Skip to content

Commit

Permalink
selftests/x86/sigreturn: Do minor cleanups
Browse files Browse the repository at this point in the history
We have short names for the requested and resulting register values.
Use them instead of spelling out the whole register entry for each
case.

Signed-off-by: Andy Lutomirski <luto@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/bb3bc1f923a2f6fe7912d22a1068fe29d6033d38.1530076529.git.luto@kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
  • Loading branch information
amluto authored and Ingo Molnar committed Jun 27, 2018
1 parent ec34802 commit e8a445d
Showing 1 changed file with 7 additions and 6 deletions.
13 changes: 7 additions & 6 deletions tools/testing/selftests/x86/sigreturn.c
Original file line number Diff line number Diff line change
Expand Up @@ -610,6 +610,7 @@ static int test_valid_sigreturn(int cs_bits, bool use_16bit_ss, int force_ss)
*/
for (int i = 0; i < NGREG; i++) {
greg_t req = requested_regs[i], res = resulting_regs[i];

if (i == REG_TRAPNO || i == REG_IP)
continue; /* don't care */

Expand Down Expand Up @@ -673,18 +674,18 @@ static int test_valid_sigreturn(int cs_bits, bool use_16bit_ss, int force_ss)
#endif

/* Sanity check on the kernel */
if (i == REG_CX && requested_regs[i] != resulting_regs[i]) {
if (i == REG_CX && req != res) {
printf("[FAIL]\tCX (saved SP) mismatch: requested 0x%llx; got 0x%llx\n",
(unsigned long long)requested_regs[i],
(unsigned long long)resulting_regs[i]);
(unsigned long long)req,
(unsigned long long)res);
nerrs++;
continue;
}

if (requested_regs[i] != resulting_regs[i] && !ignore_reg) {
if (req != res && !ignore_reg) {
printf("[FAIL]\tReg %d mismatch: requested 0x%llx; got 0x%llx\n",
i, (unsigned long long)requested_regs[i],
(unsigned long long)resulting_regs[i]);
i, (unsigned long long)req,
(unsigned long long)res);
nerrs++;
}
}
Expand Down

0 comments on commit e8a445d

Please sign in to comment.