From patchwork Thu Apr 24 00:48:02 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 883826 Delivered-To: patch@linaro.org Received: by 2002:a5d:474d:0:b0:38f:210b:807b with SMTP id o13csp3201834wrs; Wed, 23 Apr 2025 18:04:02 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX6t3IHiyZJ4WiCqvlVS51t4DyTQc2UF+u6u1SjC1U29aMz7QUfW+8JLYl/nHOqHRRffoEJaw==@linaro.org X-Google-Smtp-Source: AGHT+IExeviKnXCqA/we0Lp6nhKNvHeBN7LyqNugi4lfa+i9/KlSdbiP6n1uwU+1Q0RdYKAzdcF6 X-Received: by 2002:a05:6214:2a4f:b0:6f2:d25e:8f60 with SMTP id 6a1803df08f44-6f4bfc22694mr13413486d6.22.1745456642146; Wed, 23 Apr 2025 18:04:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745456642; cv=none; d=google.com; s=arc-20240605; b=lqwch4oEDcFeIfYgxaWYAK5CxFGRgOIxbouxc/K3ncUEdPZB9z4FbA0kZeXsa2rPO6 Sv9ZrwtCpnB7yqnmwPYSF3mdgifUFd0VtdXmBaCGir9vM2F16dBvUTQ+E1t5TVVy5det N0/jdyHrW8+DUuFPcQyb2d6PvPR5yf2y9AAByYkUHu/D8wO2kfJKMoztxNMyWP89Dfdm MRqlPZc88pZAc3h8bhDFpvfXBnYevW+cY3o7W6BmLEPDtaHqanDg1BUiKgBaCL87Ld9j UZGECFhYtNBSfAUlpH8hBdoEpGxkS5a23di0zragjEA4dbWhV1Ur2/9kKvGwXTlhpYx/ gHfg== 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:dkim-signature; bh=kEc/3fiG4iISK/71vr3crINCUz3P6fX9ye3zEIs07n0=; fh=vm85eyWrvOAHduw3sqEA+cYBqvHB7M0MHFcRJg7VWOo=; b=CmkIZZjYXNFVGXRmo6LfkpBjcGswjqdhBS6BO7SKasCObqpkWTnJRFevIrEkqh2zmC SgNsh8nu2NMAaPpHvOQyCpKNiiF9Iy6z0HiGmwg5DsWktURBzS7nua8o8OKkPXGtHyXH QHbR3GooYQ+H16YHVtB+C6aD9bvJoINyfdTr/1i9qcdjvihJkOpV7pMtUMt4SejiBJ2v 09nsp1PNu65+KOiSQLc/B9De2xxN+U+kLuLe/gIv/iwdP4h2cH6SNYjfk9r1mvVB0WLo nC5Xz9H+b37WJ+9k7jdIwVE7TxuyvnP+sTA41lXPT731bdBKTctpgrxF67JRqWmVO4HU rMBA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="P/ZyKyj4"; 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 6a1803df08f44-6f4c0921919si3970796d6.161.2025.04.23.18.04.02 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 23 Apr 2025 18:04:02 -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="P/ZyKyj4"; 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 1u7ksU-0000QI-Sv; Wed, 23 Apr 2025 20:55:50 -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 1u7kqX-000159-KP for qemu-devel@nongnu.org; Wed, 23 Apr 2025 20:53:46 -0400 Received: from mail-pf1-x434.google.com ([2607:f8b0:4864:20::434]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u7kq8-0004iQ-Vp for qemu-devel@nongnu.org; Wed, 23 Apr 2025 20:53:22 -0400 Received: by mail-pf1-x434.google.com with SMTP id d2e1a72fcca58-73bf1cef6ceso387139b3a.0 for ; Wed, 23 Apr 2025 17:53:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745455999; x=1746060799; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=kEc/3fiG4iISK/71vr3crINCUz3P6fX9ye3zEIs07n0=; b=P/ZyKyj4lM40oaQW1jiMLaKOPr38Z2xLR2tL5RvmBO6W1gbNCoy2JJ0dm+/3LnsM8N SKwMCRfHjnwBUwI9czbhCM6fekAv5OVtrpc5YZChxLrUQE+gGacwh1i5IZ+FPQFhdXtB JI0ge8cZWqbgaTvVKAT987Pi/m43QyJge6ZYLK1RR/2EFKBlnyNX8XIkz941FcUuuksM AXPDDru0GaWo9VTN05QilhkLRzMa08+yu3/3MHd0MLNpvYqWj5DQ1ZzavfR4SUh1XqnZ dj0Q7GRQJcPh9SqfBvWKIHLKFDmfseOYCMOI/zVzWnnl+5TkowMn5wUwvZqIbjl/kpVP MUVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745455999; x=1746060799; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kEc/3fiG4iISK/71vr3crINCUz3P6fX9ye3zEIs07n0=; b=BUmz3y1wDpJxk9yeVMm9Qot2zh4oFwwbt8t1KRsRzA7aWZxe8Lp3DvdbGUADc942xS UaZgvWespiA8CmpizMlmDn7hnqpUkvBuxAqoF+NFfotm4vUny+ccGyXBpdWt96xsEvPZ yLiWrF5JtCfWg5dr2OqG8thnxhbH39KPB0OviLcR/rll2CimGHwb9nejB0fFkIicki5S TzPLKbgZlOQFr3ekv2RrR8KdUQOPzqciBsqehQmssmRLI92ai8WryNbgvvQB4py9UJ78 0HidtGSFOuJKQy765NWY7EIDX1a8Deh2gKAtXdxxqnxpst4SkY587I2bn6ADGm5fccz6 +Ptg== X-Gm-Message-State: AOJu0Yz3Uij8GCyNU7YQis5cPQ8z+2+yQaSp4WjMSk63NojOw/qkYJx/ /eBnXS0z9vWmoGOtdziUflkRUuWaUsTSYafvxBfVwyETcZbwu3ayjgU31hi3mUI8eBNLgYqjgKP Q X-Gm-Gg: ASbGncuAv4Gj93H4kUPZS9mK273QIKvMzZ7jByAiylxFGVWqCwV0TLTDuR8ySDWU276 /gBAqJSQdvXfzOoQWF18VimFkrffL2knaE2DYZmIZy2LCcvrGdASAmLH5zizuLmhLcTkTxFP1t4 km9xGJf0uB0nViQ1FQRjY1R/0vQUf/nQQXJOL/D4VBPMxi7mCAgYw30XIwYUdEXIgbgY7wjkWD5 MOUzEEOKVAh5DwP6tV5aAzMUIxsrnO8QTgKD08AbfPw3HVrRJy9PqcGe8etSdOytUp8o/tdcZ+B pV/9jiepaDQqXQPRmDKq8OBfjXNw9wfEQqzk+uYE+eQnkF10yR2APGol0ra22W4wrXiZTWyDhCk = X-Received: by 2002:a05:6a20:e18a:b0:201:4061:bd94 with SMTP id adf61e73a8af0-20444ebdf33mr839092637.19.1745455999327; Wed, 23 Apr 2025 17:53:19 -0700 (PDT) Received: from stoup.. (71-212-47-143.tukw.qwest.net. [71.212.47.143]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73e25a6a971sm209353b3a.103.2025.04.23.17.53.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Apr 2025 17:53:19 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: Pierrick Bouvier Subject: [PULL 057/148] include/exec: Protect icount_enabled from poisoned symbols Date: Wed, 23 Apr 2025 17:48:02 -0700 Message-ID: <20250424004934.598783-58-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250424004934.598783-1-richard.henderson@linaro.org> References: <20250424004934.598783-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::434; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x434.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 Reviewed-by: Pierrick Bouvier Signed-off-by: Richard Henderson --- 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.