From patchwork Mon Jan 10 14:19:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiongwei Song X-Patchwork-Id: 12708876 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id C5426C433FE for ; Mon, 10 Jan 2022 14:20:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 432636B0078; Mon, 10 Jan 2022 09:20:43 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 3BB006B007B; Mon, 10 Jan 2022 09:20:43 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 234216B007D; Mon, 10 Jan 2022 09:20:43 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0006.hostedemail.com [216.40.44.6]) by kanga.kvack.org (Postfix) with ESMTP id 10D176B0078 for ; Mon, 10 Jan 2022 09:20:43 -0500 (EST) Received: from smtpin28.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id B572B181CC1A5 for ; Mon, 10 Jan 2022 14:20:42 +0000 (UTC) X-FDA: 79014588324.28.6905BB5 Received: from pv50p00im-ztdg10021901.me.com (pv50p00im-ztdg10021901.me.com [17.58.6.55]) by imf13.hostedemail.com (Postfix) with ESMTP id 0CA5D20011 for ; Mon, 10 Jan 2022 14:20:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=me.com; s=1a1hai; t=1641824440; bh=0X2uzKh83j7IEUUxGXCiACxYLjL/D0J7zHLxW88WBV0=; h=From:To:Subject:Date:Message-Id:MIME-Version; b=zM8hrO+u+z4JGP/krkL++EKjgeS9mhVGXLNq78ga29qhu6h/WB8rAUGoZ+nvDUKKh U7f3VMt8pjb1Dth5snYO9+YlxFykltMdt+C2j6J7EvNG/7wkEcEQvzck4glySVAhxP BPUxnad7vy938eKhcGttFtxfZ+hC9hbkmNQMYaOYscyZBa2ClZ3Qh6nh16c94I5jzC 3AHXR2F1HsqILYzn6UECwMTRUBERFjgpV0NV3URlX8jzJCAwZR1FaPX5oJ0KYUwh1L urVIuaIY0RB9i8LiXVIHTYAubAdQsDd5at/kuNHEyy6hgPxjba9imKmKh1+FhAnW2r c7z68im8wn3Fg== Received: from xiongwei.. (unknown [120.245.2.119]) by pv50p00im-ztdg10021901.me.com (Postfix) with ESMTPSA id 301EC819A2; Mon, 10 Jan 2022 14:20:35 +0000 (UTC) From: sxwjean@me.com To: akpm@linux-foundation.org, david@redhat.com, mhocko@suse.com, dan.j.williams@intel.com, osalvador@suse.de, naoya.horiguchi@nec.com, thunder.leizhen@huawei.com Cc: linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, Xiongwei Song Subject: [PATCH v2 1/2] mm/memremap.c: Add pfn_to_devmap_page() to get page in ZONE_DEVICE Date: Mon, 10 Jan 2022 22:19:56 +0800 Message-Id: <20220110141957.259022-2-sxwjean@me.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220110141957.259022-1-sxwjean@me.com> References: <20220110141957.259022-1-sxwjean@me.com> MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.425,18.0.790 definitions=2022-01-10_06:2022-01-10,2022-01-10 signatures=0 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 mlxscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-2009150000 definitions=main-2201100101 X-Rspamd-Queue-Id: 0CA5D20011 X-Stat-Signature: hjjtfkjbzuxctgh4373cpwps9my7biay Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=me.com header.s=1a1hai header.b=zM8hrO+u; dmarc=pass (policy=quarantine) header.from=me.com; spf=pass (imf13.hostedemail.com: domain of sxwjean@me.com designates 17.58.6.55 as permitted sender) smtp.mailfrom=sxwjean@me.com X-Rspamd-Server: rspam11 X-HE-Tag: 1641824441-325669 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: From: Xiongwei Song when requesting page information by /proc/kpage*, the pages in ZONE_DEVICE are missed. We need a function to help on this. The pfn_to_devmap_page() function like pfn_to_online_page(), but only concerns the pages in ZONE_DEVICE. Suggested-by: David Hildenbrand Signed-off-by: Xiongwei Song --- v2: Simplify pfn_to_devmap_page(). --- include/linux/memremap.h | 8 ++++++++ mm/memremap.c | 18 ++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/include/linux/memremap.h b/include/linux/memremap.h index c0e9d35889e8..621723e9c4a5 100644 --- a/include/linux/memremap.h +++ b/include/linux/memremap.h @@ -137,6 +137,8 @@ void *devm_memremap_pages(struct device *dev, struct dev_pagemap *pgmap); void devm_memunmap_pages(struct device *dev, struct dev_pagemap *pgmap); struct dev_pagemap *get_dev_pagemap(unsigned long pfn, struct dev_pagemap *pgmap); +struct page *pfn_to_devmap_page(unsigned long pfn, + struct dev_pagemap **pgmap); bool pgmap_pfn_valid(struct dev_pagemap *pgmap, unsigned long pfn); unsigned long vmem_altmap_offset(struct vmem_altmap *altmap); @@ -166,6 +168,12 @@ static inline struct dev_pagemap *get_dev_pagemap(unsigned long pfn, return NULL; } +static inline struct page *pfn_to_devmap_page(unsigned long pfn, + struct dev_pagemap **pgmap) +{ + return NULL; +} + static inline bool pgmap_pfn_valid(struct dev_pagemap *pgmap, unsigned long pfn) { return false; diff --git a/mm/memremap.c b/mm/memremap.c index 5a66a71ab591..f59994fe01a9 100644 --- a/mm/memremap.c +++ b/mm/memremap.c @@ -494,6 +494,24 @@ struct dev_pagemap *get_dev_pagemap(unsigned long pfn, } EXPORT_SYMBOL_GPL(get_dev_pagemap); +/** + * pfn_to_devmap_page - get page pointer which belongs to dev_pagemap by @pfn + * @pfn: page frame number to lookup page_map + * @pgmap: to save pgmap address which is for putting reference + * + * If @pgmap is non-NULL, then pfn is on ZONE_DEVICE and return page pointer. + */ +struct page *pfn_to_devmap_page(unsigned long pfn, struct dev_pagemap **pgmap) +{ + if (pfn_valid(pfn)) { + *pgmap = get_dev_pagemap(pfn, NULL); + if (*pgmap) + return pfn_to_page(pfn); + } + + return NULL; +} + #ifdef CONFIG_DEV_PAGEMAP_OPS void free_devmap_managed_page(struct page *page) { From patchwork Mon Jan 10 14:19:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiongwei Song X-Patchwork-Id: 12708877 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id B1734C433EF for ; Mon, 10 Jan 2022 14:20:50 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 480476B007B; Mon, 10 Jan 2022 09:20:50 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 408266B007D; Mon, 10 Jan 2022 09:20:50 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 281C66B0080; Mon, 10 Jan 2022 09:20:50 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0216.hostedemail.com [216.40.44.216]) by kanga.kvack.org (Postfix) with ESMTP id 18FA26B007B for ; Mon, 10 Jan 2022 09:20:50 -0500 (EST) Received: from smtpin30.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id C2755181CCAE0 for ; Mon, 10 Jan 2022 14:20:49 +0000 (UTC) X-FDA: 79014588618.30.31495F3 Received: from pv50p00im-ztdg10021901.me.com (pv50p00im-ztdg10021901.me.com [17.58.6.55]) by imf29.hostedemail.com (Postfix) with ESMTP id C23C312000D for ; Mon, 10 Jan 2022 14:20:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=me.com; s=1a1hai; t=1641824447; bh=9XqLQAg2WYNjySdUZ9g0g99XYS7qmt4n0TDjaRPnSgk=; h=From:To:Subject:Date:Message-Id:MIME-Version; b=viRzUp4WgCaiK0t30P2U3F+EEiYr+8TI0UaU90duNnuZr/B1LPRh1Sef+4RuGsyOD SKEEM3QmLLyvnU4/O3t4MoyEmDi8FlsZhcdVusQipS1PxLSjeGCGP1mOTHdlzP9nuC gFhyGcW9azRWGAe6M6VqO0Bow/G1NiiGubAmo8PcEBBrKwVtfKPWgjcE1Z/lbGR6P7 CqLUgDr10qx3ZFQRMl8yTGlf0iz5SE90cMHeJltAeoVsluo+HP9rZ83kIAKScyeWaa wNWv9CMGU72N6MhJw7KJs9q5j0beIYgQSXAyEmbV6MY1IpkA39XhSCcL+DMUXBfj6Y 75KEflw+my8nw== Received: from xiongwei.. (unknown [120.245.2.119]) by pv50p00im-ztdg10021901.me.com (Postfix) with ESMTPSA id CF7B2814B5; Mon, 10 Jan 2022 14:20:42 +0000 (UTC) From: sxwjean@me.com To: akpm@linux-foundation.org, david@redhat.com, mhocko@suse.com, dan.j.williams@intel.com, osalvador@suse.de, naoya.horiguchi@nec.com, thunder.leizhen@huawei.com Cc: linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, Xiongwei Song Subject: [PATCH v2 2/2] proc: Add getting pages info of ZONE_DEVICE support Date: Mon, 10 Jan 2022 22:19:57 +0800 Message-Id: <20220110141957.259022-3-sxwjean@me.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220110141957.259022-1-sxwjean@me.com> References: <20220110141957.259022-1-sxwjean@me.com> MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.425,18.0.790 definitions=2022-01-10_06:2022-01-10,2022-01-10 signatures=0 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 mlxscore=0 mlxlogscore=798 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-2009150000 definitions=main-2201100101 Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=me.com header.s=1a1hai header.b=viRzUp4W; spf=pass (imf29.hostedemail.com: domain of sxwjean@me.com designates 17.58.6.55 as permitted sender) smtp.mailfrom=sxwjean@me.com; dmarc=pass (policy=quarantine) header.from=me.com X-Rspamd-Queue-Id: C23C312000D X-Stat-Signature: ewkgyoknqsamd64gescmxfrxzuorcz1d X-Rspamd-Server: rspam04 X-HE-Tag: 1641824448-854752 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: From: Xiongwei Song When requesting pages info by /proc/kpage*, the pages in ZONE_DEVICE were missed. The pfn_to_devmap_page() function can help to get page that belongs to ZONE_DEVICE. Signed-off-by: Xiongwei Song --- fs/proc/page.c | 35 ++++++++++++++++++++++------------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/fs/proc/page.c b/fs/proc/page.c index 9f1077d94cde..2cdc2b315ff8 100644 --- a/fs/proc/page.c +++ b/fs/proc/page.c @@ -15,6 +15,7 @@ #include #include #include +#include #include "internal.h" #define KPMSIZE sizeof(u64) @@ -46,6 +47,7 @@ static ssize_t kpagecount_read(struct file *file, char __user *buf, { const unsigned long max_dump_pfn = get_max_dump_pfn(); u64 __user *out = (u64 __user *)buf; + struct dev_pagemap *pgmap = NULL; struct page *ppage; unsigned long src = *ppos; unsigned long pfn; @@ -60,17 +62,18 @@ static ssize_t kpagecount_read(struct file *file, char __user *buf, count = min_t(unsigned long, count, (max_dump_pfn * KPMSIZE) - src); while (count > 0) { - /* - * TODO: ZONE_DEVICE support requires to identify - * memmaps that were actually initialized. - */ ppage = pfn_to_online_page(pfn); + if (!ppage) + ppage = pfn_to_devmap_page(pfn, &pgmap); if (!ppage || PageSlab(ppage) || page_has_type(ppage)) pcount = 0; else pcount = page_mapcount(ppage); + if (pgmap) + put_dev_pagemap(pgmap); + if (put_user(pcount, out)) { ret = -EFAULT; break; @@ -229,10 +232,12 @@ static ssize_t kpageflags_read(struct file *file, char __user *buf, { const unsigned long max_dump_pfn = get_max_dump_pfn(); u64 __user *out = (u64 __user *)buf; + struct dev_pagemap *pgmap = NULL; struct page *ppage; unsigned long src = *ppos; unsigned long pfn; ssize_t ret = 0; + u64 flags; pfn = src / KPMSIZE; if (src & KPMMASK || count & KPMMASK) @@ -242,13 +247,15 @@ static ssize_t kpageflags_read(struct file *file, char __user *buf, count = min_t(unsigned long, count, (max_dump_pfn * KPMSIZE) - src); while (count > 0) { - /* - * TODO: ZONE_DEVICE support requires to identify - * memmaps that were actually initialized. - */ ppage = pfn_to_online_page(pfn); + if (!ppage) + ppage = pfn_to_devmap_page(pfn, &pgmap); + + flags = stable_page_flags(ppage); + if (pgmap) + put_dev_pagemap(pgmap); - if (put_user(stable_page_flags(ppage), out)) { + if (put_user(flags, out)) { ret = -EFAULT; break; } @@ -277,6 +284,7 @@ static ssize_t kpagecgroup_read(struct file *file, char __user *buf, { const unsigned long max_dump_pfn = get_max_dump_pfn(); u64 __user *out = (u64 __user *)buf; + struct dev_pagemap *pgmap = NULL; struct page *ppage; unsigned long src = *ppos; unsigned long pfn; @@ -291,17 +299,18 @@ static ssize_t kpagecgroup_read(struct file *file, char __user *buf, count = min_t(unsigned long, count, (max_dump_pfn * KPMSIZE) - src); while (count > 0) { - /* - * TODO: ZONE_DEVICE support requires to identify - * memmaps that were actually initialized. - */ ppage = pfn_to_online_page(pfn); + if (!ppage) + ppage = pfn_to_devmap_page(pfn, &pgmap); if (ppage) ino = page_cgroup_ino(ppage); else ino = 0; + if (pgmap) + put_dev_pagemap(pgmap); + if (put_user(ino, out)) { ret = -EFAULT; break;