From nobody Sun Feb 8 13:32:30 2026 Received: from mail-qv1-f42.google.com (mail-qv1-f42.google.com [209.85.219.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C52A8482E1 for ; Thu, 21 Mar 2024 18:25:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711045542; cv=none; b=phS1m07ycMvW77oT55X2T4/rNM50uWvb+MRIOFpi26LLilZ/aU4/W6PNyoNd9NrUiUooV2opet1ZKjdRkM/hVVNu7rsYp1UarzzADf0Ow/KG9R6jRNZmaIbEUcQrxSOMjEKQZylxmk//qgPPCHaUZZJCZEz01eLLUB2pERUUSRY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711045542; c=relaxed/simple; bh=mNt8c5Ewt8XiMxXkYYMi5yG5P2mD0bXKMZlcrOkYoJ4=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=WIcKc3AlXnaZD+FnNgeoUQJb0gumSP/n7gEAu/ZymtUeF9r71UI2m+h0aASJUiaJZ4jNTEvKh2Xt3La5RGAgXZp7f66IuurQdGYcwflFI6ArraBSLDvTEO7p5FWQPysRgWhfP0eVqLjUF/7Lb6hyMp25qdSq+LIEOLXjj52JDFc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=cmpxchg.org; spf=pass smtp.mailfrom=cmpxchg.org; dkim=pass (2048-bit key) header.d=cmpxchg-org.20230601.gappssmtp.com header.i=@cmpxchg-org.20230601.gappssmtp.com header.b=3Oz0Jh9K; arc=none smtp.client-ip=209.85.219.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=cmpxchg.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=cmpxchg.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=cmpxchg-org.20230601.gappssmtp.com header.i=@cmpxchg-org.20230601.gappssmtp.com header.b="3Oz0Jh9K" Received: by mail-qv1-f42.google.com with SMTP id 6a1803df08f44-6918781a913so10836856d6.3 for ; Thu, 21 Mar 2024 11:25:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cmpxchg-org.20230601.gappssmtp.com; s=20230601; t=1711045537; x=1711650337; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=/N8O7+oWMYcfdby+p0lm0Df2Q9f94VlAjnDmiCzjw4E=; b=3Oz0Jh9KMV3q8IF5CF+lz1LfUPGVUfovz34pkY7Jyx3nSO2QU2Yicj+l3jYYBGkrNt O5ziOG5JXGxUzYf5TF0CFes2YJTjzBLuSlf1ujkm7pMDDTIco015iyIVdL72ZrB2KmeS pAkEgN32krPAGummz0bs6eKLPPKqEAhM42ZGd0HwgE29Ka8a/OGa4+Td0EYzAnxtXbkD d7m0b88ebZ1C9+JWxUyTlnXUzG9FuEfuAyUl2Y3brIGQwgdmReXL9DmMRt1b7fWtevwa WqpuqPckNmuAVX5JhWjqtUu5TCnxyjD4fCHJY6Z6L4yEyIah9H5wq/DOJu+veirNhx5G uOTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711045537; x=1711650337; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=/N8O7+oWMYcfdby+p0lm0Df2Q9f94VlAjnDmiCzjw4E=; b=ByvgYFA7OgrHErF/WccQ3wjXuOs2koRopICsMKTLSr5rXFvcfhnhqU/yqo7u9UgcVx jHvmgFT8GUh/J6TVYg9+mZ+nKHoaKhGCYL3bwenfDJv7hmZLRHnd05fKsTbbY4muDXgs dqXdICRqQFFQK/kTbLpWVWs1SmjBLnf013TxkNKiw5SpjVfH5IWn17198Wq9sOoXJLz8 T+ZkVdpPaXigTyounhl7yrbm4vg8DizCD2fo6DEcJ7gRPHqoLO1AeGcYj3kaGdXNkV2P JDGV7NN2Wp2PMWPWIWYXYs2v7lZhZu4RSBGREhvCtWzffBUElLqDaOVjkMYSQNtD5sOm 08Jg== X-Forwarded-Encrypted: i=1; AJvYcCUF0KnMHG+aFR2FR4AemuZ3bvmjJyP6LHom+eYwmOL3/m1DQK6MvtcOpvkKENADisar3H39GJt0PRprIdloAFoIOj7coNDo8mpdu5A+ X-Gm-Message-State: AOJu0YzA/GydB5Mhql/aMKy053z3ayQ0ZItDo/hldCEwb3+D/en0HvoV ZYyY/wvwLHfA71TmFy4VoLQsnh8cyNEKe/cJ9aKLEoy1EMcsWkKCwwfg1vNhZ633CqRwh4Gf5ML 7 X-Google-Smtp-Source: AGHT+IEse7B1NYDndrw9NXwdauLfoIqRPAn4cgINmWelWR7WD1qMnJ8xgQB+4hbQOKGMWCWUmWb7+w== X-Received: by 2002:a05:6214:130f:b0:696:4771:e009 with SMTP id pn15-20020a056214130f00b006964771e009mr3328164qvb.4.1711045537648; Thu, 21 Mar 2024 11:25:37 -0700 (PDT) Received: from localhost ([2620:10d:c091:400::5:6036]) by smtp.gmail.com with ESMTPSA id r5-20020ad45765000000b0069019c6eff1sm151086qvx.31.2024.03.21.11.25.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Mar 2024 11:25:36 -0700 (PDT) From: Johannes Weiner To: Andrew Morton Cc: Kent Overstreet , Chengming Zhou , Nhat Pham , Yosry Ahmed , linux-mm@kvack.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH] mm: zswap: fix writeback shinker GFP_NOIO/GFP_NOFS recursion Date: Thu, 21 Mar 2024 14:25:32 -0400 Message-ID: <20240321182532.60000-1-hannes@cmpxchg.org> X-Mailer: git-send-email 2.44.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Kent forwards this bug report of zswap re-entering the block layer from an IO request allocation and locking up: [10264.128242] sysrq: Show Blocked State [10264.128268] task:kworker/20:0H state:D stack:0 pid:143 tgid:143 = ppid:2 flags:0x00004000 [10264.128271] Workqueue: bcachefs_io btree_write_submit [bcachefs] [10264.128295] Call Trace: [10264.128295] [10264.128297] __schedule+0x3e6/0x1520 [10264.128303] schedule+0x32/0xd0 [10264.128304] schedule_timeout+0x98/0x160 [10264.128308] io_schedule_timeout+0x50/0x80 [10264.128309] wait_for_completion_io_timeout+0x7f/0x180 [10264.128310] submit_bio_wait+0x78/0xb0 [10264.128313] swap_writepage_bdev_sync+0xf6/0x150 [10264.128317] zswap_writeback_entry+0xf2/0x180 [10264.128319] shrink_memcg_cb+0xe7/0x2f0 [10264.128322] __list_lru_walk_one+0xb9/0x1d0 [10264.128325] list_lru_walk_one+0x5d/0x90 [10264.128326] zswap_shrinker_scan+0xc4/0x130 [10264.128327] do_shrink_slab+0x13f/0x360 [10264.128328] shrink_slab+0x28e/0x3c0 [10264.128329] shrink_one+0x123/0x1b0 [10264.128331] shrink_node+0x97e/0xbc0 [10264.128332] do_try_to_free_pages+0xe7/0x5b0 [10264.128333] try_to_free_pages+0xe1/0x200 [10264.128334] __alloc_pages_slowpath.constprop.0+0x343/0xde0 [10264.128337] __alloc_pages+0x32d/0x350 [10264.128338] allocate_slab+0x400/0x460 [10264.128339] ___slab_alloc+0x40d/0xa40 [10264.128345] kmem_cache_alloc+0x2e7/0x330 [10264.128348] mempool_alloc+0x86/0x1b0 [10264.128349] bio_alloc_bioset+0x200/0x4f0 [10264.128352] bio_alloc_clone+0x23/0x60 [10264.128354] alloc_io+0x26/0xf0 [dm_mod 7e9e6b44df4927f93fb3e4b5c7827673= 96f58382] [10264.128361] dm_submit_bio+0xb8/0x580 [dm_mod 7e9e6b44df4927f93fb3e4b5c7= 82767396f58382] [10264.128366] __submit_bio+0xb0/0x170 [10264.128367] submit_bio_noacct_nocheck+0x159/0x370 [10264.128368] bch2_submit_wbio_replicas+0x21c/0x3a0 [bcachefs 85f1b9a7a82= 4f272eff794653a06dde1a94439f2] [10264.128391] btree_write_submit+0x1cf/0x220 [bcachefs 85f1b9a7a824f272ef= f794653a06dde1a94439f2] [10264.128406] process_one_work+0x178/0x350 [10264.128408] worker_thread+0x30f/0x450 [10264.128409] kthread+0xe5/0x120 The zswap shrinker resumes the swap_writepage()s that were intercepted by the zswap store. This will enter the block layer, and may even enter the filesystem depending on the swap backing file. Make it respect GFP_NOIO and GFP_NOFS. Link: https://lore.kernel.org/linux-mm/rc4pk2r42oyvjo4dc62z6sovquyllq56i5cd= gcaqbd7wy3hfzr@n4nbxido3fme/ Reported-by: Kent Overstreet Fixes: b5ba474f3f51 ("zswap: shrink zswap pool based on memory pressure") Cc: stable@vger.kernel.org [v6.8] Signed-off-by: Johannes Weiner Acked-by: Yosry Ahmed Reported-by: J=C3=A9r=C3=B4me Poulin Reviewed-by: Chengming Zhou Reviewed-by: Nhat Pham --- mm/zswap.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/mm/zswap.c b/mm/zswap.c index b31c977f53e9..535c907345e0 100644 --- a/mm/zswap.c +++ b/mm/zswap.c @@ -1303,6 +1303,14 @@ static unsigned long zswap_shrinker_count(struct shr= inker *shrinker, if (!zswap_shrinker_enabled || !mem_cgroup_zswap_writeback_enabled(memcg)) return 0; =20 + /* + * The shrinker resumes swap writeback, which will enter block + * and may enter fs. XXX: Harmonize with vmscan.c __GFP_FS + * rules (may_enter_fs()), which apply on a per-folio basis. + */ + if (!gfp_has_io_fs(sc->gfp_mask)) + return 0; + #ifdef CONFIG_MEMCG_KMEM mem_cgroup_flush_stats(memcg); nr_backing =3D memcg_page_state(memcg, MEMCG_ZSWAP_B) >> PAGE_SHIFT; --=20 2.44.0