From patchwork Tue Apr 22 19:26:46 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 883150 Delivered-To: patch@linaro.org Received: by 2002:a5d:474d:0:b0:38f:210b:807b with SMTP id o13csp2602539wrs; Tue, 22 Apr 2025 13:14:32 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXZGp7djCE0M85t9J7BZ4LIYzbDdvNe33DM1SzxIpPXoR4Z3Xt45ExeySFn08wt3VHYWBRAog==@linaro.org X-Google-Smtp-Source: AGHT+IHVy8TdgrfpfGlFE2mOM9H/GtVYbzOy2WraOVzvz3Q9mPQSo2ZN1QsPu9sakWEhWWWpkBDR X-Received: by 2002:a17:907:d1b:b0:ac3:4487:6a99 with SMTP id a640c23a62f3a-acb74db7e5emr1554832066b.47.1745352872818; Tue, 22 Apr 2025 13:14:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745352872; cv=none; d=google.com; s=arc-20240605; b=E4CCnkDGstNkdg+RXhWhPFSNWmZWmHKTdNniZUHV7L394UQ1Uv3waM7bWBQgiXQno5 bb9Rh6+a89xaJGsAHt9+ABZZhzYMF+ofOW/L+9pLq6CWcpoEo+GE687diMT7vcVvpb5p 994dCudlQM8IIW4B9H20ME27Hw1iy2HPg8vgjsVkwho/miE4pKR694ta4qW7LZ/dp5nV O0/cpnEbh9MCx3iQF93dDh2iK4lVDKEoV6gUu3RdTjPtjpC7Gq5UFYGPjwCenOKgK4uN eLiJBQJ1dqE1ErSK60V1Cvo/nkOKY4HI51Puqx2PbanE623Iq7NNuhjd15IZe4v6dDCu 5d7Q== 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:to:from :dkim-signature; bh=/uK/6e74nn8Fot5LvCS7tmplWHujswrlAKxdO1vG4SM=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=allYjspvlKRRO/vnbfRBnPpX6ZjmmJJZ1j7fSpAyCDHDxpyUjIhIIRUZRKzeN3umPH grgV25GYY94UwVbcPuI6spQg8/yJAw0Kkr5rP0mHwWyHooyAZNyWDD7U7Q+JG0NY8ath RPP1kqK7hVIv28atHdH3DHigVmD4FC/iOsyZnhCSyqzF9Xx0DgFKclE7NnQbW//dqk3h 9iLEHUSUhk+mWcetdMq8NnvssNro9O+dcuu5tBBdA0p1W7VU9AWEXJnHjKgZscC1kxrI Da/2A8S2qiAvYBz7p6QlkDlj8L66hv59E6v6tZsFUhkGCLC7++ZgRBP67aLUwWnCznU+ yPUw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=pqMS3LgF; 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"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id a640c23a62f3a-acb6edd8469si691730966b.282.2025.04.22.13.14.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 22 Apr 2025 13:14:32 -0700 (PDT) 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; dkim=pass header.i=@linaro.org header.s=google header.b=pqMS3LgF; 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"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org 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) 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-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) 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) 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 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org 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; -#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 +/* 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.