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 AE67AC433DF for ; Fri, 3 Jul 2020 13:39:40 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 66F48206A1 for ; Fri, 3 Jul 2020 13:39:40 +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="BG3c/Bmo" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 66F48206A1 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 12C336B00B7; Fri, 3 Jul 2020 09:39:39 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0DFB06B00BB; Fri, 3 Jul 2020 09:39:39 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E99E06B00BC; Fri, 3 Jul 2020 09:39:38 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0184.hostedemail.com [216.40.44.184]) by kanga.kvack.org (Postfix) with ESMTP id D4EA46B00B7 for ; Fri, 3 Jul 2020 09:39:38 -0400 (EDT) Received: from smtpin26.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 994A4180AD81A for ; Fri, 3 Jul 2020 13:39:38 +0000 (UTC) X-FDA: 76996872036.26.hour30_26096bc26e92 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin26.hostedemail.com (Postfix) with ESMTP id 2A1B51804B671 for ; Fri, 3 Jul 2020 13:39:38 +0000 (UTC) X-HE-Tag: hour30_26096bc26e92 X-Filterd-Recvd-Size: 3825 Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by imf27.hostedemail.com (Postfix) with ESMTP for ; Fri, 3 Jul 2020 13:39:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593783577; 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=VkR62g3UrGpBqyKGtfB0CF1RNYbpRziS7AD0u/OIIZk=; b=BG3c/BmobVLIQJuhl9Q7P1YpyNMOZNAj5hWIgogOKsNjvVAnSEGFyrlQ4oKeEGIgmfELQY j9I0HgKFb72FFSZ1XO5hHrvwmSPR5hkE/bTUgWoOu8wDuqNvrSntrUoIaJtQXuQLGM56Em 7ON45dx5S0o3j0PcbV4+YuN/Lng/0/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-448-Vg_5UOTRNDWIIxSERty0oQ-1; Fri, 03 Jul 2020 09:39:33 -0400 X-MC-Unique: Vg_5UOTRNDWIIxSERty0oQ-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 2E97BBFC1; Fri, 3 Jul 2020 13:39:32 +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 8D0AE71690; Fri, 3 Jul 2020 13:39:30 +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 5/9] s390/vmemmap: take the vmem_mutex when populating/freeing Date: Fri, 3 Jul 2020 15:39:13 +0200 Message-Id: <20200703133917.39045-6-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: 2A1B51804B671 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam05 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 synchronize all accesses to the 1:1 and vmemmap mappings. This will be especially relevant when wanting to cleanup empty page tables that cou= ld be shared by both. Avoid races when removing tables that might be just about to get reused. Cc: Heiko Carstens Cc: Vasily Gorbik Cc: Christian Borntraeger Cc: Gerald Schaefer Signed-off-by: David Hildenbrand --- arch/s390/mm/vmem.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/s390/mm/vmem.c b/arch/s390/mm/vmem.c index bcddabd509da8..aa968f67d7f9f 100644 --- a/arch/s390/mm/vmem.c +++ b/arch/s390/mm/vmem.c @@ -293,6 +293,7 @@ int __meminit vmemmap_populate(unsigned long start, u= nsigned long end, int node, pte_t *pt_dir; int ret =3D -ENOMEM; =20 + mutex_lock(&vmem_mutex); pgt_prot =3D pgprot_val(PAGE_KERNEL); sgt_prot =3D pgprot_val(SEGMENT_KERNEL); if (!MACHINE_HAS_NX) { @@ -364,6 +365,7 @@ int __meminit vmemmap_populate(unsigned long start, u= nsigned long end, int node, } ret =3D 0; out: + mutex_unlock(&vmem_mutex); if (ret) vmemmap_free(start, end, altmap); return ret; @@ -372,7 +374,9 @@ 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) { + mutex_lock(&vmem_mutex); remove_pagetable(start, end, false); + mutex_unlock(&vmem_mutex); } =20 void vmem_remove_mapping(unsigned long start, unsigned long size) --=20 2.26.2