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.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,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=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 709D0C433DB for ; Wed, 13 Jan 2021 07:03:57 +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 1678523123 for ; Wed, 13 Jan 2021 07:03:55 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1678523123 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=WzmNgT89DE1XdUfsi0cfJjtiBXyP0/1XrxLe5xKfCFM=; b=g5UunIwSHindljyZvME4DKC/L c5PoHsTyi8Twd+RNWXJyXtYZAM0Tx9pLh4Y9staMoOP75eeGug4qOImQ2ubiEnF9sccG2AexYxeOk MpWm1Vi7zGcjkfOhr0rxL+JGlEeU5xOCVOtb6WcsQZSS4Xwe3AsKcHpjsfnilB70Fnqhw3TLd6DEE rmI38+/2wKoVDG6O2+Z5uIowt+6OihOrfAZR2aaPVOhI45nrHMkORTxJSUt/rOyKTuOVw+fagE6/m VBiw+8VCwNq5q+TVqCGALPy29y6VmdtSFQeCxI/YjgqgrFMRZrpE1luQ9XSderSCF9TeZlPTt1Whw xJFLyffLw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kzaAi-0002kG-Mt; Wed, 13 Jan 2021 07:02:24 +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 1kzaAf-0002jB-Jq for linux-arm-kernel@lists.infradead.org; Wed, 13 Jan 2021 07:02:22 +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 DD715101E; Tue, 12 Jan 2021 23:02:18 -0800 (PST) Received: from [10.163.88.174] (unknown [10.163.88.174]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 41C083F70D; Tue, 12 Jan 2021 23:02:14 -0800 (PST) Subject: Re: [PATCH V2 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 References: <1608218912-28932-1-git-send-email-anshuman.khandual@arm.com> <1608218912-28932-4-git-send-email-anshuman.khandual@arm.com> <87ae0b7c-0e95-6068-900e-d813a53f2732@redhat.com> From: Anshuman Khandual Message-ID: <1efac09f-3eea-51fd-7754-98659a5e0054@arm.com> Date: Wed, 13 Jan 2021 12:32:34 +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: <87ae0b7c-0e95-6068-900e-d813a53f2732@redhat.com> Content-Language: en-US X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210113_020221_778573_2262B47B X-CRM114-Status: GOOD ( 21.35 ) 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 , linux-kernel@vger.kernel.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/11/21 4:10 PM, David Hildenbrand wrote: > On 17.12.20 16:28, 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 77767850d0d0..e0e78234ae57 100644 >> --- a/arch/s390/mm/init.c >> +++ b/arch/s390/mm/init.c >> @@ -291,6 +291,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, 1)); > > s/1/true/ Sure, will do. > >> 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 b239f2ba93b0..e10e563ad2b4 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; >> + >> + memhp_range.start = 0; >> + memhp_range.end = VMEM_MAX_PHYS; > > s/ / / > > IIRC, the range is inclusive? "VMEM_MAX_PHYS - 1" then, and adjust the > check below. Right, the memory range is inclusive at both ends. Hence will update the code here. diff --git a/arch/s390/mm/vmem.c b/arch/s390/mm/vmem.c index 21cabe3473d7..afc39ff1cc8d 100644 --- a/arch/s390/mm/vmem.c +++ b/arch/s390/mm/vmem.c @@ -538,7 +538,7 @@ struct range arch_get_mappable_range(void) struct range memhp_range; memhp_range.start = 0; - memhp_range.end = VMEM_MAX_PHYS; + memhp_range.end = VMEM_MAX_PHYS - 1; return memhp_range; } @@ -549,7 +549,7 @@ int vmem_add_mapping(unsigned long start, unsigned long size) range = arch_get_mappable_range(); if (start < range.start || - start + size > range.end || + start + size > range.end + 1 || start + size < start) return -ERANGE; (start + size - 1) is valid only when it is upto the inclusive range.end value. _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel