fc35c71aea
* 0183-syscall-do-not-use-uninitialized-parts-of-struct-ptr.patch: New file. * 0184-startup_tcb-add-a-comment.patch: Likewise. * 0185-tests-add-another-test-of-restart_syscall-decoding.patch: Likewise. * 0186-tests-workaround-net-yy-inet-for-new-kernels.patch: Likewise. * 0187-tests-avoid-linkat-secontext_mismatch-failures-on-se.patch: Likewise. * 0188-linux-s390-get_scno.c-use-NT_S390_SYSTEM_CALL-if-gpr.patch: Likewise. * 0191-prctl-improve-PR_SVE_-SG-ET_VL-decoding.patch: Likewise. * 0192-tests-prctl-sve-fix-prctl-PR_SVE_GET_VL-return-expec.patch: Likewise. * strace.spec (Patch183, Patch184, Patch185, Patch186, Patch187, Patch188, Patch191, Patch192): New patches. (%prep): Apply them. (%changelog): Add a record. Resolves: RHEL-8570 Signed-off-by: Eugene Syromiatnikov <esyr@redhat.com>
90 lines
2.5 KiB
Diff
90 lines
2.5 KiB
Diff
From 1663bf8582b7187d04225105a62bbab9ebbb8109 Mon Sep 17 00:00:00 2001
|
|
From: Eugene Syromyatnikov <evgsyr@gmail.com>
|
|
Date: Thu, 4 Aug 2022 18:46:41 +0200
|
|
Subject: [PATCH] prctl: improve PR_SVE_[SG]ET_VL decoding
|
|
|
|
* src/prctl.c (sprint_sve_val): Add aux parameter, handle printing based
|
|
on it.
|
|
(SYS_FUNC(prctl)): <case PR_SVE_SET_VL>: Pass false as aux
|
|
to sprint_sve_val.
|
|
(SYS_FUNC(prctl)): <case PR_SVE_GET_VL>: Pass true as aux
|
|
to sprint_sve_val; return RVAL_HEX flag.
|
|
* NEWS: Mention it.
|
|
---
|
|
NEWS | 1 +
|
|
src/prctl.c | 38 +++++++++++++++++++++++++++++---------
|
|
2 files changed, 30 insertions(+), 9 deletions(-)
|
|
|
|
diff --git a/src/prctl.c b/src/prctl.c
|
|
index f3bc1a34821d..2611baa5588d 100644
|
|
--- a/src/prctl.c
|
|
+++ b/src/prctl.c
|
|
@@ -64,17 +64,37 @@ print_prctl_args(struct tcb *tcp, const unsigned int first)
|
|
}
|
|
|
|
static char *
|
|
-sprint_sve_val(kernel_ulong_t arg)
|
|
+sprint_sve_val(kernel_ulong_t arg, bool aux)
|
|
{
|
|
- static char out[sizeof("PR_SVE_SET_VL_ONEXEC|PR_SVE_VL_INHERIT|0x") +
|
|
- sizeof(kernel_ulong_t) * 2];
|
|
+ static char out[sizeof("0x /* PR_SVE_SET_VL_ONEXEC|PR_SVE_VL_INHERIT"
|
|
+ "|0x|0x */") + sizeof(kernel_ulong_t) * 2 * 3];
|
|
+
|
|
+ if (xlat_verbose(xlat_verbosity) == XLAT_STYLE_RAW) {
|
|
+ if (aux)
|
|
+ return NULL;
|
|
+
|
|
+ xsprintf(out, "%#" PRI_klx, arg);
|
|
+
|
|
+ return out;
|
|
+ }
|
|
|
|
kernel_ulong_t vl = arg & PR_SVE_VL_LEN_MASK;
|
|
kernel_ulong_t flags = arg & ~PR_SVE_VL_LEN_MASK;
|
|
- const char *flags_str = sprintflags("", pr_sve_vl_flags, flags);
|
|
|
|
- xsprintf(out, "%s%s%#" PRI_klx,
|
|
- flags_str ?: "", flags_str ? "|" : "", vl);
|
|
+ if (!flags && aux)
|
|
+ return NULL;
|
|
+
|
|
+ const char *flags_str = sprintflags_ex("", pr_sve_vl_flags, flags, '\0',
|
|
+ XLAT_STYLE_ABBREV);
|
|
+
|
|
+ if (!aux && flags && xlat_verbose(xlat_verbosity) == XLAT_STYLE_VERBOSE)
|
|
+ {
|
|
+ xsprintf(out, "%#" PRI_klx " /* %s%s%#" PRI_klx " */",
|
|
+ arg, flags_str ?: "", flags_str ? "|" : "", vl);
|
|
+ } else {
|
|
+ xsprintf(out, "%s%s%#" PRI_klx,
|
|
+ flags_str ?: "", flags_str ? "|" : "", vl);
|
|
+ }
|
|
|
|
return out;
|
|
}
|
|
@@ -229,7 +249,7 @@ SYS_FUNC(prctl)
|
|
case PR_SVE_SET_VL:
|
|
if (entering(tcp)) {
|
|
tprint_arg_next();
|
|
- tprints(sprint_sve_val(arg2));
|
|
+ tprints(sprint_sve_val(arg2, false));
|
|
return 0;
|
|
}
|
|
ATTRIBUTE_FALLTHROUGH;
|
|
@@ -240,9 +260,9 @@ SYS_FUNC(prctl)
|
|
if (syserror(tcp) || tcp->u_rval == 0)
|
|
return 0;
|
|
|
|
- tcp->auxstr = sprint_sve_val(tcp->u_rval);
|
|
+ tcp->auxstr = sprint_sve_val(tcp->u_rval, true);
|
|
|
|
- return RVAL_STR;
|
|
+ return RVAL_HEX | RVAL_STR;
|
|
|
|
case PR_GET_SPECULATION_CTRL:
|
|
if (entering(tcp)) {
|
|
--
|
|
2.28.0
|
|
|