From patchwork Tue Dec 20 06:36:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Li, Xin3" X-Patchwork-Id: 34935 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp2813860wrn; Mon, 19 Dec 2022 23:04:35 -0800 (PST) X-Google-Smtp-Source: AMrXdXt7MwpVf00tJ4Lvu1gJ3BfzLNDLFckg8z+XUO6DodKtN9rDNYYVrYepv+boNpahF2nc6tRx X-Received: by 2002:a17:90b:3744:b0:219:89c2:b70b with SMTP id ne4-20020a17090b374400b0021989c2b70bmr14154630pjb.16.1671519875298; Mon, 19 Dec 2022 23:04:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671519875; cv=none; d=google.com; s=arc-20160816; b=yonuZ8E1MUhU1D0yJd1+LcUGnGregEey6KCpR5FEJ9XAwJabo4thRxfmaU56IqE0V9 EOpTK92nAZVUKGRAGijvW00pyeUDWc4vUo2ewD2CF7D2JWhtxO8YafS0ruZ7RUz7Wxeo vaqhwg5kNuiDqnYPPUfHPLG728+46BCdbm7PfDe9+N9VZy2GFV2WRWxgQPIha+oaBr30 Y5i/4fbwFuYrdvzK0rNBwLHC7BzEfL6jWssSh698t6Xzc8caXJrUeNnv6vBwzILI0nmc 5hV4WBkoAvjzOjIP9+AkJOPNRz9njKu036QIQO2wXsoc7TnK1V6etJ0O0u7Uv7VJ7SEY gVBw== 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 :dkim-signature; bh=H7vdWNh3NN9i+9p2+n8FZQH++xqEoaFBQnE4L/O5BqQ=; b=EhBJ0b6uTN2C8QcHx3+zWBGLIahyJ6UCl/RObfTTc9sTW6W97nFFI66m/7JPj39tV+ biFMSmkvUHUgurD7epJWcwULfn8C/my0Jz5bDQo14xTcwzmhmOSDdJpZeub0Phhp57cT BzIb69rVk57Hq8Luj3lBVBYC0/+Iiq2uejRtvtbxPegPaN7+K33k7kW4+x2b9Nzi6ZVI igrbXcj07I2KAPVc2b5HPhaWAFkiojxxckmsX5Afz7lIBVM5KE3FXEYMFyEwVMz6NcKQ ye771nANNCkOeaSo0U5/Lywzt0pJLvSWb5A7UXpLtweKUbyq4LGnIRcsoeZwnJsotCym VALQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=bssOtzC1; 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: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id qe4-20020a17090b4f8400b00218ca1ac741si13476967pjb.181.2022.12.19.23.04.22; Mon, 19 Dec 2022 23:04:35 -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=bssOtzC1; 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 S233661AbiLTHDq (ORCPT + 99 others); Tue, 20 Dec 2022 02:03:46 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53336 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232887AbiLTHBo (ORCPT ); Tue, 20 Dec 2022 02:01:44 -0500 Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D0B8F15FDF; Mon, 19 Dec 2022 23:01:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1671519700; x=1703055700; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=cFa67ljZDOj6B4hnKmSyOvFw/+uBlbUZju1/l5Toj94=; b=bssOtzC1EihsWMNGwXyi8KsQIb6P94dulS/RQW2o/Hu3Ei3wZpXo3uUz BR3lzhuL3u+3YdCULK/GcQ6GGLxGGGq+hOD4aKzABEas9Nd5YUZE3kztV XUo5TScwIQ8Wlrzmtg1mSNzgS07safNFvOZ7lAaPnVYryvS9FmZq/lMfF 9XfUbSVJUloTIJ14MlBRAGTny/4c5zSkk4JEYRYFM5zinB4tUN9AegAKz yUg2mgnWZZ/6xfo7Qwc4pLw8ipQ/LJ8wIVjmVi3WFCA4saaPVlVSdXSmq d3mI/2TE4XyDKjh5PqsZprm+Ws4wSjhNCLfIWqaBwB+KRGLvaGDq1XZG4 w==; X-IronPort-AV: E=McAfee;i="6500,9779,10566"; a="302972128" X-IronPort-AV: E=Sophos;i="5.96,258,1665471600"; d="scan'208";a="302972128" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Dec 2022 23:01:18 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10566"; a="644326530" X-IronPort-AV: E=Sophos;i="5.96,258,1665471600"; d="scan'208";a="644326530" Received: from unknown (HELO fred..) ([172.25.112.68]) by orsmga007.jf.intel.com with ESMTP; 19 Dec 2022 23:01:17 -0800 From: Xin Li To: linux-kernel@vger.kernel.org, x86@kernel.org, kvm@vger.kernel.org Cc: tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, hpa@zytor.com, peterz@infradead.org, andrew.cooper3@citrix.com, seanjc@google.com, pbonzini@redhat.com, ravi.v.shankar@intel.com Subject: [RFC PATCH 25/32] x86/fred: disallow the swapgs instruction when FRED is enabled Date: Mon, 19 Dec 2022 22:36:51 -0800 Message-Id: <20221220063658.19271-26-xin3.li@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221220063658.19271-1-xin3.li@intel.com> References: <20221220063658.19271-1-xin3.li@intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1752715624973928786?= X-GMAIL-MSGID: =?utf-8?q?1752715624973928786?= From: "H. Peter Anvin (Intel)" The FRED architecture establishes the full supervisor/user through: 1) FRED event delivery swaps the value of the GS base address and that of the IA32_KERNEL_GS_BASE MSR. 2) ERETU swaps the value of the GS base address and that of the IA32_KERNEL_GS_BASE MSR. Thus, the swapgs instruction is disallowed when FRED is enabled, otherwise it cauess #UD. Signed-off-by: H. Peter Anvin (Intel) Signed-off-by: Xin Li --- arch/x86/kernel/process_64.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c index bfe6179b7a17..5b6cfd2ca630 100644 --- a/arch/x86/kernel/process_64.c +++ b/arch/x86/kernel/process_64.c @@ -165,7 +165,8 @@ static noinstr unsigned long __rdgsbase_inactive(void) lockdep_assert_irqs_disabled(); - if (!static_cpu_has(X86_FEATURE_XENPV)) { + if (!cpu_feature_enabled(X86_FEATURE_FRED) && + !static_cpu_has(X86_FEATURE_XENPV)) { native_swapgs(); gsbase = rdgsbase(); native_swapgs(); @@ -190,7 +191,8 @@ static noinstr void __wrgsbase_inactive(unsigned long gsbase) { lockdep_assert_irqs_disabled(); - if (!static_cpu_has(X86_FEATURE_XENPV)) { + if (!cpu_feature_enabled(X86_FEATURE_FRED) && + !static_cpu_has(X86_FEATURE_XENPV)) { native_swapgs(); wrgsbase(gsbase); native_swapgs();