Skip to content

Commit 98fce34

Browse files
Rob Clarkgregkh
authored andcommitted
drm/msm/shrinker: Fix can_block() logic
[ Upstream commit df0f439 ] The intention here was to allow blocking if DIRECT_RECLAIM or if called from kswapd and KSWAPD_RECLAIM is set. Reported by Claude code review: https://lore.gitlab.freedesktop.org/drm-ai-reviews/review-patch9-20260309151119.290217-10-boris.brezillon@collabora.com/ on a panthor patch which had copied similar logic. Reported-by: Boris Brezillon <boris.brezillon@collabora.com> Fixes: 7860d72 ("drm/msm: Fix build break with recent mm tree") Signed-off-by: Rob Clark <robin.clark@oss.qualcomm.com> Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com> Patchwork: https://patchwork.freedesktop.org/patch/714238/ Message-ID: <20260325184106.1259528-1-robin.clark@oss.qualcomm.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 679a533 commit 98fce34

1 file changed

Lines changed: 2 additions & 3 deletions

File tree

drivers/gpu/drm/msm/msm_gem_shrinker.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,8 @@ static bool can_swap(void)
2626

2727
static bool can_block(struct shrink_control *sc)
2828
{
29-
if (!(sc->gfp_mask & __GFP_DIRECT_RECLAIM))
30-
return false;
31-
return current_is_kswapd() || (sc->gfp_mask & __GFP_RECLAIM);
29+
return (sc->gfp_mask & __GFP_DIRECT_RECLAIM) ||
30+
(current_is_kswapd() && (sc->gfp_mask & __GFP_KSWAPD_RECLAIM));
3231
}
3332

3433
static unsigned long

0 commit comments

Comments
 (0)