Received: by 2002:a05:6a10:6744:0:0:0:0 with SMTP id w4csp4531207pxu; Tue, 13 Oct 2020 00:04:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwCsn+BtPMhzu7v8RfC4E4G7PFXmpxysR0dkGTczpEgtRKwtJQcfFc020bT78JiPMPWADO9 X-Received: by 2002:a50:d7d3:: with SMTP id m19mr18222847edj.70.1602572650336; Tue, 13 Oct 2020 00:04:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1602572650; cv=none; d=google.com; s=arc-20160816; b=Aohci+79kvVFLOky46/pfO1fb2bh+QN8AR8EUtx4S1GV030f1gloS06EuiP2e/3wKQ W9sohYb+cu1Yyu3rBufd0EJ6MQhsvCY0RPRcCplPpYtdNBb2rBgerc3+9ZPpRUbVAtEj aPgtMQ9GybKJYx5QmNujlGEUDrY3j8FxipiG+dcoHcoUkb6vQpusNMtf0v5Ure0cjFvg ytkJ+aEgcQVHc6/Bcnzk6enrGRMPinFk0Y9uxOs3HEC1bYS+ZOmM/sbIIhqFj4ZF3ugP xtqii48iCY0nz82AY/v6Z5CQAmg3saGZj68po2v4RH1zncIa2JteVN3dXSan/LfJXX6q OzJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :ironport-sdr:ironport-sdr; bh=pwUAJveeyf405VKy7azMDjPiv/ubymogFQ350wEFMhk=; b=rMi0Pi16toKSjeY/DEGeT6gpwtdYT2BU+I9zByLgXSgNJ6f2FOrXo1lAyrIu2iCLxn E3UuXvlqDRC1rd3Ztt7/FD680VMf/pRQGRQbnkohQlOeJH2iUo+l8EaMr++0fixgRmHR cG2p/0m+q2K7ftYdX2Gvgu8YwJOXNEkpvVKxOCDFDVMbQ7dg7mUxERwjKbi1BYZvoQxt 6k1sbz494ZuiYlqKH959G0rPgLQDON0qlO1U5mQP8nKq1UqqelCY4XOHYBMDTR+P0NUX y2xH8CSvFgBN0uodztgVFbtRl9koriJB3K8R+pJJBKwS7ExVEruO4FH9AiiTK6W8Xlyb hk+Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id n23si9763282eje.334.2020.10.13.00.03.33; Tue, 13 Oct 2020 00:04:10 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390509AbgJLPp7 (ORCPT + 99 others); Mon, 12 Oct 2020 11:45:59 -0400 Received: from mga07.intel.com ([134.134.136.100]:28363 "EHLO mga07.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389679AbgJLPpy (ORCPT ); Mon, 12 Oct 2020 11:45:54 -0400 IronPort-SDR: MlsyVr1OnNJesxjWWNN6cOaEy0W0rLhZtKyVCDYTyY/5UlkJkM1IjZuTTWzbcjPfQxavxtRMjh FaspqaiIamxg== X-IronPort-AV: E=McAfee;i="6000,8403,9772"; a="229939280" X-IronPort-AV: E=Sophos;i="5.77,367,1596524400"; d="scan'208";a="229939280" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Oct 2020 08:45:53 -0700 IronPort-SDR: dT8YBHUy5MplZWJv2T+ldPrELLooBThUCJzDR2lmDsPOfDvwkNvbhOK68/M3QT5ZvXoEE8vOZ2 6At1tdjY3CWA== X-IronPort-AV: E=Sophos;i="5.77,367,1596524400"; d="scan'208";a="530012645" Received: from yyu32-desk.sc.intel.com ([143.183.136.146]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Oct 2020 08:45:52 -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 Cc: Yu-cheng Yu Subject: [PATCH v14 5/7] x86/cet/ibt: Update arch_prctl functions for Indirect Branch Tracking Date: Mon, 12 Oct 2020 08:45:28 -0700 Message-Id: <20201012154530.28382-6-yu-cheng.yu@intel.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20201012154530.28382-1-yu-cheng.yu@intel.com> References: <20201012154530.28382-1-yu-cheng.yu@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- arch/x86/kernel/cet_prctl.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/arch/x86/kernel/cet_prctl.c b/arch/x86/kernel/cet_prctl.c index bd5ad11763e4..0af1ec5d028f 100644 --- a/arch/x86/kernel/cet_prctl.c +++ b/arch/x86/kernel/cet_prctl.c @@ -22,6 +22,9 @@ static int copy_status_to_user(struct cet_status *cet, u64 arg2) buf[2] = (u64)cet->shstk_size; } + if (cet->ibt_enabled) + buf[0] |= GNU_PROPERTY_X86_FEATURE_1_IBT; + return copy_to_user((u64 __user *)arg2, buf, sizeof(buf)); } @@ -42,7 +45,8 @@ int prctl_cet(int option, u64 arg2) if (option == ARCH_X86_CET_STATUS) return copy_status_to_user(cet, arg2); - if (!static_cpu_has(X86_FEATURE_SHSTK)) + if (!static_cpu_has(X86_FEATURE_SHSTK) && + !static_cpu_has(X86_FEATURE_IBT)) return -EOPNOTSUPP; switch (option) { @@ -56,6 +60,8 @@ int prctl_cet(int option, u64 arg2) return -EINVAL; if (features & GNU_PROPERTY_X86_FEATURE_1_SHSTK) cet_disable_shstk(); + if (features & GNU_PROPERTY_X86_FEATURE_1_IBT) + cet_disable_ibt(); return 0; case ARCH_X86_CET_LOCK: -- 2.21.0