From nobody Thu Oct 16 04:53:32 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1745352872; cv=none; d=zohomail.com; s=zohoarc; b=O4M/pQECJtg4C7dumKEvwGxOb8oHupa1MeOPAxSa9G8DGqU/r9HQmbGXW7c63mdwSUP5pjEEoNU87lUVH94AQju3M1lEy+XDNu4TXG324ccCP/XlikhSXKBjCUyjT7JifxivjOjlobcsNzRYpzsN5Mgi0t8PNMAzHYTqSP6rezg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1745352872; h=Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=/uK/6e74nn8Fot5LvCS7tmplWHujswrlAKxdO1vG4SM=; b=f1lSw8Bm6W36Mguzc1ZdUi3i949WggVn1IoDpXCEnx4YYiAK01pgnPTZmV6GlChj5dizJUpvM/Re8GjBJtVusHXjynTIz2oY0Tjj9UAHPVF8NRbOQr+zECR0qYmSR1Wf1xTXn1etSzY+tjlSp4LWBSRMmETZcRLRC0bfZ9GU98k= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1745352872489340.1027587809764; Tue, 22 Apr 2025 13:14:32 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u7JQK-0008SC-MW; Tue, 22 Apr 2025 15:36:54 -0400 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 1u7JLd-0000am-NH for qemu-devel@nongnu.org; Tue, 22 Apr 2025 15:32:02 -0400 Received: from mail-pl1-x634.google.com ([2607:f8b0:4864:20::634]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u7JLb-0006d3-ND for qemu-devel@nongnu.org; Tue, 22 Apr 2025 15:32:01 -0400 Received: by mail-pl1-x634.google.com with SMTP id d9443c01a7336-223f4c06e9fso2415295ad.1 for ; Tue, 22 Apr 2025 12:31:59 -0700 (PDT) Received: from stoup.. (71-212-47-143.tukw.qwest.net. [71.212.47.143]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22c50bdda3bsm89312635ad.27.2025.04.22.12.31.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Apr 2025 12:31:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745350318; x=1745955118; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=/uK/6e74nn8Fot5LvCS7tmplWHujswrlAKxdO1vG4SM=; b=pqMS3LgFjVnlb7oJ4Zg71pITDQq+FrAzFiY2kUAWZLFcWeMTcb+oIwn6LBw2X+Pofn OGh5/8ZGIY67yTxcL3RQNzmM0kk82VD7AiaKbhSp6Tx1TUvXa6LxTpCdmnSaBRDmydID fYtFg2lzcBd7aJtBP6TXb+Qi0gvtWBG3VnIO8FdpV4dIejjZLzWmPJC6J3bcdW24m4fw F2Gxrt9M16vJiLOy+ToixW9VnVm9E5Vn8ETwEbHkEDf97BwN2bTAU/UCH2xyXk/gavC9 7DENKwUNHCjrnPb1Gzsef2AsPCtxmBV88dZm+lCLmllEw6T//4VrcLPHbWpy1KQO3uPE DduQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745350318; x=1745955118; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/uK/6e74nn8Fot5LvCS7tmplWHujswrlAKxdO1vG4SM=; b=H1CRzSg//IGHaD+959axekFfn6V/HhynzvtrFC1WGApnimF3x9nMq5XVbv/qW4JTmJ W2qQ3fui0VjhXkwjJ2ouI3uWaohk7cSMD0QotIOC3c4Fi1TeSs2XwSAfHW1iESvtitwF dEwddYLG06drXy88pjve1H0ptosZqKHR2Dhoh1LdsieZAGb4iu9HWq17OEB6BSjYBXkF kb9pLRyLbdK+5foD4fFTi0lh3bLsEeOjac8cHytKZWrkF5Ca1TX0oREGFc5DH5lrJqES 6v9PWGFJizEQ5LizWwJzYQO2llpmc9y/g61nNzD5K7X6vt+GJSs97mD1Sgf9jnNKdOQh 2LVQ== X-Gm-Message-State: AOJu0YyZxwmcLVtGrSmk2tP8BUUKPUSSQkugqJWl9o+fF1Vp1TPlMbVG tk0q53XqzTT8tNXkypPLNCde2NImvMvO86Eq6kBPEmjXGPQQ6zUMB0ouML7H0YloMTqJKTAjQQs G X-Gm-Gg: ASbGncuiRTK2AnD77yLVMAdMBECT28cuAPesBoKXcbHJ56tIYKlgGhhkTE8ig8MLQb9 s6ldaYmOM8ExquUVD59GO4I/agRzNcPV85l8qOsYVRCofypUJqFXBdZtH6TfhcRee1lWu/FMMsV Yw+285GaTg8E8JmaSrlMfNUM+mnsBQ9UEE59UIenep/pauEc2c+HYjN4y00twuSUI+fXj6TnjzL /DakB+DJ3GidCuXHCtZYlY6EipZSgYwLCx5ma4pYDLsVRS96OrRcPkUAvz/wbUMAiKdiymjOdA6 edckC2nuqqEWYOUDua1RwkDmxrazU50f8jb1NIjrNHsOWf4YM+ZCsAaK3KdTeZkeXbaFCcZSkMY = X-Google-Smtp-Source: AGHT+IFyMAnr3n8Qri4/q7uvsoq2AvNHasCCWieoVTPkN6YKfgR7EJBb6G1AuHRET8f1DiXyyS0HJA== X-Received: by 2002:a17:903:1aa8:b0:223:607c:1d99 with SMTP id d9443c01a7336-22da304bff3mr3947885ad.0.1745350318305; Tue, 22 Apr 2025 12:31:58 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 057/147] include/exec: Protect icount_enabled from poisoned symbols Date: Tue, 22 Apr 2025 12:26:46 -0700 Message-ID: <20250422192819.302784-58-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250422192819.302784-1-richard.henderson@linaro.org> References: <20250422192819.302784-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::634; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x634.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1745352874227019000 Content-Type: text/plain; charset="utf-8" Signed-off-by: Richard Henderson Reviewed-by: Pierrick Bouvier --- include/exec/icount.h | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/include/exec/icount.h b/include/exec/icount.h index 4964987ae4..7a26b40084 100644 --- a/include/exec/icount.h +++ b/include/exec/icount.h @@ -22,13 +22,21 @@ typedef enum { ICOUNT_ADAPTATIVE, } ICountMode; =20 -#if defined(CONFIG_TCG) && !defined(CONFIG_USER_ONLY) +#ifdef CONFIG_TCG extern ICountMode use_icount; #define icount_enabled() (use_icount) #else #define icount_enabled() ICOUNT_DISABLED #endif =20 +/* Protect the CONFIG_USER_ONLY test vs poisoning. */ +#if defined(COMPILING_PER_TARGET) || defined(COMPILING_SYSTEM_VS_USER) +# ifdef CONFIG_USER_ONLY +# undef icount_enabled +# define icount_enabled() ICOUNT_DISABLED +# endif +#endif + /* * Update the icount with the executed instructions. Called by * cpus-tcg vCPU thread so the main-loop can see time has moved forward. --=20 2.43.0