From nobody Mon Jun 8 14:35:14 2026 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (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 7A219405C33 for ; Thu, 28 May 2026 19:29:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779996548; cv=none; b=R4Ng6CYpA2igmDGeNNl0HMwwKnvekNpyp4Ucx4uyWIJ5RGr8B0kV32PYAzyroxkYFxS5xYMbRR2QayY+/3/M9zuHzhmz0hLVu1W3lnvhzkQOfwgOF1hgSDWuNXPs2br5HX0/QHaNSYe3k1yMshmnyp9GM1XNMB5B6S+LuEgByoE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779996548; c=relaxed/simple; bh=8qiNfXupTsqZ4Rv3g7nTjobddsHbVawn5rqT7Zvap2M=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=r4ku/bgmC3LZXnXnvpGJNcfe1+cv8Lmpl0R6efjkimpN1xlROjqD6cRyf4NKdLQmIgfyj8mgvjcppxPwL7ciGR6lQa/rJBGnFnXAr2lor6soVCn1uQwerL8kDBtlqrzrkY0GA4d2UkjG4wghC6UbdGmPT0cUJogNt64eE4ruLgc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=hADA5i8k; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="hADA5i8k" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1779996546; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=P8xQYAjs5DtPCuCpT2PrJS1UzcTFSVvXTrRvI9W1Hn0=; b=hADA5i8kEAdeUnynxiZ5mxV+5PULrcfHrDzcWX0ozoJEA+9Ap+MzhiUQXwh+8C6zDHB+y8 5ynbpYMKNP7RaVxveN4FJ64hUPxdSh1X/cel2drL1fIP8ND+PkP2kkvcEzbVkVsFxyyEQu 3t7ixJlqs1FpTFC6Zsb8NOQ4eTFMrGc= Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-610-XO-_kZJxMkaHR1oRtpGYRw-1; Thu, 28 May 2026 15:29:03 -0400 X-MC-Unique: XO-_kZJxMkaHR1oRtpGYRw-1 X-Mimecast-MFC-AGG-ID: XO-_kZJxMkaHR1oRtpGYRw_1779996541 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id EBE3B19560AF; Thu, 28 May 2026 19:29:00 +0000 (UTC) Received: from GoldenWind.lan (unknown [10.22.89.248]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 308CF19560A3; Thu, 28 May 2026 19:28:57 +0000 (UTC) From: Lyude Paul To: dri-devel@lists.freedesktop.org, Timur Tabi , nouveau@lists.freedesktop.org, linux-kernel@vger.kernel.org Cc: "Dave Airlie" , "Qianfeng Rong" , "Maarten Lankhorst" , "Kees Cook" , "Simona Vetter" , "David Airlie" , "Thomas Zimmermann" , "Maxime Ripard" , "Hongling Zeng" , "Danilo Krummrich" , "Zhi Wang" , "Lyude Paul" Subject: [PATCH 1/5] Revert "nouveau/gsp/rm: cleanup remaining IS_ERR_OR_NULL usage" Date: Thu, 28 May 2026 15:27:15 -0400 Message-ID: <20260528192847.4077458-2-lyude@redhat.com> In-Reply-To: <20260528192847.4077458-1-lyude@redhat.com> References: <20260528192847.4077458-1-lyude@redhat.com> 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-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 Content-Type: text/plain; charset="utf-8" This reverts commit 1a80c009e27b42e8c202d4c5dbd9dad9e22af742. Embarassingly, it seems that I completely missed a pretty big issue this patch causes according to Danilo and Sashiko: https://lists.freedesktop.org/archives/dri-devel/2026-May/570353.html Where it seems this causes some machines to segfault during nouveau probe. So, revert this for the time being. Signed-off-by: Lyude Paul Reviewed-by: Timur Tabi --- drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/ctrl.c | 2 +- drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/rpc.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/ctrl.c b/drive= rs/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/ctrl.c index aa0ebd3dfb17d..70b9ee911c5e7 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/ctrl.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/ctrl.c @@ -42,7 +42,7 @@ r535_gsp_rpc_rm_ctrl_push(struct nvkm_gsp_object *object,= void **params, u32 rep int ret =3D 0; =20 rpc =3D nvkm_gsp_rpc_push(gsp, rpc, NVKM_GSP_RPC_REPLY_RECV, repc); - if (IS_ERR(rpc)) { + if (IS_ERR_OR_NULL(rpc)) { *params =3D NULL; return PTR_ERR(rpc); } diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/rpc.c b/driver= s/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/rpc.c index 0c9657cb2dd72..41301f19729cf 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/rpc.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/rpc.c @@ -459,11 +459,11 @@ r535_gsp_msg_recv(struct nvkm_gsp *gsp, int fn, u32 g= sp_rpc_len) =20 retry: rpc =3D r535_gsp_msgq_peek(gsp, sizeof(*rpc), &retries); - if (IS_ERR(rpc)) + if (IS_ERR_OR_NULL(rpc)) return rpc; =20 rpc =3D r535_gsp_msgq_recv(gsp, gsp_rpc_len, &retries); - if (IS_ERR(rpc)) + if (IS_ERR_OR_NULL(rpc)) return rpc; =20 if (rpc->rpc_result) { @@ -561,7 +561,7 @@ r535_gsp_rpc_handle_reply(struct nvkm_gsp *gsp, u32 fn, break; case NVKM_GSP_RPC_REPLY_RECV: reply =3D r535_gsp_msg_recv(gsp, fn, gsp_rpc_len); - if (!IS_ERR(reply)) + if (!IS_ERR_OR_NULL(reply)) repv =3D reply->data; else repv =3D reply; --=20 2.54.0 From nobody Mon Jun 8 14:35:14 2026 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (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 97C7A3469E0 for ; Thu, 28 May 2026 19:29:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779996561; cv=none; b=RqFNBVoOjbHp1UCTpKX1IOhRHRfwHOZBrf5gQCgAnOLFNJb4xp9+quf4+JC3cE60LbaDEZL/iqLImJ+FyFAWGdCu3SRcPaMY8Ew7OAc/Q2/udT6KMBnDGGQpLZ16DBtWmYB1KAKLXGL7Atw1459khfalIF7AG2YYa98Md4aNySc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779996561; c=relaxed/simple; bh=SibM3sRtQdc7E2vDIqU5SEnGKCMZqqJ92jcw8riIE1Q=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=W34DEhpVgYAB/jPKAQaWG+y25QbMOIXcLgqPcs70mQ6kco6T+L2b3Q4OeZQBgYo0FYKFwYFD2uM6LVu+hOQsbz9my/Wksu3wFV12UA6GTurnJLauMpVhmX4uNwOWB7ecbpIIDsqUWPnURGqeHqHQefFkWNo9oh4g70Co3O3D9DM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=e/wiS15S; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="e/wiS15S" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1779996559; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/ZFeRDQvdk0/n+ezRcNVkmugoUqzLVYJWcPybXvPKog=; b=e/wiS15STQuPwhaFgRfIm8NtgZ2mYj/LfaZJ8u98d0hXCcbwy4NkUkdcFXBpj/3k0HM/2l POO/sADQpOe48wI91hW6IISYAouObicpgd3wi7y0lqnl+KLbiPdj6lAgY2yE8gSi/49zj1 LdZbHrWE8nmWxp2XGqNw3f2iPiFccy8= Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-367-DRlzfwcQMhmCbgVmtlPQfg-1; Thu, 28 May 2026 15:29:09 -0400 X-MC-Unique: DRlzfwcQMhmCbgVmtlPQfg-1 X-Mimecast-MFC-AGG-ID: DRlzfwcQMhmCbgVmtlPQfg_1779996547 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 343FB1800343; Thu, 28 May 2026 19:29:07 +0000 (UTC) Received: from GoldenWind.lan (unknown [10.22.89.248]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 1F9B519560A3; Thu, 28 May 2026 19:29:05 +0000 (UTC) From: Lyude Paul To: dri-devel@lists.freedesktop.org, Timur Tabi , nouveau@lists.freedesktop.org, linux-kernel@vger.kernel.org Cc: "Dave Airlie" , "Qianfeng Rong" , "Maarten Lankhorst" , "Kees Cook" , "Simona Vetter" , "David Airlie" , "Thomas Zimmermann" , "Maxime Ripard" , "Hongling Zeng" , "Danilo Krummrich" , "Zhi Wang" , "Lyude Paul" Subject: [PATCH 2/5] Revert "nouveau/gsp/rm: cleanup IS_ERR_OR_NULL in core implementation" Date: Thu, 28 May 2026 15:27:16 -0400 Message-ID: <20260528192847.4077458-3-lyude@redhat.com> In-Reply-To: <20260528192847.4077458-1-lyude@redhat.com> References: <20260528192847.4077458-1-lyude@redhat.com> 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-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 Content-Type: text/plain; charset="utf-8" This is probably too risky, see the discussion here: https://lists.freedesktop.org/archives/dri-devel/2026-May/570353.html This reverts commit 67346c90ce275e835e93a4a13041afee47bd3f9e. Signed-off-by: Lyude Paul Reviewed-by: Timur Tabi --- drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/alloc.c | 4 ++-- drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/rpc.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/alloc.c b/driv= ers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/alloc.c index 27f275d2e1510..46e3a29f2ad7f 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/alloc.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/alloc.c @@ -35,7 +35,7 @@ r535_gsp_rpc_rm_free(struct nvkm_gsp_object *object) client->object.handle, object->handle); =20 rpc =3D nvkm_gsp_rpc_get(gsp, NV_VGPU_MSG_FUNCTION_FREE, sizeof(*rpc)); - if (WARN_ON(IS_ERR(rpc))) + if (WARN_ON(IS_ERR_OR_NULL(rpc))) return -EIO; =20 rpc->params.hRoot =3D client->object.handle; @@ -60,7 +60,7 @@ r535_gsp_rpc_rm_alloc_push(struct nvkm_gsp_object *object= , void *params) void *ret =3D NULL; =20 rpc =3D nvkm_gsp_rpc_push(gsp, rpc, NVKM_GSP_RPC_REPLY_RECV, sizeof(*rpc)= ); - if (IS_ERR(rpc)) + if (IS_ERR_OR_NULL(rpc)) return rpc; =20 if (rpc->status) { diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/rpc.c b/driver= s/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/rpc.c index 41301f19729cf..3ca3de8f43408 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/rpc.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/rpc.c @@ -324,7 +324,7 @@ r535_gsp_msgq_recv(struct nvkm_gsp *gsp, u32 gsp_rpc_le= n, int *retries) u32 size; =20 rpc =3D r535_gsp_msgq_peek(gsp, sizeof(*rpc), info.retries); - if (IS_ERR(rpc)) { + if (IS_ERR_OR_NULL(rpc)) { kvfree(buf); return rpc; } @@ -333,7 +333,7 @@ r535_gsp_msgq_recv(struct nvkm_gsp *gsp, u32 gsp_rpc_le= n, int *retries) info.continuation =3D true; =20 rpc =3D r535_gsp_msgq_recv_one_elem(gsp, &info); - if (IS_ERR(rpc)) { + if (IS_ERR_OR_NULL(rpc)) { kvfree(buf); return rpc; } --=20 2.54.0 From nobody Mon Jun 8 14:35:14 2026 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (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 CB10814ABE for ; Thu, 28 May 2026 19:29:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779996563; cv=none; b=kVQRX75ZYT/lTk2wZjp4Q8AIwA+ccWNYOFm4xgTbtkVpQu1asfG4RwwzcT4mFchpL01kL9bp6rycyz72FS/vQXYPTXl21qGo4Tk7H1FSym1YtujoY6p/rvUTbeDq61zcHwP5aQhg9krtdivq6RWn7BeRXzf+EUPuIDaJmqgzFlE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779996563; c=relaxed/simple; bh=wNW4MAanDg3OcNUimZTMBjrVWJ7BE3HnP02o+GOUfQU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BXl6WYt4yneODhFaroWPFj7fETiHZWuY63K2CjT7OrvqMjnOCIB6ITqZ+6/cv0BomP/XRNlI9DNyv3EbMc79JAxPrpIWGy+Uy0IdwDyqr5l8i6qZRUwMqjBMQ3M4T8/NGkjVV20ca4O4dbCE4tJPTMQzae6Z/CJCyh0wNN2UgHo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=WKot0dLX; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="WKot0dLX" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1779996561; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Oh4yR/ss5c41je5jv3EajM1W8lREAand3plKjqUGg54=; b=WKot0dLXj+0cBgQMbMLeKRtnfgM56RJgm4H60rMrnGfR4d+UKMXOnsSca/++vckxaeRW73 KqP6kLGumi3ZsY9RzzSCAe5yAiWoT69bcKMJk9tQ2BTFHbt61kVDvWuuYKGDcMSS6XZ9Ot vWaBYmC8AtlUsPBk4mnBiFykFMHlcBU= Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-77-FtSbXF8VNDudUhug7YkZRw-1; Thu, 28 May 2026 15:29:16 -0400 X-MC-Unique: FtSbXF8VNDudUhug7YkZRw-1 X-Mimecast-MFC-AGG-ID: FtSbXF8VNDudUhug7YkZRw_1779996553 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 66EAE1800622; Thu, 28 May 2026 19:29:13 +0000 (UTC) Received: from GoldenWind.lan (unknown [10.22.89.248]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 5F50A19560A3; Thu, 28 May 2026 19:29:11 +0000 (UTC) From: Lyude Paul To: dri-devel@lists.freedesktop.org, Timur Tabi , nouveau@lists.freedesktop.org, linux-kernel@vger.kernel.org Cc: "Dave Airlie" , "Qianfeng Rong" , "Maarten Lankhorst" , "Kees Cook" , "Simona Vetter" , "David Airlie" , "Thomas Zimmermann" , "Maxime Ripard" , "Hongling Zeng" , "Danilo Krummrich" , "Zhi Wang" , "Lyude Paul" Subject: [PATCH 3/5] Revert "nouveau/gsp/rm: cleanup WARN_ON(IS_ERR_OR_NULL)" Date: Thu, 28 May 2026 15:27:17 -0400 Message-ID: <20260528192847.4077458-4-lyude@redhat.com> In-Reply-To: <20260528192847.4077458-1-lyude@redhat.com> References: <20260528192847.4077458-1-lyude@redhat.com> 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-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 Content-Type: text/plain; charset="utf-8" This is probably too risky, see the discussion here: https://lists.freedesktop.org/archives/dri-devel/2026-May/570353.html This reverts commit 6198977a78af8769d3f3108e830901325b97cf03. Signed-off-by: Lyude Paul Reviewed-by: Timur Tabi --- drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/bar.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/bar.c b/driver= s/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/bar.c index 9cd68f8622d36..fae08ac3b18c7 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/bar.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/bar.c @@ -55,7 +55,7 @@ r535_bar_bar2_update_pde(struct nvkm_gsp *gsp, u8 page_sh= ift, u64 pdbe) rpc_update_bar_pde_v15_00 *rpc; =20 rpc =3D nvkm_gsp_rpc_get(gsp, NV_VGPU_MSG_FUNCTION_UPDATE_BAR_PDE, sizeof= (*rpc)); - if (WARN_ON(IS_ERR(rpc))) + if (WARN_ON(IS_ERR_OR_NULL(rpc))) return -EIO; =20 rpc->info.barType =3D NV_RPC_UPDATE_PDE_BAR_2; --=20 2.54.0 From nobody Mon Jun 8 14:35:14 2026 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (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 C0D203346BE for ; Thu, 28 May 2026 19:29:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779996572; cv=none; b=X+sGM+mPBYMdn8KzVsPGOW5viGHlOBKVjGGhn/HwuKg2FIckPZ5XgBkIZlZ+BqFU0ZlLP90WLLJ0WM/69+l7CieFVj/z9EtwouXbCndXd2L7+yB4gRSgkykKcfxVefqLkdC+vgOR51hYfrls9J3faDkTh9SObL3q+jJH1F7ZO8g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779996572; c=relaxed/simple; bh=i2UHGI1oJPVCo/B7bh0Y1Xmtqc/JmeqnWqjc/pzbBps=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Rw9MOlRtgL+GmaTiqWlx0QZue1YWvubiywO0o0QQa9WW2p6GS9Nb7hRgI94oTIebNhCmDSe/Zj4Qd4YRQjolQfM5KAhgPlSPQ/xuPZ6YPqm6X9R0P5uauO7MXOi0oqXzFmeUE4Kg9JFzugMFcJ1FaD0IKpX2TR671uelUkPyk1M= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=FNDXaQPS; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="FNDXaQPS" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1779996570; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gGfaGZgQK2EIkOvWGdoTrr3vJzngofE2sFgYRG2RXHY=; b=FNDXaQPSfw3uCXWbDxXtLsRPgdkjY4rveIEnrMKT5w11zLZrpgSY7Vnt36S40BqdY+Gqhx 2EmqTc4IUZa2pjwmpXr9X08PYsHqwTzRSHC8leFH4Ci8LpMh9ZYvYc4HLaMJ88lmi6gBT9 LmLY5XsH5BF2psSuzsXc3Q4kiiAcMQ4= Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-284-6qb3SPAJPx-mzyPXeG3-Iw-1; Thu, 28 May 2026 15:29:25 -0400 X-MC-Unique: 6qb3SPAJPx-mzyPXeG3-Iw-1 X-Mimecast-MFC-AGG-ID: 6qb3SPAJPx-mzyPXeG3-Iw_1779996563 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id E4AC219560B2; Thu, 28 May 2026 19:29:19 +0000 (UTC) Received: from GoldenWind.lan (unknown [10.22.89.248]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 997DA19560B2; Thu, 28 May 2026 19:29:17 +0000 (UTC) From: Lyude Paul To: dri-devel@lists.freedesktop.org, Timur Tabi , nouveau@lists.freedesktop.org, linux-kernel@vger.kernel.org Cc: "Dave Airlie" , "Qianfeng Rong" , "Maarten Lankhorst" , "Kees Cook" , "Simona Vetter" , "David Airlie" , "Thomas Zimmermann" , "Maxime Ripard" , "Hongling Zeng" , "Danilo Krummrich" , "Zhi Wang" , "Lyude Paul" Subject: [PATCH 4/5] Revert "nouveau/gsp: cleanup IS_ERR_OR_NULL in rpc_rd" Date: Thu, 28 May 2026 15:27:18 -0400 Message-ID: <20260528192847.4077458-5-lyude@redhat.com> In-Reply-To: <20260528192847.4077458-1-lyude@redhat.com> References: <20260528192847.4077458-1-lyude@redhat.com> 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-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 Content-Type: text/plain; charset="utf-8" This is probably much too risky. See the discussion here: https://lists.freedesktop.org/archives/dri-devel/2026-May/570353.html This reverts commit 47f15f6cf068c14d1a5054066c445bee23f6047e. Signed-off-by: Lyude Paul Reviewed-by: Timur Tabi --- drivers/gpu/drm/nouveau/include/nvkm/subdev/gsp.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/gsp.h b/drivers/gp= u/drm/nouveau/include/nvkm/subdev/gsp.h index d771134fa4107..ab2bd88eebce5 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/gsp.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/gsp.h @@ -293,7 +293,7 @@ nvkm_gsp_rpc_rd(struct nvkm_gsp *gsp, u32 fn, u32 argc) { void *argv =3D nvkm_gsp_rpc_get(gsp, fn, argc); =20 - if (IS_ERR(argv)) + if (IS_ERR_OR_NULL(argv)) return argv; =20 return nvkm_gsp_rpc_push(gsp, argv, NVKM_GSP_RPC_REPLY_RECV, argc); --=20 2.54.0 From nobody Mon Jun 8 14:35:14 2026 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (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 A32783ABD88 for ; Thu, 28 May 2026 19:29:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779996578; cv=none; b=tztaWOI5YORPORipWh4lSlo5WtdFB0RCXdWWDIYpkFOVtZkUQ/yrjiRDnkUcW7TYLz1dfZsXBHBERhGT+kvWilE1Fu5en1yysIkCL2yJ8dSRLzrkE93X/bUhG1zf1iIY/KUPvRFCB4WkWHSrGNuXTopFlJNbQovDDtiCgeEi05g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779996578; c=relaxed/simple; bh=7nA5bi2ewxuKWjv2+ea35+u88yKbLErVYN0HxxStM+U=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cvF2sy3YWKDLclQ8Tme9X49xEcJtQa71Lw6I7EmCIREJ5cuJK6Mgz/SfIlP+Dbz6G5r5ufi9LtfE3tEfRZqy/3VNzCHOolxg2Gln8A9s3pzAfTTtZY41/p7Y80oOByJzU6SnZX0WrTsSPZk3p1535v98wy0qZbPs9wvCV8IfTbw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=SY1Q3vyj; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="SY1Q3vyj" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1779996576; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gXEMs3m1iU9CvSjiofzhaHKNsr4M9NI1nJV5PXEBxJY=; b=SY1Q3vyjNUDFqXl8jZ0chVshaLvt/bXRoy2vN+Dac2ZH0H6CyCmpsvdyuyCFw05Weme0Zs 208STW/fOZKAVlucr7ISWBE3UUiSPUi/EWhTm1tHOZvnxkVeFmbrNufp5cbhmw3xcT1oMK H6xagoFrZN4C1HlXmZ2AIrLg+Vz7oG4= Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-63-NpLvq8C8N86CP8_axzjxIA-1; Thu, 28 May 2026 15:29:33 -0400 X-MC-Unique: NpLvq8C8N86CP8_axzjxIA-1 X-Mimecast-MFC-AGG-ID: NpLvq8C8N86CP8_axzjxIA_1779996570 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 2C84619540DC; Thu, 28 May 2026 19:29:26 +0000 (UTC) Received: from GoldenWind.lan (unknown [10.22.89.248]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 1A0DF19560AD; Thu, 28 May 2026 19:29:23 +0000 (UTC) From: Lyude Paul To: dri-devel@lists.freedesktop.org, Timur Tabi , nouveau@lists.freedesktop.org, linux-kernel@vger.kernel.org Cc: "Dave Airlie" , "Qianfeng Rong" , "Maarten Lankhorst" , "Kees Cook" , "Simona Vetter" , "David Airlie" , "Thomas Zimmermann" , "Maxime Ripard" , "Hongling Zeng" , "Danilo Krummrich" , "Zhi Wang" , "Lyude Paul" Subject: [PATCH 5/5] Revert "nouveau/gsp: cleanup IS_ERR_OR_NULL in rm_alloc functions" Date: Thu, 28 May 2026 15:27:19 -0400 Message-ID: <20260528192847.4077458-6-lyude@redhat.com> In-Reply-To: <20260528192847.4077458-1-lyude@redhat.com> References: <20260528192847.4077458-1-lyude@redhat.com> 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-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 Content-Type: text/plain; charset="utf-8" This is probably too risky, see the discussion here: https://lists.freedesktop.org/archives/dri-devel/2026-May/570353.html This reverts commit 281fe11c6c4aebc1a1eb9d21eaab7323ee5af979. Signed-off-by: Lyude Paul Reviewed-by: Timur Tabi --- drivers/gpu/drm/nouveau/include/nvkm/subdev/gsp.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/gsp.h b/drivers/gp= u/drm/nouveau/include/nvkm/subdev/gsp.h index ab2bd88eebce5..64fed208e4cf8 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/gsp.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/gsp.h @@ -373,7 +373,7 @@ nvkm_gsp_rm_alloc_get(struct nvkm_gsp_object *parent, u= 32 handle, u32 oclass, u3 object->handle =3D handle; =20 argv =3D gsp->rm->api->alloc->get(object, oclass, argc); - if (IS_ERR(argv)) { + if (IS_ERR_OR_NULL(argv)) { object->client =3D NULL; return argv; } @@ -415,8 +415,8 @@ nvkm_gsp_rm_alloc(struct nvkm_gsp_object *parent, u32 h= andle, u32 oclass, u32 ar { void *argv =3D nvkm_gsp_rm_alloc_get(parent, handle, oclass, argc, object= ); =20 - if (IS_ERR(argv)) - return PTR_ERR(argv); + if (IS_ERR_OR_NULL(argv)) + return argv ? PTR_ERR(argv) : -EIO; =20 return nvkm_gsp_rm_alloc_wr(object, argv); } --=20 2.54.0