From patchwork Mon Mar 27 07:58:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Li, Xin3" X-Patchwork-Id: 75279 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1358447vqo; Mon, 27 Mar 2023 01:41:03 -0700 (PDT) X-Google-Smtp-Source: AKy350aNbxAuM6WEHhZ8TdBgOzwrWJl1Qn8N8pUB8fBHorPHQV3hKkT+UVWJXgWJxvJV2SCgeeUa X-Received: by 2002:aa7:8f37:0:b0:5a8:4861:af7d with SMTP id y23-20020aa78f37000000b005a84861af7dmr11512471pfr.20.1679906463370; Mon, 27 Mar 2023 01:41:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679906463; cv=none; d=google.com; s=arc-20160816; b=X2qS5NAWsCpPzRmTLhJJSw8PTX0q6uLDYLGqXJDkQwpsZFyhLv+Hgeofs+DH0ChQbx 1n6kf7GtbKHFcl/acXZfG9oY6TdXBzXOLZ6ABTjpyrhQfZHrI87iVKY3DNqheNnEWaMT Yy6d8a7FVJup8Ib/nBxhmoDZ9FRmBCsaFSLaO96qfqj8XqdhNApbUHH/9Ji6ZgRO8EfR om8xHVF8iwI92ETaDDNusM+FFFEVR4nvxols7nUxDkKXA6ka4A0+GSxmgfRDNjE0xPVk 49JQFc6IONPuQoyv+Fvfuni8txRFMuJCqtO2vSPAQZTvJd0qxQuSAmsGaOU2NiQA3h13 BKCg== 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=LOLAFx3Q81ZufDeZbj7uDaScN7oY36aG/HpEQYYoQ3tFRZLwBSOGTvwtjVxzXI4Xpv JPwoij0Y2oELmSj5JdlA1ZqczSEjz9Nw4WRVyMtWKKlBtEwJyuhculA/sSQXMlKSvxW9 0/zs6DLYxC8yyGAQKTk+2NkUAhkcG414U6ydnK7SJ3OYBtNi30HOcC/izgcCSTSFoa2W Wmh0sfnQd+13LNmuIIX2AkWc2DoFoqeAW0o+JezCKk89v4YVZCe42fhWBCcN4NH+juVy GYQYuhlgnc8bCzPpFlGbMVvO8y6jx6tCxAxv8595LbjCmdYIQH852Q8obrPXgbu7STh8 BJHw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="O/GbxqLr"; 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 b1-20020a056a000a8100b0062621720b76si27394204pfl.85.2023.03.27.01.40.50; Mon, 27 Mar 2023 01:41:03 -0700 (PDT) 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="O/GbxqLr"; 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 S233265AbjC0IZl (ORCPT + 99 others); Mon, 27 Mar 2023 04:25:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59822 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233049AbjC0IYh (ORCPT ); Mon, 27 Mar 2023 04:24:37 -0400 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D3A5444AE; Mon, 27 Mar 2023 01:24:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1679905476; x=1711441476; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=voFQVjFSRNzDP3of726cqSfwzN6e3VmowuyZWcsyuKM=; b=O/GbxqLrYaW8G296BKcVpenILyRSEK2Q4XazWhgjj/v+/8Wx/8W/8psr et74+Yk09b5tPGaMK4NyFOHHJpLqGl2XTRPPr1oQD3yGpFuKIDiroWJWm e2kgJNi/5pwJIb2lR0nYqFs8g4IfSYIAS6G5l5oNVACRwcHoSsMO+kcAu 28dSjH7pqgxEo3WOWhECYHXeqUYPf7/7REqTghgTbnKHFE890fEviM+SH fQ230CKL3SNtl6+WqdxLWVMqTflasn+aa3dFQ9ReSNcKjjHL7N90HWNzg LztzM3phmZL6yE5xO8UOM/8Yubswxi5hUOs856wB8OVFqVgUXLkrf/71q Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10661"; a="338930240" X-IronPort-AV: E=Sophos;i="5.98,294,1673942400"; d="scan'208";a="338930240" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Mar 2023 01:24:35 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10661"; a="713787084" X-IronPort-AV: E=Sophos;i="5.98,294,1673942400"; d="scan'208";a="713787084" Received: from unknown (HELO fred..) ([172.25.112.68]) by orsmga008.jf.intel.com with ESMTP; 27 Mar 2023 01:24:35 -0700 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, jiangshanlai@gmail.com, shan.kang@intel.com Subject: [PATCH v6 15/33] x86/fred: reserve space for the FRED stack frame Date: Mon, 27 Mar 2023 00:58:20 -0700 Message-Id: <20230327075838.5403-16-xin3.li@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230327075838.5403-1-xin3.li@intel.com> References: <20230327075838.5403-1-xin3.li@intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.5 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE autolearn=unavailable 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?1761509600125835044?= X-GMAIL-MSGID: =?utf-8?q?1761509600125835044?= 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 /*