selftests: net: tcp_mmap: fix SO_RCVLOWAT setting
Subsystems (3)
PATCH 1/1 selftests: net: tcp_mmap: fix SO_RCVLOWAT setting
Since chunk_size is no longer an integer, we can not use it directly as an argument of setsockopt().
This patch should fix tcp_mmap for Big Endian kernels.
--- tools/testing/selftests/net/tcp_mmap.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
tools/testing/selftests/net/tcp_mmap.c +3 -1
@@ -282,12 +282,14 @@ static void setup_sockaddr(int domain, const char *str_addr,static void do_accept (int fdlisten) {pthread_attr_t attr; +int rcvlowat;pthread_attr_init (&attr);pthread_attr_setdetachstate (&attr,PTHREAD_CREATE_DETACHED ); + rcvlowat = chunk_size;if (setsockopt (fdlisten,SOL_SOCKET ,SO_RCVLOWAT , - &chunk_size,sizeof (chunk_size)) ==-1 ) { + &rcvlowat,sizeof (rcvlowat)) ==-1 ) {perror ("setsockopt SO_RCVLOWAT" ); }
Signature · 1 line
2.26.2.526.g744177e7f7-goog
Quoted 10 lines · Eric Dumazet
Since
chunk_sizeis no longer an integer, we can not use it directly as an argument ofsetsockopt().This patch should fix
tcp_mmapfor Big Endian kernels.Fixes 597b01edafac ("selftests: net: avoid ptl lock contention in tcp_mmap")Signed-off-by Eric Dumazet <[email protected]>Cc Soheil Hassas Yeganeh <[email protected]>Cc Arjun Roy <[email protected]>
Quoted 27 lines
--- tools/testing/selftests/net/tcp_mmap.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)tools/testing/selftests/net/tcp_mmap.c +3
-2@@ -282,12 +282,14 @@ static void setup_sockaddr(int domain, const char *str_addr,static void do_accept (int fdlisten) {pthread_attr_t attr; +int rcvlowat;pthread_attr_init (&attr);pthread_attr_setdetachstate (&attr,PTHREAD_CREATE_DETACHED ); + rcvlowat = chunk_size;if (setsockopt (fdlisten,SOL_SOCKET ,SO_RCVLOWAT , - &chunk_size,sizeof (chunk_size)) ==-1 ) { + &rcvlowat,sizeof (rcvlowat)) ==-1 ) {perror ("setsockopt SO_RCVLOWAT" ); } --2.26.2.526.g744177e7f7-goog
From: Eric Dumazet <[email protected]>
Date: Wed, 6 May 2020 09:21:15 -0700
Quoted 7 lines
Since
chunk_sizeis no longer an integer, we can not use it directly as an argument ofsetsockopt().This patch should fix
tcp_mmapfor Big Endian kernels.Fixes 597b01edafac ("selftests: net: avoid ptl lock contention in tcp_mmap")Signed-off-by Eric Dumazet <[email protected]>
Applied, thanks Eric.
David Miller
maintainerFrom: Eric Dumazet <[email protected]>
Date: Wed, 6 May 2020 09:21:15 -0700
Quoted 7 lines
Since
chunk_sizeis no longer an integer, we can not use it directly as an argument ofsetsockopt().This patch should fix
tcp_mmapfor Big Endian kernels.Fixes 597b01edafac ("selftests: net: avoid ptl lock contention in tcp_mmap")Signed-off-by Eric Dumazet <[email protected]>
Applied and queued up for -stable.