Changes in v3d_submit.c

4ee06e3b - drm/v3d: Fix miscellaneous documentation errors

Fri, 06 Dec 2024 15:39:09 +0000

drm/v3d: Fix miscellaneous documentation errorsThis commit fixes several miscellaneous documentation errors. Mostly,delete/update comments that are outdated or are leftovers from past codechanges. Apart from that, remove double-spaces in several comments.Signed-off-by: Maíra Canal Acked-by: Iago Toral Quiroga Link: https://patchwork.freedesktop.org/patch/msgid/20241206153908.62429-1-mcanal@igalia.com List of files: /linux-6.15/drivers/gpu/drm/v3d/v3d_submit.c

c6eabbab - drm/v3d: Add DRM_IOCTL_V3D_PERFMON_SET_GLOBAL

Mon, 02 Dec 2024 14:06:13 +0000

drm/v3d: Add DRM_IOCTL_V3D_PERFMON_SET_GLOBALAdd a new ioctl, DRM_IOCTL_V3D_PERFMON_SET_GLOBAL, to allowconfiguration of a global performance monitor (perfmon).Use the global perfmon for all jobs to ensure consistentperformance tracking across submissions. This feature isneeded to implement a Perfetto datasources in user-space.Signed-off-by: Christian Gmeiner Reviewed-by: Maíra Canal Signed-off-by: Maíra Canal Link: https://patchwork.freedesktop.org/patch/msgid/20241202140615.74802-1-christian.gmeiner@gmail.com List of files: /linux-6.15/drivers/gpu/drm/v3d/v3d_submit.c

4ecc24a8 - drm/v3d: Validate passed in drm syncobj handles in the performance extension

Thu, 11 Jul 2024 13:53:34 +0000

drm/v3d: Validate passed in drm syncobj handles in the performance extensionIf userspace provides an unknown or invalid handle anywhere in the handlearray the rest of the driver will not handle that well.Fix it by checking handle was looked up successfully or otherwise fail theextension by jumping into the existing unwind.Signed-off-by: Tvrtko Ursulin Fixes: bae7cb5d6800 ("drm/v3d: Create a CPU job extension for the reset performance query job")Cc: Maíra Canal Cc: Iago Toral Quiroga Cc: stable@vger.kernel.org # v6.8+Reviewed-by: Maíra Canal Signed-off-by: Maíra Canal Link: https://patchwork.freedesktop.org/patch/msgid/20240711135340.84617-6-tursulin@igalia.com(cherry picked from commit a546b7e4d73c23838d7e4d2c92882b3ca902d213)Signed-off-by: Thomas Zimmermann List of files: /linux-6.15/drivers/gpu/drm/v3d/v3d_submit.c

023d22e8 - drm/v3d: Validate passed in drm syncobj handles in the timestamp extension

Thu, 11 Jul 2024 13:53:33 +0000

drm/v3d: Validate passed in drm syncobj handles in the timestamp extensionIf userspace provides an unknown or invalid handle anywhere in the handlearray the rest of the driver will not handle that well.Fix it by checking handle was looked up successfully or otherwise fail theextension by jumping into the existing unwind.Signed-off-by: Tvrtko Ursulin Fixes: 9ba0ff3e083f ("drm/v3d: Create a CPU job extension for the timestamp query job")Cc: Maíra Canal Cc: Iago Toral Quiroga Cc: stable@vger.kernel.org # v6.8+Reviewed-by: Maíra Canal Signed-off-by: Maíra Canal Link: https://patchwork.freedesktop.org/patch/msgid/20240711135340.84617-5-tursulin@igalia.com(cherry picked from commit 8d1276d1b8f738c3afe1457d4dff5cc66fc848a3)Signed-off-by: Thomas Zimmermann List of files: /linux-6.15/drivers/gpu/drm/v3d/v3d_submit.c

32df4abc - drm/v3d: Fix potential memory leak in the performance extension

Thu, 11 Jul 2024 13:53:32 +0000

drm/v3d: Fix potential memory leak in the performance extensionIf fetching of userspace memory fails during the main loop, all drm syncobjs looked up until that point will be leaked because of the missingdrm_syncobj_put.Fix it by exporting and using a common cleanup helper.Signed-off-by: Tvrtko Ursulin Fixes: bae7cb5d6800 ("drm/v3d: Create a CPU job extension for the reset performance query job")Cc: Maíra Canal Cc: Iago Toral Quiroga Cc: stable@vger.kernel.org # v6.8+Signed-off-by: Maíra Canal Link: https://patchwork.freedesktop.org/patch/msgid/20240711135340.84617-4-tursulin@igalia.com(cherry picked from commit 484de39fa5f5b7bd0c5f2e2c5265167250ef7501)Signed-off-by: Thomas Zimmermann List of files: /linux-6.15/drivers/gpu/drm/v3d/v3d_submit.c

0e50fcc2 - drm/v3d: Fix potential memory leak in the timestamp extension

Thu, 11 Jul 2024 13:53:31 +0000

drm/v3d: Fix potential memory leak in the timestamp extensionIf fetching of userspace memory fails during the main loop, all drm syncobjs looked up until that point will be leaked because of the missingdrm_syncobj_put.Fix it by exporting and using a common cleanup helper.Signed-off-by: Tvrtko Ursulin Fixes: 9ba0ff3e083f ("drm/v3d: Create a CPU job extension for the timestamp query job")Cc: Maíra Canal Cc: Iago Toral Quiroga Cc: stable@vger.kernel.org # v6.8+Reviewed-by: Maíra Canal Signed-off-by: Maíra Canal Link: https://patchwork.freedesktop.org/patch/msgid/20240711135340.84617-3-tursulin@igalia.com(cherry picked from commit 753ce4fea62182c77e1691ab4f9022008f25b62e)Signed-off-by: Thomas Zimmermann List of files: /linux-6.15/drivers/gpu/drm/v3d/v3d_submit.c

6ce9efd1 - drm/v3d: Prevent out of bounds access in performance query extensions

Thu, 11 Jul 2024 13:53:30 +0000

drm/v3d: Prevent out of bounds access in performance query extensionsCheck that the number of perfmons userspace is passing in the copy andreset extensions is not greater than the internal kernel storage wherethe ids will be copied into.Signed-off-by: Tvrtko Ursulin Fixes: bae7cb5d6800 ("drm/v3d: Create a CPU job extension for the reset performance query job")Cc: Maíra Canal Cc: Iago Toral Quiroga Cc: stable@vger.kernel.org # v6.8+Reviewed-by: Iago Toral Quiroga Reviewed-by: Maíra Canal Signed-off-by: Maíra Canal Link: https://patchwork.freedesktop.org/patch/msgid/20240711135340.84617-2-tursulin@igalia.com(cherry picked from commit f32b5128d2c440368b5bf3a7a356823e235caabb)Signed-off-by: Thomas Zimmermann List of files: /linux-6.15/drivers/gpu/drm/v3d/v3d_submit.c

c48abf09 - drm/v3d: Add some local variables in queries/extensions

Thu, 11 Jul 2024 13:53:40 +0000

drm/v3d: Add some local variables in queries/extensionsAdd some local variables to make the code a bit less verbose, with themain benefit being pulling some lines to under 80 columns wide.Signed-off-by: Tvrtko Ursulin Reviewed-by: Maíra Canal Signed-off-by: Maíra Canal Link: https://patchwork.freedesktop.org/patch/msgid/20240711135340.84617-12-tursulin@igalia.com List of files: /linux-6.15/drivers/gpu/drm/v3d/v3d_submit.c

96bc9049 - drm/v3d: Prefer get_user for scalar types

Thu, 11 Jul 2024 13:53:39 +0000

drm/v3d: Prefer get_user for scalar typesIt makes it just a tiny bit more obvious what is going on.Signed-off-by: Tvrtko Ursulin Reviewed-by: Maíra Canal Signed-off-by: Maíra Canal Link: https://patchwork.freedesktop.org/patch/msgid/20240711135340.84617-11-tursulin@igalia.com List of files: /linux-6.15/drivers/gpu/drm/v3d/v3d_submit.c

c9d6630f - drm/v3d: Size the kperfmon_ids array at runtime

Thu, 11 Jul 2024 13:53:36 +0000

drm/v3d: Size the kperfmon_ids array at runtimeInstead of statically reserving pessimistic space for the kperfmon_idsarray, make the userspace extension code allocate the exactly requiredamount of space.Apart from saving some memory at runtime, this also removes the need forthe V3D_MAX_PERFMONS macro whose removal will benefit further drivercleanup.Signed-off-by: Tvrtko Ursulin Reviewed-by: Maíra Canal Signed-off-by: Maíra Canal Link: https://patchwork.freedesktop.org/patch/msgid/20240711135340.84617-8-tursulin@igalia.com List of files: /linux-6.15/drivers/gpu/drm/v3d/v3d_submit.c

4bd75a81 - drm/v3d: Move part of copying of reset/copy performance extension to a helper

Thu, 11 Jul 2024 13:53:35 +0000

drm/v3d: Move part of copying of reset/copy performance extension to a helperThe loop which looks up the syncobj and copies the kperfmon ids isidentical so lets move it to a helper.The only change is replacing copy_from_user with get_user when copying ascalar.Signed-off-by: Tvrtko Ursulin Reviewed-by: Maíra Canal Signed-off-by: Maíra Canal Link: https://patchwork.freedesktop.org/patch/msgid/20240711135340.84617-7-tursulin@igalia.com List of files: /linux-6.15/drivers/gpu/drm/v3d/v3d_submit.c

a546b7e4 - drm/v3d: Validate passed in drm syncobj handles in the performance extension

Thu, 11 Jul 2024 13:53:34 +0000

drm/v3d: Validate passed in drm syncobj handles in the performance extensionIf userspace provides an unknown or invalid handle anywhere in the handlearray the rest of the driver will not handle that well.Fix it by checking handle was looked up successfully or otherwise fail theextension by jumping into the existing unwind.Signed-off-by: Tvrtko Ursulin Fixes: bae7cb5d6800 ("drm/v3d: Create a CPU job extension for the reset performance query job")Cc: Maíra Canal Cc: Iago Toral Quiroga Cc: stable@vger.kernel.org # v6.8+Reviewed-by: Maíra Canal Signed-off-by: Maíra Canal Link: https://patchwork.freedesktop.org/patch/msgid/20240711135340.84617-6-tursulin@igalia.com List of files: /linux-6.15/drivers/gpu/drm/v3d/v3d_submit.c

8d1276d1 - drm/v3d: Validate passed in drm syncobj handles in the timestamp extension

Thu, 11 Jul 2024 13:53:33 +0000

drm/v3d: Validate passed in drm syncobj handles in the timestamp extensionIf userspace provides an unknown or invalid handle anywhere in the handlearray the rest of the driver will not handle that well.Fix it by checking handle was looked up successfully or otherwise fail theextension by jumping into the existing unwind.Signed-off-by: Tvrtko Ursulin Fixes: 9ba0ff3e083f ("drm/v3d: Create a CPU job extension for the timestamp query job")Cc: Maíra Canal Cc: Iago Toral Quiroga Cc: stable@vger.kernel.org # v6.8+Reviewed-by: Maíra Canal Signed-off-by: Maíra Canal Link: https://patchwork.freedesktop.org/patch/msgid/20240711135340.84617-5-tursulin@igalia.com List of files: /linux-6.15/drivers/gpu/drm/v3d/v3d_submit.c

484de39f - drm/v3d: Fix potential memory leak in the performance extension

Thu, 11 Jul 2024 13:53:32 +0000

drm/v3d: Fix potential memory leak in the performance extensionIf fetching of userspace memory fails during the main loop, all drm syncobjs looked up until that point will be leaked because of the missingdrm_syncobj_put.Fix it by exporting and using a common cleanup helper.Signed-off-by: Tvrtko Ursulin Fixes: bae7cb5d6800 ("drm/v3d: Create a CPU job extension for the reset performance query job")Cc: Maíra Canal Cc: Iago Toral Quiroga Cc: stable@vger.kernel.org # v6.8+Signed-off-by: Maíra Canal Link: https://patchwork.freedesktop.org/patch/msgid/20240711135340.84617-4-tursulin@igalia.com List of files: /linux-6.15/drivers/gpu/drm/v3d/v3d_submit.c

753ce4fe - drm/v3d: Fix potential memory leak in the timestamp extension

Thu, 11 Jul 2024 13:53:31 +0000

drm/v3d: Fix potential memory leak in the timestamp extensionIf fetching of userspace memory fails during the main loop, all drm syncobjs looked up until that point will be leaked because of the missingdrm_syncobj_put.Fix it by exporting and using a common cleanup helper.Signed-off-by: Tvrtko Ursulin Fixes: 9ba0ff3e083f ("drm/v3d: Create a CPU job extension for the timestamp query job")Cc: Maíra Canal Cc: Iago Toral Quiroga Cc: stable@vger.kernel.org # v6.8+Reviewed-by: Maíra Canal Signed-off-by: Maíra Canal Link: https://patchwork.freedesktop.org/patch/msgid/20240711135340.84617-3-tursulin@igalia.com List of files: /linux-6.15/drivers/gpu/drm/v3d/v3d_submit.c

f32b5128 - drm/v3d: Prevent out of bounds access in performance query extensions

Thu, 11 Jul 2024 13:53:30 +0000

drm/v3d: Prevent out of bounds access in performance query extensionsCheck that the number of perfmons userspace is passing in the copy andreset extensions is not greater than the internal kernel storage wherethe ids will be copied into.Signed-off-by: Tvrtko Ursulin Fixes: bae7cb5d6800 ("drm/v3d: Create a CPU job extension for the reset performance query job")Cc: Maíra Canal Cc: Iago Toral Quiroga Cc: stable@vger.kernel.org # v6.8+Reviewed-by: Iago Toral Quiroga Reviewed-by: Maíra Canal Signed-off-by: Maíra Canal Link: https://patchwork.freedesktop.org/patch/msgid/20240711135340.84617-2-tursulin@igalia.com List of files: /linux-6.15/drivers/gpu/drm/v3d/v3d_submit.c

2ad62d16 - drm/v3d: Free the job and assign it to NULL if initialization fails

Tue, 09 Jan 2024 14:28:24 +0000

drm/v3d: Free the job and assign it to NULL if initialization failsCurrently, if `v3d_job_init()` fails (e.g. in the IGT test "bad-in-sync",where we submit an invalid in-sync to the IOCTL), then we end up withthe following NULL pointer dereference:[ 34.146279] Unable to handle kernel NULL pointer dereference at virtual address 0000000000000078[ 34.146301] Mem abort info:[ 34.146306] ESR = 0x0000000096000005[ 34.146315] EC = 0x25: DABT (current EL), IL = 32 bits[ 34.146322] SET = 0, FnV = 0[ 34.146328] EA = 0, S1PTW = 0[ 34.146334] FSC = 0x05: level 1 translation fault[ 34.146340] Data abort info:[ 34.146345] ISV = 0, ISS = 0x00000005, ISS2 = 0x00000000[ 34.146351] CM = 0, WnR = 0, TnD = 0, TagAccess = 0[ 34.146357] GCS = 0, Overlay = 0, DirtyBit = 0, Xs = 0[ 34.146366] user pgtable: 4k pages, 39-bit VAs, pgdp=00000001232e6000[ 34.146375] [0000000000000078] pgd=0000000000000000, p4d=0000000000000000, pud=0000000000000000[ 34.146399] Internal error: Oops: 0000000096000005 [#1] PREEMPT SMP[ 34.146406] Modules linked in: rfcomm snd_seq_dummy snd_hrtimer snd_seq snd_seq_device algif_hash aes_neon_bs aes_neon_blk algif_skcipher af_alg bnep hid_logitech_hidpp brcmfmac_wcc brcmfmac brcmutil hci_uart vc4 btbcm cfg80211 bluetooth bcm2835_v4l2(C) snd_soc_hdmi_codec binfmt_misc cec drm_display_helper hid_logitech_dj bcm2835_mmal_vchiq(C) drm_dma_helper drm_kms_helper videobuf2_v4l2 raspberrypi_hwmon ecdh_generic videobuf2_vmalloc videobuf2_memops ecc videobuf2_common rfkill videodev libaes snd_soc_core dwc2 i2c_brcmstb snd_pcm_dmaengine snd_bcm2835(C) i2c_bcm2835 pwm_bcm2835 snd_pcm mc v3d snd_timer snd gpu_sched drm_shmem_helper nvmem_rmem uio_pdrv_genirq uio i2c_dev drm fuse dm_mod drm_panel_orientation_quirks backlight configfs ip_tables x_tables ipv6[ 34.146556] CPU: 1 PID: 1890 Comm: v3d_submit_csd Tainted: G C 6.7.0-rc3-g49ddab089611 #68[ 34.146563] Hardware name: Raspberry Pi 4 Model B Rev 1.5 (DT)[ 34.146569] pstate: 60000005 (nZCv daif -PAN -UAO -TCO -DIT -SSBS BTYPE=--)[ 34.146575] pc : drm_sched_job_cleanup+0x3c/0x190 [gpu_sched][ 34.146611] lr : v3d_submit_csd_ioctl+0x1b4/0x460 [v3d][ 34.146653] sp : ffffffc083cbbb80[ 34.146658] x29: ffffffc083cbbb90 x28: ffffff81035afc00 x27: ffffffe77a641168[ 34.146668] x26: ffffff81056a8000 x25: 0000000000000058 x24: 0000000000000000[ 34.146677] x23: ffffff81065e2000 x22: ffffff81035afe00 x21: ffffffc083cbbcf0[ 34.146686] x20: ffffff81035afe00 x19: 00000000ffffffea x18: 0000000000000000[ 34.146694] x17: 0000000000000000 x16: ffffffe7989e34b0 x15: 0000000000000000[ 34.146703] x14: 0000000004000004 x13: ffffff81035afe80 x12: ffffffc083cb8000[ 34.146711] x11: cc57e05dfbe5ef00 x10: cc57e05dfbe5ef00 x9 : ffffffe77a64131c[ 34.146719] x8 : 0000000000000000 x7 : 0000000000000000 x6 : 000000000000003f[ 34.146727] x5 : 0000000000000040 x4 : ffffff81fefb03f0 x3 : ffffffc083cbba40[ 34.146736] x2 : ffffff81056a8000 x1 : ffffffe7989e35e8 x0 : 0000000000000000[ 34.146745] Call trace:[ 34.146748] drm_sched_job_cleanup+0x3c/0x190 [gpu_sched][ 34.146768] v3d_submit_csd_ioctl+0x1b4/0x460 [v3d][ 34.146791] drm_ioctl_kernel+0xe0/0x120 [drm][ 34.147029] drm_ioctl+0x264/0x408 [drm][ 34.147135] __arm64_sys_ioctl+0x9c/0xe0[ 34.147152] invoke_syscall+0x4c/0x118[ 34.147162] el0_svc_common+0xb8/0xf0[ 34.147168] do_el0_svc+0x28/0x40[ 34.147174] el0_svc+0x38/0x88[ 34.147184] el0t_64_sync_handler+0x84/0x100[ 34.147191] el0t_64_sync+0x190/0x198[ 34.147201] Code: aa0003f4 f90007e8 f9401008 aa0803e0 (b8478c09)[ 34.147210] ---[ end trace 0000000000000000 ]---This happens because we are calling `drm_sched_job_cleanup()` twice:once at `v3d_job_init()` and again when we call `v3d_job_cleanup()`.To mitigate this issue, we can return to the same approach that we usedto use before 464c61e76de8: deallocate the job after `v3d_job_init()`fails and assign it to NULL. Then, when we call `v3d_job_cleanup()`, jobis NULL and the function returns.Fixes: 464c61e76de8 ("drm/v3d: Decouple job allocation from job initiation")Signed-off-by: Maíra Canal Reviewed-by: Iago Toral Quiroga Link: https://patchwork.freedesktop.org/patch/msgid/20240109142857.1122704-1-mcanal@igalia.com List of files: /linux-6.15/drivers/gpu/drm/v3d/v3d_submit.c

dce94061 - drm/v3d: Fix missing error code in v3d_submit_cpu_ioctl()

Mon, 04 Dec 2023 12:21:01 +0000

drm/v3d: Fix missing error code in v3d_submit_cpu_ioctl()Smatch warns: drivers/gpu/drm/v3d/v3d_submit.c:1222 v3d_submit_cpu_ioctl() warn: missing error code 'ret'When there is no job type or job is submitted with wrong number of BOsit is an error path, ret is zero at this point which is incorrectreturn.Fix this by changing it to -EINVAL.Fixes: aafc1a2bea67 ("drm/v3d: Add a CPU job submission")Signed-off-by: Harshit Mogalapalli Reviewed-by: Melissa Wen Signed-off-by: Melissa Wen Link: https://patchwork.freedesktop.org/patch/msgid/20231204122102.181298-1-harshit.m.mogalapalli@oracle.com List of files: /linux-6.15/drivers/gpu/drm/v3d/v3d_submit.c

209e8d26 - drm/v3d: Create a CPU job extension for the copy performance query job

Thu, 30 Nov 2023 16:40:40 +0000

drm/v3d: Create a CPU job extension for the copy performance query jobA CPU job is a type of job that performs operations that requires CPUintervention. A copy performance query job is a job that copy the completeor partial result of a query to a buffer. In order to copy the result ofa performance query to a buffer, we need to get the values from theperformance monitors.So, create a user extension for the CPU job that enables the creationof a copy performance query job. This user extension will allow the creationof a CPU job that copy the results of a performance query to a BO with thepossibility to indicate the availability with a availability bit.Signed-off-by: Maíra Canal Reviewed-by: Iago Toral Quiroga Link: https://patchwork.freedesktop.org/patch/msgid/20231130164420.932823-19-mcanal@igalia.com List of files: /linux-6.15/drivers/gpu/drm/v3d/v3d_submit.c

bae7cb5d - drm/v3d: Create a CPU job extension for the reset performance query job

Thu, 30 Nov 2023 16:40:39 +0000

drm/v3d: Create a CPU job extension for the reset performance query jobA CPU job is a type of job that performs operations that requires CPUintervention. A reset performance query job is a job that resets theperformance queries by resetting the values of the perfmons. Moreover,we also reset the syncobjs related to the availability of the query.So, create a user extension for the CPU job that enables the creationof a reset performance job. This user extension will allow the creation ofa CPU job that resets the perfmons values and resets the availability syncobj.Signed-off-by: Maíra Canal Reviewed-by: Iago Toral Quiroga Link: https://patchwork.freedesktop.org/patch/msgid/20231130164420.932823-18-mcanal@igalia.com List of files: /linux-6.15/drivers/gpu/drm/v3d/v3d_submit.c