From nobody Wed Apr 8 04:46:31 2026 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CE4823EB7F1 for ; Tue, 10 Mar 2026 20:24:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773174274; cv=none; b=Q/hxE8Yv7N8M8WLzLs3evr0WwzQD7Fkro1bb71/NOTb9obSNhmrs9NTX/eyGzIurrlSxAJXdcM6orVqZlE4XoCn+agiI6YRxpQuDLM9UxyBf6FzMgX4uSJXlY+xbLbqplwIyk4Q23itb8fe6dMOTkDPHhFlU/f1AXs0GzJefiJE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773174274; c=relaxed/simple; bh=nPf3/zpsXr0gYyMgLI8arjnB90SmOw4ukmzR/VbRl74=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HOJ4dg0sHfSxPmzeLwOzzq/An1ilVfsStoN8qj03pOJfp2r/ubhTQEjXd3rWR1nsDmZcwJ8xOH3mP3cK2IKLvWWSI+3tbnFB/oY/XX8brCZKCM1/a8VspChlTZPQMhKJItv9plmSBTvlYwVxCQuQycEgiZTah6iV4ZoeqIEokcY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=dGGuMc/5; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=nN4M5d3H; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="dGGuMc/5"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="nN4M5d3H" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1773174271; h=from:from:reply-to:subject:subject: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=A7UyBjZ3bFL2zCPRfYGX2fdYuZKgz++d8DEbJHushfs=; b=dGGuMc/5ocZ9TmfdALwEBduggRqjkoL2tMUu/bKifXaguWcSTDaDsGow8Y0EHQ92cBbs4G QmGbAmku1TNRrpD0FYUAupzYmIMQzN94vTpqBe8+6/bPVeb6JiYGOgv3DVZZnSJaBmb8TT OzngOJM+BhMxSEd/JuKL2HGucGT7JoA= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-607-IuLH7wf7NWidjcu-BEquwQ-1; Tue, 10 Mar 2026 16:24:30 -0400 X-MC-Unique: IuLH7wf7NWidjcu-BEquwQ-1 X-Mimecast-MFC-AGG-ID: IuLH7wf7NWidjcu-BEquwQ_1773174269 Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-4853040372fso36366525e9.1 for ; Tue, 10 Mar 2026 13:24:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1773174268; x=1773779068; darn=vger.kernel.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=A7UyBjZ3bFL2zCPRfYGX2fdYuZKgz++d8DEbJHushfs=; b=nN4M5d3HBZRrcnw5mc44dIUQQWAs9H4FHsmT1YLdWIzpq1Ku6NiJG6rLrXAvChVJhe KQfX53yF/XKVhPGKpaniP2eeU83UOBj+O4eXcR2Oao8Ig6tnEqTN2LIISWbCYzen/hpC 2YBelC0Ve6HFfDG+ff4mC2h/+yGGDFnNaNagePDexKeFjglIWHeZk/Y4hKUWe6bkYLMt hw+zBduVB44Jl922Hk2OfQ/hrslX6kpKkfGdCk5AzquhWRSbCcO7e5INxr1kRBDXGv4E scNarBMDBN2m3DVcmuv3lV5moVG5hydwssBv7ho9fl9t3EOKEUIC0yQZNMctEyCFXCjT TLeg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773174268; x=1773779068; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=A7UyBjZ3bFL2zCPRfYGX2fdYuZKgz++d8DEbJHushfs=; b=rwAqoslO5JbXCPtZr8CdrRpw4HQBHg5Sl9y1THduaHy3IbwXg53fDS+vn3qQb3KFKo fbNopJ+QJp/HjyP1otIT9cgGs65in9tloW/IpAQ8N+koWoEyJbi3Un5JhI0H06n6awMe Ic8Acjnfv5Mto6LAoHVAmN1jigFr8pLMW6SiS2mhenFE5f0H5FxON6IWhDMNNFuA7ppW Qp6YXa90lRhiZpxcvSftbIk8xA/GcgVDy60FgG0JWQGVlmGdqchE7T1pUe41CO8MCaTo 6k/qItCmCSPWExOIOh+WnPGcdThlQs2IemMe3NWnP/8IdUFCYRJ/rZN9k6jgsRaJ0O8f 758A== X-Gm-Message-State: AOJu0YwSVvIdx9Z6zSizfW04lUdLw5M0ynG9Guo5QEAqHiZp9uKg5nyr Mwuxi4PksfwM1xow38OJTb0i0ck3Svv7A8ZsCbFM9pRzTOzq1vlGBpsYVgztS8CVrF0fusZ3tRJ 6OBXVGAyLA/7hBXC7vAbitLSR1/zW4/U+P0+nmaJGSwRLss/Pts1UTObAxCR5MwWMhIVIcTPhvV Se+chrlMreFtA7blKF8bnebAE+hx0qJGxRIYdaMyadWcUnQOHJZg== X-Gm-Gg: ATEYQzxsDe5T5jyjy/ZkH1/mK3ccd4x3jN8FEaFPocrisEmcHrCtD4kJ3jm7SKubzTc MQI4/ujKFC4vkTylnPjXFaNI/SiAIMIYygS+hZuEgznjImFrJFwQ1Z6s6wptcOREGjvC69r/eVu yj/exAjukofdrMAL3se/FxAW9pT/aSlWzNvssMgJDkK85pTWNbPLxlWZNSj3UFv6Iszrp3RgYEP QI+l+xBityvhmCz4G6glnlLH3m0VUM0IElN+ebYJbtwNRAMOME3N1Dtn/CIF1nxTGUGapZXp78N v4PiDyVaVfiqHK9LqLGKodXKkkM6c37nJPq27TOCQBvvHdw56f5h+4ACJbuECspqmf9bZyW5UrK 52BqSGZtb0FA3zY+VFwu77hTx6AbHJjdHXeDTfJ4y3jfBx/MxIQwuqmJORweWA1PtUt473LEGM6 X9wPkOsZHAb1KeVubnVMES0pUqjZs= X-Received: by 2002:a05:600c:8012:b0:485:2fc5:3b0 with SMTP id 5b1f17b1804b1-4854b145662mr1316545e9.27.1773174267608; Tue, 10 Mar 2026 13:24:27 -0700 (PDT) X-Received: by 2002:a05:600c:8012:b0:485:2fc5:3b0 with SMTP id 5b1f17b1804b1-4854b145662mr1316145e9.27.1773174267166; Tue, 10 Mar 2026 13:24:27 -0700 (PDT) Received: from [192.168.10.48] ([151.95.144.138]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48541a9e549sm102081565e9.12.2026.03.10.13.24.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Mar 2026 13:24:26 -0700 (PDT) From: Paolo Bonzini To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: seanjc@google.com, xinyang@anthropic.com Subject: [PATCH 5/5] KVM: x86: clarify leave_smm() return value Date: Tue, 10 Mar 2026 21:24:14 +0100 Message-ID: <20260310202414.406078-6-pbonzini@redhat.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260310202414.406078-1-pbonzini@redhat.com> References: <20260310202414.406078-1-pbonzini@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The return value of vmx_leave_smm() is unrelated from that of nested_vmx_enter_non_root_mode(). Check explicitly for success (which happens to be 0) and return 1 just like everywhere else in vmx_leave_smm(). Likewise, in svm_leave_smm() return 0/1 instead of the 0/1/-errno returned by enter_svm_guest_mode(). Signed-off-by: Paolo Bonzini --- arch/x86/kvm/svm/svm.c | 6 +++--- arch/x86/kvm/vmx/vmx.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c index 95495048902c..82e1d5526979 100644 --- a/arch/x86/kvm/svm/svm.c +++ b/arch/x86/kvm/svm/svm.c @@ -4894,11 +4894,11 @@ static int svm_leave_smm(struct kvm_vcpu *vcpu, con= st union kvm_smram *smram) if (nested_svm_check_cached_vmcb12(vcpu) < 0) goto unmap_save; =20 - ret =3D enter_svm_guest_mode(vcpu, smram64->svm_guest_vmcb_gpa, vmcb12, f= alse); - - if (ret) + if (enter_svm_guest_mode(vcpu, smram64->svm_guest_vmcb_gpa, + vmcb12, false) !=3D 0) goto unmap_save; =20 + ret =3D 0; svm->nested.nested_run_pending =3D 1; =20 unmap_save: diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c index e9fa59e92548..21838900f14b 100644 --- a/arch/x86/kvm/vmx/vmx.c +++ b/arch/x86/kvm/vmx/vmx.c @@ -8545,8 +8545,8 @@ int vmx_leave_smm(struct kvm_vcpu *vcpu, const union = kvm_smram *smram) return 1; =20 ret =3D nested_vmx_enter_non_root_mode(vcpu, false); - if (ret) - return ret; + if (ret !=3D NVMX_VMENTRY_SUCCESS) + return 1; =20 vmx->nested.nested_run_pending =3D 1; vmx->nested.smm.guest_mode =3D false; --=20 2.53.0