All of lore.kernel.org
 help / color / mirror / Atom feed
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 v4 12/13] xen/pvcalls: implement release command
Date: Fri, 15 Sep 2017 16:00:39 -0700	[thread overview]
Message-ID: <1505516440-11111-12-git-send-email-sstabellini@kernel.org> (raw)
In-Reply-To: <1505516440-11111-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.

For passive sockets, check whether we have already pre-allocated an
active socket for the purpose of being accepted. If so, free that as
well.

Signed-off-by: Stefano Stabellini <stefano@aporeto.com>
CC: boris.ostrovsky@oracle.com
CC: jgross@suse.com
---
 drivers/xen/pvcalls-front.c | 104 ++++++++++++++++++++++++++++++++++++++++++++
 drivers/xen/pvcalls-front.h |   1 +
 2 files changed, 105 insertions(+)

diff --git a/drivers/xen/pvcalls-front.c b/drivers/xen/pvcalls-front.c
index 8a90213..5f8e94a 100644
--- a/drivers/xen/pvcalls-front.c
+++ b/drivers/xen/pvcalls-front.c
@@ -209,6 +209,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;
+
+	unbind_from_irqhandler(map->active.irq, map);
+
+	spin_lock(&bedata->socket_lock);
+	if (!list_empty(&map->list))
+		list_del_init(&map->list);
+	spin_unlock(&bedata->socket_lock);
+
+	for (i = 0; i < (1 << PVCALLS_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);
+}
+
 int pvcalls_front_socket(struct socket *sock)
 {
 	struct pvcalls_bedata *bedata;
@@ -960,6 +978,92 @@ unsigned int pvcalls_front_poll(struct file *file, struct socket *sock,
 	return ret;
 }
 
+int pvcalls_front_release(struct socket *sock)
+{
+	struct pvcalls_bedata *bedata;
+	struct sock_mapping *map;
+	int req_id, notify, ret;
+	struct xen_pvcalls_request *req;
+
+	pvcalls_enter;
+	if (!pvcalls_front_dev) {
+		pvcalls_exit;
+		return -EIO;
+	}
+	if (sock->sk == NULL) {
+		pvcalls_exit;
+		return 0;
+	}
+
+	bedata = dev_get_drvdata(&pvcalls_front_dev->dev);
+
+	map = (struct sock_mapping *) sock->sk->sk_send_head;
+	if (map == NULL) {
+		pvcalls_exit;
+		return 0;
+	}
+
+	spin_lock(&bedata->socket_lock);
+	ret = get_request(bedata, &req_id);
+	if (ret < 0) {
+		spin_unlock(&bedata->socket_lock);
+		pvcalls_exit;
+		return ret;
+	}
+	sock->sk->sk_send_head = NULL;
+
+	req = RING_GET_REQUEST(&bedata->ring, req_id);
+	req->req_id = req_id;
+	req->cmd = PVCALLS_RELEASE;
+	req->u.release.id = (uint64_t)map;
+
+	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);
+
+	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);
+
+		/*
+		 * Wait until there are no more waiters on the mutexes.
+		 * We know that no new waiters can be added because sk_send_head
+		 * is set to NULL -- we only need to wait for the existing
+		 * waiters to return.
+		 */
+		while (!mutex_trylock(&map->active.in_mutex) ||
+			   !mutex_trylock(&map->active.out_mutex))
+			cpu_relax();
+
+		pvcalls_front_free_map(bedata, map);
+		kfree(map);
+	} else {
+		spin_lock(&bedata->socket_lock);
+		if (READ_ONCE(map->passive.inflight_req_id) !=
+		    PVCALLS_INVALID_ID) {
+			pvcalls_front_free_map(bedata,
+					       map->passive.accept_map);
+			kfree(map->passive.accept_map);
+		}
+		list_del_init(&map->list);
+		kfree(map);
+		spin_unlock(&bedata->socket_lock);
+	}
+	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 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

  parent reply	other threads:[~2017-09-15 23:00 UTC|newest]

Thread overview: 85+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-09-15 23:00 [PATCH v4 00/13] introduce the Xen PV Calls frontend Stefano Stabellini
2017-09-15 23:00 ` [PATCH v4 01/13] xen/pvcalls: introduce the pvcalls xenbus frontend Stefano Stabellini
2017-09-15 23:00   ` Stefano Stabellini
2017-09-15 23:00   ` [PATCH v4 02/13] xen/pvcalls: implement frontend disconnect Stefano Stabellini
2017-09-20 20:32     ` Boris Ostrovsky
2017-09-20 20:32     ` Boris Ostrovsky
2017-10-06 17:51       ` Stefano Stabellini
2017-10-06 20:21         ` Boris Ostrovsky
2017-10-06 20:21         ` Boris Ostrovsky
2017-10-06 20:29           ` Stefano Stabellini
2017-10-06 20:29           ` Stefano Stabellini
2017-10-06 20:31             ` Boris Ostrovsky
2017-10-06 20:31             ` Boris Ostrovsky
2017-10-06 17:51       ` Stefano Stabellini
2017-09-20 20:59     ` Boris Ostrovsky
2017-10-07  0:08       ` Stefano Stabellini
2017-10-07  0:08       ` Stefano Stabellini
2017-09-20 20:59     ` Boris Ostrovsky
2017-09-15 23:00   ` Stefano Stabellini
2017-09-15 23:00   ` [PATCH v4 03/13] xen/pvcalls: connect to the backend Stefano Stabellini
2017-09-15 23:00     ` Stefano Stabellini
2017-09-20 21:08     ` Boris Ostrovsky
2017-09-20 21:08       ` Boris Ostrovsky
2017-09-15 23:00   ` [PATCH v4 04/13] xen/pvcalls: implement socket command and handle events Stefano Stabellini
2017-09-15 23:00     ` Stefano Stabellini
2017-09-21 17:42     ` Boris Ostrovsky
2017-09-21 17:42     ` Boris Ostrovsky
2017-10-06 18:38       ` Stefano Stabellini
2017-10-06 20:36         ` Boris Ostrovsky
2017-10-06 20:36         ` Boris Ostrovsky
2017-10-06 18:38       ` Stefano Stabellini
2017-09-15 23:00   ` [PATCH v4 05/13] xen/pvcalls: implement connect command Stefano Stabellini
2017-09-15 23:00     ` Stefano Stabellini
2017-09-21 18:28     ` Boris Ostrovsky
2017-09-21 18:28     ` Boris Ostrovsky
2017-10-06 17:44       ` Stefano Stabellini
2017-10-06 17:54         ` Stefano Stabellini
2017-10-06 17:54         ` Stefano Stabellini
2017-10-06 17:44       ` Stefano Stabellini
2017-09-15 23:00   ` [PATCH v4 06/13] xen/pvcalls: implement bind command Stefano Stabellini
2017-09-15 23:00     ` Stefano Stabellini
2017-09-21 19:40     ` Boris Ostrovsky
2017-10-06 20:35       ` Stefano Stabellini
2017-10-06 20:35       ` Stefano Stabellini
2017-09-21 19:40     ` Boris Ostrovsky
2017-09-15 23:00   ` [PATCH v4 07/13] xen/pvcalls: implement listen command Stefano Stabellini
2017-09-15 23:00     ` Stefano Stabellini
2017-09-15 23:00   ` [PATCH v4 08/13] xen/pvcalls: implement accept command Stefano Stabellini
2017-09-15 23:00     ` Stefano Stabellini
2017-09-22  0:00     ` Boris Ostrovsky
2017-09-22  0:00     ` Boris Ostrovsky
2017-10-06 22:06       ` Stefano Stabellini
2017-10-06 22:06       ` Stefano Stabellini
2017-09-15 23:00   ` [PATCH v4 09/13] xen/pvcalls: implement sendmsg Stefano Stabellini
2017-09-22 21:57     ` Boris Ostrovsky
2017-10-06 21:43       ` Stefano Stabellini
2017-10-06 21:43       ` Stefano Stabellini
2017-09-22 21:57     ` Boris Ostrovsky
2017-09-15 23:00   ` Stefano Stabellini
2017-09-15 23:00   ` [PATCH v4 10/13] xen/pvcalls: implement recvmsg Stefano Stabellini
2017-09-22 22:05     ` Boris Ostrovsky
2017-10-06 20:46       ` Stefano Stabellini
2017-10-06 20:46       ` Stefano Stabellini
2017-09-22 22:05     ` Boris Ostrovsky
2017-09-15 23:00   ` Stefano Stabellini
2017-09-15 23:00   ` [PATCH v4 11/13] xen/pvcalls: implement poll command Stefano Stabellini
2017-09-19 15:19     ` Andrea Parri
2017-09-19 15:19     ` Andrea Parri
2017-10-06 23:33       ` Stefano Stabellini
2017-10-06 23:33       ` Stefano Stabellini
2017-09-22 22:27     ` Boris Ostrovsky
2017-09-22 22:27     ` Boris Ostrovsky
2017-10-06 23:39       ` Stefano Stabellini
2017-10-06 23:39       ` Stefano Stabellini
2017-09-15 23:00   ` Stefano Stabellini
2017-09-15 23:00   ` [PATCH v4 12/13] xen/pvcalls: implement release command Stefano Stabellini
2017-09-15 23:00   ` Stefano Stabellini [this message]
2017-09-22 22:43     ` Boris Ostrovsky
2017-09-22 22:43     ` Boris Ostrovsky
2017-09-22 22:48       ` Boris Ostrovsky
2017-09-22 22:48       ` Boris Ostrovsky
2017-10-06 23:49       ` Stefano Stabellini
2017-10-06 23:49       ` Stefano Stabellini
2017-09-15 23:00   ` [PATCH v4 13/13] xen: introduce a Kconfig option to enable the pvcalls frontend Stefano Stabellini
2017-09-15 23:00   ` 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=1505516440-11111-12-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.