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,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 49B2EC56202 for ; Thu, 26 Nov 2020 13:45:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F4238221FE for ; Thu, 26 Nov 2020 13:45:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391042AbgKZNpp (ORCPT ); Thu, 26 Nov 2020 08:45:45 -0500 Received: from foss.arm.com ([217.140.110.172]:33392 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390196AbgKZNpn (ORCPT ); Thu, 26 Nov 2020 08:45: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 9D0F431B; Thu, 26 Nov 2020 05:45:42 -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 660B23F71F; Thu, 26 Nov 2020 05:45:40 -0800 (PST) From: Anshuman Khandual Subject: Re: [RFC 3/3] s390/mm: Define arch_get_addressable_range() To: David Hildenbrand , linux-mm@kvack.org, akpm@linux-foundation.org Cc: Heiko Carstens , Vasily Gorbik , linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org References: <1606098529-7907-1-git-send-email-anshuman.khandual@arm.com> <1606098529-7907-4-git-send-email-anshuman.khandual@arm.com> Message-ID: <6223eabd-fbe5-2ece-1a73-172b4b67bdde@arm.com> Date: Thu, 26 Nov 2020 19:15:08 +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 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 11/25/20 10:57 PM, David Hildenbrand wrote: > On 23.11.20 03:28, Anshuman Khandual wrote: >> This overrides arch_get_addressable_range() on s390 platform and drops >> now redudant similar check in vmem_add_mapping(). >> >> Cc: Heiko Carstens >> Cc: Vasily Gorbik >> Cc: David Hildenbrand >> Cc: linux-s390@vger.kernel.org >> Cc: linux-kernel@vger.kernel.org >> Signed-off-by: Anshuman Khandual >> --- >> arch/s390/include/asm/mmu.h | 2 ++ >> arch/s390/mm/vmem.c | 16 ++++++++++++---- >> 2 files changed, 14 insertions(+), 4 deletions(-) >> >> diff --git a/arch/s390/include/asm/mmu.h b/arch/s390/include/asm/mmu.h >> index e12ff0f29d1a..f92d3926b188 100644 >> --- a/arch/s390/include/asm/mmu.h >> +++ b/arch/s390/include/asm/mmu.h >> @@ -55,4 +55,6 @@ static inline int tprot(unsigned long addr) >> return rc; >> } >> >> +#define arch_get_addressable_range arch_get_addressable_range >> +struct range arch_get_addressable_range(bool need_mapping); >> #endif >> diff --git a/arch/s390/mm/vmem.c b/arch/s390/mm/vmem.c >> index b239f2ba93b0..e03ad0ed13a7 100644 >> --- a/arch/s390/mm/vmem.c >> +++ b/arch/s390/mm/vmem.c >> @@ -532,14 +532,22 @@ void vmem_remove_mapping(unsigned long start, unsigned long size) >> mutex_unlock(&vmem_mutex); >> } >> >> +struct range arch_get_addressable_range(bool need_mapping) >> +{ >> + struct range memhp_range; >> + >> + memhp_range.start = 0; >> + if (need_mapping) >> + memhp_range.end = VMEM_MAX_PHYS; >> + else >> + memhp_range.end = (1ULL << (MAX_PHYSMEM_BITS + 1)) - 1; >> + return memhp_range; >> +} >> + >> int vmem_add_mapping(unsigned long start, unsigned long size) >> { >> int ret; >> >> - if (start + size > VMEM_MAX_PHYS || >> - start + size < start) >> - return -ERANGE; >> - >> mutex_lock(&vmem_mutex); >> ret = vmem_add_range(start, size); >> if (ret) >> > > Note that vmem_add_mapping() is also called from extmem > (arch/s390/mm/extmem.c). Right, probably something like this should be able to take care of the range check, it lost out earlier. diff --git a/arch/s390/mm/extmem.c b/arch/s390/mm/extmem.c index 5060956b8e7d..c61620ae5ee6 100644 --- a/arch/s390/mm/extmem.c +++ b/arch/s390/mm/extmem.c @@ -337,6 +337,11 @@ __segment_load (char *name, int do_nonshared, unsigned long *addr, unsigned long goto out_free_resource; } + if (seg->end + 1 > VMEM_MAX_PHYS || seg->end + 1 < seg->start) { + rc = -ERANGE; + goto out_resource; + } + rc = vmem_add_mapping(seg->start_addr, seg->end - seg->start_addr + 1); if (rc) goto out_resource;