From patchwork Fri Nov 8 00:08:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Toshiki Fukasawa X-Patchwork-Id: 11233919 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9E996112B for ; Fri, 8 Nov 2019 00:14:22 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 6872E21D7B for ; Fri, 8 Nov 2019 00:14:22 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6872E21D7B Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=vx.jp.nec.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id AACE06B0006; Thu, 7 Nov 2019 19:14:21 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id A5CF56B0007; Thu, 7 Nov 2019 19:14:21 -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 99B2A6B0008; Thu, 7 Nov 2019 19:14:21 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0034.hostedemail.com [216.40.44.34]) by kanga.kvack.org (Postfix) with ESMTP id 8543B6B0006 for ; Thu, 7 Nov 2019 19:14:21 -0500 (EST) Received: from smtpin08.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with SMTP id 52AC7181AC9CC for ; Fri, 8 Nov 2019 00:14:21 +0000 (UTC) X-FDA: 76131188322.08.ghost02_8b1299e2bf39 X-Spam-Summary: 2,0,0,06338b43e8a941e1,d41d8cd98f00b204,t-fukasawa@vx.jp.nec.com,::dan.j.williams@intel.com:linux-kernel@vger.kernel.org:akpm@linux-foundation.org:mhocko@kernel.org:adobriyan@gmail.com:hch@lst.de:longman@redhat.com:sfr@canb.auug.org.au:mst@redhat.com:cai@lca.pw:n-horiguchi@ah.jp.nec.com:j-nomura@ce.jp.nec.com,RULES_HIT:2:10:41:69:355:379:582:800:960:973:988:989:1152:1260:1261:1277:1311:1313:1314:1345:1359:1437:1513:1515:1516:1518:1521:1535:1593:1594:1605:1606:1730:1747:1777:1792:2194:2199:2393:2559:2562:3138:3139:3140:3141:3142:3865:3867:3868:3871:3872:3874:4118:4321:5007:6119:6261:6611:6742:7903:8957:9592:10004:10399:11026:11473:11658:11914:12043:12291:12296:12297:12438:12517:12519:12555:12683:12895:12986:14096:14097:14110:14394:21080:21433:21451:21627:30012:30051:30054:30064,0,RBL:error,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fp,MSBL:0,DNSBL:neutral,Custom_rules:0:0:0,LFtime:25,LUA_SUMMARY:none X-HE-Tag: ghost02_8b1299e2bf39 X-Filterd-Recvd-Size: 7726 Received: from tyo161.gate.nec.co.jp (tyo161.gate.nec.co.jp [114.179.232.161]) by imf19.hostedemail.com (Postfix) with ESMTP for ; Fri, 8 Nov 2019 00:14:19 +0000 (UTC) Received: from mailgate02.nec.co.jp ([114.179.233.122]) by tyo161.gate.nec.co.jp (8.15.1/8.15.1) with ESMTPS id xA80E98b032382 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Fri, 8 Nov 2019 09:14:09 +0900 Received: from mailsv01.nec.co.jp (mailgate-v.nec.co.jp [10.204.236.94]) by mailgate02.nec.co.jp (8.15.1/8.15.1) with ESMTP id xA80E95o006960; Fri, 8 Nov 2019 09:14:09 +0900 Received: from mail01b.kamome.nec.co.jp (mail01b.kamome.nec.co.jp [10.25.43.2]) by mailsv01.nec.co.jp (8.15.1/8.15.1) with ESMTP id xA80BoBi012271; Fri, 8 Nov 2019 09:14:09 +0900 Received: from bpxc99gp.gisp.nec.co.jp ([10.38.151.148] [10.38.151.148]) by mail01b.kamome.nec.co.jp with ESMTP id BT-MMP-10172970; Fri, 8 Nov 2019 09:08:09 +0900 Received: from BPXM20GP.gisp.nec.co.jp ([10.38.151.212]) by BPXC20GP.gisp.nec.co.jp ([10.38.151.148]) with mapi id 14.03.0439.000; Fri, 8 Nov 2019 09:08:08 +0900 From: Toshiki Fukasawa To: "linux-mm@kvack.org" , "dan.j.williams@intel.com" CC: "linux-kernel@vger.kernel.org" , "akpm@linux-foundation.org" , "mhocko@kernel.org" , "adobriyan@gmail.com" , "hch@lst.de" , "longman@redhat.com" , "sfr@canb.auug.org.au" , "mst@redhat.com" , "cai@lca.pw" , Naoya Horiguchi , Junichi Nomura Subject: [PATCH 1/3] procfs: refactor kpage_*_read() in fs/proc/page.c Thread-Topic: [PATCH 1/3] procfs: refactor kpage_*_read() in fs/proc/page.c Thread-Index: AQHVlciYTszf+OoxZUWdkxf4BbqNCg== Date: Fri, 8 Nov 2019 00:08:07 +0000 Message-ID: <20191108000855.25209-2-t-fukasawa@vx.jp.nec.com> References: <20191108000855.25209-1-t-fukasawa@vx.jp.nec.com> In-Reply-To: <20191108000855.25209-1-t-fukasawa@vx.jp.nec.com> Accept-Language: ja-JP, en-US Content-Language: ja-JP X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.34.125.135] MIME-Version: 1.0 X-TM-AS-MML: disable 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: kpagecount_read(), kpageflags_read(), and kpagecgroup_read() have duplicate code. This patch moves it into a common function. Signed-off-by: Toshiki Fukasawa --- fs/proc/page.c | 133 +++++++++++++++++++++------------------------------------ 1 file changed, 48 insertions(+), 85 deletions(-) diff --git a/fs/proc/page.c b/fs/proc/page.c index 7c952ee..a49b638 100644 --- a/fs/proc/page.c +++ b/fs/proc/page.c @@ -21,20 +21,19 @@ #define KPMMASK (KPMSIZE - 1) #define KPMBITS (KPMSIZE * BITS_PER_BYTE) -/* /proc/kpagecount - an array exposing page counts - * - * Each entry is a u64 representing the corresponding - * physical page count. +typedef u64 (*read_page_data_fn_t)(struct page *page); + +/* + * This is general function to read various data on pages. */ -static ssize_t kpagecount_read(struct file *file, char __user *buf, - size_t count, loff_t *ppos) +static ssize_t kpage_common_read(struct file *file, char __user *buf, + size_t count, loff_t *ppos, read_page_data_fn_t read_fn) { u64 __user *out = (u64 __user *)buf; struct page *ppage; unsigned long src = *ppos; unsigned long pfn; ssize_t ret = 0; - u64 pcount; pfn = src / KPMSIZE; count = min_t(size_t, count, (max_pfn * KPMSIZE) - src); @@ -48,12 +47,7 @@ static ssize_t kpagecount_read(struct file *file, char __user *buf, */ ppage = pfn_to_online_page(pfn); - if (!ppage || PageSlab(ppage) || page_has_type(ppage)) - pcount = 0; - else - pcount = page_mapcount(ppage); - - if (put_user(pcount, out)) { + if (put_user(read_fn(ppage), out)) { ret = -EFAULT; break; } @@ -71,6 +65,30 @@ static ssize_t kpagecount_read(struct file *file, char __user *buf, return ret; } +/* /proc/kpagecount - an array exposing page counts + * + * Each entry is a u64 representing the corresponding + * physical page count. + */ + +static u64 page_count_data(struct page *page) +{ + u64 pcount; + + if (!page || PageSlab(page) || page_has_type(page)) + pcount = 0; + else + pcount = page_mapcount(page); + + return pcount; +} + +static ssize_t kpagecount_read(struct file *file, char __user *buf, + size_t count, loff_t *ppos) +{ + return kpage_common_read(file, buf, count, ppos, page_count_data); +} + static const struct file_operations proc_kpagecount_operations = { .llseek = mem_lseek, .read = kpagecount_read, @@ -203,43 +221,15 @@ u64 stable_page_flags(struct page *page) return u; }; +static u64 page_flags_data(struct page *page) +{ + return stable_page_flags(page); +} + static ssize_t kpageflags_read(struct file *file, char __user *buf, size_t count, loff_t *ppos) { - u64 __user *out = (u64 __user *)buf; - struct page *ppage; - unsigned long src = *ppos; - unsigned long pfn; - ssize_t ret = 0; - - pfn = src / KPMSIZE; - count = min_t(unsigned long, count, (max_pfn * KPMSIZE) - src); - if (src & KPMMASK || count & KPMMASK) - return -EINVAL; - - while (count > 0) { - /* - * TODO: ZONE_DEVICE support requires to identify - * memmaps that were actually initialized. - */ - ppage = pfn_to_online_page(pfn); - - if (put_user(stable_page_flags(ppage), out)) { - ret = -EFAULT; - break; - } - - pfn++; - out++; - count -= KPMSIZE; - - cond_resched(); - } - - *ppos += (char __user *)out - buf; - if (!ret) - ret = (char __user *)out - buf; - return ret; + return kpage_common_read(file, buf, count, ppos, page_flags_data); } static const struct file_operations proc_kpageflags_operations = { @@ -248,49 +238,22 @@ static ssize_t kpageflags_read(struct file *file, char __user *buf, }; #ifdef CONFIG_MEMCG -static ssize_t kpagecgroup_read(struct file *file, char __user *buf, - size_t count, loff_t *ppos) +static u64 page_cgroup_data(struct page *page) { - u64 __user *out = (u64 __user *)buf; - struct page *ppage; - unsigned long src = *ppos; - unsigned long pfn; - ssize_t ret = 0; u64 ino; - pfn = src / KPMSIZE; - count = min_t(unsigned long, count, (max_pfn * KPMSIZE) - src); - if (src & KPMMASK || count & KPMMASK) - return -EINVAL; - - while (count > 0) { - /* - * TODO: ZONE_DEVICE support requires to identify - * memmaps that were actually initialized. - */ - ppage = pfn_to_online_page(pfn); - - if (ppage) - ino = page_cgroup_ino(ppage); - else - ino = 0; - - if (put_user(ino, out)) { - ret = -EFAULT; - break; - } - - pfn++; - out++; - count -= KPMSIZE; + if (page) + ino = page_cgroup_ino(page); + else + ino = 0; - cond_resched(); - } + return ino; +} - *ppos += (char __user *)out - buf; - if (!ret) - ret = (char __user *)out - buf; - return ret; +static ssize_t kpagecgroup_read(struct file *file, char __user *buf, + size_t count, loff_t *ppos) +{ + return kpage_common_read(file, buf, count, ppos, page_cgroup_data); } static const struct file_operations proc_kpagecgroup_operations = {