From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EA9A03D5236 for ; Thu, 28 May 2026 11:14:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.130 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779966854; cv=none; b=Qa4gK1C5P5WxrTgnwV8S0m+Ahuqu6zMjOXq/izmFDSwY0z0zpFnnppT1OESW6dT0nfsecqnyi85BTmlRT5vjrULBnRgjYrpAiYiHokQpk1VHYxFCDCagwHHZMWxQUOTyq/acC9VojVZxSwq/3dzGWvtP0h6Ef1qGHb76q4uHYNg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779966854; c=relaxed/simple; bh=c/BRJrvMgUknobRNXd28o9C5+IkXCI0PYo28UU2pMjQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=H383OFPLx6+jBVs2o46U4tQj/+GWRK18e33rDUhGm07T/z6ZVnm7De3yjLl3CExO34IaHSlbIOaXOwNGzSYCjtUjHpyrERWkIxnbOsRjUxTXYauVIJgjrGMTnIpN+RETGnrq3JM/aNdGtF5xlJYNnaEzaaCHCicQLNM839D60fc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com; spf=pass smtp.mailfrom=suse.com; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b=jaGEgGbi; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b=jaGEgGbi; arc=none smtp.client-ip=195.135.223.130 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b="jaGEgGbi"; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b="jaGEgGbi" Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 2E30C6AF84; Thu, 28 May 2026 11:14:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1779966851; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=JU89tIdDGXTvPA6XgNNbGU8kkEGJwcqIu1wdTgG/MTQ=; b=jaGEgGbiKEXzvW6QDKuu4Mf2S6te0IozNoWU6DxAlXUiQXHARY/+V8wW0yFqYWJoQ+OJ6D L/zM7za75gApjQ02N7v5Sd41m5vBnQL95lGqUrPjxmO6gqxVISTvy/wmPKjkzpdhZZjM8/ MJwcGf2oRkiabgqlwe5EFnN8nIhNxO0= Authentication-Results: smtp-out1.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1779966851; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=JU89tIdDGXTvPA6XgNNbGU8kkEGJwcqIu1wdTgG/MTQ=; b=jaGEgGbiKEXzvW6QDKuu4Mf2S6te0IozNoWU6DxAlXUiQXHARY/+V8wW0yFqYWJoQ+OJ6D L/zM7za75gApjQ02N7v5Sd41m5vBnQL95lGqUrPjxmO6gqxVISTvy/wmPKjkzpdhZZjM8/ MJwcGf2oRkiabgqlwe5EFnN8nIhNxO0= Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id E2D505AD61; Thu, 28 May 2026 11:14:10 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id weZNNoIjGGq7MgAAD6G6ig (envelope-from ); Thu, 28 May 2026 11:14:10 +0000 From: Juergen Gross To: linux-kernel@vger.kernel.org, x86@kernel.org, kvm@vger.kernel.org Cc: Juergen Gross , Sean Christopherson , Paolo Bonzini , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "H. Peter Anvin" Subject: [PATCH v2 2/5] KVM/x86: Return -errno instead of "1" for APIC related MSR emulation Date: Thu, 28 May 2026 13:13:54 +0200 Message-ID: <20260528111357.264809-3-jgross@suse.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260528111357.264809-1-jgross@suse.com> References: <20260528111357.264809-1-jgross@suse.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Flag: NO X-Spam-Score: -2.80 X-Spam-Level: X-Spamd-Result: default: False [-2.80 / 50.00]; BAYES_HAM(-3.00)[100.00%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; TO_MATCH_ENVRCPT_ALL(0.00)[]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_HAS_DN(0.00)[]; MIME_TRACE(0.00)[0:+]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.com:email,suse.com:mid,imap1.dmz-prg2.suse.org:helo]; FUZZY_RATELIMITED(0.00)[rspamd.com]; RCPT_COUNT_SEVEN(0.00)[11]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; DKIM_SIGNED(0.00)[suse.com:s=susede1]; TO_DN_SOME(0.00)[]; RCVD_TLS_ALL(0.00)[] Instead of a literal "1" for signalling an error, use a negative errno value in the emulation code of APIC related MSR registers. Remove some not needed braces. Signed-off-by: Juergen Gross --- V2: - use -errno instead of KVM_MSR_RET_ERR --- arch/x86/kvm/lapic.c | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c index 4078e624ca66..3e7d83db2f7a 100644 --- a/arch/x86/kvm/lapic.c +++ b/arch/x86/kvm/lapic.c @@ -2412,11 +2412,10 @@ static int kvm_lapic_reg_write(struct kvm_lapic *apic, u32 reg, u32 val) switch (reg) { case APIC_ID: /* Local APIC ID */ - if (!apic_x2apic_mode(apic)) { + if (!apic_x2apic_mode(apic)) kvm_apic_set_xapic_id(apic, val >> 24); - } else { - ret = 1; - } + else + ret = -EINVAL; break; case APIC_TASKPRI: @@ -2432,14 +2431,14 @@ static int kvm_lapic_reg_write(struct kvm_lapic *apic, u32 reg, u32 val) if (!apic_x2apic_mode(apic)) kvm_apic_set_ldr(apic, val & APIC_LDR_MASK); else - ret = 1; + ret = -EINVAL; break; case APIC_DFR: if (!apic_x2apic_mode(apic)) kvm_apic_set_dfr(apic, val | 0x0FFFFFFF); else - ret = 1; + ret = -EINVAL; break; case APIC_SPIV: { @@ -2470,7 +2469,7 @@ static int kvm_lapic_reg_write(struct kvm_lapic *apic, u32 reg, u32 val) break; case APIC_ICR2: if (apic_x2apic_mode(apic)) - ret = 1; + ret = -EINVAL; else kvm_lapic_set_reg(apic, APIC_ICR2, val & 0xff000000); break; @@ -2485,7 +2484,7 @@ static int kvm_lapic_reg_write(struct kvm_lapic *apic, u32 reg, u32 val) case APIC_LVTCMCI: { u32 index = get_lvt_index(reg); if (!kvm_lapic_lvt_supported(apic, index)) { - ret = 1; + ret = -EINVAL; break; } if (!kvm_apic_sw_enabled(apic)) @@ -2527,7 +2526,7 @@ static int kvm_lapic_reg_write(struct kvm_lapic *apic, u32 reg, u32 val) } case APIC_ESR: if (apic_x2apic_mode(apic) && val != 0) - ret = 1; + ret = -EINVAL; break; case APIC_SELF_IPI: @@ -2536,12 +2535,12 @@ static int kvm_lapic_reg_write(struct kvm_lapic *apic, u32 reg, u32 val) * the vector, everything else is reserved. */ if (!apic_x2apic_mode(apic) || (val & ~APIC_VECTOR_MASK)) - ret = 1; + ret = -EINVAL; else kvm_apic_send_ipi(apic, APIC_DEST_SELF | val, 0); break; default: - ret = 1; + ret = -EINVAL; break; } @@ -2599,7 +2598,7 @@ EXPORT_SYMBOL_FOR_KVM_INTERNAL(kvm_lapic_set_eoi); static int __kvm_x2apic_icr_write(struct kvm_lapic *apic, u64 data, bool fast) { if (data & X2APIC_ICR_RESERVED_BITS) - return 1; + return -EINVAL; /* * The BUSY bit is reserved on both Intel and AMD in x2APIC mode, but @@ -2804,12 +2803,12 @@ int kvm_apic_set_base(struct kvm_vcpu *vcpu, u64 value, bool host_initiated) (guest_cpu_cap_has(vcpu, X86_FEATURE_X2APIC) ? 0 : X2APIC_ENABLE); if ((value & reserved_bits) != 0 || new_mode == LAPIC_MODE_INVALID) - return 1; + return -EINVAL; if (!host_initiated) { if (old_mode == LAPIC_MODE_X2APIC && new_mode == LAPIC_MODE_XAPIC) return 1; if (old_mode == LAPIC_MODE_DISABLED && new_mode == LAPIC_MODE_X2APIC) - return 1; + return -EINVAL; } __kvm_apic_set_base(vcpu, value); @@ -3438,7 +3437,7 @@ static int kvm_lapic_msr_read(struct kvm_lapic *apic, u32 reg, u64 *data) } if (kvm_lapic_reg_read(apic, reg, 4, &low)) - return 1; + return -EINVAL; *data = low; @@ -3457,7 +3456,7 @@ static int kvm_lapic_msr_write(struct kvm_lapic *apic, u32 reg, u64 data) /* Bits 63:32 are reserved in all other registers. */ if (data >> 32) - return 1; + return -EINVAL; return kvm_lapic_reg_write(apic, reg, (u32)data); } @@ -3468,7 +3467,7 @@ int kvm_x2apic_msr_write(struct kvm_vcpu *vcpu, u32 msr, u64 data) u32 reg = (msr - APIC_BASE_MSR) << 4; if (!lapic_in_kernel(vcpu) || !apic_x2apic_mode(apic)) - return 1; + return -EINVAL; return kvm_lapic_msr_write(apic, reg, data); } @@ -3479,7 +3478,7 @@ int kvm_x2apic_msr_read(struct kvm_vcpu *vcpu, u32 msr, u64 *data) u32 reg = (msr - APIC_BASE_MSR) << 4; if (!lapic_in_kernel(vcpu) || !apic_x2apic_mode(apic)) - return 1; + return -EINVAL; return kvm_lapic_msr_read(apic, reg, data); } @@ -3487,7 +3486,7 @@ int kvm_x2apic_msr_read(struct kvm_vcpu *vcpu, u32 msr, u64 *data) int kvm_hv_vapic_msr_write(struct kvm_vcpu *vcpu, u32 reg, u64 data) { if (!lapic_in_kernel(vcpu)) - return 1; + return -EINVAL; return kvm_lapic_msr_write(vcpu->arch.apic, reg, data); } @@ -3495,7 +3494,7 @@ int kvm_hv_vapic_msr_write(struct kvm_vcpu *vcpu, u32 reg, u64 data) int kvm_hv_vapic_msr_read(struct kvm_vcpu *vcpu, u32 reg, u64 *data) { if (!lapic_in_kernel(vcpu)) - return 1; + return -EINVAL; return kvm_lapic_msr_read(vcpu->arch.apic, reg, data); } -- 2.54.0