From mboxrd@z Thu Jan 1 00:00:00 1970 From: ar@linux.vnet.ibm.com (Andrea Reale) Date: Fri, 24 Nov 2017 10:44:01 +0000 Subject: [PATCH v2 4/5] mm: memory_hotplug: Add memory hotremove probe device In-Reply-To: <5A17F5DF.2040108@huawei.com> References: <22d34fe30df0fbacbfceeb47e20cb1184af73585.1511433386.git.ar@linux.vnet.ibm.com> <5A17F5DF.2040108@huawei.com> Message-ID: <20171124104401.GD18120@samekh> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Hi zhongjiang, On Fri 24 Nov 2017, 18:35, zhong jiang wrote: > HI, Andrea > > I don't see "memory_add_physaddr_to_nid" in arch/arm64. > Am I miss something? When !CONFIG_NUMA it is defined in include/linux/memory_hotplug.h as 0. In patch 1/5 of this series we require !NUMA to enable ARCH_ENABLE_MEMORY_HOTPLUG. The reason for this simplification is simply that we would not know how to decide the correct node to which to add memory when NUMA is on. Any suggestion on that matter is welcome. Thanks, Andrea > Thnaks > zhongjiang > > On 2017/11/23 19:14, Andrea Reale wrote: > > Adding a "remove" sysfs handle that can be used to trigger > > memory hotremove manually, exactly simmetrically with > > what happens with the "probe" device for hot-add. > > > > This is usueful for architecture that do not rely on > > ACPI for memory hot-remove. > > > > Signed-off-by: Andrea Reale > > Signed-off-by: Maciej Bielski > > --- > > drivers/base/memory.c | 34 +++++++++++++++++++++++++++++++++- > > 1 file changed, 33 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/base/memory.c b/drivers/base/memory.c > > index 1d60b58..8ccb67c 100644 > > --- a/drivers/base/memory.c > > +++ b/drivers/base/memory.c > > @@ -530,7 +530,36 @@ memory_probe_store(struct device *dev, struct device_attribute *attr, > > } > > > > static DEVICE_ATTR(probe, S_IWUSR, NULL, memory_probe_store); > > -#endif > > + > > +#ifdef CONFIG_MEMORY_HOTREMOVE > > +static ssize_t > > +memory_remove_store(struct device *dev, > > + struct device_attribute *attr, const char *buf, size_t count) > > +{ > > + u64 phys_addr; > > + int nid, ret; > > + unsigned long pages_per_block = PAGES_PER_SECTION * sections_per_block; > > + > > + ret = kstrtoull(buf, 0, &phys_addr); > > + if (ret) > > + return ret; > > + > > + if (phys_addr & ((pages_per_block << PAGE_SHIFT) - 1)) > > + return -EINVAL; > > + > > + nid = memory_add_physaddr_to_nid(phys_addr); > > + ret = lock_device_hotplug_sysfs(); > > + if (ret) > > + return ret; > > + > > + remove_memory(nid, phys_addr, > > + MIN_MEMORY_BLOCK_SIZE * sections_per_block); > > + unlock_device_hotplug(); > > + return count; > > +} > > +static DEVICE_ATTR(remove, S_IWUSR, NULL, memory_remove_store); > > +#endif /* CONFIG_MEMORY_HOTREMOVE */ > > +#endif /* CONFIG_ARCH_MEMORY_PROBE */ > > > > #ifdef CONFIG_MEMORY_FAILURE > > /* > > @@ -790,6 +819,9 @@ bool is_memblock_offlined(struct memory_block *mem) > > static struct attribute *memory_root_attrs[] = { > > #ifdef CONFIG_ARCH_MEMORY_PROBE > > &dev_attr_probe.attr, > > +#ifdef CONFIG_MEMORY_HOTREMOVE > > + &dev_attr_remove.attr, > > +#endif > > #endif > > > > #ifdef CONFIG_MEMORY_FAILURE > > From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-f70.google.com (mail-wm0-f70.google.com [74.125.82.70]) by kanga.kvack.org (Postfix) with ESMTP id 5C9D76B0033 for ; Fri, 24 Nov 2017 05:44:14 -0500 (EST) Received: by mail-wm0-f70.google.com with SMTP id k3so6476745wmg.6 for ; Fri, 24 Nov 2017 02:44:14 -0800 (PST) Received: from mx0a-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com. [148.163.158.5]) by mx.google.com with ESMTPS id z13si7299735edl.354.2017.11.24.02.44.12 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 24 Nov 2017 02:44:13 -0800 (PST) Received: from pps.filterd (m0098416.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.21/8.16.0.21) with SMTP id vAOAi8vO061842 for ; Fri, 24 Nov 2017 05:44:11 -0500 Received: from e06smtp11.uk.ibm.com (e06smtp11.uk.ibm.com [195.75.94.107]) by mx0b-001b2d01.pphosted.com with ESMTP id 2eehscrctv-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Fri, 24 Nov 2017 05:44:11 -0500 Received: from localhost by e06smtp11.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 24 Nov 2017 10:44:08 -0000 Date: Fri, 24 Nov 2017 10:44:01 +0000 From: Andrea Reale Subject: Re: [PATCH v2 4/5] mm: memory_hotplug: Add memory hotremove probe device References: <22d34fe30df0fbacbfceeb47e20cb1184af73585.1511433386.git.ar@linux.vnet.ibm.com> <5A17F5DF.2040108@huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <5A17F5DF.2040108@huawei.com> Message-Id: <20171124104401.GD18120@samekh> Sender: owner-linux-mm@kvack.org List-ID: To: zhong jiang Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, m.bielski@virtualopensystems.com, arunks@qti.qualcomm.com, mark.rutland@arm.com, scott.branden@broadcom.com, will.deacon@arm.com, qiuxishi@huawei.com, catalin.marinas@arm.com, mhocko@suse.com, realean2@ie.ibm.com Hi zhongjiang, On Fri 24 Nov 2017, 18:35, zhong jiang wrote: > HI, Andrea > > I don't see "memory_add_physaddr_to_nid" in arch/arm64. > Am I miss something? When !CONFIG_NUMA it is defined in include/linux/memory_hotplug.h as 0. In patch 1/5 of this series we require !NUMA to enable ARCH_ENABLE_MEMORY_HOTPLUG. The reason for this simplification is simply that we would not know how to decide the correct node to which to add memory when NUMA is on. Any suggestion on that matter is welcome. Thanks, Andrea > Thnaks > zhongjiang > > On 2017/11/23 19:14, Andrea Reale wrote: > > Adding a "remove" sysfs handle that can be used to trigger > > memory hotremove manually, exactly simmetrically with > > what happens with the "probe" device for hot-add. > > > > This is usueful for architecture that do not rely on > > ACPI for memory hot-remove. > > > > Signed-off-by: Andrea Reale > > Signed-off-by: Maciej Bielski > > --- > > drivers/base/memory.c | 34 +++++++++++++++++++++++++++++++++- > > 1 file changed, 33 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/base/memory.c b/drivers/base/memory.c > > index 1d60b58..8ccb67c 100644 > > --- a/drivers/base/memory.c > > +++ b/drivers/base/memory.c > > @@ -530,7 +530,36 @@ memory_probe_store(struct device *dev, struct device_attribute *attr, > > } > > > > static DEVICE_ATTR(probe, S_IWUSR, NULL, memory_probe_store); > > -#endif > > + > > +#ifdef CONFIG_MEMORY_HOTREMOVE > > +static ssize_t > > +memory_remove_store(struct device *dev, > > + struct device_attribute *attr, const char *buf, size_t count) > > +{ > > + u64 phys_addr; > > + int nid, ret; > > + unsigned long pages_per_block = PAGES_PER_SECTION * sections_per_block; > > + > > + ret = kstrtoull(buf, 0, &phys_addr); > > + if (ret) > > + return ret; > > + > > + if (phys_addr & ((pages_per_block << PAGE_SHIFT) - 1)) > > + return -EINVAL; > > + > > + nid = memory_add_physaddr_to_nid(phys_addr); > > + ret = lock_device_hotplug_sysfs(); > > + if (ret) > > + return ret; > > + > > + remove_memory(nid, phys_addr, > > + MIN_MEMORY_BLOCK_SIZE * sections_per_block); > > + unlock_device_hotplug(); > > + return count; > > +} > > +static DEVICE_ATTR(remove, S_IWUSR, NULL, memory_remove_store); > > +#endif /* CONFIG_MEMORY_HOTREMOVE */ > > +#endif /* CONFIG_ARCH_MEMORY_PROBE */ > > > > #ifdef CONFIG_MEMORY_FAILURE > > /* > > @@ -790,6 +819,9 @@ bool is_memblock_offlined(struct memory_block *mem) > > static struct attribute *memory_root_attrs[] = { > > #ifdef CONFIG_ARCH_MEMORY_PROBE > > &dev_attr_probe.attr, > > +#ifdef CONFIG_MEMORY_HOTREMOVE > > + &dev_attr_remove.attr, > > +#endif > > #endif > > > > #ifdef CONFIG_MEMORY_FAILURE > > -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753395AbdKXKqb (ORCPT ); Fri, 24 Nov 2017 05:46:31 -0500 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:39890 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753118AbdKXKqa (ORCPT ); Fri, 24 Nov 2017 05:46:30 -0500 Date: Fri, 24 Nov 2017 10:44:01 +0000 From: Andrea Reale To: zhong jiang Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, m.bielski@virtualopensystems.com, arunks@qti.qualcomm.com, mark.rutland@arm.com, scott.branden@broadcom.com, will.deacon@arm.com, qiuxishi@huawei.com, catalin.marinas@arm.com, mhocko@suse.com, realean2@ie.ibm.com Subject: Re: [PATCH v2 4/5] mm: memory_hotplug: Add memory hotremove probe device References: <22d34fe30df0fbacbfceeb47e20cb1184af73585.1511433386.git.ar@linux.vnet.ibm.com> <5A17F5DF.2040108@huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <5A17F5DF.2040108@huawei.com> User-Agent: Mutt/1.5.24 (2015-08-30) X-TM-AS-GCONF: 00 x-cbid: 17112410-0040-0000-0000-000004122BDD X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17112410-0041-0000-0000-000020B500CF Message-Id: <20171124104401.GD18120@samekh> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2017-11-24_03:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 impostorscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1709140000 definitions=main-1711240144 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi zhongjiang, On Fri 24 Nov 2017, 18:35, zhong jiang wrote: > HI, Andrea > > I don't see "memory_add_physaddr_to_nid" in arch/arm64. > Am I miss something? When !CONFIG_NUMA it is defined in include/linux/memory_hotplug.h as 0. In patch 1/5 of this series we require !NUMA to enable ARCH_ENABLE_MEMORY_HOTPLUG. The reason for this simplification is simply that we would not know how to decide the correct node to which to add memory when NUMA is on. Any suggestion on that matter is welcome. Thanks, Andrea > Thnaks > zhongjiang > > On 2017/11/23 19:14, Andrea Reale wrote: > > Adding a "remove" sysfs handle that can be used to trigger > > memory hotremove manually, exactly simmetrically with > > what happens with the "probe" device for hot-add. > > > > This is usueful for architecture that do not rely on > > ACPI for memory hot-remove. > > > > Signed-off-by: Andrea Reale > > Signed-off-by: Maciej Bielski > > --- > > drivers/base/memory.c | 34 +++++++++++++++++++++++++++++++++- > > 1 file changed, 33 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/base/memory.c b/drivers/base/memory.c > > index 1d60b58..8ccb67c 100644 > > --- a/drivers/base/memory.c > > +++ b/drivers/base/memory.c > > @@ -530,7 +530,36 @@ memory_probe_store(struct device *dev, struct device_attribute *attr, > > } > > > > static DEVICE_ATTR(probe, S_IWUSR, NULL, memory_probe_store); > > -#endif > > + > > +#ifdef CONFIG_MEMORY_HOTREMOVE > > +static ssize_t > > +memory_remove_store(struct device *dev, > > + struct device_attribute *attr, const char *buf, size_t count) > > +{ > > + u64 phys_addr; > > + int nid, ret; > > + unsigned long pages_per_block = PAGES_PER_SECTION * sections_per_block; > > + > > + ret = kstrtoull(buf, 0, &phys_addr); > > + if (ret) > > + return ret; > > + > > + if (phys_addr & ((pages_per_block << PAGE_SHIFT) - 1)) > > + return -EINVAL; > > + > > + nid = memory_add_physaddr_to_nid(phys_addr); > > + ret = lock_device_hotplug_sysfs(); > > + if (ret) > > + return ret; > > + > > + remove_memory(nid, phys_addr, > > + MIN_MEMORY_BLOCK_SIZE * sections_per_block); > > + unlock_device_hotplug(); > > + return count; > > +} > > +static DEVICE_ATTR(remove, S_IWUSR, NULL, memory_remove_store); > > +#endif /* CONFIG_MEMORY_HOTREMOVE */ > > +#endif /* CONFIG_ARCH_MEMORY_PROBE */ > > > > #ifdef CONFIG_MEMORY_FAILURE > > /* > > @@ -790,6 +819,9 @@ bool is_memblock_offlined(struct memory_block *mem) > > static struct attribute *memory_root_attrs[] = { > > #ifdef CONFIG_ARCH_MEMORY_PROBE > > &dev_attr_probe.attr, > > +#ifdef CONFIG_MEMORY_HOTREMOVE > > + &dev_attr_remove.attr, > > +#endif > > #endif > > > > #ifdef CONFIG_MEMORY_FAILURE > >