From patchwork Tue Mar 7 02:39:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Li, Xin3" X-Patchwork-Id: 65235 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp2215221wrd; Mon, 6 Mar 2023 19:23:23 -0800 (PST) X-Google-Smtp-Source: AK7set8ty2NsAhV1NUYF9O9V6nXqYUTFCMkajjnbdTyR7nTkvOALQEdStz8oyg7LPIlbU47Z3IJA X-Received: by 2002:a17:907:728c:b0:8b1:788f:2198 with SMTP id dt12-20020a170907728c00b008b1788f2198mr16273140ejc.19.1678159403461; Mon, 06 Mar 2023 19:23:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678159403; cv=none; d=google.com; s=arc-20160816; b=ic7PLxnHfu8GvxA++4iW6f/4fTZr0JFVgyQWbAftU9DwOveFXBV7oot5HepuVfGfvk vIxobYcz1kToEbb7lNJ0iEHTRckCLB6mpD1FAukeMP19Z2fEqh4fJ+vQnZ5whIxUGL8i 1S1SMtDsgn/UxqatTFMPbZtKJSLlg22bh74CzmfU3DiAoYQ2uqTXrfGGQY+XzSAEZo6U s3dgIJ59S53t6sPnSme8eidI0Hypab08tSrsh1z6Wy2ZfKfARxule6AMl8Az82t9A1N0 ZQWBAVcbuvUfHfD+Zw+QdS/LK2uDAWcygLsjqzUXcPrMX91L3JdNiLK8fbk6x3Z1DGcT HWPw== 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=N4FXxoAND7jQBjEqpShHPjc4hHLflyZ6xveUxpk88v4=; b=xUsxbWgGnYrrJHfsYhiyw2DHy9il/9uo8pxcNQzl1MN/SawD/7kwCDudUTzUKiFrR5 d5OReinjBuAcBYP4NxBmmGi93c9IE17zh0IdyXeN/JaowvC4Z6bUpgn3P/45KUJikwrs zp/3F/FkQbxlgJDUPlM5qf/KfiSwcyhOb/2jmaj7Q9dD4pzgrOp5dI+DuFfFd3gA7kmO 5vHjSJrgurc3Oxrjr+oSQ9cxVAdsCP/2Hf4fHYKHQfdhvZ8AUImDOtVyan22FvSC9bf/ +hHAr/FHu1U1mrFHlmEX1D0Hv/Z6/HEAvfHTSLF5AXCZhdjsj4Gs2azseSjegpOQt0CM Sdqw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=auNZiq6Y; 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 qf20-20020a1709077f1400b008b177beb99esi1961051ejc.363.2023.03.06.19.23.00; Mon, 06 Mar 2023 19:23:23 -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=auNZiq6Y; 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 S230416AbjCGDG2 (ORCPT + 99 others); Mon, 6 Mar 2023 22:06:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42848 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230236AbjCGDFj (ORCPT ); Mon, 6 Mar 2023 22:05:39 -0500 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BB35480E0E; Mon, 6 Mar 2023 19:05:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1678158328; x=1709694328; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=voFQVjFSRNzDP3of726cqSfwzN6e3VmowuyZWcsyuKM=; b=auNZiq6Y5V4XGouKW4bjQYZz6N6yRlkGAb5Y2RHg5ZnKPjv+Bxb2wuWX WaDxIvDczna5iT+Vg+mCFwXK3Msc4L06BI0Vno5WgWTL6RKr5Vo0A5XXJ OKCXDxG/K9bRpZbbZzNLjlQwiOF3RHFQDQfo+p8wxwQ5Tv+cfubhp4V7G IBmOn5S4e2zeLQBaGo1iioFcsciRQu2IXko+I30sXB3EN9xAg80pJT3Lu allASigd8kAWeeUvcYT7BMwIL9U8TO09DGINraBOI2bC1r4la0OUszSv8 IbF4PD09DlsIwEDbTOMLZnm41nq5DJMemidHVvMt7FTMWRNJCfnKnd8fB Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10641"; a="338072459" X-IronPort-AV: E=Sophos;i="5.98,238,1673942400"; d="scan'208";a="338072459" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Mar 2023 19:05:17 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10641"; a="676409827" X-IronPort-AV: E=Sophos;i="5.98,238,1673942400"; d="scan'208";a="676409827" Received: from unknown (HELO fred..) ([172.25.112.68]) by orsmga002.jf.intel.com with ESMTP; 06 Mar 2023 19:05:16 -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 v5 16/34] x86/fred: reserve space for the FRED stack frame Date: Mon, 6 Mar 2023 18:39:28 -0800 Message-Id: <20230307023946.14516-17-xin3.li@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230307023946.14516-1-xin3.li@intel.com> References: <20230307023946.14516-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,URIBL_BLOCKED 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?1759677674259804594?= X-GMAIL-MSGID: =?utf-8?q?1759677674259804594?= From: "H. Peter Anvin (Intel)" When using FRED, reserve space at the top of the stack frame, just like i386 does. A future version of FRED might have dynamic frame sizes, though, in which case it might be necessary to make TOP_OF_KERNEL_STACK_PADDING a variable instead of a constant. Signed-off-by: H. Peter Anvin (Intel) Tested-by: Shan Kang Signed-off-by: Xin Li --- arch/x86/include/asm/thread_info.h | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/arch/x86/include/asm/thread_info.h b/arch/x86/include/asm/thread_info.h index f1cccba52eb9..998483078d5f 100644 --- a/arch/x86/include/asm/thread_info.h +++ b/arch/x86/include/asm/thread_info.h @@ -31,7 +31,9 @@ * In vm86 mode, the hardware frame is much longer still, so add 16 * bytes to make room for the real-mode segments. * - * x86_64 has a fixed-length stack frame. + * x86-64 has a fixed-length stack frame, but it depends on whether + * or not FRED is enabled. Future versions of FRED might make this + * dynamic, but for now it is always 2 words longer. */ #ifdef CONFIG_X86_32 # ifdef CONFIG_VM86 @@ -39,8 +41,12 @@ # else # define TOP_OF_KERNEL_STACK_PADDING 8 # endif -#else -# define TOP_OF_KERNEL_STACK_PADDING 0 +#else /* x86-64 */ +# ifdef CONFIG_X86_FRED +# define TOP_OF_KERNEL_STACK_PADDING (2*8) +# else +# define TOP_OF_KERNEL_STACK_PADDING 0 +# endif #endif /*