From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37220) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cCleo-00034F-2m for qemu-devel@nongnu.org; Fri, 02 Dec 2016 06:05:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cCleh-0002Fx-2o for qemu-devel@nongnu.org; Fri, 02 Dec 2016 06:05:34 -0500 Received: from 18.mo4.mail-out.ovh.net ([188.165.54.143]:48941) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cCleg-0002ER-Su for qemu-devel@nongnu.org; Fri, 02 Dec 2016 06:05:27 -0500 Received: from player762.ha.ovh.net (b7.ovh.net [213.186.33.57]) by mo4.mail-out.ovh.net (Postfix) with ESMTP id 80E7520414 for ; Fri, 2 Dec 2016 12:05:25 +0100 (CET) Date: Fri, 2 Dec 2016 12:05:20 +0100 From: Greg Kurz Message-ID: <20161202120520.3dc02dd7@bahia> In-Reply-To: <1480368444-4310-4-git-send-email-sstabellini@kernel.org> References: <1480368444-4310-1-git-send-email-sstabellini@kernel.org> <1480368444-4310-4-git-send-email-sstabellini@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v2 4/4] 9pfs: introduce init_out/in_iov_from_pdu List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Stefano Stabellini Cc: aneesh.kumar@linux.vnet.ibm.com, qemu-devel@nongnu.org, xen-devel@lists.xensource.com, anthony.perard@citrix.com On Mon, 28 Nov 2016 13:27:24 -0800 Stefano Stabellini wrote: > Not all 9pfs transports share memory between request and response. For > those who don't, it is necessary to know how much memory is required in > the response. > > Split the existing init_iov_from_pdu function in two: > init_out_iov_from_pdu (for writes) and init_in_iov_from_pdu (for reads). > init_in_iov_from_pdu takes an additional size parameter to specify the > memory required for the response message. > > Signed-off-by: Stefano Stabellini > --- Reviewed-by: Greg Kurz > hw/9pfs/9p.c | 6 +++++- > hw/9pfs/9p.h | 6 ++++-- > hw/9pfs/virtio-9p-device.c | 28 ++++++++++++++++++---------- > 3 files changed, 27 insertions(+), 13 deletions(-) > > diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c > index 79d7201..ce1f9d9 100644 > --- a/hw/9pfs/9p.c > +++ b/hw/9pfs/9p.c > @@ -1652,7 +1652,11 @@ static void v9fs_init_qiov_from_pdu(QEMUIOVector *qiov, V9fsPDU *pdu, > struct iovec *iov; > unsigned int niov; > > - pdu->s->transport->init_iov_from_pdu(pdu, &iov, &niov, is_write); > + if (is_write) { > + pdu->s->transport->init_out_iov_from_pdu(pdu, &iov, &niov); > + } else { > + pdu->s->transport->init_in_iov_from_pdu(pdu, &iov, &niov, size); > + } > > qemu_iovec_init_external(&elem, iov, niov); > qemu_iovec_init(qiov, niov); > diff --git a/hw/9pfs/9p.h b/hw/9pfs/9p.h > index c8c9aa8..4c4feaf 100644 > --- a/hw/9pfs/9p.h > +++ b/hw/9pfs/9p.h > @@ -349,8 +349,10 @@ struct V9fsTransport { > va_list ap); > ssize_t (*pdu_vunmarshal)(V9fsPDU *pdu, size_t offset, const char *fmt, > va_list ap); > - void (*init_iov_from_pdu)(V9fsPDU *pdu, struct iovec **piov, > - unsigned int *pniov, bool is_write); > + void (*init_in_iov_from_pdu)(V9fsPDU *pdu, struct iovec **piov, > + unsigned int *pniov, size_t size); > + void (*init_out_iov_from_pdu)(V9fsPDU *pdu, struct iovec **piov, > + unsigned int *pniov); > void (*push_and_notify)(V9fsPDU *pdu); > }; > > diff --git a/hw/9pfs/virtio-9p-device.c b/hw/9pfs/virtio-9p-device.c > index 273425b..27a4a32 100644 > --- a/hw/9pfs/virtio-9p-device.c > +++ b/hw/9pfs/virtio-9p-device.c > @@ -171,26 +171,34 @@ static ssize_t virtio_pdu_vunmarshal(V9fsPDU *pdu, size_t offset, > return v9fs_iov_vunmarshal(elem->out_sg, elem->out_num, offset, 1, fmt, ap); > } > > -static void virtio_init_iov_from_pdu(V9fsPDU *pdu, struct iovec **piov, > - unsigned int *pniov, bool is_write) > +/* The size parameter is used by other transports. Do not drop it. */ > +static void virtio_init_in_iov_from_pdu(V9fsPDU *pdu, struct iovec **piov, > + unsigned int *pniov, size_t size) > { > V9fsState *s = pdu->s; > V9fsVirtioState *v = container_of(s, V9fsVirtioState, state); > VirtQueueElement *elem = v->elems[pdu->idx]; > > - if (is_write) { > - *piov = elem->out_sg; > - *pniov = elem->out_num; > - } else { > - *piov = elem->in_sg; > - *pniov = elem->in_num; > - } > + *piov = elem->in_sg; > + *pniov = elem->in_num; > +} > + > +static void virtio_init_out_iov_from_pdu(V9fsPDU *pdu, struct iovec **piov, > + unsigned int *pniov) > +{ > + V9fsState *s = pdu->s; > + V9fsVirtioState *v = container_of(s, V9fsVirtioState, state); > + VirtQueueElement *elem = v->elems[pdu->idx]; > + > + *piov = elem->out_sg; > + *pniov = elem->out_num; > } > > static const struct V9fsTransport virtio_9p_transport = { > .pdu_vmarshal = virtio_pdu_vmarshal, > .pdu_vunmarshal = virtio_pdu_vunmarshal, > - .init_iov_from_pdu = virtio_init_iov_from_pdu, > + .init_in_iov_from_pdu = virtio_init_in_iov_from_pdu, > + .init_out_iov_from_pdu = virtio_init_out_iov_from_pdu, > .push_and_notify = virtio_9p_push_and_notify, > }; > From mboxrd@z Thu Jan 1 00:00:00 1970 From: Greg Kurz Subject: Re: [PATCH v2 4/4] 9pfs: introduce init_out/in_iov_from_pdu Date: Fri, 2 Dec 2016 12:05:20 +0100 Message-ID: <20161202120520.3dc02dd7@bahia> References: <1480368444-4310-1-git-send-email-sstabellini@kernel.org> <1480368444-4310-4-git-send-email-sstabellini@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1480368444-4310-4-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: Stefano Stabellini Cc: anthony.perard@citrix.com, xen-devel@lists.xensource.com, aneesh.kumar@linux.vnet.ibm.com, qemu-devel@nongnu.org List-Id: xen-devel@lists.xenproject.org T24gTW9uLCAyOCBOb3YgMjAxNiAxMzoyNzoyNCAtMDgwMApTdGVmYW5vIFN0YWJlbGxpbmkgPHNz dGFiZWxsaW5pQGtlcm5lbC5vcmc+IHdyb3RlOgoKPiBOb3QgYWxsIDlwZnMgdHJhbnNwb3J0cyBz aGFyZSBtZW1vcnkgYmV0d2VlbiByZXF1ZXN0IGFuZCByZXNwb25zZS4gRm9yCj4gdGhvc2Ugd2hv IGRvbid0LCBpdCBpcyBuZWNlc3NhcnkgdG8ga25vdyBob3cgbXVjaCBtZW1vcnkgaXMgcmVxdWly ZWQgaW4KPiB0aGUgcmVzcG9uc2UuCj4gCj4gU3BsaXQgdGhlIGV4aXN0aW5nIGluaXRfaW92X2Zy b21fcGR1IGZ1bmN0aW9uIGluIHR3bzoKPiBpbml0X291dF9pb3ZfZnJvbV9wZHUgKGZvciB3cml0 ZXMpIGFuZCBpbml0X2luX2lvdl9mcm9tX3BkdSAoZm9yIHJlYWRzKS4KPiBpbml0X2luX2lvdl9m cm9tX3BkdSB0YWtlcyBhbiBhZGRpdGlvbmFsIHNpemUgcGFyYW1ldGVyIHRvIHNwZWNpZnkgdGhl Cj4gbWVtb3J5IHJlcXVpcmVkIGZvciB0aGUgcmVzcG9uc2UgbWVzc2FnZS4KPiAKPiBTaWduZWQt b2ZmLWJ5OiBTdGVmYW5vIFN0YWJlbGxpbmkgPHNzdGFiZWxsaW5pQGtlcm5lbC5vcmc+Cj4gLS0t CgpSZXZpZXdlZC1ieTogR3JlZyBLdXJ6IDxncm91Z0BrYW9kLm9yZz4KCj4gIGh3LzlwZnMvOXAu YyAgICAgICAgICAgICAgIHwgIDYgKysrKystCj4gIGh3LzlwZnMvOXAuaCAgICAgICAgICAgICAg IHwgIDYgKysrKy0tCj4gIGh3LzlwZnMvdmlydGlvLTlwLWRldmljZS5jIHwgMjggKysrKysrKysr KysrKysrKysrLS0tLS0tLS0tLQo+ICAzIGZpbGVzIGNoYW5nZWQsIDI3IGluc2VydGlvbnMoKyks IDEzIGRlbGV0aW9ucygtKQo+IAo+IGRpZmYgLS1naXQgYS9ody85cGZzLzlwLmMgYi9ody85cGZz LzlwLmMKPiBpbmRleCA3OWQ3MjAxLi5jZTFmOWQ5IDEwMDY0NAo+IC0tLSBhL2h3LzlwZnMvOXAu Ywo+ICsrKyBiL2h3LzlwZnMvOXAuYwo+IEBAIC0xNjUyLDcgKzE2NTIsMTEgQEAgc3RhdGljIHZv aWQgdjlmc19pbml0X3Fpb3ZfZnJvbV9wZHUoUUVNVUlPVmVjdG9yICpxaW92LCBWOWZzUERVICpw ZHUsCj4gICAgICBzdHJ1Y3QgaW92ZWMgKmlvdjsKPiAgICAgIHVuc2lnbmVkIGludCBuaW92Owo+ ICAKPiAtICAgIHBkdS0+cy0+dHJhbnNwb3J0LT5pbml0X2lvdl9mcm9tX3BkdShwZHUsICZpb3Ys ICZuaW92LCBpc193cml0ZSk7Cj4gKyAgICBpZiAoaXNfd3JpdGUpIHsKPiArICAgICAgICBwZHUt PnMtPnRyYW5zcG9ydC0+aW5pdF9vdXRfaW92X2Zyb21fcGR1KHBkdSwgJmlvdiwgJm5pb3YpOwo+ ICsgICAgfSBlbHNlIHsKPiArICAgICAgICBwZHUtPnMtPnRyYW5zcG9ydC0+aW5pdF9pbl9pb3Zf ZnJvbV9wZHUocGR1LCAmaW92LCAmbmlvdiwgc2l6ZSk7Cj4gKyAgICB9Cj4gIAo+ICAgICAgcWVt dV9pb3ZlY19pbml0X2V4dGVybmFsKCZlbGVtLCBpb3YsIG5pb3YpOwo+ICAgICAgcWVtdV9pb3Zl Y19pbml0KHFpb3YsIG5pb3YpOwo+IGRpZmYgLS1naXQgYS9ody85cGZzLzlwLmggYi9ody85cGZz LzlwLmgKPiBpbmRleCBjOGM5YWE4Li40YzRmZWFmIDEwMDY0NAo+IC0tLSBhL2h3LzlwZnMvOXAu aAo+ICsrKyBiL2h3LzlwZnMvOXAuaAo+IEBAIC0zNDksOCArMzQ5LDEwIEBAIHN0cnVjdCBWOWZz VHJhbnNwb3J0IHsKPiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB2YV9saXN0IGFw KTsKPiAgICAgIHNzaXplX3QgICAgICgqcGR1X3Z1bm1hcnNoYWwpKFY5ZnNQRFUgKnBkdSwgc2l6 ZV90IG9mZnNldCwgY29uc3QgY2hhciAqZm10LAo+ICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgdmFfbGlzdCBhcCk7Cj4gLSAgICB2b2lkICAgICAgICAoKmluaXRfaW92X2Zyb21f cGR1KShWOWZzUERVICpwZHUsIHN0cnVjdCBpb3ZlYyAqKnBpb3YsCj4gLSAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICB1bnNpZ25lZCBpbnQgKnBuaW92LCBib29sIGlzX3dyaXRl KTsKPiArICAgIHZvaWQgICAgICAgICgqaW5pdF9pbl9pb3ZfZnJvbV9wZHUpKFY5ZnNQRFUgKnBk dSwgc3RydWN0IGlvdmVjICoqcGlvdiwKPiArICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIHVuc2lnbmVkIGludCAqcG5pb3YsIHNpemVfdCBzaXplKTsKPiArICAgIHZvaWQg ICAgICAgICgqaW5pdF9vdXRfaW92X2Zyb21fcGR1KShWOWZzUERVICpwZHUsIHN0cnVjdCBpb3Zl YyAqKnBpb3YsCj4gKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdW5z aWduZWQgaW50ICpwbmlvdik7Cj4gICAgICB2b2lkICAgICAgICAoKnB1c2hfYW5kX25vdGlmeSko Vjlmc1BEVSAqcGR1KTsKPiAgfTsKPiAgCj4gZGlmZiAtLWdpdCBhL2h3LzlwZnMvdmlydGlvLTlw LWRldmljZS5jIGIvaHcvOXBmcy92aXJ0aW8tOXAtZGV2aWNlLmMKPiBpbmRleCAyNzM0MjViLi4y N2E0YTMyIDEwMDY0NAo+IC0tLSBhL2h3LzlwZnMvdmlydGlvLTlwLWRldmljZS5jCj4gKysrIGIv aHcvOXBmcy92aXJ0aW8tOXAtZGV2aWNlLmMKPiBAQCAtMTcxLDI2ICsxNzEsMzQgQEAgc3RhdGlj IHNzaXplX3QgdmlydGlvX3BkdV92dW5tYXJzaGFsKFY5ZnNQRFUgKnBkdSwgc2l6ZV90IG9mZnNl dCwKPiAgICAgIHJldHVybiB2OWZzX2lvdl92dW5tYXJzaGFsKGVsZW0tPm91dF9zZywgZWxlbS0+ b3V0X251bSwgb2Zmc2V0LCAxLCBmbXQsIGFwKTsKPiAgfQo+ICAKPiAtc3RhdGljIHZvaWQgdmly dGlvX2luaXRfaW92X2Zyb21fcGR1KFY5ZnNQRFUgKnBkdSwgc3RydWN0IGlvdmVjICoqcGlvdiwK PiAtICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVuc2lnbmVkIGludCAqcG5p b3YsIGJvb2wgaXNfd3JpdGUpCj4gKy8qIFRoZSBzaXplIHBhcmFtZXRlciBpcyB1c2VkIGJ5IG90 aGVyIHRyYW5zcG9ydHMuIERvIG5vdCBkcm9wIGl0LiAqLwo+ICtzdGF0aWMgdm9pZCB2aXJ0aW9f aW5pdF9pbl9pb3ZfZnJvbV9wZHUoVjlmc1BEVSAqcGR1LCBzdHJ1Y3QgaW92ZWMgKipwaW92LAo+ ICsgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdW5zaWduZWQgaW50ICpw bmlvdiwgc2l6ZV90IHNpemUpCj4gIHsKPiAgICAgIFY5ZnNTdGF0ZSAqcyA9IHBkdS0+czsKPiAg ICAgIFY5ZnNWaXJ0aW9TdGF0ZSAqdiA9IGNvbnRhaW5lcl9vZihzLCBWOWZzVmlydGlvU3RhdGUs IHN0YXRlKTsKPiAgICAgIFZpcnRRdWV1ZUVsZW1lbnQgKmVsZW0gPSB2LT5lbGVtc1twZHUtPmlk eF07Cj4gIAo+IC0gICAgaWYgKGlzX3dyaXRlKSB7Cj4gLSAgICAgICAgKnBpb3YgPSBlbGVtLT5v dXRfc2c7Cj4gLSAgICAgICAgKnBuaW92ID0gZWxlbS0+b3V0X251bTsKPiAtICAgIH0gZWxzZSB7 Cj4gLSAgICAgICAgKnBpb3YgPSBlbGVtLT5pbl9zZzsKPiAtICAgICAgICAqcG5pb3YgPSBlbGVt LT5pbl9udW07Cj4gLSAgICB9Cj4gKyAgICAqcGlvdiA9IGVsZW0tPmluX3NnOwo+ICsgICAgKnBu aW92ID0gZWxlbS0+aW5fbnVtOwo+ICt9Cj4gKwo+ICtzdGF0aWMgdm9pZCB2aXJ0aW9faW5pdF9v dXRfaW92X2Zyb21fcGR1KFY5ZnNQRFUgKnBkdSwgc3RydWN0IGlvdmVjICoqcGlvdiwKPiArICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB1bnNpZ25lZCBpbnQgKnBuaW92 KQo+ICt7Cj4gKyAgICBWOWZzU3RhdGUgKnMgPSBwZHUtPnM7Cj4gKyAgICBWOWZzVmlydGlvU3Rh dGUgKnYgPSBjb250YWluZXJfb2YocywgVjlmc1ZpcnRpb1N0YXRlLCBzdGF0ZSk7Cj4gKyAgICBW aXJ0UXVldWVFbGVtZW50ICplbGVtID0gdi0+ZWxlbXNbcGR1LT5pZHhdOwo+ICsKPiArICAgICpw aW92ID0gZWxlbS0+b3V0X3NnOwo+ICsgICAgKnBuaW92ID0gZWxlbS0+b3V0X251bTsKPiAgfQo+ ICAKPiAgc3RhdGljIGNvbnN0IHN0cnVjdCBWOWZzVHJhbnNwb3J0IHZpcnRpb185cF90cmFuc3Bv cnQgPSB7Cj4gICAgICAucGR1X3ZtYXJzaGFsID0gdmlydGlvX3BkdV92bWFyc2hhbCwKPiAgICAg IC5wZHVfdnVubWFyc2hhbCA9IHZpcnRpb19wZHVfdnVubWFyc2hhbCwKPiAtICAgIC5pbml0X2lv dl9mcm9tX3BkdSA9IHZpcnRpb19pbml0X2lvdl9mcm9tX3BkdSwKPiArICAgIC5pbml0X2luX2lv dl9mcm9tX3BkdSA9IHZpcnRpb19pbml0X2luX2lvdl9mcm9tX3BkdSwKPiArICAgIC5pbml0X291 dF9pb3ZfZnJvbV9wZHUgPSB2aXJ0aW9faW5pdF9vdXRfaW92X2Zyb21fcGR1LAo+ICAgICAgLnB1 c2hfYW5kX25vdGlmeSA9IHZpcnRpb185cF9wdXNoX2FuZF9ub3RpZnksCj4gIH07Cj4gIAoKCl9f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBt YWlsaW5nIGxpc3QKWGVuLWRldmVsQGxpc3RzLnhlbi5vcmcKaHR0cHM6Ly9saXN0cy54ZW4ub3Jn L3hlbi1kZXZlbAo=