From nobody Mon Jun 8 06:38:25 2026 Received: from mailgw.kylinos.cn (mailgw.kylinos.cn [124.126.103.232]) (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 C85F93A48CA for ; Mon, 1 Jun 2026 09:54:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=124.126.103.232 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780307670; cv=none; b=G0Hrkv4YpinknXY8Vtj6Mdin7EkbRcRHWXSyyNztu4F84gHmL7QM1PcOVYvymFMXNaTha6wPHKPm7r0Vcrhdo5SRHgGwySkcxyfcV3nQBSyuTJgLzEMeIwsqafWykqeP/m/5IMEbN51jEE3uBgJTm47s2kYxEfT+BZ5yHsvjYZ0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780307670; c=relaxed/simple; bh=AB52t6bEGvovy8febRqhodQyLLSBUr5E7JY6avs/k+c=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=aZ5F3w8KXWmJ73WdOqXH2E3ByYwwVUMPUT8q81oY9UaB8RDp0sHf0s0zvB2sXpzLmAxDPdbosbDaqEbNwM50AInV9mcaLOKP2IQhe+j/mwF3HnlAVjNbtLWZsq/CT7I28wIfCjI6srTEKeEdW9N/MKh90zo1e5vv4tiPU7MWl9Y= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kylinos.cn; spf=pass smtp.mailfrom=kylinos.cn; arc=none smtp.client-ip=124.126.103.232 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kylinos.cn Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=kylinos.cn X-UUID: d566ea345d9f11f1aa26b74ffac11d73-20260601 X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.3.12,REQID:7efc5b99-d504-45d8-ba80-1caa6170d656,IP:0,U RL:0,TC:0,Content:0,EDM:-25,RT:0,SF:0,FILE:0,BULK:0,RULE:Release_Ham,ACTIO N:release,TS:-25 X-CID-META: VersionHash:e7bac3a,CLOUDID:934be5458db68f516b88124068b5d83f,BulkI D:nil,BulkQuantity:0,Recheck:0,SF:81|82|102|136|850|865|898,TC:nil,Content :0|15|50,EDM:2,IP:nil,URL:0,File:nil,RT:nil,Bulk:nil,QS:nil,BEC:nil,COL:0, OSI:0,OSA:0,AV:0,LES:1,SPR:NO,DKR:0,DKP:0,BRR:0,BRE:0,ARC:0 X-CID-BVR: 2,SSN|SDN X-CID-BAS: 2,SSN|SDN,0,_ X-CID-FACTOR: TF_CID_SPAM_SNR X-CID-RHF: D41D8CD98F00B204E9800998ECF8427E X-UUID: d566ea345d9f11f1aa26b74ffac11d73-20260601 X-User: zenghongling@kylinos.cn Received: from localhost.localdomain [(10.44.16.150)] by mailgw.kylinos.cn (envelope-from ) (Generic MTA with TLSv1.3 TLS_AES_256_GCM_SHA384 256/256) with ESMTP id 172112090; Mon, 01 Jun 2026 17:54:08 +0800 From: Hongling Zeng To: lyude@redhat.com, dakr@kernel.org, maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmermann@suse.de, airlied@gmail.com, simona@ffwll.ch, airlied@redhat.com, ttabi@nvidia.com, bskeggs@nvidia.com, dri-devel@lists.freedesktop.org Cc: nouveau@lists.freedesktop.org, linux-kernel@vger.kernel.org, zhongling0719@126.com, Hongling Zeng Subject: [PATCH v2 1/5] nouveau/gsp/rpc: Document RPC function return value contracts Date: Mon, 1 Jun 2026 17:53:59 +0800 Message-Id: <20260601095403.228220-2-zenghongling@kylinos.cn> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20260601095403.228220-1-zenghongling@kylinos.cn> References: <20260601095403.228220-1-zenghongling@kylinos.cn> 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" Add kernel-doc comments to document the return value semantics of RPC functions in r535/rpc.c. This clarifies which functions can return NULL, error pointers, or both, helping maintainers validate future changes. Return value analysis: - r535_gsp_msgq_peek(): Never returns NULL - r535_gsp_msgq_recv_one_elem(): Never returns NULL - r535_gsp_msgq_recv(): CAN return NULL (when RPC length invalid) - r535_gsp_msg_recv(): CAN return NULL (queue drained/no matching message) - r535_gsp_rpc_get(): Never returns NULL - r535_gsp_rpc_handle_reply(): CAN return NULL (NOWAIT/NOSEQ policies) - r535_gsp_rpc_send(): CAN return NULL (via handle_reply) - r535_gsp_rpc_push(): CAN return NULL (via handle_reply) Signed-off-by: Hongling Zeng --- .../drm/nouveau/nvkm/subdev/gsp/rm/r535/rpc.c | 75 +++++++++++++++++++ 1 file changed, 75 insertions(+) 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 3ca3de8f4340..7dd43fa38c41 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 @@ -204,6 +204,15 @@ r535_gsp_msgq_get_entry(struct nvkm_gsp *gsp) * The user is responsible for freeing the memory allocated for the GSP * message pages after they have been processed. */ +/** + * r535_gsp_msgq_peek - Peek at next message in GSP command queue + * @gsp: GSP device + * @gsp_rpc_len: Expected RPC length + * @retries: Retry counter + * + * Return: Pointer to RPC message on success, or ERR_PTR() on error. + * Never returns NULL. + */ static void * r535_gsp_msgq_peek(struct nvkm_gsp *gsp, u32 gsp_rpc_len, int *retries) { @@ -229,6 +238,14 @@ struct r535_gsp_msg_info { static void r535_gsp_msg_dump(struct nvkm_gsp *gsp, struct nvfw_gsp_rpc *msg, int lvl); =20 +/** + * r535_gsp_msgq_recv_one_elem - Receive one message element from GSP queue + * @gsp: GSP device + * @info: Message queue information + * + * Return: Pointer to received buffer on success, or ERR_PTR() on error. + * Never returns NULL. + */ static void * r535_gsp_msgq_recv_one_elem(struct nvkm_gsp *gsp, struct r535_gsp_msg_info *info) @@ -283,6 +300,15 @@ r535_gsp_msgq_recv_one_elem(struct nvkm_gsp *gsp, return buf; } =20 +/** + * r535_gsp_msgq_recv - Receive RPC message(s) from GSP queue + * @gsp: GSP device + * @gsp_rpc_len: Expected RPC length + * @retries: Retry counter + * + * Return: Pointer to received buffer on success, ERR_PTR() on error, + * or NULL if RPC length is invalid. + */ static void * r535_gsp_msgq_recv(struct nvkm_gsp *gsp, u32 gsp_rpc_len, int *retries) { @@ -450,6 +476,15 @@ r535_gsp_msg_dump(struct nvkm_gsp *gsp, struct nvfw_gs= p_rpc *msg, int lvl) } } =20 +/** + * r535_gsp_msg_recv - Receive RPC message from GSP message queue + * @gsp: GSP device + * @fn: Expected RPC function number (0 to accept any) + * @gsp_rpc_len: Expected RPC length + * + * Return: Pointer to RPC message on success, ERR_PTR() on error, + * or NULL if queue is drained or no matching message found. + */ struct nvfw_gsp_rpc * r535_gsp_msg_recv(struct nvkm_gsp *gsp, int fn, u32 gsp_rpc_len) { @@ -547,6 +582,17 @@ r535_gsp_rpc_poll(struct nvkm_gsp *gsp, u32 fn) return 0; } =20 +/** + * r535_gsp_rpc_handle_reply - Handle RPC reply based on policy + * @gsp: GSP device + * @fn: RPC function number + * @policy: Reply policy (NOWAIT, NOSEQ, RECV, or POLL) + * @gsp_rpc_len: Expected RPC length + * + * Return: NULL when policy is NOWAIT or NOSEQ (no reply expected), + * pointer to reply data on success, ERR_PTR() on error, + * or NULL if no message available. + */ static void * r535_gsp_rpc_handle_reply(struct nvkm_gsp *gsp, u32 fn, enum nvkm_gsp_rpc_reply_policy policy, @@ -574,6 +620,16 @@ r535_gsp_rpc_handle_reply(struct nvkm_gsp *gsp, u32 fn, return repv; } =20 +/** + * r535_gsp_rpc_send - Send RPC message and handle reply + * @gsp: GSP device + * @payload: RPC payload to send + * @policy: Reply policy (NOWAIT, NOSEQ, RECV, or POLL) + * @gsp_rpc_len: Expected RPC length for reply + * + * Return: NULL if policy is NOWAIT/NOSEQ (no reply expected), + * pointer to reply data on success, or ERR_PTR() on error. + */ static void * r535_gsp_rpc_send(struct nvkm_gsp *gsp, void *payload, enum nvkm_gsp_rpc_reply_policy policy, u32 gsp_rpc_len) @@ -601,6 +657,15 @@ r535_gsp_rpc_send(struct nvkm_gsp *gsp, void *payload, return r535_gsp_rpc_handle_reply(gsp, fn, policy, gsp_rpc_len); } =20 +/** + * r535_gsp_rpc_get - Allocate and initialize an RPC message + * @gsp: GSP device + * @fn: RPC function number + * @payload_size: Size of the payload + * + * Return: Pointer to RPC payload data on success, or ERR_PTR() on error. + * Never returns NULL. + */ static void r535_gsp_rpc_done(struct nvkm_gsp *gsp, void *repv) { @@ -628,6 +693,16 @@ r535_gsp_rpc_get(struct nvkm_gsp *gsp, u32 fn, u32 pay= load_size) return rpc->data; } =20 +/** + * r535_gsp_rpc_push - Push RPC message to GSP and wait for reply + * @gsp: GSP device + * @payload: RPC payload to send + * @policy: Reply policy (NOWAIT, NOSEQ, RECV, or POLL) + * @gsp_rpc_len: Expected RPC length in the reply + * + * Return: NULL when policy is NOWAIT/NOSEQ (no reply expected), + * pointer to reply data on success, or ERR_PTR() on error. + */ static void * r535_gsp_rpc_push(struct nvkm_gsp *gsp, void *payload, enum nvkm_gsp_rpc_reply_policy policy, u32 gsp_rpc_len) --=20 2.25.1 From nobody Mon Jun 8 06:38:25 2026 Received: from mailgw.kylinos.cn (mailgw.kylinos.cn [124.126.103.232]) (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 946C33A59B3 for ; Mon, 1 Jun 2026 09:54:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=124.126.103.232 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780307672; cv=none; b=DAuToaG8CReaCpu4VslYliw7KBfiGWAA2osoJ6w64RtyRjUwi3n6ZLALwzd0bNfYwCBoPt5fpbVj3citL8/D8hcHwjdQKjAf3nOPe5pdBi2axdLATKNTZHrNkM45rtd1K+eigCamfJSisycq7kwY1mEJktiXxquBdlr5oZFstxk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780307672; c=relaxed/simple; bh=zzH8wMI7sxaFgBxJHP8Ea1FQ9IiuHaPunkfbMZmXc9g=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=AmC8GW7U3GUV7HGQEH7YMBPh0RUtgEpsYU21wVwREXWGuZh28bJnSKIJEiGsgu2M31tr6Ejwym9k8mroJDvlo6Arv4PseACMIV/J4n/bn0m17w4SBvunrpAujCju6ZGXpnWENOMIQnSYtQ7awidmVelUU7ngl+uei/qZMc72qYQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kylinos.cn; spf=pass smtp.mailfrom=kylinos.cn; arc=none smtp.client-ip=124.126.103.232 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kylinos.cn Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=kylinos.cn X-UUID: d5ed42785d9f11f1aa26b74ffac11d73-20260601 X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.3.12,REQID:6a0a8a24-b6f0-442b-9f69-036ed8f0f53f,IP:0,U RL:0,TC:0,Content:0,EDM:0,RT:0,SF:0,FILE:0,BULK:0,RULE:Release_Ham,ACTION: release,TS:0 X-CID-META: VersionHash:e7bac3a,CLOUDID:879a41a03388ecb8c9900318dfddad4a,BulkI D:nil,BulkQuantity:0,Recheck:0,SF:81|82|102|850|865|898,TC:nil,Content:0|1 5|50,EDM:-3,IP:nil,URL:0,File:nil,RT:nil,Bulk:nil,QS:nil,BEC:nil,COL:0,OSI :0,OSA:0,AV:0,LES:1,SPR:NO,DKR:0,DKP:0,BRR:0,BRE:0,ARC:0 X-CID-BVR: 2,SSN|SDN X-CID-BAS: 2,SSN|SDN,0,_ X-CID-FACTOR: TF_CID_SPAM_SNR X-CID-RHF: D41D8CD98F00B204E9800998ECF8427E X-UUID: d5ed42785d9f11f1aa26b74ffac11d73-20260601 X-User: zenghongling@kylinos.cn Received: from localhost.localdomain [(10.44.16.150)] by mailgw.kylinos.cn (envelope-from ) (Generic MTA with TLSv1.3 TLS_AES_256_GCM_SHA384 256/256) with ESMTP id 736556445; Mon, 01 Jun 2026 17:54:09 +0800 From: Hongling Zeng To: lyude@redhat.com, dakr@kernel.org, maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmermann@suse.de, airlied@gmail.com, simona@ffwll.ch, airlied@redhat.com, ttabi@nvidia.com, bskeggs@nvidia.com, dri-devel@lists.freedesktop.org Cc: nouveau@lists.freedesktop.org, linux-kernel@vger.kernel.org, zhongling0719@126.com, Hongling Zeng Subject: [PATCH v2 2/5] nouveau/gsp/rpc: Cleanup incorrect IS_ERR_OR_NULL in rpc.c Date: Mon, 1 Jun 2026 17:54:00 +0800 Message-Id: <20260601095403.228220-3-zenghongling@kylinos.cn> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20260601095403.228220-1-zenghongling@kylinos.cn> References: <20260601095403.228220-1-zenghongling@kylinos.cn> 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" Clean up incorrect IS_ERR_OR_NULL() usage for functions that never return NULL: - r535_gsp_msgq_peek() never returns NULL - r535_gsp_msgq_recv_one_elem() never returns NULL These functions should be checked with IS_ERR() instead. Signed-off-by: Hongling Zeng --- drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/rpc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 7dd43fa38c41..73f4aee9aa3f 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 @@ -350,7 +350,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_OR_NULL(rpc)) { + if (IS_ERR(rpc)) { kvfree(buf); return rpc; } @@ -359,7 +359,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_OR_NULL(rpc)) { + if (IS_ERR(rpc)) { kvfree(buf); return rpc; } @@ -494,7 +494,7 @@ r535_gsp_msg_recv(struct nvkm_gsp *gsp, int fn, u32 gsp= _rpc_len) =20 retry: rpc =3D r535_gsp_msgq_peek(gsp, sizeof(*rpc), &retries); - if (IS_ERR_OR_NULL(rpc)) + if (IS_ERR(rpc)) return rpc; =20 rpc =3D r535_gsp_msgq_recv(gsp, gsp_rpc_len, &retries); --=20 2.25.1 From nobody Mon Jun 8 06:38:25 2026 Received: from mailgw.kylinos.cn (mailgw.kylinos.cn [124.126.103.232]) (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 C2B4D392814 for ; Mon, 1 Jun 2026 09:54:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=124.126.103.232 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780307672; cv=none; b=Fez+DegCghASG4iNwPg9MOYxBEsi5Gq+UkSvSlKkSb/f7M/J2LVHPtW9cqydpQFYAFgPutak25XOvXgfrI4LaAY4mGWMTEDqj0dmqQXxigZb0t1qRvQEVqkewsu9xkRwdoghl9YEeeizUiRnTEHwBdD4EOyDMYriiRHcjdFc7Ls= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780307672; c=relaxed/simple; bh=15GTZDvU2MwHjWVRr7Ucv2VN9BbxVTjEJUHKltiIDgs=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=U1Y0lJTdaxvneywpz5q8SnpnLOKWEcNHnj0Sa8B1e4V2q7gOCGISL1IrO8nYY02/jLm9Ce/QN+IGmrZnd/UJvY6zjwzFuYFnL3vXXGwpiIT96C9Av5umnSQlcsKdw8jagdxmhjOtGATWDfM0mD1vPuZYTkuhItsbkpmRPyzu/hk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kylinos.cn; spf=pass smtp.mailfrom=kylinos.cn; arc=none smtp.client-ip=124.126.103.232 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kylinos.cn Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=kylinos.cn X-UUID: d6c230965d9f11f1aa26b74ffac11d73-20260601 X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.3.12,REQID:b715f3b6-7071-4c1f-807f-c57916d7f6e6,IP:0,U RL:0,TC:0,Content:0,EDM:0,RT:0,SF:0,FILE:0,BULK:0,RULE:Release_Ham,ACTION: release,TS:0 X-CID-META: VersionHash:e7bac3a,CLOUDID:0993d84ea7c24c68f98e7b8b1fdf738b,BulkI D:nil,BulkQuantity:0,Recheck:0,SF:81|82|102|850|865|898,TC:nil,Content:0|1 5|50,EDM:-3,IP:nil,URL:0,File:nil,RT:nil,Bulk:nil,QS:nil,BEC:nil,COL:0,OSI :0,OSA:0,AV:0,LES:1,SPR:NO,DKR:0,DKP:0,BRR:0,BRE:0,ARC:0 X-CID-BVR: 2,SSN|SDN X-CID-BAS: 2,SSN|SDN,0,_ X-CID-FACTOR: TF_CID_SPAM_SNR X-CID-RHF: D41D8CD98F00B204E9800998ECF8427E X-UUID: d6c230965d9f11f1aa26b74ffac11d73-20260601 X-User: zenghongling@kylinos.cn Received: from localhost.localdomain [(10.44.16.150)] by mailgw.kylinos.cn (envelope-from ) (Generic MTA with TLSv1.3 TLS_AES_256_GCM_SHA384 256/256) with ESMTP id 1887217202; Mon, 01 Jun 2026 17:54:10 +0800 From: Hongling Zeng To: lyude@redhat.com, dakr@kernel.org, maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmermann@suse.de, airlied@gmail.com, simona@ffwll.ch, airlied@redhat.com, ttabi@nvidia.com, bskeggs@nvidia.com, dri-devel@lists.freedesktop.org Cc: nouveau@lists.freedesktop.org, linux-kernel@vger.kernel.org, zhongling0719@126.com, Hongling Zeng Subject: [PATCH v2 3/5] nouveau/gsp/rm/alloc: Cleanup IS_ERR_OR_NULL usage Date: Mon, 1 Jun 2026 17:54:01 +0800 Message-Id: <20260601095403.228220-4-zenghongling@kylinos.cn> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20260601095403.228220-1-zenghongling@kylinos.cn> References: <20260601095403.228220-1-zenghongling@kylinos.cn> 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" r535_gsp_rpc_rm_free() calls nvkm_gsp_rpc_get() which never returns NULL, only valid pointers or error pointers. Clean up by using IS_ERR() instead, matching the actual return value contract. Signed-off-by: Hongling Zeng --- drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/alloc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 46e3a29f2ad7..c9f86c0e9b25 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_OR_NULL(rpc))) + if (WARN_ON(IS_ERR(rpc))) return -EIO; =20 rpc->params.hRoot =3D client->object.handle; --=20 2.25.1 From nobody Mon Jun 8 06:38:25 2026 Received: from mailgw.kylinos.cn (mailgw.kylinos.cn [124.126.103.232]) (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 F29923A2E28 for ; Mon, 1 Jun 2026 09:54:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=124.126.103.232 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780307669; cv=none; b=DnMkWK24wDVGURnoHpIOo4wDFs550Y5/cjf4jG+KO5cpXCrLGLn9F5yFGTPT9Egm6sBRYAgt6KucXUk1QF1SQmYi0RYEKRVnW0HSdRlWavdKk4V5e4ocIDxFHRbd7KNydeuaFBTQ1GvU9fMnV/AjzWC5n1Q9hlLSJDeztuQ66Cc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780307669; c=relaxed/simple; bh=dxzELF4EsDErok7K1qXTJrt01p8hA3+aAtHUmxfRMZs=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=SDGFeV99XOcJd6JRyolAwEBB1tQz7SxpELpLbD9YOQEMl7ScnDJfc5dX/z2atIXwDivz5K7Eza9yrurpeu5Br2mHbm709UOwnDOciUg9jIooJPMtcAFwUDZTbOBOS7nppRwS3gZ0jAZIL4Wmrw9n7ALZQQzrE6PmAonT1Bb0T4s= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kylinos.cn; spf=pass smtp.mailfrom=kylinos.cn; arc=none smtp.client-ip=124.126.103.232 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kylinos.cn Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=kylinos.cn X-UUID: d74873225d9f11f1aa26b74ffac11d73-20260601 X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.3.12,REQID:e7d1782e-22d5-4d34-8a38-784ecb4fa854,IP:0,U RL:0,TC:0,Content:0,EDM:0,RT:0,SF:0,FILE:0,BULK:0,RULE:Release_Ham,ACTION: release,TS:0 X-CID-META: VersionHash:e7bac3a,CLOUDID:a6cb9a86db4fa3008853817328e2774f,BulkI D:nil,BulkQuantity:0,Recheck:0,SF:81|82|102|850|865|898,TC:nil,Content:0|1 5|50,EDM:-3,IP:nil,URL:0,File:nil,RT:nil,Bulk:nil,QS:nil,BEC:nil,COL:0,OSI :0,OSA:0,AV:0,LES:1,SPR:NO,DKR:0,DKP:0,BRR:0,BRE:0,ARC:0 X-CID-BVR: 2,SSN|SDN X-CID-BAS: 2,SSN|SDN,0,_ X-CID-FACTOR: TF_CID_SPAM_SNR X-CID-RHF: D41D8CD98F00B204E9800998ECF8427E X-UUID: d74873225d9f11f1aa26b74ffac11d73-20260601 X-User: zenghongling@kylinos.cn Received: from localhost.localdomain [(10.44.16.150)] by mailgw.kylinos.cn (envelope-from ) (Generic MTA with TLSv1.3 TLS_AES_256_GCM_SHA384 256/256) with ESMTP id 1062215437; Mon, 01 Jun 2026 17:54:11 +0800 From: Hongling Zeng To: lyude@redhat.com, dakr@kernel.org, maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmermann@suse.de, airlied@gmail.com, simona@ffwll.ch, airlied@redhat.com, ttabi@nvidia.com, bskeggs@nvidia.com, dri-devel@lists.freedesktop.org Cc: nouveau@lists.freedesktop.org, linux-kernel@vger.kernel.org, zhongling0719@126.com, Hongling Zeng Subject: [PATCH v2 4/5] nouveau/gsp/rm/bar: Cleanup IS_ERR_OR_NULL usage Date: Mon, 1 Jun 2026 17:54:02 +0800 Message-Id: <20260601095403.228220-5-zenghongling@kylinos.cn> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20260601095403.228220-1-zenghongling@kylinos.cn> References: <20260601095403.228220-1-zenghongling@kylinos.cn> 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" r535_bar_bar2_update_pde() calls nvkm_gsp_rpc_get() which never returns NULL, only valid pointers or error pointers. Clean up by using IS_ERR() instead, matching the actual return value contract. Signed-off-by: Hongling Zeng --- 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 fae08ac3b18c..9cd68f8622d3 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_OR_NULL(rpc))) + if (WARN_ON(IS_ERR(rpc))) return -EIO; =20 rpc->info.barType =3D NV_RPC_UPDATE_PDE_BAR_2; --=20 2.25.1 From nobody Mon Jun 8 06:38:25 2026 Received: from mailgw.kylinos.cn (mailgw.kylinos.cn [124.126.103.232]) (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 AFA4139DBC5 for ; Mon, 1 Jun 2026 09:54:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=124.126.103.232 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780307674; cv=none; b=qmG2LNO+u9fEqmgKVZgSG+oVtmLS9oSw28qtiFIvkKE2V/HZYz9+8d0c3dqsBeDxovp0RLklPcGAB8Imir7sQ6WpV2Jp0s1wrM91KTM3+bVaRlSRWGPcPB4dPl4r1qRTQRoqh88j5nC/Mvb1F+G2yInEeVv8r6ohkfcMmaAMAdo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780307674; c=relaxed/simple; bh=l0R4/pay8yW+ij+ssExj2prxlk3D/kcB0PQvsEW37BA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Jo4HcMcff/OyTx2RjCxnJY/1fUP9WMqiCSYefo1GDJiWnvx6bnNs85qQfEqzYiwtZy5KGBVdsurwHkjrRLA6/qc7hTljK9S3dv1h1zMosWpFe+06UtrfoXLPjppG8Fh03CENcBRpH2YeHAm4xqVRopkE7aJdi8JYdyQ8Rmlumr0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kylinos.cn; spf=pass smtp.mailfrom=kylinos.cn; arc=none smtp.client-ip=124.126.103.232 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kylinos.cn Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=kylinos.cn X-UUID: d7f52e965d9f11f1aa26b74ffac11d73-20260601 X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.3.12,REQID:73283eee-304d-48da-a363-7393821e65fd,IP:0,U RL:0,TC:0,Content:0,EDM:0,RT:0,SF:0,FILE:0,BULK:0,RULE:Release_Ham,ACTION: release,TS:0 X-CID-META: VersionHash:e7bac3a,CLOUDID:3fec95b3d873b147590022ed1e9a3cbe,BulkI D:nil,BulkQuantity:0,Recheck:0,SF:81|82|102|850|865|898,TC:nil,Content:0|1 5|50,EDM:-3,IP:nil,URL:0,File:nil,RT:nil,Bulk:nil,QS:nil,BEC:nil,COL:0,OSI :0,OSA:0,AV:0,LES:1,SPR:NO,DKR:0,DKP:0,BRR:0,BRE:0,ARC:0 X-CID-BVR: 2,SSN|SDN X-CID-BAS: 2,SSN|SDN,0,_ X-CID-FACTOR: TF_CID_SPAM_SNR X-CID-RHF: D41D8CD98F00B204E9800998ECF8427E X-UUID: d7f52e965d9f11f1aa26b74ffac11d73-20260601 X-User: zenghongling@kylinos.cn Received: from localhost.localdomain [(10.44.16.150)] by mailgw.kylinos.cn (envelope-from ) (Generic MTA with TLSv1.3 TLS_AES_256_GCM_SHA384 256/256) with ESMTP id 684301902; Mon, 01 Jun 2026 17:54:12 +0800 From: Hongling Zeng To: lyude@redhat.com, dakr@kernel.org, maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmermann@suse.de, airlied@gmail.com, simona@ffwll.ch, airlied@redhat.com, ttabi@nvidia.com, bskeggs@nvidia.com, dri-devel@lists.freedesktop.org Cc: nouveau@lists.freedesktop.org, linux-kernel@vger.kernel.org, zhongling0719@126.com, Hongling Zeng Subject: [PATCH v2 5/5] nouveau/gsp: Cleanup IS_ERR_OR_NULL in nvkm_gsp_rpc_rd() Date: Mon, 1 Jun 2026 17:54:03 +0800 Message-Id: <20260601095403.228220-6-zenghongling@kylinos.cn> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20260601095403.228220-1-zenghongling@kylinos.cn> References: <20260601095403.228220-1-zenghongling@kylinos.cn> 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" nvkm_gsp_rpc_rd() calls nvkm_gsp_rpc_get() which never returns NULL, only valid pointers or error pointers. Clean up by using IS_ERR() instead, matching the actual return value contract. Note: nvkm_gsp_rpc_push() can return NULL when policy is NOWAIT or NOSEQ, but nvkm_gsp_rpc_rd() uses RECV policy which expects a reply. If the RPC fails to get a reply, it should return an error pointer, not NULL. Signed-off-by: Hongling Zeng --- 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 64fed208e4cf..a061779e0107 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_OR_NULL(argv)) + if (IS_ERR(argv)) return argv; =20 return nvkm_gsp_rpc_push(gsp, argv, NVKM_GSP_RPC_REPLY_RECV, argc); --=20 2.25.1