From: Joao Martins <joao.m.martins@oracle.com>
To: kvm@vger.kernel.org, linux-kernel@vger.kernel.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>,
"Wei Liu" <wei.liu2@citrix.com>,
"Paul Durrant" <paul.durrant@citrix.com>
Subject: [PATCH RFC 37/39] xen-netback: xen_shim_domain() support
Date: Wed, 20 Feb 2019 20:16:07 +0000 [thread overview]
Message-ID: <20190220201609.28290-38-joao.m.martins@oracle.com> (raw)
In-Reply-To: <20190220201609.28290-1-joao.m.martins@oracle.com>
GNTTABOP_map_grant_ref treats host_address as an OUT parameter for
xen_shim_domain(). After doing gnttab_map_refs, we check each map op
struct and replace the page passed with the page returned by the
hypercall.
Note that mmap_pages is just a placeholder when netback runs in
xen_shim_domain() mode.
Signed-off-by: Joao Martins <joao.m.martins@oracle.com>
---
drivers/net/xen-netback/netback.c | 25 +++++++++++++++++++++----
1 file changed, 21 insertions(+), 4 deletions(-)
diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c
index 80aae3a32c2a..a5dd6de6d3e6 100644
--- a/drivers/net/xen-netback/netback.c
+++ b/drivers/net/xen-netback/netback.c
@@ -324,6 +324,9 @@ struct xenvif_tx_cb {
#define XENVIF_TX_CB(skb) ((struct xenvif_tx_cb *)(skb)->cb)
+/* Selects host map only if on native Xen */
+#define GNTTAB_host_map (xen_shim_domain() ? 0 : GNTMAP_host_map)
+
static inline void xenvif_tx_create_map_op(struct xenvif_queue *queue,
u16 pending_idx,
struct xen_netif_tx_request *txp,
@@ -332,9 +335,12 @@ static inline void xenvif_tx_create_map_op(struct xenvif_queue *queue,
{
queue->pages_to_map[mop-queue->tx_map_ops] = queue->mmap_pages[pending_idx];
gnttab_set_map_op(mop, idx_to_kaddr(queue, pending_idx),
- GNTMAP_host_map | GNTMAP_readonly,
+ GNTTAB_host_map | GNTMAP_readonly,
txp->gref, queue->vif->domid);
+ if (xen_shim_domain())
+ mop->host_addr = 0;
+
memcpy(&queue->pending_tx_info[pending_idx].req, txp,
sizeof(*txp));
queue->pending_tx_info[pending_idx].extra_count = extra_count;
@@ -405,6 +411,12 @@ static struct gnttab_map_grant_ref *xenvif_get_requests(struct xenvif_queue *que
return gop;
}
+static inline void xenvif_grant_replace_page(struct xenvif_queue *queue,
+ u16 pending_idx, u32 mapping_idx)
+{
+ queue->mmap_pages[pending_idx] = queue->pages_to_map[mapping_idx];
+}
+
static inline void xenvif_grant_handle_set(struct xenvif_queue *queue,
u16 pending_idx,
grant_handle_t handle)
@@ -481,6 +493,10 @@ static int xenvif_tx_check_gop(struct xenvif_queue *queue,
xenvif_grant_handle_set(queue,
pending_idx,
gop_map->handle);
+
+ if (!err && xen_shim_domain())
+ xenvif_grant_replace_page(queue, pending_idx,
+ gop_map - queue->tx_map_ops);
/* Had a previous error? Invalidate this fragment. */
if (unlikely(err)) {
xenvif_idx_unmap(queue, pending_idx);
@@ -1268,7 +1284,7 @@ static inline void xenvif_tx_dealloc_action(struct xenvif_queue *queue)
queue->mmap_pages[pending_idx];
gnttab_set_unmap_op(gop,
idx_to_kaddr(queue, pending_idx),
- GNTMAP_host_map,
+ GNTTAB_host_map,
queue->grant_tx_handle[pending_idx]);
xenvif_grant_handle_reset(queue, pending_idx);
++gop;
@@ -1394,7 +1410,7 @@ void xenvif_idx_unmap(struct xenvif_queue *queue, u16 pending_idx)
gnttab_set_unmap_op(&tx_unmap_op,
idx_to_kaddr(queue, pending_idx),
- GNTMAP_host_map,
+ GNTTAB_host_map,
queue->grant_tx_handle[pending_idx]);
xenvif_grant_handle_reset(queue, pending_idx);
@@ -1622,7 +1638,7 @@ static int __init netback_init(void)
{
int rc = 0;
- if (!xen_domain())
+ if (!xen_domain() && !xen_shim_domain_get())
return -ENODEV;
/* Allow as many queues as there are CPUs but max. 8 if user has not
@@ -1663,6 +1679,7 @@ static void __exit netback_fini(void)
debugfs_remove_recursive(xen_netback_dbg_root);
#endif /* CONFIG_DEBUG_FS */
xenvif_xenbus_fini();
+ xen_shim_domain_put();
}
module_exit(netback_fini);
--
2.11.0
next prev parent reply other threads:[~2019-02-20 20:19 UTC|newest]
Thread overview: 126+ 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 ` [PATCH RFC 18/39] x86/xen: make hypercall_page generic Joao Martins
2019-02-20 20:15 ` [PATCH RFC 19/39] xen/xenbus: xenbus uninit support 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-26 11:20 ` 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 ` [PATCH RFC 32/39] xen/balloon: xen_shim_domain() support Joao Martins
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 ` [PATCH RFC 35/39] xen/xenbus: " Joao Martins
2019-02-20 20:16 ` [PATCH RFC 36/39] drivers/xen: " Joao Martins
2019-02-20 20:16 ` Joao Martins [this message]
2019-02-20 20:16 ` [PATCH RFC 38/39] xen-blkback: " 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 11:45 ` Joao Martins
2019-02-22 16:59 ` Paolo Bonzini
2019-03-12 17:14 ` Joao Martins
2019-04-08 6:44 ` Juergen Gross
2019-04-08 10:36 ` Joao Martins
2019-04-08 10:42 ` Juergen Gross
2019-04-08 17:31 ` Joao Martins
2019-04-09 0:35 ` Stefano Stabellini
2019-04-10 5:50 ` [Xen-devel] " Ankur Arora
2019-04-10 20:45 ` Stefano Stabellini
2019-04-09 5:04 ` Juergen Gross
2019-04-10 6:55 ` Ankur Arora
2019-04-10 7:14 ` Juergen Gross
2019-02-20 23:39 ` [Xen-devel] " Marek Marczykowski-Górecki
2019-02-21 0:31 ` Ankur Arora
2019-02-21 7:57 ` Juergen Gross
2019-02-21 12:00 ` 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-38-joao.m.martins@oracle.com \
--to=joao.m.martins@oracle.com \
--cc=ankur.a.arora@oracle.com \
--cc=boris.ostrovsky@oracle.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=paul.durrant@citrix.com \
--cc=pbonzini@redhat.com \
--cc=rkrcmar@redhat.com \
--cc=wei.liu2@citrix.com \
/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).