From: Joao Martins <joao.m.martins@oracle.com> To: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, xen-devel@lists.xenproject.org Cc: "Ankur Arora" <ankur.a.arora@oracle.com>, "Boris Ostrovsky" <boris.ostrovsky@oracle.com>, "Joao Martins" <joao.m.martins@oracle.com>, "Paolo Bonzini" <pbonzini@redhat.com>, "Radim Krčmář" <rkrcmar@redhat.com>, "Juergen Gross" <jgross@suse.com>, "Stefano Stabellini" <sstabellini@kernel.org> Subject: [PATCH RFC 33/39] xen/grant-table: xen_shim_domain() support Date: Wed, 20 Feb 2019 20:16:03 +0000 [thread overview] Message-ID: <20190220201609.28290-34-joao.m.martins@oracle.com> (raw) In-Reply-To: <20190220201609.28290-1-joao.m.martins@oracle.com> With xen-shim, allocate_xenballooned_pages() only allocates a place-holder page (pfn 0) expecting a subsequent map_grant_ref to fix it up. However, this means that, until the grant operation (GNTTABOP_map_grant_ref) provides a valid page, we cannot set PagePrivate or save any state. This patch elides the setting of that state if xen_shim_domain(). In addition, gnttab_map_refs() now fills in the appropriate page returned from the grant operation. Signed-off-by: Joao Martins <joao.m.martins@oracle.com> --- drivers/xen/grant-table.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/drivers/xen/grant-table.c b/drivers/xen/grant-table.c index 7ea6fb6a2e5d..ab05b70d98bb 100644 --- a/drivers/xen/grant-table.c +++ b/drivers/xen/grant-table.c @@ -804,7 +804,7 @@ int gnttab_alloc_pages(int nr_pages, struct page **pages) int ret; ret = alloc_xenballooned_pages(nr_pages, pages); - if (ret < 0) + if (ret < 0 || xen_shim_domain()) return ret; ret = gnttab_pages_set_private(nr_pages, pages); @@ -1045,6 +1045,11 @@ int gnttab_map_refs(struct gnttab_map_grant_ref *map_ops, { struct xen_page_foreign *foreign; + if (xen_shim_domain()) { + pages[i] = virt_to_page(map_ops[i].host_addr); + continue; + } + SetPageForeign(pages[i]); foreign = xen_page_foreign(pages[i]); foreign->domid = map_ops[i].dom; @@ -1085,8 +1090,10 @@ int gnttab_unmap_refs(struct gnttab_unmap_grant_ref *unmap_ops, if (ret) return ret; - for (i = 0; i < count; i++) - ClearPageForeign(pages[i]); + for (i = 0; i < count; i++) { + if (!xen_shim_domain()) + ClearPageForeign(pages[i]); + } return clear_foreign_p2m_mapping(unmap_ops, kunmap_ops, pages, count); } @@ -1113,7 +1120,7 @@ static void __gnttab_unmap_refs_async(struct gntab_unmap_queue_data* item) int pc; for (pc = 0; pc < item->count; pc++) { - if (page_count(item->pages[pc]) > 1) { + if (page_count(item->pages[pc]) > 1 && !xen_shim_domain()) { unsigned long delay = GNTTAB_UNMAP_REFS_DELAY * (item->age + 1); schedule_delayed_work(&item->gnttab_work, msecs_to_jiffies(delay)); -- 2.11.0
WARNING: multiple messages have this Message-ID (diff)
From: Joao Martins <joao.m.martins@oracle.com> To: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, xen-devel@lists.xenproject.org Cc: "Juergen Gross" <jgross@suse.com>, "Stefano Stabellini" <sstabellini@kernel.org>, "Radim Krčmář" <rkrcmar@redhat.com>, "Ankur Arora" <ankur.a.arora@oracle.com>, "Paolo Bonzini" <pbonzini@redhat.com>, "Boris Ostrovsky" <boris.ostrovsky@oracle.com>, "Joao Martins" <joao.m.martins@oracle.com> Subject: [PATCH RFC 33/39] xen/grant-table: xen_shim_domain() support Date: Wed, 20 Feb 2019 20:16:03 +0000 [thread overview] Message-ID: <20190220201609.28290-34-joao.m.martins@oracle.com> (raw) In-Reply-To: <20190220201609.28290-1-joao.m.martins@oracle.com> With xen-shim, allocate_xenballooned_pages() only allocates a place-holder page (pfn 0) expecting a subsequent map_grant_ref to fix it up. However, this means that, until the grant operation (GNTTABOP_map_grant_ref) provides a valid page, we cannot set PagePrivate or save any state. This patch elides the setting of that state if xen_shim_domain(). In addition, gnttab_map_refs() now fills in the appropriate page returned from the grant operation. Signed-off-by: Joao Martins <joao.m.martins@oracle.com> --- drivers/xen/grant-table.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/drivers/xen/grant-table.c b/drivers/xen/grant-table.c index 7ea6fb6a2e5d..ab05b70d98bb 100644 --- a/drivers/xen/grant-table.c +++ b/drivers/xen/grant-table.c @@ -804,7 +804,7 @@ int gnttab_alloc_pages(int nr_pages, struct page **pages) int ret; ret = alloc_xenballooned_pages(nr_pages, pages); - if (ret < 0) + if (ret < 0 || xen_shim_domain()) return ret; ret = gnttab_pages_set_private(nr_pages, pages); @@ -1045,6 +1045,11 @@ int gnttab_map_refs(struct gnttab_map_grant_ref *map_ops, { struct xen_page_foreign *foreign; + if (xen_shim_domain()) { + pages[i] = virt_to_page(map_ops[i].host_addr); + continue; + } + SetPageForeign(pages[i]); foreign = xen_page_foreign(pages[i]); foreign->domid = map_ops[i].dom; @@ -1085,8 +1090,10 @@ int gnttab_unmap_refs(struct gnttab_unmap_grant_ref *unmap_ops, if (ret) return ret; - for (i = 0; i < count; i++) - ClearPageForeign(pages[i]); + for (i = 0; i < count; i++) { + if (!xen_shim_domain()) + ClearPageForeign(pages[i]); + } return clear_foreign_p2m_mapping(unmap_ops, kunmap_ops, pages, count); } @@ -1113,7 +1120,7 @@ static void __gnttab_unmap_refs_async(struct gntab_unmap_queue_data* item) int pc; for (pc = 0; pc < item->count; pc++) { - if (page_count(item->pages[pc]) > 1) { + if (page_count(item->pages[pc]) > 1 && !xen_shim_domain()) { unsigned long delay = GNTTAB_UNMAP_REFS_DELAY * (item->age + 1); schedule_delayed_work(&item->gnttab_work, msecs_to_jiffies(delay)); -- 2.11.0 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel
next prev parent reply other threads:[~2019-02-20 20:20 UTC|newest] Thread overview: 169+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-02-20 20:15 [PATCH RFC 00/39] x86/KVM: Xen HVM guest support Joao Martins 2019-02-20 20:15 ` [PATCH RFC 01/39] KVM: x86: fix Xen hypercall page msr handling Joao Martins 2019-02-22 1:30 ` Sean Christopherson 2019-02-22 11:47 ` Joao Martins 2019-02-22 12:51 ` Paolo Bonzini 2020-11-30 10:39 ` David Woodhouse 2020-11-30 11:03 ` Paolo Bonzini 2020-11-30 11:27 ` David Woodhouse 2019-02-20 20:15 ` [PATCH RFC 02/39] KVM: x86/xen: intercept xen hypercalls if enabled Joao Martins 2019-02-21 18:29 ` Sean Christopherson 2019-02-21 20:56 ` Joao Martins 2019-02-22 0:30 ` Sean Christopherson 2019-02-22 12:50 ` Paolo Bonzini 2020-12-01 9:48 ` David Woodhouse 2020-12-01 11:19 ` David Woodhouse 2020-12-02 11:17 ` Joao Martins 2020-12-02 12:12 ` David Woodhouse 2020-12-02 5:19 ` Ankur Arora 2020-12-02 8:03 ` David Woodhouse 2020-12-02 18:20 ` Ankur Arora 2019-02-20 20:15 ` [PATCH RFC 03/39] KVM: x86/xen: register shared_info page Joao Martins 2020-12-01 13:07 ` David Woodhouse 2020-12-02 0:40 ` Ankur Arora 2020-12-02 1:26 ` David Woodhouse 2020-12-02 5:17 ` Ankur Arora 2020-12-02 10:50 ` Joao Martins 2020-12-02 10:44 ` Joao Martins 2020-12-02 12:20 ` David Woodhouse 2020-12-02 20:32 ` Ankur Arora 2020-12-03 10:16 ` David Woodhouse 2020-12-04 17:30 ` Sean Christopherson 2020-12-02 20:33 ` Ankur Arora 2020-12-12 12:07 ` David Woodhouse 2019-02-20 20:15 ` [PATCH RFC 04/39] KVM: x86/xen: setup pvclock updates Joao Martins 2019-02-20 20:15 ` [PATCH RFC 05/39] KVM: x86/xen: update wallclock region Joao Martins 2019-02-20 20:15 ` [PATCH RFC 06/39] KVM: x86/xen: register vcpu info Joao Martins 2019-02-20 20:15 ` [PATCH RFC 07/39] KVM: x86/xen: register vcpu time info region Joao Martins 2019-02-20 20:15 ` [PATCH RFC 08/39] KVM: x86/xen: register steal clock Joao Martins 2019-02-20 20:15 ` [PATCH RFC 09/39] KVM: x86: declare Xen HVM guest capability Joao Martins 2019-02-20 20:15 ` [PATCH RFC 10/39] KVM: x86/xen: support upcall vector Joao Martins 2020-12-02 11:17 ` David Woodhouse 2020-12-02 13:12 ` Joao Martins 2020-12-02 16:47 ` David Woodhouse 2020-12-02 18:34 ` Joao Martins 2020-12-02 19:02 ` David Woodhouse 2020-12-02 20:12 ` Joao Martins 2020-12-02 20:37 ` David Woodhouse 2020-12-03 1:08 ` Ankur Arora 2020-12-08 16:08 ` David Woodhouse 2020-12-09 6:35 ` Ankur Arora 2020-12-09 10:27 ` David Woodhouse 2020-12-09 10:51 ` Joao Martins 2020-12-09 11:39 ` David Woodhouse 2020-12-09 13:26 ` Joao Martins 2020-12-09 15:41 ` David Woodhouse 2020-12-09 16:12 ` Joao Martins 2021-01-01 14:33 ` David Woodhouse 2021-01-05 12:11 ` Joao Martins 2021-01-05 13:23 ` David Woodhouse 2019-02-20 20:15 ` [PATCH RFC 11/39] KVM: x86/xen: evtchn signaling via eventfd Joao Martins 2020-11-30 9:41 ` David Woodhouse 2020-11-30 12:17 ` Joao Martins 2020-11-30 12:55 ` David Woodhouse 2020-11-30 15:08 ` Joao Martins 2020-11-30 16:48 ` David Woodhouse 2020-11-30 17:15 ` Joao Martins 2020-11-30 18:01 ` David Woodhouse 2020-11-30 18:41 ` Joao Martins 2020-11-30 19:04 ` David Woodhouse 2020-11-30 19:25 ` Joao Martins 2021-11-23 13:15 ` David Woodhouse 2019-02-20 20:15 ` [PATCH RFC 12/39] KVM: x86/xen: store virq when assigning evtchn Joao Martins [not found] ` <b750291466f3c89e0a393e48079c087704b217a5.camel@amazon.co.uk> 2022-02-10 12:17 ` Joao Martins 2022-02-10 15:23 ` [EXTERNAL] " David Woodhouse 2019-02-20 20:15 ` [PATCH RFC 13/39] KVM: x86/xen: handle PV timers oneshot mode Joao Martins 2019-02-20 20:15 ` [PATCH RFC 14/39] KVM: x86/xen: handle PV IPI vcpu yield Joao Martins 2019-02-20 20:15 ` [PATCH RFC 15/39] KVM: x86/xen: handle PV spinlocks slowpath Joao Martins 2022-02-08 12:36 ` David Woodhouse 2022-02-10 12:17 ` Joao Martins 2022-02-10 14:11 ` David Woodhouse 2019-02-20 20:15 ` [PATCH RFC 16/39] KVM: x86: declare Xen HVM evtchn offload capability Joao Martins 2019-02-20 20:15 ` [PATCH RFC 17/39] x86/xen: export vcpu_info and shared_info Joao Martins 2019-02-20 20:15 ` Joao Martins 2019-02-20 20:15 ` [PATCH RFC 18/39] x86/xen: make hypercall_page generic Joao Martins 2019-02-20 20:15 ` Joao Martins 2019-02-20 20:15 ` [PATCH RFC 19/39] xen/xenbus: xenbus uninit support Joao Martins 2019-02-20 20:15 ` Joao Martins 2019-02-20 20:15 ` [PATCH RFC 20/39] xen-blkback: module_exit support Joao Martins 2019-02-25 18:57 ` Konrad Rzeszutek Wilk 2019-02-25 18:57 ` Konrad Rzeszutek Wilk 2019-02-26 11:20 ` Joao Martins 2019-02-26 11:20 ` Joao Martins 2019-02-20 20:15 ` Joao Martins 2019-02-20 20:15 ` [PATCH RFC 21/39] KVM: x86/xen: domid allocation Joao Martins 2019-02-20 20:15 ` [PATCH RFC 22/39] KVM: x86/xen: grant table init Joao Martins 2019-02-20 20:15 ` [PATCH RFC 23/39] KVM: x86/xen: grant table grow support Joao Martins 2019-02-20 20:15 ` [PATCH RFC 24/39] KVM: x86/xen: backend hypercall support Joao Martins 2019-02-20 20:15 ` [PATCH RFC 25/39] KVM: x86/xen: grant map support Joao Martins 2019-02-20 20:15 ` [PATCH RFC 26/39] KVM: x86/xen: grant unmap support Joao Martins 2019-02-20 20:15 ` [PATCH RFC 27/39] KVM: x86/xen: grant copy support Joao Martins 2019-02-20 20:15 ` [PATCH RFC 28/39] KVM: x86/xen: interdomain evtchn support Joao Martins 2019-02-20 20:15 ` [PATCH RFC 29/39] KVM: x86/xen: evtchn unmask support Joao Martins 2019-02-20 20:16 ` [PATCH RFC 30/39] KVM: x86/xen: add additional evtchn ops Joao Martins 2019-02-20 20:16 ` [PATCH RFC 31/39] xen-shim: introduce shim domain driver Joao Martins 2019-02-20 20:16 ` Joao Martins 2019-02-20 20:16 ` [PATCH RFC 32/39] xen/balloon: xen_shim_domain() support Joao Martins 2019-02-20 20:16 ` Joao Martins 2019-02-20 20:16 ` Joao Martins [this message] 2019-02-20 20:16 ` [PATCH RFC 33/39] xen/grant-table: " Joao Martins 2019-02-20 20:16 ` [PATCH RFC 34/39] xen/gntdev: " Joao Martins 2019-02-20 20:16 ` Joao Martins 2019-02-20 20:16 ` [PATCH RFC 35/39] xen/xenbus: " Joao Martins 2019-02-20 20:16 ` Joao Martins 2019-02-20 20:16 ` [PATCH RFC 36/39] drivers/xen: " Joao Martins 2019-02-20 20:16 ` Joao Martins 2019-02-20 20:16 ` [PATCH RFC 37/39] xen-netback: " Joao Martins 2019-02-20 20:16 ` [PATCH RFC 38/39] xen-blkback: " Joao Martins 2019-02-20 20:16 ` Joao Martins 2019-02-20 20:16 ` [PATCH RFC 39/39] KVM: x86: declare Xen HVM Dom0 capability Joao Martins 2019-02-20 21:09 ` [PATCH RFC 00/39] x86/KVM: Xen HVM guest support Paolo Bonzini 2019-02-21 0:29 ` Ankur Arora 2019-02-21 0:29 ` Ankur Arora 2019-02-21 11:45 ` Joao Martins 2019-02-21 11:45 ` Joao Martins 2019-02-22 16:59 ` Paolo Bonzini 2019-03-12 17:14 ` Joao Martins 2019-03-12 17:14 ` Joao Martins 2019-04-08 6:44 ` Juergen Gross 2019-04-08 6:44 ` Juergen Gross 2019-04-08 6:44 ` [Xen-devel] " Juergen Gross 2019-04-08 10:36 ` Joao Martins 2019-04-08 10:36 ` [Xen-devel] " Joao Martins 2019-04-08 10:42 ` Juergen Gross 2019-04-08 10:42 ` [Xen-devel] " Juergen Gross 2019-04-08 17:31 ` Joao Martins 2019-04-08 17:31 ` [Xen-devel] " Joao Martins 2019-04-09 0:35 ` Stefano Stabellini 2019-04-09 0:35 ` Stefano Stabellini 2019-04-09 0:35 ` [Xen-devel] " Stefano Stabellini 2019-04-10 5:50 ` Ankur Arora 2019-04-10 5:50 ` [Xen-devel] " Ankur Arora 2019-04-10 5:50 ` Ankur Arora 2019-04-10 20:45 ` Stefano Stabellini 2019-04-10 20:45 ` [Xen-devel] " Stefano Stabellini 2019-04-10 20:45 ` Stefano Stabellini 2019-04-09 5:04 ` Juergen Gross 2019-04-09 5:04 ` [Xen-devel] " Juergen Gross 2019-04-10 6:55 ` Ankur Arora 2019-04-10 6:55 ` Ankur Arora 2019-04-10 6:55 ` [Xen-devel] " Ankur Arora 2019-04-10 7:14 ` Juergen Gross 2019-04-10 7:14 ` [Xen-devel] " Juergen Gross 2019-04-10 7:14 ` Juergen Gross 2019-04-09 5:04 ` Juergen Gross 2019-04-08 17:31 ` Joao Martins 2019-04-08 10:42 ` Juergen Gross 2019-04-08 10:36 ` Joao Martins 2019-02-22 16:59 ` Paolo Bonzini 2019-02-20 21:09 ` Paolo Bonzini 2019-02-20 23:39 ` Marek Marczykowski-Górecki 2019-02-20 23:39 ` [Xen-devel] " Marek Marczykowski-Górecki 2019-02-21 0:31 ` Ankur Arora 2019-02-21 0:31 ` [Xen-devel] " Ankur Arora 2019-02-21 7:57 ` Juergen Gross 2019-02-21 12:00 ` Joao Martins 2019-02-21 12:00 ` [Xen-devel] " Joao Martins 2019-02-21 7:57 ` Juergen Gross 2019-02-21 11:55 ` [Xen-devel] " Joao Martins 2019-02-21 11:55 ` Joao Martins
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=20190220201609.28290-34-joao.m.martins@oracle.com \ --to=joao.m.martins@oracle.com \ --cc=ankur.a.arora@oracle.com \ --cc=boris.ostrovsky@oracle.com \ --cc=jgross@suse.com \ --cc=kvm@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=pbonzini@redhat.com \ --cc=rkrcmar@redhat.com \ --cc=sstabellini@kernel.org \ --cc=xen-devel@lists.xenproject.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.