From: Vipin Sharma <vipinsh@google.com>
To: Paolo Bonzini <pbonzini@redhat.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Tejun Heo <tj@kernel.org>, KVM <kvm@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Sean Christopherson <seanjc@google.com>,
David Rientjes <rientjes@google.com>
Subject: Re: linux-next: manual merge of the cgroup tree with the kvm tree
Date: Thu, 22 Apr 2021 10:30:12 -0700 [thread overview]
Message-ID: <CAHVum0e25jKjUPiQR5+QR4x9_4CzBWNzv3=95=PyZ75Y=JMYHw@mail.gmail.com> (raw)
In-Reply-To: <13e21724-bbe5-0fb0-82b6-35f87fe4c639@redhat.com>
On Thu, Apr 22, 2021 at 10:19 AM Paolo Bonzini <pbonzini@redhat.com> wrote:
>
> On 22/04/21 19:09, Vipin Sharma wrote:
> > On Thu, Apr 22, 2021 at 12:47 AM Paolo Bonzini <pbonzini@redhat.com> wrote:
> >> You can check the current state of the merge in the queue branch of the
> >> KVM tree. This is what I plan to merge if Tejun agrees. That would be
> >> helpful indeed!
> >
> > Merge looks fine from my patch perspective. However, one thing is missing:
> >
> > In sev_guest_init() after sev_asid_free() call we should also write
> > set sev->es_false = false.
> >
> > Without this the main intent of Sean's patch will be missing in the merge.
>
> So this:
>
> diff --git a/arch/x86/kvm/svm/sev.c b/arch/x86/kvm/svm/sev.c
> index 3539201278bd..2632852be856 100644
> --- a/arch/x86/kvm/svm/sev.c
> +++ b/arch/x86/kvm/svm/sev.c
> @@ -224,7 +224,7 @@ static int sev_guest_init(struct kvm *kvm, struct
> kvm_sev_cmd *argp)
> sev->es_active = es_active;
> asid = sev_asid_new(sev);
> if (asid < 0)
> - return ret;
> + goto e_no_asid;
> sev->asid = asid;
>
> ret = sev_platform_init(&argp->error);
> @@ -240,6 +240,8 @@ static int sev_guest_init(struct kvm *kvm, struct
> kvm_sev_cmd *argp)
> e_free:
> sev_asid_free(sev);
> sev->asid = 0;
> +e_no_asid:
> + sev->es_active = false;
> return ret;
> }
>
>
> Sounds good, I'll squash it and push to kvm.git.
>
> Paolo
Thanks. This looks good.
next prev parent reply other threads:[~2021-04-22 17:31 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-22 5:53 linux-next: manual merge of the cgroup tree with the kvm tree Stephen Rothwell
2021-04-22 6:34 ` Paolo Bonzini
2021-04-22 7:33 ` Vipin Sharma
2021-04-22 7:47 ` Paolo Bonzini
2021-04-22 17:09 ` Vipin Sharma
2021-04-22 17:18 ` Paolo Bonzini
2021-04-22 17:30 ` Vipin Sharma [this message]
2021-04-22 11:48 ` Tejun Heo
2021-04-22 11:56 ` Paolo Bonzini
2021-04-22 5:57 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAHVum0e25jKjUPiQR5+QR4x9_4CzBWNzv3=95=PyZ75Y=JMYHw@mail.gmail.com' \
--to=vipinsh@google.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=pbonzini@redhat.com \
--cc=rientjes@google.com \
--cc=seanjc@google.com \
--cc=sfr@canb.auug.org.au \
--cc=tj@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).