From patchwork Tue Oct 3 06:24:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Li, Xin3" X-Patchwork-Id: 147650 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp1898625vqb; Mon, 2 Oct 2023 23:55:18 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHI44OYjDchgepV4FrH329XPHNwXmHqNsSxrX8EkVyvJay+HOs3S/0Xw4xl+guRP6QT5ULe X-Received: by 2002:a1f:6d84:0:b0:495:bf44:6a07 with SMTP id i126-20020a1f6d84000000b00495bf446a07mr10054229vkc.9.1696316117774; Mon, 02 Oct 2023 23:55:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696316117; cv=none; d=google.com; s=arc-20160816; b=fVBv8AWLahA0mZuTEqjxb/tqa/ttqXfJP00QuLhqPeAfY8Xq5DKUO4rTOKVkTHdA+y oAUxjM0ic46YJb4ni+IkQESDVotEuFajEKM8rZDB3UdpztqqmU124xDye6NggABsiVZy zODZOryv6lGXQRwQz632X6synOGUjznQOIxxFjUSvpPGH/NW0mrEr3F/GhS9JYAL+cHA Ma5UOt3qc3dROSnMNwFCV8ZFtHT70crXJv8rxKilvCNuWmzbmbP2zSgan5Ys0BOTA6zf UAXzOPkuCqknAwy9g7kMR/S1fZukDNXyC6l3WxZPk1kuGmcD1u+pLx0FbBbhUlX4k/r8 bhaw== 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=kouhClWt5wfV/1DpHpmEObJS0mYBb/EzIRFfqanKAqI3HuZUJgcEGufMpHpRyXZLnk nZQkKUy8ir+zx/e7hUYsbO0XTaIaz+YiaisApx6ub3pC2QvB+72EcG59PlxQY1vCWQ4V WrOKWtvhnmyrKqtf3PeJhJFIwsm5quO/ncbb+nDbwhwyK6dm2GjaF+tBra6EZ1d04CAP X6+p687njIe80NvrrnjNuUcOh7t2htkbnHquSBzQR85+l5rkW/9v+Vfls0bYg71X4HzA u00xjVoJE5MxwtJBiZAkMdrxZw1vp/GF9ENXWkotkUwPG2XUjV5uOkU63jhMDyyFuky5 /IOg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="XNx/RclM"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 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 howler.vger.email (howler.vger.email. [2620:137:e000::3:4]) by mx.google.com with ESMTPS id p18-20020a17090adf9200b00276bf69ac44si804963pjv.5.2023.10.02.23.55.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Oct 2023 23:55:17 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="XNx/RclM"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 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 howler.vger.email (Postfix) with ESMTP id 94408822DA38; Mon, 2 Oct 2023 23:55:16 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239318AbjJCGzK (ORCPT + 18 others); Tue, 3 Oct 2023 02:55:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50030 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239234AbjJCGyy (ORCPT ); Tue, 3 Oct 2023 02:54:54 -0400 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.126]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C804311C; Mon, 2 Oct 2023 23:54:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1696316088; x=1727852088; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=f4gesqgoemAM7gLIVW0tfHuShJv23oH28+TguMOULZ8=; b=XNx/RclM0xEqw4CBaxkn2NWr1vRqeAqWPKUXPlYHfPZCU1FB6X7fu5yv 4cXQnXvMAtDNTtEoMcOdc26lh08Dmpev0POi5kxfsbD6cX9uhqqJ2S1Kq nIspiYC0AVLwtp4AR+lnzQiK31P57XsqgpQEfn4wxoFXfWsOOP92rSgnN xCRortvC5W4x03HYwZ/UhCuzsJvqv+kJy8xO1btwJYTsFviYg17BXQTgv CwurjzxKUA82mS7NC+ndlBp0RX7ETmlgjQMe9t3FmxKEp2KjAiTlyFDEU 7mX2IR/VxFJD4x4uZRrD9L65iuKUt9+ZoszBqopRV3gDSfbpGGRwYBHjv Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10851"; a="367858112" X-IronPort-AV: E=Sophos;i="6.03,196,1694761200"; d="scan'208";a="367858112" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Oct 2023 23:54:44 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10851"; a="1081900951" X-IronPort-AV: E=Sophos;i="6.03,196,1694761200"; d="scan'208";a="1081900951" Received: from unknown (HELO fred..) ([172.25.112.68]) by fmsmga005.fm.intel.com with ESMTP; 02 Oct 2023 23:54:43 -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 v12 18/37] x86/fred: Reserve space for the FRED stack frame Date: Mon, 2 Oct 2023 23:24:39 -0700 Message-Id: <20231003062458.23552-19-xin3.li@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231003062458.23552-1-xin3.li@intel.com> References: <20231003062458.23552-1-xin3.li@intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Mon, 02 Oct 2023 23:55:16 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778716369634865733 X-GMAIL-MSGID: 1778716369634865733 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 /*