diff mbox series

[V1,1/2] mm/damon/dbgfs: Modify Damon dbfs interface dependency in Kconfig

Message ID fbf27c39e8f23d12d5474b9b659d3d45f8dd38ca.1637429074.git.xhao@linux.alibaba.com (mailing list archive)
State New
Headers show
Series [V1,1/2] mm/damon/dbgfs: Modify Damon dbfs interface dependency in Kconfig | expand

Commit Message

haoxin Nov. 20, 2021, 5:27 p.m. UTC 
If you want to support "DAMON_DBGFS" in config file, it only depends on
any one of "DAMON_VADDR" and "DAMON_PADDR".

Signed-off-by: Xin Hao <xhao@linux.alibaba.com>
---
 mm/damon/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

SeongJae Park Nov. 21, 2021, 11:24 a.m. UTC | #1 
Hi Xin,

On Sun, 21 Nov 2021 01:27:53 +0800 Xin Hao <xhao@linux.alibaba.com> wrote:

> If you want to support "DAMON_DBGFS" in config file, it only depends on
> any one of "DAMON_VADDR" and "DAMON_PADDR".

This is not true.  DAMON_DBGFS really depends on both.

This patch even makes the build fails with some configs.

      CC      mm/damon/dbgfs.o
    linux/mm/damon/dbgfs.c: In function ‘dbgfs_target_ids_write’:
    linux/mm/damon/dbgfs.c:409:3: error: implicit declaration of function ‘damon_pa_set_primitives’; did you mean ‘damon_va_set_primitives’? [-Werror=implicit-function-declaration]
       damon_pa_set_primitives(ctx);
       ^~~~~~~~~~~~~~~~~~~~~~~
       damon_va_set_primitives
    cc1: some warnings being treated as errors


Thanks,
SJ

> 
> Signed-off-by: Xin Hao <xhao@linux.alibaba.com>
> ---
>  mm/damon/Kconfig | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> 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.
> -- 
> 2.31.0
> 
>
haoxin Nov. 21, 2021, 1:19 p.m. UTC | #2 
Hi Park,

On 11/21/21 7:24 PM, SeongJae Park wrote:
> Hi Xin,
>
> On Sun, 21 Nov 2021 01:27:53 +0800 Xin Hao <xhao@linux.alibaba.com> wrote:
>
>> If you want to support "DAMON_DBGFS" in config file, it only depends on
>> any one of "DAMON_VADDR" and "DAMON_PADDR".
> This is not true.  DAMON_DBGFS really depends on both.
>
> This patch even makes the build fails with some configs.
>
>        CC      mm/damon/dbgfs.o
>      linux/mm/damon/dbgfs.c: In function ‘dbgfs_target_ids_write’:
>      linux/mm/damon/dbgfs.c:409:3: error: implicit declaration of function ‘damon_pa_set_primitives’; did you mean ‘damon_va_set_primitives’? [-Werror=implicit-function-declaration]
>         damon_pa_set_primitives(ctx);
>         ^~~~~~~~~~~~~~~~~~~~~~~
>         damon_va_set_primitives
>      cc1: some warnings being treated as errors

That is my fault,  i have found a solution, and i will send a v2 patch 
to solve it,  i I think DAMON_VADDR and DAMON_PADDR

must be decoupled，the kconfig must support it, becasue sometimes i don't 
want to use damon paddr function, just only need to include

DAMON_VADDR, therefore, it is not necessary to include damon/paddr.c 
during compile time.

>
>
> Thanks,
> SJ
>
>> Signed-off-by: Xin Hao <xhao@linux.alibaba.com>
>> ---
>>   mm/damon/Kconfig | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> 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.
>> -- 
>> 2.31.0
>>
>>
kernel test robot Nov. 26, 2021, 3:51 a.m. UTC | #3 
Hi Xin,

Thank you for the patch! Yet something to improve:

[auto build test ERROR on hnaz-mm/master]

url:    https://github.com/0day-ci/linux/commits/Xin-Hao/mm-damon-dbgfs-Modify-Damon-dbfs-interface-dependency-in-Kconfig/20211121-012819
base:   https://github.com/hnaz/linux-mm master
config: riscv-randconfig-c006-20211121 (https://download.01.org/0day-ci/archive/20211126/202111261116.0jysSfsO-lkp@intel.com/config)
reproduce (this is a W=1 build):
        wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
        chmod +x ~/bin/make.cross
        # install riscv cross compiling tool for clang build
        # apt-get install binutils-riscv64-linux-gnu
        # https://github.com/0day-ci/linux/commit/496f4e2cc535ba7b71a6ff2b82840693d413ae02
        git remote add linux-review https://github.com/0day-ci/linux
        git fetch --no-tags linux-review Xin-Hao/mm-damon-dbgfs-Modify-Damon-dbfs-interface-dependency-in-Kconfig/20211121-012819
        git checkout 496f4e2cc535ba7b71a6ff2b82840693d413ae02
        # save the config file to linux build tree
        COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 ARCH=riscv 

If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>

All errors (new ones prefixed by >>):

>> mm/damon/dbgfs.c:409:3: error: implicit declaration of function 'damon_pa_set_primitives' [-Werror,-Wimplicit-function-declaration]
                   damon_pa_set_primitives(ctx);
                   ^
   mm/damon/dbgfs.c:409:3: note: did you mean 'damon_va_set_primitives'?
   include/linux/damon.h:476:6: note: 'damon_va_set_primitives' declared here
   void damon_va_set_primitives(struct damon_ctx *ctx);
        ^
   1 error generated.


vim +/damon_pa_set_primitives +409 mm/damon/dbgfs.c

4bc05954d00766 SeongJae Park 2021-09-07  353  
4bc05954d00766 SeongJae Park 2021-09-07  354  static ssize_t dbgfs_target_ids_write(struct file *file,
4bc05954d00766 SeongJae Park 2021-09-07  355  		const char __user *buf, size_t count, loff_t *ppos)
4bc05954d00766 SeongJae Park 2021-09-07  356  {
4bc05954d00766 SeongJae Park 2021-09-07  357  	struct damon_ctx *ctx = file->private_data;
2ba00bca84ef3f SeongJae Park 2021-10-28  358  	bool id_is_pid = true;
4bc05954d00766 SeongJae Park 2021-09-07  359  	char *kbuf, *nrs;
4bc05954d00766 SeongJae Park 2021-09-07  360  	unsigned long *targets;
4bc05954d00766 SeongJae Park 2021-09-07  361  	ssize_t nr_targets;
4f521143b7d82a Rongwei Wang  2021-10-28  362  	ssize_t ret;
4bc05954d00766 SeongJae Park 2021-09-07  363  	int i;
4bc05954d00766 SeongJae Park 2021-09-07  364  
4bc05954d00766 SeongJae Park 2021-09-07  365  	kbuf = user_input_str(buf, count, ppos);
4bc05954d00766 SeongJae Park 2021-09-07  366  	if (IS_ERR(kbuf))
4bc05954d00766 SeongJae Park 2021-09-07  367  		return PTR_ERR(kbuf);
4bc05954d00766 SeongJae Park 2021-09-07  368  
4bc05954d00766 SeongJae Park 2021-09-07  369  	nrs = kbuf;
2ba00bca84ef3f SeongJae Park 2021-10-28  370  	if (!strncmp(kbuf, "paddr\n", count)) {
2ba00bca84ef3f SeongJae Park 2021-10-28  371  		id_is_pid = false;
2ba00bca84ef3f SeongJae Park 2021-10-28  372  		/* target id is meaningless here, but we set it just for fun */
2ba00bca84ef3f SeongJae Park 2021-10-28  373  		scnprintf(kbuf, count, "42    ");
2ba00bca84ef3f SeongJae Park 2021-10-28  374  	}
4bc05954d00766 SeongJae Park 2021-09-07  375  
4f521143b7d82a Rongwei Wang  2021-10-28  376  	targets = str_to_target_ids(nrs, count, &nr_targets);
4bc05954d00766 SeongJae Park 2021-09-07  377  	if (!targets) {
4bc05954d00766 SeongJae Park 2021-09-07  378  		ret = -ENOMEM;
4bc05954d00766 SeongJae Park 2021-09-07  379  		goto out;
4bc05954d00766 SeongJae Park 2021-09-07  380  	}
4bc05954d00766 SeongJae Park 2021-09-07  381  
2ba00bca84ef3f SeongJae Park 2021-10-28  382  	if (id_is_pid) {
4bc05954d00766 SeongJae Park 2021-09-07  383  		for (i = 0; i < nr_targets; i++) {
4bc05954d00766 SeongJae Park 2021-09-07  384  			targets[i] = (unsigned long)find_get_pid(
4bc05954d00766 SeongJae Park 2021-09-07  385  					(int)targets[i]);
4bc05954d00766 SeongJae Park 2021-09-07  386  			if (!targets[i]) {
4bc05954d00766 SeongJae Park 2021-09-07  387  				dbgfs_put_pids(targets, i);
4bc05954d00766 SeongJae Park 2021-09-07  388  				ret = -EINVAL;
4bc05954d00766 SeongJae Park 2021-09-07  389  				goto free_targets_out;
4bc05954d00766 SeongJae Park 2021-09-07  390  			}
4bc05954d00766 SeongJae Park 2021-09-07  391  		}
4bc05954d00766 SeongJae Park 2021-09-07  392  	}
4bc05954d00766 SeongJae Park 2021-09-07  393  
4bc05954d00766 SeongJae Park 2021-09-07  394  	mutex_lock(&ctx->kdamond_lock);
4bc05954d00766 SeongJae Park 2021-09-07  395  	if (ctx->kdamond) {
2ba00bca84ef3f SeongJae Park 2021-10-28  396  		if (id_is_pid)
4bc05954d00766 SeongJae Park 2021-09-07  397  			dbgfs_put_pids(targets, nr_targets);
4bc05954d00766 SeongJae Park 2021-09-07  398  		ret = -EBUSY;
4bc05954d00766 SeongJae Park 2021-09-07  399  		goto unlock_out;
4bc05954d00766 SeongJae Park 2021-09-07  400  	}
4bc05954d00766 SeongJae Park 2021-09-07  401  
2ba00bca84ef3f SeongJae Park 2021-10-28  402  	/* remove targets with previously-set primitive */
2ba00bca84ef3f SeongJae Park 2021-10-28  403  	damon_set_targets(ctx, NULL, 0);
2ba00bca84ef3f SeongJae Park 2021-10-28  404  
2ba00bca84ef3f SeongJae Park 2021-10-28  405  	/* Configure the context for the address space type */
2ba00bca84ef3f SeongJae Park 2021-10-28  406  	if (id_is_pid)
2ba00bca84ef3f SeongJae Park 2021-10-28  407  		damon_va_set_primitives(ctx);
2ba00bca84ef3f SeongJae Park 2021-10-28  408  	else
2ba00bca84ef3f SeongJae Park 2021-10-28 @409  		damon_pa_set_primitives(ctx);
2ba00bca84ef3f SeongJae Park 2021-10-28  410  
4f521143b7d82a Rongwei Wang  2021-10-28  411  	ret = damon_set_targets(ctx, targets, nr_targets);
4f521143b7d82a Rongwei Wang  2021-10-28  412  	if (ret) {
2ba00bca84ef3f SeongJae Park 2021-10-28  413  		if (id_is_pid)
4bc05954d00766 SeongJae Park 2021-09-07  414  			dbgfs_put_pids(targets, nr_targets);
4f521143b7d82a Rongwei Wang  2021-10-28  415  	} else {
4f521143b7d82a Rongwei Wang  2021-10-28  416  		ret = count;
4bc05954d00766 SeongJae Park 2021-09-07  417  	}
4bc05954d00766 SeongJae Park 2021-09-07  418  
4bc05954d00766 SeongJae Park 2021-09-07  419  unlock_out:
4bc05954d00766 SeongJae Park 2021-09-07  420  	mutex_unlock(&ctx->kdamond_lock);
4bc05954d00766 SeongJae Park 2021-09-07  421  free_targets_out:
4bc05954d00766 SeongJae Park 2021-09-07  422  	kfree(targets);
4bc05954d00766 SeongJae Park 2021-09-07  423  out:
4bc05954d00766 SeongJae Park 2021-09-07  424  	kfree(kbuf);
4bc05954d00766 SeongJae Park 2021-09-07  425  	return ret;
4bc05954d00766 SeongJae Park 2021-09-07  426  }
4bc05954d00766 SeongJae Park 2021-09-07  427  

---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
diff mbox series

Patch

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.