[PATCH 6/8] drm/xe: Introduce helper to populate userptr
Zeng, Oak
oak.zeng at intel.com
Wed Mar 20 20:02:26 UTC 2024
Hi Brian,
> -----Original Message-----
> From: Welty, Brian <brian.welty at intel.com>
> Sent: Wednesday, March 20, 2024 3:19 PM
> To: Zeng, Oak <oak.zeng at intel.com>; intel-xe at lists.freedesktop.org
> Cc: Hellstrom, Thomas <thomas.hellstrom at intel.com>; Brost, Matthew
> <matthew.brost at intel.com>; Ghimiray, Himal Prasad
> <himal.prasad.ghimiray at intel.com>
> Subject: Re: [PATCH 6/8] drm/xe: Introduce helper to populate userptr
>
>
>
> On 3/19/2024 8:44 PM, Oak Zeng wrote:
> > Introduce a helper function xe_userptr_populate_range to populate
> > a a userptr range. This functions calls hmm_range_fault to read
> > CPU page tables and populate all pfns/pages of this virtual address
> > range.
> >
> > If the populated page is system memory page, dma-mapping is performed
> > to get a dma-address which can be used later for GPU to access pages.
> >
> > If the populated page is device private page, we calculate the dpa (
> > device physical address) of the page. This will be handled in future
> > patches.
> >
> > The dma-address or dpa is then saved in userptr's sg table. This is
> > prepare work to replace the get_user_pages_fast code in userptr code
> > path.
> >
> > v1: Address review comments:
> > separate a npage_in_range function (Matt)
> > reparameterize function xe_userptr_populate_range function (Matt)
> > move mmu_interval_read_begin() call into while loop (Thomas)
> > s/mark_range_accessed/xe_mark_range_accessed (Thomas)
> > use set_page_dirty_lock (vs set_page_dirty) (Thomas)
> > move a few checking in xe_vma_userptr_pin_pages to hmm.c (Matt)
> > v2: Remove device private page support. Only support system
> > pages for now. use dma-map-sg rather than dma-map-page (Matt/Thomas)
>
> Are the prior patches 3, 4, 5 of this series no longer used?
>
> I searched but looks like they were used in older version of this series
> when you had the device private page support. Unused now?
>
> For the small helpers which are only few lines of code, in my opinion,
> it's nicer to squash it into patch where first used. Makes it easier
> to scrutinize it based on first introduction/usage.
You are right. In the original series, I tried to make the xe_userptr_populate_range function work for both usrptr and hmmptr. Patch 3,4,5 is for hmmptr.
But during the review, I agreed with Matt to make this series only for userptr and leave the hmmptr part for the future. From this perspective, patch 1, 2 is also not necessary. Only 6,7, 8 is needed.
I will rework
Oak
>
>
> >
> > Signed-off-by: Oak Zeng <oak.zeng at intel.com>
> > Co-developed-by: Niranjana Vishwanathapura
> <niranjana.vishwanathapura at intel.com>
> > Signed-off-by: Niranjana Vishwanathapura
> <niranjana.vishwanathapura at intel.com>
> > Cc: Matthew Brost <matthew.brost at intel.com>
> > Cc: Thomas Hellström <thomas.hellstrom at intel.com>
> > Cc: Brian Welty <brian.welty at intel.com>
> > ---
> > drivers/gpu/drm/xe/Makefile | 1 +
> > drivers/gpu/drm/xe/xe_hmm.c | 225
> ++++++++++++++++++++++++++++++++++++
> > drivers/gpu/drm/xe/xe_hmm.h | 10 ++
> > 3 files changed, 236 insertions(+)
> > create mode 100644 drivers/gpu/drm/xe/xe_hmm.c
> > create mode 100644 drivers/gpu/drm/xe/xe_hmm.h
> >
> > diff --git a/drivers/gpu/drm/xe/Makefile b/drivers/gpu/drm/xe/Makefile
> > index e2ec6d1375c0..52300de1e86f 100644
> > --- a/drivers/gpu/drm/xe/Makefile
> > +++ b/drivers/gpu/drm/xe/Makefile
> > @@ -101,6 +101,7 @@ xe-y += xe_bb.o \
> > xe_guc_pc.o \
> > xe_guc_submit.o \
> > xe_heci_gsc.o \
> > + xe_hmm.o \
> > xe_hw_engine.o \
> > xe_hw_engine_class_sysfs.o \
> > xe_hw_fence.o \
> > diff --git a/drivers/gpu/drm/xe/xe_hmm.c b/drivers/gpu/drm/xe/xe_hmm.c
> > new file mode 100644
> > index 000000000000..e5719cab0c3d
> > --- /dev/null
> > +++ b/drivers/gpu/drm/xe/xe_hmm.c
> > @@ -0,0 +1,225 @@
> > +// SPDX-License-Identifier: MIT
> > +/*
> > + * Copyright © 2024 Intel Corporation
> > + */
> > +
> > +#include <linux/mmu_notifier.h>
> > +#include <linux/dma-mapping.h>
> > +#include <linux/memremap.h>
> > +#include <linux/swap.h>
> > +#include <linux/hmm.h>
> > +#include <linux/mm.h>
> > +#include "xe_hmm.h"
> > +#include "xe_svm.h"
> > +#include "xe_vm.h"
> > +#include "xe_bo.h"
> > +
> > +static u64 xe_npages_in_range(unsigned long start, unsigned long end)
> > +{
> > + return (PAGE_ALIGN(end) - PAGE_ALIGN_DOWN(start)) >> PAGE_SHIFT;
> > +}
> > +
> > +/**
> > + * xe_mark_range_accessed() - mark a range is accessed, so core mm
> > + * have such information for memory eviction or write back to
> > + * hard disk
> > + *
> > + * @range: the range to mark
> > + * @write: if write to this range, we mark pages in this range
> > + * as dirty
> > + */
> > +static void xe_mark_range_accessed(struct hmm_range *range, bool write)
> > +{
> > + struct page *page;
> > + u64 i, npages;
> > +
> > + npages = xe_npages_in_range(range->start, range->end);
> > + for (i = 0; i < npages; i++) {
> > + page = hmm_pfn_to_page(range->hmm_pfns[i]);
> > + if (write)
> > + set_page_dirty_lock(page);
> > +
> > + mark_page_accessed(page);
> > + }
> > +}
> > +
> > +/**
> > + * xe_build_sg() - build a scatter gather table for all the physical pages/pfn
> > + * in a hmm_range. dma-map pages if necessary. dma-address is save in sg
> table
> > + * and will be used to program GPU page table later.
> > + *
> > + * @xe: the xe device who will access the dma-address in sg table
> > + * @range: the hmm range that we build the sg table from. range-
> >hmm_pfns[]
> > + * has the pfn numbers of pages that back up this hmm address range.
> > + * @st: pointer to the sg table.
> > + * @write: whether we write to this range. This decides dma map direction
> > + * for system pages. If write we map it bi-diretional; otherwise
> > + * DMA_TO_DEVICE
> > + *
> > + * All the contiguous pfns will be collapsed into one entry in
> > + * the scatter gather table. This is for the purpose of efficiently
> > + * programming GPU page table.
> > + *
> > + * The dma_address in the sg table will later be used by GPU to
> > + * access memory. So if the memory is system memory, we need to
> > + * do a dma-mapping so it can be accessed by GPU/DMA.
> > + *
> > + * FIXME: This function currently only support pages in system
> > + * memory. If the memory is GPU local memory (of the GPU who
> > + * is going to access memory), we need gpu dpa (device physical
> > + * address), and there is no need of dma-mapping. This is TBD.
> > + *
> > + * FIXME: dma-mapping for peer gpu device to access remote gpu's
> > + * memory. Add this when you support p2p
> > + *
> > + * This function allocates the storage of the sg table. It is
> > + * caller's responsibility to free it calling sg_free_table.
> > + *
> > + * Returns 0 if successful; -ENOMEM if fails to allocate memory
> > + */
> > +static int xe_build_sg(struct xe_device *xe, struct hmm_range *range,
> > + struct sg_table *st, bool write)
> > +{
> > + struct device *dev = xe->drm.dev;
> > + struct page **pages;
> > + u64 i, npages;
> > + int ret;
> > +
> > + npages = xe_npages_in_range(range->start, range->end);
> > + pages = kvmalloc_array(npages, sizeof(*pages), GFP_KERNEL);
> > + if (!pages)
> > + return -ENOMEM;
> > +
> > + for (i = 0; i < npages; i++) {
> > + pages[i] = hmm_pfn_to_page(range->hmm_pfns[i]);
> > + xe_assert(xe, !is_device_private_page(pages[i]));
> > + }
> > +
> > + ret = sg_alloc_table_from_pages_segment(st, pages, npages, 0,
> > + npages << PAGE_SHIFT, xe_sg_segment_size(dev),
> GFP_KERNEL);
> > + if (ret)
> > + goto free_pages;
> > +
> > + ret = dma_map_sgtable(dev, st, write ? DMA_BIDIRECTIONAL :
> DMA_TO_DEVICE,
> > + DMA_ATTR_SKIP_CPU_SYNC |
> DMA_ATTR_NO_KERNEL_MAPPING);
> > +
> > +free_pages:
> > + kvfree(pages);
> > + return ret;
> > +}
> > +
> > +/**
> > + * xe_userptr_populate_range() - Populate physical pages of a virtual
> > + * address range
> > + *
> > + * @uvma: userptr vma which has information of the range to populate.
> > + *
> > + * This function populate the physical pages of a virtual
> > + * address range. The populated physical pages is saved in
> > + * userptr's sg table. It is similar to get_user_pages but call
> > + * hmm_range_fault.
> > + *
> > + * This function also read mmu notifier sequence # (
> > + * mmu_interval_read_begin), for the purpose of later
> > + * comparison (through mmu_interval_read_retry).
> > + *
> > + * This must be called with mmap read or write lock held.
> > + *
> > + * This function allocates the storage of the userptr sg table.
> > + * It is caller's responsibility to free it calling sg_free_table.
> > + *
> > + * returns: 0 for succuss; negative error no on failure
> > + */
> > +int xe_userptr_populate_range(struct xe_userptr_vma *uvma)
> > +{
> > + unsigned long timeout =
> > + jiffies + msecs_to_jiffies(HMM_RANGE_DEFAULT_TIMEOUT);
> > + unsigned long *pfns, flags = HMM_PFN_REQ_FAULT;
> > + struct xe_userptr *userptr;
> > + struct xe_vma *vma = &uvma->vma;
> > + u64 start = xe_vma_userptr(vma);
> > + u64 end = start + xe_vma_size(vma);
> > + struct xe_vm *vm = xe_vma_vm(vma);
> > + struct hmm_range hmm_range;
> > + bool write = !xe_vma_read_only(vma);
> > + bool in_kthread = !current->mm;
> > + unsigned long notifier_seq;
> > + u64 npages;
> > + int ret;
> > +
> > + userptr = &uvma->userptr;
> > + mmap_assert_locked(userptr->notifier.mm);
> > +
> > + if (vma->gpuva.flags & XE_VMA_DESTROYED)
> > + return 0;
> > +
> > + notifier_seq = mmu_interval_read_begin(&userptr->notifier);
> > + if (notifier_seq == userptr->notifier_seq)
> > + return 0;
> > +
> > + npages = xe_npages_in_range(start, end);
> > + pfns = kvmalloc_array(npages, sizeof(*pfns), GFP_KERNEL);
> > + if (unlikely(!pfns))
> > + return -ENOMEM;
> > +
> > + if (write)
> > + flags |= HMM_PFN_REQ_WRITE;
> > +
> > + if (in_kthread) {
> > + if (!mmget_not_zero(userptr->notifier.mm)) {
> > + ret = -EFAULT;
> > + goto free_pfns;
> > + }
> > + kthread_use_mm(userptr->notifier.mm);
> > + }
> > +
> > + memset64((u64 *)pfns, (u64)flags, npages);
> > + hmm_range.hmm_pfns = pfns;
> > + hmm_range.notifier = &userptr->notifier;
> > + hmm_range.start = start;
> > + hmm_range.end = end;
> > + hmm_range.pfn_flags_mask = HMM_PFN_REQ_FAULT |
> HMM_PFN_REQ_WRITE;
> > + /**
> > + * FIXME:
> > + * Set the dev_private_owner can prevent hmm_range_fault to fault
> > + * in the device private pages owned by caller. See function
> > + * hmm_vma_handle_pte. In multiple GPU case, this should be set to the
> > + * device owner of the best migration destination. e.g., device0/vm0
> > + * has a page fault, but we have determined the best placement of
> > + * the fault address should be on device1, we should set below to
> > + * device1 instead of device0.
> > + */
> > + hmm_range.dev_private_owner = vm->xe;
> > +
> > + while (true) {
> > + hmm_range.notifier_seq = mmu_interval_read_begin(&userptr-
> >notifier);
> > + ret = hmm_range_fault(&hmm_range);
> > + if (time_after(jiffies, timeout))
> > + break;
> > +
> > + if (ret == -EBUSY)
> > + continue;
> > + break;
> > + }
> > +
> > + if (in_kthread) {
> > + kthread_unuse_mm(userptr->notifier.mm);
> > + mmput(userptr->notifier.mm);
> > + }
> > +
> > + if (ret)
> > + goto free_pfns;
> > +
> > + ret = xe_build_sg(vm->xe, &hmm_range, &userptr->sgt, write);
> > + if (ret)
> > + goto free_pfns;
> > +
> > + xe_mark_range_accessed(&hmm_range, write);
> > + userptr->sg = &userptr->sgt;
> > + userptr->notifier_seq = hmm_range.notifier_seq;
> > +
> > +free_pfns:
> > + kvfree(pfns);
> > + return ret;
> > +}
> > +
> > diff --git a/drivers/gpu/drm/xe/xe_hmm.h b/drivers/gpu/drm/xe/xe_hmm.h
> > new file mode 100644
> > index 000000000000..fa5ddc11f10b
> > --- /dev/null
> > +++ b/drivers/gpu/drm/xe/xe_hmm.h
> > @@ -0,0 +1,10 @@
> > +// SPDX-License-Identifier: MIT
> > +/*
> > + * Copyright © 2024 Intel Corporation
> > + */
> > +
> > +#include <linux/types.h>
> > +
> > +struct xe_userptr_vma;
> > +
> > +int xe_userptr_populate_range(struct xe_userptr_vma *uvma);
More information about the Intel-xe
mailing list