From patchwork Fri Jun 9 05:51:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juergen Gross X-Patchwork-Id: 105277 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp734448vqr; Thu, 8 Jun 2023 22:58:49 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7h7nfvhvCeEQPFuWaubAz+UZQDwHE4lvvCvZ3vRrQ4wYfKLtMyJJS6bIU9F92H82kFRD9R X-Received: by 2002:a17:90b:4b91:b0:255:2dde:17cc with SMTP id lr17-20020a17090b4b9100b002552dde17ccmr383122pjb.47.1686290328530; Thu, 08 Jun 2023 22:58:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686290328; cv=none; d=google.com; s=arc-20160816; b=XwC33ud3q0KXO4h7LVSaBvXuaJzSj7gCayRb7YH5G7SNrtrnsc6auOjX3NNaGGolXL eoLGaM7NnaXNc+oRcRWtGn4avEXX6gLo/qdDFeWyskknotY21IQbuLgT8L6ZACFsvIu+ RtH91ckSSvWTn8jQsVcFvObEfeJqj8IsDvVUFEAa2sMWUFRtPrEoV7a+GO8hGxOsOGlL XWGG0bi7/CikYja093cBrVhfnnz1tI+acKGvEzmChKxC4Mzool84bc9QtV9OfEBnmTVl Znr/82Ry5OduIsWB2JhxudRgG6VP0yJ6mnXh6w7NtrtLpFroCqO4UJVgABfpH16ECvb1 G05A== 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:dkim-signature; bh=UyouZ59jZ1L5CU9YPnNfl4jMT/ujs57hNTuxiWy+JUQ=; b=P+fwoVeB4HN+2wfOPns7fFoIO6N7yX+I6EzDBxgKJDRnydI9Yd0pSSlmzsFEl0xuyi po39TtV6m6+Ji/t9oo5DAQCRtkFPsMqG55FVh8IcOYWXfiTd8MhwtxxnFH/ONcEZp6JB 8hasjtomA6/KT0Cqy8r1TIwQyyCQzm42CBWHHvlDzrjXh+xkYLV131u+t1GmgQnOu4l8 QLxeYH2FeDqcLJ6pXfE4kDtl2mdb/d7sVkPIv5R1RskCGp1zPjd7+EDUr2O5K4vCA1sp JsF2GSdIfm2wWR6snQYFD2iUaB/5DvyAU7pErRcVaqP0owTf3NOEw6zHdNk2ju0EZNtd rV2A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.com header.s=susede1 header.b=BrdZPt5S; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id r1-20020a17090a2e8100b002476baf6b4bsi2167364pjd.149.2023.06.08.22.58.34; Thu, 08 Jun 2023 22:58:48 -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=@suse.com header.s=susede1 header.b=BrdZPt5S; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236435AbjFIFvI (ORCPT + 99 others); Fri, 9 Jun 2023 01:51:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59190 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229537AbjFIFvH (ORCPT ); Fri, 9 Jun 2023 01:51:07 -0400 Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2001:67c:2178:6::1c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 90EB330D3 for ; Thu, 8 Jun 2023 22:51:04 -0700 (PDT) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id CDF8921A02; Fri, 9 Jun 2023 05:51:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1686289862; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=UyouZ59jZ1L5CU9YPnNfl4jMT/ujs57hNTuxiWy+JUQ=; b=BrdZPt5SEo12XNnFWwZQ1camI46oJRjkjWrxEliXh9XbNxCPYhjaNF1AE31E0cFCPgYD8X IDPEbTSw3DUhmlCr7IjHUPb/KVM2zr1WZ50607xKtCo6PyJhy4iorh6ObKUCCTQV36NibI S7BVsAWlTA1swVSRCuhaE/wvzlA72mY= Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 806DD133E6; Fri, 9 Jun 2023 05:51:02 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id tQPpHca9gmRsKAAAMHmgww (envelope-from ); Fri, 09 Jun 2023 05:51:02 +0000 From: Juergen Gross To: linux-kernel@vger.kernel.org, x86@kernel.org Cc: Juergen Gross , Dave Hansen , Andy Lutomirski , Peter Zijlstra , Thomas Gleixner , Ingo Molnar , Borislav Petkov , "H. Peter Anvin" Subject: [PATCH] x86/mm: Remove Xen-PV leftovers from init_32.c Date: Fri, 9 Jun 2023 07:51:00 +0200 Message-Id: <20230609055100.12633-1-jgross@suse.com> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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?1768203567252228474?= X-GMAIL-MSGID: =?utf-8?q?1768203567252228474?= There are still some unneeded paravirt calls in arch/x86/mm/init_32.c. Remove them. Signed-off-by: Juergen Gross --- arch/x86/mm/init_32.c | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c index d4e2648a1dfb..b63403d7179d 100644 --- a/arch/x86/mm/init_32.c +++ b/arch/x86/mm/init_32.c @@ -45,7 +45,6 @@ #include #include #include -#include #include #include #include @@ -74,7 +73,6 @@ static pmd_t * __init one_md_table_init(pgd_t *pgd) #ifdef CONFIG_X86_PAE if (!(pgd_val(*pgd) & _PAGE_PRESENT)) { pmd_table = (pmd_t *)alloc_low_page(); - paravirt_alloc_pmd(&init_mm, __pa(pmd_table) >> PAGE_SHIFT); set_pgd(pgd, __pgd(__pa(pmd_table) | _PAGE_PRESENT)); p4d = p4d_offset(pgd, 0); pud = pud_offset(p4d, 0); @@ -99,7 +97,6 @@ static pte_t * __init one_page_table_init(pmd_t *pmd) if (!(pmd_val(*pmd) & _PAGE_PRESENT)) { pte_t *page_table = (pte_t *)alloc_low_page(); - paravirt_alloc_pte(&init_mm, __pa(page_table) >> PAGE_SHIFT); set_pmd(pmd, __pmd(__pa(page_table) | _PAGE_TABLE)); BUG_ON(page_table != pte_offset_kernel(pmd, 0)); } @@ -181,12 +178,10 @@ static pte_t *__init page_table_kmap_check(pte_t *pte, pmd_t *pmd, set_pte(newpte + i, pte[i]); *adr = (void *)(((unsigned long)(*adr)) + PAGE_SIZE); - paravirt_alloc_pte(&init_mm, __pa(newpte) >> PAGE_SHIFT); set_pmd(pmd, __pmd(__pa(newpte)|_PAGE_TABLE)); BUG_ON(newpte != pte_offset_kernel(pmd, 0)); __flush_tlb_all(); - paravirt_release_pte(__pa(pte) >> PAGE_SHIFT); pte = newpte; } BUG_ON(vaddr < fix_to_virt(FIX_KMAP_BEGIN - 1) @@ -482,7 +477,6 @@ void __init native_pagetable_init(void) pfn, pmd, __pa(pmd), pte, __pa(pte)); pte_clear(NULL, va, pte); } - paravirt_alloc_pmd(&init_mm, __pa(base) >> PAGE_SHIFT); paging_init(); } @@ -491,15 +485,8 @@ void __init native_pagetable_init(void) * point, we've been running on some set of pagetables constructed by * the boot process. * - * If we're booting on native hardware, this will be a pagetable - * constructed in arch/x86/kernel/head_32.S. The root of the - * pagetable will be swapper_pg_dir. - * - * If we're booting paravirtualized under a hypervisor, then there are - * more options: we may already be running PAE, and the pagetable may - * or may not be based in swapper_pg_dir. In any case, - * paravirt_pagetable_init() will set up swapper_pg_dir - * appropriately for the rest of the initialization to work. + * This will be a pagetable constructed in arch/x86/kernel/head_32.S. + * The root of the pagetable will be swapper_pg_dir. * * In general, pagetable_init() assumes that the pagetable may already * be partially populated, and so it avoids stomping on any existing