From patchwork Fri Feb 24 07:01:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Li, Xin3" X-Patchwork-Id: 61157 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp756451wrd; Thu, 23 Feb 2023 23:30:06 -0800 (PST) X-Google-Smtp-Source: AK7set97rObOzq3Fgir2VJuqh+GMx3KKG+c6y6DQGy6/sfq4HqBEkxMrFEOxO+iMczjkbiC8Wuny X-Received: by 2002:a17:907:cb84:b0:8e1:d996:dca2 with SMTP id un4-20020a170907cb8400b008e1d996dca2mr13249973ejc.64.1677223806751; Thu, 23 Feb 2023 23:30:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677223806; cv=none; d=google.com; s=arc-20160816; b=eX3Mf4Q172z9m7F0IojR4N1Pg+oHFiQjBwKXMJLXJkRjDgNQfqNXu39m3bY1oz1sVh owe3Utp5KG+XbhNwTgvN0dPEqdYbhZ+gb2ZwTuVgsQUP2dlswD/8dD5LSwlQt6f0fAYK D5sfxyu5pqTpsfv2NvvoT8bsf0BHosw3Oo6MzmtzocsYUuKiNLQxI5OnWSpNTB04kHQr nYzFsB/ChtwKzSQp7OeZytpsKVIj8mW2+8KxGTxzkFNOuuzg0T8yqfH/HN2sdKXiD2Je nIBB0uAFky91OzfdN/KoY2ASJVAxc1EKjb3jj4gCRFBUdmoqz2TZxM+AVGlivmFd1tKq Nw8A== 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=yhD85PtebAkX7AUaAFoaWsAcsqkvOX3viGBDgZTMERg=; b=IBEhioj7iN9vZKp176gtSlptdmV3fyETMLIZ++Ai5JPJJJ/30m5JmrBUwVjrWShTHl 6YFfxU7rvNEjvpKA7SOO0Z7zefNBnw7nribJEs47KnAlu7t12zxvZy8k8uADrWHKJmtb iSph1XqdQuxvC6fE8VGoufsOxOvnt6qmHFDmFTlU4mKQ9AS8mRa6rQboaUw5mcwGfix7 RXheMQ2oiOBooADIJaUGsKXvn+yHPZ5N+2AXXJiY/T4W6vskHj1zm1Ctqeicu53ENKDg T79ucfO/tPeOYsREgnZAKEy8BqNKBarM9jWcUgdpaq0CqqnKwn8Uuk4cihJBWkrYOC55 H/Gw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="cfayCtg/"; 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 ca4-20020aa7cd64000000b004ab4d3c234csi11255237edb.430.2023.02.23.23.29.43; Thu, 23 Feb 2023 23:30:06 -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="cfayCtg/"; 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 S230008AbjBXH2r (ORCPT + 99 others); Fri, 24 Feb 2023 02:28:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40418 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229854AbjBXH2Q (ORCPT ); Fri, 24 Feb 2023 02:28:16 -0500 Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D82813B871; Thu, 23 Feb 2023 23:28:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1677223683; x=1708759683; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=DOSNEZFexx6rcKjeivP+6dofAP4lFXi0PU4el7mRCPw=; b=cfayCtg/qSSK8qR2tmbmLSZdnapv4PghcHymXEGt2ERLGQZbVfY6nRwF uQxz3S3s5jJZ+ATZyUCY0Pzw7oGa6FUUowmRcz3m6Tg0xk5i5ZQ0DXIRm vf9is//wXFbDAX7wF7wqVI8Az9z8RapbnA174u0pvYtea79w9JVpw/79A 9TzWPajLTykCmN9Prxc8q7zqC+U1IkhWT3DodbVqbFeTx/0Ay8JFOa7NM Dv8Y99ygPCKX0lddpGsMTujx85GdQH/G/KP6cPN1lJMXjhlw/ku8dI0TE lGrr56uYRktdoyEG4SgvDy7p59fvhOE4NbSifyBCDTXmVTF26Wi/G5/Hd A==; X-IronPort-AV: E=McAfee;i="6500,9779,10630"; a="334836049" X-IronPort-AV: E=Sophos;i="5.97,324,1669104000"; d="scan'208";a="334836049" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Feb 2023 23:27:23 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10630"; a="815639237" X-IronPort-AV: E=Sophos;i="5.97,324,1669104000"; d="scan'208";a="815639237" Received: from unknown (HELO fred..) ([172.25.112.68]) by fmsmga001.fm.intel.com with ESMTP; 23 Feb 2023 23:27:22 -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 v3 16/32] x86/fred: reserve space for the FRED stack frame Date: Thu, 23 Feb 2023 23:01:29 -0800 Message-Id: <20230224070145.3572-17-xin3.li@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230224070145.3572-1-xin3.li@intel.com> References: <20230224070145.3572-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, 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1758696630297942780?= X-GMAIL-MSGID: =?utf-8?q?1758696630297942780?= 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) 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 /*