From patchwork Wed Jan 17 20:22:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 10170811 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 2673A60386 for ; Wed, 17 Jan 2018 20:25:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1618C20407 for ; Wed, 17 Jan 2018 20:25:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0A3591FF13; Wed, 17 Jan 2018 20:25:34 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7853A1FFDB for ; Wed, 17 Jan 2018 20:25:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753282AbeAQUYx (ORCPT ); Wed, 17 Jan 2018 15:24:53 -0500 Received: from bombadil.infradead.org ([65.50.211.133]:43925 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753144AbeAQUXH (ORCPT ); Wed, 17 Jan 2018 15:23:07 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=References:In-Reply-To:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=Bt/rnehbKpwpk7lM0ZjKmbl49bvX+n22oI0358e1SLE=; b=oj9EyZvdex6hB/oYfI5uOTjU7 l+4gPwaG64vXR04mWPNPez3hllT66PEZsvMyO2KLOa/0lK0PMOmYS1eiJ96LYSmVmxWu880AlJdfu s5WiiP8LuMs4d6piFCHhTR9ZkZ0aDHCVu3jOTcZWmx1hdauiJNQ8Rs2XYdLdMrFkp0vqBCW1GiAhR JDT05yZShhIxDEfKBwysolJqBiAzACSSghwLS/RETDqjUF7XwUh5Do/a3q3TtfcAqfUbSlb4KPhB0 39HroT9/I1aSCQKNv307aQhmBu9deIAjeM+nfSmGmWIcbreMm3+Xi/Rve5bq79MjIJ8xkaydBS456 kTFdMeVag==; Received: from willy by bombadil.infradead.org with local (Exim 4.89 #1 (Red Hat Linux)) id 1ebuEj-0006MQ-Vl; Wed, 17 Jan 2018 20:23:05 +0000 From: Matthew Wilcox To: linux-kernel@vger.kernel.org Cc: Matthew Wilcox , linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, linux-nilfs@vger.kernel.org, linux-btrfs@vger.kernel.org, linux-xfs@vger.kernel.org, linux-usb@vger.kernel.org, Bjorn Andersson , Stefano Stabellini , iommu@lists.linux-foundation.org, linux-remoteproc@vger.kernel.org, linux-s390@vger.kernel.org, intel-gfx@lists.freedesktop.org, cgroups@vger.kernel.org, linux-sh@vger.kernel.org, David Howells Subject: [PATCH v6 97/99] xen: Convert pvcalls-back to XArray Date: Wed, 17 Jan 2018 12:22:01 -0800 Message-Id: <20180117202203.19756-98-willy@infradead.org> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180117202203.19756-1-willy@infradead.org> References: <20180117202203.19756-1-willy@infradead.org> Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Matthew Wilcox This is a straightforward conversion. Signed-off-by: Matthew Wilcox --- drivers/xen/pvcalls-back.c | 51 ++++++++++++++-------------------------------- 1 file changed, 15 insertions(+), 36 deletions(-) diff --git a/drivers/xen/pvcalls-back.c b/drivers/xen/pvcalls-back.c index c7822d8078b9..e059d2e777e1 100644 --- a/drivers/xen/pvcalls-back.c +++ b/drivers/xen/pvcalls-back.c @@ -15,10 +15,10 @@ #include #include #include -#include #include #include #include +#include #include #include #include @@ -50,7 +50,7 @@ struct pvcalls_fedata { struct xen_pvcalls_back_ring ring; int irq; struct list_head socket_mappings; - struct radix_tree_root socketpass_mappings; + struct xarray socketpass_mappings; struct semaphore socket_lock; }; @@ -492,10 +492,9 @@ static int pvcalls_back_release(struct xenbus_device *dev, goto out; } } - mappass = radix_tree_lookup(&fedata->socketpass_mappings, - req->u.release.id); + mappass = xa_load(&fedata->socketpass_mappings, req->u.release.id); if (mappass != NULL) { - radix_tree_delete(&fedata->socketpass_mappings, mappass->id); + xa_erase(&fedata->socketpass_mappings, mappass->id); up(&fedata->socket_lock); ret = pvcalls_back_release_passive(dev, fedata, mappass); } else @@ -650,10 +649,8 @@ static int pvcalls_back_bind(struct xenbus_device *dev, map->fedata = fedata; map->id = req->u.bind.id; - down(&fedata->socket_lock); - ret = radix_tree_insert(&fedata->socketpass_mappings, map->id, - map); - up(&fedata->socket_lock); + ret = xa_err(xa_store(&fedata->socketpass_mappings, map->id, map, + GFP_KERNEL)); if (ret) goto out; @@ -689,9 +686,7 @@ static int pvcalls_back_listen(struct xenbus_device *dev, fedata = dev_get_drvdata(&dev->dev); - down(&fedata->socket_lock); - map = radix_tree_lookup(&fedata->socketpass_mappings, req->u.listen.id); - up(&fedata->socket_lock); + map = xa_load(&fedata->socketpass_mappings, req->u.listen.id); if (map == NULL) goto out; @@ -717,10 +712,7 @@ static int pvcalls_back_accept(struct xenbus_device *dev, fedata = dev_get_drvdata(&dev->dev); - down(&fedata->socket_lock); - mappass = radix_tree_lookup(&fedata->socketpass_mappings, - req->u.accept.id); - up(&fedata->socket_lock); + mappass = xa_load(&fedata->socketpass_mappings, req->u.accept.id); if (mappass == NULL) goto out_error; @@ -765,10 +757,7 @@ static int pvcalls_back_poll(struct xenbus_device *dev, fedata = dev_get_drvdata(&dev->dev); - down(&fedata->socket_lock); - mappass = radix_tree_lookup(&fedata->socketpass_mappings, - req->u.poll.id); - up(&fedata->socket_lock); + mappass = xa_load(&fedata->socketpass_mappings, req->u.poll.id); if (mappass == NULL) return -EINVAL; @@ -960,7 +949,7 @@ static int backend_connect(struct xenbus_device *dev) fedata->dev = dev; INIT_LIST_HEAD(&fedata->socket_mappings); - INIT_RADIX_TREE(&fedata->socketpass_mappings, GFP_KERNEL); + xa_init(&fedata->socketpass_mappings); sema_init(&fedata->socket_lock, 1); dev_set_drvdata(&dev->dev, fedata); @@ -984,9 +973,7 @@ static int backend_disconnect(struct xenbus_device *dev) struct pvcalls_fedata *fedata; struct sock_mapping *map, *n; struct sockpass_mapping *mappass; - struct radix_tree_iter iter; - void **slot; - + unsigned long index = 0; fedata = dev_get_drvdata(&dev->dev); @@ -996,18 +983,10 @@ static int backend_disconnect(struct xenbus_device *dev) pvcalls_back_release_active(dev, fedata, map); } - radix_tree_for_each_slot(slot, &fedata->socketpass_mappings, &iter, 0) { - mappass = radix_tree_deref_slot(slot); - if (!mappass) - continue; - if (radix_tree_exception(mappass)) { - if (radix_tree_deref_retry(mappass)) - slot = radix_tree_iter_retry(&iter); - } else { - radix_tree_delete(&fedata->socketpass_mappings, - mappass->id); - pvcalls_back_release_passive(dev, fedata, mappass); - } + xa_for_each(&fedata->socketpass_mappings, mappass, index, ULONG_MAX, + XA_PRESENT) { + xa_erase(&fedata->socketpass_mappings, index); + pvcalls_back_release_passive(dev, fedata, mappass); } up(&fedata->socket_lock);