From patchwork Fri Nov 9 20:39:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Barret Rhoden X-Patchwork-Id: 10676555 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 9F62A13B0 for ; Fri, 9 Nov 2018 20:39:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 909642BB32 for ; Fri, 9 Nov 2018 20:39:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 83F0F2F214; Fri, 9 Nov 2018 20:39:34 +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=-10.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, USER_IN_DEF_DKIM_WL autolearn=ham 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 5CD0D2BB32 for ; Fri, 9 Nov 2018 20:39:33 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 716AF6B071C; Fri, 9 Nov 2018 15:39:32 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 6EB8E6B071E; Fri, 9 Nov 2018 15:39:32 -0500 (EST) 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 603066B071F; Fri, 9 Nov 2018 15:39:32 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-ua1-f69.google.com (mail-ua1-f69.google.com [209.85.222.69]) by kanga.kvack.org (Postfix) with ESMTP id 2E8146B071C for ; Fri, 9 Nov 2018 15:39:32 -0500 (EST) Received: by mail-ua1-f69.google.com with SMTP id w7so1113518uao.13 for ; Fri, 09 Nov 2018 12:39:32 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:date:in-reply-to:message-id :mime-version:references:subject:from:to:cc; bh=BV7rhakurU1AWkPC5l+AZsWY8HTPaGn55zHW5QZMdW4=; b=ohaVEKDQoKrSOSxe975u5EM23t/gj6sTDrV5EZNZpLmpM2044BML5OhsMRYKYnIY3R rBrN832MRegpE1dprD0XSa7l5tW7otNhftpr3HdhkBRxuAxilqVAG3sDqiZ/wSSrW/vE IarDSwjXiVHjD9YEDpKPLs2++LAYR1bzWDjUMnItiw01fIDL5ER5YN85bw2RQgMKm1HH plHpE+egIoQW7wXWrt2Tx9rlgegLRkZbwWtibxypXwAMYCfT3yEzI0P8VJOSJ4866U1c MNVk3mQUOJUMdKklK6sVY/HJUTFIQciqFWUqHeM2Inbi9nTyLRuqKRO+mZeXIebt6ADg ZyYQ== X-Gm-Message-State: AGRZ1gKOjJoEt+0eKLGDdvNL89KLvX9jMAU+UWev7ubLr3PeC9AI0TZS Z0CsCXILfQp5vCSouKaSbxrPsbyJ2BDcK/hafKc8YO79+dAlKVr3mEqO5AfbWEfFI4ank4dKXLx 6ORrv7qDXj8Rc1iWi/FXVnSh0tpUj4GIPEi3J2JWkbWpb4e/6rvphAv5UsKw03nSZntFRVzHvbt Z+5XsAr1pr57Lg/NbBftxKzfUgkuenpr8h+BonL4LjvK338U1PoUqf3vYR78tfnLHIC5MzN+/+6 ZXp2xmdXoNcOVsXWSEPhsrmSEfmNKqqYIAGqThR9p4/C46PweXr9Ha2bbEU4YRobyPSjlBq1ZqO oYmhIakrneFuOWxkVunjLttKyO2hc3OapYsfBwpKJTBP6cOdLcNSsSd9dXTnx2FdUkQEKeg5FF6 q X-Received: by 2002:a67:8396:: with SMTP id f144mr4454151vsd.6.1541795971780; Fri, 09 Nov 2018 12:39:31 -0800 (PST) X-Received: by 2002:a67:8396:: with SMTP id f144mr4454133vsd.6.1541795971124; Fri, 09 Nov 2018 12:39:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1541795971; cv=none; d=google.com; s=arc-20160816; b=rT4zuvqDdSTMTH4pMBqoG5fUftWVnzepc2OCWpHgqt69sagm0WCd4GNMYBPDeXxFX4 N2JtnD3ns0H6HSjuRInK4kvMpAtQ9+zLOfZ36p0b79P/7FsMtS22l6GyZvkHPCt9btY9 Au3FXhWpyZx5U/FYBgAlh2tQJNNnZ0PYbIS5GSttsDrssVhVRBGEnJQK3tRi7GLctuCu uCy15W155pkfdMEKCxhuD/2+N5NXy7Q8Kf6AyLpChkekadoXxul2SnXXoLkBk4KI6dAR 9WYBFE3Fs2QK0Wc7/IcRKr/EsAu9YpHlrdFppNh6kvhdALLOVnfonkjJABx8rZmxE5Y1 7euA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:dkim-signature; bh=BV7rhakurU1AWkPC5l+AZsWY8HTPaGn55zHW5QZMdW4=; b=dsU6jiUw8u2mM7zWYteezyXu075933XBidLYF5gk39ieH7+aat9yLEUHaHKinYKg/t G1U5M686eYGfaIdvY4oDzobbW3zIfVIFfvut5TWo9Z6RwcpnuTr2qCRg1ZxfkVqIFFnq q/0eqowK8biNQuzJKxQrUDtTr+6E8lOwfFlFH+gnqOfmdfzmv+g5zqhU+BuG0dcV/oJi +WTEF5lbIvbl/afw7S85m3NXuZVPCZLit5W4GqBTT7pGjLgCG3p49LyO/63Hgo/Pl9+n +o2jELBh/IHDdv5srT3tW2WNWaKzR+zWHR2fl1GLpFqy02/ml5t0Rt29yZhdUH++4Ycd GHnA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=uKVD1wcN; spf=pass (google.com: domain of 3gvdlwwqkcn8csiphpphmf.dpnmjovy-nnlwbdl.psh@flex--brho.bounces.google.com designates 209.85.220.73 as permitted sender) smtp.mailfrom=3gvDlWwQKCN8CSIPHPPHMF.DPNMJOVY-NNLWBDL.PSH@flex--brho.bounces.google.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from mail-sor-f73.google.com (mail-sor-f73.google.com. [209.85.220.73]) by mx.google.com with SMTPS id i127sor4492303vki.70.2018.11.09.12.39.31 for (Google Transport Security); Fri, 09 Nov 2018 12:39:31 -0800 (PST) Received-SPF: pass (google.com: domain of 3gvdlwwqkcn8csiphpphmf.dpnmjovy-nnlwbdl.psh@flex--brho.bounces.google.com designates 209.85.220.73 as permitted sender) client-ip=209.85.220.73; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=uKVD1wcN; spf=pass (google.com: domain of 3gvdlwwqkcn8csiphpphmf.dpnmjovy-nnlwbdl.psh@flex--brho.bounces.google.com designates 209.85.220.73 as permitted sender) smtp.mailfrom=3gvDlWwQKCN8CSIPHPPHMF.DPNMJOVY-NNLWBDL.PSH@flex--brho.bounces.google.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=BV7rhakurU1AWkPC5l+AZsWY8HTPaGn55zHW5QZMdW4=; b=uKVD1wcNQGFPfemLDd88boZY+8v5esaYoAvtG6qmN78/9qKOE0AZLh+FPIYQH4/Y8m sBEbFD8xxfbryrXV1/rQGS8/9tq9NZag2fpfHFxwlsm9s1SUOoFVJ9LFQXotFH2/fsZw Ah2nIn89RlGU+SqpzsuvUE0bho2WaCcj1NXwuvXTUHQ0+7U6pEdxTZVaHY33BHVDYYGj Bn00w7q9DBhtj6bbvLjMOfJbyJEWWF98hDAXpThE9ZsEbkk3mHbOoRDBJuHzab1qVdqb Ltm7xWNmgTI7lzYmJ4hWNRbJTzXaoU+IiuGBgzFN/UFbKVChgKeEbb90pGeIfsyLNBE7 AddQ== X-Google-Smtp-Source: AJdET5dbQ+P6qIQlP79fD8VtNEBYDxa83xp81N1BJmzclE5Naz+tEJU+aIT3XYxO03rUY8yu4nln49At X-Received: by 2002:a1f:cc2:: with SMTP id 185mr8595140vkm.5.1541795970837; Fri, 09 Nov 2018 12:39:30 -0800 (PST) Date: Fri, 9 Nov 2018 15:39:20 -0500 In-Reply-To: <20181109203921.178363-1-brho@google.com> Message-Id: <20181109203921.178363-2-brho@google.com> Mime-Version: 1.0 References: <20181109203921.178363-1-brho@google.com> X-Mailer: git-send-email 2.19.1.930.g4563a0d9d0-goog Subject: [PATCH 1/2] mm: make dev_pagemap_mapping_shift() externally visible From: Barret Rhoden To: Dan Williams , Dave Jiang , Ross Zwisler , Vishal Verma , Paolo Bonzini , " =?utf-8?b?UmFkaW0gS3LEjW3DocWZ?= " , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Naoya Horiguchi Cc: linux-nvdimm@lists.01.org, linux-kernel@vger.kernel.org, "H. Peter Anvin" , x86@kernel.org, kvm@vger.kernel.org, yu.c.zhang@intel.com, yi.z.zhang@intel.com, linux-mm@kvack.org 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 KVM has a use case for determining the size of a dax mapping. The KVM code has easy access to the address and the mm; hence the change in parameters. Signed-off-by: Barret Rhoden Reviewed-by: David Hildenbrand --- include/linux/mm.h | 3 +++ mm/memory-failure.c | 38 +++----------------------------------- mm/util.c | 34 ++++++++++++++++++++++++++++++++++ 3 files changed, 40 insertions(+), 35 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index 5411de93a363..51215d695753 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -935,6 +935,9 @@ static inline bool is_pci_p2pdma_page(const struct page *page) } #endif /* CONFIG_DEV_PAGEMAP_OPS */ +unsigned long dev_pagemap_mapping_shift(unsigned long address, + struct mm_struct *mm); + static inline void get_page(struct page *page) { page = compound_head(page); diff --git a/mm/memory-failure.c b/mm/memory-failure.c index 0cd3de3550f0..c3f2c6a8607e 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -265,40 +265,6 @@ void shake_page(struct page *p, int access) } EXPORT_SYMBOL_GPL(shake_page); -static unsigned long dev_pagemap_mapping_shift(struct page *page, - struct vm_area_struct *vma) -{ - unsigned long address = vma_address(page, vma); - pgd_t *pgd; - p4d_t *p4d; - pud_t *pud; - pmd_t *pmd; - pte_t *pte; - - pgd = pgd_offset(vma->vm_mm, address); - if (!pgd_present(*pgd)) - return 0; - p4d = p4d_offset(pgd, address); - if (!p4d_present(*p4d)) - return 0; - pud = pud_offset(p4d, address); - if (!pud_present(*pud)) - return 0; - if (pud_devmap(*pud)) - return PUD_SHIFT; - pmd = pmd_offset(pud, address); - if (!pmd_present(*pmd)) - return 0; - if (pmd_devmap(*pmd)) - return PMD_SHIFT; - pte = pte_offset_map(pmd, address); - if (!pte_present(*pte)) - return 0; - if (pte_devmap(*pte)) - return PAGE_SHIFT; - return 0; -} - /* * Failure handling: if we can't find or can't kill a process there's * not much we can do. We just print a message and ignore otherwise. @@ -329,7 +295,9 @@ static void add_to_kill(struct task_struct *tsk, struct page *p, tk->addr = page_address_in_vma(p, vma); tk->addr_valid = 1; if (is_zone_device_page(p)) - tk->size_shift = dev_pagemap_mapping_shift(p, vma); + tk->size_shift = + dev_pagemap_mapping_shift(vma_address(page, vma), + vma->vm_mm); else tk->size_shift = compound_order(compound_head(p)) + PAGE_SHIFT; diff --git a/mm/util.c b/mm/util.c index 8bf08b5b5760..61bc9bab931d 100644 --- a/mm/util.c +++ b/mm/util.c @@ -780,3 +780,37 @@ int get_cmdline(struct task_struct *task, char *buffer, int buflen) out: return res; } + +unsigned long dev_pagemap_mapping_shift(unsigned long address, + struct mm_struct *mm) +{ + pgd_t *pgd; + p4d_t *p4d; + pud_t *pud; + pmd_t *pmd; + pte_t *pte; + + pgd = pgd_offset(mm, address); + if (!pgd_present(*pgd)) + return 0; + p4d = p4d_offset(pgd, address); + if (!p4d_present(*p4d)) + return 0; + pud = pud_offset(p4d, address); + if (!pud_present(*pud)) + return 0; + if (pud_devmap(*pud)) + return PUD_SHIFT; + pmd = pmd_offset(pud, address); + if (!pmd_present(*pmd)) + return 0; + if (pmd_devmap(*pmd)) + return PMD_SHIFT; + pte = pte_offset_map(pmd, address); + if (!pte_present(*pte)) + return 0; + if (pte_devmap(*pte)) + return PAGE_SHIFT; + return 0; +} +EXPORT_SYMBOL_GPL(dev_pagemap_mapping_shift);