From patchwork Thu Nov 17 07:56:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Shixin X-Patchwork-Id: 21471 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp256294wrr; Wed, 16 Nov 2022 23:17:55 -0800 (PST) X-Google-Smtp-Source: AA0mqf5c+Ayk8j5KYABDDlr1vYIpQ90I0fnyE1zua3jRE5RdRxJUc2dlmoJrN8VkkCGZzeuH38TF X-Received: by 2002:a65:4bc4:0:b0:430:57ec:c559 with SMTP id p4-20020a654bc4000000b0043057ecc559mr1042109pgr.53.1668669475016; Wed, 16 Nov 2022 23:17:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668669475; cv=none; d=google.com; s=arc-20160816; b=hqs+TwV0v8m7Nz8JkyjjINNXQAvAJr8iPHZQPPtC70WTVdfuDq2DydBJYLTj1wMZ7s D2TFYlLwI7lHqYj4R35cYCFGHzl4ZnmSGwSywE6WFvFmVR6Jpo2JAuqP1ybp2aEn8jTg HF5usXcP/woAcQ/EnD/RTtIfQPr+8f+IOyK8VneMKNzRomR7w+XSN9qzlChCqFRnw6Wl Q3rxmvAzA2cn7bwyRnuf29H6M0bMsgTzsT3yByKiDA88o3ezagLx3s7daSxppC5c1Kh4 yPmm79VriMsYVxMqhsTYMCRnHmWAErgw64nT4Ht37hXYzkHcU9lLIFKbe+GHKcsYevl8 CRsg== 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; bh=AZoCrMfCrkQzbC5YmqyZT3MYp1qNcQeD1d7g5HaM9S0=; b=jgKI4zRPzoIrVrLg8Ge5fZTnAIlJDwF4h11ueZdIBEBfJeMljzGbmCvuvSDgxYmdg9 Gur38Iu8vHlsLwAIflRrGufCxE0eAjyOtwkoyTzGf6PrM28L9s+9+Q4VZ0XdTqKiBktd fy45eFlEVqLk/mzjU+SWcP9JScoAqNaZ1PjZDM7F5WKHSDKMGB6kRZhrQj7VA5OsWeAC xbZICxzSDEjZXGWj7/2Fsp1kZaG1bHvT6sGQZmJiq2cefIM5F1+d+Rm7YExMljC3XsxF vQlI1+oWQ1HMfEh3ChqvskjnluXxlWotA/7NB0K1oGcIByypNlHBgjTeuLYiuCofRQ0T gosA== ARC-Authentication-Results: i=1; mx.google.com; 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=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 132-20020a63008a000000b0042af7555d10si277348pga.862.2022.11.16.23.17.42; Wed, 16 Nov 2022 23:17:55 -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; 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=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238603AbiKQHIh (ORCPT + 99 others); Thu, 17 Nov 2022 02:08:37 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49610 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238868AbiKQHIf (ORCPT ); Thu, 17 Nov 2022 02:08:35 -0500 Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2B13D19028 for ; Wed, 16 Nov 2022 23:08:28 -0800 (PST) Received: from dggpemm500021.china.huawei.com (unknown [172.30.72.57]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4NCWC12qQZzJnlk; Thu, 17 Nov 2022 15:05:17 +0800 (CST) Received: from dggpemm100009.china.huawei.com (7.185.36.113) by dggpemm500021.china.huawei.com (7.185.36.109) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Thu, 17 Nov 2022 15:08:26 +0800 Received: from huawei.com (10.175.113.32) by dggpemm100009.china.huawei.com (7.185.36.113) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Thu, 17 Nov 2022 15:08:26 +0800 From: Liu Shixin To: Catalin Marinas , Will Deacon , Denys Vlasenko , Kefeng Wang , Anshuman Khandual , David Hildenbrand , Rafael Aquini , Pasha Tatashin CC: , , Liu Shixin Subject: [PATCH v2 1/2] arm64/mm: fix incorrect file_map_count for non-leaf pmd/pud Date: Thu, 17 Nov 2022 15:56:01 +0800 Message-ID: <20221117075602.2904324-2-liushixin2@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221117075602.2904324-1-liushixin2@huawei.com> References: <20221117075602.2904324-1-liushixin2@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.113.32] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To dggpemm100009.china.huawei.com (7.185.36.113) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS 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?1749726763319116517?= X-GMAIL-MSGID: =?utf-8?q?1749726763319116517?= The page table check trigger BUG_ON() unexpectedly when collapse hugepage: ------------[ cut here ]------------ kernel BUG at mm/page_table_check.c:82! Internal error: Oops - BUG: 00000000f2000800 [#1] SMP Dumping ftrace buffer: (ftrace buffer empty) Modules linked in: CPU: 6 PID: 68 Comm: khugepaged Not tainted 6.1.0-rc3+ #750 Hardware name: linux,dummy-virt (DT) pstate: 60000005 (nZCv daif -PAN -UAO -TCO -DIT -SSBS BTYPE=--) pc : page_table_check_clear.isra.0+0x258/0x3f0 lr : page_table_check_clear.isra.0+0x240/0x3f0 [...] Call trace: page_table_check_clear.isra.0+0x258/0x3f0 __page_table_check_pmd_clear+0xbc/0x108 pmdp_collapse_flush+0xb0/0x160 collapse_huge_page+0xa08/0x1080 hpage_collapse_scan_pmd+0xf30/0x1590 khugepaged_scan_mm_slot.constprop.0+0x52c/0xac8 khugepaged+0x338/0x518 kthread+0x278/0x2f8 ret_from_fork+0x10/0x20 [...] Since pmd_user_accessible_page() doesn't check if a pmd is leaf, it decrease file_map_count for a non-leaf pmd comes from collapse_huge_page(). and so trigger BUG_ON() unexpectedly. Fix this problem by using pmd_leaf() insteal of pmd_present() in pmd_user_accessible_page(). Moreover, use pud_leaf() for pud_user_accessible_page() too. Fixes: 42b2547137f5 ("arm64/mm: enable ARCH_SUPPORTS_PAGE_TABLE_CHECK") Reported-by: Denys Vlasenko Signed-off-by: Liu Shixin Reviewed-by: David Hildenbrand Acked-by: Pasha Tatashin Reviewed-by: Kefeng Wang Acked-by: Will Deacon Reviewed-by: Anshuman Khandual --- arch/arm64/include/asm/pgtable.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h index 71a1af42f0e8..edf6625ce965 100644 --- a/arch/arm64/include/asm/pgtable.h +++ b/arch/arm64/include/asm/pgtable.h @@ -863,12 +863,12 @@ static inline bool pte_user_accessible_page(pte_t pte) static inline bool pmd_user_accessible_page(pmd_t pmd) { - return pmd_present(pmd) && (pmd_user(pmd) || pmd_user_exec(pmd)); + return pmd_leaf(pmd) && (pmd_user(pmd) || pmd_user_exec(pmd)); } static inline bool pud_user_accessible_page(pud_t pud) { - return pud_present(pud) && pud_user(pud); + return pud_leaf(pud) && pud_user(pud); } #endif