From patchwork Fri Sep 21 15:05:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yu-cheng Yu X-Patchwork-Id: 10610303 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D1B0914BD for ; Fri, 21 Sep 2018 15:11:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C30A22E454 for ; Fri, 21 Sep 2018 15:11:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BF8D42E543; Fri, 21 Sep 2018 15:11:23 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 418CA2E454 for ; Fri, 21 Sep 2018 15:11:23 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5E7AB8E0027; Fri, 21 Sep 2018 11:10:31 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 53ED08E0020; Fri, 21 Sep 2018 11:10:31 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 405F18E0028; Fri, 21 Sep 2018 11:10:31 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf1-f199.google.com (mail-pf1-f199.google.com [209.85.210.199]) by kanga.kvack.org (Postfix) with ESMTP id ED6908E0023 for ; Fri, 21 Sep 2018 11:10:30 -0400 (EDT) Received: by mail-pf1-f199.google.com with SMTP id w19-v6so6704548pfa.14 for ; Fri, 21 Sep 2018 08:10:30 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:from:to:cc :subject:date:message-id:in-reply-to:references; bh=TK8EDeMGPZ2hWiuLL/i5vI4+eG5g0kdJ6UAxh9hkMGQ=; b=OHGM4ShlRT29Xctea56RXhAkjy3lof3MSt7F5Nim1tMjemtVyxvuU9Reudn9lFD4pK X8+LBeSIoSbn6bvDEsFFZPwrcWexHLVNTOVaqYSTwH17Ib+NiYx67Su5uCUYiuQ6YeP5 gpmvLmqIA4CfHHc71YYONZd+dAA1/DW2SMVDwnm9MbDUqFBi3R5qd5fk4fYBA3ShZ7zU zeg2U3I5oK8ZSWK3vQNHtzahaaeH06Qr0E/Iq5P/Vhg0CpWwo7POOpov1pMKFw5E8zqh DzBCRPYG4jz4/CSoricBOfLjT7PfTvuEl7Jk7n2UcchZZ8hUOrPCD5+Y2sDRKRZOlWVf J6fQ== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of yu-cheng.yu@intel.com designates 192.55.52.115 as permitted sender) smtp.mailfrom=yu-cheng.yu@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com X-Gm-Message-State: APzg51BH4/tIqil6QRCLAq3vVSje9S0DWvzhOiHOgxEQJaK6Rk7vx4FE vOTCCqWVMA4M9zYvbCit43YZWWVs3EriBW9onzC6AKmEvFU5mFX0N3A3/roA9EAAz7W5mvmtEY0 /q4Kcj/35wiiKPWZxI+ngtoMfSPyN3ssbjiTPv5fcVAAil30udVjSth+yO7oCiMTY1g== X-Received: by 2002:a63:991a:: with SMTP id d26-v6mr42073083pge.159.1537542630664; Fri, 21 Sep 2018 08:10:30 -0700 (PDT) X-Google-Smtp-Source: ANB0Vdbfj0+8OvFydxa/W8Mq2NXY6hGLnu/aWeQrm3/tT/j/3vzksxgMfQs3KuHCFkD9u8xaw35Q X-Received: by 2002:a63:991a:: with SMTP id d26-v6mr42073020pge.159.1537542629758; Fri, 21 Sep 2018 08:10:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537542629; cv=none; d=google.com; s=arc-20160816; b=k4oeCcG6VCKGwnCQfl0SC3meh55y5xikOxaqq9XZ4ZPAO+efTqDV4q59iSCCCTAv+1 YzHUp3NxNQNq/1/T6f4mW4k3MHPYCDpkF0mu5azamkItLKIBnobt2NEpxeGMRSGQuXeQ qP+vQ3ZN31BnEHQ3HqQzwAHTt+ixApm6OXMR1Ofuikove0qNMnt7pEtnYhRM/6avkBdr W0NOiEQhb456QwuFF2QWOZAZEs//Z3Ut2PxHsMhouS+OaT+/MI2OUpnhZqgNsYOHI9qh 1YcEZlfTut9a6hInVuKixn2m6Tv4dhELxl7hdJhjEprK3uESorKeyOQU/PrJR+JxiHhE C3DA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from; bh=TK8EDeMGPZ2hWiuLL/i5vI4+eG5g0kdJ6UAxh9hkMGQ=; b=R6fPAt6mDLKD8/zYVFoCYBs7QTikDd7L4FGAG0XQcOG0zWfQ8x5FIcKhu2cf+ZoZg5 Vsn9kTxWMi3A7auMcCvlTTMcOkxVP7JmDzaAlB6uYldONvLpYAUTyGcUN7b8MaIMNJCw 8phrzRma5bI3qDlaxsG3LR3aUAD3cyFNcGfkSUsLgMwxSBd9lpg4kk50xU8eubY/aJ8w MkWArLQ0ckHzFyl4E8tU6CExLHK9+mMxak6fqTxjchPybz9iCpmmROXCrPjmqRX77cay 0bwvV5kG8lODy5X1enHR4rz/U2p8rR6awYA07x1kTGgukC562dGOaXFfmtGvH0zXL5Bm DzAQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of yu-cheng.yu@intel.com designates 192.55.52.115 as permitted sender) smtp.mailfrom=yu-cheng.yu@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from mga14.intel.com (mga14.intel.com. [192.55.52.115]) by mx.google.com with ESMTPS id d11-v6si29460120pln.471.2018.09.21.08.10.29 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 21 Sep 2018 08:10:29 -0700 (PDT) Received-SPF: pass (google.com: domain of yu-cheng.yu@intel.com designates 192.55.52.115 as permitted sender) client-ip=192.55.52.115; Authentication-Results: mx.google.com; spf=pass (google.com: domain of yu-cheng.yu@intel.com designates 192.55.52.115 as permitted sender) smtp.mailfrom=yu-cheng.yu@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 21 Sep 2018 08:10:28 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.54,285,1534834800"; d="scan'208";a="88187982" Received: from 2b52.sc.intel.com ([143.183.136.51]) by fmsmga002.fm.intel.com with ESMTP; 21 Sep 2018 08:10:28 -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 , Cyrill Gorcunov , Dave Hansen , 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 Cc: Yu-cheng Yu Subject: [RFC PATCH v4 7/9] x86/cet/ibt: Add ENDBR to op-code-map Date: Fri, 21 Sep 2018 08:05:51 -0700 Message-Id: <20180921150553.21016-8-yu-cheng.yu@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180921150553.21016-1-yu-cheng.yu@intel.com> References: <20180921150553.21016-1-yu-cheng.yu@intel.com> 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: X-Virus-Scanned: ClamAV using ClamSMTP Add control transfer terminating instructions: ENDBR64/ENDBR32: Mark a valid 64/32-bit control transfer endpoint. Signed-off-by: Yu-cheng Yu --- arch/x86/lib/x86-opcode-map.txt | 13 +++++++++++-- tools/objtool/arch/x86/lib/x86-opcode-map.txt | 13 +++++++++++-- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/arch/x86/lib/x86-opcode-map.txt b/arch/x86/lib/x86-opcode-map.txt index c5e825d44766..fbc53481bc59 100644 --- a/arch/x86/lib/x86-opcode-map.txt +++ b/arch/x86/lib/x86-opcode-map.txt @@ -620,7 +620,16 @@ ea: SAVEPREVSSP (f3) # Skip 0xeb-0xff EndTable -Table: 3-byte opcode 2 (0x0f 0x38) +Table: 3-byte opcode 2 (0x0f 0x1e) +Referrer: +AVXcode: +# Skip 0x00-0xf9 +fa: ENDBR64 (f3) +fb: ENDBR32 (f3) +#skip 0xfc-0xff +EndTable + +Table: 3-byte opcode 3 (0x0f 0x38) Referrer: 3-byte escape 1 AVXcode: 2 # 0x0f 0x38 0x00-0x0f @@ -804,7 +813,7 @@ f6: ADCX Gy,Ey (66) | ADOX Gy,Ey (F3) | MULX By,Gy,rDX,Ey (F2),(v) | WRSS Pq,Qq f7: BEXTR Gy,Ey,By (v) | SHLX Gy,Ey,By (66),(v) | SARX Gy,Ey,By (F3),(v) | SHRX Gy,Ey,By (F2),(v) EndTable -Table: 3-byte opcode 3 (0x0f 0x3a) +Table: 3-byte opcode 4 (0x0f 0x3a) Referrer: 3-byte escape 2 AVXcode: 3 # 0x0f 0x3a 0x00-0xff diff --git a/tools/objtool/arch/x86/lib/x86-opcode-map.txt b/tools/objtool/arch/x86/lib/x86-opcode-map.txt index c5e825d44766..fbc53481bc59 100644 --- a/tools/objtool/arch/x86/lib/x86-opcode-map.txt +++ b/tools/objtool/arch/x86/lib/x86-opcode-map.txt @@ -620,7 +620,16 @@ ea: SAVEPREVSSP (f3) # Skip 0xeb-0xff EndTable -Table: 3-byte opcode 2 (0x0f 0x38) +Table: 3-byte opcode 2 (0x0f 0x1e) +Referrer: +AVXcode: +# Skip 0x00-0xf9 +fa: ENDBR64 (f3) +fb: ENDBR32 (f3) +#skip 0xfc-0xff +EndTable + +Table: 3-byte opcode 3 (0x0f 0x38) Referrer: 3-byte escape 1 AVXcode: 2 # 0x0f 0x38 0x00-0x0f @@ -804,7 +813,7 @@ f6: ADCX Gy,Ey (66) | ADOX Gy,Ey (F3) | MULX By,Gy,rDX,Ey (F2),(v) | WRSS Pq,Qq f7: BEXTR Gy,Ey,By (v) | SHLX Gy,Ey,By (66),(v) | SARX Gy,Ey,By (F3),(v) | SHRX Gy,Ey,By (F2),(v) EndTable -Table: 3-byte opcode 3 (0x0f 0x3a) +Table: 3-byte opcode 4 (0x0f 0x3a) Referrer: 3-byte escape 2 AVXcode: 3 # 0x0f 0x3a 0x00-0xff