From patchwork Thu Mar 2 05:24: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: 63224 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp4063533wrd; Wed, 1 Mar 2023 21:53:22 -0800 (PST) X-Google-Smtp-Source: AK7set9MqG2iT1mZQB2qO/kqra8rVRoz2IPSWGkxOdjhgZ4QmeLYAHCplG/AhPoX3ANZK1m0NGUA X-Received: by 2002:a17:907:25c2:b0:8e1:12b6:a8fc with SMTP id ae2-20020a17090725c200b008e112b6a8fcmr11278865ejc.4.1677736402184; Wed, 01 Mar 2023 21:53:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677736402; cv=none; d=google.com; s=arc-20160816; b=U6gtxyDhjGmNAxUj0QUyiwUGrfUgz1pUG2jGfR8XPCRKbCBs/AqlDLXbU2p1M6D+GI whSvY4f2++8z+YuiBKcRYJ0ziEnJ5d9gHE+UdQs9XTYmCjHOfy9Jc0fL0lna+O5Jfk/H EqqO13c1rMsmU1FYJ032ybhILQO6Xu6klod5xjkyO6g0YdwFT6W99NHJ6krwUH2AQfKD LSj+NoALNWktDq2cXVvcdLZunuMyEL4ahZkauNOB0f1tfZ1R+PQF+n6nfvydLgIDULR4 g2gBQ8Z/j+3QbQoycKtPc0Tfi3EpMAl39TSekS0+IFoLzex0E7OM9QvRgyxPdq/5AN/N Vz1w== 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=IQgv7IXkVBlSTEzBtwlBR6PEX8IabIg7jq2KxZ31IyzHp2cbjO4Nn+3ZNIkHb8UIQK 4SzXsRQo50yTclp70YPDMrb71gWLyuBfeLVBHY0GpJ0EoZ9mFAX4m+xkLx46cUYNRNJK b3tRVx662JkXioSGDPHkaF8hGLKzb491wJ1tm6QUY9lPjHbqJXqHw+AK2J5Dqin6Sv+i ppeeoYYEg7M2TW7UIaUEK+ZZ7IgcHk98/EWA5k3owQKRAzoiJgQoVKO5lZMpPbJCTFIf 1KQnESROOpcsIEMLg2Rs64sbL6FIug7v9Tz2uRphoGbyxEcL817Bsw3u5XnsWl4wPLIk sVLg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=gjEX5fzf; 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 v12-20020a170906338c00b008e0bd541c5fsi14036521eja.926.2023.03.01.21.52.57; Wed, 01 Mar 2023 21:53:22 -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=gjEX5fzf; 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 S230052AbjCBFvy (ORCPT + 99 others); Thu, 2 Mar 2023 00:51:54 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44974 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229965AbjCBFva (ORCPT ); Thu, 2 Mar 2023 00:51:30 -0500 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 54D0C4E5E8; Wed, 1 Mar 2023 21:51:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1677736260; x=1709272260; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=voFQVjFSRNzDP3of726cqSfwzN6e3VmowuyZWcsyuKM=; b=gjEX5fzftlhKADWO1Mdk4T6ESyjkokRqYTUmr33Gpwu4gZvzuRWbXkkG lii4AJWxJlatWFWQqfGNmKKbRFyvTcFrH96jB92TD68cKdvP0oAwfe6rR Y84C4Dym6rwsKtW1AYFRdf0HI3qH0jlzGoaYpFC1hev0OE+PkDJUDgGQX u8P+90BgKutUuUVEeVzrpgZ6TS41qonA5v1j5tW8g+IyBXvaGernsS3IU Erw9jHksdGXk5VEsUAJZZJbekttBPnEZaFoLfA8DvvX9nPFkB8FzIo2RR yD/eZXUslpmp7Y4h3k8SdFGxC5TW67OVqPzfKuZREkSn7+4Nh3LH7zqoF Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10636"; a="420887199" X-IronPort-AV: E=Sophos;i="5.98,226,1673942400"; d="scan'208";a="420887199" 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="920530921" X-IronPort-AV: E=Sophos;i="5.98,226,1673942400"; d="scan'208";a="920530921" Received: from unknown (HELO fred..) ([172.25.112.68]) by fmsmga006.fm.intel.com with ESMTP; 01 Mar 2023 21:50:48 -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 16/34] x86/fred: reserve space for the FRED stack frame Date: Wed, 1 Mar 2023 21:24:53 -0800 Message-Id: <20230302052511.1918-17-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?1759234125659500993?= X-GMAIL-MSGID: =?utf-8?q?1759234125659500993?= 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 /*