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=-6.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=no 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 43644C433DF for ; Wed, 14 Oct 2020 20:57:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DB0A02076D for ; Wed, 14 Oct 2020 20:57:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1602709061; bh=Z6YC4zBrd02tunlxrGgyNpvsYc4nsx72PDYI6UFLC3A=; h=Date:From:To:Subject:Reply-To:List-ID:From; b=sn1IyU/6Col5n4zGwW5Tr0mi1t6L4bGfs4j4mxxIvTw2Zp+nCldvjExM+RTPuRo+D CaQTuLdVkB/6qKS8bNHTUOI1KwyzkHDqEKKzfBixx/bfTbnQChN06px09R6ud6P8w+ mrgAM8tvrYXkg6o7WyhzkkquP9+UKEjoxC20yFmQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389452AbgJNU5l (ORCPT ); Wed, 14 Oct 2020 16:57:41 -0400 Received: from mail.kernel.org ([198.145.29.99]:48226 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387573AbgJNU5l (ORCPT ); Wed, 14 Oct 2020 16:57:41 -0400 Received: from localhost.localdomain (c-71-198-47-131.hsd1.ca.comcast.net [71.198.47.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id DE3CC2068E; Wed, 14 Oct 2020 20:57:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1602709060; bh=Z6YC4zBrd02tunlxrGgyNpvsYc4nsx72PDYI6UFLC3A=; h=Date:From:To:Subject:From; b=BkA7UvUNempl9wWNvNv4Sc2VlX5cW11iWwKtdxjHPJXGsNC2hOjHq76+dNaitCGGW KCcfmx8kZHaZE0RwXEL5i3xZGKSuBaT/PPxCL34axpxFAxJ4WItGDrZX6xgU89PTuK chEfMSXSntL+bAuRVbmtJ2j8ElZ/TTR4MAbDZgTU= Date: Wed, 14 Oct 2020 13:57:37 -0700 From: akpm@linux-foundation.org To: airlied@linux.ie, ard.biesheuvel@linaro.org, ardb@kernel.org, benh@kernel.crashing.org, bhelgaas@google.com, boris.ostrovsky@oracle.com, bp@alien8.de, Brice.Goglin@inria.fr, bskeggs@redhat.com, catalin.marinas@arm.com, dan.j.williams@intel.com, daniel@ffwll.ch, dave.hansen@linux.intel.com, dave.jiang@intel.com, david@redhat.com, gregkh@linuxfoundation.org, hpa@zytor.com, hulkci@huawei.com, ira.weiny@intel.com, jgg@mellanox.com, jglisse@redhat.com, jgross@suse.com, jmoyer@redhat.com, joao.m.martins@oracle.com, Jonathan.Cameron@huawei.com, justin.he@arm.com, lkp@intel.com, luto@kernel.org, mingo@redhat.com, mm-commits@vger.kernel.org, mpe@ellerman.id.au, pasha.tatashin@soleen.com, paulus@ozlabs.org, peterz@infradead.org, rafael.j.wysocki@intel.com, rdunlap@infradead.org, richard.weiyang@linux.alibaba.com, rppt@linux.ibm.com, sstabellini@kernel.org, tglx@linutronix.de, thomas.lendacky@amd.com, vgoyal@redhat.com, vishal.l.verma@intel.com, will@kernel.org, yanaijie@huawei.com Subject: [merged] device-dax-kmem-replace-release_resource-with-release_mem_region.patch removed from -mm tree Message-ID: <20201014205737.O89Jr1J08%akpm@linux-foundation.org> User-Agent: s-nail v14.8.16 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Precedence: bulk Reply-To: linux-kernel@vger.kernel.org List-ID: X-Mailing-List: mm-commits@vger.kernel.org The patch titled Subject: device-dax/kmem: replace release_resource() with release_mem_= region() has been removed from the -mm tree. Its filename was device-dax-kmem-replace-release_resource-with-release_mem_region.patch This patch was dropped because it was merged into mainline or a subsystem t= ree ------------------------------------------------------ =46rom: Dan Williams Subject: device-dax/kmem: replace release_resource() with release_mem_regio= n() Towards removing the mode specific @dax_kmem_res attribute from the generic 'struct dev_dax', and preparing for multi-range support, change the kmem driver to use the idiomatic release_mem_region() to pair with the initial request_mem_region(). This also eliminates the need to open code the release of the resource allocated by request_mem_region(). As there are no more dax_kmem_res users, delete this struct member. Link: https://lkml.kernel.org/r/160106112239.30709.15909567572288425294.stg= it@dwillia2-desk3.amr.corp.intel.com Signed-off-by: Dan Williams 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 Cc: Andy Lutomirski Cc: Ard Biesheuvel Cc: Ard Biesheuvel Cc: Benjamin Herrenschmidt Cc: Ben Skeggs Cc: Bjorn Helgaas Cc: Borislav Petkov Cc: Boris Ostrovsky Cc: Catalin Marinas Cc: Daniel Vetter Cc: David Airlie Cc: Greg Kroah-Hartman Cc: "H. Peter Anvin" Cc: Hulk Robot Cc: Ingo Molnar Cc: Jason Gunthorpe Cc: Jason Yan Cc: Jeff Moyer Cc: "J=C3=A9r=C3=B4me Glisse" Cc: Juergen Gross Cc: kernel test robot Cc: Michael Ellerman Cc: Mike Rapoport Cc: Paul Mackerras Cc: Peter Zijlstra Cc: "Rafael J. Wysocki" Cc: Randy Dunlap Cc: Stefano Stabellini Cc: Thomas Gleixner Cc: Tom Lendacky Cc: Vivek Goyal Cc: Wei Yang Cc: Will Deacon Signed-off-by: Andrew Morton --- drivers/dax/dax-private.h | 3 --- drivers/dax/kmem.c | 20 +++++++------------- 2 files changed, 7 insertions(+), 16 deletions(-) --- a/drivers/dax/dax-private.h~device-dax-kmem-replace-release_resource-wi= th-release_mem_region +++ a/drivers/dax/dax-private.h @@ -42,8 +42,6 @@ struct dax_region { * @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_manag= ed() */ struct dev_dax { struct dax_region *region; @@ -52,7 +50,6 @@ struct dev_dax { struct device dev; struct dev_pagemap *pgmap; struct range range; - struct resource *dax_kmem_res; }; =20 static inline u64 range_len(struct range *range) --- a/drivers/dax/kmem.c~device-dax-kmem-replace-release_resource-with-rele= ase_mem_region +++ a/drivers/dax/kmem.c @@ -33,7 +33,7 @@ int dev_dax_kmem_probe(struct device *de { struct dev_dax *dev_dax =3D to_dev_dax(dev); struct range range =3D dax_kmem_range(dev_dax); - struct resource *new_res; + struct resource *res; char *res_name; int numa_node; int rc; @@ -56,8 +56,8 @@ int dev_dax_kmem_probe(struct device *de return -ENOMEM; =20 /* Region is permanently reserved if hotremove fails. */ - new_res =3D request_mem_region(range.start, range_len(&range), res_name); - if (!new_res) { + res =3D request_mem_region(range.start, range_len(&range), res_name); + if (!res) { dev_warn(dev, "could not reserve region [%#llx-%#llx]\n", range.start, r= ange.end); kfree(res_name); return -EBUSY; @@ -69,23 +69,20 @@ int dev_dax_kmem_probe(struct device *de * inherit flags from the parent since it may set new flags * unknown to us that will break add_memory() below. */ - new_res->flags =3D IORESOURCE_SYSTEM_RAM; + res->flags =3D IORESOURCE_SYSTEM_RAM; =20 /* * Ensure that future kexec'd kernels will not treat this as RAM * automatically. */ - rc =3D add_memory_driver_managed(numa_node, new_res->start, - resource_size(new_res), kmem_name); + rc =3D add_memory_driver_managed(numa_node, range.start, range_len(&range= ), kmem_name); if (rc) { - release_resource(new_res); - kfree(new_res); + release_mem_region(range.start, range_len(&range)); kfree(res_name); return rc; } =20 dev_set_drvdata(dev, res_name); - dev_dax->dax_kmem_res =3D new_res; =20 return 0; } @@ -95,7 +92,6 @@ static int dev_dax_kmem_remove(struct de { struct dev_dax *dev_dax =3D to_dev_dax(dev); struct range range =3D dax_kmem_range(dev_dax); - struct resource *res =3D dev_dax->dax_kmem_res; const char *res_name =3D dev_get_drvdata(dev); int rc; =20 @@ -114,10 +110,8 @@ static int dev_dax_kmem_remove(struct de } =20 /* Release and free dax resources */ - release_resource(res); - kfree(res); + release_mem_region(range.start, range_len(&range)); kfree(res_name); - dev_dax->dax_kmem_res =3D NULL; =20 return 0; } _ Patches currently in -mm which might be from dan.j.williams@intel.com are