From nobody Fri Oct 3 19:17:02 2025 Received: from mail-pj1-f74.google.com (mail-pj1-f74.google.com [209.85.216.74]) (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 5A7A91DFD9A for ; Wed, 27 Aug 2025 00:05:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756253136; cv=none; b=kkS0xhah+zG/huAyXdeQkwp522Nf4XlaIzxIj0OwNy2qRGPzKOIDiOiNb3qjfP1iUYUw9aiAXTwyf/tphVvU7OkyruEZCwE8nRlw8mwCfPRgoR2n403xkFiCnNmCGb6n9YEscjdR2yD3p9Kv/5nLfsXSWPW8lDtMemAahbHLNnU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756253136; c=relaxed/simple; bh=cqqucMYtivTxgJ2yWtjMcM5NpaFOO1MES3223ug0X4E=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=khBteVXUS/2GyYo8MlYp7DLcveURfCT/j9ODQS1wlXSxCy5MoBeSOSbaba84wF28Qw2BveSB+Fbu6mfVXJQQxxTp3Q4Vp2uiX8fAzkfSUQ0jxxF1aly+jUsLS2bTeZBCN1PdUAQRv4izDLe8vg/smjTS257YiqjrhItARY7G8+4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=Cnehlumx; arc=none smtp.client-ip=209.85.216.74 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="Cnehlumx" Received: by mail-pj1-f74.google.com with SMTP id 98e67ed59e1d1-32771335ce6so68259a91.1 for ; Tue, 26 Aug 2025 17:05:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1756253135; x=1756857935; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:from:to:cc:subject:date:message-id:reply-to; bh=oGCmox8NCxkTSpPUlLKTfWHUVoiysl+0iyU32s+8vBE=; b=Cnehlumx5usGz9bDM7tH+A9BsThIbDUwO9/e6cwD6Sd48sx1Sv8jqgKm0aSrTlfVPF TS1T7PcgcInnBxA1EKivFEdk4+nUXBUuQq2xzvKr+XcKpZ1rcUxpm5GA+ks96mOj1ky0 SlmnBke0dt2bqy+2vLPd+5V0EF1TmeH8ZYFAzKxgddP4+I1ybNnYaNDKZdx8qKLAYbRJ 6rzidg/0wvS2Txyzv9P9yfxbLKJobKv82pfANzJS34vvDSt+mVp2gqDbyTvltjGq76Pz 2/gbhzUkP7Kz7I/HizUZ9pOPZ99B4l/70uoOvSVcBqvHPDuKuSTykzOdkufU5DVyhw+H ms7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756253135; x=1756857935; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=oGCmox8NCxkTSpPUlLKTfWHUVoiysl+0iyU32s+8vBE=; b=W0M4cO7oexujzkp6p2i1RQ8gvdYilnMYH6HDKG9kwD2IqgaCLbElWJUQpufrEcqPqD hPoDHFQMNnPgBO9eX4Y7h7hSSYgQXHpIlKMN4eEeeFQM6s0bCB2IdteXLS40WHyTiEyR 93TVlajhbcHM7ccX8NLVxjs2wYH6xs7oRRre0S0v0KvD4suKmc6kVK34phalsy3cJ7hy cYg7/FvXdfYYOU8pFa99bG37bbyx117aN8Gp75RFQs426gD1TE6Y+Kn+fmlO/YctKJa7 0gLynvARm4cPjF2YWfIeigNpEwmluKj7BK65Ef6y2vq2foT9i3FxK+phiXgCQvqfXD5I /a4w== X-Forwarded-Encrypted: i=1; AJvYcCVn4Ly9Lr6O/AKyBwIzVQPXtxhMqaW1Nr+d8ciaJX8C9F81Tn1868Hp4iBveI7aOBk0SB8S4AL94gA9PWQ=@vger.kernel.org X-Gm-Message-State: AOJu0Ywplb5bxSWFCfjxxvxIo7ERPX/yLNSphceh5UQQGRE6TR0iG6Z2 tptDWMuRmgfWguXGpcZj2HOq/CXAnEbkkutkE2t/JSNlFviFwZtHEw7U8mvOnTQjoszsJTK1FAy Jx1K4tg== X-Google-Smtp-Source: AGHT+IEYma5Tgh82jGLGfJfLfmhoqHyeRAhaK0BUFIBNQaa0nt6VPuBWzXcFJlUAx1BFZPkgbXKo0snHV+0= X-Received: from pjd5.prod.google.com ([2002:a17:90b:54c5:b0:325:8ff:2ad]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:5787:b0:30a:4874:5397 with SMTP id 98e67ed59e1d1-32515ef215amr21922120a91.9.1756253134805; Tue, 26 Aug 2025 17:05:34 -0700 (PDT) Reply-To: Sean Christopherson Date: Tue, 26 Aug 2025 17:05:16 -0700 In-Reply-To: <20250827000522.4022426-1-seanjc@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250827000522.4022426-1-seanjc@google.com> X-Mailer: git-send-email 2.51.0.268.g9569e192d0-goog Message-ID: <20250827000522.4022426-7-seanjc@google.com> Subject: [RFC PATCH 06/12] KVM: TDX: Return -EIO, not -EINVAL, on a KVM_BUG_ON() condition From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Michael Roth , Yan Zhao , Ira Weiny , Vishal Annapurve , Rick Edgecombe Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Return -EIO when a KVM_BUG_ON() is tripped, as KVM's ABI is to return -EIO when a VM has been killed due to a KVM bug, not -EINVAL. Signed-off-by: Sean Christopherson Reviewed-by: Ira Weiny --- arch/x86/kvm/vmx/tdx.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/x86/kvm/vmx/tdx.c b/arch/x86/kvm/vmx/tdx.c index 9fb6e5f02cc9..ef4ffcad131f 100644 --- a/arch/x86/kvm/vmx/tdx.c +++ b/arch/x86/kvm/vmx/tdx.c @@ -1624,7 +1624,7 @@ static int tdx_mem_page_record_premap_cnt(struct kvm = *kvm, gfn_t gfn, struct kvm_tdx *kvm_tdx =3D to_kvm_tdx(kvm); =20 if (KVM_BUG_ON(kvm->arch.pre_fault_allowed, kvm)) - return -EINVAL; + return -EIO; =20 /* nr_premapped will be decreased when tdh_mem_page_add() is called. */ atomic64_inc(&kvm_tdx->nr_premapped); @@ -1638,7 +1638,7 @@ static int tdx_sept_set_private_spte(struct kvm *kvm,= gfn_t gfn, =20 /* TODO: handle large pages. */ if (KVM_BUG_ON(level !=3D PG_LEVEL_4K, kvm)) - return -EINVAL; + return -EIO; =20 /* * Read 'pre_fault_allowed' before 'kvm_tdx->state'; see matching @@ -1849,7 +1849,7 @@ static int tdx_sept_free_private_spt(struct kvm *kvm,= gfn_t gfn, * and slot move/deletion. */ if (KVM_BUG_ON(is_hkid_assigned(kvm_tdx), kvm)) - return -EINVAL; + return -EIO; =20 /* * The HKID assigned to this TD was already freed and cache was @@ -1870,7 +1870,7 @@ static int tdx_sept_remove_private_spte(struct kvm *k= vm, gfn_t gfn, * there can't be anything populated in the private EPT. */ if (KVM_BUG_ON(!is_hkid_assigned(to_kvm_tdx(kvm)), kvm)) - return -EINVAL; + return -EIO; =20 ret =3D tdx_sept_zap_private_spte(kvm, gfn, level, page); if (ret <=3D 0) --=20 2.51.0.268.g9569e192d0-goog