x86: tag application address space for devices
Subsystems (13)
v4 cover x86: tag application address space for devices
Typical hardware devices require a driver stack to translate application buffers to hardware addresses, and a kernel-user transition to notify the hardware of new work. What if both the translation and transition overhead could be eliminated? This is what Shared Virtual Address (SVA) and ENQCMD enabled hardware like Data Streaming Accelerator (DSA) aims to achieve. Applications map portals in their local-address-space and directly submit work to them using a new instruction.
This series enables ENQCMD and associated management of the new MSR (MSR_IA32_PASID). This new MSR allows an application address space to be associated with what the PCIe spec calls a Process Address Space ID (PASID). This PASID tag is carried along with all requests between applications and devices and allows devices to interact with the process address space.
SVA and ENQCMD enabled device drivers need this series. The phase 2 DSA patches with SVA and ENQCMD support was released on the top of this series:
https://lore.kernel.org/patchwork/cover/1244060/
This series only provides simple and basic support for ENQCMD and the MSR:
1. Clean up type definitions (patch 1-2). These patches can be in a separate series.
- Define "pasid" as "u32" consistently
- Define "flags" as "unsigned int"
2. Explain different various technical terms used in the series (patch 3).
3. Enumerate support for ENQCMD in the processor (patch 4).
4. Handle FPU PASID state and the MSR during context switch (patches 5-6).
5. Define "pasid" in mm_struct (patch 7).
5. Clear PASID state for new mm and forked and cloned thread (patch 8-9).
6. Allocate and free PASID for a process (patch 10).
7. Fix up the PASID MSR in #GP handler when one thread in a process executes ENQCMD for the first time (patches 11-12).
This patch series and the DSA phase 2 series are in
https://github.com/intel/idxd-driver/tree/idxd-stage2
References:
1. Detailed information on the ENQCMD/ENQCMDS instructions and the IA32_PASID MSR can be found in Intel Architecture Instruction Set Extensions and Future Features Programming Reference:
https://software.intel.com/sites/default/files/managed/c5/15/architecture-instruction-set-extensions-programming-reference.pdf
2. Detailed information on DSA can be found in DSA specification:
https://software.intel.com/en-us/download/intel-data-streaming-accelerator-preliminary-architecture-specification
Chang log:
v4:
- Define PASID as "u32" instead of "unsigned int" in patch 1, 7, 10, 12. (Christoph)
- Drop v3 patch 2 which changes PASID type in ocxl because it's not related to x86 and was rejected by ocxl maintainer Frederic Barrat
- A split patch which changes PASID type to u32 in crypto/hisilicon/qm.c was released separately to linux-crypto mailing list because it's not related to x86 and is a standalone patch:
v3:
- Change names of bind_mm() and unbind_mm() to match to new APIs in patch 4 (Baolu)
- Change CONFIG_PCI_PASID to CONFIG_IOMMU_SUPPORT because non-PCI device can have PASID in ARM in patch 8 (Jean)
- Add a few sanity checks in __free_pasid() and alloc_pasid() in patch 11 (Baolu)
- Add patch 12 to define a new flag "has_valid_pasid" for a task and use the flag to identify if the task has a valid PASID MSR (PeterZ)
- Add fpu__pasid_write() to update the MSR in fixup() in patch 13
- Check if mm->pasid can be found in fixup() in patch 13
v2:
- Add patches 1-3 to define "pasid" and "flags" as "unsigned int" consistently (Thomas)
(these 3 patches could be in a separate patch set)
- Add patch 8 to move "pasid" to generic mm_struct (Christoph). Jean-Philippe Brucker released a virtually same patch. Upstream only needs one of the two.
- Add patch 9 to initialize PASID in a new mm.
- Plus other changes described in each patch (Thomas)
Ashok Raj (1):
docs: x86: Add documentation for SVA (Shared Virtual Addressing)
Fenghua Yu (9):
iommu: Change type of pasid to u32
iommu/vt-d: Change flags type to unsigned int in binding mm x86/cpufeatures: Enumerate ENQCMD and ENQCMDS instructions x86/msr-index: Define IA32_PASID MSR
mm: Define pasid in mm
fork: Clear PASID for new mm
x86/process: Clear PASID state for a newly forked/cloned thread x86/mmu: Allocate/free PASID
x86/traps: Fix up invalid PASID
Peter Zijlstra (1):
sched: Define and initialize a flag to identify valid PASID in the
task
Yu-cheng Yu (1):
x86/fpu/xstate: Add supervisor PASID state for ENQCMD feature
Documentation/x86/index.rst | 1 + Documentation/x86/sva.rst | 287 ++++++++++++++++++ arch/x86/include/asm/cpufeatures.h | 1 + arch/x86/include/asm/fpu/types.h | 10 + arch/x86/include/asm/fpu/xstate.h | 2 +- arch/x86/include/asm/iommu.h | 3 + arch/x86/include/asm/mmu_context.h | 14 + arch/x86/include/asm/msr-index.h | 3 + arch/x86/kernel/cpu/cpuid-deps.c | 1 + arch/x86/kernel/fpu/xstate.c | 4 + arch/x86/kernel/process.c | 18 ++ arch/x86/kernel/traps.c | 14 + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 4 +- .../drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c | 2 +- .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c | 2 +- .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c | 2 +- .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 2 +- .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.h | 2 +- .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c | 6 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ids.h | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 8 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 8 +- .../gpu/drm/amd/amdkfd/cik_event_interrupt.c | 2 +- drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.c | 2 +- drivers/gpu/drm/amd/amdkfd/kfd_dbgmgr.h | 2 +- .../drm/amd/amdkfd/kfd_device_queue_manager.c | 7 +- drivers/gpu/drm/amd/amdkfd/kfd_events.c | 8 +- drivers/gpu/drm/amd/amdkfd/kfd_events.h | 4 +- drivers/gpu/drm/amd/amdkfd/kfd_iommu.c | 6 +- drivers/gpu/drm/amd/amdkfd/kfd_pasid.c | 2 +- drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 18 +- drivers/gpu/drm/amd/amdkfd/kfd_process.c | 2 +- .../gpu/drm/amd/include/kgd_kfd_interface.h | 2 +- drivers/iommu/amd/amd_iommu.h | 10 +- drivers/iommu/amd/iommu.c | 31 +- drivers/iommu/amd/iommu_v2.c | 20 +- drivers/iommu/intel/dmar.c | 7 +- drivers/iommu/intel/intel-pasid.h | 24 +- drivers/iommu/intel/iommu.c | 4 +- drivers/iommu/intel/pasid.c | 31 +- drivers/iommu/intel/svm.c | 225 ++++++++++++-- drivers/iommu/iommu.c | 2 +- drivers/misc/uacce/uacce.c | 2 +- include/linux/amd-iommu.h | 8 +- include/linux/intel-iommu.h | 14 +- include/linux/intel-svm.h | 2 +- include/linux/iommu.h | 10 +- include/linux/mm_types.h | 6 + include/linux/sched.h | 3 + include/linux/uacce.h | 2 +- kernel/fork.c | 12 + 53 files changed, 716 insertions(+), 156 deletions(-) create mode 100644 Documentation/x86/sva.rst
Signature · 1 line
2.19.1
PATCH v4 1/12 iommu: Change type of pasid to u32
PASID is defined as a few different types in iommu including "int", "u32", and "unsigned int". To be consistent and to match with uapi definitions, define PASID and its variations (e.g. max PASID) as "u32". "u32" is also shorter and a little more explicit than "unsigned int".
No PASID type change in uapi although it defines PASID as __u64 in some places.
---
v4:
- Change PASID type from "unsigned int" to "u32" (Christoph)
v2:
- Create this new patch to define PASID as "unsigned int" consistently in iommu (Thomas)
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 4 +-- .../drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c | 2 +- .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c | 2 +- .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c | 2 +- .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 2 +- .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.h | 2 +- .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 4 +-- drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c | 6 ++-- drivers/gpu/drm/amd/amdgpu/amdgpu_ids.h | 4 +-- drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 8 ++--- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 8 ++--- .../gpu/drm/amd/amdkfd/cik_event_interrupt.c | 2 +- drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.c | 2 +- drivers/gpu/drm/amd/amdkfd/kfd_dbgmgr.h | 2 +- .../drm/amd/amdkfd/kfd_device_queue_manager.c | 7 ++--- drivers/gpu/drm/amd/amdkfd/kfd_events.c | 8 ++--- drivers/gpu/drm/amd/amdkfd/kfd_events.h | 4 +-- drivers/gpu/drm/amd/amdkfd/kfd_iommu.c | 6 ++-- drivers/gpu/drm/amd/amdkfd/kfd_pasid.c | 2 +- drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 18 +++++------ drivers/gpu/drm/amd/amdkfd/kfd_process.c | 2 +- .../gpu/drm/amd/include/kgd_kfd_interface.h | 2 +- drivers/iommu/amd/amd_iommu.h | 10 +++--- drivers/iommu/amd/iommu.c | 31 ++++++++++--------- drivers/iommu/amd/iommu_v2.c | 20 ++++++------ drivers/iommu/intel/dmar.c | 7 +++-- drivers/iommu/intel/intel-pasid.h | 24 +++++++------- drivers/iommu/intel/iommu.c | 4 +-- drivers/iommu/intel/pasid.c | 31 +++++++++---------- drivers/iommu/intel/svm.c | 12 +++---- drivers/iommu/iommu.c | 2 +- drivers/misc/uacce/uacce.c | 2 +- include/linux/amd-iommu.h | 8 ++--- include/linux/intel-iommu.h | 12 +++---- include/linux/intel-svm.h | 2 +- include/linux/iommu.h | 10 +++--- include/linux/uacce.h | 2 +- 38 files changed, 139 insertions(+), 139 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h +2 -2
@@ -207,11 +207,11 @@ uint8_t amdgpu_amdkfd_get_xgmi_hops_count(struct kgd_dev *dst, struct kgd_dev *s })/* GPUVM API */ -int amdgpu_amdkfd_gpuvm_create_process_vm (struct kgd_dev *kgd,unsigned int pasid, +int amdgpu_amdkfd_gpuvm_create_process_vm (struct kgd_dev *kgd,u32 pasid,void **vm,void **process_info,struct dma_fence **ef);int amdgpu_amdkfd_gpuvm_acquire_process_vm (struct kgd_dev *kgd, -struct file *filp,unsigned int pasid, +struct file *filp,u32 pasid,void **vm,void **process_info,struct dma_fence **ef); void amdgpu_amdkfd_gpuvm_destroy_cb(struct amdgpu_device *adev,
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c +1 -1
@@ -105,7 +105,7 @@ static void kgd_program_sh_mem_settings(struct kgd_dev *kgd, uint32_t vmid,unlock_srbm (kgd); } -static int kgd_set_pasid_vmid_mapping (struct kgd_dev *kgd,unsigned int pasid, +static int kgd_set_pasid_vmid_mapping (struct kgd_dev *kgd,u32 pasid,unsigned int vmid) {struct amdgpu_device *adev =get_amdgpu_device (kgd);
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c +1 -1
@@ -139,7 +139,7 @@ static void kgd_program_sh_mem_settings(struct kgd_dev *kgd, uint32_t vmid,unlock_srbm (kgd); } -static int kgd_set_pasid_vmid_mapping (struct kgd_dev *kgd,unsigned int pasid, +static int kgd_set_pasid_vmid_mapping (struct kgd_dev *kgd,u32 pasid,unsigned int vmid) {struct amdgpu_device *adev =get_amdgpu_device (kgd);
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c +1 -1
@@ -96,7 +96,7 @@ static void kgd_program_sh_mem_settings(struct kgd_dev *kgd, uint32_t vmid,unlock_srbm (kgd); } -static int kgd_set_pasid_vmid_mapping (struct kgd_dev *kgd,unsigned int pasid, +static int kgd_set_pasid_vmid_mapping (struct kgd_dev *kgd,u32 pasid,unsigned int vmid) {struct amdgpu_device *adev =get_amdgpu_device (kgd);
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c +1 -1
@@ -110,7 +110,7 @@ void kgd_gfx_v9_program_sh_mem_settings(struct kgd_dev *kgd, uint32_t vmid,unlock_srbm (kgd); } -int kgd_gfx_v9_set_pasid_vmid_mapping (struct kgd_dev *kgd,unsigned int pasid, +int kgd_gfx_v9_set_pasid_vmid_mapping (struct kgd_dev *kgd,u32 pasid,unsigned int vmid) {struct amdgpu_device *adev =get_amdgpu_device (kgd);
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.h +1 -1
@@ -26,7 +26,7 @@ void kgd_gfx_v9_program_sh_mem_settings(struct kgd_dev *kgd, uint32_t vmid,uint32_t sh_mem_config, uint32_t sh_mem_ape1_base, uint32_t sh_mem_ape1_limit, uint32_t sh_mem_bases); -int kgd_gfx_v9_set_pasid_vmid_mapping (struct kgd_dev *kgd,unsigned int pasid, +int kgd_gfx_v9_set_pasid_vmid_mapping (struct kgd_dev *kgd,u32 pasid,unsigned int vmid);int kgd_gfx_v9_init_interrupts (struct kgd_dev *kgd,uint32_t pipe_id); int kgd_gfx_v9_hqd_load(struct kgd_dev *kgd, void *mqd, uint32_t pipe_id,
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +2 -2
@@ -994,7 +994,7 @@ static int init_kfd_vm(struct amdgpu_vm *vm, void **process_info,return ret; } -int amdgpu_amdkfd_gpuvm_create_process_vm (struct kgd_dev *kgd,unsigned int pasid, +int amdgpu_amdkfd_gpuvm_create_process_vm (struct kgd_dev *kgd,u32 pasid,void **vm,void **process_info,struct dma_fence **ef) {
@@ -1030,7 +1030,7 @@ int amdgpu_amdkfd_gpuvm_create_process_vm(struct kgd_dev *kgd, unsigned int pasi }int amdgpu_amdkfd_gpuvm_acquire_process_vm (struct kgd_dev *kgd, -struct file *filp,unsigned int pasid, +struct file *filp,u32 pasid,void **vm,void **process_info,struct dma_fence **ef) {
drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c +3 -3
@@ -43,7 +43,7 @@ static DEFINE_IDA(amdgpu_pasid_ida);/* Helper to free pasid from a fence callback */ struct amdgpu_pasid_cb {struct dma_fence_cb cb; -unsigned int pasid; +u32 pasid; };/**
@@ -79,7 +79,7 @@ int amdgpu_pasid_alloc(unsigned int bits)* amdgpu_pasid_free - Free a PASID * @pasid: PASID to free */ -void amdgpu_pasid_free (unsigned int pasid) +void amdgpu_pasid_free (u32 pasid) {trace_amdgpu_pasid_freed (pasid);ida_simple_remove (&amdgpu_pasid_ida, pasid);
@@ -105,7 +105,7 @@ static void amdgpu_pasid_free_cb(struct dma_fence *fence,* Free the pasid only after all the fences in resv are signaled. */ void amdgpu_pasid_free_delayed (struct dma_resv *resv, -unsigned int pasid) +u32 pasid) {struct dma_fence *fence, **fences;struct amdgpu_pasid_cb *cb;
drivers/gpu/drm/amd/amdgpu/amdgpu_ids.h +2 -2
@@ -71,9 +71,9 @@ struct amdgpu_vmid_mgr { };int amdgpu_pasid_alloc (unsigned int bits); -void amdgpu_pasid_free (unsigned int pasid); +void amdgpu_pasid_free (u32 pasid);void amdgpu_pasid_free_delayed (struct dma_resv *resv, -unsigned int pasid); +u32 pasid);bool amdgpu_vmid_had_gpu_reset (struct amdgpu_device *adev,struct amdgpu_vmid *id);
drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +1 -1
@@ -1062,7 +1062,7 @@ void amdgpu_driver_postclose_kms(struct drm_device *dev,struct amdgpu_fpriv *fpriv = file_priv->driver_priv;struct amdgpu_bo_list *list;struct amdgpu_bo *pd; -unsigned int pasid; +u32 pasid;int handle;if (!fpriv)
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +4 -4
@@ -2783,7 +2783,7 @@ long amdgpu_vm_wait_idle(struct amdgpu_vm *vm, long timeout)* 0 for success, error for failure. */ int amdgpu_vm_init (struct amdgpu_device *adev,struct amdgpu_vm *vm, -int vm_context,unsigned int pasid) +int vm_context,u32 pasid) {struct amdgpu_bo_param bp;struct amdgpu_bo *root;
@@ -2954,7 +2954,7 @@ static int amdgpu_vm_check_clean_reserved(struct amdgpu_device *adev,* 0 for success, -errno for errors. */ int amdgpu_vm_make_compute (struct amdgpu_device *adev,struct amdgpu_vm *vm, -unsigned int pasid) +u32 pasid) {bool pte_support_ats = (adev->asic_type ==CHIP_RAVEN );int r;
@@ -3252,7 +3252,7 @@ int amdgpu_vm_ioctl(struct drm_device *dev, void *data, struct drm_file *filp)* @pasid: PASID identifier for VM * @task_info: task_info to fill. */ -void amdgpu_vm_get_task_info (struct amdgpu_device *adev,unsigned int pasid, +void amdgpu_vm_get_task_info (struct amdgpu_device *adev,u32 pasid,struct amdgpu_task_info *task_info) {struct amdgpu_vm *vm;
@@ -3296,7 +3296,7 @@ void amdgpu_vm_set_task_info(struct amdgpu_vm *vm)* Try to gracefully handle a VM fault. Return true if the fault was handled and * shouldn't be reported any more. */ -bool amdgpu_vm_handle_fault (struct amdgpu_device *adev,unsigned int pasid, +bool amdgpu_vm_handle_fault (struct amdgpu_device *adev,u32 pasid,uint64_t addr) {struct amdgpu_bo *root;
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h +4 -4
@@ -371,8 +371,8 @@ void amdgpu_vm_manager_fini(struct amdgpu_device *adev);long amdgpu_vm_wait_idle (struct amdgpu_vm *vm,long timeout);int amdgpu_vm_init (struct amdgpu_device *adev,struct amdgpu_vm *vm, -int vm_context,unsigned int pasid); -int amdgpu_vm_make_compute (struct amdgpu_device *adev,struct amdgpu_vm *vm,unsigned int pasid); +int vm_context,u32 pasid); +int amdgpu_vm_make_compute (struct amdgpu_device *adev,struct amdgpu_vm *vm,u32 pasid);void amdgpu_vm_release_compute (struct amdgpu_device *adev,struct amdgpu_vm *vm);void amdgpu_vm_fini (struct amdgpu_device *adev,struct amdgpu_vm *vm); void amdgpu_vm_get_pd_bo(struct amdgpu_vm *vm,
@@ -429,9 +429,9 @@ bool amdgpu_vm_need_pipeline_sync(struct amdgpu_ring *ring, struct amdgpu_job *job);void amdgpu_vm_check_compute_bug (struct amdgpu_device *adev); -void amdgpu_vm_get_task_info (struct amdgpu_device *adev,unsigned int pasid, +void amdgpu_vm_get_task_info (struct amdgpu_device *adev,u32 pasid,struct amdgpu_task_info *task_info); -bool amdgpu_vm_handle_fault (struct amdgpu_device *adev,unsigned int pasid, +bool amdgpu_vm_handle_fault (struct amdgpu_device *adev,u32 pasid,uint64_t addr);void amdgpu_vm_set_task_info (struct amdgpu_vm *vm);
drivers/gpu/drm/amd/amdkfd/cik_event_interrupt.c +1 -1
@@ -90,7 +90,7 @@ static void cik_event_interrupt_wq(struct kfd_dev *dev, (const struct cik_ih_ring_entry *)ih_ring_entry;uint32_t context_id = ihre->data &0xfffffff ;unsigned int vmid = (ihre->ring_id &0x0000ff00 ) >>8 ; -unsigned int pasid = (ihre->ring_id &0xffff0000 ) >>16 ; +u32 pasid = (ihre->ring_id &0xffff0000 ) >>16 ;if (pasid ==0 )return ;
drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.c +1 -1
@@ -45,7 +45,7 @@ static void dbgdev_address_watch_disable_nodiq(struct kfd_dev *dev) }static int dbgdev_diq_submit_ib (struct kfd_dbgdev *dbgdev, -unsigned int pasid,uint64_t vmid0_address, +u32 pasid,uint64_t vmid0_address,uint32_t *packet_buff,size_t size_in_bytes) {struct pm4__release_mem *rm_packet;
drivers/gpu/drm/amd/amdkfd/kfd_dbgmgr.h +1 -1
@@ -275,7 +275,7 @@ struct kfd_dbgdev { };struct kfd_dbgmgr { -unsigned int pasid; +u32 pasid;struct kfd_dev *dev;struct kfd_dbgdev *dbgdev; };
drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +3 -4
@@ -40,7 +40,7 @@#define CIK_HPD_EOP_BYTES (1U << CIK_HPD_EOP_BYTES_LOG2)static int set_pasid_vmid_mapping (struct device_queue_manager *dqm, -unsigned int pasid,unsigned int vmid); +u32 pasid,unsigned int vmid); static int execute_queues_cpsch(struct device_queue_manager *dqm, enum kfd_unmap_queues_filter filter,
@@ -909,7 +909,7 @@ static int unregister_process(struct device_queue_manager *dqm, }static int -set_pasid_vmid_mapping (struct device_queue_manager *dqm,unsigned int pasid, +set_pasid_vmid_mapping (struct device_queue_manager *dqm,u32 pasid,unsigned int vmid) { return dqm->dev->kfd2kgd->set_pasid_vmid_mapping(
@@ -1925,8 +1925,7 @@ void device_queue_manager_uninit(struct device_queue_manager *dqm)kfree (dqm); } -int kfd_process_vm_fault (struct device_queue_manager *dqm, -unsigned int pasid) +int kfd_process_vm_fault (struct device_queue_manager *dqm,u32 pasid) {struct kfd_process_device *pdd;struct kfd_process *p =kfd_lookup_process_by_pasid (pasid);
drivers/gpu/drm/amd/amdkfd/kfd_events.c +4 -4
@@ -460,7 +460,7 @@ static void set_event_from_interrupt(struct kfd_process *p, } } -void kfd_signal_event_interrupt (unsigned int pasid,uint32_t partial_id, +void kfd_signal_event_interrupt (u32 pasid,uint32_t partial_id,uint32_t valid_id_bits) {struct kfd_event *ev =NULL ;
@@ -872,7 +872,7 @@ static void lookup_events_by_type_and_signal(struct kfd_process *p, }#ifdef KFD_SUPPORT_IOMMU_V2 -void kfd_signal_iommu_event (struct kfd_dev *dev,unsigned int pasid, +void kfd_signal_iommu_event (struct kfd_dev *dev,u32 pasid,unsigned long address,bool is_write_requested,bool is_execute_requested) {
@@ -950,7 +950,7 @@ void kfd_signal_iommu_event(struct kfd_dev *dev, unsigned int pasid, }#endif /* KFD_SUPPORT_IOMMU_V2 */ -void kfd_signal_hw_exception_event (unsigned int pasid) +void kfd_signal_hw_exception_event (u32 pasid) {/* * Because we are called from arbitrary context (workqueue) as opposed
@@ -971,7 +971,7 @@ void kfd_signal_hw_exception_event(unsigned int pasid)kfd_unref_process (p); } -void kfd_signal_vm_fault_event (struct kfd_dev *dev,unsigned int pasid, +void kfd_signal_vm_fault_event (struct kfd_dev *dev,u32 pasid,struct kfd_vm_fault_info *info) {struct kfd_event *ev;
drivers/gpu/drm/amd/amdkfd/kfd_events.h +2 -2
@@ -79,7 +79,7 @@ struct kfd_event {#define KFD_EVENT_TYPE_DEBUG 5#define KFD_EVENT_TYPE_MEMORY 8 -extern void kfd_signal_event_interrupt (unsigned int pasid,uint32_t partial_id, -uint32_t valid_id_bits); +extern void kfd_signal_event_interrupt (u32 pasid,uint32_t partial_id, +uint32_t valid_id_bits);#endif
drivers/gpu/drm/amd/amdkfd/kfd_iommu.c +3 -3
@@ -139,7 +139,7 @@ void kfd_iommu_unbind_process(struct kfd_process *p) }/* Callback for process shutdown invoked by the IOMMU driver */ -static void iommu_pasid_shutdown_callback (struct pci_dev *pdev,int pasid) +static void iommu_pasid_shutdown_callback (struct pci_dev *pdev,u32 pasid) {struct kfd_dev *dev =kfd_device_by_pci_dev (pdev);struct kfd_process *p;
@@ -185,8 +185,8 @@ static void iommu_pasid_shutdown_callback(struct pci_dev *pdev, int pasid) }/* This function called by IOMMU driver on PPR failure */ -static int iommu_invalid_ppr_cb (struct pci_dev *pdev,int pasid, -unsigned long address,u16 flags) +static int iommu_invalid_ppr_cb (struct pci_dev *pdev,u32 pasid, +unsigned long address,u16 flags) {struct kfd_dev *dev;
drivers/gpu/drm/amd/amdkfd/kfd_pasid.c +1 -1
@@ -77,7 +77,7 @@ unsigned int kfd_pasid_alloc(void)return r >0 ? r :0 ; } -void kfd_pasid_free (unsigned int pasid) +void kfd_pasid_free (u32 pasid) {if (kfd2kgd)amdgpu_pasid_free (pasid);
drivers/gpu/drm/amd/amdkfd/kfd_priv.h +9 -9
@@ -715,7 +715,7 @@ struct kfd_process {/* We want to receive a notification when the mm_struct is destroyed */ struct mmu_notifier mmu_notifier; -uint16_t pasid; +u32 pasid;unsigned int doorbell_index;/*
@@ -790,7 +790,7 @@ int kfd_process_create_wq(void);void kfd_process_destroy_wq (void );struct kfd_process *kfd_create_process (struct file *filep);struct kfd_process *kfd_get_process (const struct task_struct *); -struct kfd_process *kfd_lookup_process_by_pasid (unsigned int pasid); +struct kfd_process *kfd_lookup_process_by_pasid (u32 pasid);struct kfd_process *kfd_lookup_process_by_mm (const struct mm_struct *mm);void kfd_unref_process (struct kfd_process *p);int kfd_process_evict_queues (struct kfd_process *p);
@@ -832,7 +832,7 @@ void kfd_pasid_exit(void);bool kfd_set_pasid_limit (unsigned int new_limit);unsigned int kfd_get_pasid_limit (void );unsigned int kfd_pasid_alloc (void ); -void kfd_pasid_free (unsigned int pasid); +void kfd_pasid_free (u32 pasid);/* Doorbells */ size_t kfd_doorbell_process_slice (struct kfd_dev *kfd);
@@ -917,7 +917,7 @@ void device_queue_manager_uninit(struct device_queue_manager *dqm);struct kernel_queue *kernel_queue_init (struct kfd_dev *dev,enum kfd_queue_type type);void kernel_queue_uninit (struct kernel_queue *kq,bool hanging); -int kfd_process_vm_fault (struct device_queue_manager *dqm,unsigned int pasid); +int kfd_process_vm_fault (struct device_queue_manager *dqm,u32 pasid);/* Process Queue Manager */ struct process_queue_node {
@@ -1039,12 +1039,12 @@ int kfd_wait_on_events(struct kfd_process *p, uint32_t num_events, void __user *data, bool all, uint32_t user_timeout_ms, uint32_t *wait_result); -void kfd_signal_event_interrupt (unsigned int pasid,uint32_t partial_id, +void kfd_signal_event_interrupt (u32 pasid,uint32_t partial_id,uint32_t valid_id_bits);void kfd_signal_iommu_event (struct kfd_dev *dev, -unsigned int pasid,unsigned long address, -bool is_write_requested,bool is_execute_requested); -void kfd_signal_hw_exception_event (unsigned int pasid); +u32 pasid,unsigned long address, +bool is_write_requested,bool is_execute_requested); +void kfd_signal_hw_exception_event (u32 pasid);int kfd_set_event (struct kfd_process *p,uint32_t event_id);int kfd_reset_event (struct kfd_process *p,uint32_t event_id); int kfd_event_page_set(struct kfd_process *p, void *kernel_address,
@@ -1055,7 +1055,7 @@ int kfd_event_create(struct file *devkfd, struct kfd_process *p, uint64_t *event_page_offset, uint32_t *event_slot_index);int kfd_event_destroy (struct kfd_process *p,uint32_t event_id); -void kfd_signal_vm_fault_event (struct kfd_dev *dev,unsigned int pasid, +void kfd_signal_vm_fault_event (struct kfd_dev *dev,u32 pasid,struct kfd_vm_fault_info *info);void kfd_signal_reset_event (struct kfd_dev *dev);
drivers/gpu/drm/amd/amdkfd/kfd_process.c +1 -1
@@ -1086,7 +1086,7 @@ void kfd_process_device_remove_obj_handle(struct kfd_process_device *pdd, }/* This increments the process->ref counter. */ -struct kfd_process *kfd_lookup_process_by_pasid (unsigned int pasid) +struct kfd_process *kfd_lookup_process_by_pasid (u32 pasid) {struct kfd_process *p, *ret_p =NULL ;unsigned int temp;
drivers/gpu/drm/amd/include/kgd_kfd_interface.h +1 -1
@@ -226,7 +226,7 @@ struct kfd2kgd_calls { uint32_t sh_mem_config, uint32_t sh_mem_ape1_base, uint32_t sh_mem_ape1_limit, uint32_t sh_mem_bases); -int (*set_pasid_vmid_mapping)(struct kgd_dev *kgd,unsigned int pasid, +int (*set_pasid_vmid_mapping)(struct kgd_dev *kgd,u32 pasid,unsigned int vmid);int (*init_interrupts)(struct kgd_dev *kgd,uint32_t pipe_id);
drivers/iommu/amd/amd_iommu.h +5 -5
@@ -45,12 +45,12 @@ extern int amd_iommu_register_ppr_notifier(struct notifier_block *nb);extern int amd_iommu_unregister_ppr_notifier (struct notifier_block *nb);extern void amd_iommu_domain_direct_map (struct iommu_domain *dom);extern int amd_iommu_domain_enable_v2 (struct iommu_domain *dom,int pasids); -extern int amd_iommu_flush_page (struct iommu_domain *dom,int pasid, +extern int amd_iommu_flush_page (struct iommu_domain *dom,u32 pasid,u64 address); -extern int amd_iommu_flush_tlb (struct iommu_domain *dom,int pasid); -extern int amd_iommu_domain_set_gcr3 (struct iommu_domain *dom,int pasid, +extern int amd_iommu_flush_tlb (struct iommu_domain *dom,u32 pasid); +extern int amd_iommu_domain_set_gcr3 (struct iommu_domain *dom,u32 pasid,unsigned long cr3); -extern int amd_iommu_domain_clear_gcr3 (struct iommu_domain *dom,int pasid); +extern int amd_iommu_domain_clear_gcr3 (struct iommu_domain *dom,u32 pasid);extern struct iommu_domain *amd_iommu_get_v2_domain (struct pci_dev *pdev);#ifdef CONFIG_IRQ_REMAP
@@ -66,7 +66,7 @@ static inline int amd_iommu_create_irq_domain(struct amd_iommu *iommu)#define PPR_INVALID 0x1#define PPR_FAILURE 0xf -extern int amd_iommu_complete_ppr (struct pci_dev *pdev,int pasid, +extern int amd_iommu_complete_ppr (struct pci_dev *pdev,u32 pasid,int status,int tag);static inline bool is_rd890_iommu (struct pci_dev *pdev)
drivers/iommu/amd/iommu.c +16 -15
@@ -502,10 +502,11 @@ static void amd_iommu_report_page_fault(u16 devid, u16 domain_id,static void iommu_print_event (struct amd_iommu *iommu,void *__evt) {struct device *dev = iommu->iommu.dev; -int type, devid, pasid, flags, tag; +int type, devid, flags, tag;volatile u32 *event = __evt;int count =0 ;u64 address; +u32 pasid; retry: type = (event[1 ] >>EVENT_TYPE_SHIFT ) &EVENT_TYPE_MASK ;
@@ -898,7 +899,7 @@ static void build_inv_iotlb_pages(struct iommu_cmd *cmd, u16 devid, int qdep, cmd->data[2 ] |=CMD_INV_IOMMU_PAGES_SIZE_MASK ; } -static void build_inv_iommu_pasid (struct iommu_cmd *cmd,u16 domid,int pasid, +static void build_inv_iommu_pasid (struct iommu_cmd *cmd,u16 domid,u32 pasid,u64 address,bool size) {memset (cmd,0 ,sizeof (*cmd));
@@ -916,7 +917,7 @@ static void build_inv_iommu_pasid(struct iommu_cmd *cmd, u16 domid, int pasid,CMD_SET_TYPE (cmd,CMD_INV_IOMMU_PAGES ); } -static void build_inv_iotlb_pasid (struct iommu_cmd *cmd,u16 devid,int pasid, +static void build_inv_iotlb_pasid (struct iommu_cmd *cmd,u16 devid,u32 pasid,int qdep,u64 address,bool size) {memset (cmd,0 ,sizeof (*cmd));
@@ -936,7 +937,7 @@ static void build_inv_iotlb_pasid(struct iommu_cmd *cmd, u16 devid, int pasid,CMD_SET_TYPE (cmd,CMD_INV_IOTLB_PAGES ); } -static void build_complete_ppr (struct iommu_cmd *cmd,u16 devid,int pasid, +static void build_complete_ppr (struct iommu_cmd *cmd,u16 devid,u32 pasid,int status,int tag,bool gn) {memset (cmd,0 ,sizeof (*cmd));
@@ -2772,7 +2773,7 @@ int amd_iommu_domain_enable_v2(struct iommu_domain *dom, int pasids) }EXPORT_SYMBOL (amd_iommu_domain_enable_v2); -static int __flush_pasid (struct protection_domain *domain,int pasid, +static int __flush_pasid (struct protection_domain *domain,u32 pasid,u64 address,bool size) {struct iommu_dev_data *dev_data;
@@ -2833,13 +2834,13 @@ static int __flush_pasid(struct protection_domain *domain, int pasid,return ret; } -static int __amd_iommu_flush_page (struct protection_domain *domain,int pasid, +static int __amd_iommu_flush_page (struct protection_domain *domain,u32 pasid,u64 address) {return __flush_pasid (domain, pasid, address, false); } -int amd_iommu_flush_page (struct iommu_domain *dom,int pasid, +int amd_iommu_flush_page (struct iommu_domain *dom,u32 pasid,u64 address) {struct protection_domain *domain =to_pdomain (dom);
@@ -2854,13 +2855,13 @@ int amd_iommu_flush_page(struct iommu_domain *dom, int pasid, }EXPORT_SYMBOL (amd_iommu_flush_page); -static int __amd_iommu_flush_tlb (struct protection_domain *domain,int pasid) +static int __amd_iommu_flush_tlb (struct protection_domain *domain,u32 pasid) {return __flush_pasid (domain, pasid,CMD_INV_IOMMU_ALL_PAGES_ADDRESS , true); } -int amd_iommu_flush_tlb (struct iommu_domain *dom,int pasid) +int amd_iommu_flush_tlb (struct iommu_domain *dom,u32 pasid) {struct protection_domain *domain =to_pdomain (dom);unsigned long flags;
@@ -2874,7 +2875,7 @@ int amd_iommu_flush_tlb(struct iommu_domain *dom, int pasid) }EXPORT_SYMBOL (amd_iommu_flush_tlb); -static u64 *__get_gcr3_pte (u64 *root,int level,int pasid,bool alloc) +static u64 *__get_gcr3_pte (u64 *root,int level,u32 pasid,bool alloc) {int index;u64 *pte;
@@ -2906,7 +2907,7 @@ static u64 *__get_gcr3_pte(u64 *root, int level, int pasid, bool alloc)return pte; } -static int __set_gcr3 (struct protection_domain *domain,int pasid, +static int __set_gcr3 (struct protection_domain *domain,u32 pasid,unsigned long cr3) {struct domain_pgtable pgtable;
@@ -2925,7 +2926,7 @@ static int __set_gcr3(struct protection_domain *domain, int pasid,return __amd_iommu_flush_tlb (domain, pasid); } -static int __clear_gcr3 (struct protection_domain *domain,int pasid) +static int __clear_gcr3 (struct protection_domain *domain,u32 pasid) {struct domain_pgtable pgtable;u64 *pte;
@@ -2943,7 +2944,7 @@ static int __clear_gcr3(struct protection_domain *domain, int pasid)return __amd_iommu_flush_tlb (domain, pasid); } -int amd_iommu_domain_set_gcr3 (struct iommu_domain *dom,int pasid, +int amd_iommu_domain_set_gcr3 (struct iommu_domain *dom,u32 pasid,unsigned long cr3) {struct protection_domain *domain =to_pdomain (dom);
@@ -2958,7 +2959,7 @@ int amd_iommu_domain_set_gcr3(struct iommu_domain *dom, int pasid, }EXPORT_SYMBOL (amd_iommu_domain_set_gcr3); -int amd_iommu_domain_clear_gcr3 (struct iommu_domain *dom,int pasid) +int amd_iommu_domain_clear_gcr3 (struct iommu_domain *dom,u32 pasid) {struct protection_domain *domain =to_pdomain (dom);unsigned long flags;
@@ -2972,7 +2973,7 @@ int amd_iommu_domain_clear_gcr3(struct iommu_domain *dom, int pasid) }EXPORT_SYMBOL (amd_iommu_domain_clear_gcr3); -int amd_iommu_complete_ppr (struct pci_dev *pdev,int pasid, +int amd_iommu_complete_ppr (struct pci_dev *pdev,u32 pasid,int status,int tag) {struct iommu_dev_data *dev_data;
drivers/iommu/amd/iommu_v2.c +10 -10
@@ -40,7 +40,7 @@ struct pasid_state {struct mmu_notifier mn;/* mmu_notifier handle */ struct pri_queue pri[PRI_QUEUE_SIZE ];/* PRI tag states */ struct device_state *device_state;/* Link to our device_state */ -int pasid;/* PASID index */ +u32 pasid;/* PASID index */ bool invalid;/* Used during setup and teardown of the pasid */ spinlock_t lock;/* Protect pri_queues and
@@ -70,7 +70,7 @@ struct fault {struct mm_struct *mm;u64 address;u16 devid; -u16 pasid; +u32 pasid;u16 tag;u16 finish;u16 flags;
@@ -150,7 +150,7 @@ static void put_device_state(struct device_state *dev_state)/* Must be called under dev_state->lock */ static struct pasid_state **__get_pasid_state_ptr (struct device_state *dev_state, -int pasid,bool alloc) +u32 pasid,bool alloc) {struct pasid_state **root, **ptr;int level, index;
@@ -184,7 +184,7 @@ static struct pasid_state **__get_pasid_state_ptr(struct device_state *dev_statestatic int set_pasid_state (struct device_state *dev_state,struct pasid_state *pasid_state, -int pasid) +u32 pasid) {struct pasid_state **ptr;unsigned long flags;
@@ -211,7 +211,7 @@ static int set_pasid_state(struct device_state *dev_state,return ret; } -static void clear_pasid_state (struct device_state *dev_state,int pasid) +static void clear_pasid_state (struct device_state *dev_state,u32 pasid) {struct pasid_state **ptr;unsigned long flags;
@@ -229,7 +229,7 @@ static void clear_pasid_state(struct device_state *dev_state, int pasid) }static struct pasid_state *get_pasid_state (struct device_state *dev_state, -int pasid) +u32 pasid) {struct pasid_state **ptr, *ret =NULL ;unsigned long flags;
@@ -594,7 +594,7 @@ static struct notifier_block ppr_nb = { .notifier_call = ppr_notifier, }; -int amd_iommu_bind_pasid (struct pci_dev *pdev,int pasid, +int amd_iommu_bind_pasid (struct pci_dev *pdev,u32 pasid,struct task_struct *task) {struct pasid_state *pasid_state;
@@ -615,7 +615,7 @@ int amd_iommu_bind_pasid(struct pci_dev *pdev, int pasid,return -EINVAL ; ret = -EINVAL ; -if (pasid <0 || pasid >= dev_state->max_pasids) +if (pasid >= dev_state->max_pasids) goto out; ret = -ENOMEM ;
@@ -679,7 +679,7 @@ int amd_iommu_bind_pasid(struct pci_dev *pdev, int pasid, }EXPORT_SYMBOL (amd_iommu_bind_pasid); -void amd_iommu_unbind_pasid (struct pci_dev *pdev,int pasid) +void amd_iommu_unbind_pasid (struct pci_dev *pdev,u32 pasid) {struct pasid_state *pasid_state;struct device_state *dev_state;
@@ -695,7 +695,7 @@ void amd_iommu_unbind_pasid(struct pci_dev *pdev, int pasid)if (dev_state ==NULL )return ; -if (pasid <0 || pasid >= dev_state->max_pasids) +if (pasid >= dev_state->max_pasids) goto out; pasid_state =get_pasid_state (dev_state, pasid);
drivers/iommu/intel/dmar.c +4 -3
@@ -1465,7 +1465,7 @@ void qi_flush_dev_iotlb_pasid(struct intel_iommu *iommu, u16 sid, u16 pfsid, }void qi_flush_pasid_cache (struct intel_iommu *iommu,u16 did, -u64 granu,int pasid) +u64 granu,u32 pasid) {struct qi_desc desc = {.qw1 =0 , .qw2 =0 , .qw3 =0 };
@@ -1779,7 +1779,7 @@ void dmar_msi_read(int irq, struct msi_msg *msg) }static int dmar_fault_do_one (struct intel_iommu *iommu,int type, -u8 fault_reason,int pasid,u16 source_id, +u8 fault_reason,u32 pasid,u16 source_id,unsigned long long addr) {const char *reason;
@@ -1829,7 +1829,8 @@ irqreturn_t dmar_fault(int irq, void *dev_id)u8 fault_reason;u16 source_id;u64 guest_addr; -int type, pasid; +u32 pasid; +int type;u32 data;bool pasid_present;
drivers/iommu/intel/intel-pasid.h +12 -12
@@ -72,7 +72,7 @@ struct pasid_entry {struct pasid_table {void *table;/* pasid table pointer */ int order;/* page order of pasid table */ -int max_pasid;/* max pasid */ +u32 max_pasid;/* max pasid */ struct list_head dev;/* device list */ };
@@ -98,31 +98,31 @@ static inline bool pasid_pte_is_present(struct pasid_entry *pte)return READ_ONCE (pte->val[0 ]) &PASID_PTE_PRESENT ; } -extern u32 intel_pasid_max_id; +extern unsigned int intel_pasid_max_id;int intel_pasid_alloc_id (void *ptr,int start,int end,gfp_t gfp); -void intel_pasid_free_id (int pasid); -void *intel_pasid_lookup_id (int pasid); +void intel_pasid_free_id (u32 pasid); +void *intel_pasid_lookup_id (u32 pasid);int intel_pasid_alloc_table (struct device *dev);void intel_pasid_free_table (struct device *dev);struct pasid_table *intel_pasid_get_table (struct device *dev);int intel_pasid_get_dev_max_id (struct device *dev); -struct pasid_entry *intel_pasid_get_entry (struct device *dev,int pasid); +struct pasid_entry *intel_pasid_get_entry (struct device *dev,u32 pasid);int intel_pasid_setup_first_level (struct intel_iommu *iommu,struct device *dev,pgd_t *pgd, -int pasid,u16 did,int flags); +u32 pasid,u16 did,int flags);int intel_pasid_setup_second_level (struct intel_iommu *iommu,struct dmar_domain *domain, -struct device *dev,int pasid); +struct device *dev,u32 pasid);int intel_pasid_setup_pass_through (struct intel_iommu *iommu,struct dmar_domain *domain, -struct device *dev,int pasid); +struct device *dev,u32 pasid);int intel_pasid_setup_nested (struct intel_iommu *iommu, -struct device *dev,pgd_t *pgd,int pasid, +struct device *dev,pgd_t *pgd,u32 pasid,struct iommu_gpasid_bind_data_vtd *pasid_data,struct dmar_domain *domain,int addr_width);void intel_pasid_tear_down_entry (struct intel_iommu *iommu, -struct device *dev,int pasid, +struct device *dev,u32 pasid,bool fault_ignore); -int vcmd_alloc_pasid (struct intel_iommu *iommu,unsigned int *pasid); -void vcmd_free_pasid (struct intel_iommu *iommu,unsigned int pasid); +int vcmd_alloc_pasid (struct intel_iommu *iommu,u32 *pasid); +void vcmd_free_pasid (struct intel_iommu *iommu,u32 pasid);#endif /* __INTEL_PASID_H */
drivers/iommu/intel/iommu.c +2 -2
@@ -2469,7 +2469,7 @@ dmar_search_domain_by_dev_info(int segment, int bus, int devfn)static int domain_setup_first_level (struct intel_iommu *iommu,struct dmar_domain *domain,struct device *dev, -int pasid) +u32 pasid) {int flags =PASID_FLAG_SUPERVISOR_MODE ;struct dma_pte *pgd = domain->pgd;
@@ -5147,7 +5147,7 @@ static int aux_domain_add_dev(struct dmar_domain *domain,return -ENODEV ;if (domain->default_pasid <=0 ) { -int pasid; +u32 pasid;/* No private data needed for the default pasid */ pasid = ioasid_alloc(NULL, PASID_MIN,
drivers/iommu/intel/pasid.c +15 -16
@@ -27,7 +27,7 @@static DEFINE_SPINLOCK (pasid_lock);u32 intel_pasid_max_id =PASID_MAX ; -int vcmd_alloc_pasid (struct intel_iommu *iommu,unsigned int *pasid) +int vcmd_alloc_pasid (struct intel_iommu *iommu,u32 *pasid) {unsigned long flags;u8 status_code;
@@ -58,7 +58,7 @@ int vcmd_alloc_pasid(struct intel_iommu *iommu, unsigned int *pasid)return ret; } -void vcmd_free_pasid (struct intel_iommu *iommu,unsigned int pasid) +void vcmd_free_pasid (struct intel_iommu *iommu,u32 pasid) {unsigned long flags;u8 status_code;
@@ -146,7 +146,7 @@ int intel_pasid_alloc_table(struct device *dev)struct pasid_table *pasid_table;struct pasid_table_opaque data;struct page *pages; -int max_pasid =0 ; +u32 max_pasid =0 ;int ret, order;int size;
@@ -168,7 +168,7 @@ int intel_pasid_alloc_table(struct device *dev)INIT_LIST_HEAD (&pasid_table->dev);if (info->pasid_supported) - max_pasid =min_t (int,pci_max_pasids (to_pci_dev (dev)), + max_pasid =min_t (u32,pci_max_pasids (to_pci_dev (dev)), intel_pasid_max_id); size = max_pasid >> (PASID_PDE_SHIFT -3 );
@@ -242,7 +242,7 @@ int intel_pasid_get_dev_max_id(struct device *dev)return info->pasid_table->max_pasid; } -struct pasid_entry *intel_pasid_get_entry (struct device *dev,int pasid) +struct pasid_entry *intel_pasid_get_entry (struct device *dev,u32 pasid) {struct device_domain_info *info;struct pasid_table *pasid_table;
@@ -251,8 +251,7 @@ struct pasid_entry *intel_pasid_get_entry(struct device *dev, int pasid)int dir_index, index; pasid_table =intel_pasid_get_table (dev); -if (WARN_ON (!pasid_table || pasid <0 || - pasid >=intel_pasid_get_dev_max_id (dev))) +if (WARN_ON (!pasid_table || pasid >=intel_pasid_get_dev_max_id (dev)))return NULL ; dir = pasid_table->table;
@@ -305,7 +304,7 @@ static inline void pasid_clear_entry_with_fpd(struct pasid_entry *pe) }static void -intel_pasid_clear_entry (struct device *dev,int pasid,bool fault_ignore) +intel_pasid_clear_entry (struct device *dev,u32 pasid,bool fault_ignore) {struct pasid_entry *pe;
@@ -444,7 +443,7 @@ pasid_set_eafe(struct pasid_entry *pe)static void pasid_cache_invalidation_with_pasid (struct intel_iommu *iommu, -u16 did,int pasid) +u16 did,u32 pasid) {struct qi_desc desc;
@@ -473,7 +472,7 @@ iotlb_invalidation_with_pasid(struct intel_iommu *iommu, u16 did, u32 pasid)static void devtlb_invalidation_with_pasid (struct intel_iommu *iommu, -struct device *dev,int pasid) +struct device *dev,u32 pasid) {struct device_domain_info *info;u16 sid, qdep, pfsid;
@@ -490,7 +489,7 @@ devtlb_invalidation_with_pasid(struct intel_iommu *iommu, }void intel_pasid_tear_down_entry (struct intel_iommu *iommu,struct device *dev, -int pasid,bool fault_ignore) +u32 pasid,bool fault_ignore) {struct pasid_entry *pte;u16 did;
@@ -515,7 +514,7 @@ void intel_pasid_tear_down_entry(struct intel_iommu *iommu, struct device *dev,static void pasid_flush_caches (struct intel_iommu *iommu,struct pasid_entry *pte, -int pasid,u16 did) +u32 pasid,u16 did) {if (!ecap_coherent (iommu->ecap))clflush_cache_range (pte,sizeof (*pte));
@@ -534,7 +533,7 @@ static void pasid_flush_caches(struct intel_iommu *iommu,*/ int intel_pasid_setup_first_level (struct intel_iommu *iommu,struct device *dev,pgd_t *pgd, -int pasid,u16 did,int flags) +u32 pasid,u16 did,int flags) {struct pasid_entry *pte;
@@ -607,7 +606,7 @@ static inline int iommu_skip_agaw(struct dmar_domain *domain,*/ int intel_pasid_setup_second_level (struct intel_iommu *iommu,struct dmar_domain *domain, -struct device *dev,int pasid) +struct device *dev,u32 pasid) {struct pasid_entry *pte;struct dma_pte *pgd;
@@ -665,7 +664,7 @@ int intel_pasid_setup_second_level(struct intel_iommu *iommu,*/ int intel_pasid_setup_pass_through (struct intel_iommu *iommu,struct dmar_domain *domain, -struct device *dev,int pasid) +struct device *dev,u32 pasid) {u16 did =FLPT_DEFAULT_DID ;struct pasid_entry *pte;
@@ -751,7 +750,7 @@ intel_pasid_setup_bind_data(struct intel_iommu *iommu, struct pasid_entry *pte,* @addr_width: Address width of the first level (guest) */ int intel_pasid_setup_nested (struct intel_iommu *iommu,struct device *dev, -pgd_t *gpgd,int pasid, +pgd_t *gpgd,u32 pasid,struct iommu_gpasid_bind_data_vtd *pasid_data,struct dmar_domain *domain,int addr_width) {
drivers/iommu/intel/svm.c +6 -6
@@ -23,7 +23,7 @@#include "intel-pasid.h" static irqreturn_t prq_event_thread (int irq,void *d); -static void intel_svm_drain_prq (struct device *dev,int pasid); +static void intel_svm_drain_prq (struct device *dev,u32 pasid);#define PRQ_ORDER 0
@@ -371,7 +371,7 @@ int intel_svm_bind_gpasid(struct iommu_domain *domain, struct device *dev,return ret; } -int intel_svm_unbind_gpasid (struct device *dev,int pasid) +int intel_svm_unbind_gpasid (struct device *dev,u32 pasid) {struct intel_iommu *iommu =intel_svm_device_to_iommu (dev);struct intel_svm_dev *sdev;
@@ -601,7 +601,7 @@ intel_svm_bind_mm(struct device *dev, int flags, struct svm_dev_ops *ops, }/* Caller must hold pasid_mutex */ -static int intel_svm_unbind_mm (struct device *dev,int pasid) +static int intel_svm_unbind_mm (struct device *dev,u32 pasid) {struct intel_svm_dev *sdev;struct intel_iommu *iommu;
@@ -728,7 +728,7 @@ static bool is_canonical_address(u64 addr)* described in VT-d spec CH7.10 to drain all page requests and page * responses pending in the hardware. */ -static void intel_svm_drain_prq (struct device *dev,int pasid) +static void intel_svm_drain_prq (struct device *dev,u32 pasid) {struct device_domain_info *info;struct dmar_domain *domain;
@@ -988,10 +988,10 @@ void intel_svm_unbind(struct iommu_sva *sva)mutex_unlock (&pasid_mutex); } -int intel_svm_get_pasid (struct iommu_sva *sva) +u32 intel_svm_get_pasid (struct iommu_sva *sva) {struct intel_svm_dev *sdev; -int pasid; +u32 pasid;mutex_lock (&pasid_mutex); sdev =to_intel_svm_dev (sva);
drivers/iommu/iommu.c +1 -1
@@ -2828,7 +2828,7 @@ void iommu_sva_unbind_device(struct iommu_sva *handle) }EXPORT_SYMBOL_GPL (iommu_sva_unbind_device); -int iommu_sva_get_pasid (struct iommu_sva *handle) +u32 iommu_sva_get_pasid (struct iommu_sva *handle) {const struct iommu_ops *ops = handle->dev->bus->iommu_ops;
drivers/misc/uacce/uacce.c +1 -1
@@ -92,7 +92,7 @@ static long uacce_fops_compat_ioctl(struct file *filep,static int uacce_bind_queue (struct uacce_device *uacce,struct uacce_queue *q) { -int pasid; +u32 pasid;struct iommu_sva *handle;if (!(uacce->flags &UACCE_DEV_SVA ))
include/linux/amd-iommu.h +4 -4
@@ -76,7 +76,7 @@ extern void amd_iommu_free_device(struct pci_dev *pdev);* * The function returns 0 on success or a negative value on error. */ -extern int amd_iommu_bind_pasid (struct pci_dev *pdev,int pasid, +extern int amd_iommu_bind_pasid (struct pci_dev *pdev,u32 pasid,struct task_struct *task);/**
@@ -88,7 +88,7 @@ extern int amd_iommu_bind_pasid(struct pci_dev *pdev, int pasid,* When this function returns the device is no longer using the PASID * and the PASID is no longer bound to its task. */ -extern void amd_iommu_unbind_pasid (struct pci_dev *pdev,int pasid); +extern void amd_iommu_unbind_pasid (struct pci_dev *pdev,u32 pasid);/** * amd_iommu_set_invalid_ppr_cb() - Register a call-back for failed
@@ -114,7 +114,7 @@ extern void amd_iommu_unbind_pasid(struct pci_dev *pdev, int pasid);#define AMD_IOMMU_INV_PRI_RSP_FAIL 2typedef int (*amd_iommu_invalid_ppr_cb )(struct pci_dev *pdev, -int pasid, +u32 pasid,unsigned long address,u16 );
@@ -166,7 +166,7 @@ extern int amd_iommu_device_info(struct pci_dev *pdev,* @cb: The call-back function */ -typedef void (*amd_iommu_invalidate_ctx )(struct pci_dev *pdev,int pasid); +typedef void (*amd_iommu_invalidate_ctx )(struct pci_dev *pdev,u32 pasid);extern int amd_iommu_set_invalidate_ctx_cb (struct pci_dev *pdev,amd_iommu_invalidate_ctx cb);
include/linux/intel-iommu.h +6 -6
@@ -549,7 +549,7 @@ struct dmar_domain {2 == 1GiB, 3 == 512GiB, 4 == 1TiB */ u64 max_addr;/* maximum mapped address */ -int default_pasid;/* +u32 default_pasid;/* * The default pasid used for non-SVM * traffic on mediated devices. */
@@ -706,7 +706,7 @@ void qi_flush_dev_iotlb_pasid(struct intel_iommu *iommu, u16 sid, u16 pfsid, u32 pasid, u16 qdep, u64 addr, unsigned int size_order, u64 granu);void qi_flush_pasid_cache (struct intel_iommu *iommu,u16 did,u64 granu, -int pasid); +u32 pasid);int qi_submit_sync (struct intel_iommu *iommu,struct qi_desc *desc,unsigned int count,unsigned long options);
@@ -734,11 +734,11 @@ extern int intel_svm_enable_prq(struct intel_iommu *iommu);extern int intel_svm_finish_prq (struct intel_iommu *iommu);int intel_svm_bind_gpasid (struct iommu_domain *domain,struct device *dev,struct iommu_gpasid_bind_data *data); -int intel_svm_unbind_gpasid (struct device *dev,int pasid); +int intel_svm_unbind_gpasid (struct device *dev,u32 pasid);struct iommu_sva *intel_svm_bind (struct device *dev,struct mm_struct *mm,void *drvdata);void intel_svm_unbind (struct iommu_sva *handle); -int intel_svm_get_pasid (struct iommu_sva *handle); +u32 intel_svm_get_pasid (struct iommu_sva *handle);struct svm_dev_ops ;struct intel_svm_dev {
@@ -747,7 +747,7 @@ struct intel_svm_dev {struct device *dev;struct svm_dev_ops *ops;struct iommu_sva sva; -int pasid; +u32 pasid;int users;u16 did; u16 dev_iotlb:1;
@@ -760,7 +760,7 @@ struct intel_svm {struct intel_iommu *iommu;int flags; -int pasid; +u32 pasid;int gpasid;/* In case that guest PASID is different from host PASID */ struct list_head devs;struct list_head list;
include/linux/intel-svm.h +1 -1
@@ -11,7 +11,7 @@struct device ;struct svm_dev_ops { -void (*fault_cb)(struct device *dev,int pasid,u64 address, +void (*fault_cb)(struct device *dev,u32 pasid,u64 address,void *private,int rwxp,int response); };
include/linux/iommu.h +5 -5
@@ -292,7 +292,7 @@ struct iommu_ops {struct iommu_sva *(*sva_bind)(struct device *dev,struct mm_struct *mm,void *drvdata);void (*sva_unbind)(struct iommu_sva *handle); -int (*sva_get_pasid)(struct iommu_sva *handle); +u32 (*sva_get_pasid)(struct iommu_sva *handle); int (*page_response)(struct device *dev, struct iommu_fault_event *evt,
@@ -302,7 +302,7 @@ struct iommu_ops {int (*sva_bind_gpasid)(struct iommu_domain *domain,struct device *dev,struct iommu_gpasid_bind_data *data); -int (*sva_unbind_gpasid)(struct device *dev,int pasid); +int (*sva_unbind_gpasid)(struct device *dev,u32 pasid);int (*def_domain_type)(struct device *dev);
@@ -656,7 +656,7 @@ struct iommu_sva *iommu_sva_bind_device(struct device *dev,struct mm_struct *mm, void *drvdata);void iommu_sva_unbind_device (struct iommu_sva *handle); -int iommu_sva_get_pasid (struct iommu_sva *handle); +u32 iommu_sva_get_pasid (struct iommu_sva *handle);#else /* CONFIG_IOMMU_API */
@@ -1049,7 +1049,7 @@ static inline void iommu_sva_unbind_device(struct iommu_sva *handle) { } -static inline int iommu_sva_get_pasid (struct iommu_sva *handle) +static inline u32 iommu_sva_get_pasid (struct iommu_sva *handle) {return IOMMU_PASID_INVALID ; }
@@ -1068,7 +1068,7 @@ static inline int iommu_sva_bind_gpasid(struct iommu_domain *domain, }static inline int iommu_sva_unbind_gpasid (struct iommu_domain *domain, -struct device *dev,int pasid) +struct device *dev,u32 pasid) {return -ENODEV ; }
include/linux/uacce.h +1 -1
@@ -81,7 +81,7 @@ struct uacce_queue {struct list_head list;struct uacce_qfile_region *qfrs[UACCE_MAX_REGION ];enum uacce_q_state state; -int pasid; +u32 pasid;struct iommu_sva *handle; };
Signature · 6 lines
2.19.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH v4 01/12] iommu: Change type of pasid to u32
Hi Fenghua,
Quoted 4 lines · Fenghua Yu
PASID is defined as a few different types in iommu including "int", "u32", and "unsigned int". To be consistent and to match with uapi definitions, define PASID and its variations (e.g. max PASID) as "u32". "u32" is also shorter and a little more explicit than "unsigned int".
For changes in Intel VT-d driver,
Best regards,
baolu
Quoted 1,295 lines
No PASID type change in uapi although it defines PASID as
__u64in some places.Suggested-by Thomas Gleixner <[email protected]>Signed-off-by Fenghua Yu <[email protected]>Reviewed-by Tony Luck <[email protected]>---
v4:
- Change PASID type from "unsigned int" to "u32" (Christoph)v2:
- Create this new patch to define PASID as "unsigned int" consistently in iommu (Thomas)drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 4 +-- .../drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c | 2 +- .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c | 2 +- .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c | 2 +- .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 2 +- .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.h | 2 +- .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 4 +-- drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c | 6 ++-- drivers/gpu/drm/amd/amdgpu/amdgpu_ids.h | 4 +-- drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 8 ++--- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 8 ++--- .../gpu/drm/amd/amdkfd/cik_event_interrupt.c | 2 +- drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.c | 2 +- drivers/gpu/drm/amd/amdkfd/kfd_dbgmgr.h | 2 +- .../drm/amd/amdkfd/kfd_device_queue_manager.c | 7 ++--- drivers/gpu/drm/amd/amdkfd/kfd_events.c | 8 ++--- drivers/gpu/drm/amd/amdkfd/kfd_events.h | 4 +-- drivers/gpu/drm/amd/amdkfd/kfd_iommu.c | 6 ++-- drivers/gpu/drm/amd/amdkfd/kfd_pasid.c | 2 +- drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 18 +++++------ drivers/gpu/drm/amd/amdkfd/kfd_process.c | 2 +- .../gpu/drm/amd/include/kgd_kfd_interface.h | 2 +- drivers/iommu/amd/amd_iommu.h | 10 +++--- drivers/iommu/amd/iommu.c | 31 ++++++++++--------- drivers/iommu/amd/iommu_v2.c | 20 ++++++------ drivers/iommu/intel/dmar.c | 7 +++-- drivers/iommu/intel/intel-pasid.h | 24 +++++++------- drivers/iommu/intel/iommu.c | 4 +-- drivers/iommu/intel/pasid.c | 31 +++++++++---------- drivers/iommu/intel/svm.c | 12 +++---- drivers/iommu/iommu.c | 2 +- drivers/misc/uacce/uacce.c | 2 +- include/linux/amd-iommu.h | 8 ++--- include/linux/intel-iommu.h | 12 +++---- include/linux/intel-svm.h | 2 +- include/linux/iommu.h | 10 +++--- include/linux/uacce.h | 2 +- 38 files changed, 139 insertions(+), 139 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h +2
-2@@ -207,11 +207,11 @@ uint8_t amdgpu_amdkfd_get_xgmi_hops_count(struct kgd_dev *dst, struct kgd_dev *s })/* GPUVM API */ -int amdgpu_amdkfd_gpuvm_create_process_vm (struct kgd_dev *kgd,unsigned int pasid, +int amdgpu_amdkfd_gpuvm_create_process_vm (struct kgd_dev *kgd,u32 pasid,void **vm,void **process_info,struct dma_fence **ef);int amdgpu_amdkfd_gpuvm_acquire_process_vm (struct kgd_dev *kgd, -struct file *filp,unsigned int pasid, +struct file *filp,u32 pasid,void **vm,void **process_info,struct dma_fence **ef); void amdgpu_amdkfd_gpuvm_destroy_cb(struct amdgpu_device *adev,drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c +1
-1@@ -105,7 +105,7 @@ static void kgd_program_sh_mem_settings(struct kgd_dev *kgd, uint32_t vmid,unlock_srbm (kgd); } -static int kgd_set_pasid_vmid_mapping (struct kgd_dev *kgd,unsigned int pasid, +static int kgd_set_pasid_vmid_mapping (struct kgd_dev *kgd,u32 pasid,unsigned int vmid) {struct amdgpu_device *adev =get_amdgpu_device (kgd);drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c +1
-1@@ -139,7 +139,7 @@ static void kgd_program_sh_mem_settings(struct kgd_dev *kgd, uint32_t vmid,unlock_srbm (kgd); } -static int kgd_set_pasid_vmid_mapping (struct kgd_dev *kgd,unsigned int pasid, +static int kgd_set_pasid_vmid_mapping (struct kgd_dev *kgd,u32 pasid,unsigned int vmid) {struct amdgpu_device *adev =get_amdgpu_device (kgd);drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c +1
-1@@ -96,7 +96,7 @@ static void kgd_program_sh_mem_settings(struct kgd_dev *kgd, uint32_t vmid,unlock_srbm (kgd); } -static int kgd_set_pasid_vmid_mapping (struct kgd_dev *kgd,unsigned int pasid, +static int kgd_set_pasid_vmid_mapping (struct kgd_dev *kgd,u32 pasid,unsigned int vmid) {struct amdgpu_device *adev =get_amdgpu_device (kgd);drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c +1
-1@@ -110,7 +110,7 @@ void kgd_gfx_v9_program_sh_mem_settings(struct kgd_dev *kgd, uint32_t vmid,unlock_srbm (kgd); } -int kgd_gfx_v9_set_pasid_vmid_mapping (struct kgd_dev *kgd,unsigned int pasid, +int kgd_gfx_v9_set_pasid_vmid_mapping (struct kgd_dev *kgd,u32 pasid,unsigned int vmid) {struct amdgpu_device *adev =get_amdgpu_device (kgd);drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.h +1
-1@@ -26,7 +26,7 @@ void kgd_gfx_v9_program_sh_mem_settings(struct kgd_dev *kgd, uint32_t vmid,uint32_t sh_mem_config, uint32_t sh_mem_ape1_base, uint32_t sh_mem_ape1_limit, uint32_t sh_mem_bases); -int kgd_gfx_v9_set_pasid_vmid_mapping (struct kgd_dev *kgd,unsigned int pasid, +int kgd_gfx_v9_set_pasid_vmid_mapping (struct kgd_dev *kgd,u32 pasid,unsigned int vmid);int kgd_gfx_v9_init_interrupts (struct kgd_dev *kgd,uint32_t pipe_id); int kgd_gfx_v9_hqd_load(struct kgd_dev *kgd, void *mqd, uint32_t pipe_id,drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +2
-2@@ -994,7 +994,7 @@ static int init_kfd_vm(struct amdgpu_vm *vm, void **process_info,return ret; } -int amdgpu_amdkfd_gpuvm_create_process_vm (struct kgd_dev *kgd,unsigned int pasid, +int amdgpu_amdkfd_gpuvm_create_process_vm (struct kgd_dev *kgd,u32 pasid,void **vm,void **process_info,struct dma_fence **ef) {@@ -1030,7 +1030,7 @@ int amdgpu_amdkfd_gpuvm_create_process_vm(struct kgd_dev *kgd, unsigned int pasi }int amdgpu_amdkfd_gpuvm_acquire_process_vm (struct kgd_dev *kgd, -struct file *filp,unsigned int pasid, +struct file *filp,u32 pasid,void **vm,void **process_info,struct dma_fence **ef) {drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c +3
-3@@ -43,7 +43,7 @@ static DEFINE_IDA(amdgpu_pasid_ida);/* Helper to free pasid from a fence callback */ struct amdgpu_pasid_cb {struct dma_fence_cb cb; -unsigned int pasid; +u32 pasid; };/** @@ -79,7 +79,7 @@ int amdgpu_pasid_alloc(unsigned int bits)* amdgpu_pasid_free - Free a PASID * @pasid: PASID to free */ -void amdgpu_pasid_free (unsigned int pasid) +void amdgpu_pasid_free (u32 pasid) {trace_amdgpu_pasid_freed (pasid);ida_simple_remove (&amdgpu_pasid_ida, pasid);@@ -105,7 +105,7 @@ static void amdgpu_pasid_free_cb(struct dma_fence *fence,* Free the pasid only after all the fences in resv are signaled. */ void amdgpu_pasid_free_delayed (struct dma_resv *resv, -unsigned int pasid) +u32 pasid) {struct dma_fence *fence, **fences;struct amdgpu_pasid_cb *cb;drivers/gpu/drm/amd/amdgpu/amdgpu_ids.h +2
-2@@ -71,9 +71,9 @@ struct amdgpu_vmid_mgr { };int amdgpu_pasid_alloc (unsigned int bits); -void amdgpu_pasid_free (unsigned int pasid); +void amdgpu_pasid_free (u32 pasid);void amdgpu_pasid_free_delayed (struct dma_resv *resv, -unsigned int pasid); +u32 pasid);bool amdgpu_vmid_had_gpu_reset (struct amdgpu_device *adev,struct amdgpu_vmid *id);drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +1
-1@@ -1062,7 +1062,7 @@ void amdgpu_driver_postclose_kms(struct drm_device *dev,struct amdgpu_fpriv *fpriv = file_priv->driver_priv;struct amdgpu_bo_list *list;struct amdgpu_bo *pd; -unsigned int pasid; +u32 pasid;int handle;if (!fpriv)drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +4
-4@@ -2783,7 +2783,7 @@ long amdgpu_vm_wait_idle(struct amdgpu_vm *vm, long timeout)* 0 for success, error for failure. */ int amdgpu_vm_init (struct amdgpu_device *adev,struct amdgpu_vm *vm, -int vm_context,unsigned int pasid) +int vm_context,u32 pasid) {struct amdgpu_bo_param bp;struct amdgpu_bo *root;@@ -2954,7 +2954,7 @@ static int amdgpu_vm_check_clean_reserved(struct amdgpu_device *adev,* 0 for success, -errno for errors. */ int amdgpu_vm_make_compute (struct amdgpu_device *adev,struct amdgpu_vm *vm, -unsigned int pasid) +u32 pasid) {bool pte_support_ats = (adev->asic_type ==CHIP_RAVEN );int r;@@ -3252,7 +3252,7 @@ int amdgpu_vm_ioctl(struct drm_device *dev, void *data, struct drm_file *filp)* @pasid: PASID identifier for VM * @task_info: task_info to fill. */ -void amdgpu_vm_get_task_info (struct amdgpu_device *adev,unsigned int pasid, +void amdgpu_vm_get_task_info (struct amdgpu_device *adev,u32 pasid,struct amdgpu_task_info *task_info) {struct amdgpu_vm *vm;@@ -3296,7 +3296,7 @@ void amdgpu_vm_set_task_info(struct amdgpu_vm *vm)* Try to gracefully handle a VM fault. Return true if the fault was handled and * shouldn't be reported any more. */ -bool amdgpu_vm_handle_fault (struct amdgpu_device *adev,unsigned int pasid, +bool amdgpu_vm_handle_fault (struct amdgpu_device *adev,u32 pasid,uint64_t addr) {struct amdgpu_bo *root;drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h +4
-4@@ -371,8 +371,8 @@ void amdgpu_vm_manager_fini(struct amdgpu_device *adev);long amdgpu_vm_wait_idle (struct amdgpu_vm *vm,long timeout);int amdgpu_vm_init (struct amdgpu_device *adev,struct amdgpu_vm *vm, -int vm_context,unsigned int pasid); -int amdgpu_vm_make_compute (struct amdgpu_device *adev,struct amdgpu_vm *vm,unsigned int pasid); +int vm_context,u32 pasid); +int amdgpu_vm_make_compute (struct amdgpu_device *adev,struct amdgpu_vm *vm,u32 pasid);void amdgpu_vm_release_compute (struct amdgpu_device *adev,struct amdgpu_vm *vm);void amdgpu_vm_fini (struct amdgpu_device *adev,struct amdgpu_vm *vm); void amdgpu_vm_get_pd_bo(struct amdgpu_vm *vm,@@ -429,9 +429,9 @@ bool amdgpu_vm_need_pipeline_sync(struct amdgpu_ring *ring, struct amdgpu_job *job);void amdgpu_vm_check_compute_bug (struct amdgpu_device *adev); -void amdgpu_vm_get_task_info (struct amdgpu_device *adev,unsigned int pasid, +void amdgpu_vm_get_task_info (struct amdgpu_device *adev,u32 pasid,struct amdgpu_task_info *task_info); -bool amdgpu_vm_handle_fault (struct amdgpu_device *adev,unsigned int pasid, +bool amdgpu_vm_handle_fault (struct amdgpu_device *adev,u32 pasid,uint64_t addr);void amdgpu_vm_set_task_info (struct amdgpu_vm *vm);drivers/gpu/drm/amd/amdkfd/cik_event_interrupt.c +1
-1@@ -90,7 +90,7 @@ static void cik_event_interrupt_wq(struct kfd_dev *dev, (const struct cik_ih_ring_entry *)ih_ring_entry;uint32_t context_id = ihre->data &0xfffffff ;unsigned int vmid = (ihre->ring_id &0x0000ff00 ) >>8 ; -unsigned int pasid = (ihre->ring_id &0xffff0000 ) >>16 ; +u32 pasid = (ihre->ring_id &0xffff0000 ) >>16 ;if (pasid ==0 )return ;drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.c +1
-1@@ -45,7 +45,7 @@ static void dbgdev_address_watch_disable_nodiq(struct kfd_dev *dev) }static int dbgdev_diq_submit_ib (struct kfd_dbgdev *dbgdev, -unsigned int pasid,uint64_t vmid0_address, +u32 pasid,uint64_t vmid0_address,uint32_t *packet_buff,size_t size_in_bytes) {struct pm4__release_mem *rm_packet;drivers/gpu/drm/amd/amdkfd/kfd_dbgmgr.h +1
-1@@ -275,7 +275,7 @@ struct kfd_dbgdev { };struct kfd_dbgmgr { -unsigned int pasid; +u32 pasid;struct kfd_dev *dev;struct kfd_dbgdev *dbgdev; };drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +3
-4@@ -40,7 +40,7 @@#define CIK_HPD_EOP_BYTES (1U << CIK_HPD_EOP_BYTES_LOG2)static int set_pasid_vmid_mapping (struct device_queue_manager *dqm, -unsigned int pasid,unsigned int vmid); +u32 pasid,unsigned int vmid); static int execute_queues_cpsch(struct device_queue_manager *dqm, enum kfd_unmap_queues_filter filter,@@ -909,7 +909,7 @@ static int unregister_process(struct device_queue_manager *dqm, }static int -set_pasid_vmid_mapping (struct device_queue_manager *dqm,unsigned int pasid, +set_pasid_vmid_mapping (struct device_queue_manager *dqm,u32 pasid,unsigned int vmid) { return dqm->dev->kfd2kgd->set_pasid_vmid_mapping(@@ -1925,8 +1925,7 @@ void device_queue_manager_uninit(struct device_queue_manager *dqm)kfree (dqm); } -int kfd_process_vm_fault (struct device_queue_manager *dqm, -unsigned int pasid) +int kfd_process_vm_fault (struct device_queue_manager *dqm,u32 pasid) {struct kfd_process_device *pdd;struct kfd_process *p =kfd_lookup_process_by_pasid (pasid);drivers/gpu/drm/amd/amdkfd/kfd_events.c +4
-4@@ -460,7 +460,7 @@ static void set_event_from_interrupt(struct kfd_process *p, } } -void kfd_signal_event_interrupt (unsigned int pasid,uint32_t partial_id, +void kfd_signal_event_interrupt (u32 pasid,uint32_t partial_id,uint32_t valid_id_bits) {struct kfd_event *ev =NULL ;@@ -872,7 +872,7 @@ static void lookup_events_by_type_and_signal(struct kfd_process *p, }#ifdef KFD_SUPPORT_IOMMU_V2 -void kfd_signal_iommu_event (struct kfd_dev *dev,unsigned int pasid, +void kfd_signal_iommu_event (struct kfd_dev *dev,u32 pasid,unsigned long address,bool is_write_requested,bool is_execute_requested) {@@ -950,7 +950,7 @@ void kfd_signal_iommu_event(struct kfd_dev *dev, unsigned int pasid, }#endif /* KFD_SUPPORT_IOMMU_V2 */ -void kfd_signal_hw_exception_event (unsigned int pasid) +void kfd_signal_hw_exception_event (u32 pasid) {/* * Because we are called from arbitrary context (workqueue) as opposed @@ -971,7 +971,7 @@ void kfd_signal_hw_exception_event(unsigned int pasid)kfd_unref_process (p); } -void kfd_signal_vm_fault_event (struct kfd_dev *dev,unsigned int pasid, +void kfd_signal_vm_fault_event (struct kfd_dev *dev,u32 pasid,struct kfd_vm_fault_info *info) {struct kfd_event *ev;drivers/gpu/drm/amd/amdkfd/kfd_events.h +2
-2@@ -79,7 +79,7 @@ struct kfd_event {#define KFD_EVENT_TYPE_DEBUG 5#define KFD_EVENT_TYPE_MEMORY 8 -extern void kfd_signal_event_interrupt (unsigned int pasid,uint32_t partial_id, -uint32_t valid_id_bits); +extern void kfd_signal_event_interrupt (u32 pasid,uint32_t partial_id, +uint32_t valid_id_bits);#endif drivers/gpu/drm/amd/amdkfd/kfd_iommu.c +3
-3@@ -139,7 +139,7 @@ void kfd_iommu_unbind_process(struct kfd_process *p) }/* Callback for process shutdown invoked by the IOMMU driver */ -static void iommu_pasid_shutdown_callback (struct pci_dev *pdev,int pasid) +static void iommu_pasid_shutdown_callback (struct pci_dev *pdev,u32 pasid) {struct kfd_dev *dev =kfd_device_by_pci_dev (pdev);struct kfd_process *p;@@ -185,8 +185,8 @@ static void iommu_pasid_shutdown_callback(struct pci_dev *pdev, int pasid) }/* This function called by IOMMU driver on PPR failure */ -static int iommu_invalid_ppr_cb (struct pci_dev *pdev,int pasid, -unsigned long address,u16 flags) +static int iommu_invalid_ppr_cb (struct pci_dev *pdev,u32 pasid, +unsigned long address,u16 flags) {struct kfd_dev *dev;drivers/gpu/drm/amd/amdkfd/kfd_pasid.c +1
-1@@ -77,7 +77,7 @@ unsigned int kfd_pasid_alloc(void)return r >0 ? r :0 ; } -void kfd_pasid_free (unsigned int pasid) +void kfd_pasid_free (u32 pasid) {if (kfd2kgd)amdgpu_pasid_free (pasid);drivers/gpu/drm/amd/amdkfd/kfd_priv.h +9
-9@@ -715,7 +715,7 @@ struct kfd_process {/* We want to receive a notification when the mm_struct is destroyed */ struct mmu_notifier mmu_notifier; -uint16_t pasid; +u32 pasid;unsigned int doorbell_index;/* @@ -790,7 +790,7 @@ int kfd_process_create_wq(void);void kfd_process_destroy_wq (void );struct kfd_process *kfd_create_process (struct file *filep);struct kfd_process *kfd_get_process (const struct task_struct *); -struct kfd_process *kfd_lookup_process_by_pasid (unsigned int pasid); +struct kfd_process *kfd_lookup_process_by_pasid (u32 pasid);struct kfd_process *kfd_lookup_process_by_mm (const struct mm_struct *mm);void kfd_unref_process (struct kfd_process *p);int kfd_process_evict_queues (struct kfd_process *p);@@ -832,7 +832,7 @@ void kfd_pasid_exit(void);bool kfd_set_pasid_limit (unsigned int new_limit);unsigned int kfd_get_pasid_limit (void );unsigned int kfd_pasid_alloc (void ); -void kfd_pasid_free (unsigned int pasid); +void kfd_pasid_free (u32 pasid);/* Doorbells */ size_t kfd_doorbell_process_slice (struct kfd_dev *kfd);@@ -917,7 +917,7 @@ void device_queue_manager_uninit(struct device_queue_manager *dqm);struct kernel_queue *kernel_queue_init (struct kfd_dev *dev,enum kfd_queue_type type);void kernel_queue_uninit (struct kernel_queue *kq,bool hanging); -int kfd_process_vm_fault (struct device_queue_manager *dqm,unsigned int pasid); +int kfd_process_vm_fault (struct device_queue_manager *dqm,u32 pasid);/* Process Queue Manager */ struct process_queue_node {@@ -1039,12 +1039,12 @@ int kfd_wait_on_events(struct kfd_process *p, uint32_t num_events, void __user *data, bool all, uint32_t user_timeout_ms, uint32_t *wait_result); -void kfd_signal_event_interrupt (unsigned int pasid,uint32_t partial_id, +void kfd_signal_event_interrupt (u32 pasid,uint32_t partial_id,uint32_t valid_id_bits);void kfd_signal_iommu_event (struct kfd_dev *dev, -unsigned int pasid,unsigned long address, -bool is_write_requested,bool is_execute_requested); -void kfd_signal_hw_exception_event (unsigned int pasid); +u32 pasid,unsigned long address, +bool is_write_requested,bool is_execute_requested); +void kfd_signal_hw_exception_event (u32 pasid);int kfd_set_event (struct kfd_process *p,uint32_t event_id);int kfd_reset_event (struct kfd_process *p,uint32_t event_id); int kfd_event_page_set(struct kfd_process *p, void *kernel_address,@@ -1055,7 +1055,7 @@ int kfd_event_create(struct file *devkfd, struct kfd_process *p, uint64_t *event_page_offset, uint32_t *event_slot_index);int kfd_event_destroy (struct kfd_process *p,uint32_t event_id); -void kfd_signal_vm_fault_event (struct kfd_dev *dev,unsigned int pasid, +void kfd_signal_vm_fault_event (struct kfd_dev *dev,u32 pasid,struct kfd_vm_fault_info *info);void kfd_signal_reset_event (struct kfd_dev *dev);drivers/gpu/drm/amd/amdkfd/kfd_process.c +1
-1@@ -1086,7 +1086,7 @@ void kfd_process_device_remove_obj_handle(struct kfd_process_device *pdd, }/* This increments the process->ref counter. */ -struct kfd_process *kfd_lookup_process_by_pasid (unsigned int pasid) +struct kfd_process *kfd_lookup_process_by_pasid (u32 pasid) {struct kfd_process *p, *ret_p =NULL ;unsigned int temp;drivers/gpu/drm/amd/include/kgd_kfd_interface.h +1
-1@@ -226,7 +226,7 @@ struct kfd2kgd_calls { uint32_t sh_mem_config, uint32_t sh_mem_ape1_base, uint32_t sh_mem_ape1_limit, uint32_t sh_mem_bases); -int (*set_pasid_vmid_mapping)(struct kgd_dev *kgd,unsigned int pasid, +int (*set_pasid_vmid_mapping)(struct kgd_dev *kgd,u32 pasid,unsigned int vmid);int (*init_interrupts)(struct kgd_dev *kgd,uint32_t pipe_id);drivers/iommu/amd/amd_iommu.h +5
-5@@ -45,12 +45,12 @@ extern int amd_iommu_register_ppr_notifier(struct notifier_block *nb);extern int amd_iommu_unregister_ppr_notifier (struct notifier_block *nb);extern void amd_iommu_domain_direct_map (struct iommu_domain *dom);extern int amd_iommu_domain_enable_v2 (struct iommu_domain *dom,int pasids); -extern int amd_iommu_flush_page (struct iommu_domain *dom,int pasid, +extern int amd_iommu_flush_page (struct iommu_domain *dom,u32 pasid,u64 address); -extern int amd_iommu_flush_tlb (struct iommu_domain *dom,int pasid); -extern int amd_iommu_domain_set_gcr3 (struct iommu_domain *dom,int pasid, +extern int amd_iommu_flush_tlb (struct iommu_domain *dom,u32 pasid); +extern int amd_iommu_domain_set_gcr3 (struct iommu_domain *dom,u32 pasid,unsigned long cr3); -extern int amd_iommu_domain_clear_gcr3 (struct iommu_domain *dom,int pasid); +extern int amd_iommu_domain_clear_gcr3 (struct iommu_domain *dom,u32 pasid);extern struct iommu_domain *amd_iommu_get_v2_domain (struct pci_dev *pdev);#ifdef CONFIG_IRQ_REMAP @@ -66,7 +66,7 @@ static inline int amd_iommu_create_irq_domain(struct amd_iommu *iommu)#define PPR_INVALID 0x1#define PPR_FAILURE 0xf -extern int amd_iommu_complete_ppr (struct pci_dev *pdev,int pasid, +extern int amd_iommu_complete_ppr (struct pci_dev *pdev,u32 pasid,int status,int tag);static inline bool is_rd890_iommu (struct pci_dev *pdev)drivers/iommu/amd/iommu.c +16
-15@@ -502,10 +502,11 @@ static void amd_iommu_report_page_fault(u16 devid, u16 domain_id,static void iommu_print_event (struct amd_iommu *iommu,void *__evt) {struct device *dev = iommu->iommu.dev; -int type, devid, pasid, flags, tag; +int type, devid, flags, tag;volatile u32 *event = __evt;int count =0 ;u64 address; +u32 pasid; retry: type = (event[1 ] >>EVENT_TYPE_SHIFT ) &EVENT_TYPE_MASK ;@@ -898,7 +899,7 @@ static void build_inv_iotlb_pages(struct iommu_cmd *cmd, u16 devid, int qdep, cmd->data[2 ] |=CMD_INV_IOMMU_PAGES_SIZE_MASK ; } -static void build_inv_iommu_pasid (struct iommu_cmd *cmd,u16 domid,int pasid, +static void build_inv_iommu_pasid (struct iommu_cmd *cmd,u16 domid,u32 pasid,u64 address,bool size) {memset (cmd,0 ,sizeof (*cmd));@@ -916,7 +917,7 @@ static void build_inv_iommu_pasid(struct iommu_cmd *cmd, u16 domid, int pasid,CMD_SET_TYPE (cmd,CMD_INV_IOMMU_PAGES ); } -static void build_inv_iotlb_pasid (struct iommu_cmd *cmd,u16 devid,int pasid, +static void build_inv_iotlb_pasid (struct iommu_cmd *cmd,u16 devid,u32 pasid,int qdep,u64 address,bool size) {memset (cmd,0 ,sizeof (*cmd));@@ -936,7 +937,7 @@ static void build_inv_iotlb_pasid(struct iommu_cmd *cmd, u16 devid, int pasid,CMD_SET_TYPE (cmd,CMD_INV_IOTLB_PAGES ); } -static void build_complete_ppr (struct iommu_cmd *cmd,u16 devid,int pasid, +static void build_complete_ppr (struct iommu_cmd *cmd,u16 devid,u32 pasid,int status,int tag,bool gn) {memset (cmd,0 ,sizeof (*cmd));@@ -2772,7 +2773,7 @@ int amd_iommu_domain_enable_v2(struct iommu_domain *dom, int pasids) }EXPORT_SYMBOL (amd_iommu_domain_enable_v2); -static int __flush_pasid (struct protection_domain *domain,int pasid, +static int __flush_pasid (struct protection_domain *domain,u32 pasid,u64 address,bool size) {struct iommu_dev_data *dev_data;@@ -2833,13 +2834,13 @@ static int __flush_pasid(struct protection_domain *domain, int pasid,return ret; } -static int __amd_iommu_flush_page (struct protection_domain *domain,int pasid, +static int __amd_iommu_flush_page (struct protection_domain *domain,u32 pasid,u64 address) {return __flush_pasid (domain, pasid, address, false); } -int amd_iommu_flush_page (struct iommu_domain *dom,int pasid, +int amd_iommu_flush_page (struct iommu_domain *dom,u32 pasid,u64 address) {struct protection_domain *domain =to_pdomain (dom);@@ -2854,13 +2855,13 @@ int amd_iommu_flush_page(struct iommu_domain *dom, int pasid, }EXPORT_SYMBOL (amd_iommu_flush_page); -static int __amd_iommu_flush_tlb (struct protection_domain *domain,int pasid) +static int __amd_iommu_flush_tlb (struct protection_domain *domain,u32 pasid) {return __flush_pasid (domain, pasid,CMD_INV_IOMMU_ALL_PAGES_ADDRESS , true); } -int amd_iommu_flush_tlb (struct iommu_domain *dom,int pasid) +int amd_iommu_flush_tlb (struct iommu_domain *dom,u32 pasid) {struct protection_domain *domain =to_pdomain (dom);unsigned long flags;@@ -2874,7 +2875,7 @@ int amd_iommu_flush_tlb(struct iommu_domain *dom, int pasid) }EXPORT_SYMBOL (amd_iommu_flush_tlb); -static u64 *__get_gcr3_pte (u64 *root,int level,int pasid,bool alloc) +static u64 *__get_gcr3_pte (u64 *root,int level,u32 pasid,bool alloc) {int index;u64 *pte;@@ -2906,7 +2907,7 @@ static u64 *__get_gcr3_pte(u64 *root, int level, int pasid, bool alloc)return pte; } -static int __set_gcr3 (struct protection_domain *domain,int pasid, +static int __set_gcr3 (struct protection_domain *domain,u32 pasid,unsigned long cr3) {struct domain_pgtable pgtable;@@ -2925,7 +2926,7 @@ static int __set_gcr3(struct protection_domain *domain, int pasid,return __amd_iommu_flush_tlb (domain, pasid); } -static int __clear_gcr3 (struct protection_domain *domain,int pasid) +static int __clear_gcr3 (struct protection_domain *domain,u32 pasid) {struct domain_pgtable pgtable;u64 *pte;@@ -2943,7 +2944,7 @@ static int __clear_gcr3(struct protection_domain *domain, int pasid)return __amd_iommu_flush_tlb (domain, pasid); } -int amd_iommu_domain_set_gcr3 (struct iommu_domain *dom,int pasid, +int amd_iommu_domain_set_gcr3 (struct iommu_domain *dom,u32 pasid,unsigned long cr3) {struct protection_domain *domain =to_pdomain (dom);@@ -2958,7 +2959,7 @@ int amd_iommu_domain_set_gcr3(struct iommu_domain *dom, int pasid, }EXPORT_SYMBOL (amd_iommu_domain_set_gcr3); -int amd_iommu_domain_clear_gcr3 (struct iommu_domain *dom,int pasid) +int amd_iommu_domain_clear_gcr3 (struct iommu_domain *dom,u32 pasid) {struct protection_domain *domain =to_pdomain (dom);unsigned long flags;@@ -2972,7 +2973,7 @@ int amd_iommu_domain_clear_gcr3(struct iommu_domain *dom, int pasid) }EXPORT_SYMBOL (amd_iommu_domain_clear_gcr3); -int amd_iommu_complete_ppr (struct pci_dev *pdev,int pasid, +int amd_iommu_complete_ppr (struct pci_dev *pdev,u32 pasid,int status,int tag) {struct iommu_dev_data *dev_data;drivers/iommu/amd/iommu_v2.c +10
-10@@ -40,7 +40,7 @@ struct pasid_state {struct mmu_notifier mn;/* mmu_notifier handle */ struct pri_queue pri[PRI_QUEUE_SIZE ];/* PRI tag states */ struct device_state *device_state;/* Link to our device_state */ -int pasid;/* PASID index */ +u32 pasid;/* PASID index */ bool invalid;/* Used during setup and teardown of the pasid */ spinlock_t lock;/* Protect pri_queues and @@ -70,7 +70,7 @@ struct fault {struct mm_struct *mm;u64 address;u16 devid; -u16 pasid; +u32 pasid;u16 tag;u16 finish;u16 flags;@@ -150,7 +150,7 @@ static void put_device_state(struct device_state *dev_state)/* Must be called under dev_state->lock */ static struct pasid_state **__get_pasid_state_ptr (struct device_state *dev_state, -int pasid,bool alloc) +u32 pasid,bool alloc) {struct pasid_state **root, **ptr;int level, index;@@ -184,7 +184,7 @@ static struct pasid_state **__get_pasid_state_ptr(struct device_state *dev_statestatic int set_pasid_state (struct device_state *dev_state,struct pasid_state *pasid_state, -int pasid) +u32 pasid) {struct pasid_state **ptr;unsigned long flags;@@ -211,7 +211,7 @@ static int set_pasid_state(struct device_state *dev_state,return ret; } -static void clear_pasid_state (struct device_state *dev_state,int pasid) +static void clear_pasid_state (struct device_state *dev_state,u32 pasid) {struct pasid_state **ptr;unsigned long flags;@@ -229,7 +229,7 @@ static void clear_pasid_state(struct device_state *dev_state, int pasid) }static struct pasid_state *get_pasid_state (struct device_state *dev_state, -int pasid) +u32 pasid) {struct pasid_state **ptr, *ret =NULL ;unsigned long flags;@@ -594,7 +594,7 @@ static struct notifier_block ppr_nb = { .notifier_call = ppr_notifier, }; -int amd_iommu_bind_pasid (struct pci_dev *pdev,int pasid, +int amd_iommu_bind_pasid (struct pci_dev *pdev,u32 pasid,struct task_struct *task) {struct pasid_state *pasid_state;@@ -615,7 +615,7 @@ int amd_iommu_bind_pasid(struct pci_dev *pdev, int pasid,return -EINVAL ; ret = -EINVAL ; -if (pasid <0 || pasid >= dev_state->max_pasids) +if (pasid >= dev_state->max_pasids) goto out; ret = -ENOMEM ;@@ -679,7 +679,7 @@ int amd_iommu_bind_pasid(struct pci_dev *pdev, int pasid, }EXPORT_SYMBOL (amd_iommu_bind_pasid); -void amd_iommu_unbind_pasid (struct pci_dev *pdev,int pasid) +void amd_iommu_unbind_pasid (struct pci_dev *pdev,u32 pasid) {struct pasid_state *pasid_state;struct device_state *dev_state;@@ -695,7 +695,7 @@ void amd_iommu_unbind_pasid(struct pci_dev *pdev, int pasid)if (dev_state ==NULL )return ; -if (pasid <0 || pasid >= dev_state->max_pasids) +if (pasid >= dev_state->max_pasids) goto out; pasid_state =get_pasid_state (dev_state, pasid);drivers/iommu/intel/dmar.c +4
-3@@ -1465,7 +1465,7 @@ void qi_flush_dev_iotlb_pasid(struct intel_iommu *iommu, u16 sid, u16 pfsid, }void qi_flush_pasid_cache (struct intel_iommu *iommu,u16 did, -u64 granu,int pasid) +u64 granu,u32 pasid) {struct qi_desc desc = {.qw1 =0 , .qw2 =0 , .qw3 =0 };@@ -1779,7 +1779,7 @@ void dmar_msi_read(int irq, struct msi_msg *msg) }static int dmar_fault_do_one (struct intel_iommu *iommu,int type, -u8 fault_reason,int pasid,u16 source_id, +u8 fault_reason,u32 pasid,u16 source_id,unsigned long long addr) {const char *reason;@@ -1829,7 +1829,8 @@ irqreturn_t dmar_fault(int irq, void *dev_id)u8 fault_reason;u16 source_id;u64 guest_addr; -int type, pasid; +u32 pasid; +int type;u32 data;bool pasid_present;drivers/iommu/intel/intel-pasid.h +12
-12@@ -72,7 +72,7 @@ struct pasid_entry {struct pasid_table {void *table;/* pasid table pointer */ int order;/* page order of pasid table */ -int max_pasid;/* max pasid */ +u32 max_pasid;/* max pasid */ struct list_head dev;/* device list */ };@@ -98,31 +98,31 @@ static inline bool pasid_pte_is_present(struct pasid_entry *pte)return READ_ONCE (pte->val[0 ]) &PASID_PTE_PRESENT ; } -extern u32 intel_pasid_max_id; +extern unsigned int intel_pasid_max_id;int intel_pasid_alloc_id (void *ptr,int start,int end,gfp_t gfp); -void intel_pasid_free_id (int pasid); -void *intel_pasid_lookup_id (int pasid); +void intel_pasid_free_id (u32 pasid); +void *intel_pasid_lookup_id (u32 pasid);int intel_pasid_alloc_table (struct device *dev);void intel_pasid_free_table (struct device *dev);struct pasid_table *intel_pasid_get_table (struct device *dev);int intel_pasid_get_dev_max_id (struct device *dev); -struct pasid_entry *intel_pasid_get_entry (struct device *dev,int pasid); +struct pasid_entry *intel_pasid_get_entry (struct device *dev,u32 pasid);int intel_pasid_setup_first_level (struct intel_iommu *iommu,struct device *dev,pgd_t *pgd, -int pasid,u16 did,int flags); +u32 pasid,u16 did,int flags);int intel_pasid_setup_second_level (struct intel_iommu *iommu,struct dmar_domain *domain, -struct device *dev,int pasid); +struct device *dev,u32 pasid);int intel_pasid_setup_pass_through (struct intel_iommu *iommu,struct dmar_domain *domain, -struct device *dev,int pasid); +struct device *dev,u32 pasid);int intel_pasid_setup_nested (struct intel_iommu *iommu, -struct device *dev,pgd_t *pgd,int pasid, +struct device *dev,pgd_t *pgd,u32 pasid,struct iommu_gpasid_bind_data_vtd *pasid_data,struct dmar_domain *domain,int addr_width);void intel_pasid_tear_down_entry (struct intel_iommu *iommu, -struct device *dev,int pasid, +struct device *dev,u32 pasid,bool fault_ignore); -int vcmd_alloc_pasid (struct intel_iommu *iommu,unsigned int *pasid); -void vcmd_free_pasid (struct intel_iommu *iommu,unsigned int pasid); +int vcmd_alloc_pasid (struct intel_iommu *iommu,u32 *pasid); +void vcmd_free_pasid (struct intel_iommu *iommu,u32 pasid);#endif /* __INTEL_PASID_H */ drivers/iommu/intel/iommu.c +2
-2@@ -2469,7 +2469,7 @@ dmar_search_domain_by_dev_info(int segment, int bus, int devfn)static int domain_setup_first_level (struct intel_iommu *iommu,struct dmar_domain *domain,struct device *dev, -int pasid) +u32 pasid) {int flags =PASID_FLAG_SUPERVISOR_MODE ;struct dma_pte *pgd = domain->pgd;@@ -5147,7 +5147,7 @@ static int aux_domain_add_dev(struct dmar_domain *domain,return -ENODEV ;if (domain->default_pasid <=0 ) { -int pasid; +u32 pasid;/* No private data needed for the default pasid */ pasid = ioasid_alloc(NULL, PASID_MIN,drivers/iommu/intel/pasid.c +15
-16@@ -27,7 +27,7 @@static DEFINE_SPINLOCK (pasid_lock);u32 intel_pasid_max_id =PASID_MAX ; -int vcmd_alloc_pasid (struct intel_iommu *iommu,unsigned int *pasid) +int vcmd_alloc_pasid (struct intel_iommu *iommu,u32 *pasid) {unsigned long flags;u8 status_code;@@ -58,7 +58,7 @@ int vcmd_alloc_pasid(struct intel_iommu *iommu, unsigned int *pasid)return ret; } -void vcmd_free_pasid (struct intel_iommu *iommu,unsigned int pasid) +void vcmd_free_pasid (struct intel_iommu *iommu,u32 pasid) {unsigned long flags;u8 status_code;@@ -146,7 +146,7 @@ int intel_pasid_alloc_table(struct device *dev)struct pasid_table *pasid_table;struct pasid_table_opaque data;struct page *pages; -int max_pasid =0 ; +u32 max_pasid =0 ;int ret, order;int size;@@ -168,7 +168,7 @@ int intel_pasid_alloc_table(struct device *dev)INIT_LIST_HEAD (&pasid_table->dev);if (info->pasid_supported) - max_pasid =min_t (int,pci_max_pasids (to_pci_dev (dev)), + max_pasid =min_t (u32,pci_max_pasids (to_pci_dev (dev)), intel_pasid_max_id); size = max_pasid >> (PASID_PDE_SHIFT -3 );@@ -242,7 +242,7 @@ int intel_pasid_get_dev_max_id(struct device *dev)return info->pasid_table->max_pasid; } -struct pasid_entry *intel_pasid_get_entry (struct device *dev,int pasid) +struct pasid_entry *intel_pasid_get_entry (struct device *dev,u32 pasid) {struct device_domain_info *info;struct pasid_table *pasid_table;@@ -251,8 +251,7 @@ struct pasid_entry *intel_pasid_get_entry(struct device *dev, int pasid)int dir_index, index; pasid_table =intel_pasid_get_table (dev); -if (WARN_ON (!pasid_table || pasid <0 || - pasid >=intel_pasid_get_dev_max_id (dev))) +if (WARN_ON (!pasid_table || pasid >=intel_pasid_get_dev_max_id (dev)))return NULL ; dir = pasid_table->table;@@ -305,7 +304,7 @@ static inline void pasid_clear_entry_with_fpd(struct pasid_entry *pe) }static void -intel_pasid_clear_entry (struct device *dev,int pasid,bool fault_ignore) +intel_pasid_clear_entry (struct device *dev,u32 pasid,bool fault_ignore) {struct pasid_entry *pe;@@ -444,7 +443,7 @@ pasid_set_eafe(struct pasid_entry *pe)static void pasid_cache_invalidation_with_pasid (struct intel_iommu *iommu, -u16 did,int pasid) +u16 did,u32 pasid) {struct qi_desc desc;@@ -473,7 +472,7 @@ iotlb_invalidation_with_pasid(struct intel_iommu *iommu, u16 did, u32 pasid)static void devtlb_invalidation_with_pasid (struct intel_iommu *iommu, -struct device *dev,int pasid) +struct device *dev,u32 pasid) {struct device_domain_info *info;u16 sid, qdep, pfsid;@@ -490,7 +489,7 @@ devtlb_invalidation_with_pasid(struct intel_iommu *iommu, }void intel_pasid_tear_down_entry (struct intel_iommu *iommu,struct device *dev, -int pasid,bool fault_ignore) +u32 pasid,bool fault_ignore) {struct pasid_entry *pte;u16 did;@@ -515,7 +514,7 @@ void intel_pasid_tear_down_entry(struct intel_iommu *iommu, struct device *dev,static void pasid_flush_caches (struct intel_iommu *iommu,struct pasid_entry *pte, -int pasid,u16 did) +u32 pasid,u16 did) {if (!ecap_coherent (iommu->ecap))clflush_cache_range (pte,sizeof (*pte));@@ -534,7 +533,7 @@ static void pasid_flush_caches(struct intel_iommu *iommu,*/ int intel_pasid_setup_first_level (struct intel_iommu *iommu,struct device *dev,pgd_t *pgd, -int pasid,u16 did,int flags) +u32 pasid,u16 did,int flags) {struct pasid_entry *pte;@@ -607,7 +606,7 @@ static inline int iommu_skip_agaw(struct dmar_domain *domain,*/ int intel_pasid_setup_second_level (struct intel_iommu *iommu,struct dmar_domain *domain, -struct device *dev,int pasid) +struct device *dev,u32 pasid) {struct pasid_entry *pte;struct dma_pte *pgd;@@ -665,7 +664,7 @@ int intel_pasid_setup_second_level(struct intel_iommu *iommu,*/ int intel_pasid_setup_pass_through (struct intel_iommu *iommu,struct dmar_domain *domain, -struct device *dev,int pasid) +struct device *dev,u32 pasid) {u16 did =FLPT_DEFAULT_DID ;struct pasid_entry *pte;@@ -751,7 +750,7 @@ intel_pasid_setup_bind_data(struct intel_iommu *iommu, struct pasid_entry *pte,* @addr_width: Address width of the first level (guest) */ int intel_pasid_setup_nested (struct intel_iommu *iommu,struct device *dev, -pgd_t *gpgd,int pasid, +pgd_t *gpgd,u32 pasid,struct iommu_gpasid_bind_data_vtd *pasid_data,struct dmar_domain *domain,int addr_width) {drivers/iommu/intel/svm.c +6
-6@@ -23,7 +23,7 @@#include "intel-pasid.h" static irqreturn_t prq_event_thread (int irq,void *d); -static void intel_svm_drain_prq (struct device *dev,int pasid); +static void intel_svm_drain_prq (struct device *dev,u32 pasid);#define PRQ_ORDER 0@@ -371,7 +371,7 @@ int intel_svm_bind_gpasid(struct iommu_domain *domain, struct device *dev,return ret; } -int intel_svm_unbind_gpasid (struct device *dev,int pasid) +int intel_svm_unbind_gpasid (struct device *dev,u32 pasid) {struct intel_iommu *iommu =intel_svm_device_to_iommu (dev);struct intel_svm_dev *sdev;@@ -601,7 +601,7 @@ intel_svm_bind_mm(struct device *dev, int flags, struct svm_dev_ops *ops, }/* Caller must hold pasid_mutex */ -static int intel_svm_unbind_mm (struct device *dev,int pasid) +static int intel_svm_unbind_mm (struct device *dev,u32 pasid) {struct intel_svm_dev *sdev;struct intel_iommu *iommu;@@ -728,7 +728,7 @@ static bool is_canonical_address(u64 addr)* described in VT-d spec CH7.10 to drain all page requests and page * responses pending in the hardware. */ -static void intel_svm_drain_prq (struct device *dev,int pasid) +static void intel_svm_drain_prq (struct device *dev,u32 pasid) {struct device_domain_info *info;struct dmar_domain *domain;@@ -988,10 +988,10 @@ void intel_svm_unbind(struct iommu_sva *sva)mutex_unlock (&pasid_mutex); } -int intel_svm_get_pasid (struct iommu_sva *sva) +u32 intel_svm_get_pasid (struct iommu_sva *sva) {struct intel_svm_dev *sdev; -int pasid; +u32 pasid;mutex_lock (&pasid_mutex); sdev =to_intel_svm_dev (sva);drivers/iommu/iommu.c +1
-1@@ -2828,7 +2828,7 @@ void iommu_sva_unbind_device(struct iommu_sva *handle) }EXPORT_SYMBOL_GPL (iommu_sva_unbind_device); -int iommu_sva_get_pasid (struct iommu_sva *handle) +u32 iommu_sva_get_pasid (struct iommu_sva *handle) {const struct iommu_ops *ops = handle->dev->bus->iommu_ops;drivers/misc/uacce/uacce.c +1
-1@@ -92,7 +92,7 @@ static long uacce_fops_compat_ioctl(struct file *filep,static int uacce_bind_queue (struct uacce_device *uacce,struct uacce_queue *q) { -int pasid; +u32 pasid;struct iommu_sva *handle;if (!(uacce->flags &UACCE_DEV_SVA ))include/linux/amd-iommu.h +4
-4@@ -76,7 +76,7 @@ extern void amd_iommu_free_device(struct pci_dev *pdev);* * The function returns 0 on success or a negative value on error. */ -extern int amd_iommu_bind_pasid (struct pci_dev *pdev,int pasid, +extern int amd_iommu_bind_pasid (struct pci_dev *pdev,u32 pasid,struct task_struct *task);/** @@ -88,7 +88,7 @@ extern int amd_iommu_bind_pasid(struct pci_dev *pdev, int pasid,* When this function returns the device is no longer using the PASID * and the PASID is no longer bound to its task. */ -extern void amd_iommu_unbind_pasid (struct pci_dev *pdev,int pasid); +extern void amd_iommu_unbind_pasid (struct pci_dev *pdev,u32 pasid);/** * amd_iommu_set_invalid_ppr_cb() - Register a call-back for failed @@ -114,7 +114,7 @@ extern void amd_iommu_unbind_pasid(struct pci_dev *pdev, int pasid);#define AMD_IOMMU_INV_PRI_RSP_FAIL 2typedef int (*amd_iommu_invalid_ppr_cb )(struct pci_dev *pdev, -int pasid, +u32 pasid,unsigned long address,u16 );@@ -166,7 +166,7 @@ extern int amd_iommu_device_info(struct pci_dev *pdev,* @cb: The call-back function */ -typedef void (*amd_iommu_invalidate_ctx )(struct pci_dev *pdev,int pasid); +typedef void (*amd_iommu_invalidate_ctx )(struct pci_dev *pdev,u32 pasid);extern int amd_iommu_set_invalidate_ctx_cb (struct pci_dev *pdev,amd_iommu_invalidate_ctx cb);include/linux/intel-iommu.h +6
-6@@ -549,7 +549,7 @@ struct dmar_domain {2 == 1GiB, 3 == 512GiB, 4 == 1TiB */ u64 max_addr;/* maximum mapped address */ -int default_pasid;/* +u32 default_pasid;/* * The default pasid used for non-SVM * traffic on mediated devices. */ @@ -706,7 +706,7 @@ void qi_flush_dev_iotlb_pasid(struct intel_iommu *iommu, u16 sid, u16 pfsid, u32 pasid, u16 qdep, u64 addr, unsigned int size_order, u64 granu);void qi_flush_pasid_cache (struct intel_iommu *iommu,u16 did,u64 granu, -int pasid); +u32 pasid);int qi_submit_sync (struct intel_iommu *iommu,struct qi_desc *desc,unsigned int count,unsigned long options);@@ -734,11 +734,11 @@ extern int intel_svm_enable_prq(struct intel_iommu *iommu);extern int intel_svm_finish_prq (struct intel_iommu *iommu);int intel_svm_bind_gpasid (struct iommu_domain *domain,struct device *dev,struct iommu_gpasid_bind_data *data); -int intel_svm_unbind_gpasid (struct device *dev,int pasid); +int intel_svm_unbind_gpasid (struct device *dev,u32 pasid);struct iommu_sva *intel_svm_bind (struct device *dev,struct mm_struct *mm,void *drvdata);void intel_svm_unbind (struct iommu_sva *handle); -int intel_svm_get_pasid (struct iommu_sva *handle); +u32 intel_svm_get_pasid (struct iommu_sva *handle);struct svm_dev_ops ;struct intel_svm_dev {@@ -747,7 +747,7 @@ struct intel_svm_dev {struct device *dev;struct svm_dev_ops *ops;struct iommu_sva sva; -int pasid; +u32 pasid;int users;u16 did; u16 dev_iotlb:1;@@ -760,7 +760,7 @@ struct intel_svm {struct intel_iommu *iommu;int flags; -int pasid; +u32 pasid;int gpasid;/* In case that guest PASID is different from host PASID */ struct list_head devs;struct list_head list;include/linux/intel-svm.h +1
-1@@ -11,7 +11,7 @@struct device ;struct svm_dev_ops { -void (*fault_cb)(struct device *dev,int pasid,u64 address, +void (*fault_cb)(struct device *dev,u32 pasid,u64 address,void *private,int rwxp,int response); };include/linux/iommu.h +5
-5@@ -292,7 +292,7 @@ struct iommu_ops {struct iommu_sva *(*sva_bind)(struct device *dev,struct mm_struct *mm,void *drvdata);void (*sva_unbind)(struct iommu_sva *handle); -int (*sva_get_pasid)(struct iommu_sva *handle); +u32 (*sva_get_pasid)(struct iommu_sva *handle); int (*page_response)(struct device *dev, struct iommu_fault_event *evt,@@ -302,7 +302,7 @@ struct iommu_ops {int (*sva_bind_gpasid)(struct iommu_domain *domain,struct device *dev,struct iommu_gpasid_bind_data *data); -int (*sva_unbind_gpasid)(struct device *dev,int pasid); +int (*sva_unbind_gpasid)(struct device *dev,u32 pasid);int (*def_domain_type)(struct device *dev);@@ -656,7 +656,7 @@ struct iommu_sva *iommu_sva_bind_device(struct device *dev,struct mm_struct *mm, void *drvdata);void iommu_sva_unbind_device (struct iommu_sva *handle); -int iommu_sva_get_pasid (struct iommu_sva *handle); +u32 iommu_sva_get_pasid (struct iommu_sva *handle);#else /* CONFIG_IOMMU_API */ @@ -1049,7 +1049,7 @@ static inline void iommu_sva_unbind_device(struct iommu_sva *handle) { } -static inline int iommu_sva_get_pasid (struct iommu_sva *handle) +static inline u32 iommu_sva_get_pasid (struct iommu_sva *handle) {return IOMMU_PASID_INVALID ; }@@ -1068,7 +1068,7 @@ static inline int iommu_sva_bind_gpasid(struct iommu_domain *domain, }static inline int iommu_sva_unbind_gpasid (struct iommu_domain *domain, -struct device *dev,int pasid) +struct device *dev,u32 pasid) {return -ENODEV ; }include/linux/uacce.h +0
-0
include/linux/uacce.h struct uacce_queue { · line 87
Quoted 8 lines
include/linux/uacce.h +1
-1@@ -81,7 +81,7 @@ struct uacce_queue {struct list_head list;struct uacce_qfile_region *qfrs[UACCE_MAX_REGION ];enum uacce_q_state state; -int pasid; +u32 pasid;struct iommu_sva *handle; };
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH v4 2/12 iommu/vt-d: Change flags type to unsigned int in binding mm
In reply to Fenghua Yu"flags" passed to intel_svm_bind_mm() is a bit mask and should be defined as "unsigned int" instead of "int".
Change its type to "unsigned int".
---
v2:
- Add this new patch per Thomas' comment.
drivers/iommu/intel/svm.c | 7 ++++--- include/linux/intel-iommu.h | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-)
drivers/iommu/intel/svm.c +4 -3
@@ -427,7 +427,8 @@ int intel_svm_unbind_gpasid(struct device *dev, u32 pasid)/* Caller must hold pasid_mutex, mm reference */ static int -intel_svm_bind_mm (struct device *dev,int flags,struct svm_dev_ops *ops, +intel_svm_bind_mm (struct device *dev,unsigned int flags, +struct svm_dev_ops *ops,struct mm_struct *mm,struct intel_svm_dev **sd) {struct intel_iommu *iommu =intel_svm_device_to_iommu (dev);
@@ -954,7 +955,7 @@ intel_svm_bind(struct device *dev, struct mm_struct *mm, void *drvdata) {struct iommu_sva *sva =ERR_PTR (-EINVAL );struct intel_svm_dev *sdev =NULL ; -int flags =0 ; +unsigned int flags =0 ;int ret;/*
@@ -963,7 +964,7 @@ intel_svm_bind(struct device *dev, struct mm_struct *mm, void *drvdata)* and intel_svm etc. */ if (drvdata) - flags = *(int *)drvdata; + flags = *(unsigned int *)drvdata;mutex_lock (&pasid_mutex); ret =intel_svm_bind_mm (dev, flags,NULL , mm, &sdev);if (ret)
include/linux/intel-iommu.h +1 -1
@@ -759,7 +759,7 @@ struct intel_svm {struct mm_struct *mm;struct intel_iommu *iommu; -int flags; +unsigned int flags;u32 pasid;int gpasid;/* In case that guest PASID is different from host PASID */ struct list_head devs;
Signature · 6 lines
2.19.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH v4 02/12] iommu/vt-d: Change flags type to unsigned int in binding mm
Hi Fenghua,
Quoted 4 lines · Fenghua Yu
"flags" passed to
intel_svm_bind_mm()is a bit mask and should be defined as "unsigned int" instead of "int".Change its type to "unsigned int".
Best regards,
baolu
Quoted 58 lines
Suggested-by Thomas Gleixner <[email protected]>Signed-off-by Fenghua Yu <[email protected]>Reviewed-by Tony Luck <[email protected]>---
v2:
- Add this new patch per Thomas' comment.drivers/iommu/intel/svm.c | 7 ++++--- include/linux/intel-iommu.h | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-)drivers/iommu/intel/svm.c +4
-3@@ -427,7 +427,8 @@ int intel_svm_unbind_gpasid(struct device *dev, u32 pasid)/* Caller must hold pasid_mutex, mm reference */ static int -intel_svm_bind_mm (struct device *dev,int flags,struct svm_dev_ops *ops, +intel_svm_bind_mm (struct device *dev,unsigned int flags, +struct svm_dev_ops *ops,struct mm_struct *mm,struct intel_svm_dev **sd) {struct intel_iommu *iommu =intel_svm_device_to_iommu (dev);@@ -954,7 +955,7 @@ intel_svm_bind(struct device *dev, struct mm_struct *mm, void *drvdata) {struct iommu_sva *sva =ERR_PTR (-EINVAL );struct intel_svm_dev *sdev =NULL ; -int flags =0 ; +unsigned int flags =0 ;int ret;/* @@ -963,7 +964,7 @@ intel_svm_bind(struct device *dev, struct mm_struct *mm, void *drvdata)* and intel_svm etc. */ if (drvdata) - flags = *(int *)drvdata; + flags = *(unsigned int *)drvdata;mutex_lock (&pasid_mutex); ret =intel_svm_bind_mm (dev, flags,NULL , mm, &sdev);if (ret)include/linux/intel-iommu.h +1
-1@@ -759,7 +759,7 @@ struct intel_svm {struct mm_struct *mm;struct intel_iommu *iommu; -int flags; +unsigned int flags;u32 pasid;int gpasid;/* In case that guest PASID is different from host PASID */ struct list_head devs;
PATCH v4 3/12 docs: x86: Add documentation for SVA (Shared Virtual Addressing)
In reply to Fenghua YuFrom: Ashok Raj <[email protected]>
ENQCMD and Data Streaming Accelerator (DSA) and all of their associated features are a complicated stack with lots of interconnected pieces. This documentation provides a big picture overview for all of the features.
---
v3:
- Replace deprecated intel_svm_bind_mm() by iommu_sva_bind_mm() (Baolu)
- Fix a couple of typos (Baolu)
v2:
- Fix the doc format and add the doc in toctree (Thomas)
- Modify the doc for better description (Thomas, Tony, Dave)
Documentation/x86/index.rst | 1 + Documentation/x86/sva.rst | 287 ++++++++++++++++++++++++++++++++++++ 2 files changed, 288 insertions(+) create mode 100644 Documentation/x86/sva.rst
Documentation/x86/index.rst +1 -0
@@ -30,3 +30,4 @@ x86-specific Documentation usb-legacy-support i386/index x86_64/index + sva
Documentation/x86/sva.rst new file +287 -0
287 lines not on this page · raw message
Signature · 6 lines
2.19.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH v4 4/12 x86/cpufeatures: Enumerate ENQCMD and ENQCMDS instructions
In reply to Fenghua YuWork submission instruction comes in two flavors. ENQCMD can be called both in ring 3 and ring 0 and always uses the contents of PASID MSR when shipping the command to the device. ENQCMDS allows a kernel driver to submit commands on behalf of a user process. The driver supplies the PASID value in ENQCMDS. There isn't any usage of ENQCMD in the kernel as of now.
The CPU feature flag is shown as "enqcmd" in /proc/cpuinfo.
---
v2:
- Re-write commit message (Thomas)
arch/x86/include/asm/cpufeatures.h | 1 + arch/x86/kernel/cpu/cpuid-deps.c | 1 + 2 files changed, 2 insertions(+)
arch/x86/include/asm/cpufeatures.h +1 -0
@@ -351,6 +351,7 @@#define X86_FEATURE_CLDEMOTE (16*32+25)/* CLDEMOTE instruction */ #define X86_FEATURE_MOVDIRI (16*32+27)/* MOVDIRI instruction */ #define X86_FEATURE_MOVDIR64B (16*32+28)/* MOVDIR64B instruction */ +#define X86_FEATURE_ENQCMD (16*32+29)/* ENQCMD and ENQCMDS instructions */ /* AMD-defined CPU features, CPUID level 0x80000007 (EBX), word 17 */ #define X86_FEATURE_OVERFLOW_RECOV (17*32+ 0)/* MCA overflow recovery support */
arch/x86/kernel/cpu/cpuid-deps.c +1 -0
@@ -69,6 +69,7 @@ static const struct cpuid_dep cpuid_deps[] = { { X86_FEATURE_CQM_MBM_TOTAL, X86_FEATURE_CQM_LLC }, { X86_FEATURE_CQM_MBM_LOCAL, X86_FEATURE_CQM_LLC }, { X86_FEATURE_AVX512_BF16, X86_FEATURE_AVX512VL }, + { X86_FEATURE_ENQCMD, X86_FEATURE_XSAVES }, {} };
Signature · 6 lines
2.19.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH v4 5/12 x86/fpu/xstate: Add supervisor PASID state for ENQCMD feature
In reply to Fenghua YuFrom: Yu-cheng Yu <[email protected]>
ENQCMD instruction reads PASID from IA32_PASID MSR. The MSR is stored in the task's supervisor FPU PASID state and is context switched by XSAVES/XRSTORS.
---
v2:
- Modify the commit message (Thomas)
arch/x86/include/asm/fpu/types.h | 10 ++++++++++ arch/x86/include/asm/fpu/xstate.h | 2 +- arch/x86/kernel/fpu/xstate.c | 4 ++++ 3 files changed, 15 insertions(+), 1 deletion(-)
arch/x86/include/asm/fpu/types.h +10 -0
@@ -114,6 +114,7 @@ enum xfeature { XFEATURE_Hi16_ZMM,XFEATURE_PT_UNIMPLEMENTED_SO_FAR ,XFEATURE_PKRU , +XFEATURE_PASID , XFEATURE_MAX, };
@@ -128,6 +129,7 @@ enum xfeature {#define XFEATURE_MASK_Hi16_ZMM (1 << XFEATURE_Hi16_ZMM)#define XFEATURE_MASK_PT (1 << XFEATURE_PT_UNIMPLEMENTED_SO_FAR)#define XFEATURE_MASK_PKRU (1 << XFEATURE_PKRU) +#define XFEATURE_MASK_PASID (1 << XFEATURE_PASID)#define XFEATURE_MASK_FPSSE (XFEATURE_MASK_FP | XFEATURE_MASK_SSE)#define XFEATURE_MASK_AVX512 (XFEATURE_MASK_OPMASK \
@@ -229,6 +231,14 @@ struct pkru_state {u32 pad; } __packed; +/* +* State component 10 is supervisor state used for context-switching the +* PASID state. +*/ +struct ia32_pasid_state { +u64 pasid; +} __packed; +struct xstate_header {u64 xfeatures;u64 xcomp_bv;
arch/x86/include/asm/fpu/xstate.h +1 -1
@@ -33,7 +33,7 @@ XFEATURE_MASK_BNDCSR)/* All currently supported supervisor features */ -#define XFEATURE_MASK_SUPERVISOR_SUPPORTED (0) +#define XFEATURE_MASK_SUPERVISOR_SUPPORTED (XFEATURE_MASK_PASID)/* * Unsupported supervisor features. When a supervisor feature in this mask is
arch/x86/kernel/fpu/xstate.c +4 -0
@@ -37,6 +37,7 @@ static const char *xfeature_names[] ="AVX-512 ZMM_Hi256" ,"Processor Trace (unused)" ,"Protection Keys User registers" , +"PASID state" , "unknown xstate feature" , };
@@ -51,6 +52,7 @@ static short xsave_cpuid_features[] __initdata = {X86_FEATURE_AVX512F ,X86_FEATURE_INTEL_PT ,X86_FEATURE_PKU , + X86_FEATURE_ENQCMD, };/*
@@ -316,6 +318,7 @@ static void __init print_xstate_features(void)print_xstate_feature (XFEATURE_MASK_ZMM_Hi256);print_xstate_feature (XFEATURE_MASK_Hi16_ZMM);print_xstate_feature (XFEATURE_MASK_PKRU ); +print_xstate_feature (XFEATURE_MASK_PASID ); }/*
@@ -590,6 +593,7 @@ static void check_xstate_against_struct(int nr) XCHECK_SZ(sz, nr, XFEATURE_ZMM_Hi256, struct avx_512_zmm_uppers_state); XCHECK_SZ(sz, nr, XFEATURE_Hi16_ZMM, struct avx_512_hi16_state); XCHECK_SZ(sz, nr, XFEATURE_PKRU, struct pkru_state); + XCHECK_SZ(sz, nr, XFEATURE_PASID, struct ia32_pasid_state);/* * Make *SURE* to add any feature numbers in below if
Signature · 6 lines
2.19.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH v4 6/12 x86/msr-index: Define IA32_PASID MSR
In reply to Fenghua YuThe IA32_PASID MSR (0xd93) contains the Process Address Space Identifier (PASID), a 20-bit value. Bit 31 must be set to indicate the value programmed in the MSR is valid. Hardware uses PASID to identify process address space and direct responses to the right address space.
---
v2:
- Change "identify process" to "identify process address space" in the commit message (Thomas)
arch/x86/include/asm/msr-index.h | 3 +++ 1 file changed, 3 insertions(+)
arch/x86/include/asm/msr-index.h +3 -0
@@ -237,6 +237,9 @@#define MSR_IA32_LASTINTFROMIP 0x000001dd#define MSR_IA32_LASTINTTOIP 0x000001de +#define MSR_IA32_PASID 0x00000d93 +#define MSR_IA32_PASID_VALID BIT_ULL(31) +/* DEBUGCTLMSR bits (others vary by model): */ #define DEBUGCTLMSR_LBR (1UL << 0)/* last branch recording */ #define DEBUGCTLMSR_BTF_SHIFT 1
Signature · 6 lines
2.19.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH v4 7/12 mm: Define pasid in mm
In reply to Fenghua YuPASID is shared by all threads in a process. So the logical place to keep track of it is in the "mm". Both ARM and X86 need to use the PASID in the "mm".
---
v4:
- Change PASID type to u32 (Christoph)
v3:
- Change CONFIG_PCI_PASID to CONFIG_IOMMU_SUPPORT because non-PCI device can have PASID in ARM (Jean)
v2:
- This new patch moves "pasid" from x86 specific mm_context_t to generic
struct mm_struct per Christopher's comment: https://lore.kernel.org/linux-iommu/[email protected]/T/#mb57110ffe1aaa24750eeea4f93b611f0d1913911
- Jean-Philippe Brucker released a virtually same patch. I still put this
patch in the series for better review. The upstream kernel only needs one
of the two patches eventually.
https://lore.kernel.org/linux-iommu/[email protected]/
- Change CONFIG_IOASID to CONFIG_PCI_PASID (Ashok)
include/linux/mm_types.h | 4 ++++ 1 file changed, 4 insertions(+)
include/linux/mm_types.h +4 -0
@@ -538,6 +538,10 @@ struct mm_struct {atomic_long_t hugetlb_usage;#endif struct work_struct async_put_work; + +#ifdef CONFIG_IOMMU_SUPPORT +u32 pasid; +#endif } __randomize_layout;/*
Signature · 6 lines
2.19.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH v4 8/12 fork: Clear PASID for new mm
In reply to Fenghua YuWhen a new mm is created, its PASID should be cleared, i.e. the PASID is initialized to its init state 0 on both ARM and X86.
---
v2:
- Add this patch to initialize PASID value for a new mm.
include/linux/mm_types.h | 2 ++ kernel/fork.c | 8 ++++++++ 2 files changed, 10 insertions(+)
include/linux/mm_types.h +2 -0
@@ -22,6 +22,8 @@#endif #define AT_VECTOR_SIZE (2*(AT_VECTOR_SIZE_ARCH + AT_VECTOR_SIZE_BASE + 1)) +/* Initial PASID value is 0. */ +#define INIT_PASID 0struct address_space ;struct mem_cgroup ;
kernel/fork.c +8 -0
@@ -1007,6 +1007,13 @@ static void mm_init_owner(struct mm_struct *mm, struct task_struct *p)#endif } +static void mm_init_pasid (struct mm_struct *mm) +{ +#ifdef CONFIG_IOMMU_SUPPORT + mm->pasid =INIT_PASID ; +#endif +} +static void mm_init_uprobes_state (struct mm_struct *mm) {#ifdef CONFIG_UPROBES
@@ -1035,6 +1042,7 @@ static struct mm_struct *mm_init(struct mm_struct *mm, struct task_struct *p,mm_init_cpumask (mm);mm_init_aio (mm);mm_init_owner (mm, p); +mm_init_pasid (mm);RCU_INIT_POINTER (mm->exe_file,NULL );mmu_notifier_subscriptions_init (mm);init_tlb_flush_pending (mm);
Signature · 6 lines
2.19.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH v4 9/12 x86/process: Clear PASID state for a newly forked/cloned thread
In reply to Fenghua YuThe PASID state has to be cleared on forks, since the child has a different address space. The PASID is also cleared for thread clone. While it would be correct to inherit the PASID in this case, it is unknown whether the new task will use ENQCMD. Giving it the PASID "just in case" would have the downside of increased context switch overhead to setting the PASID MSR.
Since #GP faults have to be handled on any threads that were created before the PASID was assigned to the mm of the process, newly created threads might as well be treated in a consistent way.
---
v2:
- Modify init_task_pasid().
arch/x86/kernel/process.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
arch/x86/kernel/process.c +18 -0
@@ -121,6 +121,21 @@ static int set_new_tls(struct task_struct *p, unsigned long tls)return do_set_thread_area_64 (p,ARCH_SET_FS , tls); } +/* Initialize the PASID state for the forked/cloned thread. */ +static void init_task_pasid (struct task_struct *task) +{ +struct ia32_pasid_state *ppasid; + +/* +* Initialize the PASID state so that the PASID MSR will be +* initialized to its initial state (0) by XRSTORS when the task is +* scheduled for the first time. +*/ + ppasid =get_xsave_addr (&task->thread.fpu.state.xsave,XFEATURE_PASID ); +if (ppasid) + ppasid->pasid =INIT_PASID ; +} +int copy_thread_tls (unsigned long clone_flags,unsigned long sp,unsigned long arg,struct task_struct *p,unsigned long tls) {
@@ -174,6 +189,9 @@ int copy_thread_tls(unsigned long clone_flags, unsigned long sp,task_user_gs (p) =get_user_gs (current_pt_regs ());#endif +if (static_cpu_has (X86_FEATURE_ENQCMD )) +init_task_pasid (p); +/* Set a new TLS for the child thread? */ if (clone_flags &CLONE_SETTLS ) ret =set_new_tls (p, tls);
Signature · 6 lines
2.19.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH v4 10/12 x86/mmu: Allocate/free PASID
In reply to Fenghua YuA PASID is allocated for an "mm" the first time any thread attaches to an SVM capable device. Later device attachments (whether to the same device or another SVM device) will re-use the same PASID.
The PASID is freed when the process exits (so no need to keep reference counts on how many SVM devices are sharing the PASID).
---
v4:
- Change PASID type to u32 (Christoph)
v3:
- Add sanity checks in alloc_pasid() and _free_pasid() (Baolu)
- Add a comment that the private PASID feature will be removed completely from IOMMU and don't track private PASID in mm (Thomas)
v2:
- Define a helper free_bind() to simplify error exit code in bind_mm() (Thomas)
- Fix a ret error code in bind_mm() (Thomas)
- Change pasid's type from "int" to "unsigned int" to have consistent pasid type in iommu (Thomas)
- Simplify alloc_pasid() a bit.
arch/x86/include/asm/iommu.h | 2 + arch/x86/include/asm/mmu_context.h | 14 ++++ drivers/iommu/intel/svm.c | 128 ++++++++++++++++++++++++++--- 3 files changed, 132 insertions(+), 12 deletions(-)
arch/x86/include/asm/iommu.h +2 -0
@@ -26,4 +26,6 @@ arch_rmrr_sanity_check(struct acpi_dmar_reserved_memory *rmrr) return -EINVAL; } +void __free_pasid (struct mm_struct *mm); +#endif /* _ASM_X86_IOMMU_H */
arch/x86/include/asm/mmu_context.h +14 -0
@@ -13,6 +13,7 @@#include <asm/tlbflush.h> #include <asm/paravirt.h> #include <asm/debugreg.h> +#include <asm/iommu.h> extern atomic64_t last_mm_ctx_id;
@@ -117,9 +118,22 @@ static inline int init_new_context(struct task_struct *tsk,init_new_context_ldt (mm);return 0 ; } + +static inline void free_pasid (struct mm_struct *mm) +{ +if (!IS_ENABLED (CONFIG_INTEL_IOMMU_SVM )) +return ; + +if (!cpu_feature_enabled (X86_FEATURE_ENQCMD )) +return ; + +__free_pasid (mm); +} +static inline void destroy_context (struct mm_struct *mm) {destroy_context_ldt (mm); +free_pasid (mm); } extern void switch_mm(struct mm_struct *prev, struct mm_struct *next,
drivers/iommu/intel/svm.c +116 -12
171 lines not on this page · raw message
Signature · 6 lines
2.19.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH v4 10/12] x86/mmu: Allocate/free PASID
Hi Fenghua,
Quoted 6 lines · Fenghua Yu
A PASID is allocated for an "mm" the first time any thread attaches to an SVM capable device. Later device attachments (whether to the same device or another SVM device) will re-use the same PASID.
The PASID is freed when the process exits (so no need to keep reference counts on how many SVM devices are sharing the PASID).
For changes in Intel VT-d driver,
Best regards,
baolu
Quoted 244 lines
Signed-off-by Fenghua Yu <[email protected]>Reviewed-by Tony Luck <[email protected]>---
v4:
- Change PASID type to u32 (Christoph)v3:
- Add sanity checks inalloc_pasid()and_free_pasid()(Baolu)
- Add a comment that the private PASID feature will be removed completely from IOMMU and don't track private PASID in mm (Thomas)v2:
- Define a helperfree_bind()to simplify error exit code inbind_mm()(Thomas)
- Fix a ret error code inbind_mm()(Thomas)
- Change pasid's type from "int" to "unsigned int" to have consistent pasid type in iommu (Thomas)
- Simplifyalloc_pasid()a bit.arch/x86/include/asm/iommu.h | 2 + arch/x86/include/asm/mmu_context.h | 14 ++++ drivers/iommu/intel/svm.c | 128 ++++++++++++++++++++++++++--- 3 files changed, 132 insertions(+), 12 deletions(-)arch/x86/include/asm/iommu.h +2
-0@@ -26,4 +26,6 @@ arch_rmrr_sanity_check(struct acpi_dmar_reserved_memory *rmrr) return -EINVAL; } +void __free_pasid (struct mm_struct *mm); +#endif /* _ASM_X86_IOMMU_H */ arch/x86/include/asm/mmu_context.h +14
-0@@ -13,6 +13,7 @@#include <asm/tlbflush.h> #include <asm/paravirt.h> #include <asm/debugreg.h> +#include <asm/iommu.h> extern atomic64_t last_mm_ctx_id;@@ -117,9 +118,22 @@ static inline int init_new_context(struct task_struct *tsk,init_new_context_ldt (mm);return 0 ; } + +static inline void free_pasid (struct mm_struct *mm) +{ +if (!IS_ENABLED (CONFIG_INTEL_IOMMU_SVM )) +return ; + +if (!cpu_feature_enabled (X86_FEATURE_ENQCMD )) +return ; + +__free_pasid (mm); +} +static inline void destroy_context (struct mm_struct *mm) {destroy_context_ldt (mm); +free_pasid (mm); } extern void switch_mm(struct mm_struct *prev, struct mm_struct *next,drivers/iommu/intel/svm.c +106
-12@@ -425,6 +425,69 @@ int intel_svm_unbind_gpasid(struct device *dev, u32 pasid)return ret; } +static void free_bind (struct intel_svm *svm,struct intel_svm_dev *sdev, +bool new_pasid) +{ +if (new_pasid) +ioasid_free (svm->pasid); +kfree (svm); +kfree (sdev); +} + +/* +* If this mm already has a PASID, use it. Otherwise allocate a new one. +* Let the caller know if a new PASID is allocated via 'new_pasid'. +*/ +static int alloc_pasid (struct intel_svm *svm,struct mm_struct *mm, +u32 pasid_max,bool *new_pasid, +unsigned int flags) +{ +u32 pasid; + + *new_pasid = false; + +/* +* Reuse the PASID if the mm already has a PASID and not a private +* PASID is requested. +*/ +if (mm && mm->pasid && !(flags &SVM_FLAG_PRIVATE_PASID )) { +void *p; + +/* +* Since the mm has a PASID already, the PASID should be +* bound and unbound to the mm before calling this allocation. +* So the PASID must be allocated by bind_mm() previously and +* should still exist in ioasid; but its data must be cleared +* already by unbind_mm(). +* +* Do a sanity check here to ensure the PASID has the right +* status before reusing it. +*/ + p =ioasid_find (NULL , mm->pasid,NULL ); +if (IS_ERR (p) || p) +return INVALID_IOASID ; + +/* +* Once the PASID is allocated for this mm, it +* stays with the mm until the mm is dropped. Reuse +* the PASID which has been already allocated for the +* mm instead of allocating a new one. +*/ +ioasid_set_data (mm->pasid, svm); + +return mm->pasid; + } + +/* Allocate a new pasid. Do not use PASID 0, reserved for init PASID. */ + pasid =ioasid_alloc (NULL ,PASID_MIN , pasid_max -1 , svm); +if (pasid !=INVALID_IOASID ) { +/* A new pasid is allocated. */ + *new_pasid = true; + } + +return pasid; +} +/* Caller must hold pasid_mutex, mm reference */ static int intel_svm_bind_mm(struct device *dev, unsigned int flags,@@ -518,6 +581,8 @@ intel_svm_bind_mm(struct device *dev, unsigned int flags,init_rcu_head (&sdev->rcu);if (!svm) { +bool new_pasid; + svm =kzalloc (sizeof (*svm),GFP_KERNEL );if (!svm) { ret = -ENOMEM ;@@ -529,12 +594,9 @@ intel_svm_bind_mm(struct device *dev, unsigned int flags,if (pasid_max > intel_pasid_max_id) pasid_max = intel_pasid_max_id; -/* Do not use PASID 0, reserved for RID to PASID */ - svm->pasid =ioasid_alloc (NULL ,PASID_MIN , - pasid_max -1 , svm); + svm->pasid =alloc_pasid (svm, mm, pasid_max, &new_pasid, flags);if (svm->pasid ==INVALID_IOASID ) { -kfree (svm); -kfree (sdev); +free_bind (svm, sdev, new_pasid); ret = -ENOSPC ; goto out; }@@ -547,9 +609,7 @@ intel_svm_bind_mm(struct device *dev, unsigned int flags,if (mm) { ret =mmu_notifier_register (&svm->notifier, mm);if (ret) { -ioasid_free (svm->pasid); -kfree (svm); -kfree (sdev); +free_bind (svm, sdev, new_pasid); goto out; } }@@ -565,12 +625,20 @@ intel_svm_bind_mm(struct device *dev, unsigned int flags,if (ret) {if (mm)mmu_notifier_unregister (&svm->notifier, mm); -ioasid_free (svm->pasid); -kfree (svm); -kfree (sdev); +free_bind (svm, sdev, new_pasid); goto out; } +if (mm && new_pasid && !(flags &SVM_FLAG_PRIVATE_PASID )) { +/* +* Track the new pasid in the mm. The pasid will be +* freed at process exit. +* +* The private PASID feature will be removed soon from +* IOMMU. Don't track requested private PASID in the mm. +*/ + mm->pasid = svm->pasid; + }list_add_tail (&svm->list, &global_svm_list); }else {/* @@ -640,7 +708,8 @@ static int intel_svm_unbind_mm(struct device *dev, u32 pasid)kfree_rcu (sdev, rcu);if (list_empty (&svm->devs)) { -ioasid_free (svm->pasid); +/* Clear data in the pasid. */ +ioasid_set_data (pasid,NULL );if (svm->mm)mmu_notifier_unregister (&svm->notifier, svm->mm);list_del (&svm->list);@@ -1001,3 +1070,38 @@ u32 intel_svm_get_pasid(struct iommu_sva *sva)return pasid; } + +/* +* An invalid pasid is either 0 (init PASID value) or bigger than max PASID +* (PASID_MAX - 1). +*/ +static bool invalid_pasid (u32 pasid) +{ +return (pasid ==INIT_PASID ) || (pasid >=PASID_MAX ); +} + +/* On process exit free the PASID (if one was allocated). */ +void __free_pasid (struct mm_struct *mm) +{ +u32 pasid = mm->pasid; +void *p; + +/* No need to free invalid pasid. */ +if (invalid_pasid (pasid)) +return ; + +/* The pasid shouldn't be bound to any mm by now. */ + p =ioasid_find (NULL , pasid,NULL ); +if (!IS_ERR_OR_NULL (p)) { +pr_err ("PASID %d is still in use\n" , pasid); +
drivers/iommu/intel/svm.c u32 intel_svm_get_pasid(struct iommu_sva *sva) · line 1107
Quoted 10 lines
drivers/iommu/intel/svm.c +10
-0+return ; + } + +/* +* Since the pasid is not bound to any svm, there is no race +* here with binding/unbinding and no need to protect the free +* operation by pasid_mutex. +*/ +ioasid_free (pasid); +}
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH v4 11/12 sched: Define and initialize a flag to identify valid PASID in the task
In reply to Fenghua YuFrom: Peter Zijlstra <[email protected]>
The flag is defined for the task to identify if the task has a valid PASID. Its initial value is 0 when the task is forked/cloned. It will be used shortly.
---
v2:
- Add this patch to define the flag to identify valid PASID MSR (PeterZ)
include/linux/sched.h | 3 +++ kernel/fork.c | 4 ++++ 2 files changed, 7 insertions(+)
include/linux/sched.h +3 -0
@@ -801,6 +801,9 @@ struct task_struct {/* Stalled due to lack of memory */ unsigned in_memstall:1;#endif +#ifdef CONFIG_IOMMU_SUPPORT + unsigned has_valid_pasid:1; +#endif unsigned long atomic_flags;/* Flags requiring atomic access. */
kernel/fork.c +4 -0
@@ -955,6 +955,10 @@ static struct task_struct *dup_task_struct(struct task_struct *orig, int node) tsk->use_memdelay =0 ;#endif +#ifdef CONFIG_IOMMU_SUPPORT + tsk->has_valid_pasid =0 ; +#endif +#ifdef CONFIG_MEMCG tsk->active_memcg =NULL ;#endif
Signature · 6 lines
2.19.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH v4 12/12 x86/traps: Fix up invalid PASID
In reply to Fenghua YuA #GP fault is generated when ENQCMD instruction is executed without a valid PASID value programmed in the current thread's PASID MSR. The #GP fault handler will initialize the MSR if a PASID has been allocated for this process.
Decoding the user instruction is ugly and sets a bad architecture precedent. It may not function if the faulting instruction is modified after #GP.
Thomas suggested to provide a reason for the #GP caused by executing ENQCMD without a valid PASID value programmed. #GP error codes are 16 bits and all 16 bits are taken. Refer to SDM Vol 3, Chapter 16.13 for details. The other choice was to reflect the error code in an MSR. ENQCMD can also cause #GP when loading from the source operand, so its not fully comprehending all the reasons. Rather than special case the ENQCMD, in future Intel may choose a different fault mechanism for such cases if recovery is needed on #GP.
The following heuristic is used to avoid decoding the user instructions to determine the precise reason for the #GP fault:
1) If the mm for the process has not been allocated a PASID, this #GP cannot be fixed.
2) If the PASID MSR is already initialized, then the #GP was for some other reason
3) Try initializing the PASID MSR and returning. If the #GP was from an ENQCMD this will fix it. If not, the #GP fault will be repeated and will hit case "2".
---
v4:
- Change PASID type to u32 (Christoph)
v3:
- Check and set current->has_valid_pasid in fixup() (PeterZ)
- Add fpu__pasid_write() to update the MSR (PeterZ)
- Add ioasid_find() sanity check in fixup()
v2:
- Update the first paragraph of the commit message (Thomas)
- Add reasons why don't decode the user instruction and don't use #GP error code (Thomas)
- Change get_task_mm() to current->mm (Thomas)
- Add comments on why IRQ is disabled during PASID fixup (Thomas)
- Add comment in fixup() that the function is called when #GP is from user (so mm is not NULL) (Dave Hansen)
arch/x86/include/asm/iommu.h | 1 + arch/x86/kernel/traps.c | 14 +++++++ drivers/iommu/intel/svm.c | 78 ++++++++++++++++++++++++++++++++++++ 3 files changed, 93 insertions(+)
arch/x86/include/asm/iommu.h +1 -0
@@ -27,5 +27,6 @@ arch_rmrr_sanity_check(struct acpi_dmar_reserved_memory *rmrr) }void __free_pasid (struct mm_struct *mm); +bool __fixup_pasid_exception (void );#endif /* _ASM_X86_IOMMU_H */
arch/x86/kernel/traps.c +14 -0
@@ -59,6 +59,7 @@#include <asm/umip.h> #include <asm/insn.h> #include <asm/insn-eval.h> +#include <asm/iommu.h> #ifdef CONFIG_X86_64 #include <asm/x86_init.h>
@@ -514,6 +515,16 @@ static enum kernel_gp_hint get_kernel_gp_address(struct pt_regs *regs,return GP_CANONICAL ; } +static bool fixup_pasid_exception (void ) +{ +if (!IS_ENABLED (CONFIG_INTEL_IOMMU_SVM )) +return false; +if (!static_cpu_has (X86_FEATURE_ENQCMD )) +return false; + +return __fixup_pasid_exception (); +} +#define GPFSTR "general protection fault"DEFINE_IDTENTRY_ERRORCODE (exc_general_protection)
@@ -526,6 +537,9 @@ DEFINE_IDTENTRY_ERRORCODE(exc_general_protection)cond_local_irq_enable (regs); +if (user_mode (regs) &&fixup_pasid_exception ()) + goto exit; +if (static_cpu_has (X86_FEATURE_UMIP )) {if (user_mode (regs) &&fixup_umip_exception (regs)) goto exit;
drivers/iommu/intel/svm.c +78 -0
81 lines not on this page · raw message
Signature · 6 lines
2.19.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH v4 12/12] x86/traps: Fix up invalid PASID
Hi Fenghua,
Quoted 18 lines · Fenghua Yu
A #GP fault is generated when ENQCMD instruction is executed without a valid PASID value programmed in the current thread's PASID MSR. The #GP fault handler will initialize the MSR if a PASID has been allocated for this process.
Decoding the user instruction is ugly and sets a bad architecture precedent. It may not function if the faulting instruction is modified after #GP.
Thomas suggested to provide a reason for the #GP caused by executing ENQCMD without a valid PASID value programmed. #GP error codes are 16 bits and all 16 bits are taken. Refer to SDM Vol 3, Chapter 16.13 for details. The other choice was to reflect the error code in an MSR. ENQCMD can also cause #GP when loading from the source operand, so its not fully comprehending all the reasons. Rather than special case the ENQCMD, in future Intel may choose a different fault mechanism for such cases if recovery is needed on #GP.
Quoted 9 lines
The following heuristic is used to avoid decoding the user instructions to determine the precise reason for the #GP fault:
1) If the mm for the process has not been allocated a PASID, this #GP cannot be fixed.
2) If the PASID MSR is already initialized, then the #GP was for some other reason
3) Try initializing the PASID MSR and returning. If the #GP was from an ENQCMD this will fix it. If not, the #GP fault will be repeated and will hit case "2".
For changes in Intel VT-d driver,
Best regards,
baolu
Quoted 154 lines
Suggested-by Thomas Gleixner <[email protected]>Signed-off-by Fenghua Yu <[email protected]>Reviewed-by Tony Luck <[email protected]>---
v4:
- Change PASID type to u32 (Christoph)v3:
- Check and setcurrent->has_valid_pasidinfixup()(PeterZ)
- Addfpu__pasid_write()to update the MSR (PeterZ)
- Addioasid_find()sanity check infixup()v2:
- Update the first paragraph of the commit message (Thomas)
- Add reasons why don't decode the user instruction and don't use #GP error code (Thomas)
- Changeget_task_mm()tocurrent->mm(Thomas)
- Add comments on why IRQ is disabled during PASID fixup (Thomas)
- Add comment infixup()that the function is called when #GP is from user (so mm is not NULL) (Dave Hansen)arch/x86/include/asm/iommu.h | 1 + arch/x86/kernel/traps.c | 14 +++++++ drivers/iommu/intel/svm.c | 78 ++++++++++++++++++++++++++++++++++++ 3 files changed, 93 insertions(+)arch/x86/include/asm/iommu.h +1
-0@@ -27,5 +27,6 @@ arch_rmrr_sanity_check(struct acpi_dmar_reserved_memory *rmrr) }void __free_pasid (struct mm_struct *mm); +bool __fixup_pasid_exception (void );#endif /* _ASM_X86_IOMMU_H */ arch/x86/kernel/traps.c +14
-0@@ -59,6 +59,7 @@#include <asm/umip.h> #include <asm/insn.h> #include <asm/insn-eval.h> +#include <asm/iommu.h> #ifdef CONFIG_X86_64 #include <asm/x86_init.h> @@ -514,6 +515,16 @@ static enum kernel_gp_hint get_kernel_gp_address(struct pt_regs *regs,return GP_CANONICAL ; } +static bool fixup_pasid_exception (void ) +{ +if (!IS_ENABLED (CONFIG_INTEL_IOMMU_SVM )) +return false; +if (!static_cpu_has (X86_FEATURE_ENQCMD )) +return false; + +return __fixup_pasid_exception (); +} +#define GPFSTR "general protection fault"DEFINE_IDTENTRY_ERRORCODE (exc_general_protection)@@ -526,6 +537,9 @@ DEFINE_IDTENTRY_ERRORCODE(exc_general_protection)cond_local_irq_enable (regs); +if (user_mode (regs) &&fixup_pasid_exception ()) + goto exit; +if (static_cpu_has (X86_FEATURE_UMIP )) {if (user_mode (regs) &&fixup_umip_exception (regs)) goto exit;drivers/iommu/intel/svm.c +68
-0@@ -1105,3 +1105,81 @@ void __free_pasid(struct mm_struct *mm)*/ ioasid_free (pasid); } + +/* +* Write the current task's PASID MSR/state. This is called only when PASID +* is enabled. +*/ +static void fpu__pasid_write (u32 pasid) +{ +u64 msr_val = pasid |MSR_IA32_PASID_VALID ; + +fpregs_lock (); + +/* +* If the MSR is active and owned by the current task's FPU, it can +* be directly written. +* +* Otherwise, write the fpstate. +*/ +if (!test_thread_flag (TIF_NEED_FPU_LOAD )) { +wrmsrl (MSR_IA32_PASID , msr_val); + }else { +struct ia32_pasid_state *ppasid_state; + + ppasid_state =get_xsave_addr (¤t->thread.fpu.state.xsave, +XFEATURE_PASID ); +/* +* ppasid_state shouldn't be NULL because XFEATURE_PASID +* is enabled. +*/ +WARN_ON_ONCE (!ppasid_state); + ppasid_state->pasid = msr_val; + } +fpregs_unlock (); +} + +/* +* Apply some heuristics to see if the #GP fault was caused by a thread +* that hasn't had the IA32_PASID MSR initialized. If it looks like that +* is the problem, try initializing the IA32_PASID MSR. If the heuristic +* guesses incorrectly, take one more #GP fault. +*/ +bool __fixup_pasid_exception (void ) +{ +struct intel_svm *svm; +struct mm_struct *mm; +u32 pasid; + +/* +* If the current task already has a valid PASID in the MSR, +* the #GP must be for some other reason. +*/ +if (current->has_valid_pasid) +return false; + +/* +* This function is called only when this #GP was triggered from user +* space. So the mm cannot be NULL. +*/ + mm = current->mm; + pasid = mm->pasid; + +/* +* If the PASID isn't found, cannot help. +* +* Don't care if the PASID is bound to the mm here. #PF will handle the +* case that the MSR is fixed up by an unbound PASID. +*/ + svm =ioasid_find (NULL , pasid,NULL ); +if (IS_ERR_OR_NULL (svm))
drivers/iommu/intel/svm.c void __free_pasid(struct mm_struct *mm) · line 1185
Quoted 10 lines
drivers/iommu/intel/svm.c +10
-0+return false; + +/* Fix up the MSR by the PASID in the mm. */ +fpu__pasid_write (pasid); + +/* Now the current task has a valid PASID in the MSR. */ + current->has_valid_pasid =1 ; + +return true; +}
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Peter Zijlstra
maintainerRe: [PATCH v4 12/12] x86/traps: Fix up invalid PASID
In reply to Fenghua Yuarch/x86/kernel/traps.c static enum kernel_gp_hint get_kernel_gp_address(struct pt_regs *regs, · line 523
Quoted 6 lines · Fenghua Yu
arch/x86/kernel/traps.c +6
-0+static bool fixup_pasid_exception (void ) +{ +if (!IS_ENABLED (CONFIG_INTEL_IOMMU_SVM )) +return false; +if (!static_cpu_has (X86_FEATURE_ENQCMD )) +return false;
elsewhere you had another variation:
+ if (!IS_ENABLED(CONFIG_INTEL_IOMMU_SVM))
+ return;
+
+ if (!cpu_feature_enabled(X86_FEATURE_ENQCMD))
+ return;
Which is it, and why do we need the CONFIG thing when combined with the enabled thing?
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH v4 12/12] x86/traps: Fix up invalid PASID
Quoted 17 lines · Peter Zijlstra
arch/x86/kernel/traps.c static enum kernel_gp_hint get_kernel_gp_address(struct pt_regs *regs, · line 523
Quoted 6 lines · Fenghua Yu
arch/x86/kernel/traps.c +6
-0+static bool fixup_pasid_exception (void ) +{ +if (!IS_ENABLED (CONFIG_INTEL_IOMMU_SVM )) +return false; +if (!static_cpu_has (X86_FEATURE_ENQCMD )) +return false;elsewhere you had another variation:
(quoted diff) +5
-0+ if (!IS_ENABLED(CONFIG_INTEL_IOMMU_SVM)) + return; + + if (!cpu_feature_enabled(X86_FEATURE_ENQCMD)) + return;
Quoted 2 lines
Which is it, and why do we need the CONFIG thing when combined with the enabled thing?
Do we have a standard way of coding for a feature that depends on multiple other features? For this case the system needs to both suport the ENQCMD instruction, and also have kernel code that programs the IOMMU.
And/or guidance on when to use each of the very somewhat simlar looking
boot_cpu_has() static_cpu_has() IS_ENABLED() cpu_feature_enabled()
options?
-Tony
Borislav Petkov
maintainerRe: [PATCH v4 12/12] x86/traps: Fix up invalid PASID
Quoted 3 lines · Tony
Do we have a standard way of coding for a feature that depends on multiple other features? For this case the system needs to both suport the ENQCMD instruction, and also have kernel code that programs the IOMMU.
Yes, you need both. Consider distros enabling everything so that they can ship a single kernel image.
Quoted 3 lines
And/or guidance on when to use each of the very somewhat simlar looking
boot_cpu_has() static_cpu_has()
See the comment over _static_cpu_has() in arch/x86/include/asm/cpufeature.h
In the exception path you should use the static_ variant.
Quoted 1 line
IS_ENABLED()
This is testing CONFIG_ settings, i.e., build time.
Quoted 1 line
cpu_feature_enabled()
This too, indirectly. See
arch/x86/include/asm/disabled-features.h
Signature · 4 lines
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquetteRe: [PATCH v4 12/12] x86/traps: Fix up invalid PASID
In reply to Luck, TonyQuoted 18 lines · Tony
Quoted 17 lines · Peter Zijlstra
arch/x86/kernel/traps.c static enum kernel_gp_hint get_kernel_gp_address(struct pt_regs *regs, · line 523
Quoted 6 lines · Fenghua Yu
arch/x86/kernel/traps.c +6
-0+static bool fixup_pasid_exception (void ) +{ +if (!IS_ENABLED (CONFIG_INTEL_IOMMU_SVM )) +return false; +if (!static_cpu_has (X86_FEATURE_ENQCMD )) +return false;elsewhere you had another variation:
(quoted diff) +5
-0+ if (!IS_ENABLED(CONFIG_INTEL_IOMMU_SVM)) + return; + + if (!cpu_feature_enabled(X86_FEATURE_ENQCMD)) + return;
Quoted 6 lines
Quoted 2 lines
Which is it, and why do we need the CONFIG thing when combined with the enabled thing?
Do we have a standard way of coding for a feature that depends on multiple other features? For this case the system needs to both suport the ENQCMD instruction, and also have kernel code that programs the IOMMU.
Not really a standard one.
We could setup_clear_cpu_cap(X86_FEATURE_ENQCMD) during boot if we see that CONFIG_INTEL_IOMMU_SVM=n or if we don't have a detected IOMMU. That would at least get static value patching which would make some of the feature checks very cheap.
That means we can't use ENQCMD at all in the kernel, though. Is that an issue? Is the CPU feature truly dependent on IOMMU_SVM?
Quoted 6 lines
And/or guidance on when to use each of the very somewhat simlar looking
boot_cpu_has() static_cpu_has() IS_ENABLED() cpu_feature_enabled(X86_FEATURE_ENQCMD)options?
cpu_feature_enabled() is by go-to for checking X86_FEATUREs. It has compile-time checking along with static checking.
If you use cpu_feature_enabled(), and we added:
#ifdef CONFIG_INTEL_IOMMU_SVM
# define DISABLE_ENQCMD 0 #else # define DISABLE_ENQCMD (1 << (X86_FEATURE_ENQCMD & <bitval>)) #endif
to arch/x86/include/asm/disabled-features.h, then we could check only X86_FEATURE_ENQCMD, and we'd get that IS_ENABLED() check for "free".
Re: [PATCH v4 12/12] x86/traps: Fix up invalid PASID
Hi, Dave,
Quoted 28 lines · Dave Hansen
Quoted 18 lines · Tony
Quoted 17 lines · Peter Zijlstra
arch/x86/kernel/traps.c static enum kernel_gp_hint get_kernel_gp_address(struct pt_regs *regs, · line 523
Quoted 6 lines · Fenghua Yu
arch/x86/kernel/traps.c +6
-0+static bool fixup_pasid_exception (void ) +{ +if (!IS_ENABLED (CONFIG_INTEL_IOMMU_SVM )) +return false; +if (!static_cpu_has (X86_FEATURE_ENQCMD )) +return false;elsewhere you had another variation:
(quoted diff) +5
-0+ if (!IS_ENABLED(CONFIG_INTEL_IOMMU_SVM)) + return; + + if (!cpu_feature_enabled(X86_FEATURE_ENQCMD)) + return;Quoted 6 lines
Quoted 2 lines
Which is it, and why do we need the CONFIG thing when combined with the enabled thing?
Do we have a standard way of coding for a feature that depends on multiple other features? For this case the system needs to both suport the ENQCMD instruction, and also have kernel code that programs the IOMMU.
Not really a standard one.
Quoted 7 lines
We could
setup_clear_cpu_cap(X86_FEATURE_ENQCMD)during boot if we see thatCONFIG_INTEL_IOMMU_SVM=nor if we don't have a detected IOMMU. That would at least get static value patching which would make some of the feature checks very cheap.That means we can't use ENQCMD at all in the kernel, though. Is that an issue? Is the CPU feature truly dependent on
IOMMU_SVM?
ENQCMD instruction needs bind_mm()/unbind_mm() defined in svm.c which is only compiled by:
obj-$(CONFIG_INTEL_IOMMU_SVM) += intel/svm.o
So I think ENQCMD instruction is truly dependent on CONFIG_INTEL_IOMMU_SVM.
Quoted 13 lines
Quoted 7 lines
And/or guidance on when to use each of the very somewhat simlar looking
boot_cpu_has() static_cpu_has() IS_ENABLED() cpu_feature_enabled(X86_FEATURE_ENQCMD)options?
cpu_feature_enabled()is by go-to for checkingX86_FEATUREs. It has compile-time checking along with static checking.If you use
cpu_feature_enabled(), and we added:
Quoted 8 lines
#ifdef
CONFIG_INTEL_IOMMU_SVM# define DISABLE_ENQCMD 0 #else # define DISABLE_ENQCMD (1 << (X86_FEATURE_ENQCMD & <bitval>)) #endifto
arch/x86/include/asm/disabled-features.h, then we could check onlyX86_FEATURE_ENQCMD, and we'd get thatIS_ENABLED()check for "free".
This makes code simpler and cleaner.
Thanks.
-Fenghua
Re: [PATCH v4 12/12] x86/traps: Fix up invalid PASID
In reply to Peter ZijlstraHi, Peter,
Quoted 17 lines · Peter Zijlstra
arch/x86/kernel/traps.c static enum kernel_gp_hint get_kernel_gp_address(struct pt_regs *regs, · line 523
Quoted 6 lines · Fenghua Yu
arch/x86/kernel/traps.c +6
-0+static bool fixup_pasid_exception (void ) +{ +if (!IS_ENABLED (CONFIG_INTEL_IOMMU_SVM )) +return false; +if (!static_cpu_has (X86_FEATURE_ENQCMD )) +return false;elsewhere you had another variation:
(quoted diff) +5
-0+ if (!IS_ENABLED(CONFIG_INTEL_IOMMU_SVM)) + return; + + if (!cpu_feature_enabled(X86_FEATURE_ENQCMD)) + return;
Quoted 3 lines
Which is it, and why do we need the CONFIG thing when combined with the enabled thing?
I will use the second one with cpu_feature_enabled() for both cases.
The CONFIG thing is for compilation time optimization when CONFIG_INTEL_IOMMU_SVM is not set.
If CONFIG_INTEL_IOMMU_SVM is not set, IS_ENABLED(CONFIG_INTEL_IOMMU_SVM) is "false" during compilation time. Then GCC will optimize fixup_pasid_execption() to empty and will not define __fixup_pasid_exception() at all because no one calls it.
If CONFIG_INTEL_IOMMU_SVM is set, IS_ENABLED(...) is always true. Depending on cpu_feature_enabled(X86_FEATURE_ENQCMD), __fixup_pasid_execption() will be called or not during run time.
Does it make sense?
Do you want me to define a helper enqcmd_enabled()?
static inline bool enqcmd_enabled(void)
{
if (!IS_ENABLED(CONFIG_INTEL_IOMMU_SVM))
return false;
if (!static_cpu_has(X86_FEATURE_ENQCMD))
return false; return true;
}
Then both fixup_pasid_execption() and free_pasid() can call it.
static bool fixup_pasid_exception(void)
{
if (!enqcmd_enabled())
return false;
return __fixup_pasid_exception();
}statis inline void free_pasid(struct m_struct *mm)
{
if (!enqcmd_enabled())
return;
__free_pasid(mm);
}Please advice.
-Fenghua