From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AH8x226UORklxwgneK4Yn1wW+VFyKsCgXNlf/B41u4VNgGouPbY/6Vcjrl1xFhjOaLAC1TiyhTnY ARC-Seal: i=1; a=rsa-sha256; t=1519218534; cv=none; d=google.com; s=arc-20160816; b=dCfQeeU/dBXF6SiXbYOlGNrus7uJo2ROAUrDObRvLsMM4/w35zexQWbDkDApuahwFY eYez1EqRMrAwnkiZM2D81drEOnWlxVkP4rYyCaqZfjZdE4+N51rEdbfv8d+G56vuxHko JV/XjgmzGA6st9U8Okb9x3bONhLyDaUgxEMZlDSmTZE3HJgPf+imRi/dZm6EphOIKCd8 HjpXz1bOaHvF0HquJVrpuWQhqKfu6vfprA7pxpSE/mRHr4GKqHRt8mrFCpXLWxRZNPR+ BQ80XguBnBHrJB4R6l6U6fl2oj76CQ1dX94kewVb67AQAE6yCR+LanyMSnpTZvBvpsWH nkXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=eFe0DU0BvPBY/zUF+MrwaFuNW/XjQy8UfNgP8iZv2Sk=; b=ddof1k757CM27ePQQ/drA0a50RKgmFa65rXirrEKfBl6EZOKGFT/2a22wyIF8WAZq+ GLpeqtIzIQeeKmSfiDyLeltgqmUcBWUhZLwttYdcL4vu5DdWEleZG0iQ6vKgE97DM8kG 51j6QlsWjAW7ZHAY9Vv2V5Hlek5Kn7crlYfleyVRzP3EtVCxLD/Fu3XSOQbwfTIeW96h 9mi32OiY0e+kC1k2wqSaueazcSZ8Hj3IElx4FtNZpq84vHbxROYcRnWhLiwap+5EeeoF YbNmIlzqgx7p8i+5ilH7kld14LyNOafzwhAFtTqM1GrIahUQAGLmVsYdiVp0a+cZFfYo fqug== ARC-Authentication-Results: i=1; mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.71.90 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org Authentication-Results: mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.71.90 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dominik Brodowski , Andy Lutomirski , Dmitry Safonov , Linus Torvalds , Peter Zijlstra , Thomas Gleixner , linux-kselftest@vger.kernel.org, shuah@kernel.org, Ingo Molnar Subject: [PATCH 4.15 074/163] selftests/x86: Do not rely on "int $0x80" in single_step_syscall.c Date: Wed, 21 Feb 2018 13:48:23 +0100 Message-Id: <20180221124534.553066850@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180221124529.931834518@linuxfoundation.org> References: <20180221124529.931834518@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-LABELS: =?utf-8?b?IlxcU2VudCI=?= X-GMAIL-THRID: =?utf-8?q?1593015325375300324?= X-GMAIL-MSGID: =?utf-8?q?1593016093554152154?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Dominik Brodowski commit 4105c69703cdeba76f384b901712c9397b04e9c2 upstream. On 64-bit builds, we should not rely on "int $0x80" working (it only does if CONFIG_IA32_EMULATION=y is enabled). To keep the "Set TF and check int80" test running on 64-bit installs with CONFIG_IA32_EMULATION=y enabled, build this test only if we can also build 32-bit binaries (which should be a good approximation for that). Signed-off-by: Dominik Brodowski Cc: Andy Lutomirski Cc: Dmitry Safonov Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: linux-kselftest@vger.kernel.org Cc: shuah@kernel.org Link: http://lkml.kernel.org/r/20180211111013.16888-5-linux@dominikbrodowski.net Signed-off-by: Ingo Molnar Signed-off-by: Greg Kroah-Hartman --- tools/testing/selftests/x86/Makefile | 2 ++ tools/testing/selftests/x86/single_step_syscall.c | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) --- a/tools/testing/selftests/x86/Makefile +++ b/tools/testing/selftests/x86/Makefile @@ -30,11 +30,13 @@ CAN_BUILD_X86_64 := $(shell ./check_cc.s ifeq ($(CAN_BUILD_I386),1) all: all_32 TEST_PROGS += $(BINARIES_32) +EXTRA_CFLAGS += -DCAN_BUILD_32 endif ifeq ($(CAN_BUILD_X86_64),1) all: all_64 TEST_PROGS += $(BINARIES_64) +EXTRA_CFLAGS += -DCAN_BUILD_64 endif all_32: $(BINARIES_32) --- a/tools/testing/selftests/x86/single_step_syscall.c +++ b/tools/testing/selftests/x86/single_step_syscall.c @@ -119,7 +119,9 @@ static void check_result(void) int main() { +#ifdef CAN_BUILD_32 int tmp; +#endif sethandler(SIGTRAP, sigtrap, 0); @@ -139,12 +141,13 @@ int main() : : "c" (post_nop) : "r11"); check_result(); #endif - +#ifdef CAN_BUILD_32 printf("[RUN]\tSet TF and check int80\n"); set_eflags(get_eflags() | X86_EFLAGS_TF); asm volatile ("int $0x80" : "=a" (tmp) : "a" (SYS_getpid) : INT80_CLOBBERS); check_result(); +#endif /* * This test is particularly interesting if fast syscalls use