| From foo@baz Wed Aug 22 09:42:09 CEST 2018 |
| From: Andy Lutomirski <luto@kernel.org> |
| Date: Tue, 26 Jun 2018 22:17:18 -0700 |
| Subject: selftests/x86/sigreturn: Do minor cleanups |
| |
| From: Andy Lutomirski <luto@kernel.org> |
| |
| [ Upstream commit e8a445dea219c32727016af14f847d2e8f7ebec8 ] |
| |
| 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> |
| Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| tools/testing/selftests/x86/sigreturn.c | 13 +++++++------ |
| 1 file changed, 7 insertions(+), 6 deletions(-) |
| |
| --- a/tools/testing/selftests/x86/sigreturn.c |
| +++ b/tools/testing/selftests/x86/sigreturn.c |
| @@ -610,6 +610,7 @@ static int test_valid_sigreturn(int cs_b |
| */ |
| 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 */ |
| |
| @@ -673,18 +674,18 @@ static int test_valid_sigreturn(int cs_b |
| #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++; |
| } |
| } |