From: "Thomas Hellström" <thomas.hellstrom@linux.intel.com>
To: intel-xe@lists.freedesktop.org
Cc: "Thomas Hellström" <thomas.hellstrom@linux.intel.com>
Subject: [PATCH v3] drm/xe: Enable ATS if enabled on the PCI side
Date: Mon, 9 Jun 2025 15:54:08 +0200 [thread overview]
Message-ID: <20250609135408.102001-1-thomas.hellstrom@linux.intel.com> (raw)
If IOMMU and device supports ATS, enable it in an effort to offload
IOMMU TLB.
v2:
- Set the FORCE_FAULT PTE flag when clearing a PTE for faulting VM. (CI)
v3:
- More instances of FORCE_FAULT flag. (CI)
Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
---
drivers/gpu/drm/xe/regs/xe_gtt_defs.h | 1 +
drivers/gpu/drm/xe/xe_lrc.c | 5 ++++
drivers/gpu/drm/xe/xe_pt.c | 36 +++++++++++++++------------
3 files changed, 26 insertions(+), 16 deletions(-)
diff --git a/drivers/gpu/drm/xe/regs/xe_gtt_defs.h b/drivers/gpu/drm/xe/regs/xe_gtt_defs.h
index 4389e5a76f89..c6b32516b008 100644
--- a/drivers/gpu/drm/xe/regs/xe_gtt_defs.h
+++ b/drivers/gpu/drm/xe/regs/xe_gtt_defs.h
@@ -33,5 +33,6 @@
#define XE_PAGE_PRESENT BIT_ULL(0)
#define XE_PAGE_RW BIT_ULL(1)
+#define XE_PAGE_FORCE_FAULT BIT_ULL(2)
#endif
diff --git a/drivers/gpu/drm/xe/xe_lrc.c b/drivers/gpu/drm/xe/xe_lrc.c
index 61a2e87990a9..085f7e0568e9 100644
--- a/drivers/gpu/drm/xe/xe_lrc.c
+++ b/drivers/gpu/drm/xe/xe_lrc.c
@@ -976,6 +976,7 @@ static void xe_lrc_setup_utilization(struct xe_lrc *lrc)
#define PVC_CTX_ASID (0x2e + 1)
#define PVC_CTX_ACC_CTR_THOLD (0x2a + 1)
+#define XE_CTX_PASID (0x2c + 1)
static int xe_lrc_init(struct xe_lrc *lrc, struct xe_hw_engine *hwe,
struct xe_vm *vm, u32 ring_size, u16 msix_vec,
@@ -1104,6 +1105,10 @@ static int xe_lrc_init(struct xe_lrc *lrc, struct xe_hw_engine *hwe,
if (xe->info.has_asid && vm)
xe_lrc_write_ctx_reg(lrc, PVC_CTX_ASID, vm->usm.asid);
+ /* If possible, enable ATS to offload the IOMMU TLB */
+ if (to_pci_dev(xe->drm.dev)->ats_enabled)
+ xe_lrc_write_ctx_reg(lrc, XE_CTX_PASID, (1 << 31));
+
lrc->desc = LRC_VALID;
lrc->desc |= FIELD_PREP(LRC_ADDRESSING_MODE, LRC_LEGACY_64B_CONTEXT);
/* TODO: Priority */
diff --git a/drivers/gpu/drm/xe/xe_pt.c b/drivers/gpu/drm/xe/xe_pt.c
index c9c41fbe125c..6227ea238b1b 100644
--- a/drivers/gpu/drm/xe/xe_pt.c
+++ b/drivers/gpu/drm/xe/xe_pt.c
@@ -65,7 +65,7 @@ static u64 __xe_pt_empty_pte(struct xe_tile *tile, struct xe_vm *vm,
u8 id = tile->id;
if (!xe_vm_has_scratch(vm))
- return 0;
+ return XE_PAGE_FORCE_FAULT;
if (level > MAX_HUGEPTE_LEVEL)
return vm->pt_ops->pde_encode_bo(vm->scratch_pt[id][level - 1]->bo,
@@ -163,17 +163,9 @@ void xe_pt_populate_empty(struct xe_tile *tile, struct xe_vm *vm,
u64 empty;
int i;
- if (!xe_vm_has_scratch(vm)) {
- /*
- * FIXME: Some memory is allocated already allocated to zero?
- * Find out which memory that is and avoid this memset...
- */
- xe_map_memset(vm->xe, map, 0, 0, SZ_4K);
- } else {
- empty = __xe_pt_empty_pte(tile, vm, pt->level);
- for (i = 0; i < XE_PDES; i++)
- xe_pt_write(vm->xe, map, i, empty);
- }
+ empty = __xe_pt_empty_pte(tile, vm, pt->level);
+ for (i = 0; i < XE_PDES; i++)
+ xe_pt_write(vm->xe, map, i, empty);
}
/**
@@ -535,7 +527,7 @@ xe_pt_stage_bind_entry(struct xe_ptw *parent, pgoff_t offset,
XE_WARN_ON(xe_walk->va_curs_start != addr);
if (xe_walk->clear_pt) {
- pte = 0;
+ pte = XE_PAGE_FORCE_FAULT;
} else {
pte = vm->pt_ops->pte_encode_vma(is_null ? 0 :
xe_res_dma(curs) +
@@ -865,9 +857,21 @@ static int xe_pt_zap_ptes_entry(struct xe_ptw *parent, pgoff_t offset,
*/
if (xe_pt_nonshared_offsets(addr, next, --level, walk, action, &offset,
&end_offset)) {
- xe_map_memset(tile_to_xe(xe_walk->tile), &xe_child->bo->vmap,
- offset * sizeof(u64), 0,
- (end_offset - offset) * sizeof(u64));
+ struct iosys_map *map = &xe_child->bo->vmap;
+ struct xe_device *xe = tile_to_xe(xe_walk->tile);
+
+ /*
+ * Write only the low dword in 32-bit case to avoid potential
+ * issues with the high dword being non-atomically written first
+ * resulting in an out-of-bounds address with the present
+ * bit set.
+ */
+ for (; offset < end_offset; offset++) {
+ if (IS_ENABLED(CONFIG_64BIT))
+ xe_map_wr(xe, map, offset * sizeof(u64), u64, XE_PAGE_FORCE_FAULT);
+ else
+ xe_map_wr(xe, map, offset * sizeof(u64), u32, XE_PAGE_FORCE_FAULT);
+ }
xe_walk->needs_invalidate = true;
}
--
2.49.0
next reply other threads:[~2025-06-09 13:54 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-06-09 13:54 Thomas Hellström [this message]
2025-06-09 18:10 ` ✓ CI.Patch_applied: success for drm/xe: Enable ATS if enabled on the PCI side (rev3) Patchwork
2025-06-09 18:10 ` ✓ CI.checkpatch: " Patchwork
2025-06-09 18:11 ` ✓ CI.KUnit: " Patchwork
2025-06-09 18:22 ` ✓ CI.Build: " Patchwork
2025-06-09 18:27 ` ✓ CI.Hooks: " Patchwork
2025-06-09 18:27 ` ✓ CI.checksparse: " Patchwork
2025-06-09 19:17 ` ✓ Xe.CI.BAT: " Patchwork
2025-06-09 20:26 ` ✗ Xe.CI.Full: failure " Patchwork
2025-06-10 0:46 ` [PATCH v3] drm/xe: Enable ATS if enabled on the PCI side Matthew Brost
2025-06-10 7:20 ` Thomas Hellström
2025-06-10 13:43 ` Matthew Brost
2025-06-10 13:50 ` Thomas Hellström
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250609135408.102001-1-thomas.hellstrom@linux.intel.com \
--to=thomas.hellstrom@linux.intel.com \
--cc=intel-xe@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox