From patchwork Thu Jan 20 16:04:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: haoxin X-Patchwork-Id: 12718817 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 291D9C433F5 for ; Thu, 20 Jan 2022 16:04:38 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 96D6D6B0096; Thu, 20 Jan 2022 11:04:37 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 91CBD6B009C; Thu, 20 Jan 2022 11:04:37 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 80D336B00A0; Thu, 20 Jan 2022 11:04:37 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0157.hostedemail.com [216.40.44.157]) by kanga.kvack.org (Postfix) with ESMTP id 73E8A6B0096 for ; Thu, 20 Jan 2022 11:04:37 -0500 (EST) Received: from smtpin08.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 2C8211817903C for ; Thu, 20 Jan 2022 16:04:37 +0000 (UTC) X-FDA: 79051138194.08.01C555A Received: from out30-133.freemail.mail.aliyun.com (out30-133.freemail.mail.aliyun.com [115.124.30.133]) by imf30.hostedemail.com (Postfix) with ESMTP id D647C8000B for ; Thu, 20 Jan 2022 16:04:34 +0000 (UTC) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R161e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=e01e04426;MF=xhao@linux.alibaba.com;NM=1;PH=DS;RN=5;SR=0;TI=SMTPD_---0V2Mx5lP_1642694669; Received: from localhost.localdomain(mailfrom:xhao@linux.alibaba.com fp:SMTPD_---0V2Mx5lP_1642694669) by smtp.aliyun-inc.com(127.0.0.1); Fri, 21 Jan 2022 00:04:30 +0800 From: Xin Hao To: sj@kernel.org Cc: xhao@linux.alibaba.com, akpm@linux-foundation.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH V1 1/2] mm/damon/dbgfs: Put "paddr" check into damon_pa_check() func Date: Fri, 21 Jan 2022 00:04:27 +0800 Message-Id: <44060c744a3760b1ecf6ce52a9b4ec842fa55eef.1642722660.git.xhao@linux.alibaba.com> X-Mailer: git-send-email 2.31.0 In-Reply-To: References: MIME-Version: 1.0 X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: D647C8000B X-Stat-Signature: mhf5m396ks7yw1qppzpfrez3j3zozdyi Authentication-Results: imf30.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=alibaba.com; spf=pass (imf30.hostedemail.com: domain of xhao@linux.alibaba.com designates 115.124.30.133 as permitted sender) smtp.mailfrom=xhao@linux.alibaba.com X-HE-Tag: 1642694674-770214 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: The purpose of putting "paddr" check into damon_pa_check() func is to better solve "DAMON_DBGFS" dependency on both "DAMON_VADDR" and "DAMON_PADDR". Signed-off-by: Xin Hao --- include/linux/damon.h | 1 + mm/damon/dbgfs.c | 2 +- mm/damon/paddr.c | 8 ++++++++ 3 files changed, 10 insertions(+), 1 deletion(-) -- 2.27.0 diff --git a/include/linux/damon.h b/include/linux/damon.h index 5e1e3a128b77..794b5f453662 100644 --- a/include/linux/damon.h +++ b/include/linux/damon.h @@ -504,6 +504,7 @@ void damon_va_set_primitives(struct damon_ctx *ctx); #endif /* CONFIG_DAMON_VADDR */ #ifdef CONFIG_DAMON_PADDR +bool damon_pa_check(char *buf, size_t count); bool damon_pa_target_valid(void *t); void damon_pa_set_primitives(struct damon_ctx *ctx); #endif /* CONFIG_DAMON_PADDR */ diff --git a/mm/damon/dbgfs.c b/mm/damon/dbgfs.c index 5b899601e56c..cdb9c1e2ab29 100644 --- a/mm/damon/dbgfs.c +++ b/mm/damon/dbgfs.c @@ -374,7 +374,7 @@ static ssize_t dbgfs_target_ids_write(struct file *file, if (IS_ERR(kbuf)) return PTR_ERR(kbuf); - if (!strncmp(kbuf, "paddr\n", count)) { + if (damon_pa_check(kbuf, count)) { id_is_pid = false; /* target id is meaningless here, but we set it just for fun */ scnprintf(kbuf, count, "42 "); diff --git a/mm/damon/paddr.c b/mm/damon/paddr.c index 5e8244f65a1a..14a6bf2a2adb 100644 --- a/mm/damon/paddr.c +++ b/mm/damon/paddr.c @@ -208,6 +208,14 @@ static unsigned int damon_pa_check_accesses(struct damon_ctx *ctx) return max_nr_accesses; } +bool damon_pa_check(char *buf, size_t count) +{ + if (!strncmp(buf, "paddr\n", count)) + return true; + + return false; +} + bool damon_pa_target_valid(void *t) { return true; From patchwork Thu Jan 20 16:04:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: haoxin X-Patchwork-Id: 12718818 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 9FB58C433EF for ; Thu, 20 Jan 2022 16:04:39 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3C7E86B009C; Thu, 20 Jan 2022 11:04:39 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 3779A6B00A0; Thu, 20 Jan 2022 11:04:39 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 28DC26B00A2; Thu, 20 Jan 2022 11:04:39 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0218.hostedemail.com [216.40.44.218]) by kanga.kvack.org (Postfix) with ESMTP id 183736B009C for ; Thu, 20 Jan 2022 11:04:39 -0500 (EST) Received: from smtpin13.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id CA2269637D for ; Thu, 20 Jan 2022 16:04:38 +0000 (UTC) X-FDA: 79051138236.13.08CB695 Received: from out30-45.freemail.mail.aliyun.com (out30-45.freemail.mail.aliyun.com [115.124.30.45]) by imf20.hostedemail.com (Postfix) with ESMTP id AEEE71C0053 for ; Thu, 20 Jan 2022 16:04:35 +0000 (UTC) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R201e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=e01e04357;MF=xhao@linux.alibaba.com;NM=1;PH=DS;RN=5;SR=0;TI=SMTPD_---0V2Mx5lP_1642694669; Received: from localhost.localdomain(mailfrom:xhao@linux.alibaba.com fp:SMTPD_---0V2Mx5lP_1642694669) by smtp.aliyun-inc.com(127.0.0.1); Fri, 21 Jan 2022 00:04:31 +0800 From: Xin Hao To: sj@kernel.org Cc: xhao@linux.alibaba.com, akpm@linux-foundation.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH V1 2/2] mm/damon/dbgfs: Modify Damon dbfs interface dependency in Kconfig Date: Fri, 21 Jan 2022 00:04:28 +0800 Message-Id: <00a90e13bba20c252a0ea1c0fb3e1c07b0fbb3b0.1642722660.git.xhao@linux.alibaba.com> X-Mailer: git-send-email 2.31.0 In-Reply-To: References: MIME-Version: 1.0 X-Rspamd-Queue-Id: AEEE71C0053 X-Stat-Signature: dgjjahbbzrnan9nqritga9ws8hwufmuk Authentication-Results: imf20.hostedemail.com; dkim=none; spf=pass (imf20.hostedemail.com: domain of xhao@linux.alibaba.com designates 115.124.30.45 as permitted sender) smtp.mailfrom=xhao@linux.alibaba.com; dmarc=pass (policy=none) header.from=alibaba.com X-Rspamd-Server: rspam03 X-HE-Tag: 1642694675-478006 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: If you want to support "DAMON_DBGFS" in config file, it only depends on any one of "DAMON_VADDR" and "DAMON_PADDR", and sometimes we just want to use damon virtual address function, but it is unreasonable to include "DAMON_PADDR" in config file which cause the damon/paddr.c be compiled. So there just do little change to fix it. Signed-off-by: Xin Hao --- include/linux/damon.h | 16 ++++++++++++++++ mm/damon/Kconfig | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) -- 2.27.0 diff --git a/include/linux/damon.h b/include/linux/damon.h index 794b5f453662..c83e4588aa45 100644 --- a/include/linux/damon.h +++ b/include/linux/damon.h @@ -501,12 +501,28 @@ int damon_stop(struct damon_ctx **ctxs, int nr_ctxs); #ifdef CONFIG_DAMON_VADDR bool damon_va_target_valid(void *t); void damon_va_set_primitives(struct damon_ctx *ctx); +#else +static inline void damon_va_set_primitives(struct damon_ctx *ctx) { } +static inline bool damon_va_target_valid(void *t) +{ + return false; +} #endif /* CONFIG_DAMON_VADDR */ #ifdef CONFIG_DAMON_PADDR bool damon_pa_check(char *buf, size_t count); bool damon_pa_target_valid(void *t); void damon_pa_set_primitives(struct damon_ctx *ctx); +#else +static inline bool damon_pa_check(char *buf, size_t count) +{ + return false; +} +static inline void damon_pa_set_primitives(struct damon_ctx *ctx) { } +static inline bool damon_pa_target_valid(void *t) +{ + return false; +} #endif /* CONFIG_DAMON_PADDR */ #endif /* _DAMON_H */ diff --git a/mm/damon/Kconfig b/mm/damon/Kconfig index 5bcf05851ad0..a8952af3c8bf 100644 --- a/mm/damon/Kconfig +++ b/mm/damon/Kconfig @@ -54,7 +54,7 @@ config DAMON_VADDR_KUNIT_TEST config DAMON_DBGFS bool "DAMON debugfs interface" - depends on DAMON_VADDR && DAMON_PADDR && DEBUG_FS + depends on (DAMON_VADDR || DAMON_PADDR) && DEBUG_FS help This builds the debugfs interface for DAMON. The user space admins can use the interface for arbitrary data access monitoring.