From: Stefano Stabellini <sstabellini@kernel.org>
To: xen-devel@lists.xen.org
Cc: linux-kernel@vger.kernel.org, sstabellini@kernel.org,
jgross@suse.com, boris.ostrovsky@oracle.com,
Stefano Stabellini <stefano@aporeto.com>
Subject: [PATCH v1 11/13] xen/pvcalls: implement release command
Date: Fri, 21 Jul 2017 17:12:01 -0700 [thread overview]
Message-ID: <1500682323-25940-11-git-send-email-sstabellini@kernel.org> (raw)
In-Reply-To: <1500682323-25940-1-git-send-email-sstabellini@kernel.org>
Send PVCALLS_RELEASE to the backend and wait for a reply. Take both
in_mutex and out_mutex to avoid concurrent accesses. Then, free the
socket.
Signed-off-by: Stefano Stabellini <stefano@aporeto.com>
CC: boris.ostrovsky@oracle.com
CC: jgross@suse.com
---
drivers/xen/pvcalls-front.c | 86 +++++++++++++++++++++++++++++++++++++++++++++
drivers/xen/pvcalls-front.h | 1 +
2 files changed, 87 insertions(+)
diff --git a/drivers/xen/pvcalls-front.c b/drivers/xen/pvcalls-front.c
index b6cfb7d..bd3dfac 100644
--- a/drivers/xen/pvcalls-front.c
+++ b/drivers/xen/pvcalls-front.c
@@ -174,6 +174,24 @@ static irqreturn_t pvcalls_front_conn_handler(int irq, void *sock_map)
return IRQ_HANDLED;
}
+static void pvcalls_front_free_map(struct pvcalls_bedata *bedata,
+ struct sock_mapping *map)
+{
+ int i;
+
+ spin_lock(&bedata->pvcallss_lock);
+ if (!list_empty(&map->list))
+ list_del_init(&map->list);
+ spin_unlock(&bedata->pvcallss_lock);
+
+ /* what if the thread waiting still need access? */
+ for (i = 0; i < (1 << map->active.ring->ring_order); i++)
+ gnttab_end_foreign_access(map->active.ring->ref[i], 0, 0);
+ gnttab_end_foreign_access(map->active.ref, 0, 0);
+ free_page((unsigned long)map->active.ring);
+ unbind_from_irqhandler(map->active.irq, map);
+}
+
int pvcalls_front_socket(struct socket *sock)
{
struct pvcalls_bedata *bedata;
@@ -805,6 +823,74 @@ unsigned int pvcalls_front_poll(struct file *file, struct socket *sock,
return pvcalls_front_poll_passive(file, bedata, map, wait);
}
+int pvcalls_front_release(struct socket *sock)
+{
+ struct pvcalls_bedata *bedata;
+ struct sock_mapping *map;
+ int req_id, notify;
+ struct xen_pvcalls_request *req;
+
+ if (!pvcalls_front_dev)
+ return -EIO;
+ bedata = dev_get_drvdata(&pvcalls_front_dev->dev);
+ if (!bedata)
+ return -EIO;
+
+ if (sock->sk == NULL)
+ return 0;
+
+ map = (struct sock_mapping *) READ_ONCE(sock->sk->sk_send_head);
+ if (map == NULL)
+ return 0;
+ WRITE_ONCE(sock->sk->sk_send_head, NULL);
+
+ spin_lock(&bedata->pvcallss_lock);
+ req_id = bedata->ring.req_prod_pvt & (RING_SIZE(&bedata->ring) - 1);
+ BUG_ON(req_id >= PVCALLS_NR_REQ_PER_RING);
+ if (RING_FULL(&bedata->ring) ||
+ READ_ONCE(bedata->rsp[req_id].req_id) != PVCALLS_INVALID_ID) {
+ spin_unlock(&bedata->pvcallss_lock);
+ return -EAGAIN;
+ }
+ req = RING_GET_REQUEST(&bedata->ring, req_id);
+ req->req_id = req_id;
+ req->cmd = PVCALLS_RELEASE;
+ req->u.release.id = (uint64_t)sock;
+
+ bedata->ring.req_prod_pvt++;
+ RING_PUSH_REQUESTS_AND_CHECK_NOTIFY(&bedata->ring, notify);
+ spin_unlock(&bedata->pvcallss_lock);
+ if (notify)
+ notify_remote_via_irq(bedata->irq);
+
+ wait_event(bedata->inflight_req,
+ READ_ONCE(bedata->rsp[req_id].req_id) == req_id);
+
+ if (map->active_socket) {
+ /*
+ * Set in_error and wake up inflight_conn_req to force
+ * recvmsg waiters to exit.
+ */
+ map->active.ring->in_error = -EBADF;
+ wake_up_interruptible(&map->active.inflight_conn_req);
+
+ mutex_lock(&map->active.in_mutex);
+ mutex_lock(&map->active.out_mutex);
+ pvcalls_front_free_map(bedata, map);
+ mutex_unlock(&map->active.out_mutex);
+ mutex_unlock(&map->active.in_mutex);
+ kfree(map);
+ } else {
+ spin_lock(&bedata->pvcallss_lock);
+ list_del_init(&map->list);
+ kfree(map);
+ spin_unlock(&bedata->pvcallss_lock);
+ }
+ WRITE_ONCE(bedata->rsp[req_id].req_id, PVCALLS_INVALID_ID);
+
+ 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 25e05b8..3332978 100644
--- a/drivers/xen/pvcalls-front.h
+++ b/drivers/xen/pvcalls-front.h
@@ -23,5 +23,6 @@ int pvcalls_front_recvmsg(struct socket *sock,
unsigned int pvcalls_front_poll(struct file *file,
struct socket *sock,
poll_table *wait);
+int pvcalls_front_release(struct socket *sock);
#endif
--
1.9.1
next prev parent reply other threads:[~2017-07-22 0:12 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-22 0:11 [PATCH v1 00/13] introduce the Xen PV Calls frontend Stefano Stabellini
2017-07-22 0:11 ` [PATCH v1 01/13] xen/pvcalls: introduce the pvcalls xenbus frontend Stefano Stabellini
2017-07-22 0:11 ` [PATCH v1 02/13] xen/pvcalls: connect to the backend Stefano Stabellini
2017-07-24 19:23 ` Juergen Gross
2017-07-25 20:10 ` Stefano Stabellini
2017-07-22 0:11 ` [PATCH v1 03/13] xen/pvcalls: implement socket command and handle events Stefano Stabellini
2017-07-24 19:29 ` Juergen Gross
2017-07-25 20:43 ` Stefano Stabellini
2017-07-22 0:11 ` [PATCH v1 04/13] xen/pvcalls: implement connect command Stefano Stabellini
2017-07-24 19:40 ` Juergen Gross
2017-07-24 22:45 ` Stefano Stabellini
2017-07-22 0:11 ` [PATCH v1 05/13] xen/pvcalls: implement bind command Stefano Stabellini
2017-07-24 19:43 ` Juergen Gross
2017-07-24 22:51 ` Stefano Stabellini
2017-07-22 0:11 ` [PATCH v1 06/13] xen/pvcalls: implement listen command Stefano Stabellini
2017-07-24 19:44 ` Juergen Gross
2017-07-24 22:51 ` Stefano Stabellini
2017-07-22 0:11 ` [PATCH v1 07/13] xen/pvcalls: implement accept command Stefano Stabellini
2017-07-24 19:47 ` Juergen Gross
2017-07-24 22:53 ` Stefano Stabellini
2017-07-22 0:11 ` [PATCH v1 08/13] xen/pvcalls: implement sendmsg Stefano Stabellini
2017-07-24 19:51 ` Juergen Gross
2017-07-24 22:38 ` Stefano Stabellini
2017-07-22 0:11 ` [PATCH v1 09/13] xen/pvcalls: implement recvmsg Stefano Stabellini
2017-07-24 19:56 ` Juergen Gross
2017-07-24 22:37 ` Stefano Stabellini
2017-07-22 0:12 ` [PATCH v1 10/13] xen/pvcalls: implement poll command Stefano Stabellini
2017-07-24 20:08 ` Juergen Gross
2017-07-25 20:59 ` Stefano Stabellini
2017-07-22 0:12 ` Stefano Stabellini [this message]
2017-07-24 20:14 ` [PATCH v1 11/13] xen/pvcalls: implement release command Juergen Gross
2017-07-25 21:07 ` Stefano Stabellini
2017-07-22 0:12 ` [PATCH v1 12/13] xen/pvcalls: implement frontend disconnect Stefano Stabellini
2017-07-24 20:16 ` Juergen Gross
2017-07-22 0:12 ` [PATCH v1 13/13] xen: introduce a Kconfig option to enable the pvcalls frontend Stefano Stabellini
2017-07-24 20:17 ` Juergen Gross
2017-07-24 22:36 ` Stefano Stabellini
2017-07-24 19:06 ` [PATCH v1 01/13] xen/pvcalls: introduce the pvcalls xenbus frontend Juergen Gross
2017-07-24 22:32 ` Stefano Stabellini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1500682323-25940-11-git-send-email-sstabellini@kernel.org \
--to=sstabellini@kernel.org \
--cc=boris.ostrovsky@oracle.com \
--cc=jgross@suse.com \
--cc=linux-kernel@vger.kernel.org \
--cc=stefano@aporeto.com \
--cc=xen-devel@lists.xen.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox