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=-9.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS 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 1F674C433F2 for ; Wed, 22 Jul 2020 09:46:29 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id CBBC920714 for ; Wed, 22 Jul 2020 09:46:28 +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="bE6n0SCZ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CBBC920714 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 7ABC76B0022; Wed, 22 Jul 2020 05:46:28 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 75EF46B0023; Wed, 22 Jul 2020 05:46:28 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 698A96B0024; Wed, 22 Jul 2020 05:46:28 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0187.hostedemail.com [216.40.44.187]) by kanga.kvack.org (Postfix) with ESMTP id 53A716B0022 for ; Wed, 22 Jul 2020 05:46:28 -0400 (EDT) Received: from smtpin25.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 1A223184C6157 for ; Wed, 22 Jul 2020 09:46:28 +0000 (UTC) X-FDA: 77065231656.25.metal86_04112c926f35 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin25.hostedemail.com (Postfix) with ESMTP id AF15B1836778E for ; Wed, 22 Jul 2020 09:46:27 +0000 (UTC) X-HE-Tag: metal86_04112c926f35 X-Filterd-Recvd-Size: 3239 Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by imf17.hostedemail.com (Postfix) with ESMTP for ; Wed, 22 Jul 2020 09:46:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1595411186; 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=T0K2FcSq6leMfuluLpIVelm2NQA8cm14HeDeSCdv624=; b=bE6n0SCZECjnZOmXjNp/vjOJTn/p75ud7GJ2WvU3M+kviI7QS9EnSRa9v7y8FrKXQcoOw9 KfiN2C/2mKUGvyocZY5CpTuebegU8q8MKwCM1dEtHBjFPFAa2AkpzLUvLBpScTqLUUHAsE EVYN+7LiONMBPrkoQLGwC+A/lmtDwuU= 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-86-YgASFoKtPVSRf2tB1VsMrA-1; Wed, 22 Jul 2020 05:46:24 -0400 X-MC-Unique: YgASFoKtPVSRf2tB1VsMrA-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2774F800688; Wed, 22 Jul 2020 09:46:23 +0000 (UTC) Received: from t480s.redhat.com (ovpn-113-254.ams2.redhat.com [10.36.113.254]) by smtp.corp.redhat.com (Postfix) with ESMTP id B1BC45D9CA; Wed, 22 Jul 2020 09:46:18 +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 v2 7/9] s390/vmemmap: fallback to PTEs if mapping large PMD fails Date: Wed, 22 Jul 2020 11:45:56 +0200 Message-Id: <20200722094558.9828-8-david@redhat.com> In-Reply-To: <20200722094558.9828-1-david@redhat.com> References: <20200722094558.9828-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Rspamd-Queue-Id: AF15B1836778E X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam01 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: Let's fallback to single pages if short on huge pages. No need to stop memory hotplug. Cc: Heiko Carstens Cc: Vasily Gorbik Cc: Christian Borntraeger Cc: Gerald Schaefer Signed-off-by: David Hildenbrand --- arch/s390/mm/vmem.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/s390/mm/vmem.c b/arch/s390/mm/vmem.c index b831f9f9130aa..e82a63de19db2 100644 --- a/arch/s390/mm/vmem.c +++ b/arch/s390/mm/vmem.c @@ -180,10 +180,10 @@ static int __ref modify_pmd_table(pud_t *pud, unsig= ned long addr, */ new_page =3D vmemmap_alloc_block(PMD_SIZE, NUMA_NO_NODE); - if (!new_page) - goto out; - pmd_val(*pmd) =3D __pa(new_page) | prot; - continue; + if (new_page) { + pmd_val(*pmd) =3D __pa(new_page) | prot; + continue; + } } pte =3D vmem_pte_alloc(); if (!pte) --=20 2.26.2