From patchwork Wed Oct 31 03:12:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Williams X-Patchwork-Id: 10662027 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 766D513B5 for ; Wed, 31 Oct 2018 03:24:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 659892A440 for ; Wed, 31 Oct 2018 03:24:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 59EAF2A594; Wed, 31 Oct 2018 03:24:47 +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=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=unavailable version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E87012A440 for ; Wed, 31 Oct 2018 03:24:46 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DE4A06B032F; Tue, 30 Oct 2018 23:24:45 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id D95786B0331; Tue, 30 Oct 2018 23:24:45 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CAB646B0333; Tue, 30 Oct 2018 23:24:45 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pg1-f198.google.com (mail-pg1-f198.google.com [209.85.215.198]) by kanga.kvack.org (Postfix) with ESMTP id 8B7786B032F for ; Tue, 30 Oct 2018 23:24:45 -0400 (EDT) Received: by mail-pg1-f198.google.com with SMTP id b24-v6so10618922pgh.5 for ; Tue, 30 Oct 2018 20:24:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:subject:from :to:cc:date:message-id:in-reply-to:references:user-agent :mime-version:content-transfer-encoding; bh=E4DwfO1qGHXy40UlXSkzBnrFY2KuJ1PzNv+qx561vlI=; b=b18X7+/OXiJIOeL38uaiUBct2sMDTXqXSc3owF0/sXpS1nY3u5FLTJ8uF3KDas/ORO SlYulS27YR2bMBWa/lXzpaX1sEbSTx/iCCEwbJvBxooTfLX3/++i+hUJ6EQgKoYjdNlj zstn5AoVOFtlT8XUs+KRxoYQXKCl2FCqwcQG4otaABUCYi0ysr8u2D2aPbEmElTCD7OS TJqbunKbu/0w40CzTg47D7aG6gswU/nt38+mnotPF6VVYSddKkXmR36qxisWfzkCOB0L xD/DnR65kKVKbYo/qTL88dkdgG8Q4eTiiLgrtais5D6pMJdQsdB/I/dyxhfl0LP0o3ex uhIQ== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of dan.j.williams@intel.com designates 134.134.136.20 as permitted sender) smtp.mailfrom=dan.j.williams@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com X-Gm-Message-State: AGRZ1gKgmnrqfpQpzHydrg02V+++AxD4DjTakA4pCSCdvH3lKNEWwJLs D+0zQ6jSpyAPXY16jfanKaw06umDlucPVn2Al1r3/BeEtmXTKDzb50aDR2xtL77tDsj0A8PHS+N MwHxAIwfOkdB9KxfpNScpdjqFDyI288XqKGJpvlIYCd8KbEY6V3pAhFZfaD2I5NzEvA== X-Received: by 2002:a63:907:: with SMTP id 7-v6mr1406811pgj.121.1540956285223; Tue, 30 Oct 2018 20:24:45 -0700 (PDT) X-Google-Smtp-Source: AJdET5eZPpw9DG15u3glI9JOi4sH2pIQ0xhDLTj5ByZ8rziNwb2L7yq1swXkjl1Ax5BNExOblt/X X-Received: by 2002:a63:907:: with SMTP id 7-v6mr1406774pgj.121.1540956284325; Tue, 30 Oct 2018 20:24:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1540956284; cv=none; d=google.com; s=arc-20160816; b=yotPpLyXrfjGTSgSBB0O0jy8wnzUrSkDwj3/ahPmsOWFW5HLxtLLi5tskLgsF8Wb0s rkWwhi7mq6MCmK+SbdmfiszLq0G7ss3OuKiVcxRWhhh52sApp/v1ttuzbFntjx4YsI6v EjKam9jyy1umx87KyWbt+2XGFoyHN+tvIr3/iZPatvLTfWNdqwWTEw/m7e6tBmhYElTK 6HvSLfXT0NnYUXnZq4sm4Ivkeavh8KxTnMRcDn/KStSkY5DdT4eWNM32YANMuKk6ICSc NWBGBrMnq1ifVHBNuu7/p1g22tm4VEekU0oFOIJZFHxWNPetAEY9A4Fhahgnb7RY4DRj ev1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:user-agent:references :in-reply-to:message-id:date:cc:to:from:subject; bh=E4DwfO1qGHXy40UlXSkzBnrFY2KuJ1PzNv+qx561vlI=; b=m7Pq5AZBkXF5W0z8i3fP0vwQgFjsTE9+3doFhKqpv91EZ1xNZ9BFSvUGQpYc4U4t3r uV76JjNoy3bFrCe1UWYce2ghGVeIOftj+5tWiOBsCSXHumMty4KfnQj4sPKfc1U0a1UL ZQVtiCzxsworw4kqERhaJG0EotpAUZF7kpuh/m/8T971F9AhAdfLO+Hf457+mgLPb67l IEI0zoXhi35vkj4vybNZFOJ1+vQvE0vxsqXjP5zFD6D9NO8V4MP6iJzcSP9srtxhGFdl vlXmE9Yz9NhZDYyqPsSYa/1BA3V+d2Kks35xOR9HjtcfEEHbN0Tqw64r09NGUUOiKCBh e/Xw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of dan.j.williams@intel.com designates 134.134.136.20 as permitted sender) smtp.mailfrom=dan.j.williams@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from mga02.intel.com (mga02.intel.com. [134.134.136.20]) by mx.google.com with ESMTPS id w20-v6si24205618plp.260.2018.10.30.20.24.44 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 30 Oct 2018 20:24:44 -0700 (PDT) Received-SPF: pass (google.com: domain of dan.j.williams@intel.com designates 134.134.136.20 as permitted sender) client-ip=134.134.136.20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of dan.j.williams@intel.com designates 134.134.136.20 as permitted sender) smtp.mailfrom=dan.j.williams@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 30 Oct 2018 20:24:43 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.54,447,1534834800"; d="scan'208";a="104138659" Received: from dwillia2-desk3.jf.intel.com (HELO dwillia2-desk3.amr.corp.intel.com) ([10.54.39.16]) by orsmga001.jf.intel.com with ESMTP; 30 Oct 2018 20:24:42 -0700 Subject: [PATCH 1/8] device-dax: Kill dax_region ida From: Dan Williams To: linux-nvdimm@lists.01.org Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, dave.hansen@linux.intel.com Date: Tue, 30 Oct 2018 20:12:54 -0700 Message-ID: <154095557491.3271337.10354816564776020500.stgit@dwillia2-desk3.amr.corp.intel.com> In-Reply-To: <154095556915.3271337.12581429676272726902.stgit@dwillia2-desk3.amr.corp.intel.com> References: <154095556915.3271337.12581429676272726902.stgit@dwillia2-desk3.amr.corp.intel.com> User-Agent: StGit/0.18-2-gc94f MIME-Version: 1.0 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP Commit bbb3be170ac2 "device-dax: fix sysfs duplicate warnings" arranged for passing a dax instance-id to devm_create_dax_dev(), rather than generating one internally. Remove the dax_region ida and related code. Signed-off-by: Dan Williams --- drivers/dax/dax-private.h | 3 --- drivers/dax/device.c | 24 +++--------------------- 2 files changed, 3 insertions(+), 24 deletions(-) diff --git a/drivers/dax/dax-private.h b/drivers/dax/dax-private.h index b6fc4f04636d..d1b36a42132f 100644 --- a/drivers/dax/dax-private.h +++ b/drivers/dax/dax-private.h @@ -28,7 +28,6 @@ */ struct dax_region { int id; - struct ida ida; void *base; struct kref kref; struct device *dev; @@ -42,7 +41,6 @@ struct dax_region { * @region - parent region * @dax_dev - core dax functionality * @dev - device core - * @id - child id in the region * @num_resources - number of physical address extents in this device * @res - array of physical address ranges */ @@ -50,7 +48,6 @@ struct dev_dax { struct dax_region *region; struct dax_device *dax_dev; struct device dev; - int id; int num_resources; struct resource res[0]; }; diff --git a/drivers/dax/device.c b/drivers/dax/device.c index 948806e57cee..a5a670c1cd58 100644 --- a/drivers/dax/device.c +++ b/drivers/dax/device.c @@ -128,7 +128,6 @@ struct dax_region *alloc_dax_region(struct device *parent, int region_id, dax_region->pfn_flags = pfn_flags; kref_init(&dax_region->kref); dax_region->id = region_id; - ida_init(&dax_region->ida); dax_region->align = align; dax_region->dev = parent; dax_region->base = addr; @@ -582,8 +581,6 @@ static void dev_dax_release(struct device *dev) struct dax_region *dax_region = dev_dax->region; struct dax_device *dax_dev = dev_dax->dax_dev; - if (dev_dax->id >= 0) - ida_simple_remove(&dax_region->ida, dev_dax->id); dax_region_put(dax_region); put_dax(dax_dev); kfree(dev_dax); @@ -642,19 +639,7 @@ struct dev_dax *devm_create_dev_dax(struct dax_region *dax_region, } if (i < count) - goto err_id; - - if (id < 0) { - id = ida_simple_get(&dax_region->ida, 0, 0, GFP_KERNEL); - dev_dax->id = id; - if (id < 0) { - rc = id; - goto err_id; - } - } else { - /* region provider owns @id lifetime */ - dev_dax->id = -1; - } + goto err; /* * No 'host' or dax_operations since there is no access to this @@ -663,7 +648,7 @@ struct dev_dax *devm_create_dev_dax(struct dax_region *dax_region, dax_dev = alloc_dax(dev_dax, NULL, NULL); if (!dax_dev) { rc = -ENOMEM; - goto err_dax; + goto err; } /* from here on we're committed to teardown via dax_dev_release() */ @@ -700,10 +685,7 @@ struct dev_dax *devm_create_dev_dax(struct dax_region *dax_region, return dev_dax; - err_dax: - if (dev_dax->id >= 0) - ida_simple_remove(&dax_region->ida, dev_dax->id); - err_id: + err: kfree(dev_dax); return ERR_PTR(rc);