From: Ashish Kalra <ashish.kalra@amd.com>
To: Steve Rutherford <srutherford@google.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, "H. Peter Anvin" <hpa@zytor.com>,
Joerg Roedel <joro@8bytes.org>, Borislav Petkov <bp@suse.de>,
Tom Lendacky <thomas.lendacky@amd.com>, X86 ML <x86@kernel.org>,
KVM list <kvm@vger.kernel.org>,
LKML <linux-kernel@vger.kernel.org>,
David Rientjes <rientjes@google.com>,
Andy Lutomirski <luto@kernel.org>,
Brijesh Singh <brijesh.singh@amd.com>
Subject: Re: [PATCH v6 11/14] KVM: x86: Introduce KVM_SET_PAGE_ENC_BITMAP ioctl
Date: Wed, 8 Apr 2020 01:48:52 +0000 [thread overview]
Message-ID: <20200408014852.GA27608@ashkalra_ubuntu_server> (raw)
In-Reply-To: <CABayD+eOCpTGjvxwhtP85j98BKvCxtG8QDBYSC0E08GnaA12jw@mail.gmail.com>
Hello Steve,
On Tue, Apr 07, 2020 at 05:26:33PM -0700, Steve Rutherford wrote:
> On Sun, Mar 29, 2020 at 11:23 PM Ashish Kalra <Ashish.Kalra@amd.com> wrote:
> >
> > From: Brijesh Singh <Brijesh.Singh@amd.com>
> >
> > The ioctl can be used to set page encryption bitmap for an
> > incoming guest.
> >
> > Cc: Thomas Gleixner <tglx@linutronix.de>
> > Cc: Ingo Molnar <mingo@redhat.com>
> > Cc: "H. Peter Anvin" <hpa@zytor.com>
> > Cc: Paolo Bonzini <pbonzini@redhat.com>
> > Cc: "Radim Krčmář" <rkrcmar@redhat.com>
> > Cc: Joerg Roedel <joro@8bytes.org>
> > Cc: Borislav Petkov <bp@suse.de>
> > Cc: Tom Lendacky <thomas.lendacky@amd.com>
> > Cc: x86@kernel.org
> > Cc: kvm@vger.kernel.org
> > Cc: linux-kernel@vger.kernel.org
> > Signed-off-by: Brijesh Singh <brijesh.singh@amd.com>
> > Signed-off-by: Ashish Kalra <ashish.kalra@amd.com>
> > ---
> > Documentation/virt/kvm/api.rst | 22 +++++++++++++++++
> > arch/x86/include/asm/kvm_host.h | 2 ++
> > arch/x86/kvm/svm.c | 42 +++++++++++++++++++++++++++++++++
> > arch/x86/kvm/x86.c | 12 ++++++++++
> > include/uapi/linux/kvm.h | 1 +
> > 5 files changed, 79 insertions(+)
> >
> > diff --git a/Documentation/virt/kvm/api.rst b/Documentation/virt/kvm/api.rst
> > index 8ad800ebb54f..4d1004a154f6 100644
> > --- a/Documentation/virt/kvm/api.rst
> > +++ b/Documentation/virt/kvm/api.rst
> > @@ -4675,6 +4675,28 @@ or shared. The bitmap can be used during the guest migration, if the page
> > is private then userspace need to use SEV migration commands to transmit
> > the page.
> >
> > +4.126 KVM_SET_PAGE_ENC_BITMAP (vm ioctl)
> > +---------------------------------------
> > +
> > +:Capability: basic
> > +:Architectures: x86
> > +:Type: vm ioctl
> > +:Parameters: struct kvm_page_enc_bitmap (in/out)
> > +:Returns: 0 on success, -1 on error
> > +
> > +/* for KVM_SET_PAGE_ENC_BITMAP */
> > +struct kvm_page_enc_bitmap {
> > + __u64 start_gfn;
> > + __u64 num_pages;
> > + union {
> > + void __user *enc_bitmap; /* one bit per page */
> > + __u64 padding2;
> > + };
> > +};
> > +
> > +During the guest live migration the outgoing guest exports its page encryption
> > +bitmap, the KVM_SET_PAGE_ENC_BITMAP can be used to build the page encryption
> > +bitmap for an incoming guest.
> >
> > 5. The kvm_run structure
> > ========================
> > diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
> > index 27e43e3ec9d8..d30f770aaaea 100644
> > --- a/arch/x86/include/asm/kvm_host.h
> > +++ b/arch/x86/include/asm/kvm_host.h
> > @@ -1271,6 +1271,8 @@ struct kvm_x86_ops {
> > unsigned long sz, unsigned long mode);
> > int (*get_page_enc_bitmap)(struct kvm *kvm,
> > struct kvm_page_enc_bitmap *bmap);
> > + int (*set_page_enc_bitmap)(struct kvm *kvm,
> > + struct kvm_page_enc_bitmap *bmap);
> > };
> >
> > struct kvm_arch_async_pf {
> > diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
> > index bae783cd396a..313343a43045 100644
> > --- a/arch/x86/kvm/svm.c
> > +++ b/arch/x86/kvm/svm.c
> > @@ -7756,6 +7756,47 @@ static int svm_get_page_enc_bitmap(struct kvm *kvm,
> > return ret;
> > }
> >
> > +static int svm_set_page_enc_bitmap(struct kvm *kvm,
> > + struct kvm_page_enc_bitmap *bmap)
> > +{
> > + struct kvm_sev_info *sev = &to_kvm_svm(kvm)->sev_info;
> > + unsigned long gfn_start, gfn_end;
> > + unsigned long *bitmap;
> > + unsigned long sz, i;
> > + int ret;
> > +
> > + if (!sev_guest(kvm))
> > + return -ENOTTY;
> > +
> > + gfn_start = bmap->start_gfn;
> > + gfn_end = gfn_start + bmap->num_pages;
> > +
> > + sz = ALIGN(bmap->num_pages, BITS_PER_LONG) / 8;
> > + bitmap = kmalloc(sz, GFP_KERNEL);
> > + if (!bitmap)
> > + return -ENOMEM;
> > +
> > + ret = -EFAULT;
> > + if (copy_from_user(bitmap, bmap->enc_bitmap, sz))
> > + goto out;
> > +
> > + mutex_lock(&kvm->lock);
> > + ret = sev_resize_page_enc_bitmap(kvm, gfn_end);
> I realize now that usermode could use this for initializing the
> minimum size of the enc bitmap, which probably solves my issue from
> the other thread.
> > + if (ret)
> > + goto unlock;
> > +
> > + i = gfn_start;
> > + for_each_clear_bit_from(i, bitmap, (gfn_end - gfn_start))
> > + clear_bit(i + gfn_start, sev->page_enc_bmap);
> This API seems a bit strange, since it can only clear bits. I would
> expect "set" to force the values to match the values passed down,
> instead of only ensuring that cleared bits in the input are also
> cleared in the kernel.
>
The sev_resize_page_enc_bitmap() will allocate a new bitmap and
set it to all 0xFF's, therefore, the code here simply clears the bits
in the bitmap as per the cleared bits in the input.
Thanks,
Ashish
> This should copy the values from userspace (and fix up the ends since
> byte alignment makes that complicated), instead of iterating in this
> way.
> > +
> > + ret = 0;
> > +unlock:
> > + mutex_unlock(&kvm->lock);
> > +out:
> > + kfree(bitmap);
> > + return ret;
> > +}
> > +
> > static int svm_mem_enc_op(struct kvm *kvm, void __user *argp)
> > {
> > struct kvm_sev_cmd sev_cmd;
> > @@ -8161,6 +8202,7 @@ static struct kvm_x86_ops svm_x86_ops __ro_after_init = {
> >
> > .page_enc_status_hc = svm_page_enc_status_hc,
> > .get_page_enc_bitmap = svm_get_page_enc_bitmap,
> > + .set_page_enc_bitmap = svm_set_page_enc_bitmap,
> > };
> >
> > static int __init svm_init(void)
> > diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
> > index 3c3fea4e20b5..05e953b2ec61 100644
> > --- a/arch/x86/kvm/x86.c
> > +++ b/arch/x86/kvm/x86.c
> > @@ -5238,6 +5238,18 @@ long kvm_arch_vm_ioctl(struct file *filp,
> > r = kvm_x86_ops->get_page_enc_bitmap(kvm, &bitmap);
> > break;
> > }
> > + case KVM_SET_PAGE_ENC_BITMAP: {
> > + struct kvm_page_enc_bitmap bitmap;
> > +
> > + r = -EFAULT;
> > + if (copy_from_user(&bitmap, argp, sizeof(bitmap)))
> > + goto out;
> > +
> > + r = -ENOTTY;
> > + if (kvm_x86_ops->set_page_enc_bitmap)
> > + r = kvm_x86_ops->set_page_enc_bitmap(kvm, &bitmap);
> > + break;
> > + }
> > default:
> > r = -ENOTTY;
> > }
> > diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h
> > index db1ebf85e177..b4b01d47e568 100644
> > --- a/include/uapi/linux/kvm.h
> > +++ b/include/uapi/linux/kvm.h
> > @@ -1489,6 +1489,7 @@ struct kvm_enc_region {
> > #define KVM_S390_CLEAR_RESET _IO(KVMIO, 0xc4)
> >
> > #define KVM_GET_PAGE_ENC_BITMAP _IOW(KVMIO, 0xc5, struct kvm_page_enc_bitmap)
> > +#define KVM_SET_PAGE_ENC_BITMAP _IOW(KVMIO, 0xc6, struct kvm_page_enc_bitmap)
> >
> > /* Secure Encrypted Virtualization command */
> > enum sev_cmd_id {
> > --
> > 2.17.1
> >
next prev parent reply other threads:[~2020-04-08 1:49 UTC|newest]
Thread overview: 107+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-30 6:19 [PATCH v6 00/14] Add AMD SEV guest live migration support Ashish Kalra
2020-03-30 6:19 ` [PATCH v6 01/14] KVM: SVM: Add KVM_SEV SEND_START command Ashish Kalra
2020-04-02 6:27 ` Venu Busireddy
2020-04-02 12:59 ` Brijesh Singh
2020-04-02 16:37 ` Venu Busireddy
2020-04-02 18:04 ` Brijesh Singh
2020-04-02 18:57 ` Venu Busireddy
2020-04-02 19:17 ` Brijesh Singh
2020-04-02 19:43 ` Venu Busireddy
2020-04-02 20:04 ` Brijesh Singh
2020-04-02 20:19 ` Venu Busireddy
2020-04-02 17:51 ` Krish Sadhukhan
2020-04-02 18:38 ` Brijesh Singh
2020-03-30 6:20 ` [PATCH v6 02/14] KVM: SVM: Add KVM_SEND_UPDATE_DATA command Ashish Kalra
2020-04-02 17:55 ` Venu Busireddy
2020-04-02 20:13 ` Krish Sadhukhan
2020-03-30 6:20 ` [PATCH v6 03/14] KVM: SVM: Add KVM_SEV_SEND_FINISH command Ashish Kalra
2020-04-02 18:17 ` Venu Busireddy
2020-04-02 20:15 ` Krish Sadhukhan
2020-03-30 6:21 ` [PATCH v6 04/14] KVM: SVM: Add support for KVM_SEV_RECEIVE_START command Ashish Kalra
2020-04-02 21:35 ` Venu Busireddy
2020-04-02 22:09 ` Krish Sadhukhan
2020-03-30 6:21 ` [PATCH v6 05/14] KVM: SVM: Add KVM_SEV_RECEIVE_UPDATE_DATA command Ashish Kalra
2020-04-02 22:25 ` Krish Sadhukhan
2020-04-02 22:29 ` Venu Busireddy
2020-04-07 0:49 ` Steve Rutherford
2020-03-30 6:21 ` [PATCH v6 06/14] KVM: SVM: Add KVM_SEV_RECEIVE_FINISH command Ashish Kalra
2020-04-02 22:24 ` Venu Busireddy
2020-04-02 22:27 ` Krish Sadhukhan
2020-04-07 0:57 ` Steve Rutherford
2020-03-30 6:21 ` [PATCH v6 07/14] KVM: x86: Add AMD SEV specific Hypercall3 Ashish Kalra
2020-04-02 22:36 ` Venu Busireddy
2020-04-02 23:54 ` Krish Sadhukhan
2020-04-07 1:22 ` Steve Rutherford
2020-03-30 6:22 ` [PATCH v6 08/14] KVM: X86: Introduce KVM_HC_PAGE_ENC_STATUS hypercall Ashish Kalra
2020-04-03 0:00 ` Venu Busireddy
2020-04-03 1:31 ` Krish Sadhukhan
2020-04-03 1:57 ` Ashish Kalra
2020-04-03 2:58 ` Ashish Kalra
2020-04-06 22:27 ` Krish Sadhukhan
2020-04-07 2:17 ` Steve Rutherford
2020-04-07 5:27 ` Ashish Kalra
2020-04-08 0:01 ` Steve Rutherford
2020-04-08 0:29 ` Brijesh Singh
2020-04-08 0:35 ` Steve Rutherford
2020-04-08 1:17 ` Ashish Kalra
2020-04-08 1:38 ` Steve Rutherford
2020-04-08 2:34 ` Brijesh Singh
2020-04-08 3:18 ` Ashish Kalra
2020-04-09 16:18 ` Ashish Kalra
2020-04-09 20:41 ` Steve Rutherford
2020-03-30 6:22 ` [PATCH v6 09/14] KVM: x86: Introduce KVM_GET_PAGE_ENC_BITMAP ioctl Ashish Kalra
2020-04-03 18:30 ` Venu Busireddy
2020-04-03 20:18 ` Krish Sadhukhan
2020-04-03 20:47 ` Ashish Kalra
2020-04-06 22:07 ` Krish Sadhukhan
2020-04-03 20:55 ` Venu Busireddy
2020-04-03 21:01 ` Ashish Kalra
2020-03-30 6:22 ` [PATCH v6 10/14] mm: x86: Invoke hypercall when page encryption status is changed Ashish Kalra
2020-04-03 21:07 ` Krish Sadhukhan
2020-04-03 21:30 ` Ashish Kalra
2020-04-03 21:36 ` Venu Busireddy
2020-03-30 6:22 ` [PATCH v6 11/14] KVM: x86: Introduce KVM_SET_PAGE_ENC_BITMAP ioctl Ashish Kalra
2020-04-03 21:10 ` Krish Sadhukhan
2020-04-03 21:46 ` Venu Busireddy
2020-04-08 0:26 ` Steve Rutherford
2020-04-08 1:48 ` Ashish Kalra [this message]
2020-04-10 0:06 ` Steve Rutherford
2020-04-10 1:23 ` Ashish Kalra
2020-04-10 18:08 ` Steve Rutherford
2020-03-30 6:23 ` [PATCH v6 12/14] KVM: x86: Introduce KVM_PAGE_ENC_BITMAP_RESET ioctl Ashish Kalra
2020-04-03 21:14 ` Krish Sadhukhan
2020-04-03 21:45 ` Ashish Kalra
2020-04-06 18:52 ` Krish Sadhukhan
2020-04-08 1:25 ` Steve Rutherford
2020-04-08 1:52 ` Ashish Kalra
2020-04-10 0:59 ` Steve Rutherford
2020-04-10 1:34 ` Ashish Kalra
2020-04-10 18:14 ` Steve Rutherford
2020-04-10 20:16 ` Steve Rutherford
2020-04-10 20:18 ` Steve Rutherford
2020-04-10 20:55 ` Kalra, Ashish
2020-04-10 21:42 ` Brijesh Singh
2020-04-10 21:46 ` Sean Christopherson
2020-04-10 21:58 ` Brijesh Singh
2020-04-10 22:02 ` Brijesh Singh
2020-04-11 0:35 ` Ashish Kalra
2020-04-03 22:01 ` Venu Busireddy
2020-03-30 6:23 ` [PATCH v6 13/14] KVM: x86: Introduce new KVM_FEATURE_SEV_LIVE_MIGRATION feature & Custom MSR Ashish Kalra
2020-03-30 15:52 ` Brijesh Singh
2020-03-30 16:42 ` Ashish Kalra
[not found] ` <20200330162730.GA21567@ashkalra_ubuntu_server>
[not found] ` <1de5e95f-4485-f2ff-aba8-aa8b15564796@amd.com>
[not found] ` <20200331171336.GA24050@ashkalra_ubuntu_server>
[not found] ` <20200401070931.GA8562@ashkalra_ubuntu_server>
2020-04-02 23:29 ` Ashish Kalra
2020-04-03 23:46 ` Krish Sadhukhan
2020-03-30 6:23 ` [PATCH v6 14/14] KVM: x86: Add kexec support for SEV Live Migration Ashish Kalra
2020-03-30 16:00 ` Brijesh Singh
2020-03-30 16:45 ` Ashish Kalra
2020-03-31 14:26 ` Brijesh Singh
2020-04-02 23:34 ` Ashish Kalra
2020-04-03 12:57 ` Dave Young
2020-04-04 0:55 ` Krish Sadhukhan
2020-04-04 21:57 ` Ashish Kalra
2020-04-06 18:37 ` Krish Sadhukhan
2020-03-30 17:24 ` [PATCH v6 00/14] Add AMD SEV guest live migration support Venu Busireddy
2020-03-30 18:28 ` Ashish Kalra
2020-03-30 19:13 ` Venu Busireddy
2020-03-30 21:52 ` Ashish Kalra
2020-03-31 14:42 ` Venu Busireddy
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=20200408014852.GA27608@ashkalra_ubuntu_server \
--to=ashish.kalra@amd.com \
--cc=bp@suse.de \
--cc=brijesh.singh@amd.com \
--cc=hpa@zytor.com \
--cc=joro@8bytes.org \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=luto@kernel.org \
--cc=mingo@redhat.com \
--cc=pbonzini@redhat.com \
--cc=rientjes@google.com \
--cc=srutherford@google.com \
--cc=tglx@linutronix.de \
--cc=thomas.lendacky@amd.com \
--cc=x86@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).