Skip to contentSkip to conversation

memfd_test: Make it work on 32-bit systems

PATCH Superseded Pranith Kumar 2 participants 3 messages Sep 1, 2014 – Sep 3, 2014 Kselftest

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 memfd_test: Make it work on 32-bit systems

This test currently fails on 32-bit systems since we use u64 type to pass the flags to fcntl.

This commit changes this to use 'unsigned int' type for flags to fcntl making it work on 32-bit systems.

---
v2: use 'unsigned int' instead of u32

 tools/testing/selftests/memfd/memfd_test.c | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)
tools/testing/selftests/memfd/memfd_test.c +14 -16
index 3634c90..6f1385a 100644
@@ -59,9 +59,9 @@ static void mfd_fail_new(const char *name, unsigned int flags)
 	}
 }
 
-static __u64 mfd_assert_get_seals(int fd)
+static int mfd_assert_get_seals(int fd)
 {
-	long r;
+	int r;
 
 	r = fcntl(fd, F_GET_SEALS);
 	if (r < 0) {
@@ -72,36 +72,34 @@ static __u64 mfd_assert_get_seals(int fd)
 	return r;
 }
 
-static void mfd_assert_has_seals(int fd, __u64 seals)
+static void mfd_assert_has_seals(int fd, unsigned int seals)
 {
-	__u64 s;
+	int s;
 
 	s = mfd_assert_get_seals(fd);
 	if (s != seals) {
-		printf("%llu != %llu = GET_SEALS(%d)\n",
-		       (unsigned long long)seals, (unsigned long long)s, fd);
+		printf("%u != %u = GET_SEALS(%d)\n",
+				seals, (unsigned int)s, fd);
 		abort();
 	}
 }
 
-static void mfd_assert_add_seals(int fd, __u64 seals)
+static void mfd_assert_add_seals(int fd, unsigned int seals)
 {
-	long r;
-	__u64 s;
+	int r, s;
 
 	s = mfd_assert_get_seals(fd);
 	r = fcntl(fd, F_ADD_SEALS, seals);
 	if (r < 0) {
-		printf("ADD_SEALS(%d, %llu -> %llu) failed: %m\n",
-		       fd, (unsigned long long)s, (unsigned long long)seals);
+		printf("ADD_SEALS(%d, %u -> %u) failed: %m\n",
+				fd, (unsigned int)s, seals);
 		abort();
 	}
 }
 
-static void mfd_fail_add_seals(int fd, __u64 seals)
+static void mfd_fail_add_seals(int fd, unsigned int seals)
 {
-	long r;
-	__u64 s;
+	int r, s;
 
 	r = fcntl(fd, F_GET_SEALS);
 	if (r < 0)
@@ -111,8 +109,8 @@ static void mfd_fail_add_seals(int fd, __u64 seals)
 
 	r = fcntl(fd, F_ADD_SEALS, seals);
 	if (r >= 0) {
-		printf("ADD_SEALS(%d, %llu -> %llu) didn't fail as expected\n",
-		       fd, (unsigned long long)s, (unsigned long long)seals);
+		printf("ADD_SEALS(%d, %u -> %u) didn't fail as expected\n",
+				fd, (unsigned int)s, seals);
 		abort();
 	}
 }
Signature · 1 line
2.1.0
Reviewed-by on v2 1/1
#1 lore raw

Hi

Quoted 18 lines · Pranith Kumar

This test currently fails on 32-bit systems since we use u64 type to pass the flags to fcntl.

This commit changes this to use 'unsigned int' type for flags to fcntl making it work on 32-bit systems.

---
v2: use 'unsigned int' instead of u32

 tools/testing/selftests/memfd/memfd_test.c | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)
tools/testing/selftests/memfd/memfd_test.c +0 -0
index 3634c90..6f1385a 100644

tools/testing/selftests/memfd/memfd_test.c static void mfd_fail_new(const char *name, unsigned int flags) · line 64

Quoted 8 lines
tools/testing/selftests/memfd/memfd_test.c +2 -2
@@ -59,9 +59,9 @@ static void mfd_fail_new(const char *name, unsigned int flags)
        }
 }
 
-static __u64 mfd_assert_get_seals(int fd)
+static int mfd_assert_get_seals(int fd)
 {
-       long r;
+       int r;

This function can be declared as returning "unsigned int", but keep "r" as int. negative return codes cause an abort(), so we're fine.

Quoted 9 lines
tools/testing/selftests/memfd/memfd_test.c +1 -1
        r = fcntl(fd, F_GET_SEALS);
        if (r < 0) {
@@ -72,36 +72,34 @@ static __u64 mfd_assert_get_seals(int fd)
        return r;
 }
 
-static void mfd_assert_has_seals(int fd, __u64 seals)
+static void mfd_assert_has_seals(int fd, unsigned int seals)

tools/testing/selftests/memfd/memfd_test.c static __u64 mfd_assert_get_seals(int fd) · line 82

Quoted 10 lines
tools/testing/selftests/memfd/memfd_test.c +3 -3
 {
-       __u64 s;
+       int s;
 
        s = mfd_assert_get_seals(fd);
        if (s != seals) {
-               printf("%llu != %llu = GET_SEALS(%d)\n",
-                      (unsigned long long)seals, (unsigned long long)s, fd);
+               printf("%u != %u = GET_SEALS(%d)\n",
+                               seals, (unsigned int)s, fd);

By making mfd_assert_get_seals() return "unsigned int", you can declare 's' as unsigned, too, and drop this cast.

Quoted 8 lines
tools/testing/selftests/memfd/memfd_test.c +1 -2
                abort();
        }
 }
 
-static void mfd_assert_add_seals(int fd, __u64 seals)
+static void mfd_assert_add_seals(int fd, unsigned int seals)
 {
-       long r;

tools/testing/selftests/memfd/memfd_test.c static __u64 mfd_assert_get_seals(int fd) · line 95

Quoted 10 lines
tools/testing/selftests/memfd/memfd_test.c +3 -3
-       __u64 s;
+       int r, s;
 
        s = mfd_assert_get_seals(fd);
        r = fcntl(fd, F_ADD_SEALS, seals);
        if (r < 0) {
-               printf("ADD_SEALS(%d, %llu -> %llu) failed: %m\n",
-                      fd, (unsigned long long)s, (unsigned long long)seals);
+               printf("ADD_SEALS(%d, %u -> %u) failed: %m\n",
+                               fd, (unsigned int)s, seals);

same here

Quoted 14 lines
tools/testing/selftests/memfd/memfd_test.c +2 -3
                abort();
        }
 }
 
-static void mfd_fail_add_seals(int fd, __u64 seals)
+static void mfd_fail_add_seals(int fd, unsigned int seals)
 {
-       long r;
-       __u64 s;
+       int r, s;
 
        r = fcntl(fd, F_GET_SEALS);
        if (r < 0)

tools/testing/selftests/memfd/memfd_test.c static void mfd_fail_add_seals(int fd, __u64 seals) · line 113

Quoted 7 lines
tools/testing/selftests/memfd/memfd_test.c +2 -2
@@ -111,8 +109,8 @@ static void mfd_fail_add_seals(int fd, __u64 seals)
 
        r = fcntl(fd, F_ADD_SEALS, seals);
        if (r >= 0) {
-               printf("ADD_SEALS(%d, %llu -> %llu) didn't fail as expected\n",
-                      fd, (unsigned long long)s, (unsigned long long)seals);
+               printf("ADD_SEALS(%d, %u -> %u) didn't fail as expected\n",
+                               fd, (unsigned int)s, seals);

same here

Sorry for the bike-shedding. Patch looks good, otherwise. With, or without, this changed, this is:

Thanks
David

Quoted 6 lines
tools/testing/selftests/memfd/memfd_test.c +0 -1
                abort();
        }
 }
--

2.1.0

#2 lore raw
Quoted 5 lines · David Herrmann

Sorry for the bike-shedding. Patch looks good, otherwise. With, or without, this changed, this is:

Thank you for the review David. I will send in a new patch with your suggested changes.

Signature · 1 line
Pranith