Skip to contentSkip to conversation

ltp: vma03 fix the alginment of page size

PATCH cdong 3 participants 3 messages Jun 3, 2015 – Jun 30, 2015

lore
Share & tools
lore

cdong

author
#0 lore raw

Hi,
This patch fix a vma03 bug,the info below detail it:

the offset which is parameter of mmap2() function doesn't align the page size,but,this parameter is allowed multiple of the page size as returned by sysconf(_SC_PAGE_SIZE),meanwhile offset * 4096 must be a multiple of the system page size,so modify the input parameter pgoff = (ULONG_MAX - 1)&(~((pgsz-1)>>12));

Regards
Chuang

From 1685976a18cf9b4d255434731336a820578c7647 Mon Sep 17 00:00:00 2001
From: Chuang Dong <[email protected]>
Date: Wed, 3 Jun 2015 15:53:30 +0800
Subject: [PATCH] ltp: vma03 fix the alginment of page size

the offset which is parameter of mmap2() function doesn't align the page size,but,this parameter is allowed multiple of the page size as returned by sysconf(_SC_PAGE_SIZE),meanwhile offset * 4096 must be a multiple of the system page size,so modify the input parameter pgoff = (ULONG_MAX - 1)&(~((pgsz-1)>>12));

Upstream-Status: Submitted

---
 ...-ltp-vma03-fix-the-alginment-of-page-size.patch | 32 ++++++++++++++++++++++
 meta/recipes-extended/ltp/ltp_20150119.bb          |  1 +
 2 files changed, 33 insertions(+)
 create mode 100644 meta/recipes-extended/ltp/ltp/0001-ltp-vma03-fix-the-alginment-of-page-size.patch
meta/recipes-extended/ltp/ltp/0001-ltp-vma03-fix-the-alginment-of-page-size.patch new file +32 -0
new file mode 100644
index 0000000..0e5678d
@@ -0,0 +1,32 @@
+From dd53725b162707bd09db0dce5ae141c997042fa6 Mon Sep 17 00:00:00 2001
+From: Chuang Dong <[email protected]>
+Date: Wed, 3 Jun 2015 15:44:35 +0800
+Subject: [PATCH] ltp: vma03 fix the alginment of page size
+
+the offset which is parameter of mmap2() function doesn't align the
+page size,but,this parameter is allowed multiple of the page size
+as returned by sysconf(_SC_PAGE_SIZE),meanwhile offset * 4096 must be
+a multiple of the system page size,so modify the input parameter
+pgoff = (ULONG_MAX - 1)&(~((pgsz-1)>>12));
+
+Signed-off-by: Chuang Dong <[email protected]>
+---
+ testcases/kernel/mem/vma/vma03.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/testcases/kernel/mem/vma/vma03.c b/testcases/kernel/mem/vma/vma03.c
+index 270097b..72ac470 100644
+--- a/testcases/kernel/mem/vma/vma03.c
++++ b/testcases/kernel/mem/vma/vma03.c
+@@ -89,7 +89,7 @@ int main(int argc, char *argv[])
+ 		if (fd == -1)
+ 			tst_brkm(TBROK | TERRNO, NULL, "open %s", TESTFILE);
+ 
+-		pgoff = ULONG_MAX - 1;
++		pgoff = (ULONG_MAX - 1)&(~((pgsz-1)>>12));
+ 		map = mmap2(NULL, pgsz, PROT_READ | PROT_WRITE, MAP_PRIVATE,
+ 			    fd, pgoff);
+ 		if (map == MAP_FAILED)
+-- 
+1.9.1
+
meta/recipes-extended/ltp/ltp_20150119.bb +1 -0
index 90c5973..9c5c762 100644
@@ -28,6 +28,7 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \
     file://make-setregid02-work.patch \
     file://add-knob-for-numa.patch \
     file://add-knob-for-tirpc.patch \
+    file://0001-ltp-vma03-fix-the-alginment-of-page-size.patch \
 "
 
 S = "${WORKDIR}/git"
Signature · 1 line
1.9.1
#1 lore raw

Hi Dong,

Please don't send the patch as attachment, you can use git send-email to send the patch. And please add the "Upstream-Status: Submitted" inside the patch 0001-ltp-vma03-fix-the-alginment-of-page-size.patch, right before the Signed-off-by line.

// Robert

Quoted 13 lines · cdong

Hi,
This patch fix a vma03 bug,the info below detail it:

the offset which is parameter of mmap2() function doesn't align the page size,but,this parameter is allowed multiple of the page size as returned by sysconf(_SC_PAGE_SIZE),meanwhile offset * 4096 must be a multiple of the system page size,so modify the input parameter pgoff = (ULONG_MAX - 1)&(~((pgsz-1)>>12));

Regards
Chuang

#2 lore raw

Hi guys,

I have updated the patch format and sent V2 for reviewing...

Thanks
Wenzong

Quoted 25 lines · Robert Yang

Hi Dong,

Please don't send the patch as attachment, you can use git send-email to send the patch. And please add the "Upstream-Status: Submitted" inside the patch 0001-ltp-vma03-fix-the-alginment-of-page-size.patch, right before the Signed-off-by line.

// Robert

Quoted 14 lines · cdong

Hi,
This patch fix a vma03 bug,the info below detail it:

the offset which is parameter of mmap2() function doesn't align the page size,but,this parameter is allowed multiple of the page size as returned by sysconf(_SC_PAGE_SIZE),meanwhile offset * 4096
must be
a multiple of the system page size,so modify the input parameter pgoff = (ULONG_MAX - 1)&(~((pgsz-1)>>12));

Regards
Chuang