Fix setsockopt(PACKET_RX_RING) usage on PPC64
PATCH 1/1 Fix setsockopt(PACKET_RX_RING) usage on PPC64
struct tpacket_req3.tp_block_size value must be a multiple of page size. Replace constants with values calculated from actual page size to fix setsockopt() tests on PPC64 which has 64KB pages instead of 4KB.
Signed-off-by Martin Doucha <[email protected]>
--- testcases/kernel/syscalls/setsockopt/setsockopt06.c | 6 ++++-- testcases/kernel/syscalls/setsockopt/setsockopt07.c | 6 ++++-- testcases/kernel/syscalls/setsockopt/setsockopt09.c | 4 +++- 3 files changed, 11 insertions(+), 5 deletions(-)
testcases/kernel/syscalls/setsockopt/setsockopt06.c +4 -2
@@ -28,6 +28,7 @@#include "lapi/if_ether.h" static int sock =-1 ; +static unsigned int pagesize;static struct tst_fzsync_pair fzsync_pair;static void setup (void )
@@ -35,6 +36,7 @@ static void setup(void)int real_uid =getuid ();int real_gid =getgid (); + pagesize =SAFE_SYSCONF (_SC_PAGESIZE);SAFE_TRY_FILE_PRINTF ("/proc/sys/user/max_user_namespaces" ,"%d" ,10 );SAFE_UNSHARE (CLONE_NEWUSER );
@@ -52,9 +54,9 @@ static void *thread_run(void *arg) {int ret;struct tpacket_req3 req = { - .tp_block_size =4096 , + .tp_block_size = pagesize, .tp_block_nr =1 , - .tp_frame_size =4096 , + .tp_frame_size = pagesize, .tp_frame_nr =1 , .tp_retire_blk_tov =100 };
testcases/kernel/syscalls/setsockopt/setsockopt07.c +4 -2
@@ -31,6 +31,7 @@#include "lapi/if_ether.h" static int sock =-1 ; +static unsigned int pagesize;static struct tst_fzsync_pair fzsync_pair;static void setup (void )
@@ -38,6 +39,7 @@ static void setup(void)int real_uid =getuid ();int real_gid =getgid (); + pagesize =SAFE_SYSCONF (_SC_PAGESIZE);SAFE_TRY_FILE_PRINTF ("/proc/sys/user/max_user_namespaces" ,"%d" ,10 );SAFE_UNSHARE (CLONE_NEWUSER );
@@ -73,9 +75,9 @@ static void run(void)unsigned int val, version =TPACKET_V3 ;socklen_t vsize =sizeof (val);struct tpacket_req3 req = { - .tp_block_size =4096 , + .tp_block_size = pagesize, .tp_block_nr =1 , - .tp_frame_size =4096 , + .tp_frame_size = pagesize, .tp_frame_nr =1 , .tp_retire_blk_tov =100 };
testcases/kernel/syscalls/setsockopt/setsockopt09.c +3 -1
@@ -31,12 +31,14 @@#include "lapi/if_packet.h" static int sock =-1 ; +static unsigned int pagesize;static void setup (void ) {int real_uid =getuid ();int real_gid =getgid (); + pagesize =SAFE_SYSCONF (_SC_PAGESIZE);SAFE_TRY_FILE_PRINTF ("/proc/sys/user/max_user_namespaces" ,"%d" ,10 );SAFE_UNSHARE (CLONE_NEWUSER );
@@ -50,7 +52,7 @@ static void run(void) {unsigned int version =TPACKET_V3 ;struct tpacket_req3 req = { - .tp_block_size =16384 , + .tp_block_size =4 * pagesize, .tp_block_nr =256 , .tp_frame_size =TPACKET_ALIGNMENT <<7 , .tp_retire_blk_tov =64 ,
Signature · 5 lines
2.34.1 -- Mailing list info: https://lists.linux.it/listinfo/ltp
Hi Martin,
Quoted 3 lines
struct tpacket_req3.tp_block_size value must be a multiple of page size. Replace constants with values calculated from actual page size to fix
setsockopt()tests on PPC64 which has 64KB pages instead of 4KB.
Thanks!
Reviewed-by Petr Vorel <[email protected]>
Before merging this I'll just fix breaking CI (missing libmm-dev in Debian testing).
Kind regards,
Petr
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
Hi!
Looks good to me as well.
Reviewed-by Cyril Hrubis <[email protected]>
Signature · 5 lines
Cyril Hrubis [email protected] -- Mailing list info: https://lists.linux.it/listinfo/ltp
Hi Martin, Cyril,
Quoted 4 lines
Hi!
Looks good to me as well.Reviewed-by Cyril Hrubis <[email protected]>
Merged. I'm sorry I overlooked your ack.
Kind regards,
Petr
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp