[v4] selftests/move_mount_set_group:Make tests build with old libc

[PATCH v4] selftests/move_mount_set_group:Make tests build with old libc

Posted by Hu Yadi 1 year, 11 months ago

From: "Hu.Yadi" <hu.yadi@h3c.com>

Replace SYS_<syscall> with __NR_<syscall>.  Using the __NR_<syscall>
notation, provided by UAPI, is useful to build tests on systems without
the SYS_<syscall> definitions.

Replace SYS_move_mount with __NR_move_mount

Similar changes: commit 87129ef13603 ("selftests/landlock: Make tests build with old libc")

Acked-by: Mickaël Salaün <mic@digikod.net>
Signed-off-by: Hu.Yadi <hu.yadi@h3c.com>
Suggested-by: Jiao <jiaoxupo@h3c.com>
Reviewed-by: Berlin <berlin@h3c.com>
---
Changes v4 -> v3:
 - Adjust comments for consistent
 - Add Acked-by
Changes v2 -> v3:
 - Adjust comments
Changes v1 -> v2:
 - Fix mail of Suggested-by and Reviewed-by

 .../move_mount_set_group/move_mount_set_group_test.c          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/testing/selftests/move_mount_set_group/move_mount_set_group_test.c b/tools/testing/selftests/move_mount_set_group/move_mount_set_group_test.c
index 50ed5d475dd1..bcf51d785a37 100644
--- a/tools/testing/selftests/move_mount_set_group/move_mount_set_group_test.c
+++ b/tools/testing/selftests/move_mount_set_group/move_mount_set_group_test.c
@@ -218,7 +218,7 @@ static bool move_mount_set_group_supported(void)
 	if (mount(NULL, SET_GROUP_FROM, NULL, MS_SHARED, 0))
 		return -1;
 
-	ret = syscall(SYS_move_mount, AT_FDCWD, SET_GROUP_FROM,
+	ret = syscall(__NR_move_mount, AT_FDCWD, SET_GROUP_FROM,
 		      AT_FDCWD, SET_GROUP_TO, MOVE_MOUNT_SET_GROUP);
 	umount2("/tmp", MNT_DETACH);
 
@@ -363,7 +363,7 @@ TEST_F(move_mount_set_group, complex_sharing_copying)
 		       CLONE_VM | CLONE_FILES); ASSERT_GT(pid, 0);
 	ASSERT_EQ(wait_for_pid(pid), 0);
 
-	ASSERT_EQ(syscall(SYS_move_mount, ca_from.mntfd, "",
+	ASSERT_EQ(syscall(__NR_move_mount, ca_from.mntfd, "",
 			  ca_to.mntfd, "", MOVE_MOUNT_SET_GROUP
 			  | MOVE_MOUNT_F_EMPTY_PATH | MOVE_MOUNT_T_EMPTY_PATH),
 		  0);
-- 
2.23.0

Re: [PATCH v4] selftests/move_mount_set_group:Make tests build with old libc

Posted by Christian Brauner 1 year, 11 months ago

On Thu, 11 Jan 2024 19:32:29 +0800, Hu Yadi wrote:
> Replace SYS_<syscall> with __NR_<syscall>.  Using the __NR_<syscall>
> notation, provided by UAPI, is useful to build tests on systems without
> the SYS_<syscall> definitions.
> 
> Replace SYS_move_mount with __NR_move_mount
> 
> Similar changes: commit 87129ef13603 ("selftests/landlock: Make tests build with old libc")
> 
> [...]

Applied to the vfs.misc branch of the vfs/vfs.git tree.
Patches in the vfs.misc branch should appear in linux-next soon.

Please report any outstanding bugs that were missed during review in a
new review to the original patch series allowing us to drop it.

It's encouraged to provide Acked-bys and Reviewed-bys even though the
patch has now been applied. If possible patch trailers will be updated.

Note that commit hashes shown below are subject to change due to rebase,
trailer updates or similar. If in doubt, please check the listed branch.

tree:   https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git
branch: vfs.misc

[1/1] selftests/move_mount_set_group:Make tests build with old libc
      https://git.kernel.org/vfs/vfs/c/0778b0a1a8d2

回复: [PATCH v4] selftests/move_mount_set_group:Make tests build with old libc

Posted by Huyadi 1 year, 11 months ago

>On Thu, 11 Jan 2024 19:32:29 +0800, Hu Yadi wrote:
>> Replace SYS_<syscall> with __NR_<syscall>.  Using the __NR_<syscall> 
>> notation, provided by UAPI, is useful to build tests on systems 
>> without the SYS_<syscall> definitions.
>> 
>> Replace SYS_move_mount with __NR_move_mount
>> 
>> Similar changes: commit 87129ef13603 ("selftests/landlock: Make tests 
>> build with old libc")
>> 
>> [...]
>
>Applied to the vfs.misc branch of the vfs/vfs.git tree.
>Patches in the vfs.misc branch should appear in linux-next soon.
>
>Please report any outstanding bugs that were missed during review in a new review to the original patch series allowing us to drop it.
>
>It's encouraged to provide Acked-bys and Reviewed-bys even though the patch has now been applied. If possible patch trailers will be updated.
>
>Note that commit hashes shown below are subject to change due to rebase, trailer updates or similar. If in doubt, please check the listed branch.
>
>tree:   https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git
>branch: vfs.misc
>

May I take the liberty to ask why I don't see patch applied to above branch?
and below commit also shows error:

Bad object id: 0778b0a1a8d2

>[1/1] selftests/move_mount_set_group:Make tests build with old libc
>     https://git.kernel.org/vfs/vfs/c/0778b0a1a8d2

Re: 回复: [PATCH v4] selftests/move_mount_set_group:Make tests build with old libc

Posted by Christian Brauner 1 year, 11 months ago

> May I take the liberty to ask why I don't see patch applied to above branch?

Just wasn't pushed yet. It is now.

Re: [PATCH v4] selftests/move_mount_set_group:Make tests build with old libc

Posted by Mickaël Salaün 1 year, 11 months ago

On Thu, Jan 11, 2024 at 07:32:29PM +0800, Hu Yadi wrote:
> From: "Hu.Yadi" <hu.yadi@h3c.com>
> 
> Replace SYS_<syscall> with __NR_<syscall>.  Using the __NR_<syscall>
> notation, provided by UAPI, is useful to build tests on systems without
> the SYS_<syscall> definitions.
> 
> Replace SYS_move_mount with __NR_move_mount
> 
> Similar changes: commit 87129ef13603 ("selftests/landlock: Make tests build with old libc")
> 
> Acked-by: Mickaël Salaün <mic@digikod.net>

Sorry, it should have been Reviewed-by: Mickaël Salaün <mic@digikod.net>

Also, this is maintained by the VFS maintainers. I CCed three relevant addresses.

> Signed-off-by: Hu.Yadi <hu.yadi@h3c.com>
> Suggested-by: Jiao <jiaoxupo@h3c.com>
> Reviewed-by: Berlin <berlin@h3c.com>
> ---
> Changes v4 -> v3:
>  - Adjust comments for consistent
>  - Add Acked-by
> Changes v2 -> v3:
>  - Adjust comments
> Changes v1 -> v2:
>  - Fix mail of Suggested-by and Reviewed-by
> 
>  .../move_mount_set_group/move_mount_set_group_test.c          | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/tools/testing/selftests/move_mount_set_group/move_mount_set_group_test.c b/tools/testing/selftests/move_mount_set_group/move_mount_set_group_test.c
> index 50ed5d475dd1..bcf51d785a37 100644
> --- a/tools/testing/selftests/move_mount_set_group/move_mount_set_group_test.c
> +++ b/tools/testing/selftests/move_mount_set_group/move_mount_set_group_test.c
> @@ -218,7 +218,7 @@ static bool move_mount_set_group_supported(void)
>  	if (mount(NULL, SET_GROUP_FROM, NULL, MS_SHARED, 0))
>  		return -1;
>  
> -	ret = syscall(SYS_move_mount, AT_FDCWD, SET_GROUP_FROM,
> +	ret = syscall(__NR_move_mount, AT_FDCWD, SET_GROUP_FROM,
>  		      AT_FDCWD, SET_GROUP_TO, MOVE_MOUNT_SET_GROUP);
>  	umount2("/tmp", MNT_DETACH);
>  
> @@ -363,7 +363,7 @@ TEST_F(move_mount_set_group, complex_sharing_copying)
>  		       CLONE_VM | CLONE_FILES); ASSERT_GT(pid, 0);
>  	ASSERT_EQ(wait_for_pid(pid), 0);
>  
> -	ASSERT_EQ(syscall(SYS_move_mount, ca_from.mntfd, "",
> +	ASSERT_EQ(syscall(__NR_move_mount, ca_from.mntfd, "",
>  			  ca_to.mntfd, "", MOVE_MOUNT_SET_GROUP
>  			  | MOVE_MOUNT_F_EMPTY_PATH | MOVE_MOUNT_T_EMPTY_PATH),
>  		  0);
> -- 
> 2.23.0
> 
>

回复: [PATCH v4] selftests/move_mount_set_group:Make tests build with old libc

Posted by Huyadi 1 year, 11 months ago

>On Thu, Jan 11, 2024 at 07:32:29PM +0800, Hu Yadi wrote:
>> From: "Hu.Yadi" <hu.yadi@h3c.com>
>> 
>> Replace SYS_<syscall> with __NR_<syscall>.  Using the __NR_<syscall> 
>> notation, provided by UAPI, is useful to build tests on systems 
>> without the SYS_<syscall> definitions.
>> 
>> Replace SYS_move_mount with __NR_move_mount
>> 
>> Similar changes: commit 87129ef13603 ("selftests/landlock: Make tests 
>> build with old libc")
>> 
>> Acked-by: Mickaël Salaün <mic@digikod.net>
>
>Sorry, it should have been Reviewed-by: Mickaël Salaün <mic@digikod.net>
>
>Also, this is maintained by the VFS maintainers. I CCed three relevant addresses.


Any progesss about this patch ? 
Thanks

>
>> Signed-off-by: Hu.Yadi <hu.yadi@h3c.com>
>> Suggested-by: Jiao <jiaoxupo@h3c.com>
>> Reviewed-by: Berlin <berlin@h3c.com>
>> ---
>> Changes v4 -> v3:
>>  - Adjust comments for consistent
>>  - Add Acked-by
>> Changes v2 -> v3:
>>  - Adjust comments
>> Changes v1 -> v2:
>>  - Fix mail of Suggested-by and Reviewed-by
>> 
>>  .../move_mount_set_group/move_mount_set_group_test.c          | 4 ++--
>>  1 file changed, 2 insertions(+), 2 deletions(-)
>> 
>> diff --git 
>> a/tools/testing/selftests/move_mount_set_group/move_mount_set_group_te
>> st.c 
>> b/tools/testing/selftests/move_mount_set_group/move_mount_set_group_te
>> st.c index 50ed5d475dd1..bcf51d785a37 100644
>> --- 
>> a/tools/testing/selftests/move_mount_set_group/move_mount_set_group_te
>> st.c
>> +++ b/tools/testing/selftests/move_mount_set_group/move_mount_set_grou
>> +++ p_test.c
>> @@ -218,7 +218,7 @@ static bool move_mount_set_group_supported(void)
>>  	if (mount(NULL, SET_GROUP_FROM, NULL, MS_SHARED, 0))
>>  		return -1;
>>  
>> -	ret = syscall(SYS_move_mount, AT_FDCWD, SET_GROUP_FROM,
>> +	ret = syscall(__NR_move_mount, AT_FDCWD, SET_GROUP_FROM,
>>  		      AT_FDCWD, SET_GROUP_TO, MOVE_MOUNT_SET_GROUP);
>>  	umount2("/tmp", MNT_DETACH);
>>  
>> @@ -363,7 +363,7 @@ TEST_F(move_mount_set_group, complex_sharing_copying)
>>  		       CLONE_VM | CLONE_FILES); ASSERT_GT(pid, 0);
>>  	ASSERT_EQ(wait_for_pid(pid), 0);
>>  
>> -	ASSERT_EQ(syscall(SYS_move_mount, ca_from.mntfd, "",
>> +	ASSERT_EQ(syscall(__NR_move_mount, ca_from.mntfd, "",
>>  			  ca_to.mntfd, "", MOVE_MOUNT_SET_GROUP
>>  			  | MOVE_MOUNT_F_EMPTY_PATH | MOVE_MOUNT_T_EMPTY_PATH),
>>  		  0);
>> --
>> 2.23.0
>> 
>>