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=-6.8 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS 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 1DA5DC433E1 for ; Fri, 3 Jul 2020 13:39:36 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id CCF2A206A1 for ; Fri, 3 Jul 2020 13:39:35 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="HdjYw85h" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CCF2A206A1 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id E24456B00B3; Fri, 3 Jul 2020 09:39:33 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id DD6EB6B00B5; Fri, 3 Jul 2020 09:39:33 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CC31F6B00B6; Fri, 3 Jul 2020 09:39:33 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0100.hostedemail.com [216.40.44.100]) by kanga.kvack.org (Postfix) with ESMTP id B119E6B00B3 for ; Fri, 3 Jul 2020 09:39:33 -0400 (EDT) Received: from smtpin11.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 75DAE181AC9CB for ; Fri, 3 Jul 2020 13:39:33 +0000 (UTC) X-FDA: 76996871826.11.bears40_1e0a78926e92 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin11.hostedemail.com (Postfix) with ESMTP id 4C08C180F8B82 for ; Fri, 3 Jul 2020 13:39:33 +0000 (UTC) X-HE-Tag: bears40_1e0a78926e92 X-Filterd-Recvd-Size: 6920 Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by imf39.hostedemail.com (Postfix) with ESMTP for ; Fri, 3 Jul 2020 13:39:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593783572; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=D86OWdb4G6MO930dgyd1RKO5SzKtAc9UC151Da6XFJ0=; b=HdjYw85hx/bcFfAgV3mKuHXsjAe2kbaafyAei9u1G2q89BqsSPlhrnSsNgWdsVEH5FRL+e V1t9+KY8s6ST0PbazYSlBp4M0oI+61/d7oebovc0x2JmD4LJRy+AOtBvAmyWAB4mP1fQiW b4MwDY2hLJ9HE3INDdvs7KOa/PB+N+Y= 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-386-KjYCCmWQMYK1zMsbayvs5w-1; Fri, 03 Jul 2020 09:39:29 -0400 X-MC-Unique: KjYCCmWQMYK1zMsbayvs5w-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 579798015FB; Fri, 3 Jul 2020 13:39:28 +0000 (UTC) Received: from t480s.redhat.com (ovpn-114-0.ams2.redhat.com [10.36.114.0]) by smtp.corp.redhat.com (Postfix) with ESMTP id B6CEE71690; Fri, 3 Jul 2020 13:39:26 +0000 (UTC) From: David Hildenbrand To: linux-kernel@vger.kernel.org Cc: linux-s390@vger.kernel.org, linux-mm@kvack.org, David Hildenbrand , Heiko Carstens , Vasily Gorbik , Christian Borntraeger , Gerald Schaefer Subject: [PATCH v1 3/9] s390/vmemmap: implement vmemmap_free() Date: Fri, 3 Jul 2020 15:39:11 +0200 Message-Id: <20200703133917.39045-4-david@redhat.com> In-Reply-To: <20200703133917.39045-1-david@redhat.com> References: <20200703133917.39045-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Rspamd-Queue-Id: 4C08C180F8B82 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam02 Content-Transfer-Encoding: quoted-printable 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: Reuse the shiny new remove_pagetable(), tweaking it to handle freeing of vmemmap pages, similar to the x86-64 variant (passing "bool direct" to distinguish). Cc: Heiko Carstens Cc: Vasily Gorbik Cc: Christian Borntraeger Cc: Gerald Schaefer Signed-off-by: David Hildenbrand --- arch/s390/mm/vmem.c | 46 ++++++++++++++++++++++++++++++++------------- 1 file changed, 33 insertions(+), 13 deletions(-) diff --git a/arch/s390/mm/vmem.c b/arch/s390/mm/vmem.c index 6fe156c3f035c..16e109c292bf5 100644 --- a/arch/s390/mm/vmem.c +++ b/arch/s390/mm/vmem.c @@ -29,6 +29,15 @@ static void __ref *vmem_alloc_pages(unsigned int order= ) return (void *) memblock_phys_alloc(size, size); } =20 +static void vmem_free_pages(unsigned long addr, int order) +{ + /* We don't expect boot memory to be removed ever. */ + if (!slab_is_available() || + WARN_ON_ONCE(PageReserved(phys_to_page(addr)))) + return; + free_pages(addr, order); +} + void *vmem_crst_alloc(unsigned long val) { unsigned long *table; @@ -139,7 +148,7 @@ static int vmem_add_range(unsigned long start, unsign= ed long size) } =20 static void remove_pte_table(pmd_t *pmd, unsigned long addr, - unsigned long end) + unsigned long end, bool direct) { unsigned long pages =3D 0; pte_t *pte; @@ -149,15 +158,18 @@ static void remove_pte_table(pmd_t *pmd, unsigned l= ong addr, if (pte_none(*pte)) continue; =20 + if (!direct) + vmem_free_pages(pfn_to_phys(pte_pfn(*pte)), 0); pte_clear(&init_mm, addr, pte); pages++; } =20 - update_page_count(PG_DIRECT_MAP_4K, -pages); + if (direct) + update_page_count(PG_DIRECT_MAP_4K, -pages); } =20 static void remove_pmd_table(pud_t *pud, unsigned long addr, - unsigned long end) + unsigned long end, bool direct) { unsigned long next, pages =3D 0; pmd_t *pmd; @@ -172,20 +184,24 @@ static void remove_pmd_table(pud_t *pud, unsigned l= ong addr, if (pmd_large(*pmd)) { if (IS_ALIGNED(addr, PMD_SIZE) && IS_ALIGNED(next, PMD_SIZE)) { + if (!direct) + vmem_free_pages(pmd_deref(*pmd), + get_order(PMD_SIZE)); pmd_clear(pmd); pages++; } continue; } =20 - remove_pte_table(pmd, addr, next); + remove_pte_table(pmd, addr, next, direct); } =20 - update_page_count(PG_DIRECT_MAP_1M, -pages); + if (direct) + update_page_count(PG_DIRECT_MAP_1M, -pages); } =20 static void remove_pud_table(p4d_t *p4d, unsigned long addr, - unsigned long end) + unsigned long end, bool direct) { unsigned long next, pages =3D 0; pud_t *pud; @@ -200,20 +216,22 @@ static void remove_pud_table(p4d_t *p4d, unsigned l= ong addr, if (pud_large(*pud)) { if (IS_ALIGNED(addr, PUD_SIZE) && IS_ALIGNED(next, PUD_SIZE)) { + WARN_ON_ONCE(!direct); pud_clear(pud); pages++; } continue; } =20 - remove_pmd_table(pud, addr, next); + remove_pmd_table(pud, addr, next, direct); } =20 - update_page_count(PG_DIRECT_MAP_2G, -pages); + if (direct) + update_page_count(PG_DIRECT_MAP_2G, -pages); } =20 static void remove_p4d_table(pgd_t *pgd, unsigned long addr, - unsigned long end) + unsigned long end, bool direct) { unsigned long next; p4d_t *p4d; @@ -225,11 +243,12 @@ static void remove_p4d_table(pgd_t *pgd, unsigned l= ong addr, if (p4d_none(*p4d)) continue; =20 - remove_pud_table(p4d, addr, next); + remove_pud_table(p4d, addr, next, direct); } } =20 -static void remove_pagetable(unsigned long start, unsigned long end) +static void remove_pagetable(unsigned long start, unsigned long end, + bool direct) { unsigned long addr, next; pgd_t *pgd; @@ -244,7 +263,7 @@ static void remove_pagetable(unsigned long start, uns= igned long end) if (pgd_none(*pgd)) continue; =20 - remove_p4d_table(pgd, addr, next); + remove_p4d_table(pgd, addr, next, direct); } =20 flush_tlb_kernel_range(start, end); @@ -256,7 +275,7 @@ static void remove_pagetable(unsigned long start, uns= igned long end) */ static void vmem_remove_range(unsigned long start, unsigned long size) { - remove_pagetable(start, start + size); + remove_pagetable(start, start + size, true); } =20 /* @@ -351,6 +370,7 @@ int __meminit vmemmap_populate(unsigned long start, u= nsigned long end, int node, void vmemmap_free(unsigned long start, unsigned long end, struct vmem_altmap *altmap) { + remove_pagetable(start, end, false); } =20 void vmem_remove_mapping(unsigned long start, unsigned long size) --=20 2.26.2