From: Stefano Stabellini <sstabellini@kernel.org> To: qemu-devel@nongnu.org Cc: xen-devel@lists.xenproject.org, sstabellini@kernel.org, anthony.perard@citrix.com, groug@kaod.org, Stefano Stabellini <stefano@aporeto.com>, jgross@suse.com, "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH v2 7/9] xen/9pfs: implement in/out_iov_from_pdu and vmarshal/vunmarshal Date: Mon, 13 Mar 2017 16:55:58 -0700 [thread overview] Message-ID: <1489449360-14411-7-git-send-email-sstabellini@kernel.org> (raw) In-Reply-To: <1489449360-14411-1-git-send-email-sstabellini@kernel.org> Implement xen_9pfs_init_in/out_iov_from_pdu and xen_9pfs_pdu_vmarshal/vunmarshall by creating new sg pointing to the data on the ring. This is safe as we only handle one request per ring at any given time. Signed-off-by: Stefano Stabellini <stefano@aporeto.com> CC: anthony.perard@citrix.com CC: jgross@suse.com CC: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> CC: Greg Kurz <groug@kaod.org> --- hw/9pfs/xen-9p-backend.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 89 insertions(+), 2 deletions(-) diff --git a/hw/9pfs/xen-9p-backend.c b/hw/9pfs/xen-9p-backend.c index 741dd31..d72a749 100644 --- a/hw/9pfs/xen-9p-backend.c +++ b/hw/9pfs/xen-9p-backend.c @@ -48,12 +48,77 @@ typedef struct Xen9pfsDev { struct Xen9pfsRing *rings; } Xen9pfsDev; +static void xen_9pfs_in_sg(struct Xen9pfsRing *ring, + struct iovec *in_sg, + int *num, + uint32_t idx, + uint32_t size) +{ + RING_IDX cons, prod, masked_prod, masked_cons; + + cons = ring->intf->in_cons; + prod = ring->intf->in_prod; + xen_rmb(); + masked_prod = xen_9pfs_mask(prod, XEN_9PFS_RING_SIZE); + masked_cons = xen_9pfs_mask(cons, XEN_9PFS_RING_SIZE); + + if (masked_prod < masked_cons) { + in_sg[0].iov_base = ring->ring.in + masked_prod; + in_sg[0].iov_len = masked_cons - masked_prod; + *num = 1; + } else { + in_sg[0].iov_base = ring->ring.in + masked_prod; + in_sg[0].iov_len = XEN_9PFS_RING_SIZE - masked_prod; + in_sg[1].iov_base = ring->ring.in; + in_sg[1].iov_len = masked_cons; + *num = 2; + } +} + +static void xen_9pfs_out_sg(struct Xen9pfsRing *ring, + struct iovec *out_sg, + int *num, + uint32_t idx) +{ + RING_IDX cons, prod, masked_prod, masked_cons; + + cons = ring->intf->out_cons; + prod = ring->intf->out_prod; + xen_rmb(); + masked_prod = xen_9pfs_mask(prod, XEN_9PFS_RING_SIZE); + masked_cons = xen_9pfs_mask(cons, XEN_9PFS_RING_SIZE); + + if (masked_cons < masked_prod) { + out_sg[0].iov_base = ring->ring.out + masked_cons; + out_sg[0].iov_len = ring->out_size; + *num = 1; + } else { + if (ring->out_size > (XEN_9PFS_RING_SIZE - masked_cons)) { + out_sg[0].iov_base = ring->ring.out + masked_cons; + out_sg[0].iov_len = XEN_9PFS_RING_SIZE - masked_cons; + out_sg[1].iov_base = ring->ring.out; + out_sg[1].iov_len = ring->out_size - (XEN_9PFS_RING_SIZE - masked_cons); + *num = 2; + } else { + out_sg[0].iov_base = ring->ring.out + masked_cons; + out_sg[0].iov_len = ring->out_size; + *num = 1; + } + } +} + static ssize_t xen_9pfs_pdu_vmarshal(V9fsPDU *pdu, size_t offset, const char *fmt, va_list ap) { - return 0; + struct Xen9pfsDev *xen_9pfs = container_of(pdu->s, struct Xen9pfsDev, state); + struct iovec in_sg[2]; + int num; + + xen_9pfs_in_sg(&xen_9pfs->rings[pdu->tag % xen_9pfs->num_rings], + in_sg, &num, pdu->idx, ROUND_UP(offset + 128, 512)); + return v9fs_iov_vmarshal(in_sg, num, offset, 0, fmt, ap); } static ssize_t xen_9pfs_pdu_vunmarshal(V9fsPDU *pdu, @@ -61,13 +126,27 @@ static ssize_t xen_9pfs_pdu_vunmarshal(V9fsPDU *pdu, const char *fmt, va_list ap) { - return 0; + struct Xen9pfsDev *xen_9pfs = container_of(pdu->s, struct Xen9pfsDev, state); + struct iovec out_sg[2]; + int num; + + xen_9pfs_out_sg(&xen_9pfs->rings[pdu->tag % xen_9pfs->num_rings], + out_sg, &num, pdu->idx); + return v9fs_iov_vunmarshal(out_sg, num, offset, 0, fmt, ap); } static void xen_9pfs_init_out_iov_from_pdu(V9fsPDU *pdu, struct iovec **piov, unsigned int *pniov) { + struct Xen9pfsDev *xen_9pfs = container_of(pdu->s, struct Xen9pfsDev, state); + struct Xen9pfsRing *ring = &xen_9pfs->rings[pdu->tag % xen_9pfs->num_rings]; + struct iovec *sg = g_malloc0(sizeof(*sg)*2); + int num; + + xen_9pfs_out_sg(ring, sg, &num, pdu->idx); + *piov = sg; + *pniov = num; } static void xen_9pfs_init_in_iov_from_pdu(V9fsPDU *pdu, @@ -75,6 +154,14 @@ static void xen_9pfs_init_in_iov_from_pdu(V9fsPDU *pdu, unsigned int *pniov, size_t size) { + struct Xen9pfsDev *xen_9pfs = container_of(pdu->s, struct Xen9pfsDev, state); + struct Xen9pfsRing *ring = &xen_9pfs->rings[pdu->tag % xen_9pfs->num_rings]; + struct iovec *sg = g_malloc0(sizeof(*sg)*2); + int num; + + xen_9pfs_in_sg(ring, sg, &num, pdu->idx, size); + *piov = sg; + *pniov = num; } static void xen_9pfs_push_and_notify(V9fsPDU *pdu) -- 1.9.1
WARNING: multiple messages have this Message-ID (diff)
From: Stefano Stabellini <sstabellini@kernel.org> To: qemu-devel@nongnu.org Cc: jgross@suse.com, sstabellini@kernel.org, groug@kaod.org, Stefano Stabellini <stefano@aporeto.com>, "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>, anthony.perard@citrix.com, xen-devel@lists.xenproject.org Subject: [PATCH v2 7/9] xen/9pfs: implement in/out_iov_from_pdu and vmarshal/vunmarshal Date: Mon, 13 Mar 2017 16:55:58 -0700 [thread overview] Message-ID: <1489449360-14411-7-git-send-email-sstabellini@kernel.org> (raw) In-Reply-To: <1489449360-14411-1-git-send-email-sstabellini@kernel.org> Implement xen_9pfs_init_in/out_iov_from_pdu and xen_9pfs_pdu_vmarshal/vunmarshall by creating new sg pointing to the data on the ring. This is safe as we only handle one request per ring at any given time. Signed-off-by: Stefano Stabellini <stefano@aporeto.com> CC: anthony.perard@citrix.com CC: jgross@suse.com CC: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> CC: Greg Kurz <groug@kaod.org> --- hw/9pfs/xen-9p-backend.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 89 insertions(+), 2 deletions(-) diff --git a/hw/9pfs/xen-9p-backend.c b/hw/9pfs/xen-9p-backend.c index 741dd31..d72a749 100644 --- a/hw/9pfs/xen-9p-backend.c +++ b/hw/9pfs/xen-9p-backend.c @@ -48,12 +48,77 @@ typedef struct Xen9pfsDev { struct Xen9pfsRing *rings; } Xen9pfsDev; +static void xen_9pfs_in_sg(struct Xen9pfsRing *ring, + struct iovec *in_sg, + int *num, + uint32_t idx, + uint32_t size) +{ + RING_IDX cons, prod, masked_prod, masked_cons; + + cons = ring->intf->in_cons; + prod = ring->intf->in_prod; + xen_rmb(); + masked_prod = xen_9pfs_mask(prod, XEN_9PFS_RING_SIZE); + masked_cons = xen_9pfs_mask(cons, XEN_9PFS_RING_SIZE); + + if (masked_prod < masked_cons) { + in_sg[0].iov_base = ring->ring.in + masked_prod; + in_sg[0].iov_len = masked_cons - masked_prod; + *num = 1; + } else { + in_sg[0].iov_base = ring->ring.in + masked_prod; + in_sg[0].iov_len = XEN_9PFS_RING_SIZE - masked_prod; + in_sg[1].iov_base = ring->ring.in; + in_sg[1].iov_len = masked_cons; + *num = 2; + } +} + +static void xen_9pfs_out_sg(struct Xen9pfsRing *ring, + struct iovec *out_sg, + int *num, + uint32_t idx) +{ + RING_IDX cons, prod, masked_prod, masked_cons; + + cons = ring->intf->out_cons; + prod = ring->intf->out_prod; + xen_rmb(); + masked_prod = xen_9pfs_mask(prod, XEN_9PFS_RING_SIZE); + masked_cons = xen_9pfs_mask(cons, XEN_9PFS_RING_SIZE); + + if (masked_cons < masked_prod) { + out_sg[0].iov_base = ring->ring.out + masked_cons; + out_sg[0].iov_len = ring->out_size; + *num = 1; + } else { + if (ring->out_size > (XEN_9PFS_RING_SIZE - masked_cons)) { + out_sg[0].iov_base = ring->ring.out + masked_cons; + out_sg[0].iov_len = XEN_9PFS_RING_SIZE - masked_cons; + out_sg[1].iov_base = ring->ring.out; + out_sg[1].iov_len = ring->out_size - (XEN_9PFS_RING_SIZE - masked_cons); + *num = 2; + } else { + out_sg[0].iov_base = ring->ring.out + masked_cons; + out_sg[0].iov_len = ring->out_size; + *num = 1; + } + } +} + static ssize_t xen_9pfs_pdu_vmarshal(V9fsPDU *pdu, size_t offset, const char *fmt, va_list ap) { - return 0; + struct Xen9pfsDev *xen_9pfs = container_of(pdu->s, struct Xen9pfsDev, state); + struct iovec in_sg[2]; + int num; + + xen_9pfs_in_sg(&xen_9pfs->rings[pdu->tag % xen_9pfs->num_rings], + in_sg, &num, pdu->idx, ROUND_UP(offset + 128, 512)); + return v9fs_iov_vmarshal(in_sg, num, offset, 0, fmt, ap); } static ssize_t xen_9pfs_pdu_vunmarshal(V9fsPDU *pdu, @@ -61,13 +126,27 @@ static ssize_t xen_9pfs_pdu_vunmarshal(V9fsPDU *pdu, const char *fmt, va_list ap) { - return 0; + struct Xen9pfsDev *xen_9pfs = container_of(pdu->s, struct Xen9pfsDev, state); + struct iovec out_sg[2]; + int num; + + xen_9pfs_out_sg(&xen_9pfs->rings[pdu->tag % xen_9pfs->num_rings], + out_sg, &num, pdu->idx); + return v9fs_iov_vunmarshal(out_sg, num, offset, 0, fmt, ap); } static void xen_9pfs_init_out_iov_from_pdu(V9fsPDU *pdu, struct iovec **piov, unsigned int *pniov) { + struct Xen9pfsDev *xen_9pfs = container_of(pdu->s, struct Xen9pfsDev, state); + struct Xen9pfsRing *ring = &xen_9pfs->rings[pdu->tag % xen_9pfs->num_rings]; + struct iovec *sg = g_malloc0(sizeof(*sg)*2); + int num; + + xen_9pfs_out_sg(ring, sg, &num, pdu->idx); + *piov = sg; + *pniov = num; } static void xen_9pfs_init_in_iov_from_pdu(V9fsPDU *pdu, @@ -75,6 +154,14 @@ static void xen_9pfs_init_in_iov_from_pdu(V9fsPDU *pdu, unsigned int *pniov, size_t size) { + struct Xen9pfsDev *xen_9pfs = container_of(pdu->s, struct Xen9pfsDev, state); + struct Xen9pfsRing *ring = &xen_9pfs->rings[pdu->tag % xen_9pfs->num_rings]; + struct iovec *sg = g_malloc0(sizeof(*sg)*2); + int num; + + xen_9pfs_in_sg(ring, sg, &num, pdu->idx, size); + *piov = sg; + *pniov = num; } static void xen_9pfs_push_and_notify(V9fsPDU *pdu) -- 1.9.1 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel
next prev parent reply other threads:[~2017-03-13 23:56 UTC|newest] Thread overview: 72+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-03-13 23:55 [Qemu-devel] [PATCH v2 0/9] xen/9pfs: introduce the Xen 9pfs backend Stefano Stabellini 2017-03-13 23:55 ` Stefano Stabellini 2017-03-13 23:55 ` [Qemu-devel] [PATCH v2 1/9] configure: change CONFIG_XEN_BACKEND to be a target property Stefano Stabellini 2017-03-13 23:55 ` Stefano Stabellini 2017-03-13 23:55 ` [Qemu-devel] [PATCH v2 2/9] xen: import ring.h from xen Stefano Stabellini 2017-03-13 23:55 ` Stefano Stabellini 2017-03-15 8:00 ` [Qemu-devel] " Greg Kurz 2017-03-15 8:00 ` Greg Kurz 2017-03-15 18:36 ` [Qemu-devel] " Stefano Stabellini 2017-03-15 18:36 ` Stefano Stabellini 2017-03-15 19:00 ` [Qemu-devel] " Greg Kurz 2017-03-15 19:00 ` Greg Kurz 2017-03-15 19:04 ` [Qemu-devel] " Stefano Stabellini 2017-03-15 19:04 ` Stefano Stabellini 2017-03-13 23:55 ` [Qemu-devel] [PATCH v2 3/9] xen: introduce the header file for the Xen 9pfs transport protocol Stefano Stabellini 2017-03-13 23:55 ` Stefano Stabellini 2017-03-15 9:06 ` [Qemu-devel] " Greg Kurz 2017-03-15 9:06 ` Greg Kurz 2017-03-15 19:02 ` [Qemu-devel] " Stefano Stabellini 2017-03-15 19:02 ` Stefano Stabellini 2017-03-13 23:55 ` [Qemu-devel] [PATCH v2 4/9] xen/9pfs: introduce Xen 9pfs backend Stefano Stabellini 2017-03-13 23:55 ` Stefano Stabellini 2017-03-14 7:11 ` [Qemu-devel] " Juergen Gross 2017-03-14 7:11 ` Juergen Gross 2017-03-14 20:07 ` [Qemu-devel] " Stefano Stabellini 2017-03-14 20:07 ` Stefano Stabellini 2017-03-13 23:55 ` [Qemu-devel] [PATCH v2 5/9] xen/9pfs: connect to the frontend Stefano Stabellini 2017-03-13 23:55 ` Stefano Stabellini 2017-03-14 7:17 ` [Qemu-devel] " Juergen Gross 2017-03-14 7:17 ` Juergen Gross 2017-03-14 20:14 ` [Qemu-devel] " Stefano Stabellini 2017-03-14 20:14 ` Stefano Stabellini 2017-03-15 9:48 ` [Qemu-devel] " Greg Kurz 2017-03-15 9:48 ` Greg Kurz 2017-03-15 21:30 ` [Qemu-devel] " Stefano Stabellini 2017-03-15 21:30 ` Stefano Stabellini 2017-03-13 23:55 ` [Qemu-devel] [PATCH v2 6/9] xen/9pfs: receive requests from " Stefano Stabellini 2017-03-13 23:55 ` Stefano Stabellini 2017-03-15 10:51 ` [Qemu-devel] " Greg Kurz 2017-03-15 10:51 ` Greg Kurz 2017-03-15 21:56 ` [Qemu-devel] " Stefano Stabellini 2017-03-15 21:56 ` Stefano Stabellini 2017-03-15 11:53 ` Greg Kurz 2017-03-15 11:53 ` Greg Kurz 2017-03-15 22:03 ` [Qemu-devel] " Stefano Stabellini 2017-03-15 22:03 ` Stefano Stabellini 2017-03-13 23:55 ` Stefano Stabellini [this message] 2017-03-13 23:55 ` [PATCH v2 7/9] xen/9pfs: implement in/out_iov_from_pdu and vmarshal/vunmarshal Stefano Stabellini 2017-03-15 10:58 ` [Qemu-devel] " Greg Kurz 2017-03-15 10:58 ` Greg Kurz 2017-03-15 21:58 ` [Qemu-devel] " Stefano Stabellini 2017-03-15 21:58 ` Stefano Stabellini 2017-03-13 23:55 ` [Qemu-devel] [PATCH v2 8/9] xen/9pfs: send responses back to the frontend Stefano Stabellini 2017-03-13 23:55 ` Stefano Stabellini 2017-03-15 10:59 ` [Qemu-devel] " Greg Kurz 2017-03-15 10:59 ` Greg Kurz 2017-03-15 21:59 ` [Qemu-devel] " Stefano Stabellini 2017-03-15 21:59 ` Stefano Stabellini 2017-03-13 23:56 ` [Qemu-devel] [PATCH v2 9/9] xen/9pfs: build and register Xen 9pfs backend Stefano Stabellini 2017-03-13 23:56 ` Stefano Stabellini 2017-03-14 10:02 ` [Qemu-devel] [PATCH v2 1/9] configure: change CONFIG_XEN_BACKEND to be a target property Paolo Bonzini 2017-03-14 10:02 ` Paolo Bonzini 2017-03-14 19:07 ` [Qemu-devel] " Stefano Stabellini 2017-03-14 19:07 ` Stefano Stabellini 2017-03-14 20:23 ` [Qemu-devel] " Stefano Stabellini 2017-03-14 20:23 ` Stefano Stabellini 2017-03-15 1:03 ` [Qemu-devel] " Greg Kurz 2017-03-15 1:03 ` Greg Kurz 2017-03-15 7:41 ` [Qemu-devel] " Paolo Bonzini 2017-03-15 7:41 ` Paolo Bonzini 2017-03-15 18:42 ` [Qemu-devel] " Stefano Stabellini 2017-03-15 18:42 ` Stefano Stabellini
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=1489449360-14411-7-git-send-email-sstabellini@kernel.org \ --to=sstabellini@kernel.org \ --cc=aneesh.kumar@linux.vnet.ibm.com \ --cc=anthony.perard@citrix.com \ --cc=groug@kaod.org \ --cc=jgross@suse.com \ --cc=qemu-devel@nongnu.org \ --cc=stefano@aporeto.com \ --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.