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 13/18] xen/pvcalls: implement release command
Date: Mon, 15 May 2017 13:36:05 -0700 [thread overview]
Message-ID: <1494880570-14209-13-git-send-email-sstabellini@kernel.org> (raw)
In-Reply-To: <1494880570-14209-1-git-send-email-sstabellini@kernel.org>
Release both active and passive sockets. For active sockets, make sure
to avoid possible conflicts with the ioworker reading/writing to those
sockets concurrently. Set map->release to let the ioworker know
atomically that the socket will be released soon, then wait until the
ioworker removed the socket from its list.
Unmap indexes pages and data rings.
Signed-off-by: Stefano Stabellini <stefano@aporeto.com>
CC: boris.ostrovsky@oracle.com
CC: jgross@suse.com
---
drivers/xen/pvcalls-back.c | 94 +++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 93 insertions(+), 1 deletion(-)
diff --git a/drivers/xen/pvcalls-back.c b/drivers/xen/pvcalls-back.c
index d5b7412..22c6426 100644
--- a/drivers/xen/pvcalls-back.c
+++ b/drivers/xen/pvcalls-back.c
@@ -253,13 +253,105 @@ static int pvcalls_back_release_active(struct xenbus_device *dev,
struct pvcalls_back_priv *priv,
struct sock_mapping *map)
{
+ struct pvcalls_ioworker *iow =
+ &pvcalls_back_global.ioworkers[map->data_worker];
+ unsigned long flags;
+ bool in_loop = false;
+
+
+ disable_irq(map->irq);
+ if (map->sock->sk != NULL) {
+ lock_sock(map->sock->sk);
+ map->sock->sk->sk_user_data = NULL;
+ map->sock->sk->sk_data_ready = map->saved_data_ready;
+ release_sock(map->sock->sk);
+ }
+
+ atomic_set(&map->release, 1);
+
+ /*
+ * To avoid concurrency problems with ioworker, check if the socket
+ * has any outstanding io requests. If so, wait until the ioworker
+ * removes it from the list before proceeding.
+ */
+ spin_lock_irqsave(&iow->lock, flags);
+ in_loop = !list_empty(&map->queue);
+ spin_unlock_irqrestore(&iow->lock, flags);
+
+ if (in_loop) {
+ atomic_inc(&iow->io);
+ queue_work_on(map->data_worker, pvcalls_back_global.wq,
+ &iow->register_work);
+ while (atomic_read(&map->release) > 0)
+ cond_resched();
+ }
+
+ down_write(&priv->pvcallss_lock);
+ list_del(&map->list);
+ up_write(&priv->pvcallss_lock);
+
+ xenbus_unmap_ring_vfree(dev, (void *)map->bytes);
+ xenbus_unmap_ring_vfree(dev, (void *)map->ring);
+ unbind_from_irqhandler(map->irq, map);
+
+ sock_release(map->sock);
+ kfree(map);
+
+ return 0;
+}
+
+static int pvcalls_back_release_passive(struct xenbus_device *dev,
+ struct pvcalls_back_priv *priv,
+ struct sockpass_mapping *mappass)
+{
+ if (mappass->sock->sk != NULL) {
+ lock_sock(mappass->sock->sk);
+ mappass->sock->sk->sk_user_data = NULL;
+ mappass->sock->sk->sk_data_ready = mappass->saved_data_ready;
+ release_sock(mappass->sock->sk);
+ }
+ down_write(&priv->pvcallss_lock);
+ radix_tree_delete(&priv->socketpass_mappings, mappass->id);
+ sock_release(mappass->sock);
+ flush_workqueue(mappass->wq);
+ destroy_workqueue(mappass->wq);
+ kfree(mappass);
+ up_write(&priv->pvcallss_lock);
+
return 0;
}
static int pvcalls_back_release(struct xenbus_device *dev,
struct xen_pvcalls_request *req)
{
- return 0;
+ struct pvcalls_back_priv *priv;
+ struct sock_mapping *map, *n;
+ struct sockpass_mapping *mappass;
+ int ret = 0;
+ struct xen_pvcalls_response *rsp;
+
+ priv = dev_get_drvdata(&dev->dev);
+
+ list_for_each_entry_safe(map, n, &priv->socket_mappings, list) {
+ if (map->id == req->u.release.id) {
+ ret = pvcalls_back_release_active(dev, priv, map);
+ goto out;
+ }
+ }
+ mappass = radix_tree_lookup(&priv->socketpass_mappings,
+ req->u.release.id);
+ if (mappass != NULL) {
+ ret = pvcalls_back_release_passive(dev, priv, mappass);
+ goto out;
+ }
+
+out:
+ rsp = RING_GET_RESPONSE(&priv->ring, priv->ring.rsp_prod_pvt++);
+ rsp->req_id = req->req_id;
+ rsp->u.release.id = req->u.release.id;
+ rsp->cmd = req->cmd;
+ rsp->ret = ret;
+ return 1;
}
static void __pvcalls_back_accept(struct work_struct *work)
--
1.9.1
next prev parent reply other threads:[~2017-05-15 20:38 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-15 20:35 [PATCH 00/18] introduce the Xen PV Calls backend Stefano Stabellini
2017-05-15 20:35 ` [PATCH 01/18] xen: introduce the pvcalls interface header Stefano Stabellini
2017-05-15 20:35 ` [PATCH 02/18] xen/pvcalls: introduce the pvcalls xenbus backend Stefano Stabellini
2017-05-15 20:35 ` [PATCH 03/18] xen/pvcalls: initialize the module and register the " Stefano Stabellini
2017-05-16 1:28 ` Boris Ostrovsky
2017-05-16 20:05 ` Stefano Stabellini
2017-05-16 20:22 ` Stefano Stabellini
2017-05-16 6:40 ` Juergen Gross
2017-05-16 19:58 ` Stefano Stabellini
2017-05-17 5:21 ` Juergen Gross
2017-05-18 21:18 ` Stefano Stabellini
2017-05-19 22:33 ` Stefano Stabellini
2017-05-15 20:35 ` [PATCH 04/18] xen/pvcalls: xenbus state handling Stefano Stabellini
2017-05-16 1:34 ` Boris Ostrovsky
2017-05-16 20:11 ` Stefano Stabellini
2017-05-15 20:35 ` [PATCH 05/18] xen/pvcalls: connect to a frontend Stefano Stabellini
2017-05-16 1:52 ` Boris Ostrovsky
2017-05-16 20:23 ` Stefano Stabellini
2017-05-16 20:38 ` Stefano Stabellini
2017-05-15 20:35 ` [PATCH 06/18] xen/pvcalls: handle commands from the frontend Stefano Stabellini
2017-05-16 2:06 ` Boris Ostrovsky
2017-05-16 20:57 ` Stefano Stabellini
2017-05-15 20:35 ` [PATCH 07/18] xen/pvcalls: implement socket command Stefano Stabellini
2017-05-16 2:12 ` Boris Ostrovsky
2017-05-16 20:45 ` Stefano Stabellini
2017-05-15 20:36 ` [PATCH 08/18] xen/pvcalls: implement connect command Stefano Stabellini
2017-05-16 2:36 ` Boris Ostrovsky
2017-05-16 21:02 ` Stefano Stabellini
2017-05-16 21:56 ` Boris Ostrovsky
2017-05-18 19:10 ` Stefano Stabellini
2017-05-18 20:19 ` Boris Ostrovsky
2017-05-15 20:36 ` [PATCH 09/18] xen/pvcalls: implement bind command Stefano Stabellini
2017-05-15 20:36 ` [PATCH 10/18] xen/pvcalls: implement listen command Stefano Stabellini
2017-05-15 20:36 ` [PATCH 11/18] xen/pvcalls: implement accept command Stefano Stabellini
2017-05-15 20:36 ` [PATCH 12/18] xen/pvcalls: implement poll command Stefano Stabellini
2017-05-15 20:36 ` Stefano Stabellini [this message]
2017-05-15 20:36 ` [PATCH 14/18] xen/pvcalls: disconnect and module_exit Stefano Stabellini
2017-05-15 20:36 ` [PATCH 15/18] xen/pvcalls: introduce the ioworker Stefano Stabellini
2017-05-15 20:36 ` [PATCH 16/18] xen/pvcalls: implement read Stefano Stabellini
2017-05-15 20:36 ` [PATCH 17/18] xen/pvcalls: implement write Stefano Stabellini
2017-05-15 20:36 ` [PATCH 18/18] xen: introduce a Kconfig option to enable the pvcalls backend 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=1494880570-14209-13-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
Powered by JetHome