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=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,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 3AFD2C433ED for ; Thu, 1 Apr 2021 22:14:33 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id C255A60724 for ; Thu, 1 Apr 2021 22:14:32 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C255A60724 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 3588C6B011D; Thu, 1 Apr 2021 18:14:31 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 26E146B011F; Thu, 1 Apr 2021 18:14:31 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 01FFB6B0120; Thu, 1 Apr 2021 18:14:30 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0076.hostedemail.com [216.40.44.76]) by kanga.kvack.org (Postfix) with ESMTP id C7B906B011D for ; Thu, 1 Apr 2021 18:14:30 -0400 (EDT) Received: from smtpin02.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 50B99EFFF for ; Thu, 1 Apr 2021 22:14:29 +0000 (UTC) X-FDA: 77985203058.02.7931FDC Received: from smtprelay.hostedemail.com (smtprelay0229.hostedemail.com [216.40.44.229]) by imf10.hostedemail.com (Postfix) with ESMTP id A2C3F40002C2 for ; Thu, 1 Apr 2021 22:14:27 +0000 (UTC) Received: from forelay.hostedemail.com (clb03-v110.bra.tucows.net [216.40.38.60]) by smtprelay02.hostedemail.com (Postfix) with ESMTP id 6553FF02F for ; Thu, 1 Apr 2021 22:14:28 +0000 (UTC) Received: from smtpin21.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 4BDE41832884C for ; Thu, 1 Apr 2021 22:14:24 +0000 (UTC) X-FDA: 77985202848.21.45EC9FC Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by imf14.hostedemail.com (Postfix) with ESMTP id BFA0BC0001FA for ; Thu, 1 Apr 2021 22:14:21 +0000 (UTC) IronPort-SDR: uMUBnpmKLPAeak07hKMp/ItKjxXi9NiZjTud8TkRrbY/5JSFeV4LPTaSJ9jWQxE48S7XkIyNVQ HXy9m0dMVhwA== X-IronPort-AV: E=McAfee;i="6000,8403,9941"; a="256322574" X-IronPort-AV: E=Sophos;i="5.81,296,1610438400"; d="scan'208";a="256322574" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Apr 2021 15:14:22 -0700 IronPort-SDR: LifuTxKaBv1L2f+5d2yrq0QuNEtEJoPxnih+pxcKNyEmbo47tK0KEKM1hFgeQAhbXfD48RSyuY vOZvm0dJaD9A== X-IronPort-AV: E=Sophos;i="5.81,296,1610438400"; d="scan'208";a="394700345" Received: from yyu32-desk.sc.intel.com ([143.183.136.146]) by orsmga002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Apr 2021 15:14:22 -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 , Pengfei Xu , Haitao Huang Cc: Yu-cheng Yu Subject: [PATCH v24 5/9] x86/cet/ibt: Update arch_prctl functions for Indirect Branch Tracking Date: Thu, 1 Apr 2021 15:13:59 -0700 Message-Id: <20210401221403.32253-6-yu-cheng.yu@intel.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20210401221403.32253-1-yu-cheng.yu@intel.com> References: <20210401221403.32253-1-yu-cheng.yu@intel.com> MIME-Version: 1.0 Received-SPF: none (intel.com>: No applicable sender policy available) receiver=imf14; identity=mailfrom; envelope-from=""; helo=mga07.intel.com; client-ip=134.134.136.100 X-HE-DKIM-Result: none/none X-HE-Tag: 1617315261-185029 Content-Transfer-Encoding: quoted-printable X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: A2C3F40002C2 X-Stat-Signature: tbsasuxwfekxd9sposi75b1r4qh9qgdf Received-SPF: none (intel.com>: No applicable sender policy available) receiver=imf10; identity=mailfrom; envelope-from=""; helo=smtprelay.hostedemail.com; client-ip=216.40.44.229 X-HE-DKIM-Result: none/none X-HE-Tag: 1617315267-898229 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: From: "H.J. Lu" Update ARCH_X86_CET_STATUS and ARCH_X86_CET_DISABLE for Indirect Branch Tracking. Signed-off-by: H.J. Lu Signed-off-by: Yu-cheng Yu Reviewed-by: Kees Cook --- v24: - Update for function name changes introduced from splitting shadow stack= and ibt. arch/x86/kernel/cet_prctl.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/x86/kernel/cet_prctl.c b/arch/x86/kernel/cet_prctl.c index 5f0054177d2a..ae31741d829a 100644 --- a/arch/x86/kernel/cet_prctl.c +++ b/arch/x86/kernel/cet_prctl.c @@ -22,6 +22,9 @@ static int cet_copy_status_to_user(struct cet_status *c= et, u64 __user *ubuf) buf[2] =3D cet->shstk_size; } =20 + if (cet->ibt_enabled) + buf[0] |=3D GNU_PROPERTY_X86_FEATURE_1_IBT; + return copy_to_user(ubuf, buf, sizeof(buf)); } =20 @@ -46,6 +49,8 @@ int prctl_cet(int option, u64 arg2) return -EINVAL; if (arg2 & GNU_PROPERTY_X86_FEATURE_1_SHSTK) shstk_disable(); + if (arg2 & GNU_PROPERTY_X86_FEATURE_1_IBT) + ibt_disable(); return 0; =20 case ARCH_X86_CET_LOCK: --=20 2.21.0