From: Matthew Auld <matthew.auld@intel.com>
To: sashiko-reviews@lists.linux.dev
Cc: intel-xe@lists.freedesktop.org
Subject: Re: [PATCH v2 3/5] drm/xe/vram: revamp CPU VRAM mapping
Date: Wed, 2 Sep 2026 11:56:54 +0100 [thread overview]
Message-ID: <74a63306-9fda-47fc-b5ea-779d6652fbcd@intel.com> (raw)
In-Reply-To: <20260902104936.63BA71F000E9@smtp.kernel.org>
On 02/09/2026 11:49, sashiko-bot@kernel.org wrote:
> Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
> - [High] The commit intentionally leaves the global VRAM mapping (`xe->mem.vram->mapping`) uninitialized (NULL), but the display panic handler (`xe_panic_page_set_pixel()`) still attempts to use it. This will cause an invalid memory access during a kernel panic, resulting in a nested fault and preventing the panic screen from being drawn.
> --
>
> commit c5769f31bf8cec4dae25246aba506ccb4445b29b
> Author: Matthew Auld <matthew.auld@intel.com>
>
> drm/xe/vram: revamp CPU VRAM mapping
>
> Previously, we called devm_ioremap_wc() for the entire PCI LMEM BAR (which
> can be significantly larger than usable memory, e.g., mapping 16G for a
> 10G card), and then simply assigned subsets of this global mapping to each
> tile. By moving the devm_ioremap_wc() call into vram_region_init() and
> mapping on a per-tile basis, we restrict the virtual address space to exactly
> the usable_size of each tile. As a consequence the global vram->mapping is
> now NULL.
>
>> diff --git a/drivers/gpu/drm/xe/xe_vram.c b/drivers/gpu/drm/xe/xe_vram.c
>> index 56cff1e44530b..04d831b101bd1 100644
>> --- a/drivers/gpu/drm/xe/xe_vram.c
>> +++ b/drivers/gpu/drm/xe/xe_vram.c
> [ ... ]
>> @@ -257,8 +254,15 @@ static int vram_region_init(struct xe_device *xe, struct xe_vram_region *vram,
>> return -ENODEV;
>> }
>>
>> + if (vram != xe->mem.vram) {
>> + struct pci_dev *pdev = to_pci_dev(xe->drm.dev);
>> +
>> + vram->mapping = devm_ioremap_wc(&pdev->dev, vram->io_start, vram->io_size);
>> + if (!vram->mapping)
>> + return -ENOMEM;
>> + }
>> +
>> vram->dpa_base = lmem_bar->dpa_base + offset;
>> - vram->mapping = lmem_bar->mapping + offset;
>> vram->usable_size = usable_size;
>
> [Severity: High]
> Does this change break the drm_panic display handler by leaving the global
> xe->mem.vram->mapping as NULL?
>
> Looking at drivers/gpu/drm/xe/display/xe_panic.c, xe_panic_page_set_pixel()
> appears to explicitly use the global vram->mapping to compute the IOMEM
> address for drawing pixels when the framebuffer is in VRAM:
>
> if (xe_bo_is_vram(bo)) {
> /* Display is always mapped on root tile */
> struct xe_vram_region *vram = xe_bo_device(bo)->mem.vram;
>
> if (panic->page < 0 || new_page < panic->page) {
> xe_res_first(bo->ttm.resource, new_page * PAGE_SIZE,
> bo->ttm.base.size - new_page * PAGE_SIZE, &panic->res);
> } else {
> xe_res_next(&panic->res, PAGE_SIZE * (new_page - panic->page));
> }
> iosys_map_set_vaddr_iomem(&panic->vmap,
> vram->mapping + panic->res.start);
>
> If vram->mapping is NULL, this could cause an invalid memory access when
> dereferenced by iosys_map_wr() during a kernel panic, resulting in a nested
> fault and preventing the panic screen from being displayed.
Indeed. I think we can just go via the root tile instead.
>
next prev parent reply other threads:[~2026-09-02 10:56 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-02 10:39 [PATCH v2 0/5] VRAM health check + CCS fix Matthew Auld
2026-09-02 10:39 ` [PATCH v2 1/5] drm/xe/migrate: support 4K PTEs for identity map Matthew Auld
2026-09-02 10:39 ` [PATCH v2 2/5] drm/xe/vram: report FLAT_CCS base misalignment Matthew Auld
2026-09-02 10:39 ` [PATCH v2 3/5] drm/xe/vram: revamp CPU VRAM mapping Matthew Auld
2026-09-02 10:49 ` sashiko-bot
2026-09-02 10:56 ` Matthew Auld [this message]
2026-09-02 10:39 ` [PATCH v2 4/5] drm/xe: add force option for global invalidation Matthew Auld
2026-09-02 10:39 ` [PATCH v2 5/5] drm/xe/vram: add early VRAM health check Matthew Auld
2026-09-02 10:47 ` ✓ CI.KUnit: success for VRAM health check + CCS fix (rev2) Patchwork
2026-09-02 11:35 ` ✗ Xe.CI.BAT: failure " Patchwork
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=74a63306-9fda-47fc-b5ea-779d6652fbcd@intel.com \
--to=matthew.auld@intel.com \
--cc=intel-xe@lists.freedesktop.org \
--cc=sashiko-reviews@lists.linux.dev \
/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