From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by sourceware.org (Postfix) with ESMTPS id 81AAF3948836 for ; Tue, 3 May 2022 14:57:36 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 81AAF3948836 Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id B8407210ED for ; Tue, 3 May 2022 14:57:35 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id A267D13ABE for ; Tue, 3 May 2022 14:57:35 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id Y9xrJt9CcWI5dQAAMHmgww (envelope-from ) for ; Tue, 03 May 2022 14:57:35 +0000 Date: Tue, 3 May 2022 16:57:34 +0200 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH][gdb/testsuite] Handle pipe2 syscall in gdb.base/catch-syscall.exp Message-ID: <20220503145732.GA26729@delia.home> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.10.1 (2018-07-13) X-Spam-Status: No, score=-12.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 May 2022 14:57:38 -0000 Hi, When running test-case gdb.reverse/pipe-reverse.exp on openSUSE Tumbleweed, I run into: ... (gdb) continue^M Continuing.^M ^M Catchpoint 2 (returned from syscall pipe2), in pipe () from /lib64/libc.so.6^M (gdb) FAIL: gdb.base/catch-syscall.exp: without arguments: \ syscall pipe has returned ... The current glibc on Tumbleweed is 2.35, which contains commit "linux: Implement pipe in terms of __NR_pipe2", and consequently syscall pipe2 is used in stead of syscall pipe. Fix this by detecting whether syscall pipe or pipe2 is used before running the tests. Tested on x86_64-linux, specifically on: - openSUSE Tumbleweed (with glibc 2.35), and - openSUSE Leap 15.3 (with glibc 2.31). Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=29056 Any comments? Thanks, - Tom [gdb/testsuite] Handle pipe2 syscall in gdb.base/catch-syscall.exp --- gdb/testsuite/gdb.base/catch-syscall.c | 3 +- gdb/testsuite/gdb.base/catch-syscall.exp | 69 ++++++++++++++++++++++++++++---- 2 files changed, 64 insertions(+), 8 deletions(-) diff --git a/gdb/testsuite/gdb.base/catch-syscall.c b/gdb/testsuite/gdb.base/catch-syscall.c index 0ab96318d3e..8c252a06b20 100644 --- a/gdb/testsuite/gdb.base/catch-syscall.c +++ b/gdb/testsuite/gdb.base/catch-syscall.c @@ -24,7 +24,8 @@ int chroot_syscall = SYS_chroot; int read_syscall = SYS_read; #ifdef SYS_pipe int pipe_syscall = SYS_pipe; -#else +#endif +#ifdef SYS_pipe2 int pipe2_syscall = SYS_pipe2; #endif int write_syscall = SYS_write; diff --git a/gdb/testsuite/gdb.base/catch-syscall.exp b/gdb/testsuite/gdb.base/catch-syscall.exp index a5dfd02411b..ed1b32d34bc 100644 --- a/gdb/testsuite/gdb.base/catch-syscall.exp +++ b/gdb/testsuite/gdb.base/catch-syscall.exp @@ -669,35 +669,90 @@ proc fill_all_syscalls_numbers {} { set unknown_syscall_number [get_integer_valueof "unknown_syscall" -1] } -# Set up the vector all_syscalls. +# Set up the vector all_syscalls. Returns 1 upon success, 0 upon failure. proc setup_all_syscalls {} { global all_syscalls global gdb_prompt + global decimal # They are ordered according to the file, so do not change this. lappend all_syscalls "close" lappend all_syscalls "chroot" + if { ![runto_main] } { + return 0 + } + # SYS_pipe doesn't exist on aarch64 kernel. set test "check SYS_pipe" + set have_SYS_pipe 0 gdb_test_multiple "p pipe_syscall" $test { - -re " = .*$gdb_prompt $" { + -re -wrap " = .*" { + pass $test + set have_SYS_pipe 1 + } + -re -wrap "No symbol .*" { + pass $test + } + } + + if { $have_SYS_pipe == 0 && $have_SYS_pipe2 == 0 } { + return 0 + } + + set test "check SYS_pipe2" + set have_SYS_pipe2 0 + gdb_test_multiple "p pipe2_syscall" $test { + -re -wrap " = .*" { pass $test - lappend all_syscalls "pipe" + set have_SYS_pipe2 1 } - -re "No symbol .*$gdb_prompt $" { + -re -wrap "No symbol .*" { pass $test - # SYS_pipe isn't defined, use SYS_pipe2 instead. - lappend all_syscalls "pipe2" + } + } + + with_test_prefix "determine pipe syscall" { + set line [gdb_get_line_number "pipe (fd)"] + gdb_test "break $line" + gdb_continue_to_breakpoint "before pipe call" + if { $have_SYS_pipe } { + gdb_test "catch syscall pipe" + } + if { $have_SYS_pipe2 } { + gdb_test "catch syscall pipe2" + } + set ok 0 + gdb_test_multiple "continue" "" { + -re -wrap "Catchpoint $decimal \\(call to syscall pipe\\).*" { + lappend all_syscalls "pipe" + pass $gdb_test_name + set ok 1 + } + -re -wrap "Catchpoint $decimal \\(call to syscall pipe2\\).*" { + lappend all_syscalls "pipe2" + pass $gdb_test_name + set ok 1 + } + -re -wrap "" { + fail $gdb_test_name + } + } + if { ! $ok } { + return 0 } } lappend all_syscalls "write" lappend all_syscalls "read" + + return 1 } -setup_all_syscalls +if { ![setup_all_syscalls] } { + return -1 +} # Fill all the syscalls numbers before starting anything. fill_all_syscalls_numbers