From patchwork Tue Mar 7 02:12:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Stabellini X-Patchwork-Id: 9607997 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 245A1601D2 for ; Tue, 7 Mar 2017 02:15:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1241428477 for ; Tue, 7 Mar 2017 02:15:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0725628478; Tue, 7 Mar 2017 02:15:58 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 8CAF328491 for ; Tue, 7 Mar 2017 02:15:53 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cl4ck-00025p-Qj; Tue, 07 Mar 2017 02:13:14 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cl4ci-000250-LK for xen-devel@lists.xenproject.org; Tue, 07 Mar 2017 02:13:12 +0000 Received: from [85.158.139.211] by server-17.bemta-5.messagelabs.com id 75/C7-07251-8371EB85; Tue, 07 Mar 2017 02:13:12 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupgkeJIrShJLcpLzFFi42I5NlG2Q9dcfF+ EwbQuKYvvWyYzOTB6HP5whSWAMYo1My8pvyKBNWNKz0O2gm6NijtdJ9gbGA/LdDFycQgJTGWU +HtiAROEc5BJ4vTvl8xdjJwcbAKGEn+fbGIDsUUEJCV+d51mBiliFnjBKLH/5WqgDg4OYYEQi YVb7EBqWARUJZ7ca2EEsXkFXCWOzdnHDmJLCMhJnDw2mRXE5hRwk+jb28YIsayNUeLGlW+sEE UZEvN65kDZXhKLblyCstUkrp7bxDyBkW8BI8MqRo3i1KKy1CJdQzO9pKLM9IyS3MTMHF1DA1O 93NTi4sT01JzEpGK95PzcTYzAUGEAgh2M5097HmKU5GBSEuX98WRPhBBfUn5KZUZicUZ8UWlO avEhRhkODiUJ3kTpvRFCgkWp6akVaZk5wKCFSUtw8CiJ8MqCpHmLCxJzizPTIVKnGHU55sze/ YZJiCUvPy9VSpxXAKRIAKQoozQPbgQsgi4xykoJ8zICHSXEU5BalJtZgir/ilGcg1FJmHcjyB SezLwSuE2vgI5gAjrCT2YnyBEliQgpqQZG82//7v2cqH9hYuebKPZOiX+LPsXsKr4o9Fmjef6 3E/W3enetbmTIcra3ULe46fRDKueOSeTNKpaZGRJHFstOrFoh5ZRuI3laK/eO1+c1V651/l2o KbpZRfjJrh9Mn7TuZmZ6hF77Pe3tK/+5rHZzTS/8TRH4Hbnik+ps1Xr5zd+C/usd4Nr/X4mlO CPRUIu5qDgRAJs2yiqbAgAA X-Env-Sender: sstabellini@kernel.org X-Msg-Ref: server-15.tower-206.messagelabs.com!1488852789!74115880!1 X-Originating-IP: [198.145.29.136] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.2.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10796 invoked from network); 7 Mar 2017 02:13:11 -0000 Received: from mail.kernel.org (HELO mail.kernel.org) (198.145.29.136) by server-15.tower-206.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 7 Mar 2017 02:13:11 -0000 Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D50EF20212; Tue, 7 Mar 2017 02:13:05 +0000 (UTC) Received: from sstabellini-ThinkPad-X260.hsd1.ca.comcast.net (96-82-76-110-static.hfc.comcastbusiness.net [96.82.76.110]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 589D120256; Tue, 7 Mar 2017 02:13:01 +0000 (UTC) From: Stefano Stabellini To: qemu-devel@nongnu.org Date: Mon, 6 Mar 2017 18:12:46 -0800 Message-Id: <1488852768-8935-6-git-send-email-sstabellini@kernel.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1488852768-8935-1-git-send-email-sstabellini@kernel.org> References: <1488852768-8935-1-git-send-email-sstabellini@kernel.org> X-Virus-Scanned: ClamAV using ClamSMTP Cc: jgross@suse.com, sstabellini@kernel.org, Greg Kurz , Stefano Stabellini , "Aneesh Kumar K.V" , anthony.perard@citrix.com, xen-devel@lists.xenproject.org Subject: [Xen-devel] [PATCH 6/8] xen/9pfs: implement in/out_iov_from_pdu and vmarshal/vunmarshal X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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 d4c3d36..0570e07 100644 --- a/hw/9pfs/xen-9p-backend.c +++ b/hw/9pfs/xen-9p-backend.c @@ -48,12 +48,77 @@ struct Xen9pfsDev { struct Xen9pfsRing *rings; }; +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)