From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by sourceware.org (Postfix) with ESMTPS id 5A7EA3858D1E for ; Tue, 3 Jan 2023 15:41:31 +0000 (GMT) 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-out2.suse.de (Postfix) with ESMTPS id 8F2FD67BFC for ; Tue, 3 Jan 2023 15:41:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1672760490; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=Q3w1If75VkHNInY8eyM0+sv4/hNa2JDlRMKdZ3JcXpo=; b=lbe4WNQBxCPN9CCqHGsnUlUoiyrD5XfqXg+0qYHe43WARlLQadJEpk/+UVIKtd88cNVDAu Xjyz8ZRl8JHfR2/MR04aHiwxxcZ8J8F3tZvqcA0lTWHUdlmk/cJDKGwpgSlU/v1B4bU8Ok I40GBFtV3ZgpKxQJs9DJZlGPG+/MHNA= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1672760490; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=Q3w1If75VkHNInY8eyM0+sv4/hNa2JDlRMKdZ3JcXpo=; b=lYf55nbb+xOo9MDCguISC4UXG2eZuwMPm24n1ZZ/2JMjzphsipa/VCd3IsGoGkP94A1nwK X/ELWSwoynwVPADg== 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 7B0601390C for ; Tue, 3 Jan 2023 15:41:30 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id hVXoHKpMtGNYcgAAMHmgww (envelope-from ) for ; Tue, 03 Jan 2023 15:41:30 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [pushed] [gdb/testsuite] Add xfail in gdb.arch/i386-pkru.exp Date: Tue, 3 Jan 2023 16:41:30 +0100 Message-Id: <20230103154130.30879-1-tdevries@suse.de> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 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 a x86_64-linux machine with pkru register, I run into: ... (gdb) PASS: gdb.arch/i386-pkru.exp: set pkru value info register pkru^M pkru 0x12345678 305419896^M (gdb) FAIL: gdb.arch/i386-pkru.exp: read value after setting value ... This is a regression due to kernel commit e84ba47e313d ("x86/fpu: Hook up PKRU onto ptrace()"). This is fixed by recent kernel commit 4a804c4f8356 ("x86/fpu: Allow PKRU to be (once again) written by ptrace."). The regression occurs for kernel versions v5.14-rc1 (the first tag containing the regression) up to but excluding v6.2-rc1 (the first tag containing the fix). Fix this by adding an xfail for the appropriate kernel versions. Tested on x86_64-linux. PR testsuite/29790 Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=29790 --- gdb/testsuite/gdb.arch/i386-pkru.exp | 45 +++++++++++++++++++++++--- gdb/testsuite/lib/gdb-utils.exp | 47 ++++++++++++++++++++++++++++ 2 files changed, 88 insertions(+), 4 deletions(-) diff --git a/gdb/testsuite/gdb.arch/i386-pkru.exp b/gdb/testsuite/gdb.arch/i386-pkru.exp index f5d74380a61..5d2b1a24a15 100644 --- a/gdb/testsuite/gdb.arch/i386-pkru.exp +++ b/gdb/testsuite/gdb.arch/i386-pkru.exp @@ -58,6 +58,26 @@ if { !$supports_pkru } { return } +# Linux kernel versions 5.14.0 to 6.1.x contain a regression related to writing +# the PKRU using ptrace, see commit 4a804c4f8356 ("x86/fpu: Allow PKRU to be +# (once again) written by ptrace."). +set have_xfail 0 +if { [istarget *-*-linux*] } { + set res [remote_exec target "uname -r"] + set status [lindex $res 0] + set output [lindex $res 1] + + set re ^($decimal)\\.($decimal)\\.($decimal) + if { $status == 0 + && [regexp $re $output dummy v1 v2 v3] == 1 } { + set v [list $v1 $v2 $v3] + set have_xfail \ + [expr \ + [version_compare [list 5 14 0] <= $v] \ + && [version_compare $v < [list 6 2 0]]] + } +} + # Test pkru register at startup gdb_test "print /x \$pkru" "= $default_pkru_re" "pkru register" @@ -65,11 +85,28 @@ gdb_test "print /x \$pkru" "= $default_pkru_re" "pkru register" gdb_breakpoint [ gdb_get_line_number "break here 1" ] gdb_continue_to_breakpoint "break here 1" ".*break here 1.*" -gdb_test "info register pkru" ".*pkru.*0x12345678.*" "read pkru register" -gdb_test "print /x \$pkru = 0x44444444" "= 0x44444444" "set pkru value" -gdb_test "info register pkru" ".*pkru.*0x44444444.*" "read value after setting value" +set val1 0x12345678 +gdb_test "info register pkru" ".*pkru.*$val1.*" "read pkru register" + +set val2 0x44444444 +gdb_test "print /x \$pkru = $val2" "= $val2" "set pkru value" + +set xval $val2 +gdb_test_multiple "info register pkru" "read value after setting value" { + -re -wrap ".*pkru.*$val2.*" { + pass $gdb_test_name + } + -re -wrap ".*pkru.*$val1.*" { + if { $have_xfail } { + xfail $gdb_test_name + } else { + fail $gdb_test_name + } + set xval $val1 + } +} gdb_breakpoint [ gdb_get_line_number "break here 2" ] gdb_continue_to_breakpoint "break here 2" ".*break here 2.*" -gdb_test "print /x rd_value" "= 0x44444444" "variable after reading pkru" +gdb_test "print /x rd_value" "= $xval" "variable after reading pkru" diff --git a/gdb/testsuite/lib/gdb-utils.exp b/gdb/testsuite/lib/gdb-utils.exp index 78724f8b622..fb5c953a6c4 100644 --- a/gdb/testsuite/lib/gdb-utils.exp +++ b/gdb/testsuite/lib/gdb-utils.exp @@ -100,3 +100,50 @@ proc gdb_get_bp_addr { num } { } return "" } + +# Compare the version numbers in L1 to those in L2 using OP, and return +# 1 if the comparison is true. + +proc version_compare { l1 op l2 } { + set len [llength $l1] + if { $len != [llength $l2] } { + error "l2 not the same length as l1" + } + + switch -exact $op { + "==" - + "<" {} + "<=" { return [expr [version_compare $l1 < $l2] \ + || [version_compare $l1 == $l2]]} + default { error "unsupported op: $op" } + } + + # Handle ops < and ==. + set idx 0 + foreach v1 $l1 { + set v2 [lindex $l2 $idx] + incr idx + set last [expr $len == $idx] + + set cmp [expr $v1 $op $v2] + if { $op == "==" } { + if { $cmp } { + continue + } else { + return 0 + } + } else { + # $op == "<". + if { $cmp } { + return 1 + } else { + if { !$last && $v1 == $v2 } { + continue + } + return 0 + } + } + } + + return 1 +} base-commit: 5aea5eca6c873334deb41f996dec255786a6f84d -- 2.35.3