From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36804) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cClds-0002Ok-JY for qemu-devel@nongnu.org; Fri, 02 Dec 2016 06:04:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cCldn-0001pt-K9 for qemu-devel@nongnu.org; Fri, 02 Dec 2016 06:04:36 -0500 Received: from 16.mo4.mail-out.ovh.net ([188.165.55.104]:55014) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cCldn-0001oW-Ca for qemu-devel@nongnu.org; Fri, 02 Dec 2016 06:04:31 -0500 Received: from player762.ha.ovh.net (b7.ovh.net [213.186.33.57]) by mo4.mail-out.ovh.net (Postfix) with ESMTP id 003252023F for ; Fri, 2 Dec 2016 12:04:29 +0100 (CET) Date: Fri, 2 Dec 2016 12:04:24 +0100 From: Greg Kurz Message-ID: <20161202120424.08a1afc8@bahia> In-Reply-To: <1480368444-4310-3-git-send-email-sstabellini@kernel.org> References: <1480368444-4310-1-git-send-email-sstabellini@kernel.org> <1480368444-4310-3-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 3/4] 9pfs: call v9fs_init_qiov_from_pdu before v9fs_pack 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:23 -0800 Stefano Stabellini wrote: > v9fs_xattr_read should not access VirtQueueElement elems directly. > Move v9fs_init_qiov_from_pdu up in the file and call > v9fs_init_qiov_from_pdu before v9fs_pack. Use v9fs_pack on the new > iovec. > > Signed-off-by: Stefano Stabellini > > --- Reviewed-by: Greg Kurz > Changes in v2: > - add a call to qemu_iovec_destroy > - fix commit description > --- > hw/9pfs/9p.c | 59 ++++++++++++++++++++++++++++++----------------------------- > 1 file changed, 30 insertions(+), 29 deletions(-) > > diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c > index 5a20a13..79d7201 100644 > --- a/hw/9pfs/9p.c > +++ b/hw/9pfs/9p.c > @@ -1633,14 +1633,39 @@ out_nofid: > pdu_complete(pdu, err); > } > > +/* > + * Create a QEMUIOVector for a sub-region of PDU iovecs > + * > + * @qiov: uninitialized QEMUIOVector > + * @skip: number of bytes to skip from beginning of PDU > + * @size: number of bytes to include > + * @is_write: true - write, false - read > + * > + * The resulting QEMUIOVector has heap-allocated iovecs and must be cleaned up > + * with qemu_iovec_destroy(). > + */ > +static void v9fs_init_qiov_from_pdu(QEMUIOVector *qiov, V9fsPDU *pdu, > + size_t skip, size_t size, > + bool is_write) > +{ > + QEMUIOVector elem; > + struct iovec *iov; > + unsigned int niov; > + > + pdu->s->transport->init_iov_from_pdu(pdu, &iov, &niov, is_write); > + > + qemu_iovec_init_external(&elem, iov, niov); > + qemu_iovec_init(qiov, niov); > + qemu_iovec_concat(qiov, &elem, skip, size); > +} > + > static int v9fs_xattr_read(V9fsState *s, V9fsPDU *pdu, V9fsFidState *fidp, > uint64_t off, uint32_t max_count) > { > ssize_t err; > size_t offset = 7; > uint64_t read_count; > - V9fsVirtioState *v = container_of(s, V9fsVirtioState, state); > - VirtQueueElement *elem = v->elems[pdu->idx]; > + QEMUIOVector qiov_full; > > if (fidp->fs.xattr.len < off) { > read_count = 0; > @@ -1656,9 +1681,11 @@ static int v9fs_xattr_read(V9fsState *s, V9fsPDU *pdu, V9fsFidState *fidp, > } > offset += err; > > - err = v9fs_pack(elem->in_sg, elem->in_num, offset, > + v9fs_init_qiov_from_pdu(&qiov_full, pdu, 0, read_count, false); > + err = v9fs_pack(qiov_full.iov, qiov_full.niov, offset, > ((char *)fidp->fs.xattr.value) + off, > read_count); > + qemu_iovec_destroy(&qiov_full); > if (err < 0) { > return err; > } > @@ -1732,32 +1759,6 @@ static int coroutine_fn v9fs_do_readdir_with_stat(V9fsPDU *pdu, > return count; > } > > -/* > - * Create a QEMUIOVector for a sub-region of PDU iovecs > - * > - * @qiov: uninitialized QEMUIOVector > - * @skip: number of bytes to skip from beginning of PDU > - * @size: number of bytes to include > - * @is_write: true - write, false - read > - * > - * The resulting QEMUIOVector has heap-allocated iovecs and must be cleaned up > - * with qemu_iovec_destroy(). > - */ > -static void v9fs_init_qiov_from_pdu(QEMUIOVector *qiov, V9fsPDU *pdu, > - size_t skip, size_t size, > - bool is_write) > -{ > - QEMUIOVector elem; > - struct iovec *iov; > - unsigned int niov; > - > - pdu->s->transport->init_iov_from_pdu(pdu, &iov, &niov, is_write); > - > - qemu_iovec_init_external(&elem, iov, niov); > - qemu_iovec_init(qiov, niov); > - qemu_iovec_concat(qiov, &elem, skip, size); > -} > - > static void coroutine_fn v9fs_read(void *opaque) > { > int32_t fid; From mboxrd@z Thu Jan 1 00:00:00 1970 From: Greg Kurz Subject: Re: [PATCH v2 3/4] 9pfs: call v9fs_init_qiov_from_pdu before v9fs_pack Date: Fri, 2 Dec 2016 12:04:24 +0100 Message-ID: <20161202120424.08a1afc8@bahia> References: <1480368444-4310-1-git-send-email-sstabellini@kernel.org> <1480368444-4310-3-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-3-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 T24gTW9uLCAyOCBOb3YgMjAxNiAxMzoyNzoyMyAtMDgwMApTdGVmYW5vIFN0YWJlbGxpbmkgPHNz dGFiZWxsaW5pQGtlcm5lbC5vcmc+IHdyb3RlOgoKPiB2OWZzX3hhdHRyX3JlYWQgc2hvdWxkIG5v dCBhY2Nlc3MgVmlydFF1ZXVlRWxlbWVudCBlbGVtcyBkaXJlY3RseS4KPiBNb3ZlIHY5ZnNfaW5p dF9xaW92X2Zyb21fcGR1IHVwIGluIHRoZSBmaWxlIGFuZCBjYWxsCj4gdjlmc19pbml0X3Fpb3Zf ZnJvbV9wZHUgYmVmb3JlIHY5ZnNfcGFjay4gVXNlIHY5ZnNfcGFjayBvbiB0aGUgbmV3Cj4gaW92 ZWMuCj4gCj4gU2lnbmVkLW9mZi1ieTogU3RlZmFubyBTdGFiZWxsaW5pIDxzc3RhYmVsbGluaUBr ZXJuZWwub3JnPgo+IAo+IC0tLQoKUmV2aWV3ZWQtYnk6IEdyZWcgS3VyeiA8Z3JvdWdAa2FvZC5v cmc+Cgo+IENoYW5nZXMgaW4gdjI6Cj4gLSBhZGQgYSBjYWxsIHRvIHFlbXVfaW92ZWNfZGVzdHJv eQo+IC0gZml4IGNvbW1pdCBkZXNjcmlwdGlvbgo+IC0tLQo+ICBody85cGZzLzlwLmMgfCA1OSAr KysrKysrKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LQo+ICAxIGZpbGUgY2hhbmdlZCwgMzAgaW5zZXJ0aW9ucygrKSwgMjkgZGVsZXRpb25zKC0pCj4g Cj4gZGlmZiAtLWdpdCBhL2h3LzlwZnMvOXAuYyBiL2h3LzlwZnMvOXAuYwo+IGluZGV4IDVhMjBh MTMuLjc5ZDcyMDEgMTAwNjQ0Cj4gLS0tIGEvaHcvOXBmcy85cC5jCj4gKysrIGIvaHcvOXBmcy85 cC5jCj4gQEAgLTE2MzMsMTQgKzE2MzMsMzkgQEAgb3V0X25vZmlkOgo+ICAgICAgcGR1X2NvbXBs ZXRlKHBkdSwgZXJyKTsKPiAgfQo+ICAKPiArLyoKPiArICogQ3JlYXRlIGEgUUVNVUlPVmVjdG9y IGZvciBhIHN1Yi1yZWdpb24gb2YgUERVIGlvdmVjcwo+ICsgKgo+ICsgKiBAcWlvdjogICAgICAg dW5pbml0aWFsaXplZCBRRU1VSU9WZWN0b3IKPiArICogQHNraXA6ICAgICAgIG51bWJlciBvZiBi eXRlcyB0byBza2lwIGZyb20gYmVnaW5uaW5nIG9mIFBEVQo+ICsgKiBAc2l6ZTogICAgICAgbnVt YmVyIG9mIGJ5dGVzIHRvIGluY2x1ZGUKPiArICogQGlzX3dyaXRlOiAgIHRydWUgLSB3cml0ZSwg ZmFsc2UgLSByZWFkCj4gKyAqCj4gKyAqIFRoZSByZXN1bHRpbmcgUUVNVUlPVmVjdG9yIGhhcyBo ZWFwLWFsbG9jYXRlZCBpb3ZlY3MgYW5kIG11c3QgYmUgY2xlYW5lZCB1cAo+ICsgKiB3aXRoIHFl bXVfaW92ZWNfZGVzdHJveSgpLgo+ICsgKi8KPiArc3RhdGljIHZvaWQgdjlmc19pbml0X3Fpb3Zf ZnJvbV9wZHUoUUVNVUlPVmVjdG9yICpxaW92LCBWOWZzUERVICpwZHUsCj4gKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIHNpemVfdCBza2lwLCBzaXplX3Qgc2l6ZSwKPiArICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYm9vbCBpc193cml0ZSkKPiArewo+ICsg ICAgUUVNVUlPVmVjdG9yIGVsZW07Cj4gKyAgICBzdHJ1Y3QgaW92ZWMgKmlvdjsKPiArICAgIHVu c2lnbmVkIGludCBuaW92Owo+ICsKPiArICAgIHBkdS0+cy0+dHJhbnNwb3J0LT5pbml0X2lvdl9m cm9tX3BkdShwZHUsICZpb3YsICZuaW92LCBpc193cml0ZSk7Cj4gKwo+ICsgICAgcWVtdV9pb3Zl Y19pbml0X2V4dGVybmFsKCZlbGVtLCBpb3YsIG5pb3YpOwo+ICsgICAgcWVtdV9pb3ZlY19pbml0 KHFpb3YsIG5pb3YpOwo+ICsgICAgcWVtdV9pb3ZlY19jb25jYXQocWlvdiwgJmVsZW0sIHNraXAs IHNpemUpOwo+ICt9Cj4gKwo+ICBzdGF0aWMgaW50IHY5ZnNfeGF0dHJfcmVhZChWOWZzU3RhdGUg KnMsIFY5ZnNQRFUgKnBkdSwgVjlmc0ZpZFN0YXRlICpmaWRwLAo+ICAgICAgICAgICAgICAgICAg ICAgICAgICAgICB1aW50NjRfdCBvZmYsIHVpbnQzMl90IG1heF9jb3VudCkKPiAgewo+ICAgICAg c3NpemVfdCBlcnI7Cj4gICAgICBzaXplX3Qgb2Zmc2V0ID0gNzsKPiAgICAgIHVpbnQ2NF90IHJl YWRfY291bnQ7Cj4gLSAgICBWOWZzVmlydGlvU3RhdGUgKnYgPSBjb250YWluZXJfb2YocywgVjlm c1ZpcnRpb1N0YXRlLCBzdGF0ZSk7Cj4gLSAgICBWaXJ0UXVldWVFbGVtZW50ICplbGVtID0gdi0+ ZWxlbXNbcGR1LT5pZHhdOwo+ICsgICAgUUVNVUlPVmVjdG9yIHFpb3ZfZnVsbDsKPiAgCj4gICAg ICBpZiAoZmlkcC0+ZnMueGF0dHIubGVuIDwgb2ZmKSB7Cj4gICAgICAgICAgcmVhZF9jb3VudCA9 IDA7Cj4gQEAgLTE2NTYsOSArMTY4MSwxMSBAQCBzdGF0aWMgaW50IHY5ZnNfeGF0dHJfcmVhZChW OWZzU3RhdGUgKnMsIFY5ZnNQRFUgKnBkdSwgVjlmc0ZpZFN0YXRlICpmaWRwLAo+ICAgICAgfQo+ ICAgICAgb2Zmc2V0ICs9IGVycjsKPiAgCj4gLSAgICBlcnIgPSB2OWZzX3BhY2soZWxlbS0+aW5f c2csIGVsZW0tPmluX251bSwgb2Zmc2V0LAo+ICsgICAgdjlmc19pbml0X3Fpb3ZfZnJvbV9wZHUo JnFpb3ZfZnVsbCwgcGR1LCAwLCByZWFkX2NvdW50LCBmYWxzZSk7Cj4gKyAgICBlcnIgPSB2OWZz X3BhY2socWlvdl9mdWxsLmlvdiwgcWlvdl9mdWxsLm5pb3YsIG9mZnNldCwKPiAgICAgICAgICAg ICAgICAgICAgICAoKGNoYXIgKilmaWRwLT5mcy54YXR0ci52YWx1ZSkgKyBvZmYsCj4gICAgICAg ICAgICAgICAgICAgICAgcmVhZF9jb3VudCk7Cj4gKyAgICBxZW11X2lvdmVjX2Rlc3Ryb3koJnFp b3ZfZnVsbCk7Cj4gICAgICBpZiAoZXJyIDwgMCkgewo+ICAgICAgICAgIHJldHVybiBlcnI7Cj4g ICAgICB9Cj4gQEAgLTE3MzIsMzIgKzE3NTksNiBAQCBzdGF0aWMgaW50IGNvcm91dGluZV9mbiB2 OWZzX2RvX3JlYWRkaXJfd2l0aF9zdGF0KFY5ZnNQRFUgKnBkdSwKPiAgICAgIHJldHVybiBjb3Vu dDsKPiAgfQo+ICAKPiAtLyoKPiAtICogQ3JlYXRlIGEgUUVNVUlPVmVjdG9yIGZvciBhIHN1Yi1y ZWdpb24gb2YgUERVIGlvdmVjcwo+IC0gKgo+IC0gKiBAcWlvdjogICAgICAgdW5pbml0aWFsaXpl ZCBRRU1VSU9WZWN0b3IKPiAtICogQHNraXA6ICAgICAgIG51bWJlciBvZiBieXRlcyB0byBza2lw IGZyb20gYmVnaW5uaW5nIG9mIFBEVQo+IC0gKiBAc2l6ZTogICAgICAgbnVtYmVyIG9mIGJ5dGVz IHRvIGluY2x1ZGUKPiAtICogQGlzX3dyaXRlOiAgIHRydWUgLSB3cml0ZSwgZmFsc2UgLSByZWFk Cj4gLSAqCj4gLSAqIFRoZSByZXN1bHRpbmcgUUVNVUlPVmVjdG9yIGhhcyBoZWFwLWFsbG9jYXRl ZCBpb3ZlY3MgYW5kIG11c3QgYmUgY2xlYW5lZCB1cAo+IC0gKiB3aXRoIHFlbXVfaW92ZWNfZGVz dHJveSgpLgo+IC0gKi8KPiAtc3RhdGljIHZvaWQgdjlmc19pbml0X3Fpb3ZfZnJvbV9wZHUoUUVN VUlPVmVjdG9yICpxaW92LCBWOWZzUERVICpwZHUsCj4gLSAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIHNpemVfdCBza2lwLCBzaXplX3Qgc2l6ZSwKPiAtICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgYm9vbCBpc193cml0ZSkKPiAtewo+IC0gICAgUUVNVUlPVmVj dG9yIGVsZW07Cj4gLSAgICBzdHJ1Y3QgaW92ZWMgKmlvdjsKPiAtICAgIHVuc2lnbmVkIGludCBu aW92Owo+IC0KPiAtICAgIHBkdS0+cy0+dHJhbnNwb3J0LT5pbml0X2lvdl9mcm9tX3BkdShwZHUs ICZpb3YsICZuaW92LCBpc193cml0ZSk7Cj4gLQo+IC0gICAgcWVtdV9pb3ZlY19pbml0X2V4dGVy bmFsKCZlbGVtLCBpb3YsIG5pb3YpOwo+IC0gICAgcWVtdV9pb3ZlY19pbml0KHFpb3YsIG5pb3Yp Owo+IC0gICAgcWVtdV9pb3ZlY19jb25jYXQocWlvdiwgJmVsZW0sIHNraXAsIHNpemUpOwo+IC19 Cj4gLQo+ICBzdGF0aWMgdm9pZCBjb3JvdXRpbmVfZm4gdjlmc19yZWFkKHZvaWQgKm9wYXF1ZSkK PiAgewo+ICAgICAgaW50MzJfdCBmaWQ7CgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX18KWGVuLWRldmVsIG1haWxpbmcgbGlzdApYZW4tZGV2ZWxAbGlzdHMu eGVuLm9yZwpodHRwczovL2xpc3RzLnhlbi5vcmcveGVuLWRldmVsCg==