From patchwork Tue Apr 22 19:27:42 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 883078 Delivered-To: patch@linaro.org Received: by 2002:a5d:474d:0:b0:38f:210b:807b with SMTP id o13csp2592241wrs; Tue, 22 Apr 2025 12:48:58 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW91xu8pBswJsssq6AEx/jQM5wcYe+EaEdMd4lHU2HsqV4qHBV/dJgBRMiQ5BgFEf+iAjzkgA==@linaro.org X-Google-Smtp-Source: AGHT+IEsj/vyxlYEu+L8d3zd2teMNYTG5up3gL97e61/7y/cmgyEAVdScnVUKCQzX0ebm1QQbvoh X-Received: by 2002:ac8:59cf:0:b0:477:29f5:53eb with SMTP id d75a77b69052e-47aec354ab8mr292870411cf.6.1745351338199; Tue, 22 Apr 2025 12:48:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745351338; cv=none; d=google.com; s=arc-20240605; b=AWXgVuN370uWQ5bG6AZF+/0+bOFSaD8GC8py1QDNGP4AY5W6Cp0Kklg6UL5KTCySJl P34P+nWqRUQOWgrXuzmo4XAALoGjtujYYc3vUd95H8m/EC/nk2gORIHT8RAtYzLNGT/C g7ZltX1QggVvzxgL70+1s6ZXmEL9xbhCCDrF4ap/g+oV5Ivz+931d8XlvOAcSUGJsUA8 pTKDIavv+ME0QJE0sibK5vEvZfA8OVUwO2HeIjnyTGsT1YWBllEVYYZafd6oxH/1nHjv Ua6xPFI5cWqGiKOay4qRo/C2vYKfLDWS+CZCjuXq06K3WFx67M3KjuYAhuRNW7hYplpa bTkQ== 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=Wn5IylCoa18B2xlwy66MANPbffZJqmOZqBLwmhwTcyY=; fh=vm85eyWrvOAHduw3sqEA+cYBqvHB7M0MHFcRJg7VWOo=; b=JifWvfr+iN1UGCS/QnozeMr00ktyIhZfgYRSyvug6Go8sY8DwOOPuxOIa8+QRsuuOX 2OTnoanszDyi/3c3OIq6vVFiSjOvIcAzacjcls5vHKwpo0+dWdMqxtGB+mRlnf1G4CJR U4JdxtNhq9W/7AI48as/rtoToVL0ArMXeZz+b7NzF4Skv36jnnkS+JSZBaCxnJwkt1/s vMvK22NSC1utJj0sRvgC0yO0l58OdyEk2e4RAXV98VC9DKUI8xJ+7UwJr0ug3DdAK+R4 u8E82Lx6oaat2ISnq2QSw4UfbZFvcUYv8ENJULQ6jdZlL6mAbqNFVi9xbtHezNZJmUsc XSlw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=h6757D7X; 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 d75a77b69052e-47ae9ca3632si120180581cf.272.2025.04.22.12.48.58 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 22 Apr 2025 12:48:58 -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=h6757D7X; 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 1u7JR7-0001Mf-KE; Tue, 22 Apr 2025 15:37:41 -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 1u7JP8-0005Yn-6y for qemu-devel@nongnu.org; Tue, 22 Apr 2025 15:35:41 -0400 Received: from mail-pl1-x62a.google.com ([2607:f8b0:4864:20::62a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u7JP6-00077W-7I for qemu-devel@nongnu.org; Tue, 22 Apr 2025 15:35:37 -0400 Received: by mail-pl1-x62a.google.com with SMTP id d9443c01a7336-227a8cdd241so63289685ad.3 for ; Tue, 22 Apr 2025 12:35:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745350535; x=1745955335; 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=Wn5IylCoa18B2xlwy66MANPbffZJqmOZqBLwmhwTcyY=; b=h6757D7X885MH8VcBXNVplANaMO8lzw060Pv1VvT+Ni+fKcE/eqOVx5be7u8YMXnJf WzDB3UtsCP/EiamG4c4ZSH53qEwmo8N554whDl1nriksqqWisY0JAwfvnckr9zO5HewU iggTsG/MLw+mpivaYV4Y1hhWWui+ztf90pKt6XKDgo/f2q1KUHT8BrCAA1vQD5mG1oEC oVTCdAj8g+YwnPtuj56H6F8mx+E5xAY9WJVo0SRILB6xFrws220mcC7XjJF6ulg1gpF9 CFMX5l0p7q542b6M/7Xse1FUvYnq8BNwuDpyjQTqIqqI8ARk4kmRiSms9Og3fIR3n0+K A44A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745350535; x=1745955335; 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=Wn5IylCoa18B2xlwy66MANPbffZJqmOZqBLwmhwTcyY=; b=Rz5toigIX7yHeKbnYUUDCJ4eWcvSBOqq1U3dC57EZM58q+d2chl491HL/D7gYeSQw1 Pe0m916eQ6ilxHkdMq9surOgmsvFsX50+uqRoNbTMKIYGO+nUPVR9gurDZFMLsZvT5uE eMJprrfYe2u5+rDgLxehdvQhPhjeoFi/ZDWCqftPgAbA5SD3VHPQ6hDRHpxzBDGOb0Lj ed3p/ZLTKzxEVRF4QSGpYALah/cdTCZm3Lp0i30peR7PVP/d6XmNlYqhuTzTM3aF0P9u 3aFc1RzGaccGDRxNHOPUmsiPL1jEXBFb0FST2V/QG1pbd5rGki3iyw8EmoSpDtMmZVwC XQBQ== X-Gm-Message-State: AOJu0YxPJnXIlxrL4Jkly4TKTjhUmPd48NYBciJR0a/oHBi5RAQWGyty 2+boxR3KqBWlGt1Jo5kqaPXGdbbM1wPT0XhOCA2W8+FYH13hAi45M6r7Fxpedym+H0TSPiZSIV+ t X-Gm-Gg: ASbGncv/CXSI7SE0cjXWWaCQRogL+5ktrviJaOh05NByO5EVxqDRDzwzqW4gUtIZbmh Hs4OiotsBxzDJVqynuEvyoksfu+tn92cv2y9o89Xvf1Cx3WM3Cdo65ErVKv+NPO5Kf/JoYLdU63 3v+Z7QBB6ojGR22DDEheGUQ0Mi5dOjMRUiyzbxOb5yGcPGpqhdogvB0JHGKUW3G7iKPJJXV7yHu gPAiRGgMRbEz4qd9rW5l4/lBhSuUNy2MKVAGA2bjIkqCii8VbyiyPXQuwPSzrZ002GcNuSQ6qrS Ka7e1x2nJ+K0CTo+bIXhoC7NfDew4yrpwIdOT4P77bHCIz69w9qW6YRKFBJ/U98tBJn/H7dVc5E = X-Received: by 2002:a17:902:f54c:b0:223:6180:1bea with SMTP id d9443c01a7336-22c53618770mr225353415ad.37.1745350534701; Tue, 22 Apr 2025 12:35:34 -0700 (PDT) Received: from stoup.. (71-212-47-143.tukw.qwest.net. [71.212.47.143]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22c50fdf1f1sm88996795ad.237.2025.04.22.12.35.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Apr 2025 12:35:34 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: Pierrick Bouvier Subject: [PATCH 113/147] accel/kvm: move KVM_HAVE_MCE_INJECTION define to kvm-all.c Date: Tue, 22 Apr 2025 12:27:42 -0700 Message-ID: <20250422192819.302784-114-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::62a; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62a.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 From: Pierrick Bouvier This define is used only in accel/kvm/kvm-all.c, so we push directly the definition there. Add more visibility to kvm_arch_on_sigbus_vcpu() to allow removing this define from any header. The architectures defining KVM_HAVE_MCE_INJECTION are i386, x86_64 and aarch64. Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier Signed-off-by: Richard Henderson Message-ID: <20250325045915.994760-18-pierrick.bouvier@linaro.org> --- include/system/kvm.h | 2 -- target/arm/cpu.h | 4 ---- target/i386/cpu.h | 2 -- accel/kvm/kvm-all.c | 5 +++++ 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/include/system/kvm.h b/include/system/kvm.h index 21da3b8b05..18811cad6f 100644 --- a/include/system/kvm.h +++ b/include/system/kvm.h @@ -390,9 +390,7 @@ bool kvm_vcpu_id_is_valid(int vcpu_id); /* Returns VCPU ID to be used on KVM_CREATE_VCPU ioctl() */ unsigned long kvm_arch_vcpu_id(CPUState *cpu); -#ifdef KVM_HAVE_MCE_INJECTION void kvm_arch_on_sigbus_vcpu(CPUState *cpu, int code, void *addr); -#endif void kvm_arch_init_irq_routing(KVMState *s); diff --git a/target/arm/cpu.h b/target/arm/cpu.h index ea9956395c..a8a1a8faf6 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -33,10 +33,6 @@ #include "target/arm/multiprocessing.h" #include "target/arm/gtimer.h" -#ifdef TARGET_AARCH64 -#define KVM_HAVE_MCE_INJECTION 1 -#endif - #define EXCP_UDEF 1 /* undefined instruction */ #define EXCP_SWI 2 /* software interrupt */ #define EXCP_PREFETCH_ABORT 3 diff --git a/target/i386/cpu.h b/target/i386/cpu.h index b5d68c796b..35c16302bd 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -35,8 +35,6 @@ #define XEN_NR_VIRQS 24 -#define KVM_HAVE_MCE_INJECTION 1 - /* support for self modifying code even if the modified instruction is close to the modifying instruction */ #define TARGET_HAS_PRECISE_SMC diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c index 0723a3933b..7c5d1a98bc 100644 --- a/accel/kvm/kvm-all.c +++ b/accel/kvm/kvm-all.c @@ -57,6 +57,11 @@ #include #endif +#if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) +# define KVM_HAVE_MCE_INJECTION 1 +#endif + + /* KVM uses PAGE_SIZE in its definition of KVM_COALESCED_MMIO_MAX. We * need to use the real host PAGE_SIZE, as that's what KVM will use. */