FAILED: patch "[PATCH] drm/xe/rtp: Add RING_FORCE_TO_NONPRIV_DENY to OA whitelists" failed to apply to 6.18-stable tree
Subsystems (3)
[email protected]
maintainerThe patch below does not apply to the 6.18-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.18.y
git checkout FETCH_HEAD
git cherry-pick -x e70086a3a06d276b4a5d9a2c51c9330c6cf72780
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026072902-gorgeous-negligee-5e08@gregkh' --subject-prefix 'PATCH 6.18.y' 'HEAD^..'
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From e70086a3a06d276b4a5d9a2c51c9330c6cf72780 Mon Sep 17 00:00:00 2001
From: Ashutosh Dixit <[email protected]>
Date: Mon, 15 Jun 2026 15:42:19 -0700
Subject: [PATCH] drm/xe/rtp: Add RING_FORCE_TO_NONPRIV_DENY to OA whitelists
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Unconditionally whitelisting OA registers is a security violation. Set RING_FORCE_TO_NONPRIV_DENY bit in OA nonpriv slots, so that OA registers don't get whitelisted by default after probe, gt reset, resume and engine reset.
drivers/gpu/drm/xe/xe_reg_whitelist.c +5 -3
@@ -104,10 +104,12 @@ static const struct xe_rtp_entry_sr register_whitelist[] = { RING_FORCE_TO_NONPRIV_ACCESS_RW)) }, +#define WHITELIST_DENY (r, f) WHITELIST(r, (f) | RING_FORCE_TO_NONPRIV_DENY) +#define WHITELIST_OA_MMIO_TRG (trg, status, head) \ - WHITELIST(trg, RING_FORCE_TO_NONPRIV_ACCESS_RW), \ - WHITELIST(status, RING_FORCE_TO_NONPRIV_ACCESS_RD), \ - WHITELIST(head, RING_FORCE_TO_NONPRIV_ACCESS_RD | RING_FORCE_TO_NONPRIV_RANGE_4) + WHITELIST_DENY(trg, RING_FORCE_TO_NONPRIV_ACCESS_RW), \ + WHITELIST_DENY(status, RING_FORCE_TO_NONPRIV_ACCESS_RD), \ + WHITELIST_DENY(head, RING_FORCE_TO_NONPRIV_ACCESS_RD | RING_FORCE_TO_NONPRIV_RANGE_4)#define WHITELIST_OAG_MMIO_TRG \ WHITELIST_OA_MMIO_TRG(OAG_MMIOTRIGGER, OAG_OASTATUS, OAG_OAHEADPTR)
Sasha Levin
maintainerPATCH 1/3 drm/xe/xe3: Apply wa_14024997852
From: Tapani Pälli <[email protected]>
[ Upstream commit d24f7d1f62e2ed1bce9664566c32ea13677958f4 ]
Whitelist registers needed for userspace to control autostrip on xe3.
v2: fix GRAPHICS_VERSION to match xe3 (Matt)
v3: use GRAPHICS_VERSION_RANGE to match all xe3 (Matt)
Stable-dep-of: e70086a3a06d ("drm/xe/rtp: Add RING_FORCE_TO_NONPRIV_DENY to OA whitelists")
--- drivers/gpu/drm/xe/xe_reg_whitelist.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/gpu/drm/xe/xe_reg_whitelist.c +7 -0
@@ -88,6 +88,13 @@ static const struct xe_rtp_entry_sr register_whitelist[] = { RING_FORCE_TO_NONPRIV_ACCESS_RD | RING_FORCE_TO_NONPRIV_RANGE_4)) }, + {XE_RTP_NAME ("14024997852" ), +XE_RTP_RULES (GRAPHICS_VERSION_RANGE (3000 ,3005 ),ENGINE_CLASS (RENDER )), +XE_RTP_ACTIONS (WHITELIST (FF_MODE , +RING_FORCE_TO_NONPRIV_ACCESS_RW ), +WHITELIST (VFLSKPD , +RING_FORCE_TO_NONPRIV_ACCESS_RW )) + }, };static void whitelist_apply_to_hwe (struct xe_hw_engine *hwe)
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 2/3 drm/xe/rtp: Refactor OAG MMIO trigger register whitelisting
From: Ashutosh Dixit <[email protected]>
[ Upstream commit ed455775c5a68b75e5f6ad6c8e0e3e9c98fd3f64 ]
Minor refactor of OAG MMIO trigger register whitelisting for code reuse with OAM MMIO trigger register whitelisting.
Stable-dep-of: e70086a3a06d ("drm/xe/rtp: Add RING_FORCE_TO_NONPRIV_DENY to OA whitelists")
--- drivers/gpu/drm/xe/xe_reg_whitelist.c | 41 +++++++++++++-------------- 1 file changed, 19 insertions(+), 22 deletions(-)
drivers/gpu/drm/xe/xe_reg_whitelist.c +19 -22
@@ -66,28 +66,6 @@ static const struct xe_rtp_entry_sr register_whitelist[] = { ENGINE_CLASS(RENDER)),XE_RTP_ACTIONS (WHITELIST (CSBE_DEBUG_STATUS (RENDER_RING_BASE ),0 )) }, - { XE_RTP_NAME("oa_reg_render"), -XE_RTP_RULES (GRAPHICS_VERSION_RANGE (1200 ,XE_RTP_END_VERSION_UNDEFINED ), -ENGINE_CLASS (RENDER )), -XE_RTP_ACTIONS (WHITELIST (OAG_MMIOTRIGGER , -RING_FORCE_TO_NONPRIV_ACCESS_RW ), -WHITELIST (OAG_OASTATUS , -RING_FORCE_TO_NONPRIV_ACCESS_RD ), -WHITELIST (OAG_OAHEADPTR , -RING_FORCE_TO_NONPRIV_ACCESS_RD | -RING_FORCE_TO_NONPRIV_RANGE_4 )) - }, - { XE_RTP_NAME("oa_reg_compute"), -XE_RTP_RULES (GRAPHICS_VERSION_RANGE (1200 ,XE_RTP_END_VERSION_UNDEFINED ), -ENGINE_CLASS (COMPUTE )), -XE_RTP_ACTIONS (WHITELIST (OAG_MMIOTRIGGER , -RING_FORCE_TO_NONPRIV_ACCESS_RW ), -WHITELIST (OAG_OASTATUS , -RING_FORCE_TO_NONPRIV_ACCESS_RD ), -WHITELIST (OAG_OAHEADPTR , -RING_FORCE_TO_NONPRIV_ACCESS_RD | -RING_FORCE_TO_NONPRIV_RANGE_4 )) - }, { XE_RTP_NAME("14024997852"),XE_RTP_RULES (GRAPHICS_VERSION_RANGE (3000 ,3005 ),ENGINE_CLASS (RENDER )), XE_RTP_ACTIONS(WHITELIST(FF_MODE,
@@ -95,6 +73,25 @@ static const struct xe_rtp_entry_sr register_whitelist[] = { WHITELIST(VFLSKPD, RING_FORCE_TO_NONPRIV_ACCESS_RW)) }, + +#define WHITELIST_OA_MMIO_TRG (trg, status, head) \ + WHITELIST(trg, RING_FORCE_TO_NONPRIV_ACCESS_RW), \ + WHITELIST(status, RING_FORCE_TO_NONPRIV_ACCESS_RD), \ + WHITELIST(head, RING_FORCE_TO_NONPRIV_ACCESS_RD | RING_FORCE_TO_NONPRIV_RANGE_4) + +#define WHITELIST_OAG_MMIO_TRG \ + WHITELIST_OA_MMIO_TRG(OAG_MMIOTRIGGER, OAG_OASTATUS, OAG_OAHEADPTR) + + {XE_RTP_NAME ("oag_mmio_trg_rcs" ), +XE_RTP_RULES (GRAPHICS_VERSION_RANGE (1200 ,XE_RTP_END_VERSION_UNDEFINED ), +ENGINE_CLASS (RENDER )), +XE_RTP_ACTIONS (WHITELIST_OAG_MMIO_TRG ) + }, + { XE_RTP_NAME("oag_mmio_trg_ccs"), +XE_RTP_RULES (GRAPHICS_VERSION_RANGE (1200 ,XE_RTP_END_VERSION_UNDEFINED ), +ENGINE_CLASS (COMPUTE )), +XE_RTP_ACTIONS (WHITELIST_OAG_MMIO_TRG ) + }, };static void whitelist_apply_to_hwe (struct xe_hw_engine *hwe)
Signature · 1 line
2.53.0
Re: [PATCH 6.18.y 2/3] drm/xe/rtp: Refactor OAG MMIO trigger register whitelisting
Quoted 1 line · Sasha Levin
Hi Sasha,
I have backported this entire series to linux-6.18.y here:
https://lore.kernel.org/stable/[email protected]/
Thanks.
--
Ashutosh
Quoted 78 lines
From: Ashutosh Dixit <[email protected]>
[ Upstream commit
ed455775c5a68b75e5f6ad6c8e0e3e9c98fd3f64]Minor refactor of OAG MMIO trigger register whitelisting for code reuse with OAM MMIO trigger register whitelisting.
Signed-off-by Ashutosh Dixit <[email protected]>Reviewed-by Umesh Nerlige Ramappa <[email protected]>Stable-dep-of:
e70086a3a06d("drm/xe/rtp: AddRING_FORCE_TO_NONPRIV_DENYto OA whitelists")Signed-off-by Sasha Levin <[email protected]>--- drivers/gpu/drm/xe/xe_reg_whitelist.c | 41 +++++++++++++-------------- 1 file changed, 19 insertions(+), 22 deletions(-)drivers/gpu/drm/xe/xe_reg_whitelist.c +19
-23@@ -66,28 +66,6 @@ static const struct xe_rtp_entry_sr register_whitelist[] = { ENGINE_CLASS(RENDER)),XE_RTP_ACTIONS (WHITELIST (CSBE_DEBUG_STATUS (RENDER_RING_BASE ),0 )) }, - { XE_RTP_NAME("oa_reg_render"), -XE_RTP_RULES (GRAPHICS_VERSION_RANGE (1200 ,XE_RTP_END_VERSION_UNDEFINED ), -ENGINE_CLASS (RENDER )), -XE_RTP_ACTIONS (WHITELIST (OAG_MMIOTRIGGER , -RING_FORCE_TO_NONPRIV_ACCESS_RW ), -WHITELIST (OAG_OASTATUS , -RING_FORCE_TO_NONPRIV_ACCESS_RD ), -WHITELIST (OAG_OAHEADPTR , -RING_FORCE_TO_NONPRIV_ACCESS_RD | -RING_FORCE_TO_NONPRIV_RANGE_4 )) - }, - { XE_RTP_NAME("oa_reg_compute"), -XE_RTP_RULES (GRAPHICS_VERSION_RANGE (1200 ,XE_RTP_END_VERSION_UNDEFINED ), -ENGINE_CLASS (COMPUTE )), -XE_RTP_ACTIONS (WHITELIST (OAG_MMIOTRIGGER , -RING_FORCE_TO_NONPRIV_ACCESS_RW ), -WHITELIST (OAG_OASTATUS , -RING_FORCE_TO_NONPRIV_ACCESS_RD ), -WHITELIST (OAG_OAHEADPTR , -RING_FORCE_TO_NONPRIV_ACCESS_RD | -RING_FORCE_TO_NONPRIV_RANGE_4 )) - }, { XE_RTP_NAME("14024997852"),XE_RTP_RULES (GRAPHICS_VERSION_RANGE (3000 ,3005 ),ENGINE_CLASS (RENDER )), XE_RTP_ACTIONS(WHITELIST(FF_MODE,@@ -95,6 +73,25 @@ static const struct xe_rtp_entry_sr register_whitelist[] = { WHITELIST(VFLSKPD, RING_FORCE_TO_NONPRIV_ACCESS_RW)) }, + +#define WHITELIST_OA_MMIO_TRG (trg, status, head) \ + WHITELIST(trg, RING_FORCE_TO_NONPRIV_ACCESS_RW), \ + WHITELIST(status, RING_FORCE_TO_NONPRIV_ACCESS_RD), \ + WHITELIST(head, RING_FORCE_TO_NONPRIV_ACCESS_RD | RING_FORCE_TO_NONPRIV_RANGE_4) + +#define WHITELIST_OAG_MMIO_TRG \ + WHITELIST_OA_MMIO_TRG(OAG_MMIOTRIGGER, OAG_OASTATUS, OAG_OAHEADPTR) + + {XE_RTP_NAME ("oag_mmio_trg_rcs" ), +XE_RTP_RULES (GRAPHICS_VERSION_RANGE (1200 ,XE_RTP_END_VERSION_UNDEFINED ), +ENGINE_CLASS (RENDER )), +XE_RTP_ACTIONS (WHITELIST_OAG_MMIO_TRG ) + }, + { XE_RTP_NAME("oag_mmio_trg_ccs"), +XE_RTP_RULES (GRAPHICS_VERSION_RANGE (1200 ,XE_RTP_END_VERSION_UNDEFINED ), +ENGINE_CLASS (COMPUTE )), +XE_RTP_ACTIONS (WHITELIST_OAG_MMIO_TRG ) + }, };static void whitelist_apply_to_hwe (struct xe_hw_engine *hwe) --2.53.0
Sasha Levin
maintainerPATCH 3/3 drm/xe/rtp: Add RING_FORCE_TO_NONPRIV_DENY to OA whitelists
In reply to Sasha LevinFrom: Ashutosh Dixit <[email protected]>
[ Upstream commit e70086a3a06d276b4a5d9a2c51c9330c6cf72780 ]
Unconditionally whitelisting OA registers is a security violation. Set RING_FORCE_TO_NONPRIV_DENY bit in OA nonpriv slots, so that OA registers don't get whitelisted by default after probe, gt reset, resume and engine reset.
--- drivers/gpu/drm/xe/xe_reg_whitelist.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/gpu/drm/xe/xe_reg_whitelist.c +5 -3
@@ -74,10 +74,12 @@ static const struct xe_rtp_entry_sr register_whitelist[] = { RING_FORCE_TO_NONPRIV_ACCESS_RW)) }, +#define WHITELIST_DENY (r, f) WHITELIST(r, (f) | RING_FORCE_TO_NONPRIV_DENY) +#define WHITELIST_OA_MMIO_TRG (trg, status, head) \ - WHITELIST(trg, RING_FORCE_TO_NONPRIV_ACCESS_RW), \ - WHITELIST(status, RING_FORCE_TO_NONPRIV_ACCESS_RD), \ - WHITELIST(head, RING_FORCE_TO_NONPRIV_ACCESS_RD | RING_FORCE_TO_NONPRIV_RANGE_4) + WHITELIST_DENY(trg, RING_FORCE_TO_NONPRIV_ACCESS_RW), \ + WHITELIST_DENY(status, RING_FORCE_TO_NONPRIV_ACCESS_RD), \ + WHITELIST_DENY(head, RING_FORCE_TO_NONPRIV_ACCESS_RD | RING_FORCE_TO_NONPRIV_RANGE_4)#define WHITELIST_OAG_MMIO_TRG \ WHITELIST_OA_MMIO_TRG(OAG_MMIOTRIGGER, OAG_OASTATUS, OAG_OAHEADPTR)
Signature · 1 line
2.53.0