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=-10.3 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 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 E7051C64E8A for ; Wed, 2 Dec 2020 12:16:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8EF51221FE for ; Wed, 2 Dec 2020 12:16:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729858AbgLBMQo (ORCPT ); Wed, 2 Dec 2020 07:16:44 -0500 Received: from foss.arm.com ([217.140.110.172]:37766 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729843AbgLBMQn (ORCPT ); Wed, 2 Dec 2020 07:16:43 -0500 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 34FC7101E; Wed, 2 Dec 2020 04:15:58 -0800 (PST) Received: from [192.168.0.130] (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 5E52D3F718; Wed, 2 Dec 2020 04:15:56 -0800 (PST) Subject: Re: [RFC V2 1/3] mm/hotplug: Prevalidate the address range being added with platform To: David Hildenbrand , linux-mm@kvack.org, akpm@linux-foundation.org Cc: linux-arm-kernel@lists.infradead.org, linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org References: <1606706992-26656-1-git-send-email-anshuman.khandual@arm.com> <1606706992-26656-2-git-send-email-anshuman.khandual@arm.com> <864c701a-4391-f768-1b95-1992e21835a2@redhat.com> From: Anshuman Khandual Message-ID: <349f7b33-cd5b-4240-e7c0-d8ad39c8ba71@arm.com> Date: Wed, 2 Dec 2020 17:45:39 +0530 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <864c701a-4391-f768-1b95-1992e21835a2@redhat.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 12/2/20 2:50 PM, David Hildenbrand wrote: > On 30.11.20 04:29, Anshuman Khandual wrote: >> This introduces memhp_range_allowed() which can be called in various memory >> hotplug paths to prevalidate the address range which is being added, with >> the platform. Then memhp_range_allowed() calls memhp_get_pluggable_range() >> which provides applicable address range depending on whether linear mapping >> is required or not. For ranges that require linear mapping, it calls a new >> arch callback arch_get_mappable_range() which the platform can override. So >> the new callback, in turn provides the platform an opportunity to configure >> acceptable memory hotplug address ranges in case there are constraints. >> >> This mechanism will help prevent platform specific errors deep down during >> hotplug calls. This drops now redundant check_hotplug_memory_addressable() >> check in __add_pages(). >> > > > [...] > >> /* >> * Reasonably generic function for adding memory. It is >> * expected that archs that support memory hotplug will >> @@ -317,10 +304,6 @@ int __ref __add_pages(int nid, unsigned long pfn, unsigned long nr_pages, >> if (WARN_ON_ONCE(!params->pgprot.pgprot)) >> return -EINVAL; >> >> - err = check_hotplug_memory_addressable(pfn, nr_pages); >> - if (err) >> - return err; >> - > > I was wondering if we should add a VM_BUG_ON(!memhp_range_allowed()) > here to make it clearer that callers are expected to check that first. > Maybe an other places as well (e.g., arch code where we remove the > original checks) Makes sense, will add them. > > [...] > > >> #endif /* CONFIG_MEMORY_HOTREMOVE */ >> diff --git a/mm/memremap.c b/mm/memremap.c >> index 16b2fb482da1..26c1825756cc 100644 >> --- a/mm/memremap.c >> +++ b/mm/memremap.c >> @@ -185,6 +185,7 @@ static void dev_pagemap_percpu_release(struct percpu_ref *ref) >> static int pagemap_range(struct dev_pagemap *pgmap, struct mhp_params *params, >> int range_id, int nid) >> { >> + const bool is_private = pgmap->type == MEMORY_DEVICE_PRIVATE; >> struct range *range = &pgmap->ranges[range_id]; >> struct dev_pagemap *conflict_pgmap; >> int error, is_ram; >> @@ -230,6 +231,9 @@ static int pagemap_range(struct dev_pagemap *pgmap, struct mhp_params *params, >> if (error) >> goto err_pfn_remap; >> >> + if (!memhp_range_allowed(range->start, range_len(range), !is_private)) >> + goto err_pfn_remap; >> + >> mem_hotplug_begin(); >> >> /* >> @@ -243,7 +247,7 @@ static int pagemap_range(struct dev_pagemap *pgmap, struct mhp_params *params, >> * the CPU, we do want the linear mapping and thus use >> * arch_add_memory(). >> */ >> - if (pgmap->type == MEMORY_DEVICE_PRIVATE) { >> + if (is_private) { >> error = add_pages(nid, PHYS_PFN(range->start), >> PHYS_PFN(range_len(range)), params); >> } else { >> > > In general, LGTM. > Okay 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=-11.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 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 25468C64E7C for ; Wed, 2 Dec 2020 12:17:29 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (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 B63DD22203 for ; Wed, 2 Dec 2020 12:17:28 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B63DD22203 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+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=merlin.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=F0W7FhNFQ/yhdzdgPH9YXyO7am30HKcYNvxSSSMSHg4=; b=LwnOrG7Hp2HbKsveaE4+HHjL2 Ra9+lYaErFf2N6ZOYlz1bLkNjOCtermz4Qyi1fTVHBlRlDcm06QcNKBRjpWNJt3ayGoaQautRVr9P NWVUq5iUYLJ4wNxHZbF5dCunQM65g7XJIgFITigoNA/fPV/nVbuXl4UYTT1Ky9yomD+FeTGmKwqSf 8E2exZwiy4lwpCcBOTYVA4rySYS49r3wR0yOw2O2Q2P5eX8Uh5zTYJtvh48RYf9msJIIpeBdRcOfs 9ifS9XI1F9DMkvEbgxrmroR3GrxQ/nQjSim1gmseKDHpMbwW4W3p0Um3C6QvfwKXmDTY8jWOTd4xp dd3V1jXHg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kkR3F-0003w3-86; Wed, 02 Dec 2020 12:16:05 +0000 Received: from foss.arm.com ([217.140.110.172]) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kkR38-0003sb-Ta for linux-arm-kernel@lists.infradead.org; Wed, 02 Dec 2020 12:16:00 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 34FC7101E; Wed, 2 Dec 2020 04:15:58 -0800 (PST) Received: from [192.168.0.130] (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 5E52D3F718; Wed, 2 Dec 2020 04:15:56 -0800 (PST) Subject: Re: [RFC V2 1/3] mm/hotplug: Prevalidate the address range being added with platform To: David Hildenbrand , linux-mm@kvack.org, akpm@linux-foundation.org References: <1606706992-26656-1-git-send-email-anshuman.khandual@arm.com> <1606706992-26656-2-git-send-email-anshuman.khandual@arm.com> <864c701a-4391-f768-1b95-1992e21835a2@redhat.com> From: Anshuman Khandual Message-ID: <349f7b33-cd5b-4240-e7c0-d8ad39c8ba71@arm.com> Date: Wed, 2 Dec 2020 17:45:39 +0530 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <864c701a-4391-f768-1b95-1992e21835a2@redhat.com> Content-Language: en-US X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201202_071559_117015_98BF8F39 X-CRM114-Status: GOOD ( 21.67 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On 12/2/20 2:50 PM, David Hildenbrand wrote: > On 30.11.20 04:29, Anshuman Khandual wrote: >> This introduces memhp_range_allowed() which can be called in various memory >> hotplug paths to prevalidate the address range which is being added, with >> the platform. Then memhp_range_allowed() calls memhp_get_pluggable_range() >> which provides applicable address range depending on whether linear mapping >> is required or not. For ranges that require linear mapping, it calls a new >> arch callback arch_get_mappable_range() which the platform can override. So >> the new callback, in turn provides the platform an opportunity to configure >> acceptable memory hotplug address ranges in case there are constraints. >> >> This mechanism will help prevent platform specific errors deep down during >> hotplug calls. This drops now redundant check_hotplug_memory_addressable() >> check in __add_pages(). >> > > > [...] > >> /* >> * Reasonably generic function for adding memory. It is >> * expected that archs that support memory hotplug will >> @@ -317,10 +304,6 @@ int __ref __add_pages(int nid, unsigned long pfn, unsigned long nr_pages, >> if (WARN_ON_ONCE(!params->pgprot.pgprot)) >> return -EINVAL; >> >> - err = check_hotplug_memory_addressable(pfn, nr_pages); >> - if (err) >> - return err; >> - > > I was wondering if we should add a VM_BUG_ON(!memhp_range_allowed()) > here to make it clearer that callers are expected to check that first. > Maybe an other places as well (e.g., arch code where we remove the > original checks) Makes sense, will add them. > > [...] > > >> #endif /* CONFIG_MEMORY_HOTREMOVE */ >> diff --git a/mm/memremap.c b/mm/memremap.c >> index 16b2fb482da1..26c1825756cc 100644 >> --- a/mm/memremap.c >> +++ b/mm/memremap.c >> @@ -185,6 +185,7 @@ static void dev_pagemap_percpu_release(struct percpu_ref *ref) >> static int pagemap_range(struct dev_pagemap *pgmap, struct mhp_params *params, >> int range_id, int nid) >> { >> + const bool is_private = pgmap->type == MEMORY_DEVICE_PRIVATE; >> struct range *range = &pgmap->ranges[range_id]; >> struct dev_pagemap *conflict_pgmap; >> int error, is_ram; >> @@ -230,6 +231,9 @@ static int pagemap_range(struct dev_pagemap *pgmap, struct mhp_params *params, >> if (error) >> goto err_pfn_remap; >> >> + if (!memhp_range_allowed(range->start, range_len(range), !is_private)) >> + goto err_pfn_remap; >> + >> mem_hotplug_begin(); >> >> /* >> @@ -243,7 +247,7 @@ static int pagemap_range(struct dev_pagemap *pgmap, struct mhp_params *params, >> * the CPU, we do want the linear mapping and thus use >> * arch_add_memory(). >> */ >> - if (pgmap->type == MEMORY_DEVICE_PRIVATE) { >> + if (is_private) { >> error = add_pages(nid, PHYS_PFN(range->start), >> PHYS_PFN(range_len(range)), params); >> } else { >> > > In general, LGTM. > Okay _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel