From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f73.google.com (mail-pj1-f73.google.com [209.85.216.73]) (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 67B99265620 for ; Fri, 17 Oct 2025 00:33:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.73 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760661185; cv=none; b=sw0IfAj6CKfz9uySNq5o85slVIApwS11qhr4CWbxKsLoBcLO1cMH47fAdJZSMxxEmUTaJs1Pd1SL69uzdYgw/H3ILIPUPyGlZilTsJxNy07eufWlFcu/AkpoTof1EK+bUphu64n4nAD7SjN/3kFmj/vx45dxbRC+BtHW4eUQCUE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760661185; c=relaxed/simple; bh=ZVrQAaDETHJOm3nZp8vCz09Pe/Wr4FeYALw+WA60dkU=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=Aug3uctVu4tXwo6355OsWdHrPZjrgOuCfpeOnWA7JTe/1KKaWJ5lxwNYoLDq/rz/G5U1+aYEmGKzyRToaXpVMkQtAKemeKXOmSfX72aPh9BSxae5SRw2V71999YCwkookGREVPCVLinzMn0MeAj/UWFhKBdnulX88JlaMfDH430= 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=A0c1M6Qp; arc=none smtp.client-ip=209.85.216.73 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="A0c1M6Qp" Received: by mail-pj1-f73.google.com with SMTP id 98e67ed59e1d1-33428befd39so3313310a91.0 for ; Thu, 16 Oct 2025 17:33:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1760661183; x=1761265983; darn=lists.linux.dev; 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=EknCUbF2LHWm0fNDNjp+CKNXYZwTUTGxAjt6VludIpM=; b=A0c1M6QpCEsV2Dck7q1yafK82gXK07IFn1cvPPDvqecuEz5rxasdfABQAD2Nak0Idl xLi/B1srk4D/XOYoAPaeyVVrzY5hAiTqHGYDufYP+kZ0hwNE2ht//8bp8taP939yc6LY vf5MrNT0C57iJAuF4WK0sKPqN/LkJjLd+OFwBl4q6ct0znOl1enIwgAMMpjtcW42KwZk akHIdTONZZMpqhYRYvPxPSAs35+yiRlPk7vC5l7AruXRsVqbnPr7Q38Bn/58diSmkKcE Nin2xBaNqq4+Iy8Zamkhjgwv/y5rVlMj5HFEkmcBODw/rZHIF90Az/yNK0DyPcEJeCRn bDVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760661183; x=1761265983; 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=EknCUbF2LHWm0fNDNjp+CKNXYZwTUTGxAjt6VludIpM=; b=LYyfWjSRQ85HStIdQuZ9WkJxEyC/WUUCiPruq29nNZBRe+FIVGoLD5FOOYSJ+bDXFT rpdTy0QzQ+6hR5aIVCXtEpg1o5eWZg8G9c1FtGy2h2CAA9iU2nXbdn0JQCTh/O6lJARR gGQm/oclm0H4but0IaAcmcodJCbiuLqRX4Czg/mPfGmFBqJzQ0H0PoHS8X/xnVrKiz3M z6d8paiYvJ3k0tT6G2t75PNTxlihddSwE75Pr3ZbdB44Byv5vQH9v2+Zfd1skJibvsVv yh7ozvMewycHG+ydTBRFkZTBHtFSiZ9Qt+A1ibPTGeKe1u85CQO9M4L232jiB53RRFw5 4cSg== X-Forwarded-Encrypted: i=1; AJvYcCWsCa33sfs3vW6XBnPFn8C5i3uzVSMnn9gV1iqnhfN8mglQ9JvYufPwL4KFr0ZB516PPX629+xBQSQw@lists.linux.dev X-Gm-Message-State: AOJu0YyDUkiYHIVhy8RVTjWo0gmrMV4RRdEOVJSs7LygrsjkB7XHt5a9 YiK60+ubc08UI2plyL56NFwtuxAf3qL3p4eJgESyClrDbD1muCqwid8Ek2NaZNMBgtMQoORVMxQ i8eUwEw== X-Google-Smtp-Source: AGHT+IHp0VFuMyv8iYOF0K3G5i6Db3pbnaDLGLxvBIGhE/qWOYmJanCMeHz3uAv5TWFd0pF3pAUnMoqPNCg= X-Received: from pjuy20.prod.google.com ([2002:a17:90a:d714:b0:32f:3fab:c9e7]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90a:d44c:b0:336:9dcf:ed14 with SMTP id 98e67ed59e1d1-33bcf8e3b0emr1878293a91.23.1760661182616; Thu, 16 Oct 2025 17:33:02 -0700 (PDT) Reply-To: Sean Christopherson Date: Thu, 16 Oct 2025 17:32:26 -0700 In-Reply-To: <20251017003244.186495-1-seanjc@google.com> Precedence: bulk X-Mailing-List: linux-coco@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20251017003244.186495-1-seanjc@google.com> X-Mailer: git-send-email 2.51.0.858.gf9c4a03a3a-goog Message-ID: <20251017003244.186495-9-seanjc@google.com> Subject: [PATCH v3 08/25] KVM: TDX: Return -EIO, not -EINVAL, on a KVM_BUG_ON() condition From: Sean Christopherson To: Marc Zyngier , Oliver Upton , Tianrui Zhao , Bibo Mao , Huacai Chen , Madhavan Srinivasan , Anup Patel , Paul Walmsley , Palmer Dabbelt , Albert Ou , Christian Borntraeger , Janosch Frank , Claudio Imbrenda , Sean Christopherson , Paolo Bonzini , "Kirill A. Shutemov" Cc: linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, kvm@vger.kernel.org, loongarch@lists.linux.dev, linux-mips@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, kvm-riscv@lists.infradead.org, linux-riscv@lists.infradead.org, x86@kernel.org, linux-coco@lists.linux.dev, linux-kernel@vger.kernel.org, Ira Weiny , Kai Huang , Michael Roth , Yan Zhao , Vishal Annapurve , Rick Edgecombe , Ackerley Tng , Binbin Wu 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. Note, many (all?) of the affected paths never propagate the error code to userspace, i.e. this is about internal consistency more than anything else. Reviewed-by: Rick Edgecombe Reviewed-by: Ira Weiny Reviewed-by: Binbin Wu Signed-off-by: Sean Christopherson --- arch/x86/kvm/vmx/tdx.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/x86/kvm/vmx/tdx.c b/arch/x86/kvm/vmx/tdx.c index c3bae6b96dc4..c242d73b6a7b 100644 --- a/arch/x86/kvm/vmx/tdx.c +++ b/arch/x86/kvm/vmx/tdx.c @@ -1621,7 +1621,7 @@ static int tdx_mem_page_record_premap_cnt(struct kvm *kvm, gfn_t gfn, struct kvm_tdx *kvm_tdx = to_kvm_tdx(kvm); if (KVM_BUG_ON(kvm->arch.pre_fault_allowed, kvm)) - return -EINVAL; + return -EIO; /* nr_premapped will be decreased when tdh_mem_page_add() is called. */ atomic64_inc(&kvm_tdx->nr_premapped); @@ -1635,7 +1635,7 @@ static int tdx_sept_set_private_spte(struct kvm *kvm, gfn_t gfn, /* TODO: handle large pages. */ if (KVM_BUG_ON(level != PG_LEVEL_4K, kvm)) - return -EINVAL; + return -EIO; /* * Read 'pre_fault_allowed' before 'kvm_tdx->state'; see matching @@ -1658,10 +1658,10 @@ static int tdx_sept_drop_private_spte(struct kvm *kvm, gfn_t gfn, /* TODO: handle large pages. */ if (KVM_BUG_ON(level != PG_LEVEL_4K, kvm)) - return -EINVAL; + return -EIO; if (KVM_BUG_ON(!is_hkid_assigned(kvm_tdx), kvm)) - return -EINVAL; + return -EIO; /* * When zapping private page, write lock is held. So no race condition @@ -1846,7 +1846,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; /* * The HKID assigned to this TD was already freed and cache was @@ -1867,7 +1867,7 @@ static int tdx_sept_remove_private_spte(struct kvm *kvm, 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; ret = tdx_sept_zap_private_spte(kvm, gfn, level, page); if (ret <= 0) -- 2.51.0.858.gf9c4a03a3a-goog