public inbox for gdb-cvs@sourceware.org help / color / mirror / Atom feed
From: Tom de Vries <vries@sourceware.org> To: gdb-cvs@sourceware.org Subject: [binutils-gdb] [gdb/testsuite] Add xfail in gdb.arch/i386-pkru.exp Date: Tue, 3 Jan 2023 15:41:09 +0000 (GMT) [thread overview] Message-ID: <20230103154109.861A33858D1E@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=b46632ca16021962c33c2ea32b8104fd258ef0af commit b46632ca16021962c33c2ea32b8104fd258ef0af Author: Tom de Vries <tdevries@suse.de> Date: Tue Jan 3 16:41:05 2023 +0100 [gdb/testsuite] Add xfail in gdb.arch/i386-pkru.exp 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 Diff: --- 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 +}
reply other threads:[~2023-01-03 15:41 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20230103154109.861A33858D1E@sourceware.org \ --to=vries@sourceware.org \ --cc=gdb-cvs@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).