From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 70169C4741F for ; Thu, 1 Oct 2020 16:54:32 +0000 (UTC) Received: from ml01.01.org (ml01.01.org [198.145.21.10]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C4C572075F for ; Thu, 1 Oct 2020 16:54:31 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=intel-com.20150623.gappssmtp.com header.i=@intel-com.20150623.gappssmtp.com header.b="yCNULK1n" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C4C572075F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-nvdimm-bounces@lists.01.org Received: from ml01.vlan13.01.org (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id D406F1556FDD0; Thu, 1 Oct 2020 09:54:30 -0700 (PDT) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a00:1450:4864:20::642; helo=mail-ej1-x642.google.com; envelope-from=dan.j.williams@intel.com; receiver= Received: from mail-ej1-x642.google.com (mail-ej1-x642.google.com [IPv6:2a00:1450:4864:20::642]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 4A43814321B45 for ; Thu, 1 Oct 2020 09:54:27 -0700 (PDT) Received: by mail-ej1-x642.google.com with SMTP id qp15so8185062ejb.3 for ; Thu, 01 Oct 2020 09:54:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=PcY5sR068ean6onHI2ckcFdlXy4IjyUiGqqLhTP4BDE=; b=yCNULK1n3abFX9Y+iMGYX4f2JcfN9L0Hdk+mfBgX04LDJVKbxdT7dfYejv1D7tAI3R uTTdqoRLHOFJkFkKGbYpJFa+LJYas5kW5i9V5oKCulOvmz4nCfucExd9yojQoKjCE7kk ysrEGywF0fUCLJX88KeZP/3Xa9nXcJuhJ/649SVuoJwxLIoorTYmdeclxvSVuCMUrQAB kPtf74qHtOfyvTKSR/WP4sD5qYKzQ3fxWg97siVzPuqtrKZ8DT4Csoer5QkA5N0B+Qx2 8XFRjdjXRCcLaCDKegdEcrFcYwarEIqvqTFtqaaLuMorbVqivvlfTu2jvqAyU/+4txJI GkRg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=PcY5sR068ean6onHI2ckcFdlXy4IjyUiGqqLhTP4BDE=; b=OArm5LgvV/oy0R1sH/B4bdcDvb3dEHMra1qWMBM//OR0fU2xRhI2LrQiCm8aBlb12g xNpo7bjEycYwt+zvNsUgbM39vKykB3tAWjNnvtppLCTXgH3he5WWS36S224cEFKMkVjW Sjs9Ig2evxTi0iAQw4lrwYgS1U0UFFCwn1emaGxyNgDJaP4TwyVrq/FEB/UQ9lqmErYI 7RhwS5k4aiPuf/yV8Ch8ihjUHWUump8A6fXeR/+OquOZnUmzGK1pbmRdcYP9xr0PeU/M 2jOLqbLNd2llBY+JzKUXK5daSF79ncDMamNPKoUxzS5wZrnkTJ3F3TfhCGnWSKcFmOhw tkrQ== X-Gm-Message-State: AOAM5304uT7n5xfL59rcYDeswM/NoYFIkyPOE9Xf3nKP+P2UxrQAb80G TnihrvRVBRCLKPjJJ12MX7yN6D4KI9PwRhpzJb/h6w== X-Google-Smtp-Source: ABdhPJxk5/IDh9YndGD6zVOKlgna3zc1IsQMRPKkgMnVoVbcwa8mbzwGedraAr6tDfvEQflyyxrdbiGSJWLAMqa04+0= X-Received: by 2002:a17:906:8245:: with SMTP id f5mr8644133ejx.264.1601571265618; Thu, 01 Oct 2020 09:54:25 -0700 (PDT) MIME-Version: 1.0 References: <160106109960.30709.7379926726669669398.stgit@dwillia2-desk3.amr.corp.intel.com> <160106110513.30709.4303239334850606031.stgit@dwillia2-desk3.amr.corp.intel.com> In-Reply-To: From: Dan Williams Date: Thu, 1 Oct 2020 09:54:13 -0700 Message-ID: Subject: Re: [PATCH v5 01/17] device-dax: make pgmap optional for instance creation To: David Hildenbrand Message-ID-Hash: DZZVGRECJIR7GNO6ZYRO6MGPKA4GRPN4 X-Message-ID-Hash: DZZVGRECJIR7GNO6ZYRO6MGPKA4GRPN4 X-MailFrom: dan.j.williams@intel.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header CC: Andrew Morton , Dave Hansen , Pavel Tatashin , Brice Goglin , Jia He , Joao Martins , Jonathan Cameron , Linux MM , linux-nvdimm , Linux Kernel Mailing List X-Mailman-Version: 3.1.1 Precedence: list List-Id: "Linux-nvdimm developer list." Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit On Thu, Oct 1, 2020 at 1:41 AM David Hildenbrand wrote: > > On 25.09.20 21:11, Dan Williams wrote: > > The passed in dev_pagemap is only required in the pmem case as the > > libnvdimm core may have reserved a vmem_altmap for dev_memremap_pages() to > > place the memmap in pmem directly. In the hmem case there is no agent > > reserving an altmap so it can all be handled by a core internal default. > > > > Pass the resource range via a new @range property of 'struct > > dev_dax_data'. > > > > Link: https://lkml.kernel.org/r/159643099958.4062302.10379230791041872886.stgit@dwillia2-desk3.amr.corp.intel.com > > Cc: David Hildenbrand > > Cc: Vishal Verma > > Cc: Dave Hansen > > Cc: Pavel Tatashin > > Cc: Brice Goglin > > Cc: Dave Jiang > > Cc: David Hildenbrand > > Cc: Ira Weiny > > Cc: Jia He > > Cc: Joao Martins > > Cc: Jonathan Cameron > > Signed-off-by: Dan Williams > > --- > > drivers/dax/bus.c | 29 +++++++++++++++-------------- > > drivers/dax/bus.h | 2 ++ > > drivers/dax/dax-private.h | 9 ++++++++- > > drivers/dax/device.c | 28 +++++++++++++++++++--------- > > drivers/dax/hmem/hmem.c | 8 ++++---- > > drivers/dax/kmem.c | 12 ++++++------ > > drivers/dax/pmem/core.c | 4 ++++ > > tools/testing/nvdimm/dax-dev.c | 8 ++++---- > > 8 files changed, 62 insertions(+), 38 deletions(-) > > > > diff --git a/drivers/dax/bus.c b/drivers/dax/bus.c > > index dffa4655e128..96bd64ba95a5 100644 > > --- a/drivers/dax/bus.c > > +++ b/drivers/dax/bus.c > > @@ -271,7 +271,7 @@ static ssize_t size_show(struct device *dev, > > struct device_attribute *attr, char *buf) > > { > > struct dev_dax *dev_dax = to_dev_dax(dev); > > - unsigned long long size = resource_size(&dev_dax->region->res); > > + unsigned long long size = range_len(&dev_dax->range); > > > > return sprintf(buf, "%llu\n", size); > > } > > @@ -293,19 +293,12 @@ static ssize_t target_node_show(struct device *dev, > > } > > static DEVICE_ATTR_RO(target_node); > > > > -static unsigned long long dev_dax_resource(struct dev_dax *dev_dax) > > -{ > > - struct dax_region *dax_region = dev_dax->region; > > - > > - return dax_region->res.start; > > -} > > - > > static ssize_t resource_show(struct device *dev, > > struct device_attribute *attr, char *buf) > > { > > struct dev_dax *dev_dax = to_dev_dax(dev); > > > > - return sprintf(buf, "%#llx\n", dev_dax_resource(dev_dax)); > > + return sprintf(buf, "%#llx\n", dev_dax->range.start); > > } > > static DEVICE_ATTR(resource, 0400, resource_show, NULL); > > > > @@ -376,6 +369,7 @@ static void dev_dax_release(struct device *dev) > > > > dax_region_put(dax_region); > > put_dax(dax_dev); > > + kfree(dev_dax->pgmap); > > kfree(dev_dax); > > } > > > > @@ -412,7 +406,12 @@ struct dev_dax *devm_create_dev_dax(struct dev_dax_data *data) > > if (!dev_dax) > > return ERR_PTR(-ENOMEM); > > > > - memcpy(&dev_dax->pgmap, data->pgmap, sizeof(struct dev_pagemap)); > > + if (data->pgmap) { > > + dev_dax->pgmap = kmemdup(data->pgmap, > > + sizeof(struct dev_pagemap), GFP_KERNEL); > > + if (!dev_dax->pgmap) > > + goto err_pgmap; > > + } > > > > /* > > * No 'host' or dax_operations since there is no access to this > > @@ -421,18 +420,19 @@ struct dev_dax *devm_create_dev_dax(struct dev_dax_data *data) > > dax_dev = alloc_dax(dev_dax, NULL, NULL, DAXDEV_F_SYNC); > > if (IS_ERR(dax_dev)) { > > rc = PTR_ERR(dax_dev); > > - goto err; > > + goto err_alloc_dax; > > } > > > > /* a device_dax instance is dead while the driver is not attached */ > > kill_dax(dax_dev); > > > > - /* from here on we're committed to teardown via dax_dev_release() */ > > + /* from here on we're committed to teardown via dev_dax_release() */ > > dev = &dev_dax->dev; > > device_initialize(dev); > > > > dev_dax->dax_dev = dax_dev; > > dev_dax->region = dax_region; > > + dev_dax->range = data->range; > > dev_dax->target_node = dax_region->target_node; > > kref_get(&dax_region->kref); > > > > @@ -458,8 +458,9 @@ struct dev_dax *devm_create_dev_dax(struct dev_dax_data *data) > > return ERR_PTR(rc); > > > > return dev_dax; > > - > > - err: > > +err_alloc_dax: > > + kfree(dev_dax->pgmap); > > +err_pgmap: > > kfree(dev_dax); > > > > return ERR_PTR(rc); > > diff --git a/drivers/dax/bus.h b/drivers/dax/bus.h > > index 299c2e7fac09..4aeb36da83a4 100644 > > --- a/drivers/dax/bus.h > > +++ b/drivers/dax/bus.h > > @@ -3,6 +3,7 @@ > > #ifndef __DAX_BUS_H__ > > #define __DAX_BUS_H__ > > #include > > +#include > > > > struct dev_dax; > > struct resource; > > @@ -21,6 +22,7 @@ struct dev_dax_data { > > struct dax_region *dax_region; > > struct dev_pagemap *pgmap; > > enum dev_dax_subsys subsys; > > + struct range range; > > int id; > > }; > > > > diff --git a/drivers/dax/dax-private.h b/drivers/dax/dax-private.h > > index 8a4c40ccd2ef..6779f683671d 100644 > > --- a/drivers/dax/dax-private.h > > +++ b/drivers/dax/dax-private.h > > @@ -41,6 +41,7 @@ struct dax_region { > > * @target_node: effective numa node if dev_dax memory range is onlined > > * @dev - device core > > * @pgmap - pgmap for memmap setup / lifetime (driver owned) > > + * @range: resource range for the instance > > * @dax_mem_res: physical address range of hotadded DAX memory > > * @dax_mem_name: name for hotadded DAX memory via add_memory_driver_managed() > > */ > > @@ -49,10 +50,16 @@ struct dev_dax { > > struct dax_device *dax_dev; > > int target_node; > > struct device dev; > > - struct dev_pagemap pgmap; > > + struct dev_pagemap *pgmap; > > + struct range range; > > struct resource *dax_kmem_res; > > }; > > > > +static inline u64 range_len(struct range *range) > > +{ > > + return range->end - range->start + 1; > > +} > > include/linux/range.h seems to have this function - why is this here needed? It's there because I add it later in this series. I waited until "mm/memremap_pages: convert to 'struct range'" to make it global as that's the first kernel-wide visible usage of it. _______________________________________________ Linux-nvdimm mailing list -- linux-nvdimm@lists.01.org To unsubscribe send an email to linux-nvdimm-leave@lists.01.org