From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754644AbdCFULd (ORCPT ); Mon, 6 Mar 2017 15:11:33 -0500 Received: from mail.kernel.org ([198.145.29.136]:51914 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754575AbdCFULS (ORCPT ); Mon, 6 Mar 2017 15:11:18 -0500 From: Stefano Stabellini To: xen-devel@lists.xenproject.org Cc: linux-kernel@vger.kernel.org, sstabellini@kernel.org, Stefano Stabellini , boris.ostrovsky@oracle.com, jgross@suse.com, Eric Van Hensbergen , Ron Minnich , Latchesar Ionkov , v9fs-developer@lists.sourceforge.net Subject: [PATCH 6/7] xen/9pfs: receive responses Date: Mon, 6 Mar 2017 12:01:27 -0800 Message-Id: <1488830488-18506-6-git-send-email-sstabellini@kernel.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1488830488-18506-1-git-send-email-sstabellini@kernel.org> References: <1488830488-18506-1-git-send-email-sstabellini@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Upon receiving a notification from the backend, schedule the p9_xen_response work_struct. p9_xen_response checks if any responses are available, if so, it reads them one by one, calling p9_client_cb to send them up to the 9p layer (p9_client_cb completes the request). Handle the ring following the Xen 9pfs specification. Signed-off-by: Stefano Stabellini CC: boris.ostrovsky@oracle.com CC: jgross@suse.com CC: Eric Van Hensbergen CC: Ron Minnich CC: Latchesar Ionkov CC: v9fs-developer@lists.sourceforge.net --- net/9p/trans_xen.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/net/9p/trans_xen.c b/net/9p/trans_xen.c index 4e26556..1ca9246 100644 --- a/net/9p/trans_xen.c +++ b/net/9p/trans_xen.c @@ -149,6 +149,59 @@ static int p9_xen_request(struct p9_client *client, struct p9_req_t *p9_req) static void p9_xen_response(struct work_struct *work) { + struct xen_9pfs_front_priv *priv; + struct xen_9pfs_dataring *ring; + RING_IDX cons, prod, masked_cons, masked_prod; + struct xen_9pfs_header h; + struct p9_req_t *req; + int status = REQ_STATUS_ERROR; + + ring = container_of(work, struct xen_9pfs_dataring, work); + priv = ring->priv; + + while (1) { + cons = ring->intf->in_cons; + prod = ring->intf->in_prod; + rmb(); + + if (xen_9pfs_queued(prod, cons, XEN_9PFS_RING_SIZE) < sizeof(h)) { + notify_remote_via_irq(ring->irq); + return; + } + + masked_prod = xen_9pfs_mask(prod, XEN_9PFS_RING_SIZE); + masked_cons = xen_9pfs_mask(cons, XEN_9PFS_RING_SIZE); + + xen_9pfs_read_packet(ring->ring.in, + masked_prod, &masked_cons, + XEN_9PFS_RING_SIZE, &h, sizeof(h)); + + req = p9_tag_lookup(priv->client, h.tag); + if (!req || req->status != REQ_STATUS_SENT) { + dev_warn(&priv->dev->dev, "Wrong req tag=%x\n", h.tag); + cons += h.size; + mb(); + ring->intf->in_cons = cons; + continue; + } + + memcpy(req->rc, &h, sizeof(h)); + req->rc->offset = 0; + + masked_cons = xen_9pfs_mask(cons, XEN_9PFS_RING_SIZE); + xen_9pfs_read_packet(ring->ring.in, + masked_prod, &masked_cons, + XEN_9PFS_RING_SIZE, req->rc->sdata, h.size); + + mb(); + cons += h.size; + ring->intf->in_cons = cons; + + if (req->status != REQ_STATUS_ERROR) + status = REQ_STATUS_RCVD; + + p9_client_cb(priv->client, req, status); + } } static irqreturn_t xen_9pfs_front_event_handler(int irq, void *r) -- 1.9.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefano Stabellini Subject: [PATCH 6/7] xen/9pfs: receive responses Date: Mon, 6 Mar 2017 12:01:27 -0800 Message-ID: <1488830488-18506-6-git-send-email-sstabellini@kernel.org> References: <1488830488-18506-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.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ckypE-0004Hn-2j for xen-devel@lists.xenproject.org; Mon, 06 Mar 2017 20:01:44 +0000 In-Reply-To: <1488830488-18506-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: xen-devel@lists.xenproject.org Cc: jgross@suse.com, Latchesar Ionkov , sstabellini@kernel.org, Eric Van Hensbergen , linux-kernel@vger.kernel.org, Stefano Stabellini , v9fs-developer@lists.sourceforge.net, Ron Minnich , boris.ostrovsky@oracle.com List-Id: xen-devel@lists.xenproject.org VXBvbiByZWNlaXZpbmcgYSBub3RpZmljYXRpb24gZnJvbSB0aGUgYmFja2VuZCwgc2NoZWR1bGUg dGhlCnA5X3hlbl9yZXNwb25zZSB3b3JrX3N0cnVjdC4gcDlfeGVuX3Jlc3BvbnNlIGNoZWNrcyBp ZiBhbnkgcmVzcG9uc2VzIGFyZQphdmFpbGFibGUsIGlmIHNvLCBpdCByZWFkcyB0aGVtIG9uZSBi eSBvbmUsIGNhbGxpbmcgcDlfY2xpZW50X2NiIHRvIHNlbmQKdGhlbSB1cCB0byB0aGUgOXAgbGF5 ZXIgKHA5X2NsaWVudF9jYiBjb21wbGV0ZXMgdGhlIHJlcXVlc3QpLiBIYW5kbGUgdGhlCnJpbmcg Zm9sbG93aW5nIHRoZSBYZW4gOXBmcyBzcGVjaWZpY2F0aW9uLgoKU2lnbmVkLW9mZi1ieTogU3Rl ZmFubyBTdGFiZWxsaW5pIDxzdGVmYW5vQGFwb3JldG8uY29tPgpDQzogYm9yaXMub3N0cm92c2t5 QG9yYWNsZS5jb20KQ0M6IGpncm9zc0BzdXNlLmNvbQpDQzogRXJpYyBWYW4gSGVuc2JlcmdlbiA8 ZXJpY3ZoQGdtYWlsLmNvbT4KQ0M6IFJvbiBNaW5uaWNoIDxybWlubmljaEBzYW5kaWEuZ292PgpD QzogTGF0Y2hlc2FyIElvbmtvdiA8bHVjaG9AaW9ua292Lm5ldD4KQ0M6IHY5ZnMtZGV2ZWxvcGVy QGxpc3RzLnNvdXJjZWZvcmdlLm5ldAotLS0KIG5ldC85cC90cmFuc194ZW4uYyB8IDUzICsrKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrCiAxIGZpbGUg Y2hhbmdlZCwgNTMgaW5zZXJ0aW9ucygrKQoKZGlmZiAtLWdpdCBhL25ldC85cC90cmFuc194ZW4u YyBiL25ldC85cC90cmFuc194ZW4uYwppbmRleCA0ZTI2NTU2Li4xY2E5MjQ2IDEwMDY0NAotLS0g YS9uZXQvOXAvdHJhbnNfeGVuLmMKKysrIGIvbmV0LzlwL3RyYW5zX3hlbi5jCkBAIC0xNDksNiAr MTQ5LDU5IEBAIHN0YXRpYyBpbnQgcDlfeGVuX3JlcXVlc3Qoc3RydWN0IHA5X2NsaWVudCAqY2xp ZW50LCBzdHJ1Y3QgcDlfcmVxX3QgKnA5X3JlcSkKIAogc3RhdGljIHZvaWQgcDlfeGVuX3Jlc3Bv bnNlKHN0cnVjdCB3b3JrX3N0cnVjdCAqd29yaykKIHsKKwlzdHJ1Y3QgeGVuXzlwZnNfZnJvbnRf cHJpdiAqcHJpdjsKKwlzdHJ1Y3QgeGVuXzlwZnNfZGF0YXJpbmcgKnJpbmc7CisJUklOR19JRFgg Y29ucywgcHJvZCwgbWFza2VkX2NvbnMsIG1hc2tlZF9wcm9kOworCXN0cnVjdCB4ZW5fOXBmc19o ZWFkZXIgaDsKKwlzdHJ1Y3QgcDlfcmVxX3QgKnJlcTsKKwlpbnQgc3RhdHVzID0gUkVRX1NUQVRV U19FUlJPUjsKKworCXJpbmcgPSBjb250YWluZXJfb2Yod29yaywgc3RydWN0IHhlbl85cGZzX2Rh dGFyaW5nLCB3b3JrKTsKKwlwcml2ID0gcmluZy0+cHJpdjsKKworCXdoaWxlICgxKSB7CisJCWNv bnMgPSByaW5nLT5pbnRmLT5pbl9jb25zOworCQlwcm9kID0gcmluZy0+aW50Zi0+aW5fcHJvZDsK KwkJcm1iKCk7CisKKwkJaWYgKHhlbl85cGZzX3F1ZXVlZChwcm9kLCBjb25zLCBYRU5fOVBGU19S SU5HX1NJWkUpIDwgc2l6ZW9mKGgpKSB7CisJCQlub3RpZnlfcmVtb3RlX3ZpYV9pcnEocmluZy0+ aXJxKTsKKwkJCXJldHVybjsKKwkJfQorCisJCW1hc2tlZF9wcm9kID0geGVuXzlwZnNfbWFzayhw cm9kLCBYRU5fOVBGU19SSU5HX1NJWkUpOworCQltYXNrZWRfY29ucyA9IHhlbl85cGZzX21hc2so Y29ucywgWEVOXzlQRlNfUklOR19TSVpFKTsKKworCQl4ZW5fOXBmc19yZWFkX3BhY2tldChyaW5n LT5yaW5nLmluLAorCQkJCW1hc2tlZF9wcm9kLCAmbWFza2VkX2NvbnMsCisJCQkJWEVOXzlQRlNf UklOR19TSVpFLCAmaCwgc2l6ZW9mKGgpKTsKKworCQlyZXEgPSBwOV90YWdfbG9va3VwKHByaXYt PmNsaWVudCwgaC50YWcpOworCQlpZiAoIXJlcSB8fCByZXEtPnN0YXR1cyAhPSBSRVFfU1RBVFVT X1NFTlQpIHsKKwkJCWRldl93YXJuKCZwcml2LT5kZXYtPmRldiwgIldyb25nIHJlcSB0YWc9JXhc biIsIGgudGFnKTsKKwkJCWNvbnMgKz0gaC5zaXplOworCQkJbWIoKTsKKwkJCXJpbmctPmludGYt PmluX2NvbnMgPSBjb25zOworCQkJY29udGludWU7CisJCX0KKworCQltZW1jcHkocmVxLT5yYywg JmgsIHNpemVvZihoKSk7CisJCXJlcS0+cmMtPm9mZnNldCA9IDA7CisKKwkJbWFza2VkX2NvbnMg PSB4ZW5fOXBmc19tYXNrKGNvbnMsIFhFTl85UEZTX1JJTkdfU0laRSk7CisJCXhlbl85cGZzX3Jl YWRfcGFja2V0KHJpbmctPnJpbmcuaW4sCisJCQkJbWFza2VkX3Byb2QsICZtYXNrZWRfY29ucywK KwkJCQlYRU5fOVBGU19SSU5HX1NJWkUsIHJlcS0+cmMtPnNkYXRhLCBoLnNpemUpOworCisJCW1i KCk7CisJCWNvbnMgKz0gaC5zaXplOworCQlyaW5nLT5pbnRmLT5pbl9jb25zID0gY29uczsKKwor CQlpZiAocmVxLT5zdGF0dXMgIT0gUkVRX1NUQVRVU19FUlJPUikKKwkJCXN0YXR1cyA9IFJFUV9T VEFUVVNfUkNWRDsKKworCQlwOV9jbGllbnRfY2IocHJpdi0+Y2xpZW50LCByZXEsIHN0YXR1cyk7 CisJfQogfQogCiBzdGF0aWMgaXJxcmV0dXJuX3QgeGVuXzlwZnNfZnJvbnRfZXZlbnRfaGFuZGxl cihpbnQgaXJxLCB2b2lkICpyKQotLSAKMS45LjEKCgpfX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBs aXN0cy54ZW4ub3JnCmh0dHBzOi8vbGlzdHMueGVuLm9yZy94ZW4tZGV2ZWwK