Received-SPF: pass (google.com: domain of linux-kernel+bounces-16037-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
Date: Wed, 3 Jan 2024 13:54:16 -0800
In-Reply-To: <864b9717-46d2-4c1d-a84c-0784caf952f3@amd.com>
Precedence: bulk
Mime-Version: 1.0
References: <20240102232136.38778-1-Ashish.Kalra@amd.com> <ZZSqkm5WNEUuuA_h@google.com>
 <b82bb32b-3348-4c18-b07e-34f523ae93b5@amd.com> <ZZXNXNZkCW8e1G5i@google.com> <864b9717-46d2-4c1d-a84c-0784caf952f3@amd.com>
Message-ID: <ZZXXiFEEr7m2JitG@google.com>
Subject: Re: [PATCH] x86/sev: Add support for allowing zero SEV ASIDs.
From: Sean Christopherson <seanjc@google.com>
To: Ashish Kalra <ashish.kalra@amd.com>
Cc: pbonzini@redhat.com, tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, 
	dave.hansen@linux.intel.com, x86@kernel.org, hpa@zytor.com, 
	thomas.lendacky@amd.com, kvm@vger.kernel.org, linux-kernel@vger.kernel.org, 
	joro@8bytes.org
Content-Type: text/plain; charset="us-ascii"

On Wed, Jan 03, 2024, Ashish Kalra wrote:
> On 1/3/2024 3:10 PM, Sean Christopherson wrote:
> > > > diff --git a/arch/x86/kvm/svm/sev.c b/arch/x86/kvm/svm/sev.c
> > > > index d0c580607f00..bfac6d17462a 100644
> > > > --- a/arch/x86/kvm/svm/sev.c
> > > > +++ b/arch/x86/kvm/svm/sev.c
> > > > @@ -143,8 +143,20 @@ static void sev_misc_cg_uncharge(struct kvm_sev_info *sev)
> > > >    static int sev_asid_new(struct kvm_sev_info *sev)
> > > >    {
> > > > -       int asid, min_asid, max_asid, ret;
> > > > +       /*
> > > > +        * SEV-enabled guests must use asid from min_sev_asid to max_sev_asid.
> > > > +        * SEV-ES-enabled guest can use from 1 to min_sev_asid - 1.  Note, the
> > > > +        * min ASID can end up larger than the max if basic SEV support is
> > > > +        * effectively disabled by disallowing use of ASIDs for SEV guests.
> > > > +        */
> > > > +       unsigned int min_asid = sev->es_active ? 1 : min_sev_asid;
> > > > +       unsigned int max_asid = sev->es_active ? min_sev_asid - 1 : max_sev_asid;
> > > > +       unsigned int asid;
> > > >           bool retry = true;
> > > > +       int ret;
> > > > +
> > > > +       if (min_asid > max_asid)
> > > > +               return -ENOTTY;
> > > This will still return -EBUSY to user.
> > Huh?  The above is obviously -ENOTTY, and I don't see anything in the call stack
> > that will convert it to -EBUSY.
> 
> Actually, sev_asid_new() returning failure to sev_guest_init() will cause it
> to return -EBUSY to user.

Argh, I see it now.  That too should be fixed, e.g.

diff --git a/arch/x86/kvm/svm/sev.c b/arch/x86/kvm/svm/sev.c
index d0c580607f00..79eb11083ad5 100644
--- a/arch/x86/kvm/svm/sev.c
+++ b/arch/x86/kvm/svm/sev.c
@@ -246,21 +246,20 @@ static void sev_unbind_asid(struct kvm *kvm, unsigned int handle)
 static int sev_guest_init(struct kvm *kvm, struct kvm_sev_cmd *argp)
 {
        struct kvm_sev_info *sev = &to_kvm_svm(kvm)->sev_info;
-       int asid, ret;
+       int ret;
 
        if (kvm->created_vcpus)
                return -EINVAL;
 
-       ret = -EBUSY;
        if (unlikely(sev->active))
-               return ret;
+               return -EINVAL;
 
        sev->active = true;
        sev->es_active = argp->id == KVM_SEV_ES_INIT;
-       asid = sev_asid_new(sev);
-       if (asid < 0)
+       ret = sev_asid_new(sev);
+       if (ret < 0)
                goto e_no_asid;
-       sev->asid = asid;
+       sev->asid = ret;
 
        ret = sev_platform_init(&argp->error);
        if (ret)