x86: tag application address space for devices
Subsystems (14)
v8 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).
6. Disable ENQCMD when configured out (patch 8).
7. Allocate and free PASID for a process (patch 9).
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:
v8:
- Change subject to "drm, iommu:...." in patch 1 (Boris).
- Address all comments on patch 3 from Boris and Randy.
- Re-write commit message for patch 8 (Boris)
- Re-write commit message, remove "#ifdef CONFIG_IOMMU_SUPPORT", remove the "if (!ppasid_state)" check in patch 9 (Boris).
v7:
- Don't fix up PASID in #GP. Instead, update the PASID MSR by IPI and context switch after PASID allocation and free. Inherit PASID from parent. (Andy)
v6:
- Change return type to u32 for kfd_pasid_alloc() in patch 1 (Felix)
v5:
- Mark ENQCMD disabled when configured out and use cpu_feature_enabled() to simplify the feature checking code in patch 10 and 12 (PeterZ and Dave Hansen)
- Add Reviewed-by: Lu Baolu to patch 1, 2, 10, and 12.
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):
Documentation/x86: Add documentation for SVA (Shared Virtual
Addressing)
Fenghua Yu (7):
drm, 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
x86/cpufeatures: Mark ENQCMD as disabled when configured out x86/mmu: Allocate/free PASID
Yu-cheng Yu (1):
x86/fpu/xstate: Add supervisor PASID state for ENQCMD feature
Documentation/x86/index.rst | 1 + Documentation/x86/sva.rst | 256 ++++++++++++++++++ arch/x86/include/asm/cpufeatures.h | 1 + arch/x86/include/asm/disabled-features.h | 9 +- arch/x86/include/asm/fpu/api.h | 12 + arch/x86/include/asm/fpu/internal.h | 7 + arch/x86/include/asm/fpu/types.h | 11 +- arch/x86/include/asm/fpu/xstate.h | 2 +- arch/x86/include/asm/msr-index.h | 3 + arch/x86/kernel/cpu/cpuid-deps.c | 1 + arch/x86/kernel/fpu/xstate.c | 63 ++++- 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 | 4 +- drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 20 +- 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/iommu.c | 4 +- drivers/iommu/intel/pasid.c | 31 +-- drivers/iommu/intel/pasid.h | 24 +- drivers/iommu/intel/svm.c | 47 +++- 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 | 4 + include/linux/uacce.h | 2 +- 50 files changed, 539 insertions(+), 150 deletions(-) create mode 100644 Documentation/x86/sva.rst
Signature · 6 lines
2.19.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH v8 1/9 drm, 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.
---
v8:
- Change subject to "drm, iommu:...." (Boris).
v7:
- Add "Acked-by: Felix Kuehling <[email protected]>"
v6:
- Change return type to u32 for kfd_pasid_alloc() (Felix)
v5:
- Reviewed by Lu Baolu
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 | 4 +-- drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 20 ++++++------ 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/iommu.c | 4 +-- drivers/iommu/intel/pasid.c | 31 +++++++++---------- drivers/iommu/intel/pasid.h | 24 +++++++------- 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, 141 insertions(+), 141 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
@@ -992,7 +992,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) {
@@ -1028,7 +1028,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
@@ -1084,7 +1084,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
@@ -2785,7 +2785,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;
@@ -2956,7 +2956,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;
@@ -3254,7 +3254,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;
@@ -3298,7 +3298,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
@@ -372,8 +372,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,
@@ -430,9 +430,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
@@ -91,7 +91,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,
@@ -948,7 +948,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(
@@ -1979,8 +1979,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 +2 -2
@@ -51,7 +51,7 @@ unsigned int kfd_get_pasid_limit(void)return 1U << pasid_bits; } -unsigned int kfd_pasid_alloc (void ) +u32 kfd_pasid_alloc (void ) {int r =amdgpu_pasid_alloc (pasid_bits);
@@ -63,7 +63,7 @@ unsigned int kfd_pasid_alloc(void)return 0 ; } -void kfd_pasid_free (unsigned int pasid) +void kfd_pasid_free (u32 pasid) {amdgpu_pasid_free (pasid); }
drivers/gpu/drm/amd/amdkfd/kfd_priv.h +10 -10
@@ -723,7 +723,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;/*
@@ -800,7 +800,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);
@@ -841,8 +841,8 @@ int kfd_pasid_init(void);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); +u32 kfd_pasid_alloc (void ); +void kfd_pasid_free (u32 pasid);/* Doorbells */ size_t kfd_doorbell_process_slice (struct kfd_dev *kfd);
@@ -927,7 +927,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 {
@@ -1049,12 +1049,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,
@@ -1065,7 +1065,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
@@ -1306,7 +1306,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
@@ -513,10 +513,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 ;
@@ -909,7 +910,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));
@@ -927,7 +928,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));
@@ -947,7 +948,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));
@@ -2786,7 +2787,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;
@@ -2847,13 +2848,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);
@@ -2868,13 +2869,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;
@@ -2888,7 +2889,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;
@@ -2920,7 +2921,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;
@@ -2939,7 +2940,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;
@@ -2957,7 +2958,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);
@@ -2972,7 +2973,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;
@@ -2986,7 +2987,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
@@ -1482,7 +1482,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 };
@@ -1796,7 +1796,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;
@@ -1846,7 +1846,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/iommu.c +2 -2
@@ -2527,7 +2527,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;
@@ -5173,7 +5173,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;
@@ -499,7 +498,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;
@@ -524,7 +523,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));
@@ -543,7 +542,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;
@@ -616,7 +615,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;
@@ -674,7 +673,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;
@@ -760,7 +759,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/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/svm.c +6 -6
@@ -23,7 +23,7 @@#include "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
@@ -399,7 +399,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 =device_to_iommu (dev,NULL ,NULL );struct intel_svm_dev *sdev;
@@ -620,7 +620,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;
@@ -739,7 +739,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;
@@ -1067,10 +1067,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
@@ -2839,7 +2839,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
@@ -93,7 +93,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. */
@@ -708,7 +708,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);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);
@@ -737,11 +737,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);int intel_svm_page_response (struct device *dev,struct iommu_fault_event *evt,struct iommu_page_response *msg);
@@ -753,7 +753,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;
@@ -766,7 +766,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
@@ -286,7 +286,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,
@@ -296,7 +296,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);
@@ -634,7 +634,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 */
@@ -1027,7 +1027,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 ; }
@@ -1046,7 +1046,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
[tip: x86/pasid] drm, iommu: Change type of pasid to u32
The following commit has been merged into the x86/pasid branch of tip:
The following commit has been merged into the x86/pasid branch of tip:
Commit-ID: c7b6bac9c72c5fcbd6e9e12545bd3022c7f21860 Gitweb: https://git.kernel.org/tip/c7b6bac9c72c5fcbd6e9e12545bd3022c7f21860 Author: Fenghua Yu <[email protected]> AuthorDate: Tue, 15 Sep 2020 09:30:05 -07:00 Committer: Borislav Petkov <[email protected]> CommitterDate: Thu, 17 Sep 2020 19:21:16 +02:00
drm, 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.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.h | 2 +- drivers/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 +-- drivers/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 +- drivers/gpu/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 | 4 +- drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 20 +++--- drivers/gpu/drm/amd/amdkfd/kfd_process.c | 2 +- drivers/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/iommu.c | 4 +- drivers/iommu/intel/pasid.c | 31 ++++------ drivers/iommu/intel/pasid.h | 24 ++++---- 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, 141 insertions(+), 141 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
@@ -992,7 +992,7 @@ create_evict_fence_fail: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) {
@@ -1028,7 +1028,7 @@ amdgpu_vm_init_fail: }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
@@ -1084,7 +1084,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
@@ -2785,7 +2785,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;
@@ -2956,7 +2956,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;
@@ -3254,7 +3254,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;
@@ -3298,7 +3298,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
@@ -372,8 +372,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,
@@ -430,9 +430,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
@@ -91,7 +91,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,
@@ -948,7 +948,7 @@ out: }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(
@@ -1979,8 +1979,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 +2 -2
@@ -51,7 +51,7 @@ unsigned int kfd_get_pasid_limit(void)return 1U << pasid_bits; } -unsigned int kfd_pasid_alloc (void ) +u32 kfd_pasid_alloc (void ) {int r =amdgpu_pasid_alloc (pasid_bits);
@@ -63,7 +63,7 @@ unsigned int kfd_pasid_alloc(void)return 0 ; } -void kfd_pasid_free (unsigned int pasid) +void kfd_pasid_free (u32 pasid) {amdgpu_pasid_free (pasid); }
drivers/gpu/drm/amd/amdkfd/kfd_priv.h +10 -10
@@ -723,7 +723,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;/*
@@ -800,7 +800,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);
@@ -841,8 +841,8 @@ int kfd_pasid_init(void);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); +u32 kfd_pasid_alloc (void ); +void kfd_pasid_free (u32 pasid);/* Doorbells */ size_t kfd_doorbell_process_slice (struct kfd_dev *kfd);
@@ -927,7 +927,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 {
@@ -1049,12 +1049,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,
@@ -1065,7 +1065,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
@@ -1306,7 +1306,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
@@ -513,10 +513,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 ;
@@ -909,7 +910,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));
@@ -927,7 +928,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));
@@ -947,7 +948,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));
@@ -2786,7 +2787,7 @@ out: }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;
@@ -2847,13 +2848,13 @@ out: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);
@@ -2868,13 +2869,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;
@@ -2888,7 +2889,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;
@@ -2920,7 +2921,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;
@@ -2939,7 +2940,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;
@@ -2957,7 +2958,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);
@@ -2972,7 +2973,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;
@@ -2986,7 +2987,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 @@ out_unlock: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 @@ out_unlock: }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 @@ out: }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
@@ -1482,7 +1482,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 };
@@ -1796,7 +1796,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;
@@ -1846,7 +1846,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/iommu.c +2 -2
@@ -2527,7 +2527,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;
@@ -5173,7 +5173,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;
@@ -499,7 +498,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;
@@ -524,7 +523,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));
@@ -543,7 +542,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;
@@ -616,7 +615,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;
@@ -674,7 +673,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;
@@ -760,7 +759,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/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/svm.c +6 -6
@@ -23,7 +23,7 @@#include "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
@@ -399,7 +399,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 =device_to_iommu (dev,NULL ,NULL );struct intel_svm_dev *sdev;
@@ -620,7 +620,7 @@ out: }/* 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;
@@ -739,7 +739,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;
@@ -1067,10 +1067,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
@@ -2839,7 +2839,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
@@ -93,7 +93,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. */
@@ -708,7 +708,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);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);
@@ -737,11 +737,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);int intel_svm_page_response (struct device *dev,struct iommu_fault_event *evt,struct iommu_page_response *msg);
@@ -753,7 +753,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;
@@ -766,7 +766,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
@@ -286,7 +286,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,
@@ -296,7 +296,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);
@@ -634,7 +634,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 */
@@ -1027,7 +1027,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 ; }
@@ -1046,7 +1046,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; };
PATCH v8 2/9 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".
---
v5:
- Reviewed by Lu Baolu
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
@@ -446,7 +446,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 =device_to_iommu (dev,NULL ,NULL );
@@ -1033,7 +1034,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;/*
@@ -1042,7 +1043,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
@@ -765,7 +765,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
[tip: x86/pasid] iommu/vt-d: Change flags type to unsigned int in binding mm
The following commit has been merged into the x86/pasid branch of tip:
The following commit has been merged into the x86/pasid branch of tip:
Commit-ID: 2a5054c6e7b16906984ac36a7363ca46b8d99ade Gitweb: https://git.kernel.org/tip/2a5054c6e7b16906984ac36a7363ca46b8d99ade Author: Fenghua Yu <[email protected]> AuthorDate: Tue, 15 Sep 2020 09:30:06 -07:00 Committer: Borislav Petkov <[email protected]> CommitterDate: Thu, 17 Sep 2020 19:21:30 +02:00
iommu/vt-d: Change flags type to unsigned int in binding mm
"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".
--- 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
@@ -446,7 +446,8 @@ out:/* 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 =device_to_iommu (dev,NULL ,NULL );
@@ -1033,7 +1034,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;/*
@@ -1042,7 +1043,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
@@ -765,7 +765,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 v8 3/9 Documentation/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.
---
v8:
- Address all of comments from Boris and Randy.
v7:
- Change the doc for updating PASID by IPI and context switch (Andy).
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 | 256 ++++++++++++++++++++++++++++++++++++ 2 files changed, 257 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 +256 -0
256 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
Borislav Petkov
maintainerRe: [PATCH v8 3/9] Documentation/x86: Add documentation for SVA (Shared Virtual Addressing)
Quoted 11 lines · Fenghua Yu
Documentation/x86/sva.rst new file +11
-0+Background +========== + +Shared Virtual Addressing (SVA) allows the processor and device to use the +same virtual addresses avoiding the need for software to translate virtual +addresses to physical addresses. SVA is what PCIe calls Shared Virtual +Memory (SVM). + +In addition to the convenience of using application virtual addresses +by the device, it also doesn't require pinning pages for DMA. +PCIe Address Translation Services (ATS) along with Page Request Interface
Documentation/x86/sva.rst line 27
Quoted 10 lines
Documentation/x86/sva.rst new file +10
-0+(PRI) allow devices to function much the same way as the CPU handling +application page-faults. For more information please refer to the PCIe +specification Chapter 10: ATS Specification. + +Use of SVA requires IOMMU support in the platform. IOMMU also is required +to support PCIe features ATS and PRI. ATS allows devices to cache +translations for virtual addresses. The IOMMU driver uses the mmu_notifier() +support to keep the device TLB cache and the CPU cache in sync. PRI allows +the device to request paging the virtual address by using the CPU page tables +before accessing the address.
That still reads funny, the "the device to request paging the virtual address" part. Do you mean that per chance here:
"Before the device can access that address, the device uses the PRI in order to request the virtual address to be paged in into the CPU page tables."
?
Signature · 8 lines
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquette
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommuRe: [PATCH v8 3/9] Documentation/x86: Add documentation for SVA (Shared Virtual Addressing)
Hi Boris,
Quoted 26 lines · Borislav Petkov
Quoted 11 lines · Fenghua Yu
Documentation/x86/sva.rst new file +11
-0+Background +========== + +Shared Virtual Addressing (SVA) allows the processor and device to use the +same virtual addresses avoiding the need for software to translate virtual +addresses to physical addresses. SVA is what PCIe calls Shared Virtual +Memory (SVM). + +In addition to the convenience of using application virtual addresses +by the device, it also doesn't require pinning pages for DMA. +PCIe Address Translation Services (ATS) along with Page Request InterfaceDocumentation/x86/sva.rst line 27
Quoted 10 lines
Documentation/x86/sva.rst new file +10
-0+(PRI) allow devices to function much the same way as the CPU handling +application page-faults. For more information please refer to the PCIe +specification Chapter 10: ATS Specification. + +Use of SVA requires IOMMU support in the platform. IOMMU also is required +to support PCIe features ATS and PRI. ATS allows devices to cache +translations for virtual addresses. The IOMMU driver uses the mmu_notifier() +support to keep the device TLB cache and the CPU cache in sync. PRI allows +the device to request paging the virtual address by using the CPU page tables +before accessing the address.That still reads funny, the "the device to request paging the virtual address" part. Do you mean that per chance here:
Quoted 4 lines
"Before the device can access that address, the device uses the PRI in order to request the virtual address to be paged in into the CPU page tables."
Agree, this reads a bit funny.
Just tweaked it a bit:
"When ATS lookup fails for a virtual address, device should use PRI in order to request the virtual address to be paged into the CPU page tables. The device must use ATS again in order the fetch the translation again before use"
Cheers,
Ashok
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Borislav Petkov
maintainerRe: [PATCH v8 3/9] Documentation/x86: Add documentation for SVA (Shared Virtual Addressing)
Quoted 6 lines · Ashok
Just tweaked it a bit:
"When ATS lookup fails for a virtual address, device should use PRI in order to request the virtual address to be paged into the CPU page tables. The device must use ATS again in order the fetch the translation again before use"
Thanks, amended.
Signature · 8 lines
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquette
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommuRe: [PATCH v8 3/9] Documentation/x86: Add documentation for SVA (Shared Virtual Addressing)
Thanks Boris.
multiple "again" makes it funny again :-)
Quoted 6 lines · Borislav Petkov
Quoted 5 lines · Ashok
Just tweaked it a bit:
"When ATS lookup fails for a virtual address, device should use PRI in order to request the virtual address to be paged into the CPU page tables. The device must use ATS again in order the fetch the translation again
s/translation again/translation
Quoted 4 lines
Quoted 1 line
before use"
Thanks, amended.
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Borislav Petkov
maintainerRe: [PATCH v8 3/9] Documentation/x86: Add documentation for SVA (Shared Virtual Addressing)
Quoted 1 line · Ashok
s/translation again/translation
Ok, last one. Now stop looking at that text because you'll find more.
:-)))
Signature · 8 lines
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquette
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommuRe: [PATCH v8 3/9] Documentation/x86: Add documentation for SVA (Shared Virtual Addressing)
Quoted 6 lines · Borislav Petkov
Quoted 1 line · Ashok
s/translation again/translation
Ok, last one. Now stop looking at that text because you'll find more.
:-)))
Thank you very much for taking care of the series, Boris!
I tested the tip:x86/pasid branch and everything works fine by my tests. I'll enable more tests for the branch.
-Fenghua
[tip: x86/pasid] Documentation/x86: Add documentation for SVA (Shared Virtual Addressing)
In reply to Fenghua YuThe following commit has been merged into the x86/pasid branch of tip:
The following commit has been merged into the x86/pasid branch of tip:
Commit-ID: 4e7b11567d946ebe14a3d10b697b078971a9da89 Gitweb: https://git.kernel.org/tip/4e7b11567d946ebe14a3d10b697b078971a9da89 Author: Ashok Raj <[email protected]> AuthorDate: Tue, 15 Sep 2020 09:30:07 -07:00 Committer: Borislav Petkov <[email protected]> CommitterDate: Thu, 17 Sep 2020 19:29:42 +02:00
Documentation/x86: Add documentation for SVA (Shared Virtual Addressing)
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.
--- Documentation/x86/index.rst | 1 +- Documentation/x86/sva.rst | 257 +++++++++++++++++++++++++++++++++++- 2 files changed, 258 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 +257 -0
257 lines not on this page · raw message
PATCH v8 4/9 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
@@ -353,6 +353,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
[tip: x86/pasid] x86/cpufeatures: Enumerate ENQCMD and ENQCMDS instructions
The following commit has been merged into the x86/pasid branch of tip:
The following commit has been merged into the x86/pasid branch of tip:
Commit-ID: ff4f82816dff28ffaaff96d1409bb3811d345514 Gitweb: https://git.kernel.org/tip/ff4f82816dff28ffaaff96d1409bb3811d345514 Author: Fenghua Yu <[email protected]> AuthorDate: Tue, 15 Sep 2020 09:30:08 -07:00 Committer: Borislav Petkov <[email protected]> CommitterDate: Thu, 17 Sep 2020 20:03:54 +02:00
x86/cpufeatures: Enumerate ENQCMD and ENQCMDS instructions
Work submission instruction comes in two flavors. ENQCMD can be called both in ring 3 and ring 0 and always uses the contents of a 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.
--- 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
@@ -353,6 +353,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 }, {} };
PATCH v8 5/9 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 | 11 ++++++++++- arch/x86/include/asm/fpu/xstate.h | 2 +- arch/x86/kernel/fpu/xstate.c | 6 +++++- 3 files changed, 16 insertions(+), 3 deletions(-)
arch/x86/include/asm/fpu/types.h +10 -1
@@ -114,7 +114,7 @@ enum xfeature { XFEATURE_Hi16_ZMM,XFEATURE_PT_UNIMPLEMENTED_SO_FAR ,XFEATURE_PKRU , -XFEATURE_RSRVD_COMP_10 , +XFEATURE_PASID ,XFEATURE_RSRVD_COMP_11 ,XFEATURE_RSRVD_COMP_12 , XFEATURE_RSRVD_COMP_13,
@@ -134,6 +134,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_LBR (1 << XFEATURE_LBR)#define XFEATURE_MASK_FPSSE (XFEATURE_MASK_FP | XFEATURE_MASK_SSE)
@@ -256,6 +257,14 @@ struct arch_lbr_state {struct lbr_entry entries[]; } __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
@@ -35,7 +35,7 @@ XFEATURE_MASK_BNDCSR)/* All currently supported supervisor features */ -#define XFEATURE_MASK_SUPERVISOR_SUPPORTED (0) +#define XFEATURE_MASK_SUPERVISOR_SUPPORTED (XFEATURE_MASK_PASID)/* * A supervisor state component may not always contain valuable information,
arch/x86/kernel/fpu/xstate.c +5 -1
@@ -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, };/*
@@ -318,6 +320,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 ); }/*
@@ -592,6 +595,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
@@ -601,7 +605,7 @@ static void check_xstate_against_struct(int nr)if ((nr <XFEATURE_YMM ) || (nr >=XFEATURE_MAX ) || (nr ==XFEATURE_PT_UNIMPLEMENTED_SO_FAR ) || - ((nr >=XFEATURE_RSRVD_COMP_10 ) && (nr <=XFEATURE_LBR ))) { + ((nr >=XFEATURE_RSRVD_COMP_11 ) && (nr <=XFEATURE_LBR ))) {WARN_ONCE (1 ,"no structure for xstate: %d\n" , nr);XSTATE_WARN_ON (1 ); }
Signature · 6 lines
2.19.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
[tip: x86/pasid] x86/fpu/xstate: Add supervisor PASID state for ENQCMD
The following commit has been merged into the x86/pasid branch of tip:
The following commit has been merged into the x86/pasid branch of tip:
Commit-ID: b454feb9abc1a9ee876fb84bfea0fc8d726f5bc4 Gitweb: https://git.kernel.org/tip/b454feb9abc1a9ee876fb84bfea0fc8d726f5bc4 Author: Yu-cheng Yu <[email protected]> AuthorDate: Tue, 15 Sep 2020 09:30:09 -07:00 Committer: Borislav Petkov <[email protected]> CommitterDate: Thu, 17 Sep 2020 20:22:10 +02:00
x86/fpu/xstate: Add supervisor PASID state for ENQCMD
The ENQCMD instruction reads a PASID from the IA32_PASID MSR. The MSR is stored in the task's supervisor XSAVE* PASID state and is context-switched by XSAVES/XRSTORS.
[ bp: Add (in-)definite articles and massage. ]
--- arch/x86/include/asm/fpu/types.h | 11 ++++++++++- arch/x86/include/asm/fpu/xstate.h | 2 +- arch/x86/kernel/fpu/xstate.c | 6 +++++- 3 files changed, 16 insertions(+), 3 deletions(-)
arch/x86/include/asm/fpu/types.h +10 -1
@@ -114,7 +114,7 @@ enum xfeature { XFEATURE_Hi16_ZMM,XFEATURE_PT_UNIMPLEMENTED_SO_FAR ,XFEATURE_PKRU , -XFEATURE_RSRVD_COMP_10 , +XFEATURE_PASID ,XFEATURE_RSRVD_COMP_11 ,XFEATURE_RSRVD_COMP_12 , XFEATURE_RSRVD_COMP_13,
@@ -134,6 +134,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_LBR (1 << XFEATURE_LBR)#define XFEATURE_MASK_FPSSE (XFEATURE_MASK_FP | XFEATURE_MASK_SSE)
@@ -256,6 +257,14 @@ struct arch_lbr_state {struct lbr_entry entries[]; } __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
@@ -35,7 +35,7 @@ XFEATURE_MASK_BNDCSR)/* All currently supported supervisor features */ -#define XFEATURE_MASK_SUPERVISOR_SUPPORTED (0) +#define XFEATURE_MASK_SUPERVISOR_SUPPORTED (XFEATURE_MASK_PASID)/* * A supervisor state component may not always contain valuable information,
arch/x86/kernel/fpu/xstate.c +5 -1
@@ -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, };/*
@@ -318,6 +320,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 ); }/*
@@ -592,6 +595,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
@@ -601,7 +605,7 @@ static void check_xstate_against_struct(int nr)if ((nr <XFEATURE_YMM ) || (nr >=XFEATURE_MAX ) || (nr ==XFEATURE_PT_UNIMPLEMENTED_SO_FAR ) || - ((nr >=XFEATURE_RSRVD_COMP_10 ) && (nr <=XFEATURE_LBR ))) { + ((nr >=XFEATURE_RSRVD_COMP_11 ) && (nr <=XFEATURE_LBR ))) {WARN_ONCE (1 ,"no structure for xstate: %d\n" , nr);XSTATE_WARN_ON (1 ); }
PATCH v8 6/9 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
@@ -257,6 +257,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
[tip: x86/pasid] x86/msr-index: Define an IA32_PASID MSR
The following commit has been merged into the x86/pasid branch of tip:
The following commit has been merged into the x86/pasid branch of tip:
Commit-ID: f0f2f9feb4ee6f28729e5388da3c03ce1dac077a Gitweb: https://git.kernel.org/tip/f0f2f9feb4ee6f28729e5388da3c03ce1dac077a Author: Fenghua Yu <[email protected]> AuthorDate: Tue, 15 Sep 2020 09:30:10 -07:00 Committer: Borislav Petkov <[email protected]> CommitterDate: Thu, 17 Sep 2020 20:22:15 +02:00
x86/msr-index: Define an IA32_PASID MSR
The 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 the PASID to identify a process address space and direct responses to the right address space.
--- arch/x86/include/asm/msr-index.h | 3 +++ 1 file changed, 3 insertions(+)
arch/x86/include/asm/msr-index.h +3 -0
@@ -257,6 +257,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
PATCH v8 7/9 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
@@ -542,6 +542,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
[tip: x86/pasid] mm: Add a pasid member to struct mm_struct
The following commit has been merged into the x86/pasid branch of tip:
The following commit has been merged into the x86/pasid branch of tip:
Commit-ID: 52ad9bc64c74167466e70e0df4b99ee5ccef0078 Gitweb: https://git.kernel.org/tip/52ad9bc64c74167466e70e0df4b99ee5ccef0078 Author: Fenghua Yu <[email protected]> AuthorDate: Tue, 15 Sep 2020 09:30:11 -07:00 Committer: Borislav Petkov <[email protected]> CommitterDate: Thu, 17 Sep 2020 20:22:15 +02:00
mm: Add a pasid member to struct mm_struct
A PASID is shared by all threads in a process. So the logical place to keep track of it is in the mm_struct. Both ARM and x86 would use this PASID.
[ bp: Massage commit message. ]
--- include/linux/mm_types.h | 4 ++++ 1 file changed, 4 insertions(+)
include/linux/mm_types.h +4 -0
@@ -542,6 +542,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;/*
PATCH v8 8/9 x86/cpufeatures: Mark ENQCMD as disabled when configured out
In reply to Fenghua YuCurrently, the ENQCMD feature depends on CONFIG_IOMMU_SUPPORT. Add X86_FEATURE_ENQCMD to the disabled features mask.
---
v8:
- Re-write commit message (Boris).
- Move "#ifdef CONFIG_IOMMU_SUPPORT" hunk from patch 9 (Boris).
v7:
- Split this patch from a previous patch.
arch/x86/include/asm/disabled-features.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
arch/x86/include/asm/disabled-features.h +8 -1
@@ -56,6 +56,12 @@# define DISABLE_PTI (1 << (X86_FEATURE_PTI & 31))#endif +#ifdef CONFIG_IOMMU_SUPPORT +# define DISABLE_ENQCMD 0 +#else +# define DISABLE_ENQCMD (1 << (X86_FEATURE_ENQCMD & 31)) +#endif +/* * Make sure to add features to the correct mask */
@@ -75,7 +81,8 @@#define DISABLED_MASK13 0#define DISABLED_MASK14 0#define DISABLED_MASK15 0 -#define DISABLED_MASK16 (DISABLE_PKU|DISABLE_OSPKE|DISABLE_LA57|DISABLE_UMIP) +#define DISABLED_MASK16 (DISABLE_PKU|DISABLE_OSPKE|DISABLE_LA57|DISABLE_UMIP| \ + DISABLE_ENQCMD)#define DISABLED_MASK17 0#define DISABLED_MASK18 0#define DISABLED_MASK_CHECK BUILD_BUG_ON_ZERO(NCAPINTS != 19)
Signature · 6 lines
2.19.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
[tip: x86/pasid] x86/cpufeatures: Mark ENQCMD as disabled when configured out
The following commit has been merged into the x86/pasid branch of tip:
The following commit has been merged into the x86/pasid branch of tip:
Commit-ID: 1478b99a76534b6c244cfe24fa616280a9441118 Gitweb: https://git.kernel.org/tip/1478b99a76534b6c244cfe24fa616280a9441118 Author: Fenghua Yu <[email protected]> AuthorDate: Tue, 15 Sep 2020 09:30:12 -07:00 Committer: Borislav Petkov <[email protected]> CommitterDate: Thu, 17 Sep 2020 20:22:15 +02:00
x86/cpufeatures: Mark ENQCMD as disabled when configured out
Currently, the ENQCMD feature depends on CONFIG_IOMMU_SUPPORT. Add X86_FEATURE_ENQCMD to the disabled features mask so that it gets disabled when the IOMMU config option above is not enabled.
--- arch/x86/include/asm/disabled-features.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
arch/x86/include/asm/disabled-features.h +8 -1
@@ -56,6 +56,12 @@# define DISABLE_PTI (1 << (X86_FEATURE_PTI & 31))#endif +#ifdef CONFIG_IOMMU_SUPPORT +# define DISABLE_ENQCMD 0 +#else +# define DISABLE_ENQCMD (1 << (X86_FEATURE_ENQCMD & 31)) +#endif +/* * Make sure to add features to the correct mask */
@@ -75,7 +81,8 @@#define DISABLED_MASK13 0#define DISABLED_MASK14 0#define DISABLED_MASK15 0 -#define DISABLED_MASK16 (DISABLE_PKU|DISABLE_OSPKE|DISABLE_LA57|DISABLE_UMIP) +#define DISABLED_MASK16 (DISABLE_PKU|DISABLE_OSPKE|DISABLE_LA57|DISABLE_UMIP| \ + DISABLE_ENQCMD)#define DISABLED_MASK17 0#define DISABLED_MASK18 0#define DISABLED_MASK_CHECK BUILD_BUG_ON_ZERO(NCAPINTS != 19)
PATCH v8 9/9 x86/mmu: Allocate/free PASID
In reply to Fenghua YuA PASID is allocated for an "mm" the first time any thread binds to an SVM capable device and is freed from the "mm" when the SVM is unbound by the last thread. It's possible for the "mm" to have different PASID values in different binding/unbinding SVM cycles.
The mm's PASID (non-zero for valid PASID or 0 for invalid PASID) is propagated to per-thread PASID MSR for all threads within the mm through IPI, context switch, or inherit. So that a running thread has the right PASID MSR matching the mm's PASID.
---
v8:
- Re-write commit message (Boris).
- Remove ppasid_state == NULL check in update_pasid() (Boris).
- Move "#ifdef CONFIG_IOMMU_SUPPORT" hunk to patch 8 (Boris).
- Add comment when calling update_pasid().
v7:
- Don't fix up PASID in #GP. Instead, update the PASID MSR by IPI and context switch after PASID allocation and free. Inherit PASID from parent. (Andy)
Before v7:
- Allocate a PASID for the mm and free it until mm exit.
arch/x86/include/asm/fpu/api.h | 12 ++++++ arch/x86/include/asm/fpu/internal.h | 7 ++++ arch/x86/kernel/fpu/xstate.c | 57 +++++++++++++++++++++++++++++ drivers/iommu/intel/svm.c | 28 +++++++++++++- 4 files changed, 103 insertions(+), 1 deletion(-)
arch/x86/include/asm/fpu/api.h +12 -0
@@ -62,4 +62,16 @@ extern void switch_fpu_return(void);*/ extern int cpu_has_xfeatures (u64 xfeatures_mask,const char **feature_name); +/* +* Tasks that are not using SVA have mm->pasid set to zero to note that they +* will not have the valid bit set in MSR_IA32_PASID while they are running. +*/ +#define PASID_DISABLED 0 + +#ifdef CONFIG_IOMMU_SUPPORT +/* Update current's PASID MSR/state by mm's PASID. */ +void update_pasid (void ); +#else +static inline void update_pasid (void ) { } +#endif #endif /* _ASM_X86_FPU_API_H */
arch/x86/include/asm/fpu/internal.h +7 -0
@@ -583,6 +583,13 @@ static inline void switch_fpu_finish(struct fpu *new_fpu) pkru_val = pk->pkru; }__write_pkru (pkru_val); + +/* +* Expensive PASID MSR write will be avoided in update_pasid() because +* TIF_NEED_FPU_LOAD was set. And the PASID state won't be updated +* unless it's different from mm->pasid to reduce overhead. +*/ +update_pasid (); }/*
arch/x86/kernel/fpu/xstate.c +57 -0
60 lines not on this page · raw message
drivers/iommu/intel/svm.c +27 -1
@@ -19,6 +19,7 @@#include <linux/mm_types.h> #include <linux/ioasid.h> #include <asm/page.h> +#include <asm/fpu/api.h> #include "pasid.h"
@@ -444,6 +445,24 @@ int intel_svm_unbind_gpasid(struct device *dev, u32 pasid)return ret; } +static void _load_pasid (void *unused) +{ +update_pasid (); +} + +static void load_pasid (struct mm_struct *mm,u32 pasid) +{ +mutex_lock (&mm->context.lock); + +/* Synchronize with READ_ONCE in update_pasid(). */ +smp_store_release (&mm->pasid, pasid); + +/* Update PASID MSR on all CPUs running the mm's tasks. */ +on_each_cpu_mask (mm_cpumask (mm), _load_pasid,NULL , true); + +mutex_unlock (&mm->context.lock); +} +/* Caller must hold pasid_mutex, mm reference */ static int intel_svm_bind_mm(struct device *dev, unsigned int flags,
@@ -591,6 +610,10 @@ intel_svm_bind_mm(struct device *dev, unsigned int flags, }list_add_tail (&svm->list, &global_svm_list); +if (mm) { +/* The newly allocated pasid is loaded to the mm. */ +load_pasid (mm, svm->pasid); + } }else {/* * Binding a new device with existing PASID, need to setup
@@ -654,8 +677,11 @@ static int intel_svm_unbind_mm(struct device *dev, u32 pasid)if (list_empty (&svm->devs)) {ioasid_free (svm->pasid); -if (svm->mm) +if (svm->mm) {mmu_notifier_unregister (&svm->notifier, svm->mm); +/* Clear mm's pasid. */ +load_pasid (svm->mm,PASID_DISABLED ); + }list_del (&svm->list);/* We mandate that no page faults may be outstanding * for the PASID when intel_svm_unbind_mm() is called.
Signature · 6 lines
2.19.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
[tip: x86/pasid] x86/mmu: Allocate/free a PASID
The following commit has been merged into the x86/pasid branch of tip:
The following commit has been merged into the x86/pasid branch of tip:
Commit-ID: 20f0afd1fb3d7d44f4a3db5a4b6e904410862140 Gitweb: https://git.kernel.org/tip/20f0afd1fb3d7d44f4a3db5a4b6e904410862140 Author: Fenghua Yu <[email protected]> AuthorDate: Tue, 15 Sep 2020 09:30:13 -07:00 Committer: Borislav Petkov <[email protected]> CommitterDate: Thu, 17 Sep 2020 20:22:15 +02:00
x86/mmu: Allocate/free a PASID
A PASID is allocated for an "mm" the first time any thread binds to an SVA-capable device and is freed from the "mm" when the SVA is unbound by the last thread. It's possible for the "mm" to have different PASID values in different binding/unbinding SVA cycles.
The mm's PASID (non-zero for valid PASID or 0 for invalid PASID) is propagated to a per-thread PASID MSR for all threads within the mm through IPI, context switch, or inherited. This is done to ensure that a running thread has the right PASID in the MSR matching the mm's PASID.
[ bp: s/SVM/SVA/g; massage. ]
--- arch/x86/include/asm/fpu/api.h | 12 ++++++- arch/x86/include/asm/fpu/internal.h | 7 +++- arch/x86/kernel/fpu/xstate.c | 57 ++++++++++++++++++++++++++++- drivers/iommu/intel/svm.c | 28 +++++++++++++- 4 files changed, 103 insertions(+), 1 deletion(-)
arch/x86/include/asm/fpu/api.h +12 -0
@@ -62,4 +62,16 @@ extern void switch_fpu_return(void);*/ extern int cpu_has_xfeatures (u64 xfeatures_mask,const char **feature_name); +/* +* Tasks that are not using SVA have mm->pasid set to zero to note that they +* will not have the valid bit set in MSR_IA32_PASID while they are running. +*/ +#define PASID_DISABLED 0 + +#ifdef CONFIG_IOMMU_SUPPORT +/* Update current's PASID MSR/state by mm's PASID. */ +void update_pasid (void ); +#else +static inline void update_pasid (void ) { } +#endif #endif /* _ASM_X86_FPU_API_H */
arch/x86/include/asm/fpu/internal.h +7 -0
@@ -583,6 +583,13 @@ static inline void switch_fpu_finish(struct fpu *new_fpu) pkru_val = pk->pkru; }__write_pkru (pkru_val); + +/* +* Expensive PASID MSR write will be avoided in update_pasid() because +* TIF_NEED_FPU_LOAD was set. And the PASID state won't be updated +* unless it's different from mm->pasid to reduce overhead. +*/ +update_pasid (); }/*
arch/x86/kernel/fpu/xstate.c +57 -0
60 lines not on this page · raw message
drivers/iommu/intel/svm.c +27 -1
@@ -19,6 +19,7 @@#include <linux/mm_types.h> #include <linux/ioasid.h> #include <asm/page.h> +#include <asm/fpu/api.h> #include "pasid.h"
@@ -444,6 +445,24 @@ out:return ret; } +static void _load_pasid (void *unused) +{ +update_pasid (); +} + +static void load_pasid (struct mm_struct *mm,u32 pasid) +{ +mutex_lock (&mm->context.lock); + +/* Synchronize with READ_ONCE in update_pasid(). */ +smp_store_release (&mm->pasid, pasid); + +/* Update PASID MSR on all CPUs running the mm's tasks. */ +on_each_cpu_mask (mm_cpumask (mm), _load_pasid,NULL , true); + +mutex_unlock (&mm->context.lock); +} +/* Caller must hold pasid_mutex, mm reference */ static int intel_svm_bind_mm(struct device *dev, unsigned int flags,
@@ -591,6 +610,10 @@ intel_svm_bind_mm(struct device *dev, unsigned int flags, }list_add_tail (&svm->list, &global_svm_list); +if (mm) { +/* The newly allocated pasid is loaded to the mm. */ +load_pasid (mm, svm->pasid); + } }else {/* * Binding a new device with existing PASID, need to setup
@@ -654,8 +677,11 @@ static int intel_svm_unbind_mm(struct device *dev, u32 pasid)if (list_empty (&svm->devs)) {ioasid_free (svm->pasid); -if (svm->mm) +if (svm->mm) {mmu_notifier_unregister (&svm->notifier, svm->mm); +/* Clear mm's pasid. */ +load_pasid (svm->mm,PASID_DISABLED ); + }list_del (&svm->list);/* We mandate that no page faults may be outstanding * for the PASID when intel_svm_unbind_mm() is called.
PATCH 1/1 x86/cpufeatures: Force disable X86_FEATURE_ENQCMD and remove update_pasid()
In reply to Fenghua YuWhile digesting the XSAVE related horrors, which got introduced with the supervisor/user split, the recent addition of ENQCMD related functionality got on the radar and turned out to be similarly broken.
update_pasid(), which is only required when X86_FEATURE_ENQCMD is available, is invoked from two places:
1) From switch_to() for the incoming task
2) Via a SMP function call from the IOMMU/SMV code
#1 is half-ways correct as it hacks around the brokenness of get_xsave_addr()
by enforcing the state to be 'present', but all the conditionals in that code are completely pointless for that.
Also the invocation is just useless overhead because at that point it's guaranteed that TIF_NEED_FPU_LOAD is set on the incoming task and all of this can be handled at return to user space.
#2 is broken beyond repair. The comment in the code claims that it is safe
to invoke this in an IPI, but that's just wishful thinking.
FPU state of a running task is protected by fregs_lock() which is nothing else than a local_bh_disable(). As BH disabled regions run usually with interrupts enabled the IPI can hit a code section which modifies FPU state and there is absolutely no guarantee that any of the assumptions which are made for the IPI case is true.
Also the IPI is sent to all CPUs in mm_cpumask(mm), but the IPI is invoked with a NULL pointer argument, so it can hit a completely unrelated task and unconditionally force an update for nothing. Worse it can hit a kernel thread which operates on a user space address space and set a random PASID for it.
The offending commit does not cleanly revert, but it's sufficient to force disable X86_FEATURE_ENQCMD and to remove the broken update_pasid() code to make this dysfunctional all over the place. Anything more complex would require more surgery and none of the related functions outside of the x86 core code are blatantly wrong, so removing those would be overkill.
As nothing enables the PASID bit in the IA32_XSS MSR yet, which is required to make this actually work, this cannot result in a regression except for related out of tree train-wrecks, but they are broken already today.
---
See also: https://lore.kernel.org/lkml/[email protected]
--- arch/x86/include/asm/disabled-features.h | 7 +-- arch/x86/include/asm/fpu/api.h | 6 --- arch/x86/include/asm/fpu/internal.h | 7 --- arch/x86/kernel/fpu/xstate.c | 57 ------------------------------- 4 files changed, 3 insertions(+), 74 deletions(-)
arch/x86/include/asm/disabled-features.h +2 -5
@@ -56,11 +56,8 @@# define DISABLE_PTI (1 << (X86_FEATURE_PTI & 31))#endif -#ifdef CONFIG_IOMMU_SUPPORT -# define DISABLE_ENQCMD 0 -#else -# define DISABLE_ENQCMD (1 << (X86_FEATURE_ENQCMD & 31)) -#endif +/* Force disable because it's broken beyond repair */ +#define DISABLE_ENQCMD (1 << (X86_FEATURE_ENQCMD & 31))#ifdef CONFIG_X86_SGX # define DISABLE_SGX 0
arch/x86/include/asm/fpu/api.h +1 -5
@@ -106,10 +106,6 @@ extern int cpu_has_xfeatures(u64 xfeatur*/ #define PASID_DISABLED 0 -#ifdef CONFIG_IOMMU_SUPPORT -/* Update current's PASID MSR/state by mm's PASID. */ -void update_pasid (void ); -#else static inline void update_pasid (void ) { } -#endif +#endif /* _ASM_X86_FPU_API_H */
arch/x86/include/asm/fpu/internal.h +0 -7
@@ -583,13 +583,6 @@ static inline void switch_fpu_finish(str pkru_val = pk->pkru; }__write_pkru (pkru_val); - -/* -* Expensive PASID MSR write will be avoided in update_pasid() because -* TIF_NEED_FPU_LOAD was set. And the PASID state won't be updated -* unless it's different from mm->pasid to reduce overhead. -*/ -update_pasid (); }#endif /* _ASM_X86_FPU_INTERNAL_H */
arch/x86/kernel/fpu/xstate.c +0 -57
60 lines not on this page · raw message
Borislav Petkov
maintainerRe: [PATCH] x86/cpufeatures: Force disable X86_FEATURE_ENQCMD and remove update_pasid()
Quoted 19 lines · Thomas Gleixner
While digesting the XSAVE related horrors, which got introduced with the supervisor/user split, the recent addition of ENQCMD related functionality got on the radar and turned out to be similarly broken.
update_pasid(), which is only required whenX86_FEATURE_ENQCMDis available, is invoked from two places:1) From
switch_to()for the incoming task2) Via a SMP function call from the IOMMU/SMV code
#1 is half-ways correct as it hacks around the brokenness of
get_xsave_addr()
by enforcing the state to be 'present', but all the conditionals in that code are completely pointless for that.Also the invocation is just useless overhead because at that point it's guaranteed that
TIF_NEED_FPU_LOADis set on the incoming task and all of this can be handled at return to user space.
Quoted 8 lines
#2 is broken beyond repair. The comment in the code claims that it is safe
to invoke this in an IPI, but that's just wishful thinking.FPU state of a running task is protected by
fregs_lock()which is nothing else than alocal_bh_disable(). As BH disabled regions run usually with interrupts enabled the IPI can hit a code section which modifies FPU state and there is absolutely no guarantee that any of the assumptions which are made for the IPI case is true.
... so on a PASID system, your trivial reproducer would theoretically fire the same way and corrupt FPU state just as well.
Hohumm, I'd say we need all those reproducers turned into proper self tests and run on everything new that touches xstate. *At* *least*.
Signature · 8 lines
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquette
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommuRe: [PATCH] x86/cpufeatures: Force disable X86_FEATURE_ENQCMD and remove update_pasid()
Quoted 4 lines · Borislav Petkov
Quoted 3 lines · Thomas Gleixner
#2 is broken beyond repair. The comment in the code claims that it is safe
to invoke this in an IPI, but that's just wishful thinking.
Quoted 8 lines
Quoted 5 lines
FPU state of a running task is protected by
fregs_lock()which is nothing else than alocal_bh_disable(). As BH disabled regions run usually with interrupts enabled the IPI can hit a code section which modifies FPU state and there is absolutely no guarantee that any of the assumptions which are made for the IPI case is true.... so on a PASID system, your trivial reproducer would theoretically fire the same way and corrupt FPU state just as well.
This is worse and you can't selftest it because the IPI can just hit in the middle of _any_ FPU state operation and corrupt state.
Thanks,
tglx
RE: [PATCH] x86/cpufeatures: Force disable X86_FEATURE_ENQCMD and remove update_pasid()
Quoted 5 lines
Quoted 2 lines
... so on a PASID system, your trivial reproducer would theoretically fire the same way and corrupt FPU state just as well.
This is worse and you can't selftest it because the IPI can just hit in the middle of _any_ FPU state operation and corrupt state.
That sounds like we should abandon the "IPI all the other threads to force enable the PASID for them" approach. It would just be a nightmare of papering over cracks when the IPI was delivered at some inconvenient moment when the recipient was in the middle of touching xsave state.
I've told Fenghua to dig out the previous iteration of this patch where the plan was to lazily fix the PASID_MSR in other threads in the #GP handler.
That algorithm is very simple and easy to check. Pseudo-code:
#GP
if (usermode && current->mm->pasid && rdmsr(PASID_MSR) != valid) {
wrmsr(PASID_MSR, current->mm->pasid | PASID_VALID);
return;
}Worst case is that some thread of a multi-threaded process that is using PASID takes some unrelated #GP ... this code will try to fix it by enabling the PASID_MSR. That will just #GP a second time and this test will see the MSR is already set, so fall into the usual #GP handling code.
Seems like a better direction than trying to fix the IPI method. The virtualization folks will like this way more because IPI in guest causes a couple of VMEXIT so is somewhat expensive.
-Tony
Re: [PATCH] x86/cpufeatures: Force disable X86_FEATURE_ENQCMD and remove update_pasid()
Quoted 12 lines · Tony
Quoted 5 lines
Quoted 2 lines
... so on a PASID system, your trivial reproducer would theoretically fire the same way and corrupt FPU state just as well.
This is worse and you can't selftest it because the IPI can just hit in the middle of _any_ FPU state operation and corrupt state.
That sounds like we should abandon the "IPI all the other threads to force enable the PASID for them" approach. It would just be a nightmare of papering over cracks when the IPI was delivered at some inconvenient moment when the recipient was in the middle of touching xsave state.
Quoted 3 lines
I've told Fenghua to dig out the previous iteration of this patch where the plan was to lazily fix the
PASID_MSRin other threads in the #GP handler.
Blech. Also this won't work for other PASID-like features.
I have a half-written patch to fix this up for real. Stay tuned.
Quoted 3 lines
Seems like a better direction than trying to fix the IPI method. The virtualization folks will like this way more because IPI in guest causes a couple of VMEXIT so is somewhat expensive.
It happens at most once per PASID-using process.
RE: [PATCH] x86/cpufeatures: Force disable X86_FEATURE_ENQCMD and remove update_pasid()
Quoted 7 lines
Quoted 3 lines
I've told Fenghua to dig out the previous iteration of this patch where the plan was to lazily fix the
PASID_MSRin other threads in the #GP handler.Blech. Also this won't work for other PASID-like features.
I have a half-written patch to fix this up for real. Stay tuned.
Andy: Any update on this?
-Tony
Re: [PATCH] x86/cpufeatures: Force disable X86_FEATURE_ENQCMD and remove update_pasid()
Quoted 4 lines · Tony
Quoted 4 lines
Quoted 3 lines
I've told Fenghua to dig out the previous iteration of this patch where the plan was to lazily fix the
PASID_MSRin other threads in the #GP handler.
Quoted 8 lines
Quoted 3 lines
Blech. Also this won't work for other PASID-like features.
I have a half-written patch to fix this up for real. Stay tuned.
Andy: Any update on this?
-Tony
Let me try to merge my pile with tglx's pile and come up with something halfway sane.
Re: [PATCH] x86/cpufeatures: Force disable X86_FEATURE_ENQCMD and remove update_pasid()
Quoted 9 lines · Andy Lutomirski
Quoted 8 lines · Tony
Quoted 7 lines
Quoted 3 lines
I've told Fenghua to dig out the previous iteration of this patch where the plan was to lazily fix the
PASID_MSRin other threads in the #GP handler.Blech. Also this won't work for other PASID-like features.
I have a half-written patch to fix this up for real. Stay tuned.
Quoted 7 lines
Quoted 4 lines
Andy: Any update on this?
-Tony
Let me try to merge my pile with tglx's pile and come up with something halfway sane.
Looks like Thomas' pile is done (well done enough to be queued in TIP).
Can we see your "pile" soon?
-Tony
Borislav Petkov
maintainerRe: [PATCH] x86/cpufeatures: Force disable X86_FEATURE_ENQCMD and remove update_pasid()
In reply to Thomas Gleixnerarch/x86/include/asm/disabled-features.h line 60
Quoted 13 lines · Thomas Gleixner
arch/x86/include/asm/disabled-features.h +2
-5@@ -56,11 +56,8 @@# define DISABLE_PTI (1 << (X86_FEATURE_PTI & 31))#endif -#ifdef CONFIG_IOMMU_SUPPORT -# define DISABLE_ENQCMD 0 -#else -# define DISABLE_ENQCMD (1 << (X86_FEATURE_ENQCMD & 31)) -#endif +/* Force disable because it's broken beyond repair */ +#define DISABLE_ENQCMD (1 << (X86_FEATURE_ENQCMD & 31))
Yeah, for that to work we need:
---
From: Borislav Petkov <[email protected]>
Date: Wed, 2 Jun 2021 12:07:52 +0200
Subject: [PATCH] dmaengine: idxd: Use cpu_feature_enabled()
When testing x86 feature bits, use cpu_feature_enabled() so that build-disabled features can remain off, regardless of what CPUID says.
--- drivers/dma/idxd/init.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/dma/idxd/init.c +2 -2
@@ -745,12 +745,12 @@ static int __init idxd_init_module(void)* If the CPU does not support MOVDIR64B or ENQCMDS, there's no point in * enumerating the device. We can not utilize it. */ -if (!boot_cpu_has (X86_FEATURE_MOVDIR64B )) { +if (!cpu_feature_enabled (X86_FEATURE_MOVDIR64B )) {pr_warn ("idxd driver failed to load without MOVDIR64B.\n" );return -ENODEV ; } -if (!boot_cpu_has (X86_FEATURE_ENQCMD )) +if (!cpu_feature_enabled (X86_FEATURE_ENQCMD ))pr_warn ("Platform does not have ENQCMD(S) support.\n" );else support_enqcmd = true;
Signature · 15 lines
2.29.2 For the newly CCed parties, pls check https://lkml.kernel.org/r/[email protected] for more info. Thx. -- Regards/Gruss, Boris. https://people.kernel.org/tglx/notes-about-netiquette
Thomas Gleixner
Reviewed-byRe: [PATCH] x86/cpufeatures: Force disable X86_FEATURE_ENQCMD and remove update_pasid()
Quoted 22 lines · Borislav Petkov
arch/x86/include/asm/disabled-features.h line 60
Quoted 13 lines · Thomas Gleixner
arch/x86/include/asm/disabled-features.h +2
-5@@ -56,11 +56,8 @@# define DISABLE_PTI (1 << (X86_FEATURE_PTI & 31))#endif -#ifdef CONFIG_IOMMU_SUPPORT -# define DISABLE_ENQCMD 0 -#else -# define DISABLE_ENQCMD (1 << (X86_FEATURE_ENQCMD & 31)) -#endif +/* Force disable because it's broken beyond repair */ +#define DISABLE_ENQCMD (1 << (X86_FEATURE_ENQCMD & 31))Yeah, for that to work we need:
---
From: Borislav Petkov <[email protected]>
Date: Wed, 2 Jun 2021 12:07:52 +0200
Subject: [PATCH] dmaengine: idxd: Usecpu_feature_enabled()
Quoted 6 lines
When testing x86 feature bits, use
cpu_feature_enabled()so that build-disabled features can remain off, regardless of what CPUID says.Fixes 8e50d392652f ("dmaengine: idxd: Add shared workqueue support")Signed-off-by Borislav Petkov <[email protected]>Cc <[email protected]>
Thanks for spotting this!
tglx
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH] x86/cpufeatures: Force disable X86_FEATURE_ENQCMD and remove update_pasid()
In reply to Borislav PetkovQuoted 7 lines · Borislav Petkov
---
From: Borislav Petkov <[email protected]>
Date: Wed, 2 Jun 2021 12:07:52 +0200
Subject: [PATCH] dmaengine: idxd: Usecpu_feature_enabled()When testing x86 feature bits, use
cpu_feature_enabled()so that build-disabled features can remain off, regardless of what CPUID says.
Applied, thanks
Signature · 1 line
~Vinod
Borislav Petkov
maintainerRe: [PATCH] x86/cpufeatures: Force disable X86_FEATURE_ENQCMD and remove update_pasid()
Quoted 1 line · Vinod Koul
Applied, thanks
Actually, I'd prefer if I take it through the tip tree:
https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git/log/?h=x86/urgent
because it is needed for the following patch by tglx:
6867ee8bcb75 x86/cpufeatures: Force disable X86_FEATURE_ENQCMD and remove update_pasid() db099bafbf5e dmaengine: idxd: Use cpu_feature_enabled()
if you don't mind.
I'll be sending this to Linus this weekend.
Thx.
Signature · 4 lines
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquetteRe: [PATCH] x86/cpufeatures: Force disable X86_FEATURE_ENQCMD and remove update_pasid()
Quoted 7 lines · Borislav Petkov
Quoted 1 line · Vinod Koul
Applied, thanks
Actually, I'd prefer if I take it through the tip tree:
https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git/log/?h=x86/urgent
Quoted 8 lines
because it is needed for the following patch by tglx:
6867ee8bcb75x86/cpufeatures: Force disableX86_FEATURE_ENQCMDand removeupdate_pasid()db099bafbf5edmaengine: idxd: Usecpu_feature_enabled()if you don't mind.
I'll be sending this to Linus this weekend.
Okay dropped now..
You can add:
Signature · 1 line
~Vinod
Borislav Petkov
maintainerRe: [PATCH] x86/cpufeatures: Force disable X86_FEATURE_ENQCMD and remove update_pasid()
Quoted 3 lines · Vinod Koul
You can add:
Acked-by Vinod Koul <[email protected]>
Done.
Thx.
Signature · 4 lines
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquette[tip: x86/urgent] x86/cpufeatures: Force disable X86_FEATURE_ENQCMD and remove update_pasid()
In reply to Thomas GleixnerThe following commit has been merged into the x86/urgent branch of tip:
The following commit has been merged into the x86/urgent branch of tip:
Commit-ID: 6867ee8bcb754c59a8304f4a9d693ed6cfb96b31 Gitweb: https://git.kernel.org/tip/6867ee8bcb754c59a8304f4a9d693ed6cfb96b31 Author: Thomas Gleixner <[email protected]> AuthorDate: Sat, 29 May 2021 11:17:30 +02:00 Committer: Borislav Petkov <[email protected]> CommitterDate: Wed, 02 Jun 2021 12:29:00 +02:00
x86/cpufeatures: Force disable X86_FEATURE_ENQCMD and remove update_pasid()
While digesting the XSAVE-related horrors which got introduced with the supervisor/user split, the recent addition of ENQCMD-related functionality got on the radar and turned out to be similarly broken.
update_pasid(), which is only required when X86_FEATURE_ENQCMD is available, is invoked from two places:
1) From switch_to() for the incoming task
2) Via a SMP function call from the IOMMU/SMV code
#1 is half-ways correct as it hacks around the brokenness of get_xsave_addr()
by enforcing the state to be 'present', but all the conditionals in that code are completely pointless for that.
Also the invocation is just useless overhead because at that point it's guaranteed that TIF_NEED_FPU_LOAD is set on the incoming task and all of this can be handled at return to user space.
#2 is broken beyond repair. The comment in the code claims that it is safe
to invoke this in an IPI, but that's just wishful thinking.
FPU state of a running task is protected by fregs_lock() which is nothing else than a local_bh_disable(). As BH-disabled regions run usually with interrupts enabled the IPI can hit a code section which modifies FPU state and there is absolutely no guarantee that any of the assumptions which are made for the IPI case is true.
Also the IPI is sent to all CPUs in mm_cpumask(mm), but the IPI is invoked with a NULL pointer argument, so it can hit a completely unrelated task and unconditionally force an update for nothing. Worse, it can hit a kernel thread which operates on a user space address space and set a random PASID for it.
The offending commit does not cleanly revert, but it's sufficient to force disable X86_FEATURE_ENQCMD and to remove the broken update_pasid() code to make this dysfunctional all over the place. Anything more complex would require more surgery and none of the related functions outside of the x86 core code are blatantly wrong, so removing those would be overkill.
As nothing enables the PASID bit in the IA32_XSS MSR yet, which is required to make this actually work, this cannot result in a regression except for related out of tree train-wrecks, but they are broken already today.
--- arch/x86/include/asm/disabled-features.h | 7 +--- arch/x86/include/asm/fpu/api.h | 6 +-- arch/x86/include/asm/fpu/internal.h | 7 +--- arch/x86/kernel/fpu/xstate.c | 57 +----------------------- 4 files changed, 3 insertions(+), 74 deletions(-)
arch/x86/include/asm/disabled-features.h +2 -5
@@ -56,11 +56,8 @@# define DISABLE_PTI (1 << (X86_FEATURE_PTI & 31))#endif -#ifdef CONFIG_IOMMU_SUPPORT -# define DISABLE_ENQCMD 0 -#else -# define DISABLE_ENQCMD (1 << (X86_FEATURE_ENQCMD & 31)) -#endif +/* Force disable because it's broken beyond repair */ +#define DISABLE_ENQCMD (1 << (X86_FEATURE_ENQCMD & 31))#ifdef CONFIG_X86_SGX # define DISABLE_SGX 0
arch/x86/include/asm/fpu/api.h +1 -5
@@ -106,10 +106,6 @@ extern int cpu_has_xfeatures(u64 xfeatures_mask, const char **feature_name);*/ #define PASID_DISABLED 0 -#ifdef CONFIG_IOMMU_SUPPORT -/* Update current's PASID MSR/state by mm's PASID. */ -void update_pasid (void ); -#else static inline void update_pasid (void ) { } -#endif +#endif /* _ASM_X86_FPU_API_H */
arch/x86/include/asm/fpu/internal.h +0 -7
@@ -584,13 +584,6 @@ static inline void switch_fpu_finish(struct fpu *new_fpu) pkru_val = pk->pkru; }__write_pkru (pkru_val); - -/* -* Expensive PASID MSR write will be avoided in update_pasid() because -* TIF_NEED_FPU_LOAD was set. And the PASID state won't be updated -* unless it's different from mm->pasid to reduce overhead. -*/ -update_pasid (); }#endif /* _ASM_X86_FPU_INTERNAL_H */
arch/x86/kernel/fpu/xstate.c +0 -57
60 lines not on this page · raw message
[tip: x86/urgent] x86/cpufeatures: Force disable X86_FEATURE_ENQCMD and remove update_pasid()
In reply to Thomas GleixnerThe following commit has been merged into the x86/urgent branch of tip:
The following commit has been merged into the x86/urgent branch of tip:
Commit-ID: 9bfecd05833918526cc7357d55e393393440c5fa Gitweb: https://git.kernel.org/tip/9bfecd05833918526cc7357d55e393393440c5fa Author: Thomas Gleixner <[email protected]> AuthorDate: Sat, 29 May 2021 11:17:30 +02:00 Committer: Borislav Petkov <[email protected]> CommitterDate: Thu, 03 Jun 2021 16:33:09 +02:00
x86/cpufeatures: Force disable X86_FEATURE_ENQCMD and remove update_pasid()
While digesting the XSAVE-related horrors which got introduced with the supervisor/user split, the recent addition of ENQCMD-related functionality got on the radar and turned out to be similarly broken.
update_pasid(), which is only required when X86_FEATURE_ENQCMD is available, is invoked from two places:
1) From switch_to() for the incoming task
2) Via a SMP function call from the IOMMU/SMV code
#1 is half-ways correct as it hacks around the brokenness of get_xsave_addr()
by enforcing the state to be 'present', but all the conditionals in that code are completely pointless for that.
Also the invocation is just useless overhead because at that point it's guaranteed that TIF_NEED_FPU_LOAD is set on the incoming task and all of this can be handled at return to user space.
#2 is broken beyond repair. The comment in the code claims that it is safe
to invoke this in an IPI, but that's just wishful thinking.
FPU state of a running task is protected by fregs_lock() which is nothing else than a local_bh_disable(). As BH-disabled regions run usually with interrupts enabled the IPI can hit a code section which modifies FPU state and there is absolutely no guarantee that any of the assumptions which are made for the IPI case is true.
Also the IPI is sent to all CPUs in mm_cpumask(mm), but the IPI is invoked with a NULL pointer argument, so it can hit a completely unrelated task and unconditionally force an update for nothing. Worse, it can hit a kernel thread which operates on a user space address space and set a random PASID for it.
The offending commit does not cleanly revert, but it's sufficient to force disable X86_FEATURE_ENQCMD and to remove the broken update_pasid() code to make this dysfunctional all over the place. Anything more complex would require more surgery and none of the related functions outside of the x86 core code are blatantly wrong, so removing those would be overkill.
As nothing enables the PASID bit in the IA32_XSS MSR yet, which is required to make this actually work, this cannot result in a regression except for related out of tree train-wrecks, but they are broken already today.
--- arch/x86/include/asm/disabled-features.h | 7 +--- arch/x86/include/asm/fpu/api.h | 6 +-- arch/x86/include/asm/fpu/internal.h | 7 +--- arch/x86/kernel/fpu/xstate.c | 57 +----------------------- 4 files changed, 3 insertions(+), 74 deletions(-)
arch/x86/include/asm/disabled-features.h +2 -5
@@ -56,11 +56,8 @@# define DISABLE_PTI (1 << (X86_FEATURE_PTI & 31))#endif -#ifdef CONFIG_IOMMU_SUPPORT -# define DISABLE_ENQCMD 0 -#else -# define DISABLE_ENQCMD (1 << (X86_FEATURE_ENQCMD & 31)) -#endif +/* Force disable because it's broken beyond repair */ +#define DISABLE_ENQCMD (1 << (X86_FEATURE_ENQCMD & 31))#ifdef CONFIG_X86_SGX # define DISABLE_SGX 0
arch/x86/include/asm/fpu/api.h +1 -5
@@ -106,10 +106,6 @@ extern int cpu_has_xfeatures(u64 xfeatures_mask, const char **feature_name);*/ #define PASID_DISABLED 0 -#ifdef CONFIG_IOMMU_SUPPORT -/* Update current's PASID MSR/state by mm's PASID. */ -void update_pasid (void ); -#else static inline void update_pasid (void ) { } -#endif +#endif /* _ASM_X86_FPU_API_H */
arch/x86/include/asm/fpu/internal.h +0 -7
@@ -584,13 +584,6 @@ static inline void switch_fpu_finish(struct fpu *new_fpu) pkru_val = pk->pkru; }__write_pkru (pkru_val); - -/* -* Expensive PASID MSR write will be avoided in update_pasid() because -* TIF_NEED_FPU_LOAD was set. And the PASID state won't be updated -* unless it's different from mm->pasid to reduce overhead. -*/ -update_pasid (); }#endif /* _ASM_X86_FPU_INTERNAL_H */
arch/x86/kernel/fpu/xstate.c +0 -57
60 lines not on this page · raw message
Quoted 13 lines · Fenghua Yu
Ashok Raj (1):
Documentation/x86: Add documentation for SVA (Shared Virtual
Addressing)Fenghua Yu (7):
drm, 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: DefineIA32_PASIDMSR
mm: Define pasid in mm
x86/cpufeatures: Mark ENQCMD as disabled when configured out x86/mmu: Allocate/free PASID
Quoted 2 lines
Yu-cheng Yu (1):
x86/fpu/xstate: Add supervisor PASID state for ENQCMD feature
For the IOMMU bits:
Hi, Joerg,
Quoted 14 lines · Joerg Roedel
Quoted 13 lines · Fenghua Yu
Ashok Raj (1):
Documentation/x86: Add documentation for SVA (Shared Virtual
Addressing)Fenghua Yu (7):
drm, 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: DefineIA32_PASIDMSR
mm: Define pasid in mm
x86/cpufeatures: Mark ENQCMD as disabled when configured out x86/mmu: Allocate/free PASID
Quoted 6 lines
Quoted 2 lines
Yu-cheng Yu (1):
x86/fpu/xstate: Add supervisor PASID state for ENQCMD featureFor the IOMMU bits:
Acked-by Joerg Roedel <[email protected]>
Thank you!
-Fenghua