From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Hildenbrand Date: Wed, 05 Jun 2019 09:00:28 +0000 Subject: Re: [PATCH v3 09/11] mm/memory_hotplug: Remove memory block devices before arch_remove_memory() Message-Id: <38b8b004-9a26-e4ba-d8e3-a41c8fcc51c1@redhat.com> List-Id: References: <20190527111152.16324-1-david@redhat.com> <20190527111152.16324-10-david@redhat.com> <20190604220715.d4d2ctwjk25vd5sq@master> In-Reply-To: <20190604220715.d4d2ctwjk25vd5sq@master> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Wei Yang Cc: Michal Hocko , linux-ia64@vger.kernel.org, linux-sh@vger.kernel.org, Chris Wilson , linux-mm@kvack.org, Arun KS , Ingo Molnar , linux-s390@vger.kernel.org, "Rafael J. Wysocki" , Pavel Tatashin , "mike.travis@hpe.com" , Mark Brown , Jonathan Cameron , Dan Williams , linux-arm-kernel@lists.infradead.org, Oscar Salvador , Andrew Banman , Mathieu Malaterre , Greg Kroah-Hartman , linux-kernel@vger.kernel.org, Alex Deucher , Igor Mammedov , akpm@linux-foundation.org, linuxppc-dev@lists.ozlabs.org, "David S. Miller" On 05.06.19 00:07, Wei Yang wrote: > On Mon, May 27, 2019 at 01:11:50PM +0200, David Hildenbrand wrote: >> Let's factor out removing of memory block devices, which is only >> necessary for memory added via add_memory() and friends that created >> memory block devices. Remove the devices before calling >> arch_remove_memory(). >> >> This finishes factoring out memory block device handling from >> arch_add_memory() and arch_remove_memory(). >> >> Cc: Greg Kroah-Hartman >> Cc: "Rafael J. Wysocki" >> Cc: David Hildenbrand >> Cc: "mike.travis@hpe.com" >> Cc: Andrew Morton >> Cc: Andrew Banman >> Cc: Ingo Molnar >> Cc: Alex Deucher >> Cc: "David S. Miller" >> Cc: Mark Brown >> Cc: Chris Wilson >> Cc: Oscar Salvador >> Cc: Jonathan Cameron >> Cc: Michal Hocko >> Cc: Pavel Tatashin >> Cc: Arun KS >> Cc: Mathieu Malaterre >> Reviewed-by: Dan Williams >> Signed-off-by: David Hildenbrand >> --- >> drivers/base/memory.c | 37 ++++++++++++++++++------------------- >> drivers/base/node.c | 11 ++++++----- >> include/linux/memory.h | 2 +- >> include/linux/node.h | 6 ++---- >> mm/memory_hotplug.c | 5 +++-- >> 5 files changed, 30 insertions(+), 31 deletions(-) >> >> diff --git a/drivers/base/memory.c b/drivers/base/memory.c >> index 5a0370f0c506..f28efb0bf5c7 100644 >> --- a/drivers/base/memory.c >> +++ b/drivers/base/memory.c >> @@ -763,32 +763,31 @@ int create_memory_block_devices(unsigned long start, unsigned long size) >> return ret; >> } >> >> -void unregister_memory_section(struct mem_section *section) >> +/* >> + * Remove memory block devices for the given memory area. Start and size >> + * have to be aligned to memory block granularity. Memory block devices >> + * have to be offline. >> + */ >> +void remove_memory_block_devices(unsigned long start, unsigned long size) >> { >> + const int start_block_id = pfn_to_block_id(PFN_DOWN(start)); >> + const int end_block_id = pfn_to_block_id(PFN_DOWN(start + size)); >> struct memory_block *mem; >> + int block_id; >> >> - if (WARN_ON_ONCE(!present_section(section))) >> + if (WARN_ON_ONCE(!IS_ALIGNED(start, memory_block_size_bytes()) || >> + !IS_ALIGNED(size, memory_block_size_bytes()))) >> return; >> >> mutex_lock(&mem_sysfs_mutex); >> - >> - /* >> - * Some users of the memory hotplug do not want/need memblock to >> - * track all sections. Skip over those. >> - */ >> - mem = find_memory_block(section); >> - if (!mem) >> - goto out_unlock; >> - >> - unregister_mem_sect_under_nodes(mem, __section_nr(section)); >> - >> - mem->section_count--; >> - if (mem->section_count = 0) >> + for (block_id = start_block_id; block_id != end_block_id; block_id++) { >> + mem = find_memory_block_by_id(block_id, NULL); >> + if (WARN_ON_ONCE(!mem)) >> + continue; >> + mem->section_count = 0; > > Is this step necessary? It's what the previous code does, it might not be - I'll leave it like that for now. As mentioned in another reply, I might remove the section_count completely, eventually. -- Thanks, David / dhildenb 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=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=ham 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 A9A2FC282DE for ; Wed, 5 Jun 2019 09:00:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7D8B420866 for ; Wed, 5 Jun 2019 09:00:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726949AbfFEJAs (ORCPT ); Wed, 5 Jun 2019 05:00:48 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35086 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726690AbfFEJAs (ORCPT ); Wed, 5 Jun 2019 05:00:48 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E0E3030C0DD6; Wed, 5 Jun 2019 09:00:36 +0000 (UTC) Received: from [10.36.118.48] (unknown [10.36.118.48]) by smtp.corp.redhat.com (Postfix) with ESMTP id C8C0E5C225; Wed, 5 Jun 2019 09:00:29 +0000 (UTC) Subject: Re: [PATCH v3 09/11] mm/memory_hotplug: Remove memory block devices before arch_remove_memory() To: Wei Yang Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-ia64@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-s390@vger.kernel.org, linux-sh@vger.kernel.org, linux-arm-kernel@lists.infradead.org, akpm@linux-foundation.org, Dan Williams , Igor Mammedov , Greg Kroah-Hartman , "Rafael J. Wysocki" , "mike.travis@hpe.com" , Andrew Banman , Ingo Molnar , Alex Deucher , "David S. Miller" , Mark Brown , Chris Wilson , Oscar Salvador , Jonathan Cameron , Michal Hocko , Pavel Tatashin , Arun KS , Mathieu Malaterre References: <20190527111152.16324-1-david@redhat.com> <20190527111152.16324-10-david@redhat.com> <20190604220715.d4d2ctwjk25vd5sq@master> From: David Hildenbrand Openpgp: preference=signencrypt Autocrypt: addr=david@redhat.com; prefer-encrypt=mutual; keydata= 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 SE+xAvmumFBY Organization: Red Hat GmbH Message-ID: <38b8b004-9a26-e4ba-d8e3-a41c8fcc51c1@redhat.com> Date: Wed, 5 Jun 2019 11:00:28 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.7.0 MIME-Version: 1.0 In-Reply-To: <20190604220715.d4d2ctwjk25vd5sq@master> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]); Wed, 05 Jun 2019 09:00:47 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 05.06.19 00:07, Wei Yang wrote: > On Mon, May 27, 2019 at 01:11:50PM +0200, David Hildenbrand wrote: >> Let's factor out removing of memory block devices, which is only >> necessary for memory added via add_memory() and friends that created >> memory block devices. Remove the devices before calling >> arch_remove_memory(). >> >> This finishes factoring out memory block device handling from >> arch_add_memory() and arch_remove_memory(). >> >> Cc: Greg Kroah-Hartman >> Cc: "Rafael J. Wysocki" >> Cc: David Hildenbrand >> Cc: "mike.travis@hpe.com" >> Cc: Andrew Morton >> Cc: Andrew Banman >> Cc: Ingo Molnar >> Cc: Alex Deucher >> Cc: "David S. Miller" >> Cc: Mark Brown >> Cc: Chris Wilson >> Cc: Oscar Salvador >> Cc: Jonathan Cameron >> Cc: Michal Hocko >> Cc: Pavel Tatashin >> Cc: Arun KS >> Cc: Mathieu Malaterre >> Reviewed-by: Dan Williams >> Signed-off-by: David Hildenbrand >> --- >> drivers/base/memory.c | 37 ++++++++++++++++++------------------- >> drivers/base/node.c | 11 ++++++----- >> include/linux/memory.h | 2 +- >> include/linux/node.h | 6 ++---- >> mm/memory_hotplug.c | 5 +++-- >> 5 files changed, 30 insertions(+), 31 deletions(-) >> >> diff --git a/drivers/base/memory.c b/drivers/base/memory.c >> index 5a0370f0c506..f28efb0bf5c7 100644 >> --- a/drivers/base/memory.c >> +++ b/drivers/base/memory.c >> @@ -763,32 +763,31 @@ int create_memory_block_devices(unsigned long start, unsigned long size) >> return ret; >> } >> >> -void unregister_memory_section(struct mem_section *section) >> +/* >> + * Remove memory block devices for the given memory area. Start and size >> + * have to be aligned to memory block granularity. Memory block devices >> + * have to be offline. >> + */ >> +void remove_memory_block_devices(unsigned long start, unsigned long size) >> { >> + const int start_block_id = pfn_to_block_id(PFN_DOWN(start)); >> + const int end_block_id = pfn_to_block_id(PFN_DOWN(start + size)); >> struct memory_block *mem; >> + int block_id; >> >> - if (WARN_ON_ONCE(!present_section(section))) >> + if (WARN_ON_ONCE(!IS_ALIGNED(start, memory_block_size_bytes()) || >> + !IS_ALIGNED(size, memory_block_size_bytes()))) >> return; >> >> mutex_lock(&mem_sysfs_mutex); >> - >> - /* >> - * Some users of the memory hotplug do not want/need memblock to >> - * track all sections. Skip over those. >> - */ >> - mem = find_memory_block(section); >> - if (!mem) >> - goto out_unlock; >> - >> - unregister_mem_sect_under_nodes(mem, __section_nr(section)); >> - >> - mem->section_count--; >> - if (mem->section_count == 0) >> + for (block_id = start_block_id; block_id != end_block_id; block_id++) { >> + mem = find_memory_block_by_id(block_id, NULL); >> + if (WARN_ON_ONCE(!mem)) >> + continue; >> + mem->section_count = 0; > > Is this step necessary? It's what the previous code does, it might not be - I'll leave it like that for now. As mentioned in another reply, I might remove the section_count completely, eventually. -- Thanks, David / dhildenb 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=-7.0 required=3.0 tests=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 8C45BC28CC6 for ; Wed, 5 Jun 2019 09:02:20 +0000 (UTC) Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (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 204B72086A for ; Wed, 5 Jun 2019 09:02:20 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 204B72086A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 45JjV229DgzDqWg for ; Wed, 5 Jun 2019 19:02:18 +1000 (AEST) Authentication-Results: lists.ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=redhat.com (client-ip=209.132.183.28; helo=mx1.redhat.com; envelope-from=david@redhat.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=redhat.com Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 45JjSQ349JzDqB5 for ; Wed, 5 Jun 2019 19:00:54 +1000 (AEST) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E0E3030C0DD6; Wed, 5 Jun 2019 09:00:36 +0000 (UTC) Received: from [10.36.118.48] (unknown [10.36.118.48]) by smtp.corp.redhat.com (Postfix) with ESMTP id C8C0E5C225; Wed, 5 Jun 2019 09:00:29 +0000 (UTC) Subject: Re: [PATCH v3 09/11] mm/memory_hotplug: Remove memory block devices before arch_remove_memory() To: Wei Yang References: <20190527111152.16324-1-david@redhat.com> <20190527111152.16324-10-david@redhat.com> <20190604220715.d4d2ctwjk25vd5sq@master> From: David Hildenbrand Openpgp: preference=signencrypt Autocrypt: addr=david@redhat.com; prefer-encrypt=mutual; keydata= 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 SE+xAvmumFBY Organization: Red Hat GmbH Message-ID: <38b8b004-9a26-e4ba-d8e3-a41c8fcc51c1@redhat.com> Date: Wed, 5 Jun 2019 11:00:28 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.7.0 MIME-Version: 1.0 In-Reply-To: <20190604220715.d4d2ctwjk25vd5sq@master> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]); Wed, 05 Jun 2019 09:00:47 +0000 (UTC) X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michal Hocko , linux-ia64@vger.kernel.org, linux-sh@vger.kernel.org, Chris Wilson , linux-mm@kvack.org, Arun KS , Ingo Molnar , linux-s390@vger.kernel.org, "Rafael J. Wysocki" , Pavel Tatashin , "mike.travis@hpe.com" , Mark Brown , Jonathan Cameron , Dan Williams , linux-arm-kernel@lists.infradead.org, Oscar Salvador , Andrew Banman , Mathieu Malaterre , Greg Kroah-Hartman , linux-kernel@vger.kernel.org, Alex Deucher , Igor Mammedov , akpm@linux-foundation.org, linuxppc-dev@lists.ozlabs.org, "David S. Miller" Errors-To: linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Sender: "Linuxppc-dev" On 05.06.19 00:07, Wei Yang wrote: > On Mon, May 27, 2019 at 01:11:50PM +0200, David Hildenbrand wrote: >> Let's factor out removing of memory block devices, which is only >> necessary for memory added via add_memory() and friends that created >> memory block devices. Remove the devices before calling >> arch_remove_memory(). >> >> This finishes factoring out memory block device handling from >> arch_add_memory() and arch_remove_memory(). >> >> Cc: Greg Kroah-Hartman >> Cc: "Rafael J. Wysocki" >> Cc: David Hildenbrand >> Cc: "mike.travis@hpe.com" >> Cc: Andrew Morton >> Cc: Andrew Banman >> Cc: Ingo Molnar >> Cc: Alex Deucher >> Cc: "David S. Miller" >> Cc: Mark Brown >> Cc: Chris Wilson >> Cc: Oscar Salvador >> Cc: Jonathan Cameron >> Cc: Michal Hocko >> Cc: Pavel Tatashin >> Cc: Arun KS >> Cc: Mathieu Malaterre >> Reviewed-by: Dan Williams >> Signed-off-by: David Hildenbrand >> --- >> drivers/base/memory.c | 37 ++++++++++++++++++------------------- >> drivers/base/node.c | 11 ++++++----- >> include/linux/memory.h | 2 +- >> include/linux/node.h | 6 ++---- >> mm/memory_hotplug.c | 5 +++-- >> 5 files changed, 30 insertions(+), 31 deletions(-) >> >> diff --git a/drivers/base/memory.c b/drivers/base/memory.c >> index 5a0370f0c506..f28efb0bf5c7 100644 >> --- a/drivers/base/memory.c >> +++ b/drivers/base/memory.c >> @@ -763,32 +763,31 @@ int create_memory_block_devices(unsigned long start, unsigned long size) >> return ret; >> } >> >> -void unregister_memory_section(struct mem_section *section) >> +/* >> + * Remove memory block devices for the given memory area. Start and size >> + * have to be aligned to memory block granularity. Memory block devices >> + * have to be offline. >> + */ >> +void remove_memory_block_devices(unsigned long start, unsigned long size) >> { >> + const int start_block_id = pfn_to_block_id(PFN_DOWN(start)); >> + const int end_block_id = pfn_to_block_id(PFN_DOWN(start + size)); >> struct memory_block *mem; >> + int block_id; >> >> - if (WARN_ON_ONCE(!present_section(section))) >> + if (WARN_ON_ONCE(!IS_ALIGNED(start, memory_block_size_bytes()) || >> + !IS_ALIGNED(size, memory_block_size_bytes()))) >> return; >> >> mutex_lock(&mem_sysfs_mutex); >> - >> - /* >> - * Some users of the memory hotplug do not want/need memblock to >> - * track all sections. Skip over those. >> - */ >> - mem = find_memory_block(section); >> - if (!mem) >> - goto out_unlock; >> - >> - unregister_mem_sect_under_nodes(mem, __section_nr(section)); >> - >> - mem->section_count--; >> - if (mem->section_count == 0) >> + for (block_id = start_block_id; block_id != end_block_id; block_id++) { >> + mem = find_memory_block_by_id(block_id, NULL); >> + if (WARN_ON_ONCE(!mem)) >> + continue; >> + mem->section_count = 0; > > Is this step necessary? It's what the previous code does, it might not be - I'll leave it like that for now. As mentioned in another reply, I might remove the section_count completely, eventually. -- Thanks, David / dhildenb 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=-7.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,T_DKIMWL_WL_HIGH,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 C2428C282DE for ; Wed, 5 Jun 2019 09:00:52 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 9861C2075C for ; Wed, 5 Jun 2019 09:00:52 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="X7UJ75iS" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9861C2075C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date: Message-ID:From:References:To:Subject:Reply-To:Content-ID:Content-Description :Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=c/1Mxg5Rm8hvzfpwRBvxYye37s4aq9D0yYRIlu6Se1Q=; b=X7UJ75iS+bmmwb pBBQOWvgoK//J5S2VHtafSfsTkW7kAcCSnW+LxDqCm2Skp5ppImNHRsyuMqWK8XPXUIwg14ZJ/ZWu OLE8IXedgh3QWoQH3ovmnZ/RYv0tqgeZJ4NQoQmMjNaOozd4tZUKi82ybDKvHadyAV9eKRF9/zh9j zBYNw/mh+qcII+mw8XJaKpkvLMY2uFbJcHebLtfwEtfm2wOI4Vfxn9o02L8HEH7b/1Ma1WD1fw6QM m7ngAqs+806AxRjVZqvYs0iiX1wrJO6FR9/dSsDNEChh3mlbo3kV4V0kcQ6BX/2mZOYEAoeC3468d oz9dTmJ3khzaKcZkMTvQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hYRmt-0005B1-1D; Wed, 05 Jun 2019 09:00:51 +0000 Received: from mx1.redhat.com ([209.132.183.28]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hYRmp-0005AC-Ks for linux-arm-kernel@lists.infradead.org; Wed, 05 Jun 2019 09:00:49 +0000 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E0E3030C0DD6; Wed, 5 Jun 2019 09:00:36 +0000 (UTC) Received: from [10.36.118.48] (unknown [10.36.118.48]) by smtp.corp.redhat.com (Postfix) with ESMTP id C8C0E5C225; Wed, 5 Jun 2019 09:00:29 +0000 (UTC) Subject: Re: [PATCH v3 09/11] mm/memory_hotplug: Remove memory block devices before arch_remove_memory() To: Wei Yang References: <20190527111152.16324-1-david@redhat.com> <20190527111152.16324-10-david@redhat.com> <20190604220715.d4d2ctwjk25vd5sq@master> From: David Hildenbrand Openpgp: preference=signencrypt Autocrypt: addr=david@redhat.com; prefer-encrypt=mutual; keydata= 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 SE+xAvmumFBY Organization: Red Hat GmbH Message-ID: <38b8b004-9a26-e4ba-d8e3-a41c8fcc51c1@redhat.com> Date: Wed, 5 Jun 2019 11:00:28 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.7.0 MIME-Version: 1.0 In-Reply-To: <20190604220715.d4d2ctwjk25vd5sq@master> Content-Language: en-US X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]); Wed, 05 Jun 2019 09:00:47 +0000 (UTC) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190605_020047_722614_96AB52B2 X-CRM114-Status: GOOD ( 21.17 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michal Hocko , linux-ia64@vger.kernel.org, linux-sh@vger.kernel.org, Chris Wilson , linux-mm@kvack.org, Arun KS , Ingo Molnar , linux-s390@vger.kernel.org, "Rafael J. Wysocki" , Pavel Tatashin , "mike.travis@hpe.com" , Mark Brown , Jonathan Cameron , Dan Williams , linux-arm-kernel@lists.infradead.org, Oscar Salvador , Andrew Banman , Mathieu Malaterre , Greg Kroah-Hartman , linux-kernel@vger.kernel.org, Alex Deucher , Igor Mammedov , akpm@linux-foundation.org, linuxppc-dev@lists.ozlabs.org, "David S. Miller" Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org On 05.06.19 00:07, Wei Yang wrote: > On Mon, May 27, 2019 at 01:11:50PM +0200, David Hildenbrand wrote: >> Let's factor out removing of memory block devices, which is only >> necessary for memory added via add_memory() and friends that created >> memory block devices. Remove the devices before calling >> arch_remove_memory(). >> >> This finishes factoring out memory block device handling from >> arch_add_memory() and arch_remove_memory(). >> >> Cc: Greg Kroah-Hartman >> Cc: "Rafael J. Wysocki" >> Cc: David Hildenbrand >> Cc: "mike.travis@hpe.com" >> Cc: Andrew Morton >> Cc: Andrew Banman >> Cc: Ingo Molnar >> Cc: Alex Deucher >> Cc: "David S. Miller" >> Cc: Mark Brown >> Cc: Chris Wilson >> Cc: Oscar Salvador >> Cc: Jonathan Cameron >> Cc: Michal Hocko >> Cc: Pavel Tatashin >> Cc: Arun KS >> Cc: Mathieu Malaterre >> Reviewed-by: Dan Williams >> Signed-off-by: David Hildenbrand >> --- >> drivers/base/memory.c | 37 ++++++++++++++++++------------------- >> drivers/base/node.c | 11 ++++++----- >> include/linux/memory.h | 2 +- >> include/linux/node.h | 6 ++---- >> mm/memory_hotplug.c | 5 +++-- >> 5 files changed, 30 insertions(+), 31 deletions(-) >> >> diff --git a/drivers/base/memory.c b/drivers/base/memory.c >> index 5a0370f0c506..f28efb0bf5c7 100644 >> --- a/drivers/base/memory.c >> +++ b/drivers/base/memory.c >> @@ -763,32 +763,31 @@ int create_memory_block_devices(unsigned long start, unsigned long size) >> return ret; >> } >> >> -void unregister_memory_section(struct mem_section *section) >> +/* >> + * Remove memory block devices for the given memory area. Start and size >> + * have to be aligned to memory block granularity. Memory block devices >> + * have to be offline. >> + */ >> +void remove_memory_block_devices(unsigned long start, unsigned long size) >> { >> + const int start_block_id = pfn_to_block_id(PFN_DOWN(start)); >> + const int end_block_id = pfn_to_block_id(PFN_DOWN(start + size)); >> struct memory_block *mem; >> + int block_id; >> >> - if (WARN_ON_ONCE(!present_section(section))) >> + if (WARN_ON_ONCE(!IS_ALIGNED(start, memory_block_size_bytes()) || >> + !IS_ALIGNED(size, memory_block_size_bytes()))) >> return; >> >> mutex_lock(&mem_sysfs_mutex); >> - >> - /* >> - * Some users of the memory hotplug do not want/need memblock to >> - * track all sections. Skip over those. >> - */ >> - mem = find_memory_block(section); >> - if (!mem) >> - goto out_unlock; >> - >> - unregister_mem_sect_under_nodes(mem, __section_nr(section)); >> - >> - mem->section_count--; >> - if (mem->section_count == 0) >> + for (block_id = start_block_id; block_id != end_block_id; block_id++) { >> + mem = find_memory_block_by_id(block_id, NULL); >> + if (WARN_ON_ONCE(!mem)) >> + continue; >> + mem->section_count = 0; > > Is this step necessary? It's what the previous code does, it might not be - I'll leave it like that for now. As mentioned in another reply, I might remove the section_count completely, eventually. -- Thanks, David / dhildenb _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel