Received: by 2002:a05:7412:f690:b0:e2:908c:2ebd with SMTP id ej16csp884201rdb; Fri, 20 Oct 2023 02:09:12 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGJSCxTAN6aSS7p6MkPo7DCBi2bm7HrHF4QIVkEn2dgygygSsaxCyzo3E8TX3AD3Ol3+ZKX X-Received: by 2002:a05:6a00:2308:b0:6be:367a:2a71 with SMTP id h8-20020a056a00230800b006be367a2a71mr1326085pfh.16.1697792952503; Fri, 20 Oct 2023 02:09:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697792952; cv=none; d=google.com; s=arc-20160816; b=JPR0h3ouQGqPqa1MSVDVWrZaqiIrG6snmLKs67Arnx+FKedBr4hCQjE0vuVwPEgdUO AcyIXuFXlIDKSL32OeRxaKmRiqEVRZ6Ie0YaKARlC2lAl1IoZmDWOTHZ9M+omhqLL7mn Vrwqcp4sNeuszHD08J5eUpmuFfvdMr6rFfjrXmRmcz9hLA3JLMAA6iWK2v8Xz9v1M1BX wLQ2w1cxiK+pLRJM8kduvkyBdrVZt7fvIOYtFFiJ0PhdTO3bYWMXsdILEPl65063TMf9 JxLVj5+iuLmiqKcU5JsaJPHbTM1C4e04t7+Ydbc7gRIpI5CflZV50ASJWWmis3rW265R aKWw== 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 :message-id:date:subject:cc:to:from; bh=sdhD6UJ5kNvE6rBRVwmtclM5i9jrGVO5sVfdDSZpK8A=; fh=hKzLdgK4HR+tiTg9dLSK89ALadeChc5zAyrWEZxRg98=; b=WsplVSGrEmZIuozkWc154ekq252xXHkYRCCFq50yVxXg58x3aXruBsLZvEYSXklGTl pDJTKsk5VX8vbymLBq+S4Ncp5uC7vu0YYkkT1oDnxdpo79j4HJfOim0kHVdSa32Onpt7 HDMqbNyrjBnQXkHISSStvovU3B1XhO+6htel+2tx07eH7wglDaWtFmLBbJTTZxMunGFl rtWsDqExhotiRaiv6SAYAlqRwNbAHQUwiwlS1VEKh0emgivUIsHPNQRJJh7VO/ufT/Vc 4g1C/q6ckh4zMT5hmMSerRIkBav5PQD4Uy8AI5w2C84Kn9Z8iGuB3k+18tZXYy54iuuE 9DUQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=antgroup.com Return-Path: Received: from agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id k124-20020a636f82000000b005ac13df150dsi1463557pgc.384.2023.10.20.02.09.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Oct 2023 02:09:12 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=antgroup.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id ED0388258996; Fri, 20 Oct 2023 02:09:09 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1376558AbjJTJI6 (ORCPT + 99 others); Fri, 20 Oct 2023 05:08:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59936 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1376523AbjJTJI5 (ORCPT ); Fri, 20 Oct 2023 05:08:57 -0400 Received: from out0-198.mail.aliyun.com (out0-198.mail.aliyun.com [140.205.0.198]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 96182AB; Fri, 20 Oct 2023 02:08:55 -0700 (PDT) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R401e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018047193;MF=houwenlong.hwl@antgroup.com;NM=1;PH=DS;RN=14;SR=0;TI=SMTPD_---.V3aO7cu_1697792930; Received: from localhost(mailfrom:houwenlong.hwl@antgroup.com fp:SMTPD_---.V3aO7cu_1697792930) by smtp.aliyun-inc.com; Fri, 20 Oct 2023 17:08:51 +0800 From: "Hou Wenlong" To: linux-kernel@vger.kernel.org Cc: "Hou Wenlong" , "Juergen Gross" , "Boris Ostrovsky" , "Darren Hart" , "Andy Shevchenko" , "Thomas Gleixner" , "Ingo Molnar" , "Borislav Petkov" , "Dave Hansen" , "=?UTF-8?B?bWFpbnRhaW5lcjpYODYgQVJDSElURUNUVVJFIDMyLUJJVCBBTkQgNjQtQklU?=" , "H. Peter Anvin" , "=?UTF-8?B?bW9kZXJhdGVkIGxpc3Q6WEVOIEhZUEVSVklTT1IgWDg2?=" , "=?UTF-8?B?b3BlbiBsaXN0Olg4NiBQTEFURk9STSBEUklWRVJTIC0gQVJDSA==?=" Subject: [PATCH] x86/xen/pvh: Enable PAE mode for 32-bit guest only when CONFIG_X86_PAE is set Date: Fri, 20 Oct 2023 17:08:42 +0800 Message-Id: <8c5448eeebbba998a7fff9ed9b2f7e7f3e437967.1697792461.git.houwenlong.hwl@antgroup.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-0.7 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.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 (agentk.vger.email [0.0.0.0]); Fri, 20 Oct 2023 02:09:10 -0700 (PDT) The PVH entry is available for 32-bit KVM guests, and 32-bit KVM guests do not depend on CONFIG_X86_PAE. However, mk_early_pgtbl_32() builds different pagetables depending on whether CONFIG_X86_PAE is set. Therefore, enabling PAE mode for 32-bit KVM guests without CONFIG_X86_PAE being set would result in a boot failure during CR3 loading. Signed-off-by: Hou Wenlong --- arch/x86/platform/pvh/head.S | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/x86/platform/pvh/head.S b/arch/x86/platform/pvh/head.S index c4365a05ab83..085adb1b2313 100644 --- a/arch/x86/platform/pvh/head.S +++ b/arch/x86/platform/pvh/head.S @@ -70,10 +70,12 @@ SYM_CODE_START_LOCAL(pvh_start_xen) mov $_pa(early_stack_end), %esp +#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE) /* Enable PAE mode. */ mov %cr4, %eax orl $X86_CR4_PAE, %eax mov %eax, %cr4 +#endif #ifdef CONFIG_X86_64 /* Enable Long mode. */ -- 2.31.1