Received: by 2002:ac0:a5a6:0:0:0:0:0 with SMTP id m35-v6csp783024imm; Fri, 21 Sep 2018 08:13:37 -0700 (PDT) X-Google-Smtp-Source: ANB0Vda+9gmWQS118rdJCJMb34zsoECtQAsKOvgcP9lAXwi/NvhqDwWCz+JFUtm0JqwXG2nhTw4d X-Received: by 2002:a63:1d3:: with SMTP id 202-v6mr42002155pgb.136.1537542817554; Fri, 21 Sep 2018 08:13:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537542817; cv=none; d=google.com; s=arc-20160816; b=ymc5FbF/dGI5D1Gg8XghPQAqj4j65gGPaEsBVcx0uGFU1Jq5VLC7wFFvZCDV/zGiHn HCuDz8/s/qZETRAiGFwhgHXL5GMeIk4fShSpj0xOk2BwNW7J8GyeTA3ANXj0N0W9ddBB 7tC79RdEB6m/rRUrniEQjNd8VGx4+LKV6tMb9q/T77cmTACRVt3qCGOzV3SHbSJ4MYnw Sfk53U9RLL6LR3zxJe831eBPvWZiiEvcAkZELZ9Y/yTSb9XJMn/r9j3I3Kls66pQW7uy r7+ezjD5lmUVS525woVDZTuxIyHUCVAX43+RHZeTj3PBSm3sWrR6ZKTyUWiAQlOgF1/7 YUUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from; bh=hBcH5DA3/9CPjXEnDP6a+Vqekbjnf4bFOs5utUIsqPg=; b=aiqnPPES6tTxgeAYxe5Xkig+G1XaF3EbcOJEesquQTqDYo29MLIJgZjjZmNflULQSt LXezUbeI6DmQA6EsMapTEuBYsHef1PLPubSvi2ob12dotZMyOVyGnzXUGzJahm+8nZnS TNtybCAKkVucsYu+gTt9XdW2kX/9wAiENyiRfMRB/VQW44H0MpYrQ2MGZXKtCJ6Hp/3i o8MotgtpQStIjomuLaj3Niv8c+NVhwvCF3COQ9gKoBkkjzLnOiYaV+vwcRxqqViekcR5 t8/O9ZghYQPhurhfZwD/sd83OyQU8+t14toO7AZN8rXm1t/PuzQT1itpF9Lxnr+5+waB 2cwA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 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. [209.132.180.67]) by mx.google.com with ESMTP id e17-v6si24204840pgv.615.2018.09.21.08.13.21; Fri, 21 Sep 2018 08:13:37 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 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 S2390958AbeIUVAf (ORCPT + 99 others); Fri, 21 Sep 2018 17:00:35 -0400 Received: from mga11.intel.com ([192.55.52.93]:13767 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390860AbeIUU7r (ORCPT ); Fri, 21 Sep 2018 16:59:47 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga102.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="88187968" Received: from 2b52.sc.intel.com ([143.183.136.51]) by fmsmga002.fm.intel.com with ESMTP; 21 Sep 2018 08:10:27 -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 3/9] x86/cet/ibt: Add IBT legacy code bitmap allocation function Date: Fri, 21 Sep 2018 08:05:47 -0700 Message-Id: <20180921150553.21016-4-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> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Indirect branch tracking provides an optional legacy code bitmap that indicates locations of non-IBT compatible code. When set, each bit in the bitmap represents a page in the linear address is legacy code. We allocate the bitmap only when the application requests it. Most applications do not need the bitmap. Signed-off-by: Yu-cheng Yu --- arch/x86/kernel/cet.c | 45 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/arch/x86/kernel/cet.c b/arch/x86/kernel/cet.c index 6adfe795d692..a65d9745af08 100644 --- a/arch/x86/kernel/cet.c +++ b/arch/x86/kernel/cet.c @@ -314,3 +314,48 @@ void cet_disable_ibt(void) wrmsrl(MSR_IA32_U_CET, r); current->thread.cet.ibt_enabled = 0; } + +int cet_setup_ibt_bitmap(void) +{ + u64 r; + unsigned long bitmap; + unsigned long size; + + if (!cpu_feature_enabled(X86_FEATURE_IBT)) + return -EOPNOTSUPP; + + if (!current->thread.cet.ibt_bitmap_addr) { + /* + * Calculate size and put in thread header. + * may_expand_vm() needs this information. + */ + size = TASK_SIZE / PAGE_SIZE / BITS_PER_BYTE; + current->thread.cet.ibt_bitmap_size = size; + bitmap = do_mmap_locked(0, size, PROT_READ | PROT_WRITE, + MAP_ANONYMOUS | MAP_PRIVATE, + VM_DONTDUMP); + + if (bitmap >= TASK_SIZE) { + current->thread.cet.ibt_bitmap_size = 0; + return -ENOMEM; + } + + current->thread.cet.ibt_bitmap_addr = bitmap; + } + + /* + * Lower bits of MSR_IA32_CET_LEG_IW_EN are for IBT + * settings. Clear lower bits even bitmap is already + * page-aligned. + */ + bitmap = current->thread.cet.ibt_bitmap_addr; + bitmap &= PAGE_MASK; + + /* + * 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; +} -- 2.17.1