Received: by 2002:a05:6358:16cc:b0:ea:6187:17c9 with SMTP id r12csp7308861rwl; Mon, 9 Jan 2023 22:04:01 -0800 (PST) X-Google-Smtp-Source: AMrXdXvRvjSMiWcP1Mh0iyzWYKeP6TUrDYteZhKoLkVzy9lkv+PiiPslmye7UjXIInNBRW9fexnH X-Received: by 2002:a17:906:38c6:b0:7c0:dcc2:e7b1 with SMTP id r6-20020a17090638c600b007c0dcc2e7b1mr56938688ejd.43.1673330640997; Mon, 09 Jan 2023 22:04:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673330640; cv=none; d=google.com; s=arc-20160816; b=uV7GM2C2vqVnP0Eonp5B7X6cwi71kChpvVJyR5OIBj2oGAgtuUA+ZT/8p9bVX4gOD7 +Os/tow2ENbVgs48h77zDrkxiYyYAQjZrS9fnWpafKxS22KwUKusNx0G9nVSaJnhXeQ4 pSd7qvbHgokgFZftmyAUIEZMFmZb0D7Ul1UpqQ11AXxUBTpt/qTvWrK62n8ZFZmRIGJ6 l8u6aLiPyGKC2yF9x85vbwXyK2IHdQfdr6dttmE6hHjj/wBVfuNTPEZF0qwIOCLBidP+ CcB/KrHAajTVp3j4dpsjJJpYTuTvb4jfFBQhedzSWDxHBG6HD+hT62/pEjXgwzE+7tks wopA== 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:to:from :dkim-signature; bh=Y8a18JSy2rGLZMNvXkTgRqCUUVm/Mu+W2nSD3o9xBT8=; b=T/Y5KG2cp8oGPwXivOO21QAzXBsstTvbaX7tGWiknPtfNMNYOUwnGMR4KjKZN9FjEX DtYm4OFq0lNXpncE7prpqfaxOXZMCiEiJaX2nP+UxASXclLlOj0t1ZD54AoK7LyoWJdm IRxgaE+SYQGX9fROZIkJCXHsVjp5ohPBfbgHP/r1wVQKWEEzJ9mD10MWrEYWI410tOZD wUYvcix72oZ7lzv7P+V//PhbVg5RhFeekzblkEoNmNmyYzY/pzL9M5pt6kPc8SC4XfAi J1kPWAOQnIdgNVS4ltWkROV6IMimZYNLr68qN35e/hLmXEfpfhvNr5o26N28ElMdbu+u eY3A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=fPIZO7BN; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id hg2-20020a1709072cc200b0084d4730001asi4922183ejc.89.2023.01.09.22.03.37; Mon, 09 Jan 2023 22:04:00 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=fPIZO7BN; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230506AbjAJF50 (ORCPT + 55 others); Tue, 10 Jan 2023 00:57:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57772 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231639AbjAJF4I (ORCPT ); Tue, 10 Jan 2023 00:56:08 -0500 Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9C41644352 for ; Mon, 9 Jan 2023 21:55:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1673330141; x=1704866141; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=1w4ypkqHrSsKN+f9gXoNWqz9PeGgeztfz3He0u8lGw4=; b=fPIZO7BNWHOgA1tguA7A3NJkR0gOfsRgsTMXU4T0GIS8ii233anICiTp LWl83ZIFOnsswJAfrPSs4K8Qv2Q5K6b7L6LORAbCbGN4bpzTCeWSvgDVx fQKBs8AzeKhje8CMQs1uFgvRkCABjElmi7Z8MPEeyhHEtyX0lHCLIGiNq 1Lo2j+m8idhzoL1EUCsokTdEGWkq8DUhhMgf6IQSMfd3Ur8mKPfEUmRhX cURyDAarZpCkjniaB5z5VWX6w+F8XfkYE34SkLqJopftnbqj3MI0QwdCO Kc0DqWb5MPjimnFhnudNeLWn4OMHHJdXTCiKWFomlYiegE4jfh6MNClSn g==; X-IronPort-AV: E=McAfee;i="6500,9779,10585"; a="350289957" X-IronPort-AV: E=Sophos;i="5.96,314,1665471600"; d="scan'208";a="350289957" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Jan 2023 21:55:39 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10585"; a="634483736" X-IronPort-AV: E=Sophos;i="5.96,314,1665471600"; d="scan'208";a="634483736" Received: from oux.sc.intel.com ([10.3.52.57]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Jan 2023 21:55:39 -0800 From: Yian Chen To: linux-kernel@vger.kernel.org, x86@kernel.org, Andy Lutomirski , Dave Hansen , Ravi Shankar , Tony Luck , Sohil Mehta , Paul Lai , Yian Chen Subject: [PATCH 2/7] x86: Add CONFIG option X86_LASS Date: Mon, 9 Jan 2023 21:51:59 -0800 Message-Id: <20230110055204.3227669-3-yian.chen@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230110055204.3227669-1-yian.chen@intel.com> References: <20230110055204.3227669-1-yian.chen@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org LASS is an Intel x86-64 only feature. Add CONFIG option X86_LASS and flag DISABLE_LASS to choose opt-in/out the feature from kernel binary. CONFIG_X86_LASS is enabled by default because it is a security feature which should have little to no overhead or side effects. If any issues are found with specific use cases, the CONFIG option makes it easy to disable. Signed-off-by: Yian Chen Reviewed-by: Tony Luck --- arch/x86/Kconfig | 10 ++++++++++ arch/x86/include/asm/disabled-features.h | 8 +++++++- tools/arch/x86/include/asm/disabled-features.h | 8 +++++++- 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 3604074a878b..38b1497afd75 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -1826,6 +1826,16 @@ config ARCH_USES_PG_UNCACHED def_bool y depends on X86_PAT +config X86_LASS + def_bool y + prompt "Linear Address Space Separation" + depends on X86_64 && CPU_SUP_INTEL + help + Linear Address Space Separation (LASS) is a processor + feature that mitigates address space layout probes. + + if unsure, say Y. + config X86_UMIP def_bool y prompt "User Mode Instruction Prevention" if EXPERT diff --git a/arch/x86/include/asm/disabled-features.h b/arch/x86/include/asm/disabled-features.h index c44b56f7ffba..0cad37d59e0f 100644 --- a/arch/x86/include/asm/disabled-features.h +++ b/arch/x86/include/asm/disabled-features.h @@ -16,6 +16,12 @@ # define DISABLE_UMIP (1<<(X86_FEATURE_UMIP & 31)) #endif +#ifdef CONFIG_X86_LASS +# define DISABLE_LASS 0 +#else +# define DISABLE_LASS (1<<(X86_FEATURE_LASS & 31)) +#endif + #ifdef CONFIG_X86_64 # define DISABLE_VME (1<<(X86_FEATURE_VME & 31)) # define DISABLE_K6_MTRR (1<<(X86_FEATURE_K6_MTRR & 31)) @@ -115,7 +121,7 @@ #define DISABLED_MASK10 0 #define DISABLED_MASK11 (DISABLE_RETPOLINE|DISABLE_RETHUNK|DISABLE_UNRET| \ DISABLE_CALL_DEPTH_TRACKING) -#define DISABLED_MASK12 0 +#define DISABLED_MASK12 (DISABLE_LASS) #define DISABLED_MASK13 0 #define DISABLED_MASK14 0 #define DISABLED_MASK15 0 diff --git a/tools/arch/x86/include/asm/disabled-features.h b/tools/arch/x86/include/asm/disabled-features.h index c44b56f7ffba..0cad37d59e0f 100644 --- a/tools/arch/x86/include/asm/disabled-features.h +++ b/tools/arch/x86/include/asm/disabled-features.h @@ -16,6 +16,12 @@ # define DISABLE_UMIP (1<<(X86_FEATURE_UMIP & 31)) #endif +#ifdef CONFIG_X86_LASS +# define DISABLE_LASS 0 +#else +# define DISABLE_LASS (1<<(X86_FEATURE_LASS & 31)) +#endif + #ifdef CONFIG_X86_64 # define DISABLE_VME (1<<(X86_FEATURE_VME & 31)) # define DISABLE_K6_MTRR (1<<(X86_FEATURE_K6_MTRR & 31)) @@ -115,7 +121,7 @@ #define DISABLED_MASK10 0 #define DISABLED_MASK11 (DISABLE_RETPOLINE|DISABLE_RETHUNK|DISABLE_UNRET| \ DISABLE_CALL_DEPTH_TRACKING) -#define DISABLED_MASK12 0 +#define DISABLED_MASK12 (DISABLE_LASS) #define DISABLED_MASK13 0 #define DISABLED_MASK14 0 #define DISABLED_MASK15 0 -- 2.34.1