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=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 77E4FC433E6 for ; Wed, 13 Jan 2021 05:04:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 216FD2310E for ; Wed, 13 Jan 2021 05:04:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726184AbhAMFEh (ORCPT ); Wed, 13 Jan 2021 00:04:37 -0500 Received: from foss.arm.com ([217.140.110.172]:58490 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725873AbhAMFEg (ORCPT ); Wed, 13 Jan 2021 00:04:36 -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 727961042; Tue, 12 Jan 2021 21:03:50 -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 2E6A73F70D; Tue, 12 Jan 2021 21:03:45 -0800 (PST) Subject: Re: [PATCH V2 1/3] mm/hotplug: Prevalidate the address range being added with platform To: David Hildenbrand , Oscar Salvador Cc: linux-mm@kvack.org, akpm@linux-foundation.org, hca@linux.ibm.com, catalin.marinas@arm.com, linux-arm-kernel@lists.infradead.org, linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org, Vasily Gorbik , Will Deacon , Ard Biesheuvel , Mark Rutland References: <1608218912-28932-1-git-send-email-anshuman.khandual@arm.com> <1608218912-28932-2-git-send-email-anshuman.khandual@arm.com> <10e733fa-4568-d38f-9b95-2ccc5dc627b8@redhat.com> <20210111134303.GA3031@linux> <556a8a62-7bb2-d16b-67ea-57c87c1a6aa7@redhat.com> From: Anshuman Khandual Message-ID: <041d9344-b07c-c6f9-c41a-01057470c350@arm.com> Date: Wed, 13 Jan 2021 10:34:04 +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: <556a8a62-7bb2-d16b-67ea-57c87c1a6aa7@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 1/12/21 3:39 PM, David Hildenbrand wrote: > On 12.01.21 04:51, Anshuman Khandual wrote: >> >> >> On 1/11/21 7:13 PM, Oscar Salvador wrote: >>> On Mon, Jan 11, 2021 at 11:51:47AM +0100, David Hildenbrand wrote: >>>> AFAIKs, all memhp_get_pluggable_range() users pass "1". >>>> >>>> What about the "add_pages()-only" path? >>> >>> I guess you refer to memremap_pages(), right? >> >> Right, via pagemap_range(). >> >>> If so, moving the added memhp_range_allowed() check above the if-else might do >>> the trick >>> >> We had that code in the earlier version. But dropped it, as we did >> not want to add any new checks in the generic code. Can add it back >> if that is preferred. > > I remember discussing replacing the check in __add_pages() instead. But The proposed change for __add_pages() now seems misleading. Instead of VM_BUG_ON(), memhp_range_allowed() should be checked directly for a non linear mapping i.e with 'false' argument and return prematurely in case that check fails. s/VM_BUG_ON(!memhp_range_allowed(.., 1)/!memhp_range_allowed(.., 0)/ /* * Reasonably generic function for adding memory. It is * expected that archs that support memory hotplug will @@ -317,10 +304,7 @@ 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; - + VM_BUG_ON(!memhp_range_allowed(PFN_PHYS(pfn), nr_pages * PAGE_SIZE, 1)); if (altmap) { /* * Validate altmap is within bounds of the total request @@ -1181,6 +1165,61 @@ int add_memory_driver_managed(int nid, u64 start, u64 size, > I don't really care where the check ends up being. As discussed, at some > point, we should provide versions of add_pages() and arch_add_pages() > that don't immediately end in arch-code. Sure. But for now, AFAICS the above replacement should be sufficient. 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.5 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=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 64A9BC433E0 for ; Wed, 13 Jan 2021 05:05:27 +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 04CB22310F for ; Wed, 13 Jan 2021 05:05:26 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 04CB22310F 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=cHZ0rm8Ze1judzDwwoP7ShsAuEvcetpfjpeNgIag4pI=; b=x0moXv0LS9rUkA7c7vWpqsdUS WtVaVifT/BS2PzNynumF1roDUgnyJ7pmRtAmPvxqn7SA/8Lh8STbnkQUTVl2kYRiasiVrZf6aINGU qvz7zmvaTZQ0FqOe/u1Te5DKKTFA/YvRavpz0+8Ht2q1zNPB/55pQmg0gbohudLvL0wOydp8aSj7t DH5Ql3EZcsp4AS4xasMzsRHafJLVGrb6sdi/fJlF9DhmuBx655Xby84wnUzUNPilrORWOz1Z6BSzN j6XjCeys4fIebOHV3uMShiNBn/3pM4OhS4IItn49Nnnmn/cqpV5Rwo3oD7WXHm7GtbFQ5Uk7wfNhn qgeadEE1A==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kzYK3-00012G-0f; Wed, 13 Jan 2021 05:03:55 +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 1kzYK0-00011H-4x for linux-arm-kernel@lists.infradead.org; Wed, 13 Jan 2021 05:03:53 +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 727961042; Tue, 12 Jan 2021 21:03:50 -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 2E6A73F70D; Tue, 12 Jan 2021 21:03:45 -0800 (PST) Subject: Re: [PATCH V2 1/3] mm/hotplug: Prevalidate the address range being added with platform To: David Hildenbrand , Oscar Salvador References: <1608218912-28932-1-git-send-email-anshuman.khandual@arm.com> <1608218912-28932-2-git-send-email-anshuman.khandual@arm.com> <10e733fa-4568-d38f-9b95-2ccc5dc627b8@redhat.com> <20210111134303.GA3031@linux> <556a8a62-7bb2-d16b-67ea-57c87c1a6aa7@redhat.com> From: Anshuman Khandual Message-ID: <041d9344-b07c-c6f9-c41a-01057470c350@arm.com> Date: Wed, 13 Jan 2021 10:34:04 +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: <556a8a62-7bb2-d16b-67ea-57c87c1a6aa7@redhat.com> Content-Language: en-US X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210113_000352_260121_3B7BC06F X-CRM114-Status: GOOD ( 18.29 ) 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: Mark Rutland , linux-s390@vger.kernel.org, Vasily Gorbik , catalin.marinas@arm.com, hca@linux.ibm.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org, akpm@linux-foundation.org, Will Deacon , Ard Biesheuvel , 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 1/12/21 3:39 PM, David Hildenbrand wrote: > On 12.01.21 04:51, Anshuman Khandual wrote: >> >> >> On 1/11/21 7:13 PM, Oscar Salvador wrote: >>> On Mon, Jan 11, 2021 at 11:51:47AM +0100, David Hildenbrand wrote: >>>> AFAIKs, all memhp_get_pluggable_range() users pass "1". >>>> >>>> What about the "add_pages()-only" path? >>> >>> I guess you refer to memremap_pages(), right? >> >> Right, via pagemap_range(). >> >>> If so, moving the added memhp_range_allowed() check above the if-else might do >>> the trick >>> >> We had that code in the earlier version. But dropped it, as we did >> not want to add any new checks in the generic code. Can add it back >> if that is preferred. > > I remember discussing replacing the check in __add_pages() instead. But The proposed change for __add_pages() now seems misleading. Instead of VM_BUG_ON(), memhp_range_allowed() should be checked directly for a non linear mapping i.e with 'false' argument and return prematurely in case that check fails. s/VM_BUG_ON(!memhp_range_allowed(.., 1)/!memhp_range_allowed(.., 0)/ /* * Reasonably generic function for adding memory. It is * expected that archs that support memory hotplug will @@ -317,10 +304,7 @@ 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; - + VM_BUG_ON(!memhp_range_allowed(PFN_PHYS(pfn), nr_pages * PAGE_SIZE, 1)); if (altmap) { /* * Validate altmap is within bounds of the total request @@ -1181,6 +1165,61 @@ int add_memory_driver_managed(int nid, u64 start, u64 size, > I don't really care where the check ends up being. As discussed, at some > point, we should provide versions of add_pages() and arch_add_pages() > that don't immediately end in arch-code. Sure. But for now, AFAICS the above replacement should be sufficient. _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel