From patchwork Sun Nov 21 14:07:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: haoxin X-Patchwork-Id: 12630857 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 2F1F0C433EF for ; Sun, 21 Nov 2021 14:07:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 345436B0071; Sun, 21 Nov 2021 09:07:27 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 2F4D76B0072; Sun, 21 Nov 2021 09:07:27 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1BC226B0073; Sun, 21 Nov 2021 09:07:27 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0252.hostedemail.com [216.40.44.252]) by kanga.kvack.org (Postfix) with ESMTP id 072956B0071 for ; Sun, 21 Nov 2021 09:07:27 -0500 (EST) Received: from smtpin05.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id C2C4E82E592D for ; Sun, 21 Nov 2021 14:07:16 +0000 (UTC) X-FDA: 78833114682.05.2F54647 Received: from out30-130.freemail.mail.aliyun.com (out30-130.freemail.mail.aliyun.com [115.124.30.130]) by imf28.hostedemail.com (Postfix) with ESMTP id 2A44A9000504 for ; Sun, 21 Nov 2021 14:07:13 +0000 (UTC) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R751e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=e01e04423;MF=xhao@linux.alibaba.com;NM=1;PH=DS;RN=5;SR=0;TI=SMTPD_---0UxWwTCe_1637503628; Received: from localhost.localdomain(mailfrom:xhao@linux.alibaba.com fp:SMTPD_---0UxWwTCe_1637503628) by smtp.aliyun-inc.com(127.0.0.1); Sun, 21 Nov 2021 22:07:10 +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 V2 1/2] mm/damon/dbgfs: Modify Damon dbfs interface dependency in Kconfig Date: Sun, 21 Nov 2021 22:07:04 +0800 Message-Id: <39a61385187fbc293dcf0e32f20137148ca97db6.1637503141.git.xhao@linux.alibaba.com> X-Mailer: git-send-email 2.31.0 In-Reply-To: References: MIME-Version: 1.0 X-Stat-Signature: gusk4qjx59e1xihyoz3swmky4n1pqbnh X-Rspamd-Queue-Id: 2A44A9000504 X-Rspamd-Server: rspam07 Authentication-Results: imf28.hostedemail.com; dkim=none; spf=pass (imf28.hostedemail.com: domain of xhao@linux.alibaba.com designates 115.124.30.130 as permitted sender) smtp.mailfrom=xhao@linux.alibaba.com; dmarc=pass (policy=none) header.from=alibaba.com X-HE-Tag: 1637503633-234765 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 fix it. Signed-off-by: Xin Hao --- include/linux/damon.h | 12 ++++++++++++ mm/damon/Kconfig | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/include/linux/damon.h b/include/linux/damon.h index 8a73e825e0d5..00ad96f2ec10 100644 --- a/include/linux/damon.h +++ b/include/linux/damon.h @@ -463,11 +463,23 @@ int damon_stop(struct damon_ctx **ctxs, int nr_ctxs); #ifdef CONFIG_DAMON_VADDR void damon_va_set_primitives(struct damon_ctx *ctx); bool damon_va_target_valid(void *t); +#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 void damon_pa_set_primitives(struct damon_ctx *ctx); bool damon_pa_target_valid(void *t); +#else +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..971ffc496596 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. From patchwork Sun Nov 21 14:07:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: haoxin X-Patchwork-Id: 12630861 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 EA37DC433F5 for ; Sun, 21 Nov 2021 14:08:35 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3BA506B0073; Sun, 21 Nov 2021 09:08:02 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 3681D6B0074; Sun, 21 Nov 2021 09:08:02 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 258FF6B0075; Sun, 21 Nov 2021 09:08:02 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0031.hostedemail.com [216.40.44.31]) by kanga.kvack.org (Postfix) with ESMTP id 16B266B0073 for ; Sun, 21 Nov 2021 09:08:02 -0500 (EST) Received: from smtpin01.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id CC19E8D6F7 for ; Sun, 21 Nov 2021 14:07:51 +0000 (UTC) X-FDA: 78833116026.01.FEF4376 Received: from out4436.biz.mail.alibaba.com (out4436.biz.mail.alibaba.com [47.88.44.36]) by imf28.hostedemail.com (Postfix) with ESMTP id D87B890000BB for ; Sun, 21 Nov 2021 14:07:49 +0000 (UTC) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R111e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=e01e04400;MF=xhao@linux.alibaba.com;NM=1;PH=DS;RN=5;SR=0;TI=SMTPD_---0UxWwTCe_1637503628; Received: from localhost.localdomain(mailfrom:xhao@linux.alibaba.com fp:SMTPD_---0UxWwTCe_1637503628) by smtp.aliyun-inc.com(127.0.0.1); Sun, 21 Nov 2021 22:07:10 +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 V2 2/2] mm/damon: move damon_rand() definition into damon.h Date: Sun, 21 Nov 2021 22:07:05 +0800 Message-Id: <778a31d6aaa847c30bf6c1b715aa3b936bd41d67.1637503141.git.xhao@linux.alibaba.com> X-Mailer: git-send-email 2.31.0 In-Reply-To: References: MIME-Version: 1.0 X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: D87B890000BB Authentication-Results: imf28.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=alibaba.com; spf=pass (imf28.hostedemail.com: domain of xhao@linux.alibaba.com designates 47.88.44.36 as permitted sender) smtp.mailfrom=xhao@linux.alibaba.com X-Stat-Signature: og555dgmwd9senmsfncr69yb17q8eyit X-HE-Tag: 1637503669-163348 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: damon_rand() is called in three files:damon/core.c, damon/ paddr.c, damon/vaddr.c, i think there is no need to redefine this twice, So move it to damon.h will be a good choice. Signed-off-by: Xin Hao Reviewed-by: SeongJae Park --- include/linux/damon.h | 4 ++++ mm/damon/core.c | 4 ---- mm/damon/prmtv-common.h | 4 ---- 3 files changed, 4 insertions(+), 8 deletions(-) -- 2.31.0 diff --git a/include/linux/damon.h b/include/linux/damon.h index 00ad96f2ec10..c6df025d8704 100644 --- a/include/linux/damon.h +++ b/include/linux/damon.h @@ -11,12 +11,16 @@ #include #include #include +#include /* Minimal region size. Every damon_region is aligned by this. */ #define DAMON_MIN_REGION PAGE_SIZE /* Max priority score for DAMON-based operation schemes */ #define DAMOS_MAX_SCORE (99) +/* Get a random number in [l, r) */ +#define damon_rand(l, r) (l + prandom_u32_max(r - l)) + /** * struct damon_addr_range - Represents an address region of [@start, @end). * @start: Start address of the region (inclusive). diff --git a/mm/damon/core.c b/mm/damon/core.c index 4d2c3a0c7c8a..bdec32ef78c0 100644 --- a/mm/damon/core.c +++ b/mm/damon/core.c @@ -11,7 +11,6 @@ #include #include #include -#include #include #include @@ -23,9 +22,6 @@ #define DAMON_MIN_REGION 1 #endif -/* Get a random number in [l, r) */ -#define damon_rand(l, r) (l + prandom_u32_max(r - l)) - static DEFINE_MUTEX(damon_lock); static int nr_running_ctxs; diff --git a/mm/damon/prmtv-common.h b/mm/damon/prmtv-common.h index 61f27037603e..e790cb5f8fe0 100644 --- a/mm/damon/prmtv-common.h +++ b/mm/damon/prmtv-common.h @@ -6,10 +6,6 @@ */ #include -#include - -/* Get a random number in [l, r) */ -#define damon_rand(l, r) (l + prandom_u32_max(r - l)) struct page *damon_get_page(unsigned long pfn);