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 v3 13/18] xen/pvcalls: implement release command
Date: Fri, 2 Jun 2017 12:31:50 -0700 [thread overview]
Message-ID: <1496431915-20774-13-git-send-email-sstabellini@kernel.org> (raw)
In-Reply-To: <1496431915-20774-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 finishes (flush_work).
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 | 72 +++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 71 insertions(+), 1 deletion(-)
diff --git a/drivers/xen/pvcalls-back.c b/drivers/xen/pvcalls-back.c
index 82f350d..b541887 100644
--- a/drivers/xen/pvcalls-back.c
+++ b/drivers/xen/pvcalls-back.c
@@ -265,13 +265,83 @@ static int pvcalls_back_release_active(struct xenbus_device *dev,
struct pvcalls_fedata *priv,
struct sock_mapping *map)
{
+ disable_irq(map->irq);
+ if (map->sock->sk != NULL) {
+ write_lock_bh(&map->sock->sk->sk_callback_lock);
+ map->sock->sk->sk_user_data = NULL;
+ map->sock->sk->sk_data_ready = map->saved_data_ready;
+ write_unlock_bh(&map->sock->sk->sk_callback_lock);
+ }
+
+ atomic_set(&map->release, 1);
+ flush_work(&map->ioworker.register_work);
+
+ down(&priv->socket_lock);
+ list_del(&map->list);
+ up(&priv->socket_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_fedata *priv,
+ struct sockpass_mapping *mappass)
+{
+ if (mappass->sock->sk != NULL) {
+ write_lock_bh(&mappass->sock->sk->sk_callback_lock);
+ mappass->sock->sk->sk_user_data = NULL;
+ mappass->sock->sk->sk_data_ready = mappass->saved_data_ready;
+ write_unlock_bh(&mappass->sock->sk->sk_callback_lock);
+ }
+ down(&priv->socket_lock);
+ radix_tree_delete(&priv->socketpass_mappings, mappass->id);
+ sock_release(mappass->sock);
+ flush_workqueue(mappass->wq);
+ destroy_workqueue(mappass->wq);
+ kfree(mappass);
+ up(&priv->socket_lock);
+
return 0;
}
static int pvcalls_back_release(struct xenbus_device *dev,
struct xen_pvcalls_request *req)
{
- return 0;
+ struct pvcalls_fedata *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 ret;
}
static void __pvcalls_back_accept(struct work_struct *work)
--
1.9.1
next prev parent reply other threads:[~2017-06-02 19:33 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-02 19:31 [PATCH v3 00/18] introduce the Xen PV Calls backend Stefano Stabellini
2017-06-02 19:31 ` [PATCH v3 01/18] xen: introduce the pvcalls interface header Stefano Stabellini
2017-06-02 19:31 ` [PATCH v3 02/18] xen/pvcalls: introduce the pvcalls xenbus backend Stefano Stabellini
2017-06-02 19:31 ` [PATCH v3 03/18] xen/pvcalls: initialize the module and register the " Stefano Stabellini
2017-06-02 19:31 ` [PATCH v3 04/18] xen/pvcalls: xenbus state handling Stefano Stabellini
2017-06-12 21:19 ` Boris Ostrovsky
2017-06-02 19:31 ` [PATCH v3 05/18] xen/pvcalls: connect to a frontend Stefano Stabellini
2017-06-12 21:27 ` Boris Ostrovsky
2017-06-02 19:31 ` [PATCH v3 06/18] xen/pvcalls: handle commands from the frontend Stefano Stabellini
2017-06-12 22:03 ` Boris Ostrovsky
2017-06-14 21:03 ` Stefano Stabellini
2017-06-15 14:33 ` Boris Ostrovsky
2017-06-15 18:54 ` Stefano Stabellini
2017-06-02 19:31 ` [PATCH v3 07/18] xen/pvcalls: implement socket command Stefano Stabellini
2017-06-13 6:06 ` Juergen Gross
2017-06-14 0:46 ` Stefano Stabellini
2017-06-02 19:31 ` [PATCH v3 08/18] xen/pvcalls: implement connect command Stefano Stabellini
2017-06-13 6:17 ` Juergen Gross
2017-06-14 0:46 ` Stefano Stabellini
2017-06-02 19:31 ` [PATCH v3 09/18] xen/pvcalls: implement bind command Stefano Stabellini
2017-06-13 7:00 ` Juergen Gross
2017-06-14 0:46 ` Stefano Stabellini
2017-06-02 19:31 ` [PATCH v3 10/18] xen/pvcalls: implement listen command Stefano Stabellini
2017-06-13 7:00 ` Juergen Gross
2017-06-02 19:31 ` [PATCH v3 11/18] xen/pvcalls: implement accept command Stefano Stabellini
2017-06-13 7:24 ` Juergen Gross
2017-06-14 0:47 ` Stefano Stabellini
2017-06-14 6:32 ` Juergen Gross
2017-06-14 19:27 ` Stefano Stabellini
2017-06-15 6:58 ` Juergen Gross
2017-06-15 17:54 ` Stefano Stabellini
2017-06-02 19:31 ` [PATCH v3 12/18] xen/pvcalls: implement poll command Stefano Stabellini
2017-06-13 7:28 ` Juergen Gross
2017-06-14 0:47 ` Stefano Stabellini
2017-06-02 19:31 ` Stefano Stabellini [this message]
2017-06-13 7:39 ` [PATCH v3 13/18] xen/pvcalls: implement release command Juergen Gross
2017-06-14 0:47 ` Stefano Stabellini
2017-06-02 19:31 ` [PATCH v3 14/18] xen/pvcalls: disconnect and module_exit Stefano Stabellini
2017-06-13 7:49 ` Juergen Gross
2017-06-14 0:54 ` Stefano Stabellini
2017-06-14 13:51 ` Boris Ostrovsky
2017-06-14 19:15 ` Stefano Stabellini
2017-06-02 19:31 ` [PATCH v3 15/18] xen/pvcalls: implement the ioworker functions Stefano Stabellini
2017-06-13 7:51 ` Juergen Gross
2017-06-14 0:56 ` Stefano Stabellini
2017-06-02 19:31 ` [PATCH v3 16/18] xen/pvcalls: implement read Stefano Stabellini
2017-06-13 7:56 ` Juergen Gross
2017-06-14 0:57 ` Stefano Stabellini
2017-06-02 19:31 ` [PATCH v3 17/18] xen/pvcalls: implement write Stefano Stabellini
2017-06-13 7:59 ` Juergen Gross
2017-06-14 1:00 ` Stefano Stabellini
2017-06-02 19:31 ` [PATCH v3 18/18] xen: introduce a Kconfig option to enable the pvcalls backend Stefano Stabellini
2017-06-13 6:02 ` Juergen Gross
2017-06-13 23:46 ` Stefano Stabellini
2017-06-12 21:17 ` [PATCH v3 01/18] xen: introduce the pvcalls interface header Boris Ostrovsky
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=1496431915-20774-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;
as well as URLs for NNTP newsgroup(s).