minmax: fix type warnings
PATCH 1/1 minmax: fix type warnings
Several min/max comparisons are missing type conversions.
--- lib/tst_memutils.c | 2 +- testcases/kernel/mem/mmapstress/mmapstress01.c | 2 +- testcases/kernel/mem/mmapstress/mmapstress10.c | 2 +- testcases/kernel/mem/tunable/overcommit_memory.c | 6 +++--- testcases/kernel/syscalls/mprotect/mprotect02.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-)
lib/tst_memutils.c +1 -1
@@ -31,7 +31,7 @@ void tst_pollute_memory(size_t maxsize, int fillchar)SAFE_SYSINFO (&info); safety =MAX (4096 *SAFE_SYSCONF (_SC_PAGESIZE),128L *1024 *1024 ); - safety =MAX (safety, min_free); + safety =MAX (safety, (size_t )min_free); safety /= info.mem_unit;if (info.freeswap > safety)
testcases/kernel/mem/mmapstress/mmapstress01.c +1 -1
@@ -310,7 +310,7 @@ int main(int argc, char *argv[])anyfail (); }for (bytes_left = filesize; bytes_left; bytes_left -= c) { - write_cnt =MIN (pagesize, bytes_left); + write_cnt =MIN (pagesize, (int )bytes_left);if ((c =write (fd, buf, write_cnt)) != write_cnt) {if (c ==-1 ) {perror ("write error" );
testcases/kernel/mem/mmapstress/mmapstress10.c +1 -1
@@ -360,7 +360,7 @@ int main(int argc, char *argv[]) }for (bytes_left = filesize; bytes_left; bytes_left -= c) { - write_cnt =MIN (pagesize, bytes_left); + write_cnt =MIN (pagesize, (int )bytes_left);if ((c =write (fd, (char *)buf, write_cnt)) != write_cnt) {if (c ==-1 ) {perror ("write error" );
testcases/kernel/mem/tunable/overcommit_memory.c +3 -3
@@ -248,9 +248,9 @@ static void calculate_total_batch_size(void)SAFE_SYSINFO (&info);/* see linux source mm/mm_init.c mm_compute_batch() (This is in pages) */ -long batch_size =MAX (ncpus *2 , -MAX (32 , -MIN (INT32_MAX , +long batch_size =MAX (ncpus *2L , +MAX (32L , +MIN ((long )INT32_MAX , (long )(info.totalram / pagesize) / ncpus /256 ) )
testcases/kernel/syscalls/mprotect/mprotect02.c +1 -1
@@ -77,7 +77,7 @@ int main(int ac, char **av) do { - bytes_to_write = MIN(strlen(buf), num_bytes); + bytes_to_write = MIN((unsigned int)strlen(buf), num_bytes); num_bytes -= SAFE_WRITE(cleanup, 1, fd, buf, bytes_to_write);
Signature · 5 lines
2.37.2.789.g6183377224-goog -- Mailing list info: https://lists.linux.it/listinfo/ltp
Hi Edward,
Ah, 32 bit fixes. Thanks!
Kind regards,
Petr
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
Hi!
Review
Quoted 5 lines
(quoted diff) +1
-1SAFE_SYSINFO(&info); safety = MAX(4096 * SAFE_SYSCONF(_SC_PAGESIZE), 128L * 1024 * 1024); - safety = MAX(safety, min_free); + safety = MAX(safety, (size_t)min_free); safety /= info.mem_unit;
We can define the min_free to be size_t from the start as:
lib/tst_memutils.c +2 -2
@@ -20,11 +20,11 @@ void tst_pollute_memory(size_t maxsize, int fillchar) {size_t i, map_count =0 , safety =0 , blocksize =BLOCKSIZE ;unsigned long long freeram; -unsigned long min_free; +size_t min_free;void **map_blocks;struct sysinfo info; -SAFE_FILE_SCANF ("/proc/sys/vm/min_free_kbytes" ,"%lu" , &min_free); +SAFE_FILE_SCANF ("/proc/sys/vm/min_free_kbytes" ,"%zu" , &min_free); min_free *=1024 ;/* Apply a margin because we cannot get below "min" watermark */ min_free += min_free /10 ;
Quoted 49 lines
(quoted diff) +0
-0if (info.freeswap > safety)testcases/kernel/mem/mmapstress/mmapstress01.c +1
-1@@ -310,7 +310,7 @@ int main(int argc, char *argv[])anyfail (); }for (bytes_left = filesize; bytes_left; bytes_left -= c) { - write_cnt =MIN (pagesize, bytes_left); + write_cnt =MIN (pagesize, (int )bytes_left);if ((c =write (fd, buf, write_cnt)) != write_cnt) {if (c ==-1 ) {perror ("write error" );testcases/kernel/mem/mmapstress/mmapstress10.c +1
-1@@ -360,7 +360,7 @@ int main(int argc, char *argv[]) }for (bytes_left = filesize; bytes_left; bytes_left -= c) { - write_cnt =MIN (pagesize, bytes_left); + write_cnt =MIN (pagesize, (int )bytes_left);if ((c =write (fd, (char *)buf, write_cnt)) != write_cnt) {if (c ==-1 ) {perror ("write error" );testcases/kernel/mem/tunable/overcommit_memory.c +3
-3@@ -248,9 +248,9 @@ static void calculate_total_batch_size(void)SAFE_SYSINFO (&info);/* see linux source mm/mm_init.c mm_compute_batch() (This is in pages) */ -long batch_size =MAX (ncpus *2 , -MAX (32 , -MIN (INT32_MAX , +long batch_size =MAX (ncpus *2L , +MAX (32L , +MIN ((long )INT32_MAX , (long )(info.totalram / pagesize) / ncpus /256 ) )testcases/kernel/syscalls/mprotect/mprotect02.c +0
-0
testcases/kernel/syscalls/mprotect/mprotect02.c int main(int ac, char **av) · line 80
Quoted 5 lines
testcases/kernel/syscalls/mprotect/mprotect02.c +1
-1@@ -77,7 +77,7 @@ int main(int ac, char **av) do { - bytes_to_write = MIN(strlen(buf), num_bytes); + bytes_to_write = MIN((unsigned int)strlen(buf), num_bytes);
Again we can define the num_bytes to be size_t from the start.
The rest looks good.
Signature · 5 lines
Cyril Hrubis [email protected] -- Mailing list info: https://lists.linux.it/listinfo/ltp
Quoted 8 lines
Hi!
Review
Quoted 5 lines
(quoted diff) +1
-1SAFE_SYSINFO(&info); safety = MAX(4096 * SAFE_SYSCONF(_SC_PAGESIZE), 128L * 1024 * 1024); - safety = MAX(safety, min_free); + safety = MAX(safety, (size_t)min_free); safety /= info.mem_unit;We can define the
min_freeto besize_tfrom the start as:
Indeed, that's much better. And the second one as well. Going to merged with these fixes.
Kind regards,
Petr
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
Hi Edward, Cyril,
Merged with requested fixes + update printf format (SAFE_FILE_SCANF) to %zi.
Kind regards,
Petr
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
Hey Petr, Cyril,
I'm second-guessing how to handle the off_t and int comparisons in mem/mmapstress01 and 10. Would it have been better to do the following?
(quoted diff) +0 -0
b/testcases/kernel/mem/mmapstress/mmapstress01.c
index f425c223d..934e83006 100644
testcases/kernel/mem/mmapstress/mmapstress01.c +3 -2
@@ -143,7 +143,6 @@ int main(int argc, char *argv[])pid_t pid;uchar_t *buf =NULL ;unsigned int seed; -int pagesize =sysconf (_SC_PAGE_SIZE);float alarmtime =0 ;struct sigaction sa;unsigned i;
@@ -154,8 +153,10 @@ int main(int argc, char *argv[])time_t t;#ifdef LARGE_FILE off64_t bytes_left; +off64_t pagesize =sysconf (_SC_PAGE_SIZE);#else /* LARGE_FILE */ off_t bytes_left; +off_t pagesize =sysconf (_SC_PAGE_SIZE);#endif /* LARGE_FILE */ const char *filename ="mmapstress01.out" ;
@@ -310,7 +311,7 @@ int main(int argc, char *argv[])anyfail (); }for (bytes_left = filesize; bytes_left; bytes_left -= c) { - write_cnt =MIN (pagesize, (int )bytes_left); + write_cnt =MIN (pagesize, bytes_left);if ((c =write (fd, buf, write_cnt)) != write_cnt) {if (c ==-1 ) {perror ("write error" );
(quoted diff) +0 -0
b/testcases/kernel/mem/mmapstress/mmapstress10.c
index 53f02c1f6..1756f7081 100644
testcases/kernel/mem/mmapstress/mmapstress10.c +3 -2
@@ -171,7 +171,6 @@ int main(int argc, char *argv[])pid_t wr_pid =0 ;uchar_t *buf =NULL ;unsigned int seed; -int pagesize =sysconf (_SC_PAGE_SIZE);float alarmtime =0 ;struct sigaction sa;unsigned i;
@@ -182,8 +181,10 @@ int main(int argc, char *argv[])time_t t;#ifdef LARGE_FILE off64_t bytes_left; +off64_t pagesize =sysconf (_SC_PAGE_SIZE);#else /* LARGE_FILE */ off_t bytes_left; +off_t pagesize =sysconf (_SC_PAGE_SIZE);#endif /* LARGE_FILE */ progname = *argv;
@@ -360,7 +361,7 @@ int main(int argc, char *argv[]) }for (bytes_left = filesize; bytes_left; bytes_left -= c) { - write_cnt =MIN (pagesize, (int )bytes_left); + write_cnt =MIN (pagesize, bytes_left);if ((c =write (fd, (char *)buf, write_cnt)) != write_cnt) {if (c ==-1 ) {perror ("write error" );
Thanks,
Edward
Signature · 2 lines
-- Mailing list info: https://lists.linux.it/listinfo/ltp
Hi!
Ideally when you are touching that code it should be cleaned up first and ported to the new test API. The code wasn't properly ported to LTP to begin with and there are hacks and wrappers around LTP API functions that should be removed as well.
Signature · 5 lines
Cyril Hrubis [email protected] -- Mailing list info: https://lists.linux.it/listinfo/ltp
Quoted 9 lines · Cyril Hrubis
Hi!
Ideally when you are touching that code it should be cleaned up first and ported to the new test API. The code wasn't properly ported to LTP to begin with and there are hacks and wrappers around LTP API functions that should be removed as well.--
Cyril Hrubis
[email protected]
Hi Cyril,
Sure thing, I've made an attempt to port mmapstress01, will send that for feedback before tackling the others.
Thanks,
Edward
Signature · 2 lines
-- Mailing list info: https://lists.linux.it/listinfo/ltp
Hi!
Quoted 2 lines
Sure thing, I've made an attempt to port mmapstress01, will send that for feedback before tackling the others.
We are finalizing a LTP release right now, I will have a look once I have a bit of time, however it probably wouldn't be sooner than next week.
Signature · 5 lines
Cyril Hrubis [email protected] -- Mailing list info: https://lists.linux.it/listinfo/ltp
Hi Cyril,
Quoted 8 lines · Cyril Hrubis
Hi!
Quoted 2 lines
Sure thing, I've made an attempt to port mmapstress01, will send that for feedback before tackling the others.
We are finalizing a LTP release right now, I will have a look once I have a bit of time, however it probably wouldn't be sooner than next week.
Sounds good, thanks!
Signature · 2 lines
-- Mailing list info: https://lists.linux.it/listinfo/ltp