From patchwork Sun Mar 28 16:42:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Morton X-Patchwork-Id: 410784 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B935BC433E3 for ; Sun, 28 Mar 2021 16:43:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7925F6196D for ; Sun, 28 Mar 2021 16:43:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231267AbhC1Qmz (ORCPT ); Sun, 28 Mar 2021 12:42:55 -0400 Received: from mail.kernel.org ([198.145.29.99]:55496 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231331AbhC1Qmg (ORCPT ); Sun, 28 Mar 2021 12:42:36 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 86A4561968; Sun, 28 Mar 2021 16:42:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1616949755; bh=eF3HTBuQwU9xqQ5IgwbMWjJH8gSTk8vEMl33GoZUnhM=; h=Date:From:To:Subject:From; b=EP9epRbsYm7GCEdLbkVn/z5fVBdXEoKFHpUhMpP3uEha4iOI1POWY6MvA/i2yr1Y0 9Ii2aXLd+SpQWOwayBkX7mZdRbKayM7QnKmlQIhc6+6s7fXx3wzpryeQ73dggN14Dq xtwahYP3RLjLZLR49id81fT5ZlMhJwNDtDZTmp7g= Date: Sun, 28 Mar 2021 09:42:35 -0700 From: akpm@linux-foundation.org To: Chaitanya.Kulkarni@wdc.com, dsterba@suse.com, ira.weiny@intel.com, mm-commits@vger.kernel.org, oliver.sang@intel.com, stable@vger.kernel.org, tglx@linutronix.de Subject: [merged] mm-highmem-fix-config_debug_kmap_local_force_map.patch removed from -mm tree Message-ID: <20210328164235.udPStFdQP%akpm@linux-foundation.org> User-Agent: s-nail v14.8.16 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org The patch titled Subject: mm/highmem: fix CONFIG_DEBUG_KMAP_LOCAL_FORCE_MAP has been removed from the -mm tree. Its filename was mm-highmem-fix-config_debug_kmap_local_force_map.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ From: Ira Weiny Subject: mm/highmem: fix CONFIG_DEBUG_KMAP_LOCAL_FORCE_MAP The kernel test robot found that __kmap_local_sched_out() was not correctly skipping the guard pages when CONFIG_DEBUG_KMAP_LOCAL_FORCE_MAP was set.[1] This was due to CONFIG_DEBUG_HIGHMEM check being used. Change the configuration check to be correct. [1] https://lore.kernel.org/lkml/20210304083825.GB17830@xsang-OptiPlex-9020/ Link: https://lkml.kernel.org/r/20210318230657.1497881-1-ira.weiny@intel.com Fixes: 0e91a0c6984c ("mm/highmem: Provide CONFIG_DEBUG_KMAP_LOCAL_FORCE_MAP") Signed-off-by: Ira Weiny Reported-by: kernel test robot Reviewed-by: Thomas Gleixner Cc: Thomas Gleixner Cc: Oliver Sang Cc: Chaitanya Kulkarni Cc: David Sterba Cc: Signed-off-by: Andrew Morton --- mm/highmem.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/mm/highmem.c~mm-highmem-fix-config_debug_kmap_local_force_map +++ a/mm/highmem.c @@ -618,7 +618,7 @@ void __kmap_local_sched_out(void) int idx; /* With debug all even slots are unmapped and act as guard */ - if (IS_ENABLED(CONFIG_DEBUG_HIGHMEM) && !(i & 0x01)) { + if (IS_ENABLED(CONFIG_DEBUG_KMAP_LOCAL) && !(i & 0x01)) { WARN_ON_ONCE(!pte_none(pteval)); continue; } @@ -654,7 +654,7 @@ void __kmap_local_sched_in(void) int idx; /* With debug all even slots are unmapped and act as guard */ - if (IS_ENABLED(CONFIG_DEBUG_HIGHMEM) && !(i & 0x01)) { + if (IS_ENABLED(CONFIG_DEBUG_KMAP_LOCAL) && !(i & 0x01)) { WARN_ON_ONCE(!pte_none(pteval)); continue; }