From patchwork Sat Nov 9 10:14:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 842083 Delivered-To: patch@linaro.org Received: by 2002:a5d:6307:0:b0:381:e71e:8f7b with SMTP id i7csp2084111wru; Sat, 9 Nov 2024 02:27:03 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXkbpepbLnJbtHcYkVK0cacNBc+BhPrGUoALkmsloOixxcuWAS5Tq3fszUpfEcEofvNiKiw3w==@linaro.org X-Google-Smtp-Source: AGHT+IFPQkwQaj7ZPqnmQlc7+BzKefWqBa6q7qbgm7vo32WpFfpEcK//Lek/qvuNz40P6qffxe0X X-Received: by 2002:a05:620a:4414:b0:7ac:b213:36f3 with SMTP id af79cd13be357-7b331eaa522mr893675985a.14.1731148023429; Sat, 09 Nov 2024 02:27:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1731148023; cv=none; d=google.com; s=arc-20240605; b=dPBKGtHvGWOHYr5uGY2j32ZPPC4son0+2lVbYxp/DRUE3g6JoVzyhnct3LaZnVsY3w 1pQPEBqjUSpaG4TvEnOQVOY29nRytmdBNSC5HSzlrl7kp1atyeCSKkChEl4nK7p6mO0m 3uj6kpXfdL2pCy/LxzynaOAn7Wsvja9leL8KBG1F9sLnxuAIJA6JoZRvgeTB/C/jAeRu jv0K91yM/JqH/d8/CO9sjxhXHHCDjYFHgtJNR6ofUv1+CV+uaRArdRLUpWjZzR4ssjNz stIUQFtlCszJjreCWcj/+H9fndh7aNjrrdd1xxxq9NbIvVnD40kV2Ds/1zqsABIeEthU IHyg== 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=YKAcXknjA03wPR2IfNDIKLcRMacJaeRxXc1cw2YCsWo=; fh=vuhzQW7LNVNfoCzrQU/zlJ6j/7aL6vBNEyQhm6VZot4=; b=H3ugifOqq/QJq1KSjB/3crt1d0eJ3VMqA0o/EqHU9ZaGBRhtKpDT98jtJ4Y/2b2huz 3XzJmXDuDj5mSNfWQrDQ/1QrtRti4knK/IBN5pgFz0bg+89r04yeMebvZyxy4WGnciZ8 /buos+l04xyf14Tl5d5ewE6rwQhP5HrGRYKr86IQeoNT1GtIn2EW2hWGevZxw1aeZsG3 8GnkpQY1u9qKcwDyvAgSn/CSdZilXLQOlX6Yg6VabB22at3BnbfpLUtelHO43o2jbjeO HYlBAHmKvvN+ngqPw1A8NP9PAEKOOAgXGTzcIbE/Hd9d9L182i/OSbbSll2HgF7f6v6E WCXw==; 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 af79cd13be357-7b32ad3a0aesi610759385a.705.2024.11.09.02.27.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 09 Nov 2024 02:27:03 -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 1t9iY4-0001m2-Dw; Sat, 09 Nov 2024 05:18:34 -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 1t9iW3-00060P-7U; Sat, 09 Nov 2024 05:16:34 -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 1t9iW1-0007wH-Mx; Sat, 09 Nov 2024 05:16:26 -0500 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 6F4F7A13FA; Sat, 9 Nov 2024 13:13:50 +0300 (MSK) Received: from think4mjt.tls.msk.ru (mjtthink.wg.tls.msk.ru [192.168.177.146]) by tsrv.corpit.ru (Postfix) with ESMTP id 07F50167EE6; Sat, 9 Nov 2024 13:14:45 +0300 (MSK) 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-8.2.8 22/49] tcg: Reset data_gen_ptr correctly Date: Sat, 9 Nov 2024 13:14:13 +0300 Message-Id: <20241109101443.312701-22-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 e2c38f6d11..7d07a1166b 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -1410,7 +1410,6 @@ TranslationBlock *tcg_tb_alloc(TCGContext *s) goto retry; } qatomic_set(&s->code_gen_ptr, next); - s->data_gen_ptr = NULL; return tb; } @@ -6114,6 +6113,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);