From nobody Sat Sep 26 23:53:37 2026 Received: from mail-m155101.qiye.163.com (mail-m155101.qiye.163.com [101.71.155.101]) (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 6C1723932C6; Fri, 28 Aug 2026 05:08:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=101.71.155.101 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787893710; cv=none; b=O05+nmKXKMwY6rciKehPF4z0BvUB27xC111G73/td6VdijlU3S96v1Q3XulfdOSZV5wUqA2hXc0cwsCy2m874V/cWptnbjunRT53pId1K1iQbgIUc/oW7cNYXR70OI4PoBiIHjLO0mIrStdNThanDOizsYDVqrkWn3YWhyt8pwo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787893710; c=relaxed/simple; bh=t9oHZqW8LVA7WjRjoRG5XQQqpRzfcrpeWakZw2W9lBk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CAcEsE1mRVU/FGs9DPearPpV2QElaWlpqmEOAf2DgBfGrd8XfVyOno6damg7ezcSVf3/tD0TrG49BID0ilVXqf4brgGZYxn5a/VHgqwKdTSG90fI2BH4/mBCCnnssVbyrer+Pd4o8LzD50TDEM2f/KABAahJccEBq2qknVlTxCc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=whut.edu.cn; spf=pass smtp.mailfrom=whut.edu.cn; arc=none smtp.client-ip=101.71.155.101 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=whut.edu.cn Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=whut.edu.cn Received: from Mogu.localdomain (unknown [223.73.65.69]) by smtp.qiye.163.com (Hmail) with ESMTP id 4ba72fe21; Fri, 28 Aug 2026 13:08:21 +0800 (GMT+08:00) From: MoGGuU To: Tomeu Vizoso Cc: Oded Gabbay , Jeff Hugo , Sidong Yang , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH v3 1/3] accel/rocket: Validate BO handle counts on job submission Date: Fri, 28 Aug 2026 13:08:03 +0800 Message-ID: <20260828050805.38548-2-Naixumogu@whut.edu.cn> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260828050805.38548-1-Naixumogu@whut.edu.cn> References: <20260828050805.38548-1-Naixumogu@whut.edu.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 X-HM-Tid: 0aa046c4dbb403a1kunma5b495348836b X-HM-MType: 10 X-HM-Spam-Status: e1kfGhgUHx5ZQUtXWQgPGg8OCBgUHx5ZQUlOS1dZFg8aDwILHllBWSg2Ly tZV1koWUFITzdXWRgWCB1ZQUpXWS1ZQUlXWQ8JGhUIEh9ZQVlDThgYVh1JT0pPHR9NH0pLGFYeHw 5VEwETFhoSFyQUDg9ZV1kYEgtZQVlJSUhVTEhVTU5VTUJZV1kWGg8SFR0UWUFZS1VLVUtVS1kG Content-Type: text/plain; charset="utf-8" The input and output BO handle counts are __u32, while GEM lookup and reservation helpers take int counts. A count above INT_MAX cannot be represented safely by the GEM lookup helper. Reject each count above INT_MAX before looking up the BOs. rocket_job_push() already uses check_add_overflow() for the combined count, but stores the result in u32, so it only detects unsigned wraparound. Store the result in int so sums above INT_MAX are rejected before the count is passed to the reservation helpers. Fixes: 0810d5ad88a1 ("accel/rocket: Add job submission IOCTL") Cc: stable@vger.kernel.org Tested-by: Sidong Yang Signed-off-by: MoGGuU Reviewed-by: Sidong Yang --- drivers/accel/rocket/rocket_job.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/accel/rocket/rocket_job.c b/drivers/accel/rocket/rocke= t_job.c index bb77b6bf0f231..e6052d1973afa 100644 --- a/drivers/accel/rocket/rocket_job.c +++ b/drivers/accel/rocket/rocket_job.c @@ -190,7 +190,7 @@ static int rocket_job_push(struct rocket_job *job) struct rocket_device *rdev =3D job->rdev; struct drm_gem_object **bos; struct ww_acquire_ctx acquire_ctx; - u32 bo_count; + int bo_count; int ret =3D 0; =20 if (check_add_overflow(job->in_bo_count, job->out_bo_count, &bo_count)) @@ -556,6 +556,11 @@ static int rocket_ioctl_submit_job(struct drm_device *= dev, struct drm_file *file if (job->task_count =3D=3D 0) return -EINVAL; =20 + /* GEM lookup takes a signed object count. */ + if (job->in_bo_handle_count > INT_MAX || + job->out_bo_handle_count > INT_MAX) + return -EINVAL; + rjob =3D kzalloc_obj(*rjob); if (!rjob) return -ENOMEM; --=20 2.43.0 From nobody Sat Sep 26 23:53:37 2026 Received: from mail-m49197.qiye.163.com (mail-m49197.qiye.163.com [45.254.49.197]) (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 53C9038DC65; Fri, 28 Aug 2026 05:08:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.254.49.197 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787893709; cv=none; b=ha7kHss6+ZU6TbGbEyevty8GMslPxYacHn3gHJ8iZnnnHiPDZPTGvNcuv3qFwuAPtwx7CS1axnP8DPj/7baxUQEi5vW3AhyGaUwF5/rhWcSGP6sZwxUEOsKgqUawrzcsve4GmwZx20zTKcJmjcHyi40hh1bNASkyGi371l6mKEg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787893709; c=relaxed/simple; bh=2oeiR7BUymHocFrGjsFW8hZN9wopW0mVnjdDPX+1IQE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DIU1JHQ7K+73a5elbbdKKdf/jEao477WF5sA3V2n+vxWbR0PwR3ihan025Z1S/nhQYhmbIMjJl1jo1ZGjb1CO/DOWztZJK5RsynfFoagFJWpuHVH53lwke+2jSHEJn89T7C9yMl5ULJ1t5ewDEzWPc5EE08HGBp08cD5hGOBIG0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=whut.edu.cn; spf=pass smtp.mailfrom=whut.edu.cn; arc=none smtp.client-ip=45.254.49.197 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=whut.edu.cn Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=whut.edu.cn Received: from Mogu.localdomain (unknown [223.73.65.69]) by smtp.qiye.163.com (Hmail) with ESMTP id 4ba72fe22; Fri, 28 Aug 2026 13:08:22 +0800 (GMT+08:00) From: MoGGuU To: Tomeu Vizoso Cc: Oded Gabbay , Jeff Hugo , Sidong Yang , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH v3 2/3] accel/rocket: Collect job dependencies before arming Date: Fri, 28 Aug 2026 13:08:04 +0800 Message-ID: <20260828050805.38548-3-Naixumogu@whut.edu.cn> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260828050805.38548-1-Naixumogu@whut.edu.cn> References: <20260828050805.38548-1-Naixumogu@whut.edu.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 X-HM-Tid: 0aa046c4de0603a1kunma5b495348836d X-HM-MType: 10 X-HM-Spam-Status: e1kfGhgUHx5ZQUtXWQgPGg8OCBgUHx5ZQUlOS1dZFg8aDwILHllBWSg2Ly tZV1koWUFITzdXWRgWCB1ZQUpXWS1ZQUlXWQ8JGhUIEh9ZQVkaHxhLVktPGkIYSUsfSE9MSFYeHw 5VEwETFhoSFyQUDg9ZV1kYEgtZQVlJSUhVTEhVTU5VTUJZV1kWGg8SFR0UWUFZS1VLVUtVS1kG Content-Type: text/plain; charset="utf-8" rocket_job_push() arms the scheduler job before collecting its implicit dependencies. Dependency collection can fail with -ENOMEM, but an armed job must be pushed and must not be aborted with drm_sched_job_cleanup(). Collect dependencies before taking the scheduler lock and arming the job. Only operations that cannot fail remain after drm_sched_job_arm(). Fixes: 0810d5ad88a1 ("accel/rocket: Add job submission IOCTL") Cc: stable@vger.kernel.org Tested-by: Sidong Yang Signed-off-by: MoGGuU Reviewed-by: Sidong Yang Reviewed-by: Sidong Yang --- drivers/accel/rocket/rocket_job.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/drivers/accel/rocket/rocket_job.c b/drivers/accel/rocket/rocke= t_job.c index e6052d1973afa..b55e12aecfe64 100644 --- a/drivers/accel/rocket/rocket_job.c +++ b/drivers/accel/rocket/rocket_job.c @@ -206,19 +206,21 @@ static int rocket_job_push(struct rocket_job *job) if (ret) goto err; =20 + ret =3D rocket_acquire_object_fences(job->in_bos, job->in_bo_count, + &job->base, false); + if (ret) + goto err_unlock; + + ret =3D rocket_acquire_object_fences(job->out_bos, job->out_bo_count, + &job->base, true); + if (ret) + goto err_unlock; + scoped_guard(mutex, &rdev->sched_lock) { drm_sched_job_arm(&job->base); =20 job->inference_done_fence =3D dma_fence_get(&job->base.s_fence->finished= ); =20 - ret =3D rocket_acquire_object_fences(job->in_bos, job->in_bo_count, &job= ->base, false); - if (ret) - goto err_unlock; - - ret =3D rocket_acquire_object_fences(job->out_bos, job->out_bo_count, &j= ob->base, true); - if (ret) - goto err_unlock; - kref_get(&job->refcount); /* put by scheduler job completion */ =20 drm_sched_entity_push_job(&job->base); --=20 2.43.0 From nobody Sat Sep 26 23:53:37 2026 Received: from mail-m155101.qiye.163.com (mail-m155101.qiye.163.com [101.71.155.101]) (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 1B6B7355F4E; Fri, 28 Aug 2026 05:08:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=101.71.155.101 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787893709; cv=none; b=cMPB7wTCVhjrBoG8au1BzOM3wtEEwlAnOr78uQ4z4ooAJVe+S59qs6emVmEh5GbCdiVLFiwQm1gwH0NoNznP9AooYG0A1ynWrSNIpDcSUjZ+N0SQIKM8MlNWfx+HMPq3wMfRJVpCeYKxtJahY2XBT7rW/n98GnI+SvEtQrdJy/8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787893709; c=relaxed/simple; bh=X0Gep0btEjJu/T+EyYd0jpqhvft7cu7/20fyUne6dDY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=O3UCvgptLcOIJNY4ZwoOmAVAvLkXHd9oBf1SNDf8W1VaCGfSJ+4xzTRdc1CceCN0rKyixPzL0sl+nhrdvVcQFqOCq/PGIThFodI9QOOmypnx6y1tlJhkqk2UeIIUzzSksItmlrXcFDVTjJoBYvPFPZUpMBtC/PkBeEBKoVrFWNo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=whut.edu.cn; spf=pass smtp.mailfrom=whut.edu.cn; arc=none smtp.client-ip=101.71.155.101 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=whut.edu.cn Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=whut.edu.cn Received: from Mogu.localdomain (unknown [223.73.65.69]) by smtp.qiye.163.com (Hmail) with ESMTP id 4ba72fe23; Fri, 28 Aug 2026 13:08:22 +0800 (GMT+08:00) From: MoGGuU To: Tomeu Vizoso Cc: Oded Gabbay , Jeff Hugo , Sidong Yang , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH v3 3/3] accel/rocket: Propagate job submission errors Date: Fri, 28 Aug 2026 13:08:05 +0800 Message-ID: <20260828050805.38548-4-Naixumogu@whut.edu.cn> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260828050805.38548-1-Naixumogu@whut.edu.cn> References: <20260828050805.38548-1-Naixumogu@whut.edu.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 X-HM-Tid: 0aa046c4e09203a1kunma5b4953488371 X-HM-MType: 10 X-HM-Spam-Status: e1kfGhgUHx5ZQUtXWQgPGg8OCBgUHx5ZQUlOS1dZFg8aDwILHllBWSg2Ly tZV1koWUFITzdXWRgWCB1ZQUpXWS1ZQUlXWQ8JGhUIEh9ZQVkZH09IVk5NGh1CHkpJSRkYSlYeHw 5VEwETFhoSFyQUDg9ZV1kYEgtZQVlJSUhVTEhVTU5VTUJZV1kWGg8SFR0UWUFZS1VLVUtVS1kG Content-Type: text/plain; charset="utf-8" rocket_ioctl_submit() discards each job's return value and reports success even when every job fails. Return the first error and stop submitting the remaining jobs. Jobs queued before an error remain queued, giving the ioctl ordered partial-submit semantics. Fixes: 0810d5ad88a1 ("accel/rocket: Add job submission IOCTL") Cc: stable@vger.kernel.org Tested-by: Sidong Yang Signed-off-by: MoGGuU Reviewed-by: Sidong Yang --- drivers/accel/rocket/rocket_job.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/accel/rocket/rocket_job.c b/drivers/accel/rocket/rocke= t_job.c index b55e12aecfe64..8f1bdf4a57f20 100644 --- a/drivers/accel/rocket/rocket_job.c +++ b/drivers/accel/rocket/rocket_job.c @@ -646,8 +646,11 @@ int rocket_ioctl_submit(struct drm_device *dev, void *= data, struct drm_file *fil } =20 =20 - for (i =3D 0; i < args->job_count; i++) - rocket_ioctl_submit_job(dev, file, &jobs[i]); + for (i =3D 0; i < args->job_count; i++) { + ret =3D rocket_ioctl_submit_job(dev, file, &jobs[i]); + if (ret) + goto exit; + } =20 exit: kvfree(jobs); --=20 2.43.0