2022-03-01 04:16:30

by CGEL

Subject: [PATCH] selftests: vm: remove duplicated macro and use swap() to make code cleaner

From: "Lv Ruyi (CGEL ZTE)" <[email protected]>

The macro is duplicated, so remove one. And use swap to make code cleaner.

Reported-by: Zeal Robot <[email protected]>
Signed-off-by: Lv Ruyi (CGEL ZTE) <[email protected]>
---
tools/testing/selftests/vm/userfaultfd.c | 13 ++-----------
1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/tools/testing/selftests/vm/userfaultfd.c b/tools/testing/selftests/vm/userfaultfd.c
index ab394e6bff43..100f08362164 100644
--- a/tools/testing/selftests/vm/userfaultfd.c
+++ b/tools/testing/selftests/vm/userfaultfd.c
@@ -121,9 +121,6 @@ struct uffd_stats {
#define swap(a, b) \
do { typeof(a) __tmp = (a); (a) = (b); (b) = __tmp; } while (0)

-#define swap(a, b) \
- do { typeof(a) __tmp = (a); (a) = (b); (b) = __tmp; } while (0)
-
const char *examples =
"# Run anonymous memory test on 100MiB region with 99999 bounces:\n"
"./userfaultfd anon 100 99999\n\n"
@@ -1424,7 +1421,6 @@ static void userfaultfd_pagemap_test(unsigned int test_pgsize)
static int userfaultfd_stress(void)
{
void *area;
- char *tmp_area;
unsigned long nr;
struct uffdio_register uffdio_register;
struct uffd_stats uffd_stats[nr_cpus];
@@ -1535,13 +1531,8 @@ static int userfaultfd_stress(void)
count_verify[nr], nr);

/* prepare next bounce */
- tmp_area = area_src;
- area_src = area_dst;
- area_dst = tmp_area;
-
- tmp_area = area_src_alias;
- area_src_alias = area_dst_alias;
- area_dst_alias = tmp_area;
+ swap(area_src, area_dst);
+ swap(area_src_alias, area_dst_alias);

uffd_stats_report(uffd_stats, nr_cpus);
}
--
2.25.1

2022-03-01 16:16:15

by Shuah Khan

Subject: Re: [PATCH] selftests: vm: remove duplicated macro and use swap() to make code cleaner

On 2/28/22 6:44 PM, [email protected] wrote:
> From: "Lv Ruyi (CGEL ZTE)" <[email protected]>
>
> The macro is duplicated, so remove one. And use swap to make code cleaner.
>
> Reported-by: Zeal Robot <[email protected]>
> Signed-off-by: Lv Ruyi (CGEL ZTE) <[email protected]>
> ---
> tools/testing/selftests/vm/userfaultfd.c | 13 ++-----------
> 1 file changed, 2 insertions(+), 11 deletions(-)
>
> diff --git a/tools/testing/selftests/vm/userfaultfd.c b/tools/testing/selftests/vm/userfaultfd.c
> index ab394e6bff43..100f08362164 100644
> --- a/tools/testing/selftests/vm/userfaultfd.c
> +++ b/tools/testing/selftests/vm/userfaultfd.c
> @@ -121,9 +121,6 @@ struct uffd_stats {
> #define swap(a, b) \
> do { typeof(a) __tmp = (a); (a) = (b); (b) = __tmp; } while (0)
>
> -#define swap(a, b) \
> - do { typeof(a) __tmp = (a); (a) = (b); (b) = __tmp; } while (0)
> -
> const char *examples =
> "# Run anonymous memory test on 100MiB region with 99999 bounces:\n"
> "./userfaultfd anon 100 99999\n\n"
> @@ -1424,7 +1421,6 @@ static void userfaultfd_pagemap_test(unsigned int test_pgsize)
> static int userfaultfd_stress(void)
> {
> void *area;
> - char *tmp_area;
> unsigned long nr;
> struct uffdio_register uffdio_register;
> struct uffd_stats uffd_stats[nr_cpus];
> @@ -1535,13 +1531,8 @@ static int userfaultfd_stress(void)
> count_verify[nr], nr);
>
> /* prepare next bounce */
> - tmp_area = area_src;
> - area_src = area_dst;
> - area_dst = tmp_area;
> -
> - tmp_area = area_src_alias;
> - area_src_alias = area_dst_alias;
> - area_dst_alias = tmp_area;
> + swap(area_src, area_dst);
> + swap(area_src_alias, area_dst_alias);

Where is swap() defined? Does this patch compile? I reverted a
change like this one reported by Zeal Robot recently. Let's
make sure this change compiles and runs.

>
> uffd_stats_report(uffd_stats, nr_cpus);
> }
>

thanks,
-- Shuah