From patchwork Sat Nov 9 12:08:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 842102 Delivered-To: patch@linaro.org Received: by 2002:a5d:6307:0:b0:381:e71e:8f7b with SMTP id i7csp2120790wru; Sat, 9 Nov 2024 04:29:53 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWxa78Q7+YCrMYJhWJ5x0Dwyel0oRAH4zeNKN2Sph4/eUW9xIOtB1xfygJwDxIdFQDKJnvvmw==@linaro.org X-Google-Smtp-Source: AGHT+IGdrGjROsFVKCwxL7rDkFIKij+0bJ/913Gr0YScUxClaXTIP/JuXwILa/e/TJZ5IoZfTZbP X-Received: by 2002:a05:6214:3207:b0:6d3:51d8:7bd5 with SMTP id 6a1803df08f44-6d39e1670e4mr65163326d6.6.1731155393144; Sat, 09 Nov 2024 04:29:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1731155393; cv=none; d=google.com; s=arc-20240605; b=HpHVZuED+8lvzgwvjl6Jx+/q16jL5tX9rB/dxOo9YpqMCHqfICO/X+lhjN5Wej/aU+ froK05hID3sdQGZICXiMPDQhful7n9SCkE1r2+nBVFSNQWcapH3eduXwAxP9bXMynQZK O0PpfaC6NwvfkqrmmFLau2oEF2o0Sx9nFK2kDUbQHFkFUv5BoRYDSqBczYWT0CaoLGBl s8kQJlA1QDF7VBzNc/Emo+aJRONy9LnJ50j4FzIgQb8c7/+v+8dCFWlLJMzHY3ELICWg aDmHlNz0+atUfjC74/Dg8s2z1+vedRAoRU6HxqyY/OMd65Mh0a5hXLgHMBYiYGG6GkJy dqcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from; bh=LEXt+cKGioNqgNcxjTRpeK9ddoxHe/bXyFmN/jofoAM=; fh=vuhzQW7LNVNfoCzrQU/zlJ6j/7aL6vBNEyQhm6VZot4=; b=D62DyYcPVQ8XE7+jit+g6hU+sqa0M1Y3l1XSZkl9xLtaDz9umfWasK8v5OEv9e7UXf RyVXJoioc/K8/AUm7PXKJp0vq/E34ExutD3n3gRcEyQyGsx8HWqBD7lKbPMemZkB2aK2 dWQDnIzqBwAtN6Rg8xeIgsK3rGATYGE4L939eS+KczKvACW1rL25JIAIBSldBZx3ENtq R2ntKO4exijP4vT4smHasCpZ9a/spx5RhvRQvKGF2zfS1HWYtsLTPv31vsK6BM7Ok9MT IH+dMfMc+EkMbIgGCqnFtqRBLxAIMF8jnwTT9AJWDo1oOJPd6eCsTrZlpAyasWjeB7MO JIHA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6d3966b2567si65318826d6.449.2024.11.09.04.29.52 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 09 Nov 2024 04:29:53 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t9kNx-0004Ss-P7; Sat, 09 Nov 2024 07:16:15 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t9kNU-0003uy-Uq; Sat, 09 Nov 2024 07:15:46 -0500 Received: from isrv.corpit.ru ([86.62.121.231]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t9kNT-00054w-Bo; Sat, 09 Nov 2024 07:15:44 -0500 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 3A4F5A1633; Sat, 9 Nov 2024 15:08:07 +0300 (MSK) Received: from tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with SMTP id F3C64167FBA; Sat, 9 Nov 2024 15:09:01 +0300 (MSK) Received: (nullmailer pid 3296157 invoked by uid 1000); Sat, 09 Nov 2024 12:09:01 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, Richard Henderson , Alistair Francis , Pierrick Bouvier , LIU Zhiwei , Michael Tokarev Subject: [Stable-9.1.2 10/58] tcg: Reset data_gen_ptr correctly Date: Sat, 9 Nov 2024 15:08:11 +0300 Message-Id: <20241109120901.3295995-10-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.5 In-Reply-To: References: MIME-Version: 1.0 Received-SPF: pass client-ip=86.62.121.231; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Richard Henderson This pointer needs to be reset after overflow just like code_buf and code_ptr. Cc: qemu-stable@nongnu.org Fixes: 57a269469db ("tcg: Infrastructure for managing constant pools") Acked-by: Alistair Francis Reviewed-by: Pierrick Bouvier Reviewed-by: LIU Zhiwei Signed-off-by: Richard Henderson (cherry picked from commit a7cfd751fb269de4a93bf1658cb13911c7ac77cc) Signed-off-by: Michael Tokarev diff --git a/tcg/tcg.c b/tcg/tcg.c index 34e3056380..b1b8b8bba3 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -1399,7 +1399,6 @@ TranslationBlock *tcg_tb_alloc(TCGContext *s) goto retry; } qatomic_set(&s->code_gen_ptr, next); - s->data_gen_ptr = NULL; return tb; } @@ -6172,6 +6171,7 @@ int tcg_gen_code(TCGContext *s, TranslationBlock *tb, uint64_t pc_start) */ s->code_buf = tcg_splitwx_to_rw(tb->tc.ptr); s->code_ptr = s->code_buf; + s->data_gen_ptr = NULL; #ifdef TCG_TARGET_NEED_LDST_LABELS QSIMPLEQ_INIT(&s->ldst_labels);