Skip to contentSkip to conversation

Migrating the libhugetlbfs/testcases/straddle_4GB.c

PATCH In review Geetika 2 participants 3 messages Oct 3, 2023 – Mar 27, 2024

lore
Share & tools
lore

Geetika

author
#0 lore raw

PATCH 1/1 Migrating the libhugetlbfs/testcases/straddle_4GB.c

Test Description:
This test tries to allocate hugepages to cover a memory range that straddles the 4GB boundary.

---
 runtest/hugetlb                               |   1 +
 testcases/kernel/mem/.gitignore               |   1 +
 .../kernel/mem/hugetlb/hugemmap/hugemmap40.c  | 145 ++++++++++++++++++
 testcases/kernel/mem/hugetlb/lib/hugetlb.c    |  42 +++++
 4 files changed, 189 insertions(+)
 create mode 100644 testcases/kernel/mem/hugetlb/hugemmap/hugemmap40.c
runtest/hugetlb +1 -0
index 299c07ac9..da37dc815 100644
@@ -35,6 +35,7 @@ hugemmap29 hugemmap29
 hugemmap30 hugemmap30
 hugemmap31 hugemmap31
 hugemmap32 hugemmap32
+hugemmap40 hugemmap40
 hugemmap05_1 hugemmap05 -m
 hugemmap05_2 hugemmap05 -s
 hugemmap05_3 hugemmap05 -s -m
testcases/kernel/mem/.gitignore +1 -0
index 7258489ed..dd1858a4a 100644
@@ -34,6 +34,7 @@
 /hugetlb/hugemmap/hugemmap30
 /hugetlb/hugemmap/hugemmap31
 /hugetlb/hugemmap/hugemmap32
+/hugetlb/hugemmap/hugemmap40
 /hugetlb/hugeshmat/hugeshmat01
 /hugetlb/hugeshmat/hugeshmat02
 /hugetlb/hugeshmat/hugeshmat03
testcases/kernel/mem/hugetlb/hugemmap/hugemmap40.c new file +145 -0

145 lines not on this page · raw message

testcases/kernel/mem/hugetlb/lib/hugetlb.c +42 -0

45 lines not on this page · raw message

Signature · 5 lines
2.39.2 (Apple Git-143)


-- 
Mailing list info: https://lists.linux.it/listinfo/ltp
#1 lore raw

Hi Geetika,

Please have look at my comments at your previous patch [1] [2], these changes apply a lot for your patches as well.

[1] https://lore.kernel.org/ltp/20231128111024.GA364870@pevik/
[2] https://lore.kernel.org/ltp/20231128112254.GA367506@pevik/

Quoted 45 lines

Test Description:
This test tries to allocate hugepages to cover a memory range that straddles the 4GB boundary.

---
 runtest/hugetlb                               |   1 +
 testcases/kernel/mem/.gitignore               |   1 +
 .../kernel/mem/hugetlb/hugemmap/hugemmap40.c  | 145 ++++++++++++++++++
 testcases/kernel/mem/hugetlb/lib/hugetlb.c    |  42 +++++
 4 files changed, 189 insertions(+)
 create mode 100644 testcases/kernel/mem/hugetlb/hugemmap/hugemmap40.c
runtest/hugetlb +1 -0
index 299c07ac9..da37dc815 100644
@@ -35,6 +35,7 @@ hugemmap29 hugemmap29
 hugemmap30 hugemmap30
 hugemmap31 hugemmap31
 hugemmap32 hugemmap32
+hugemmap40 hugemmap40
 hugemmap05_1 hugemmap05 -m
 hugemmap05_2 hugemmap05 -s
 hugemmap05_3 hugemmap05 -s -m
testcases/kernel/mem/.gitignore +1 -0
index 7258489ed..dd1858a4a 100644
@@ -34,6 +34,7 @@
 /hugetlb/hugemmap/hugemmap30
 /hugetlb/hugemmap/hugemmap31
 /hugetlb/hugemmap/hugemmap32
+/hugetlb/hugemmap/hugemmap40
 /hugetlb/hugeshmat/hugeshmat01
 /hugetlb/hugeshmat/hugeshmat02
 /hugetlb/hugeshmat/hugeshmat03
testcases/kernel/mem/hugetlb/hugemmap/hugemmap40.c new file +2 -0
new file mode 100644
index 000000000..1ba070831
@@ -0,0 +1,145 @@
+// SPDX-License-Identifier: LGPL-2.1-or-later
+/*

testcases/kernel/mem/hugetlb/hugemmap/hugemmap40.c line 12

Quoted 10 lines
testcases/kernel/mem/hugetlb/hugemmap/hugemmap40.c new file +10 -0
+ * Copyright (C) 2005-2006 David Gibson & Adam Litke, IBM Corporation.
+ * Copyright (C) 2006 Hugh Dickins <[email protected]>
+ */
+
+/*\
+ * [Description]
+ * This test tries to allocate hugepages to cover a memory range
+ * that straddles the 4GB boundary.
+ * Scenario 1 : mmap without MAP_FIXED
+ * Scenario 2 : mmap with MAP_FIXED

This will be badly formatted (it will not be list, but inline).

How about:

/*\
* [Description]
*
* Test tries to allocate hugepages to cover a memory range that straddles the
* 4GB boundary, using mmap(2) with and without MAP_FIXED.
*/

testcases/kernel/mem/hugetlb/hugemmap/hugemmap40.c line 19

Quoted 6 lines
testcases/kernel/mem/hugetlb/hugemmap/hugemmap40.c new file +6 -0
+ */
+
+#define MAPS_BUF_SZ 4096
+#define FOURGB (1UL << 32)
+#define MNTPOINT "hugetlbfs/"
+#define HUGETLBFS_MAGIC	0x958458f6

Could you please add this magic definition to include/tst_fs.h (as a separate patch), we store all magic there.

testcases/kernel/mem/hugetlb/hugemmap/hugemmap40.c line 20

Quoted 1 line
testcases/kernel/mem/hugetlb/hugemmap/hugemmap40.c new file +1 -0
+#define _LARGEFILE64_SOURCE /* Need this for statfs64 */

We would probably define it in Makefile

hugemmap40: CFLAGS += -D_LARGEFILE64_SOURCE

Quoted 9 lines
testcases/kernel/mem/hugetlb/hugemmap/hugemmap40.c new file +9 -0
+
+#include "hugetlb.h"
+
+static long hpage_size;
+static int fd = -1;
+static unsigned long straddle_addr;
+
+static int test_addr_huge(void *p)
+{

testcases/kernel/mem/hugetlb/hugemmap/hugemmap40.c line 39

Quoted 10 lines
testcases/kernel/mem/hugetlb/hugemmap/hugemmap40.c new file +10 -0
+	char name[256];
+	char *dirend;
+	int ret;
+	struct statfs64 sb;
+
+	ret = read_maps((unsigned long)p, name);
+	if (ret < 0)
+		return ret;
+	if (ret == 0) {
+		tst_res(TINFO, "Couldn't find address %p in /proc/self/maps\n", p);

Please remove "\n", it's already added in tst_res().

Quoted 35 lines
testcases/kernel/mem/hugetlb/hugemmap/hugemmap40.c new file +35 -0
+		return -1;
+	}
+	/* looks like a filename? */
+	if (name[0] != '/')
+		return 0;
+
+	/* Truncate the filename portion */
+
+	dirend = strrchr(name, '/');
+	if (dirend && dirend > name)
+		*dirend = '\0';
+
+	ret = statfs64(name, &sb);
+	if (ret)
+		return -1;
+
+	return (sb.f_type == HUGETLBFS_MAGIC);
+}
+
+static void run_test(void)
+{
+	void *p;
+
+	/* We first try to get the mapping without MAP_FIXED */
+	tst_res(TINFO, "Mapping without MAP_FIXED at %lx...", straddle_addr);
+	p = mmap((void *)straddle_addr, 2*hpage_size, PROT_READ|PROT_WRITE,
+			MAP_SHARED, fd, 0);
+	if (p == (void *)straddle_addr) {
+		/* These tests irrelevant if we didn't get the straddle address*/
+		if (test_addr_huge(p) != 1) {
+			tst_brk(TFAIL, "1st Mapped address is not hugepage");
+			goto windup;
+		}
+		if (test_addr_huge(p + hpage_size) != 1) {
+			tst_brk(TFAIL, "2nd Mapped address is not hugepage");

testcases/kernel/mem/hugetlb/hugemmap/hugemmap40.c line 84

Quoted 10 lines
testcases/kernel/mem/hugetlb/hugemmap/hugemmap40.c new file +10 -0
+			goto windup;
+		}
+		memset(p, 0, hpage_size);
+		memset(p + hpage_size, 0, hpage_size);
+		tst_res(TPASS, "Mapping without MAP_FIXED at %lx... completed", straddle_addr);
+	} else {
+		tst_res(TINFO, "Got %p instead, never mind, let's move to mapping with MAP_FIXED\n", p);
+		munmap(p, 2*hpage_size);
+	}
+	tst_res(TINFO, "Mapping with MAP_FIXED at %lx...", straddle_addr);

Maybe use .tcnt = 2, in struct tst_test and separate these 2 cases into it's wonf functions?

You would either use:
static void run_test(unsigned int n)

With that you would reduce code duplicity and make test function smaller.

Also, sometimes we use test struct (pointer to the function and description, see e.g. testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl02.c).

...

testcases/kernel/mem/hugetlb/hugemmap/hugemmap40.c line 84

Quoted 1 line
testcases/kernel/mem/hugetlb/hugemmap/hugemmap40.c new file +1 -0
+++ b/testcases/kernel/mem/hugetlb/lib/hugetlb.c

Maybe add this change as a separate commit?

Kind regards,
Petr

Quoted 46 lines
testcases/kernel/mem/hugetlb/hugemmap/hugemmap40.c new file +42 -0
@@ -130,3 +130,45 @@ int do_readback(void *p, size_t size, char *desc)
 	}
 	return 0;
 }
+
+#define MAPS_BUF_SZ 4096
+int read_maps(unsigned long addr, char *buf)
+{
+        FILE *f;
+        char line[MAPS_BUF_SZ];
+        char *tmp;
+
+        f = fopen("/proc/self/maps", "r");
+        if (!f) {
+                tst_res(TFAIL, "Failed to open /proc/self/maps: %s\n", strerror(errno));
+                return -1;
+        }
+
+        while (1) {
+                unsigned long start, end, off, ino;
+                int ret;
+
+                tmp = fgets(line, MAPS_BUF_SZ, f);
+                if (!tmp)
+                        break;
+
+                buf[0] = '\0';
+                ret = sscanf(line, "%lx-%lx %*s %lx %*s %ld %255s",
+                             &start, &end, &off, &ino,
+                             buf);
+                if ((ret < 4) || (ret > 5)) {
+                        tst_res(TFAIL, "Couldn't parse /proc/self/maps line: %s\n",
+                                        line);
+                        fclose(f);
+                        return -1;
+                }
+
+                if ((start <= addr) && (addr < end)) {
+                        fclose(f);
+                        return 1;
+                }
+        }
+
+        fclose(f);
+        return 0;
+}
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
author
#2 lore raw

Hi Petr,

Quoted 8 lines · Petr Vorel

Hi Geetika,

Please have look at my comments at your previous patch [1] [2], these changes apply a lot for your patches as well.

[1]https://lore.kernel.org/ltp/20231128111024.GA364870@pevik/ [2]https://lore.kernel.org/ltp/20231128112254.GA367506@pevik/

Noted.
I will apply whatever changes are applicable to this testcase in the next version.

...

Quoted 26 lines

testcases/kernel/mem/hugetlb/hugemmap/hugemmap40.c line 12

Quoted 7 lines
testcases/kernel/mem/hugetlb/hugemmap/hugemmap40.c new file +7 -0
+
+/*\
+ * [Description]
+ * This test tries to allocate hugepages to cover a memory range
+ * that straddles the 4GB boundary.
+ * Scenario 1 : mmap without MAP_FIXED
+ * Scenario 2 : mmap with MAP_FIXED

This will be badly formatted (it will not be list, but inline).

How about:

/*\
* [Description]
*
* Test tries to allocate hugepages to cover a memory range that straddles the
* 4GB boundary, using mmap(2) with and without MAP_FIXED.
*/

testcases/kernel/mem/hugetlb/hugemmap/hugemmap40.c line 19

Quoted 6 lines

+ */

testcases/kernel/mem/hugetlb/hugemmap/hugemmap40.c new file +5 -0
+
+#define MAPS_BUF_SZ 4096
+#define FOURGB (1UL << 32)
+#define MNTPOINT "hugetlbfs/"
+#define HUGETLBFS_MAGIC	0x958458f6

Could you please add this magic definition to include/tst_fs.h (as a separate patch), we store all magic there.

Quoted 4 lines
Quoted 1 line

+#define _LARGEFILE64_SOURCE /* Need this for statfs64 */

We would probably define it in Makefile

hugemmap40: CFLAGS += -D_LARGEFILE64_SOURCE

Noted.
I will apply above changes with the next version.

...

Quoted 33 lines
testcases/kernel/mem/hugetlb/hugemmap/hugemmap40.c new file +27 -0
+
+static void run_test(void)
+{
+	void *p;
+
+	/* We first try to get the mapping without MAP_FIXED */
+	tst_res(TINFO, "Mapping without MAP_FIXED at %lx...", straddle_addr);
+	p = mmap((void *)straddle_addr, 2*hpage_size, PROT_READ|PROT_WRITE,
+			MAP_SHARED, fd, 0);
+	if (p == (void *)straddle_addr) {
+		/* These tests irrelevant if we didn't get the straddle address*/
+		if (test_addr_huge(p) != 1) {
+			tst_brk(TFAIL, "1st Mapped address is not hugepage");
+			goto windup;
+		}
+		if (test_addr_huge(p + hpage_size) != 1) {
+			tst_brk(TFAIL, "2nd Mapped address is not hugepage");
+			goto windup;
+		}
+		memset(p, 0, hpage_size);
+		memset(p + hpage_size, 0, hpage_size);
+		tst_res(TPASS, "Mapping without MAP_FIXED at %lx... completed", straddle_addr);
+	} else {
+		tst_res(TINFO, "Got %p instead, never mind, let's move to mapping with MAP_FIXED\n", p);
+		munmap(p, 2*hpage_size);
+	}
+	tst_res(TINFO, "Mapping with MAP_FIXED at %lx...", straddle_addr);

Maybe use .tcnt = 2, in struct tst_test and separate these 2 cases into it's wonf functions?

You would either use:
static void run_test(unsigned int n)

Quoted 6 lines

With that you would reduce code duplicity and make test function smaller.

Also, sometimes we use test struct (pointer to the function and description, see e.g. testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl02.c).

...

Can you suggest how we can handle the test exit upon failure inside one of test cases then?

Currently I am handling it by using label windup placed at the end of function. In one of the other tests there was feedback to not use exit(0); then how can we exit easily upon failure from one of the testcase?

Thanks & Regards,
Geetika

Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp