From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id DB16AC07548 for ; Wed, 15 Nov 2023 12:01:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=edcx3PPOeIqGjGCRdjl5pBb3idJFVU4KbWuVnvAJYZk=; b=zaxBHK7ywdI8ox 89tQFsO76/pu+KS3cXu65XZQikIfN0Pa18XySJQhEOQM1Plm077J9Kfo1TaaqJfHhFcBy1ZWmIq31 COzTgG5D4Jr0u+rjKA63RjuQFk/+z2XBS0N9vQGycgO9EEwuFDGvY1Uqw1iGDPLTi91V1P7wumepB N8/HTpQenR8PZ28a9IQZvWPWX+s99ydjB/ZR8bYly3hCs4p3R9iqvS7ytm93b8gLkyLCO3DqtrkE5 emk0YforqBA/1bC9VVLxqwYZekFCvtoOb9Iu7KXl6xKxaXucGKVYN33UO8haxxfm9yFKmKqh2cn+Q 6GLH1k3bSmoUqUA3LKlw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1r3Eag-000jkP-0t; Wed, 15 Nov 2023 12:01:54 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1r3Eae-000jiz-0z for kexec@bombadil.infradead.org; Wed, 15 Nov 2023 12:01:52 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=nRb9odYj0zuUgjn5mN2pRzKe6eite6Cnh5+z/pgqCLI=; b=B69rCxeEwhpf2JTeSy6PNp6VzT mTA6/Zl4cgdGmJmiEC7lTf2G6YGUSOM6zhP6+ADvIBFQtlXN/+skv8Ck3E90zx2WyIXZjHPptzh2R waZmeFynTlT89JVakfGWVVw3645A2FWekbve5BfFgXo472gHtRlUKeA5MrjU3oSw7V/8SBYIKwO6q JoTfKwIpeF8dyXFALfu4CjujgnoAJJbpTL1jQdqHaveQbaS/58R6dkQOwRdquGUytQIxVhrB2mQDV xIaRILnhC9LfHhfIzey8eCzdKiqL0ncm2j9lysf3pgi5grUuMuYfQnRhblYdfj5Hag5RWiz0WiAmV ty9Bqocw==; Received: from mgamail.intel.com ([192.198.163.7]) by desiato.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1r3EaZ-003zHa-1a for kexec@lists.infradead.org; Wed, 15 Nov 2023 12:01:50 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1700049708; x=1731585708; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=7MgS2tz+eXb3t+LyzYLE/xkq/zAhJTq68EvRtEFLASY=; b=h5cu3pgthzxdkM89X5hIt8jG9aK2C5ZjIeCDQwpEM4WMCDQ5FBzYzjtN fZpH6Wykyfy8lkqxO5E5HzuJeBKSuKUHgBZhb9SrKDxAQOd12aHSIhGfA aqSiJVk0Qx9OdlFm66dQ1lCjpmt+a/QvlIDZizkfccRjffuDbWmkw3zYq UEaA0qQg+Ykjy0AwPRma//K15Rk3vGcrcvofBxq4OScnIwju0edcfmFQ4 PdEqnzuFgpUPCuWhCUDmHGKXzJy32VKBOtjp+Ar2vzwzehPzfj1eizg31 M4/0RfKfmrUbDegrw6sL2ouZRQwsD41N7qkQIEFRmwsSVXOepSQTP/6mw A==; X-IronPort-AV: E=McAfee;i="6600,9927,10894"; a="12411966" X-IronPort-AV: E=Sophos;i="6.03,304,1694761200"; d="scan'208";a="12411966" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by fmvoesa101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Nov 2023 04:01:28 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.03,304,1694761200"; d="scan'208";a="6377702" Received: from mituomis-mobl.ger.corp.intel.com (HELO box.shutemov.name) ([10.249.44.135]) by fmviesa002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Nov 2023 04:01:21 -0800 Received: by box.shutemov.name (Postfix, from userid 1000) id 85A4210A301; Wed, 15 Nov 2023 15:01:12 +0300 (+03) From: "Kirill A. Shutemov" To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org Cc: "Rafael J. Wysocki" , Peter Zijlstra , Adrian Hunter , Kuppuswamy Sathyanarayanan , Elena Reshetova , Jun Nakajima , Rick Edgecombe , Tom Lendacky , "Kalra, Ashish" , Sean Christopherson , "Huang, Kai" , Baoquan He , kexec@lists.infradead.org, linux-coco@lists.linux.dev, linux-kernel@vger.kernel.org, "Kirill A. Shutemov" Subject: [PATCHv3 08/14] x86/mm: Return correct level from lookup_address() if pte is none Date: Wed, 15 Nov 2023 15:00:38 +0300 Message-ID: <20231115120044.8034-9-kirill.shutemov@linux.intel.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231115120044.8034-1-kirill.shutemov@linux.intel.com> References: <20231115120044.8034-1-kirill.shutemov@linux.intel.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231115_120149_140365_CDBB871F X-CRM114-Status: GOOD ( 13.39 ) X-BeenThere: kexec@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "kexec" Errors-To: kexec-bounces+kexec=archiver.kernel.org@lists.infradead.org lookup_address() only returns correct page table level for the entry if the entry is not none. Make the helper to always return correct 'level'. It allows to implement iterator over kernel page tables using lookup_address(). Add one more entry into enum pg_level to indicate size of VA covered by one PGD entry in 5-level paging mode. Signed-off-by: Kirill A. Shutemov Reviewed-by: Rick Edgecombe --- arch/x86/include/asm/pgtable_types.h | 1 + arch/x86/mm/pat/set_memory.c | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/arch/x86/include/asm/pgtable_types.h b/arch/x86/include/asm/pgtable_types.h index 0b748ee16b3d..3f648ffdfbe5 100644 --- a/arch/x86/include/asm/pgtable_types.h +++ b/arch/x86/include/asm/pgtable_types.h @@ -548,6 +548,7 @@ enum pg_level { PG_LEVEL_2M, PG_LEVEL_1G, PG_LEVEL_512G, + PG_LEVEL_256T, PG_LEVEL_NUM }; diff --git a/arch/x86/mm/pat/set_memory.c b/arch/x86/mm/pat/set_memory.c index 6fbf22d5fa56..01f827eb8e80 100644 --- a/arch/x86/mm/pat/set_memory.c +++ b/arch/x86/mm/pat/set_memory.c @@ -666,32 +666,32 @@ pte_t *lookup_address_in_pgd(pgd_t *pgd, unsigned long address, pud_t *pud; pmd_t *pmd; - *level = PG_LEVEL_NONE; + *level = PG_LEVEL_256T; if (pgd_none(*pgd)) return NULL; + *level = PG_LEVEL_512G; p4d = p4d_offset(pgd, address); if (p4d_none(*p4d)) return NULL; - *level = PG_LEVEL_512G; if (p4d_large(*p4d) || !p4d_present(*p4d)) return (pte_t *)p4d; + *level = PG_LEVEL_1G; pud = pud_offset(p4d, address); if (pud_none(*pud)) return NULL; - *level = PG_LEVEL_1G; if (pud_large(*pud) || !pud_present(*pud)) return (pte_t *)pud; + *level = PG_LEVEL_2M; pmd = pmd_offset(pud, address); if (pmd_none(*pmd)) return NULL; - *level = PG_LEVEL_2M; if (pmd_large(*pmd) || !pmd_present(*pmd)) return (pte_t *)pmd; -- 2.41.0 _______________________________________________ kexec mailing list kexec@lists.infradead.org http://lists.infradead.org/mailman/listinfo/kexec