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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4EEDFC433F5 for ; Fri, 5 Nov 2021 13:51:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2FC2B611AE for ; Fri, 5 Nov 2021 13:51:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232837AbhKENyc (ORCPT ); Fri, 5 Nov 2021 09:54:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46794 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232106AbhKENya (ORCPT ); Fri, 5 Nov 2021 09:54:30 -0400 Received: from casper.infradead.org (casper.infradead.org [IPv6:2001:8b0:10b:1236::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6F277C061714 for ; Fri, 5 Nov 2021 06:51:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=In-Reply-To:Content-Type:MIME-Version: References:Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=uB26i/GpUuIPYUVcF2WyVQ4MrTliX9jWGUk0z0aWGG8=; b=tgne2CVCiuoOcMmED1JDLkNmRe xTNUfXvmJ31a8VUkl/Se8XKdofL8XYOqHYctLCoA7tM/TM67FVpZZhtPIydGetcjkXvDlKf5kZizH KFMh37+yYo0C9IK7MRsFdoVrrHflTU77avd8lIpaO8HGt53NR8TiWdHfZnDA57mgJjir4hpeFGlIa ewedz6GZd090ht4v9DsIQw9NnMFyhqqVTYbRFB/o7nyDtCrebAT/gTPvKIGIXDgTQD01i6gaEnhLm zLQE76qhy446CACQVzxF8+6Qf/ObPvdhlR7wVYaAki5VpZPm50hyR/C+hsl+/qS989Vcro6yBfk2V IcsmpLxA==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1mizar-006aVK-Fd; Fri, 05 Nov 2021 13:49:48 +0000 Date: Fri, 5 Nov 2021 13:49:21 +0000 From: Matthew Wilcox To: Andrew Morton Cc: Ira Weiny , Prathu Baronia , linux-kernel@vger.kernel.org, chintan.pandya@oneplus.com, Prathu Baronia , Thomas Gleixner , "Peter Zijlstra (Intel)" , Randy Dunlap Subject: Re: [PATCH v4 1/1] mm/highmem: Remove deprecated kmap_atomic Message-ID: References: <20210204073255.20769-1-prathu.baronia@oneplus.com> <20210204073255.20769-2-prathu.baronia@oneplus.com> <20210211003307.GA3158182@iweiny-DESK2.sc.intel.com> <20210211155625.7f8dd5d53e19f88530ddf248@linux-foundation.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210211155625.7f8dd5d53e19f88530ddf248@linux-foundation.org> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Feb 11, 2021 at 03:56:25PM -0800, Andrew Morton wrote: > On Wed, 10 Feb 2021 16:33:07 -0800 Ira Weiny wrote: > > > > Signed-off-by: Ira Weiny > > > > This already has my signed off by so I'm not going to 'review'. With Prathu's > > testing information I hope this can land. > > > > Andrew did you see this patch? > > I did now ;) > > Tossed onto the post-rc1 pile, thanks, This patch seems to have slipped through the gaps for a couple of cycles now? I found a missed spot in it for CONFIG_HIGHMEM: diff --git a/mm/highmem.c b/mm/highmem.c index 471d9779a7f4..82d8c5ab6e8d 100644 --- a/mm/highmem.c +++ b/mm/highmem.c @@ -382,7 +382,7 @@ void zero_user_segments(struct page *page, unsigned start1, unsigned end1, unsigned this_end = min_t(unsigned, end1, PAGE_SIZE); if (end1 > start1) { - kaddr = kmap_atomic(page + i); + kaddr = kmap_local(page + i); memset(kaddr + start1, 0, this_end - start1); } end1 -= this_end; @@ -397,7 +397,7 @@ void zero_user_segments(struct page *page, unsigned start1, unsigned end1, if (end2 > start2) { if (!kaddr) - kaddr = kmap_atomic(page + i); + kaddr = kmap_local(page + i); memset(kaddr + start2, 0, this_end - start2); } end2 -= this_end; @@ -405,7 +405,7 @@ void zero_user_segments(struct page *page, unsigned start1, unsigned end1, } if (kaddr) { - kunmap_atomic(kaddr); + kunmap_local(kaddr); flush_dcache_page(page + i); }