From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D8A3AC433E1 for ; Thu, 21 May 2020 21:17:47 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 9CC40207F9 for ; Thu, 21 May 2020 21:17:47 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9CC40207F9 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 85E818000E; Thu, 21 May 2020 17:17:43 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 74A2F8000C; Thu, 21 May 2020 17:17:43 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 45F308000E; Thu, 21 May 2020 17:17:43 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0031.hostedemail.com [216.40.44.31]) by kanga.kvack.org (Postfix) with ESMTP id 285888000C for ; Thu, 21 May 2020 17:17:43 -0400 (EDT) Received: from smtpin11.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id D9E1F180AD820 for ; Thu, 21 May 2020 21:17:42 +0000 (UTC) X-FDA: 76841987964.11.flag68_7d73304b68b21 X-HE-Tag: flag68_7d73304b68b21 X-Filterd-Recvd-Size: 3552 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by imf25.hostedemail.com (Postfix) with ESMTP for ; Thu, 21 May 2020 21:17:41 +0000 (UTC) IronPort-SDR: YC2NqfTCVpm8xi/1HvBKaVyq9d6ap1RfRsXTh9rnfQhfW2VEvil2Tr4M5FmuFJX8Usye4HUS+5 PoxrTTu3oEdw== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 May 2020 14:17:40 -0700 IronPort-SDR: /r9zDoD7SFGxhHoYqXSzLpcMKQdLR//ClQAx8/S2eThDAud+UvEpi8XCme+YutCu00NsB6QJjr mRmRSBwuq7iA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,419,1583222400"; d="scan'208";a="440623140" Received: from yyu32-desk.sc.intel.com ([143.183.136.146]) by orsmga005.jf.intel.com with ESMTP; 21 May 2020 14:17:39 -0700 From: Yu-cheng Yu To: x86@kernel.org, "H. Peter Anvin" , Thomas Gleixner , Ingo Molnar , linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, linux-mm@kvack.org, linux-arch@vger.kernel.org, linux-api@vger.kernel.org, Arnd Bergmann , Andy Lutomirski , Balbir Singh , Borislav Petkov , Cyrill Gorcunov , Dave Hansen , Eugene Syromiatnikov , Florian Weimer , "H.J. Lu" , Jann Horn , Jonathan Corbet , Kees Cook , Mike Kravetz , Nadav Amit , Oleg Nesterov , Pavel Machek , Peter Zijlstra , Randy Dunlap , "Ravi V. Shankar" , Vedvyas Shanbhogue , Dave Martin , Weijiang Yang Cc: Yu-cheng Yu Subject: [RFC PATCH 4/5] selftest/x86: Fix sysret_rip with ENDBR Date: Thu, 21 May 2020 14:17:19 -0700 Message-Id: <20200521211720.20236-5-yu-cheng.yu@intel.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20200521211720.20236-1-yu-cheng.yu@intel.com> References: <20200521211720.20236-1-yu-cheng.yu@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Insert endbr64 to assembly code of sysret_rip. Signed-off-by: Yu-cheng Yu --- tools/testing/selftests/x86/sysret_rip.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/x86/sysret_rip.c b/tools/testing/sel= ftests/x86/sysret_rip.c index 84d74be1d902..027682a0f377 100644 --- a/tools/testing/selftests/x86/sysret_rip.c +++ b/tools/testing/selftests/x86/sysret_rip.c @@ -27,8 +27,9 @@ asm ( ".pushsection \".text\", \"ax\"\n\t" ".balign 4096\n\t" "test_page: .globl test_page\n\t" - ".fill 4094,1,0xcc\n\t" + ".fill 4090,1,0xcc\n\t" "test_syscall_insn:\n\t" + "endbr64\n\t" "syscall\n\t" ".ifne . - test_page - 4096\n\t" ".error \"test page is not one page long\"\n\t" @@ -151,7 +152,7 @@ static void test_syscall_fallthrough_to(unsigned long= ip) =20 if (sigsetjmp(jmpbuf, 1) =3D=3D 0) { asm volatile ("call *%[syscall_insn]" :: "a" (SYS_getpid), - [syscall_insn] "rm" (ip - 2)); + [syscall_insn] "rm" (ip - 6)); errx(1, "[FAIL]\tSyscall trampoline returned"); } =20 --=20 2.21.0