Received: by 2002:a6b:500f:0:0:0:0:0 with SMTP id e15csp5912994iob; Tue, 10 May 2022 06:36:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyHKzFW2RTzDgm2bENLl7NzBgk+ojwdQHTmczTefBlzcVRx+nUHabP4xSoOJJtrL3UcSiBr X-Received: by 2002:a17:90a:5215:b0:1ca:79cf:f3dd with SMTP id v21-20020a17090a521500b001ca79cff3ddmr92099pjh.6.1652189762918; Tue, 10 May 2022 06:36:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1652189762; cv=none; d=google.com; s=arc-20160816; b=rvI/a3Bh4QNFZl2nnR0BwLug6prDQWCIJCbkz8pDyHQUgY38a1W430z+B/KRhk5r0L UPDEEoohZBXyUF9NcLvmOhJlpdINJT4KupieXAdmSNPgW71Ju12WcBSpYuss7DWv7flR tMSb5Q2eSzVvgWCwgw7PkpZ8g3UZboCQGdJzlJJ3lp/6gRHjULAi0jgTPBrDx3gArZpD +vNyRO8bDi4k9J3BR7J3D0AAOiK1P1E2RerY2qFYG+l0h6/hlS3F8Isq/URoTEiUzAfN iZOMBQq/2sPAc3PGIbjA+oHdl8H0bQxFiYDO30SPC3L1YKv4YudvMcsWhcpfnRTHOFdA OlIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:message-id:date:subject:cc:to:from; bh=UPwyVHlBDiqFx7R00nuFhuDYZQ68tOxbdMPuV/EKwsI=; b=wIllJgBWGgt+9/1xEtEzOE+ojGjMT3BeaQJDZF2Hbu9LJifHyeF2PfYo+QVd2HDzQI ZwXyjUfYkjBO67gstsAp/f4ceym2XKdetuSZt+AupUgdxQ0UI/+nWAHXmVyy1QsM9vWj K6SEi8gN3DIUd6W8CqgnQtRCnEG61oBZUla+VVjuIqUzSXqQV8eUZVzrBkyKV4qOrzQA oPmlg3wV1Kn+4aN2bd+zutfVzeT0sSK+APWqS3GKXd0LSJZW7tOl/x/NU1ocT2P0E+Wn hNcGetxOWMLFFz8OyaTEKXrqoqxFOQaivTLTjTItgSyky6/tR9sH3z/c+ifJMLHL/e5N +87w== 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 Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 77-20020a630250000000b003aaa7a8baa1si17639075pgc.467.2022.05.10.06.35.47; Tue, 10 May 2022 06:36:02 -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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239470AbiEJKGk (ORCPT + 99 others); Tue, 10 May 2022 06:06:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39574 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239459AbiEJKGa (ORCPT ); Tue, 10 May 2022 06:06:30 -0400 Received: from loongson.cn (mail.loongson.cn [114.242.206.163]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 7769613C34F; Tue, 10 May 2022 03:02:32 -0700 (PDT) Received: from localhost.localdomain.localdomain (unknown [10.2.5.46]) by mail.loongson.cn (Coremail) with SMTP id AQAAf9AxOtgVOHpi0_UPAA--.222S2; Tue, 10 May 2022 18:02:13 +0800 (CST) From: Hongchen Zhang To: Thomas Bogendoerfer , Palmer Dabbelt , Anshuman Khandual , Andrew Morton , Mike Rapoport , Guo Ren , Hongchen Zhang , "Aneesh Kumar K.V" Cc: linux-mips@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] MIPS: fix pmd_bad check for huge pmd Date: Tue, 10 May 2022 18:01:48 +0800 Message-Id: <1652176908-22288-1-git-send-email-zhanghongchen@loongson.cn> X-Mailer: git-send-email 1.8.3.1 X-CM-TRANSID: AQAAf9AxOtgVOHpi0_UPAA--.222S2 X-Coremail-Antispam: 1UD129KBjvJXoWxJr4xWF48Zw4DGw1rWF45Wrg_yoW8Gr1rpF srAF9YgFW2gFyfGFy5Ar93Kr13Aa9xGr90gw1q93WDJa45XF47Jrn3Kw1YvF18XayqvFW8 WFy7XF15Cr4Ivw7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUvl14x267AKxVW8JVW5JwAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2ocxC64kIII0Yj41l84x0c7CEw4AK67xGY2AK02 1l84ACjcxK6xIIjxv20xvE14v26ryj6F1UM28EF7xvwVC0I7IYx2IY6xkF7I0E14v26F4j 6r4UJwA2z4x0Y4vEx4A2jsIE14v26F4UJVW0owA2z4x0Y4vEx4A2jsIEc7CjxVAFwI0_Gc CE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xvF2IEw4CE5I8CrVC2j2WlYx0E 2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE14v26r1j6r4UMcvjeVCFs4IE7xkEbVWUJV W8JwACjcxG0xvY0x0EwIxGrwACjI8F5VA0II8E6IAqYI8I648v4I1lFIxGxcIEc7CjxVA2 Y2ka0xkIwI1lc2xSY4AK6svPMxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r 4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF 67AKxVWUtVW8ZwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r1j6r1xMIIF0xvE2I x0cI8IcVCY1x0267AKxVWUJVW8JwCI42IY6xAIw20EY4v20xvaj40_WFyUJVCq3wCI42IY 6I8E87Iv67AKxVWUJVW8JwCI42IY6I8E87Iv6xkF7I0E14v26r1j6r4UYxBIdaVFxhVjvj DU0xZFpf9x0JUdHUDUUUUU= X-CM-SenderInfo: x2kd0w5krqwupkhqwqxorr0wxvrqhubq/ X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_PASS, SPF_PASS,T_SCC_BODY_TEXT_LINE 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 a huge pmd is also a bad pmd,so make pmd_bad return 1 when passed in a huge pmd. Signed-off-by: Hongchen Zhang --- arch/mips/include/asm/pgtable-32.h | 6 ------ arch/mips/include/asm/pgtable-64.h | 6 ------ 2 files changed, 12 deletions(-) diff --git a/arch/mips/include/asm/pgtable-32.h b/arch/mips/include/asm/pgtable-32.h index 95df9c2..252887b 100644 --- a/arch/mips/include/asm/pgtable-32.h +++ b/arch/mips/include/asm/pgtable-32.h @@ -129,12 +129,6 @@ static inline int pmd_none(pmd_t pmd) static inline int pmd_bad(pmd_t pmd) { -#ifdef CONFIG_MIPS_HUGE_TLB_SUPPORT - /* pmd_huge(pmd) but inline */ - if (unlikely(pmd_val(pmd) & _PAGE_HUGE)) - return 0; -#endif - if (unlikely(pmd_val(pmd) & ~PAGE_MASK)) return 1; diff --git a/arch/mips/include/asm/pgtable-64.h b/arch/mips/include/asm/pgtable-64.h index 41921ac..ef52812 100644 --- a/arch/mips/include/asm/pgtable-64.h +++ b/arch/mips/include/asm/pgtable-64.h @@ -249,12 +249,6 @@ static inline int pmd_none(pmd_t pmd) static inline int pmd_bad(pmd_t pmd) { -#ifdef CONFIG_MIPS_HUGE_TLB_SUPPORT - /* pmd_huge(pmd) but inline */ - if (unlikely(pmd_val(pmd) & _PAGE_HUGE)) - return 0; -#endif - if (unlikely(pmd_val(pmd) & ~PAGE_MASK)) return 1; -- 1.8.3.1