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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0BCE1C636CC for ; Tue, 7 Feb 2023 08:44:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231238AbjBGIo4 (ORCPT ); Tue, 7 Feb 2023 03:44:56 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34696 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231167AbjBGIoz (ORCPT ); Tue, 7 Feb 2023 03:44:55 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7476517CC4 for ; Tue, 7 Feb 2023 00:44:46 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 10B76B816D7 for ; Tue, 7 Feb 2023 08:44:45 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 15B3AC433D2; Tue, 7 Feb 2023 08:44:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1675759483; bh=SqpcVJIhPgM2RJ2uEw/cb5DSRLCQNFzCG3MNMOqCNQw=; h=Subject:To:Cc:From:Date:From; b=c88kLDh+oWsVM8n9ryNYWksHDTvMGJ8vArDJkmS1WCfx8ZPzw+4V8rifquo8kOm+6 TzMYrKHoBeUekl3apRfW1V29DDNYepvBQddTAM0SUNmY2pCTRNGiOWlsPatrYr9dJ/ YKtrOw3k40Txfer+m0xvktTIN80s++VMF5zWAfgE= Subject: FAILED: patch "[PATCH] mm: memcg: fix NULL pointer in" failed to apply to 5.10-stable tree To: wangkefeng.wang@huawei.com, akpm@linux-foundation.org, axboe@kernel.dk, jack@suse.cz, mawupeng1@huawei.com, mhocko@suse.com, mikoxyzzz@gmail.com, naoya.horiguchi@nec.com, shakeelb@google.com, stable@vger.kernel.org, tj@kernel.org Cc: From: Date: Tue, 07 Feb 2023 09:44:32 +0100 Message-ID: <167575947234162@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org The patch below does not apply to the 5.10-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . Possible dependencies: ac86f547ca10 ("mm: memcg: fix NULL pointer in mem_cgroup_track_foreign_dirty_slowpath()") 203a31516616 ("mm/writeback: Add __folio_mark_dirty()") 9d8053fc7a21 ("mm/memcg: Convert mem_cgroup_track_foreign_dirty_slowpath() to folio") a49d0c507759 ("mm/writeback: Add folio_wait_stable()") 490e016f229a ("mm/writeback: Add folio_wait_writeback()") 4268b48077e5 ("mm/filemap: Add folio_end_writeback()") 575ced1c8b0d ("mm/swap: Add folio_rotate_reclaimable()") 4e1364286d0a ("mm/filemap: Add folio_unlock()") 2f52578f9c64 ("mm/util: Add folio_mapping() and folio_file_mapping()") 3a6b2162005f ("mm: move page dirtying prototypes from mm.h") 6e1cae881a06 ("mm/writeback: move __set_page_dirty() to core mm") 34ebcce79324 ("fs: unexport __set_page_dirty") 87e378974975 ("mm/page-writeback: use __this_cpu_inc() in account_page_dirtied()") 9620ad86d0e3 ("afs: Re-enable freezing once a page fault is interrupted") d479960e44f2 ("mm: disable LRU pagevec during the migration temporarily") 198fba4137a1 ("mm/mmzone.h: fix existing kernel-doc comments and link them to core-api") a87132a22991 ("mm/doc: add mm.h and mm_types.h to the mm-api document") 842ca547f706 ("mm: move page_mapping_file to pagemap.h") 5cbf03985c67 ("afs: Use new netfs lib read helper API") dc4191841d09 ("afs: Use the fs operation ops to handle FetchData completion") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From ac86f547ca1002aec2ef66b9e64d03f45bbbfbb9 Mon Sep 17 00:00:00 2001 From: Kefeng Wang Date: Sun, 29 Jan 2023 12:09:45 +0800 Subject: [PATCH] mm: memcg: fix NULL pointer in mem_cgroup_track_foreign_dirty_slowpath() As commit 18365225f044 ("hwpoison, memcg: forcibly uncharge LRU pages"), hwpoison will forcibly uncharg a LRU hwpoisoned page, the folio_memcg could be NULl, then, mem_cgroup_track_foreign_dirty_slowpath() could occurs a NULL pointer dereference, let's do not record the foreign writebacks for folio memcg is null in mem_cgroup_track_foreign_dirty() to fix it. Link: https://lkml.kernel.org/r/20230129040945.180629-1-wangkefeng.wang@huawei.com Fixes: 97b27821b485 ("writeback, memcg: Implement foreign dirty flushing") Signed-off-by: Kefeng Wang Reported-by: Ma Wupeng Tested-by: Miko Larsson Acked-by: Michal Hocko Cc: Jan Kara Cc: Jens Axboe Cc: Kefeng Wang Cc: Ma Wupeng Cc: Naoya Horiguchi Cc: Shakeel Butt Cc: Tejun Heo Cc: Signed-off-by: Andrew Morton diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index d3c8203cab6c..85dc9b88ea37 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -1666,10 +1666,13 @@ void mem_cgroup_track_foreign_dirty_slowpath(struct folio *folio, static inline void mem_cgroup_track_foreign_dirty(struct folio *folio, struct bdi_writeback *wb) { + struct mem_cgroup *memcg; + if (mem_cgroup_disabled()) return; - if (unlikely(&folio_memcg(folio)->css != wb->memcg_css)) + memcg = folio_memcg(folio); + if (unlikely(memcg && &memcg->css != wb->memcg_css)) mem_cgroup_track_foreign_dirty_slowpath(folio, wb); }