Nested Shared Virtual Address (SVA) VT-d support
v7 cover Nested Shared Virtual Address (SVA) VT-d support
Shared virtual address (SVA), a.k.a, Shared virtual memory (SVM) on Intel platforms allow address space sharing between device DMA and applications. SVA can reduce programming complexity and enhance security.
This series is intended to enable SVA virtualization, i.e. enable use of SVA within a guest user application.
Only IOMMU portion of the changes are included in this series. Additional support is needed in VFIO and QEMU (will be submitted separately) to complete this functionality.
To make incremental changes and reduce the size of each patchset. This series does not inlcude support for page request services.
In VT-d implementation, PASID table is per device and maintained in the host. Guest PASID table is shadowed in VMM where virtual IOMMU is emulated.
.-------------. .---------------------------.
| vIOMMU | | Guest process CR3, FL only|
| | '---------------------------' .----------------/
| PASID Entry |--- PASID cache flush -
'-------------' |
| | V
| | CR3 in GPA
'-------------'
Guest
------| Shadow |--------------------------|--------
v v v
Host
.-------------. .----------------------.
| pIOMMU | | Bind FL for GVA-GPA |
| | '----------------------'
.----------------/ |
| PASID Entry | V (Nested xlate)
'----------------\.------------------------------.
| | |SL for GPA-HPA, default domain|
| | '------------------------------'
'-------------'Where:
- FL = First level/stage one page tables
- SL = Second level/stage two page tables
This is the remaining VT-d only portion of V5 since the uAPIs and IOASID common code have been applied to Joerg's IOMMU core branch.
(https://lkml.org/lkml/2019/10/2/833)
The complete set with VFIO patches are here:
https://github.com/jacobpan/linux.git:siov_sva
The complete nested SVA upstream patches are divided into three phases:
1. Common APIs and PCI device direct assignment
2. Page Request Services (PRS) support
3. Mediated device assignment
With this set and the accompanied VFIO code, we will achieve phase #1.
Thanks,
Jacob
ChangeLog:
- V7
- Respect vIOMMU PASID range in virtual command PASID/IOASID allocator
- Caching virtual command capabilities to avoid runtime checks that could cause vmexits.
- V6
- Rebased on top of Joerg's core branch
(git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git core)
- Adapt to new uAPIs and IOASID allocators
- V5
Rebased on v5.3-rc4 which has some of the IOMMU fault APIs merged. Addressed v4 review comments from Eric Auger, Baolu Lu, and
Jonathan Cameron. Specific changes are as follows:
- Refined custom IOASID allocator to support multiple vIOMMU, hotplug cases.
- Extracted vendor data from IOMMU guest PASID bind data, for VT-d will support all necessary guest PASID entry fields for PASID bind.
- Support non-identity host-guest PASID mapping
- Exception handling in various cases
- V4
- Redesigned IOASID allocator such that it can support custom allocators with shared helper functions. Use separate XArray to store IOASIDs per allocator. Took advice from Eric Auger to have default allocator use the generic allocator structure. Combined into one patch in that the default allocator is just "another" allocator now. Can be built as a module in case of driver use without IOMMU.
- Extended bind guest PASID data to support SMMU and non-identity guest to host PASID mapping https://lkml.org/lkml/2019/5/21/802
- Rebased on Jean's sva/api common tree, new patches starts with [PATCH v4 10/22]
- V3
- Addressed thorough review comments from Eric Auger (Thank you!)
- Moved IOASID allocator from driver core to IOMMU code per suggestion by Christoph Hellwig
(https://lkml.org/lkml/2019/4/26/462)
- Rebased on top of Jean's SVA API branch and Eric's v7[1]
(git://linux-arm.org/linux-jpb.git sva/api)
- All IOMMU APIs are unmodified (except the new bind guest PASID call in patch 9/16)
- V2
- Rebased on Joerg's IOMMU x86/vt-d branch v5.1-rc4
- Integrated with Eric Auger's new v7 series for common APIs
(https://github.com/eauger/linux/tree/v5.1-rc3-2stage-v7)
- Addressed review comments from Andy Shevchenko and Alex Williamson on IOASID custom allocator.
- Support multiple custom IOASID allocators (vIOMMUs) and dynamic registration.
Jacob Pan (10):
iommu/vt-d: Cache virtual command capability register iommu/vt-d: Add custom allocator for IOASID iommu/vt-d: Replace Intel specific PASID allocator with IOASID iommu/vt-d: Move domain helper to header
iommu/vt-d: Avoid duplicated code for PASID setup iommu/vt-d: Add nested translation helper function iommu/vt-d: Misc macro clean up for SVM
iommu/vt-d: Add bind guest PASID support
iommu/vt-d: Support flushing more translation cache types iommu/vt-d: Add svm/sva invalidate function
Lu Baolu (1):
iommu/vt-d: Enlightened PASID allocation
drivers/iommu/Kconfig | 1 + drivers/iommu/dmar.c | 47 +++++++ drivers/iommu/intel-iommu.c | 259 ++++++++++++++++++++++++++++++++-- drivers/iommu/intel-pasid.c | 332 ++++++++++++++++++++++++++++++++++++-------- drivers/iommu/intel-pasid.h | 25 +++- drivers/iommu/intel-svm.c | 298 +++++++++++++++++++++++++++++++-------- include/linux/intel-iommu.h | 43 +++++- include/linux/intel-svm.h | 17 +++ 8 files changed, 890 insertions(+), 132 deletions(-)
Signature · 6 lines
2.7.4 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH v7 1/11 iommu/vt-d: Cache virtual command capability register
Virtual command registers are used in the guest only, to prevent vmexit cost, we cache the capability and store it during initialization.
--- drivers/iommu/dmar.c | 1 + include/linux/intel-iommu.h | 4 ++++ 2 files changed, 5 insertions(+)
drivers/iommu/dmar.c +1 -0
@@ -950,6 +950,7 @@ static int map_iommu(struct intel_iommu *iommu, u64 phys_addr)warn_invalid_dmar (phys_addr," returns all ones" ); goto unmap; } + iommu->vccap =dmar_readq (iommu->reg +DMAR_VCCAP_REG );/* the registers might be more than one page */ map_size = max_t(int, ecap_max_iotlb_offset(iommu->ecap),
include/linux/intel-iommu.h +4 -0
@@ -186,6 +186,9 @@#define ecap_max_handle_mask (e) ((e >> 20) & 0xf)#define ecap_sc_support (e) ((e >> 7) & 0x1)/* Snooping Control */ +/* Virtual command interface capabilities */ +#define vccap_pasid (v) ((v & DMA_VCS_PAS))/* PASID allocation */ +/* IOTLB_REG */ #define DMA_TLB_FLUSH_GRANU_OFFSET 60#define DMA_TLB_GLOBAL_FLUSH (((u64)1) << 60)
@@ -520,6 +523,7 @@ struct intel_iommu {u64 reg_size;/* size of hw register set */ u64 cap;u64 ecap; +u64 vccap;u32 gcmd;/* Holds TE, EAFL. Don't need SRTP, SFL, WBF */ raw_spinlock_t register_lock;/* protect register handling */ int seq_id;/* sequence id of the iommu */
Signature · 6 lines
2.7.4 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH v7 01/11] iommu/vt-d: Cache virtual command capability register
Hi,
Quoted 4 lines · Jacob Pan
Virtual command registers are used in the guest only, to prevent vmexit cost, we cache the capability and store it during initialization.
Signed-off-by Jacob Pan <[email protected]>
This patch looks good to me.
Best regards,
baolu
Quoted 40 lines
--- drivers/iommu/dmar.c | 1 + include/linux/intel-iommu.h | 4 ++++ 2 files changed, 5 insertions(+)drivers/iommu/dmar.c +1
-0@@ -950,6 +950,7 @@ static int map_iommu(struct intel_iommu *iommu, u64 phys_addr)warn_invalid_dmar (phys_addr," returns all ones" ); goto unmap; } + iommu->vccap =dmar_readq (iommu->reg +DMAR_VCCAP_REG );/* the registers might be more than one page */ map_size = max_t(int, ecap_max_iotlb_offset(iommu->ecap),include/linux/intel-iommu.h +4
-0@@ -186,6 +186,9 @@#define ecap_max_handle_mask (e) ((e >> 20) & 0xf)#define ecap_sc_support (e) ((e >> 7) & 0x1)/* Snooping Control */ +/* Virtual command interface capabilities */ +#define vccap_pasid (v) ((v & DMA_VCS_PAS))/* PASID allocation */ +/* IOTLB_REG */ #define DMA_TLB_FLUSH_GRANU_OFFSET 60#define DMA_TLB_GLOBAL_FLUSH (((u64)1) << 60)@@ -520,6 +523,7 @@ struct intel_iommu {u64 reg_size;/* size of hw register set */ u64 cap;u64 ecap; +u64 vccap;u32 gcmd;/* Holds TE, EAFL. Don't need SRTP, SFL, WBF */ raw_spinlock_t register_lock;/* protect register handling */ int seq_id;/* sequence id of the iommu */
RE: [PATCH v7 01/11] iommu/vt-d: Cache virtual command capability register
In reply to Jacob PanQuoted 35 lines
From: Jacob Pan [mailto:[email protected]]
Sent: Friday, October 25, 2019 3:55 AMVirtual command registers are used in the guest only, to prevent vmexit cost, we cache the capability and store it during initialization.
Signed-off-by Jacob Pan <[email protected]>--- drivers/iommu/dmar.c | 1 + include/linux/intel-iommu.h | 4 ++++ 2 files changed, 5 insertions(+)drivers/iommu/dmar.c +1
-0@@ -950,6 +950,7 @@ static int map_iommu(struct intel_iommu *iommu, u64 phys_addr) warn_invalid_dmar(phys_addr, " returns all ones"); goto unmap; } + iommu->vccap =dmar_readq (iommu->reg +DMAR_VCCAP_REG );/* the registers might be more than one page */ drivers/iommu/dmar.c +0
-0map_size = max_t(int, ecap_max_iotlb_offset(iommu->ecap),include/linux/intel-iommu.h +2
-0@@ -186,6 +186,9 @@#define ecap_max_handle_mask (e) ((e >> 20) & 0xf)#define ecap_sc_support (e) ((e >> 7) & 0x1)/* Snooping Control */ +/* Virtual command interface capabilities */ +#define vccap_pasid (v) ((v & DMA_VCS_PAS))/* PASID
Quoted 1 line
allocation */
DMA_VCS_PAS is defined in [2/11]. should move to here.
Quoted 12 lines
include/linux/intel-iommu.h +2
-0+/* IOTLB_REG */ #define DMA_TLB_FLUSH_GRANU_OFFSET 60#define DMA_TLB_GLOBAL_FLUSH (((u64)1) << 60)@@ -520,6 +523,7 @@ struct intel_iommu {u64 reg_size;/* size of hw register set */ u64 cap;u64 ecap; +u64 vccap;u32 gcmd;/* Holds TE, EAFL. Don't need SRTP, SFL, WBF */ raw_spinlock_t register_lock;/* protect register handling */
Quoted 3 lines
int
seq_id; /* sequence id of the iommu */
--
2.7.4
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH v7 01/11] iommu/vt-d: Cache virtual command capability register
In reply to Jacob PanHi Jacob,
Quoted 37 lines · Jacob Pan
Virtual command registers are used in the guest only, to prevent vmexit cost, we cache the capability and store it during initialization.
Signed-off-by Jacob Pan <[email protected]>--- drivers/iommu/dmar.c | 1 + include/linux/intel-iommu.h | 4 ++++ 2 files changed, 5 insertions(+)drivers/iommu/dmar.c +1
-0@@ -950,6 +950,7 @@ static int map_iommu(struct intel_iommu *iommu, u64 phys_addr)warn_invalid_dmar (phys_addr," returns all ones" ); goto unmap; } + iommu->vccap =dmar_readq (iommu->reg +DMAR_VCCAP_REG );/* the registers might be more than one page */ map_size = max_t(int, ecap_max_iotlb_offset(iommu->ecap),include/linux/intel-iommu.h +3
-0@@ -186,6 +186,9 @@#define ecap_max_handle_mask (e) ((e >> 20) & 0xf)#define ecap_sc_support (e) ((e >> 7) & 0x1)/* Snooping Control */ +/* Virtual command interface capabilities */ +#define vccap_pasid (v) ((v & DMA_VCS_PAS))/* PASID allocation */ +/* IOTLB_REG */ #define DMA_TLB_FLUSH_GRANU_OFFSET 60#define DMA_TLB_GLOBAL_FLUSH (((u64)1) << 60)
include/linux/intel-iommu.h struct intel_iommu { · line 529
Quoted 7 lines
include/linux/intel-iommu.h +1
-0@@ -520,6 +523,7 @@ struct intel_iommu {u64 reg_size;/* size of hw register set */ u64 cap;u64 ecap; +u64 vccap;u32 gcmd;/* Holds TE, EAFL. Don't need SRTP, SFL, WBF */ raw_spinlock_t register_lock;/* protect register handling */ int seq_id;/* sequence id of the iommu */
with DMA_VCS_PAS's move in this patch as pointed out by Kevin or vccap_pasid() move to patch 3, feel free to add
Eric
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH v7 2/11 iommu/vt-d: Enlightened PASID allocation
In reply to Jacob PanFrom: Lu Baolu <[email protected]>
Enabling IOMMU in a guest requires communication with the host driver for certain aspects. Use of PASID ID to enable Shared Virtual Addressing (SVA) requires managing PASID's in the host. VT-d 3.0 spec provides a Virtual Command Register (VCMD) to facilitate this. Writes to this register in the guest are trapped by QEMU which proxies the call to the host driver.
This virtual command interface consists of a capability register, a virtual command register, and a virtual response register. Refer to section 10.4.42, 10.4.43, 10.4.44 for more information.
This patch adds the enlightened PASID allocation/free interfaces via the virtual command interface.
--- drivers/iommu/intel-pasid.c | 56 +++++++++++++++++++++++++++++++++++++++++++++ drivers/iommu/intel-pasid.h | 13 ++++++++++- include/linux/intel-iommu.h | 2 ++ 3 files changed, 70 insertions(+), 1 deletion(-)
drivers/iommu/intel-pasid.c +56 -0
@@ -63,6 +63,62 @@ void *intel_pasid_lookup_id(int pasid)return p; } +int vcmd_alloc_pasid (struct intel_iommu *iommu,unsigned int *pasid) +{ +unsigned long flags; +u8 status_code; +int ret =0 ; +u64 res; + +raw_spin_lock_irqsave (&iommu->register_lock, flags); +dmar_writeq (iommu->reg +DMAR_VCMD_REG ,VCMD_CMD_ALLOC ); +IOMMU_WAIT_OP (iommu,DMAR_VCRSP_REG , dmar_readq, + !(res &VCMD_VRSP_IP ), res); +raw_spin_unlock_irqrestore (&iommu->register_lock, flags); + + status_code =VCMD_VRSP_SC (res); +switch (status_code) { +case VCMD_VRSP_SC_SUCCESS : + *pasid =VCMD_VRSP_RESULT (res); +break ; +case VCMD_VRSP_SC_NO_PASID_AVAIL : +pr_info ("IOMMU: %s: No PASID available\n" , iommu->name); + ret = -ENOMEM ; +break ; +default : + ret = -ENODEV ; +pr_warn ("IOMMU: %s: Unexpected error code %d\n" , + iommu->name, status_code); + } + +return ret; +} + +void vcmd_free_pasid (struct intel_iommu *iommu,unsigned int pasid) +{ +unsigned long flags; +u8 status_code; +u64 res; + +raw_spin_lock_irqsave (&iommu->register_lock, flags); +dmar_writeq (iommu->reg +DMAR_VCMD_REG , (pasid <<8 ) |VCMD_CMD_FREE ); +IOMMU_WAIT_OP (iommu,DMAR_VCRSP_REG , dmar_readq, + !(res &VCMD_VRSP_IP ), res); +raw_spin_unlock_irqrestore (&iommu->register_lock, flags); + + status_code =VCMD_VRSP_SC (res); +switch (status_code) { +case VCMD_VRSP_SC_SUCCESS : +break ; +case VCMD_VRSP_SC_INVALID_PASID : +pr_info ("IOMMU: %s: Invalid PASID\n" , iommu->name); +break ; +default : +pr_warn ("IOMMU: %s: Unexpected error code %d\n" , + iommu->name, status_code); + } +} +/* * Per device pasid table management: */
drivers/iommu/intel-pasid.h +12 -1
@@ -23,6 +23,16 @@#define is_pasid_enabled (entry) (((entry)->lo >> 3) & 0x1)#define get_pasid_dir_size (entry) (1 << ((((entry)->lo >> 9) & 0x7) + 7)) +/* Virtual command interface for enlightened pasid management. */ +#define VCMD_CMD_ALLOC 0x1 +#define VCMD_CMD_FREE 0x2 +#define VCMD_VRSP_IP 0x1 +#define VCMD_VRSP_SC (e) (((e) >> 1) & 0x3) +#define VCMD_VRSP_SC_SUCCESS 0 +#define VCMD_VRSP_SC_NO_PASID_AVAIL 1 +#define VCMD_VRSP_SC_INVALID_PASID 1 +#define VCMD_VRSP_RESULT (e) (((e) >> 8) & 0xfffff) +/* * Domain ID reserved for pasid entries programmed for first-level * only and pass-through transfer modes.
@@ -95,5 +105,6 @@ int intel_pasid_setup_pass_through(struct intel_iommu *iommu, struct device *dev, int pasid);void intel_pasid_tear_down_entry (struct intel_iommu *iommu,struct device *dev,int pasid); - +int vcmd_alloc_pasid (struct intel_iommu *iommu,unsigned int *pasid); +void vcmd_free_pasid (struct intel_iommu *iommu,unsigned int pasid);#endif /* __INTEL_PASID_H */
include/linux/intel-iommu.h +2 -0
@@ -161,6 +161,7 @@#define ecap_smpwc (e) (((e) >> 48) & 0x1)#define ecap_flts (e) (((e) >> 47) & 0x1)#define ecap_slts (e) (((e) >> 46) & 0x1) +#define ecap_vcs (e) (((e) >> 44) & 0x1)#define ecap_smts (e) (((e) >> 43) & 0x1)#define ecap_dit (e) ((e >> 41) & 0x1)#define ecap_pasid (e) ((e >> 40) & 0x1)
@@ -282,6 +283,7 @@/* PRS_REG */ #define DMA_PRS_PPR ((u32)1) +#define DMA_VCS_PAS ((u64)1)#define IOMMU_WAIT_OP (iommu, offset, op, cond, sts) \ do { \
Signature · 6 lines
2.7.4 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
RE: [PATCH v7 02/11] iommu/vt-d: Enlightened PASID allocation
Quoted 45 lines
From: Jacob Pan [mailto:[email protected]]
Sent: Friday, October 25, 2019 3:55 AMFrom: Lu Baolu <[email protected]>
Enabling IOMMU in a guest requires communication with the host driver for certain aspects. Use of PASID ID to enable Shared Virtual Addressing (SVA) requires managing PASID's in the host. VT-d 3.0 spec provides a Virtual Command Register (VCMD) to facilitate this. Writes to this register in the guest are trapped by QEMU which proxies the call to the host driver.
This virtual command interface consists of a capability register, a virtual command register, and a virtual response register. Refer to section 10.4.42, 10.4.43, 10.4.44 for more information.
This patch adds the enlightened PASID allocation/free interfaces via the virtual command interface.
Cc Ashok Raj <[email protected]>Cc Jacob Pan <[email protected]>Cc Kevin Tian <[email protected]>Signed-off-by Liu Yi L <[email protected]>Signed-off-by Lu Baolu <[email protected]>Signed-off-by Jacob Pan <[email protected]>Reviewed-by Eric Auger <[email protected]>--- drivers/iommu/intel-pasid.c | 56 +++++++++++++++++++++++++++++++++++++++++++++ drivers/iommu/intel-pasid.h | 13 ++++++++++- include/linux/intel-iommu.h | 2 ++ 3 files changed, 70 insertions(+), 1 deletion(-)drivers/iommu/intel-pasid.c +4
-0@@ -63,6 +63,62 @@ void *intel_pasid_lookup_id(int pasid)return p; } +int vcmd_alloc_pasid (struct intel_iommu *iommu,unsigned int *pasid) +{ +unsigned long flags; +u8 status_code;
drivers/iommu/intel-pasid.c void *intel_pasid_lookup_id(int pasid) · line 79
Quoted 10 lines
drivers/iommu/intel-pasid.c +9
-0+int ret =0 ; +u64 res; + +raw_spin_lock_irqsave (&iommu->register_lock, flags); +dmar_writeq (iommu->reg +DMAR_VCMD_REG ,VCMD_CMD_ALLOC ); +IOMMU_WAIT_OP (iommu,DMAR_VCRSP_REG , dmar_readq, + !(res &VCMD_VRSP_IP ), res); +raw_spin_unlock_irqrestore (&iommu->register_lock, flags); +
should we handle VCMD_VRSP_IP here?
Quoted 18 lines
drivers/iommu/intel-pasid.c +17
-0+ status_code =VCMD_VRSP_SC (res); +switch (status_code) { +case VCMD_VRSP_SC_SUCCESS : + *pasid =VCMD_VRSP_RESULT (res); +break ; +case VCMD_VRSP_SC_NO_PASID_AVAIL : +pr_info ("IOMMU: %s: No PASID available\n" , iommu- >name); + ret = -ENOMEM ; +break ; +default : + ret = -ENODEV ; +pr_warn ("IOMMU: %s: Unexpected error code %d\n" , + iommu->name, status_code); + } + +return ret; +}
drivers/iommu/intel-pasid.c void *intel_pasid_lookup_id(int pasid)
Quoted 10 lines
drivers/iommu/intel-pasid.c +9
-0+ +void vcmd_free_pasid (struct intel_iommu *iommu,unsigned int pasid) +{ +unsigned long flags; +u8 status_code; +u64 res; + +raw_spin_lock_irqsave (&iommu->register_lock, flags); +dmar_writeq (iommu->reg +DMAR_VCMD_REG , (pasid <<8 ) |VCMD_CMD_FREE );
define a macro for pasid offset.
Quoted 70 lines
drivers/iommu/intel-pasid.c +17
-0+IOMMU_WAIT_OP (iommu,DMAR_VCRSP_REG , dmar_readq, + !(res &VCMD_VRSP_IP ), res); +raw_spin_unlock_irqrestore (&iommu->register_lock, flags); + + status_code =VCMD_VRSP_SC (res); +switch (status_code) { +case VCMD_VRSP_SC_SUCCESS : +break ; +case VCMD_VRSP_SC_INVALID_PASID : +pr_info ("IOMMU: %s: Invalid PASID\n" , iommu->name); +break ; +default : +pr_warn ("IOMMU: %s: Unexpected error code %d\n" , + iommu->name, status_code); + } +} +/*
* Per device pasid table management:
*/drivers/iommu/intel-pasid.h +12
-1@@ -23,6 +23,16 @@#define is_pasid_enabled (entry) (((entry)->lo >> 3) & 0x1)#define get_pasid_dir_size (entry) (1 << ((((entry)->lo >> 9) & 0x7) + 7)) +/* Virtual command interface for enlightened pasid management. */ +#define VCMD_CMD_ALLOC 0x1 +#define VCMD_CMD_FREE 0x2 +#define VCMD_VRSP_IP 0x1 +#define VCMD_VRSP_SC (e) (((e) >> 1) & 0x3) +#define VCMD_VRSP_SC_SUCCESS 0 +#define VCMD_VRSP_SC_NO_PASID_AVAIL 1 +#define VCMD_VRSP_SC_INVALID_PASID 1 +#define VCMD_VRSP_RESULT (e) (((e) >> 8) & 0xfffff) +/* * Domain ID reserved for pasid entries programmed for first-level * only and pass-through transfer modes. @@ -95,5 +105,6 @@ int intel_pasid_setup_pass_through(structintel_iommu *iommu, struct device *dev, int pasid);void intel_pasid_tear_down_entry (struct intel_iommu *iommu,struct device *dev,int pasid); - +int vcmd_alloc_pasid (struct intel_iommu *iommu,unsigned int *pasid); +void vcmd_free_pasid (struct intel_iommu *iommu,unsigned int pasid);#endif /*
__INTEL_PASID_H*/include/linux/intel-iommu.h +2
-0@@ -161,6 +161,7 @@#define ecap_smpwc (e) (((e) >> 48) & 0x1)#define ecap_flts (e) (((e) >> 47) & 0x1)#define ecap_slts (e) (((e) >> 46) & 0x1) +#define ecap_vcs (e) (((e) >> 44) & 0x1)#define ecap_smts (e) (((e) >> 43) & 0x1)#define ecap_dit (e) ((e >> 41) & 0x1)#define ecap_pasid (e) ((e >> 40) & 0x1)@@ -282,6 +283,7 @@/* PRS_REG */ #define DMA_PRS_PPR ((u32)1) +#define DMA_VCS_PAS ((u64)1)#define IOMMU_WAIT_OP (iommu, offset, op, cond, sts) \
Quoted 3 lines
do { \
--
2.7.4
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH v7 02/11] iommu/vt-d: Enlightened PASID allocation
Quoted 41 lines · Kevin
Quoted 41 lines
From: Jacob Pan [mailto:[email protected]]
Sent: Friday, October 25, 2019 3:55 AMFrom: Lu Baolu <[email protected]>
Enabling IOMMU in a guest requires communication with the host driver for certain aspects. Use of PASID ID to enable Shared Virtual Addressing (SVA) requires managing PASID's in the host. VT-d 3.0 spec provides a Virtual Command Register (VCMD) to facilitate this. Writes to this register in the guest are trapped by QEMU which proxies the call to the host driver.
This virtual command interface consists of a capability register, a virtual command register, and a virtual response register. Refer to section 10.4.42, 10.4.43, 10.4.44 for more information.
This patch adds the enlightened PASID allocation/free interfaces via the virtual command interface.
Cc Ashok Raj <[email protected]>Cc Jacob Pan <[email protected]>Cc Kevin Tian <[email protected]>Signed-off-by Liu Yi L <[email protected]>Signed-off-by Lu Baolu <[email protected]>Signed-off-by Jacob Pan <[email protected]>Reviewed-by Eric Auger <[email protected]>--- drivers/iommu/intel-pasid.c | 56 +++++++++++++++++++++++++++++++++++++++++++++ drivers/iommu/intel-pasid.h | 13 ++++++++++- include/linux/intel-iommu.h | 2 ++ 3 files changed, 70 insertions(+), 1 deletion(-)(quoted diff) +0
-0
b/drivers/iommu/intel-pasid.cindex040a445be300..d81e857d2b25100644 ---a/drivers/iommu/intel-pasid.c
+++b/drivers/iommu/intel-pasid.cdrivers/iommu/intel-pasid.c +0
-0@@ -63,6 +63,62 @@ void *intel_pasid_lookup_id(int pasid)return p; }
Quoted 16 lines
Quoted 4 lines
drivers/iommu/intel-pasid.c +3
-0+int vcmd_alloc_pasid (struct intel_iommu *iommu,unsigned int *pasid) +{ +unsigned long flags; +u8 status_code;drivers/iommu/intel-pasid.c void *intel_pasid_lookup_id(int pasid) · line 78
Quoted 10 lines
drivers/iommu/intel-pasid.c +9
-0+int ret =0 ; +u64 res; + +raw_spin_lock_irqsave (&iommu->register_lock, flags); +dmar_writeq (iommu->reg +DMAR_VCMD_REG ,VCMD_CMD_ALLOC ); +IOMMU_WAIT_OP (iommu,DMAR_VCRSP_REG , dmar_readq, + !(res &VCMD_VRSP_IP ), res); +raw_spin_unlock_irqrestore (&iommu->register_lock, flags); +should we handle
VCMD_VRSP_IPhere?
VCMD_VRSP_IP is checked above, if it times out, you will get panic. Not sure whatelse to do?
Quoted 23 lines
Quoted 23 lines
drivers/iommu/intel-pasid.c +21
-0+ status_code =VCMD_VRSP_SC (res); +switch (status_code) { +case VCMD_VRSP_SC_SUCCESS : + *pasid =VCMD_VRSP_RESULT (res); +break ; +case VCMD_VRSP_SC_NO_PASID_AVAIL : +pr_info ("IOMMU: %s: No PASID available\n" , iommu- >name); + ret = -ENOMEM ; +break ; +default : + ret = -ENODEV ; +pr_warn ("IOMMU: %s: Unexpected error code %d\n" , + iommu->name, status_code); + } + +return ret; +} + +void vcmd_free_pasid (struct intel_iommu *iommu,unsigned int pasid) +{ +unsigned long flags;
Quoted 9 lines
Quoted 6 lines
drivers/iommu/intel-pasid.c +5
-0+u8 status_code; +u64 res; + +raw_spin_lock_irqsave (&iommu->register_lock, flags); + dmar_writeq(iommu->reg + DMAR_VCMD_REG, (pasid << 8) |
VCMD_CMD_FREE);define a macro for pasid offset.
will do.
Quoted 69 lines
Quoted 69 lines
drivers/iommu/intel-pasid.c +17
-0+IOMMU_WAIT_OP (iommu,DMAR_VCRSP_REG , dmar_readq, + !(res &VCMD_VRSP_IP ), res); +raw_spin_unlock_irqrestore (&iommu->register_lock, flags); + + status_code =VCMD_VRSP_SC (res); +switch (status_code) { +case VCMD_VRSP_SC_SUCCESS : +break ; +case VCMD_VRSP_SC_INVALID_PASID : +pr_info ("IOMMU: %s: Invalid PASID\n" , iommu->name); +break ; +default : +pr_warn ("IOMMU: %s: Unexpected error code %d\n" , + iommu->name, status_code); + } +} +/* * Per device pasid table management: */ (quoted diff) +0
-0
b/drivers/iommu/intel-pasid.hindexfc8cd8f17de1..e413e884e685100644 ---a/drivers/iommu/intel-pasid.h
+++b/drivers/iommu/intel-pasid.h(quoted diff) +0
-0@@ -23,6 +23,16 @@ #define is_pasid_enabled(entry) (((entry)->lo >> 3)&
0x1) #defineget_pasid_dir_size(entry)(1 <<
((((entry)->lo >> 9) &0x7) + 7))drivers/iommu/intel-pasid.h +11
-1+/* Virtual command interface for enlightened pasid management. */ +#define VCMD_CMD_ALLOC 0x1 +#define VCMD_CMD_FREE 0x2 +#define VCMD_VRSP_IP 0x1 +#define VCMD_VRSP_SC (e) (((e) >> 1) & 0x3) +#define VCMD_VRSP_SC_SUCCESS 0 +#define VCMD_VRSP_SC_NO_PASID_AVAIL 1 +#define VCMD_VRSP_SC_INVALID_PASID 1 +#define VCMD_VRSP_RESULT (e) (((e) >> 8) & 0xfffff) +/* * Domain ID reserved for pasid entries programmed for first-level * only and pass-through transfer modes. @@ -95,5 +105,6 @@ int intel_pasid_setup_pass_through(structintel_iommu *iommu, struct device *dev, int pasid);void intel_pasid_tear_down_entry (struct intel_iommu *iommu,struct device *dev,int pasid); - +int vcmd_alloc_pasid(struct intel_iommu *iommu, unsigned int*pasid); +void
vcmd_free_pasid(struct intel_iommu *iommu, unsigned int pasid); #endif /*__INTEL_PASID_H*/(quoted diff) +0
-0
b/include/linux/intel-iommu.hindex2e1bed9b7eef..1d4b8dcdc5d8100644 ---a/include/linux/intel-iommu.h
+++b/include/linux/intel-iommu.hinclude/linux/intel-iommu.h +2
-0@@ -161,6 +161,7 @@#define ecap_smpwc (e) (((e) >> 48) & 0x1)#define ecap_flts (e) (((e) >> 47) & 0x1)#define ecap_slts (e) (((e) >> 46) & 0x1) +#define ecap_vcs (e) (((e) >> 44) & 0x1)#define ecap_smts (e) (((e) >> 43) & 0x1)#define ecap_dit (e) ((e >> 41) & 0x1)#define ecap_pasid (e) ((e >> 40) & 0x1)@@ -282,6 +283,7 @@/* PRS_REG */ #define DMA_PRS_PPR ((u32)1) +#define DMA_VCS_PAS ((u64)1)
Quoted 6 lines
Quoted 5 lines
(quoted diff) +0
-0#define IOMMU_WAIT_OP(iommu, offset, op, cond, sts) \do
{
\ -- 2.7.4
[Jacob Pan]
RE: [PATCH v7 02/11] iommu/vt-d: Enlightened PASID allocation
Quoted 57 lines
From: Jacob Pan [mailto:[email protected]]
Sent: Wednesday, October 30, 2019 1:15 AMQuoted 39 lines
Quoted 39 lines
From: Lu Baolu <[email protected]>
Enabling IOMMU in a guest requires communication with the host driver for certain aspects. Use of PASID ID to enable Shared Virtual Addressing (SVA) requires managing PASID's in the host. VT-d 3.0 spec provides a Virtual Command Register (VCMD) to facilitate this. Writes to this register in the guest are trapped by QEMU which proxies the call to the host driver.
This virtual command interface consists of a capability register, a virtual command register, and a virtual response register. Refer to section 10.4.42, 10.4.43, 10.4.44 for more information.
This patch adds the enlightened PASID allocation/free interfaces via the virtual command interface.
Cc Ashok Raj <[email protected]>Cc Jacob Pan <[email protected]>Cc Kevin Tian <[email protected]>Signed-off-by Liu Yi L <[email protected]>Signed-off-by Lu Baolu <[email protected]>Signed-off-by Jacob Pan <[email protected]>Reviewed-by Eric Auger <[email protected]>--- drivers/iommu/intel-pasid.c | 56 +++++++++++++++++++++++++++++++++++++++++++++ drivers/iommu/intel-pasid.h | 13 ++++++++++- include/linux/intel-iommu.h | 2 ++ 3 files changed, 70 insertions(+), 1 deletion(-)(quoted diff) +0
-0
b/drivers/iommu/intel-pasid.cindex040a445be300..d81e857d2b25100644 ---a/drivers/iommu/intel-pasid.c
+++b/drivers/iommu/intel-pasid.cdrivers/iommu/intel-pasid.c +0
-0@@ -63,6 +63,62 @@ void *intel_pasid_lookup_id(int pasid)return p; }Quoted 16 lines
Quoted 4 lines
drivers/iommu/intel-pasid.c +3
-0+int vcmd_alloc_pasid (struct intel_iommu *iommu,unsigned int *pasid) +{ +unsigned long flags; +u8 status_code;drivers/iommu/intel-pasid.c void *intel_pasid_lookup_id(int pasid) · line 78
Quoted 10 lines
drivers/iommu/intel-pasid.c +9
-0+int ret =0 ; +u64 res; + +raw_spin_lock_irqsave (&iommu->register_lock, flags); +dmar_writeq (iommu->reg +DMAR_VCMD_REG ,VCMD_CMD_ALLOC ); +IOMMU_WAIT_OP (iommu,DMAR_VCRSP_REG , dmar_readq, + !(res &VCMD_VRSP_IP ), res); +raw_spin_unlock_irqrestore (&iommu->register_lock, flags); +should we handle
VCMD_VRSP_IPhere?
Quoted 2 lines
VCMD_VRSP_IPis checked above, if it times out, you will get panic. Not sure whatelse to do?
Not need. I misunderstood the condition here.
Quoted 103 lines
Quoted 23 lines
Quoted 23 lines
drivers/iommu/intel-pasid.c +21
-0+ status_code =VCMD_VRSP_SC (res); +switch (status_code) { +case VCMD_VRSP_SC_SUCCESS : + *pasid =VCMD_VRSP_RESULT (res); +break ; +case VCMD_VRSP_SC_NO_PASID_AVAIL : +pr_info ("IOMMU: %s: No PASID available\n" , iommu- >name); + ret = -ENOMEM ; +break ; +default : + ret = -ENODEV ; +pr_warn ("IOMMU: %s: Unexpected error code %d\n" , + iommu->name, status_code); + } + +return ret; +} + +void vcmd_free_pasid (struct intel_iommu *iommu,unsigned int pasid) +{ +unsigned long flags;Quoted 9 lines
Quoted 6 lines
drivers/iommu/intel-pasid.c +5
-0+u8 status_code; +u64 res; + +raw_spin_lock_irqsave (&iommu->register_lock, flags); + dmar_writeq(iommu->reg + DMAR_VCMD_REG, (pasid << 8) |
VCMD_CMD_FREE);define a macro for pasid offset.
will do.
Quoted 69 lines
Quoted 69 lines
drivers/iommu/intel-pasid.c +17
-0+IOMMU_WAIT_OP (iommu,DMAR_VCRSP_REG , dmar_readq, + !(res &VCMD_VRSP_IP ), res); +raw_spin_unlock_irqrestore (&iommu->register_lock, flags); + + status_code =VCMD_VRSP_SC (res); +switch (status_code) { +case VCMD_VRSP_SC_SUCCESS : +break ; +case VCMD_VRSP_SC_INVALID_PASID : +pr_info ("IOMMU: %s: Invalid PASID\n" , iommu->name); +break ; +default : +pr_warn ("IOMMU: %s: Unexpected error code %d\n" , + iommu->name, status_code); + } +} +/* * Per device pasid table management: */ (quoted diff) +0
-0
b/drivers/iommu/intel-pasid.hindexfc8cd8f17de1..e413e884e685100644 ---a/drivers/iommu/intel-pasid.h
+++b/drivers/iommu/intel-pasid.h(quoted diff) +0
-0@@ -23,6 +23,16 @@ #define is_pasid_enabled(entry) (((entry)->lo >> 3)&
0x1) #defineget_pasid_dir_size(entry)(1 <<
((((entry)->lo >> 9) &0x7) + 7))drivers/iommu/intel-pasid.h +11
-1+/* Virtual command interface for enlightened pasid management. */ +#define VCMD_CMD_ALLOC 0x1 +#define VCMD_CMD_FREE 0x2 +#define VCMD_VRSP_IP 0x1 +#define VCMD_VRSP_SC (e) (((e) >> 1) & 0x3) +#define VCMD_VRSP_SC_SUCCESS 0 +#define VCMD_VRSP_SC_NO_PASID_AVAIL 1 +#define VCMD_VRSP_SC_INVALID_PASID 1 +#define VCMD_VRSP_RESULT (e) (((e) >> 8) & 0xfffff) +/* * Domain ID reserved for pasid entries programmed for first-level * only and pass-through transfer modes. @@ -95,5 +105,6 @@ int intel_pasid_setup_pass_through(structintel_iommu *iommu, struct device *dev, int pasid);void intel_pasid_tear_down_entry (struct intel_iommu *iommu,struct device *dev,int pasid); - +int vcmd_alloc_pasid(struct intel_iommu *iommu, unsigned int*pasid); +void
vcmd_free_pasid(struct intel_iommu *iommu, unsigned int pasid); #endif /*__INTEL_PASID_H*/(quoted diff) +0
-0
b/include/linux/intel-iommu.hindex2e1bed9b7eef..1d4b8dcdc5d8100644 ---a/include/linux/intel-iommu.h
+++b/include/linux/intel-iommu.hinclude/linux/intel-iommu.h +2
-0@@ -161,6 +161,7 @@#define ecap_smpwc (e) (((e) >> 48) & 0x1)#define ecap_flts (e) (((e) >> 47) & 0x1)#define ecap_slts (e) (((e) >> 46) & 0x1) +#define ecap_vcs (e) (((e) >> 44) & 0x1)#define ecap_smts (e) (((e) >> 43) & 0x1)#define ecap_dit (e) ((e >> 41) & 0x1)#define ecap_pasid (e) ((e >> 40) & 0x1)@@ -282,6 +283,7 @@/* PRS_REG */ #define DMA_PRS_PPR ((u32)1) +#define DMA_VCS_PAS ((u64)1)
Quoted 8 lines
Quoted 6 lines
Quoted 5 lines
(quoted diff) +0
-0#define IOMMU_WAIT_OP(iommu, offset, op, cond, sts) \do
{
\ -- 2.7.4[Jacob Pan]
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH v7 02/11] iommu/vt-d: Enlightened PASID allocation
In reply to Jacob PanHi Jacob,
Quoted 103 lines · Jacob Pan
From: Lu Baolu <[email protected]>
Enabling IOMMU in a guest requires communication with the host driver for certain aspects. Use of PASID ID to enable Shared Virtual Addressing (SVA) requires managing PASID's in the host. VT-d 3.0 spec provides a Virtual Command Register (VCMD) to facilitate this. Writes to this register in the guest are trapped by QEMU which proxies the call to the host driver.
This virtual command interface consists of a capability register, a virtual command register, and a virtual response register. Refer to section 10.4.42, 10.4.43, 10.4.44 for more information.
This patch adds the enlightened PASID allocation/free interfaces via the virtual command interface.
Cc Ashok Raj <[email protected]>Cc Jacob Pan <[email protected]>Cc Kevin Tian <[email protected]>Signed-off-by Liu Yi L <[email protected]>Signed-off-by Lu Baolu <[email protected]>Signed-off-by Jacob Pan <[email protected]>Reviewed-by Eric Auger <[email protected]>--- drivers/iommu/intel-pasid.c | 56 +++++++++++++++++++++++++++++++++++++++++++++ drivers/iommu/intel-pasid.h | 13 ++++++++++- include/linux/intel-iommu.h | 2 ++ 3 files changed, 70 insertions(+), 1 deletion(-)drivers/iommu/intel-pasid.c +56
-0@@ -63,6 +63,62 @@ void *intel_pasid_lookup_id(int pasid)return p; } +int vcmd_alloc_pasid (struct intel_iommu *iommu,unsigned int *pasid) +{ +unsigned long flags; +u8 status_code; +int ret =0 ; +u64 res; + +raw_spin_lock_irqsave (&iommu->register_lock, flags); +dmar_writeq (iommu->reg +DMAR_VCMD_REG ,VCMD_CMD_ALLOC ); +IOMMU_WAIT_OP (iommu,DMAR_VCRSP_REG , dmar_readq, + !(res &VCMD_VRSP_IP ), res); +raw_spin_unlock_irqrestore (&iommu->register_lock, flags); + + status_code =VCMD_VRSP_SC (res); +switch (status_code) { +case VCMD_VRSP_SC_SUCCESS : + *pasid =VCMD_VRSP_RESULT (res); +break ; +case VCMD_VRSP_SC_NO_PASID_AVAIL : +pr_info ("IOMMU: %s: No PASID available\n" , iommu->name); + ret = -ENOMEM ; +break ; +default : + ret = -ENODEV ; +pr_warn ("IOMMU: %s: Unexpected error code %d\n" , + iommu->name, status_code); + } + +return ret; +} + +void vcmd_free_pasid (struct intel_iommu *iommu,unsigned int pasid) +{ +unsigned long flags; +u8 status_code; +u64 res; + +raw_spin_lock_irqsave (&iommu->register_lock, flags); +dmar_writeq (iommu->reg +DMAR_VCMD_REG , (pasid <<8 ) |VCMD_CMD_FREE ); +IOMMU_WAIT_OP (iommu,DMAR_VCRSP_REG , dmar_readq, + !(res &VCMD_VRSP_IP ), res); +raw_spin_unlock_irqrestore (&iommu->register_lock, flags); + + status_code =VCMD_VRSP_SC (res); +switch (status_code) { +case VCMD_VRSP_SC_SUCCESS : +break ; +case VCMD_VRSP_SC_INVALID_PASID : +pr_info ("IOMMU: %s: Invalid PASID\n" , iommu->name); +break ; +default : +pr_warn ("IOMMU: %s: Unexpected error code %d\n" , + iommu->name, status_code); + } +} +/* * Per device pasid table management: */ drivers/iommu/intel-pasid.h +0
-0@@ -23,6 +23,16 @@#define is_pasid_enabled (entry) (((entry)->lo >> 3) & 0x1)#define get_pasid_dir_size (entry) (1 << ((((entry)->lo >> 9) & 0x7) + 7))
drivers/iommu/intel-pasid.h line 34
Quoted 10 lines
drivers/iommu/intel-pasid.h +9
-0+/* Virtual command interface for enlightened pasid management. */ +#define VCMD_CMD_ALLOC 0x1 +#define VCMD_CMD_FREE 0x2 +#define VCMD_VRSP_IP 0x1 +#define VCMD_VRSP_SC (e) (((e) >> 1) & 0x3) +#define VCMD_VRSP_SC_SUCCESS 0 +#define VCMD_VRSP_SC_NO_PASID_AVAIL 1 +#define VCMD_VRSP_SC_INVALID_PASID 1 +#define VCMD_VRSP_RESULT (e) (((e) >> 8) & 0xfffff)
nit: pasid is 20b but result field is 56b large Just in case a new command were to be added later on.
Quoted 17 lines
drivers/iommu/intel-pasid.h +3
-1+/* * Domain ID reserved for pasid entries programmed for first-level * only and pass-through transfer modes. @@ -95,5 +105,6 @@ int intel_pasid_setup_pass_through(struct intel_iommu *iommu, struct device *dev, int pasid);void intel_pasid_tear_down_entry (struct intel_iommu *iommu,struct device *dev,int pasid); - +int vcmd_alloc_pasid (struct intel_iommu *iommu,unsigned int *pasid); +void vcmd_free_pasid (struct intel_iommu *iommu,unsigned int pasid);#endif /* __INTEL_PASID_H */ include/linux/intel-iommu.h +0
-0
include/linux/intel-iommu.h line 164
Quoted 4 lines
include/linux/intel-iommu.h +1
-0@@ -161,6 +161,7 @@#define ecap_smpwc (e) (((e) >> 48) & 0x1)#define ecap_flts (e) (((e) >> 47) & 0x1)#define ecap_slts (e) (((e) >> 46) & 0x1) +#define ecap_vcs (e) (((e) >> 44) & 0x1)
nit: this addition is not related to this patch
may be moved to [3] as vccap_pasid
include/linux/intel-iommu.h line 289
Quoted 12 lines
include/linux/intel-iommu.h +1
-0#define ecap_smts (e) (((e) >> 43) & 0x1)#define ecap_dit (e) ((e >> 41) & 0x1)#define ecap_pasid (e) ((e >> 40) & 0x1)@@ -282,6 +283,7 @@/* PRS_REG */ #define DMA_PRS_PPR ((u32)1) +#define DMA_VCS_PAS ((u64)1)#define IOMMU_WAIT_OP (iommu, offset, op, cond, sts) \ do { \
Otherwise looks good to me
Thanks
Eric
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH v7 02/11] iommu/vt-d: Enlightened PASID allocation
Quoted 112 lines · On Fri, 8 Nov 2019 11:33:22 +0100 Auger Eric <[email protected]> wrote:
Hi Jacob,
Quoted 110 lines · Jacob Pan
From: Lu Baolu <[email protected]>
Enabling IOMMU in a guest requires communication with the host driver for certain aspects. Use of PASID ID to enable Shared Virtual Addressing (SVA) requires managing PASID's in the host. VT-d 3.0 spec provides a Virtual Command Register (VCMD) to facilitate this. Writes to this register in the guest are trapped by QEMU which proxies the call to the host driver.
This virtual command interface consists of a capability register, a virtual command register, and a virtual response register. Refer to section 10.4.42, 10.4.43, 10.4.44 for more information.
This patch adds the enlightened PASID allocation/free interfaces via the virtual command interface.
Cc Ashok Raj <[email protected]>Cc Jacob Pan <[email protected]>Cc Kevin Tian <[email protected]>Signed-off-by Liu Yi L <[email protected]>Signed-off-by Lu Baolu <[email protected]>Signed-off-by Jacob Pan <[email protected]>Reviewed-by Eric Auger <[email protected]>--- drivers/iommu/intel-pasid.c | 56+++++++++++++++++++++++++++++++++++++++++++++
drivers/iommu/intel-pasid.h| 13 ++++++++++-include/linux/intel-iommu.h| 2 ++ 3 files changed, 70 insertions(+), 1 deletion(-)(quoted diff) +0
-0
b/drivers/iommu/intel-pasid.cindex040a445be300..d81e857d2b25100644 ---a/drivers/iommu/intel-pasid.c
+++b/drivers/iommu/intel-pasid.cdrivers/iommu/intel-pasid.c +55
-0@@ -63,6 +63,62 @@ void *intel_pasid_lookup_id(int pasid)return p; } +int vcmd_alloc_pasid (struct intel_iommu *iommu,unsigned int *pasid) +{ +unsigned long flags; +u8 status_code; +int ret =0 ; +u64 res; + +raw_spin_lock_irqsave (&iommu->register_lock, flags); +dmar_writeq (iommu->reg +DMAR_VCMD_REG ,VCMD_CMD_ALLOC ); +IOMMU_WAIT_OP (iommu,DMAR_VCRSP_REG , dmar_readq, + !(res &VCMD_VRSP_IP ), res); +raw_spin_unlock_irqrestore (&iommu->register_lock, flags); + + status_code =VCMD_VRSP_SC (res); +switch (status_code) { +case VCMD_VRSP_SC_SUCCESS : + *pasid =VCMD_VRSP_RESULT (res); +break ; +case VCMD_VRSP_SC_NO_PASID_AVAIL : +pr_info ("IOMMU: %s: No PASID available\n" , iommu->name); + ret = -ENOMEM ; +break ; +default : + ret = -ENODEV ; +pr_warn ("IOMMU: %s: Unexpected error code %d\n" , + iommu->name, status_code); + } + +return ret; +} + +void vcmd_free_pasid (struct intel_iommu *iommu,unsigned int pasid) +{ +unsigned long flags; +u8 status_code; +u64 res; + +raw_spin_lock_irqsave (&iommu->register_lock, flags); +dmar_writeq (iommu->reg +DMAR_VCMD_REG , (pasid <<8 ) |VCMD_CMD_FREE ); +IOMMU_WAIT_OP (iommu,DMAR_VCRSP_REG , dmar_readq, + !(res &VCMD_VRSP_IP ), res); +raw_spin_unlock_irqrestore (&iommu->register_lock, flags); + + status_code =VCMD_VRSP_SC (res); +switch (status_code) { +case VCMD_VRSP_SC_SUCCESS : +break ; +case VCMD_VRSP_SC_INVALID_PASID : +pr_info ("IOMMU: %s: Invalid PASID\n" , iommu->name); +break ; +default : +pr_warn ("IOMMU: %s: Unexpected error code %d\n" , + iommu->name, status_code); + } +} +/* * Per device pasid table management: */ (quoted diff) +0
-0
b/drivers/iommu/intel-pasid.hindexfc8cd8f17de1..e413e884e685100644 ---a/drivers/iommu/intel-pasid.h
+++b/drivers/iommu/intel-pasid.h(quoted diff) +0
-0@@ -23,6 +23,16 @@ #define is_pasid_enabled(entry) (((entry)->lo >> 3)&
0x1) #defineget_pasid_dir_size(entry)(1 <<
((((entry)->lo >> 9) &0x7) + 7))drivers/iommu/intel-pasid.h +3
-0+/* Virtual command interface for enlightened pasid management. */ +#define VCMD_CMD_ALLOC 0x1 +#define VCMD_CMD_FREE 0x2
Quoted 8 lines
drivers/iommu/intel-pasid.h line 34
Quoted 6 lines
drivers/iommu/intel-pasid.h +6
-0+#define VCMD_VRSP_IP 0x1 +#define VCMD_VRSP_SC (e) (((e) >> 1) & 0x3) +#define VCMD_VRSP_SC_SUCCESS 0 +#define VCMD_VRSP_SC_NO_PASID_AVAIL 1 +#define VCMD_VRSP_SC_INVALID_PASID 1 +#define VCMD_VRSP_RESULT (e) (((e) >> 8) & 0xfffff)nit: pasid is 20b but result field is 56b large Just in case a new command were to be added later on.
Good point, will rename to VCMD_VRSP_RESULT_PASID andd new macros for future new commands with different results.
Quoted 15 lines
Quoted 15 lines
drivers/iommu/intel-pasid.h +2
-1+/* * Domain ID reserved for pasid entries programmed for first-level * only and pass-through transfer modes. @@ -95,5 +105,6 @@ int intel_pasid_setup_pass_through(struct intel_iommu *iommu, struct device *dev, int pasid);void intel_pasid_tear_down_entry (struct intel_iommu *iommu,struct device *dev,int pasid); - +int vcmd_alloc_pasid (struct intel_iommu *iommu,unsigned int *pasid); +void vcmd_free_pasid(struct intel_iommu *iommu, unsignedint pasid); #endif /*
__INTEL_PASID_H*/(quoted diff) +0
-0
b/include/linux/intel-iommu.hindex2e1bed9b7eef..1d4b8dcdc5d8100644 ---a/include/linux/intel-iommu.h
Quoted 8 lines
include/linux/intel-iommu.h line 164
Quoted 6 lines
+++
b/include/linux/intel-iommu.hinclude/linux/intel-iommu.h +1
-0@@ -161,6 +161,7 @@#define ecap_smpwc (e) (((e) >> 48) & 0x1)#define ecap_flts (e) (((e) >> 47) & 0x1)#define ecap_slts (e) (((e) >> 46) & 0x1) +#define ecap_vcs (e) (((e) >> 44) & 0x1)nit: this addition is not related to this patch
may be moved to [3] asvccap_pasid
Sounds good.
Thanks
Quoted 15 lines
Quoted 10 lines
include/linux/intel-iommu.h +1
-0#define ecap_smts (e) (((e) >> 43) & 0x1)#define ecap_dit (e) ((e >> 41) & 0x1)#define ecap_pasid (e) ((e >> 40) & 0x1)@@ -282,6 +283,7 @@/* PRS_REG */ #define DMA_PRS_PPR ((u32)1) +#define DMA_VCS_PAS ((u64)1) #define IOMMU_WAIT_OP(iommu, offset, op, cond,Quoted 3 lines
sts) \ do
{
\Otherwise looks good to me
Quoted 4 lines
Thanks
Eric
[Jacob Pan]
PATCH v7 3/11 iommu/vt-d: Add custom allocator for IOASID
In reply to Jacob PanWhen VT-d driver runs in the guest, PASID allocation must be performed via virtual command interface. This patch registers a custom IOASID allocator which takes precedence over the default XArray based allocator. The resulting IOASID allocation will always come from the host. This ensures that PASID namespace is system- wide.
--- drivers/iommu/Kconfig | 1 + drivers/iommu/intel-iommu.c | 67 +++++++++++++++++++++++++++++++++++++++++++++ include/linux/intel-iommu.h | 2 ++ 3 files changed, 70 insertions(+)
drivers/iommu/Kconfig +1 -0
@@ -211,6 +211,7 @@ config INTEL_IOMMU_SVM bool "Support for Shared Virtual Memory with Intel IOMMU" depends on INTEL_IOMMU && X86 select PCI_PASID + select IOASID select MMU_NOTIFIER help Shared Virtual Memory (SVM) provides a facility for devices
drivers/iommu/intel-iommu.c +67 -0
85 lines not on this page · raw message
include/linux/intel-iommu.h +2 -0
@@ -19,6 +19,7 @@#include <linux/iommu.h> #include <linux/io-64-nonatomic-lo-hi.h> #include <linux/dmar.h> +#include <linux/ioasid.h> #include <asm/cacheflush.h> #include <asm/iommu.h>
@@ -546,6 +547,7 @@ struct intel_iommu {#ifdef CONFIG_INTEL_IOMMU_SVM struct page_req_dsc *prq;unsigned char prq_name[16 ];/* Name for PRQ interrupt */ +struct ioasid_allocator_ops pasid_allocator;/* Custom allocator for PASIDs */ #endif struct q_inval *qi;/* Queued invalidation info */ u32 *iommu_state;/* Store iommu states between suspend and resume.*/
Signature · 6 lines
2.7.4 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH v7 03/11] iommu/vt-d: Add custom allocator for IOASID
Hi Jacob,
Quoted 33 lines · Jacob Pan
When VT-d driver runs in the guest, PASID allocation must be performed via virtual command interface. This patch registers a custom IOASID allocator which takes precedence over the default XArray based allocator. The resulting IOASID allocation will always come from the host. This ensures that PASID namespace is system- wide.
Signed-off-by Lu Baolu <[email protected]>Signed-off-by Liu, Yi L <[email protected]>Signed-off-by Jacob Pan <[email protected]>--- drivers/iommu/Kconfig | 1 + drivers/iommu/intel-iommu.c | 67 +++++++++++++++++++++++++++++++++++++++++++++ include/linux/intel-iommu.h | 2 ++ 3 files changed, 70 insertions(+)drivers/iommu/Kconfig +1
-0@@ -211,6 +211,7 @@ config INTEL_IOMMU_SVM bool "Support for Shared Virtual Memory with Intel IOMMU" depends on INTEL_IOMMU && X86 select PCI_PASID + select IOASID select MMU_NOTIFIER help Shared Virtual Memory (SVM) provides a facility for devicesdrivers/iommu/intel-iommu.c +0
-0
drivers/iommu/intel-iommu.c static void free_dmar_iommu(struct intel_iommu *iommu) · line 1710
Quoted 5 lines
drivers/iommu/intel-iommu.c +2
-0@@ -1706,6 +1706,9 @@ static void free_dmar_iommu(struct intel_iommu *iommu)if (ecap_prs (iommu->ecap))intel_svm_finish_prq (iommu); } +if (ecap_vcs (iommu->ecap) &&vccap_pasid (iommu->vccap)) +ioasid_unregister_allocator (&iommu->pasid_allocator);
Since scalable mode is disabled if pasid allocator failed to register, add sm_support(iommu) check here will be better.
Quoted 66 lines
drivers/iommu/intel-iommu.c +52
-0+#endif }@@ -4910,6 +4913,44 @@ static int __init probe_acpi_namespace_devices(void)return 0 ; } +#ifdef CONFIG_INTEL_IOMMU_SVM +static ioasid_t intel_ioasid_alloc (ioasid_t min,ioasid_t max,void *data) +{ +struct intel_iommu *iommu = data; +ioasid_t ioasid; + +/* +* VT-d virtual command interface always uses the full 20 bit +* PASID range. Host can partition guest PASID range based on +* policies but it is out of guest's control. +*/ +if (min <PASID_MIN || max > intel_pasid_max_id) +return INVALID_IOASID ; + +if (vcmd_alloc_pasid (iommu, &ioasid)) +return INVALID_IOASID ; + +return ioasid; +} + +static void intel_ioasid_free (ioasid_t ioasid,void *data) +{ +struct intel_iommu *iommu = data; + +if (!iommu) +return ; +/* +* Sanity check the ioasid owner is done at upper layer, e.g. VFIO +* We can only free the PASID when all the devices are unbond. +*/ +if (ioasid_find (NULL , ioasid,NULL )) { +pr_alert ("Cannot free active IOASID %d\n" , ioasid); +return ; + } +vcmd_free_pasid (iommu, ioasid); +} +#endif +int __init intel_iommu_init (void ) {int ret = -ENODEV ;@@ -5020,6 +5061,32 @@ int __init intel_iommu_init(void) "%s", iommu->name);iommu_device_set_ops (&iommu->iommu, &intel_iommu_ops);iommu_device_register (&iommu->iommu); +#ifdef CONFIG_INTEL_IOMMU_SVM +if (ecap_vcs (iommu->ecap) &&vccap_pasid (iommu->vccap)) { +pr_info ("Register custom PASID allocator\n" ); +/* +* Register a custom ASID allocator if we are running +* in a guest, the purpose is to have a system wide PASID +* namespace among all PASID users. +* There can be multiple vIOMMUs in each guest but only +* one allocator is active. All vIOMMU allocators will +* eventually be calling the same host allocator. +*/ + iommu->pasid_allocator.alloc = intel_ioasid_alloc; + iommu->pasid_allocator.free = intel_ioasid_free;
drivers/iommu/intel-iommu.c int __init intel_iommu_init(void) · line 5086
Quoted 10 lines
drivers/iommu/intel-iommu.c +10
-0+ iommu->pasid_allocator.pdata = (void *)iommu; + ret =ioasid_register_allocator (&iommu->pasid_allocator); +if (ret) { +pr_warn ("Custom PASID allocator registeration failed\n" ); +/* +* Disable scalable mode on this IOMMU if there +* is no custom allocator. Mixing SM capable vIOMMU +* and non-SM vIOMMU are not supported. +*/ + intel_iommu_sm =0 ;
It's insufficient to disable scalable mode by only clearing intel_iommu_sm. The DMA_RTADDR_SMT bit in root entry has already been set. Probably, you need to
for each iommu
clear DMA_RTADDR_SMT in root entry
Alternatively, since vSVA is the only customer of this custom PASID allocator, is it possible to only disable SVA here?
Quoted 20 lines
drivers/iommu/intel-iommu.c +3
-0+ } + } +#endif }bus_set_iommu (&pci_bus_type, &intel_iommu_ops);include/linux/intel-iommu.h +1
-0@@ -19,6 +19,7 @@#include <linux/iommu.h> #include <linux/io-64-nonatomic-lo-hi.h> #include <linux/dmar.h> +#include <linux/ioasid.h> #include <asm/cacheflush.h> #include <asm/iommu.h>
include/linux/intel-iommu.h struct intel_iommu { · line 553
Quoted 7 lines
include/linux/intel-iommu.h +1
-0@@ -546,6 +547,7 @@ struct intel_iommu {#ifdef CONFIG_INTEL_IOMMU_SVM struct page_req_dsc *prq;unsigned char prq_name[16 ];/* Name for PRQ interrupt */ +struct ioasid_allocator_ops pasid_allocator;/* Custom allocator for PASIDs */ #endif struct q_inval *qi;/* Queued invalidation info */ u32 *iommu_state;/* Store iommu states between suspend and resume.*/
Best regards,
baolu
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH v7 03/11] iommu/vt-d: Add custom allocator for IOASID
Hi Baolu,
Thanks for the review. please see my comments inline.
Quoted 38 lines · On Fri, 25 Oct 2019 10:30:48 +0800 Lu Baolu <[email protected]> wrote:
Hi Jacob,
Quoted 35 lines · Jacob Pan
When VT-d driver runs in the guest, PASID allocation must be performed via virtual command interface. This patch registers a custom IOASID allocator which takes precedence over the default XArray based allocator. The resulting IOASID allocation will always come from the host. This ensures that PASID namespace is system- wide.
Signed-off-by Lu Baolu <[email protected]>Signed-off-by Liu, Yi L <[email protected]>Signed-off-by Jacob Pan <[email protected]>--- drivers/iommu/Kconfig | 1 + drivers/iommu/intel-iommu.c | 67+++++++++++++++++++++++++++++++++++++++++++++
include/linux/intel-iommu.h| 2 ++ 3 files changed, 70 insertions(+)drivers/iommu/Kconfig +1
-0@@ -211,6 +211,7 @@ config INTEL_IOMMU_SVM bool "Support for Shared Virtual Memory with Intel IOMMU" depends on INTEL_IOMMU && X86 select PCI_PASID + select IOASID select MMU_NOTIFIER help Shared Virtual Memory (SVM) provides a facility fordevices diff --git
a/drivers/iommu/intel-iommu.cb/drivers/iommu/intel-iommu.cindex3f974919d3bd..ced1d89ef977100644 ---a/drivers/iommu/intel-iommu.c
+++b/drivers/iommu/intel-iommu.cdrivers/iommu/Kconfig +0
-0@@ -1706,6 +1706,9 @@ static void free_dmar_iommu(struct intel_iommu *iommu) if (ecap_prs(iommu->ecap))
Quoted 9 lines
drivers/iommu/Kconfig static void free_dmar_iommu(struct · line 1711
Quoted 5 lines
drivers/iommu/Kconfig +2
-0intel_svm_finish_prq(iommu); } + if (ecap_vcs(iommu->ecap) && vccap_pasid(iommu->vccap)) + ioasid_unregister_allocator(&iommu->pasid_allocator);Since scalable mode is disabled if pasid allocator failed to register, add
sm_support(iommu)check here will be better.
I was thinking to be symmetric with register call, checking for the same conditions. Also, I like your advice below to only disable SVA instead of scalable mode.
Quoted 100 lines
Quoted 93 lines
drivers/iommu/Kconfig +8
-0+ #endif }@@ -4910,6 +4913,44 @@ static int __init probe_acpi_namespace_devices(void) return 0; } +#ifdef CONFIG_INTEL_IOMMU_SVM +static ioasid_t intel_ioasid_alloc(ioasid_t min, ioasid_t max, void *data) +{ + struct intel_iommu *iommu = data; + ioasid_t ioasid; + + /* + * VT-d virtual command interface always uses the full 20bit
drivers/iommu/Kconfig +1
-0+ * PASID range. Host can partition guest PASID range basedon
drivers/iommu/Kconfig +19
-0+ * policies but it is out of guest's control. + */ + if (min < PASID_MIN || max > intel_pasid_max_id) + return INVALID_IOASID; + + if (vcmd_alloc_pasid(iommu, &ioasid)) + return INVALID_IOASID; + + return ioasid; +} + +static void intel_ioasid_free(ioasid_t ioasid, void *data) +{ + struct intel_iommu *iommu = data; + + if (!iommu) + return; + /* + * Sanity check the ioasid owner is done at upper layer,e.g. VFIO
drivers/iommu/Kconfig +1
-0+ * We can only free the PASID when all the devices areunbond.
drivers/iommu/Kconfig +14
-0+ */ + if (ioasid_find(NULL, ioasid, NULL)) { + pr_alert("Cannot free active IOASID %d\n", ioasid); + return; + } + vcmd_free_pasid(iommu, ioasid); +} +#endif + int __init intel_iommu_init(void) { int ret = -ENODEV;@@ -5020,6 +5061,32 @@ int __init intel_iommu_init(void) "%s", iommu->name); iommu_device_set_ops(&iommu->iommu, &intel_iommu_ops); iommu_device_register(&iommu->iommu); +#ifdef CONFIG_INTEL_IOMMU_SVM + if (ecap_vcs(iommu->ecap) && vccap_pasid(iommu->vccap)) { + pr_info("Register custom PASID allocator\n"); + /* + * Register a custom ASID allocator if weare running
drivers/iommu/Kconfig +1
-0+ * in a guest, the purpose is to have asystem wide PASID
drivers/iommu/Kconfig +2
-0+ * namespace among all PASID users. + * There can be multiple vIOMMUs in eachguest but only
drivers/iommu/Kconfig +1
-0+ * one allocator is active. All vIOMMUallocators will
drivers/iommu/Kconfig +1
-0+ * eventually be calling the same hostallocator.
drivers/iommu/Kconfig +2
-0+ */ + iommu->pasid_allocator.alloc =
intel_ioasid_alloc;drivers/iommu/Kconfig +1
-0+ iommu->pasid_allocator.free =
intel_ioasid_free;drivers/iommu/Kconfig +1
-0+ iommu->pasid_allocator.pdata = (void*)iommu;
drivers/iommu/Kconfig +1
-0+ ret =
ioasid_register_allocator(&iommu->pasid_allocator);drivers/iommu/Kconfig +2
-0+ if (ret) { + pr_warn("Custom PASID allocatorregisteration failed\n");
drivers/iommu/Kconfig +2
-0+ /* + * Disable scalable mode on thisIOMMU if there
drivers/iommu/Kconfig +1
-0+ * is no custom allocator. MixingSM capable vIOMMU
drivers/iommu/Kconfig +1
-0+ * and non-SM vIOMMU are notsupported.
drivers/iommu/Kconfig
Quoted 2 lines
drivers/iommu/Kconfig +2
-0+ */ + intel_iommu_sm = 0;It's insufficient to disable scalable mode by only clearing
intel_iommu_sm. TheDMA_RTADDR_SMTbit in root entry has already been set. Probably, you need to
Quoted 6 lines
for each iommu
clearDMA_RTADDR_SMTin root entryAlternatively, since vSVA is the only customer of this custom PASID allocator, is it possible to only disable SVA here?
Yeah, I think disable SVA is better. We can still do gIOVA in SM. I guess we need to introduce a flag for sva_enabled.
Quoted 16 lines
Quoted 16 lines
drivers/iommu/Kconfig +3
-0+ } + } +#endif } bus_set_iommu(&pci_bus_type, &intel_iommu_ops);(quoted diff) +0
-0
b/include/linux/intel-iommu.hindex1d4b8dcdc5d8..c624733cb2e6100644 ---a/include/linux/intel-iommu.h
+++b/include/linux/intel-iommu.hinclude/linux/intel-iommu.h +1
-0@@ -19,6 +19,7 @@#include <linux/iommu.h> #include <linux/io-64-nonatomic-lo-hi.h> #include <linux/dmar.h> +#include <linux/ioasid.h>
Quoted 15 lines
Quoted 8 lines
include/linux/intel-iommu.h +1
-0#include <asm/cacheflush.h> #include <asm/iommu.h> @@ -546,6 +547,7 @@ struct intel_iommu {#ifdef CONFIG_INTEL_IOMMU_SVM struct page_req_dsc *prq;unsigned char prq_name[16 ];/* Name for PRQ interrupt */ +struct ioasid_allocator_ops pasid_allocator;/* Custom Quoted 4 lines
allocator for PASIDs */ #endif
structq_inval*qi; /* Queued invalidation
info */ u32*iommu_state; /* Store iommu states between suspend and resume.*/Best regards,
baolu
[Jacob Pan]
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
RE: [PATCH v7 03/11] iommu/vt-d: Add custom allocator for IOASID
Quoted 161 lines
From: Jacob Pan [mailto:[email protected]]
Sent: Friday, October 25, 2019 12:43 PMHi Baolu,
Thanks for the review. please see my comments inline.
Quoted 38 lines · On Fri, 25 Oct 2019 10:30:48 +0800 Lu Baolu <[email protected]> wrote:
Hi Jacob,
Quoted 35 lines · Jacob Pan
When VT-d driver runs in the guest, PASID allocation must be performed via virtual command interface. This patch registers a custom IOASID allocator which takes precedence over the default XArray based allocator. The resulting IOASID allocation will always come from the host. This ensures that PASID namespace is system- wide.
Signed-off-by Lu Baolu <[email protected]>Signed-off-by Liu, Yi L <[email protected]>Signed-off-by Jacob Pan <[email protected]>--- drivers/iommu/Kconfig | 1 + drivers/iommu/intel-iommu.c | 67+++++++++++++++++++++++++++++++++++++++++++++
include/linux/intel-iommu.h| 2 ++ 3 files changed, 70 insertions(+)drivers/iommu/Kconfig +1
-0@@ -211,6 +211,7 @@ config INTEL_IOMMU_SVM bool "Support for Shared Virtual Memory with Intel IOMMU" depends on INTEL_IOMMU && X86 select PCI_PASID + select IOASID select MMU_NOTIFIER help Shared Virtual Memory (SVM) provides a facility fordevices diff --git
a/drivers/iommu/intel-iommu.cb/drivers/iommu/intel-iommu.cindex3f974919d3bd..ced1d89ef977100644 ---a/drivers/iommu/intel-iommu.c
+++b/drivers/iommu/intel-iommu.cdrivers/iommu/Kconfig +0
-0@@ -1706,6 +1706,9 @@ static void free_dmar_iommu(struct intel_iommu *iommu) if (ecap_prs(iommu->ecap))Quoted 9 lines
drivers/iommu/Kconfig static void free_dmar_iommu(struct · line 1711
Quoted 5 lines
drivers/iommu/Kconfig +2
-0intel_svm_finish_prq(iommu); } + if (ecap_vcs(iommu->ecap) && vccap_pasid(iommu->vccap)) + ioasid_unregister_allocator(&iommu->pasid_allocator);Since scalable mode is disabled if pasid allocator failed to register, add
sm_support(iommu)check here will be better.I was thinking to be symmetric with register call, checking for the same conditions. Also, I like your advice below to only disable SVA instead of scalable mode.
Quoted 90 lines
Quoted 90 lines
drivers/iommu/Kconfig +8
-0+ #endif }@@ -4910,6 +4913,44 @@ static int __init probe_acpi_namespace_devices(void) return 0; } +#ifdef CONFIG_INTEL_IOMMU_SVM +static ioasid_t intel_ioasid_alloc(ioasid_t min, ioasid_t max, void *data) +{ + struct intel_iommu *iommu = data; + ioasid_t ioasid; + + /* + * VT-d virtual command interface always uses the full 20bit
drivers/iommu/Kconfig +1
-0+ * PASID range. Host can partition guest PASID range basedon
drivers/iommu/Kconfig +19
-0+ * policies but it is out of guest's control. + */ + if (min < PASID_MIN || max > intel_pasid_max_id) + return INVALID_IOASID; + + if (vcmd_alloc_pasid(iommu, &ioasid)) + return INVALID_IOASID; + + return ioasid; +} + +static void intel_ioasid_free(ioasid_t ioasid, void *data) +{ + struct intel_iommu *iommu = data; + + if (!iommu) + return; + /* + * Sanity check the ioasid owner is done at upper layer,e.g. VFIO
drivers/iommu/Kconfig +1
-0+ * We can only free the PASID when all the devices areunbond.
drivers/iommu/Kconfig +14
-0+ */ + if (ioasid_find(NULL, ioasid, NULL)) { + pr_alert("Cannot free active IOASID %d\n", ioasid); + return; + } + vcmd_free_pasid(iommu, ioasid); +} +#endif + int __init intel_iommu_init(void) { int ret = -ENODEV;@@ -5020,6 +5061,32 @@ int __init intel_iommu_init(void) "%s", iommu->name); iommu_device_set_ops(&iommu->iommu, &intel_iommu_ops); iommu_device_register(&iommu->iommu); +#ifdef CONFIG_INTEL_IOMMU_SVM + if (ecap_vcs(iommu->ecap) && vccap_pasid(iommu->vccap)) { + pr_info("Register custom PASID allocator\n"); + /* + * Register a custom ASID allocator if weare running
drivers/iommu/Kconfig +1
-0+ * in a guest, the purpose is to have asystem wide PASID
drivers/iommu/Kconfig +2
-0+ * namespace among all PASID users. + * There can be multiple vIOMMUs in eachguest but only
drivers/iommu/Kconfig +1
-0+ * one allocator is active. All vIOMMUallocators will
drivers/iommu/Kconfig +1
-0+ * eventually be calling the same hostallocator.
drivers/iommu/Kconfig +2
-0+ */ + iommu->pasid_allocator.alloc =
intel_ioasid_alloc;drivers/iommu/Kconfig +1
-0+ iommu->pasid_allocator.free =
intel_ioasid_free;drivers/iommu/Kconfig +1
-0+ iommu->pasid_allocator.pdata = (void*)iommu;
drivers/iommu/Kconfig +1
-0+ ret =
ioasid_register_allocator(&iommu->pasid_allocator);drivers/iommu/Kconfig +2
-0+ if (ret) { + pr_warn("Custom PASID allocatorregisteration failed\n");
drivers/iommu/Kconfig +2
-0+ /* + * Disable scalable mode on thisIOMMU if there
drivers/iommu/Kconfig +1
-0+ * is no custom allocator. MixingQuoted 8 lines
drivers/iommu/Kconfig
Quoted 5 lines
SM capable vIOMMU
drivers/iommu/Kconfig +1
-0+ * and non-SM vIOMMU are notsupported.
drivers/iommu/Kconfig +2
-0+ */ + intel_iommu_sm = 0;It's insufficient to disable scalable mode by only clearing
intel_iommu_sm. TheDMA_RTADDR_SMTbit in root entry has alreadybeen
Quoted 2 lines
set. Probably, you need to
Quoted 8 lines
Quoted 6 lines
for each iommu
clearDMA_RTADDR_SMTin root entryAlternatively, since vSVA is the only customer of this custom PASID allocator, is it possible to only disable SVA here?
Yeah, I think disable SVA is better. We can still do gIOVA in SM. I guess we need to introduce a flag for
sva_enabled.
I'm not sure whether tying above logic to SVA is the right approach. If vcmd interface doesn't work, the whole SM mode doesn't make sense which is based on PASID-granular protection (SVA is only one usage atop). If the only remaining usage of SM is to map gIOVA using reserved PASID#0, then why not disabling SM and just fallback to legacy mode?
Based on that I prefer to disabling the SM mode completely (better through an interface), and move the logic out of CONFIG_INTEL_ IOMMU_SVM
Quoted 33 lines
Quoted 16 lines
Quoted 16 lines
drivers/iommu/Kconfig +3
-0+ } + } +#endif } bus_set_iommu(&pci_bus_type, &intel_iommu_ops);(quoted diff) +0
-0
b/include/linux/intel-iommu.hindex1d4b8dcdc5d8..c624733cb2e6100644 ---a/include/linux/intel-iommu.h
+++b/include/linux/intel-iommu.hinclude/linux/intel-iommu.h +1
-0@@ -19,6 +19,7 @@#include <linux/iommu.h> #include <linux/io-64-nonatomic-lo-hi.h> #include <linux/dmar.h> +#include <linux/ioasid.h> Quoted 15 lines
Quoted 8 lines
include/linux/intel-iommu.h +1
-0#include <asm/cacheflush.h> #include <asm/iommu.h> @@ -546,6 +547,7 @@ struct intel_iommu {#ifdef CONFIG_INTEL_IOMMU_SVM struct page_req_dsc *prq;unsigned char prq_name[16 ];/* Name for PRQ interrupt */ +struct ioasid_allocator_ops pasid_allocator;/* Custom Quoted 4 lines
allocator for PASIDs */ #endif
structq_inval*qi; /* Queued invalidation
info */ u32*iommu_state; /* Store iommu states between suspend and resume.*/Best regards,
baolu[Jacob Pan]
Re: [PATCH v7 03/11] iommu/vt-d: Add custom allocator for IOASID
Hi,
Quoted 33 lines · Kevin
Quoted 18 lines
Quoted 7 lines
Quoted 7 lines
ioasid_register_allocator(&iommu->pasid_allocator);(quoted diff) +2
-0+ if (ret) { + pr_warn("Custom PASID allocatorregisteration failed\n");
(quoted diff) +2
-0+ /* + * Disable scalable mode on thisIOMMU if there
Quoted 8 lines
Review
Quoted 6 lines
(quoted diff) +1
-0+ * is no custom allocator. MixingSM capable vIOMMU
(quoted diff) +1
-0+ * and non-SM vIOMMU are notsupported.
(quoted diff) +2
-0+ */ + intel_iommu_sm = 0;It's insufficient to disable scalable mode by only clearing
intel_iommu_sm. TheDMA_RTADDR_SMTbit in root entry has alreadybeen
Quoted 2 lines
set. Probably, you need to
Quoted 8 lines
Quoted 6 lines
for each iommu
clearDMA_RTADDR_SMTin root entryAlternatively, since vSVA is the only customer of this custom PASID allocator, is it possible to only disable SVA here?
Yeah, I think disable SVA is better. We can still do gIOVA in SM. I guess we need to introduce a flag for
sva_enabled.I'm not sure whether tying above logic to SVA is the right approach. If vcmd interface doesn't work, the whole SM mode doesn't make sense which is based on PASID-granular protection (SVA is only one usage atop). If the only remaining usage of SM is to map gIOVA using reserved PASID#0, then why not disabling SM and just fallback to legacy mode?
Quoted 4 lines
Based on that I prefer to disabling the SM mode completely (better through an interface), and move the logic out of
CONFIG_INTEL_IOMMU_SVM
Unfortunately, it is dangerous to disable SM after boot. SM uses different root/device contexts and pasid table formats. Disabling SM after boot requires changing above from SM format into legacy format.
Since ioasid registration failure is a rare case. How about moving this part of code up to the early stage of intel_iommu_init() and returning error if hardware present vcmd capability but software fails to register a custom ioasid allocator?
Best regards,
baolu
RE: [PATCH v7 03/11] iommu/vt-d: Add custom allocator for IOASID
Quoted 39 lines
From: Lu Baolu [mailto:[email protected]]
Sent: Friday, October 25, 2019 10:39 PMHi,
Quoted 33 lines · Kevin
Quoted 18 lines
Quoted 7 lines
Quoted 7 lines
ioasid_register_allocator(&iommu->pasid_allocator);(quoted diff) +2
-0+ if (ret) { + pr_warn("Custom PASID allocatorregisteration failed\n");
(quoted diff) +2
-0+ /* + * Disable scalable mode on thisIOMMU if there
Quoted 8 lines
Review
Quoted 6 lines
(quoted diff) +1
-0+ * is no custom allocator. MixingSM capable vIOMMU
(quoted diff) +1
-0+ * and non-SM vIOMMU are notsupported.
(quoted diff) +2
-0+ */ + intel_iommu_sm = 0;It's insufficient to disable scalable mode by only clearing
intel_iommu_sm. TheDMA_RTADDR_SMTbit in root entry has alreadybeen
Quoted 2 lines
set. Probably, you need to
Quoted 8 lines
Quoted 6 lines
for each iommu
clearDMA_RTADDR_SMTin root entryAlternatively, since vSVA is the only customer of this custom PASID allocator, is it possible to only disable SVA here?
Yeah, I think disable SVA is better. We can still do gIOVA in SM. I guess we need to introduce a flag for
sva_enabled.I'm not sure whether tying above logic to SVA is the right approach. If vcmd interface doesn't work, the whole SM mode doesn't make sense which is based on PASID-granular protection (SVA is only one usage atop). If the only remaining usage of SM is to map gIOVA using reserved PASID#0, then why not disabling SM and just fallback to legacy mode?
Quoted 8 lines
Quoted 4 lines
Based on that I prefer to disabling the SM mode completely (better through an interface), and move the logic out of
CONFIG_INTEL_IOMMU_SVMUnfortunately, it is dangerous to disable SM after boot. SM uses different root/device contexts and pasid table formats. Disabling SM after boot requires changing above from SM format into legacy format.
You are correct.
Quoted 6 lines
Since ioasid registration failure is a rare case. How about moving this part of code up to the early stage of
intel_iommu_init()and returning error if hardware present vcmd capability but software fails to register a custom ioasid allocator?
It makes sense to me.
Thanks
Kevin
Re: [PATCH v7 03/11] iommu/vt-d: Add custom allocator for IOASID
Quoted 53 lines · Kevin
Quoted 45 lines
From: Lu Baolu [mailto:[email protected]]
Sent: Friday, October 25, 2019 10:39 PMHi,
Quoted 34 lines · Kevin
Quoted 19 lines
Quoted 8 lines
Quoted 8 lines
ioasid_register_allocator(&iommu->pasid_allocator);(quoted diff) +2
-0+ if (ret) { + pr_warn("Custom PASIDallocator registeration failed\n");
(quoted diff) +2
-0+ /* + * Disable scalable mode onthis IOMMU if there
(quoted diff) +1
-0+ * is no custom allocator.Quoted 8 lines
Review
Quoted 5 lines
Mixing SM capable vIOMMU
(quoted diff) +1
-0+ * and non-SM vIOMMU are notsupported.
(quoted diff) +2
-0+ */ + intel_iommu_sm = 0;It's insufficient to disable scalable mode by only clearing
intel_iommu_sm. TheDMA_RTADDR_SMTbit in root entry has alreadybeen
Quoted 2 lines
set. Probably, you need to
Quoted 8 lines
Quoted 6 lines
for each iommu
clearDMA_RTADDR_SMTin root entryAlternatively, since vSVA is the only customer of this custom PASID allocator, is it possible to only disable SVA here?
Yeah, I think disable SVA is better. We can still do gIOVA in SM. I guess we need to introduce a flag for
sva_enabled.I'm not sure whether tying above logic to SVA is the right approach. If vcmd interface doesn't work, the whole SM mode doesn't make sense which is based on PASID-granular protection (SVA is only one usage atop). If the only remaining usage of SM is to map gIOVA using reserved PASID#0, then why not disabling SM and just fallback to legacy mode?
Quoted 4 lines
Based on that I prefer to disabling the SM mode completely (better through an interface), and move the logic out of
CONFIG_INTEL_IOMMU_SVMQuoted 4 lines
Unfortunately, it is dangerous to disable SM after boot. SM uses different root/device contexts and pasid table formats. Disabling SM after boot requires changing above from SM format into legacy format.
You are correct.
Quoted 1 line
Quoted 8 lines
Quoted 5 lines
Since ioasid registration failure is a rare case. How about moving this part of code up to the early stage of
intel_iommu_init()and returning error if hardware present vcmd capability but software fails to register a custom ioasid allocator?It makes sense to me.
sounds good to me too, the earlier the less to clean up.
Quoted 2 lines
Thanks
Kevin
[Jacob Pan]
Re: [PATCH v7 03/11] iommu/vt-d: Add custom allocator for IOASID
Hi,
Quoted 17 lines · Jacob Pan
Quoted 17 lines
Quoted 7 lines
Quoted 7 lines
I'm not sure whether tying above logic to SVA is the right approach. If vcmd interface doesn't work, the whole SM mode doesn't make sense which is based on PASID-granular protection (SVA is only one usage atop). If the only remaining usage of SM is to map gIOVA using reserved PASID#0, then why not disabling SM and just fallback to legacy mode?
Quoted 8 lines
Quoted 4 lines
Based on that I prefer to disabling the SM mode completely (better through an interface), and move the logic out of
CONFIG_INTEL_IOMMU_SVMUnfortunately, it is dangerous to disable SM after boot. SM uses different root/device contexts and pasid table formats. Disabling SM after boot requires changing above from SM format into legacy format.
You are correct.
Quoted 8 lines
Quoted 7 lines
Quoted 5 lines
Since ioasid registration failure is a rare case. How about moving this part of code up to the early stage of
intel_iommu_init()and returning error if hardware present vcmd capability but software fails to register a custom ioasid allocator?It makes sense to me.
sounds good to me too, the earlier the less to clean up.
Actually, we even could return error directly and abort the iommu initialization. The registration of custom ioasid allocator fails only when memory runs out or software is buggy. In either cases, we should abort iommu initialization.
Best regards,
baolu
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
RE: [PATCH v7 03/11] iommu/vt-d: Add custom allocator for IOASID
In reply to Jacob PanQuoted 71 lines
From: Jacob Pan [mailto:[email protected]]
Sent: Friday, October 25, 2019 3:55 AMWhen VT-d driver runs in the guest, PASID allocation must be performed via virtual command interface. This patch registers a custom IOASID allocator which takes precedence over the default XArray based allocator. The resulting IOASID allocation will always come from the host. This ensures that PASID namespace is system- wide.
Signed-off-by Lu Baolu <[email protected]>Signed-off-by Liu, Yi L <[email protected]>Signed-off-by Jacob Pan <[email protected]>--- drivers/iommu/Kconfig | 1 + drivers/iommu/intel-iommu.c | 67 +++++++++++++++++++++++++++++++++++++++++++++ include/linux/intel-iommu.h | 2 ++ 3 files changed, 70 insertions(+)drivers/iommu/Kconfig +1
-0@@ -211,6 +211,7 @@ config INTEL_IOMMU_SVM bool "Support for Shared Virtual Memory with Intel IOMMU" depends on INTEL_IOMMU && X86 select PCI_PASID + select IOASID select MMU_NOTIFIER help Shared Virtual Memory (SVM) provides a facility for devicesdrivers/iommu/intel-iommu.c +22
-0@@ -1706,6 +1706,9 @@ static void free_dmar_iommu(struct intel_iommu *iommu)if (ecap_prs (iommu->ecap)) intel_svm_finish_prq(iommu); } +if (ecap_vcs (iommu->ecap) &&vccap_pasid (iommu->vccap)) +ioasid_unregister_allocator (&iommu->pasid_allocator); +#endif }@@ -4910,6 +4913,44 @@ static int __initprobe_acpi_namespace_devices (void ) return 0; } +#ifdef CONFIG_INTEL_IOMMU_SVM +static ioasid_t intel_ioasid_alloc (ioasid_t min,ioasid_t max,void *data) +{ +struct intel_iommu *iommu = data; +ioasid_t ioasid; + +/* +* VT-d virtual command interface always uses the full 20 bit +* PASID range. Host can partition guest PASID range based on +* policies but it is out of guest's control. +*/ +if (min <PASID_MIN || max > intel_pasid_max_id) +return INVALID_IOASID ; + +if (vcmd_alloc_pasid (iommu, &ioasid)) +return INVALID_IOASID ; + +return ioasid; +}
drivers/iommu/intel-iommu.c static int __init · line 4945
Quoted 10 lines
drivers/iommu/intel-iommu.c +10
-0+ +static void intel_ioasid_free (ioasid_t ioasid,void *data) +{ +struct intel_iommu *iommu = data; + +if (!iommu) +return ; +/* +* Sanity check the ioasid owner is done at upper layer, e.g. VFIO +* We can only free the PASID when all the devices are unbond.
unbond -> unbound
Quoted 38 lines
drivers/iommu/intel-iommu.c +9
-0+*/ +if (ioasid_find (NULL , ioasid,NULL )) { +pr_alert ("Cannot free active IOASID %d\n" , ioasid); +return ; + } + vcmd_free_pasid(iommu, ioasid); +} +#endif +int __init intel_iommu_init (void ) {drivers/iommu/intel-iommu.c +6
-0int ret = -ENODEV ;@@ -5020,6 +5061,32 @@ int __init intel_iommu_init(void) "%s", iommu->name);iommu_device_set_ops (&iommu->iommu, &intel_iommu_ops);iommu_device_register (&iommu->iommu); +#ifdef CONFIG_INTEL_IOMMU_SVM +if (ecap_vcs (iommu->ecap) &&vccap_pasid (iommu->vccap)) { +pr_info ("Register custom PASID allocator\n" ); +/* +* Register a custom ASID allocator if we are running +* in a guest, the purpose is to have a system wide PASID
drivers/iommu/intel-iommu.c +2
-0+* namespace among all PASID users. +* There can be multiple vIOMMUs in each guest but only
drivers/iommu/intel-iommu.c +7
-0+* one allocator is active. All vIOMMU allocators will +* eventually be calling the same host allocator. +*/ + iommu->pasid_allocator.alloc = intel_ioasid_alloc; + iommu->pasid_allocator.free = intel_ioasid_free; + iommu->pasid_allocator.pdata = (void *)iommu; + ret = ioasid_register_allocator(&iommu-Quoted 1 line
pasid_allocator);drivers/iommu/intel-iommu.c +2
-0+if (ret) { + pr_warn("Custom PASID allocator
Quoted 1 line
registeration failed\n");
registration
Quoted 38 lines
drivers/iommu/intel-iommu.c +2
-0+/* +* Disable scalable mode on this IOMMU if there
drivers/iommu/intel-iommu.c +1
-0+* is no custom allocator. Mixing SM capable vIOMMU
drivers/iommu/intel-iommu.c +6
-0+* and non-SM vIOMMU are not supported. +*/ + intel_iommu_sm = 0; + } + } +#endif }bus_set_iommu (&pci_bus_type, &intel_iommu_ops);include/linux/intel-iommu.h +2
-0@@ -19,6 +19,7 @@#include <linux/iommu.h> #include <linux/io-64-nonatomic-lo-hi.h> #include <linux/dmar.h> +#include <linux/ioasid.h> #include <asm/cacheflush.h> #include <asm/iommu.h> @@ -546,6 +547,7 @@ struct intel_iommu {#ifdef CONFIG_INTEL_IOMMU_SVM struct page_req_dsc *prq;unsigned char prq_name[16 ];/* Name for PRQ interrupt */ +struct ioasid_allocator_ops pasid_allocator;/* Custom allocator for PASIDs */
#endifinclude/linux/intel-iommu.h +0
-0struct q_inval *qi;/* Queued invalidation info */ u32 *iommu_state;/* Store iommu states between suspend and resume.*/
--
2.7.4
Re: [PATCH v7 03/11] iommu/vt-d: Add custom allocator for IOASID
Quoted 79 lines · Kevin
Quoted 79 lines
From: Jacob Pan [mailto:[email protected]]
Sent: Friday, October 25, 2019 3:55 AMWhen VT-d driver runs in the guest, PASID allocation must be performed via virtual command interface. This patch registers a custom IOASID allocator which takes precedence over the default XArray based allocator. The resulting IOASID allocation will always come from the host. This ensures that PASID namespace is system- wide.
Signed-off-by Lu Baolu <[email protected]>Signed-off-by Liu, Yi L <[email protected]>Signed-off-by Jacob Pan <[email protected]>--- drivers/iommu/Kconfig | 1 + drivers/iommu/intel-iommu.c | 67 +++++++++++++++++++++++++++++++++++++++++++++ include/linux/intel-iommu.h | 2 ++ 3 files changed, 70 insertions(+)drivers/iommu/Kconfig +1
-0@@ -211,6 +211,7 @@ config INTEL_IOMMU_SVM bool "Support for Shared Virtual Memory with Intel IOMMU" depends on INTEL_IOMMU && X86 select PCI_PASID + select IOASID select MMU_NOTIFIER help Shared Virtual Memory (SVM) provides a facility fordevices diff --git
a/drivers/iommu/intel-iommu.cb/drivers/iommu/intel-iommu.cindex3f974919d3bd..ced1d89ef977100644 ---a/drivers/iommu/intel-iommu.c
+++b/drivers/iommu/intel-iommu.cdrivers/iommu/Kconfig +2
-0@@ -1706,6 +1706,9 @@ static void free_dmar_iommu(struct intel_iommu *iommu) if (ecap_prs(iommu->ecap)) intel_svm_finish_prq(iommu); } + if (ecap_vcs(iommu->ecap) && vccap_pasid(iommu->vccap)) +
ioasid_unregister_allocator(&iommu->pasid_allocator); +
#endif
}drivers/iommu/Kconfig +7
-0@@ -4910,6 +4913,44 @@ static int __init probe_acpi_namespace_devices(void) return 0; } +#ifdef CONFIG_INTEL_IOMMU_SVM +static ioasid_t intel_ioasid_alloc(ioasid_t min, ioasid_t max, void *data) +{ + struct intel_iommu *iommu = data; + ioasid_t ioasid; + + /* + * VT-d virtual command interface always uses the full 20bit
drivers/iommu/Kconfig +1
-0+ * PASID range. Host can partition guest PASID range basedon
drivers/iommu/Kconfig +16
-0+ * policies but it is out of guest's control. + */ + if (min < PASID_MIN || max > intel_pasid_max_id) + return INVALID_IOASID; + + if (vcmd_alloc_pasid(iommu, &ioasid)) + return INVALID_IOASID; + + return ioasid; +} + +static void intel_ioasid_free(ioasid_t ioasid, void *data) +{ + struct intel_iommu *iommu = data; + + if (!iommu)
Quoted 9 lines
Quoted 6 lines
drivers/iommu/Kconfig +3
-0+ return; + /* + * Sanity check the ioasid owner is done at upper layer,e.g. VFIO
drivers/iommu/Kconfig +1
-0+ * We can only free the PASID when all the devices areunbond.
unbond -> unbound
will fix
Quoted 42 lines
Quoted 42 lines
drivers/iommu/Kconfig +14
-0+ */ + if (ioasid_find(NULL, ioasid, NULL)) { + pr_alert("Cannot free active IOASID %d\n", ioasid); + return; + } + vcmd_free_pasid(iommu, ioasid); +} +#endif + int __init intel_iommu_init(void) { int ret = -ENODEV;@@ -5020,6 +5061,32 @@ int __init intel_iommu_init(void) "%s", iommu->name); iommu_device_set_ops(&iommu->iommu, &intel_iommu_ops); iommu_device_register(&iommu->iommu); +#ifdef CONFIG_INTEL_IOMMU_SVM + if (ecap_vcs(iommu->ecap) && vccap_pasid(iommu->vccap)) { + pr_info("Register custom PASID allocator\n"); + /* + * Register a custom ASID allocator if weare running
drivers/iommu/Kconfig +1
-0+ * in a guest, the purpose is to have asystem wide PASID
drivers/iommu/Kconfig +2
-0+ * namespace among all PASID users. + * There can be multiple vIOMMUs in eachguest but only
drivers/iommu/Kconfig +1
-0+ * one allocator is active. All vIOMMUallocators will
drivers/iommu/Kconfig +1
-0+ * eventually be calling the same hostallocator.
drivers/iommu/Kconfig +2
-0+ */ + iommu->pasid_allocator.alloc =
intel_ioasid_alloc;drivers/iommu/Kconfig +1
-0+ iommu->pasid_allocator.free =
intel_ioasid_free;drivers/iommu/Kconfig +1
-0+ iommu->pasid_allocator.pdata = (void*)iommu;
drivers/iommu/Kconfig +1
-0+ ret = ioasid_register_allocator(&iommu-
Quoted 6 lines
Quoted 4 lines
Quoted 1 line
pasid_allocator);drivers/iommu/Kconfig +2
-0+ if (ret) { + pr_warn("Custom PASID allocatorregisteration failed\n");
registration
will fix
Thanks!
Quoted 26 lines
Quoted 26 lines
drivers/iommu/Kconfig +2
-0+ /* + * Disable scalable mode on thisIOMMU if there
drivers/iommu/Kconfig +1
-0+ * is no custom allocator. MixingSM capable vIOMMU
drivers/iommu/Kconfig +1
-0+ * and non-SM vIOMMU are notsupported.
drivers/iommu/Kconfig +5
-0+ */ + intel_iommu_sm = 0; + } + } +#endif } bus_set_iommu(&pci_bus_type, &intel_iommu_ops);(quoted diff) +0
-0
b/include/linux/intel-iommu.hindex1d4b8dcdc5d8..c624733cb2e6100644 ---a/include/linux/intel-iommu.h
+++b/include/linux/intel-iommu.hinclude/linux/intel-iommu.h +1
-0@@ -19,6 +19,7 @@#include <linux/iommu.h> #include <linux/io-64-nonatomic-lo-hi.h> #include <linux/dmar.h> +#include <linux/ioasid.h>
Quoted 15 lines
Quoted 7 lines
include/linux/intel-iommu.h +1
-0#include <asm/cacheflush.h> #include <asm/iommu.h> @@ -546,6 +547,7 @@ struct intel_iommu {#ifdef CONFIG_INTEL_IOMMU_SVM struct page_req_dsc *prq;unsigned char prq_name[16 ];/* Name for PRQ interrupt */ +struct ioasid_allocator_ops pasid_allocator;/* Custom Quoted 7 lines
allocator for PASIDs */
#endif
structq_inval*qi; /* Queued invalidation
info */ u32*iommu_state; /* Store iommu states between suspend and resume.*/
--
2.7.4
[Jacob Pan]
Re: [PATCH v7 03/11] iommu/vt-d: Add custom allocator for IOASID
In reply to Jacob PanHi Jacob,
Quoted 98 lines · Jacob Pan
When VT-d driver runs in the guest, PASID allocation must be performed via virtual command interface. This patch registers a custom IOASID allocator which takes precedence over the default XArray based allocator. The resulting IOASID allocation will always come from the host. This ensures that PASID namespace is system- wide.
Signed-off-by Lu Baolu <[email protected]>Signed-off-by Liu, Yi L <[email protected]>Signed-off-by Jacob Pan <[email protected]>--- drivers/iommu/Kconfig | 1 + drivers/iommu/intel-iommu.c | 67 +++++++++++++++++++++++++++++++++++++++++++++ include/linux/intel-iommu.h | 2 ++ 3 files changed, 70 insertions(+)drivers/iommu/Kconfig +1
-0@@ -211,6 +211,7 @@ config INTEL_IOMMU_SVM bool "Support for Shared Virtual Memory with Intel IOMMU" depends on INTEL_IOMMU && X86 select PCI_PASID + select IOASID select MMU_NOTIFIER help Shared Virtual Memory (SVM) provides a facility for devicesdrivers/iommu/intel-iommu.c +47
-0@@ -1706,6 +1706,9 @@ static void free_dmar_iommu(struct intel_iommu *iommu)if (ecap_prs (iommu->ecap)) intel_svm_finish_prq(iommu); } +if (ecap_vcs (iommu->ecap) &&vccap_pasid (iommu->vccap)) +ioasid_unregister_allocator (&iommu->pasid_allocator); +#endif }@@ -4910,6 +4913,44 @@ static int __init probe_acpi_namespace_devices(void)return 0 ; } +#ifdef CONFIG_INTEL_IOMMU_SVM +static ioasid_t intel_ioasid_alloc (ioasid_t min,ioasid_t max,void *data) +{ +struct intel_iommu *iommu = data; +ioasid_t ioasid; + +/* +* VT-d virtual command interface always uses the full 20 bit +* PASID range. Host can partition guest PASID range based on +* policies but it is out of guest's control. +*/ + if (min < PASID_MIN || max > intel_pasid_max_id)> + return INVALID_IOASID; + +if (vcmd_alloc_pasid (iommu, &ioasid)) +return INVALID_IOASID ; + +return ioasid; +} + +static void intel_ioasid_free (ioasid_t ioasid,void *data) +{ +struct intel_iommu *iommu = data; + +if (!iommu) +return ; +/* +* Sanity check the ioasid owner is done at upper layer, e.g. VFIO +* We can only free the PASID when all the devices are unbond. +*/ +if (ioasid_find (NULL , ioasid,NULL )) { +pr_alert ("Cannot free active IOASID %d\n" , ioasid); +return ; + } +vcmd_free_pasid (iommu, ioasid); +} +#endif +int __init intel_iommu_init (void ) {int ret = -ENODEV ;@@ -5020,6 +5061,32 @@ int __init intel_iommu_init(void) "%s", iommu->name);iommu_device_set_ops (&iommu->iommu, &intel_iommu_ops);iommu_device_register (&iommu->iommu); +#ifdef CONFIG_INTEL_IOMMU_SVM +if (ecap_vcs (iommu->ecap) &&vccap_pasid (iommu->vccap)) { +pr_info ("Register custom PASID allocator\n" ); +/* +* Register a custom ASID allocator if we are running +* in a guest, the purpose is to have a system wide PASID +* namespace among all PASID users.
drivers/iommu/intel-iommu.c int __init intel_iommu_init(void) · line 5080
Quoted 10 lines
drivers/iommu/intel-iommu.c +10
-0+* There can be multiple vIOMMUs in each guest but only +* one allocator is active. All vIOMMU allocators will +* eventually be calling the same host allocator. +*/ + iommu->pasid_allocator.alloc = intel_ioasid_alloc; + iommu->pasid_allocator.free = intel_ioasid_free; + iommu->pasid_allocator.pdata = (void *)iommu; + ret =ioasid_register_allocator (&iommu->pasid_allocator); +if (ret) { +pr_warn ("Custom PASID allocator registeration failed\n" );
nit: registration
drivers/iommu/intel-iommu.c int __init intel_iommu_init(void)
Quoted 4 lines
drivers/iommu/intel-iommu.c +4
-0+/* +* Disable scalable mode on this IOMMU if there +* is no custom allocator. Mixing SM capable vIOMMU +* and non-SM vIOMMU are not supported:
nit; is not supported. But I guess you will reshape it according to previous comments.
Quoted 22 lines
drivers/iommu/intel-iommu.c +5
-0+*/ + intel_iommu_sm = 0; + } + } +#endif }bus_set_iommu (&pci_bus_type, &intel_iommu_ops);include/linux/intel-iommu.h +1
-0@@ -19,6 +19,7 @@#include <linux/iommu.h> #include <linux/io-64-nonatomic-lo-hi.h> #include <linux/dmar.h> +#include <linux/ioasid.h> #include <asm/cacheflush.h> #include <asm/iommu.h>
include/linux/intel-iommu.h struct intel_iommu { · line 553
Quoted 7 lines
include/linux/intel-iommu.h +1
-0@@ -546,6 +547,7 @@ struct intel_iommu {#ifdef CONFIG_INTEL_IOMMU_SVM struct page_req_dsc *prq;unsigned char prq_name[16 ];/* Name for PRQ interrupt */ +struct ioasid_allocator_ops pasid_allocator;/* Custom allocator for PASIDs */ #endif struct q_inval *qi;/* Queued invalidation info */ u32 *iommu_state;/* Store iommu states between suspend and resume.*/
Thanks
Eric
Re: [PATCH v7 03/11] iommu/vt-d: Add custom allocator for IOASID
Quoted 130 lines · On Fri, 8 Nov 2019 11:40:23 +0100 Auger Eric <[email protected]> wrote:
Hi Jacob,
Quoted 125 lines · Jacob Pan
When VT-d driver runs in the guest, PASID allocation must be performed via virtual command interface. This patch registers a custom IOASID allocator which takes precedence over the default XArray based allocator. The resulting IOASID allocation will always come from the host. This ensures that PASID namespace is system- wide.
Signed-off-by Lu Baolu <[email protected]>Signed-off-by Liu, Yi L <[email protected]>Signed-off-by Jacob Pan <[email protected]>--- drivers/iommu/Kconfig | 1 + drivers/iommu/intel-iommu.c | 67+++++++++++++++++++++++++++++++++++++++++++++
include/linux/intel-iommu.h| 2 ++ 3 files changed, 70 insertions(+)drivers/iommu/Kconfig +1
-0@@ -211,6 +211,7 @@ config INTEL_IOMMU_SVM bool "Support for Shared Virtual Memory with Intel IOMMU" depends on INTEL_IOMMU && X86 select PCI_PASID + select IOASID select MMU_NOTIFIER help Shared Virtual Memory (SVM) provides a facility fordevices diff --git
a/drivers/iommu/intel-iommu.cb/drivers/iommu/intel-iommu.cindex3f974919d3bd..ced1d89ef977100644 ---a/drivers/iommu/intel-iommu.c
+++b/drivers/iommu/intel-iommu.cdrivers/iommu/Kconfig +2
-0@@ -1706,6 +1706,9 @@ static void free_dmar_iommu(struct intel_iommu *iommu) if (ecap_prs(iommu->ecap)) intel_svm_finish_prq(iommu); } + if (ecap_vcs(iommu->ecap) && vccap_pasid(iommu->vccap)) +
ioasid_unregister_allocator(&iommu->pasid_allocator); +
#endif
}drivers/iommu/Kconfig +7
-0@@ -4910,6 +4913,44 @@ static int __init probe_acpi_namespace_devices(void) return 0; } +#ifdef CONFIG_INTEL_IOMMU_SVM +static ioasid_t intel_ioasid_alloc(ioasid_t min, ioasid_t max, void *data) +{ + struct intel_iommu *iommu = data; + ioasid_t ioasid; + + /* + * VT-d virtual command interface always uses the full 20bit
drivers/iommu/Kconfig +1
-0+ * PASID range. Host can partition guest PASID range basedon
drivers/iommu/Kconfig +19
-0+ * policies but it is out of guest's control. + */ + if (min < PASID_MIN || max > intel_pasid_max_id)> + return INVALID_IOASID; + + if (vcmd_alloc_pasid(iommu, &ioasid)) + return INVALID_IOASID; + + return ioasid; +} + +static void intel_ioasid_free(ioasid_t ioasid, void *data) +{ + struct intel_iommu *iommu = data; + + if (!iommu) + return; + /* + * Sanity check the ioasid owner is done at upper layer,e.g. VFIO
drivers/iommu/Kconfig +1
-0+ * We can only free the PASID when all the devices areunbond.
drivers/iommu/Kconfig +14
-0+ */ + if (ioasid_find(NULL, ioasid, NULL)) { + pr_alert("Cannot free active IOASID %d\n", ioasid); + return; + } + vcmd_free_pasid(iommu, ioasid); +} +#endif + int __init intel_iommu_init(void) { int ret = -ENODEV;@@ -5020,6 +5061,32 @@ int __init intel_iommu_init(void) "%s", iommu->name); iommu_device_set_ops(&iommu->iommu, &intel_iommu_ops); iommu_device_register(&iommu->iommu); +#ifdef CONFIG_INTEL_IOMMU_SVM + if (ecap_vcs(iommu->ecap) && vccap_pasid(iommu->vccap)) { + pr_info("Register custom PASID allocator\n"); + /* + * Register a custom ASID allocator if weare running
drivers/iommu/Kconfig +1
-0+ * in a guest, the purpose is to have asystem wide PASID
drivers/iommu/Kconfig +2
-0+ * namespace among all PASID users. + * There can be multiple vIOMMUs in eachguest but only
drivers/iommu/Kconfig +1
-0+ * one allocator is active. All vIOMMUallocators will
drivers/iommu/Kconfig +1
-0+ * eventually be calling the same hostallocator.
drivers/iommu/Kconfig +2
-0+ */ + iommu->pasid_allocator.alloc =
intel_ioasid_alloc;drivers/iommu/Kconfig +1
-0+ iommu->pasid_allocator.free =
intel_ioasid_free;drivers/iommu/Kconfig +1
-0+ iommu->pasid_allocator.pdata = (void*)iommu;
drivers/iommu/Kconfig +1
-0+ ret =
ioasid_register_allocator(&iommu->pasid_allocator);drivers/iommu/Kconfig +2
-0+ if (ret) { + pr_warn("Custom PASID allocatorQuoted 1 line
registeration failed\n");
nit: registration
Quoted 9 lines
Quoted 7 lines
drivers/iommu/Kconfig +2
-0+ /* + * Disable scalable mode on thisIOMMU if there
drivers/iommu/Kconfig +1
-0+ * is no custom allocator. MixingSM capable vIOMMU
drivers/iommu/Kconfig +1
-0+ * and non-SM vIOMMU are notsupported:
nit; is not supported. But I guess you will reshape it according to previous comments.
Yes, i moved this earlier to avoid the need to clean up after scalable mode root table is set.
Quoted 32 lines
Quoted 25 lines
drivers/iommu/Kconfig +5
-0+ */ + intel_iommu_sm = 0; + } + } +#endif } bus_set_iommu(&pci_bus_type, &intel_iommu_ops);(quoted diff) +0
-0
b/include/linux/intel-iommu.hindex1d4b8dcdc5d8..c624733cb2e6100644 ---a/include/linux/intel-iommu.h
+++b/include/linux/intel-iommu.hinclude/linux/intel-iommu.h +2
-0@@ -19,6 +19,7 @@#include <linux/iommu.h> #include <linux/io-64-nonatomic-lo-hi.h> #include <linux/dmar.h> +#include <linux/ioasid.h> #include <asm/cacheflush.h> #include <asm/iommu.h> @@ -546,6 +547,7 @@ struct intel_iommu {#ifdef CONFIG_INTEL_IOMMU_SVM struct page_req_dsc *prq;unsigned char prq_name[16 ];/* Name for PRQ interrupt */ +struct ioasid_allocator_ops pasid_allocator;/* Custom Quoted 4 lines
allocator for PASIDs */ #endif
structq_inval*qi; /* Queued invalidation
info */ u32*iommu_state; /* Store iommu states between suspend and resume.*/Thanks
Quoted 2 lines
Eric
[Jacob Pan]
PATCH v7 4/11 iommu/vt-d: Replace Intel specific PASID allocator with IOASID
In reply to Jacob PanMake use of generic IOASID code to manage PASID allocation, free, and lookup. Replace Intel specific code.
--- drivers/iommu/intel-iommu.c | 12 ++++++------ drivers/iommu/intel-pasid.c | 36 ------------------------------------ drivers/iommu/intel-svm.c | 39 +++++++++++++++++++++++---------------- 3 files changed, 29 insertions(+), 58 deletions(-)
drivers/iommu/intel-iommu.c +6 -6
@@ -5311,7 +5311,7 @@ static void auxiliary_unlink_device(struct dmar_domain *domain, domain->auxd_refcnt--;if (!domain->auxd_refcnt && domain->default_pasid >0 ) -intel_pasid_free_id (domain->default_pasid); +ioasid_free (domain->default_pasid); } static int aux_domain_add_dev(struct dmar_domain *domain,
@@ -5329,10 +5329,10 @@ static int aux_domain_add_dev(struct dmar_domain *domain,if (domain->default_pasid <=0 ) {int pasid; - pasid =intel_pasid_alloc_id (domain,PASID_MIN , -pci_max_pasids (to_pci_dev (dev)), -GFP_KERNEL ); -if (pasid <=0 ) { +/* No private data needed for the default pasid */ + pasid =ioasid_alloc (NULL ,PASID_MIN ,pci_max_pasids (to_pci_dev (dev)) -1 , +NULL ); +if (pasid ==INVALID_IOASID ) {pr_err ("Can't allocate default pasid\n" );return -ENODEV ; }
@@ -5368,7 +5368,7 @@ static int aux_domain_add_dev(struct dmar_domain *domain,spin_unlock (&iommu->lock);spin_unlock_irqrestore (&device_domain_lock, flags);if (!domain->auxd_refcnt && domain->default_pasid >0 ) -intel_pasid_free_id (domain->default_pasid); +ioasid_free (domain->default_pasid);return ret; }
drivers/iommu/intel-pasid.c +0 -36
@@ -26,42 +26,6 @@*/ static DEFINE_SPINLOCK (pasid_lock);u32 intel_pasid_max_id =PASID_MAX ; -static DEFINE_IDR (pasid_idr); - -int intel_pasid_alloc_id (void *ptr,int start,int end,gfp_t gfp) -{ -int ret, min, max; - - min =max_t (int, start,PASID_MIN ); - max =min_t (int, end, intel_pasid_max_id); - -WARN_ON (in_interrupt ()); -idr_preload (gfp); -spin_lock (&pasid_lock); - ret =idr_alloc (&pasid_idr, ptr, min, max,GFP_ATOMIC ); -spin_unlock (&pasid_lock); -idr_preload_end (); - -return ret; -} - -void intel_pasid_free_id (int pasid) -{ -spin_lock (&pasid_lock); -idr_remove (&pasid_idr, pasid); -spin_unlock (&pasid_lock); -} - -void *intel_pasid_lookup_id (int pasid) -{ -void *p; - -spin_lock (&pasid_lock); - p =idr_find (&pasid_idr, pasid); -spin_unlock (&pasid_lock); - -return p; -}int vcmd_alloc_pasid (struct intel_iommu *iommu,unsigned int *pasid) {
drivers/iommu/intel-svm.c +23 -16
@@ -17,6 +17,7 @@#include <linux/dmar.h> #include <linux/interrupt.h> #include <linux/mm_types.h> +#include <linux/ioasid.h> #include <asm/page.h> #include "intel-pasid.h"
@@ -318,16 +319,15 @@ int intel_svm_bind_mm(struct device *dev, int *pasid, int flags, struct svm_dev_if (pasid_max > intel_pasid_max_id) pasid_max = intel_pasid_max_id; -/* Do not use PASID 0 in caching mode (virtualised IOMMU) */ - ret =intel_pasid_alloc_id (svm, - !!cap_caching_mode (iommu->cap), - pasid_max -1 ,GFP_KERNEL ); -if (ret <0 ) { +/* Do not use PASID 0, reserved for RID to PASID */ + svm->pasid =ioasid_alloc (NULL ,PASID_MIN , + pasid_max -1 , svm); +if (svm->pasid ==INVALID_IOASID ) {kfree (svm);kfree (sdev); + ret =ENOSPC ; goto out; } - svm->pasid = ret; svm->notifier.ops = &intel_mmuops; svm->mm = mm; svm->flags = flags;
@@ -337,7 +337,7 @@ int intel_svm_bind_mm(struct device *dev, int *pasid, int flags, struct svm_dev_if (mm) { ret =mmu_notifier_register (&svm->notifier, mm);if (ret) { -intel_pasid_free_id (svm->pasid); +ioasid_free (svm->pasid);kfree (svm);kfree (sdev); goto out;
@@ -353,7 +353,7 @@ int intel_svm_bind_mm(struct device *dev, int *pasid, int flags, struct svm_dev_if (ret) {if (mm)mmu_notifier_unregister (&svm->notifier, mm); -intel_pasid_free_id (svm->pasid); +ioasid_free (svm->pasid);kfree (svm);kfree (sdev); goto out;
@@ -401,7 +401,12 @@ int intel_svm_unbind_mm(struct device *dev, int pasid)if (!iommu) goto out; - svm =intel_pasid_lookup_id (pasid); + svm =ioasid_find (NULL , pasid,NULL ); +if (IS_ERR (svm)) { + ret =PTR_ERR (svm); + goto out; + } +if (!svm) goto out;
@@ -423,7 +428,9 @@ int intel_svm_unbind_mm(struct device *dev, int pasid)kfree_rcu (sdev, rcu);if (list_empty (&svm->devs)) { -intel_pasid_free_id (svm->pasid); +/* Clear private data so that free pass check */ +ioasid_set_data (svm->pasid,NULL ); +ioasid_free (svm->pasid);if (svm->mm)mmu_notifier_unregister (&svm->notifier, svm->mm);
@@ -458,10 +465,11 @@ int intel_svm_is_pasid_valid(struct device *dev, int pasid)if (!iommu) goto out; - svm =intel_pasid_lookup_id (pasid); -if (!svm) + svm =ioasid_find (NULL , pasid,NULL ); +if (IS_ERR (svm)) { + ret =PTR_ERR (svm); goto out; - + }/* init_mm is used in this case */ if (!svm->mm) ret =1 ;
@@ -568,13 +576,12 @@ static irqreturn_t prq_event_thread(int irq, void *d)if (!svm || svm->pasid != req->pasid) {rcu_read_lock (); - svm =intel_pasid_lookup_id (req->pasid); + svm =ioasid_find (NULL , req->pasid,NULL );/* It *can't* go away, because the driver is not permitted * to unbind the mm while any page faults are outstanding. * So we only need RCU to protect the internal idr code. */ rcu_read_unlock (); - -if (!svm) { +if (IS_ERR (svm) || !svm) {pr_err ("%s: Page request for invalid PASID %d: %08llx %08llx\n" , iommu->name, req->pasid, ((unsigned long long *)req)[0 ], ((unsigned long long *)req)[1 ]);
Signature · 6 lines
2.7.4 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH v7 04/11] iommu/vt-d: Replace Intel specific PASID allocator with IOASID
Hi,
Quoted 9 lines · Jacob Pan
Make use of generic IOASID code to manage PASID allocation, free, and lookup. Replace Intel specific code.
Signed-off-by Jacob Pan <[email protected]>--- drivers/iommu/intel-iommu.c | 12 ++++++------ drivers/iommu/intel-pasid.c | 36 ------------------------------------ drivers/iommu/intel-svm.c | 39 +++++++++++++++++++++++---------------- 3 files changed, 29 insertions(+), 58 deletions(-)
[--cut--]
drivers/iommu/intel-svm.c int intel_svm_is_pasid_valid(struct device *dev, int pasid) · line 469
Quoted 8 lines
drivers/iommu/intel-svm.c +2
-2@@ -458,10 +465,11 @@ int intel_svm_is_pasid_valid(struct device *dev, int pasid)if (!iommu) goto out; - svm =intel_pasid_lookup_id (pasid); -if (!svm) + svm =ioasid_find (NULL , pasid,NULL ); +if (IS_ERR (svm)) {
Shall we check whether svm is NULL?
Others looks good to me.
Best regards,
baolu
Re: [PATCH v7 04/11] iommu/vt-d: Replace Intel specific PASID allocator with IOASID
Quoted 20 lines · On Fri, 25 Oct 2019 13:47:25 +0800 Lu Baolu <[email protected]> wrote:
Hi,
Quoted 10 lines · Jacob Pan
Make use of generic IOASID code to manage PASID allocation, free, and lookup. Replace Intel specific code.
Signed-off-by Jacob Pan <[email protected]>--- drivers/iommu/intel-iommu.c | 12 ++++++------ drivers/iommu/intel-pasid.c | 36------------------------------------
drivers/iommu/intel-svm.c|
39 +++++++++++++++++++++++---------------- 3 files changed, 29 insertions(+), 58 deletions(-)[--cut--]
Quoted 4 lines
drivers/iommu/intel-svm.c +0
-0@@ -458,10 +465,11 @@ int intel_svm_is_pasid_valid(struct device *dev, int pasid) if (!iommu) goto out;
Quoted 7 lines
drivers/iommu/intel-svm.c int intel_svm_is_pasid_valid(struct device *dev, int pasid) · line 469
Quoted 4 lines
drivers/iommu/intel-svm.c +2
-2- svm =intel_pasid_lookup_id (pasid); -if (!svm) + svm =ioasid_find (NULL , pasid,NULL ); +if (IS_ERR (svm)) {Shall we check whether svm is NULL?
Missed this earlier, you are right we need to check for NULL. Thanks,
Quoted 6 lines
Others looks good to me.
Reviewed-by Lu Baolu <[email protected]>Best regards,
baolu
[Jacob Pan]
RE: [PATCH v7 04/11] iommu/vt-d: Replace Intel specific PASID allocator with IOASID
In reply to Jacob PanQuoted 7 lines
From: Jacob Pan [mailto:[email protected]]
Sent: Friday, October 25, 2019 3:55 AMMake use of generic IOASID code to manage PASID allocation, free, and lookup. Replace Intel specific code.
Signed-off-by Jacob Pan <[email protected]>
better push this patch separately. It's a generic cleanup.
Quoted 214 lines
--- drivers/iommu/intel-iommu.c | 12 ++++++------ drivers/iommu/intel-pasid.c | 36 ------------------------------------ drivers/iommu/intel-svm.c | 39 +++++++++++++++++++++++---------------- 3 files changed, 29 insertions(+), 58 deletions(-)drivers/iommu/intel-iommu.c +1
-1@@ -5311,7 +5311,7 @@ static void auxiliary_unlink_device(struct dmar_domain *domain, domain->auxd_refcnt--;if (!domain->auxd_refcnt && domain->default_pasid >0 ) -intel_pasid_free_id (domain->default_pasid); +ioasid_free (domain->default_pasid); }static int aux_domain_add_dev(struct
dmar_domain*domain,drivers/iommu/intel-iommu.c +4
-4@@ -5329,10 +5329,10 @@ static int aux_domain_add_dev(struct dmar_domain *domain, if (domain->default_pasid <= 0) {int pasid; - pasid =intel_pasid_alloc_id (domain,PASID_MIN , -pci_max_pasids (to_pci_dev (dev)), -GFP_KERNEL ); -if (pasid <=0 ) { +/* No private data needed for the default pasid */ + pasid =ioasid_alloc (NULL ,PASID_MIN ,pci_max_pasids (to_pci_dev (dev)) -1 , +NULL ); +if (pasid ==INVALID_IOASID ) {pr_err ("Can't allocate default pasid\n" );drivers/iommu/intel-iommu.c +1
-1return -ENODEV ; }@@ -5368,7 +5368,7 @@ static int aux_domain_add_dev(struct dmar_domain *domain,spin_unlock (&iommu->lock);spin_unlock_irqrestore (&device_domain_lock, flags);if (!domain->auxd_refcnt && domain->default_pasid >0 ) -intel_pasid_free_id (domain->default_pasid); +ioasid_free (domain->default_pasid);return ret;}
drivers/iommu/intel-pasid.c +0
-36@@ -26,42 +26,6 @@*/ static DEFINE_SPINLOCK (pasid_lock);u32 intel_pasid_max_id =PASID_MAX ; -static DEFINE_IDR (pasid_idr); - -int intel_pasid_alloc_id (void *ptr,int start,int end,gfp_t gfp) -{ -int ret, min, max; - - min =max_t (int, start,PASID_MIN ); - max =min_t (int, end, intel_pasid_max_id); - -WARN_ON (in_interrupt ()); -idr_preload (gfp); -spin_lock (&pasid_lock); - ret =idr_alloc (&pasid_idr, ptr, min, max,GFP_ATOMIC ); -spin_unlock (&pasid_lock); -idr_preload_end (); - -return ret; -} - -void intel_pasid_free_id (int pasid) -{ -spin_lock (&pasid_lock); -idr_remove (&pasid_idr, pasid); -spin_unlock (&pasid_lock); -} - -void *intel_pasid_lookup_id (int pasid) -{ -void *p; - -spin_lock (&pasid_lock); - p =idr_find (&pasid_idr, pasid); -spin_unlock (&pasid_lock); - -return p; -}int vcmd_alloc_pasid (struct intel_iommu *iommu,unsigned int *pasid) {drivers/iommu/intel-svm.c +6
-6@@ -17,6 +17,7 @@#include <linux/dmar.h> #include <linux/interrupt.h> #include <linux/mm_types.h> +#include <linux/ioasid.h> #include <asm/page.h> #include "intel-pasid.h" @@ -318,16 +319,15 @@ int intel_svm_bind_mm(struct device *dev, int*pasid, int flags, struct svm_dev_ if (pasid_max > intel_pasid_max_id) pasid_max = intel_pasid_max_id; -/* Do not use PASID 0 in caching mode (virtualised IOMMU) */ - ret =intel_pasid_alloc_id (svm, - !!cap_caching_mode (iommu->cap), - pasid_max -1 ,GFP_KERNEL ); -if (ret <0 ) { +/* Do not use PASID 0, reserved for RID to PASID */ + svm->pasid =ioasid_alloc (NULL ,PASID_MIN , + pasid_max -1 , svm); +if (svm->pasid ==INVALID_IOASID ) {kfree (svm);kfree (sdev); + ret =ENOSPC ; goto out; } - svm->pasid = ret; svm->notifier.ops = &intel_mmuops;drivers/iommu/intel-svm.c +1
-1svm->mm = mm; svm->flags = flags;@@ -337,7 +337,7 @@ int intel_svm_bind_mm(struct device *dev, int *pasid, int flags, struct svm_dev_ if (mm) { ret =mmu_notifier_register (&svm->notifier, mm);if (ret) { -intel_pasid_free_id (svm->pasid); +ioasid_free (svm->pasid);kfree (svm);kfree (sdev);drivers/iommu/intel-svm.c +1
-1goto out;@@ -353,7 +353,7 @@ int intel_svm_bind_mm(struct device *dev, int *pasid, int flags, struct svm_dev_ if (ret) {if (mm)mmu_notifier_unregister (&svm->notifier, mm); -intel_pasid_free_id (svm->pasid); +ioasid_free (svm->pasid);kfree (svm);drivers/iommu/intel-svm.c +7
-2kfree (sdev); goto out;@@ -401,7 +401,12 @@ int intel_svm_unbind_mm(struct device *dev, int pasid)if (!iommu) goto out; - svm =intel_pasid_lookup_id (pasid); + svm =ioasid_find (NULL , pasid,NULL ); +if (IS_ERR (svm)) { + ret =PTR_ERR (svm); + goto out; + } +if (!svm) goto out;@@ -423,7 +428,9 @@ int intel_svm_unbind_mm(struct device *dev, int pasid)kfree_rcu (sdev ,rcu );if (list_empty (&svm->devs)) { -intel_pasid_free_id (svm->pasid); +/* Clear private data so that free pass check */
drivers/iommu/intel-svm.c +2
-0+ioasid_set_data (svm->pasid,NULL ); +ioasid_free (svm->pasid);if (svm->mm)mmu_notifier_unregister(&svm->notifier, svm->mm);drivers/iommu/intel-svm.c +4
-3@@ -458,10 +465,11 @@ int intel_svm_is_pasid_valid(struct device *dev, int pasid)if (!iommu) goto out; - svm =intel_pasid_lookup_id (pasid); -if (!svm) + svm =ioasid_find (NULL , pasid,NULL ); +if (IS_ERR (svm)) { + ret =PTR_ERR (svm); goto out; - + }/* init_mm is used in this case */ if (!svm->mm)drivers/iommu/intel-svm.c +1
-1ret =1 ;@@ -568,13 +576,12 @@ static irqreturn_t prq_event_thread(int irq, void *d)if (!svm || svm->pasid != req->pasid) {rcu_read_lock (); - svm =intel_pasid_lookup_id (req->pasid); + svm =ioasid_find (NULL , req->pasid,NULL );/* It *can't* go away, because the driver is not permitted
* to unbind the mm while any page faults are
outstanding.
* So we only need RCU to protect the internal idr
code. */drivers/iommu/intel-svm.c +1
-2rcu_read_unlock (); - -if (!svm) { +if (IS_ERR (svm) || !svm) { pr_err("%s: Page request for invalid
Quoted 6 lines
PASID %d: %08llx %08llx\n",
iommu->name,req->pasid, ((unsigned
long long *)req)[0],
((unsigned long long *)req)[1]);
--
2.7.4
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH v7 04/11] iommu/vt-d: Replace Intel specific PASID allocator with IOASID
Quoted 10 lines · Kevin
Quoted 7 lines
From: Jacob Pan [mailto:[email protected]]
Sent: Friday, October 25, 2019 3:55 AMMake use of generic IOASID code to manage PASID allocation, free, and lookup. Replace Intel specific code.
Signed-off-by Jacob Pan <[email protected]>better push this patch separately. It's a generic cleanup.
True but might be more efficient to have this cleanup patch paved way. Since the follow up new guest SVA code uses the new API. So I wanted to get rid of the old code completely.
Quoted 217 lines
Quoted 217 lines
--- drivers/iommu/intel-iommu.c | 12 ++++++------ drivers/iommu/intel-pasid.c | 36------------------------------------
drivers/iommu/intel-svm.c|
39 +++++++++++++++++++++++---------------- 3 files changed, 29 insertions(+), 58 deletions(-)(quoted diff) +0
-0
b/drivers/iommu/intel-iommu.cindexced1d89ef977..2ea09b988a23100644 ---a/drivers/iommu/intel-iommu.c
+++b/drivers/iommu/intel-iommu.cdrivers/iommu/intel-iommu.c +1
-1@@ -5311,7 +5311,7 @@ static void auxiliary_unlink_device(struct dmar_domain *domain, domain->auxd_refcnt--;if (!domain->auxd_refcnt && domain->default_pasid >0 ) -intel_pasid_free_id (domain->default_pasid); +ioasid_free (domain->default_pasid); }static int aux_domain_add_dev(struct
dmar_domain*domain,drivers/iommu/intel-iommu.c +4
-4@@ -5329,10 +5329,10 @@ static int aux_domain_add_dev(struct dmar_domain *domain, if (domain->default_pasid <= 0) {int pasid; - pasid =intel_pasid_alloc_id (domain,PASID_MIN , -pci_max_pasids (to_pci_dev (dev)), -GFP_KERNEL ); -if (pasid <=0 ) { +/* No private data needed for the default pasid */ + pasid =ioasid_alloc (NULL ,PASID_MIN ,pci_max_pasids (to_pci_dev (dev)) -1 , +NULL ); +if (pasid ==INVALID_IOASID ) {drivers/iommu/intel-iommu.c +1
-1pr_err ("Can't allocate default pasid\n" );return -ENODEV ; }@@ -5368,7 +5368,7 @@ static int aux_domain_add_dev(struct dmar_domain *domain,spin_unlock (&iommu->lock);spin_unlock_irqrestore (&device_domain_lock, flags);if (!domain->auxd_refcnt && domain->default_pasid >0 ) -intel_pasid_free_id (domain->default_pasid); +ioasid_free (domain->default_pasid);return ret;}
(quoted diff) +0
-0
b/drivers/iommu/intel-pasid.cindexd81e857d2b25..e79d680fe300100644 ---a/drivers/iommu/intel-pasid.c
+++b/drivers/iommu/intel-pasid.cdrivers/iommu/intel-pasid.c +0
-36@@ -26,42 +26,6 @@*/ static DEFINE_SPINLOCK (pasid_lock);u32 intel_pasid_max_id =PASID_MAX ; -static DEFINE_IDR (pasid_idr); - -int intel_pasid_alloc_id (void *ptr,int start,int end,gfp_t gfp) -{ -int ret, min, max; - - min =max_t (int, start,PASID_MIN ); - max =min_t (int, end, intel_pasid_max_id); - -WARN_ON (in_interrupt ()); -idr_preload (gfp); -spin_lock (&pasid_lock); - ret =idr_alloc (&pasid_idr, ptr, min, max,GFP_ATOMIC ); -spin_unlock (&pasid_lock); -idr_preload_end (); - -return ret; -} - -void intel_pasid_free_id (int pasid) -{ -spin_lock (&pasid_lock); -idr_remove (&pasid_idr, pasid); -spin_unlock (&pasid_lock); -} - -void *intel_pasid_lookup_id (int pasid) -{ -void *p; - -spin_lock (&pasid_lock); - p =idr_find (&pasid_idr, pasid); -spin_unlock (&pasid_lock); - -return p; -}int vcmd_alloc_pasid (struct intel_iommu *iommu,unsigned int *pasid) {drivers/iommu/intel-svm.c +1
-1@@ -17,6 +17,7 @@#include <linux/dmar.h> #include <linux/interrupt.h> #include <linux/mm_types.h> +#include <linux/ioasid.h> #include <asm/page.h> #include "intel-pasid.h" @@ -318,16 +319,15 @@ int intel_svm_bind_mm(struct device *dev, int *pasid, int flags, struct svm_dev_if (pasid_max > intel_pasid_max_id) pasid_max = intel_pasid_max_id; -/* Do not use PASID 0 in caching mode (virtualised IOMMU) */
drivers/iommu/intel-svm.c +0
-3- ret = intel_pasid_alloc_id(svm, - !!cap_caching_mode(iommu->cap), - pasid_max - 1,
GFP_KERNEL);drivers/iommu/intel-svm.c +6
-3-if (ret <0 ) { +/* Do not use PASID 0, reserved for RID to PASID */ + svm->pasid =ioasid_alloc (NULL ,PASID_MIN , + pasid_max -1 , svm); +if (svm->pasid ==INVALID_IOASID ) {kfree (svm);kfree (sdev); + ret =ENOSPC ; goto out; } - svm->pasid = ret; svm->notifier.ops = &intel_mmuops; svm->mm = mm; svm->flags = flags;@@ -337,7 +337,7 @@ int intel_svm_bind_mm(struct device *dev, int *pasid, int flags, struct svm_dev_ if (mm) { ret =mmu_notifier_register (&svm->notifier, mm);if (ret) { -intel_pasid_free_id (svm->pasid); +ioasid_free (svm->pasid);kfree (svm);kfree (sdev);drivers/iommu/intel-svm.c +1
-1goto out;@@ -353,7 +353,7 @@ int intel_svm_bind_mm(struct device *dev, int *pasid, int flags, struct svm_dev_ if (ret) {if (mm)mmu_notifier_unregister (&svm->notifier, mm); -intel_pasid_free_id (svm->pasid); +ioasid_free (svm->pasid);kfree (svm);drivers/iommu/intel-svm.c +7
-2kfree (sdev); goto out;@@ -401,7 +401,12 @@ int intel_svm_unbind_mm(struct device *dev, int pasid)if (!iommu) goto out; - svm =intel_pasid_lookup_id (pasid); + svm =ioasid_find (NULL , pasid,NULL ); +if (IS_ERR (svm)) { + ret =PTR_ERR (svm); + goto out; + } +if (!svm) goto out;@@ -423,7 +428,9 @@ int intel_svm_unbind_mm(struct device *dev, int pasid)kfree_rcu (sdev ,rcu );if (list_empty (&svm->devs)) { -intel_pasid_free_id (svm->pasid); +/* Clear private data so that free pass check */
+ioasid_set_data(svm->pasid, NULL);drivers/iommu/intel-svm.c +1
-0+ioasid_free (svm->pasid);if (svm->mm)mmu_notifier_unregister(&svm->notifier, svm->mm);drivers/iommu/intel-svm.c +4
-3@@ -458,10 +465,11 @@ int intel_svm_is_pasid_valid(struct device *dev, int pasid)if (!iommu) goto out; - svm =intel_pasid_lookup_id (pasid); -if (!svm) + svm =ioasid_find (NULL , pasid,NULL ); +if (IS_ERR (svm)) { + ret =PTR_ERR (svm); goto out; - + }/* init_mm is used in this case */ if (!svm->mm)drivers/iommu/intel-svm.c +1
-1ret =1 ;@@ -568,13 +576,12 @@ static irqreturn_t prq_event_thread(int irq, void *d)if (!svm || svm->pasid != req->pasid) {rcu_read_lock (); - svm =intel_pasid_lookup_id (req->pasid); + svm =ioasid_find (NULL , req->pasid,NULL );/* It *can't* go away, because the driver is not permitted
* to unbind the mm while any page faults
are outstanding.
* So we only need RCU to protect the
internal idr code. */drivers/iommu/intel-svm.c +0
-2rcu_read_unlock (); - -if (!svm) {
Quoted 9 lines
Quoted 8 lines
drivers/iommu/intel-svm.c +1
-0+if (IS_ERR (svm) || !svm) { pr_err("%s: Page request forinvalid PASID %d: %08llx %08llx\n",
iommu->name,req->pasid,
((unsigned long long *)req)[0],
((unsigned long long
*)req)[1]); --
2.7.4
[Jacob Pan]
Re: [PATCH v7 04/11] iommu/vt-d: Replace Intel specific PASID allocator with IOASID
In reply to Jacob PanHi Jacob,
Quoted 108 lines · Jacob Pan
Make use of generic IOASID code to manage PASID allocation, free, and lookup. Replace Intel specific code.
Signed-off-by Jacob Pan <[email protected]>--- drivers/iommu/intel-iommu.c | 12 ++++++------ drivers/iommu/intel-pasid.c | 36 ------------------------------------ drivers/iommu/intel-svm.c | 39 +++++++++++++++++++++++---------------- 3 files changed, 29 insertions(+), 58 deletions(-)drivers/iommu/intel-iommu.c +6
-6@@ -5311,7 +5311,7 @@ static void auxiliary_unlink_device(struct dmar_domain *domain, domain->auxd_refcnt--;if (!domain->auxd_refcnt && domain->default_pasid >0 ) -intel_pasid_free_id (domain->default_pasid); +ioasid_free (domain->default_pasid); } static int aux_domain_add_dev(struct dmar_domain *domain,@@ -5329,10 +5329,10 @@ static int aux_domain_add_dev(struct dmar_domain *domain,if (domain->default_pasid <=0 ) {int pasid; - pasid =intel_pasid_alloc_id (domain,PASID_MIN , -pci_max_pasids (to_pci_dev (dev)), -GFP_KERNEL ); -if (pasid <=0 ) { +/* No private data needed for the default pasid */ + pasid =ioasid_alloc (NULL ,PASID_MIN ,pci_max_pasids (to_pci_dev (dev)) -1 , +NULL ); +if (pasid ==INVALID_IOASID ) {pr_err ("Can't allocate default pasid\n" );return -ENODEV ; }@@ -5368,7 +5368,7 @@ static int aux_domain_add_dev(struct dmar_domain *domain,spin_unlock (&iommu->lock);spin_unlock_irqrestore (&device_domain_lock, flags);if (!domain->auxd_refcnt && domain->default_pasid >0 ) -intel_pasid_free_id (domain->default_pasid); +ioasid_free (domain->default_pasid);return ret; }drivers/iommu/intel-pasid.c +0
-36@@ -26,42 +26,6 @@*/ static DEFINE_SPINLOCK (pasid_lock);u32 intel_pasid_max_id =PASID_MAX ; -static DEFINE_IDR (pasid_idr); - -int intel_pasid_alloc_id (void *ptr,int start,int end,gfp_t gfp) -{ -int ret, min, max; - - min =max_t (int, start,PASID_MIN ); - max =min_t (int, end, intel_pasid_max_id); - -WARN_ON (in_interrupt ()); -idr_preload (gfp); -spin_lock (&pasid_lock); - ret =idr_alloc (&pasid_idr, ptr, min, max,GFP_ATOMIC ); -spin_unlock (&pasid_lock); -idr_preload_end (); - -return ret; -} - -void intel_pasid_free_id (int pasid) -{ -spin_lock (&pasid_lock); -idr_remove (&pasid_idr, pasid); -spin_unlock (&pasid_lock); -} - -void *intel_pasid_lookup_id (int pasid) -{ -void *p; - -spin_lock (&pasid_lock); - p =idr_find (&pasid_idr, pasid); -spin_unlock (&pasid_lock); - -return p; -}int vcmd_alloc_pasid (struct intel_iommu *iommu,unsigned int *pasid) {drivers/iommu/intel-svm.c +1
-0@@ -17,6 +17,7 @@#include <linux/dmar.h> #include <linux/interrupt.h> #include <linux/mm_types.h> +#include <linux/ioasid.h> #include <asm/page.h> #include "intel-pasid.h" @@ -318,16 +319,15 @@ int intel_svm_bind_mm(struct device *dev, int *pasid, int flags, struct svm_dev_if (pasid_max > intel_pasid_max_id)
drivers/iommu/intel-svm.c int intel_svm_bind_mm(struct device *dev, int *pasid, int flags, struct svm_dev_ · line 324
Quoted 10 lines
drivers/iommu/intel-svm.c +3
-5pasid_max = intel_pasid_max_id; -/* Do not use PASID 0 in caching mode (virtualised IOMMU) */ - ret =intel_pasid_alloc_id (svm, - !!cap_caching_mode (iommu->cap), - pasid_max -1 ,GFP_KERNEL ); -if (ret <0 ) { +/* Do not use PASID 0, reserved for RID to PASID */ + svm->pasid =ioasid_alloc (NULL ,PASID_MIN , + pasid_max -1 , svm);
pasid_max -1 is inclusive. whereas max param in intel_pasid_alloc_id() is exclusive right? If you fixed an issue, you can mention it in the commit message.
drivers/iommu/intel-svm.c int intel_svm_bind_mm(struct device *dev, int *pasid, int flags, struct svm_dev_ · line 328
Quoted 3 lines
drivers/iommu/intel-svm.c +2
-0+if (svm->pasid ==INVALID_IOASID ) { kfree(svm);> kfree(sdev); + ret =ENOSPC ;
-ENOSPC.
Nit: in 2/11 vcmd_alloc_pasid returned -ENOMEM
Quoted 39 lines
drivers/iommu/intel-svm.c +8
-4goto out; } - svm->pasid = ret; svm->notifier.ops = &intel_mmuops; svm->mm = mm; svm->flags = flags;@@ -337,7 +337,7 @@ int intel_svm_bind_mm(struct device *dev, int *pasid, int flags, struct svm_dev_if (mm) { ret =mmu_notifier_register (&svm->notifier, mm);if (ret) { -intel_pasid_free_id (svm->pasid); +ioasid_free (svm->pasid);kfree (svm);kfree (sdev); goto out;@@ -353,7 +353,7 @@ int intel_svm_bind_mm(struct device *dev, int *pasid, int flags, struct svm_dev_if (ret) {if (mm)mmu_notifier_unregister (&svm->notifier, mm); -intel_pasid_free_id (svm->pasid); +ioasid_free (svm->pasid);kfree (svm);kfree (sdev); goto out;@@ -401,7 +401,12 @@ int intel_svm_unbind_mm(struct device *dev, int pasid)if (!iommu) goto out; - svm =intel_pasid_lookup_id (pasid); + svm =ioasid_find (NULL , pasid,NULL ); +if (IS_ERR (svm)) { + ret =PTR_ERR (svm); + goto out; + } +if (!svm) goto out;
drivers/iommu/intel-svm.c int intel_svm_unbind_mm(struct device *dev, int pasid) · line 431
Quoted 5 lines
drivers/iommu/intel-svm.c +1
-1@@ -423,7 +428,9 @@ int intel_svm_unbind_mm(struct device *dev, int pasid)kfree_rcu (sdev, rcu);if (list_empty (&svm->devs)) { -intel_pasid_free_id (svm->pasid); + /* Clear private data so that free pass check */> + ioasid_set_data(svm->pasid, NULL);
I don't get the above comment. Why is it needed?
Quoted 26 lines
drivers/iommu/intel-svm.c +6
-4+ioasid_free (svm->pasid);if (svm->mm)mmu_notifier_unregister (&svm->notifier, svm->mm);@@ -458,10 +465,11 @@ int intel_svm_is_pasid_valid(struct device *dev, int pasid)if (!iommu) goto out; - svm =intel_pasid_lookup_id (pasid); -if (!svm) + svm =ioasid_find (NULL , pasid,NULL ); +if (IS_ERR (svm)) { + ret =PTR_ERR (svm); goto out; - + }/* init_mm is used in this case */ if (!svm->mm) ret =1 ;@@ -568,13 +576,12 @@ static irqreturn_t prq_event_thread(int irq, void *d)if (!svm || svm->pasid != req->pasid) {rcu_read_lock (); - svm =intel_pasid_lookup_id (req->pasid); + svm =ioasid_find (NULL , req->pasid,NULL );
drivers/iommu/intel-svm.c static irqreturn_t prq_event_thread(int irq, void *d) · line 587
Quoted 10 lines
drivers/iommu/intel-svm.c +1
-2/* It *can't* go away, because the driver is not permitted * to unbind the mm while any page faults are outstanding. * So we only need RCU to protect the internal idr code. */ rcu_read_unlock (); - -if (!svm) { +if (IS_ERR (svm) || !svm) {pr_err ("%s: Page request for invalid PASID %d: %08llx %08llx\n" , iommu->name, req->pasid, ((unsigned long long *)req)[0 ], ((unsigned long long *)req)[1 ]);
Thanks
Eric
Re: [PATCH v7 04/11] iommu/vt-d: Replace Intel specific PASID allocator with IOASID
Quoted 116 lines · On Fri, 8 Nov 2019 12:30:31 +0100 Auger Eric <[email protected]> wrote:
Hi Jacob,
Quoted 113 lines · Jacob Pan
Make use of generic IOASID code to manage PASID allocation, free, and lookup. Replace Intel specific code.
Signed-off-by Jacob Pan <[email protected]>--- drivers/iommu/intel-iommu.c | 12 ++++++------ drivers/iommu/intel-pasid.c | 36------------------------------------
drivers/iommu/intel-svm.c|
39 +++++++++++++++++++++++---------------- 3 files changed, 29 insertions(+), 58 deletions(-)(quoted diff) +0
-0
b/drivers/iommu/intel-iommu.cindexced1d89ef977..2ea09b988a23100644 ---a/drivers/iommu/intel-iommu.c
+++b/drivers/iommu/intel-iommu.cdrivers/iommu/intel-iommu.c +5
-5@@ -5311,7 +5311,7 @@ static void auxiliary_unlink_device(struct dmar_domain *domain, domain->auxd_refcnt--;if (!domain->auxd_refcnt && domain->default_pasid >0 ) -intel_pasid_free_id (domain->default_pasid); +ioasid_free (domain->default_pasid); } static int aux_domain_add_dev(struct dmar_domain *domain,@@ -5329,10 +5329,10 @@ static int aux_domain_add_dev(struct dmar_domain *domain, if (domain->default_pasid <= 0) {int pasid; - pasid =intel_pasid_alloc_id (domain,PASID_MIN , -pci_max_pasids (to_pci_dev (dev)), -GFP_KERNEL ); -if (pasid <=0 ) { +/* No private data needed for the default pasid */ + pasid =ioasid_alloc (NULL ,PASID_MIN ,pci_max_pasids (to_pci_dev (dev)) -1 , +NULL ); +if (pasid ==INVALID_IOASID ) {pr_err ("Can't allocate default pasid\n" );drivers/iommu/intel-iommu.c +1
-1return -ENODEV ; }@@ -5368,7 +5368,7 @@ static int aux_domain_add_dev(struct dmar_domain *domain,spin_unlock (&iommu->lock);spin_unlock_irqrestore (&device_domain_lock, flags);if (!domain->auxd_refcnt && domain->default_pasid >0 ) -intel_pasid_free_id (domain->default_pasid); +ioasid_free (domain->default_pasid);return ret; }(quoted diff) +0
-0
b/drivers/iommu/intel-pasid.cindexd81e857d2b25..e79d680fe300100644 ---a/drivers/iommu/intel-pasid.c
+++b/drivers/iommu/intel-pasid.cdrivers/iommu/intel-pasid.c +0
-36@@ -26,42 +26,6 @@*/ static DEFINE_SPINLOCK (pasid_lock);u32 intel_pasid_max_id =PASID_MAX ; -static DEFINE_IDR (pasid_idr); - -int intel_pasid_alloc_id (void *ptr,int start,int end,gfp_t gfp) -{ -int ret, min, max; - - min =max_t (int, start,PASID_MIN ); - max =min_t (int, end, intel_pasid_max_id); - -WARN_ON (in_interrupt ()); -idr_preload (gfp); -spin_lock (&pasid_lock); - ret =idr_alloc (&pasid_idr, ptr, min, max,GFP_ATOMIC ); -spin_unlock (&pasid_lock); -idr_preload_end (); - -return ret; -} - -void intel_pasid_free_id (int pasid) -{ -spin_lock (&pasid_lock); -idr_remove (&pasid_idr, pasid); -spin_unlock (&pasid_lock); -} - -void *intel_pasid_lookup_id (int pasid) -{ -void *p; - -spin_lock (&pasid_lock); - p =idr_find (&pasid_idr, pasid); -spin_unlock (&pasid_lock); - -return p; -}int vcmd_alloc_pasid (struct intel_iommu *iommu,unsigned int *pasid) {drivers/iommu/intel-svm.c +1
-0@@ -17,6 +17,7 @@#include <linux/dmar.h> #include <linux/interrupt.h> #include <linux/mm_types.h> +#include <linux/ioasid.h> #include <asm/page.h> #include "intel-pasid.h" @@ -318,16 +319,15 @@ int intel_svm_bind_mm(struct device *dev, int *pasid, int flags, struct svm_dev_ if (pasid_max > intel_pasid_max_id) pasid_max = intel_pasid_max_id;
Quoted 13 lines
drivers/iommu/intel-svm.c int intel_svm_bind_mm(struct device *dev, int *pasid, int flags, struct svm_dev_ · line 324
Quoted 10 lines
drivers/iommu/intel-svm.c +0
-1-/* Do not use PASID 0 in caching mode (virtualised IOMMU) */
drivers/iommu/intel-svm.c +0
-3- ret = intel_pasid_alloc_id(svm, - !!cap_caching_mode(iommu->cap), - pasid_max - 1,
GFP_KERNEL);drivers/iommu/intel-svm.c +3
-1-if (ret <0 ) { +/* Do not use PASID 0, reserved for RID to PASID */ + svm->pasid =ioasid_alloc (NULL ,PASID_MIN , + pasid_max -1 , svm);
pasid_max-1 is inclusive. whereas max param inintel_pasid_alloc_id()is exclusive right? If you fixed an issue, you can mention it in the commit message.
yes, i should mention that. intel_pasid_alloc_id() uses IDR which is end exclusive. ioasid uses xarray, which is inclusive.
Quoted 6 lines
drivers/iommu/intel-svm.c int intel_svm_bind_mm(struct device *dev, int *pasid, int flags, struct svm_dev_ · line 328
Quoted 4 lines
drivers/iommu/intel-svm.c +1
-0+if (svm->pasid ==INVALID_IOASID ) { kfree(svm);>kfree(sdev);
drivers/iommu/intel-svm.c +1
-0+ ret =ENOSPC ;
-ENOSPC.
Nit: in 2/11vcmd_alloc_pasidreturned-ENOMEM
yes, it should be -ENOSPC as well.
Quoted 42 lines
Quoted 42 lines
drivers/iommu/intel-svm.c +2
-3goto out; } - svm->pasid = ret; svm->notifier.ops = &intel_mmuops; svm->mm = mm; svm->flags = flags;@@ -337,7 +337,7 @@ int intel_svm_bind_mm(struct device *dev, int *pasid, int flags, struct svm_dev_ if (mm) { ret =mmu_notifier_register (&svm->notifier, mm);if (ret) { -intel_pasid_free_id (svm->pasid); +ioasid_free (svm->pasid);kfree (svm);kfree (sdev); goto out;@@ -353,7 +353,7 @@ int intel_svm_bind_mm(struct device *dev, int *pasid, int flags, struct svm_dev_ if (ret) {if (mm)mmu_notifier_unregister (&svm->notifier, mm); -intel_pasid_free_id (svm->pasid); +ioasid_free (svm->pasid);kfree (svm);kfree (sdev);drivers/iommu/intel-svm.c +6
-1goto out;@@ -401,7 +401,12 @@ int intel_svm_unbind_mm(struct device *dev, int pasid) if (!iommu) goto out; - svm =intel_pasid_lookup_id (pasid); + svm =ioasid_find (NULL , pasid,NULL ); +if (IS_ERR (svm)) { + ret =PTR_ERR (svm); + goto out; + } +if (!svm) goto out;@@ -423,7 +428,9 @@ int intel_svm_unbind_mm(struct device *dev, int pasid) kfree_rcu(sdev, rcu);
Quoted 7 lines
Quoted 6 lines
drivers/iommu/intel-svm.c +1
-1if (list_empty (&svm->devs)) { -intel_pasid_free_id (svm->pasid); +/* Clear private data so that free pass check */> +
ioasid_set_data(svm->pasid, NULL);I don't get the above comment. Why is it needed?
Having private data associated with an IOASID is an indicator that this IOASID is busy. So we have to clear it to signal it is free. Actually, I am planning to introduce a refcount per IOASID since there will be multiple users of IOASID, e.g. IOMMU driver and KVM. When refcount == 0, we can free.
Quoted 40 lines
Quoted 35 lines
drivers/iommu/intel-svm.c +1
-0+ioasid_free (svm->pasid);if (svm->mm) mmu_notifier_unregister(&svm->notifier,
svm->mm);drivers/iommu/intel-svm.c +5
-4@@ -458,10 +465,11 @@ int intel_svm_is_pasid_valid(struct device *dev, int pasid) if (!iommu) goto out; - svm =intel_pasid_lookup_id (pasid); -if (!svm) + svm =ioasid_find (NULL , pasid,NULL ); +if (IS_ERR (svm)) { + ret =PTR_ERR (svm); goto out; - + }/* init_mm is used in this case */ if (!svm->mm) ret =1 ;@@ -568,13 +576,12 @@ static irqreturn_t prq_event_thread(int irq, void *d)if (!svm || svm->pasid != req->pasid) {rcu_read_lock (); - svm =intel_pasid_lookup_id (req->pasid); + svm =ioasid_find (NULL , req->pasid,NULL );/* It *can't* go away, because the driver is not permitted
* to unbind the mm while any page faults
are outstanding.
* So we only need RCU to protect the
internal idr code. */rcu_read_unlock();drivers/iommu/intel-svm.c +1
-2- -if (!svm) { +if (IS_ERR (svm) || !svm) { pr_err("%s: Page request forQuoted 3 lines
invalid PASID %d: %08llx %08llx\n",
iommu->name,req->pasid, ((unsigned long long *)req)[0], ((unsigned long long *)req)[1]);Thanks
Quoted 2 lines
Eric
[Jacob Pan]
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH v7 04/11] iommu/vt-d: Replace Intel specific PASID allocator with IOASID
Hi Jacob,
Quoted 191 lines · Jacob Pan
Quoted 116 lines · On Fri, 8 Nov 2019 12:30:31 +0100 Auger Eric <[email protected]> wrote:
Hi Jacob,
Quoted 113 lines · Jacob Pan
Make use of generic IOASID code to manage PASID allocation, free, and lookup. Replace Intel specific code.
Signed-off-by Jacob Pan <[email protected]>--- drivers/iommu/intel-iommu.c | 12 ++++++------ drivers/iommu/intel-pasid.c | 36------------------------------------
drivers/iommu/intel-svm.c|
39 +++++++++++++++++++++++---------------- 3 files changed, 29 insertions(+), 58 deletions(-)(quoted diff) +0
-0
b/drivers/iommu/intel-iommu.cindexced1d89ef977..2ea09b988a23100644 ---a/drivers/iommu/intel-iommu.c
+++b/drivers/iommu/intel-iommu.cdrivers/iommu/intel-iommu.c +5
-5@@ -5311,7 +5311,7 @@ static void auxiliary_unlink_device(struct dmar_domain *domain, domain->auxd_refcnt--;if (!domain->auxd_refcnt && domain->default_pasid >0 ) -intel_pasid_free_id (domain->default_pasid); +ioasid_free (domain->default_pasid); } static int aux_domain_add_dev(struct dmar_domain *domain,@@ -5329,10 +5329,10 @@ static int aux_domain_add_dev(struct dmar_domain *domain, if (domain->default_pasid <= 0) {int pasid; - pasid =intel_pasid_alloc_id (domain,PASID_MIN , -pci_max_pasids (to_pci_dev (dev)), -GFP_KERNEL ); -if (pasid <=0 ) { +/* No private data needed for the default pasid */ + pasid =ioasid_alloc (NULL ,PASID_MIN ,pci_max_pasids (to_pci_dev (dev)) -1 , +NULL ); +if (pasid ==INVALID_IOASID ) {pr_err ("Can't allocate default pasid\n" );drivers/iommu/intel-iommu.c +1
-1return -ENODEV ; }@@ -5368,7 +5368,7 @@ static int aux_domain_add_dev(struct dmar_domain *domain,spin_unlock (&iommu->lock);spin_unlock_irqrestore (&device_domain_lock, flags);if (!domain->auxd_refcnt && domain->default_pasid >0 ) -intel_pasid_free_id (domain->default_pasid); +ioasid_free (domain->default_pasid);return ret; }(quoted diff) +0
-0
b/drivers/iommu/intel-pasid.cindexd81e857d2b25..e79d680fe300100644 ---a/drivers/iommu/intel-pasid.c
+++b/drivers/iommu/intel-pasid.cdrivers/iommu/intel-pasid.c +0
-36@@ -26,42 +26,6 @@*/ static DEFINE_SPINLOCK (pasid_lock);u32 intel_pasid_max_id =PASID_MAX ; -static DEFINE_IDR (pasid_idr); - -int intel_pasid_alloc_id (void *ptr,int start,int end,gfp_t gfp) -{ -int ret, min, max; - - min =max_t (int, start,PASID_MIN ); - max =min_t (int, end, intel_pasid_max_id); - -WARN_ON (in_interrupt ()); -idr_preload (gfp); -spin_lock (&pasid_lock); - ret =idr_alloc (&pasid_idr, ptr, min, max,GFP_ATOMIC ); -spin_unlock (&pasid_lock); -idr_preload_end (); - -return ret; -} - -void intel_pasid_free_id (int pasid) -{ -spin_lock (&pasid_lock); -idr_remove (&pasid_idr, pasid); -spin_unlock (&pasid_lock); -} - -void *intel_pasid_lookup_id (int pasid) -{ -void *p; - -spin_lock (&pasid_lock); - p =idr_find (&pasid_idr, pasid); -spin_unlock (&pasid_lock); - -return p; -}int vcmd_alloc_pasid (struct intel_iommu *iommu,unsigned int *pasid) {drivers/iommu/intel-svm.c +1
-0@@ -17,6 +17,7 @@#include <linux/dmar.h> #include <linux/interrupt.h> #include <linux/mm_types.h> +#include <linux/ioasid.h> #include <asm/page.h> #include "intel-pasid.h" @@ -318,16 +319,15 @@ int intel_svm_bind_mm(struct device *dev, int *pasid, int flags, struct svm_dev_ if (pasid_max > intel_pasid_max_id) pasid_max = intel_pasid_max_id;Quoted 13 lines
drivers/iommu/intel-svm.c int intel_svm_bind_mm(struct device *dev, int *pasid, int flags, struct svm_dev_ · line 324
Quoted 10 lines
drivers/iommu/intel-svm.c +0
-1-/* Do not use PASID 0 in caching mode (virtualised IOMMU) */
drivers/iommu/intel-svm.c +0
-3- ret = intel_pasid_alloc_id(svm, - !!cap_caching_mode(iommu->cap), - pasid_max - 1,
GFP_KERNEL);drivers/iommu/intel-svm.c +3
-1-if (ret <0 ) { +/* Do not use PASID 0, reserved for RID to PASID */ + svm->pasid =ioasid_alloc (NULL ,PASID_MIN , + pasid_max -1 , svm);
pasid_max-1 is inclusive. whereas max param inintel_pasid_alloc_id()is exclusive right? If you fixed an issue, you can mention it in the commit message.yes, i should mention that.
intel_pasid_alloc_id()uses IDR which is end exclusive. ioasid uses xarray, which is inclusive.Quoted 6 lines
drivers/iommu/intel-svm.c int intel_svm_bind_mm(struct device *dev, int *pasid, int flags, struct svm_dev_ · line 328
Quoted 4 lines
drivers/iommu/intel-svm.c +1
-0+if (svm->pasid ==INVALID_IOASID ) { kfree(svm);>kfree(sdev);
drivers/iommu/intel-svm.c +1
-0+ ret =ENOSPC ;
-ENOSPC.
Nit: in 2/11vcmd_alloc_pasidreturned-ENOMEMyes, it should be
-ENOSPCas well.Quoted 42 lines
Quoted 42 lines
drivers/iommu/intel-svm.c +2
-3goto out; } - svm->pasid = ret; svm->notifier.ops = &intel_mmuops; svm->mm = mm; svm->flags = flags;@@ -337,7 +337,7 @@ int intel_svm_bind_mm(struct device *dev, int *pasid, int flags, struct svm_dev_ if (mm) { ret =mmu_notifier_register (&svm->notifier, mm);if (ret) { -intel_pasid_free_id (svm->pasid); +ioasid_free (svm->pasid);kfree (svm);kfree (sdev); goto out;@@ -353,7 +353,7 @@ int intel_svm_bind_mm(struct device *dev, int *pasid, int flags, struct svm_dev_ if (ret) {if (mm)mmu_notifier_unregister (&svm->notifier, mm); -intel_pasid_free_id (svm->pasid); +ioasid_free (svm->pasid);kfree (svm);kfree (sdev);drivers/iommu/intel-svm.c +6
-1goto out;@@ -401,7 +401,12 @@ int intel_svm_unbind_mm(struct device *dev, int pasid) if (!iommu) goto out; - svm =intel_pasid_lookup_id (pasid); + svm =ioasid_find (NULL , pasid,NULL ); +if (IS_ERR (svm)) { + ret =PTR_ERR (svm); + goto out; + } +if (!svm) goto out;@@ -423,7 +428,9 @@ int intel_svm_unbind_mm(struct device *dev, int pasid) kfree_rcu(sdev, rcu);Quoted 7 lines
Quoted 6 lines
drivers/iommu/intel-svm.c +1
-1if (list_empty (&svm->devs)) { -intel_pasid_free_id (svm->pasid); +/* Clear private data so that free pass check */> +
ioasid_set_data(svm->pasid, NULL);I don't get the above comment. Why is it needed?
Quoted 5 lines
Having private data associated with an IOASID is an indicator that this IOASID is busy. So we have to clear it to signal it is free. Actually, I am planning to introduce a refcount per IOASID since there will be multiple users of IOASID, e.g. IOMMU driver and KVM. When refcount == 0, we can free.
Ah OK I missed that. This is a specificity of the intel custom PASID allocator, ie intel_ioasid_free and not a generic behavior.
Thanks
Eric
Quoted 41 lines
Quoted 41 lines
Quoted 36 lines
drivers/iommu/intel-svm.c +1
-0+ioasid_free (svm->pasid);if (svm->mm) mmu_notifier_unregister(&svm->notifier,
svm->mm);drivers/iommu/intel-svm.c +5
-4@@ -458,10 +465,11 @@ int intel_svm_is_pasid_valid(struct device *dev, int pasid) if (!iommu) goto out; - svm =intel_pasid_lookup_id (pasid); -if (!svm) + svm =ioasid_find (NULL , pasid,NULL ); +if (IS_ERR (svm)) { + ret =PTR_ERR (svm); goto out; - + }/* init_mm is used in this case */ if (!svm->mm) ret =1 ;@@ -568,13 +576,12 @@ static irqreturn_t prq_event_thread(int irq, void *d)if (!svm || svm->pasid != req->pasid) {rcu_read_lock (); - svm =intel_pasid_lookup_id (req->pasid); + svm =ioasid_find (NULL , req->pasid,NULL );/* It *can't* go away, because the driver is not permitted
* to unbind the mm while any page faults
are outstanding.
* So we only need RCU to protect the
internal idr code. */rcu_read_unlock();drivers/iommu/intel-svm.c +1
-2- -if (!svm) { +if (IS_ERR (svm) || !svm) { pr_err("%s: Page request forQuoted 3 lines
invalid PASID %d: %08llx %08llx\n",
iommu->name,req->pasid, ((unsigned long long *)req)[0], ((unsigned long long *)req)[1]);Thanks
Quoted 5 lines
Quoted 2 lines
Eric
[Jacob Pan]
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH v7 5/11 iommu/vt-d: Move domain helper to header
In reply to Jacob PanMove domain helper to header to be used by SVA code.
--- drivers/iommu/intel-iommu.c | 6 ------ include/linux/intel-iommu.h | 6 ++++++ 2 files changed, 6 insertions(+), 6 deletions(-)
drivers/iommu/intel-iommu.c +0 -6
@@ -428,12 +428,6 @@ static void init_translation_status(struct intel_iommu *iommu) iommu->flags |=VTD_FLAG_TRANS_PRE_ENABLED ; } -/* Convert generic 'struct iommu_domain to private struct dmar_domain */ -static struct dmar_domain *to_dmar_domain (struct iommu_domain *dom) -{ - return container_of(dom, struct dmar_domain, domain); -} -static int __init intel_iommu_setup (char *str) {if (!str)
include/linux/intel-iommu.h +6 -0
@@ -594,6 +594,12 @@ static inline void __iommu_flush_cache(clflush_cache_range (addr, size); } +/* Convert generic struct iommu_domain to private struct dmar_domain */ +static inline struct dmar_domain *to_dmar_domain (struct iommu_domain *dom) +{ + return container_of(dom, struct dmar_domain, domain); +} +/* * 0: readable * 1: writable
Signature · 1 line
2.7.4
Re: [PATCH v7 05/11] iommu/vt-d: Move domain helper to header
HI,
Quoted 4 lines · Jacob Pan
Move domain helper to header to be used by SVA code.
Signed-off-by Jacob Pan <[email protected]>Reviewed-by Eric Auger <[email protected]>
This patch looks good to me.
Best regards,
baolu
Quoted 30 lines
--- drivers/iommu/intel-iommu.c | 6 ------ include/linux/intel-iommu.h | 6 ++++++ 2 files changed, 6 insertions(+), 6 deletions(-)drivers/iommu/intel-iommu.c +0
-6@@ -428,12 +428,6 @@ static void init_translation_status(struct intel_iommu *iommu) iommu->flags |=VTD_FLAG_TRANS_PRE_ENABLED ; } -/* Convert generic 'struct iommu_domain to private struct dmar_domain */ -static struct dmar_domain *to_dmar_domain (struct iommu_domain *dom) -{ - return container_of(dom, struct dmar_domain, domain); -} -static int __init intel_iommu_setup (char *str) {if (!str)include/linux/intel-iommu.h +0
-0@@ -594,6 +594,12 @@ static inline void __iommu_flush_cache(clflush_cache_range (addr, size); }
include/linux/intel-iommu.h static inline void __iommu_flush_cache( · line 605
Quoted 10 lines
include/linux/intel-iommu.h +6
-0+/* Convert generic struct iommu_domain to private struct dmar_domain */ +static inline struct dmar_domain *to_dmar_domain (struct iommu_domain *dom) +{ + return container_of(dom, struct dmar_domain, domain); +} +/* * 0: readable * 1: writable
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH v7 6/11 iommu/vt-d: Avoid duplicated code for PASID setup
In reply to Jacob PanAfter each setup for PASID entry, related translation caches must be flushed. We can combine duplicated code into one function which is less error prone.
--- drivers/iommu/intel-pasid.c | 48 +++++++++++++++++---------------------------- 1 file changed, 18 insertions(+), 30 deletions(-)
drivers/iommu/intel-pasid.c +18 -30
@@ -485,6 +485,21 @@ void intel_pasid_tear_down_entry(struct intel_iommu *iommu,devtlb_invalidation_with_pasid (iommu, dev, pasid); } +static void pasid_flush_caches (struct intel_iommu *iommu, +struct pasid_entry *pte, +int pasid,u16 did) +{ +if (!ecap_coherent (iommu->ecap)) +clflush_cache_range (pte,sizeof (*pte)); + +if (cap_caching_mode (iommu->cap)) { +pasid_cache_invalidation_with_pasid (iommu, did, pasid); +iotlb_invalidation_with_pasid (iommu, did, pasid); + }else { +iommu_flush_write_buffer (iommu); + } +} +/* * Set up the scalable mode pasid table entry for first only * translation type.
@@ -530,16 +545,7 @@ int intel_pasid_setup_first_level(struct intel_iommu *iommu,/* Setup Present and PASID Granular Transfer Type: */ pasid_set_translation_type (pte,1 );pasid_set_present (pte); - -if (!ecap_coherent (iommu->ecap)) -clflush_cache_range (pte,sizeof (*pte)); - -if (cap_caching_mode (iommu->cap)) { -pasid_cache_invalidation_with_pasid (iommu, did, pasid); -iotlb_invalidation_with_pasid (iommu, did, pasid); - }else { -iommu_flush_write_buffer (iommu); - } +pasid_flush_caches (iommu, pte, pasid, did);return 0 ; }
@@ -603,16 +609,7 @@ int intel_pasid_setup_second_level(struct intel_iommu *iommu,*/ pasid_set_sre (pte);pasid_set_present (pte); - -if (!ecap_coherent (iommu->ecap)) -clflush_cache_range (pte,sizeof (*pte)); - -if (cap_caching_mode (iommu->cap)) { -pasid_cache_invalidation_with_pasid (iommu, did, pasid); -iotlb_invalidation_with_pasid (iommu, did, pasid); - }else { -iommu_flush_write_buffer (iommu); - } +pasid_flush_caches (iommu, pte, pasid, did);return 0 ; }
@@ -646,16 +643,7 @@ int intel_pasid_setup_pass_through(struct intel_iommu *iommu,*/ pasid_set_sre (pte);pasid_set_present (pte); - -if (!ecap_coherent (iommu->ecap)) -clflush_cache_range (pte,sizeof (*pte)); - -if (cap_caching_mode (iommu->cap)) { -pasid_cache_invalidation_with_pasid (iommu, did, pasid); -iotlb_invalidation_with_pasid (iommu, did, pasid); - }else { -iommu_flush_write_buffer (iommu); - } +pasid_flush_caches (iommu, pte, pasid, did);return 0 ; }
Signature · 6 lines
2.7.4 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH v7 06/11] iommu/vt-d: Avoid duplicated code for PASID setup
Hi,
Quoted 4 lines · Jacob Pan
After each setup for PASID entry, related translation caches must be flushed. We can combine duplicated code into one function which is less error prone.
Signed-off-by Jacob Pan <[email protected]>
This patch looks good to me.
Best regards,
baolu
Quoted 75 lines
--- drivers/iommu/intel-pasid.c | 48 +++++++++++++++++---------------------------- 1 file changed, 18 insertions(+), 30 deletions(-)drivers/iommu/intel-pasid.c +17
-24@@ -485,6 +485,21 @@ void intel_pasid_tear_down_entry(struct intel_iommu *iommu,devtlb_invalidation_with_pasid (iommu, dev, pasid); } +static void pasid_flush_caches (struct intel_iommu *iommu, +struct pasid_entry *pte, +int pasid,u16 did) +{ +if (!ecap_coherent (iommu->ecap)) +clflush_cache_range (pte,sizeof (*pte)); + +if (cap_caching_mode (iommu->cap)) { +pasid_cache_invalidation_with_pasid (iommu, did, pasid); +iotlb_invalidation_with_pasid (iommu, did, pasid); + }else { +iommu_flush_write_buffer (iommu); + } +} +/* * Set up the scalable mode pasid table entry for first only * translation type. @@ -530,16 +545,7 @@ int intel_pasid_setup_first_level(struct intel_iommu *iommu,/* Setup Present and PASID Granular Transfer Type: */ pasid_set_translation_type (pte,1 );pasid_set_present (pte); - -if (!ecap_coherent (iommu->ecap)) -clflush_cache_range (pte,sizeof (*pte)); - -if (cap_caching_mode (iommu->cap)) { -pasid_cache_invalidation_with_pasid (iommu, did, pasid); -iotlb_invalidation_with_pasid (iommu, did, pasid); - }else { -iommu_flush_write_buffer (iommu); - } +pasid_flush_caches (iommu, pte, pasid, did);return 0 ; }@@ -603,16 +609,7 @@ int intel_pasid_setup_second_level(struct intel_iommu *iommu,*/ pasid_set_sre (pte);pasid_set_present (pte); - -if (!ecap_coherent (iommu->ecap)) -clflush_cache_range (pte,sizeof (*pte)); - -if (cap_caching_mode (iommu->cap)) { -pasid_cache_invalidation_with_pasid (iommu, did, pasid); -iotlb_invalidation_with_pasid (iommu, did, pasid); - }else { -iommu_flush_write_buffer (iommu); - } +pasid_flush_caches (iommu, pte, pasid, did);return 0 ; }@@ -646,16 +643,7 @@ int intel_pasid_setup_pass_through(struct intel_iommu *iommu,*/ pasid_set_sre (pte);pasid_set_present (pte); - -if (!ecap_coherent (iommu->ecap)) -clflush_cache_range (pte,sizeof (*pte)); -
drivers/iommu/intel-pasid.c int intel_pasid_setup_pass_through(struct intel_iommu *iommu, · line 649
Quoted 10 lines
drivers/iommu/intel-pasid.c +1
-6-if (cap_caching_mode (iommu->cap)) { -pasid_cache_invalidation_with_pasid (iommu, did, pasid); -iotlb_invalidation_with_pasid (iommu, did, pasid); - }else { -iommu_flush_write_buffer (iommu); - } +pasid_flush_caches (iommu, pte, pasid, did);return 0 ; }
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
RE: [PATCH v7 06/11] iommu/vt-d: Avoid duplicated code for PASID setup
In reply to Jacob PanQuoted 9 lines
From: Jacob Pan [mailto:[email protected]]
Sent: Friday, October 25, 2019 3:55 AMAfter each setup for PASID entry, related translation caches must be flushed.
We can combine duplicated code into one function which is less error prone.Signed-off-by Jacob Pan <[email protected]>
similarly, it doesn't need to be in this series.
Quoted 88 lines
--- drivers/iommu/intel-pasid.c | 48 +++++++++++++++++---------------------------(quoted diff) +0
-1- 1 file changed, 18 insertions(+), 30 deletions(-)drivers/iommu/intel-pasid.c +15
-0@@ -485,6 +485,21 @@ void intel_pasid_tear_down_entry(structintel_iommu *iommu,devtlb_invalidation_with_pasid (iommu ,dev ,pasid ); } +static void pasid_flush_caches (struct intel_iommu *iommu, +struct pasid_entry *pte, +int pasid,u16 did) +{ +if (!ecap_coherent (iommu->ecap)) +clflush_cache_range (pte,sizeof (*pte)); + +if (cap_caching_mode (iommu->cap)) { +pasid_cache_invalidation_with_pasid (iommu, did, pasid); +iotlb_invalidation_with_pasid (iommu, did, pasid); + }else { +iommu_flush_write_buffer (iommu); + } +} +/* * Set up the scalable mode pasid table entry for first only * translation type.
drivers/iommu/intel-pasid.c +1
-10@@ -530,16 +545,7 @@ int intel_pasid_setup_first_level(struct intel_iommu *iommu,/* Setup Present and PASID Granular Transfer Type: */ pasid_set_translation_type (pte,1 );pasid_set_present (pte); - -if (!ecap_coherent (iommu->ecap)) -clflush_cache_range (pte,sizeof (*pte)); - -if (cap_caching_mode (iommu->cap)) { -pasid_cache_invalidation_with_pasid (iommu, did, pasid); -iotlb_invalidation_with_pasid (iommu, did, pasid); - }else { -iommu_flush_write_buffer (iommu); - } +pasid_flush_caches (iommu, pte, pasid, did);return 0 ;}
drivers/iommu/intel-pasid.c +1
-10@@ -603,16 +609,7 @@ int intel_pasid_setup_second_level(structintel_iommu *iommu, */ pasid_set_sre (pte);pasid_set_present (pte); - -if (!ecap_coherent (iommu->ecap)) -clflush_cache_range (pte,sizeof (*pte)); - -if (cap_caching_mode (iommu->cap)) { -pasid_cache_invalidation_with_pasid (iommu, did, pasid); -iotlb_invalidation_with_pasid (iommu, did, pasid); - }else { -iommu_flush_write_buffer (iommu); - } +pasid_flush_caches (iommu, pte, pasid, did);return 0 ;}
drivers/iommu/intel-pasid.c +1
-10@@ -646,16 +643,7 @@ int intel_pasid_setup_pass_through(structintel_iommu *iommu, */ pasid_set_sre (pte);pasid_set_present (pte); - -if (!ecap_coherent (iommu->ecap)) -clflush_cache_range (pte,sizeof (*pte)); - -if (cap_caching_mode (iommu->cap)) { -pasid_cache_invalidation_with_pasid (iommu, did, pasid); -iotlb_invalidation_with_pasid (iommu, did, pasid); - }else { -iommu_flush_write_buffer (iommu); - } +pasid_flush_caches (iommu, pte, pasid, did);return 0 ;
Quoted 3 lines
}
--
2.7.4
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH v7 06/11] iommu/vt-d: Avoid duplicated code for PASID setup
Quoted 11 lines · Kevin
Quoted 9 lines
From: Jacob Pan [mailto:[email protected]]
Sent: Friday, October 25, 2019 3:55 AMAfter each setup for PASID entry, related translation caches must be flushed.
We can combine duplicated code into one function which is less error prone.Signed-off-by Jacob Pan <[email protected]>similarly, it doesn't need to be in this series.
Technically true, it is in this series so that we can use the combined function.
Quoted 92 lines
Quoted 92 lines
--- drivers/iommu/intel-pasid.c | 48 +++++++++++++++++--------------------------- - 1 file changed, 18 insertions(+), 30 deletions(-)(quoted diff) +0
-0
b/drivers/iommu/intel-pasid.cindexe79d680fe300..ffbd416ed3b8100644 ---a/drivers/iommu/intel-pasid.c
+++b/drivers/iommu/intel-pasid.cdrivers/iommu/intel-pasid.c +15
-0@@ -485,6 +485,21 @@ void intel_pasid_tear_down_entry(structintel_iommu *iommu,devtlb_invalidation_with_pasid (iommu ,dev ,pasid ); } +static void pasid_flush_caches (struct intel_iommu *iommu, +struct pasid_entry *pte, +int pasid,u16 did) +{ +if (!ecap_coherent (iommu->ecap)) +clflush_cache_range (pte,sizeof (*pte)); + +if (cap_caching_mode (iommu->cap)) { +pasid_cache_invalidation_with_pasid (iommu, did, pasid); +iotlb_invalidation_with_pasid (iommu, did, pasid); + }else { +iommu_flush_write_buffer (iommu); + } +} +/* * Set up the scalable mode pasid table entry for first only
* translation type.drivers/iommu/intel-pasid.c +1
-10@@ -530,16 +545,7 @@ int intel_pasid_setup_first_level(struct intel_iommu *iommu,/* Setup Present and PASID Granular Transfer Type: */ pasid_set_translation_type (pte,1 );pasid_set_present (pte); - -if (!ecap_coherent (iommu->ecap)) -clflush_cache_range (pte,sizeof (*pte)); - -if (cap_caching_mode (iommu->cap)) { -pasid_cache_invalidation_with_pasid (iommu, did, pasid); -iotlb_invalidation_with_pasid (iommu, did, pasid); - }else { -iommu_flush_write_buffer (iommu); - } +pasid_flush_caches (iommu, pte, pasid, did);drivers/iommu/intel-pasid.c +1
-10return 0 ; }@@ -603,16 +609,7 @@ int intel_pasid_setup_second_level(structintel_iommu *iommu, */ pasid_set_sre (pte);pasid_set_present (pte); - -if (!ecap_coherent (iommu->ecap)) -clflush_cache_range (pte,sizeof (*pte)); - -if (cap_caching_mode (iommu->cap)) { -pasid_cache_invalidation_with_pasid (iommu, did, pasid); -iotlb_invalidation_with_pasid (iommu, did, pasid); - }else { -iommu_flush_write_buffer (iommu); - } +pasid_flush_caches (iommu, pte, pasid, did);drivers/iommu/intel-pasid.c +1
-10return 0 ; }@@ -646,16 +643,7 @@ int intel_pasid_setup_pass_through(structintel_iommu *iommu, */ pasid_set_sre (pte);pasid_set_present (pte); - -if (!ecap_coherent (iommu->ecap)) -clflush_cache_range (pte,sizeof (*pte)); - -if (cap_caching_mode (iommu->cap)) { -pasid_cache_invalidation_with_pasid (iommu, did, pasid); -iotlb_invalidation_with_pasid (iommu, did, pasid); - }else { -iommu_flush_write_buffer (iommu); - } +pasid_flush_caches (iommu, pte, pasid, did);
Quoted 5 lines
Quoted 4 lines
return 0;
}
--
2.7.4
[Jacob Pan]
Re: [PATCH v7 06/11] iommu/vt-d: Avoid duplicated code for PASID setup
In reply to Jacob PanHi Jacob,
Quoted 79 lines · Jacob Pan
After each setup for PASID entry, related translation caches must be flushed. We can combine duplicated code into one function which is less error prone.
Signed-off-by Jacob Pan <[email protected]>--- drivers/iommu/intel-pasid.c | 48 +++++++++++++++++---------------------------- 1 file changed, 18 insertions(+), 30 deletions(-)drivers/iommu/intel-pasid.c +17
-24@@ -485,6 +485,21 @@ void intel_pasid_tear_down_entry(struct intel_iommu *iommu,devtlb_invalidation_with_pasid (iommu, dev, pasid); } +static void pasid_flush_caches (struct intel_iommu *iommu, +struct pasid_entry *pte, +int pasid,u16 did) +{ +if (!ecap_coherent (iommu->ecap)) +clflush_cache_range (pte,sizeof (*pte)); + +if (cap_caching_mode (iommu->cap)) { +pasid_cache_invalidation_with_pasid (iommu, did, pasid); +iotlb_invalidation_with_pasid (iommu, did, pasid); + }else { +iommu_flush_write_buffer (iommu); + } +} +/* * Set up the scalable mode pasid table entry for first only * translation type. @@ -530,16 +545,7 @@ int intel_pasid_setup_first_level(struct intel_iommu *iommu,/* Setup Present and PASID Granular Transfer Type: */ pasid_set_translation_type (pte,1 );pasid_set_present (pte); - -if (!ecap_coherent (iommu->ecap)) -clflush_cache_range (pte,sizeof (*pte)); - -if (cap_caching_mode (iommu->cap)) { -pasid_cache_invalidation_with_pasid (iommu, did, pasid); -iotlb_invalidation_with_pasid (iommu, did, pasid); - }else { -iommu_flush_write_buffer (iommu); - } +pasid_flush_caches (iommu, pte, pasid, did);return 0 ; }@@ -603,16 +609,7 @@ int intel_pasid_setup_second_level(struct intel_iommu *iommu,*/ pasid_set_sre (pte);pasid_set_present (pte); - -if (!ecap_coherent (iommu->ecap)) -clflush_cache_range (pte,sizeof (*pte)); - -if (cap_caching_mode (iommu->cap)) { -pasid_cache_invalidation_with_pasid (iommu, did, pasid); -iotlb_invalidation_with_pasid (iommu, did, pasid); - }else { -iommu_flush_write_buffer (iommu); - } +pasid_flush_caches (iommu, pte, pasid, did);return 0 ; }@@ -646,16 +643,7 @@ int intel_pasid_setup_pass_through(struct intel_iommu *iommu,*/ pasid_set_sre (pte);pasid_set_present (pte); - -if (!ecap_coherent (iommu->ecap)) -clflush_cache_range (pte,sizeof (*pte)); -
drivers/iommu/intel-pasid.c int intel_pasid_setup_pass_through(struct intel_iommu *iommu, · line 649
Quoted 10 lines
drivers/iommu/intel-pasid.c +1
-6-if (cap_caching_mode (iommu->cap)) { -pasid_cache_invalidation_with_pasid (iommu, did, pasid); -iotlb_invalidation_with_pasid (iommu, did, pasid); - }else { -iommu_flush_write_buffer (iommu); - } +pasid_flush_caches (iommu, pte, pasid, did);return 0 ; }
Thanks
Eric
PATCH v7 7/11 iommu/vt-d: Add nested translation helper function
In reply to Jacob PanNested translation mode is supported in VT-d 3.0 Spec.CH 3.8. With PASID granular translation type set to 0x11b, translation result from the first level(FL) also subject to a second level(SL) page table translation. This mode is used for SVA virtualization, where FL performs guest virtual to guest physical translation and SL performs guest physical to host physical translation.
--- drivers/iommu/intel-pasid.c | 207 ++++++++++++++++++++++++++++++++++++++++++++ drivers/iommu/intel-pasid.h | 12 +++ 2 files changed, 219 insertions(+)
drivers/iommu/intel-pasid.c +207 -0
@@ -415,6 +415,76 @@ pasid_set_flpm(struct pasid_entry *pe, u64 value)pasid_set_bits (&pe->val[2 ],GENMASK_ULL (3 ,2 ), value <<2 ); } +/* +* Setup the Extended Memory Type(EMT) field (Bits 91-93) +* of a scalable mode PASID entry. +*/ +static inline void +pasid_set_emt (struct pasid_entry *pe,u64 value) +{ +pasid_set_bits (&pe->val[1 ],GENMASK_ULL (29 ,27 ), value <<27 ); +} + +/* +* Setup the Page Attribute Table (PAT) field (Bits 96-127) +* of a scalable mode PASID entry. +*/ +static inline void +pasid_set_pat (struct pasid_entry *pe,u64 value) +{ +pasid_set_bits (&pe->val[1 ],GENMASK_ULL (63 ,32 ), value <<27 ); +} + +/* +* Setup the Cache Disable (CD) field (Bit 89) +* of a scalable mode PASID entry. +*/ +static inline void +pasid_set_cd (struct pasid_entry *pe) +{ +pasid_set_bits (&pe->val[1 ],1 <<25 ,1 ); +} + +/* +* Setup the Extended Memory Type Enable (EMTE) field (Bit 90) +* of a scalable mode PASID entry. +*/ +static inline void +pasid_set_emte (struct pasid_entry *pe) +{ +pasid_set_bits (&pe->val[1 ],1 <<26 ,1 ); +} + +/* +* Setup the Extended Access Flag Enable (EAFE) field (Bit 135) +* of a scalable mode PASID entry. +*/ +static inline void +pasid_set_eafe (struct pasid_entry *pe) +{ +pasid_set_bits (&pe->val[2 ],1 <<7 ,1 ); +} + +/* +* Setup the Page-level Cache Disable (PCD) field (Bit 95) +* of a scalable mode PASID entry. +*/ +static inline void +pasid_set_pcd (struct pasid_entry *pe) +{ +pasid_set_bits (&pe->val[1 ],1 <<31 ,1 ); +} + +/* +* Setup the Page-level Write-Through (PWT)) field (Bit 94) +* of a scalable mode PASID entry. +*/ +static inline void +pasid_set_pwt (struct pasid_entry *pe) +{ +pasid_set_bits (&pe->val[1 ],1 <<30 ,1 ); +} +static void pasid_cache_invalidation_with_pasid (struct intel_iommu *iommu,u16 did,int pasid)
@@ -647,3 +717,140 @@ int intel_pasid_setup_pass_through(struct intel_iommu *iommu,return 0 ; } + +static int intel_pasid_setup_bind_data (struct intel_iommu *iommu, +struct pasid_entry *pte, +struct iommu_gpasid_bind_data_vtd *pasid_data) +{ +/* +* Not all guest PASID table entry fields are passed down during bind, +* here we only set up the ones that are dependent on guest settings. +* Execution related bits such as NXE, SMEP are not meaningful to IOMMU, +* therefore not set. Other fields, such as snoop related, are set based +* on host needs regardless of guest settings. +*/ +if (pasid_data->flags &IOMMU_SVA_VTD_GPASID_SRE ) { +if (!ecap_srs (iommu->ecap)) { +pr_err ("No supervisor request support on %s\n" , + iommu->name); +return -EINVAL ; + } +pasid_set_sre (pte); + } + +if ((pasid_data->flags &IOMMU_SVA_VTD_GPASID_EAFE ) &&ecap_eafs (iommu->ecap)) +pasid_set_eafe (pte); + +if (pasid_data->flags &IOMMU_SVA_VTD_GPASID_EMTE ) { +pasid_set_emte (pte); +pasid_set_emt (pte, pasid_data->emt); + } + +/* +* Memory type is only applicable to devices inside processor coherent +* domain. PCIe devices are not included. We can skip the rest of the +* flags if IOMMU does not support MTS. +*/ +if (!ecap_mts (iommu->ecap)) { +pr_info ("%s does not support memory type bind guest PASID\n" , + iommu->name); +return 0 ; + } + +if (pasid_data->flags &IOMMU_SVA_VTD_GPASID_PCD ) +pasid_set_pcd (pte); +if (pasid_data->flags &IOMMU_SVA_VTD_GPASID_PWT ) +pasid_set_pwt (pte); +if (pasid_data->flags &IOMMU_SVA_VTD_GPASID_CD ) +pasid_set_cd (pte); +pasid_set_pat (pte, pasid_data->pat); + +return 0 ; + +} + +/** +* intel_pasid_setup_nested() - Set up PASID entry for nested translation +* which is used for vSVA. The first level page tables are used for +* GVA-GPA translation in the guest, second level page tables are used +* for GPA to HPA translation. +* +* @iommu: Iommu which the device belong to +* @dev: Device to be set up for translation +* @gpgd: FLPTPTR: First Level Page translation pointer in GPA +* @pasid: PASID to be programmed in the device PASID table +* @pasid_data: Additional PASID info from the guest bind request +* @domain: Domain info for setting up second level page tables +* @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,struct iommu_gpasid_bind_data_vtd *pasid_data, +struct dmar_domain *domain, +int addr_width) +{ +struct pasid_entry *pte; +struct dma_pte *pgd; +u64 pgd_val; +int agaw; +u16 did; + +if (!ecap_nest (iommu->ecap)) { +pr_err ("IOMMU: %s: No nested translation support\n" , + iommu->name); +return -EINVAL ; + } + + pte =intel_pasid_get_entry (dev, pasid); +if (WARN_ON (!pte)) +return -EINVAL ; + +pasid_clear_entry (pte); + +/* Sanity checking performed by caller to make sure address +* width matching in two dimensions: +* 1. CPU vs. IOMMU +* 2. Guest vs. Host. +*/ +switch (addr_width) { +case 57 : +pasid_set_flpm (pte,1 ); +break ; +case 48 : +pasid_set_flpm (pte,0 ); +break ; +default : +dev_err (dev,"Invalid paging mode %d\n" , addr_width); +return -EINVAL ; + } + +pasid_set_flptr (pte, (u64 )gpgd); + +intel_pasid_setup_bind_data (iommu, pte, pasid_data); + +/* Setup the second level based on the given domain */ + pgd = domain->pgd; + +for (agaw = domain->agaw; agaw != iommu->agaw; agaw--) { + pgd =phys_to_virt (dma_pte_addr (pgd)); +if (!dma_pte_present (pgd)) { +dev_err (dev,"Invalid domain page table\n" ); +return -EINVAL ; + } + } + pgd_val =virt_to_phys (pgd); +pasid_set_slptr (pte, pgd_val); +pasid_set_fault_enable (pte); + + did = domain->iommu_did[iommu->seq_id]; +pasid_set_domain_id (pte, did); + +pasid_set_address_width (pte, agaw); +pasid_set_page_snoop (pte, !!ecap_smpwc (iommu->ecap)); + +pasid_set_translation_type (pte,PASID_ENTRY_PGTT_NESTED ); +pasid_set_present (pte); +pasid_flush_caches (iommu, pte, pasid, did); + +return 0 ; +}
drivers/iommu/intel-pasid.h +12 -0
@@ -46,6 +46,7 @@* to vmalloc or even module mappings. */ #define PASID_FLAG_SUPERVISOR_MODE BIT(0) +#define PASID_FLAG_NESTED BIT(1)struct pasid_dir_entry {u64 val;
@@ -55,6 +56,11 @@ struct pasid_entry {u64 val[8 ]; }; +#define PASID_ENTRY_PGTT_FL_ONLY (1) +#define PASID_ENTRY_PGTT_SL_ONLY (2) +#define PASID_ENTRY_PGTT_NESTED (3) +#define PASID_ENTRY_PGTT_PT (4) +/* The representative of a PASID table */ struct pasid_table {void *table;/* pasid table pointer */
@@ -103,6 +109,12 @@ 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); +int intel_pasid_setup_nested (struct intel_iommu *iommu, +struct device *dev,pgd_t *pgd, +int 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);int vcmd_alloc_pasid (struct intel_iommu *iommu,unsigned int *pasid);
Signature · 6 lines
2.7.4 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
RE: [PATCH v7 07/11] iommu/vt-d: Add nested translation helper function
Quoted 9 lines
From: Jacob Pan [mailto:[email protected]]
Sent: Friday, October 25, 2019 3:55 AMNested translation mode is supported in VT-d 3.0 Spec.CH 3.8. With PASID granular translation type set to
0x11b, translation result from the first level(FL) also subject to a second level(SL) page table translation. This mode is used for SVA virtualization, where FL performs guest virtual to guest physical translation and SL performs guest physical to host physical translation.
I think we really differentiate what is the common logic for first-level usages (GVA, GIOVA, etc.) in scalable mode, and what is specific to SVA. I have the feeling that SVA is over-used to cause confusing interpretation.
Quoted 123 lines
Signed-off-by Jacob Pan <[email protected]>Signed-off-by Liu, Yi L <[email protected]>--- drivers/iommu/intel-pasid.c | 207 ++++++++++++++++++++++++++++++++++++++++++++ drivers/iommu/intel-pasid.h | 12 +++ 2 files changed, 219 insertions(+)drivers/iommu/intel-pasid.c +74
-0@@ -415,6 +415,76 @@ pasid_set_flpm(struct pasid_entry *pe, u64 value)pasid_set_bits (&pe->val[2 ],GENMASK_ULL (3 ,2 ), value <<2 ); } +/* +* Setup the Extended Memory Type(EMT) field (Bits 91-93) +* of a scalable mode PASID entry. +*/ +static inline void +pasid_set_emt (struct pasid_entry *pe,u64 value) +{ +pasid_set_bits (&pe->val[1 ],GENMASK_ULL (29 ,27 ), value <<27 ); +} + +/* +* Setup the Page Attribute Table (PAT) field (Bits 96-127) +* of a scalable mode PASID entry. +*/ +static inline void +pasid_set_pat (struct pasid_entry *pe,u64 value) +{ +pasid_set_bits (&pe->val[1 ],GENMASK_ULL (63 ,32 ), value <<27 ); +} + +/* +* Setup the Cache Disable (CD) field (Bit 89) +* of a scalable mode PASID entry. +*/ +static inline void +pasid_set_cd (struct pasid_entry *pe) +{ +pasid_set_bits (&pe->val[1 ],1 <<25 ,1 ); +} + +/* +* Setup the Extended Memory Type Enable (EMTE) field (Bit 90) +* of a scalable mode PASID entry. +*/ +static inline void +pasid_set_emte (struct pasid_entry *pe) +{ +pasid_set_bits (&pe->val[1 ],1 <<26 ,1 ); +} + +/* +* Setup the Extended Access Flag Enable (EAFE) field (Bit 135) +* of a scalable mode PASID entry. +*/ +static inline void +pasid_set_eafe (struct pasid_entry *pe) +{ +pasid_set_bits (&pe->val[2 ],1 <<7 ,1 ); +} + +/* +* Setup the Page-level Cache Disable (PCD) field (Bit 95) +* of a scalable mode PASID entry. +*/ +static inline void +pasid_set_pcd (struct pasid_entry *pe) +{ +pasid_set_bits (&pe->val[1 ],1 <<31 ,1 ); +} + +/* +* Setup the Page-level Write-Through (PWT)) field (Bit 94) +* of a scalable mode PASID entry. +*/ +static inline void +pasid_set_pwt (struct pasid_entry *pe) +{ +pasid_set_bits (&pe->val[1 ],1 <<30 ,1 ); +} +static void pasid_cache_invalidation_with_pasid (struct intel_iommu *iommu,u16 did,int pasid)@@ -647,3 +717,140 @@ int intel_pasid_setup_pass_through(structintel_iommu *iommu, return 0; } + +static int intel_pasid_setup_bind_data (struct intel_iommu *iommu, +struct pasid_entry *pte, + struct iommu_gpasid_bind_data_vtd
*pasid_data)drivers/iommu/intel-pasid.c +3
-0+{ +/* +* Not all guest PASID table entry fields are passed down during bind,
drivers/iommu/intel-pasid.c +1
-0+* here we only set up the ones that are dependent on guest settings.
drivers/iommu/intel-pasid.c +1
-0+* Execution related bits such as NXE, SMEP are not meaningful to IOMMU,
drivers/iommu/intel-pasid.c +1
-0+* therefore not set. Other fields, such as snoop related, are set based
drivers/iommu/intel-pasid.c +12
-0+* on host needs regardless of guest settings. +*/ +if (pasid_data->flags &IOMMU_SVA_VTD_GPASID_SRE ) { +if (!ecap_srs (iommu->ecap)) { +pr_err ("No supervisor request support on %s\n" , + iommu->name); +return -EINVAL ; + } +pasid_set_sre (pte); + } + + if ((pasid_data->flags & IOMMU_SVA_VTD_GPASID_EAFE) &&
ecap_eafs(iommu->ecap))
drivers/iommu/intel-pasid.c int intel_pasid_setup_pass_through(struct intel_iommu *iommu, · line 747
Quoted 6 lines
drivers/iommu/intel-pasid.c +6
-0+pasid_set_eafe (pte); + +if (pasid_data->flags &IOMMU_SVA_VTD_GPASID_EMTE ) { +pasid_set_emte (pte); +pasid_set_emt (pte, pasid_data->emt); + }
above conditional checks are not consistent. The 1st check may return error but latter two don't. Can you confirm whether it's desired way?
drivers/iommu/intel-pasid.c
Quoted 13 lines
drivers/iommu/intel-pasid.c +3
-0+ +/* +* Memory type is only applicable to devices inside processor coherent
drivers/iommu/intel-pasid.c +1
-0+* domain. PCIe devices are not included. We can skip the rest of the
drivers/iommu/intel-pasid.c +4
-0+* flags if IOMMU does not support MTS. +*/ +if (!ecap_mts (iommu->ecap)) { + pr_info("%s does not support memory type bind guestPASID\n",
drivers/iommu/intel-pasid.c +2
-0+ iommu->name); +return 0 ;
why not -EINVAL?
Quoted 9 lines
drivers/iommu/intel-pasid.c +9
-0+ } + +if (pasid_data->flags &IOMMU_SVA_VTD_GPASID_PCD ) +pasid_set_pcd (pte); +if (pasid_data->flags &IOMMU_SVA_VTD_GPASID_PWT ) +pasid_set_pwt (pte); +if (pasid_data->flags &IOMMU_SVA_VTD_GPASID_CD ) +pasid_set_cd (pte); +pasid_set_pat (pte, pasid_data->pat);
drivers/iommu/intel-pasid.c int intel_pasid_setup_pass_through(struct intel_iommu *iommu, · line 776
Quoted 10 lines
drivers/iommu/intel-pasid.c +10
-0+ +return 0 ; + +} + +/** +* intel_pasid_setup_nested() - Set up PASID entry for nested translation +* which is used for vSVA. The first level page tables are used for +* GVA-GPA translation in the guest, second level page tables are used +* for GPA to HPA translation.
It's too restricting on how 1st level is used by guest.
Quoted 31 lines
+ *
+ * @iommu: Iommu which the device belong to + * @dev: Device to be set up for translation + * @gpgd: FLPTPTR: First Level Page translation pointer in GPA + * @pasid: PASID to be programmed in the device PASID table+ * @pasid_data: Additional PASID info from the guest bind request
+ * @domain: Domain info for setting up second level page tables
+ * @addr_width: Address width of the first level (guest)
+ */drivers/iommu/intel-pasid.c +3
-0+int intel_pasid_setup_nested (struct intel_iommu *iommu, +struct device *dev,pgd_t *gpgd, + int pasid, struct iommu_gpasid_bind_data_vtd
*pasid_data,drivers/iommu/intel-pasid.c +18
-0+ struct dmar_domain *domain, + int addr_width) +{ +struct pasid_entry *pte; +struct dma_pte *pgd; +u64 pgd_val; +int agaw; +u16 did; + +if (!ecap_nest (iommu->ecap)) { +pr_err ("IOMMU: %s: No nested translation support\n" , + iommu->name); +return -EINVAL ; + } + + pte =intel_pasid_get_entry (dev, pasid); +if (WARN_ON (!pte)) +return -EINVAL ;
drivers/iommu/intel-pasid.c int intel_pasid_setup_pass_through(struct intel_iommu *iommu, · line 816
Quoted 10 lines
drivers/iommu/intel-pasid.c +10
-0+ +pasid_clear_entry (pte); + +/* Sanity checking performed by caller to make sure address +* width matching in two dimensions: +* 1. CPU vs. IOMMU +* 2. Guest vs. Host. +*/ +switch (addr_width) { +case 57 :
AW_5LEVEL
drivers/iommu/intel-pasid.c int intel_pasid_setup_pass_through(struct intel_iommu *iommu, · line 819
Quoted 3 lines
drivers/iommu/intel-pasid.c +3
-0+pasid_set_flpm (pte,1 ); +break ; +case 48 :
AW_4LEVEL
Quoted 8 lines
drivers/iommu/intel-pasid.c +8
-0+pasid_set_flpm (pte,0 ); +break ; +default : +dev_err (dev,"Invalid paging mode %d\n" , addr_width); +return -EINVAL ; + } + +pasid_set_flptr (pte, (u64 )gpgd);
drivers/iommu/intel-pasid.c int intel_pasid_setup_pass_through(struct intel_iommu *iommu, · line 837
Quoted 10 lines
drivers/iommu/intel-pasid.c +10
-0+ +intel_pasid_setup_bind_data (iommu, pte, pasid_data); + +/* Setup the second level based on the given domain */ + pgd = domain->pgd; + +for (agaw = domain->agaw; agaw != iommu->agaw; agaw--) { + pgd =phys_to_virt (dma_pte_addr (pgd)); +if (!dma_pte_present (pgd)) { +dev_err (dev,"Invalid domain page table\n" );
pasid_clear_entry?
Quoted 56 lines
drivers/iommu/intel-pasid.c +19
-0+return -EINVAL ; + } + } + pgd_val =virt_to_phys (pgd); +pasid_set_slptr (pte, pgd_val); +pasid_set_fault_enable (pte); + + did = domain->iommu_did[iommu->seq_id]; +pasid_set_domain_id (pte, did); + +pasid_set_address_width (pte, agaw); +pasid_set_page_snoop (pte, !!ecap_smpwc (iommu->ecap)); + +pasid_set_translation_type (pte,PASID_ENTRY_PGTT_NESTED ); +pasid_set_present (pte); +pasid_flush_caches (iommu, pte, pasid, did); + +return 0 ; +}drivers/iommu/intel-pasid.h +12
-0@@ -46,6 +46,7 @@* to vmalloc or even module mappings. */ #define PASID_FLAG_SUPERVISOR_MODE BIT(0) +#define PASID_FLAG_NESTED BIT(1)struct pasid_dir_entry {u64 val;@@ -55,6 +56,11 @@ struct pasid_entry {u64 val[8 ]; }; +#define PASID_ENTRY_PGTT_FL_ONLY (1) +#define PASID_ENTRY_PGTT_SL_ONLY (2) +#define PASID_ENTRY_PGTT_NESTED (3) +#define PASID_ENTRY_PGTT_PT (4) +/* The representative of a PASID table */ struct pasid_table {void *table;/* pasid table pointer */ @@ -103,6 +109,12 @@ int intel_pasid_setup_second_level(structintel_iommu *iommu, int intel_pasid_setup_pass_through(struct intel_iommu *iommu,struct dmar_domain *domain,struct device *dev,int pasid); +int intel_pasid_setup_nested (struct intel_iommu *iommu, +struct device *dev,pgd_t *pgd, +int 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);
Quoted 3 lines
int
vcmd_alloc_pasid(struct intel_iommu *iommu, unsigned int *pasid);
--
2.7.4
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH v7 07/11] iommu/vt-d: Add nested translation helper function
Quoted 10 lines · Kevin
Quoted 9 lines
From: Jacob Pan [mailto:[email protected]]
Sent: Friday, October 25, 2019 3:55 AMNested translation mode is supported in VT-d 3.0 Spec.CH 3.8. With PASID granular translation type set to
0x11b, translation result from the first level(FL) also subject to a second level(SL) page table translation. This mode is used for SVA virtualization, where FL performs guest virtual to guest physical translation and SL performs guest physical to host physical translation.
Quoted 5 lines
I think we really differentiate what is the common logic for first-level usages (GVA, GIOVA, etc.) in scalable mode, and what is specific to SVA. I have the feeling that SVA is over-used to cause confusing interpretation.
Good point, it should be clearly stated that nest mode is not for gSVA only, gIOVA shares this common code.
Quoted 126 lines
Quoted 126 lines
Signed-off-by Jacob Pan <[email protected]>Signed-off-by Liu, Yi L <[email protected]>--- drivers/iommu/intel-pasid.c | 207 ++++++++++++++++++++++++++++++++++++++++++++ drivers/iommu/intel-pasid.h | 12 +++ 2 files changed, 219 insertions(+)(quoted diff) +0
-0
b/drivers/iommu/intel-pasid.cindexffbd416ed3b8..f846a907cfcf100644 ---a/drivers/iommu/intel-pasid.c
+++b/drivers/iommu/intel-pasid.cdrivers/iommu/intel-pasid.c +72
-0@@ -415,6 +415,76 @@ pasid_set_flpm(struct pasid_entry *pe, u64 value) pasid_set_bits(&pe->val[2], GENMASK_ULL(3, 2), value << 2); } +/* +* Setup the Extended Memory Type(EMT) field (Bits 91-93) +* of a scalable mode PASID entry. +*/ +static inline void +pasid_set_emt (struct pasid_entry *pe,u64 value) +{ +pasid_set_bits (&pe->val[1 ],GENMASK_ULL (29 ,27 ), value << 27); +} + +/* +* Setup the Page Attribute Table (PAT) field (Bits 96-127) +* of a scalable mode PASID entry. +*/ +static inline void +pasid_set_pat (struct pasid_entry *pe,u64 value) +{ +pasid_set_bits (&pe->val[1 ],GENMASK_ULL (63 ,32 ), value << 27); +} + +/* +* Setup the Cache Disable (CD) field (Bit 89) +* of a scalable mode PASID entry. +*/ +static inline void +pasid_set_cd (struct pasid_entry *pe) +{ +pasid_set_bits (&pe->val[1 ],1 <<25 ,1 ); +} + +/* +* Setup the Extended Memory Type Enable (EMTE) field (Bit 90) +* of a scalable mode PASID entry. +*/ +static inline void +pasid_set_emte (struct pasid_entry *pe) +{ +pasid_set_bits (&pe->val[1 ],1 <<26 ,1 ); +} + +/* +* Setup the Extended Access Flag Enable (EAFE) field (Bit 135) +* of a scalable mode PASID entry. +*/ +static inline void +pasid_set_eafe (struct pasid_entry *pe) +{ +pasid_set_bits (&pe->val[2 ],1 <<7 ,1 ); +} + +/* +* Setup the Page-level Cache Disable (PCD) field (Bit 95) +* of a scalable mode PASID entry. +*/ +static inline void +pasid_set_pcd (struct pasid_entry *pe) +{ +pasid_set_bits (&pe->val[1 ],1 <<31 ,1 ); +} + +/* +* Setup the Page-level Write-Through (PWT)) field (Bit 94) +* of a scalable mode PASID entry. +*/ +static inline void +pasid_set_pwt (struct pasid_entry *pe) +{ +pasid_set_bits (&pe->val[1 ],1 <<30 ,1 ); +} +static void pasid_cache_invalidation_with_pasid (struct intel_iommu *iommu,u16 did,int pasid)@@ -647,3 +717,140 @@ int intel_pasid_setup_pass_through(structintel_iommu *iommu, return 0; } + +static int intel_pasid_setup_bind_data (struct intel_iommu *iommu, +struct pasid_entry *pte, + struct iommu_gpasid_bind_data_vtd
*pasid_data)drivers/iommu/intel-pasid.c +3
-0+{ +/* +* Not all guest PASID table entry fields are passed down during bind,
(quoted diff) +1
-0+ * here we only set up the ones that are dependent on guestsettings.
(quoted diff) +1
-0+ * Execution related bits such as NXE, SMEP are notmeaningful to IOMMU,
(quoted diff) +1
-0+ * therefore not set. Other fields, such as snoop related,are set based
drivers/iommu/intel-pasid.c +5
-0+* on host needs regardless of guest settings. +*/ +if (pasid_data->flags &IOMMU_SVA_VTD_GPASID_SRE ) { +if (!ecap_srs (iommu->ecap)) { + pr_err("No supervisor request support on%s\n",
drivers/iommu/intel-pasid.c +7
-0+ iommu->name); +return -EINVAL ; + } +pasid_set_sre (pte); + } + + if ((pasid_data->flags & IOMMU_SVA_VTD_GPASID_EAFE) &&
ecap_eafs(iommu->ecap))(quoted diff) +2
-0+ pasid_set_eafe(pte); +
Quoted 9 lines
drivers/iommu/intel-pasid.c int intel_pasid_setup_pass_through(struct intel_iommu *iommu, · line 747
Quoted 4 lines
drivers/iommu/intel-pasid.c +4
-0+if (pasid_data->flags &IOMMU_SVA_VTD_GPASID_EMTE ) { +pasid_set_emte (pte); +pasid_set_emt (pte, pasid_data->emt); + }above conditional checks are not consistent. The 1st check may return error but latter two don't. Can you confirm whether it's desired way?
should be consistent and under the check of host MTS capability. Will change.
Quoted 7 lines
Quoted 7 lines
drivers/iommu/intel-pasid.c +3
-0+ +/* +* Memory type is only applicable to devices inside processor coherent
(quoted diff) +1
-0+ * domain. PCIe devices are not included. We can skip therest of the
drivers/iommu/intel-pasid.c +1
-0+* flags if IOMMU does not support MTS.
Quoted 9 lines
Review
Quoted 6 lines
drivers/iommu/intel-pasid.c +3
-0+*/ +if (!ecap_mts (iommu->ecap)) { + pr_info("%s does not support memory type bind guestPASID\n",
(quoted diff) +2
-0+ iommu->name); + return 0;why not
-EINVAL?
right, if host does not support MTS and guest wants to set MTS related bits, -EINVAL should be returned.
Quoted 15 lines
Quoted 15 lines
drivers/iommu/intel-pasid.c +15
-0+ } + +if (pasid_data->flags &IOMMU_SVA_VTD_GPASID_PCD ) +pasid_set_pcd (pte); +if (pasid_data->flags &IOMMU_SVA_VTD_GPASID_PWT ) +pasid_set_pwt (pte); +if (pasid_data->flags &IOMMU_SVA_VTD_GPASID_CD ) +pasid_set_cd (pte); +pasid_set_pat (pte, pasid_data->pat); + +return 0 ; + +} + +/**
Quoted 9 lines
Quoted 6 lines
+ *
intel_pasid_setup_nested()- Set up PASID entry for nested translation
+ * which is used for vSVA. The first level page tables are used for
+ * GVA-GPA translation in the guest, second level page tables are used
+ * for GPA to HPA translation.It's too restricting on how 1st level is used by guest.
will fix. stating FL can be used for gIOVA in nested mode.
Quoted 46 lines
Quoted 33 lines
+ *
+ * @iommu: Iommu which the device belong to + * @dev: Device to be set up for translation + * @gpgd: FLPTPTR: First Level Page translation pointer inGPA
+ * @pasid: PASID to be programmed in the device PASID table
+ * @pasid_data: Additional PASID info from the guest bind request
+ * @domain: Domain info for setting up second level page tables
+ * @addr_width: Address width of the first level (guest)
+ */drivers/iommu/intel-pasid.c +3
-0+int intel_pasid_setup_nested(struct intel_iommu *iommu, + struct device *dev, pgd_t *gpgd, + int pasid, struct
iommu_gpasid_bind_data_vtd*pasid_data,drivers/iommu/intel-pasid.c +11
-0+ struct dmar_domain *domain, + int addr_width) +{ +struct pasid_entry *pte; +struct dma_pte *pgd; +u64 pgd_val; +int agaw; +u16 did; + +if (!ecap_nest (iommu->ecap)) { + pr_err("IOMMU: %s: No nested translationsupport\n",
drivers/iommu/intel-pasid.c +7
-0+ iommu->name); +return -EINVAL ; + } + + pte =intel_pasid_get_entry (dev, pasid); +if (WARN_ON (!pte)) +return -EINVAL ;drivers/iommu/intel-pasid.c int intel_pasid_setup_pass_through(struct intel_iommu *iommu, · line 816
Quoted 10 lines
drivers/iommu/intel-pasid.c +10
-0+ +pasid_clear_entry (pte); + +/* Sanity checking performed by caller to make sure address +* width matching in two dimensions: +* 1. CPU vs. IOMMU +* 2. Guest vs. Host. +*/ +switch (addr_width) { +case 57 :
AW_5LEVEL
Quoted 6 lines
drivers/iommu/intel-pasid.c int intel_pasid_setup_pass_through(struct intel_iommu *iommu, · line 819
Quoted 3 lines
drivers/iommu/intel-pasid.c +3
-0+pasid_set_flpm (pte,1 ); +break ; +case 48 :
AW_4LEVEL
will add macros
Quoted 14 lines
Quoted 14 lines
drivers/iommu/intel-pasid.c +4
-0+pasid_set_flpm (pte,0 ); +break ; +default : + dev_err(dev, "Invalid paging mode %d\n",
addr_width);drivers/iommu/intel-pasid.c +9
-0+return -EINVAL ; + } + +pasid_set_flptr (pte, (u64 )gpgd); + +intel_pasid_setup_bind_data (iommu, pte, pasid_data); + +/* Setup the second level based on the given domain */ + pgd = domain->pgd;
Quoted 9 lines
Quoted 6 lines
drivers/iommu/intel-pasid.c +5
-0+ +for (agaw = domain->agaw; agaw != iommu->agaw; agaw--) { + pgd =phys_to_virt (dma_pte_addr (pgd)); +if (!dma_pte_present (pgd)) { + dev_err(dev, "Invalid domain pagetable\n");
pasid_clear_entry?
right, even though present bit is not set still a good practice to clear.
Quoted 52 lines
Quoted 52 lines
drivers/iommu/intel-pasid.c +19
-0+return -EINVAL ; + } + } + pgd_val =virt_to_phys (pgd); +pasid_set_slptr (pte, pgd_val); +pasid_set_fault_enable (pte); + + did = domain->iommu_did[iommu->seq_id]; +pasid_set_domain_id (pte, did); + +pasid_set_address_width (pte, agaw); +pasid_set_page_snoop (pte, !!ecap_smpwc (iommu->ecap)); + +pasid_set_translation_type (pte,PASID_ENTRY_PGTT_NESTED ); +pasid_set_present (pte); +pasid_flush_caches (iommu, pte, pasid, did); + +return 0 ; +}(quoted diff) +0
-0
b/drivers/iommu/intel-pasid.hindexe413e884e685..09c85db73b77100644 ---a/drivers/iommu/intel-pasid.h
+++b/drivers/iommu/intel-pasid.hdrivers/iommu/intel-pasid.h +6
-0@@ -46,6 +46,7 @@* to vmalloc or even module mappings. */ #define PASID_FLAG_SUPERVISOR_MODE BIT(0) +#define PASID_FLAG_NESTED BIT(1)struct pasid_dir_entry {u64 val;@@ -55,6 +56,11 @@ struct pasid_entry {u64 val[8 ]; }; +#define PASID_ENTRY_PGTT_FL_ONLY (1) +#define PASID_ENTRY_PGTT_SL_ONLY (2) +#define PASID_ENTRY_PGTT_NESTED (3) +#define PASID_ENTRY_PGTT_PT (4) +/* The representative of a PASID table */ struct pasid_table {void *table;/* pasid table pointer */ @@ -103,6 +109,12 @@ int intel_pasid_setup_second_level(struct
intel_iommu*iommu,
int intel_pasid_setup_pass_through(structintel_iommu*iommu,drivers/iommu/intel-pasid.h +4
-0struct dmar_domain *domain, struct device *dev, int pasid); +int intel_pasid_setup_nested (struct intel_iommu *iommu, +struct device *dev,pgd_t *pgd, +int pasid, + struct iommu_gpasid_bind_data_vtd
Quoted 9 lines
Quoted 8 lines
*pasid_data,drivers/iommu/intel-pasid.h +2
-0+struct dmar_domain *domain, + int addr_width);void intel_pasid_tear_down_entry (struct intel_iommu *iommu,struct device *dev,int pasid); int vcmd_alloc_pasid(struct intel_iommu *iommu, unsigned int*pasid); --
2.7.4
[Jacob Pan]
Re: [PATCH v7 07/11] iommu/vt-d: Add nested translation helper function
In reply to Jacob PanHi,
Quoted 30 lines · Jacob Pan
Nested translation mode is supported in VT-d 3.0 Spec.CH 3.8. With PASID granular translation type set to
0x11b, translation result from the first level(FL) also subject to a second level(SL) page table translation. This mode is used for SVA virtualization, where FL performs guest virtual to guest physical translation and SL performs guest physical to host physical translation.Signed-off-by Jacob Pan <[email protected]>Signed-off-by Liu, Yi L <[email protected]>--- drivers/iommu/intel-pasid.c | 207 ++++++++++++++++++++++++++++++++++++++++++++ drivers/iommu/intel-pasid.h | 12 +++ 2 files changed, 219 insertions(+)drivers/iommu/intel-pasid.c +8
-0@@ -415,6 +415,76 @@ pasid_set_flpm(struct pasid_entry *pe, u64 value)pasid_set_bits (&pe->val[2 ],GENMASK_ULL (3 ,2 ), value <<2 ); } +/* +* Setup the Extended Memory Type(EMT) field (Bits 91-93) +* of a scalable mode PASID entry. +*/ +static inline void +pasid_set_emt (struct pasid_entry *pe,u64 value) +{ +pasid_set_bits (&pe->val[1 ],GENMASK_ULL (29 ,27 ), value <<27 );
drivers/iommu/intel-pasid.c pasid_set_flpm(struct pasid_entry *pe, u64 value) · line 435
Quoted 10 lines
drivers/iommu/intel-pasid.c +10
-0+} + +/* +* Setup the Page Attribute Table (PAT) field (Bits 96-127) +* of a scalable mode PASID entry. +*/ +static inline void +pasid_set_pat (struct pasid_entry *pe,u64 value) +{ +pasid_set_bits (&pe->val[1 ],GENMASK_ULL (63 ,32 ), value <<27 );
Should be "value << 32", right?
Quoted 88 lines
drivers/iommu/intel-pasid.c +81
-0+} + +/* +* Setup the Cache Disable (CD) field (Bit 89) +* of a scalable mode PASID entry. +*/ +static inline void +pasid_set_cd (struct pasid_entry *pe) +{ +pasid_set_bits (&pe->val[1 ],1 <<25 ,1 ); +} + +/* +* Setup the Extended Memory Type Enable (EMTE) field (Bit 90) +* of a scalable mode PASID entry. +*/ +static inline void +pasid_set_emte (struct pasid_entry *pe) +{ +pasid_set_bits (&pe->val[1 ],1 <<26 ,1 ); +} + +/* +* Setup the Extended Access Flag Enable (EAFE) field (Bit 135) +* of a scalable mode PASID entry. +*/ +static inline void +pasid_set_eafe (struct pasid_entry *pe) +{ +pasid_set_bits (&pe->val[2 ],1 <<7 ,1 ); +} + +/* +* Setup the Page-level Cache Disable (PCD) field (Bit 95) +* of a scalable mode PASID entry. +*/ +static inline void +pasid_set_pcd (struct pasid_entry *pe) +{ +pasid_set_bits (&pe->val[1 ],1 <<31 ,1 ); +} + +/* +* Setup the Page-level Write-Through (PWT)) field (Bit 94) +* of a scalable mode PASID entry. +*/ +static inline void +pasid_set_pwt (struct pasid_entry *pe) +{ +pasid_set_bits (&pe->val[1 ],1 <<30 ,1 ); +} +static void pasid_cache_invalidation_with_pasid (struct intel_iommu *iommu,u16 did,int pasid)@@ -647,3 +717,140 @@ int intel_pasid_setup_pass_through(struct intel_iommu *iommu,return 0 ; } + +static int intel_pasid_setup_bind_data (struct intel_iommu *iommu, +struct pasid_entry *pte, +struct iommu_gpasid_bind_data_vtd *pasid_data) +{ +/* +* Not all guest PASID table entry fields are passed down during bind, +* here we only set up the ones that are dependent on guest settings. +* Execution related bits such as NXE, SMEP are not meaningful to IOMMU, +* therefore not set. Other fields, such as snoop related, are set based +* on host needs regardless of guest settings. +*/ +if (pasid_data->flags &IOMMU_SVA_VTD_GPASID_SRE ) { +if (!ecap_srs (iommu->ecap)) { +pr_err ("No supervisor request support on %s\n" , + iommu->name); +return -EINVAL ; + } +pasid_set_sre (pte); + } + +if ((pasid_data->flags &IOMMU_SVA_VTD_GPASID_EAFE ) &&ecap_eafs (iommu->ecap)) +pasid_set_eafe (pte); + +if (pasid_data->flags &IOMMU_SVA_VTD_GPASID_EMTE ) { +pasid_set_emte (pte); +pasid_set_emt (pte, pasid_data->emt); + } +
drivers/iommu/intel-pasid.c int intel_pasid_setup_pass_through(struct intel_iommu *iommu, · line 758
Quoted 10 lines
drivers/iommu/intel-pasid.c +10
-0+/* +* Memory type is only applicable to devices inside processor coherent +* domain. PCIe devices are not included. We can skip the rest of the +* flags if IOMMU does not support MTS. +*/ +if (!ecap_mts (iommu->ecap)) { +pr_info ("%s does not support memory type bind guest PASID\n" , + iommu->name); +return 0 ; + }
How about making below lines as
if (ecap_mts(iommu->ecap)) {
do various pasid entry settings
} else {
pr_info(...);
}Otherwise, when someone later adds code at the end of this function. It might be ignored by above return 0.
Best regards,
baolu
Quoted 136 lines
drivers/iommu/intel-pasid.c +98
-0+ +if (pasid_data->flags &IOMMU_SVA_VTD_GPASID_PCD ) +pasid_set_pcd (pte); +if (pasid_data->flags &IOMMU_SVA_VTD_GPASID_PWT ) +pasid_set_pwt (pte); +if (pasid_data->flags &IOMMU_SVA_VTD_GPASID_CD ) +pasid_set_cd (pte); +pasid_set_pat (pte, pasid_data->pat); + +return 0 ; + +} + +/** +* intel_pasid_setup_nested() - Set up PASID entry for nested translation +* which is used for vSVA. The first level page tables are used for +* GVA-GPA translation in the guest, second level page tables are used +* for GPA to HPA translation. +* +* @iommu: Iommu which the device belong to +* @dev: Device to be set up for translation +* @gpgd: FLPTPTR: First Level Page translation pointer in GPA +* @pasid: PASID to be programmed in the device PASID table +* @pasid_data: Additional PASID info from the guest bind request +* @domain: Domain info for setting up second level page tables +* @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,struct iommu_gpasid_bind_data_vtd *pasid_data, +struct dmar_domain *domain, +int addr_width) +{ +struct pasid_entry *pte; +struct dma_pte *pgd; +u64 pgd_val; +int agaw; +u16 did; + +if (!ecap_nest (iommu->ecap)) { +pr_err ("IOMMU: %s: No nested translation support\n" , + iommu->name); +return -EINVAL ; + } + + pte =intel_pasid_get_entry (dev, pasid); +if (WARN_ON (!pte)) +return -EINVAL ; + +pasid_clear_entry (pte); + +/* Sanity checking performed by caller to make sure address +* width matching in two dimensions: +* 1. CPU vs. IOMMU +* 2. Guest vs. Host. +*/ +switch (addr_width) { +case 57 : +pasid_set_flpm (pte,1 ); +break ; +case 48 : +pasid_set_flpm (pte,0 ); +break ; +default : +dev_err (dev,"Invalid paging mode %d\n" , addr_width); +return -EINVAL ; + } + +pasid_set_flptr (pte, (u64 )gpgd); + +intel_pasid_setup_bind_data (iommu, pte, pasid_data); + +/* Setup the second level based on the given domain */ + pgd = domain->pgd; + +for (agaw = domain->agaw; agaw != iommu->agaw; agaw--) { + pgd =phys_to_virt (dma_pte_addr (pgd)); +if (!dma_pte_present (pgd)) { +dev_err (dev,"Invalid domain page table\n" ); +return -EINVAL ; + } + } + pgd_val =virt_to_phys (pgd); +pasid_set_slptr (pte, pgd_val); +pasid_set_fault_enable (pte); + + did = domain->iommu_did[iommu->seq_id]; +pasid_set_domain_id (pte, did); + +pasid_set_address_width (pte, agaw); +pasid_set_page_snoop (pte, !!ecap_smpwc (iommu->ecap)); + +pasid_set_translation_type (pte,PASID_ENTRY_PGTT_NESTED ); +pasid_set_present (pte); +pasid_flush_caches (iommu, pte, pasid, did); + +return 0 ; +}drivers/iommu/intel-pasid.h +12
-0@@ -46,6 +46,7 @@* to vmalloc or even module mappings. */ #define PASID_FLAG_SUPERVISOR_MODE BIT(0) +#define PASID_FLAG_NESTED BIT(1)struct pasid_dir_entry {u64 val;@@ -55,6 +56,11 @@ struct pasid_entry {u64 val[8 ]; }; +#define PASID_ENTRY_PGTT_FL_ONLY (1) +#define PASID_ENTRY_PGTT_SL_ONLY (2) +#define PASID_ENTRY_PGTT_NESTED (3) +#define PASID_ENTRY_PGTT_PT (4) +/* The representative of a PASID table */ struct pasid_table {void *table;/* pasid table pointer */ @@ -103,6 +109,12 @@ 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); +int intel_pasid_setup_nested (struct intel_iommu *iommu, +struct device *dev,pgd_t *pgd, +int 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);int vcmd_alloc_pasid (struct intel_iommu *iommu,unsigned int *pasid);
Re: [PATCH v7 07/11] iommu/vt-d: Add nested translation helper function
Quoted 158 lines · On Fri, 25 Oct 2019 23:04:48 +0800 Lu Baolu <[email protected]> wrote:
Hi,
Quoted 32 lines · Jacob Pan
Nested translation mode is supported in VT-d 3.0 Spec.CH 3.8. With PASID granular translation type set to
0x11b, translation result from the first level(FL) also subject to a second level(SL) page table translation. This mode is used for SVA virtualization, where FL performs guest virtual to guest physical translation and SL performs guest physical to host physical translation.Signed-off-by Jacob Pan <[email protected]>Signed-off-by Liu, Yi L <[email protected]>--- drivers/iommu/intel-pasid.c | 207++++++++++++++++++++++++++++++++++++++++++++
drivers/iommu/intel-pasid.h| 12 +++ 2 files changed, 219 insertions(+)(quoted diff) +0
-0
b/drivers/iommu/intel-pasid.cindexffbd416ed3b8..f846a907cfcf100644 ---a/drivers/iommu/intel-pasid.c
+++b/drivers/iommu/intel-pasid.cdrivers/iommu/intel-pasid.c +8
-0@@ -415,6 +415,76 @@ pasid_set_flpm(struct pasid_entry *pe, u64 value) pasid_set_bits(&pe->val[2], GENMASK_ULL(3, 2), value << 2); } +/* +* Setup the Extended Memory Type(EMT) field (Bits 91-93) +* of a scalable mode PASID entry. +*/ +static inline void +pasid_set_emt (struct pasid_entry *pe,u64 value) +{ +pasid_set_bits (&pe->val[1 ],GENMASK_ULL (29 ,27 ), value << 27); +}drivers/iommu/intel-pasid.c pasid_set_flpm(struct pasid_entry *pe, u64 · line 436
Quoted 10 lines
drivers/iommu/intel-pasid.c +9
-0+ +/* +* Setup the Page Attribute Table (PAT) field (Bits 96-127) +* of a scalable mode PASID entry. +*/ +static inline void +pasid_set_pat (struct pasid_entry *pe,u64 value) +{ +pasid_set_bits (&pe->val[1 ],GENMASK_ULL (63 ,32 ), value <<27 );Should be "value << 32", right?
Quoted 104 lines
drivers/iommu/intel-pasid.c +56
-0+} + +/* +* Setup the Cache Disable (CD) field (Bit 89) +* of a scalable mode PASID entry. +*/ +static inline void +pasid_set_cd (struct pasid_entry *pe) +{ +pasid_set_bits (&pe->val[1 ],1 <<25 ,1 ); +} + +/* +* Setup the Extended Memory Type Enable (EMTE) field (Bit 90) +* of a scalable mode PASID entry. +*/ +static inline void +pasid_set_emte (struct pasid_entry *pe) +{ +pasid_set_bits (&pe->val[1 ],1 <<26 ,1 ); +} + +/* +* Setup the Extended Access Flag Enable (EAFE) field (Bit 135) +* of a scalable mode PASID entry. +*/ +static inline void +pasid_set_eafe (struct pasid_entry *pe) +{ +pasid_set_bits (&pe->val[2 ],1 <<7 ,1 ); +} + +/* +* Setup the Page-level Cache Disable (PCD) field (Bit 95) +* of a scalable mode PASID entry. +*/ +static inline void +pasid_set_pcd (struct pasid_entry *pe) +{ +pasid_set_bits (&pe->val[1 ],1 <<31 ,1 ); +} + +/* +* Setup the Page-level Write-Through (PWT)) field (Bit 94) +* of a scalable mode PASID entry. +*/ +static inline void +pasid_set_pwt (struct pasid_entry *pe) +{ +pasid_set_bits (&pe->val[1 ],1 <<30 ,1 ); +} +static void pasid_cache_invalidation_with_pasid (struct intel_iommu *iommu,u16 did,int pasid)@@ -647,3 +717,140 @@ int intel_pasid_setup_pass_through(structintel_iommu *iommu, return 0; } + +static int intel_pasid_setup_bind_data (struct intel_iommu *iommu, +struct pasid_entry *pte, + struct iommu_gpasid_bind_data_vtd
*pasid_data) +{(quoted diff) +2
-0+ /* + * Not all guest PASID table entry fields are passed downduring bind,
(quoted diff) +1
-0+ * here we only set up the ones that are dependent onguest settings.
(quoted diff) +1
-0+ * Execution related bits such as NXE, SMEP are notmeaningful to IOMMU,
(quoted diff) +1
-0+ * therefore not set. Other fields, such as snoop related,are set based
drivers/iommu/intel-pasid.c +5
-0+* on host needs regardless of guest settings. +*/ +if (pasid_data->flags &IOMMU_SVA_VTD_GPASID_SRE ) { +if (!ecap_srs (iommu->ecap)) { + pr_err("No supervisor request support on%s\n",
drivers/iommu/intel-pasid.c +7
-0+ iommu->name); +return -EINVAL ; + } +pasid_set_sre (pte); + } + + if ((pasid_data->flags & IOMMU_SVA_VTD_GPASID_EAFE) &&
ecap_eafs(iommu->ecap))drivers/iommu/intel-pasid.c +9
-0+pasid_set_eafe (pte); + +if (pasid_data->flags &IOMMU_SVA_VTD_GPASID_EMTE ) { +pasid_set_emte (pte); +pasid_set_emt (pte, pasid_data->emt); + } + +/* +* Memory type is only applicable to devices inside processor coherent
(quoted diff) +1
-0+ * domain. PCIe devices are not included. We can skip therest of the
drivers/iommu/intel-pasid.c +4
-0+* flags if IOMMU does not support MTS. +*/ +if (!ecap_mts (iommu->ecap)) { + pr_info("%s does not support memory type bindguest PASID\n",
drivers/iommu/intel-pasid.c int intel_pasid_setup_pass_through(struct intel_iommu *iommu, · line 758
Quoted 3 lines
drivers/iommu/intel-pasid.c +3
-0+ iommu->name); +return 0 ; + }How about making below lines as
Quoted 9 lines
if (
ecap_mts(iommu->ecap)) {
do various pasid entry settings} else { pr_info(...); }Otherwise, when someone later adds code at the end of this function. It might be ignored by above return 0.
Sounds good, I like the positive logic and more readable this way.
Thanks,
Jacob
Quoted 139 lines
Best regards,
baoluQuoted 136 lines
drivers/iommu/intel-pasid.c +15
-0+ +if (pasid_data->flags &IOMMU_SVA_VTD_GPASID_PCD ) +pasid_set_pcd (pte); +if (pasid_data->flags &IOMMU_SVA_VTD_GPASID_PWT ) +pasid_set_pwt (pte); +if (pasid_data->flags &IOMMU_SVA_VTD_GPASID_CD ) +pasid_set_cd (pte); +pasid_set_pat (pte, pasid_data->pat); + +return 0 ; + +} + +/** +* intel_pasid_setup_nested() - Set up PASID entry for nested translation
+ * which is used for vSVA. The first level page tables are used for
+ * GVA-GPA translation in the guest, second level page tables are used
+ * for GPA to HPA translation.
+ *+ * @iommu: Iommu which the device belong to + * @dev: Device to be set up for translation + * @gpgd: FLPTPTR: First Level Page translation pointer inGPA
+ * @pasid: PASID to be programmed in the device PASID table
+ * @pasid_data: Additional PASID info from the guest bind request
+ * @domain: Domain info for setting up second level page tables
+ * @addr_width: Address width of the first level (guest)
+ */drivers/iommu/intel-pasid.c +3
-0+int intel_pasid_setup_nested(struct intel_iommu *iommu, + struct device *dev, pgd_t *gpgd, + int pasid, struct
iommu_gpasid_bind_data_vtd*pasid_data,drivers/iommu/intel-pasid.c +11
-0+ struct dmar_domain *domain, + int addr_width) +{ +struct pasid_entry *pte; +struct dma_pte *pgd; +u64 pgd_val; +int agaw; +u16 did; + +if (!ecap_nest (iommu->ecap)) { + pr_err("IOMMU: %s: No nested translationsupport\n",
drivers/iommu/intel-pasid.c +24
-0+ iommu->name); +return -EINVAL ; + } + + pte =intel_pasid_get_entry (dev, pasid); +if (WARN_ON (!pte)) +return -EINVAL ; + +pasid_clear_entry (pte); + +/* Sanity checking performed by caller to make sure address +* width matching in two dimensions: +* 1. CPU vs. IOMMU +* 2. Guest vs. Host. +*/ +switch (addr_width) { +case 57 : +pasid_set_flpm (pte,1 ); +break ; +case 48 : +pasid_set_flpm (pte,0 ); +break ; +default : + dev_err(dev, "Invalid paging mode %d\n",
addr_width);drivers/iommu/intel-pasid.c +14
-0+return -EINVAL ; + } + +pasid_set_flptr (pte, (u64 )gpgd); + +intel_pasid_setup_bind_data (iommu, pte, pasid_data); + +/* Setup the second level based on the given domain */ + pgd = domain->pgd; + +for (agaw = domain->agaw; agaw != iommu->agaw; agaw--) { + pgd =phys_to_virt (dma_pte_addr (pgd)); +if (!dma_pte_present (pgd)) { + dev_err(dev, "Invalid domain pagetable\n");
drivers/iommu/intel-pasid.c +19
-0+return -EINVAL ; + } + } + pgd_val =virt_to_phys (pgd); +pasid_set_slptr (pte, pgd_val); +pasid_set_fault_enable (pte); + + did = domain->iommu_did[iommu->seq_id]; +pasid_set_domain_id (pte, did); + +pasid_set_address_width (pte, agaw); +pasid_set_page_snoop (pte, !!ecap_smpwc (iommu->ecap)); + +pasid_set_translation_type (pte,PASID_ENTRY_PGTT_NESTED ); +pasid_set_present (pte); +pasid_flush_caches (iommu, pte, pasid, did); + +return 0 ; +}(quoted diff) +0
-0
b/drivers/iommu/intel-pasid.hindexe413e884e685..09c85db73b77100644 ---a/drivers/iommu/intel-pasid.h
+++b/drivers/iommu/intel-pasid.hdrivers/iommu/intel-pasid.h +6
-0@@ -46,6 +46,7 @@* to vmalloc or even module mappings. */ #define PASID_FLAG_SUPERVISOR_MODE BIT(0) +#define PASID_FLAG_NESTED BIT(1)struct pasid_dir_entry {u64 val;@@ -55,6 +56,11 @@ struct pasid_entry {u64 val[8 ]; }; +#define PASID_ENTRY_PGTT_FL_ONLY (1) +#define PASID_ENTRY_PGTT_SL_ONLY (2) +#define PASID_ENTRY_PGTT_NESTED (3) +#define PASID_ENTRY_PGTT_PT (4) +/* The representative of a PASID table */ struct pasid_table {void *table;/* pasid table pointer */ @@ -103,6 +109,12 @@ int intel_pasid_setup_second_level(struct
intel_iommu*iommu, intintel_pasid_setup_pass_through(struct intel_iommu *iommu, struct dmar_domain *domain, struct device *dev, int pasid);drivers/iommu/intel-pasid.h +3
-0+int intel_pasid_setup_nested(struct intel_iommu *iommu, + struct device *dev, pgd_t *pgd, + int pasid,
Quoted 8 lines
Quoted 8 lines
(quoted diff) +1
-0+ struct iommu_gpasid_bind_data_vtd
*pasid_data,drivers/iommu/intel-pasid.h +2
-0+struct dmar_domain *domain, + int addr_width);void intel_pasid_tear_down_entry (struct intel_iommu *iommu,struct device *dev,int pasid); int vcmd_alloc_pasid(struct intel_iommu *iommu, unsigned int*pasid);
[Jacob Pan]
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH v7 07/11] iommu/vt-d: Add nested translation helper function
In reply to Jacob PanHi Jacob,
Quoted 40 lines · Jacob Pan
Nested translation mode is supported in VT-d 3.0 Spec.CH 3.8. With PASID granular translation type set to
0x11b, translation result from the first level(FL) also subject to a second level(SL) page table translation. This mode is used for SVA virtualization, where FL performs guest virtual to guest physical translation and SL performs guest physical to host physical translation.Signed-off-by Jacob Pan <[email protected]>Signed-off-by Liu, Yi L <[email protected]>--- drivers/iommu/intel-pasid.c | 207 ++++++++++++++++++++++++++++++++++++++++++++ drivers/iommu/intel-pasid.h | 12 +++ 2 files changed, 219 insertions(+)drivers/iommu/intel-pasid.c +18
-0@@ -415,6 +415,76 @@ pasid_set_flpm(struct pasid_entry *pe, u64 value)pasid_set_bits (&pe->val[2 ],GENMASK_ULL (3 ,2 ), value <<2 ); } +/* +* Setup the Extended Memory Type(EMT) field (Bits 91-93) +* of a scalable mode PASID entry. +*/ +static inline void +pasid_set_emt (struct pasid_entry *pe,u64 value) +{ +pasid_set_bits (&pe->val[1 ],GENMASK_ULL (29 ,27 ), value <<27 ); +} + +/* +* Setup the Page Attribute Table (PAT) field (Bits 96-127) +* of a scalable mode PASID entry. +*/ +static inline void +pasid_set_pat (struct pasid_entry *pe,u64 value) +{ +pasid_set_bits (&pe->val[1 ],GENMASK_ULL (63 ,32 ), value <<27 );
drivers/iommu/intel-pasid.c pasid_set_flpm(struct pasid_entry *pe, u64 value) · line 445
Quoted 10 lines
drivers/iommu/intel-pasid.c +10
-0+} + +/* +* Setup the Cache Disable (CD) field (Bit 89) +* of a scalable mode PASID entry. +*/ +static inline void +pasid_set_cd (struct pasid_entry *pe) +{ +pasid_set_bits (&pe->val[1 ],1 <<25 ,1 );
should be pasid_set_bits(&pe->val[1], 1 << 25, 1 << 25); and same for below individual bit settings.
a macro could be introduced, taking the offset (up to 511) and the size and this would automatically select the right pe->val[n] and convert the offset into a 64b one. I think the readability would be improved versus the spec.
Not related to this patch but it may be worth to "&" the "bits" value with the mask to avoid any wrong value to overwrite other fields?
Quoted 97 lines
drivers/iommu/intel-pasid.c +90
-0+} + +/* +* Setup the Extended Memory Type Enable (EMTE) field (Bit 90) +* of a scalable mode PASID entry. +*/ +static inline void +pasid_set_emte (struct pasid_entry *pe) +{ +pasid_set_bits (&pe->val[1 ],1 <<26 ,1 ); +} + +/* +* Setup the Extended Access Flag Enable (EAFE) field (Bit 135) +* of a scalable mode PASID entry. +*/ +static inline void +pasid_set_eafe (struct pasid_entry *pe) +{ + pasid_set_bits(&pe->val[2], 1 << 7, 1);> +} + +/* +* Setup the Page-level Cache Disable (PCD) field (Bit 95) +* of a scalable mode PASID entry. +*/ +static inline void +pasid_set_pcd (struct pasid_entry *pe) +{ +pasid_set_bits (&pe->val[1 ],1 <<31 ,1 ); +} + +/* +* Setup the Page-level Write-Through (PWT)) field (Bit 94) +* of a scalable mode PASID entry. +*/ +static inline void +pasid_set_pwt (struct pasid_entry *pe) +{ +pasid_set_bits (&pe->val[1 ],1 <<30 ,1 ); +} +static void pasid_cache_invalidation_with_pasid (struct intel_iommu *iommu,u16 did,int pasid)@@ -647,3 +717,140 @@ int intel_pasid_setup_pass_through(struct intel_iommu *iommu,return 0 ; } + +static int intel_pasid_setup_bind_data (struct intel_iommu *iommu, +struct pasid_entry *pte, +struct iommu_gpasid_bind_data_vtd *pasid_data) +{ +/* +* Not all guest PASID table entry fields are passed down during bind, +* here we only set up the ones that are dependent on guest settings. +* Execution related bits such as NXE, SMEP are not meaningful to IOMMU, +* therefore not set. Other fields, such as snoop related, are set based +* on host needs regardless of guest settings. +*/ +if (pasid_data->flags &IOMMU_SVA_VTD_GPASID_SRE ) { +if (!ecap_srs (iommu->ecap)) { +pr_err ("No supervisor request support on %s\n" , + iommu->name); +return -EINVAL ; + } +pasid_set_sre (pte); + } + +if ((pasid_data->flags &IOMMU_SVA_VTD_GPASID_EAFE ) &&ecap_eafs (iommu->ecap)) +pasid_set_eafe (pte); + +if (pasid_data->flags &IOMMU_SVA_VTD_GPASID_EMTE ) { +pasid_set_emte (pte); +pasid_set_emt (pte, pasid_data->emt); + } + +/* +* Memory type is only applicable to devices inside processor coherent +* domain. PCIe devices are not included. We can skip the rest of the +* flags if IOMMU does not support MTS. +*/ +if (!ecap_mts (iommu->ecap)) { +pr_info ("%s does not support memory type bind guest PASID\n" , + iommu->name); +return 0 ; + } + +if (pasid_data->flags &IOMMU_SVA_VTD_GPASID_PCD ) +pasid_set_pcd (pte); +if (pasid_data->flags &IOMMU_SVA_VTD_GPASID_PWT ) +pasid_set_pwt (pte); +if (pasid_data->flags &IOMMU_SVA_VTD_GPASID_CD ) +pasid_set_cd (pte); +pasid_set_pat (pte, pasid_data->pat); + +return 0 ;
drivers/iommu/intel-pasid.c int intel_pasid_setup_pass_through(struct intel_iommu *iommu, · line 778
Quoted 10 lines
drivers/iommu/intel-pasid.c +10
-0+ +} + +/** +* intel_pasid_setup_nested() - Set up PASID entry for nested translation +* which is used for vSVA. The first level page tables are used for +* GVA-GPA translation in the guest, second level page tables are used +* for GPA to HPA translation. +* +* @iommu: Iommu which the device belong to
belongs
Quoted 23 lines
drivers/iommu/intel-pasid.c +23
-0+* @dev: Device to be set up for translation +* @gpgd: FLPTPTR: First Level Page translation pointer in GPA +* @pasid: PASID to be programmed in the device PASID table +* @pasid_data: Additional PASID info from the guest bind request +* @domain: Domain info for setting up second level page tables +* @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,struct iommu_gpasid_bind_data_vtd *pasid_data, +struct dmar_domain *domain, +int addr_width) +{ +struct pasid_entry *pte; +struct dma_pte *pgd; +u64 pgd_val; +int agaw; +u16 did; + +if (!ecap_nest (iommu->ecap)) { +pr_err ("IOMMU: %s: No nested translation support\n" , + iommu->name); +return -EINVAL ;
drivers/iommu/intel-pasid.c int intel_pasid_setup_pass_through(struct intel_iommu *iommu, · line 811
Quoted 10 lines
drivers/iommu/intel-pasid.c +10
-0+ } + + pte =intel_pasid_get_entry (dev, pasid); +if (WARN_ON (!pte)) +return -EINVAL ; + +pasid_clear_entry (pte); + +/* Sanity checking performed by caller to make sure address +* width matching in two dimensions:
s/matching/match
Quoted 73 lines
drivers/iommu/intel-pasid.c +45
-0+* 1. CPU vs. IOMMU +* 2. Guest vs. Host. +*/ +switch (addr_width) { +case 57 : +pasid_set_flpm (pte,1 ); +break ; +case 48 : +pasid_set_flpm (pte,0 ); +break ; +default : +dev_err (dev,"Invalid paging mode %d\n" , addr_width); +return -EINVAL ; + } + +pasid_set_flptr (pte, (u64 )gpgd); + +intel_pasid_setup_bind_data (iommu, pte, pasid_data); + +/* Setup the second level based on the given domain */ + pgd = domain->pgd; + +for (agaw = domain->agaw; agaw != iommu->agaw; agaw--) { + pgd =phys_to_virt (dma_pte_addr (pgd)); +if (!dma_pte_present (pgd)) { +dev_err (dev,"Invalid domain page table\n" ); +return -EINVAL ; + } + } + pgd_val =virt_to_phys (pgd); +pasid_set_slptr (pte, pgd_val); +pasid_set_fault_enable (pte); + + did = domain->iommu_did[iommu->seq_id]; +pasid_set_domain_id (pte, did); + +pasid_set_address_width (pte, agaw); +pasid_set_page_snoop (pte, !!ecap_smpwc (iommu->ecap)); + +pasid_set_translation_type (pte,PASID_ENTRY_PGTT_NESTED ); +pasid_set_present (pte); +pasid_flush_caches (iommu, pte, pasid, did); + +return 0 ; +}drivers/iommu/intel-pasid.h +6
-0@@ -46,6 +46,7 @@* to vmalloc or even module mappings. */ #define PASID_FLAG_SUPERVISOR_MODE BIT(0) +#define PASID_FLAG_NESTED BIT(1)struct pasid_dir_entry {u64 val;@@ -55,6 +56,11 @@ struct pasid_entry {u64 val[8 ]; }; +#define PASID_ENTRY_PGTT_FL_ONLY (1) +#define PASID_ENTRY_PGTT_SL_ONLY (2) +#define PASID_ENTRY_PGTT_NESTED (3) +#define PASID_ENTRY_PGTT_PT (4) +/* The representative of a PASID table */ struct pasid_table {void *table;/* pasid table pointer */ @@ -103,6 +109,12 @@ int intel_pasid_setup_second_level(struct intel_iommu *iommu, int intel_pasid_setup_pass_through(struct intel_iommu *iommu, struct dmar_domain *domain,
drivers/iommu/intel-pasid.h int intel_pasid_setup_second_level(struct intel_iommu *iommu, · line 120
Quoted 10 lines
drivers/iommu/intel-pasid.h +6
-0struct device *dev, int pasid); +int intel_pasid_setup_nested (struct intel_iommu *iommu, +struct device *dev,pgd_t *pgd, +int 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);int vcmd_alloc_pasid (struct intel_iommu *iommu,unsigned int *pasid);
Thanks
Eric
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH v7 8/11 iommu/vt-d: Misc macro clean up for SVM
In reply to Jacob PanUse combined macros for_each_svm_dev() to simplify SVM device iteration and error checking.
--- drivers/iommu/intel-svm.c | 89 ++++++++++++++++++++++------------------------- 1 file changed, 42 insertions(+), 47 deletions(-)
drivers/iommu/intel-svm.c +42 -47
@@ -212,6 +212,10 @@ static const struct mmu_notifier_ops intel_mmuops = {static DEFINE_MUTEX (pasid_mutex);static LIST_HEAD (global_svm_list); +#define for_each_svm_dev (svm, dev) \ + list_for_each_entry(sdev, &svm->devs, list) \ + if (dev == sdev->dev) \ +int intel_svm_bind_mm (struct device *dev,int *pasid,int flags,struct svm_dev_ops *ops) {struct intel_iommu *iommu =intel_svm_device_to_iommu (dev);
@@ -257,15 +261,13 @@ int intel_svm_bind_mm(struct device *dev, int *pasid, int flags, struct svm_dev_ goto out; } -list_for_each_entry (sdev, &svm->devs, list) { -if (dev == sdev->dev) { -if (sdev->ops != ops) { - ret = -EBUSY ; - goto out; - } - sdev->users++; - goto success; +for_each_svm_dev (svm, dev) { +if (sdev->ops != ops) { + ret = -EBUSY ; + goto out; } + sdev->users++; + goto success; }break ;
@@ -402,50 +404,43 @@ int intel_svm_unbind_mm(struct device *dev, int pasid) goto out; svm =ioasid_find (NULL , pasid,NULL ); -if (IS_ERR (svm)) { +if (IS_ERR_OR_NULL (svm)) { ret =PTR_ERR (svm); goto out; } -if (!svm) - goto out; - -list_for_each_entry (sdev, &svm->devs, list) { -if (dev == sdev->dev) { - ret =0 ; - sdev->users--; -if (!sdev->users) { -list_del_rcu (&sdev->list); -/* Flush the PASID cache and IOTLB for this device. -* Note that we do depend on the hardware *not* using -* the PASID any more. Just as we depend on other -* devices never using PASIDs that they have no right -* to use. We have a *shared* PASID table, because it's -* large and has to be physically contiguous. So it's -* hard to be as defensive as we might like. */ -intel_pasid_tear_down_entry (iommu, dev, svm->pasid); -intel_flush_svm_range_dev (svm, sdev,0 ,-1 ,0 ); -kfree_rcu (sdev, rcu); - -if (list_empty (&svm->devs)) { -/* Clear private data so that free pass check */ -ioasid_set_data (svm->pasid,NULL ); -ioasid_free (svm->pasid); -if (svm->mm) -mmu_notifier_unregister (&svm->notifier, svm->mm); - -list_del (&svm->list); - -/* We mandate that no page faults may be outstanding -* for the PASID when intel_svm_unbind_mm() is called. -* If that is not obeyed, subtle errors will happen. -* Let's make them less subtle... */ -memset (svm,0x6b ,sizeof (*svm)); -kfree (svm); - } +for_each_svm_dev (svm, dev) { + ret =0 ; + sdev->users--; +if (!sdev->users) { +list_del_rcu (&sdev->list); +/* Flush the PASID cache and IOTLB for this device. +* Note that we do depend on the hardware *not* using +* the PASID any more. Just as we depend on other +* devices never using PASIDs that they have no right +* to use. We have a *shared* PASID table, because it's +* large and has to be physically contiguous. So it's +* hard to be as defensive as we might like. */ +intel_pasid_tear_down_entry (iommu, dev, svm->pasid); +intel_flush_svm_range_dev (svm, sdev,0 ,-1 ,0 ); +kfree_rcu (sdev, rcu); + +if (list_empty (&svm->devs)) { +/* Clear private data so that free pass check */ +ioasid_set_data (svm->pasid,NULL ); +ioasid_free (svm->pasid); +if (svm->mm) +mmu_notifier_unregister (&svm->notifier, svm->mm); +list_del (&svm->list); +/* We mandate that no page faults may be outstanding +* for the PASID when intel_svm_unbind_mm() is called. +* If that is not obeyed, subtle errors will happen. +* Let's make them less subtle... */ +memset (svm,0x6b ,sizeof (*svm)); +kfree (svm); } -break ; } +break ; } out:mutex_unlock (&pasid_mutex);
@@ -581,7 +576,7 @@ static irqreturn_t prq_event_thread(int irq, void *d)* to unbind the mm while any page faults are outstanding. * So we only need RCU to protect the internal idr code. */ rcu_read_unlock (); -if (IS_ERR (svm) || !svm) { +if (IS_ERR_OR_NULL (svm)) {pr_err ("%s: Page request for invalid PASID %d: %08llx %08llx\n" , iommu->name, req->pasid, ((unsigned long long *)req)[0 ], ((unsigned long long *)req)[1 ]);
Signature · 1 line
2.7.4
Re: [PATCH v7 08/11] iommu/vt-d: Misc macro clean up for SVM
Hi,
Quoted 49 lines · Jacob Pan
Use combined macros
for_each_svm_dev()to simplify SVM device iteration and error checking.Suggested-by Andy Shevchenko <[email protected]>Signed-off-by Jacob Pan <[email protected]>Reviewed-by Eric Auger <[email protected]>--- drivers/iommu/intel-svm.c | 89 ++++++++++++++++++++++------------------------- 1 file changed, 42 insertions(+), 47 deletions(-)drivers/iommu/intel-svm.c +10
-8@@ -212,6 +212,10 @@ static const struct mmu_notifier_ops intel_mmuops = {static DEFINE_MUTEX (pasid_mutex);static LIST_HEAD (global_svm_list); +#define for_each_svm_dev (svm, dev) \ + list_for_each_entry(sdev, &svm->devs, list) \ + if (dev == sdev->dev) \ +int intel_svm_bind_mm (struct device *dev,int *pasid,int flags,struct svm_dev_ops *ops) {struct intel_iommu *iommu =intel_svm_device_to_iommu (dev);@@ -257,15 +261,13 @@ int intel_svm_bind_mm(struct device *dev, int *pasid, int flags, struct svm_dev_ goto out; } -list_for_each_entry (sdev, &svm->devs, list) { -if (dev == sdev->dev) { -if (sdev->ops != ops) { - ret = -EBUSY ; - goto out; - } - sdev->users++; - goto success; +for_each_svm_dev (svm, dev) { +if (sdev->ops != ops) { + ret = -EBUSY ; + goto out; } + sdev->users++; + goto success; }break ;@@ -402,50 +404,43 @@ int intel_svm_unbind_mm(struct device *dev, int pasid) goto out;
drivers/iommu/intel-svm.c int intel_svm_unbind_mm(struct device *dev, int pasid) · line 411
Quoted 10 lines
drivers/iommu/intel-svm.c +1
-3svm =ioasid_find (NULL , pasid,NULL ); -if (IS_ERR (svm)) { +if (IS_ERR_OR_NULL (svm)) { ret =PTR_ERR (svm); goto out; } -if (!svm) - goto out;
If svm == NULL here, this function will return success. This isn't expected, right?
Others looks good to me.
Best regards,
baolu
Quoted 80 lines
drivers/iommu/intel-svm.c +31
-36- -list_for_each_entry (sdev, &svm->devs, list) { -if (dev == sdev->dev) { - ret =0 ; - sdev->users--; -if (!sdev->users) { -list_del_rcu (&sdev->list); -/* Flush the PASID cache and IOTLB for this device. -* Note that we do depend on the hardware *not* using -* the PASID any more. Just as we depend on other -* devices never using PASIDs that they have no right -* to use. We have a *shared* PASID table, because it's -* large and has to be physically contiguous. So it's -* hard to be as defensive as we might like. */ -intel_pasid_tear_down_entry (iommu, dev, svm->pasid); -intel_flush_svm_range_dev (svm, sdev,0 ,-1 ,0 ); -kfree_rcu (sdev, rcu); - -if (list_empty (&svm->devs)) { -/* Clear private data so that free pass check */ -ioasid_set_data (svm->pasid,NULL ); -ioasid_free (svm->pasid); -if (svm->mm) -mmu_notifier_unregister (&svm->notifier, svm->mm); - -list_del (&svm->list); - -/* We mandate that no page faults may be outstanding -* for the PASID when intel_svm_unbind_mm() is called. -* If that is not obeyed, subtle errors will happen. -* Let's make them less subtle... */ -memset (svm,0x6b ,sizeof (*svm)); -kfree (svm); - } +for_each_svm_dev (svm, dev) { + ret =0 ; + sdev->users--; +if (!sdev->users) { +list_del_rcu (&sdev->list); +/* Flush the PASID cache and IOTLB for this device. +* Note that we do depend on the hardware *not* using +* the PASID any more. Just as we depend on other +* devices never using PASIDs that they have no right +* to use. We have a *shared* PASID table, because it's +* large and has to be physically contiguous. So it's +* hard to be as defensive as we might like. */ +intel_pasid_tear_down_entry (iommu, dev, svm->pasid); +intel_flush_svm_range_dev (svm, sdev,0 ,-1 ,0 ); +kfree_rcu (sdev, rcu); + +if (list_empty (&svm->devs)) { +/* Clear private data so that free pass check */ +ioasid_set_data (svm->pasid,NULL ); +ioasid_free (svm->pasid); +if (svm->mm) +mmu_notifier_unregister (&svm->notifier, svm->mm); +list_del (&svm->list); +/* We mandate that no page faults may be outstanding +* for the PASID when intel_svm_unbind_mm() is called. +* If that is not obeyed, subtle errors will happen. +* Let's make them less subtle... */ +memset (svm,0x6b ,sizeof (*svm)); +kfree (svm); } -break ; } +break ; } out:mutex_unlock (&pasid_mutex);@@ -581,7 +576,7 @@ static irqreturn_t prq_event_thread(int irq, void *d)* to unbind the mm while any page faults are outstanding. * So we only need RCU to protect the internal idr code. */ rcu_read_unlock (); -if (IS_ERR (svm) || !svm) { +if (IS_ERR_OR_NULL (svm)) {pr_err ("%s: Page request for invalid PASID %d: %08llx %08llx\n" , iommu->name, req->pasid, ((unsigned long long *)req)[0 ], ((unsigned long long *)req)[1 ]);
Re: [PATCH v7 08/11] iommu/vt-d: Misc macro clean up for SVM
Quoted 62 lines · On Sat, 26 Oct 2019 09:00:51 +0800 Lu Baolu <[email protected]> wrote:
Hi,
Quoted 59 lines · Jacob Pan
Use combined macros
for_each_svm_dev()to simplify SVM device iteration and error checking.Suggested-by Andy Shevchenko <[email protected]>Signed-off-by Jacob Pan <[email protected]>Reviewed-by Eric Auger <[email protected]>--- drivers/iommu/intel-svm.c | 89++++++++++++++++++++++------------------------- 1 file changed, 42 insertions(+), 47 deletions(-)
drivers/iommu/intel-svm.c +4
-0@@ -212,6 +212,10 @@ static const struct mmu_notifier_ops intel_mmuops = { static DEFINE_MUTEX(pasid_mutex);static LIST_HEAD (global_svm_list); +#define for_each_svm_dev (svm, dev) \ + list_for_each_entry(sdev, &svm->devs, list) \ + if (dev == sdev->dev) \ +int intel_svm_bind_mm (struct device *dev,int *pasid,int flags,struct svm_dev_ops *ops) { struct intel_iommu *iommu =
intel_svm_device_to_iommu(dev); @@ -257,15 +261,13 @@ int intel_svm_bind_mm(struct device *dev, int *pasid, int flags, structsvm_dev_goto out; }drivers/iommu/intel-svm.c +0
-1- list_for_each_entry(sdev, &svm->devs,list) {
drivers/iommu/intel-svm.c +7
-8-if (dev == sdev->dev) { -if (sdev->ops != ops) { - ret = -EBUSY ; - goto out; - } - sdev->users++; - goto success; +for_each_svm_dev (svm, dev) { +if (sdev->ops != ops) { + ret = -EBUSY ; + goto out; } + sdev->users++; + goto success; }break ;@@ -402,50 +404,43 @@ int intel_svm_unbind_mm(struct device *dev, int pasid) goto out; svm =ioasid_find (NULL , pasid,NULL ); -if (IS_ERR (svm)) { +if (IS_ERR_OR_NULL (svm)) { ret =PTR_ERR (svm); goto out; }
Quoted 6 lines
drivers/iommu/intel-svm.c int intel_svm_unbind_mm(struct device *dev, int pasid) · line 411
Quoted 2 lines
drivers/iommu/intel-svm.c +0
-2-if (!svm) - goto out;If svm == NULL here, this function will return success. This isn't expected, right?
you are right, should handle separately.
Thanks!
Quoted 112 lines
Others looks good to me.
Reviewed-by Lu Baolu <[email protected]>Best regards,
baoluQuoted 105 lines
drivers/iommu/intel-svm.c +0
-8- -list_for_each_entry (sdev, &svm->devs, list) { -if (dev == sdev->dev) { - ret =0 ; - sdev->users--; -if (!sdev->users) { -list_del_rcu (&sdev->list); -/* Flush the PASID cache and IOTLB for this device.
drivers/iommu/intel-svm.c +0
-1-* Note that we do depend on the hardware *not* using
drivers/iommu/intel-svm.c +0
-1-* the PASID any more. Just as we depend on other
drivers/iommu/intel-svm.c +0
-1-* devices never using PASIDs that they have no right
drivers/iommu/intel-svm.c +0
-1-* to use. We have a *shared* PASID table, because it's
drivers/iommu/intel-svm.c +0
-1-* large and has to be physically contiguous. So it's
drivers/iommu/intel-svm.c +0
-1-* hard to be as defensive as we might like. */
drivers/iommu/intel-svm.c +0
-1- intel_pasid_tear_down_entry(iommu,dev,
svm->pasid);drivers/iommu/intel-svm.c +0
-1- intel_flush_svm_range_dev(svm,sdev, 0, -1, 0);
drivers/iommu/intel-svm.c +0
-4-kfree_rcu (sdev, rcu); - -if (list_empty (&svm->devs)) { -/* Clear private data so that free pass check */
-ioasid_set_data(svm->pasid, NULL);drivers/iommu/intel-svm.c +0
-3-ioasid_free (svm->pasid); -if (svm->mm) -
mmu_notifier_unregister(&svm->notifier, svm->mm); -drivers/iommu/intel-svm.c +0
-3-list_del (&svm->list); - -/* We mandate that no page faults may be outstanding
drivers/iommu/intel-svm.c +0
-1-* for the PASID when
intel_svm_unbind_mm()is called.drivers/iommu/intel-svm.c +0
-1-* If that is not obeyed, subtle errors will happen.
drivers/iommu/intel-svm.c +0
-1-* Let's make them less subtle... */
drivers/iommu/intel-svm.c +0
-1- memset(svm, 0x6b,
sizeof(*svm));drivers/iommu/intel-svm.c +6
-2-kfree (svm); - } +for_each_svm_dev (svm, dev) { + ret =0 ; + sdev->users--; +if (!sdev->users) { +list_del_rcu (&sdev->list); +/* Flush the PASID cache and IOTLB for this device.
drivers/iommu/intel-svm.c +1
-0+* Note that we do depend on the hardware *not* using
drivers/iommu/intel-svm.c +1
-0+* the PASID any more. Just as we depend on other
drivers/iommu/intel-svm.c +1
-0+* devices never using PASIDs that they have no right
drivers/iommu/intel-svm.c +1
-0+* to use. We have a *shared* PASID table, because it's
drivers/iommu/intel-svm.c +1
-0+* large and has to be physically contiguous. So it's
drivers/iommu/intel-svm.c +1
-0+* hard to be as defensive as we might like. */
drivers/iommu/intel-svm.c +1
-0+ intel_pasid_tear_down_entry(iommu, dev,
svm->pasid);drivers/iommu/intel-svm.c +5
-1+intel_flush_svm_range_dev (svm, sdev,0 , -1, 0); + kfree_rcu(sdev, rcu); + +if (list_empty (&svm->devs)) { +/* Clear private data so that free pass check */
drivers/iommu/intel-svm.c +4
-0+ioasid_set_data (svm->pasid,NULL ); +ioasid_free (svm->pasid); +if (svm->mm) +
mmu_notifier_unregister(&svm->notifier, svm->mm);drivers/iommu/intel-svm.c +2
-0+list_del (&svm->list); +/* We mandate that no page faults may be outstanding
drivers/iommu/intel-svm.c +1
-0+* for the PASID when
intel_svm_unbind_mm()is called.drivers/iommu/intel-svm.c +1
-0+* If that is not obeyed, subtle errors will happen.
drivers/iommu/intel-svm.c +1
-0+* Let's make them less subtle... */
drivers/iommu/intel-svm.c +3
-1+memset (svm,0x6b ,sizeof (*svm)); +kfree (svm); } -break ; } +break ; } out:mutex_unlock (&pasid_mutex);@@ -581,7 +576,7 @@ static irqreturn_t prq_event_thread(int irq, void *d) * to unbind the mm while any page faultsare outstanding.
Quoted 8 lines
Quoted 8 lines
* So we only need RCU to protect the
internal idr code. */rcu_read_unlock();drivers/iommu/intel-svm.c +1
-1-if (IS_ERR (svm) || !svm) { +if (IS_ERR_OR_NULL (svm)) { pr_err("%s: Page request forinvalid PASID %d: %08llx %08llx\n",
iommu->name,req->pasid, ((unsigned long long *)req)[0], ((unsigned long long *)req)[1]);
[Jacob Pan]
PATCH v7 9/11 iommu/vt-d: Add bind guest PASID support
In reply to Jacob PanWhen supporting guest SVA with emulated IOMMU, the guest PASID table is shadowed in VMM. Updates to guest vIOMMU PASID table will result in PASID cache flush which will be passed down to the host as bind guest PASID calls.
For the SL page tables, it will be harvested from device's default domain (request w/o PASID), or aux domain in case of mediated device.
.-------------. .---------------------------.
| vIOMMU | | Guest process CR3, FL only|
| | '---------------------------' .----------------/
| PASID Entry |--- PASID cache flush -
'-------------' |
| | V
| | CR3 in GPA
'-------------'
Guest
------| Shadow |--------------------------|--------
v v v
Host
.-------------. .----------------------.
| pIOMMU | | Bind FL for GVA-GPA |
| | '----------------------'
.----------------/ |
| PASID Entry | V (Nested xlate)
'----------------\.------------------------------.
| | |SL for GPA-HPA, default domain|
| | '------------------------------'
'-------------'Where:
- FL = First level/stage one page tables
- SL = Second level/stage two page tables
--- drivers/iommu/intel-iommu.c | 4 + drivers/iommu/intel-svm.c | 184 ++++++++++++++++++++++++++++++++++++++++++++ include/linux/intel-iommu.h | 8 +- include/linux/intel-svm.h | 17 ++++ 4 files changed, 212 insertions(+), 1 deletion(-)
drivers/iommu/intel-iommu.c +4 -0
@@ -6026,6 +6026,10 @@ const struct iommu_ops intel_iommu_ops = { .dev_disable_feat = intel_iommu_dev_disable_feat, .is_attach_deferred = intel_iommu_is_attach_deferred, .pgsize_bitmap =INTEL_IOMMU_PGSIZES , +#ifdef CONFIG_INTEL_IOMMU_SVM + .sva_bind_gpasid = intel_svm_bind_gpasid, + .sva_unbind_gpasid = intel_svm_unbind_gpasid, +#endif };static void quirk_iommu_igfx (struct pci_dev *dev)
drivers/iommu/intel-svm.c +184 -0
190 lines not on this page · raw message
include/linux/intel-iommu.h +7 -1
@@ -673,7 +673,9 @@ int intel_iommu_enable_pasid(struct intel_iommu *iommu, struct device *dev);int intel_svm_init (struct intel_iommu *iommu);extern int intel_svm_enable_prq (struct intel_iommu *iommu);extern int intel_svm_finish_prq (struct intel_iommu *iommu); - +extern int intel_svm_bind_gpasid (struct iommu_domain *domain, +struct device *dev,struct iommu_gpasid_bind_data *data); +extern int intel_svm_unbind_gpasid (struct device *dev,int pasid);struct svm_dev_ops ;struct intel_svm_dev {
@@ -690,9 +692,13 @@ struct intel_svm_dev {struct intel_svm {struct mmu_notifier notifier;struct mm_struct *mm; +struct intel_iommu *iommu;int flags;int pasid; +int gpasid;/* Guest PASID in case of vSVA bind with non-identity host +* to guest PASID mapping. +*/ struct list_head devs;struct list_head list; };
include/linux/intel-svm.h +17 -0
@@ -44,6 +44,23 @@ struct svm_dev_ops {* do such IOTLB flushes automatically. */ #define SVM_FLAG_SUPERVISOR_MODE (1<<1) +/* +* The SVM_FLAG_GUEST_MODE flag is used when a guest process bind to a device. +* In this case the mm_struct is in the guest kernel or userspace, its life +* cycle is managed by VMM and VFIO layer. For IOMMU driver, this API provides +* means to bind/unbind guest CR3 with PASIDs allocated for a device. +*/ +#define SVM_FLAG_GUEST_MODE (1<<2) +/* +* The SVM_FLAG_GUEST_PASID flag is used when a guest has its own PASID space, +* which requires guest and host PASID translation at both directions. We keep +* track of guest PASID in order to provide lookup service to device drivers. +* One such example is a physical function (PF) driver that supports mediated +* device (mdev) assignment. Guest programming of mdev configuration space can +* only be done with guest PASID, therefore PF driver needs to find the matching +* host PASID to program the real hardware. +*/ +#define SVM_FLAG_GUEST_PASID (1<<3)#ifdef CONFIG_INTEL_IOMMU_SVM
Signature · 1 line
2.7.4
RE: [PATCH v7 09/11] iommu/vt-d: Add bind guest PASID support
Quoted 7 lines
From: Jacob Pan [mailto:[email protected]]
Sent: Friday, October 25, 2019 3:55 AMWhen supporting guest SVA with emulated IOMMU, the guest PASID table is shadowed in VMM. Updates to guest vIOMMU PASID table will result in PASID cache flush which will be passed down to the host as bind guest PASID calls.
will be translated into binding/unbinding guest PASID calls to update the host shadow PASID table.
Quoted 4 lines
For the SL page tables, it will be harvested from device's default domain (request w/o PASID), or aux domain in case of mediated device.
harvested -> copied or linked to?
Quoted 42 lines
.-------------. .---------------------------. | vIOMMU | | Guest process CR3, FL only| | | '---------------------------'.----------------/
| PASID Entry |--- PASID cache flush -
'-------------' |
| | V
| | CR3 in GPA
'-------------'
Guest------| Shadow |--------------------------|-------- v v v Host .-------------. .----------------------. | pIOMMU | | Bind FL for GVA-GPA | | | '----------------------' .----------------/ | | PASID Entry | V (Nested xlate) '----------------\.------------------------------. | | |SL for GPA-HPA, default domain| | | '------------------------------' '-------------'Where:
- FL = First level/stage one page tables
- SL = Second level/stage two page tablesSigned-off-by Jacob Pan <[email protected]>Signed-off-by Liu, Yi L <[email protected]>--- drivers/iommu/intel-iommu.c | 4 + drivers/iommu/intel-svm.c | 184 ++++++++++++++++++++++++++++++++++++++++++++ include/linux/intel-iommu.h | 8 +- include/linux/intel-svm.h | 17 ++++ 4 files changed, 212 insertions(+), 1 deletion(-)drivers/iommu/intel-iommu.c +0
-0
drivers/iommu/intel-iommu.c const struct iommu_ops intel_iommu_ops = { · line 6032
Quoted 7 lines
drivers/iommu/intel-iommu.c +4
-0@@ -6026,6 +6026,10 @@ const struct iommu_ops intel_iommu_ops = { .dev_disable_feat = intel_iommu_dev_disable_feat, .is_attach_deferred = intel_iommu_is_attach_deferred, .pgsize_bitmap =INTEL_IOMMU_PGSIZES , +#ifdef CONFIG_INTEL_IOMMU_SVM + .sva_bind_gpasid = intel_svm_bind_gpasid, + .sva_unbind_gpasid = intel_svm_unbind_gpasid, +#endif
again, pure PASID management logic should be separated from SVM.
Quoted 23 lines
drivers/iommu/intel-iommu.c +0
-0};static void quirk_iommu_igfx (struct pci_dev *dev)drivers/iommu/intel-svm.c +12
-0@@ -216,6 +216,190 @@ static LIST_HEAD(global_svm_list); list_for_each_entry(sdev, &svm->devs, list) \if (dev == sdev->dev) \ +int intel_svm_bind_gpasid(struct iommu_domain *domain, + struct device *dev, + struct iommu_gpasid_bind_data *data) +{ + struct intel_iommu *iommu = intel_svm_device_to_iommu(dev); +struct dmar_domain *ddomain; +struct intel_svm_dev *sdev; +struct intel_svm *svm; +int ret =0 ; + +if (WARN_ON (!iommu) || !data) +return -EINVAL ;
drivers/iommu/intel-svm.c static LIST_HEAD(global_svm_list); · line 240
Quoted 10 lines
drivers/iommu/intel-svm.c +10
-0+ +if (data->version !=IOMMU_GPASID_BIND_VERSION_1 || + data->format !=IOMMU_PASID_FORMAT_INTEL_VTD ) +return -EINVAL ; + +if (dev_is_pci (dev)) { +/* VT-d supports devices with full 20 bit PASIDs only */ +if (pci_max_pasids (to_pci_dev (dev)) !=PASID_MAX ) +return -EINVAL ; + }
what about non-pci devices? It just moves forward w/o any check here?
Quoted 5 lines
drivers/iommu/intel-svm.c +5
-0+ +/* +* We only check host PASID range, we have no knowledge to check +* guest PASID range nor do we use the guest PASID. +*/
drivers/iommu/intel-svm.c static LIST_HEAD(global_svm_list); · line 255
Quoted 10 lines
drivers/iommu/intel-svm.c +10
-0+if (data->hpasid <=0 || data->hpasid >=PASID_MAX ) +return -EINVAL ; + + ddomain =to_dmar_domain (domain); +/* REVISIT: +* Sanity check adddress width and paging mode support +* width matching in two dimensions: +* 1. paging mode CPU <= IOMMU +* 2. address width Guest <= Host. +*/
Is lacking of above logic harmful? If not, we should add
Quoted 18 lines
drivers/iommu/intel-svm.c +15
-0+mutex_lock (&pasid_mutex); + svm =ioasid_find (NULL , data->hpasid,NULL ); +if (IS_ERR (svm)) { + ret =PTR_ERR (svm); + goto out; + } +if (svm) { +/* +* If we found svm for the PASID, there must be at +* least one device bond, otherwise svm should be freed. +*/ +BUG_ON (list_empty (&svm->devs)); + +for_each_svm_dev (svm, dev) { +/* In case of multiple sub-devices of the same pdev assigned, we should
drivers/iommu/intel-svm.c +1
-0+* allow multiple bind calls with the same PASID and pdev.
drivers/iommu/intel-svm.c static LIST_HEAD(global_svm_list); · line 274
Quoted 3 lines
drivers/iommu/intel-svm.c +3
-0+*/ + sdev->users++; + goto out;
sorry if I overlooked, but I didn't see any check on the PASID actually belonging to this process. At least should check the match between svm->mm and get_task_mm? also check whether a previous binding between this hpasid and gpasid already exists.
Quoted 13 lines
drivers/iommu/intel-svm.c +3
-0+ } + }else { +/* We come here when PASID has never been bond to a device. */
drivers/iommu/intel-svm.c +6
-0+ svm =kzalloc (sizeof (*svm),GFP_KERNEL ); +if (!svm) { + ret = -ENOMEM ; + goto out; + } +/* REVISIT: upper layer/VFIO can track host process that bind the PASID.
drivers/iommu/intel-svm.c +1
-0+* ioasid_set = mm might be sufficient for vfio to check pasid VMM
drivers/iommu/intel-svm.c
Quoted 2 lines
drivers/iommu/intel-svm.c +2
-0+* ownership. +*/
Is it correct to leave the check to the caller?
Quoted 46 lines
drivers/iommu/intel-svm.c +45
-0+ svm->mm =get_task_mm (current); + svm->pasid = data->hpasid; +if (data->flags &IOMMU_SVA_GPASID_VAL ) { + svm->gpasid = data->gpasid; + svm->flags |=SVM_FLAG_GUEST_PASID ; + } +ioasid_set_data (data->hpasid, svm); +INIT_LIST_HEAD_RCU (&svm->devs); +INIT_LIST_HEAD (&svm->list); + +mmput (svm->mm); + } + sdev =kzalloc (sizeof (*sdev),GFP_KERNEL ); +if (!sdev) { +if (list_empty (&svm->devs)) +kfree (svm); + ret = -ENOMEM ; + goto out; + } + sdev->dev = dev; + sdev->users =1 ; + +/* Set up device context entry for PASID if not enabled already */ + ret =intel_iommu_enable_pasid (iommu, sdev->dev); +if (ret) { +dev_err (dev,"Failed to enable PASID capability\n" ); +kfree (sdev); + goto out; + } + +/* +* For guest bind, we need to set up PASID table entry as follows: +* - FLPM matches guest paging mode +* - turn on nested mode +* - SL guest address width matching +*/ + ret =intel_pasid_setup_nested (iommu, + dev, + (pgd_t *)data->gpgd, + data->hpasid, + &data->vtd, + ddomain, + data->addr_width); +if (ret) { + dev_err(dev, "Failed to set up PASID %llu in nested mode,Err %d\n",
drivers/iommu/intel-svm.c static LIST_HEAD(global_svm_list); · line 333
Quoted 2 lines
drivers/iommu/intel-svm.c +2
-0+ data->hpasid, ret); +kfree (sdev);
disable pasid? revert ioasid_set_data?
Quoted 146 lines
drivers/iommu/intel-svm.c +35
-0+ goto out; + } + svm->flags |=SVM_FLAG_GUEST_MODE ; + +init_rcu_head (&sdev->rcu); +list_add_rcu (&sdev->list, &svm->devs); + out: +mutex_unlock (&pasid_mutex); +return ret; +} + +int intel_svm_unbind_gpasid (struct device *dev,int pasid) +{ +struct intel_svm_dev *sdev; +struct intel_iommu *iommu; +struct intel_svm *svm; +int ret = -EINVAL ; + +mutex_lock (&pasid_mutex); + iommu =intel_svm_device_to_iommu (dev); +if (!iommu) + goto out; + + svm =ioasid_find (NULL , pasid,NULL ); +if (IS_ERR_OR_NULL (svm)) { + ret =PTR_ERR (svm); + goto out; + } + +for_each_svm_dev (svm, dev) { + ret =0 ; + sdev->users--; +if (!sdev->users) { +list_del_rcu (&sdev->list); + intel_pasid_tear_down_entry(iommu, dev, svm-Quoted 1 line
pasid);
drivers/iommu/intel-svm.c +12
-0+/* TODO: Drain in flight PRQ for the PASID since it +* may get reused soon, we don't want to +* confuse with its previous life. +* intel_svm_drain_prq(dev, pasid); +*/ +kfree_rcu (sdev, rcu); + +if (list_empty (&svm->devs)) { +list_del (&svm->list); +kfree (svm); +/* +* We do not free PASID here until explicit call
drivers/iommu/intel-svm.c +2
-0+* from VFIO to free. The PASID life cycle +* management is largely tied to VFIO management
drivers/iommu/intel-svm.c +6
-0+* of assigned device life cycles. In case of +* guest exit without a explicit free PASID call, +* the responsibility lies in VFIO layer to free +* the PASIDs allocated for the guest. +* For security reasons, VFIO has to track the +* PASID ownership per guest anyway to ensure
drivers/iommu/intel-svm.c +1
-0+* that PASID allocated by one guest cannot be
drivers/iommu/intel-svm.c +13
-0+* used by another. +*/ +ioasid_set_data (pasid,NULL ); + } + } +break ; + } + out: +mutex_unlock (&pasid_mutex); + +return ret; +} + int intel_svm_bind_mm(struct device *dev, int *pasid, int flags, struct
svm_dev_ops*ops)
{drivers/iommu/intel-svm.c +0
-0struct intel_iommu *iommu =intel_svm_device_to_iommu (dev);include/linux/intel-iommu.h +3
-1@@ -673,7 +673,9 @@ int intel_iommu_enable_pasid(struct intel_iommu *iommu, struct device *dev);int intel_svm_init (struct intel_iommu *iommu);extern int intel_svm_enable_prq (struct intel_iommu *iommu);extern int intel_svm_finish_prq (struct intel_iommu *iommu); - +extern int intel_svm_bind_gpasid (struct iommu_domain *domain, +struct device *dev,struct iommu_gpasid_bind_data *data); +extern int intel_svm_unbind_gpasid (struct device *dev,int pasid);struct svm_dev_ops ;struct
intel_svm_dev{include/linux/intel-iommu.h +2
-0@@ -690,9 +692,13 @@ struct intel_svm_dev {struct intel_svm {struct mmu_notifier notifier;struct mm_struct *mm; +struct intel_iommu *iommu;int flags;int pasid; +int gpasid;/* Guest PASID in case of vSVA bind with non-identity host
include/linux/intel-iommu.h +2
-0+* to guest PASID mapping. +*/ struct list_head devs;struct list_head list; };include/linux/intel-svm.h +2
-0@@ -44,6 +44,23 @@ struct svm_dev_ops {* do such IOTLB flushes automatically. */ #define SVM_FLAG_SUPERVISOR_MODE (1<<1) +/* +* The SVM_FLAG_GUEST_MODE flag is used when a guest process bind to a device.
+ * In this case themm_structis in the guest kernel or userspace, its life
+ * cycle is managed by VMM and VFIO layer. For IOMMU driver, this API provides
+ * means to bind/unbind guest CR3 with PASIDs allocated for a device.
+ */include/linux/intel-svm.h +3
-0+#define SVM_FLAG_GUEST_MODE (1<<2) +/* +* The SVM_FLAG_GUEST_PASID flag is used when a guest has its own PASID space,
+ * which requires guest and host PASID translation at both directions. We keep
+ * track of guest PASID in order to provide lookup service to device drivers.
+ * One such example is a physical function (PF) driver that supports mediated
+ * device (mdev) assignment. Guest programming of mdev configuration space can
+ * only be done with guest PASID, therefore PF driver needs to find the matching
+ * host PASID to program the real hardware.
+ */
+#defineSVM_FLAG_GUEST_PASID(1<<3)#ifdef
CONFIG_INTEL_IOMMU_SVM--
2.7.4
Re: [PATCH v7 09/11] iommu/vt-d: Add bind guest PASID support
Hi Kevin,
Quoted 11 lines · Kevin
Quoted 7 lines
From: Jacob Pan [mailto:[email protected]]
Sent: Friday, October 25, 2019 3:55 AMWhen supporting guest SVA with emulated IOMMU, the guest PASID table is shadowed in VMM. Updates to guest vIOMMU PASID table will result in PASID cache flush which will be passed down to the host as bind guest PASID calls.
will be translated into binding/unbinding guest PASID calls to update the host shadow PASID table.
yours is more precise, will replace.
Quoted 6 lines
Quoted 4 lines
For the SL page tables, it will be harvested from device's default domain (request w/o PASID), or aux domain in case of mediated device.
harvested -> copied or linked to?
Kind of the same, but I agree copied is more technical and precise term. Will change.
Quoted 37 lines
Quoted 37 lines
.-------------. .---------------------------. | vIOMMU | | Guest process CR3, FL only| | | '---------------------------'.----------------/
| PASID Entry |--- PASID cache flush -
'-------------' |
| | V
| | CR3 in GPA
'-------------'
Guest------| Shadow |--------------------------|-------- v v v Host .-------------. .----------------------. | pIOMMU | | Bind FL for GVA-GPA | | | '----------------------' .----------------/ | | PASID Entry | V (Nested xlate) '----------------\.------------------------------. | | |SL for GPA-HPA, default domain| | | '------------------------------' '-------------'Where:
- FL = First level/stage one page tables
- SL = Second level/stage two page tablesSigned-off-by Jacob Pan <[email protected]>Signed-off-by Liu, Yi L <[email protected]>--- drivers/iommu/intel-iommu.c | 4 + drivers/iommu/intel-svm.c | 184 ++++++++++++++++++++++++++++++++++++++++++++ include/linux/intel-iommu.h | 8 +- include/linux/intel-svm.h | 17 ++++ 4 files changed, 212 insertions(+), 1 deletion(-)
Quoted 15 lines
drivers/iommu/intel-iommu.c const struct iommu_ops intel_iommu_ops = { · line 6032
Quoted 12 lines
(quoted diff) +0
-0
b/drivers/iommu/intel-iommu.cindexacd1ac787d8b..5fab32fbc4b4100644 ---a/drivers/iommu/intel-iommu.c
+++b/drivers/iommu/intel-iommu.c(quoted diff) +0
-0@@ -6026,6 +6026,10 @@ const struct iommu_ops intel_iommu_ops = { .dev_disable_feat = intel_iommu_dev_disable_feat, .is_attach_deferred =
intel_iommu_is_attach_deferred, .pgsize_bitmap =INTEL_IOMMU_PGSIZES, +#ifdefCONFIG_INTEL_IOMMU_SVMdrivers/iommu/intel-iommu.c +3
-0+ .sva_bind_gpasid = intel_svm_bind_gpasid, + .sva_unbind_gpasid = intel_svm_unbind_gpasid, +#endif again, pure PASID management logic should be separated from SVM.
I am not following, these two functions are SVM functionality, not pure PASID management which is already separated in ioasid.c
Quoted 28 lines
Quoted 28 lines
};
static void
quirk_iommu_igfx(struct pci_dev *dev)drivers/iommu/intel-svm.c +17
-0@@ -216,6 +216,190 @@ static LIST_HEAD(global_svm_list); list_for_each_entry(sdev, &svm->devs, list) \if (dev == sdev->dev) \ +int intel_svm_bind_gpasid(struct iommu_domain *domain, + struct device *dev, + struct iommu_gpasid_bind_data *data) +{ + struct intel_iommu *iommu = intel_svm_device_to_iommu(dev); +struct dmar_domain *ddomain; +struct intel_svm_dev *sdev; +struct intel_svm *svm; +int ret =0 ; + +if (WARN_ON (!iommu) || !data) +return -EINVAL ; + +if (data->version !=IOMMU_GPASID_BIND_VERSION_1 || + data->format !=IOMMU_PASID_FORMAT_INTEL_VTD ) +return -EINVAL ; +
Quoted 9 lines
drivers/iommu/intel-svm.c static LIST_HEAD(global_svm_list); · line 240
Quoted 6 lines
drivers/iommu/intel-svm.c +2
-0+if (dev_is_pci (dev)) { +/* VT-d supports devices with full 20 bit PASIDs only */
drivers/iommu/intel-svm.c +3
-0+if (pci_max_pasids (to_pci_dev (dev)) !=PASID_MAX ) +return -EINVAL ; + }what about non-pci devices? It just moves forward w/o any check here?
Good catch, we only support PCI-device on Intel. Even mdev has to pass the pdev to bind. Will add the else case.
Quoted 10 lines
Quoted 10 lines
drivers/iommu/intel-svm.c +3
-0+ +/* +* We only check host PASID range, we have no knowledge to check
drivers/iommu/intel-svm.c +6
-0+* guest PASID range nor do we use the guest PASID. +*/ +if (data->hpasid <=0 || data->hpasid >=PASID_MAX ) +return -EINVAL ; + + ddomain =to_dmar_domain (domain);
Quoted 9 lines
drivers/iommu/intel-svm.c static LIST_HEAD(global_svm_list); · line 255
Quoted 6 lines
drivers/iommu/intel-svm.c +6
-0+/* REVISIT: +* Sanity check adddress width and paging mode support +* width matching in two dimensions: +* 1. paging mode CPU <= IOMMU +* 2. address width Guest <= Host. +*/ Is lacking of above logic harmful? If not, we should add
It is better to add the check now, not solely rely on QEMU.
Quoted 20 lines
Quoted 20 lines
drivers/iommu/intel-svm.c +10
-0+mutex_lock (&pasid_mutex); + svm =ioasid_find (NULL , data->hpasid,NULL ); +if (IS_ERR (svm)) { + ret =PTR_ERR (svm); + goto out; + } +if (svm) { +/* +* If we found svm for the PASID, there must be at +* least one device bond, otherwise svm should be freed.
drivers/iommu/intel-svm.c +5
-0+*/ +BUG_ON (list_empty (&svm->devs)); + +for_each_svm_dev (svm, dev) { +/* In case of multiple sub-devices of the same pdev assigned, we should
drivers/iommu/intel-svm.c +1
-0+* allow multiple bind calls with the same PASID and pdev.
drivers/iommu/intel-svm.c +1
-0+*/
Quoted 9 lines
drivers/iommu/intel-svm.c
Quoted 2 lines
drivers/iommu/intel-svm.c +2
-0+ sdev->users++; + goto out;sorry if I overlooked, but I didn't see any check on the PASID actually belonging to this process. At least should check the match between
svm->mmandget_task_mm? also check whether a previous binding between this hpasid and gpasid already exists.
We had some discussions on whom should be responsible for checking ownership. I tend to think VFIO is right place but I guess we can also double check here.
Good point, we should check the same H-G PASID bind already exists.
Quoted 9 lines
Quoted 9 lines
drivers/iommu/intel-svm.c +3
-0+ } + }else { +/* We come here when PASID has never been bond to a device. */
drivers/iommu/intel-svm.c +5
-0+ svm =kzalloc (sizeof (*svm),GFP_KERNEL ); +if (!svm) { + ret = -ENOMEM ; + goto out; + }
Quoted 9 lines
drivers/iommu/intel-svm.c
Quoted 6 lines
drivers/iommu/intel-svm.c +1
-0+/* REVISIT: upper layer/VFIO can track host process that bind the PASID.
drivers/iommu/intel-svm.c +1
-0+* ioasid_set = mm might be sufficient for vfio to check pasid VMM
drivers/iommu/intel-svm.c +2
-0+* ownership. +*/ Is it correct to leave the check to the caller?
Ditto, we will double check. But since this is related to the guest, I feel iommu driver check mm might be too restrictive. I am not sure if any VMM could have more than one process? One process does alloc, the other does bind.
Quoted 45 lines
Quoted 45 lines
drivers/iommu/intel-svm.c +23
-0+ svm->mm =get_task_mm (current); + svm->pasid = data->hpasid; +if (data->flags &IOMMU_SVA_GPASID_VAL ) { + svm->gpasid = data->gpasid; + svm->flags |=SVM_FLAG_GUEST_PASID ; + } +ioasid_set_data (data->hpasid, svm); +INIT_LIST_HEAD_RCU (&svm->devs); +INIT_LIST_HEAD (&svm->list); + +mmput (svm->mm); + } + sdev =kzalloc (sizeof (*sdev),GFP_KERNEL ); +if (!sdev) { +if (list_empty (&svm->devs)) +kfree (svm); + ret = -ENOMEM ; + goto out; + } + sdev->dev = dev; + sdev->users =1 ; + +/* Set up device context entry for PASID if not enabled already */
drivers/iommu/intel-svm.c +3
-0+ ret =intel_iommu_enable_pasid (iommu, sdev->dev); +if (ret) { + dev_err(dev, "Failed to enable PASIDcapability\n");
drivers/iommu/intel-svm.c +6
-0+kfree (sdev); + goto out; + } + +/* +* For guest bind, we need to set up PASID table entry as follows:
drivers/iommu/intel-svm.c +10
-0+* - FLPM matches guest paging mode +* - turn on nested mode +* - SL guest address width matching +*/ + ret = intel_pasid_setup_nested(iommu, + dev, + (pgd_t *)data->gpgd, + data->hpasid, + &data->vtd, + ddomain,
Quoted 9 lines
drivers/iommu/intel-svm.c static LIST_HEAD(global_svm_list); · line 333
Quoted 6 lines
drivers/iommu/intel-svm.c +3
-0+ data->addr_width); +if (ret) { + dev_err(dev, "Failed to set up PASID %llu innested mode, Err %d\n",
drivers/iommu/intel-svm.c +2
-0+ data->hpasid, ret); +kfree (sdev);disable pasid? revert
ioasid_set_data?
Good catch, will do.
Quoted 153 lines
Quoted 153 lines
drivers/iommu/intel-svm.c +35
-0+ goto out; + } + svm->flags |=SVM_FLAG_GUEST_MODE ; + +init_rcu_head (&sdev->rcu); +list_add_rcu (&sdev->list, &svm->devs); + out: +mutex_unlock (&pasid_mutex); +return ret; +} + +int intel_svm_unbind_gpasid (struct device *dev,int pasid) +{ +struct intel_svm_dev *sdev; +struct intel_iommu *iommu; +struct intel_svm *svm; +int ret = -EINVAL ; + +mutex_lock (&pasid_mutex); + iommu =intel_svm_device_to_iommu (dev); +if (!iommu) + goto out; + + svm =ioasid_find (NULL , pasid,NULL ); +if (IS_ERR_OR_NULL (svm)) { + ret =PTR_ERR (svm); + goto out; + } + +for_each_svm_dev (svm, dev) { + ret =0 ; + sdev->users--; +if (!sdev->users) { +list_del_rcu (&sdev->list); + intel_pasid_tear_down_entry(iommu, dev,svm-
Quoted 1 line
pasid);
drivers/iommu/intel-svm.c +1
-0+/* TODO: Drain in flight PRQ for the PASID since it
drivers/iommu/intel-svm.c +11
-0+* may get reused soon, we don't want to +* confuse with its previous life. +* intel_svm_drain_prq(dev, pasid); +*/ +kfree_rcu (sdev, rcu); + +if (list_empty (&svm->devs)) { +list_del (&svm->list); +kfree (svm); +/* +* We do not free PASID here until explicit call
drivers/iommu/intel-svm.c +1
-0+* from VFIO to free. The PASID life cycle
drivers/iommu/intel-svm.c +1
-0+* management is largely tied to VFIO management
drivers/iommu/intel-svm.c +1
-0+* of assigned device life cycles. In case of
drivers/iommu/intel-svm.c +1
-0+* guest exit without a explicit free PASID call,
drivers/iommu/intel-svm.c +1
-0+* the responsibility lies in VFIO layer to free
drivers/iommu/intel-svm.c +1
-0+* the PASIDs allocated for the guest.
drivers/iommu/intel-svm.c +1
-0+* For security reasons, VFIO has to track the
drivers/iommu/intel-svm.c +1
-0+* PASID ownership per guest anyway to ensure
drivers/iommu/intel-svm.c +1
-0+* that PASID allocated by one guest cannot be
drivers/iommu/intel-svm.c +13
-0+* used by another. +*/ +ioasid_set_data (pasid,NULL ); + } + } +break ; + } + out: +mutex_unlock (&pasid_mutex); + +return ret; +} + int intel_svm_bind_mm(struct device *dev, int *pasid, int flags,struct
svm_dev_ops*ops)
{drivers/iommu/intel-svm.c +0
-0struct intel_iommu *iommu =intel_svm_device_to_iommu (dev);(quoted diff) +0
-0
b/include/linux/intel-iommu.hindex3dba6ad3e9ad..6c74c71b1ebf100644 ---a/include/linux/intel-iommu.h
+++b/include/linux/intel-iommu.hinclude/linux/intel-iommu.h +4
-1@@ -673,7 +673,9 @@ int intel_iommu_enable_pasid(struct intel_iommu *iommu, struct device *dev);int intel_svm_init (struct intel_iommu *iommu);extern int intel_svm_enable_prq (struct intel_iommu *iommu);extern int intel_svm_finish_prq (struct intel_iommu *iommu); - +extern int intel_svm_bind_gpasid (struct iommu_domain *domain, +struct device *dev,struct iommu_gpasid_bind_data *data); +extern int intel_svm_unbind_gpasid(struct device *dev, int pasid);struct svm_dev_ops ;struct intel_svm_dev {@@ -690,9 +692,13 @@ struct intel_svm_dev {struct intel_svm {struct mmu_notifier notifier;struct mm_struct *mm; +struct intel_iommu *iommu;int flags;int pasid; +int gpasid;/* Guest PASID in case of vSVA bind with non-identity host
include/linux/intel-iommu.h +2
-0+* to guest PASID mapping. +*/ struct list_head devs;struct list_head list; };include/linux/intel-svm.h +2
-0@@ -44,6 +44,23 @@ struct svm_dev_ops {* do such IOTLB flushes automatically. */ #define SVM_FLAG_SUPERVISOR_MODE (1<<1) +/* +* The SVM_FLAG_GUEST_MODE flag is used when a guest process bind to a device.
+ * In this case themm_structis in the guest kernel or userspace, its life
+ * cycle is managed by VMM and VFIO layer. For IOMMU driver, this API provides
+ * means to bind/unbind guest CR3 with PASIDs allocated for a device.
+ */include/linux/intel-svm.h +3
-0+#define SVM_FLAG_GUEST_MODE (1<<2) +/* +* The SVM_FLAG_GUEST_PASID flag is used when a guest has its own PASID space,
+ * which requires guest and host PASID translation at both directions. We keep
+ * track of guest PASID in order to provide lookup service to device drivers.
+ * One such example is a physical function (PF) driver that supports mediated
+ * device (mdev) assignment. Guest programming of mdev configuration space can
+ * only be done with guest PASID, therefore PF driver needs to find the matching
+ * host PASID to program the real hardware.
+ */
+#defineSVM_FLAG_GUEST_PASID(1<<3)
Quoted 5 lines
Quoted 4 lines
#ifdef
CONFIG_INTEL_IOMMU_SVM--
2.7.4
[Jacob Pan]
RE: [PATCH v7 09/11] iommu/vt-d: Add bind guest PASID support
Quoted 83 lines
From: Jacob Pan [mailto:[email protected]]
Sent: Saturday, October 26, 2019 1:34 AMHi Kevin,
Quoted 11 lines · Kevin
Quoted 7 lines
From: Jacob Pan [mailto:[email protected]]
Sent: Friday, October 25, 2019 3:55 AMWhen supporting guest SVA with emulated IOMMU, the guest PASID table is shadowed in VMM. Updates to guest vIOMMU PASID table will result in PASID cache flush which will be passed down to the host as bind guest PASID calls.
will be translated into binding/unbinding guest PASID calls to update the host shadow PASID table.
yours is more precise, will replace.
Quoted 6 lines
Quoted 4 lines
For the SL page tables, it will be harvested from device's default domain (request w/o PASID), or aux domain in case of mediated device.
harvested -> copied or linked to?
Kind of the same, but I agree copied is more technical and precise term. Will change.
Quoted 37 lines
Quoted 37 lines
.-------------. .---------------------------. | vIOMMU | | Guest process CR3, FL only| | | '---------------------------'.----------------/
| PASID Entry |--- PASID cache flush -
'-------------' |
| | V
| | CR3 in GPA
'-------------'
Guest------| Shadow |--------------------------|-------- v v v Host .-------------. .----------------------. | pIOMMU | | Bind FL for GVA-GPA | | | '----------------------' .----------------/ | | PASID Entry | V (Nested xlate) '----------------\.------------------------------. | | |SL for GPA-HPA, default domain| | | '------------------------------' '-------------'Where:
- FL = First level/stage one page tables
- SL = Second level/stage two page tablesSigned-off-by Jacob Pan <[email protected]>Signed-off-by Liu, Yi L <[email protected]>--- drivers/iommu/intel-iommu.c | 4 + drivers/iommu/intel-svm.c | 184 ++++++++++++++++++++++++++++++++++++++++++++ include/linux/intel-iommu.h | 8 +- include/linux/intel-svm.h | 17 ++++ 4 files changed, 212 insertions(+), 1 deletion(-)Quoted 5 lines
Review const struct iommu_ops intel_iommu_ops =
Quoted 5 lines
(quoted diff) +0
-0
b/drivers/iommu/intel-iommu.cindexacd1ac787d8b..5fab32fbc4b4100644 ---a/drivers/iommu/intel-iommu.c
+++b/drivers/iommu/intel-iommu.c(quoted diff) +0
-0@@ -6026,6 +6026,10 @@ const struct iommu_ops intel_iommu_ops ={
Quoted 10 lines
drivers/iommu/intel-iommu.c const struct iommu_ops intel_iommu_ops = { · line 6032
Quoted 7 lines
(quoted diff) +0
-0.dev_disable_feat = intel_iommu_dev_disable_feat, .is_attach_deferred =
intel_iommu_is_attach_deferred, .pgsize_bitmap =INTEL_IOMMU_PGSIZES, +#ifdefCONFIG_INTEL_IOMMU_SVMdrivers/iommu/intel-iommu.c +3
-0+ .sva_bind_gpasid = intel_svm_bind_gpasid, + .sva_unbind_gpasid = intel_svm_unbind_gpasid, +#endif again, pure PASID management logic should be separated from SVM.
Quoted 2 lines
I am not following, these two functions are SVM functionality, not pure PASID management which is already separated in
ioasid.c
I should say pure "scalable mode" logic. Above callbacks are not related to host SVM per se. They are serving gpasid requests from guest side, thus part of generic scalable mode capability.
Quoted 113 lines
Quoted 29 lines
Quoted 29 lines
};
static void
quirk_iommu_igfx(struct pci_dev *dev)drivers/iommu/intel-svm.c +17
-0@@ -216,6 +216,190 @@ static LIST_HEAD(global_svm_list); list_for_each_entry(sdev, &svm->devs, list) \if (dev == sdev->dev) \ +int intel_svm_bind_gpasid(struct iommu_domain *domain, + struct device *dev, + struct iommu_gpasid_bind_data *data) +{ + struct intel_iommu *iommu = intel_svm_device_to_iommu(dev); +struct dmar_domain *ddomain; +struct intel_svm_dev *sdev; +struct intel_svm *svm; +int ret =0 ; + +if (WARN_ON (!iommu) || !data) +return -EINVAL ; + +if (data->version !=IOMMU_GPASID_BIND_VERSION_1 || + data->format !=IOMMU_PASID_FORMAT_INTEL_VTD ) +return -EINVAL ; +Quoted 9 lines
drivers/iommu/intel-svm.c static LIST_HEAD(global_svm_list); · line 240
Quoted 6 lines
drivers/iommu/intel-svm.c +2
-0+if (dev_is_pci (dev)) { +/* VT-d supports devices with full 20 bit PASIDs only */
drivers/iommu/intel-svm.c +3
-0+if (pci_max_pasids (to_pci_dev (dev)) !=PASID_MAX ) +return -EINVAL ; + }what about non-pci devices? It just moves forward w/o any check here?
Good catch, we only support PCI-device on Intel. Even mdev has to pass the pdev to bind. Will add the else case.
Quoted 10 lines
Quoted 10 lines
drivers/iommu/intel-svm.c +3
-0+ +/* +* We only check host PASID range, we have no knowledge to check
drivers/iommu/intel-svm.c +6
-0+* guest PASID range nor do we use the guest PASID. +*/ +if (data->hpasid <=0 || data->hpasid >=PASID_MAX ) +return -EINVAL ; + + ddomain =to_dmar_domain (domain);Quoted 9 lines
drivers/iommu/intel-svm.c static LIST_HEAD(global_svm_list); · line 255
Quoted 6 lines
drivers/iommu/intel-svm.c +6
-0+/* REVISIT: +* Sanity check adddress width and paging mode support +* width matching in two dimensions: +* 1. paging mode CPU <= IOMMU +* 2. address width Guest <= Host. +*/ Is lacking of above logic harmful? If not, we should add
It is better to add the check now, not solely rely on QEMU.
Quoted 20 lines
Quoted 20 lines
drivers/iommu/intel-svm.c +10
-0+mutex_lock (&pasid_mutex); + svm =ioasid_find (NULL , data->hpasid,NULL ); +if (IS_ERR (svm)) { + ret =PTR_ERR (svm); + goto out; + } +if (svm) { +/* +* If we found svm for the PASID, there must be at +* least one device bond, otherwise svm should be freed.
drivers/iommu/intel-svm.c +5
-0+*/ +BUG_ON (list_empty (&svm->devs)); + +for_each_svm_dev (svm, dev) { +/* In case of multiple sub-devices of the same pdev assigned, we should
drivers/iommu/intel-svm.c +1
-0+* allow multiple bind calls with the same PASID and pdev.
drivers/iommu/intel-svm.c +1
-0+*/ Quoted 9 lines
drivers/iommu/intel-svm.c
Quoted 2 lines
drivers/iommu/intel-svm.c +2
-0+ sdev->users++; + goto out;sorry if I overlooked, but I didn't see any check on the PASID actually belonging to this process. At least should check the match between
svm->mmandget_task_mm? also check whether a previous binding between this hpasid and gpasid already exists.We had some discussions on whom should be responsible for checking ownership. I tend to think VFIO is right place but I guess we can also double check here.
Good point, we should check the same H-G PASID bind already exists.Quoted 9 lines
Quoted 9 lines
drivers/iommu/intel-svm.c +3
-0+ } + }else { +/* We come here when PASID has never been bond to a device. */
drivers/iommu/intel-svm.c +5
-0+ svm =kzalloc (sizeof (*svm),GFP_KERNEL ); +if (!svm) { + ret = -ENOMEM ; + goto out; + }Quoted 9 lines
drivers/iommu/intel-svm.c
Quoted 6 lines
drivers/iommu/intel-svm.c +1
-0+/* REVISIT: upper layer/VFIO can track host process that bind the PASID.
drivers/iommu/intel-svm.c +1
-0+* ioasid_set = mm might be sufficient for vfio to check pasid VMM
drivers/iommu/intel-svm.c +2
-0+* ownership. +*/ Is it correct to leave the check to the caller?
Quoted 4 lines
Ditto, we will double check. But since this is related to the guest, I feel iommu driver check mm might be too restrictive. I am not sure if any VMM could have more than one process? One process does alloc, the other does bind.
one process, and there might be multiple threads each corresponding to a vCPU.
Quoted 218 lines
Quoted 46 lines
Quoted 46 lines
drivers/iommu/intel-svm.c +23
-0+ svm->mm =get_task_mm (current); + svm->pasid = data->hpasid; +if (data->flags &IOMMU_SVA_GPASID_VAL ) { + svm->gpasid = data->gpasid; + svm->flags |=SVM_FLAG_GUEST_PASID ; + } +ioasid_set_data (data->hpasid, svm); +INIT_LIST_HEAD_RCU (&svm->devs); +INIT_LIST_HEAD (&svm->list); + +mmput (svm->mm); + } + sdev =kzalloc (sizeof (*sdev),GFP_KERNEL ); +if (!sdev) { +if (list_empty (&svm->devs)) +kfree (svm); + ret = -ENOMEM ; + goto out; + } + sdev->dev = dev; + sdev->users =1 ; + +/* Set up device context entry for PASID if not enabled already */
drivers/iommu/intel-svm.c +3
-0+ ret =intel_iommu_enable_pasid (iommu, sdev->dev); +if (ret) { + dev_err(dev, "Failed to enable PASIDcapability\n");
drivers/iommu/intel-svm.c +6
-0+kfree (sdev); + goto out; + } + +/* +* For guest bind, we need to set up PASID table entry as follows:
drivers/iommu/intel-svm.c +10
-0+* - FLPM matches guest paging mode +* - turn on nested mode +* - SL guest address width matching +*/ + ret = intel_pasid_setup_nested(iommu, + dev, + (pgd_t *)data->gpgd, + data->hpasid, + &data->vtd, + ddomain,Quoted 9 lines
drivers/iommu/intel-svm.c static LIST_HEAD(global_svm_list); · line 333
Quoted 6 lines
drivers/iommu/intel-svm.c +3
-0+ data->addr_width); +if (ret) { + dev_err(dev, "Failed to set up PASID %llu innested mode, Err %d\n",
drivers/iommu/intel-svm.c +2
-0+ data->hpasid, ret); +kfree (sdev);disable pasid? revert
ioasid_set_data?Good catch, will do.
Quoted 83 lines
Quoted 83 lines
drivers/iommu/intel-svm.c +35
-0+ goto out; + } + svm->flags |=SVM_FLAG_GUEST_MODE ; + +init_rcu_head (&sdev->rcu); +list_add_rcu (&sdev->list, &svm->devs); + out: +mutex_unlock (&pasid_mutex); +return ret; +} + +int intel_svm_unbind_gpasid (struct device *dev,int pasid) +{ +struct intel_svm_dev *sdev; +struct intel_iommu *iommu; +struct intel_svm *svm; +int ret = -EINVAL ; + +mutex_lock (&pasid_mutex); + iommu =intel_svm_device_to_iommu (dev); +if (!iommu) + goto out; + + svm =ioasid_find (NULL , pasid,NULL ); +if (IS_ERR_OR_NULL (svm)) { + ret =PTR_ERR (svm); + goto out; + } + +for_each_svm_dev (svm, dev) { + ret =0 ; + sdev->users--; +if (!sdev->users) { +list_del_rcu (&sdev->list); + intel_pasid_tear_down_entry(iommu, dev,svm-
Quoted 1 line
pasid);
drivers/iommu/intel-svm.c +1
-0+/* TODO: Drain in flight PRQ for the PASID since it
drivers/iommu/intel-svm.c +11
-0+* may get reused soon, we don't want to +* confuse with its previous life. +* intel_svm_drain_prq(dev, pasid); +*/ +kfree_rcu (sdev, rcu); + +if (list_empty (&svm->devs)) { +list_del (&svm->list); +kfree (svm); +/* +* We do not free PASID here until explicit call
drivers/iommu/intel-svm.c +1
-0+* from VFIO to free. The PASID life cycle
drivers/iommu/intel-svm.c +1
-0+* management is largely tied to VFIO management
drivers/iommu/intel-svm.c +1
-0+* of assigned device life cycles. In case of
drivers/iommu/intel-svm.c +1
-0+* guest exit without a explicit free PASID call,
drivers/iommu/intel-svm.c +1
-0+* the responsibility lies in VFIO layer to free
drivers/iommu/intel-svm.c +1
-0+* the PASIDs allocated for the guest.
drivers/iommu/intel-svm.c +1
-0+* For security reasons, VFIO has to track the
drivers/iommu/intel-svm.c +1
-0+* PASID ownership per guest anyway to ensure
drivers/iommu/intel-svm.c +1
-0+* that PASID allocated by one guest cannot be
drivers/iommu/intel-svm.c +13
-0+* used by another. +*/ +ioasid_set_data (pasid,NULL ); + } + } +break ; + } + out: +mutex_unlock (&pasid_mutex); + +return ret; +} + int intel_svm_bind_mm(struct device *dev, int *pasid, int flags,Quoted 8 lines
Review int intel_iommu_enable_pasid(struct
Quoted 8 lines
struct
svm_dev_ops*ops)
{drivers/iommu/intel-svm.c +0
-0struct intel_iommu *iommu =intel_svm_device_to_iommu (dev);(quoted diff) +0
-0
b/include/linux/intel-iommu.hindex3dba6ad3e9ad..6c74c71b1ebf100644 ---a/include/linux/intel-iommu.h
+++b/include/linux/intel-iommu.h(quoted diff) +0
-0@@ -673,7 +673,9 @@ int intel_iommu_enable_pasid(struct
intel_iommuQuoted 28 lines
Quoted 28 lines
include/linux/intel-iommu.h +4
-1*iommu, struct device *dev);int intel_svm_init (struct intel_iommu *iommu);extern int intel_svm_enable_prq (struct intel_iommu *iommu);extern int intel_svm_finish_prq (struct intel_iommu *iommu); - +extern int intel_svm_bind_gpasid (struct iommu_domain *domain, +struct device *dev,struct iommu_gpasid_bind_data *data); +extern int intel_svm_unbind_gpasid(struct device *dev, int pasid);struct svm_dev_ops ;struct intel_svm_dev {@@ -690,9 +692,13 @@ struct intel_svm_dev {struct intel_svm {struct mmu_notifier notifier;struct mm_struct *mm; +struct intel_iommu *iommu;int flags;int pasid; +int gpasid;/* Guest PASID in case of vSVA bind with non-identity host
include/linux/intel-iommu.h +2
-0+* to guest PASID mapping. +*/ struct list_head devs;struct list_head list; };include/linux/intel-svm.h +0
-0Quoted 8 lines
include/linux/intel-svm.h struct svm_dev_ops { · line 48
Quoted 8 lines
include/linux/intel-svm.h +2
-0@@ -44,6 +44,23 @@ struct svm_dev_ops {* do such IOTLB flushes automatically. */ #define SVM_FLAG_SUPERVISOR_MODE (1<<1) +/* +* The SVM_FLAG_GUEST_MODE flag is used when a guest process bind
Quoted 26 lines
Quoted 26 lines
to a device.
+ * In this case themm_structis in the guest kernel or userspace, its life
+ * cycle is managed by VMM and VFIO layer. For IOMMU driver, this API provides
+ * means to bind/unbind guest CR3 with PASIDs allocated for a device.
+ */include/linux/intel-svm.h +3
-0+#define SVM_FLAG_GUEST_MODE (1<<2) +/* +* The SVM_FLAG_GUEST_PASID flag is used when a guest has its own PASID space,
+ * which requires guest and host PASID translation at both directions. We keep
+ * track of guest PASID in order to provide lookup service to device drivers.
+ * One such example is a physical function (PF) driver that supports mediated
+ * device (mdev) assignment. Guest programming of mdev configuration space can
+ * only be done with guest PASID, therefore PF driver needs to find the matching
+ * host PASID to program the real hardware.
+ */
+#defineSVM_FLAG_GUEST_PASID(1<<3)Quoted 5 lines
Quoted 4 lines
#ifdef
CONFIG_INTEL_IOMMU_SVM--
2.7.4[Jacob Pan]
Re: [PATCH v7 09/11] iommu/vt-d: Add bind guest PASID support
Quoted 6 lines · Kevin
Quoted 6 lines
Quoted 6 lines
drivers/iommu/intel-iommu.c const struct iommu_ops intel_iommu_ops = { · line 6032
Quoted 3 lines
drivers/iommu/intel-iommu.c +3
-0+ .sva_bind_gpasid = intel_svm_bind_gpasid, + .sva_unbind_gpasid = intel_svm_unbind_gpasid, +#endif again, pure PASID management logic should be separated from SVM.
Quoted 6 lines
Quoted 2 lines
I am not following, these two functions are SVM functionality, not pure PASID management which is already separated in
ioasid.cI should say pure "scalable mode" logic. Above callbacks are not related to host SVM per se. They are serving gpasid requests from guest side, thus part of generic scalable mode capability.
Got your point, but we are sharing data structures with host SVM, it is very difficult and inefficient to separate the two.
RE: [PATCH v7 09/11] iommu/vt-d: Add bind guest PASID support
Quoted 12 lines
From: Jacob Pan [mailto:[email protected]]
Sent: Tuesday, October 29, 2019 12:03 AMQuoted 6 lines · Kevin
Quoted 6 lines
Quoted 6 lines
drivers/iommu/intel-iommu.c const struct iommu_ops intel_iommu_ops = { · line 6032
Quoted 3 lines
drivers/iommu/intel-iommu.c +3
-0+ .sva_bind_gpasid = intel_svm_bind_gpasid, + .sva_unbind_gpasid = intel_svm_unbind_gpasid, +#endif again, pure PASID management logic should be separated from SVM.
Quoted 8 lines
Quoted 6 lines
Quoted 2 lines
I am not following, these two functions are SVM functionality, not pure PASID management which is already separated in
ioasid.cI should say pure "scalable mode" logic. Above callbacks are not related to host SVM per se. They are serving gpasid requests from guest side, thus part of generic scalable mode capability.
Got your point, but we are sharing data structures with host SVM, it is very difficult and inefficient to separate the two.
I don't think difficulty is the reason against such direction. We need do things right. :-) I'm fine with putting it in a TODO list, but at least need the right information in the 1st place to tell that current way is just a short-term approach, and we should revisit later.
thanks
Kevin
Re: [PATCH v7 09/11] iommu/vt-d: Add bind guest PASID support
Quoted 19 lines · Kevin
Quoted 19 lines
From: Jacob Pan [mailto:[email protected]]
Sent: Tuesday, October 29, 2019 12:03 AMQuoted 13 lines · Kevin
Quoted 9 lines
Quoted 6 lines
Quoted 3 lines
(quoted diff) +2
-0+ .sva_bind_gpasid = intel_svm_bind_gpasid, + .sva_unbind_gpasid =
intel_svm_unbind_gpasid, +#endifagain, pure PASID management logic should be separated from SVM.
I am not following, these two functions are SVM functionality, not pure PASID management which is already separated in
ioasid.cI should say pure "scalable mode" logic. Above callbacks are not related to host SVM per se. They are serving gpasid requests from guest side, thus part of generic scalable mode capability.
Quoted 8 lines
Quoted 2 lines
Got your point, but we are sharing data structures with host SVM, it is very difficult and inefficient to separate the two.
I don't think difficulty is the reason against such direction. We need do things right. :-) I'm fine with putting it in a TODO list, but at least need the right information in the 1st place to tell that current way is just a short-term approach, and we should revisit later.
I guess the fundamental question is: Should the scalable mode logic, i.e. guest SVA at PASID granu device, be perceived as part of the overall SVA functionality?
My view is yes, we shall share SVA and gSVA whenever we can.
The longer term, which I am working on right now, is to converge intel_svm_bind_mm to the generic iommu_sva_bind_device() and use common data structures as well. It is conceivable that these common structures span across hardware architectures, also guest vs host SVA usages.
i.e. iommu_ops haveiommu_sva_bind_gpasid() for SM/gSVAiommu_sva_bind_device() for native SVA
Or I am missing your point completely?
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
RE: [PATCH v7 09/11] iommu/vt-d: Add bind guest PASID support
Quoted 28 lines
From: Jacob Pan [mailto:[email protected]]
Sent: Wednesday, October 30, 2019 12:12 AMQuoted 22 lines · Kevin
Quoted 21 lines
From: Jacob Pan [mailto:[email protected]]
Sent: Tuesday, October 29, 2019 12:03 AMQuoted 6 lines · Kevin
Quoted 6 lines
Quoted 6 lines
Quoted 3 lines
(quoted diff) +2
-0+ .sva_bind_gpasid = intel_svm_bind_gpasid, + .sva_unbind_gpasid =
intel_svm_unbind_gpasid, +#endifagain, pure PASID management logic should be separated from SVM.
Quoted 7 lines
Quoted 3 lines
I am not following, these two functions are SVM functionality, not pure PASID management which is already separated in
ioasid.cI should say pure "scalable mode" logic. Above callbacks are not related to host SVM per se. They are serving gpasid requests from guest side, thus part of generic scalable mode capability.
Got your point, but we are sharing data structures with host SVM, it is very difficult and inefficient to separate the two.
Quoted 8 lines
Quoted 5 lines
I don't think difficulty is the reason against such direction. We need do things right. :-) I'm fine with putting it in a TODO list, but at least need the right information in the 1st place to tell that current way is just a short-term approach, and we should revisit later.
I guess the fundamental question is: Should the scalable mode logic, i.e. guest SVA at PASID granu device, be perceived as part of the overall SVA functionality?
guest SVA != guest scalable mode. I'm not sure whether the definition of SVA has been changed. but iirc it simply means shared virtual memory usage i.e. sharing CPU page table with device. But with scalable mode, you can have PASID tagged 1st-level for whatever usage, guest IOVA, guest SVA, guest nested GPA, etc.
Quoted 2 lines
My view is yes, we shall share SVA and gSVA whenever we can.
sharing is based on scalable mode, not based on sva itself.
Quoted 7 lines
The longer term, which I am working on right now, is to converge
intel_svm_bind_mmto the genericiommu_sva_bind_device()and use common
data structures as well. It is conceivable that these common structures span across hardware architectures, also guest vs host SVA usages.
Quoted 5 lines
i.e.
iommu_opshaveiommu_sva_bind_gpasid()for SM/gSVAiommu_sva_bind_device()for native SVAOr I am missing your point completely?
since sva is already used in VFIO for broader purpose, it's fine to leave the name there. But again, it's incorrect to tie iommu_sva_bind_gpasid under CONFIG_INTEL_IOMMU_SVM. The former is for SM, while the latter is only for SVA. As long as host IOMMU is in scalable mode, bind_gpasid can be supported. If you want a config option, then it should be a new one instead of IOMMU_SVM.
Thanks
Kevin
Re: [PATCH v7 09/11] iommu/vt-d: Add bind guest PASID support
In reply to Tian, KevinHi,
Quoted 9 lines · Kevin
Quoted 9 lines
Quoted 9 lines
drivers/iommu/intel-iommu.c const struct iommu_ops intel_iommu_ops = { · line 6032
Quoted 7 lines
.dev_disable_feat =
intel_iommu_dev_disable_feat,
.is_attach_deferred =intel_iommu_is_attach_deferred, .pgsize_bitmap =INTEL_IOMMU_PGSIZES, +#ifdefCONFIG_INTEL_IOMMU_SVMdrivers/iommu/intel-iommu.c +3
-0+ .sva_bind_gpasid = intel_svm_bind_gpasid, + .sva_unbind_gpasid = intel_svm_unbind_gpasid, +#endif again, pure PASID management logic should be separated from SVM.
Quoted 6 lines
Quoted 2 lines
I am not following, these two functions are SVM functionality, not pure PASID management which is already separated in
ioasid.cI should say pure "scalable mode" logic. Above callbacks are not related to host SVM per se. They are serving gpasid requests from guest side, thus part of generic scalable mode capability.
Currently these two callbacks are for sva only and the patch has been queued by Joerg for the next rc1. It could be extended to be generic. But it deserves a separated patch.
Best regards,
baolu
Re: [PATCH v7 09/11] iommu/vt-d: Add bind guest PASID support
In reply to Jacob PanHi,
Quoted 64 lines · Jacob Pan
When supporting guest SVA with emulated IOMMU, the guest PASID table is shadowed in VMM. Updates to guest vIOMMU PASID table will result in PASID cache flush which will be passed down to the host as bind guest PASID calls.
For the SL page tables, it will be harvested from device's default domain (request w/o PASID), or aux domain in case of mediated device.
.-------------. .---------------------------. | vIOMMU | | Guest process CR3, FL only| | | '---------------------------'.----------------/
| PASID Entry |--- PASID cache flush -
'-------------' |
| | V
| | CR3 in GPA
'-------------'
Guest
------| Shadow |--------------------------|--------
v v v
Host.-------------. .----------------------. | pIOMMU | | Bind FL for GVA-GPA | | | '----------------------' .----------------/ | | PASID Entry | V (Nested xlate) '----------------\.------------------------------. | | |SL for GPA-HPA, default domain| | | '------------------------------' '-------------'Where:
- FL = First level/stage one page tables
- SL = Second level/stage two page tablesSigned-off-by Jacob Pan <[email protected]>Signed-off-by Liu, Yi L <[email protected]>--- drivers/iommu/intel-iommu.c | 4 + drivers/iommu/intel-svm.c | 184 ++++++++++++++++++++++++++++++++++++++++++++ include/linux/intel-iommu.h | 8 +- include/linux/intel-svm.h | 17 ++++ 4 files changed, 212 insertions(+), 1 deletion(-)drivers/iommu/intel-iommu.c +4
-0@@ -6026,6 +6026,10 @@ const struct iommu_ops intel_iommu_ops = { .dev_disable_feat = intel_iommu_dev_disable_feat, .is_attach_deferred = intel_iommu_is_attach_deferred, .pgsize_bitmap =INTEL_IOMMU_PGSIZES , +#ifdef CONFIG_INTEL_IOMMU_SVM + .sva_bind_gpasid = intel_svm_bind_gpasid, + .sva_unbind_gpasid = intel_svm_unbind_gpasid, +#endif };static void quirk_iommu_igfx (struct pci_dev *dev)drivers/iommu/intel-svm.c +0
-0
drivers/iommu/intel-svm.c static LIST_HEAD(global_svm_list); · line 217
Quoted 2 lines
drivers/iommu/intel-svm.c +0
-0@@ -216,6 +216,190 @@ static LIST_HEAD(global_svm_list);list_for_each_entry (sdev, &svm->devs, list) \ if (dev == sdev->dev) \
Add an indent tab please.
Quoted 6 lines
drivers/iommu/intel-svm.c +5
-0+int intel_svm_bind_gpasid (struct iommu_domain *domain, +struct device *dev, +struct iommu_gpasid_bind_data *data) +{ +struct intel_iommu *iommu =intel_svm_device_to_iommu (dev);
drivers/iommu/intel-svm.c static LIST_HEAD(global_svm_list); · line 233
Quoted 10 lines
drivers/iommu/intel-svm.c +10
-0+struct dmar_domain *ddomain; +struct intel_svm_dev *sdev; +struct intel_svm *svm; +int ret =0 ; + +if (WARN_ON (!iommu) || !data) +return -EINVAL ; + +if (data->version !=IOMMU_GPASID_BIND_VERSION_1 || + data->format !=IOMMU_PASID_FORMAT_INTEL_VTD )
Alignment should match open parenthesis.
Run "scripts/checkpatch.pl --strict" for all in this patch. I will ignore others.
Quoted 8 lines
drivers/iommu/intel-svm.c +8
-0+return -EINVAL ; + +if (dev_is_pci (dev)) { +/* VT-d supports devices with full 20 bit PASIDs only */ +if (pci_max_pasids (to_pci_dev (dev)) !=PASID_MAX ) +return -EINVAL ; + } +
drivers/iommu/intel-svm.c static LIST_HEAD(global_svm_list); · line 251
Quoted 10 lines
drivers/iommu/intel-svm.c +10
-0+/* +* We only check host PASID range, we have no knowledge to check +* guest PASID range nor do we use the guest PASID. +*/ +if (data->hpasid <=0 || data->hpasid >=PASID_MAX ) +return -EINVAL ; + + ddomain =to_dmar_domain (domain); +/* REVISIT: +* Sanity check adddress width and paging mode support
s/adddress/address/g
drivers/iommu/intel-svm.c static LIST_HEAD(global_svm_list); · line 261
Quoted 9 lines
drivers/iommu/intel-svm.c +9
-0+* width matching in two dimensions: +* 1. paging mode CPU <= IOMMU +* 2. address width Guest <= Host. + */ > + mutex_lock(&pasid_mutex); + svm =ioasid_find (NULL , data->hpasid,NULL ); +if (IS_ERR (svm)) { + ret =PTR_ERR (svm); + goto out; + }
A blank line looks better.
drivers/iommu/intel-svm.c static LIST_HEAD(global_svm_list); · line 267
Quoted 6 lines
drivers/iommu/intel-svm.c +6
-0+if (svm) { +/* +* If we found svm for the PASID, there must be at +* least one device bond, otherwise svm should be freed. +*/ +BUG_ON (list_empty (&svm->devs));
Avoid crashing kernel, use WARN_ON() instead.
if (WARN_ON(list_empty(&svm->devs))) {
ret = -EINVAL;
goto out;
}drivers/iommu/intel-svm.c static LIST_HEAD(global_svm_list); · line 270
Quoted 3 lines
drivers/iommu/intel-svm.c +3
-0+ +for_each_svm_dev (svm, dev) { +/* In case of multiple sub-devices of the same pdev assigned, we should
Make line shorter. Not over 80 characters.
The same for other lines.
drivers/iommu/intel-svm.c static LIST_HEAD(global_svm_list); · line 275
Quoted 5 lines
drivers/iommu/intel-svm.c +5
-0+* allow multiple bind calls with the same PASID and pdev. +*/ + sdev->users++; + goto out; + }
I remember I ever pointed this out before. But I forgot how we addressed it. So forgive me if this has been addressed.
What if we have a valid bound svm but @dev doesn't belong to it (a.k.a. @dev not in svm->devs list)?
Quoted 13 lines
drivers/iommu/intel-svm.c +13
-0+ }else { +/* We come here when PASID has never been bond to a device. */ + svm =kzalloc (sizeof (*svm),GFP_KERNEL ); +if (!svm) { + ret = -ENOMEM ; + goto out; + } +/* REVISIT: upper layer/VFIO can track host process that bind the PASID. +* ioasid_set = mm might be sufficient for vfio to check pasid VMM +* ownership. +*/ + svm->mm =get_task_mm (current); + svm->pasid = data->hpasid;
drivers/iommu/intel-svm.c static LIST_HEAD(global_svm_list); · line 298
Quoted 10 lines
drivers/iommu/intel-svm.c +10
-0+if (data->flags &IOMMU_SVA_GPASID_VAL ) { + svm->gpasid = data->gpasid; + svm->flags |=SVM_FLAG_GUEST_PASID ; + } +ioasid_set_data (data->hpasid, svm); +INIT_LIST_HEAD_RCU (&svm->devs); +INIT_LIST_HEAD (&svm->list); + +mmput (svm->mm); + }
A blank line, please.
drivers/iommu/intel-svm.c static LIST_HEAD(global_svm_list); · line 302
Quoted 4 lines
drivers/iommu/intel-svm.c +4
-0+ sdev =kzalloc (sizeof (*sdev),GFP_KERNEL ); +if (!sdev) { +if (list_empty (&svm->devs)) +kfree (svm);
This is dangerous. This might leave a wild pointer bound with gpasid.
Quoted 20 lines
drivers/iommu/intel-svm.c +20
-0+ ret = -ENOMEM ; + goto out; + } + sdev->dev = dev; + sdev->users =1 ; + +/* Set up device context entry for PASID if not enabled already */ + ret =intel_iommu_enable_pasid (iommu, sdev->dev); +if (ret) { +dev_err (dev,"Failed to enable PASID capability\n" ); +kfree (sdev); + goto out; + } + +/* +* For guest bind, we need to set up PASID table entry as follows: +* - FLPM matches guest paging mode +* - turn on nested mode +* - SL guest address width matching +*/
drivers/iommu/intel-svm.c static LIST_HEAD(global_svm_list); · line 332
Quoted 10 lines
drivers/iommu/intel-svm.c +10
-0+ ret =intel_pasid_setup_nested (iommu, + dev, + (pgd_t *)data->gpgd, + data->hpasid, + &data->vtd, + ddomain, + data->addr_width); +if (ret) { +dev_err (dev,"Failed to set up PASID %llu in nested mode, Err %d\n" , + data->hpasid, ret);
This error handling is insufficient. You should at least:
1. free sdev
2. if list_empty(&svm->devs)
unbound the svm from gpasid
free svm
The same for above error handling. Add a branch for error recovery at the end of function might help here.
Quoted 13 lines
drivers/iommu/intel-svm.c +13
-0+kfree (sdev); + goto out; + } + svm->flags |=SVM_FLAG_GUEST_MODE ; + +init_rcu_head (&sdev->rcu); +list_add_rcu (&sdev->list, &svm->devs); + out: +mutex_unlock (&pasid_mutex); +return ret; +} + +int intel_svm_unbind_gpasid (struct device *dev,int pasid)
drivers/iommu/intel-svm.c static LIST_HEAD(global_svm_list); · line 355
Quoted 10 lines
drivers/iommu/intel-svm.c +10
-0+{ +struct intel_svm_dev *sdev; +struct intel_iommu *iommu; +struct intel_svm *svm; +int ret = -EINVAL ; + +mutex_lock (&pasid_mutex); + iommu =intel_svm_device_to_iommu (dev); +if (!iommu) + goto out;
Make it symmetrical with bind function.
if (WARN_ON(!iommu)) goto out;
drivers/iommu/intel-svm.c static LIST_HEAD(global_svm_list); · line 359
Quoted 4 lines
drivers/iommu/intel-svm.c +4
-0+ + svm =ioasid_find (NULL , pasid,NULL ); +if (IS_ERR_OR_NULL (svm)) { + ret =PTR_ERR (svm);
If svm == NULL, this function will return success. This is not expected, right?
Quoted 23 lines
drivers/iommu/intel-svm.c +23
-0+ goto out; + } + +for_each_svm_dev (svm, dev) { + ret =0 ; + sdev->users--; +if (!sdev->users) { +list_del_rcu (&sdev->list); +intel_pasid_tear_down_entry (iommu, dev, svm->pasid); +/* TODO: Drain in flight PRQ for the PASID since it +* may get reused soon, we don't want to +* confuse with its previous life. +* intel_svm_drain_prq(dev, pasid); +*/ +kfree_rcu (sdev, rcu); + +if (list_empty (&svm->devs)) { +list_del (&svm->list); +kfree (svm); +/* +* We do not free PASID here until explicit call +* from VFIO to free. The PASID life cycle +* management is largely tied to VFIO management
drivers/iommu/intel-svm.c static LIST_HEAD(global_svm_list); · line 392
Quoted 10 lines
drivers/iommu/intel-svm.c +10
-0+* of assigned device life cycles. In case of +* guest exit without a explicit free PASID call, +* the responsibility lies in VFIO layer to free +* the PASIDs allocated for the guest. +* For security reasons, VFIO has to track the +* PASID ownership per guest anyway to ensure +* that PASID allocated by one guest cannot be +* used by another. +*/ +ioasid_set_data (pasid,NULL );
Exchange order. First unbind svm from gpasid and then free svm.
Quoted 47 lines
drivers/iommu/intel-svm.c +10
-0+ } + } +break ; + } + out: +mutex_unlock (&pasid_mutex); + +return ret; +} +int intel_svm_bind_mm (struct device *dev,int *pasid,int flags,struct svm_dev_ops *ops) {struct intel_iommu *iommu =intel_svm_device_to_iommu (dev);include/linux/intel-iommu.h +7
-1@@ -673,7 +673,9 @@ int intel_iommu_enable_pasid(struct intel_iommu *iommu, struct device *dev);int intel_svm_init (struct intel_iommu *iommu);extern int intel_svm_enable_prq (struct intel_iommu *iommu);extern int intel_svm_finish_prq (struct intel_iommu *iommu); - +extern int intel_svm_bind_gpasid (struct iommu_domain *domain, +struct device *dev,struct iommu_gpasid_bind_data *data); +extern int intel_svm_unbind_gpasid (struct device *dev,int pasid);struct svm_dev_ops ;struct intel_svm_dev {@@ -690,9 +692,13 @@ struct intel_svm_dev {struct intel_svm {struct mmu_notifier notifier;struct mm_struct *mm; +struct intel_iommu *iommu;int flags;int pasid; +int gpasid;/* Guest PASID in case of vSVA bind with non-identity host +* to guest PASID mapping. +*/ struct list_head devs;struct list_head list; };include/linux/intel-svm.h +0
-0
include/linux/intel-svm.h struct svm_dev_ops { · line 53
Quoted 10 lines
include/linux/intel-svm.h +7
-0@@ -44,6 +44,23 @@ struct svm_dev_ops {* do such IOTLB flushes automatically. */ #define SVM_FLAG_SUPERVISOR_MODE (1<<1) +/* +* The SVM_FLAG_GUEST_MODE flag is used when a guest process bind to a device. +* In this case the mm_struct is in the guest kernel or userspace, its life +* cycle is managed by VMM and VFIO layer. For IOMMU driver, this API provides +* means to bind/unbind guest CR3 with PASIDs allocated for a device. +*/ +#define SVM_FLAG_GUEST_MODE (1<<2)
How about keeping this aligned with top by adding a tab?
BIT macro is preferred. Hence, make it BIT(1), BIT(2), BIT(3) is preferred.
include/linux/intel-svm.h struct svm_dev_ops { · line 63
Quoted 10 lines
include/linux/intel-svm.h +10
-0+/* +* The SVM_FLAG_GUEST_PASID flag is used when a guest has its own PASID space, +* which requires guest and host PASID translation at both directions. We keep +* track of guest PASID in order to provide lookup service to device drivers. +* One such example is a physical function (PF) driver that supports mediated +* device (mdev) assignment. Guest programming of mdev configuration space can +* only be done with guest PASID, therefore PF driver needs to find the matching +* host PASID to program the real hardware. +*/ +#define SVM_FLAG_GUEST_PASID (1<<3)
Ditto.
Best regards,
baolu
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH v7 09/11] iommu/vt-d: Add bind guest PASID support
Hi Baolu,
Appreciate the thorough review, comments inline.
Quoted 61 lines · On Sat, 26 Oct 2019 10:01:19 +0800 Lu Baolu <[email protected]> wrote:
Hi,
Quoted 58 lines · Jacob Pan
When supporting guest SVA with emulated IOMMU, the guest PASID table is shadowed in VMM. Updates to guest vIOMMU PASID table will result in PASID cache flush which will be passed down to the host as bind guest PASID calls.
For the SL page tables, it will be harvested from device's default domain (request w/o PASID), or aux domain in case of mediated device.
.-------------. .---------------------------. | vIOMMU | | Guest process CR3, FL only| | | '---------------------------'.----------------/
| PASID Entry |--- PASID cache flush -
'-------------' |
| | V
| | CR3 in GPA
'-------------'
Guest
------| Shadow |--------------------------|--------
v v v
Host.-------------. .----------------------. | pIOMMU | | Bind FL for GVA-GPA | | | '----------------------' .----------------/ | | PASID Entry | V (Nested xlate) '----------------\.------------------------------. | | |SL for GPA-HPA, default domain| | | '------------------------------' '-------------'Where:
- FL = First level/stage one page tables
- SL = Second level/stage two page tablesSigned-off-by Jacob Pan <[email protected]>Signed-off-by Liu, Yi L <[email protected]>--- drivers/iommu/intel-iommu.c | 4 + drivers/iommu/intel-svm.c | 184++++++++++++++++++++++++++++++++++++++++++++
include/linux/intel-iommu.h| 8 +-include/linux/intel-svm.h|
17 ++++ 4 files changed, 212 insertions(+), 1 deletion(-)(quoted diff) +0
-0
b/drivers/iommu/intel-iommu.cindexacd1ac787d8b..5fab32fbc4b4100644 ---a/drivers/iommu/intel-iommu.c
+++b/drivers/iommu/intel-iommu.c(quoted diff) +0
-0@@ -6026,6 +6026,10 @@ const struct iommu_ops intel_iommu_ops = { .dev_disable_feat = intel_iommu_dev_disable_feat, .is_attach_deferred =
intel_iommu_is_attach_deferred, .pgsize_bitmap =INTEL_IOMMU_PGSIZES, +#ifdefCONFIG_INTEL_IOMMU_SVMdrivers/iommu/intel-iommu.c +3
-0+ .sva_bind_gpasid = intel_svm_bind_gpasid, + .sva_unbind_gpasid = intel_svm_unbind_gpasid, +#endif };
Quoted 11 lines
drivers/iommu/intel-svm.c static LIST_HEAD(global_svm_list); · line 217
Quoted 8 lines
static void
quirk_iommu_igfx(struct pci_dev *dev)drivers/iommu/intel-svm.c +0
-0@@ -216,6 +216,190 @@ static LIST_HEAD(global_svm_list);list_for_each_entry (sdev, &svm->devs, list) \ if (dev == sdev->dev) \Add an indent tab please.
looks good.
Quoted 19 lines
Quoted 6 lines
drivers/iommu/intel-svm.c +5
-0+int intel_svm_bind_gpasid (struct iommu_domain *domain, +struct device *dev, +struct iommu_gpasid_bind_data *data) +{ +struct intel_iommu *iommu =intel_svm_device_to_iommu (dev);drivers/iommu/intel-svm.c static LIST_HEAD(global_svm_list); · line 233
Quoted 10 lines
drivers/iommu/intel-svm.c +10
-0+struct dmar_domain *ddomain; +struct intel_svm_dev *sdev; +struct intel_svm *svm; +int ret =0 ; + +if (WARN_ON (!iommu) || !data) +return -EINVAL ; + +if (data->version !=IOMMU_GPASID_BIND_VERSION_1 || + data->format !=IOMMU_PASID_FORMAT_INTEL_VTD )Alignment should match open parenthesis.
Quoted 3 lines
Run "
scripts/checkpatch.pl--strict" for all in this patch. I will ignore others.
it was my editor's setting :), will do.
Quoted 14 lines
Quoted 14 lines
drivers/iommu/intel-svm.c +4
-0+return -EINVAL ; + +if (dev_is_pci (dev)) { +/* VT-d supports devices with full 20 bit PASIDs only */
drivers/iommu/intel-svm.c +6
-0+if (pci_max_pasids (to_pci_dev (dev)) !=PASID_MAX ) +return -EINVAL ; + } + +/* +* We only check host PASID range, we have no knowledge to check
drivers/iommu/intel-svm.c +2
-0+* guest PASID range nor do we use the guest PASID. +*/
Quoted 9 lines
drivers/iommu/intel-svm.c static LIST_HEAD(global_svm_list); · line 251
Quoted 6 lines
drivers/iommu/intel-svm.c +6
-0+if (data->hpasid <=0 || data->hpasid >=PASID_MAX ) +return -EINVAL ; + + ddomain =to_dmar_domain (domain); +/* REVISIT: +* Sanity check adddress width and paging mode support s/adddress/address/g
good catch, I will add the check for paging mode and this comment is no longer needed.
Quoted 12 lines
drivers/iommu/intel-svm.c static LIST_HEAD(global_svm_list); · line 261
Quoted 9 lines
drivers/iommu/intel-svm.c +9
-0+* width matching in two dimensions: +* 1. paging mode CPU <= IOMMU +* 2. address width Guest <= Host. + */ > + mutex_lock(&pasid_mutex); + svm =ioasid_find (NULL , data->hpasid,NULL ); +if (IS_ERR (svm)) { + ret =PTR_ERR (svm); + goto out; + }A blank line looks better.
true.
Quoted 10 lines
drivers/iommu/intel-svm.c
Quoted 7 lines
drivers/iommu/intel-svm.c +4
-0+if (svm) { +/* +* If we found svm for the PASID, there must be at +* least one device bond, otherwise svm should be freed.
drivers/iommu/intel-svm.c +2
-0+*/ +BUG_ON (list_empty (&svm->devs));Avoid crashing kernel, use
WARN_ON()instead.
Quoted 5 lines
if (WARN_ON(list_empty(&svm->devs))) {
ret = -EINVAL;
goto out;
}Yeah, WARN_ON is better, should let the kernel continue for easy debug. Though this is an indication of serious problem.
Quoted 9 lines
Quoted 4 lines
drivers/iommu/intel-svm.c +3
-0+ +for_each_svm_dev (svm, dev) { +/* In case of multiple sub-devices of the same pdev assigned, we should
Make line shorter. Not over 80 characters.
The same for other lines.
sure.
Quoted 10 lines
drivers/iommu/intel-svm.c static LIST_HEAD(global_svm_list); · line 275
Quoted 6 lines
drivers/iommu/intel-svm.c +1
-0+* allow multiple bind calls with the same PASID and pdev.
drivers/iommu/intel-svm.c +4
-0+*/ + sdev->users++; + goto out; + }I remember I ever pointed this out before. But I forgot how we addressed it. So forgive me if this has been addressed.
Quoted 3 lines
What if we have a valid bound svm but @dev doesn't belong to it (a.k.a. @dev not in
svm->devslist)?
If we are binding a new device to an existing/active PASID, the code will allocate a new sdev and add that to the svm->devs list.
Quoted 20 lines
Quoted 20 lines
drivers/iommu/intel-svm.c +2
-0+ }else { +/* We come here when PASID has never been bond to a device. */
drivers/iommu/intel-svm.c +6
-0+ svm =kzalloc (sizeof (*svm),GFP_KERNEL ); +if (!svm) { + ret = -ENOMEM ; + goto out; + } +/* REVISIT: upper layer/VFIO can track host process that bind the PASID.
drivers/iommu/intel-svm.c +1
-0+* ioasid_set = mm might be sufficient for vfio to check pasid VMM
drivers/iommu/intel-svm.c +8
-0+* ownership. +*/ + svm->mm =get_task_mm (current); + svm->pasid = data->hpasid; +if (data->flags &IOMMU_SVA_GPASID_VAL ) { + svm->gpasid = data->gpasid; + svm->flags |=SVM_FLAG_GUEST_PASID ; + }
Quoted 8 lines
drivers/iommu/intel-svm.c static LIST_HEAD(global_svm_list); · line 298
Quoted 6 lines
drivers/iommu/intel-svm.c +6
-0+ioasid_set_data (data->hpasid, svm); +INIT_LIST_HEAD_RCU (&svm->devs); +INIT_LIST_HEAD (&svm->list); + +mmput (svm->mm); + }A blank line, please.
looks good.
Quoted 8 lines
drivers/iommu/intel-svm.c static LIST_HEAD(global_svm_list); · line 302
Quoted 5 lines
drivers/iommu/intel-svm.c +4
-0+ sdev =kzalloc (sizeof (*sdev),GFP_KERNEL ); +if (!sdev) { +if (list_empty (&svm->devs)) +kfree (svm);This is dangerous. This might leave a wild pointer bound with gpasid.
why is that? can you please explain?
if the list is empty that means we just allocated the new svm, no users. why can't we free it here?
Quoted 37 lines
Quoted 33 lines
drivers/iommu/intel-svm.c +7
-0+ ret = -ENOMEM ; + goto out; + } + sdev->dev = dev; + sdev->users =1 ; + +/* Set up device context entry for PASID if not enabled already */
drivers/iommu/intel-svm.c +3
-0+ ret =intel_iommu_enable_pasid (iommu, sdev->dev); +if (ret) { + dev_err(dev, "Failed to enable PASIDcapability\n");
drivers/iommu/intel-svm.c +6
-0+kfree (sdev); + goto out; + } + +/* +* For guest bind, we need to set up PASID table entry as follows:
drivers/iommu/intel-svm.c +13
-0+* - FLPM matches guest paging mode +* - turn on nested mode +* - SL guest address width matching +*/ + ret =intel_pasid_setup_nested (iommu, + dev, + (pgd_t *)data->gpgd, + data->hpasid, + &data->vtd, + ddomain, + data->addr_width); +if (ret) { + dev_err(dev, "Failed to set up PASID %llu innested mode, Err %d\n",
drivers/iommu/intel-svm.c static LIST_HEAD(global_svm_list); · line 332
Quoted 1 line
drivers/iommu/intel-svm.c +1
-0+ data->hpasid, ret);This error handling is insufficient. You should at least:
Quoted 1 line
1. free sdev
already done below
Quoted 4 lines
2. if
list_empty(&svm->devs)
unbound the svm from gpasid
free svm
yes, agreed.
Quoted 3 lines
The same for above error handling. Add a branch for error recovery at the end of function might help here.
not sure which code is the same as above? could you point it out?
Quoted 26 lines
Quoted 13 lines
drivers/iommu/intel-svm.c +13
-0+kfree (sdev); + goto out; + } + svm->flags |=SVM_FLAG_GUEST_MODE ; + +init_rcu_head (&sdev->rcu); +list_add_rcu (&sdev->list, &svm->devs); + out: +mutex_unlock (&pasid_mutex); +return ret; +} + +int intel_svm_unbind_gpasid (struct device *dev,int pasid)drivers/iommu/intel-svm.c static LIST_HEAD(global_svm_list); · line 355
Quoted 10 lines
drivers/iommu/intel-svm.c +10
-0+{ +struct intel_svm_dev *sdev; +struct intel_iommu *iommu; +struct intel_svm *svm; +int ret = -EINVAL ; + +mutex_lock (&pasid_mutex); + iommu =intel_svm_device_to_iommu (dev); +if (!iommu) + goto out;Make it symmetrical with bind function.
Quoted 3 lines
if (WARN_ON(!iommu)) goto out;
sounds good.
Quoted 8 lines
drivers/iommu/intel-svm.c static LIST_HEAD(global_svm_list); · line 359
Quoted 4 lines
drivers/iommu/intel-svm.c +4
-0+ + svm =ioasid_find (NULL , pasid,NULL ); +if (IS_ERR_OR_NULL (svm)) { + ret =PTR_ERR (svm);If svm == NULL, this function will return success. This is not expected, right?
good catch, will fix.
Quoted 39 lines
Quoted 39 lines
drivers/iommu/intel-svm.c +9
-0+ goto out; + } + +for_each_svm_dev (svm, dev) { + ret =0 ; + sdev->users--; +if (!sdev->users) { +list_del_rcu (&sdev->list); + intel_pasid_tear_down_entry(iommu, dev,
svm->pasid);drivers/iommu/intel-svm.c +1
-0+/* TODO: Drain in flight PRQ for the PASID since it
drivers/iommu/intel-svm.c +11
-0+* may get reused soon, we don't want to +* confuse with its previous life. +* intel_svm_drain_prq(dev, pasid); +*/ +kfree_rcu (sdev, rcu); + +if (list_empty (&svm->devs)) { +list_del (&svm->list); +kfree (svm); +/* +* We do not free PASID here until explicit call
drivers/iommu/intel-svm.c +1
-0+* from VFIO to free. The PASID life cycle
drivers/iommu/intel-svm.c +1
-0+* management is largely tied to VFIO management
drivers/iommu/intel-svm.c +1
-0+* of assigned device life cycles. In case of
drivers/iommu/intel-svm.c +1
-0+* guest exit without a explicit free PASID call,
drivers/iommu/intel-svm.c +1
-0+* the responsibility lies in VFIO layer to free
drivers/iommu/intel-svm.c +1
-0+* the PASIDs allocated for the guest.
drivers/iommu/intel-svm.c +1
-0+* For security reasons, VFIO has to track the
drivers/iommu/intel-svm.c +1
-0+* PASID ownership per guest
Quoted 9 lines
drivers/iommu/intel-svm.c static LIST_HEAD(global_svm_list); · line 392
Quoted 6 lines
anyway to ensure
drivers/iommu/intel-svm.c +1
-0+* that PASID allocated by one guest cannot be
drivers/iommu/intel-svm.c +3
-0+* used by another. +*/ +ioasid_set_data (pasid,NULL );Exchange order. First unbind svm from gpasid and then free svm.
I am not following, aren't we already doing free svm after unbind? please explain.
Quoted 56 lines
Quoted 56 lines
drivers/iommu/intel-svm.c +10
-0+ } + } +break ; + } + out: +mutex_unlock (&pasid_mutex); + +return ret; +} + int intel_svm_bind_mm(struct device *dev, int *pasid, int flags,struct
svm_dev_ops*ops) {
structintel_iommu*iommu =intel_svm_device_to_iommu(dev); diff --gita/include/linux/intel-iommu.hb/include/linux/intel-iommu.hindex3dba6ad3e9ad..6c74c71b1ebf100644 ---a/include/linux/intel-iommu.h+++b/include/linux/intel-iommu.hdrivers/iommu/intel-svm.c +4
-1@@ -673,7 +673,9 @@ int intel_iommu_enable_pasid(struct intel_iommu *iommu, struct device *dev); int intel_svm_init(struct intel_iommu *iommu);extern int intel_svm_enable_prq (struct intel_iommu *iommu);extern int intel_svm_finish_prq (struct intel_iommu *iommu); - +extern int intel_svm_bind_gpasid (struct iommu_domain *domain, +struct device *dev,struct iommu_gpasid_bind_data *data); +extern int intel_svm_unbind_gpasid(struct device *dev, int pasid);struct svm_dev_ops ;struct intel_svm_dev {@@ -690,9 +692,13 @@ struct intel_svm_dev {struct intel_svm {struct mmu_notifier notifier;struct mm_struct *mm; +struct intel_iommu *iommu;int flags;int pasid; +int gpasid;/* Guest PASID in case of vSVA bind with non-identity host
drivers/iommu/intel-svm.c +2
-0+* to guest PASID mapping. +*/ struct list_head devs;struct list_head list; };include/linux/intel-svm.h +2
-0@@ -44,6 +44,23 @@ struct svm_dev_ops {* do such IOTLB flushes automatically. */ #define SVM_FLAG_SUPERVISOR_MODE (1<<1) +/* +* The SVM_FLAG_GUEST_MODE flag is used when a guest process bind to a device.
+ * In this case themm_structis in the guest kernel or userspace, its life
Quoted 9 lines
Quoted 6 lines
+ * cycle is managed by VMM and VFIO layer. For IOMMU driver, this API provides
+ * means to bind/unbind guest CR3 with PASIDs allocated for a device.
+ */
+#defineSVM_FLAG_GUEST_MODE(1<<2)How about keeping this aligned with top by adding a tab?
sounds good.
Quoted 3 lines
BIT macro is preferred. Hence, make it BIT(1), BIT(2), BIT(3) is preferred.
I know, but the existing mainline code is not using BIT, so I wanted to keep coding style consistent. Perhaps a separate cleanup patch will do later.
Quoted 19 lines
Quoted 8 lines
+/*
+ * TheSVM_FLAG_GUEST_PASIDflag is used when a guest has its own PASID space,
+ * which requires guest and host PASID translation at both directions. We keep
+ * track of guest PASID in order to provide lookup service to device drivers.
+ * One such example is a physical function (PF) driver thatQuoted 8 lines
supports mediated
+ * device (mdev) assignment. Guest programming of mdev configuration space can
+ * only be done with guest PASID, therefore PF driver needs to find the matching
+ * host PASID to program the real hardware.
+ */
+#defineSVM_FLAG_GUEST_PASID(1<<3)Ditto.
Quoted 2 lines
Best regards,
baolu
[Jacob Pan]
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH v7 09/11] iommu/vt-d: Add bind guest PASID support
Hi,
Quoted 3 lines · Jacob Pan
Hi Baolu,
Appreciate the thorough review, comments inline.
You are welcome.
Quoted 6 lines
Quoted 2 lines · On Sat, 26 Oct 2019 10:01:19 +0800 Lu Baolu <[email protected]> wrote:
Hi,
[...]
Quoted 10 lines
Quoted 10 lines
drivers/iommu/intel-svm.c static LIST_HEAD(global_svm_list); · line 275
Quoted 6 lines
(quoted diff) +1
-0+ * allow multiple bind calls with the samePASID and pdev.
drivers/iommu/intel-svm.c +4
-0+*/ + sdev->users++; + goto out; + }I remember I ever pointed this out before. But I forgot how we addressed it. So forgive me if this has been addressed.
Quoted 5 lines
Quoted 3 lines
What if we have a valid bound svm but @dev doesn't belong to it (a.k.a. @dev not in
svm->devslist)?If we are binding a new device to an existing/active PASID, the code will allocate a new sdev and add that to the
svm->devslist.
But allocating a new sdev and adding device is in below else branch, so it will never reach there, right?
Quoted 37 lines
Quoted 20 lines
Quoted 20 lines
(quoted diff) +2
-0+ } else { + /* We come here when PASID has never been bond toa device. */
drivers/iommu/intel-svm.c +6
-0+ svm =kzalloc (sizeof (*svm),GFP_KERNEL ); +if (!svm) { + ret = -ENOMEM ; + goto out; + } +/* REVISIT: upper layer/VFIO can track host process that bind the PASID.
(quoted diff) +1
-0+ * ioasid_set = mm might be sufficient for vfio tocheck pasid VMM
drivers/iommu/intel-svm.c +8
-0+* ownership. +*/ + svm->mm =get_task_mm (current); + svm->pasid = data->hpasid; +if (data->flags &IOMMU_SVA_GPASID_VAL ) { + svm->gpasid = data->gpasid; + svm->flags |=SVM_FLAG_GUEST_PASID ; + }Quoted 8 lines
drivers/iommu/intel-svm.c static LIST_HEAD(global_svm_list); · line 298
Quoted 6 lines
drivers/iommu/intel-svm.c +6
-0+ioasid_set_data (data->hpasid, svm); +INIT_LIST_HEAD_RCU (&svm->devs); +INIT_LIST_HEAD (&svm->list); + +mmput (svm->mm); + }A blank line, please.
looks good.
Quoted 8 lines
drivers/iommu/intel-svm.c static LIST_HEAD(global_svm_list); · line 302
Quoted 5 lines
drivers/iommu/intel-svm.c +4
-0+ sdev =kzalloc (sizeof (*sdev),GFP_KERNEL ); +if (!sdev) { +if (list_empty (&svm->devs)) +kfree (svm);This is dangerous. This might leave a wild pointer bound with gpasid.
Quoted 3 lines
why is that? can you please explain?
if the list is empty that means we just allocated the new svm, no users. why can't we free it here?
svm has been associated with the pasid private data. It needs to be unbound from pasid before getting freed. Otherwise, a wild pointer will be left.
ioasid_set_data(pasid, NULL); kfree(svm);
Quoted 45 lines
Quoted 38 lines
Quoted 34 lines
drivers/iommu/intel-svm.c +7
-0+ ret = -ENOMEM ; + goto out; + } + sdev->dev = dev; + sdev->users =1 ; + +/* Set up device context entry for PASID if not enabled already */
drivers/iommu/intel-svm.c +3
-0+ ret =intel_iommu_enable_pasid (iommu, sdev->dev); +if (ret) { + dev_err(dev, "Failed to enable PASIDcapability\n");
drivers/iommu/intel-svm.c +6
-0+kfree (sdev); + goto out; + } + +/* +* For guest bind, we need to set up PASID table entry as follows:
drivers/iommu/intel-svm.c +13
-0+* - FLPM matches guest paging mode +* - turn on nested mode +* - SL guest address width matching +*/ + ret =intel_pasid_setup_nested (iommu, + dev, + (pgd_t *)data->gpgd, + data->hpasid, + &data->vtd, + ddomain, + data->addr_width); +if (ret) { + dev_err(dev, "Failed to set up PASID %llu innested mode, Err %d\n",
drivers/iommu/intel-svm.c static LIST_HEAD(global_svm_list); · line 332
Quoted 1 line
drivers/iommu/intel-svm.c +1
-0+ data->hpasid, ret);This error handling is insufficient. You should at least:
Quoted 1 line
1. free sdev
already done below
Quoted 4 lines
2. if
list_empty(&svm->devs)
unbound the svm from gpasid
free svm
Quoted 6 lines
yes, agreed.
Quoted 3 lines
The same for above error handling. Add a branch for error recovery at the end of function might help here.
not sure which code is the same as above? could you point it out?
Above last comment. :-)
Quoted 87 lines
Quoted 26 lines
Quoted 13 lines
drivers/iommu/intel-svm.c +13
-0+kfree (sdev); + goto out; + } + svm->flags |=SVM_FLAG_GUEST_MODE ; + +init_rcu_head (&sdev->rcu); +list_add_rcu (&sdev->list, &svm->devs); + out: +mutex_unlock (&pasid_mutex); +return ret; +} + +int intel_svm_unbind_gpasid (struct device *dev,int pasid)drivers/iommu/intel-svm.c static LIST_HEAD(global_svm_list); · line 355
Quoted 10 lines
drivers/iommu/intel-svm.c +10
-0+{ +struct intel_svm_dev *sdev; +struct intel_iommu *iommu; +struct intel_svm *svm; +int ret = -EINVAL ; + +mutex_lock (&pasid_mutex); + iommu =intel_svm_device_to_iommu (dev); +if (!iommu) + goto out;Make it symmetrical with bind function.
Quoted 3 lines
if (WARN_ON(!iommu)) goto out;sounds good.
Quoted 8 lines
drivers/iommu/intel-svm.c static LIST_HEAD(global_svm_list); · line 359
Quoted 4 lines
drivers/iommu/intel-svm.c +4
-0+ + svm =ioasid_find (NULL , pasid,NULL ); +if (IS_ERR_OR_NULL (svm)) { + ret =PTR_ERR (svm);If svm == NULL, this function will return success. This is not expected, right?
good catch, will fix.
Quoted 39 lines
Quoted 39 lines
drivers/iommu/intel-svm.c +9
-0+ goto out; + } + +for_each_svm_dev (svm, dev) { + ret =0 ; + sdev->users--; +if (!sdev->users) { +list_del_rcu (&sdev->list); + intel_pasid_tear_down_entry(iommu, dev,
svm->pasid);(quoted diff) +1
-0+ /* TODO: Drain in flight PRQ for the PASIDsince it
drivers/iommu/intel-svm.c +11
-0+* may get reused soon, we don't want to +* confuse with its previous life. +* intel_svm_drain_prq(dev, pasid); +*/ +kfree_rcu (sdev, rcu); + +if (list_empty (&svm->devs)) { +list_del (&svm->list); +kfree (svm); +/* +* We do not free PASID here until explicit call
(quoted diff) +1
-0+ * from VFIO to free. The PASIDlife cycle
(quoted diff) +1
-0+ * management is largely tied toVFIO management
(quoted diff) +1
-0+ * of assigned device life cycles.In case of
(quoted diff) +1
-0+ * guest exit without a explicitfree PASID call,
(quoted diff) +1
-0+ * the responsibility lies in VFIOlayer to free
(quoted diff) +1
-0+ * the PASIDs allocated for theguest.
(quoted diff) +1
-0+ * For security reasons, VFIO hasto track the
(quoted diff) +1
-0+ * PASID ownership per guestQuoted 9 lines
drivers/iommu/intel-svm.c static LIST_HEAD(global_svm_list); · line 392
Quoted 6 lines
anyway to ensure
(quoted diff) +1
-0+ * that PASID allocated by oneguest cannot be
drivers/iommu/intel-svm.c +3
-0+* used by another. +*/ +ioasid_set_data (pasid,NULL );Exchange order. First unbind svm from gpasid and then free svm.
Quoted 2 lines
I am not following, aren't we already doing free svm after unbind? please explain.
I meant
ioasid_set_data(pasid, NULL); kfree(svm);
in reverse order, it leaves a short window when svm is freed, but pasid private data is still kept svm (wild pointer).
Quoted 65 lines
Quoted 56 lines
Quoted 56 lines
drivers/iommu/intel-svm.c +10
-0+ } + } +break ; + } + out: +mutex_unlock (&pasid_mutex); + +return ret; +} + int intel_svm_bind_mm(struct device *dev, int *pasid, int flags,struct
svm_dev_ops*ops) {
structintel_iommu*iommu =intel_svm_device_to_iommu(dev); diff --gita/include/linux/intel-iommu.hb/include/linux/intel-iommu.hindex3dba6ad3e9ad..6c74c71b1ebf100644 ---a/include/linux/intel-iommu.h+++b/include/linux/intel-iommu.hinclude/linux/intel-iommu.h +4
-1@@ -673,7 +673,9 @@ int intel_iommu_enable_pasid(struct intel_iommu *iommu, struct device *dev); int intel_svm_init(struct intel_iommu *iommu);extern int intel_svm_enable_prq (struct intel_iommu *iommu);extern int intel_svm_finish_prq (struct intel_iommu *iommu); - +extern int intel_svm_bind_gpasid (struct iommu_domain *domain, +struct device *dev,struct iommu_gpasid_bind_data *data); +extern int intel_svm_unbind_gpasid(struct device *dev, int pasid);struct svm_dev_ops ;struct intel_svm_dev {@@ -690,9 +692,13 @@ struct intel_svm_dev {struct intel_svm {struct mmu_notifier notifier;struct mm_struct *mm; +struct intel_iommu *iommu;int flags;int pasid; +int gpasid;/* Guest PASID in case of vSVA bind with non-identity host
include/linux/intel-iommu.h +2
-0+* to guest PASID mapping. +*/ struct list_head devs;struct list_head list; };include/linux/intel-svm.h +2
-0@@ -44,6 +44,23 @@ struct svm_dev_ops {* do such IOTLB flushes automatically. */ #define SVM_FLAG_SUPERVISOR_MODE (1<<1) +/* +* The SVM_FLAG_GUEST_MODE flag is used when a guest process bind to a device.
+ * In this case themm_structis in the guest kernel or userspace, its lifeQuoted 9 lines
Quoted 6 lines
+ * cycle is managed by VMM and VFIO layer. For IOMMU driver, this API provides
+ * means to bind/unbind guest CR3 with PASIDs allocated for a device.
+ */
+#defineSVM_FLAG_GUEST_MODE(1<<2)How about keeping this aligned with top by adding a tab?
Quoted 7 lines
sounds good.
Quoted 3 lines
BIT macro is preferred. Hence, make it BIT(1), BIT(2), BIT(3) is preferred.
I know, but the existing mainline code is not using BIT, so I wanted to keep coding style consistent. Perhaps a separate cleanup patch will do later.
It makes sense to me.
Quoted 19 lines
Quoted 19 lines
Quoted 8 lines
+/*
+ * TheSVM_FLAG_GUEST_PASIDflag is used when a guest has its own PASID space,
+ * which requires guest and host PASID translation at both directions. We keep
+ * track of guest PASID in order to provide lookup service to device drivers.
+ * One such example is a physical function (PF) driver thatQuoted 8 lines
supports mediated
+ * device (mdev) assignment. Guest programming of mdev configuration space can
+ * only be done with guest PASID, therefore PF driver needs to find the matching
+ * host PASID to program the real hardware.
+ */
+#defineSVM_FLAG_GUEST_PASID(1<<3)Ditto.
Quoted 5 lines
Quoted 2 lines
Best regards,
baolu[Jacob Pan]
Best regards,
baolu
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH v7 09/11] iommu/vt-d: Add bind guest PASID support
Quoted 28 lines · On Tue, 29 Oct 2019 10:54:48 +0800 Lu Baolu <[email protected]> wrote:
Hi,
Quoted 3 lines · Jacob Pan
Hi Baolu,
Appreciate the thorough review, comments inline.
You are welcome.
Quoted 6 lines
Quoted 2 lines · On Sat, 26 Oct 2019 10:01:19 +0800 Lu Baolu <[email protected]> wrote:
Hi,
[...]
Quoted 10 lines
Quoted 10 lines
drivers/iommu/intel-svm.c static LIST_HEAD(global_svm_list); · line 275
Quoted 6 lines
(quoted diff) +1
-0+ * allow multiple bind calls with thesame PASID and pdev.
drivers/iommu/intel-svm.c +4
-0+*/ + sdev->users++; + goto out; + }I remember I ever pointed this out before. But I forgot how we addressed it. So forgive me if this has been addressed.
Quoted 9 lines
Quoted 5 lines
Quoted 3 lines
What if we have a valid bound svm but @dev doesn't belong to it (a.k.a. @dev not in
svm->devslist)?If we are binding a new device to an existing/active PASID, the code will allocate a new sdev and add that to the
svm->devslist.But allocating a new sdev and adding device is in below else branch, so it will never reach there, right?
No, allocating sdev is outside else branch.
Quoted 41 lines
Quoted 37 lines
Quoted 20 lines
Quoted 20 lines
(quoted diff) +2
-0+ } else { + /* We come here when PASID has never been bond toa device. */
drivers/iommu/intel-svm.c +6
-0+ svm =kzalloc (sizeof (*svm),GFP_KERNEL ); +if (!svm) { + ret = -ENOMEM ; + goto out; + } +/* REVISIT: upper layer/VFIO can track host process that bind the PASID.
(quoted diff) +1
-0+ * ioasid_set = mm might be sufficient for vfioto check pasid VMM
drivers/iommu/intel-svm.c +8
-0+* ownership. +*/ + svm->mm =get_task_mm (current); + svm->pasid = data->hpasid; +if (data->flags &IOMMU_SVA_GPASID_VAL ) { + svm->gpasid = data->gpasid; + svm->flags |=SVM_FLAG_GUEST_PASID ; + }Quoted 8 lines
drivers/iommu/intel-svm.c static LIST_HEAD(global_svm_list); · line 298
Quoted 6 lines
drivers/iommu/intel-svm.c +6
-0+ioasid_set_data (data->hpasid, svm); +INIT_LIST_HEAD_RCU (&svm->devs); +INIT_LIST_HEAD (&svm->list); + +mmput (svm->mm); + }A blank line, please.
looks good.
Quoted 8 lines
drivers/iommu/intel-svm.c static LIST_HEAD(global_svm_list); · line 302
Quoted 5 lines
drivers/iommu/intel-svm.c +4
-0+ sdev =kzalloc (sizeof (*sdev),GFP_KERNEL ); +if (!sdev) { +if (list_empty (&svm->devs)) +kfree (svm);This is dangerous. This might leave a wild pointer bound with gpasid.
Quoted 3 lines
why is that? can you please explain?
if the list is empty that means we just allocated the new svm, no users. why can't we free it here?
Quoted 7 lines
svm has been associated with the pasid private data. It needs to be unbound from pasid before getting freed. Otherwise, a wild pointer will be left.
ioasid_set_data(pasid, NULL); kfree(svm);
Right, I need to clear the private data here. Thanks!
Quoted 45 lines
Quoted 45 lines
Quoted 38 lines
Quoted 34 lines
drivers/iommu/intel-svm.c +7
-0+ ret = -ENOMEM ; + goto out; + } + sdev->dev = dev; + sdev->users =1 ; + +/* Set up device context entry for PASID if not enabled already */
drivers/iommu/intel-svm.c +3
-0+ ret =intel_iommu_enable_pasid (iommu, sdev->dev); +if (ret) { + dev_err(dev, "Failed to enable PASIDcapability\n");
drivers/iommu/intel-svm.c +6
-0+kfree (sdev); + goto out; + } + +/* +* For guest bind, we need to set up PASID table entry as follows:
drivers/iommu/intel-svm.c +13
-0+* - FLPM matches guest paging mode +* - turn on nested mode +* - SL guest address width matching +*/ + ret =intel_pasid_setup_nested (iommu, + dev, + (pgd_t *)data->gpgd, + data->hpasid, + &data->vtd, + ddomain, + data->addr_width); +if (ret) { + dev_err(dev, "Failed to set up PASID %llu innested mode, Err %d\n",
drivers/iommu/intel-svm.c static LIST_HEAD(global_svm_list); · line 332
Quoted 1 line
drivers/iommu/intel-svm.c +1
-0+ data->hpasid, ret);This error handling is insufficient. You should at least:
Quoted 1 line
1. free sdev
already done below
Quoted 4 lines
2. if
list_empty(&svm->devs)
unbound the svm from gpasid
free svm
Quoted 9 lines
Quoted 6 lines
yes, agreed.
Quoted 3 lines
The same for above error handling. Add a branch for error recovery at the end of function might help here.
not sure which code is the same as above? could you point it out?
Above last comment. :-)
Got it.
Quoted 90 lines
Quoted 87 lines
Quoted 26 lines
Quoted 13 lines
drivers/iommu/intel-svm.c +13
-0+kfree (sdev); + goto out; + } + svm->flags |=SVM_FLAG_GUEST_MODE ; + +init_rcu_head (&sdev->rcu); +list_add_rcu (&sdev->list, &svm->devs); + out: +mutex_unlock (&pasid_mutex); +return ret; +} + +int intel_svm_unbind_gpasid (struct device *dev,int pasid)drivers/iommu/intel-svm.c static LIST_HEAD(global_svm_list); · line 355
Quoted 10 lines
drivers/iommu/intel-svm.c +10
-0+{ +struct intel_svm_dev *sdev; +struct intel_iommu *iommu; +struct intel_svm *svm; +int ret = -EINVAL ; + +mutex_lock (&pasid_mutex); + iommu =intel_svm_device_to_iommu (dev); +if (!iommu) + goto out;Make it symmetrical with bind function.
Quoted 3 lines
if (WARN_ON(!iommu)) goto out;sounds good.
Quoted 8 lines
drivers/iommu/intel-svm.c static LIST_HEAD(global_svm_list); · line 359
Quoted 4 lines
drivers/iommu/intel-svm.c +4
-0+ + svm =ioasid_find (NULL , pasid,NULL ); +if (IS_ERR_OR_NULL (svm)) { + ret =PTR_ERR (svm);If svm == NULL, this function will return success. This is not expected, right?
good catch, will fix.
Quoted 39 lines
Quoted 39 lines
drivers/iommu/intel-svm.c +9
-0+ goto out; + } + +for_each_svm_dev (svm, dev) { + ret =0 ; + sdev->users--; +if (!sdev->users) { +list_del_rcu (&sdev->list); + intel_pasid_tear_down_entry(iommu, dev,
svm->pasid);(quoted diff) +1
-0+ /* TODO: Drain in flight PRQ for thePASID since it
drivers/iommu/intel-svm.c +11
-0+* may get reused soon, we don't want to +* confuse with its previous life. +* intel_svm_drain_prq(dev, pasid); +*/ +kfree_rcu (sdev, rcu); + +if (list_empty (&svm->devs)) { +list_del (&svm->list); +kfree (svm); +/* +* We do not free PASID here until explicit call
(quoted diff) +1
-0+ * from VFIO to free. The PASIDlife cycle
(quoted diff) +1
-0+ * management is largely tied toVFIO management
(quoted diff) +1
-0+ * of assigned device lifecycles. In case of
(quoted diff) +1
-0+ * guest exit without a explicitfree PASID call,
(quoted diff) +1
-0+ * the responsibility lies inVFIO layer to free
(quoted diff) +1
-0+ * the PASIDs allocated for theguest.
(quoted diff) +1
-0+ * For security reasons, VFIO hasto track the
(quoted diff) +1
-0+ * PASID ownership per guestQuoted 9 lines
drivers/iommu/intel-svm.c static LIST_HEAD(global_svm_list); · line 392
Quoted 6 lines
anyway to ensure
(quoted diff) +1
-0+ * that PASID allocated by oneguest cannot be
drivers/iommu/intel-svm.c +3
-0+* used by another. +*/ +ioasid_set_data (pasid,NULL );Exchange order. First unbind svm from gpasid and then free svm.
Quoted 2 lines
I am not following, aren't we already doing free svm after unbind? please explain.
Quoted 9 lines
I meant
ioasid_set_data(pasid, NULL); kfree(svm);in reverse order, it leaves a short window when svm is freed, but pasid private data is still kept svm (wild pointer).
Right. will fix
Quoted 94 lines
Quoted 65 lines
Quoted 56 lines
Quoted 56 lines
drivers/iommu/intel-svm.c +10
-0+ } + } +break ; + } + out: +mutex_unlock (&pasid_mutex); + +return ret; +} + int intel_svm_bind_mm(struct device *dev, int *pasid, intflags, struct
svm_dev_ops*ops) {
structintel_iommu*iommu =intel_svm_device_to_iommu(dev); diff --gita/include/linux/intel-iommu.hb/include/linux/intel-iommu.hindex3dba6ad3e9ad..6c74c71b1ebf100644 ---a/include/linux/intel-iommu.h+++b/include/linux/intel-iommu.h(quoted diff) +0
-0@@ -673,7 +673,9 @@ int intel_iommu_enable_pasid(struct
intel_iommu*iommu, struct device *dev); intintel_svm_init(struct intel_iommu *iommu); extern intintel_svm_enable_prq(struct intel_iommu *iommu); extern intintel_svm_finish_prq(struct intel_iommu *iommu); -(quoted diff) +2
-0+extern int intel_svm_bind_gpasid(struct iommu_domain *domain, + struct device *dev, struct iommu_gpasid_bind_data*data); +extern int intel_svm_unbind_gpasid(struct device *dev,
int pasid); struct svm_dev_ops; struct intel_svm_dev {include/linux/intel-iommu.h +2
-0@@ -690,9 +692,13 @@ struct intel_svm_dev {struct intel_svm {struct mmu_notifier notifier;struct mm_struct *mm; +struct intel_iommu *iommu;int flags;int pasid; +int gpasid;/* Guest PASID in case of vSVA bind with non-identity host
include/linux/intel-iommu.h +2
-0+* to guest PASID mapping. +*/ struct list_head devs;struct list_head list; };include/linux/intel-svm.h +2
-0@@ -44,6 +44,23 @@ struct svm_dev_ops {* do such IOTLB flushes automatically. */ #define SVM_FLAG_SUPERVISOR_MODE (1<<1) +/* +* The SVM_FLAG_GUEST_MODE flag is used when a guest process bind to a device.
+ * In this case themm_structis in the guest kernel or userspace, its lifeQuoted 9 lines
Quoted 6 lines
+ * cycle is managed by VMM and VFIO layer. For IOMMU driver, this API provides
+ * means to bind/unbind guest CR3 with PASIDs allocated for a device.
+ */
+#defineSVM_FLAG_GUEST_MODE(1<<2)How about keeping this aligned with top by adding a tab?
Quoted 7 lines
sounds good.
Quoted 3 lines
BIT macro is preferred. Hence, make it BIT(1), BIT(2), BIT(3) is preferred.
I know, but the existing mainline code is not using BIT, so I wanted to keep coding style consistent. Perhaps a separate cleanup patch will do later.
It makes sense to me.
Quoted 19 lines
Quoted 19 lines
Quoted 8 lines
+/*
+ * TheSVM_FLAG_GUEST_PASIDflag is used when a guest has its own PASID space,
+ * which requires guest and host PASID translation at both directions. We keep
+ * track of guest PASID in order to provide lookup service to device drivers.
+ * One such example is a physical function (PF) driver thatQuoted 8 lines
supports mediated
+ * device (mdev) assignment. Guest programming of mdev configuration space can
+ * only be done with guest PASID, therefore PF driver needs to find the matching
+ * host PASID to program the real hardware.
+ */
+#defineSVM_FLAG_GUEST_PASID(1<<3)Ditto.
Quoted 8 lines
Quoted 5 lines
Quoted 2 lines
Best regards,
baolu[Jacob Pan]
Best regards,
baolu
[Jacob Pan]
Re: [PATCH v7 09/11] iommu/vt-d: Add bind guest PASID support
Hi,
Quoted 30 lines · Jacob Pan
Quoted 27 lines · On Tue, 29 Oct 2019 10:54:48 +0800 Lu Baolu<[email protected]> wrote:
Hi,
Quoted 3 lines · Jacob Pan
Hi Baolu,
Appreciate the thorough review, comments inline.
You are welcome.
Quoted 5 lines
Quoted 2 lines · On Sat, 26 Oct 2019 10:01:19 +0800 Lu Baolu<[email protected]> wrote:
Hi,
[...]
Quoted 12 lines
Quoted 12 lines
drivers/iommu/intel-svm.c static LIST_HEAD(global_svm_list); · line 275
Quoted 6 lines
(quoted diff) +1
-0+ * allow multiple bind calls with thesame PASID and pdev.
drivers/iommu/intel-svm.c +4
-0+*/ + sdev->users++; + goto out; + }I remember I ever pointed this out before. But I forgot how we addressed it. So forgive me if this has been addressed.
What if we have a valid bound svm but @dev doesn't belong to it (a.k.a. @dev not in
svm->devslist)?
Quoted 6 lines
Quoted 5 lines
Quoted 2 lines
If we are binding a new device to an existing/active PASID, the code will allocate a new sdev and add that to the
svm->devslist.But allocating a new sdev and adding device is in below else branch, so it will never reach there, right?
No, allocating sdev is outside else branch.
Oh, yes! Please ignore it.
Best regards,
baolu
PATCH v7 10/11 iommu/vt-d: Support flushing more translation cache types
In reply to Jacob PanWhen Shared Virtual Memory is exposed to a guest via vIOMMU, scalable IOTLB invalidation may be passed down from outside IOMMU subsystems. This patch adds invalidation functions that can be used for additional translation cache types.
--- drivers/iommu/dmar.c | 46 +++++++++++++++++++++++++++++++++++++++++++++ drivers/iommu/intel-pasid.c | 3 ++- include/linux/intel-iommu.h | 21 +++++++++++++++++---- 3 files changed, 65 insertions(+), 5 deletions(-)
drivers/iommu/dmar.c +46 -0
@@ -1346,6 +1346,20 @@ void qi_flush_iotlb(struct intel_iommu *iommu, u16 did, u64 addr,qi_submit_sync (&desc, iommu); } +/* PASID-based IOTLB Invalidate */ +void qi_flush_piotlb (struct intel_iommu *iommu,u16 did,u64 addr,u32 pasid, +unsigned int size_order,u64 granu,int ih) +{ +struct qi_desc desc = {.qw2 =0 , .qw3 =0 }; + + desc.qw0 =QI_EIOTLB_PASID (pasid) |QI_EIOTLB_DID (did) | +QI_EIOTLB_GRAN (granu) |QI_EIOTLB_TYPE ; + desc.qw1 =QI_EIOTLB_ADDR (addr) |QI_EIOTLB_IH (ih) | +QI_EIOTLB_AM (size_order); + +qi_submit_sync (&desc, iommu); +} +void qi_flush_dev_iotlb (struct intel_iommu *iommu,u16 sid,u16 pfsid,u16 qdep,u64 addr,unsigned mask) {
@@ -1369,6 +1383,38 @@ void qi_flush_dev_iotlb(struct intel_iommu *iommu, u16 sid, u16 pfsid,qi_submit_sync (&desc, iommu); } +/* PASID-based device IOTLB Invalidate */ +void qi_flush_dev_piotlb (struct intel_iommu *iommu,u16 sid,u16 pfsid, +u32 pasid,u16 qdep,u64 addr,unsigned size_order,u64 granu) +{ +struct qi_desc desc; + + desc.qw0 =QI_DEV_EIOTLB_PASID (pasid) |QI_DEV_EIOTLB_SID (sid) | +QI_DEV_EIOTLB_QDEP (qdep) |QI_DEIOTLB_TYPE | +QI_DEV_IOTLB_PFSID (pfsid); + desc.qw1 =QI_DEV_EIOTLB_GLOB (granu); + +/* If S bit is 0, we only flush a single page. If S bit is set, +* The least significant zero bit indicates the invalidation address +* range. VT-d spec 6.5.2.6. +* e.g. address bit 12[0] indicates 8KB, 13[0] indicates 16KB. +*/ +if (!size_order) { + desc.qw0 |=QI_DEV_EIOTLB_ADDR (addr) & ~QI_DEV_EIOTLB_SIZE ; + }else { +unsigned long mask =1UL << (VTD_PAGE_SHIFT + size_order); + desc.qw1 |=QI_DEV_EIOTLB_ADDR (addr & ~mask) |QI_DEV_EIOTLB_SIZE ; + } +qi_submit_sync (&desc, iommu); +} + +void qi_flush_pasid_cache (struct intel_iommu *iommu,u16 did,u64 granu,int pasid) +{ +struct qi_desc desc = {.qw1 =0 , .qw2 =0 , .qw3 =0 }; + + desc.qw0 =QI_PC_PASID (pasid) |QI_PC_DID (did) |QI_PC_GRAN (granu) |QI_PC_TYPE ; +qi_submit_sync (&desc, iommu); +}/* * Disable Queued Invalidation interface. */
drivers/iommu/intel-pasid.c +2 -1
@@ -491,7 +491,8 @@ pasid_cache_invalidation_with_pasid(struct intel_iommu *iommu, {struct qi_desc desc; - desc.qw0 =QI_PC_DID (did) |QI_PC_PASID_SEL |QI_PC_PASID (pasid); + desc.qw0 =QI_PC_DID (did) |QI_PC_GRAN (QI_PC_PASID_SEL ) | +QI_PC_PASID (pasid) |QI_PC_TYPE ; desc.qw1 =0 ; desc.qw2 =0 ; desc.qw3 =0 ;
include/linux/intel-iommu.h +17 -4
@@ -332,7 +332,7 @@ enum {#define QI_IOTLB_GRAN (gran) (((u64)gran) >> (DMA_TLB_FLUSH_GRANU_OFFSET-4))#define QI_IOTLB_ADDR (addr) (((u64)addr) & VTD_PAGE_MASK)#define QI_IOTLB_IH (ih) (((u64)ih) << 6) -#define QI_IOTLB_AM (am) (((u8)am)) +#define QI_IOTLB_AM (am) (((u8)am) & 0x3f)#define QI_CC_FM (fm) (((u64)fm) << 48)#define QI_CC_SID (sid) (((u64)sid) << 32)
@@ -350,16 +350,21 @@ enum {#define QI_PC_DID (did) (((u64)did) << 16)#define QI_PC_GRAN (gran) (((u64)gran) << 4) -#define QI_PC_ALL_PASIDS (QI_PC_TYPE | QI_PC_GRAN(0)) -#define QI_PC_PASID_SEL (QI_PC_TYPE | QI_PC_GRAN(1)) +/* PASID cache invalidation granu */ +#define QI_PC_ALL_PASIDS 0 +#define QI_PC_PASID_SEL 1#define QI_EIOTLB_ADDR (addr) ((u64)(addr) & VTD_PAGE_MASK)#define QI_EIOTLB_IH (ih) (((u64)ih) << 6) -#define QI_EIOTLB_AM (am) (((u64)am)) +#define QI_EIOTLB_AM (am) (((u64)am) & 0x3f)#define QI_EIOTLB_PASID (pasid) (((u64)pasid) << 32)#define QI_EIOTLB_DID (did) (((u64)did) << 16)#define QI_EIOTLB_GRAN (gran) (((u64)gran) << 4) +/* QI Dev-IOTLB inv granu */ +#define QI_DEV_IOTLB_GRAN_ALL 1 +#define QI_DEV_IOTLB_GRAN_PASID_SEL 0 +#define QI_DEV_EIOTLB_ADDR (a) ((u64)(a) & VTD_PAGE_MASK)#define QI_DEV_EIOTLB_SIZE (((u64)1) << 11)#define QI_DEV_EIOTLB_GLOB (g) ((u64)g)
@@ -655,8 +660,16 @@ extern void qi_flush_context(struct intel_iommu *iommu, u16 did, u16 sid, u8 fm, u64 type);extern void qi_flush_iotlb (struct intel_iommu *iommu,u16 did,u64 addr,unsigned int size_order,u64 type); +extern void qi_flush_piotlb (struct intel_iommu *iommu,u16 did,u64 addr, +u32 pasid,unsigned int size_order,u64 type,int ih);extern void qi_flush_dev_iotlb (struct intel_iommu *iommu,u16 sid,u16 pfsid,u16 qdep,u64 addr,unsigned mask); + +extern void qi_flush_dev_piotlb (struct intel_iommu *iommu,u16 sid,u16 pfsid, +u32 pasid,u16 qdep,u64 addr,unsigned size_order,u64 granu); + +extern void qi_flush_pasid_cache (struct intel_iommu *iommu,u16 did,u64 granu,int pasid); +extern int qi_submit_sync (struct qi_desc *desc,struct intel_iommu *iommu);extern int dmar_ir_support (void );
Signature · 1 line
2.7.4
RE: [PATCH v7 10/11] iommu/vt-d: Support flushing more translation cache types
Quoted 5 lines
From: Jacob Pan [mailto:[email protected]]
Sent: Friday, October 25, 2019 3:55 AMWhen Shared Virtual Memory is exposed to a guest via vIOMMU, scalable IOTLB invalidation may be passed down from outside IOMMU subsystems.
from outside of host IOMMU subsystem
Quoted 16 lines
This patch adds invalidation functions that can be used for additional translation cache types.
Signed-off-by Jacob Pan <[email protected]>--- drivers/iommu/dmar.c | 46 +++++++++++++++++++++++++++++++++++++++++++++ drivers/iommu/intel-pasid.c | 3 ++- include/linux/intel-iommu.h | 21 +++++++++++++++++---- 3 files changed, 65 insertions(+), 5 deletions(-)drivers/iommu/dmar.c +0
-0
drivers/iommu/dmar.c void qi_flush_iotlb(struct intel_iommu *iommu, · line 1352
Quoted 7 lines
drivers/iommu/dmar.c +2
-0@@ -1346,6 +1346,20 @@ void qi_flush_iotlb(struct intel_iommu *iommu, u16 did, u64 addr, qi_submit_sync(&desc, iommu); } +/* PASID-based IOTLB Invalidate */ +void qi_flush_piotlb(struct intel_iommu *iommu, u16 did, u64 addr, u32 pasid,
qi_flush_iotlb_pasid.
Quoted 139 lines
drivers/iommu/dmar.c +12
-0+ unsigned int size_order, u64 granu, int ih) +{ + struct qi_desc desc = {.qw2 = 0, .qw3 = 0}; + + desc.qw0 =QI_EIOTLB_PASID (pasid) |QI_EIOTLB_DID (did) | +QI_EIOTLB_GRAN (granu) |QI_EIOTLB_TYPE ; + desc.qw1 =QI_EIOTLB_ADDR (addr) |QI_EIOTLB_IH (ih) | +QI_EIOTLB_AM (size_order); + +qi_submit_sync (&desc, iommu); +} + void qi_flush_dev_iotlb(struct intel_iommu *iommu, u16 sid, u16 pfsid,drivers/iommu/dmar.c +7
-0u16 qdep, u64 addr, unsigned mask) {@@ -1369,6 +1383,38 @@ void qi_flush_dev_iotlb(struct intel_iommu *iommu, u16 sid, u16 pfsid,qi_submit_sync (&desc, iommu); } +/* PASID-based device IOTLB Invalidate */ +void qi_flush_dev_piotlb (struct intel_iommu *iommu,u16 sid,u16 pfsid, +u32 pasid,u16 qdep,u64 addr,unsigned size_order,u64 granu) +{ +struct qi_desc desc; + + desc.qw0 =QI_DEV_EIOTLB_PASID (pasid) |QI_DEV_EIOTLB_SID (sid)|
drivers/iommu/dmar.c +11
-0+QI_DEV_EIOTLB_QDEP (qdep) |QI_DEIOTLB_TYPE | +QI_DEV_IOTLB_PFSID (pfsid); + desc.qw1 =QI_DEV_EIOTLB_GLOB (granu); + +/* If S bit is 0, we only flush a single page. If S bit is set, +* The least significant zero bit indicates the invalidation address +* range. VT-d spec 6.5.2.6. +* e.g. address bit 12[0] indicates 8KB, 13[0] indicates 16KB. +*/ +if (!size_order) { + desc.qw0 |= QI_DEV_EIOTLB_ADDR(addr) &~QI_DEV_EIOTLB_SIZE;
drivers/iommu/dmar.c +2
-0+ }else { + unsigned long mask = 1UL << (VTD_PAGE_SHIFT +
size_order);drivers/iommu/dmar.c +1
-0+ desc.qw1 |= QI_DEV_EIOTLB_ADDR(addr & ~mask) |
QI_DEV_EIOTLB_SIZE;drivers/iommu/dmar.c +5
-0+ } +qi_submit_sync (&desc, iommu); +} + +void qi_flush_pasid_cache(struct intel_iommu *iommu, u16 did, u64granu, int pasid)
drivers/iommu/dmar.c +4
-0+{ +struct qi_desc desc = {.qw1 =0 , .qw2 =0 , .qw3 =0 }; + + desc.qw0 = QI_PC_PASID(pasid) | QI_PC_DID(did) |
QI_PC_GRAN(granu)|QI_PC_TYPE;drivers/iommu/dmar.c +2
-0+qi_submit_sync (&desc, iommu); +}/* * Disable Queued Invalidation interface. */ drivers/iommu/intel-pasid.c +2
-1@@ -491,7 +491,8 @@ pasid_cache_invalidation_with_pasid(struct intel_iommu *iommu, {struct qi_desc desc; - desc.qw0 =QI_PC_DID (did) |QI_PC_PASID_SEL |QI_PC_PASID (pasid); + desc.qw0 =QI_PC_DID (did) |QI_PC_GRAN (QI_PC_PASID_SEL ) | +QI_PC_PASID (pasid) |QI_PC_TYPE ; desc.qw1 =0 ;drivers/iommu/intel-pasid.c +0
-0desc.qw2 =0 ; desc.qw3 =0 ;include/linux/intel-iommu.h +1
-1@@ -332,7 +332,7 @@ enum {#define QI_IOTLB_GRAN (gran) (((u64)gran) >> (DMA_TLB_FLUSH_GRANU_OFFSET-4))#define QI_IOTLB_ADDR (addr) (((u64)addr) & VTD_PAGE_MASK)#define QI_IOTLB_IH (ih) (((u64)ih) << 6) -#define QI_IOTLB_AM (am) (((u8)am)) +#define QI_IOTLB_AM (am) (((u8)am) & 0x3f)#define QI_CC_FM (fm) (((u64)fm) << 48)#define
QI_CC_SID(sid)(((u64)sid) << 32)include/linux/intel-iommu.h +13
-3@@ -350,16 +350,21 @@ enum {#define QI_PC_DID (did) (((u64)did) << 16)#define QI_PC_GRAN (gran) (((u64)gran) << 4) -#define QI_PC_ALL_PASIDS (QI_PC_TYPE | QI_PC_GRAN(0)) -#define QI_PC_PASID_SEL (QI_PC_TYPE | QI_PC_GRAN(1)) +/* PASID cache invalidation granu */ +#define QI_PC_ALL_PASIDS 0 +#define QI_PC_PASID_SEL 1#define QI_EIOTLB_ADDR (addr) ((u64)(addr) & VTD_PAGE_MASK)#define QI_EIOTLB_IH (ih) (((u64)ih) << 6) -#define QI_EIOTLB_AM (am) (((u64)am)) +#define QI_EIOTLB_AM (am) (((u64)am) & 0x3f)#define QI_EIOTLB_PASID (pasid) (((u64)pasid) << 32)#define QI_EIOTLB_DID (did) (((u64)did) << 16)#define QI_EIOTLB_GRAN (gran) (((u64)gran) << 4) +/* QI Dev-IOTLB inv granu */ +#define QI_DEV_IOTLB_GRAN_ALL 1 +#define QI_DEV_IOTLB_GRAN_PASID_SEL 0 +#define QI_DEV_EIOTLB_ADDR (a) ((u64)(a) & VTD_PAGE_MASK)#define QI_DEV_EIOTLB_SIZE (((u64)1) << 11)#define QI_DEV_EIOTLB_GLOB (g) ((u64)g)@@ -655,8 +660,16 @@ extern void qi_flush_context(struct intel_iommu *iommu, u16 did, u16 sid, u8 fm, u64 type);extern void qi_flush_iotlb (struct intel_iommu *iommu,u16 did,u64 addr,unsigned int size_order,u64 type); +extern void qi_flush_piotlb (struct intel_iommu *iommu,u16 did,u64 addr, +u32 pasid,unsigned int size_order,u64 type,int ih);extern void qi_flush_dev_iotlb (struct intel_iommu *iommu,u16 sid,u16 pfsid,u16 qdep,u64 addr,unsigned mask); + +extern void qi_flush_dev_piotlb(struct intel_iommu *iommu, u16 sid, u16 pfsid, + u32 pasid, u16 qdep, u64 addr, unsigned size_order,u64 granu);
include/linux/intel-iommu.h +2
-0+ +extern void qi_flush_pasid_cache(struct intel_iommu *iommu, u16 did,u64 granu, int pasid);
+
extern int qi_submit_sync(structqi_desc*desc, structintel_iommu
*iommu);
Quoted 3 lines
extern int
dmar_ir_support(void);
--
2.7.4
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH v7 10/11] iommu/vt-d: Support flushing more translation cache types
Quoted 29 lines · Kevin
Quoted 6 lines
From: Jacob Pan [mailto:[email protected]]
Sent: Friday, October 25, 2019 3:55 AMWhen Shared Virtual Memory is exposed to a guest via vIOMMU, scalable IOTLB invalidation may be passed down from outside IOMMU subsystems.
from outside of host IOMMU subsystem
Quoted 20 lines
This patch adds invalidation functions that can be used for additional translation cache types.
Signed-off-by Jacob Pan <[email protected]>--- drivers/iommu/dmar.c | 46 +++++++++++++++++++++++++++++++++++++++++++++ drivers/iommu/intel-pasid.c | 3 ++- include/linux/intel-iommu.h | 21 +++++++++++++++++---- 3 files changed, 65 insertions(+), 5 deletions(-)drivers/iommu/dmar.c +0
-0@@ -1346,6 +1346,20 @@ void qi_flush_iotlb(struct intel_iommu *iommu, u16 did, u64 addr,qi_submit_sync (&desc, iommu); }
Quoted 5 lines
drivers/iommu/dmar.c void qi_flush_iotlb(struct intel_iommu · line 1352
Quoted 3 lines
drivers/iommu/dmar.c +2
-0+/* PASID-based IOTLB Invalidate */ +void qi_flush_piotlb(struct intel_iommu *iommu, u16 did, u64 addr, u32 pasid,
qi_flush_iotlb_pasid.
will rename to make it more readable.
Quoted 145 lines
Quoted 145 lines
drivers/iommu/dmar.c +12
-0+ unsigned int size_order, u64 granu, int ih) +{ + struct qi_desc desc = {.qw2 = 0, .qw3 = 0}; + + desc.qw0 =QI_EIOTLB_PASID (pasid) |QI_EIOTLB_DID (did) | +QI_EIOTLB_GRAN (granu) |QI_EIOTLB_TYPE ; + desc.qw1 =QI_EIOTLB_ADDR (addr) |QI_EIOTLB_IH (ih) | +QI_EIOTLB_AM (size_order); + +qi_submit_sync (&desc, iommu); +} + void qi_flush_dev_iotlb(struct intel_iommu *iommu, u16 sid, u16pfsid, u16 qdep, u64 addr, unsigned mask)
{drivers/iommu/dmar.c +7
-0@@ -1369,6 +1383,38 @@ void qi_flush_dev_iotlb(struct intel_iommu *iommu, u16 sid, u16 pfsid,qi_submit_sync (&desc, iommu); } +/* PASID-based device IOTLB Invalidate */ +void qi_flush_dev_piotlb (struct intel_iommu *iommu,u16 sid,u16 pfsid, +u32 pasid,u16 qdep,u64 addr,unsigned size_order,u64 granu) +{ +struct qi_desc desc; + + desc.qw0 = QI_DEV_EIOTLB_PASID(pasid) |
QI_DEV_EIOTLB_SID(sid)|drivers/iommu/dmar.c +5
-0+QI_DEV_EIOTLB_QDEP (qdep) |QI_DEIOTLB_TYPE | +QI_DEV_IOTLB_PFSID (pfsid); + desc.qw1 =QI_DEV_EIOTLB_GLOB (granu); + +/* If S bit is 0, we only flush a single page. If S bit is set,
drivers/iommu/dmar.c +1
-0+* The least significant zero bit indicates the invalidation address
drivers/iommu/dmar.c +2
-0+* range. VT-d spec 6.5.2.6. +* e.g. address bit 12[0] indicates 8KB, 13[0] indicates 16KB.
drivers/iommu/dmar.c +3
-0+*/ +if (!size_order) { + desc.qw0 |= QI_DEV_EIOTLB_ADDR(addr) &~QI_DEV_EIOTLB_SIZE;
drivers/iommu/dmar.c +2
-0+ }else { + unsigned long mask = 1UL << (VTD_PAGE_SHIFT +
size_order);drivers/iommu/dmar.c +1
-0+ desc.qw1 |= QI_DEV_EIOTLB_ADDR(addr & ~mask) |
QI_DEV_EIOTLB_SIZE;drivers/iommu/dmar.c +5
-0+ } +qi_submit_sync (&desc, iommu); +} + +void qi_flush_pasid_cache(struct intel_iommu *iommu, u16 did, u64granu, int pasid)
drivers/iommu/dmar.c +4
-0+{ +struct qi_desc desc = {.qw1 =0 , .qw2 =0 , .qw3 =0 }; + + desc.qw0 = QI_PC_PASID(pasid) | QI_PC_DID(did) |
QI_PC_GRAN(granu)|QI_PC_TYPE;drivers/iommu/dmar.c +2
-0+qi_submit_sync (&desc, iommu); +}/* * Disable Queued Invalidation interface. */ (quoted diff) +0
-0
b/drivers/iommu/intel-pasid.cindexf846a907cfcf..6d7a701ef4d3100644 ---a/drivers/iommu/intel-pasid.c
+++b/drivers/iommu/intel-pasid.cdrivers/iommu/intel-pasid.c +2
-1@@ -491,7 +491,8 @@ pasid_cache_invalidation_with_pasid(struct intel_iommu *iommu, {struct qi_desc desc; - desc.qw0 =QI_PC_DID (did) |QI_PC_PASID_SEL |QI_PC_PASID (pasid); + desc.qw0 =QI_PC_DID (did) |QI_PC_GRAN (QI_PC_PASID_SEL ) | +QI_PC_PASID (pasid) |QI_PC_TYPE ; desc.qw1 =0 ;drivers/iommu/intel-pasid.c +0
-0desc.qw2 =0 ; desc.qw3 =0 ;(quoted diff) +0
-0
b/include/linux/intel-iommu.hindex6c74c71b1ebf..a25fb3a0ea5b100644 ---a/include/linux/intel-iommu.h
+++b/include/linux/intel-iommu.hinclude/linux/intel-iommu.h +1
-1@@ -332,7 +332,7 @@ enum {#define QI_IOTLB_GRAN (gran) (((u64)gran) >> (DMA_TLB_FLUSH_GRANU_OFFSET-4))#define QI_IOTLB_ADDR (addr) (((u64)addr) & VTD_PAGE_MASK)#define QI_IOTLB_IH (ih) (((u64)ih) << 6) -#define QI_IOTLB_AM (am) (((u8)am)) +#define QI_IOTLB_AM (am) (((u8)am) & 0x3f)#define QI_CC_FM (fm) (((u64)fm) << 48)#define
QI_CC_SID(sid)(((u64)sid) << 32)include/linux/intel-iommu.h +10
-3@@ -350,16 +350,21 @@ enum {#define QI_PC_DID (did) (((u64)did) << 16)#define QI_PC_GRAN (gran) (((u64)gran) << 4) -#define QI_PC_ALL_PASIDS (QI_PC_TYPE | QI_PC_GRAN(0)) -#define QI_PC_PASID_SEL (QI_PC_TYPE | QI_PC_GRAN(1)) +/* PASID cache invalidation granu */ +#define QI_PC_ALL_PASIDS 0 +#define QI_PC_PASID_SEL 1#define QI_EIOTLB_ADDR (addr) ((u64)(addr) & VTD_PAGE_MASK)#define QI_EIOTLB_IH (ih) (((u64)ih) << 6) -#define QI_EIOTLB_AM (am) (((u64)am)) +#define QI_EIOTLB_AM (am) (((u64)am) & 0x3f)#define QI_EIOTLB_PASID (pasid) (((u64)pasid) << 32)#define QI_EIOTLB_DID (did) (((u64)did) << 16)#define QI_EIOTLB_GRAN (gran) (((u64)gran) << 4) +/* QI Dev-IOTLB inv granu */ +#define QI_DEV_IOTLB_GRAN_ALL 1 +#define QI_DEV_IOTLB_GRAN_PASID_SEL 0 +#define QI_DEV_EIOTLB_ADDR (a) ((u64)(a) & VTD_PAGE_MASK)#define QI_DEV_EIOTLB_SIZE (((u64)1) << 11)#define QI_DEV_EIOTLB_GLOB (g) ((u64)g)@@ -655,8 +660,16 @@ extern void qi_flush_context(struct intel_iommu *iommu, u16 did, u16 sid, u8 fm, u64 type);extern void qi_flush_iotlb (struct intel_iommu *iommu,u16 did,u64 addr,unsigned int size_order,u64 type); +extern void qi_flush_piotlb (struct intel_iommu *iommu,u16 did,u64 addr, + u32 pasid, unsigned int size_order, u64type, int ih); extern void qi_flush_dev_iotlb(struct
intel_iommu*iommu, u16 sid, u16 pfsid,include/linux/intel-iommu.h +2
-0u16 qdep, u64 addr, unsigned mask); + +extern void qi_flush_dev_piotlb(struct intel_iommu *iommu, u16sid, u16 pfsid,
(quoted diff) +1
-0+ u32 pasid, u16 qdep, u64 addr, unsigned
size_order, u64 granu);(quoted diff) +2
-0+ +extern void qi_flush_pasid_cache(struct intel_iommu *iommu, u16did, u64 granu, int pasid);
+
extern int qi_submit_sync(structqi_desc*desc, structintel_iommu
*iommu);
Quoted 4 lines
Quoted 3 lines
extern int
dmar_ir_support(void);
--
2.7.4
[Jacob Pan]
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH v7 10/11] iommu/vt-d: Support flushing more translation cache types
In reply to Jacob PanHi,
Quoted 38 lines · Jacob Pan
When Shared Virtual Memory is exposed to a guest via vIOMMU, scalable IOTLB invalidation may be passed down from outside IOMMU subsystems. This patch adds invalidation functions that can be used for additional translation cache types.
Signed-off-by Jacob Pan <[email protected]>--- drivers/iommu/dmar.c | 46 +++++++++++++++++++++++++++++++++++++++++++++ drivers/iommu/intel-pasid.c | 3 ++- include/linux/intel-iommu.h | 21 +++++++++++++++++---- 3 files changed, 65 insertions(+), 5 deletions(-)drivers/iommu/dmar.c +14
-0@@ -1346,6 +1346,20 @@ void qi_flush_iotlb(struct intel_iommu *iommu, u16 did, u64 addr,qi_submit_sync (&desc, iommu); } +/* PASID-based IOTLB Invalidate */ +void qi_flush_piotlb (struct intel_iommu *iommu,u16 did,u64 addr,u32 pasid, +unsigned int size_order,u64 granu,int ih) +{ +struct qi_desc desc = {.qw2 =0 , .qw3 =0 }; + + desc.qw0 =QI_EIOTLB_PASID (pasid) |QI_EIOTLB_DID (did) | +QI_EIOTLB_GRAN (granu) |QI_EIOTLB_TYPE ; + desc.qw1 =QI_EIOTLB_ADDR (addr) |QI_EIOTLB_IH (ih) | +QI_EIOTLB_AM (size_order); + +qi_submit_sync (&desc, iommu); +} +void qi_flush_dev_iotlb (struct intel_iommu *iommu,u16 sid,u16 pfsid,u16 qdep,u64 addr,unsigned mask) {
drivers/iommu/dmar.c void qi_flush_dev_iotlb(struct intel_iommu *iommu, u16 sid, u16 pfsid, · line 1390
Quoted 8 lines
drivers/iommu/dmar.c +5
-0@@ -1369,6 +1383,38 @@ void qi_flush_dev_iotlb(struct intel_iommu *iommu, u16 sid, u16 pfsid,qi_submit_sync (&desc, iommu); } +/* PASID-based device IOTLB Invalidate */ +void qi_flush_dev_piotlb (struct intel_iommu *iommu,u16 sid,u16 pfsid, +u32 pasid,u16 qdep,u64 addr,unsigned size_order,u64 granu) +{ +struct qi_desc desc;
Do you need to set qw2 and qw3 to 0?
Quoted 90 lines
drivers/iommu/dmar.c +27
-0+ + desc.qw0 =QI_DEV_EIOTLB_PASID (pasid) |QI_DEV_EIOTLB_SID (sid) | +QI_DEV_EIOTLB_QDEP (qdep) |QI_DEIOTLB_TYPE | +QI_DEV_IOTLB_PFSID (pfsid); + desc.qw1 =QI_DEV_EIOTLB_GLOB (granu); + +/* If S bit is 0, we only flush a single page. If S bit is set, +* The least significant zero bit indicates the invalidation address +* range. VT-d spec 6.5.2.6. +* e.g. address bit 12[0] indicates 8KB, 13[0] indicates 16KB. +*/ +if (!size_order) { + desc.qw0 |=QI_DEV_EIOTLB_ADDR (addr) & ~QI_DEV_EIOTLB_SIZE ; + }else { +unsigned long mask =1UL << (VTD_PAGE_SHIFT + size_order); + desc.qw1 |=QI_DEV_EIOTLB_ADDR (addr & ~mask) |QI_DEV_EIOTLB_SIZE ; + } +qi_submit_sync (&desc, iommu); +} + +void qi_flush_pasid_cache (struct intel_iommu *iommu,u16 did,u64 granu,int pasid) +{ +struct qi_desc desc = {.qw1 =0 , .qw2 =0 , .qw3 =0 }; + + desc.qw0 =QI_PC_PASID (pasid) |QI_PC_DID (did) |QI_PC_GRAN (granu) |QI_PC_TYPE ; +qi_submit_sync (&desc, iommu); +}/* * Disable Queued Invalidation interface. */ drivers/iommu/intel-pasid.c +2
-1@@ -491,7 +491,8 @@ pasid_cache_invalidation_with_pasid(struct intel_iommu *iommu, {struct qi_desc desc; - desc.qw0 =QI_PC_DID (did) |QI_PC_PASID_SEL |QI_PC_PASID (pasid); + desc.qw0 =QI_PC_DID (did) |QI_PC_GRAN (QI_PC_PASID_SEL ) | +QI_PC_PASID (pasid) |QI_PC_TYPE ; desc.qw1 =0 ; desc.qw2 =0 ; desc.qw3 =0 ;include/linux/intel-iommu.h +11
-4@@ -332,7 +332,7 @@ enum {#define QI_IOTLB_GRAN (gran) (((u64)gran) >> (DMA_TLB_FLUSH_GRANU_OFFSET-4))#define QI_IOTLB_ADDR (addr) (((u64)addr) & VTD_PAGE_MASK)#define QI_IOTLB_IH (ih) (((u64)ih) << 6) -#define QI_IOTLB_AM (am) (((u8)am)) +#define QI_IOTLB_AM (am) (((u8)am) & 0x3f)#define QI_CC_FM (fm) (((u64)fm) << 48)#define QI_CC_SID (sid) (((u64)sid) << 32)@@ -350,16 +350,21 @@ enum {#define QI_PC_DID (did) (((u64)did) << 16)#define QI_PC_GRAN (gran) (((u64)gran) << 4) -#define QI_PC_ALL_PASIDS (QI_PC_TYPE | QI_PC_GRAN(0)) -#define QI_PC_PASID_SEL (QI_PC_TYPE | QI_PC_GRAN(1)) +/* PASID cache invalidation granu */ +#define QI_PC_ALL_PASIDS 0 +#define QI_PC_PASID_SEL 1#define QI_EIOTLB_ADDR (addr) ((u64)(addr) & VTD_PAGE_MASK)#define QI_EIOTLB_IH (ih) (((u64)ih) << 6) -#define QI_EIOTLB_AM (am) (((u64)am)) +#define QI_EIOTLB_AM (am) (((u64)am) & 0x3f)#define QI_EIOTLB_PASID (pasid) (((u64)pasid) << 32)#define QI_EIOTLB_DID (did) (((u64)did) << 16)#define QI_EIOTLB_GRAN (gran) (((u64)gran) << 4) +/* QI Dev-IOTLB inv granu */ +#define QI_DEV_IOTLB_GRAN_ALL 1 +#define QI_DEV_IOTLB_GRAN_PASID_SEL 0 +#define QI_DEV_EIOTLB_ADDR (a) ((u64)(a) & VTD_PAGE_MASK)#define QI_DEV_EIOTLB_SIZE (((u64)1) << 11)#define QI_DEV_EIOTLB_GLOB (g) ((u64)g)@@ -655,8 +660,16 @@ extern void qi_flush_context(struct intel_iommu *iommu, u16 did, u16 sid, u8 fm, u64 type);extern void qi_flush_iotlb (struct intel_iommu *iommu,u16 did,u64 addr,unsigned int size_order,u64 type); +extern void qi_flush_piotlb (struct intel_iommu *iommu,u16 did,u64 addr, +u32 pasid,unsigned int size_order,u64 type,int ih); extern void qi_flush_dev_iotlb(struct intel_iommu *iommu, u16 sid, u16 pfsid,
include/linux/intel-iommu.h extern void qi_flush_context(struct intel_iommu *iommu, u16 did, u16 sid, · line 675
Quoted 10 lines
include/linux/intel-iommu.h +6
-0u16 qdep, u64 addr, unsigned mask); + +extern void qi_flush_dev_piotlb (struct intel_iommu *iommu,u16 sid,u16 pfsid, +u32 pasid,u16 qdep,u64 addr,unsigned size_order,u64 granu); + +extern void qi_flush_pasid_cache (struct intel_iommu *iommu,u16 did,u64 granu,int pasid); +extern int qi_submit_sync (struct qi_desc *desc,struct intel_iommu *iommu);extern int dmar_ir_support (void );
Best regards,
baolu
Re: [PATCH v7 10/11] iommu/vt-d: Support flushing more translation cache types
Quoted 46 lines · On Sat, 26 Oct 2019 10:22:43 +0800 Lu Baolu <[email protected]> wrote:
Hi,
Quoted 43 lines · Jacob Pan
When Shared Virtual Memory is exposed to a guest via vIOMMU, scalable IOTLB invalidation may be passed down from outside IOMMU subsystems. This patch adds invalidation functions that can be used for additional translation cache types.
Signed-off-by Jacob Pan <[email protected]>--- drivers/iommu/dmar.c | 46+++++++++++++++++++++++++++++++++++++++++++++
drivers/iommu/intel-pasid.c| 3 ++-include/linux/intel-iommu.h| 21 +++++++++++++++++---- 3 files changed, 65 insertions(+), 5 deletions(-)drivers/iommu/dmar.c +14
-0@@ -1346,6 +1346,20 @@ void qi_flush_iotlb(struct intel_iommu *iommu, u16 did, u64 addr, qi_submit_sync(&desc, iommu); } +/* PASID-based IOTLB Invalidate */ +void qi_flush_piotlb (struct intel_iommu *iommu,u16 did,u64 addr,u32 pasid, +unsigned int size_order,u64 granu,int ih) +{ +struct qi_desc desc = {.qw2 =0 , .qw3 =0 }; + + desc.qw0 =QI_EIOTLB_PASID (pasid) |QI_EIOTLB_DID (did) | +QI_EIOTLB_GRAN (granu) |QI_EIOTLB_TYPE ; + desc.qw1 =QI_EIOTLB_ADDR (addr) |QI_EIOTLB_IH (ih) | +QI_EIOTLB_AM (size_order); + +qi_submit_sync (&desc, iommu); +} +void qi_flush_dev_iotlb (struct intel_iommu *iommu,u16 sid,u16 pfsid,u16 qdep,u64 addr,unsigned mask){drivers/iommu/dmar.c +0
-0@@ -1369,6 +1383,38 @@ void qi_flush_dev_iotlb(struct intel_iommu *iommu, u16 sid, u16 pfsid, qi_submit_sync(&desc, iommu); }
Quoted 9 lines
drivers/iommu/dmar.c void qi_flush_dev_iotlb(struct intel_iommu · line 1391
Quoted 6 lines
drivers/iommu/dmar.c +4
-0+/* PASID-based device IOTLB Invalidate */ +void qi_flush_dev_piotlb (struct intel_iommu *iommu,u16 sid,u16 pfsid, +u32 pasid,u16 qdep,u64 addr,unsigned size_order, u64 granu) +{ +struct qi_desc desc;Do you need to set qw2 and qw3 to 0?
right, forgot to add
struct qi_desc desc = {.qw2 = 0, .qw3 = 0};Quoted 106 lines
Quoted 106 lines
drivers/iommu/dmar.c +2
-0+ + desc.qw0 = QI_DEV_EIOTLB_PASID(pasid) |
QI_DEV_EIOTLB_SID(sid)|drivers/iommu/dmar.c +5
-0+QI_DEV_EIOTLB_QDEP (qdep) |QI_DEIOTLB_TYPE | +QI_DEV_IOTLB_PFSID (pfsid); + desc.qw1 =QI_DEV_EIOTLB_GLOB (granu); + +/* If S bit is 0, we only flush a single page. If S bit is set,
drivers/iommu/dmar.c +1
-0+* The least significant zero bit indicates the invalidation address
drivers/iommu/dmar.c +2
-0+* range. VT-d spec 6.5.2.6. +* e.g. address bit 12[0] indicates 8KB, 13[0] indicates 16KB.
drivers/iommu/dmar.c +3
-0+*/ +if (!size_order) { + desc.qw0 |= QI_DEV_EIOTLB_ADDR(addr) &~QI_DEV_EIOTLB_SIZE;
drivers/iommu/dmar.c +2
-0+ }else { + unsigned long mask = 1UL << (VTD_PAGE_SHIFT +
size_order);drivers/iommu/dmar.c +1
-0+ desc.qw1 |= QI_DEV_EIOTLB_ADDR(addr & ~mask) |
QI_DEV_EIOTLB_SIZE;drivers/iommu/dmar.c +5
-0+ } +qi_submit_sync (&desc, iommu); +} + +void qi_flush_pasid_cache(struct intel_iommu *iommu, u16 did, u64granu, int pasid) +{
drivers/iommu/dmar.c +3
-0+struct qi_desc desc = {.qw1 =0 , .qw2 =0 , .qw3 =0 }; + + desc.qw0 = QI_PC_PASID(pasid) | QI_PC_DID(did) |
QI_PC_GRAN(granu)|QI_PC_TYPE;drivers/iommu/dmar.c +2
-0+qi_submit_sync (&desc, iommu); +}/* * Disable Queued Invalidation interface. */ (quoted diff) +0
-0
b/drivers/iommu/intel-pasid.cindexf846a907cfcf..6d7a701ef4d3100644 ---a/drivers/iommu/intel-pasid.c
+++b/drivers/iommu/intel-pasid.cdrivers/iommu/intel-pasid.c +2
-1@@ -491,7 +491,8 @@ pasid_cache_invalidation_with_pasid(struct intel_iommu *iommu, {struct qi_desc desc; - desc.qw0 =QI_PC_DID (did) |QI_PC_PASID_SEL |QI_PC_PASID (pasid); + desc.qw0 =QI_PC_DID (did) |QI_PC_GRAN (QI_PC_PASID_SEL ) | +QI_PC_PASID (pasid) |QI_PC_TYPE ; desc.qw1 =0 ; desc.qw2 =0 ;desc.qw3 = 0;
(quoted diff) +0
-0
b/include/linux/intel-iommu.hindex6c74c71b1ebf..a25fb3a0ea5b100644 ---a/include/linux/intel-iommu.h
+++b/include/linux/intel-iommu.h(quoted diff) +0
-0@@ -332,7 +332,7 @@ enum { #define QI_IOTLB_GRAN(gran) (((u64)gran) >> (DMA_TLB_FLUSH_GRANU_OFFSET-4)) #define QI_IOTLB_ADDR(addr)(((u64)addr) &
VTD_PAGE_MASK) #defineQI_IOTLB_IH(ih)(((u64)ih) << 6) -#defineQI_IOTLB_AM(am)(((u8)am)) +#defineQI_IOTLB_AM(am)(((u8)am) &0x3f)
#defineQI_CC_FM(fm)(((u64)fm) << 48)
#defineQI_CC_SID(sid)(((u64)sid) << 32)include/linux/intel-iommu.h +10
-3@@ -350,16 +350,21 @@ enum {#define QI_PC_DID (did) (((u64)did) << 16)#define QI_PC_GRAN (gran) (((u64)gran) << 4) -#define QI_PC_ALL_PASIDS (QI_PC_TYPE | QI_PC_GRAN(0)) -#define QI_PC_PASID_SEL (QI_PC_TYPE | QI_PC_GRAN(1)) +/* PASID cache invalidation granu */ +#define QI_PC_ALL_PASIDS 0 +#define QI_PC_PASID_SEL 1#define QI_EIOTLB_ADDR (addr) ((u64)(addr) & VTD_PAGE_MASK)#define QI_EIOTLB_IH (ih) (((u64)ih) << 6) -#define QI_EIOTLB_AM (am) (((u64)am)) +#define QI_EIOTLB_AM (am) (((u64)am) & 0x3f)#define QI_EIOTLB_PASID (pasid) (((u64)pasid) << 32)#define QI_EIOTLB_DID (did) (((u64)did) << 16)#define QI_EIOTLB_GRAN (gran) (((u64)gran) << 4) +/* QI Dev-IOTLB inv granu */ +#define QI_DEV_IOTLB_GRAN_ALL 1 +#define QI_DEV_IOTLB_GRAN_PASID_SEL 0 +#define QI_DEV_EIOTLB_ADDR (a) ((u64)(a) & VTD_PAGE_MASK)#define QI_DEV_EIOTLB_SIZE (((u64)1) << 11)#define QI_DEV_EIOTLB_GLOB (g) ((u64)g)@@ -655,8 +660,16 @@ extern void qi_flush_context(struct intel_iommu *iommu, u16 did, u16 sid, u8 fm, u64 type);extern void qi_flush_iotlb (struct intel_iommu *iommu,u16 did,u64 addr,unsigned int size_order,u64 type); +extern void qi_flush_piotlb (struct intel_iommu *iommu,u16 did,u64 addr, + u32 pasid, unsigned int size_order, u64type, int ih); extern void
qi_flush_dev_iotlb(struct intel_iommu *iommu, u16 sid, u16 pfsid, u16 qdep, u64 addr, unsigned mask);(quoted diff) +2
-0+ +extern void qi_flush_dev_piotlb(struct intel_iommu *iommu, u16sid, u16 pfsid,
(quoted diff) +1
-0+ u32 pasid, u16 qdep, u64 addr, unsigned
size_order, u64 granu); +
+extern void qi_flush_pasid_cache(structintel_iommu*iommu, u16
Quoted 8 lines
Quoted 5 lines
did, u64 granu, int pasid); +
extern int qi_submit_sync(structqi_desc*desc, structintel_iommu*iommu);
extern intdmar_ir_support(void);Best regards,
baolu
[Jacob Pan]
Re: [PATCH v7 10/11] iommu/vt-d: Support flushing more translation cache types
In reply to Jacob PanHi Jacob,
Quoted 49 lines · Jacob Pan
When Shared Virtual Memory is exposed to a guest via vIOMMU, scalable IOTLB invalidation may be passed down from outside IOMMU subsystems. This patch adds invalidation functions that can be used for additional translation cache types.
Signed-off-by Jacob Pan <[email protected]>--- drivers/iommu/dmar.c | 46 +++++++++++++++++++++++++++++++++++++++++++++ drivers/iommu/intel-pasid.c | 3 ++- include/linux/intel-iommu.h | 21 +++++++++++++++++---- 3 files changed, 65 insertions(+), 5 deletions(-)drivers/iommu/dmar.c +22
-0@@ -1346,6 +1346,20 @@ void qi_flush_iotlb(struct intel_iommu *iommu, u16 did, u64 addr,qi_submit_sync (&desc, iommu); } +/* PASID-based IOTLB Invalidate */ +void qi_flush_piotlb (struct intel_iommu *iommu,u16 did,u64 addr,u32 pasid, +unsigned int size_order,u64 granu,int ih) +{ +struct qi_desc desc = {.qw2 =0 , .qw3 =0 }; + + desc.qw0 =QI_EIOTLB_PASID (pasid) |QI_EIOTLB_DID (did) | +QI_EIOTLB_GRAN (granu) |QI_EIOTLB_TYPE ; + desc.qw1 =QI_EIOTLB_ADDR (addr) |QI_EIOTLB_IH (ih) | +QI_EIOTLB_AM (size_order); + +qi_submit_sync (&desc, iommu); +} +void qi_flush_dev_iotlb (struct intel_iommu *iommu,u16 sid,u16 pfsid,u16 qdep,u64 addr,unsigned mask) {@@ -1369,6 +1383,38 @@ void qi_flush_dev_iotlb(struct intel_iommu *iommu, u16 sid, u16 pfsid,qi_submit_sync (&desc, iommu); } +/* PASID-based device IOTLB Invalidate */ +void qi_flush_dev_piotlb (struct intel_iommu *iommu,u16 sid,u16 pfsid, +u32 pasid,u16 qdep,u64 addr,unsigned size_order,u64 granu) +{ +struct qi_desc desc; + + desc.qw0 =QI_DEV_EIOTLB_PASID (pasid) |QI_DEV_EIOTLB_SID (sid) | + QI_DEV_EIOTLB_QDEP(qdep) | QI_DEIOTLB_TYPE |
drivers/iommu/dmar.c void qi_flush_dev_iotlb(struct intel_iommu *iommu, u16 sid, u16 pfsid, · line 1403
Quoted 10 lines
drivers/iommu/dmar.c +10
-0+QI_DEV_IOTLB_PFSID (pfsid); + desc.qw1 =QI_DEV_EIOTLB_GLOB (granu); + +/* If S bit is 0, we only flush a single page. If S bit is set, +* The least significant zero bit indicates the invalidation address +* range. VT-d spec 6.5.2.6. +* e.g. address bit 12[0] indicates 8KB, 13[0] indicates 16KB. +*/ +if (!size_order) { + desc.qw0 |=QI_DEV_EIOTLB_ADDR (addr) & ~QI_DEV_EIOTLB_SIZE ;
this is desc.qw1
With that fixed and the qi_flush_dev_piotlb init issue spotted by Lu, feel free to add my
Thanks
Eric
Quoted 87 lines
drivers/iommu/dmar.c +14
-0+ }else { +unsigned long mask =1UL << (VTD_PAGE_SHIFT + size_order); + desc.qw1 |=QI_DEV_EIOTLB_ADDR (addr & ~mask) |QI_DEV_EIOTLB_SIZE ; + } +qi_submit_sync (&desc, iommu); +} + +void qi_flush_pasid_cache (struct intel_iommu *iommu,u16 did,u64 granu,int pasid) +{ +struct qi_desc desc = {.qw1 =0 , .qw2 =0 , .qw3 =0 }; + + desc.qw0 =QI_PC_PASID (pasid) |QI_PC_DID (did) |QI_PC_GRAN (granu) |QI_PC_TYPE ; +qi_submit_sync (&desc, iommu); +}/* * Disable Queued Invalidation interface. */ drivers/iommu/intel-pasid.c +2
-1@@ -491,7 +491,8 @@ pasid_cache_invalidation_with_pasid(struct intel_iommu *iommu, {struct qi_desc desc; - desc.qw0 =QI_PC_DID (did) |QI_PC_PASID_SEL |QI_PC_PASID (pasid); + desc.qw0 =QI_PC_DID (did) |QI_PC_GRAN (QI_PC_PASID_SEL ) | +QI_PC_PASID (pasid) |QI_PC_TYPE ; desc.qw1 =0 ; desc.qw2 =0 ; desc.qw3 =0 ;include/linux/intel-iommu.h +17
-4@@ -332,7 +332,7 @@ enum {#define QI_IOTLB_GRAN (gran) (((u64)gran) >> (DMA_TLB_FLUSH_GRANU_OFFSET-4))#define QI_IOTLB_ADDR (addr) (((u64)addr) & VTD_PAGE_MASK)#define QI_IOTLB_IH (ih) (((u64)ih) << 6) -#define QI_IOTLB_AM (am) (((u8)am)) +#define QI_IOTLB_AM (am) (((u8)am) & 0x3f)#define QI_CC_FM (fm) (((u64)fm) << 48)#define QI_CC_SID (sid) (((u64)sid) << 32)@@ -350,16 +350,21 @@ enum {#define QI_PC_DID (did) (((u64)did) << 16)#define QI_PC_GRAN (gran) (((u64)gran) << 4) -#define QI_PC_ALL_PASIDS (QI_PC_TYPE | QI_PC_GRAN(0)) -#define QI_PC_PASID_SEL (QI_PC_TYPE | QI_PC_GRAN(1)) +/* PASID cache invalidation granu */ +#define QI_PC_ALL_PASIDS 0 +#define QI_PC_PASID_SEL 1#define QI_EIOTLB_ADDR (addr) ((u64)(addr) & VTD_PAGE_MASK)#define QI_EIOTLB_IH (ih) (((u64)ih) << 6) -#define QI_EIOTLB_AM (am) (((u64)am)) +#define QI_EIOTLB_AM (am) (((u64)am) & 0x3f)#define QI_EIOTLB_PASID (pasid) (((u64)pasid) << 32)#define QI_EIOTLB_DID (did) (((u64)did) << 16)#define QI_EIOTLB_GRAN (gran) (((u64)gran) << 4) +/* QI Dev-IOTLB inv granu */ +#define QI_DEV_IOTLB_GRAN_ALL 1 +#define QI_DEV_IOTLB_GRAN_PASID_SEL 0 +#define QI_DEV_EIOTLB_ADDR (a) ((u64)(a) & VTD_PAGE_MASK)#define QI_DEV_EIOTLB_SIZE (((u64)1) << 11)#define QI_DEV_EIOTLB_GLOB (g) ((u64)g)@@ -655,8 +660,16 @@ extern void qi_flush_context(struct intel_iommu *iommu, u16 did, u16 sid, u8 fm, u64 type);extern void qi_flush_iotlb (struct intel_iommu *iommu,u16 did,u64 addr,unsigned int size_order,u64 type); +extern void qi_flush_piotlb (struct intel_iommu *iommu,u16 did,u64 addr, +u32 pasid,unsigned int size_order,u64 type,int ih);extern void qi_flush_dev_iotlb (struct intel_iommu *iommu,u16 sid,u16 pfsid,u16 qdep,u64 addr,unsigned mask); + +extern void qi_flush_dev_piotlb (struct intel_iommu *iommu,u16 sid,u16 pfsid, +u32 pasid,u16 qdep,u64 addr,unsigned size_order,u64 granu); + +extern void qi_flush_pasid_cache (struct intel_iommu *iommu,u16 did,u64 granu,int pasid); +extern int qi_submit_sync (struct qi_desc *desc,struct intel_iommu *iommu);extern int dmar_ir_support (void );
Re: [PATCH v7 10/11] iommu/vt-d: Support flushing more translation cache types
Quoted 63 lines · On Fri, 8 Nov 2019 17:18:10 +0100 Auger Eric <[email protected]> wrote:
Hi Jacob,
Quoted 60 lines · Jacob Pan
When Shared Virtual Memory is exposed to a guest via vIOMMU, scalable IOTLB invalidation may be passed down from outside IOMMU subsystems. This patch adds invalidation functions that can be used for additional translation cache types.
Signed-off-by Jacob Pan <[email protected]>--- drivers/iommu/dmar.c | 46+++++++++++++++++++++++++++++++++++++++++++++
drivers/iommu/intel-pasid.c| 3 ++-include/linux/intel-iommu.h| 21 +++++++++++++++++---- 3 files changed, 65 insertions(+), 5 deletions(-)drivers/iommu/dmar.c +14
-0@@ -1346,6 +1346,20 @@ void qi_flush_iotlb(struct intel_iommu *iommu, u16 did, u64 addr, qi_submit_sync(&desc, iommu); } +/* PASID-based IOTLB Invalidate */ +void qi_flush_piotlb (struct intel_iommu *iommu,u16 did,u64 addr,u32 pasid, +unsigned int size_order,u64 granu,int ih) +{ +struct qi_desc desc = {.qw2 =0 , .qw3 =0 }; + + desc.qw0 =QI_EIOTLB_PASID (pasid) |QI_EIOTLB_DID (did) | +QI_EIOTLB_GRAN (granu) |QI_EIOTLB_TYPE ; + desc.qw1 =QI_EIOTLB_ADDR (addr) |QI_EIOTLB_IH (ih) | +QI_EIOTLB_AM (size_order); + +qi_submit_sync (&desc, iommu); +} +void qi_flush_dev_iotlb (struct intel_iommu *iommu,u16 sid,u16 pfsid,u16 qdep,u64 addr,unsigned mask){
drivers/iommu/dmar.c +6
-0@@ -1369,6 +1383,38 @@ void qi_flush_dev_iotlb(struct intel_iommu *iommu, u16 sid, u16 pfsid, qi_submit_sync(&desc, iommu); } +/* PASID-based device IOTLB Invalidate */ +void qi_flush_dev_piotlb (struct intel_iommu *iommu,u16 sid,u16 pfsid, +u32 pasid,u16 qdep,u64 addr,unsigned size_order, u64 granu) +{ +struct qi_desc desc; + + desc.qw0 = QI_DEV_EIOTLB_PASID(pasid) |
QI_DEV_EIOTLB_SID(sid)|drivers/iommu/dmar.c +5
-0+QI_DEV_EIOTLB_QDEP (qdep) |QI_DEIOTLB_TYPE | +QI_DEV_IOTLB_PFSID (pfsid); + desc.qw1 =QI_DEV_EIOTLB_GLOB (granu); + +/* If S bit is 0, we only flush a single page. If S bit is set,
drivers/iommu/dmar.c +1
-0+* The least significant zero bit indicates the invalidation address
Quoted 9 lines
Quoted 7 lines
drivers/iommu/dmar.c +2
-0+* range. VT-d spec 6.5.2.6. +* e.g. address bit 12[0] indicates 8KB, 13[0] indicates 16KB.
drivers/iommu/dmar.c +3
-0+*/ +if (!size_order) { + desc.qw0 |= QI_DEV_EIOTLB_ADDR(addr) &~QI_DEV_EIOTLB_SIZE;
this is desc.qw1
Right, will fix.
Thanks!
Quoted 94 lines
With that fixed and the
qi_flush_dev_piotlbinit issue spotted by Lu, feel free to add myReviewed-by Eric Auger <[email protected]>Thanks
Eric
Quoted 85 lines
drivers/iommu/dmar.c +2
-0+ }else { + unsigned long mask = 1UL << (VTD_PAGE_SHIFT +
size_order);drivers/iommu/dmar.c +1
-0+ desc.qw1 |= QI_DEV_EIOTLB_ADDR(addr & ~mask) |
QI_DEV_EIOTLB_SIZE;drivers/iommu/dmar.c +5
-0+ } +qi_submit_sync (&desc, iommu); +} + +void qi_flush_pasid_cache(struct intel_iommu *iommu, u16 did, u64granu, int pasid) +{
drivers/iommu/dmar.c +3
-0+struct qi_desc desc = {.qw1 =0 , .qw2 =0 , .qw3 =0 }; + + desc.qw0 = QI_PC_PASID(pasid) | QI_PC_DID(did) |
QI_PC_GRAN(granu)|QI_PC_TYPE;drivers/iommu/dmar.c +2
-0+qi_submit_sync (&desc, iommu); +}/* * Disable Queued Invalidation interface. */ (quoted diff) +0
-0
b/drivers/iommu/intel-pasid.cindexf846a907cfcf..6d7a701ef4d3100644 ---a/drivers/iommu/intel-pasid.c
+++b/drivers/iommu/intel-pasid.cdrivers/iommu/intel-pasid.c +2
-1@@ -491,7 +491,8 @@ pasid_cache_invalidation_with_pasid(struct intel_iommu *iommu, {struct qi_desc desc; - desc.qw0 =QI_PC_DID (did) |QI_PC_PASID_SEL |QI_PC_PASID (pasid); + desc.qw0 =QI_PC_DID (did) |QI_PC_GRAN (QI_PC_PASID_SEL ) | +QI_PC_PASID (pasid) |QI_PC_TYPE ; desc.qw1 =0 ; desc.qw2 =0 ;drivers/iommu/intel-pasid.c +0
-0desc.qw3 =0 ;(quoted diff) +0
-0
b/include/linux/intel-iommu.hindex6c74c71b1ebf..a25fb3a0ea5b100644 ---a/include/linux/intel-iommu.h
+++b/include/linux/intel-iommu.h(quoted diff) +0
-0@@ -332,7 +332,7 @@ enum { #define QI_IOTLB_GRAN(gran) (((u64)gran) >> (DMA_TLB_FLUSH_GRANU_OFFSET-4)) #define QI_IOTLB_ADDR(addr)(((u64)addr) &
VTD_PAGE_MASK) #defineQI_IOTLB_IH(ih)(((u64)ih) << 6) -#defineQI_IOTLB_AM(am)(((u8)am)) +#defineQI_IOTLB_AM(am)(((u8)am) &0x3f)
#defineQI_CC_FM(fm)(((u64)fm) << 48)
#defineQI_CC_SID(sid)(((u64)sid) << 32)include/linux/intel-iommu.h +10
-3@@ -350,16 +350,21 @@ enum {#define QI_PC_DID (did) (((u64)did) << 16)#define QI_PC_GRAN (gran) (((u64)gran) << 4) -#define QI_PC_ALL_PASIDS (QI_PC_TYPE | QI_PC_GRAN(0)) -#define QI_PC_PASID_SEL (QI_PC_TYPE | QI_PC_GRAN(1)) +/* PASID cache invalidation granu */ +#define QI_PC_ALL_PASIDS 0 +#define QI_PC_PASID_SEL 1#define QI_EIOTLB_ADDR (addr) ((u64)(addr) & VTD_PAGE_MASK)#define QI_EIOTLB_IH (ih) (((u64)ih) << 6) -#define QI_EIOTLB_AM (am) (((u64)am)) +#define QI_EIOTLB_AM (am) (((u64)am) & 0x3f)#define QI_EIOTLB_PASID (pasid) (((u64)pasid) << 32)#define QI_EIOTLB_DID (did) (((u64)did) << 16)#define QI_EIOTLB_GRAN (gran) (((u64)gran) << 4) +/* QI Dev-IOTLB inv granu */ +#define QI_DEV_IOTLB_GRAN_ALL 1 +#define QI_DEV_IOTLB_GRAN_PASID_SEL 0 +#define QI_DEV_EIOTLB_ADDR (a) ((u64)(a) & VTD_PAGE_MASK)#define QI_DEV_EIOTLB_SIZE (((u64)1) << 11)#define QI_DEV_EIOTLB_GLOB (g) ((u64)g)@@ -655,8 +660,16 @@ extern void qi_flush_context(struct intel_iommu *iommu, u16 did, u16 sid, u8 fm, u64 type);extern void qi_flush_iotlb (struct intel_iommu *iommu,u16 did,u64 addr,unsigned int size_order,u64 type); +extern void qi_flush_piotlb (struct intel_iommu *iommu,u16 did,u64 addr, + u32 pasid, unsigned int size_order, u64type, int ih); extern void
qi_flush_dev_iotlb(struct intel_iommu *iommu, u16 sid, u16 pfsid, u16 qdep, u64 addr, unsigned mask);(quoted diff) +2
-0+ +extern void qi_flush_dev_piotlb(struct intel_iommu *iommu, u16sid, u16 pfsid,
Quoted 9 lines
Quoted 8 lines
(quoted diff) +1
-0+ u32 pasid, u16 qdep, u64 addr, unsigned
size_order, u64 granu); +
+extern voidqi_flush_pasid_cache(struct intel_iommu *iommu, u16 did, u64 granu, int pasid); +
extern int qi_submit_sync(structqi_desc*desc, structintel_iommu
*iommu);
extern intdmar_ir_support(void);
[Jacob Pan]
PATCH v7 11/11 iommu/vt-d: Add svm/sva invalidate function
In reply to Jacob PanWhen Shared Virtual Address (SVA) is enabled for a guest OS via vIOMMU, we need to provide invalidation support at IOMMU API and driver level. This patch adds Intel VT-d specific function to implement iommu passdown invalidate API for shared virtual address.
The use case is for supporting caching structure invalidation of assigned SVM capable devices. Emulated IOMMU exposes queue invalidation capability and passes down all descriptors from the guest to the physical IOMMU.
The assumption is that guest to host device ID mapping should be resolved prior to calling IOMMU driver. Based on the device handle, host IOMMU driver can replace certain fields before submit to the invalidation queue.
--- drivers/iommu/intel-iommu.c | 170 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 170 insertions(+)
drivers/iommu/intel-iommu.c +170 -0
@@ -5491,6 +5491,175 @@ static void intel_iommu_aux_detach_device(struct iommu_domain *domain,aux_domain_remove_dev (to_dmar_domain (domain), dev); } +/* +* 2D array for converting and sanitizing IOMMU generic TLB granularity to +* VT-d granularity. Invalidation is typically included in the unmap operation +* as a result of DMA or VFIO unmap. However, for assigned device where guest +* could own the first level page tables without being shadowed by QEMU. In +* this case there is no pass down unmap to the host IOMMU as a result of unmap +* in the guest. Only invalidations are trapped and passed down. +* In all cases, only first level TLB invalidation (request with PASID) can be +* passed down, therefore we do not include IOTLB granularity for request +* without PASID (second level). +* +* For an example, to find the VT-d granularity encoding for IOTLB +* type and page selective granularity within PASID: +* X: indexed by iommu cache type +* Y: indexed by enum iommu_inv_granularity +* [IOMMU_CACHE_INV_TYPE_IOTLB][IOMMU_INV_GRANU_ADDR] +* +* Granu_map array indicates validity of the table. 1: valid, 0: invalid +* +*/ +const static int inv_type_granu_map[IOMMU_CACHE_INV_TYPE_NR ][IOMMU_INV_GRANU_NR ] = { +/* PASID based IOTLB, support PASID selective and page selective */ + {0 ,1 ,1 }, +/* PASID based dev TLBs, only support all PASIDs or single PASID */ + {1 ,1 ,0 }, +/* PASID cache */ + {1 ,1 ,0 } +}; + +const static u64 inv_type_granu_table[IOMMU_CACHE_INV_TYPE_NR ][IOMMU_INV_GRANU_NR ] = { +/* PASID based IOTLB */ + {0 ,QI_GRAN_NONG_PASID ,QI_GRAN_PSI_PASID }, +/* PASID based dev TLBs */ + {QI_DEV_IOTLB_GRAN_ALL ,QI_DEV_IOTLB_GRAN_PASID_SEL ,0 }, +/* PASID cache */ + {QI_PC_ALL_PASIDS ,QI_PC_PASID_SEL ,0 }, +}; + +static inline int to_vtd_granularity (int type,int granu,u64 *vtd_granu) +{ +if (type >=IOMMU_CACHE_INV_TYPE_NR || granu >=IOMMU_INV_GRANU_NR || + !inv_type_granu_map[type][granu]) +return -EINVAL ; + + *vtd_granu = inv_type_granu_table[type][granu]; + +return 0 ; +} + +static inline u64 to_vtd_size (u64 granu_size,u64 nr_granules) +{ +u64 nr_pages = (granu_size * nr_granules) >>VTD_PAGE_SHIFT ; + +/* VT-d size is encoded as 2^size of 4K pages, 0 for 4k, 9 for 2MB, etc. +* IOMMU cache invalidate API passes granu_size in bytes, and number of +* granu size in contiguous memory. +*/ +return order_base_2 (nr_pages); +} + +#ifdef CONFIG_INTEL_IOMMU_SVM +static int intel_iommu_sva_invalidate (struct iommu_domain *domain, +struct device *dev,struct iommu_cache_invalidate_info *inv_info) +{ +struct dmar_domain *dmar_domain =to_dmar_domain (domain); +struct device_domain_info *info; +struct intel_iommu *iommu; +unsigned long flags; +int cache_type; +u8 bus, devfn; +u16 did, sid; +int ret =0 ; +u64 size; + +if (!inv_info || !dmar_domain || + inv_info->version !=IOMMU_CACHE_INVALIDATE_INFO_VERSION_1 ) +return -EINVAL ; + +if (!dev || !dev_is_pci (dev)) +return -ENODEV ; + + iommu =device_to_iommu (dev, &bus, &devfn); +if (!iommu) +return -ENODEV ; + +spin_lock_irqsave (&device_domain_lock, flags); +spin_lock (&iommu->lock); + info =iommu_support_dev_iotlb (dmar_domain, iommu, bus, devfn); +if (!info) { + ret = -EINVAL ; + goto out_unlock; + } + did = dmar_domain->iommu_did[iommu->seq_id]; + sid =PCI_DEVID (bus, devfn); + size =to_vtd_size (inv_info->addr_info.granule_size, inv_info->addr_info.nb_granules); + +for_each_set_bit (cache_type, (unsigned long *)&inv_info->cache,IOMMU_CACHE_INV_TYPE_NR ) { +u64 granu =0 ; +u64 pasid =0 ; + + ret =to_vtd_granularity (cache_type, inv_info->granularity, &granu); +if (ret) { +pr_err ("Invalid cache type and granu combination %d/%d\n" , cache_type, + inv_info->granularity); +break ; + } + +/* PASID is stored in different locations based on granularity */ +if (inv_info->granularity ==IOMMU_INV_GRANU_PASID ) + pasid = inv_info->pasid_info.pasid; +else if (inv_info->granularity ==IOMMU_INV_GRANU_ADDR ) + pasid = inv_info->addr_info.pasid; +else { +pr_err ("Cannot find PASID for given cache type and granularity\n" ); +break ; + } + +switch (BIT (cache_type)) { +case IOMMU_CACHE_INV_TYPE_IOTLB : +if (size && (inv_info->addr_info.addr & ((BIT (VTD_PAGE_SHIFT + size)) -1 ))) { +pr_err ("Address out of range, 0x%llx, size order %llu\n" , + inv_info->addr_info.addr, size); + ret = -ERANGE ; + goto out_unlock; + } + +qi_flush_piotlb (iommu, did,mm_to_dma_pfn (inv_info->addr_info.addr), + pasid, size, granu, inv_info->addr_info.flags &IOMMU_INV_ADDR_FLAGS_LEAF ); + +/* +* Always flush device IOTLB if ATS is enabled since guest +* vIOMMU exposes CM = 1, no device IOTLB flush will be passed +* down. +*/ +if (info->ats_enabled) { +qi_flush_dev_piotlb (iommu, sid, info->pfsid, + pasid, info->ats_qdep, + inv_info->addr_info.addr, size, + granu); + } +break ; +case IOMMU_CACHE_INV_TYPE_DEV_IOTLB : +if (info->ats_enabled) { +qi_flush_dev_piotlb (iommu, sid, info->pfsid, + inv_info->addr_info.pasid, info->ats_qdep, + inv_info->addr_info.addr, size, + granu); + }else +pr_warn ("Passdown device IOTLB flush w/o ATS!\n" ); + +break ; +case IOMMU_CACHE_INV_TYPE_PASID : +qi_flush_pasid_cache (iommu, did, granu, inv_info->pasid_info.pasid); + +break ; +default : +dev_err (dev,"Unsupported IOMMU invalidation type %d\n" , + cache_type); + ret = -EINVAL ; + } + } +out_unlock: +spin_unlock (&iommu->lock); +spin_unlock_irqrestore (&device_domain_lock, flags); + +return ret; +} +#endif +static int intel_iommu_map (struct iommu_domain *domain,unsigned long iova,phys_addr_t hpa,size_t size,int iommu_prot)
@@ -6027,6 +6196,7 @@ const struct iommu_ops intel_iommu_ops = { .is_attach_deferred = intel_iommu_is_attach_deferred, .pgsize_bitmap =INTEL_IOMMU_PGSIZES , #ifdef CONFIG_INTEL_IOMMU_SVM + .cache_invalidate = intel_iommu_sva_invalidate, .sva_bind_gpasid = intel_svm_bind_gpasid, .sva_unbind_gpasid = intel_svm_unbind_gpasid, #endif
Signature · 1 line
2.7.4
RE: [PATCH v7 11/11] iommu/vt-d: Add svm/sva invalidate function
Quoted 9 lines
From: Jacob Pan [mailto:[email protected]]
Sent: Friday, October 25, 2019 3:55 AMWhen Shared Virtual Address (SVA) is enabled for a guest OS via vIOMMU, we need to provide invalidation support at IOMMU API and driver
level. This patch adds Intel VT-d specific function to implement iommu passdown invalidate API for shared virtual address.
Quoted 4 lines
The use case is for supporting caching structure invalidation of assigned SVM capable devices. Emulated IOMMU exposes queue invalidation capability and passes down all descriptors from the guest to the physical IOMMU.
specifically you may clarify that only invalidations related to first-level page table is passed down, because it's guest structure being bound to the first-level. other descriptors are emulated or translated into other necessary operations.
Quoted 5 lines
The assumption is that guest to host device ID mapping should be resolved prior to calling IOMMU driver. Based on the device handle, host IOMMU driver can replace certain fields before submit to the invalidation queue.
what is device ID? it's a bit confusing term here.
Quoted 45 lines
Signed-off-by Jacob Pan <[email protected]>Signed-off-by Ashok Raj <[email protected]>Signed-off-by Liu, Yi L <[email protected]>--- drivers/iommu/intel-iommu.c | 170 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 170 insertions(+)drivers/iommu/intel-iommu.c +3
-0@@ -5491,6 +5491,175 @@ static void intel_iommu_aux_detach_device(struct iommu_domain *domain,aux_domain_remove_dev (to_dmar_domain(domain ), dev); } +/* +* 2D array for converting and sanitizing IOMMU generic TLB granularity to +* VT-d granularity. Invalidation is typically included in the unmap operation
+ * as a result of DMA or VFIO unmap. However, for assigned device where guest
+ * could own the first level page tables without being shadowed by QEMU. In
+ * this case there is no pass down unmap to the host IOMMU as a result of unmap
+ * in the guest. Only invalidations are trapped and passed down.
+ * In all cases, only first level TLB invalidation (request with PASID) can be
+ * passed down, therefore we do not include IOTLB granularity for request
+ * without PASID (second level).
+ *
+ * For an example, to find the VT-d granularity encoding for IOTLB
+ * type and page selective granularity within PASID:
+ * X: indexed by iommu cache type
+ * Y: indexed by enumiommu_inv_granularity
+ * [IOMMU_CACHE_INV_TYPE_IOTLB][IOMMU_INV_GRANU_ADDR]
+ *
+ *Granu_maparray indicates validity of the table. 1: valid, 0: invalid
+ *
+ */
+const static int inv_type_granu_map[IOMMU_CACHE_INV_TYPE_NR][IOMMU_INV_GRANU_NR] = {
drivers/iommu/intel-iommu.c static void intel_iommu_aux_detach_device(struct iommu_domain *domain, · line 5518
Quoted 4 lines
drivers/iommu/intel-iommu.c +4
-0+/* PASID based IOTLB, support PASID selective and page selective */ + {0, 1, 1}, +/* PASID based dev TLBs, only support all PASIDs or single PASID */ + {1, 1, 0},
I forgot previous discussion. is it necessary to pass down dev TLB invalidation requests? Can it be handled by host iOMMU driver automatically?
Quoted 182 lines
drivers/iommu/intel-iommu.c +5
-0+/* PASID cache */ + {1, 1, 0} +}; + +const static u64inv_type_granu_table[IOMMU_CACHE_INV_TYPE_NR][IOMMU_INV_GRAN
U_NR] = {drivers/iommu/intel-iommu.c +11
-0+/* PASID based IOTLB */ + {0, QI_GRAN_NONG_PASID, QI_GRAN_PSI_PASID}, + /* PASID based dev TLBs */ + {QI_DEV_IOTLB_GRAN_ALL, QI_DEV_IOTLB_GRAN_PASID_SEL, 0}, + /* PASID cache */ + {QI_PC_ALL_PASIDS, QI_PC_PASID_SEL, 0}, +}; + +static inline int to_vtd_granularity(int type, int granu, u64 *vtd_granu) +{ + if (type >= IOMMU_CACHE_INV_TYPE_NR || granu >=
IOMMU_INV_GRANU_NR||drivers/iommu/intel-iommu.c +13
-0+ !inv_type_granu_map[type][granu]) +return -EINVAL ; + + *vtd_granu = inv_type_granu_table[type][granu]; + +return 0 ; +} + +static inline u64 to_vtd_size (u64 granu_size,u64 nr_granules) +{ +u64 nr_pages = (granu_size * nr_granules) >>VTD_PAGE_SHIFT ; + +/* VT-d size is encoded as 2^size of 4K pages, 0 for 4k, 9 for 2MB, etc.
drivers/iommu/intel-iommu.c +1
-0+* IOMMU cache invalidate API passes granu_size in bytes, and number of
drivers/iommu/intel-iommu.c +8
-0+* granu size in contiguous memory. +*/ +return order_base_2 (nr_pages); +} + +#ifdef CONFIG_INTEL_IOMMU_SVM +static int intel_iommu_sva_invalidate (struct iommu_domain *domain, + struct device *dev, struct iommu_cache_invalidate_info
*inv_info)drivers/iommu/intel-iommu.c +13
-0+{ + struct dmar_domain *dmar_domain = to_dmar_domain(domain); + struct device_domain_info *info; + struct intel_iommu *iommu; + unsigned long flags; + int cache_type; + u8 bus, devfn; + u16 did, sid; + int ret = 0; + u64 size; + + if (!inv_info || !dmar_domain || + inv_info->version !=
IOMMU_CACHE_INVALIDATE_INFO_VERSION_1)drivers/iommu/intel-iommu.c +12
-0+return -EINVAL ; + +if (!dev || !dev_is_pci (dev)) +return -ENODEV ; + + iommu =device_to_iommu (dev, &bus, &devfn); +if (!iommu) +return -ENODEV ; + +spin_lock_irqsave (&device_domain_lock, flags); +spin_lock (&iommu->lock); + info = iommu_support_dev_iotlb(dmar_domain, iommu, bus,devfn);
drivers/iommu/intel-iommu.c +7
-0+if (!info) { + ret = -EINVAL ; + goto out_unlock; + } + did = dmar_domain->iommu_did[iommu->seq_id]; + sid =PCI_DEVID (bus, devfn); + size = to_vtd_size(inv_info->addr_info.granule_size, inv_info-Quoted 1 line
addr_info.nb_granules);
drivers/iommu/intel-iommu.c +2
-0+ + for_each_set_bit(cache_type, (unsigned long *)&inv_info->cache,
IOMMU_CACHE_INV_TYPE_NR) {drivers/iommu/intel-iommu.c +4
-0+u64 granu =0 ; +u64 pasid =0 ; + + ret = to_vtd_granularity(cache_type, inv_info->granularity,&granu);
drivers/iommu/intel-iommu.c +2
-0+if (ret) { + pr_err("Invalid cache type and granucombination %d/%d\n",
cache_type,drivers/iommu/intel-iommu.c +5
-0+ inv_info->granularity); +break ; + } + +/* PASID is stored in different locations based on granularity */
drivers/iommu/intel-iommu.c +6
-0+if (inv_info->granularity ==IOMMU_INV_GRANU_PASID ) + pasid = inv_info->pasid_info.pasid; +else if (inv_info->granularity ==IOMMU_INV_GRANU_ADDR ) + pasid = inv_info->addr_info.pasid; +else { + pr_err("Cannot find PASID for given cache type andgranularity\n");
drivers/iommu/intel-iommu.c +6
-0+break ; + } + +switch (BIT (cache_type)) { +case IOMMU_CACHE_INV_TYPE_IOTLB : + if (size && (inv_info->addr_info.addr &((
BIT(VTD_PAGE_SHIFT + size)) - 1))) {drivers/iommu/intel-iommu.c +1
-0+ pr_err("Address out of range, 0x%llx, sizeorder %llu\n",
drivers/iommu/intel-iommu.c +6
-0+ inv_info->addr_info.addr, size); + ret = -ERANGE ; + goto out_unlock; + } + + qi_flush_piotlb(iommu, did,
mm_to_dma_pfn(inv_info->addr_info.addr),drivers/iommu/intel-iommu.c +1
-0+ pasid, size, granu, inv_info-Quoted 1 line
addr_info.flags &
IOMMU_INV_ADDR_FLAGS_LEAF);drivers/iommu/intel-iommu.c +3
-0+ +/* +* Always flush device IOTLB if ATS is enabled since guest
drivers/iommu/intel-iommu.c +1
-0+* vIOMMU exposes CM = 1, no device IOTLB flush will be passed
drivers/iommu/intel-iommu.c +6
-0+* down. +*/ +if (info->ats_enabled) { + qi_flush_dev_piotlb(iommu, sid, info->pfsid, + pasid, info->ats_qdep, + inv_info->addr_info.addr,size,
drivers/iommu/intel-iommu.c +7
-0+ granu); + } +break ; +case IOMMU_CACHE_INV_TYPE_DEV_IOTLB : +if (info->ats_enabled) { + qi_flush_dev_piotlb(iommu, sid, info->pfsid, + inv_info->addr_info.pasid,
info->ats_qdep,drivers/iommu/intel-iommu.c +1
-0+ inv_info->addr_info.addr,size,
drivers/iommu/intel-iommu.c +3
-0+ granu); + }else + pr_warn("Passdown device IOTLB flush w/oATS!\n");
drivers/iommu/intel-iommu.c +4
-0+ +break ; +case IOMMU_CACHE_INV_TYPE_PASID : + qi_flush_pasid_cache(iommu, did, granu, inv_info-Quoted 1 line
pasid_info.pasid);
drivers/iommu/intel-iommu.c +4
-0+ +break ; +default : + dev_err(dev, "Unsupported IOMMU invalidationtype %d\n",
drivers/iommu/intel-iommu.c +13
-1+ cache_type); + ret = -EINVAL; + } + } +out_unlock: +spin_unlock (&iommu->lock); +spin_unlock_irqrestore (&device_domain_lock, flags); + +return ret; +} +#endif +static int intel_iommu_map (struct iommu_domain *domain,unsigned long iova,phys_addr_t hpa,size_t size,int iommu_prot)@@ -6027,6 +6196,7 @@ const struct iommu_ops intel_iommu_ops = { .is_attach_deferred = intel_iommu_is_attach_deferred, .pgsize_bitmap =INTEL_IOMMU_PGSIZES , #ifdef CONFIG_INTEL_IOMMU_SVM + .cache_invalidate = intel_iommu_sva_invalidate, .sva_bind_gpasid = intel_svm_bind_gpasid, .sva_unbind_gpasid = intel_svm_unbind_gpasid, #endif --
Quoted 1 line
2.7.4
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH v7 11/11] iommu/vt-d: Add svm/sva invalidate function
Hi,
Quoted 71 lines · Kevin
Quoted 9 lines
From: Jacob Pan [mailto:[email protected]]
Sent: Friday, October 25, 2019 3:55 AMWhen Shared Virtual Address (SVA) is enabled for a guest OS via vIOMMU, we need to provide invalidation support at IOMMU API and driver
level. This patch adds Intel VT-d specific function to implement iommu passdown invalidate API for shared virtual address.Quoted 4 lines
The use case is for supporting caching structure invalidation of assigned SVM capable devices. Emulated IOMMU exposes queue invalidation capability and passes down all descriptors from the guest to the physical IOMMU.
specifically you may clarify that only invalidations related to first-level page table is passed down, because it's guest structure being bound to the first-level. other descriptors are emulated or translated into other necessary operations.
Quoted 5 lines
The assumption is that guest to host device ID mapping should be resolved prior to calling IOMMU driver. Based on the device handle, host IOMMU driver can replace certain fields before submit to the invalidation queue.
what is device ID? it's a bit confusing term here.
Quoted 44 lines
Signed-off-by Jacob Pan <[email protected]>Signed-off-by Ashok Raj <[email protected]>Signed-off-by Liu, Yi L <[email protected]>--- drivers/iommu/intel-iommu.c | 170 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 170 insertions(+)drivers/iommu/intel-iommu.c +3
-0@@ -5491,6 +5491,175 @@ static void intel_iommu_aux_detach_device(struct iommu_domain *domain,aux_domain_remove_dev (to_dmar_domain(domain ), dev); } +/* +* 2D array for converting and sanitizing IOMMU generic TLB granularity to +* VT-d granularity. Invalidation is typically included in the unmap operation
+ * as a result of DMA or VFIO unmap. However, for assigned device where guest
+ * could own the first level page tables without being shadowed by QEMU. In
+ * this case there is no pass down unmap to the host IOMMU as a result of unmap
+ * in the guest. Only invalidations are trapped and passed down.
+ * In all cases, only first level TLB invalidation (request with PASID) can be
+ * passed down, therefore we do not include IOTLB granularity for request
+ * without PASID (second level).
+ *
+ * For an example, to find the VT-d granularity encoding for IOTLB
+ * type and page selective granularity within PASID:
+ * X: indexed by iommu cache type
+ * Y: indexed by enumiommu_inv_granularity
+ * [IOMMU_CACHE_INV_TYPE_IOTLB][IOMMU_INV_GRANU_ADDR]
+ *
+ *Granu_maparray indicates validity of the table. 1: valid, 0: invalid
+ *
+ */
+const static int inv_type_granu_map[IOMMU_CACHE_INV_TYPE_NR][IOMMU_INV_GRAN
Quoted 8 lines
drivers/iommu/intel-iommu.c static void intel_iommu_aux_detach_device(struct iommu_domain *domain, · line 5518
Quoted 5 lines
U_NR] = {drivers/iommu/intel-iommu.c +4
-0+/* PASID based IOTLB, support PASID selective and page selective */ + {0, 1, 1}, +/* PASID based dev TLBs, only support all PASIDs or single PASID */ + {1, 1, 0},I forgot previous discussion. is it necessary to pass down dev TLB invalidation requests? Can it be handled by host iOMMU driver automatically?
On host SVA, when a memory is unmapped, driver callback will invalidate dev IOTLB explicitly. So I guess we need to pass down it for guest case. This is also required for guest iova over 1st level usage as far as can see.
Best regards,
baolu
Quoted 176 lines
Quoted 176 lines
drivers/iommu/intel-iommu.c +5
-0+/* PASID cache */ + {1, 1, 0} +}; + +const static u64inv_type_granu_table[IOMMU_CACHE_INV_TYPE_NR][IOMMU_INV_GRAN
U_NR] = {drivers/iommu/intel-iommu.c +11
-0+/* PASID based IOTLB */ + {0, QI_GRAN_NONG_PASID, QI_GRAN_PSI_PASID}, + /* PASID based dev TLBs */ + {QI_DEV_IOTLB_GRAN_ALL, QI_DEV_IOTLB_GRAN_PASID_SEL, 0}, + /* PASID cache */ + {QI_PC_ALL_PASIDS, QI_PC_PASID_SEL, 0}, +}; + +static inline int to_vtd_granularity(int type, int granu, u64 *vtd_granu) +{ + if (type >= IOMMU_CACHE_INV_TYPE_NR || granu >=
IOMMU_INV_GRANU_NR||drivers/iommu/intel-iommu.c +13
-0+ !inv_type_granu_map[type][granu]) +return -EINVAL ; + + *vtd_granu = inv_type_granu_table[type][granu]; + +return 0 ; +} + +static inline u64 to_vtd_size (u64 granu_size,u64 nr_granules) +{ +u64 nr_pages = (granu_size * nr_granules) >>VTD_PAGE_SHIFT ; + +/* VT-d size is encoded as 2^size of 4K pages, 0 for 4k, 9 for 2MB, etc.
drivers/iommu/intel-iommu.c +1
-0+* IOMMU cache invalidate API passes granu_size in bytes, and number of
drivers/iommu/intel-iommu.c +8
-0+* granu size in contiguous memory. +*/ +return order_base_2 (nr_pages); +} + +#ifdef CONFIG_INTEL_IOMMU_SVM +static int intel_iommu_sva_invalidate (struct iommu_domain *domain, + struct device *dev, struct iommu_cache_invalidate_info
*inv_info)drivers/iommu/intel-iommu.c +13
-0+{ + struct dmar_domain *dmar_domain = to_dmar_domain(domain); + struct device_domain_info *info; + struct intel_iommu *iommu; + unsigned long flags; + int cache_type; + u8 bus, devfn; + u16 did, sid; + int ret = 0; + u64 size; + + if (!inv_info || !dmar_domain || + inv_info->version !=
IOMMU_CACHE_INVALIDATE_INFO_VERSION_1)drivers/iommu/intel-iommu.c +12
-0+return -EINVAL ; + +if (!dev || !dev_is_pci (dev)) +return -ENODEV ; + + iommu =device_to_iommu (dev, &bus, &devfn); +if (!iommu) +return -ENODEV ; + +spin_lock_irqsave (&device_domain_lock, flags); +spin_lock (&iommu->lock); + info = iommu_support_dev_iotlb(dmar_domain, iommu, bus,devfn);
drivers/iommu/intel-iommu.c +7
-0+if (!info) { + ret = -EINVAL ; + goto out_unlock; + } + did = dmar_domain->iommu_did[iommu->seq_id]; + sid =PCI_DEVID (bus, devfn); + size = to_vtd_size(inv_info->addr_info.granule_size, inv_info-Quoted 1 line
addr_info.nb_granules);
drivers/iommu/intel-iommu.c +2
-0+ + for_each_set_bit(cache_type, (unsigned long *)&inv_info->cache,
IOMMU_CACHE_INV_TYPE_NR) {drivers/iommu/intel-iommu.c +4
-0+u64 granu =0 ; +u64 pasid =0 ; + + ret = to_vtd_granularity(cache_type, inv_info->granularity,&granu);
drivers/iommu/intel-iommu.c +2
-0+if (ret) { + pr_err("Invalid cache type and granucombination %d/%d\n",
cache_type,drivers/iommu/intel-iommu.c +5
-0+ inv_info->granularity); +break ; + } + +/* PASID is stored in different locations based on granularity */
drivers/iommu/intel-iommu.c +6
-0+if (inv_info->granularity ==IOMMU_INV_GRANU_PASID ) + pasid = inv_info->pasid_info.pasid; +else if (inv_info->granularity ==IOMMU_INV_GRANU_ADDR ) + pasid = inv_info->addr_info.pasid; +else { + pr_err("Cannot find PASID for given cache type andgranularity\n");
drivers/iommu/intel-iommu.c +6
-0+break ; + } + +switch (BIT (cache_type)) { +case IOMMU_CACHE_INV_TYPE_IOTLB : + if (size && (inv_info->addr_info.addr &((
BIT(VTD_PAGE_SHIFT + size)) - 1))) {drivers/iommu/intel-iommu.c +1
-0+ pr_err("Address out of range, 0x%llx, sizeorder %llu\n",
drivers/iommu/intel-iommu.c +6
-0+ inv_info->addr_info.addr, size); + ret = -ERANGE ; + goto out_unlock; + } + + qi_flush_piotlb(iommu, did,
mm_to_dma_pfn(inv_info->addr_info.addr),drivers/iommu/intel-iommu.c +1
-0+ pasid, size, granu, inv_info-Quoted 1 line
addr_info.flags &
IOMMU_INV_ADDR_FLAGS_LEAF);drivers/iommu/intel-iommu.c +3
-0+ +/* +* Always flush device IOTLB if ATS is enabled since guest
drivers/iommu/intel-iommu.c +1
-0+* vIOMMU exposes CM = 1, no device IOTLB flush will be passed
drivers/iommu/intel-iommu.c +6
-0+* down. +*/ +if (info->ats_enabled) { + qi_flush_dev_piotlb(iommu, sid, info->pfsid, + pasid, info->ats_qdep, + inv_info->addr_info.addr,size,
drivers/iommu/intel-iommu.c +7
-0+ granu); + } +break ; +case IOMMU_CACHE_INV_TYPE_DEV_IOTLB : +if (info->ats_enabled) { + qi_flush_dev_piotlb(iommu, sid, info->pfsid, + inv_info->addr_info.pasid,
info->ats_qdep,drivers/iommu/intel-iommu.c +1
-0+ inv_info->addr_info.addr,size,
drivers/iommu/intel-iommu.c +3
-0+ granu); + }else + pr_warn("Passdown device IOTLB flush w/oATS!\n");
drivers/iommu/intel-iommu.c +4
-0+ +break ; +case IOMMU_CACHE_INV_TYPE_PASID : + qi_flush_pasid_cache(iommu, did, granu, inv_info-Quoted 1 line
pasid_info.pasid);
drivers/iommu/intel-iommu.c +4
-0+ +break ; +default : + dev_err(dev, "Unsupported IOMMU invalidationtype %d\n",
drivers/iommu/intel-iommu.c +12
-0+ cache_type); + ret = -EINVAL; + } + } +out_unlock: +spin_unlock (&iommu->lock); +spin_unlock_irqrestore (&device_domain_lock, flags); + +return ret; +} +#endif +static int intel_iommu_map (struct iommu_domain *domain,unsigned long iova,phys_addr_t hpa,size_t size,int iommu_prot)@@ -6027,6 +6196,7 @@ const struct iommu_ops intel_iommu_ops = { .is_attach_deferred = intel_iommu_is_attach_deferred,
Quoted 10 lines
Quoted 8 lines
drivers/iommu/intel-iommu.c +1
-1.pgsize_bitmap = INTEL_IOMMU_PGSIZES,#ifdef CONFIG_INTEL_IOMMU_SVM + .cache_invalidate = intel_iommu_sva_invalidate, .sva_bind_gpasid = intel_svm_bind_gpasid, .sva_unbind_gpasid = intel_svm_unbind_gpasid,#endif --2.7.4
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH v7 11/11] iommu/vt-d: Add svm/sva invalidate function
Hi again,
Quoted 89 lines · Lu Baolu
Hi,
Quoted 77 lines · Kevin
Quoted 9 lines
From: Jacob Pan [mailto:[email protected]]
Sent: Friday, October 25, 2019 3:55 AMWhen Shared Virtual Address (SVA) is enabled for a guest OS via vIOMMU, we need to provide invalidation support at IOMMU API and driver
level. This patch adds Intel VT-d specific function to implement iommu passdown invalidate API for shared virtual address.Quoted 4 lines
The use case is for supporting caching structure invalidation of assigned SVM capable devices. Emulated IOMMU exposes queue invalidation capability and passes down all descriptors from the guest to the physical IOMMU.
specifically you may clarify that only invalidations related to first-level page table is passed down, because it's guest structure being bound to the first-level. other descriptors are emulated or translated into other necessary operations.
Quoted 5 lines
The assumption is that guest to host device ID mapping should be resolved prior to calling IOMMU driver. Based on the device handle, host IOMMU driver can replace certain fields before submit to the invalidation queue.
what is device ID? it's a bit confusing term here.
Quoted 50 lines
Signed-off-by Jacob Pan <[email protected]>Signed-off-by Ashok Raj <[email protected]>Signed-off-by Liu, Yi L <[email protected]>---
drivers/iommu/intel-iommu.c| 170
++++++++++++++++++++++++++++++++++++++++++++1 file changed, 170 insertions(+)drivers/iommu/intel-iommu.c +2
-0@@ -5491,6 +5491,175 @@ static void intel_iommu_aux_detach_device(struct iommu_domain *domain, aux_domain_remove_dev(to_dmar_domain(domain), dev); } +/* +* 2D array for converting and sanitizing IOMMU generic TLB granularity to
+ * VT-d granularity. Invalidation is typically included in the unmap operation
+ * as a result of DMA or VFIO unmap. However, for assigned device where guest
+ * could own the first level page tables without being shadowed by QEMU.
In
+ * this case there is no pass down unmap to the host IOMMU as a result of
unmap
+ * in the guest. Only invalidations are trapped and passed down.
+ * In all cases, only first level TLB invalidation (request with PASID) can be
+ * passed down, therefore we do not include IOTLB granularity for request
+ * without PASID (second level).
+ *
+ * For an example, to find the VT-d granularity encoding for IOTLB
+ * type and page selective granularity within PASID:
+ * X: indexed by iommu cache type
+ * Y: indexed by enumiommu_inv_granularity
+ * [IOMMU_CACHE_INV_TYPE_IOTLB][IOMMU_INV_GRANU_ADDR]
+ *
+ *Granu_maparray indicates validity of the table. 1: valid, 0:
invalid
+ *
+ */
+const static int inv_type_granu_map[IOMMU_CACHE_INV_TYPE_NR][IOMMU_INV_GRANQuoted 8 lines
Quoted 5 lines
U_NR] = {
+ /* PASID based IOTLB, support PASID selective and page selective */ + {0, 1, 1},
+ /* PASID based dev TLBs, only support all PASIDs or single PASID */ + {1, 1, 0},I forgot previous discussion. is it necessary to pass down dev TLB invalidation requests? Can it be handled by host iOMMU driver automatically?
Quoted 5 lines
On host SVA, when a memory is unmapped, driver callback will invalidate dev IOTLB explicitly. So I guess we need to pass down it for guest case. This is also required for guest iova over 1st level usage as far as can see.
Sorry, I confused guest vIOVA and guest vSVA. For guest vIOVA, no device TLB invalidation pass down. But currently for guest vSVA, device TLB invalidation is passed down. Perhaps we can avoid passing down dev TLB flush just like what we are doing for guest IOVA.
Best regards,
baolu
RE: [PATCH v7 11/11] iommu/vt-d: Add svm/sva invalidate function
Quoted 105 lines
From: Lu Baolu [mailto:[email protected]]
Sent: Saturday, October 26, 2019 3:03 PMHi again,
Quoted 39 lines · Lu Baolu
Hi,
Quoted 36 lines · Kevin
Quoted 9 lines
From: Jacob Pan [mailto:[email protected]]
Sent: Friday, October 25, 2019 3:55 AMWhen Shared Virtual Address (SVA) is enabled for a guest OS via vIOMMU, we need to provide invalidation support at IOMMU API and driver
level. This patch adds Intel VT-d specific function to implement iommu passdown invalidate API for shared virtual address.Quoted 4 lines
The use case is for supporting caching structure invalidation of assigned SVM capable devices. Emulated IOMMU exposes queue invalidation capability and passes down all descriptors from the guest to the physical IOMMU.
specifically you may clarify that only invalidations related to first-level page table is passed down, because it's guest structure being bound to the first-level. other descriptors are emulated or translated into other necessary operations.
Quoted 5 lines
The assumption is that guest to host device ID mapping should be resolved prior to calling IOMMU driver. Based on the device handle, host IOMMU driver can replace certain fields before submit to the invalidation queue.
what is device ID? it's a bit confusing term here.
Quoted 9 lines
Signed-off-by Jacob Pan <[email protected]>Signed-off-by Ashok Raj <[email protected]>Signed-off-by Liu, Yi L <[email protected]>---
drivers/iommu/intel-iommu.c| 170
++++++++++++++++++++++++++++++++++++++++++++1 file changed, 170 insertions(+)Quoted 1 line
Quoted 1 line
drivers/iommu/intel-
Quoted 1 line
drivers/iommu/intel- renamed from drivers/iommu/intel-iommu.c +0
-0
iommu.cQuoted 8 lines
Quoted 8 lines
Quoted 8 lines
index
5fab32fbc4b4..a73e76d6457a100644drivers/iommu/intel-iommu.c +0
-0@@ -5491,6 +5491,175 @@ static void intel_iommu_aux_detach_device(struct iommu_domain *domain, aux_domain_remove_dev(to_dmar_domain(domain), dev); }Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
drivers/iommu/intel-iommu.c +2
-0+/* +* 2D array for converting and sanitizing IOMMU generic TLB granularity to
+ * VT-d granularity. Invalidation is typically included in the unmap operation
+ * as a result of DMA or VFIO unmap. However, for assigned devicewhere
Quoted 18 lines
Quoted 18 lines
Quoted 18 lines
guest
+ * could own the first level page tables without being shadowed by QEMU.
In
+ * this case there is no pass down unmap to the host IOMMU as a result of
unmap
+ * in the guest. Only invalidations are trapped and passed down.
+ * In all cases, only first level TLB invalidation (request with PASID) can be
+ * passed down, therefore we do not include IOTLB granularity for request
+ * without PASID (second level).
+ *
+ * For an example, to find the VT-d granularity encoding for IOTLB
+ * type and page selective granularity within PASID:
+ * X: indexed by iommu cache type
+ * Y: indexed by enumiommu_inv_granularityQuoted 8 lines
Quoted 8 lines
Quoted 8 lines
+ * [IOMMU_CACHE_INV_TYPE_IOTLB][IOMMU_INV_GRANU_ADDR]
+ *
+ *Granu_maparray indicates validity of the table. 1: valid, 0:
invalid
+ *
+ */
+const static intinv_type_granu_map[IOMMU_CACHE_INV_TYPE_NR][IOMMU_INV_GRAN
Quoted 6 lines
Quoted 6 lines
Quoted 5 lines
U_NR] = {
+ /* PASID based IOTLB, support PASID selective and page selective */ + {0, 1, 1},
+ /* PASID based dev TLBs, only support all PASIDs or single PASID */ + {1, 1, 0},Quoted 9 lines
Quoted 3 lines
I forgot previous discussion. is it necessary to pass down dev TLB invalidation
requests? Can it be handled by host iOMMU driver automatically?On host SVA, when a memory is unmapped, driver callback will invalidate dev IOTLB explicitly. So I guess we need to pass down it for guest case. This is also required for guest iova over 1st level usage as far as can see.
Quoted 5 lines
Sorry, I confused guest vIOVA and guest vSVA. For guest vIOVA, no device TLB invalidation pass down. But currently for guest vSVA, device TLB invalidation is passed down. Perhaps we can avoid passing down dev TLB flush just like what we are doing for guest IOVA.
I think dev TLB is fully handled within IOMMU driver today. It doesn't require device driver to explicit toggle. With this then we can fully virtualize guest dev TLB invalidation request to save one syscall, since the host is supposed to flush dev TLB when serving the earlier IOTLB invalidation pass-down.
Thanks
Kevin
Re: [PATCH v7 11/11] iommu/vt-d: Add svm/sva invalidate function
Quoted 20 lines · Kevin
Quoted 14 lines
Quoted 4 lines
Quoted 4 lines
Quoted 3 lines
+ /* PASID based dev TLBs, only support all PASIDs or single PASID */
+ {1, 1, 0},Quoted 9 lines
Quoted 3 lines
I forgot previous discussion. is it necessary to pass down dev TLB invalidation
requests? Can it be handled by host iOMMU driver automatically?On host SVA, when a memory is unmapped, driver callback will invalidate dev IOTLB explicitly. So I guess we need to pass down it for guest case. This is also required for guest iova over 1st level usage as far as can see.
Quoted 5 lines
Sorry, I confused guest vIOVA and guest vSVA. For guest vIOVA, no device TLB invalidation pass down. But currently for guest vSVA, device TLB invalidation is passed down. Perhaps we can avoid passing down dev TLB flush just like what we are doing for guest IOVA.
Quoted 5 lines
I think dev TLB is fully handled within IOMMU driver today. It doesn't require device driver to explicit toggle. With this then we can fully virtualize guest dev TLB invalidation request to save one syscall, since the host is supposed to flush dev TLB when serving the earlier IOTLB invalidation pass-down.
In the previous discussions, we thought about making IOTLB flush inclusive, where IOTLB flush would always include device TLB flush. But we thought such behavior cannot be assumed for all VMMs, some may still do explicit dev TLB flush. So for completeness, we included dev TLB here.
RE: [PATCH v7 11/11] iommu/vt-d: Add svm/sva invalidate function
Quoted 32 lines
From: Jacob Pan [mailto:[email protected]]
Sent: Tuesday, October 29, 2019 12:11 AMQuoted 20 lines · Kevin
Quoted 14 lines
Quoted 4 lines
Quoted 4 lines
Quoted 3 lines
+ /* PASID based dev TLBs, only support all PASIDs or single PASID */
+ {1, 1, 0},Quoted 9 lines
Quoted 3 lines
I forgot previous discussion. is it necessary to pass down dev TLB invalidation
requests? Can it be handled by host iOMMU driver automatically?On host SVA, when a memory is unmapped, driver callback will invalidate dev IOTLB explicitly. So I guess we need to pass down it for guest case. This is also required for guest iova over 1st level usage as far as can see.
Quoted 5 lines
Sorry, I confused guest vIOVA and guest vSVA. For guest vIOVA, no device TLB invalidation pass down. But currently for guest vSVA, device TLB invalidation is passed down. Perhaps we can avoid passing down dev TLB flush just like what we are doing for guest IOVA.
Quoted 5 lines
I think dev TLB is fully handled within IOMMU driver today. It doesn't require device driver to explicit toggle. With this then we can fully virtualize guest dev TLB invalidation request to save one syscall, since the host is supposed to flush dev TLB when serving the earlier IOTLB invalidation pass-down.
Quoted 5 lines
In the previous discussions, we thought about making IOTLB flush inclusive, where IOTLB flush would always include device TLB flush. But we thought such behavior cannot be assumed for all VMMs, some may still do explicit dev TLB flush. So for completeness, we included dev TLB here.
is there such example or a link to previous discussion? Here we are talking about host IOMMU driver behavior, instead of VMM. But I'm not strong on this, since it's more an optimization. But there remains one unclear area. If we do want to support such usage with explicit dev TLB flush, how does host IOMMU driver avoid doing implicit dev TLB flush when serving iotlb invalidation request? Is it already designed such way that user-passed-down iotlb invalidation request only invalidates iotlb while kernel-triggered iotlb invalidation still does implicit dev TLB flush?
Thanks
Kevin
Re: [PATCH v7 11/11] iommu/vt-d: Add svm/sva invalidate function
Quoted 39 lines · Kevin
Quoted 33 lines
From: Jacob Pan [mailto:[email protected]]
Sent: Tuesday, October 29, 2019 12:11 AMQuoted 21 lines · Kevin
Quoted 15 lines
Quoted 9 lines
Quoted 8 lines
Quoted 3 lines
+ /* PASID based dev TLBs, only support all PASIDs or single PASID */
+ {1, 1, 0},I forgot previous discussion. is it necessary to pass down dev TLB invalidation
requests? Can it be handled by host iOMMU driver automatically?Quoted 5 lines
On host SVA, when a memory is unmapped, driver callback will invalidate dev IOTLB explicitly. So I guess we need to pass down it for guest case. This is also required for guest iova over 1st level usage as far as can see.
Quoted 5 lines
Sorry, I confused guest vIOVA and guest vSVA. For guest vIOVA, no device TLB invalidation pass down. But currently for guest vSVA, device TLB invalidation is passed down. Perhaps we can avoid passing down dev TLB flush just like what we are doing for guest IOVA.
Quoted 5 lines
I think dev TLB is fully handled within IOMMU driver today. It doesn't require device driver to explicit toggle. With this then we can fully virtualize guest dev TLB invalidation request to save one syscall, since the host is supposed to flush dev TLB when serving the earlier IOTLB invalidation pass-down.
Quoted 5 lines
In the previous discussions, we thought about making IOTLB flush inclusive, where IOTLB flush would always include device TLB flush. But we thought such behavior cannot be assumed for all VMMs, some may still do explicit dev TLB flush. So for completeness, we included dev TLB here.
Quoted 10 lines
is there such example or a link to previous discussion? Here we are talking about host IOMMU driver behavior, instead of VMM. But I'm not strong on this, since it's more an optimization. But there remains one unclear area. If we do want to support such usage with explicit dev TLB flush, how does host IOMMU driver avoid doing implicit dev TLB flush when serving iotlb invalidation request? Is it already designed such way that user-passed-down iotlb invalidation request only invalidates iotlb while kernel-triggered iotlb invalidation still does implicit dev TLB flush?
The current design with vIOMMU in QEMU will prevent explicit dev TLB flush. Host will always do inclusive IOTLB and dev TLB flush on IOTLB flush request.
For other VMM which does not do this optimization, we just leave a path for explicit dev TLB flush. Redundant but for IOMMU driver perspective it is complete. We don't avoid the redundancy as there is no damage outside the guest, just as we don't prevent guest doing the same flush twice.
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH v7 11/11] iommu/vt-d: Add svm/sva invalidate function
In reply to Tian, KevinQuoted 14 lines · Kevin
Quoted 9 lines
From: Jacob Pan [mailto:[email protected]]
Sent: Friday, October 25, 2019 3:55 AMWhen Shared Virtual Address (SVA) is enabled for a guest OS via vIOMMU, we need to provide invalidation support at IOMMU API and driver
level. This patch adds Intel VT-d specific function to implement iommu passdown invalidate API for shared virtual address.Quoted 4 lines
The use case is for supporting caching structure invalidation of assigned SVM capable devices. Emulated IOMMU exposes queue invalidation capability and passes down all descriptors from the guest to the physical IOMMU.
Quoted 5 lines
specifically you may clarify that only invalidations related to first-level page table is passed down, because it's guest structure being bound to the first-level. other descriptors are emulated or translated into other necessary operations.
Sounds good, will do.
Quoted 8 lines
Quoted 5 lines
The assumption is that guest to host device ID mapping should be resolved prior to calling IOMMU driver. Based on the device handle, host IOMMU driver can replace certain fields before submit to the invalidation queue.
what is device ID? it's a bit confusing term here.
Device ID meant requester IDs, or guest to host PCI BDF mapping should be resolved such that passdown invalidation is targeting host PCI device. I will rephrase.
Quoted 243 lines
Quoted 54 lines
Signed-off-by Jacob Pan <[email protected]>Signed-off-by Ashok Raj <[email protected]>Signed-off-by Liu, Yi L <[email protected]>--- drivers/iommu/intel-iommu.c | 170 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 170 insertions(+)(quoted diff) +0
-0
b/drivers/iommu/intel-iommu.cindex5fab32fbc4b4..a73e76d6457a100644 ---a/drivers/iommu/intel-iommu.c
+++b/drivers/iommu/intel-iommu.cdrivers/iommu/intel-iommu.c +2
-0@@ -5491,6 +5491,175 @@ static void intel_iommu_aux_detach_device(struct iommu_domain *domain,aux_domain_remove_dev (to_dmar_domain(domain ), dev); } +/* +* 2D array for converting and sanitizing IOMMU generic TLB granularity to
+ * VT-d granularity. Invalidation is typically included in the unmap operation
+ * as a result of DMA or VFIO unmap. However, for assigned device where guest
+ * could own the first level page tables without being shadowed by QEMU. In
+ * this case there is no pass down unmap to the host IOMMU as a result of unmap
+ * in the guest. Only invalidations are trapped and passed down.
+ * In all cases, only first level TLB invalidation (request with PASID) can be
+ * passed down, therefore we do not include IOTLB granularity for request
+ * without PASID (second level).
+ *
+ * For an example, to find the VT-d granularity encoding for IOTLB
+ * type and page selective granularity within PASID:
+ * X: indexed by iommu cache type
+ * Y: indexed by enumiommu_inv_granularity
+ * [IOMMU_CACHE_INV_TYPE_IOTLB][IOMMU_INV_GRANU_ADDR]
+ *
+ *Granu_maparray indicates validity of the table. 1: valid, 0:
invalid
+ *
+ */
+const static int inv_type_granu_map[IOMMU_CACHE_INV_TYPE_NR][IOMMU_INV_GRANU_NR] = {(quoted diff) +1
-0+ /* PASID based IOTLB, support PASID selective and pageselective */
(quoted diff) +2
-0+ {0, 1, 1}, + /* PASID based dev TLBs, only support all PASIDs or singlePASID */
drivers/iommu/intel-iommu.c static void intel_iommu_aux_detach_device(struct iommu_domain *domain, · line 5518
Quoted 1 line
drivers/iommu/intel-iommu.c +1
-0+ {1, 1, 0},I forgot previous discussion. is it necessary to pass down dev TLB invalidation requests? Can it be handled by host iOMMU driver automatically?
Quoted 183 lines
drivers/iommu/intel-iommu.c +5
-0+/* PASID cache */ + {1, 1, 0} +}; + +const static u64inv_type_granu_table[IOMMU_CACHE_INV_TYPE_NR][IOMMU_INV_GRAN
U_NR] = {drivers/iommu/intel-iommu.c +9
-0+/* PASID based IOTLB */ + {0, QI_GRAN_NONG_PASID, QI_GRAN_PSI_PASID}, +/* PASID based dev TLBs */ + {QI_DEV_IOTLB_GRAN_ALL, QI_DEV_IOTLB_GRAN_PASID_SEL, 0}, +/* PASID cache */ + {QI_PC_ALL_PASIDS, QI_PC_PASID_SEL, 0}, +}; + +static inline int to_vtd_granularity(int type, int granu, u64
*vtd_granu) +{(quoted diff) +1
-0+ if (type >= IOMMU_CACHE_INV_TYPE_NR || granu >=
IOMMU_INV_GRANU_NR||drivers/iommu/intel-iommu.c +11
-0+ !inv_type_granu_map[type][granu]) +return -EINVAL ; + + *vtd_granu = inv_type_granu_table[type][granu]; + +return 0 ; +} + +static inline u64 to_vtd_size (u64 granu_size,u64 nr_granules) +{ + u64 nr_pages = (granu_size * nr_granules) >>
VTD_PAGE_SHIFT; +(quoted diff) +1
-0+ /* VT-d size is encoded as 2^size of 4K pages, 0 for 4k, 9for 2MB, etc.
(quoted diff) +1
-0+ * IOMMU cache invalidate API passes granu_size in bytes,and number of
drivers/iommu/intel-iommu.c +8
-0+* granu size in contiguous memory. +*/ +return order_base_2 (nr_pages); +} + +#ifdef CONFIG_INTEL_IOMMU_SVM +static int intel_iommu_sva_invalidate(struct iommu_domain *domain, + struct device *dev, struct
iommu_cache_invalidate_info*inv_info)drivers/iommu/intel-iommu.c +13
-0+{ + struct dmar_domain *dmar_domain = to_dmar_domain(domain); + struct device_domain_info *info; + struct intel_iommu *iommu; + unsigned long flags; + int cache_type; + u8 bus, devfn; + u16 did, sid; + int ret = 0; + u64 size; + + if (!inv_info || !dmar_domain || + inv_info->version !=
IOMMU_CACHE_INVALIDATE_INFO_VERSION_1)drivers/iommu/intel-iommu.c +12
-0+return -EINVAL ; + +if (!dev || !dev_is_pci (dev)) +return -ENODEV ; + + iommu =device_to_iommu (dev, &bus, &devfn); +if (!iommu) +return -ENODEV ; + +spin_lock_irqsave (&device_domain_lock, flags); +spin_lock (&iommu->lock); + info = iommu_support_dev_iotlb(dmar_domain, iommu, bus,devfn);
drivers/iommu/intel-iommu.c +7
-0+if (!info) { + ret = -EINVAL ; + goto out_unlock; + } + did = dmar_domain->iommu_did[iommu->seq_id]; + sid =PCI_DEVID (bus, devfn); + size = to_vtd_size(inv_info->addr_info.granule_size,inv_info-
Quoted 1 line
addr_info.nb_granules);
(quoted diff) +2
-0+ + for_each_set_bit(cache_type, (unsigned long*)&inv_info->cache,
IOMMU_CACHE_INV_TYPE_NR) {drivers/iommu/intel-iommu.c +4
-0+u64 granu =0 ; +u64 pasid =0 ; + + ret = to_vtd_granularity(cache_type,
inv_info->granularity, &granu);(quoted diff) +2
-0+ if (ret) { + pr_err("Invalid cache type and granucombination %d/%d\n",
cache_type,drivers/iommu/intel-iommu.c +5
-0+ inv_info->granularity); +break ; + } + +/* PASID is stored in different locations based on granularity */
drivers/iommu/intel-iommu.c +3
-0+if (inv_info->granularity ==IOMMU_INV_GRANU_PASID ) + pasid = inv_info->pasid_info.pasid; + else if (inv_info->granularity ==
IOMMU_INV_GRANU_ADDR)drivers/iommu/intel-iommu.c +3
-0+ pasid = inv_info->addr_info.pasid; + else { + pr_err("Cannot find PASID for given cachetype and granularity\n");
drivers/iommu/intel-iommu.c +6
-0+break ; + } + +switch (BIT (cache_type)) { +case IOMMU_CACHE_INV_TYPE_IOTLB : + if (size && (inv_info->addr_info.addr &((
BIT(VTD_PAGE_SHIFT + size)) - 1))) {(quoted diff) +1
-0+ pr_err("Address out of range,0x%llx, size order %llu\n",
(quoted diff) +1
-0+ inv_info->addr_info.addr,size);
drivers/iommu/intel-iommu.c +5
-0+ ret = -ERANGE ; + goto out_unlock; + } + + qi_flush_piotlb(iommu, did,
mm_to_dma_pfn(inv_info->addr_info.addr),(quoted diff) +1
-0+ pasid, size, granu,inv_info-
Quoted 1 line
addr_info.flags &
IOMMU_INV_ADDR_FLAGS_LEAF);drivers/iommu/intel-iommu.c +3
-0+ +/* +* Always flush device IOTLB if ATS is enabled since guest
(quoted diff) +1
-0+ * vIOMMU exposes CM = 1, no device IOTLBflush will be passed
drivers/iommu/intel-iommu.c +4
-0+* down. +*/ +if (info->ats_enabled) { + qi_flush_dev_piotlb(iommu, sid,
info->pfsid,(quoted diff) +1
-0+ pasid,
info->ats_qdep,
+inv_info->addr_info.addr, size,drivers/iommu/intel-iommu.c +6
-0+ granu); + } +break ; +case IOMMU_CACHE_INV_TYPE_DEV_IOTLB : +if (info->ats_enabled) { + qi_flush_dev_piotlb(iommu, sid,
info->pfsid,
+inv_info->addr_info.pasid,info->ats_qdep,
+inv_info->addr_info.addr, size,drivers/iommu/intel-iommu.c +3
-0+ granu); + }else + pr_warn("Passdown device IOTLBflush w/o ATS!\n");
drivers/iommu/intel-iommu.c +4
-0+ +break ; +case IOMMU_CACHE_INV_TYPE_PASID : + qi_flush_pasid_cache(iommu, did, granu,inv_info-
Quoted 1 line
pasid_info.pasid);
drivers/iommu/intel-iommu.c +4
-0+ +break ; +default : + dev_err(dev, "Unsupported IOMMUinvalidation type %d\n",
drivers/iommu/intel-iommu.c +12
-0+ cache_type); + ret = -EINVAL; + } + } +out_unlock: +spin_unlock (&iommu->lock); +spin_unlock_irqrestore (&device_domain_lock, flags); + +return ret; +} +#endif +static int intel_iommu_map (struct iommu_domain *domain,unsigned long iova,phys_addr_t hpa,size_t size,int iommu_prot)@@ -6027,6 +6196,7 @@ const struct iommu_ops intel_iommu_ops = { .is_attach_deferred =
Quoted 9 lines
Quoted 8 lines
intel_iommu_is_attach_deferred, .pgsize_bitmap =INTEL_IOMMU_PGSIZES, #ifdefCONFIG_INTEL_IOMMU_SVMdrivers/iommu/intel-iommu.c +1
-1+ .cache_invalidate = intel_iommu_sva_invalidate, .sva_bind_gpasid = intel_svm_bind_gpasid, .sva_unbind_gpasid = intel_svm_unbind_gpasid,#endif --2.7.4
[Jacob Pan]
Re: [PATCH v7 11/11] iommu/vt-d: Add svm/sva invalidate function
In reply to Jacob PanHi Jacob,
Quoted 27 lines · Jacob Pan
When Shared Virtual Address (SVA) is enabled for a guest OS via vIOMMU, we need to provide invalidation support at IOMMU API and driver level. This patch adds Intel VT-d specific function to implement iommu passdown invalidate API for shared virtual address.
The use case is for supporting caching structure invalidation of assigned SVM capable devices. Emulated IOMMU exposes queue invalidation capability and passes down all descriptors from the guest to the physical IOMMU.
The assumption is that guest to host device ID mapping should be resolved prior to calling IOMMU driver. Based on the device handle, host IOMMU driver can replace certain fields before submit to the invalidation queue.
Signed-off-by Jacob Pan <[email protected]>Signed-off-by Ashok Raj <[email protected]>Signed-off-by Liu, Yi L <[email protected]>--- drivers/iommu/intel-iommu.c | 170 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 170 insertions(+)drivers/iommu/intel-iommu.c +0
-0
drivers/iommu/intel-iommu.c static void intel_iommu_aux_detach_device(struct iommu_domain *domain, · line 5498
Quoted 8 lines
drivers/iommu/intel-iommu.c +5
-0@@ -5491,6 +5491,175 @@ static void intel_iommu_aux_detach_device(struct iommu_domain *domain,aux_domain_remove_dev (to_dmar_domain (domain), dev); } +/* +* 2D array for converting and sanitizing IOMMU generic TLB granularity to +* VT-d granularity. Invalidation is typically included in the unmap operation +* as a result of DMA or VFIO unmap. However, for assigned device where guest +* could own the first level page tables without being shadowed by QEMU. In
above sentence needs to be rephrased.
drivers/iommu/intel-iommu.c static void intel_iommu_aux_detach_device(struct iommu_domain *domain, · line 5505
Quoted 7 lines
drivers/iommu/intel-iommu.c +7
-0+* this case there is no pass down unmap to the host IOMMU as a result of unmap +* in the guest. Only invalidations are trapped and passed down. +* In all cases, only first level TLB invalidation (request with PASID) can be +* passed down, therefore we do not include IOTLB granularity for request +* without PASID (second level). +* +* For an example, to find the VT-d granularity encoding for IOTLB
for example
drivers/iommu/intel-iommu.c static void intel_iommu_aux_detach_device(struct iommu_domain *domain, · line 5515
Quoted 10 lines
drivers/iommu/intel-iommu.c +10
-0+* type and page selective granularity within PASID: +* X: indexed by iommu cache type +* Y: indexed by enum iommu_inv_granularity +* [IOMMU_CACHE_INV_TYPE_IOTLB][IOMMU_INV_GRANU_ADDR] +* +* Granu_map array indicates validity of the table. 1: valid, 0: invalid +* +*/ +const static int inv_type_granu_map[IOMMU_CACHE_INV_TYPE_NR ][IOMMU_INV_GRANU_NR ] = { +/* PASID based IOTLB, support PASID selective and page selective */
I would rather use the generic terminology, ie. IOTLB invalidation supports PASID and ADDR granularity
drivers/iommu/intel-iommu.c static void intel_iommu_aux_detach_device(struct iommu_domain *domain, · line 5516
Quoted 1 line
drivers/iommu/intel-iommu.c +1
-0+ {0, 1, 1},> + /* PASID based dev TLBs, only support all PASIDs or single PASID */
Device IOLTB invalidation supports DOMAIN and PASID granularities
drivers/iommu/intel-iommu.c static void intel_iommu_aux_detach_device(struct iommu_domain *domain, · line 5518
Quoted 2 lines
drivers/iommu/intel-iommu.c +2
-0+ {1, 1, 0}, +/* PASID cache */
PASID cache invalidation support DOMAIN and PASID granularity
drivers/iommu/intel-iommu.c static void intel_iommu_aux_detach_device(struct iommu_domain *domain, · line 5532
Quoted 13 lines
drivers/iommu/intel-iommu.c +13
-0+ {1, 1, 0} +}; + +const static u64 inv_type_granu_table[IOMMU_CACHE_INV_TYPE_NR ][IOMMU_INV_GRANU_NR ] = { +/* PASID based IOTLB */ + {0 ,QI_GRAN_NONG_PASID ,QI_GRAN_PSI_PASID }, +/* PASID based dev TLBs */ + {QI_DEV_IOTLB_GRAN_ALL ,QI_DEV_IOTLB_GRAN_PASID_SEL ,0 }, +/* PASID cache */ + {QI_PC_ALL_PASIDS ,QI_PC_PASID_SEL ,0 }, +}; + +static inline int to_vtd_granularity (int type,int granu,u64 *vtd_granu)
nit: this looks a bit weird to me to manipulate an u64 here. Why not use a int
Quoted 60 lines
drivers/iommu/intel-iommu.c +60
-0+{ +if (type >=IOMMU_CACHE_INV_TYPE_NR || granu >=IOMMU_INV_GRANU_NR || + !inv_type_granu_map[type][granu]) +return -EINVAL ; + + *vtd_granu = inv_type_granu_table[type][granu];> + + return 0; +} + +static inline u64 to_vtd_size (u64 granu_size,u64 nr_granules) +{ +u64 nr_pages = (granu_size * nr_granules) >>VTD_PAGE_SHIFT ; + +/* VT-d size is encoded as 2^size of 4K pages, 0 for 4k, 9 for 2MB, etc. +* IOMMU cache invalidate API passes granu_size in bytes, and number of +* granu size in contiguous memory. +*/ +return order_base_2 (nr_pages); +} + +#ifdef CONFIG_INTEL_IOMMU_SVM +static int intel_iommu_sva_invalidate (struct iommu_domain *domain, +struct device *dev,struct iommu_cache_invalidate_info *inv_info) +{ +struct dmar_domain *dmar_domain =to_dmar_domain (domain); +struct device_domain_info *info; +struct intel_iommu *iommu; +unsigned long flags; +int cache_type; +u8 bus, devfn; +u16 did, sid; +int ret =0 ; +u64 size; + +if (!inv_info || !dmar_domain || + inv_info->version !=IOMMU_CACHE_INVALIDATE_INFO_VERSION_1 ) +return -EINVAL ; + +if (!dev || !dev_is_pci (dev)) +return -ENODEV ; + + iommu =device_to_iommu (dev, &bus, &devfn); +if (!iommu) +return -ENODEV ; + +spin_lock_irqsave (&device_domain_lock, flags); +spin_lock (&iommu->lock); + info =iommu_support_dev_iotlb (dmar_domain, iommu, bus, devfn); +if (!info) { + ret = -EINVAL ; + goto out_unlock; + } + did = dmar_domain->iommu_did[iommu->seq_id]; + sid =PCI_DEVID (bus, devfn); + size =to_vtd_size (inv_info->addr_info.granule_size, inv_info->addr_info.nb_granules); + +for_each_set_bit (cache_type, (unsigned long *)&inv_info->cache,IOMMU_CACHE_INV_TYPE_NR ) { +u64 granu =0 ; +u64 pasid =0 ; +
drivers/iommu/intel-iommu.c static void intel_iommu_aux_detach_device(struct iommu_domain *domain, · line 5603
Quoted 10 lines
drivers/iommu/intel-iommu.c +10
-0+ ret =to_vtd_granularity (cache_type, inv_info->granularity, &granu); +if (ret) { +pr_err ("Invalid cache type and granu combination %d/%d\n" , cache_type, + inv_info->granularity); +break ; + } + +/* PASID is stored in different locations based on granularity */ +if (inv_info->granularity ==IOMMU_INV_GRANU_PASID ) + pasid = inv_info->pasid_info.pasid;
you need to check IOMMU_INV_ADDR_FLAGS_PASID in flags
drivers/iommu/intel-iommu.c static void intel_iommu_aux_detach_device(struct iommu_domain *domain, · line 5605
Quoted 2 lines
drivers/iommu/intel-iommu.c +2
-0+else if (inv_info->granularity ==IOMMU_INV_GRANU_ADDR ) + pasid = inv_info->addr_info.pasid;
same
drivers/iommu/intel-iommu.c static void intel_iommu_aux_detach_device(struct iommu_domain *domain, · line 5614
Quoted 9 lines
drivers/iommu/intel-iommu.c +9
-0+else { +pr_err ("Cannot find PASID for given cache type and granularity\n" ); +break ; + } + +switch (BIT (cache_type)) { +case IOMMU_CACHE_INV_TYPE_IOTLB : +if (size && (inv_info->addr_info.addr & ((BIT (VTD_PAGE_SHIFT + size)) -1 ))) { + pr_err("Address out of range, 0x%llx, size order %llu\n",
don't you mean address not correctly aligned?
Quoted 53 lines
drivers/iommu/intel-iommu.c +48
-0+ inv_info->addr_info.addr, size); + ret = -ERANGE ; + goto out_unlock; + } + +qi_flush_piotlb (iommu, did,mm_to_dma_pfn (inv_info->addr_info.addr), + pasid, size, granu, inv_info->addr_info.flags &IOMMU_INV_ADDR_FLAGS_LEAF ); + +/* +* Always flush device IOTLB if ATS is enabled since guest +* vIOMMU exposes CM = 1, no device IOTLB flush will be passed +* down. +*/ +if (info->ats_enabled) { +qi_flush_dev_piotlb (iommu, sid, info->pfsid, + pasid, info->ats_qdep, + inv_info->addr_info.addr, size, + granu); + } +break ; +case IOMMU_CACHE_INV_TYPE_DEV_IOTLB : +if (info->ats_enabled) { +qi_flush_dev_piotlb (iommu, sid, info->pfsid, + inv_info->addr_info.pasid, info->ats_qdep, + inv_info->addr_info.addr, size, + granu); + }else +pr_warn ("Passdown device IOTLB flush w/o ATS!\n" ); + +break ; +case IOMMU_CACHE_INV_TYPE_PASID : +qi_flush_pasid_cache (iommu, did, granu, inv_info->pasid_info.pasid); + +break ; +default : +dev_err (dev,"Unsupported IOMMU invalidation type %d\n" , + cache_type); + ret = -EINVAL; + } + } +out_unlock: +spin_unlock (&iommu->lock); +spin_unlock_irqrestore (&device_domain_lock, flags); + +return ret; +} +#endif +static int intel_iommu_map (struct iommu_domain *domain,unsigned long iova,phys_addr_t hpa,size_t size,int iommu_prot)
drivers/iommu/intel-iommu.c const struct iommu_ops intel_iommu_ops = { · line 6202
Quoted 7 lines
drivers/iommu/intel-iommu.c +1
-0@@ -6027,6 +6196,7 @@ const struct iommu_ops intel_iommu_ops = { .is_attach_deferred = intel_iommu_is_attach_deferred, .pgsize_bitmap =INTEL_IOMMU_PGSIZES , #ifdef CONFIG_INTEL_IOMMU_SVM + .cache_invalidate = intel_iommu_sva_invalidate, .sva_bind_gpasid = intel_svm_bind_gpasid, .sva_unbind_gpasid = intel_svm_unbind_gpasid, #endif
Thanks
Eric
Re: [PATCH v7 11/11] iommu/vt-d: Add svm/sva invalidate function
Hi Eric,
Thanks for the review, I somehow missed it, my apologies. See comments below.
Quoted 34 lines · On Tue, 12 Nov 2019 11:28:37 +0100 Auger Eric <[email protected]> wrote:
Hi Jacob,
Quoted 31 lines · Jacob Pan
When Shared Virtual Address (SVA) is enabled for a guest OS via vIOMMU, we need to provide invalidation support at IOMMU API and driver level. This patch adds Intel VT-d specific function to implement iommu passdown invalidate API for shared virtual address.
The use case is for supporting caching structure invalidation of assigned SVM capable devices. Emulated IOMMU exposes queue invalidation capability and passes down all descriptors from the guest to the physical IOMMU.
The assumption is that guest to host device ID mapping should be resolved prior to calling IOMMU driver. Based on the device handle, host IOMMU driver can replace certain fields before submit to the invalidation queue.
Signed-off-by Jacob Pan <[email protected]>Signed-off-by Ashok Raj <[email protected]>Signed-off-by Liu, Yi L <[email protected]>--- drivers/iommu/intel-iommu.c | 170++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 170 insertions(+)
(quoted diff) +0
-0
b/drivers/iommu/intel-iommu.cindex5fab32fbc4b4..a73e76d6457a100644 ---a/drivers/iommu/intel-iommu.c
+++b/drivers/iommu/intel-iommu.c(quoted diff) +0
-0@@ -5491,6 +5491,175 @@ static void intel_iommu_aux_detach_device(struct iommu_domain *domain, aux_domain_remove_dev(to_dmar_domain(domain), dev); }
Quoted 10 lines
Quoted 9 lines
(quoted diff) +2
-0+/* + * 2D array for converting and sanitizing IOMMU generic TLBgranularity to
+ * VT-d granularity. Invalidation is typically included in the unmap operation
+ * as a result of DMA or VFIO unmap. However, for assigned device where guest
+ * could own the first level page tables without being shadowed by QEMU. Inabove sentence needs to be rephrased.
Yes, how about this:
/*
* 2D array for converting and sanitizing IOMMU generic TLB granularity
to
* VT-d granularity. Invalidation is typically included in the unmap
operation
* as a result of DMA or VFIO unmap. However, for assigned devices guest
* owns the first level page tables. Invalidations of translation
caches in the
* guest are trapped and passed down to the host.
*
* vIOMMU in the guest will only expose first level page tables,
therefore
* we do not include IOTLB granularity for request without PASID
(second level). *
* For example, to find the VT-d granularity encoding for IOTLB
Quoted 11 lines
Quoted 11 lines
+ * this case there is no pass down unmap to the host IOMMU as a result of unmap
+ * in the guest. Only invalidations are trapped and passed down.
+ * In all cases, only first level TLB invalidation (request with PASID) can be
+ * passed down, therefore we do not include IOTLB granularity for request
+ * without PASID (second level).
+ *
+ * For an example, to find the VT-d granularity encoding for IOTLB
Quoted 1 line
for example
sounds better.
Quoted 7 lines
Quoted 7 lines
+ * type and page selective granularity within PASID:
+ * X: indexed by iommu cache type
+ * Y: indexed by enumiommu_inv_granularity
+ * [IOMMU_CACHE_INV_TYPE_IOTLB][IOMMU_INV_GRANU_ADDR]
+ *
+ *Granu_maparray indicates validity of the table. 1: valid, 0:
invalid
Quoted 8 lines
Quoted 6 lines
+ *
+ */
+const static int inv_type_granu_map[IOMMU_CACHE_INV_TYPE_NR][IOMMU_INV_GRANU_NR] = {(quoted diff) +1
-0+ /* PASID based IOTLB, support PASID selective and pageselective */
I would rather use the generic terminology, ie. IOTLB invalidation supports PASID and ADDR granularity
Understood. My choice of terminology is based on VT-d spec and this is VT-d only code. Perhaps add the generic terms by the side? i.e. /*
* PASID based IOTLB invalidation: PASID selective (per PASID),
* page selective (address granularity)
*/
Quoted 16 lines
Quoted 2 lines
(quoted diff) +1
-0+ {0, 1, 1},> + /* PASID based dev TLBs, only supportall PASIDs or single PASID */
Device IOLTB invalidation supports DOMAIN and PASID granularities
Review
Quoted 2 lines
(quoted diff) +2
-0+ {1, 1, 0}, + /* PASID cache */PASID cache invalidation support DOMAIN and PASID granularity
Quoted 10 lines
drivers/iommu/intel-iommu.c +4
-0+ {1, 1, 0} +}; + +const static u64inv_type_granu_table[IOMMU_CACHE_INV_TYPE_NR][IOMMU_INV_GRANU_NR] = {
drivers/iommu/intel-iommu.c +4
-0+/* PASID based IOTLB */ + {0, QI_GRAN_NONG_PASID, QI_GRAN_PSI_PASID}, +/* PASID based dev TLBs */ + {QI_DEV_IOTLB_GRAN_ALL, QI_DEV_IOTLB_GRAN_PASID_SEL, 0},
Quoted 8 lines
Quoted 6 lines
drivers/iommu/intel-iommu.c +5
-0+/* PASID cache */ + {QI_PC_ALL_PASIDS, QI_PC_PASID_SEL, 0}, +}; + +static inline int to_vtd_granularity(int type, int granu, u64
*vtd_granu)nit: this looks a bit weird to me to manipulate an u64 here. Why not use a int
Yes, should be int.
Quoted 72 lines
Quoted 72 lines
(quoted diff) +2
-0+{ + if (type >= IOMMU_CACHE_INV_TYPE_NR || granu >=
IOMMU_INV_GRANU_NR||drivers/iommu/intel-iommu.c +10
-0+ !inv_type_granu_map[type][granu]) +return -EINVAL ; + + *vtd_granu = inv_type_granu_table[type][granu];> + + return 0; +} + +static inline u64 to_vtd_size (u64 granu_size,u64 nr_granules) +{ + u64 nr_pages = (granu_size * nr_granules) >>
VTD_PAGE_SHIFT; +(quoted diff) +1
-0+ /* VT-d size is encoded as 2^size of 4K pages, 0 for 4k, 9for 2MB, etc.
(quoted diff) +1
-0+ * IOMMU cache invalidate API passes granu_size in bytes,and number of
drivers/iommu/intel-iommu.c +8
-0+* granu size in contiguous memory. +*/ +return order_base_2 (nr_pages); +} + +#ifdef CONFIG_INTEL_IOMMU_SVM +static int intel_iommu_sva_invalidate(struct iommu_domain *domain, + struct device *dev, struct
iommu_cache_invalidate_info*inv_info) +{drivers/iommu/intel-iommu.c +12
-0+struct dmar_domain *dmar_domain =to_dmar_domain (domain); +struct device_domain_info *info; +struct intel_iommu *iommu; +unsigned long flags; +int cache_type; +u8 bus, devfn; +u16 did, sid; +int ret =0 ; +u64 size; + +if (!inv_info || !dmar_domain || + inv_info->version !=
IOMMU_CACHE_INVALIDATE_INFO_VERSION_1)drivers/iommu/intel-iommu.c +12
-0+return -EINVAL ; + +if (!dev || !dev_is_pci (dev)) +return -ENODEV ; + + iommu =device_to_iommu (dev, &bus, &devfn); +if (!iommu) +return -ENODEV ; + +spin_lock_irqsave (&device_domain_lock, flags); +spin_lock (&iommu->lock); + info = iommu_support_dev_iotlb(dmar_domain, iommu, bus,devfn);
drivers/iommu/intel-iommu.c +7
-0+if (!info) { + ret = -EINVAL ; + goto out_unlock; + } + did = dmar_domain->iommu_did[iommu->seq_id]; + sid =PCI_DEVID (bus, devfn); + size = to_vtd_size(inv_info->addr_info.granule_size,
inv_info->addr_info.nb_granules); +(quoted diff) +1
-0+ for_each_set_bit(cache_type, (unsigned long*)&inv_info->cache,
IOMMU_CACHE_INV_TYPE_NR) {drivers/iommu/intel-iommu.c +4
-0+u64 granu =0 ; +u64 pasid =0 ; + + ret = to_vtd_granularity(cache_type,
inv_info->granularity, &granu);(quoted diff) +2
-0+ if (ret) { + pr_err("Invalid cache type and granucombination %d/%d\n",
cache_type,drivers/iommu/intel-iommu.c +1
-0+ inv_info->granularity);
Quoted 8 lines
drivers/iommu/intel-iommu.c static void intel_iommu_aux_detach_device(struct iommu_domain *domain, · line 5603
Quoted 7 lines
drivers/iommu/intel-iommu.c +4
-0+break ; + } + +/* PASID is stored in different locations based on granularity */
drivers/iommu/intel-iommu.c +2
-0+if (inv_info->granularity ==IOMMU_INV_GRANU_PASID ) + pasid = inv_info->pasid_info.pasid;you need to check
IOMMU_INV_ADDR_FLAGS_PASIDin flags
You mean to check IOMMU_INV_PASID_FLAGS_PASID?
You are right we need to check this flag to make sure the PASID value is valid. i.e.
if (inv_info->granularity == IOMMU_INV_GRANU_PASID &&
inv_info->pasid_info.flags & IOMMU_INV_PASID_FLAGS_PASID) pasid = inv_info->pasid_info.pasid;
Quoted 4 lines
drivers/iommu/intel-iommu.c static void intel_iommu_aux_detach_device(struct iommu_domain *domain, · line 5605
Quoted 3 lines
(quoted diff) +1
-0+ else if (inv_info->granularity ==
IOMMU_INV_GRANU_ADDR)drivers/iommu/intel-iommu.c +1
-0+ pasid = inv_info->addr_info.pasid;same
Ditto.
else if (inv_info->granularity == IOMMU_INV_GRANU_ADDR &&
inv_info->addr_info.flags & IOMMU_INV_ADDR_FLAGS_PASID) pasid = inv_info->addr_info.pasid;
Quoted 86 lines
Quoted 11 lines
(quoted diff) +2
-0+ else { + pr_err("Cannot find PASID for given cachetype and granularity\n");
drivers/iommu/intel-iommu.c +6
-0+break ; + } + +switch (BIT (cache_type)) { +case IOMMU_CACHE_INV_TYPE_IOTLB : + if (size && (inv_info->addr_info.addr &((
BIT(VTD_PAGE_SHIFT + size)) - 1))) {(quoted diff) +1
-0+ pr_err("Address out of range,Quoted 1 line
0x%llx, size order %llu\n",
don't you mean address not correctly aligned?
Quoted 67 lines
(quoted diff) +1
-0+ inv_info->addr_info.addr,size);
drivers/iommu/intel-iommu.c +5
-0+ ret = -ERANGE ; + goto out_unlock; + } + + qi_flush_piotlb(iommu, did,
mm_to_dma_pfn(inv_info->addr_info.addr),(quoted diff) +1
-0+ pasid, size, granu,
inv_info->addr_info.flags&IOMMU_INV_ADDR_FLAGS_LEAF); +(quoted diff) +2
-0+ /* + * Always flush device IOTLB if ATS isenabled since guest
(quoted diff) +1
-0+ * vIOMMU exposes CM = 1, no device IOTLBflush will be passed
drivers/iommu/intel-iommu.c +4
-0+* down. +*/ +if (info->ats_enabled) { + qi_flush_dev_piotlb(iommu, sid,
info->pfsid,(quoted diff) +1
-0+ pasid,
info->ats_qdep,
+inv_info->addr_info.addr, size,drivers/iommu/intel-iommu.c +6
-0+ granu); + } +break ; +case IOMMU_CACHE_INV_TYPE_DEV_IOTLB : +if (info->ats_enabled) { + qi_flush_dev_piotlb(iommu, sid,
info->pfsid,
+inv_info->addr_info.pasid,info->ats_qdep,
+inv_info->addr_info.addr, size,drivers/iommu/intel-iommu.c +3
-0+ granu); + }else + pr_warn("Passdown device IOTLBflush w/o ATS!\n"); +
drivers/iommu/intel-iommu.c +3
-0+break ; +case IOMMU_CACHE_INV_TYPE_PASID : + qi_flush_pasid_cache(iommu, did, granu,
inv_info->pasid_info.pasid); +drivers/iommu/intel-iommu.c +3
-0+break ; +default : + dev_err(dev, "Unsupported IOMMUinvalidation type %d\n",
drivers/iommu/intel-iommu.c +12
-0+ cache_type); + ret = -EINVAL; + } + } +out_unlock: +spin_unlock (&iommu->lock); +spin_unlock_irqrestore (&device_domain_lock, flags); + +return ret; +} +#endif +static int intel_iommu_map (struct iommu_domain *domain,unsigned long iova,phys_addr_t hpa,size_t size,int iommu_prot)@@ -6027,6 +6196,7 @@ const struct iommu_ops intel_iommu_ops = { .is_attach_deferred =
intel_iommu_is_attach_deferred, .pgsize_bitmap =INTEL_IOMMU_PGSIZES, #ifdefCONFIG_INTEL_IOMMU_SVMdrivers/iommu/intel-iommu.c const struct iommu_ops intel_iommu_ops = { · line 6202
Quoted 4 lines
drivers/iommu/intel-iommu.c +1
-0+ .cache_invalidate = intel_iommu_sva_invalidate, .sva_bind_gpasid = intel_svm_bind_gpasid, .sva_unbind_gpasid = intel_svm_unbind_gpasid,#endif Thanks
Quoted 2 lines
Eric
Thanks,
Jacob