From patchwork Sat Sep 23 09:41:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Li, Xin3" X-Patchwork-Id: 143911 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:cae8:0:b0:403:3b70:6f57 with SMTP id r8csp200541vqu; Sat, 23 Sep 2023 07:12:23 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHZ3c+okG2UXlGPqtIOIG/PrB2THwBD90UCXW/X5KOJ4A+reIXvKoFwKqh0691XofCtryCW X-Received: by 2002:a05:6358:279f:b0:141:b70:baa0 with SMTP id l31-20020a056358279f00b001410b70baa0mr2820187rwb.27.1695478343432; Sat, 23 Sep 2023 07:12:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695478343; cv=none; d=google.com; s=arc-20160816; b=kDfxAmMBDW7JFuREmgQ3dKhWfn2aRO7mkmDzJqSIWvBPRkxzoPpbfBoQg1lgmi0M33 cjgNkJ6Ihgl4JYNZAHsj1bFTEwOXg49j74w4XiTPLd6Vw1e01rT5D+wtYoLIxAenDQnW cjdDSXTfQ4CKhpu1sPNhnyjM14+hkAstmu/XPxikHcKOLWjfkJ5rbyJJE3BtmA13LHc9 5MH+0U2mF2suspCanOmKRHWTQE5tldQ2Tb+HT8U0m4YccvWjqwiN8SrRXtdzkfBWNzkp y3EWj0N0CmAUHUAHBldHViOWQ6dCF3rzPzKBu1XY8tifxQwdtl8bLZmtfQqxA67LhliE jjNA== 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=gAZY9xniyTfPliDTpYR37+Md0HYYnva4EgAEJyvKmmU=; fh=Tb1p8S3iOxe/kX/WSNC3xEJzSVgGJ5DaxSrKb+pzH+4=; b=l6jwJCNwNLBaiPZJM1yeU0hOHyOwr8hR/Mq2vPgVJm277BP9xOu9PHP4j3M96GdQMh s8pBT8aC5leyIsVMN8bhdqGyjXVMhDwUNNxyNv3wpqOEYW9d8ntnNP2RDn10PCohsMiH j73ZcEpbtTeUX67WkQvyNevNhoI+ytlBgl/KORx+zn3OZ4xakLTC9bC3gTsuZHBaWGmn l01hWDY09o/t6ViVv7nCWDFPZSGLyExBK7J1BNfp8vaaV8BYvrnh8m14DSgM13xd8/Q4 Sh0blD8glfhQGRFRUuxmWdqkT2xm1etbfci5uVYUdNkcln273ylyp22eWXJKM8HfefjI 40dg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=QxWUBZs0; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 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 pete.vger.email (pete.vger.email. [23.128.96.36]) by mx.google.com with ESMTPS id f10-20020a65550a000000b0057744d09d2fsi5872755pgr.18.2023.09.23.07.12.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 Sep 2023 07:12:23 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) client-ip=23.128.96.36; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=QxWUBZs0; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 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 (depot.vger.email [IPv6:2620:137:e000::3:0]) by pete.vger.email (Postfix) with ESMTP id 4CE1584049E0; Sat, 23 Sep 2023 03:13:52 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231363AbjIWKMx (ORCPT + 29 others); Sat, 23 Sep 2023 06:12:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59040 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231445AbjIWKL5 (ORCPT ); Sat, 23 Sep 2023 06:11:57 -0400 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.100]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A83CA1AB; Sat, 23 Sep 2023 03:11:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1695463906; x=1726999906; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=f4gesqgoemAM7gLIVW0tfHuShJv23oH28+TguMOULZ8=; b=QxWUBZs0xpA7p45SMCJP3pzboZwv1TWVn8628483/zG1HN6J3uhYFht0 8wbEKjofUV5ftUEKibda7nWg3+Zz3/6MhwKuLmcTkGWpumromTH58FCkM vn0z6XIWq4sjp0uhOhy5iySOKDOuojLMrlJRxrG2OR8vaDGGRaNSfLmoH 047a2i9MLbggY/U922moqfRaC2R0N/FdYTWCQbNG2HaA3WDJVd8eS8htp 8X0ZBQfgiuAVJ3D/c/KuIsrFMn1X971OQ+g5mSqXkOr3zmlFR3+nBr6O3 38RSSIasELGBMsA0JXZUQiZnUUVdeX63YB2q98yDP0Li8d/CNOg0tV6aA Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10841"; a="447492290" X-IronPort-AV: E=Sophos;i="6.03,171,1694761200"; d="scan'208";a="447492290" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Sep 2023 03:11:45 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10841"; a="813388160" X-IronPort-AV: E=Sophos;i="6.03,171,1694761200"; d="scan'208";a="813388160" Received: from unknown (HELO fred..) ([172.25.112.68]) by fmsmga008.fm.intel.com with ESMTP; 23 Sep 2023 03:11:44 -0700 From: Xin Li To: linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-edac@vger.kernel.org, linux-hyperv@vger.kernel.org, kvm@vger.kernel.org, xen-devel@lists.xenproject.org Cc: tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, x86@kernel.org, hpa@zytor.com, luto@kernel.org, pbonzini@redhat.com, seanjc@google.com, peterz@infradead.org, jgross@suse.com, ravi.v.shankar@intel.com, mhiramat@kernel.org, andrew.cooper3@citrix.com, jiangshanlai@gmail.com, nik.borisov@suse.com Subject: [PATCH v11 18/37] x86/fred: Reserve space for the FRED stack frame Date: Sat, 23 Sep 2023 02:41:53 -0700 Message-Id: <20230923094212.26520-19-xin3.li@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230923094212.26520-1-xin3.li@intel.com> References: <20230923094212.26520-1-xin3.li@intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=2.7 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_SBL_CSS,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (pete.vger.email [0.0.0.0]); Sat, 23 Sep 2023 03:13:52 -0700 (PDT) X-Spam-Level: ** X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777837899391853315 X-GMAIL-MSGID: 1777837899391853315 From: "H. Peter Anvin (Intel)" When using FRED, reserve space at the top of the stack frame, just like i386 does. 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 d63b02940747..12da7dfd5ef1 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 /*