From nobody Fri Apr 3 00:00:53 2026 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 551853195FD for ; Wed, 25 Mar 2026 18:41:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774464073; cv=none; b=FxMs5QNvdBySc1i258f86ILUSKQtrHRuubyt1U8MeP1tw/NcQSpwC7eC0S4VT8mC1RRWXMTcyxjsc9fUVaDrVSxXZDAp+ROq+YamvZLVJ8ytXg/45pn8pZA8b/NA33OTlHIEoZReS7/nnkxKES7ZqQ0yP0ddX/gAPmRTmiWaFzs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774464073; c=relaxed/simple; bh=gFnmEtSaaGbYj9iRaSU5VZiNuQMQSedmpXMQiJ3ru1s=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=DG7GZwsC/G+MEtztmmtF7KC04p2AIM0fV40BXfVqzovitvTSIEl1TdBNGwWL/8bkVAs8gR2xL1otupnUrEeb9SlYRgUWay100MFMEevAWjTYHi8ZQjmHezFQUzKpVQ/G8PWpkppzr3SixuQvJ8fzrrLxvrcM9ghhJ/H3/462+6g= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=dB9/AK3z; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=WcgJ2TdG; arc=none smtp.client-ip=205.220.168.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="dB9/AK3z"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="WcgJ2TdG" Received: from pps.filterd (m0279864.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 62PFH14f1554595 for ; Wed, 25 Mar 2026 18:41:11 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:message-id:mime-version :subject:to; s=qcppdkim1; bh=yD3+fkKUCogV0OXXreNqk477OXDaZsvVesq RPlP5eQQ=; b=dB9/AK3z2AH3NkWebPapWT4Cq+vJ0PH6KcnxSm1EbUm9uq5JSdm exUPYNX5BFEpXrY8zk7+FBpvJppxgwmCjAyf0snicsqXEe1h1a5RECi30jqIiTJe MlfjDDRnTAHEux7QTFtfSkytMK40W4prplfcs7WfN7ABLxLLRVjti9hQn4ctgDfh GUZ77HamZbK7bciZvEicfS5nKUZvpf+XIzi/U2NSm+jbBpyy1Z484iH5C6Xwip0m r7+nfmDQ4MAicc+cLJrMLW1wqig7YcIlOKZfl5SxbbGLZ+LdCOTE7/5Pql/Q9Nw2 C9B7IxbEiCFX+67EUAPwkNHjo3Zth5DglDg== Received: from mail-pl1-f197.google.com (mail-pl1-f197.google.com [209.85.214.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4d4gj7982t-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 25 Mar 2026 18:41:11 +0000 (GMT) Received: by mail-pl1-f197.google.com with SMTP id d9443c01a7336-2b04911610fso1491295ad.3 for ; Wed, 25 Mar 2026 11:41:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1774464071; x=1775068871; 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=yD3+fkKUCogV0OXXreNqk477OXDaZsvVesqRPlP5eQQ=; b=WcgJ2TdGV9ifeYev9GVDIgtTr34x7qmUhT4OHDTAUbvrRe5kYETsB/f6IA0DRj54JC dibNB6DhaIu3Zjag7p1m5bzHJA7/Bl3a9+gaZ3JZehpJtoP7tKFhxyNOdndZ45BIt1mF f5gTbMbKXplncoVxGOpzTPluLNhHSSFxT0bL/pUDa8lE2TvA6usFWUm6lvHnzO68x+jC 8b9DqTDwx4LfGDCBSyDRlCbaTgBOYBQBm7hJI9VWCm0mlgPpB7DtClxXoZJ8J+0hkIO+ K2onlmSftSlK4iFIbwd53X3/lDTiVQ76XMfAyLI8PYf7r9VTLRpz2G/d+ftbKGdhnike be5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774464071; x=1775068871; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=yD3+fkKUCogV0OXXreNqk477OXDaZsvVesqRPlP5eQQ=; b=OfGEGc5W94Ow0JOEs+k2+a1+FTeolmFRBhkPtVv2u+9WiS1KaQHckQDoHMVz06/M4l peu7CaGWoGmhDdlxGEHNMVJOG3NpTUJpjGZOnqb14M0/q+aOnV6E2MJw/kKysAwhxvSM vMYsNlzP3+6OZ338G2ABjwxsaI/hpLyz0doAiRoo40doOGhhU9Y8TGGgX/qxxtupVGrd lfD04k2nzKAsZeUP6JZKEAVaXN/nDr9TCxcDHUtJ58C0t3PtnF6RotOaMbGCMMH6f++V CdgSac+Q1JL1rjaTN0sLF3U9IZygHSJPo0q69FLPJIHQbneiAZymroDRmGkKc1XVMTUL M1AQ== X-Forwarded-Encrypted: i=1; AJvYcCVJxJiVaHtx9kSdq4ir09SSpUucFC6FWavGG80W74uoFWaAK3szs2sK+vanKYnpwkBcJqInmGncen/PDOk=@vger.kernel.org X-Gm-Message-State: AOJu0YyUnnV+FylYKyMvNMop6EwKybljWZI5otZZmCzOApXNrbXwVq2L uOhzw0odM/KLJccH4gsy4f/Zq9++tl8gd4+XTY7JXZkKKs5ErFNVtWXoVNOQ5xREcQdj4WFpU8v DJGNWt+6AqwXDD/0pmTMvpdc76PS7ORO11EJRTuNLvXt4VGDofhwen58r4nUnAm76JBQ= X-Gm-Gg: ATEYQzw6Sy844ejFhZrLpy0PAgGs/L6zc8SlMdhh/qxcFL+P1HG1txXHD87TtkV94Xt h7S4RbpwTHZve88mp6QYOCM9l96CxalBueRoPrL//Ccb0F4Q3j4S6L9Fe94nCCSU5JxDV8rwi6I P/ZrSu3xntyR+q/YTfY22K479VfmOrgeVkzexi8Li7TflsJiefjYcuIGmNnmaaiD2VT4cvr2I5X eJgt4QmgJbkCr91VPZWBl1PIYpRL4jSxPm/OhOOShrcKFhNCLG3oXYMjB3l05z4OA/QZB9+K2Qt LWhkjej/KiBhp3RALtIXX+7YWtu+XaNLBtAmaJhm/Iwj+ip9xuBhZTlIZ7yONwNg/1PQ+9XvlIG 5oJkDry4yZWPQpMcZHql5busXb9P6Evwy X-Received: by 2002:a17:903:228c:b0:2b0:6e8f:8e79 with SMTP id d9443c01a7336-2b0b0adf54bmr50362115ad.42.1774464071023; Wed, 25 Mar 2026 11:41:11 -0700 (PDT) X-Received: by 2002:a17:903:228c:b0:2b0:6e8f:8e79 with SMTP id d9443c01a7336-2b0b0adf54bmr50361775ad.42.1774464070497; Wed, 25 Mar 2026 11:41:10 -0700 (PDT) Received: from localhost ([2601:1c0:5000:d5c:4ec8:83f5:8254:6891]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2b0bc79c471sm5980785ad.22.2026.03.25.11.41.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Mar 2026 11:41:10 -0700 (PDT) From: Rob Clark To: dri-devel@lists.freedesktop.org Cc: linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, Rob Clark , Boris Brezillon , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , linux-kernel@vger.kernel.org (open list) Subject: [PATCH] drm/msm/shrinker: Fix can_block() logic Date: Wed, 25 Mar 2026 11:41:05 -0700 Message-ID: <20260325184106.1259528-1-robin.clark@oss.qualcomm.com> X-Mailer: git-send-email 2.53.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 X-Authority-Analysis: v=2.4 cv=M9hA6iws c=1 sm=1 tr=0 ts=69c42c47 cx=c_pps a=cmESyDAEBpBGqyK7t0alAg==:117 a=xqWC_Br6kY4A:10 a=Yq5XynenixoA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=DJpcGTmdVt4CTyJn9g5Z:22 a=e5mUnYsNAAAA:8 a=QX4gbG5DAAAA:8 a=EUspDBNiAAAA:8 a=3XT13xyzjVv8HZeWGjUA:9 a=1OuFwYUASf3TG4hYMiVC:22 a=Vxmtnl_E_bksehYqCbjh:22 a=AbAUZ8qAyYyZVLSsDulk:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzI1MDEzNiBTYWx0ZWRfX05aXz7L1SP54 YfhZZCV0CdX1LruJCOEd0O+14rsiBAw+ea2ssxDNiDhw1rPrMxGiWf9njk71SOphgw3ogbigo/b FP+zIg2sDuDmxBQxChR0vuN9okNMGj0b1MP/7PFH5uYP48cb18iN63jXFQbQdgTalrHrxApQE1+ GWjcztqqlRoxEtuL5INj8hgRR9JSvRrKNJBf1Hod8xGg56jU6xrI9MVbtO5v8/+K5XYef+dSL7J VQRSzylbqfpDBncraD1WoD/I5868x4tAF09p5GJe5sGpsDWL4T0KHwuCsVWEibl96+7XrRZYfqS MPaP+DREUdJStCSUHX4cBM83v0CR6azgNqq66R625QpTrft62oiiljCivhUrHgyoFMnCd+bKZOt lE2gZzhRWuWjZo3IgXI4l4SoHJbHGsQL3nuAtK6NjeXh+nYvjw4E5jxznSGUOAWXegzl3K3xwBF cfVBSKiSvkNVhhsbybA== X-Proofpoint-GUID: WgTZyhuMwvS9ZQ0d7YBcCzjlCy8VCLkv X-Proofpoint-ORIG-GUID: WgTZyhuMwvS9ZQ0d7YBcCzjlCy8VCLkv X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-03-25_05,2026-03-24_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 priorityscore=1501 bulkscore=0 impostorscore=0 spamscore=0 adultscore=0 malwarescore=0 phishscore=0 lowpriorityscore=0 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2603050001 definitions=main-2603250136 Content-Type: text/plain; charset="utf-8" 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.co= m/ on a panthor patch which had copied similar logic. Reported-by: Boris Brezillon Fixes: 7860d720a84c ("drm/msm: Fix build break with recent mm tree") Signed-off-by: Rob Clark Reviewed-by: Boris Brezillon --- drivers/gpu/drm/msm/msm_gem_shrinker.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/msm/msm_gem_shrinker.c b/drivers/gpu/drm/msm/m= sm_gem_shrinker.c index 1039e3c0a47b..31fa51a44f86 100644 --- a/drivers/gpu/drm/msm/msm_gem_shrinker.c +++ b/drivers/gpu/drm/msm/msm_gem_shrinker.c @@ -26,9 +26,8 @@ static bool can_swap(void) =20 static bool can_block(struct shrink_control *sc) { - if (!(sc->gfp_mask & __GFP_DIRECT_RECLAIM)) - return false; - return current_is_kswapd() || (sc->gfp_mask & __GFP_RECLAIM); + return (sc->gfp_mask & __GFP_DIRECT_RECLAIM) || + (current_is_kswapd() && (sc->gfp_mask & __GFP_KSWAPD_RECLAIM)); } =20 static unsigned long --=20 2.53.0