From patchwork Thu Mar 2 05:25:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Li, Xin3" X-Patchwork-Id: 63241 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp4068811wrd; Wed, 1 Mar 2023 22:08:30 -0800 (PST) X-Google-Smtp-Source: AK7set84zIGw2gxYXJCXMlvJdpjCNnWMsIVSTcVAmd7DhDAR1MC5p2ioCNGWxjkQLDAJ9b2UoDCa X-Received: by 2002:a05:6a21:6da1:b0:cc:c69b:f7e5 with SMTP id wl33-20020a056a216da100b000ccc69bf7e5mr11090529pzb.9.1677737309767; Wed, 01 Mar 2023 22:08:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677737309; cv=none; d=google.com; s=arc-20160816; b=N1hTy2kRqHYY6txyqItpUZq4+jHs0FyEyjktezenAXRNGIkwjTDwofBcelmVe/50gt 4TZ4MVWgl4hjrix4psJwA8gbRC5Rn7FX712tMTZwUgPKkU9rgzTB+YtRgbRxlZXUUSfe v4CAK/WFKhfpWMCFLOqPzUHAw6OuM+ltKc04f2aZSQuIVjflBwrmAkn8ZGD3z8Er+yEG YiaXkpDms33jKme6ejmGNiKhPS6uFccT9FdFKUNKo/98nLVHPbofPhIbPoELgKN3be+B KpS3ybhd6Wco7aGXrXi/BQaazhtrNpN9pzlMA7Zv3uBLuCcxIAGXxQv/8pszQ8ejYRZ+ AVcg== 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=CAwwHxdmySeTwUiXJxBjwIE6ec+fx+NkUFLB6oSL6+I=; b=MQ+zHKocd7/1VIBxEIAX33SWbqkI4uIyfZ6SjgOTh8TvyOOPuxibwEfP0oC3oUL6w9 2C9GFv9g2kotLZfkyfesq/IMMoWn79rUqyoaEx1waKpyDHo/LIySd+eiTEFRU/6QaAt/ H1PE1rI/NTXxu0tkzafjFyf5ZfArDWUhIOa5xBiqWIB+LhYAdWTe3a/pEpYay1PvAfSZ HkrgONYykgN1hWWyzJFIX2jY545h2//Tnbqf3sMJNPh71VuyVrypi0FepjF7Hy1Y1eKB brRRL7sJe3tTEno2ZR+N++3NjtfeV01iJgjZPbkpWQ/ry4fDUItXui22B5yLA8PgxOM7 5R1Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="ka5ay/5T"; 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 w189-20020a6382c6000000b004fb42dcc3b0si14635745pgd.710.2023.03.01.22.08.16; Wed, 01 Mar 2023 22:08:29 -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="ka5ay/5T"; 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 S230124AbjCBFw7 (ORCPT + 99 others); Thu, 2 Mar 2023 00:52:59 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46842 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230098AbjCBFwW (ORCPT ); Thu, 2 Mar 2023 00:52:22 -0500 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E8F64532AE; Wed, 1 Mar 2023 21:51:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1677736285; x=1709272285; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=JCKu4lASdy4fofKGHW4gy5ePwfNi7YQxHJ13+kwlv3k=; b=ka5ay/5TeN2UCtOgI6Y2fZeGibJS4uC1tORRFgivbbhHh3rTbb9+VdQH LkceHnsNJhODN6WvYOVhAkzgUPZVnQZfF119eMr55J7dJokQS7jotg4nN 8uebwA21T/7Q7T1bxfKjmbY3Bmk/Pbd6xblY5zzYikdqVtzCwLM1YO3nJ jz7qazwr3AxK8b83OIjNQUB13HW+HuvKZX1JPZ1gsJovv5LhNP7H+tP/Z auMVvLqm5ZYC2HZslxQM9K6qUw0s+UXnnbb8+GP+13bCOluSoDmgiSL07 88neN2qZzArMxT0KmTN28w+9fPABmaL8ZFN5uBcChuWcoa4yANAuGVad6 Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10636"; a="420887283" X-IronPort-AV: E=Sophos;i="5.98,226,1673942400"; d="scan'208";a="420887283" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Mar 2023 21:50:52 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10636"; a="920530956" X-IronPort-AV: E=Sophos;i="5.98,226,1673942400"; d="scan'208";a="920530956" Received: from unknown (HELO fred..) ([172.25.112.68]) by fmsmga006.fm.intel.com with ESMTP; 01 Mar 2023 21:50:50 -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: [PATCH v4 25/34] x86/fred: disallow the swapgs instruction when FRED is enabled Date: Wed, 1 Mar 2023 21:25:02 -0800 Message-Id: <20230302052511.1918-26-xin3.li@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230302052511.1918-1-xin3.li@intel.com> References: <20230302052511.1918-1-xin3.li@intel.com> MIME-Version: 1.0 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, 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?1759235077445535678?= X-GMAIL-MSGID: =?utf-8?q?1759235077445535678?= 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) Tested-by: Shan Kang 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 57de166dc61c..ff6594dbea4a 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 (!cpu_feature_enabled(X86_FEATURE_XENPV)) { + if (!cpu_feature_enabled(X86_FEATURE_FRED) && + !cpu_feature_enabled(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 (!cpu_feature_enabled(X86_FEATURE_XENPV)) { + if (!cpu_feature_enabled(X86_FEATURE_FRED) && + !cpu_feature_enabled(X86_FEATURE_XENPV)) { native_swapgs(); wrgsbase(gsbase); native_swapgs();