From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751973AbdIOXCQ (ORCPT ); Fri, 15 Sep 2017 19:02:16 -0400 Received: from mail.kernel.org ([198.145.29.99]:37042 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751594AbdIOXAp (ORCPT ); Fri, 15 Sep 2017 19:00:45 -0400 DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9059622A7A Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=sstabellini@kernel.org From: Stefano Stabellini To: xen-devel@lists.xen.org Cc: linux-kernel@vger.kernel.org, sstabellini@kernel.org, jgross@suse.com, boris.ostrovsky@oracle.com, Stefano Stabellini Subject: [PATCH v4 06/13] xen/pvcalls: implement bind command Date: Fri, 15 Sep 2017 16:00:33 -0700 Message-Id: <1505516440-11111-6-git-send-email-sstabellini@kernel.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1505516440-11111-1-git-send-email-sstabellini@kernel.org> References: <1505516440-11111-1-git-send-email-sstabellini@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Send PVCALLS_BIND to the backend. Introduce a new structure, part of struct sock_mapping, to store information specific to passive sockets. Introduce a status field to keep track of the status of the passive socket. Signed-off-by: Stefano Stabellini CC: boris.ostrovsky@oracle.com CC: jgross@suse.com --- drivers/xen/pvcalls-front.c | 68 +++++++++++++++++++++++++++++++++++++++++++++ drivers/xen/pvcalls-front.h | 3 ++ 2 files changed, 71 insertions(+) diff --git a/drivers/xen/pvcalls-front.c b/drivers/xen/pvcalls-front.c index ef511b6..50b6588 100644 --- a/drivers/xen/pvcalls-front.c +++ b/drivers/xen/pvcalls-front.c @@ -72,6 +72,13 @@ struct sock_mapping { wait_queue_head_t inflight_conn_req; } active; + struct { + /* Socket status */ +#define PVCALLS_STATUS_UNINITALIZED 0 +#define PVCALLS_STATUS_BIND 1 +#define PVCALLS_STATUS_LISTEN 2 + uint8_t status; + } passive; }; }; @@ -346,6 +353,67 @@ int pvcalls_front_connect(struct socket *sock, struct sockaddr *addr, return ret; } +int pvcalls_front_bind(struct socket *sock, struct sockaddr *addr, int addr_len) +{ + struct pvcalls_bedata *bedata; + struct sock_mapping *map = NULL; + struct xen_pvcalls_request *req; + int notify, req_id, ret; + + pvcalls_enter; + if (!pvcalls_front_dev) { + pvcalls_exit; + return -ENOTCONN; + } + if (addr->sa_family != AF_INET || sock->type != SOCK_STREAM) { + pvcalls_exit; + return -ENOTSUPP; + } + bedata = dev_get_drvdata(&pvcalls_front_dev->dev); + + map = (struct sock_mapping *) sock->sk->sk_send_head; + if (map == NULL) { + pvcalls_exit; + return -ENOTSOCK; + } + + spin_lock(&bedata->socket_lock); + ret = get_request(bedata, &req_id); + if (ret < 0) { + spin_unlock(&bedata->socket_lock); + pvcalls_exit; + return ret; + } + req = RING_GET_REQUEST(&bedata->ring, req_id); + req->req_id = req_id; + map->sock = sock; + req->cmd = PVCALLS_BIND; + req->u.bind.id = (uint64_t) map; + memcpy(req->u.bind.addr, addr, sizeof(*addr)); + req->u.bind.len = addr_len; + + init_waitqueue_head(&map->passive.inflight_accept_req); + + map->active_socket = false; + + bedata->ring.req_prod_pvt++; + RING_PUSH_REQUESTS_AND_CHECK_NOTIFY(&bedata->ring, notify); + spin_unlock(&bedata->socket_lock); + if (notify) + notify_remote_via_irq(bedata->irq); + + wait_event(bedata->inflight_req, + READ_ONCE(bedata->rsp[req_id].req_id) == req_id); + + map->passive.status = PVCALLS_STATUS_BIND; + ret = bedata->rsp[req_id].ret; + /* read ret, then set this rsp slot to be reused */ + smp_mb(); + WRITE_ONCE(bedata->rsp[req_id].req_id, PVCALLS_INVALID_ID); + pvcalls_exit; + return 0; +} + static const struct xenbus_device_id pvcalls_front_ids[] = { { "pvcalls" }, { "" } diff --git a/drivers/xen/pvcalls-front.h b/drivers/xen/pvcalls-front.h index 63b0417..8b0a274 100644 --- a/drivers/xen/pvcalls-front.h +++ b/drivers/xen/pvcalls-front.h @@ -6,5 +6,8 @@ int pvcalls_front_socket(struct socket *sock); int pvcalls_front_connect(struct socket *sock, struct sockaddr *addr, int addr_len, int flags); +int pvcalls_front_bind(struct socket *sock, + struct sockaddr *addr, + int addr_len); #endif -- 1.9.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefano Stabellini Subject: [PATCH v4 06/13] xen/pvcalls: implement bind command Date: Fri, 15 Sep 2017 16:00:33 -0700 Message-ID: <1505516440-11111-6-git-send-email-sstabellini@kernel.org> References: <1505516440-11111-1-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: <1505516440-11111-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.xen.org Cc: jgross@suse.com, Stefano Stabellini , boris.ostrovsky@oracle.com, sstabellini@kernel.org, linux-kernel@vger.kernel.org List-Id: xen-devel@lists.xenproject.org U2VuZCBQVkNBTExTX0JJTkQgdG8gdGhlIGJhY2tlbmQuIEludHJvZHVjZSBhIG5ldyBzdHJ1Y3R1 cmUsIHBhcnQgb2YKc3RydWN0IHNvY2tfbWFwcGluZywgdG8gc3RvcmUgaW5mb3JtYXRpb24gc3Bl Y2lmaWMgdG8gcGFzc2l2ZSBzb2NrZXRzLgoKSW50cm9kdWNlIGEgc3RhdHVzIGZpZWxkIHRvIGtl ZXAgdHJhY2sgb2YgdGhlIHN0YXR1cyBvZiB0aGUgcGFzc2l2ZQpzb2NrZXQuCgpTaWduZWQtb2Zm LWJ5OiBTdGVmYW5vIFN0YWJlbGxpbmkgPHN0ZWZhbm9AYXBvcmV0by5jb20+CkNDOiBib3Jpcy5v c3Ryb3Zza3lAb3JhY2xlLmNvbQpDQzogamdyb3NzQHN1c2UuY29tCi0tLQogZHJpdmVycy94ZW4v cHZjYWxscy1mcm9udC5jIHwgNjggKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrCiBkcml2ZXJzL3hlbi9wdmNhbGxzLWZyb250LmggfCAgMyArKwogMiBmaWxlcyBj aGFuZ2VkLCA3MSBpbnNlcnRpb25zKCspCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy94ZW4vcHZjYWxs cy1mcm9udC5jIGIvZHJpdmVycy94ZW4vcHZjYWxscy1mcm9udC5jCmluZGV4IGVmNTExYjYuLjUw YjY1ODggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMveGVuL3B2Y2FsbHMtZnJvbnQuYworKysgYi9kcml2 ZXJzL3hlbi9wdmNhbGxzLWZyb250LmMKQEAgLTcyLDYgKzcyLDEzIEBAIHN0cnVjdCBzb2NrX21h cHBpbmcgewogCiAJCQl3YWl0X3F1ZXVlX2hlYWRfdCBpbmZsaWdodF9jb25uX3JlcTsKIAkJfSBh Y3RpdmU7CisJCXN0cnVjdCB7CisJCS8qIFNvY2tldCBzdGF0dXMgKi8KKyNkZWZpbmUgUFZDQUxM U19TVEFUVVNfVU5JTklUQUxJWkVEICAwCisjZGVmaW5lIFBWQ0FMTFNfU1RBVFVTX0JJTkQgICAg ICAgICAgMQorI2RlZmluZSBQVkNBTExTX1NUQVRVU19MSVNURU4gICAgICAgIDIKKwkJCXVpbnQ4 X3Qgc3RhdHVzOworCQl9IHBhc3NpdmU7CiAJfTsKIH07CiAKQEAgLTM0Niw2ICszNTMsNjcgQEAg aW50IHB2Y2FsbHNfZnJvbnRfY29ubmVjdChzdHJ1Y3Qgc29ja2V0ICpzb2NrLCBzdHJ1Y3Qgc29j a2FkZHIgKmFkZHIsCiAJcmV0dXJuIHJldDsKIH0KIAoraW50IHB2Y2FsbHNfZnJvbnRfYmluZChz dHJ1Y3Qgc29ja2V0ICpzb2NrLCBzdHJ1Y3Qgc29ja2FkZHIgKmFkZHIsIGludCBhZGRyX2xlbikK K3sKKwlzdHJ1Y3QgcHZjYWxsc19iZWRhdGEgKmJlZGF0YTsKKwlzdHJ1Y3Qgc29ja19tYXBwaW5n ICptYXAgPSBOVUxMOworCXN0cnVjdCB4ZW5fcHZjYWxsc19yZXF1ZXN0ICpyZXE7CisJaW50IG5v dGlmeSwgcmVxX2lkLCByZXQ7CisKKwlwdmNhbGxzX2VudGVyOworCWlmICghcHZjYWxsc19mcm9u dF9kZXYpIHsKKwkJcHZjYWxsc19leGl0OworCQlyZXR1cm4gLUVOT1RDT05OOworCX0KKwlpZiAo YWRkci0+c2FfZmFtaWx5ICE9IEFGX0lORVQgfHwgc29jay0+dHlwZSAhPSBTT0NLX1NUUkVBTSkg eworCQlwdmNhbGxzX2V4aXQ7CisJCXJldHVybiAtRU5PVFNVUFA7CisJfQorCWJlZGF0YSA9IGRl dl9nZXRfZHJ2ZGF0YSgmcHZjYWxsc19mcm9udF9kZXYtPmRldik7CisKKwltYXAgPSAoc3RydWN0 IHNvY2tfbWFwcGluZyAqKSBzb2NrLT5zay0+c2tfc2VuZF9oZWFkOworCWlmIChtYXAgPT0gTlVM TCkgeworCQlwdmNhbGxzX2V4aXQ7CisJCXJldHVybiAtRU5PVFNPQ0s7CisJfQorCisJc3Bpbl9s b2NrKCZiZWRhdGEtPnNvY2tldF9sb2NrKTsKKwlyZXQgPSBnZXRfcmVxdWVzdChiZWRhdGEsICZy ZXFfaWQpOworCWlmIChyZXQgPCAwKSB7CisJCXNwaW5fdW5sb2NrKCZiZWRhdGEtPnNvY2tldF9s b2NrKTsKKwkJcHZjYWxsc19leGl0OworCQlyZXR1cm4gcmV0OworCX0KKwlyZXEgPSBSSU5HX0dF VF9SRVFVRVNUKCZiZWRhdGEtPnJpbmcsIHJlcV9pZCk7CisJcmVxLT5yZXFfaWQgPSByZXFfaWQ7 CisJbWFwLT5zb2NrID0gc29jazsKKwlyZXEtPmNtZCA9IFBWQ0FMTFNfQklORDsKKwlyZXEtPnUu YmluZC5pZCA9ICh1aW50NjRfdCkgbWFwOworCW1lbWNweShyZXEtPnUuYmluZC5hZGRyLCBhZGRy LCBzaXplb2YoKmFkZHIpKTsKKwlyZXEtPnUuYmluZC5sZW4gPSBhZGRyX2xlbjsKKworCWluaXRf d2FpdHF1ZXVlX2hlYWQoJm1hcC0+cGFzc2l2ZS5pbmZsaWdodF9hY2NlcHRfcmVxKTsKKworCW1h cC0+YWN0aXZlX3NvY2tldCA9IGZhbHNlOworCisJYmVkYXRhLT5yaW5nLnJlcV9wcm9kX3B2dCsr OworCVJJTkdfUFVTSF9SRVFVRVNUU19BTkRfQ0hFQ0tfTk9USUZZKCZiZWRhdGEtPnJpbmcsIG5v dGlmeSk7CisJc3Bpbl91bmxvY2soJmJlZGF0YS0+c29ja2V0X2xvY2spOworCWlmIChub3RpZnkp CisJCW5vdGlmeV9yZW1vdGVfdmlhX2lycShiZWRhdGEtPmlycSk7CisKKwl3YWl0X2V2ZW50KGJl ZGF0YS0+aW5mbGlnaHRfcmVxLAorCQkgICBSRUFEX09OQ0UoYmVkYXRhLT5yc3BbcmVxX2lkXS5y ZXFfaWQpID09IHJlcV9pZCk7CisKKwltYXAtPnBhc3NpdmUuc3RhdHVzID0gUFZDQUxMU19TVEFU VVNfQklORDsKKwlyZXQgPSBiZWRhdGEtPnJzcFtyZXFfaWRdLnJldDsKKwkvKiByZWFkIHJldCwg dGhlbiBzZXQgdGhpcyByc3Agc2xvdCB0byBiZSByZXVzZWQgKi8KKwlzbXBfbWIoKTsKKwlXUklU RV9PTkNFKGJlZGF0YS0+cnNwW3JlcV9pZF0ucmVxX2lkLCBQVkNBTExTX0lOVkFMSURfSUQpOwor CXB2Y2FsbHNfZXhpdDsKKwlyZXR1cm4gMDsKK30KKwogc3RhdGljIGNvbnN0IHN0cnVjdCB4ZW5i dXNfZGV2aWNlX2lkIHB2Y2FsbHNfZnJvbnRfaWRzW10gPSB7CiAJeyAicHZjYWxscyIgfSwKIAl7 ICIiIH0KZGlmZiAtLWdpdCBhL2RyaXZlcnMveGVuL3B2Y2FsbHMtZnJvbnQuaCBiL2RyaXZlcnMv eGVuL3B2Y2FsbHMtZnJvbnQuaAppbmRleCA2M2IwNDE3Li44YjBhMjc0IDEwMDY0NAotLS0gYS9k cml2ZXJzL3hlbi9wdmNhbGxzLWZyb250LmgKKysrIGIvZHJpdmVycy94ZW4vcHZjYWxscy1mcm9u dC5oCkBAIC02LDUgKzYsOCBAQAogaW50IHB2Y2FsbHNfZnJvbnRfc29ja2V0KHN0cnVjdCBzb2Nr ZXQgKnNvY2spOwogaW50IHB2Y2FsbHNfZnJvbnRfY29ubmVjdChzdHJ1Y3Qgc29ja2V0ICpzb2Nr LCBzdHJ1Y3Qgc29ja2FkZHIgKmFkZHIsCiAJCQkgIGludCBhZGRyX2xlbiwgaW50IGZsYWdzKTsK K2ludCBwdmNhbGxzX2Zyb250X2JpbmQoc3RydWN0IHNvY2tldCAqc29jaywKKwkJICAgICAgIHN0 cnVjdCBzb2NrYWRkciAqYWRkciwKKwkJICAgICAgIGludCBhZGRyX2xlbik7CiAKICNlbmRpZgot LSAKMS45LjEKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f XwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW4ub3JnCmh0dHBzOi8v bGlzdHMueGVuLm9yZy94ZW4tZGV2ZWwK