Re: [LTP] [PATCH] fix "hugetlb" several tests

Mitani
2010-04-16T09:25:02Z

[-- Attachment #1: Type: text/plain, Size: 2207 bytes --]

> -----Original Message-----
> From: Garrett Cooper [mailto:yanegomi@gmail.com]
> Sent: Friday, April 16, 2010 2:06 PM
> To: Mitani
> Cc: Randy Dunlap; ltp-list@lists.sourceforge.net
> Subject: Re: [LTP] [PATCH] fix "hugetlb" several tests
>
> On Thu, Apr 15, 2010 at 7:42 PM, Mitani <mitani@ryobi.co.jp> wrote:
> >
> >> -----Original Message-----
> >> From: Randy Dunlap [mailto:rdunlap@xenotime.net]
> >> Sent: Thursday, April 15, 2010 12:20 AM
> >> To: Mitani
> >> Cc: 'Garrett Cooper'; ltp-list@lists.sourceforge.net
> >> Subject: Re: [LTP] [PATCH] fix "hugetlb" several tests
> >>
> >> On Wed, 14 Apr 2010 17:58:17 +0900 Mitani wrote:
> >>
> >> > Hi,
> >> >
> >> > I suggest new patch.
> >> >
> >> > Signed-off-by: Tomonori Mitani <mitani@ryobi.co.jp>
> >>
> >> This one is OK with me also, but...
> >>
> >> Is it possible to determine the difference between a kernel that
> does
> >> not support hugepages at all and a kernel that does support hugepages
> >> but just does not have enough of them allocated?
> >>
> >> or maybe we don't care about this difference.  Do we?
> >
> > I cannot give a good opinion because I'm not a creator of these test
> > programs, but ...
> > I think that the difference of test refusal reason isn't so important.
> > How about following message? :
> > ------------
> > Not support Hugepages or not enough available Hugepages
> > ------------
> >
> > If users read above message, they will examine a reason by themselves
> > and will do appropriate measures (set an enough hugepages value or
> > gave up this test), I think.
>
> It's fine as-is. `Zero [supported] hugepages' is the same as `not
> enough hugepages'. If people can't read the message, and put together
> the details based on what's in the test output versus the
> documentation and the source code, they quite frankly shouldn't be
> running the tests.
> Thanks,
> -Garrett

I made patch for both Hugepages non-support message and "tst_exit()"
calling.
I attach the patch as a file.

Signed-off-by: Tomonori Mitani <mitani@ryobi.co.jp>

Regards--

-Tomonori Mitani

[-- Attachment #2: hugetlb.patch --]
[-- Type: application/octet-stream, Size: 8367 bytes --]

--- a/testcases/kernel/mem/hugetlb/hugemmap/hugemmap04.c 2010-04-01 15:23:09.000000000 +0900
+++ b/testcases/kernel/mem/hugetlb/hugemmap/hugemmap04.c 2010-04-16 14:33:44.000000000 +0900
@@ -127,8 +127,7 @@

/* Check number of hugepages */
if (get_no_of_hugepages() <= 0 || hugepages_size() <= 0)
- tst_brkm(TBROK, cleanup, "Test cannot be continued owning to \
- sufficient availability of Hugepages on the system");
+ tst_brkm(TCONF, tst_exit, "Not support Hugepages or not enough available Hugepages");

/* Perform global setup for test */
setup();
--- a/testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat01.c 2010-04-01 15:23:09.000000000 +0900
+++ b/testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat01.c 2010-04-16 14:31:56.000000000 +0900
@@ -105,7 +105,7 @@
}

if ( get_no_of_hugepages() <= 0 || hugepages_size() <= 0 )
- tst_brkm(TBROK, cleanup, "Test cannot be continued owning to sufficient availability of Hugepages on the system");
+ tst_brkm(TCONF, tst_exit, "Not support Hugepages or not enough available Hugepages");
else
huge_pages_shm_to_be_allocated = ( get_no_of_hugepages() * hugepages_size() * 1024) / 2 ;

--- a/testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat02.c 2010-04-01 15:23:09.000000000 +0900
+++ b/testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat02.c 2010-04-16 14:32:13.000000000 +0900
@@ -102,7 +102,7 @@
}

if ( get_no_of_hugepages() <= 0 || hugepages_size() <= 0 )
- tst_brkm(TBROK, cleanup, "Test cannot be continued owning to sufficient availability of Hugepages on the system");
+ tst_brkm(TCONF, tst_exit, "Not support Hugepages or not enough available Hugepages");
else
huge_pages_shm_to_be_allocated = ( get_no_of_hugepages() * hugepages_size() * 1024) / 2 ;

--- a/testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat03.c 2010-04-01 15:23:09.000000000 +0900
+++ b/testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat03.c 2010-04-16 14:32:26.000000000 +0900
@@ -86,7 +86,7 @@
}

if ( get_no_of_hugepages() <= 0 || hugepages_size() <= 0 )
- tst_brkm(TBROK, cleanup, "Test cannot be continued owning to sufficient availability of Hugepages on the system");
+ tst_brkm(TCONF, tst_exit, "Not support Hugepages or not enough available Hugepages");
else
huge_pages_shm_to_be_allocated = ( get_no_of_hugepages() * hugepages_size() * 1024) / 2 ;

--- a/testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl01.c 2010-04-01 15:23:09.000000000 +0900
+++ b/testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl01.c 2010-04-16 14:35:10.000000000 +0900
@@ -130,7 +130,7 @@
}

if ( get_no_of_hugepages() <= 0 || hugepages_size() <= 0 )
- tst_brkm(TBROK, cleanup, "Test cannot be continued owning to sufficient availability of Hugepages on the system");
+ tst_brkm(TCONF, tst_exit, "Not support Hugepages or not enough available Hugepages");
else
huge_pages_shm_to_be_allocated = ( get_no_of_hugepages() * hugepages_size() * 1024) / 2 ;

--- a/testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl02.c 2010-04-01 15:23:09.000000000 +0900
+++ b/testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl02.c 2010-04-16 14:35:21.000000000 +0900
@@ -102,7 +102,7 @@
}

if ( get_no_of_hugepages() <= 0 || hugepages_size() <= 0 )
- tst_brkm(TBROK, cleanup, "Test cannot be continued owning to sufficient availability of Hugepages on the system");
+ tst_brkm(TCONF, tst_exit, "Not support Hugepages or not enough available Hugepages");
else
huge_pages_shm_to_be_allocated = ( get_no_of_hugepages() * hugepages_size() * 1024) / 2 ;

--- a/testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl03.c 2010-04-01 15:23:09.000000000 +0900
+++ b/testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl03.c 2010-04-16 14:35:31.000000000 +0900
@@ -105,7 +105,7 @@
}

if ( get_no_of_hugepages() <= 0 || hugepages_size() <= 0 )
- tst_brkm(TBROK, cleanup, "Test cannot be continued owning to sufficient availability of Hugepages on the system");
+ tst_brkm(TCONF, tst_exit, "Not support Hugepages or not enough available Hugepages");
else
huge_pages_shm_to_be_allocated = ( get_no_of_hugepages() * hugepages_size() * 1024) / 2 ;

--- a/testcases/kernel/mem/hugetlb/hugeshmdt/hugeshmdt01.c 2010-04-01 15:23:09.000000000 +0900
+++ b/testcases/kernel/mem/hugetlb/hugeshmdt/hugeshmdt01.c 2010-04-16 14:36:39.000000000 +0900
@@ -87,7 +87,7 @@
}

if ( get_no_of_hugepages() <= 0 || hugepages_size() <= 0 )
- tst_brkm(TBROK, cleanup, "Test cannot be continued owning to sufficient availability of Hugepages on the system");
+ tst_brkm(TCONF, tst_exit, "Not support Hugepages or not enough available Hugepages");
else
huge_pages_shm_to_be_allocated = ( get_no_of_hugepages() * hugepages_size() * 1024) / 2 ;

--- a/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget01.c 2010-04-01 15:23:09.000000000 +0900
+++ b/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget01.c 2010-04-16 14:38:22.000000000 +0900
@@ -78,14 +78,14 @@
tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
}

- setup(); /* global setup */
-
/* The following loop checks looping state if -i option given */
if ( get_no_of_hugepages() <= 0 || hugepages_size() <= 0 )
- tst_brkm(TBROK, cleanup, "Test cannot be continued owning to sufficient availability of Hugepages on the system");
+ tst_brkm(TCONF, tst_exit, "Not support Hugepages or not enough available Hugepages");
else
huge_pages_shm_to_be_allocated = ( get_no_of_hugepages() * hugepages_size() * 1024) / 2 ;

+ setup(); /* global setup */
+
for (lc = 0; TEST_LOOPING(lc); lc++) {
/* reset Tst_count in case we are looping */
Tst_count = 0;
--- a/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget02.c 2010-04-01 15:23:09.000000000 +0900
+++ b/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget02.c 2010-04-16 14:38:33.000000000 +0900
@@ -84,7 +84,7 @@
}

if ( get_no_of_hugepages() <= 0 || hugepages_size() <= 0 )
- tst_brkm(TBROK, cleanup, "Test cannot be continued owning to sufficient availability of Hugepages on the system");
+ tst_brkm(TCONF, tst_exit, "Not support Hugepages or not enough available Hugepages");
else
huge_pages_shm_to_be_allocated = ( get_no_of_hugepages() * hugepages_size() * 1024) / 2 ;

--- a/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget03.c 2010-04-01 15:23:09.000000000 +0900
+++ b/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget03.c 2010-04-16 14:38:49.000000000 +0900
@@ -85,7 +85,7 @@

/* The following loop checks looping state if -i option given */
if ( get_no_of_hugepages() <= 0 || hugepages_size() <= 0 )
- tst_brkm(TBROK, cleanup, "Test cannot be continued owning to sufficient availability of Hugepages on the system");
+ tst_brkm(TCONF, tst_exit, "Not support Hugepages or not enough available Hugepages");
else
huge_pages_shm_to_be_allocated = ( get_no_of_hugepages() * hugepages_size() * 1024) / 2 ;

--- a/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget05.c 2010-04-01 15:23:09.000000000 +0900
+++ b/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget05.c 2010-04-16 14:39:00.000000000 +0900
@@ -86,7 +86,7 @@
}

if ( get_no_of_hugepages() <= 0 || hugepages_size() <= 0 )
- tst_brkm(TBROK, cleanup, "Test cannot be continued owning to sufficient availability of Hugepages on the system");
+ tst_brkm(TCONF, tst_exit, "Not support Hugepages or not enough available Hugepages");
else
huge_pages_shm_to_be_allocated = ( get_no_of_hugepages() * hugepages_size() * 1024) / 2 ;

[-- Attachment #3: Type: text/plain, Size: 345 bytes --]

------------------------------------------------------------------------------
Download Intel&#174; Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev

[-- Attachment #4: Type: text/plain, Size: 155 bytes --]