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.4 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, 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 5D8E4C433DB for ; Tue, 19 Jan 2021 12:28:21 +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 0CF4C22D2A for ; Tue, 19 Jan 2021 12:28:21 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0CF4C22D2A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.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=l4uxHkbjJCgvd0Wtu6YAbYo0D6NEvHTRdZaWJYxl4FU=; b=my7JlK8wig0JOSFqPB9WdTPLl db7G0sF0YfgST5h9IkdUFpRaiU53D991s5Xw9WNyPmZAFa3TC39p3aewC1cSzYelV8H7dokvnnYu+ nifvV2Rjd3W/FjfYQZA/6UuFg1jMrjpx+4XtgzhJ1fVflnpmtk1d0pQtfL1n0hh6UCkDkDfYBCFWH mZMvAq25xCMo7LhmgfDtwy+wLjgI5DAxWPn9BcwP/ysSZwaPKUn9mW/JOZxRHRw51YjcotjznIQ7b aYojgd6enwGK1mCQpVALXOjiSV/n8Kag1zLMyBwGvNiIR9kSG0r0R95EZEEayOn2WOuj15N3cgO1D dDWFd5Law==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l1q6D-0001Ve-DZ; Tue, 19 Jan 2021 12:27:05 +0000 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l1q6A-0001Uo-Tm for linux-arm-kernel@lists.infradead.org; Tue, 19 Jan 2021 12:27:03 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1611059221; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=UWWEX+tZcqi8Aed2AQBNeafP+kkMB/om7kZIB/JclL8=; b=i4yRHiNMXgHj4mE4gbfL05GrOuYqV7i/ZqfPumvC+LvdJpclGFWTByl3gZYy6WDfIsUNLA YZWtyf/BXE1ET+E1Yx+TvY6ssSIoaFcZr+d5Ep925cjW4hAaNoFnDgvSTpf4Z5phGA5JiS 2MfG2leWEfnpdHawhG/eerR08fuQ6MY= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-550-Ma0I1oXsPsWpn3E27LhNdg-1; Tue, 19 Jan 2021 07:26:57 -0500 X-MC-Unique: Ma0I1oXsPsWpn3E27LhNdg-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E1C8459; Tue, 19 Jan 2021 12:26:55 +0000 (UTC) Received: from [10.36.114.143] (ovpn-114-143.ams2.redhat.com [10.36.114.143]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8412F5C8A7; Tue, 19 Jan 2021 12:26:53 +0000 (UTC) Subject: Re: [PATCH V3 3/3] s390/mm: Define arch_get_mappable_range() To: Anshuman Khandual , linux-mm@kvack.org, akpm@linux-foundation.org, hca@linux.ibm.com, catalin.marinas@arm.com References: <1610975582-12646-1-git-send-email-anshuman.khandual@arm.com> <1610975582-12646-4-git-send-email-anshuman.khandual@arm.com> From: David Hildenbrand Organization: Red Hat GmbH Message-ID: Date: Tue, 19 Jan 2021 13:26:52 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.5.0 MIME-Version: 1.0 In-Reply-To: <1610975582-12646-4-git-send-email-anshuman.khandual@arm.com> Content-Language: en-US X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210119_072702_982082_CEAB9572 X-CRM114-Status: GOOD ( 25.66 ) 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, Oscar Salvador 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 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. > + > + 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(); > + if (start < range.start || > + start + size > range.end + 1 || > start + size < start) > return -ERANGE; > > -- Thanks, David / dhildenb _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel