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=-15.3 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,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 5827AC433E0 for ; Wed, 20 Jan 2021 08:28:17 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id A9804225AA for ; Wed, 20 Jan 2021 08:28:16 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A9804225AA Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id F15C46B0006; Wed, 20 Jan 2021 03:28:15 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id E9E376B0007; Wed, 20 Jan 2021 03:28:15 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D8DE16B0008; Wed, 20 Jan 2021 03:28:15 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0192.hostedemail.com [216.40.44.192]) by kanga.kvack.org (Postfix) with ESMTP id BC7D06B0006 for ; Wed, 20 Jan 2021 03:28:15 -0500 (EST) Received: from smtpin08.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 7B8988249980 for ; Wed, 20 Jan 2021 08:28:15 +0000 (UTC) X-FDA: 77725476150.08.burn17_191830b27559 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin08.hostedemail.com (Postfix) with ESMTP id 5FAED1819E62A for ; Wed, 20 Jan 2021 08:28:15 +0000 (UTC) X-HE-Tag: burn17_191830b27559 X-Filterd-Recvd-Size: 4563 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf46.hostedemail.com (Postfix) with ESMTP for ; Wed, 20 Jan 2021 08:28:14 +0000 (UTC) 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 CE2A611B3; Wed, 20 Jan 2021 00:28:13 -0800 (PST) Received: from [10.163.90.172] (unknown [10.163.90.172]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 0FC453F68F; Wed, 20 Jan 2021 00:28:09 -0800 (PST) Subject: Re: [PATCH V3 3/3] s390/mm: Define arch_get_mappable_range() To: David Hildenbrand , linux-mm@kvack.org, akpm@linux-foundation.org, hca@linux.ibm.com, catalin.marinas@arm.com Cc: Oscar Salvador , Vasily Gorbik , Will Deacon , Ard Biesheuvel , Mark Rutland , linux-arm-kernel@lists.infradead.org, linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org References: <1610975582-12646-1-git-send-email-anshuman.khandual@arm.com> <1610975582-12646-4-git-send-email-anshuman.khandual@arm.com> From: Anshuman Khandual Message-ID: Date: Wed, 20 Jan 2021 13:58:32 +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: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit 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: On 1/19/21 5:56 PM, David Hildenbrand wrote: > On 18.01.21 14:13, Anshuman Khandual wrote: >> This overrides arch_get_mappabble_range() on s390 platform which will be >> used with recently added generic framework. It modifies the existing range >> check in vmem_add_mapping() using arch_get_mappable_range(). It also adds a >> VM_BUG_ON() check that would ensure that memhp_range_allowed() has already >> been called on the hotplug path. >> >> Cc: Heiko Carstens >> Cc: Vasily Gorbik >> Cc: David Hildenbrand >> Cc: linux-s390@vger.kernel.org >> Cc: linux-kernel@vger.kernel.org >> Acked-by: Heiko Carstens >> Signed-off-by: Anshuman Khandual >> --- >> arch/s390/mm/init.c | 1 + >> arch/s390/mm/vmem.c | 15 ++++++++++++++- >> 2 files changed, 15 insertions(+), 1 deletion(-) >> >> diff --git a/arch/s390/mm/init.c b/arch/s390/mm/init.c >> index 73a163065b95..97017a4bcc90 100644 >> --- a/arch/s390/mm/init.c >> +++ b/arch/s390/mm/init.c >> @@ -297,6 +297,7 @@ int arch_add_memory(int nid, u64 start, u64 size, >> if (WARN_ON_ONCE(params->pgprot.pgprot != PAGE_KERNEL.pgprot)) >> return -EINVAL; >> >> + VM_BUG_ON(!memhp_range_allowed(start, size, true)); >> rc = vmem_add_mapping(start, size); >> if (rc) >> return rc; >> diff --git a/arch/s390/mm/vmem.c b/arch/s390/mm/vmem.c >> index 01f3a5f58e64..afc39ff1cc8d 100644 >> --- a/arch/s390/mm/vmem.c >> +++ b/arch/s390/mm/vmem.c >> @@ -4,6 +4,7 @@ >> * Author(s): Heiko Carstens >> */ >> >> +#include >> #include >> #include >> #include >> @@ -532,11 +533,23 @@ void vmem_remove_mapping(unsigned long start, unsigned long size) >> mutex_unlock(&vmem_mutex); >> } >> >> +struct range arch_get_mappable_range(void) >> +{ >> + struct range memhp_range; > > You could do: > > memhp_range = { > .start = 0, > .end = VMEM_MAX_PHYS - 1, > }; > > Similar in the arm64 patch. There is a comment block just before this assignment on arm64. Also it seems like code style preference and Heiko had originally agreed on this particular patch. Could we just leave it unchanged please ? > >> + >> + memhp_range.start = 0; >> + memhp_range.end = VMEM_MAX_PHYS - 1; >> + return memhp_range; >> +} >> + >> int vmem_add_mapping(unsigned long start, unsigned long size) >> { >> + struct range range; >> int ret; >> >> - if (start + size > VMEM_MAX_PHYS || >> + range = arch_get_mappable_range(); > > You could do > > struct range range = arch_get_mappable_range(); Sure, will change this though. > >> + if (start < range.start || >> + start + size > range.end + 1 || >> start + size < start) >> return -ERANGE; >> >> > >