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=-1.1 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,URIBL_DBL_ABUSE_MALW 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 5CF38C2D0DB for ; Tue, 28 Jan 2020 13:49:41 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id D95862468D for ; Tue, 28 Jan 2020 13:49:40 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="viMkuWFK" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D95862468D Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=linuxfoundation.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 575746B0003; Tue, 28 Jan 2020 08:49:40 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 526516B0006; Tue, 28 Jan 2020 08:49:40 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3ED156B0007; Tue, 28 Jan 2020 08:49:40 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0053.hostedemail.com [216.40.44.53]) by kanga.kvack.org (Postfix) with ESMTP id 23F8E6B0003 for ; Tue, 28 Jan 2020 08:49:40 -0500 (EST) Received: from smtpin24.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with SMTP id D0965180AD804 for ; Tue, 28 Jan 2020 13:49:39 +0000 (UTC) X-FDA: 76427175678.24.berry75_3732cb9403b31 X-HE-Tag: berry75_3732cb9403b31 X-Filterd-Recvd-Size: 11085 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by imf06.hostedemail.com (Postfix) with ESMTP for ; Tue, 28 Jan 2020 13:49:39 +0000 (UTC) Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 9255E24683; Tue, 28 Jan 2020 13:49:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580219378; bh=UCqOyG/HQgODbD3qTbeWgaogXt68FoYyMeSaIK2zva0=; h=Subject:To:Cc:From:Date:In-Reply-To:From; b=viMkuWFKbeC7xH2VyZkNigLCdZqjzWl4+qxy+3EdCvK83PqRry9i381Pa2dRsqOJM Qa/5mQ7sxLBgdLWGqDoTcICfnCWu6OvXjHXbk2KZ8g+L4LMLHAbAHrO+YcT/6nVb/n XuMLrPaNGYxGvlGEY75U6vyQMs1uBE8VbCOPcAfU= Subject: Patch "drivers/base/memory: pass a block_id to init_memory_block()" has been added to the 4.19-stable tree To: 1559320186-28337-1-git-send-email-cai@lca.pw, 20190527111152.16324-6-david@redhat.com, Jonathan.Cameron@huawei.com, akpm@linux-foundation.org, alexander.deucher@amd.com, andrew.banman@hpe.com, aneesh.kumar@linux.ibm.com, anshuman.khandual@arm.com, ard.biesheuvel@linaro.org, arunks@codeaurora.org, benh@kernel.crashing.org, bhe@redhat.com, bp@alien8.de, broonie@kernel.org, cai@lca.pw, catalin.marinas@arm.com, chris@chris-wilson.co.uk, christophe.leroy@c-s.fr, cpandya@codeaurora.org, dalias@libc.org, dan.j.williams@intel.com, dave.hansen@linux.intel.com, davem@davemloft.net, david@redhat.com, fenghua.yu@intel.com, gor@linux.ibm.com, gregkh@linuxfoundation.org, heiko.carstens@de.ibm.com, hpa@zytor.com, iamjoonsoo.kim@lge.com, kirill.shutemov@linux.intel.com, linux-mm@kvack.org, logang@deltatee.com, luto@kernel.org, malat@debian.org, mark.rutland@arm.com, mhocko@suse.com, mike.travis@hpe.com, mingo@kernel.org, mpe@ellerman.id.au, npiggin@gmail.com, osalvador@suse.com, osalvador@suse.de, pasha.tatashin@soleen.com, paulus@samba.o, rg@kvack.org, peterz@infradead.org, rafael@kernel.org, richard.weiyang@gmail.com, robh@kernel.org, robin.murphy@arm.com, rppt@linux.vnet.ibm.com, tglx@linutronix.de, tony.luck@intel.com, torvalds@linux-foundation.org, will.deacon@arm.com, yamada.masahiro@socionext.com, yaojun8558363@gmail.com, ysato@users.sourceforge.jp, yuzhao@google.com Cc: From: Date: Tue, 28 Jan 2020 14:49:35 +0100 In-Reply-To: <20200128095021.8076-16-david@redhat.com> Message-ID: <158021937589217@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 X-stable: commit X-Patchwork-Hint: ignore Content-Transfer-Encoding: quoted-printable 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: This is a note to let you know that I've just added the patch titled drivers/base/memory: pass a block_id to init_memory_block() to the 4.19-stable tree which can be found at: http://www.kernel.org/git/?p=3Dlinux/kernel/git/stable/stable-queue.g= it;a=3Dsummary The filename of the patch is: drivers-base-memory-pass-a-block_id-to-init_memory_block.patch and it can be found in the queue-4.19 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >From foo@baz Tue 28 Jan 2020 02:32:10 PM CET From: David Hildenbrand Date: Tue, 28 Jan 2020 10:50:12 +0100 Subject: drivers/base/memory: pass a block_id to init_memory_block() To: stable@vger.kernel.org Cc: linux-mm@kvack.org, Michal Hocko , Greg Kroah-Hartma= n , Andrew Morton = , "Aneesh Kumar K . V" , Baoquan He , Dan Williams , Oscar Salvador , Wei Yang , David Hildenbrand Message-ID: <20200128095021.8076-16-david@redhat.com> From: David Hildenbrand commit 1811582587c43bdf13d690d83345610d4df433bb upstream. We'll rework hotplug_memory_register() shortly, so it no longer consumes pass a section. [cai@lca.pw: fix a compilation warning] Link: http://lkml.kernel.org/r/1559320186-28337-1-git-send-email-cai@lc= a.pw Link: http://lkml.kernel.org/r/20190527111152.16324-6-david@redhat.com Signed-off-by: David Hildenbrand Signed-off-by: Qian Cai Acked-by: Michal Hocko Cc: Greg Kroah-Hartman Cc: "Rafael J. Wysocki" Cc: Alex Deucher Cc: Andrew Banman Cc: Andy Lutomirski Cc: Anshuman Khandual Cc: Ard Biesheuvel Cc: Arun KS Cc: Baoquan He Cc: Benjamin Herrenschmidt Cc: Borislav Petkov Cc: Catalin Marinas Cc: Chintan Pandya Cc: Christophe Leroy Cc: Chris Wilson Cc: Dan Williams Cc: Dave Hansen Cc: "David S. Miller" Cc: Fenghua Yu Cc: Heiko Carstens Cc: "H. Peter Anvin" Cc: Ingo Molnar Cc: Jonathan Cameron Cc: Joonsoo Kim Cc: Jun Yao Cc: "Kirill A. Shutemov" Cc: Logan Gunthorpe Cc: Mark Brown Cc: Mark Rutland Cc: Masahiro Yamada Cc: Mathieu Malaterre Cc: Michael Ellerman Cc: Mike Rapoport Cc: "mike.travis@hpe.com" Cc: Nicholas Piggin Cc: Oscar Salvador Cc: Oscar Salvador Cc: Paul Mackerras Cc: Pavel Tatashin Cc: Peter Zijlstra Cc: Rich Felker Cc: Rob Herring Cc: Robin Murphy Cc: Thomas Gleixner Cc: Tony Luck Cc: Vasily Gorbik Cc: Wei Yang Cc: Will Deacon Cc: Yoshinori Sato Cc: Yu Zhao Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: David Hildenbrand Signed-off-by: Greg Kroah-Hartman --- drivers/base/memory.c | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) --- a/drivers/base/memory.c +++ b/drivers/base/memory.c @@ -660,21 +660,18 @@ int register_memory(struct memory_block return ret; } =20 -static int init_memory_block(struct memory_block **memory, - struct mem_section *section, unsigned long state) +static int init_memory_block(struct memory_block **memory, int block_id, + unsigned long state) { struct memory_block *mem; unsigned long start_pfn; - int scn_nr; int ret =3D 0; =20 mem =3D kzalloc(sizeof(*mem), GFP_KERNEL); if (!mem) return -ENOMEM; =20 - scn_nr =3D __section_nr(section); - mem->start_section_nr =3D - base_memory_block_id(scn_nr) * sections_per_block; + mem->start_section_nr =3D block_id * sections_per_block; mem->end_section_nr =3D mem->start_section_nr + sections_per_block - 1; mem->state =3D state; start_pfn =3D section_nr_to_pfn(mem->start_section_nr); @@ -689,21 +686,18 @@ static int init_memory_block(struct memo static int add_memory_block(int base_section_nr) { struct memory_block *mem; - int i, ret, section_count =3D 0, section_nr; + int i, ret, section_count =3D 0; =20 for (i =3D base_section_nr; i < base_section_nr + sections_per_block; - i++) { - if (!present_section_nr(i)) - continue; - if (section_count =3D=3D 0) - section_nr =3D i; - section_count++; - } + i++) + if (present_section_nr(i)) + section_count++; =20 if (section_count =3D=3D 0) return 0; - ret =3D init_memory_block(&mem, __nr_to_section(section_nr), MEM_ONLINE= ); + ret =3D init_memory_block(&mem, base_memory_block_id(base_section_nr), + MEM_ONLINE); if (ret) return ret; mem->section_count =3D section_count; @@ -716,6 +710,7 @@ static int add_memory_block(int base_sec */ int hotplug_memory_register(int nid, struct mem_section *section) { + int block_id =3D base_memory_block_id(__section_nr(section)); int ret =3D 0; struct memory_block *mem; =20 @@ -726,7 +721,7 @@ int hotplug_memory_register(int nid, str mem->section_count++; put_device(&mem->dev); } else { - ret =3D init_memory_block(&mem, section, MEM_OFFLINE); + ret =3D init_memory_block(&mem, block_id, MEM_OFFLINE); if (ret) goto out; mem->section_count++; Patches currently in stable-queue which might be from david@redhat.com ar= e queue-4.19/mm-memory_hotplug-remove-memory-block-devices-before-arch_remo= ve_memory.patch queue-4.19/mm-hotplug-kill-is_dev_zone-usage-in-__remove_pages.patch queue-4.19/mm-memory_hotplug-create-memory-block-devices-after-arch_add_m= emory.patch queue-4.19/drivers-base-memory-pass-a-block_id-to-init_memory_block.patch queue-4.19/drivers-base-memory.c-clean-up-relics-in-function-parameters.p= atch queue-4.19/mm-memory_hotplug-update-a-comment-in-unregister_memory.patch queue-4.19/mm-memory_hotplug-shrink-zones-when-offlining-memory.patch queue-4.19/mm-memory_hotplug-make-unregister_memory_block_under_nodes-nev= er-fail.patch queue-4.19/mm-memunmap-don-t-access-uninitialized-memmap-in-memunmap_page= s.patch queue-4.19/mm-memory_hotplug-make-__remove_section-never-fail.patch queue-4.19/mm-sparse-drop-pgdat_resize_lock-in-sparse_add-remove_one_sect= ion.patch queue-4.19/mm-memory_hotplug-make-unregister_memory_section-never-fail.pa= tch queue-4.19/mm-memory_hotplug-release-memory-resource-after-arch_remove_me= mory.patch queue-4.19/mm-memory_hotplug-add-nid-parameter-to-arch_remove_memory.patc= h queue-4.19/powerpc-mm-fix-section-mismatch-warning.patch queue-4.19/mm-memory_hotplug-allow-arch_remove_memory-without-config_memo= ry_hotremove.patch queue-4.19/mm-memory_hotplug-make-remove_memory-take-the-device_hotplug_l= ock.patch queue-4.19/mm-memory_hotplug-make-__remove_pages-and-arch_remove_memory-n= ever-fail.patch queue-4.19/mm-memory_hotplug-fix-try_offline_node.patch queue-4.19/mm-memory_hotplug-remove-zone-parameter-from-sparse_remove_one= _section.patch queue-4.19/drivers-base-memory.c-remove-an-unnecessary-check-on-nr_mem_se= ctions.patch queue-4.19/drivers-base-node.c-simplify-unregister_memory_block_under_nod= es.patch queue-4.19/s390x-mm-implement-arch_remove_memory.patch queue-4.19/mm-sparse-pass-nid-instead-of-pgdat-to-sparse_add_one_section.= patch