From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54975) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cngiE-0001LX-AW for qemu-devel@nongnu.org; Tue, 14 Mar 2017 03:17:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cngiB-0008NH-18 for qemu-devel@nongnu.org; Tue, 14 Mar 2017 03:17:42 -0400 Received: from mx2.suse.de ([195.135.220.15]:41314) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cngiA-0008Lq-Mu for qemu-devel@nongnu.org; Tue, 14 Mar 2017 03:17:38 -0400 References: <1489449360-14411-1-git-send-email-sstabellini@kernel.org> <1489449360-14411-5-git-send-email-sstabellini@kernel.org> From: Juergen Gross Message-ID: <5c51b719-737f-82f8-849c-2f2a16aeb213@suse.com> Date: Tue, 14 Mar 2017 08:17:34 +0100 MIME-Version: 1.0 In-Reply-To: <1489449360-14411-5-git-send-email-sstabellini@kernel.org> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v2 5/9] xen/9pfs: connect to the frontend List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Stefano Stabellini , qemu-devel@nongnu.org Cc: xen-devel@lists.xenproject.org, anthony.perard@citrix.com, groug@kaod.org, Stefano Stabellini , "Aneesh Kumar K.V" On 14/03/17 00:55, Stefano Stabellini wrote: > Write the limits of the backend to xenstore. Connect to the frontend. > Upon connection, allocate the rings according to the protocol > specification. > > Initialize a QEMUBH to schedule work upon receiving an event channel > notification from the frontend. > > 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 | 159 ++++++++++++++++++++++++++++++++++++++++++++++- > 1 file changed, 158 insertions(+), 1 deletion(-) > > diff --git a/hw/9pfs/xen-9p-backend.c b/hw/9pfs/xen-9p-backend.c > index 35032d3..0e4a133 100644 > --- a/hw/9pfs/xen-9p-backend.c > +++ b/hw/9pfs/xen-9p-backend.c > @@ -17,8 +17,35 @@ > #include "qemu/config-file.h" > #include "fsdev/qemu-fsdev.h" > > +#define VERSIONS "1" > +#define MAX_RINGS 8 > +#define MAX_RING_ORDER 8 > + > +struct Xen9pfsRing { > + struct Xen9pfsDev *priv; > + > + int ref; > + xenevtchn_handle *evtchndev; > + int evtchn; > + int local_port; > + struct xen_9pfs_data_intf *intf; > + unsigned char *data; > + struct xen_9pfs_data ring; > + > + QEMUBH *bh; > + > + /* local copies, so that we can read/write PDU data directly from > + * the ring */ > + RING_IDX out_cons, out_size, in_cons; > + bool inprogress; > +}; > + > typedef struct Xen9pfsDev { > struct XenDevice xendev; /* must be first */ > + V9fsState state; > + > + int num_rings; > + struct Xen9pfsRing *rings; > } Xen9pfsDev; > > static ssize_t xen_9pfs_pdu_vmarshal(V9fsPDU *pdu, > @@ -67,22 +94,152 @@ static int xen_9pfs_init(struct XenDevice *xendev) > return 0; > } > > +static void xen_9pfs_bh(void *opaque) > +{ > +} > + > +static void xen_9pfs_evtchn_event(void *opaque) > +{ > +} > + > static int xen_9pfs_free(struct XenDevice *xendev) > { > - return -1; > + int i; > + struct Xen9pfsDev *xen_9pdev = container_of(xendev, struct Xen9pfsDev, xendev); > + > + for (i = 0; i < xen_9pdev->num_rings; i++) { > + if (xen_9pdev->rings[i].data != NULL) { > + xengnttab_unmap(xen_9pdev->xendev.gnttabdev, > + xen_9pdev->rings[i].data, > + (1 << XEN_9PFS_RING_ORDER)); > + } > + if (xen_9pdev->rings[i].intf != NULL) { > + xengnttab_unmap(xen_9pdev->xendev.gnttabdev, > + xen_9pdev->rings[i].intf, > + 1); > + } > + if (xen_9pdev->rings[i].evtchndev > 0) { > + qemu_set_fd_handler(xenevtchn_fd(xen_9pdev->rings[i].evtchndev), > + NULL, NULL, NULL); > + xenevtchn_unbind(xen_9pdev->rings[i].evtchndev, xen_9pdev->rings[i].local_port); > + } > + if (xen_9pdev->rings[i].bh != NULL) { > + qemu_bh_delete(xen_9pdev->rings[i].bh); > + } > + } > + g_free(xen_9pdev->rings); > + return 0; > } > > static int xen_9pfs_connect(struct XenDevice *xendev) > { > + int i; > + struct Xen9pfsDev *xen_9pdev = container_of(xendev, struct Xen9pfsDev, xendev); > + V9fsState *s = &xen_9pdev->state; > + QemuOpts *fsdev; > + char *security_model, *path; > + > + if (xenstore_read_fe_int(&xen_9pdev->xendev, "num-rings", > + &xen_9pdev->num_rings) == -1 || > + xen_9pdev->num_rings > MAX_RINGS) { What if num_rings is < 1? > + return -1; > + } > + > + xen_9pdev->rings = g_malloc0(xen_9pdev->num_rings * sizeof(struct Xen9pfsRing)); > + for (i = 0; i < xen_9pdev->num_rings; i++) { > + char str[16]; > + > + xen_9pdev->rings[i].priv = xen_9pdev; > + xen_9pdev->rings[i].evtchn = -1; > + xen_9pdev->rings[i].local_port = -1; > + > + sprintf(str, "ring-ref%u", i); use g_strdup_printf()? > + if (xenstore_read_fe_int(&xen_9pdev->xendev, str, > + &xen_9pdev->rings[i].ref) == -1) { > + goto out; > + } > + sprintf(str, "event-channel-%u", i); use g_strdup_printf()? Juergen From mboxrd@z Thu Jan 1 00:00:00 1970 From: Juergen Gross Subject: Re: [PATCH v2 5/9] xen/9pfs: connect to the frontend Date: Tue, 14 Mar 2017 08:17:34 +0100 Message-ID: <5c51b719-737f-82f8-849c-2f2a16aeb213@suse.com> References: <1489449360-14411-1-git-send-email-sstabellini@kernel.org> <1489449360-14411-5-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.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cngi9-0005Xw-W5 for xen-devel@lists.xenproject.org; Tue, 14 Mar 2017 07:17:38 +0000 In-Reply-To: <1489449360-14411-5-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 , qemu-devel@nongnu.org Cc: anthony.perard@citrix.com, xen-devel@lists.xenproject.org, Stefano Stabellini , groug@kaod.org, "Aneesh Kumar K.V" List-Id: xen-devel@lists.xenproject.org T24gMTQvMDMvMTcgMDA6NTUsIFN0ZWZhbm8gU3RhYmVsbGluaSB3cm90ZToKPiBXcml0ZSB0aGUg bGltaXRzIG9mIHRoZSBiYWNrZW5kIHRvIHhlbnN0b3JlLiBDb25uZWN0IHRvIHRoZSBmcm9udGVu ZC4KPiBVcG9uIGNvbm5lY3Rpb24sIGFsbG9jYXRlIHRoZSByaW5ncyBhY2NvcmRpbmcgdG8gdGhl IHByb3RvY29sCj4gc3BlY2lmaWNhdGlvbi4KPiAKPiBJbml0aWFsaXplIGEgUUVNVUJIIHRvIHNj aGVkdWxlIHdvcmsgdXBvbiByZWNlaXZpbmcgYW4gZXZlbnQgY2hhbm5lbAo+IG5vdGlmaWNhdGlv biBmcm9tIHRoZSBmcm9udGVuZC4KPiAKPiBTaWduZWQtb2ZmLWJ5OiBTdGVmYW5vIFN0YWJlbGxp bmkgPHN0ZWZhbm9AYXBvcmV0by5jb20+Cj4gQ0M6IGFudGhvbnkucGVyYXJkQGNpdHJpeC5jb20K PiBDQzogamdyb3NzQHN1c2UuY29tCj4gQ0M6IEFuZWVzaCBLdW1hciBLLlYgPGFuZWVzaC5rdW1h ckBsaW51eC52bmV0LmlibS5jb20+Cj4gQ0M6IEdyZWcgS3VyeiA8Z3JvdWdAa2FvZC5vcmc+Cj4g LS0tCj4gIGh3LzlwZnMveGVuLTlwLWJhY2tlbmQuYyB8IDE1OSArKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrLQo+ICAxIGZpbGUgY2hhbmdlZCwgMTU4IGluc2Vy dGlvbnMoKyksIDEgZGVsZXRpb24oLSkKPiAKPiBkaWZmIC0tZ2l0IGEvaHcvOXBmcy94ZW4tOXAt YmFja2VuZC5jIGIvaHcvOXBmcy94ZW4tOXAtYmFja2VuZC5jCj4gaW5kZXggMzUwMzJkMy4uMGU0 YTEzMyAxMDA2NDQKPiAtLS0gYS9ody85cGZzL3hlbi05cC1iYWNrZW5kLmMKPiArKysgYi9ody85 cGZzL3hlbi05cC1iYWNrZW5kLmMKPiBAQCAtMTcsOCArMTcsMzUgQEAKPiAgI2luY2x1ZGUgInFl bXUvY29uZmlnLWZpbGUuaCIKPiAgI2luY2x1ZGUgImZzZGV2L3FlbXUtZnNkZXYuaCIKPiAgCj4g KyNkZWZpbmUgVkVSU0lPTlMgIjEiCj4gKyNkZWZpbmUgTUFYX1JJTkdTIDgKPiArI2RlZmluZSBN QVhfUklOR19PUkRFUiA4Cj4gKwo+ICtzdHJ1Y3QgWGVuOXBmc1Jpbmcgewo+ICsgICAgc3RydWN0 IFhlbjlwZnNEZXYgKnByaXY7Cj4gKwo+ICsgICAgaW50IHJlZjsKPiArICAgIHhlbmV2dGNobl9o YW5kbGUgICAqZXZ0Y2huZGV2Owo+ICsgICAgaW50IGV2dGNobjsKPiArICAgIGludCBsb2NhbF9w b3J0Owo+ICsgICAgc3RydWN0IHhlbl85cGZzX2RhdGFfaW50ZiAqaW50ZjsKPiArICAgIHVuc2ln bmVkIGNoYXIgKmRhdGE7Cj4gKyAgICBzdHJ1Y3QgeGVuXzlwZnNfZGF0YSByaW5nOwo+ICsKPiAr ICAgIFFFTVVCSCAqYmg7Cj4gKwo+ICsgICAgLyogbG9jYWwgY29waWVzLCBzbyB0aGF0IHdlIGNh biByZWFkL3dyaXRlIFBEVSBkYXRhIGRpcmVjdGx5IGZyb20KPiArICAgICAqIHRoZSByaW5nICov Cj4gKyAgICBSSU5HX0lEWCBvdXRfY29ucywgb3V0X3NpemUsIGluX2NvbnM7Cj4gKyAgICBib29s IGlucHJvZ3Jlc3M7Cj4gK307Cj4gKwo+ICB0eXBlZGVmIHN0cnVjdCBYZW45cGZzRGV2IHsKPiAg ICAgIHN0cnVjdCBYZW5EZXZpY2UgeGVuZGV2OyAgLyogbXVzdCBiZSBmaXJzdCAqLwo+ICsgICAg Vjlmc1N0YXRlIHN0YXRlOwo+ICsKPiArICAgIGludCBudW1fcmluZ3M7Cj4gKyAgICBzdHJ1Y3Qg WGVuOXBmc1JpbmcgKnJpbmdzOwo+ICB9IFhlbjlwZnNEZXY7Cj4gIAo+ICBzdGF0aWMgc3NpemVf dCB4ZW5fOXBmc19wZHVfdm1hcnNoYWwoVjlmc1BEVSAqcGR1LAo+IEBAIC02NywyMiArOTQsMTUy IEBAIHN0YXRpYyBpbnQgeGVuXzlwZnNfaW5pdChzdHJ1Y3QgWGVuRGV2aWNlICp4ZW5kZXYpCj4g ICAgICByZXR1cm4gMDsKPiAgfQo+ICAKPiArc3RhdGljIHZvaWQgeGVuXzlwZnNfYmgodm9pZCAq b3BhcXVlKQo+ICt7Cj4gK30KPiArCj4gK3N0YXRpYyB2b2lkIHhlbl85cGZzX2V2dGNobl9ldmVu dCh2b2lkICpvcGFxdWUpCj4gK3sKPiArfQo+ICsKPiAgc3RhdGljIGludCB4ZW5fOXBmc19mcmVl KHN0cnVjdCBYZW5EZXZpY2UgKnhlbmRldikKPiAgewo+IC0gICAgcmV0dXJuIC0xOwo+ICsgICAg aW50IGk7Cj4gKyAgICBzdHJ1Y3QgWGVuOXBmc0RldiAqeGVuXzlwZGV2ID0gY29udGFpbmVyX29m KHhlbmRldiwgc3RydWN0IFhlbjlwZnNEZXYsIHhlbmRldik7Cj4gKwo+ICsgICAgZm9yIChpID0g MDsgaSA8IHhlbl85cGRldi0+bnVtX3JpbmdzOyBpKyspIHsKPiArICAgICAgICBpZiAoeGVuXzlw ZGV2LT5yaW5nc1tpXS5kYXRhICE9IE5VTEwpIHsKPiArICAgICAgICAgICAgeGVuZ250dGFiX3Vu bWFwKHhlbl85cGRldi0+eGVuZGV2LmdudHRhYmRldiwKPiArICAgICAgICAgICAgICAgICAgICB4 ZW5fOXBkZXYtPnJpbmdzW2ldLmRhdGEsCj4gKyAgICAgICAgICAgICAgICAgICAgKDEgPDwgWEVO XzlQRlNfUklOR19PUkRFUikpOwo+ICsgICAgICAgIH0KPiArICAgICAgICBpZiAoeGVuXzlwZGV2 LT5yaW5nc1tpXS5pbnRmICE9IE5VTEwpIHsKPiArICAgICAgICAgICAgeGVuZ250dGFiX3VubWFw KHhlbl85cGRldi0+eGVuZGV2LmdudHRhYmRldiwKPiArICAgICAgICAgICAgICAgICAgICB4ZW5f OXBkZXYtPnJpbmdzW2ldLmludGYsCj4gKyAgICAgICAgICAgICAgICAgICAgMSk7Cj4gKyAgICAg ICAgfQo+ICsgICAgICAgIGlmICh4ZW5fOXBkZXYtPnJpbmdzW2ldLmV2dGNobmRldiA+IDApIHsK PiArICAgICAgICAgICAgcWVtdV9zZXRfZmRfaGFuZGxlcih4ZW5ldnRjaG5fZmQoeGVuXzlwZGV2 LT5yaW5nc1tpXS5ldnRjaG5kZXYpLAo+ICsgICAgICAgICAgICAgICAgICAgIE5VTEwsIE5VTEws IE5VTEwpOwo+ICsgICAgICAgICAgICB4ZW5ldnRjaG5fdW5iaW5kKHhlbl85cGRldi0+cmluZ3Nb aV0uZXZ0Y2huZGV2LCB4ZW5fOXBkZXYtPnJpbmdzW2ldLmxvY2FsX3BvcnQpOwo+ICsgICAgICAg IH0KPiArICAgICAgICBpZiAoeGVuXzlwZGV2LT5yaW5nc1tpXS5iaCAhPSBOVUxMKSB7Cj4gKyAg ICAgICAgICAgIHFlbXVfYmhfZGVsZXRlKHhlbl85cGRldi0+cmluZ3NbaV0uYmgpOwo+ICsgICAg ICAgIH0KPiArICAgIH0KPiArICAgIGdfZnJlZSh4ZW5fOXBkZXYtPnJpbmdzKTsKPiArICAgIHJl dHVybiAwOwo+ICB9Cj4gIAo+ICBzdGF0aWMgaW50IHhlbl85cGZzX2Nvbm5lY3Qoc3RydWN0IFhl bkRldmljZSAqeGVuZGV2KQo+ICB7Cj4gKyAgICBpbnQgaTsKPiArICAgIHN0cnVjdCBYZW45cGZz RGV2ICp4ZW5fOXBkZXYgPSBjb250YWluZXJfb2YoeGVuZGV2LCBzdHJ1Y3QgWGVuOXBmc0Rldiwg eGVuZGV2KTsKPiArICAgIFY5ZnNTdGF0ZSAqcyA9ICZ4ZW5fOXBkZXYtPnN0YXRlOwo+ICsgICAg UWVtdU9wdHMgKmZzZGV2Owo+ICsgICAgY2hhciAqc2VjdXJpdHlfbW9kZWwsICpwYXRoOwo+ICsK PiArICAgIGlmICh4ZW5zdG9yZV9yZWFkX2ZlX2ludCgmeGVuXzlwZGV2LT54ZW5kZXYsICJudW0t cmluZ3MiLAo+ICsgICAgICAgICAgICAgICAgICAgICAgICAgICAgICZ4ZW5fOXBkZXYtPm51bV9y aW5ncykgPT0gLTEgfHwKPiArICAgICAgICB4ZW5fOXBkZXYtPm51bV9yaW5ncyA+IE1BWF9SSU5H UykgewoKV2hhdCBpZiBudW1fcmluZ3MgaXMgPCAxPwoKPiArICAgICAgICByZXR1cm4gLTE7Cj4g KyAgICB9Cj4gKwo+ICsgICAgeGVuXzlwZGV2LT5yaW5ncyA9IGdfbWFsbG9jMCh4ZW5fOXBkZXYt Pm51bV9yaW5ncyAqIHNpemVvZihzdHJ1Y3QgWGVuOXBmc1JpbmcpKTsKPiArICAgIGZvciAoaSA9 IDA7IGkgPCB4ZW5fOXBkZXYtPm51bV9yaW5nczsgaSsrKSB7Cj4gKyAgICAgICAgY2hhciBzdHJb MTZdOwo+ICsKPiArICAgICAgICB4ZW5fOXBkZXYtPnJpbmdzW2ldLnByaXYgPSB4ZW5fOXBkZXY7 Cj4gKyAgICAgICAgeGVuXzlwZGV2LT5yaW5nc1tpXS5ldnRjaG4gPSAtMTsKPiArICAgICAgICB4 ZW5fOXBkZXYtPnJpbmdzW2ldLmxvY2FsX3BvcnQgPSAtMTsKPiArCj4gKyAgICAgICAgc3ByaW50 ZihzdHIsICJyaW5nLXJlZiV1IiwgaSk7Cgp1c2UgZ19zdHJkdXBfcHJpbnRmKCk/Cgo+ICsgICAg ICAgIGlmICh4ZW5zdG9yZV9yZWFkX2ZlX2ludCgmeGVuXzlwZGV2LT54ZW5kZXYsIHN0ciwKPiAr ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJnhlbl85cGRldi0+cmluZ3NbaV0ucmVm KSA9PSAtMSkgewo+ICsgICAgICAgICAgICBnb3RvIG91dDsKPiArICAgICAgICB9Cj4gKyAgICAg ICAgc3ByaW50ZihzdHIsICJldmVudC1jaGFubmVsLSV1IiwgaSk7Cgp1c2UgZ19zdHJkdXBfcHJp bnRmKCk/CgoKSnVlcmdlbgoKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW4ub3Jn Cmh0dHBzOi8vbGlzdHMueGVuLm9yZy94ZW4tZGV2ZWwK