]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
drm/xe/oa: (De-)whitelist OA registers on OA stream open/release
authorAshutosh Dixit <ashutosh.dixit@intel.com>
Mon, 15 Jun 2026 22:42:26 +0000 (15:42 -0700)
committerThomas Hellström <thomas.hellstrom@linux.intel.com>
Thu, 2 Jul 2026 10:29:43 +0000 (12:29 +0200)
Whitelist OA registers on stream open and de-whitelist on stream
close/release. Whitelisting is only done when 'stream->sample' is
true. 'stream->sample' is only true when (a) xe_observation_paranoid is set
to false by system admin, or (b) the process is perfmon_capable(). This
therefore enforces the OA register whitelisting security requirements.

Fixes: 828a8eaf37c3 ("drm/xe/oa: Add MMIO trigger support")
Cc: stable@vger.kernel.org # v6.12+
Signed-off-by: Ashutosh Dixit <ashutosh.dixit@intel.com>
Reviewed-by: Umesh Nerlige Ramappa <umesh.nerlige.ramappa@intel.com>
Link: https://patch.msgid.link/20260615224227.34880-9-ashutosh.dixit@intel.com
(cherry picked from commit f8e6874f46f19a6a2a0f24a81689f90641bb402a)
Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
drivers/gpu/drm/xe/xe_oa.c

index 4bf4b1f65929f1f96c96ebfea6466b557a8f1f8a..2dce6a47202ca6328d02379e5c90c61691fde787 100644 (file)
@@ -37,6 +37,7 @@
 #include "xe_oa.h"
 #include "xe_observation.h"
 #include "xe_pm.h"
+#include "xe_reg_whitelist.h"
 #include "xe_sched_job.h"
 #include "xe_sriov.h"
 #include "xe_sync.h"
@@ -885,6 +886,9 @@ static void xe_oa_stream_destroy(struct xe_oa_stream *stream)
 
        mutex_destroy(&stream->stream_lock);
 
+       if (stream->sample)
+               xe_reg_dewhitelist_oa_regs(stream->gt);
+
        xe_oa_disable_metric_set(stream);
        xe_exec_queue_put(stream->k_exec_q);
 
@@ -1885,6 +1889,9 @@ static int xe_oa_stream_open_ioctl_locked(struct xe_oa *oa,
                goto err_disable;
        }
 
+       if (stream->sample)
+               xe_reg_whitelist_oa_regs(stream->gt);
+
        /* Hold a reference on the drm device till stream_fd is released */
        drm_dev_get(&stream->oa->xe->drm);