From patchwork Thu Jun 14 18:25:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dave Jiang X-Patchwork-Id: 10464927 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B242C603B4 for ; Thu, 14 Jun 2018 18:25:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A220128AA7 for ; Thu, 14 Jun 2018 18:25:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 96F8328BC8; Thu, 14 Jun 2018 18:25:08 +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 3F5D828AA7 for ; Thu, 14 Jun 2018 18:25:08 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8855E6B0003; Thu, 14 Jun 2018 14:25:06 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 8347F6B0005; Thu, 14 Jun 2018 14:25:06 -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 7232D6B0006; Thu, 14 Jun 2018 14:25:06 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf0-f199.google.com (mail-pf0-f199.google.com [209.85.192.199]) by kanga.kvack.org (Postfix) with ESMTP id 33B8B6B0003 for ; Thu, 14 Jun 2018 14:25:06 -0400 (EDT) Received: by mail-pf0-f199.google.com with SMTP id g20-v6so3379763pfi.2 for ; Thu, 14 Jun 2018 11:25:06 -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:subject:from :to:cc:date:message-id:user-agent:mime-version :content-transfer-encoding; bh=EeZkSasd0O14ukAEP70TLSX95PsYMSSfHzbwSzXmvsA=; b=ANK7hlSbWQ6Saw5kS+OeNrI5SIPnMvB8UcX2h916lWZkJmLoP8HBLHAeCk0laTV+XT 0SFcLbq/7KwRkOGWjOWyCEmgF+6Aep+0LXvxqbmDd5Hu17mx4pTQiNwFXJ8/Ya695cPR ANr66/Ag6WPshVMdTGaGZ0ebm8K0kuq71rhGl/gs1Hl6P75usD+DzcKVP41Y4s0H97FV 0krdRtKlJTc42gbTp/ufNJew8UaRfXF3lzqpne6AEoyJo3aO5f3APt+oEYNkNezsJsVX CcFJIJYfcczgo/KdosWCJI0wJcyRQKbE0zHDYSV3cDZ5xVxQWsfvWFsAv6fZJotQvSn8 TeYg== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of dave.jiang@intel.com designates 134.134.136.31 as permitted sender) smtp.mailfrom=dave.jiang@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com X-Gm-Message-State: APt69E16gKOsOKXUMMjI2yUVGJTFFrzNw9S/fbbdHlFvyC9SoV4QcfhH nkxTmlGUePrtAXJqzsrIKkWXjOmv/xGeGxttMdRb+G4Xgi5IzlLvRBQwr/X9o2G2rEeraAlJ/GU IwxEt09rkhO+yhTyEewAJ0dv2zSowy/gRxJTjKH3Ix2sOqyAwZPTmY7w4/wU6ma1K/A== X-Received: by 2002:a17:902:6e01:: with SMTP id u1-v6mr4180240plk.96.1529000705904; Thu, 14 Jun 2018 11:25:05 -0700 (PDT) X-Google-Smtp-Source: ADUXVKIM4sLqritDODH/4KYndsGEDsM5j1Anh2RJpIUcm6tPD+FU2dtqSkps5SV9Sonl3O6EK4q6 X-Received: by 2002:a17:902:6e01:: with SMTP id u1-v6mr4180181plk.96.1529000704945; Thu, 14 Jun 2018 11:25:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529000704; cv=none; d=google.com; s=arc-20160816; b=OHD02pLC+ibstVL7bBEHvJMMzeGBMt5CLFRRPEdY5E612IUw+FupKHblBlhsnk4jlQ gm7OytkHOS2USC/r52J8eP+lC05gl03QZehKmd9NfXJXQeJS1iMVtPbiJHZ0RNxZTNpW t3/gTG9mft2/UqYZf/qXHfBmbhTjj7X+VLfxezZmq0cNUrkKOdbcl8/gUNNxHhYhI47/ H0OkhPtiBKjpuYFIsbOo/I86u7Fayb8awSZd5JJbhVVl9KEdiSeXfNQpzFfazik770AC rIjOZ13fswXJGLxjoQdfUDEgm82PLIlDOGlFaRrEoayf5+bvlOLsWCeQAoPiqzV3JBZj oHAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:user-agent:message-id:date :cc:to:from:subject:arc-authentication-results; bh=EeZkSasd0O14ukAEP70TLSX95PsYMSSfHzbwSzXmvsA=; b=NgARK87gbdyA3JtIIeVsRzgVMlqLdD2sPjNHWF02QcMDwdX3JOVFwO4DHSMdLSYVk4 CFINZgHuj2L4qNM8a5lUaB75m4A/5xZ9MMjFfoSBdgb6497/WRmj6SDgMu7OPCoFPHVc eq9jk1/NWv9ScCG4UGNsRhmFvrgmm7yv+qcnCWacSQ4PID4nt7FgCF4V6sygXq2ss/sV Zja4TXjCxs3ngXOWCI8f5UbRAJtyyS7UHwtfT/KVQQE7CkCAMlqCTMOfLqSNkU1FjGSf zwbMsYt5g7ctOoSvBUSLQjzxZSLwFUromHnQ8SnGPBhXAQHWuq6aEg11Tcp1RjyvmIvr WLiQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of dave.jiang@intel.com designates 134.134.136.31 as permitted sender) smtp.mailfrom=dave.jiang@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from mga06.intel.com (mga06.intel.com. [134.134.136.31]) by mx.google.com with ESMTPS id v11-v6si5947014plp.25.2018.06.14.11.25.04 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 Jun 2018 11:25:04 -0700 (PDT) Received-SPF: pass (google.com: domain of dave.jiang@intel.com designates 134.134.136.31 as permitted sender) client-ip=134.134.136.31; Authentication-Results: mx.google.com; spf=pass (google.com: domain of dave.jiang@intel.com designates 134.134.136.31 as permitted sender) smtp.mailfrom=dave.jiang@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 14 Jun 2018 11:25:03 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.51,222,1526367600"; d="scan'208";a="57370981" Received: from djiang5-desk3.ch.intel.com ([143.182.136.93]) by FMSMGA003.fm.intel.com with ESMTP; 14 Jun 2018 11:25:03 -0700 Subject: [PATCH] mm: disallow mapping that conflict for devm_memremap_pages() From: Dave Jiang To: akpm@linux-foundation.org Cc: linux-mm@kvack.org, dan.j.williams@intel.com, linux-nvdimm@lists.01.org Date: Thu, 14 Jun 2018 11:25:03 -0700 Message-ID: <152900070339.49084.2958083852988708457.stgit@djiang5-desk3.ch.intel.com> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 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 When pmem namespaces created are smaller than section size, this can cause issue during removal and gpf was observed: [ 249.613597] general protection fault: 0000 1 SMP PTI [ 249.725203] CPU: 36 PID: 3941 Comm: ndctl Tainted: G W 4.14.28-1.el7uek.x86_64 #2 [ 249.745495] task: ffff88acda150000 task.stack: ffffc900233a4000 [ 249.752107] RIP: 0010:__put_page+0x56/0x79 [ 249.844675] Call Trace: [ 249.847410] devm_memremap_pages_release+0x155/0x23a [ 249.852953] release_nodes+0x21e/0x260 [ 249.857138] devres_release_all+0x3c/0x48 [ 249.861606] device_release_driver_internal+0x15c/0x207 [ 249.867439] device_release_driver+0x12/0x14 [ 249.872204] unbind_store+0xba/0xd8 [ 249.876098] drv_attr_store+0x27/0x31 [ 249.880186] sysfs_kf_write+0x3f/0x46 [ 249.884266] kernfs_fop_write+0x10f/0x18b [ 249.888734] __vfs_write+0x3a/0x16d [ 249.892628] ? selinux_file_permission+0xe5/0x116 [ 249.897881] ? security_file_permission+0x41/0xbb [ 249.903133] vfs_write+0xb2/0x1a1 [ 249.906835] ? syscall_trace_enter+0x1ce/0x2b8 [ 249.911795] SyS_write+0x55/0xb9 [ 249.915397] do_syscall_64+0x79/0x1ae [ 249.919485] entry_SYSCALL_64_after_hwframe+0x3d/0x0 Add code to check whether we have mapping already in the same section and prevent additional mapping from created if that is the case. Signed-off-by: Dave Jiang --- kernel/memremap.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/kernel/memremap.c b/kernel/memremap.c index 5857267a4af5..d9ac547993cb 100644 --- a/kernel/memremap.c +++ b/kernel/memremap.c @@ -176,10 +176,27 @@ void *devm_memremap_pages(struct device *dev, struct dev_pagemap *pgmap) unsigned long pfn, pgoff, order; pgprot_t pgprot = PAGE_KERNEL; int error, nid, is_ram; + struct dev_pagemap *conflict_pgmap; align_start = res->start & ~(SECTION_SIZE - 1); align_size = ALIGN(res->start + resource_size(res), SECTION_SIZE) - align_start; + align_end = align_start + align_size - 1; + + conflict_pgmap = get_dev_pagemap(PHYS_PFN(align_start), NULL); + if (conflict_pgmap) { + dev_warn(dev, "Conflicting mapping in same section\n"); + put_dev_pagemap(conflict_pgmap); + return ERR_PTR(-ENOMEM); + } + + conflict_pgmap = get_dev_pagemap(PHYS_PFN(align_end), NULL); + if (conflict_pgmap) { + dev_warn(dev, "Conflicting mapping in same section\n"); + put_dev_pagemap(conflict_pgmap); + return ERR_PTR(-ENOMEM); + } + is_ram = region_intersects(align_start, align_size, IORESOURCE_SYSTEM_RAM, IORES_DESC_NONE); @@ -199,7 +216,6 @@ void *devm_memremap_pages(struct device *dev, struct dev_pagemap *pgmap) mutex_lock(&pgmap_lock); error = 0; - align_end = align_start + align_size - 1; foreach_order_pgoff(res, order, pgoff) { error = __radix_tree_insert(&pgmap_radix,