mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-08-30 14:33:24 -04:00
selftests/net: use MAP_FAILED instead of (void *)-1 in tcp_mmap
mmap() is documented to return MAP_FAILED on error, but tcp_mmap.c compares the return value against (void *)-1 and (unsigned char *)-1. Replace these with the standard MAP_FAILED macro for better readability and type safety. Signed-off-by: longlong yan <yanlonglong@kylinos.cn> Reviewed-by: Joe Damato <joe@dama.to> Reviewed-by: Eric Dumazet <edumazet@google.com> Link: https://patch.msgid.link/20260722015129.916-1-yanlonglong@kylinos.cn Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
committed by
Jakub Kicinski
parent
92f0217f8a
commit
94cdc6a2c8
@@ -141,12 +141,12 @@ static void *mmap_large_buffer(size_t need, size_t *allocated)
|
||||
buffer = mmap(NULL, sz, PROT_READ | PROT_WRITE,
|
||||
MAP_PRIVATE | MAP_ANONYMOUS | MAP_HUGETLB, -1, 0);
|
||||
|
||||
if (buffer == (void *)-1) {
|
||||
if (buffer == MAP_FAILED) {
|
||||
sz = need;
|
||||
buffer = mmap(NULL, sz, PROT_READ | PROT_WRITE,
|
||||
MAP_PRIVATE | MAP_ANONYMOUS | MAP_POPULATE,
|
||||
-1, 0);
|
||||
if (buffer != (void *)-1)
|
||||
if (buffer != MAP_FAILED)
|
||||
fprintf(stderr, "MAP_HUGETLB attempt failed, look at /sys/kernel/mm/hugepages for optimal performance\n");
|
||||
}
|
||||
*allocated = sz;
|
||||
@@ -189,13 +189,13 @@ void *child_thread(void *arg)
|
||||
|
||||
fcntl(fd, F_SETFL, O_NDELAY);
|
||||
buffer = mmap_large_buffer(chunk_size, &buffer_sz);
|
||||
if (buffer == (void *)-1) {
|
||||
if (buffer == MAP_FAILED) {
|
||||
perror("mmap");
|
||||
goto error;
|
||||
}
|
||||
if (zflg) {
|
||||
raddr = mmap(NULL, chunk_size + map_align, PROT_READ, flags, fd, 0);
|
||||
if (raddr == (void *)-1) {
|
||||
if (raddr == MAP_FAILED) {
|
||||
perror("mmap");
|
||||
zflg = 0;
|
||||
} else {
|
||||
@@ -547,7 +547,7 @@ int main(int argc, char *argv[])
|
||||
}
|
||||
|
||||
buffer = mmap_large_buffer(chunk_size, &buffer_sz);
|
||||
if (buffer == (unsigned char *)-1) {
|
||||
if (buffer == MAP_FAILED) {
|
||||
perror("mmap");
|
||||
exit(1);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user