From patchwork Mon Nov 19 21:49:26 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: 10689573 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 3A4C113BB for ; Mon, 19 Nov 2018 21:55:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2C74F2A583 for ; Mon, 19 Nov 2018 21:55:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 203F42A6EE; Mon, 19 Nov 2018 21:55:42 +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 AE84C2A583 for ; Mon, 19 Nov 2018 21:55:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6F5D36B1CB1; Mon, 19 Nov 2018 16:54:58 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 655166B1CB2; Mon, 19 Nov 2018 16:54:58 -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 4F72C6B1CB4; Mon, 19 Nov 2018 16:54:58 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf1-f198.google.com (mail-pf1-f198.google.com [209.85.210.198]) by kanga.kvack.org (Postfix) with ESMTP id 05ED36B1CB1 for ; Mon, 19 Nov 2018 16:54:58 -0500 (EST) Received: by mail-pf1-f198.google.com with SMTP id l15-v6so27594126pff.5 for ; Mon, 19 Nov 2018 13:54:57 -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=qwvBk6j/AQhaRu5D52VWCF3xBckwceEXvsvcLNj5iAY=; b=aFCulnC2HwO2d+p1FPjfXKSF4uJC9hpKLdO4R4QPu3n7EQ4Z5tPN4bVW7+Qk4JLyh9 fAI8SWzeoMMKFu5TIVNtFGapm2wm+xgJEIrM75oFQye+yY1RqJWqIp2oevTTIzJNuIsO QynVjI+hzWLMk1MY4+Ar59gtqMq5x8uq6Nv2VtND6WB/sBHPCFpkLoH+21xv81p99Stn DFkLuYAAZZULlAfZciSy6+gmpMDQxh6K2fIP4fpKD4sYtjKGYUP3AS8C53h2YjmGDl6d 64yxUHSoQZOKfyVEsrbychDPpdaeYTKhB1kygEN2y8r0qic5Aglo3TINNFaKFzw3jdng gdXQ== 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: AGRZ1gJ/8meRx8B0ISVWq0hsAzS4tpFagc1xNuGhLJ85dFFkGjWWRUZd vazx93Ox9ydEfSZ0Zs04MUwsITcvJp/TmhCi/2G6Jafr0OnugsSaXBzYbY/cZJMi+f+3VE4KDnE 53caRQ9vAeqyqyTYbLdWsfEEyg2ZNxqZwh9e063xoCk49H30VESsTegWbftNK8LyJnw== X-Received: by 2002:a62:2a04:: with SMTP id q4-v6mr24449493pfq.61.1542664497691; Mon, 19 Nov 2018 13:54:57 -0800 (PST) X-Google-Smtp-Source: AJdET5f2Mi83f0rAqwGOlWRjwdcX00/3/fGgWzfSKT5mc/eBkB3SgppjYRFYFqPclzLeEIvfLHbo X-Received: by 2002:a62:2a04:: with SMTP id q4-v6mr24449469pfq.61.1542664497038; Mon, 19 Nov 2018 13:54:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542664497; cv=none; d=google.com; s=arc-20160816; b=nY2w3yW8jEYppqKLJMjPi/uD+tjJ/tS+AXhN/Qd3xPeyMMHZ3TRqJEJK6Anpel1L6e 24wJMPN1pSB3ERfSd9p61wRcaPKGBtLXARTxiI/gPkEavuoSGw2EWigKC5E2fLqEitEF z3wWpskzXnG0RtpJsVtdYfQfd2h/4Bh68GuM9rLTaHqCsmxPwMteY59239fvJ96r6PP8 IqRi73REqV94f5RINRHZV+3XJe11Jve/27ZAgmktd0k7/p8mvwQYPr7s6BZzkfEJ5T2Y cc15rIUWkLwN+CuWg/Gm4TZftWXjvP46MXQWKfIzqrTjepN9HCpVEhyWlzP6heIhr7eG NlRQ== 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=qwvBk6j/AQhaRu5D52VWCF3xBckwceEXvsvcLNj5iAY=; b=T9IYy9/vvbS8oMYNEgRa9PRXQknVXy/TCWD/V115IIx1Jf+qgGwk0bD1Cq/OiqNNWe HU38rorANeZDnlmDzACILUxK5CR8/JR/jzroSHzLQim1qxnNCu4xgJsogxH1QbkSanxC 4uv2lekxBs2d4sElby06U9SKVl6nAVX7dURD/qCDYMmqvl/V0p1NNqM/qZ3DMHbhNdHK /dz5xSd5URHgvZaqOMK4Bho+q1dluSIOU6+4zaFZxI4Wx4/xcGIrYTKzDoIH9/Umlh4b nkKDpw0YepXSUbhl7v9euHwzumDf+OfLTO9C5G0wQaKxNVcDnOJau9vAM129LH6qUPZl nTrw== 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.54.56 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 19 Nov 2018 13:54:57 -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:54:56 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,254,1539673200"; d="scan'208";a="92423889" Received: from yyu32-desk1.sc.intel.com ([143.183.136.147]) by orsmga006.jf.intel.com with ESMTP; 19 Nov 2018 13:54:55 -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 03/11] x86/cet/ibt: Add IBT legacy code bitmap setup function Date: Mon, 19 Nov 2018 13:49:26 -0800 Message-Id: <20181119214934.6174-4-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 Indirect Branch Tracking (IBT) provides an optional legacy code bitmap that allows execution of legacy, non-IBT compatible library by an IBT-enabled application. When set, each bit in the bitmap indicates one page of legacy code. The bitmap is allocated and setup from the application. Signed-off-by: Yu-cheng Yu --- arch/x86/include/asm/cet.h | 1 + arch/x86/kernel/cet.c | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/arch/x86/include/asm/cet.h b/arch/x86/include/asm/cet.h index 810d3e386fdb..db40fc54a905 100644 --- a/arch/x86/include/asm/cet.h +++ b/arch/x86/include/asm/cet.h @@ -29,6 +29,7 @@ void cet_disable_free_shstk(struct task_struct *p); int cet_restore_signal(unsigned long ssp); int cet_setup_signal(bool ia32, unsigned long rstor, unsigned long *new_ssp); int cet_setup_ibt(void); +int cet_setup_ibt_bitmap(unsigned long bitmap, unsigned long size); void cet_disable_ibt(void); #else static inline int prctl_cet(int option, unsigned long arg2) { return -EINVAL; } diff --git a/arch/x86/kernel/cet.c b/arch/x86/kernel/cet.c index fd157a6208c3..18a92a92c50f 100644 --- a/arch/x86/kernel/cet.c +++ b/arch/x86/kernel/cet.c @@ -21,6 +21,7 @@ #include #include #include +#include static int set_shstk_ptr(unsigned long addr) { @@ -333,3 +334,25 @@ void cet_disable_ibt(void) wrmsrl(MSR_IA32_U_CET, r); current->thread.cet.ibt_enabled = 0; } + +int cet_setup_ibt_bitmap(unsigned long bitmap, unsigned long size) +{ + u64 r; + + if (!current->thread.cet.ibt_enabled) + return -EINVAL; + + if (!PAGE_ALIGNED(bitmap) || (size > TASK_SIZE_MAX)) + return -EINVAL; + + current->thread.cet.ibt_bitmap_addr = bitmap; + current->thread.cet.ibt_bitmap_size = size; + + /* + * Turn on IBT legacy bitmap. + */ + rdmsrl(MSR_IA32_U_CET, r); + r |= (MSR_IA32_CET_LEG_IW_EN | bitmap); + wrmsrl(MSR_IA32_U_CET, r); + return 0; +}