From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54113) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cnZp3-0000Oh-Sl for qemu-devel@nongnu.org; Mon, 13 Mar 2017 19:56:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cnZp2-0004pL-Pq for qemu-devel@nongnu.org; Mon, 13 Mar 2017 19:56:17 -0400 Received: from mail.kernel.org ([198.145.29.136]:46862) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cnZp2-0004oh-GU for qemu-devel@nongnu.org; Mon, 13 Mar 2017 19:56:16 -0400 From: Stefano Stabellini Date: Mon, 13 Mar 2017 16:55:58 -0700 Message-Id: <1489449360-14411-7-git-send-email-sstabellini@kernel.org> In-Reply-To: <1489449360-14411-1-git-send-email-sstabellini@kernel.org> References: <1489449360-14411-1-git-send-email-sstabellini@kernel.org> Subject: [Qemu-devel] [PATCH v2 7/9] xen/9pfs: implement in/out_iov_from_pdu and vmarshal/vunmarshal List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: xen-devel@lists.xenproject.org, sstabellini@kernel.org, anthony.perard@citrix.com, groug@kaod.org, Stefano Stabellini , jgross@suse.com, "Aneesh Kumar K.V" 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 CC: anthony.perard@citrix.com CC: jgross@suse.com CC: Aneesh Kumar K.V CC: Greg Kurz --- 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 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefano Stabellini 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 Message-ID: <1489449360-14411-7-git-send-email-sstabellini@kernel.org> References: <1489449360-14411-1-git-send-email-sstabellini@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cnZp4-0007xQ-6e for xen-devel@lists.xenproject.org; Mon, 13 Mar 2017 23:56:18 +0000 In-Reply-To: <1489449360-14411-1-git-send-email-sstabellini@kernel.org> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: qemu-devel@nongnu.org Cc: jgross@suse.com, sstabellini@kernel.org, groug@kaod.org, Stefano Stabellini , "Aneesh Kumar K.V" , anthony.perard@citrix.com, xen-devel@lists.xenproject.org List-Id: xen-devel@lists.xenproject.org SW1wbGVtZW50IHhlbl85cGZzX2luaXRfaW4vb3V0X2lvdl9mcm9tX3BkdSBhbmQKeGVuXzlwZnNf cGR1X3ZtYXJzaGFsL3Z1bm1hcnNoYWxsIGJ5IGNyZWF0aW5nIG5ldyBzZyBwb2ludGluZyB0byB0 aGUKZGF0YSBvbiB0aGUgcmluZy4KClRoaXMgaXMgc2FmZSBhcyB3ZSBvbmx5IGhhbmRsZSBvbmUg cmVxdWVzdCBwZXIgcmluZyBhdCBhbnkgZ2l2ZW4gdGltZS4KClNpZ25lZC1vZmYtYnk6IFN0ZWZh bm8gU3RhYmVsbGluaSA8c3RlZmFub0BhcG9yZXRvLmNvbT4KQ0M6IGFudGhvbnkucGVyYXJkQGNp dHJpeC5jb20KQ0M6IGpncm9zc0BzdXNlLmNvbQpDQzogQW5lZXNoIEt1bWFyIEsuViA8YW5lZXNo Lmt1bWFyQGxpbnV4LnZuZXQuaWJtLmNvbT4KQ0M6IEdyZWcgS3VyeiA8Z3JvdWdAa2FvZC5vcmc+ Ci0tLQogaHcvOXBmcy94ZW4tOXAtYmFja2VuZC5jIHwgOTEgKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKy0tCiAxIGZpbGUgY2hhbmdlZCwgODkgaW5zZXJ0aW9u cygrKSwgMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9ody85cGZzL3hlbi05cC1iYWNrZW5k LmMgYi9ody85cGZzL3hlbi05cC1iYWNrZW5kLmMKaW5kZXggNzQxZGQzMS4uZDcyYTc0OSAxMDA2 NDQKLS0tIGEvaHcvOXBmcy94ZW4tOXAtYmFja2VuZC5jCisrKyBiL2h3LzlwZnMveGVuLTlwLWJh Y2tlbmQuYwpAQCAtNDgsMTIgKzQ4LDc3IEBAIHR5cGVkZWYgc3RydWN0IFhlbjlwZnNEZXYgewog ICAgIHN0cnVjdCBYZW45cGZzUmluZyAqcmluZ3M7CiB9IFhlbjlwZnNEZXY7CiAKK3N0YXRpYyB2 b2lkIHhlbl85cGZzX2luX3NnKHN0cnVjdCBYZW45cGZzUmluZyAqcmluZywKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgIHN0cnVjdCBpb3ZlYyAqaW5fc2csCisgICAgICAgICAgICAgICAgICAg ICAgICAgICBpbnQgKm51bSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgIHVpbnQzMl90IGlk eCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgIHVpbnQzMl90IHNpemUpCit7CisgICAgUklO R19JRFggY29ucywgcHJvZCwgbWFza2VkX3Byb2QsIG1hc2tlZF9jb25zOworCisgICAgY29ucyA9 IHJpbmctPmludGYtPmluX2NvbnM7CisgICAgcHJvZCA9IHJpbmctPmludGYtPmluX3Byb2Q7Cisg ICAgeGVuX3JtYigpOworICAgIG1hc2tlZF9wcm9kID0geGVuXzlwZnNfbWFzayhwcm9kLCBYRU5f OVBGU19SSU5HX1NJWkUpOworICAgIG1hc2tlZF9jb25zID0geGVuXzlwZnNfbWFzayhjb25zLCBY RU5fOVBGU19SSU5HX1NJWkUpOworCisgICAgaWYgKG1hc2tlZF9wcm9kIDwgbWFza2VkX2NvbnMp IHsKKyAgICAgICAgaW5fc2dbMF0uaW92X2Jhc2UgPSByaW5nLT5yaW5nLmluICsgbWFza2VkX3By b2Q7CisgICAgICAgIGluX3NnWzBdLmlvdl9sZW4gPSBtYXNrZWRfY29ucyAtIG1hc2tlZF9wcm9k OworICAgICAgICAqbnVtID0gMTsKKyAgICB9IGVsc2UgeworICAgICAgICBpbl9zZ1swXS5pb3Zf YmFzZSA9IHJpbmctPnJpbmcuaW4gKyBtYXNrZWRfcHJvZDsKKyAgICAgICAgaW5fc2dbMF0uaW92 X2xlbiA9IFhFTl85UEZTX1JJTkdfU0laRSAtIG1hc2tlZF9wcm9kOworICAgICAgICBpbl9zZ1sx XS5pb3ZfYmFzZSA9IHJpbmctPnJpbmcuaW47CisgICAgICAgIGluX3NnWzFdLmlvdl9sZW4gPSBt YXNrZWRfY29uczsKKyAgICAgICAgKm51bSA9IDI7CisgICAgfQorfQorCitzdGF0aWMgdm9pZCB4 ZW5fOXBmc19vdXRfc2coc3RydWN0IFhlbjlwZnNSaW5nICpyaW5nLAorICAgICAgICAgICAgICAg ICAgICAgICAgICAgIHN0cnVjdCBpb3ZlYyAqb3V0X3NnLAorICAgICAgICAgICAgICAgICAgICAg ICAgICAgIGludCAqbnVtLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVpbnQzMl90IGlk eCkKK3sKKyAgICBSSU5HX0lEWCBjb25zLCBwcm9kLCBtYXNrZWRfcHJvZCwgbWFza2VkX2NvbnM7 CisKKyAgICBjb25zID0gcmluZy0+aW50Zi0+b3V0X2NvbnM7CisgICAgcHJvZCA9IHJpbmctPmlu dGYtPm91dF9wcm9kOworICAgIHhlbl9ybWIoKTsKKyAgICBtYXNrZWRfcHJvZCA9IHhlbl85cGZz X21hc2socHJvZCwgWEVOXzlQRlNfUklOR19TSVpFKTsKKyAgICBtYXNrZWRfY29ucyA9IHhlbl85 cGZzX21hc2soY29ucywgWEVOXzlQRlNfUklOR19TSVpFKTsKKworICAgIGlmIChtYXNrZWRfY29u cyA8IG1hc2tlZF9wcm9kKSB7CisgICAgICAgIG91dF9zZ1swXS5pb3ZfYmFzZSA9IHJpbmctPnJp bmcub3V0ICsgbWFza2VkX2NvbnM7CisgICAgICAgIG91dF9zZ1swXS5pb3ZfbGVuID0gcmluZy0+ b3V0X3NpemU7CisgICAgICAgICpudW0gPSAxOworICAgIH0gZWxzZSB7CisgICAgICAgIGlmIChy aW5nLT5vdXRfc2l6ZSA+IChYRU5fOVBGU19SSU5HX1NJWkUgLSBtYXNrZWRfY29ucykpIHsKKyAg ICAgICAgICAgIG91dF9zZ1swXS5pb3ZfYmFzZSA9IHJpbmctPnJpbmcub3V0ICsgbWFza2VkX2Nv bnM7CisgICAgICAgICAgICBvdXRfc2dbMF0uaW92X2xlbiA9IFhFTl85UEZTX1JJTkdfU0laRSAt IG1hc2tlZF9jb25zOworICAgICAgICAgICAgb3V0X3NnWzFdLmlvdl9iYXNlID0gcmluZy0+cmlu Zy5vdXQ7CisgICAgICAgICAgICBvdXRfc2dbMV0uaW92X2xlbiA9IHJpbmctPm91dF9zaXplIC0g KFhFTl85UEZTX1JJTkdfU0laRSAtIG1hc2tlZF9jb25zKTsKKyAgICAgICAgICAgICpudW0gPSAy OworICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgb3V0X3NnWzBdLmlvdl9iYXNlID0gcmlu Zy0+cmluZy5vdXQgKyBtYXNrZWRfY29uczsKKyAgICAgICAgICAgIG91dF9zZ1swXS5pb3ZfbGVu ID0gcmluZy0+b3V0X3NpemU7CisgICAgICAgICAgICAqbnVtID0gMTsKKyAgICAgICAgfQorICAg IH0KK30KKwogc3RhdGljIHNzaXplX3QgeGVuXzlwZnNfcGR1X3ZtYXJzaGFsKFY5ZnNQRFUgKnBk dSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzaXplX3Qgb2Zmc2V0LAog ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IGNoYXIgKmZtdCwKICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB2YV9saXN0IGFwKQogewotICAgIHJl dHVybiAwOworICAgIHN0cnVjdCBYZW45cGZzRGV2ICp4ZW5fOXBmcyA9IGNvbnRhaW5lcl9vZihw ZHUtPnMsIHN0cnVjdCBYZW45cGZzRGV2LCBzdGF0ZSk7CisgICAgc3RydWN0IGlvdmVjIGluX3Nn WzJdOworICAgIGludCBudW07CisKKyAgICB4ZW5fOXBmc19pbl9zZygmeGVuXzlwZnMtPnJpbmdz W3BkdS0+dGFnICUgeGVuXzlwZnMtPm51bV9yaW5nc10sCisgICAgICAgICAgICAgICAgICAgaW5f c2csICZudW0sIHBkdS0+aWR4LCBST1VORF9VUChvZmZzZXQgKyAxMjgsIDUxMikpOworICAgIHJl dHVybiB2OWZzX2lvdl92bWFyc2hhbChpbl9zZywgbnVtLCBvZmZzZXQsIDAsIGZtdCwgYXApOwog fQogCiBzdGF0aWMgc3NpemVfdCB4ZW5fOXBmc19wZHVfdnVubWFyc2hhbChWOWZzUERVICpwZHUs CkBAIC02MSwxMyArMTI2LDI3IEBAIHN0YXRpYyBzc2l6ZV90IHhlbl85cGZzX3BkdV92dW5tYXJz aGFsKFY5ZnNQRFUgKnBkdSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IGNvbnN0IGNoYXIgKmZtdCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IHZhX2xpc3QgYXApCiB7Ci0gICAgcmV0dXJuIDA7CisgICAgc3RydWN0IFhlbjlwZnNEZXYgKnhl bl85cGZzID0gY29udGFpbmVyX29mKHBkdS0+cywgc3RydWN0IFhlbjlwZnNEZXYsIHN0YXRlKTsK KyAgICBzdHJ1Y3QgaW92ZWMgb3V0X3NnWzJdOworICAgIGludCBudW07CisKKyAgICB4ZW5fOXBm c19vdXRfc2coJnhlbl85cGZzLT5yaW5nc1twZHUtPnRhZyAlIHhlbl85cGZzLT5udW1fcmluZ3Nd LAorICAgICAgICAgICAgICAgICAgICBvdXRfc2csICZudW0sIHBkdS0+aWR4KTsKKyAgICByZXR1 cm4gdjlmc19pb3ZfdnVubWFyc2hhbChvdXRfc2csIG51bSwgb2Zmc2V0LCAwLCBmbXQsIGFwKTsK IH0KIAogc3RhdGljIHZvaWQgeGVuXzlwZnNfaW5pdF9vdXRfaW92X2Zyb21fcGR1KFY5ZnNQRFUg KnBkdSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzdHJ1Y3Qg aW92ZWMgKipwaW92LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IHVuc2lnbmVkIGludCAqcG5pb3YpCiB7CisgICAgc3RydWN0IFhlbjlwZnNEZXYgKnhlbl85cGZz ID0gY29udGFpbmVyX29mKHBkdS0+cywgc3RydWN0IFhlbjlwZnNEZXYsIHN0YXRlKTsKKyAgICBz dHJ1Y3QgWGVuOXBmc1JpbmcgKnJpbmcgPSAmeGVuXzlwZnMtPnJpbmdzW3BkdS0+dGFnICUgeGVu XzlwZnMtPm51bV9yaW5nc107CisgICAgc3RydWN0IGlvdmVjICpzZyA9IGdfbWFsbG9jMChzaXpl b2YoKnNnKSoyKTsKKyAgICBpbnQgbnVtOworCisgICAgeGVuXzlwZnNfb3V0X3NnKHJpbmcsIHNn LCAmbnVtLCBwZHUtPmlkeCk7CisgICAgKnBpb3YgPSBzZzsKKyAgICAqcG5pb3YgPSBudW07CiB9 CiAKIHN0YXRpYyB2b2lkIHhlbl85cGZzX2luaXRfaW5faW92X2Zyb21fcGR1KFY5ZnNQRFUgKnBk dSwKQEAgLTc1LDYgKzE1NCwxNCBAQCBzdGF0aWMgdm9pZCB4ZW5fOXBmc19pbml0X2luX2lvdl9m cm9tX3BkdShWOWZzUERVICpwZHUsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICB1bnNpZ25lZCBpbnQgKnBuaW92LAogICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgc2l6ZV90IHNpemUpCiB7CisgICAgc3RydWN0IFhlbjlwZnNEZXYgKnhl bl85cGZzID0gY29udGFpbmVyX29mKHBkdS0+cywgc3RydWN0IFhlbjlwZnNEZXYsIHN0YXRlKTsK KyAgICBzdHJ1Y3QgWGVuOXBmc1JpbmcgKnJpbmcgPSAmeGVuXzlwZnMtPnJpbmdzW3BkdS0+dGFn ICUgeGVuXzlwZnMtPm51bV9yaW5nc107CisgICAgc3RydWN0IGlvdmVjICpzZyA9IGdfbWFsbG9j MChzaXplb2YoKnNnKSoyKTsKKyAgICBpbnQgbnVtOworCisgICAgeGVuXzlwZnNfaW5fc2cocmlu Zywgc2csICZudW0sIHBkdS0+aWR4LCBzaXplKTsKKyAgICAqcGlvdiA9IHNnOworICAgICpwbmlv diA9IG51bTsKIH0KIAogc3RhdGljIHZvaWQgeGVuXzlwZnNfcHVzaF9hbmRfbm90aWZ5KFY5ZnNQ RFUgKnBkdSkKLS0gCjEuOS4xCgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX18KWGVuLWRldmVsIG1haWxpbmcgbGlzdApYZW4tZGV2ZWxAbGlzdHMueGVuLm9y ZwpodHRwczovL2xpc3RzLnhlbi5vcmcveGVuLWRldmVsCg==