From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) by sourceware.org (Postfix) with ESMTPS id 12F4A3858D34 for ; Wed, 1 May 2024 09:08:27 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 12F4A3858D34 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 12F4A3858D34 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=195.135.223.130 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1714554511; cv=none; b=TAoMBeC4Z7SHwzWmg145HsDhKo+PxzGrWdLdL1EE4YEbx9n3cR9E+SMnOQdwXkYV95JE3XjMqCKo3x0ACJX6AqBG/CCPrH7oh6irdpY2yEhfBed4171pmLcEEaGu8gHLsrAwac3tHBNSXMLx06o3vxVlbFjPzvoDEzKBj+Dsolg= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1714554511; c=relaxed/simple; bh=w/yAA95jsq+G9xfu2BLPW/k+jn146TP93zb8qrcu2s4=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature: Message-ID:Date:MIME-Version:Subject:From:To; b=PytimVYWU0tQZFzxto9vq8iEs+zfwRAg5QZoUQD48lzJ4BKZlGH2WEOhiWFO3es/DWWugpKCeYlrMKPFp9DnK2Au0Oo4nA89BCJ7vduHAHeCvru78aw/SB7owRqJNkq+7KZxVAWtHHQcaVgns3D+TcbulPAyZn6zXeZTqzSaVO4= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id D89CF34728 for ; Wed, 1 May 2024 09:08:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1714554506; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=JEa2xidmiAz2u1QCSJx0LWyxFyqpFv/EU5zf+HxQszU=; b=wJ2W6xVxLqXXxmfXeaApuXqdQQ6dKQTGlPlKQd0swYGRpNE5nR1oaQqhBnHbTYua0p0npi 2ANnF6JUL0+5mK+gnjb7qI8Q5jlvt0bq/e4ofyM0Nie7GPpDM6oWwxFMMNhLwMcDAngiAy IpY5yylMF0IO8CxONliuigkJTdprmNs= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1714554506; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=JEa2xidmiAz2u1QCSJx0LWyxFyqpFv/EU5zf+HxQszU=; b=c/3L6had6PYjbjPyhrykq+ERPAzfc415QAqszPY0irTXaPtqFu+iAVN1OKLqI//hOXUIJH C5QttP8nPhRtj8AA== Authentication-Results: smtp-out1.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=JpThmBqn; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=SYj4x6i0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1714554505; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=JEa2xidmiAz2u1QCSJx0LWyxFyqpFv/EU5zf+HxQszU=; b=JpThmBqnFiHdS1NAke9tGZT/zLHDOJryGyz/fGyLkZfS1159bXeUSsVtpirWpcFSebW4bJ dc9/PTdUcVbwXqq1AMq15lRi/xdxwtyzO735+4O7uo7oksBbuTsuI/p+qsrcthGuDQRkRm S7ixsGiVbvBFCILrWtK4w1L97FwUBGE= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1714554505; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=JEa2xidmiAz2u1QCSJx0LWyxFyqpFv/EU5zf+HxQszU=; b=SYj4x6i0+6Ga3IM0L1JyPYf66j+Z09I7TOfrB7gRt1f0bHEkj9pLzonmNzCJhPd4XupepI nfwSGpFXRXf7DQDw== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id BE3F3137BA for ; Wed, 1 May 2024 09:08:25 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id XtCgLIkGMmb2dgAAD6G6ig (envelope-from ) for ; Wed, 01 May 2024 09:08:25 +0000 Message-ID: <356a1259-c1dd-42fc-abbc-7418ce3f009a@suse.de> Date: Wed, 1 May 2024 11:08:45 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v2] [gdb/testsuite] Handle ptrace operation not permitted in can_spawn_for_attach From: Tom de Vries To: gdb-patches@sourceware.org References: <20240501083433.19966-1-tdevries@suse.de> Content-Language: en-US In-Reply-To: <20240501083433.19966-1-tdevries@suse.de> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Level: X-Spamd-Result: default: False [-4.50 / 50.00]; BAYES_HAM(-3.00)[100.00%]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; XM_UA_NO_VERSION(0.01)[]; FUZZY_BLOCKED(0.00)[rspamd.com]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo,imap1.dmz-prg2.suse.org:rdns,suse.de:dkim]; MID_RHS_MATCH_FROM(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCVD_TLS_ALL(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; TO_DN_NONE(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; DKIM_TRACE(0.00)[suse.de:+] X-Rspamd-Action: no action X-Rspamd-Queue-Id: D89CF34728 X-Rspamd-Server: rspamd1.dmz-prg2.suse.org X-Spam-Score: -4.50 X-Spam-Status: No, score=-12.3 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 autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: On 5/1/24 10:34, Tom de Vries wrote: Um, I forgot that I already send a v2, so this is v2-v2. Thanks, - Tom > When running the testsuite on a system with kernel.yama.ptrace_scope set to 1, > we run into attach failures. > > Fix this by recognizing "ptrace: Operation not permitted" in > can_spawn_for_attach. > > Tested on aarch64-linux and x86_64-linux. > --- > gdb/testsuite/gdb.base/break-interp.exp | 4 + > gdb/testsuite/gdb.base/dprintf-detach.exp | 2 +- > .../run-control-while-bg-execution.exp | 3 + > .../gdb.multi/attach-while-running.exp | 2 +- > .../gdb.threads/attach-into-signal.exp | 3 +- > .../gdb.threads/attach-slow-waitpid.exp | 3 +- > gdb/testsuite/gdb.threads/attach-stopped.exp | 3 +- > .../gdb.threads/check-libthread-db.exp | 42 +++---- > gdb/testsuite/lib/gdb.exp | 112 +++++++++++++++--- > 9 files changed, 135 insertions(+), 39 deletions(-) > > diff --git a/gdb/testsuite/gdb.base/break-interp.exp b/gdb/testsuite/gdb.base/break-interp.exp > index addacde552d..d7f84db4770 100644 > --- a/gdb/testsuite/gdb.base/break-interp.exp > +++ b/gdb/testsuite/gdb.base/break-interp.exp > @@ -318,6 +318,10 @@ proc test_attach_gdb {file pid displacement prefix} { > } > > proc test_attach {file displacement {relink_args ""}} { > + if { ![can_spawn_for_attach] } { > + return > + } > + > global board_info > global exec > > diff --git a/gdb/testsuite/gdb.base/dprintf-detach.exp b/gdb/testsuite/gdb.base/dprintf-detach.exp > index 550d319a895..b4184d698df 100644 > --- a/gdb/testsuite/gdb.base/dprintf-detach.exp > +++ b/gdb/testsuite/gdb.base/dprintf-detach.exp > @@ -21,7 +21,7 @@ > load_lib gdbserver-support.exp > > # The test relies on "detach/attach". > -require !use_gdb_stub > +require can_spawn_for_attach > > standard_testfile > set escapedbinfile [string_to_regexp ${binfile}] > diff --git a/gdb/testsuite/gdb.base/run-control-while-bg-execution.exp b/gdb/testsuite/gdb.base/run-control-while-bg-execution.exp > index f1cbd9351d3..380047ae854 100644 > --- a/gdb/testsuite/gdb.base/run-control-while-bg-execution.exp > +++ b/gdb/testsuite/gdb.base/run-control-while-bg-execution.exp > @@ -110,6 +110,9 @@ proc do_test { action1 action2 } { > > foreach_with_prefix action1 { kill detach add none } { > foreach_with_prefix action2 { start run attach } { > + if { $action2 == "attach" && ![can_spawn_for_attach] } { > + continue > + } > do_test $action1 $action2 > } > } > diff --git a/gdb/testsuite/gdb.multi/attach-while-running.exp b/gdb/testsuite/gdb.multi/attach-while-running.exp > index eade8b42a18..ca4fa635467 100644 > --- a/gdb/testsuite/gdb.multi/attach-while-running.exp > +++ b/gdb/testsuite/gdb.multi/attach-while-running.exp > @@ -36,7 +36,7 @@ > > standard_testfile > > -require !use_gdb_stub > +require can_spawn_for_attach > > if { [build_executable "failed to prepare" ${testfile} ${srcfile}] } { > return > diff --git a/gdb/testsuite/gdb.threads/attach-into-signal.exp b/gdb/testsuite/gdb.threads/attach-into-signal.exp > index 87e34070548..91da960e09a 100644 > --- a/gdb/testsuite/gdb.threads/attach-into-signal.exp > +++ b/gdb/testsuite/gdb.threads/attach-into-signal.exp > @@ -17,7 +17,8 @@ > # This file was created by Jan Kratochvil . > > # This test only works on Linux > -require !use_gdb_stub isnative > +require can_spawn_for_attach > +require isnative > require {!is_remote host} > require {istarget *-linux*} > > diff --git a/gdb/testsuite/gdb.threads/attach-slow-waitpid.exp b/gdb/testsuite/gdb.threads/attach-slow-waitpid.exp > index dc3e62a7b7e..28d70daad8c 100644 > --- a/gdb/testsuite/gdb.threads/attach-slow-waitpid.exp > +++ b/gdb/testsuite/gdb.threads/attach-slow-waitpid.exp > @@ -37,7 +37,8 @@ > # during the attach phase. > > # This test only works on Linux > -require !use_gdb_stub isnative > +require can_spawn_for_attach > +require isnative > require {!is_remote host} > require {istarget *-linux*} > > diff --git a/gdb/testsuite/gdb.threads/attach-stopped.exp b/gdb/testsuite/gdb.threads/attach-stopped.exp > index 78e194c992f..0421ffc3794 100644 > --- a/gdb/testsuite/gdb.threads/attach-stopped.exp > +++ b/gdb/testsuite/gdb.threads/attach-stopped.exp > @@ -18,7 +18,8 @@ > # This file was updated by Jan Kratochvil . > > # This test only works on Linux > -require !use_gdb_stub isnative > +require can_spawn_for_attach > +require isnative > require {!is_remote host} > require {istarget *-linux*} > > diff --git a/gdb/testsuite/gdb.threads/check-libthread-db.exp b/gdb/testsuite/gdb.threads/check-libthread-db.exp > index 5662eeda077..6976fe6f83b 100644 > --- a/gdb/testsuite/gdb.threads/check-libthread-db.exp > +++ b/gdb/testsuite/gdb.threads/check-libthread-db.exp > @@ -102,25 +102,27 @@ with_test_prefix "automated load-time check" { > } > > # Automated load-time check with NPTL fully operational. > - with_test_prefix "libpthread.so fully initialized" { > - clean_restart ${binfile} > - > - gdb_test_no_output "maint set check-libthread-db 1" > - gdb_test_no_output "set debug libthread-db 1" > - > - set test_spawn_id [spawn_wait_for_attach $binfile] > - set testpid [spawn_id_get_pid $test_spawn_id] > - > - gdb_test_sequence "attach $testpid" \ > - "check debug libthread-db output" { > - "\[\r\n\]+Running libthread_db integrity checks:" > - "\[\r\n\]+\[ \]+Got thread 0x\[1-9a-f\]\[0-9a-f\]+ => \[0-9\]+ => 0x\[1-9a-f\]\[0-9a-f\]+ ... OK" > - "\[\r\n\]+\[ \]+Got thread 0x\[1-9a-f\]\[0-9a-f\]+ => \[0-9\]+ => 0x\[1-9a-f\]\[0-9a-f\]+ ... OK" > - "\[\r\n\]+libthread_db integrity checks passed." > - "\[\r\n\]+[Thread debugging using libthread_db enabled]" > - } > - > - gdb_exit > - kill_wait_spawned_process $test_spawn_id > + if { [can_spawn_for_attach] } { > + with_test_prefix "libpthread.so fully initialized" { > + clean_restart ${binfile} > + > + gdb_test_no_output "maint set check-libthread-db 1" > + gdb_test_no_output "set debug libthread-db 1" > + > + set test_spawn_id [spawn_wait_for_attach $binfile] > + set testpid [spawn_id_get_pid $test_spawn_id] > + > + gdb_test_sequence "attach $testpid" \ > + "check debug libthread-db output" { > + "\[\r\n\]+Running libthread_db integrity checks:" > + "\[\r\n\]+\[ \]+Got thread 0x\[1-9a-f\]\[0-9a-f\]+ => \[0-9\]+ => 0x\[1-9a-f\]\[0-9a-f\]+ ... OK" > + "\[\r\n\]+\[ \]+Got thread 0x\[1-9a-f\]\[0-9a-f\]+ => \[0-9\]+ => 0x\[1-9a-f\]\[0-9a-f\]+ ... OK" > + "\[\r\n\]+libthread_db integrity checks passed." > + "\[\r\n\]+[Thread debugging using libthread_db enabled]" > + } > + > + gdb_exit > + kill_wait_spawned_process $test_spawn_id > + } > } > } > diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp > index d092258a9e5..7019f38eb15 100644 > --- a/gdb/testsuite/lib/gdb.exp > +++ b/gdb/testsuite/lib/gdb.exp > @@ -6155,8 +6155,54 @@ proc gdb_exit { } { > catch default_gdb_exit > } > > +# Helper function for can_spawn_for_attach. Try to spawn and attach, and > +# return 0 only if we cannot attach because it's unsupported. > + > +gdb_caching_proc can_spawn_for_attach_1 {} { > + # Assume yes. > + set res 1 > + > + set me "can_spawn_for_attach" > + set src { > + #include > + > + int > + main (void) > + { > + sleep (600); > + return 0; > + } > + } > + if {![gdb_simple_compile $me $src executable]} { > + return $res > + } > + > + set test_spawn_id [spawn_wait_for_attach_1 $obj] > + remote_file build delete $obj > + > + gdb_start > + > + set test_pid [spawn_id_get_pid $test_spawn_id] > + set attaching_re "Attaching to process $test_pid" > + gdb_test_multiple "attach $test_pid" "can spawn for attach" { > + -re -wrap "$attaching_re\r\n.*ptrace: Operation not permitted\\." { > + # Not permitted. > + set res 0 > + } > + -re -wrap "" { > + # Don't know, keep assuming yes. > + } > + } > + > + gdb_exit > + > + kill_wait_spawned_process $test_spawn_id > + > + return $res > +} > + > # Return true if we can spawn a program on the target and attach to > -# it. > +# it. Calls gdb_exit for the first call in a test-case. > > proc can_spawn_for_attach { } { > # We use exp_pid to get the inferior's pid, assuming that gives > @@ -6175,8 +6221,39 @@ proc can_spawn_for_attach { } { > return 0 > } > > - # Assume yes. > - return 1 > + # The normal sequence to use for a runtime test like > + # can_spawn_for_attach_1 is: > + # - gdb_exit (don't use a running gdb, we don't know what state it is in), > + # - gdb_start (start a new gdb), and > + # - gdb_exit (cleanup). > + # > + # By making can_spawn_for_attach_1 a gdb_caching_proc, we make it > + # unpredictable which test-case will call it first, and consequently a > + # test-case may pass in say a full test run, but fail when run > + # individually, due to a can_spawn_for_attach call in location where a > + # gdb_exit (as can_spawn_for_attach_1 does) breaks things. > + # To avoid this, we move the initial gdb_exit out of > + # can_spawn_for_attach_1, guaranteeing that we end up in the same state > + # regardless of whether can_spawn_for_attach_1 is called. However, that > + # is only necessary for the first call in a test-case, so cache the result > + # in a global (which should be reset after each test-case) to keep track > + # of that. > + # > + # In summary, we distinguish between three cases: > + # - first call in first test-case. Executes can_spawn_for_attach_1. > + # Calls gdb_exit, gdb_start, gdb_exit. > + # - first call in following test-cases. Uses cached result of > + # can_spawn_for_attach_1. Calls gdb_exit. > + # - rest. Use cached result in cache_can_spawn_for_attach_1. Calls no > + # gdb_start or gdb_exit. > + global cache_can_spawn_for_attach_1 > + if { [info exists cache_can_spawn_for_attach_1] } { > + return $cache_can_spawn_for_attach_1 > + } > + gdb_exit > + > + set cache_can_spawn_for_attach_1 [can_spawn_for_attach_1] > + return $cache_can_spawn_for_attach_1 > } > > # Centralize the failure checking of "attach" command. > @@ -6289,20 +6366,12 @@ proc spawn_id_get_pid { spawn_id } { > return $testpid > } > > -# Start a set of programs running and then wait for a bit, to be sure > -# that they can be attached to. Return a list of processes spawn IDs, > -# one element for each process spawned. It's a test error to call > -# this when [can_spawn_for_attach] is false. > +# Helper function for spawn_wait_for_attach and can_spawn_for_attach_1. As > +# spawn_wait_for_attach, but doesn't check for can_spawn_for_attach. > > -proc spawn_wait_for_attach { executable_list } { > +proc spawn_wait_for_attach_1 { executable_list } { > set spawn_id_list {} > > - if ![can_spawn_for_attach] { > - # The caller should have checked can_spawn_for_attach itself > - # before getting here. > - error "can't spawn for attach with this target/board" > - } > - > foreach {executable} $executable_list { > # Note we use Expect's spawn, not Tcl's exec, because with > # spawn we control when to wait for/reap the process. That > @@ -6316,6 +6385,21 @@ proc spawn_wait_for_attach { executable_list } { > return $spawn_id_list > } > > +# Start a set of programs running and then wait for a bit, to be sure > +# that they can be attached to. Return a list of processes spawn IDs, > +# one element for each process spawned. It's a test error to call > +# this when [can_spawn_for_attach] is false. > + > +proc spawn_wait_for_attach { executable_list } { > + if ![can_spawn_for_attach] { > + # The caller should have checked can_spawn_for_attach itself > + # before getting here. > + error "can't spawn for attach with this target/board" > + } > + > + return [spawn_wait_for_attach_1 $executable_list] > +} > + > # > # gdb_load_cmd -- load a file into the debugger. > # ARGS - additional args to load command. > > base-commit: 7320840f1998547b4428c58d1b39ca41febad83a