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=-17.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,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 9E659C433E0 for ; Mon, 11 Jan 2021 10:41:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 66C1720B1F for ; Mon, 11 Jan 2021 10:41:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729341AbhAKKlm (ORCPT ); Mon, 11 Jan 2021 05:41:42 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:26271 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729031AbhAKKlm (ORCPT ); Mon, 11 Jan 2021 05:41:42 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1610361615; 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=SXDYc0wJR1WVDdg07JHpUA2tSMEFWcqIlRZk9oZHqH8=; b=i/utmrOoDDOXGuOArmq9H3VAEP+GWH/VcUSXCCAUSrHr2zH0aJlS83101GHQQcMjfqe4x1 ENeWeKQRDxRLGLd7MCNzDJWY6vuTrCcwmkw/cnFdrjB6Djk4WPRuqkFuynRl5dAMI653No WzrFodKjRVzAMINKofi46arVM2qr4X8= 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-337-JoQK4F-oPEq0NI9cddKRPQ-1; Mon, 11 Jan 2021 05:40:11 -0500 X-MC-Unique: JoQK4F-oPEq0NI9cddKRPQ-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 75351190B2A0; Mon, 11 Jan 2021 10:40:09 +0000 (UTC) Received: from [10.36.115.103] (ovpn-115-103.ams2.redhat.com [10.36.115.103]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0CA8A5C232; Mon, 11 Jan 2021 10:40:06 +0000 (UTC) Subject: Re: [PATCH V2 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 Cc: 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-4-git-send-email-anshuman.khandual@arm.com> From: David Hildenbrand Organization: Red Hat GmbH Message-ID: <87ae0b7c-0e95-6068-900e-d813a53f2732@redhat.com> Date: Mon, 11 Jan 2021 11:40:06 +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: <1608218912-28932-4-git-send-email-anshuman.khandual@arm.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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/ > 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. > + return memhp_range; > +} > + -- Thanks, David / dhildenb