From patchwork Mon Nov 19 21:49:29 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: 10689579 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 F12B713BB for ; Mon, 19 Nov 2018 21:55:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E314F2A583 for ; Mon, 19 Nov 2018 21:55:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D644B2A6EE; Mon, 19 Nov 2018 21:55:50 +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 698F42A583 for ; Mon, 19 Nov 2018 21:55:50 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4336F6B1CB6; Mon, 19 Nov 2018 16:55:02 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 3BB466B1CB7; Mon, 19 Nov 2018 16:55:02 -0500 (EST) 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 238B06B1CB8; Mon, 19 Nov 2018 16:55:02 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pg1-f199.google.com (mail-pg1-f199.google.com [209.85.215.199]) by kanga.kvack.org (Postfix) with ESMTP id B8BE26B1CB6 for ; Mon, 19 Nov 2018 16:55:01 -0500 (EST) Received: by mail-pg1-f199.google.com with SMTP id t26so4674344pgu.18 for ; Mon, 19 Nov 2018 13:55:01 -0800 (PST) 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=Jr5OEgZMFm1CVpCy6A4/sKFO9JSC7hHXqBtrAH6VUPw=; b=lGtEa0JZvIkHb5Vpybq/mbLwcCGc9GUwRNXZarU07FD0g94EjeXic9/xR02yv05jKe pg1CZa4B3P0+/6rLVqdOiPKPgNXAtEzOrlycEEZRhjwF92J5Rgq5/gEd67LwNAWoJiq+ mwdCLFL63bH8Qn+H6CyO5eng7K43wROMaSGZN9zhSJ0IIgMP9PVdEpqsHs5XvmO8eNj2 pvZMadnF19++BNTAmdubAI47vC0nvPU+PwgeHXxwytDanM4pn8UvCk6vjuFBqjY8On77 iZ02k/r/1w1sRMVYN/CyQPBdLQkzvU2Tf0+QEDT/rkq91xqIH/qczTPv1U4yzXsiYAgr L3LA== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of yu-cheng.yu@intel.com designates 192.55.52.93 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: AGRZ1gJdj0X1Vl8hrtW6MXhzr+2WKk7cxm65y07Sh2AC2ALmtITPXyGX CZ4hd6swgin7krRp7M7c3RmRWESANW7NVtMIWmUkK33g/Ts/9QlK7DHL7KkZUIGVnoPJvAcgL5y zwbzs0V66gCxvOUhKgZTT8ll52VrBmk1EHr/sKZXdcnfmaxD6PcraEhf+9ENvizG3ug== X-Received: by 2002:a62:d449:: with SMTP id u9-v6mr12874294pfl.116.1542664501424; Mon, 19 Nov 2018 13:55:01 -0800 (PST) X-Google-Smtp-Source: AJdET5eWiZpXcXcYeI8LjWCu5CK0WCK/z8cd/yBYZ3/iiVCrRZ3dq1xELfJj+ctmK7olf84KHZZ5 X-Received: by 2002:a62:d449:: with SMTP id u9-v6mr12874269pfl.116.1542664500709; Mon, 19 Nov 2018 13:55:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542664500; cv=none; d=google.com; s=arc-20160816; b=E24slrAUSDSoVWENNbFdmlu++WThzPRQZppFNdwjQDvXUm/F3lk93i+dfPORd8hjN6 aK1HOVGbgXYFFcOWOtuy3UC1tmdcUN+0k2vJEpdjvjiGweaA3OPArpbVUTcafbZNZWUc XzbSQGz3zY3YJxsuyvQZ0MDy8Wib2gqlHJrXh7EBoKGgI7JtFi4BwlV81o5fYo66wfYf 73TqFBFCFV7d7gX+aeVo9koolMG1n5zLHFyyRc0TvJpJnEY9FAKWxUGPUugWSLap9ZWK hy0Upcpi3QITBXGlZocSIttaB7uNdGEndRy/XGvVxiMaJ7Y78QvQXazHw8k2yGUOxbX0 Tlfw== 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=Jr5OEgZMFm1CVpCy6A4/sKFO9JSC7hHXqBtrAH6VUPw=; b=RHg1Yy/CC/cHkuSveDmfuji/2SkX9WrjFYNh9jb8iGXJZx5Qpd6VXdjUr8ZCqkMgB8 2cSNMbccMeBK+BFATAjfIqoRS3cXbNnsu23OnT7wDuCvK8bFrUfnlSWwRzN1WV9HrQDd NGJUMrecPB0JjKIyW2TSeYoCwHLPTAz0ltinlGB0iUVziVNT7L8Ew436ZV6AAITpvskL jZ6aFtCs8YDcVur+rbVAiwNI8L/YcDjrtnFD53KKliZ14j2g+qBctU5Fj/or5gfmLsPq t2+YIgSzOKlcRoH7iITx+EYTccHeZ0VVCOoF5FqwMJUbUE7MXbhA0TG6Ke4L+Y70J1XN +Kig== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of yu-cheng.yu@intel.com designates 192.55.52.93 as permitted sender) smtp.mailfrom=yu-cheng.yu@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from mga11.intel.com (mga11.intel.com. [192.55.52.93]) by mx.google.com with ESMTPS id s8si4586261plq.345.2018.11.19.13.55.00 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 19 Nov 2018 13:55:00 -0800 (PST) Received-SPF: pass (google.com: domain of yu-cheng.yu@intel.com designates 192.55.52.93 as permitted sender) client-ip=192.55.52.93; Authentication-Results: mx.google.com; spf=pass (google.com: domain of yu-cheng.yu@intel.com designates 192.55.52.93 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 orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 19 Nov 2018 13:55:00 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,254,1539673200"; d="scan'208";a="92423905" Received: from yyu32-desk1.sc.intel.com ([143.183.136.147]) by orsmga006.jf.intel.com with ESMTP; 19 Nov 2018 13:54:59 -0800 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 , 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 Cc: Yu-cheng Yu Subject: [RFC PATCH v6 06/11] x86/cet/ibt: Add arch_prctl functions for IBT Date: Mon, 19 Nov 2018 13:49:29 -0800 Message-Id: <20181119214934.6174-7-yu-cheng.yu@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181119214934.6174-1-yu-cheng.yu@intel.com> References: <20181119214934.6174-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 Update ARCH_X86_CET_STATUS and ARCH_X86_CET_DISABLE to include Indirect Branch Tracking features. Introduce: arch_prctl(ARCH_X86_CET_SET_LEGACY_BITMAP, unsigned long *addr) Enable the Indirect Branch Tracking legacy code bitmap. The parameter 'addr' is a pointer to a user buffer that has: *addr = IBT bitmap base address *(addr + 1) = IBT bitmap size Signed-off-by: H.J. Lu Signed-off-by: Yu-cheng Yu --- arch/x86/include/uapi/asm/prctl.h | 2 ++ arch/x86/kernel/cet_prctl.c | 21 +++++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/arch/x86/include/uapi/asm/prctl.h b/arch/x86/include/uapi/asm/prctl.h index d962f0ec9ccf..5eb9aeb5c662 100644 --- a/arch/x86/include/uapi/asm/prctl.h +++ b/arch/x86/include/uapi/asm/prctl.h @@ -18,5 +18,7 @@ #define ARCH_X86_CET_DISABLE 0x3002 #define ARCH_X86_CET_LOCK 0x3003 #define ARCH_X86_CET_ALLOC_SHSTK 0x3004 +#define ARCH_X86_CET_GET_LEGACY_BITMAP 0x3005 /* deprecated */ +#define ARCH_X86_CET_SET_LEGACY_BITMAP 0x3006 #endif /* _ASM_X86_PRCTL_H */ diff --git a/arch/x86/kernel/cet_prctl.c b/arch/x86/kernel/cet_prctl.c index 320dbb620d61..a752d73cb1f4 100644 --- a/arch/x86/kernel/cet_prctl.c +++ b/arch/x86/kernel/cet_prctl.c @@ -21,6 +21,8 @@ static int handle_get_status(unsigned long arg2) if (current->thread.cet.shstk_enabled) features |= GNU_PROPERTY_X86_FEATURE_1_SHSTK; + if (current->thread.cet.ibt_enabled) + features |= GNU_PROPERTY_X86_FEATURE_1_IBT; shstk_base = current->thread.cet.shstk_base; shstk_size = current->thread.cet.shstk_size; @@ -56,6 +58,17 @@ static int handle_alloc_shstk(unsigned long arg2) return 0; } +static int handle_bitmap(unsigned long arg2) +{ + unsigned long addr, size; + + if (get_user(addr, (unsigned long __user *)arg2) || + get_user(size, (unsigned long __user *)arg2 + 1)) + return -EFAULT; + + return cet_setup_ibt_bitmap(addr, size); +} + int prctl_cet(int option, unsigned long arg2) { if (!cpu_x86_cet_enabled()) @@ -70,6 +83,8 @@ int prctl_cet(int option, unsigned long arg2) return -EPERM; if (arg2 & GNU_PROPERTY_X86_FEATURE_1_SHSTK) cet_disable_free_shstk(current); + if (arg2 & GNU_PROPERTY_X86_FEATURE_1_IBT) + cet_disable_ibt(); return 0; @@ -80,6 +95,12 @@ int prctl_cet(int option, unsigned long arg2) case ARCH_X86_CET_ALLOC_SHSTK: return handle_alloc_shstk(arg2); + /* + * Allocate legacy bitmap and return address & size to user. + */ + case ARCH_X86_CET_SET_LEGACY_BITMAP: + return handle_bitmap(arg2); + default: return -EINVAL; }