From patchwork Tue Oct 9 10:19:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kara X-Patchwork-Id: 10632205 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 725E215E2 for ; Tue, 9 Oct 2018 10:19:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 57641288F1 for ; Tue, 9 Oct 2018 10:19:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4B5522891C; Tue, 9 Oct 2018 10:19:39 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=unavailable version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E1023288F1 for ; Tue, 9 Oct 2018 10:19:38 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BCE546B0003; Tue, 9 Oct 2018 06:19:37 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id B7D6E6B0005; Tue, 9 Oct 2018 06:19:37 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A93EB6B0006; Tue, 9 Oct 2018 06:19:37 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) by kanga.kvack.org (Postfix) with ESMTP id 49F1D6B0003 for ; Tue, 9 Oct 2018 06:19:37 -0400 (EDT) Received: by mail-ed1-f72.google.com with SMTP id v15-v6so973360edm.13 for ; Tue, 09 Oct 2018 03:19:37 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:from:to:cc :subject:date:message-id; bh=sUP9o9CbVk1dqRIvCLFO0SEHmv7tifYG4vJ5cfjcnMc=; b=AAJZo6BjIGK+TdidJHzAzfrGuqsZ7cQgO9asF56IshPz6L9i7XJQEN6n/nyvyp0+zg OSmddh59jRf/tCLgqCebqKS/1XbodwqYcQsSX6Trv0JFFWMcRX07qUulyDHl3vw2+ww3 QnAMKpDC0OD3jbV14U0czADwnQlquz7YnWpLsaTHgQhFg8pxhvVv1ekYFFFcBJx1dQaD Y/5TLzABZ8LXUJ8Aby+1e15+cRP0+sz2zk91TgnMkNYCP91+8ejp/iZGJKcsE5rsdKC7 DVcbAZHvbzDBYRfIRCBbv+b+9J9BN1AtNoIfq6wuGoJJvNERA0uQMzMhYgJ1MLMJR3in 3wag== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of jack@suse.cz designates 195.135.220.15 as permitted sender) smtp.mailfrom=jack@suse.cz X-Gm-Message-State: ABuFfohcU6xCSu2U1K4htrNE4xznOiFNUNwdu6fjPm9k1XEOFW1DgkHk 2pAfAdTGhj2jWbQX8ViJngLwO9xxefHVYVO9A1ZZQfc3p7cXClqcSWBpOvF7J7Ec8UNoBlCJiKp UFZofuCgEiXl9m8QvUi9BA7n9VAyECSXdx29aioyT7mIpXhhHxRpes2WLSkp3vuzQSQ== X-Received: by 2002:a17:906:c801:: with SMTP id cx1-v6mr27439916ejb.145.1539080376773; Tue, 09 Oct 2018 03:19:36 -0700 (PDT) X-Google-Smtp-Source: ACcGV60ol/B4XSvdGL7a7VlRg1gWYHNHqSgu5M+W6D3dtMmyqLfjRbmYx3gTAK3eWS5wDrezyMrq X-Received: by 2002:a17:906:c801:: with SMTP id cx1-v6mr27439854ejb.145.1539080375613; Tue, 09 Oct 2018 03:19:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1539080375; cv=none; d=google.com; s=arc-20160816; b=c/jMskwoKTHY4Hon5MS6XlzR3JlZNrequ8aOpnxvyKsKj9IeCu5fYbwn2QNXjUTLdg R2KpLFJ77fr8SJS9/1PATc6dx6WV71eczP4wOg0FqHFeb7vNK16NpGA7pOFx6ojoEaAq nVsdpoJotDhP9kBiwQesgaMPvys/lIXtRVmdT148BvX66pQEAHl6Xi+gCT6cSd/E2SZ7 ywvjGZqzHjkI8X+x2AFAQi/PtYhFurap9L/hLUrVx9XWKJYE+Zm/Ulf6hn8bzBfwrv/L 7pN1aL3cSMgKBFkjIfWkjex97FBNR4P74XXuofLHT1bbj6JbluiCbiKA6KYUOTj8KjfG Faxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:cc:to:from; bh=sUP9o9CbVk1dqRIvCLFO0SEHmv7tifYG4vJ5cfjcnMc=; b=dDddGC41eFqEEO/u3MOJBRUBK8npJvjlivaIVvTh+crAPBhSE2OIZ8k+jDQij0uGwX 54gzBrxxX+bDbPRsCEtUyaKtMPT2Y1XY1FWCI9AgqpvBRmGcw7Mhfvnp3DlDeBw/CHTA WWkoYtRu/ZcyJ6kZ2EP+2rDcCT8Fh45g8uz3749xnAusU4tMrWVpdMnw2XeSKdnxTifn beoRty5uUp/vbLL9yYthLcNCifD3ITwtzsokyBzSQOgIqqAeeNoBPemTwG3WBwCGbHgb ti8YSwXja91QamyYdSBQCnBryRmGkGCmbswEgE/uxKD5bDCa6IaULIvoN/ADsk6h5xZi spog== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of jack@suse.cz designates 195.135.220.15 as permitted sender) smtp.mailfrom=jack@suse.cz Received: from mx1.suse.de (mx2.suse.de. [195.135.220.15]) by mx.google.com with ESMTPS id br7-v6si1041943ejb.281.2018.10.09.03.19.35 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Oct 2018 03:19:35 -0700 (PDT) Received-SPF: pass (google.com: domain of jack@suse.cz designates 195.135.220.15 as permitted sender) client-ip=195.135.220.15; Authentication-Results: mx.google.com; spf=pass (google.com: domain of jack@suse.cz designates 195.135.220.15 as permitted sender) smtp.mailfrom=jack@suse.cz X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay1.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id EE514AEF3; Tue, 9 Oct 2018 10:19:34 +0000 (UTC) Received: by quack2.suse.cz (Postfix, from userid 1000) id 4C3541E3615; Tue, 9 Oct 2018 12:19:34 +0200 (CEST) From: Jan Kara To: Dan Williams Cc: linux-nvdimm@lists.01.org, , , Jan Kara , stable@vger.kernel.org Subject: [PATCH] mm: Preserve _PAGE_DEVMAP across mprotect() calls Date: Tue, 9 Oct 2018 12:19:17 +0200 Message-Id: <20181009101917.32497-1-jack@suse.cz> X-Mailer: git-send-email 2.16.4 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: X-Virus-Scanned: ClamAV using ClamSMTP Currently _PAGE_DEVMAP bit is not preserved in mprotect(2) calls. As a result we will see warnings such as: BUG: Bad page map in process JobWrk0013 pte:800001803875ea25 pmd:7624381067 addr:00007f0930720000 vm_flags:280000f9 anon_vma: (null) mapping:ffff97f2384056f0 index:0 file:457-000000fe00000030-00000009-000000ca-00000001_2001.fileblock fault:xfs_filemap_fault [xfs] mmap:xfs_file_mmap [xfs] readpage: (null) CPU: 3 PID: 15848 Comm: JobWrk0013 Tainted: G W 4.12.14-2.g7573215-default #1 SLE12-SP4 (unreleased) Hardware name: Intel Corporation S2600WFD/S2600WFD, BIOS SE5C620.86B.01.00.0833.051120182255 05/11/2018 Call Trace: dump_stack+0x5a/0x75 print_bad_pte+0x217/0x2c0 ? enqueue_task_fair+0x76/0x9f0 _vm_normal_page+0xe5/0x100 zap_pte_range+0x148/0x740 unmap_page_range+0x39a/0x4b0 unmap_vmas+0x42/0x90 unmap_region+0x99/0xf0 ? vma_gap_callbacks_rotate+0x1a/0x20 do_munmap+0x255/0x3a0 vm_munmap+0x54/0x80 SyS_munmap+0x1d/0x30 do_syscall_64+0x74/0x150 entry_SYSCALL_64_after_hwframe+0x3d/0xa2 ... when mprotect(2) gets used on DAX mappings. Also there is a wide variety of other failures that can result from the missing _PAGE_DEVMAP flag when the area gets used by get_user_pages() later. Fix the problem by including _PAGE_DEVMAP in a set of flags that get preserved by mprotect(2). Fixes: 69660fd797c3 ("x86, mm: introduce _PAGE_DEVMAP") Fixes: ebd31197931d ("powerpc/mm: Add devmap support for ppc64") CC: stable@vger.kernel.org Signed-off-by: Jan Kara Acked-by: Michal Hocko Reviewed-by: Johannes Thumshirn --- arch/powerpc/include/asm/book3s/64/pgtable.h | 4 ++-- arch/x86/include/asm/pgtable_types.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/powerpc/include/asm/book3s/64/pgtable.h b/arch/powerpc/include/asm/book3s/64/pgtable.h index 2fdc865ca374..2a2486526d1f 100644 --- a/arch/powerpc/include/asm/book3s/64/pgtable.h +++ b/arch/powerpc/include/asm/book3s/64/pgtable.h @@ -114,7 +114,7 @@ */ #define _HPAGE_CHG_MASK (PTE_RPN_MASK | _PAGE_HPTEFLAGS | _PAGE_DIRTY | \ _PAGE_ACCESSED | H_PAGE_THP_HUGE | _PAGE_PTE | \ - _PAGE_SOFT_DIRTY) + _PAGE_SOFT_DIRTY | _PAGE_DEVMAP) /* * user access blocked by key */ @@ -132,7 +132,7 @@ */ #define _PAGE_CHG_MASK (PTE_RPN_MASK | _PAGE_HPTEFLAGS | _PAGE_DIRTY | \ _PAGE_ACCESSED | _PAGE_SPECIAL | _PAGE_PTE | \ - _PAGE_SOFT_DIRTY) + _PAGE_SOFT_DIRTY | _PAGE_DEVMAP) #define H_PTE_PKEY (H_PTE_PKEY_BIT0 | H_PTE_PKEY_BIT1 | H_PTE_PKEY_BIT2 | \ H_PTE_PKEY_BIT3 | H_PTE_PKEY_BIT4) diff --git a/arch/x86/include/asm/pgtable_types.h b/arch/x86/include/asm/pgtable_types.h index b64acb08a62b..106b7d0e2dae 100644 --- a/arch/x86/include/asm/pgtable_types.h +++ b/arch/x86/include/asm/pgtable_types.h @@ -124,7 +124,7 @@ */ #define _PAGE_CHG_MASK (PTE_PFN_MASK | _PAGE_PCD | _PAGE_PWT | \ _PAGE_SPECIAL | _PAGE_ACCESSED | _PAGE_DIRTY | \ - _PAGE_SOFT_DIRTY) + _PAGE_SOFT_DIRTY | _PAGE_DEVMAP) #define _HPAGE_CHG_MASK (_PAGE_CHG_MASK | _PAGE_PSE) /*