From patchwork Wed Jan 12 14:35:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiongwei Song X-Patchwork-Id: 12711487 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 A5462C433F5 for ; Wed, 12 Jan 2022 14:36:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2BE836B0170; Wed, 12 Jan 2022 09:36:42 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 26DE16B0171; Wed, 12 Jan 2022 09:36:42 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 10ED36B0172; Wed, 12 Jan 2022 09:36:42 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0224.hostedemail.com [216.40.44.224]) by kanga.kvack.org (Postfix) with ESMTP id DDB626B0170 for ; Wed, 12 Jan 2022 09:36:41 -0500 (EST) Received: from smtpin14.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 5D1F6181CB2C2 for ; Wed, 12 Jan 2022 14:36:41 +0000 (UTC) X-FDA: 79021886202.14.E25CC83 Received: from mr85p00im-zteg06011501.me.com (mr85p00im-zteg06011501.me.com [17.58.23.182]) by imf05.hostedemail.com (Postfix) with ESMTP id 76963100018 for ; Wed, 12 Jan 2022 14:36:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=me.com; s=1a1hai; t=1641998199; bh=J8I1NMVpmtmxYOzkUXhKs7c0idUTGDpRCI8xL5DNgZY=; h=From:To:Subject:Date:Message-Id:MIME-Version; b=GafK0KHp7PLgmiiaPBS4vqdd+jk1oZhYM1EyhZqEZ8urPXuTY/hxrt0t2b9cYfrsI 6k73Jn7DXYfOx5w2TO+M1664IDA3yNJF6AkV2Z+4hygO6LowndI1vo9wMaq0Baxfa1 hMB8Yxz+z56ut7ipUxrg6LdicrUJw9ogBM7poeyjWqeEs9BX53ONfGWRAUWAY05Uoj obAZ3mgOsRD2epz67cIjVlvg/+qkiz1VT8Tbg8IQNuJZMeiZbBXNtN7G/5pW6lnvsJ WXM6Z427Lq9qjZGc8BGVPreQHjouLAqvRBu6q9KiyaA1eJ7EZ074CljQrQHDUPp+oq y+wnLInHtuysA== Received: from xiongwei.. (unknown [120.245.2.88]) by mr85p00im-zteg06011501.me.com (Postfix) with ESMTPSA id 680ED480EE0; Wed, 12 Jan 2022 14:36:13 +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 v3 1/2] mm/memremap.c: Add pfn_to_devmap_page() to get page in ZONE_DEVICE Date: Wed, 12 Jan 2022 22:35:16 +0800 Message-Id: <20220112143517.262143-2-sxwjean@me.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220112143517.262143-1-sxwjean@me.com> References: <20220112143517.262143-1-sxwjean@me.com> MIME-Version: 1.0 X-Proofpoint-Virus-Version: =?utf-8?q?vendor=3Dfsecure_engine=3D1=2E1=2E170-?= =?utf-8?q?22c6f66c430a71ce266a39bfe25bc2903e8d5c8f=3A6=2E0=2E425=2C18=2E0?= =?utf-8?q?=2E790=2C17=2E0=2E607=2E475=2E0000000_definitions=3D2022-01-12=5F?= =?utf-8?q?04=3A2022-01-11=5F01=2C2022-01-12=5F04=2C2020-04-07=5F01_signatur?= =?utf-8?q?es=3D0?= X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 bulkscore=0 malwarescore=0 mlxscore=0 adultscore=0 clxscore=1015 suspectscore=0 phishscore=0 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2201120095 X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 76963100018 X-Stat-Signature: 5eq653j9aowtjchtbf79aa78w7yap1k4 Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=me.com header.s=1a1hai header.b=GafK0KHp; spf=pass (imf05.hostedemail.com: domain of sxwjean@me.com designates 17.58.23.182 as permitted sender) smtp.mailfrom=sxwjean@me.com; dmarc=pass (policy=quarantine) header.from=me.com X-HE-Tag: 1641998200-443174 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 were ignored . 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 --- v3: Before returning page pointer, check validity of page by pgmap_pfn_valid(). v2: Simplify pfn_to_devmap_page() as David suggested. --- include/linux/memremap.h | 8 ++++++++ mm/memremap.c | 19 +++++++++++++++++++ 2 files changed, 27 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..782309b74d71 100644 --- a/mm/memremap.c +++ b/mm/memremap.c @@ -494,6 +494,25 @@ 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. Meanwhile check if + * pfn is valid in @pgmap, if yes 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 && pgmap_pfn_valid(*pgmap, pfn)) + return pfn_to_page(pfn); + } + + return NULL; +} + #ifdef CONFIG_DEV_PAGEMAP_OPS void free_devmap_managed_page(struct page *page) { From patchwork Wed Jan 12 14:35:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiongwei Song X-Patchwork-Id: 12711488 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 D4410C433F5 for ; Wed, 12 Jan 2022 14:36:58 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 531096B0172; Wed, 12 Jan 2022 09:36:58 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 4DE7F6B0173; Wed, 12 Jan 2022 09:36:58 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 358396B0174; Wed, 12 Jan 2022 09:36:58 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 0FA9C6B0172 for ; Wed, 12 Jan 2022 09:36:58 -0500 (EST) Received: from smtpin29.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 9A6168909E for ; Wed, 12 Jan 2022 14:36:57 +0000 (UTC) X-FDA: 79021886874.29.197E1D8 Received: from mr85p00im-zteg06011501.me.com (mr85p00im-zteg06011501.me.com [17.58.23.182]) by imf03.hostedemail.com (Postfix) with ESMTP id 38F7520017 for ; Wed, 12 Jan 2022 14:36:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=me.com; s=1a1hai; t=1641998216; bh=d0cZDTdkbq2OLCsejXnziUbJRkiUwF2JPM28YjzJMvc=; h=From:To:Subject:Date:Message-Id:MIME-Version; b=wrc8VTVY5uaQ+01UGn4ZudroMr5Ch1kUZ1i8CPrKIvjrG2J0jI9gb2TOWLI11acsI UKF6omEoaKN9lyqhwOtCkbP9qPzh8Qf3E85Ym/EEdpJy7ww+yEhveam9fI1NyjU9bK SQ1VF8Id8nIiTA5ZYBob+8ZPIi74gupc6+vf65GRsExcWuV1BGARkXA5M7WuVUTeof yq5nbH+Fg37LPN0AYCmJ4OL76HmYgAtVDmQgI1x+K6Luvzf6EtmJlcSB4WcIP7VTwA 5c/zq1MBCyxcG0y2mMS5/J6LzELELtWHGv/ajTcZNOwP5+PhzbxfyweTMhp6omEh2H WG3dUFUms6iPQ== Received: from xiongwei.. (unknown [120.245.2.88]) by mr85p00im-zteg06011501.me.com (Postfix) with ESMTPSA id C8C51480823; Wed, 12 Jan 2022 14:36: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 v3 2/2] proc: Add getting pages info of ZONE_DEVICE support Date: Wed, 12 Jan 2022 22:35:17 +0800 Message-Id: <20220112143517.262143-3-sxwjean@me.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220112143517.262143-1-sxwjean@me.com> References: <20220112143517.262143-1-sxwjean@me.com> MIME-Version: 1.0 X-Proofpoint-Virus-Version: =?utf-8?q?vendor=3Dfsecure_engine=3D1=2E1=2E170-?= =?utf-8?q?22c6f66c430a71ce266a39bfe25bc2903e8d5c8f=3A6=2E0=2E425=2C18=2E0?= =?utf-8?q?=2E790=2C17=2E0=2E607=2E475=2E0000000_definitions=3D2022-01-12=5F?= =?utf-8?q?04=3A2022-01-11=5F01=2C2022-01-12=5F04=2C2020-04-07=5F01_signatur?= =?utf-8?q?es=3D0?= X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=922 bulkscore=0 malwarescore=0 mlxscore=0 adultscore=0 clxscore=1015 suspectscore=0 phishscore=0 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2201120095 X-Rspamd-Queue-Id: 38F7520017 X-Stat-Signature: ds1mazdzzkit8rsfqjmsog9j3ukc1n54 Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=me.com header.s=1a1hai header.b=wrc8VTVY; dmarc=pass (policy=quarantine) header.from=me.com; spf=pass (imf03.hostedemail.com: domain of sxwjean@me.com designates 17.58.23.182 as permitted sender) smtp.mailfrom=sxwjean@me.com X-Rspamd-Server: rspam03 X-HE-Tag: 1641998217-924761 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 ignored. The pfn_to_devmap_page() function can help to get page that belongs to ZONE_DEVICE. Signed-off-by: Xiongwei Song --- V3: Reset pgmap to NULL after putting dev_pagemap to prevent false non-NULL. --- fs/proc/page.c | 41 ++++++++++++++++++++++++++++------------- 1 file changed, 28 insertions(+), 13 deletions(-) diff --git a/fs/proc/page.c b/fs/proc/page.c index 9f1077d94cde..d4fc308765f5 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,20 @@ 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); + pgmap = NULL; + } + if (put_user(pcount, out)) { ret = -EFAULT; break; @@ -229,10 +234,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 +249,17 @@ 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); + pgmap = NULL; + } - if (put_user(stable_page_flags(ppage), out)) { + if (put_user(flags, out)) { ret = -EFAULT; break; } @@ -277,6 +288,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 +303,20 @@ 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); + pgmap = NULL; + } + if (put_user(ino, out)) { ret = -EFAULT; break;