[PATCH v12 01/13] vfio: VFIO_IOMMU_SET_PASID_TABLE
From: "Liu, Yi L" This patch adds an VFIO_IOMMU_SET_PASID_TABLE ioctl which aims to pass the virtual iommu guest configuration to the host. This latter takes the form of the so-called PASID table. Signed-off-by: Jacob Pan Signed-off-by: Liu, Yi L Signed-off-by: Eric Auger --- v11 -> v12: - use iommu_uapi_set_pasid_table - Rework the flags checks [Zenghui, Alex] - use VFIO_BASE + 19 [Alex] - rework the unwind in vfio_attach_pasid_table() [Alex] v8 -> v9: - Merge VFIO_IOMMU_ATTACH/DETACH_PASID_TABLE into a single VFIO_IOMMU_SET_PASID_TABLE ioctl. v6 -> v7: - add a comment related to VFIO_IOMMU_DETACH_PASID_TABLE v3 -> v4: - restore ATTACH/DETACH - add unwind on failure v2 -> v3: - s/BIND_PASID_TABLE/SET_PASID_TABLE v1 -> v2: - s/BIND_GUEST_STAGE/BIND_PASID_TABLE - remove the struct device arg --- drivers/vfio/vfio_iommu_type1.c | 58 + include/uapi/linux/vfio.h | 19 +++ 2 files changed, 77 insertions(+) diff --git a/drivers/vfio/vfio_iommu_type1.c b/drivers/vfio/vfio_iommu_type1.c index 0b4dedaa9128..50c4f8ae5b03 100644 --- a/drivers/vfio/vfio_iommu_type1.c +++ b/drivers/vfio/vfio_iommu_type1.c @@ -2587,6 +2587,39 @@ static int vfio_iommu_iova_build_caps(struct vfio_iommu *iommu, return ret; } +static void +vfio_detach_pasid_table(struct vfio_iommu *iommu) +{ + struct vfio_domain *d; + + mutex_lock(&iommu->lock); + list_for_each_entry(d, &iommu->domain_list, next) + iommu_detach_pasid_table(d->domain); + + mutex_unlock(&iommu->lock); +} + +static int +vfio_attach_pasid_table(struct vfio_iommu *iommu, unsigned long arg) +{ + struct vfio_domain *d; + int ret = 0; + + mutex_lock(&iommu->lock); + + list_for_each_entry(d, &iommu->domain_list, next) { + ret = iommu_uapi_attach_pasid_table(d->domain, (void __user *)arg); + if (ret) { + list_for_each_entry_continue_reverse(d, &iommu->domain_list, next) + iommu_detach_pasid_table(d->domain); + break; + } + } + + mutex_unlock(&iommu->lock); + return ret; +} + static int vfio_iommu_migration_build_caps(struct vfio_iommu *iommu, struct vfio_info_cap *caps) { @@ -2747,6 +2780,29 @@ static int vfio_iommu_type1_unmap_dma(struct vfio_iommu *iommu, -EFAULT : 0; } +static int vfio_iommu_type1_set_pasid_table(struct vfio_iommu *iommu, + unsigned long arg) +{ + struct vfio_iommu_type1_set_pasid_table spt; + unsigned long minsz; + + minsz = offsetofend(struct vfio_iommu_type1_set_pasid_table, flags); + + if (copy_from_user(&spt, (void __user *)arg, minsz)) + return -EFAULT; + + if (spt.argsz < minsz) + return -EINVAL; + + if (spt.flags == VFIO_PASID_TABLE_FLAG_SET) { + return vfio_attach_pasid_table(iommu, arg + minsz); + } else if (spt.flags == VFIO_PASID_TABLE_FLAG_UNSET) { + vfio_detach_pasid_table(iommu); + return 0; + } + return -EINVAL; +} + static int vfio_iommu_type1_dirty_pages(struct vfio_iommu *iommu, unsigned long arg) { @@ -2867,6 +2923,8 @@ static long vfio_iommu_type1_ioctl(void *iommu_data, return vfio_iommu_type1_unmap_dma(iommu, arg); case VFIO_IOMMU_DIRTY_PAGES: return vfio_iommu_type1_dirty_pages(iommu, arg); + case VFIO_IOMMU_SET_PASID_TABLE: + return vfio_iommu_type1_set_pasid_table(iommu, arg); default: return -ENOTTY; } diff --git a/include/uapi/linux/vfio.h b/include/uapi/linux/vfio.h index d1812777139f..6d9c941d 100644 --- a/include/uapi/linux/vfio.h +++ b/include/uapi/linux/vfio.h @@ -14,6 +14,7 @@ #include #include +#include #define VFIO_API_VERSION 0 @@ -1181,6 +1182,24 @@ struct vfio_iommu_type1_dirty_bitmap_get { #define VFIO_IOMMU_DIRTY_PAGES _IO(VFIO_TYPE, VFIO_BASE + 17) +/* + * VFIO_IOMMU_SET_PASID_TABLE - _IOWR(VFIO_TYPE, VFIO_BASE + 18, + * struct vfio_iommu_type1_set_pasid_table) + * + * The SET operation passes a PASID table to the host while the + * UNSET operation detaches the one currently programmed. Setting + * a table while another is already programmed replaces the old table. + */ +struct vfio_iommu_type1_set_pasid_table { + __u32 argsz; + __u32 flags; +#define VFIO_PASID_TABLE_FLAG_SET (1 << 0) +#define VFIO_PASID_TABLE_FLAG_UNSET(1 << 1) + struct iommu_pasid_table_config config; /* used on SET */ +}; + +#define VFIO_IOMMU_SET_PASID_TABLE _IO(VFIO_TYPE, VFIO_BASE + 18) + /* Additional API for SPAPR TCE (Server POWERPC) IOMMU */ /* -- 2.26.2 ___
Re: [PATCH v12 01/13] vfio: VFIO_IOMMU_SET_PASID_TABLE
Hi Eric, Thank you for the patch! Yet something to improve: [auto build test ERROR on v5.11] [also build test ERROR on next-20210223] [cannot apply to vfio/next] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in https://git-scm.com/docs/git-format-patch] url: https://github.com/0day-ci/linux/commits/Eric-Auger/SMMUv3-Nested-Stage-Setup-VFIO-part/20210224-051641 base:f40ddce88593482919761f74910f42f4b84c004b config: x86_64-randconfig-s021-20210223 (attached as .config) compiler: gcc-9 (Debian 9.3.0-15) 9.3.0 reproduce: # apt-get install sparse # sparse version: v0.6.3-229-g60c1f270-dirty # https://github.com/0day-ci/linux/commit/3bb0b5b270edf8c80af65a89749296990f9b9213 git remote add linux-review https://github.com/0day-ci/linux git fetch --no-tags linux-review Eric-Auger/SMMUv3-Nested-Stage-Setup-VFIO-part/20210224-051641 git checkout 3bb0b5b270edf8c80af65a89749296990f9b9213 # save the attached .config to linux build tree make W=1 C=1 CF='-fdiagnostic-prefix -D__CHECK_ENDIAN__' ARCH=x86_64 If you fix the issue, kindly add following tag as appropriate Reported-by: kernel test robot All errors (new ones prefixed by >>): In file included from :32: >> ./usr/include/linux/vfio.h:1198:34: error: field 'config' has incomplete type 1198 | struct iommu_pasid_table_config config; /* used on SET */ | ^~ --- 0-DAY CI Kernel Test Service, Intel Corporation https://lists.01.org/hyperkitty/list/kbuild-...@lists.01.org .config.gz Description: application/gzip ___ iommu mailing list iommu@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH v12 01/13] vfio: VFIO_IOMMU_SET_PASID_TABLE
Hi Eric, Thank you for the patch! Yet something to improve: [auto build test ERROR on v5.11] [also build test ERROR on next-20210223] [cannot apply to vfio/next] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in https://git-scm.com/docs/git-format-patch] url: https://github.com/0day-ci/linux/commits/Eric-Auger/SMMUv3-Nested-Stage-Setup-VFIO-part/20210224-051641 base:f40ddce88593482919761f74910f42f4b84c004b config: arm64-randconfig-r003-20210223 (attached as .config) compiler: clang version 12.0.0 (https://github.com/llvm/llvm-project c9439ca36342fb6013187d0a69aef92736951476) reproduce (this is a W=1 build): wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross # install arm64 cross compiling tool for clang build # apt-get install binutils-aarch64-linux-gnu # https://github.com/0day-ci/linux/commit/3bb0b5b270edf8c80af65a89749296990f9b9213 git remote add linux-review https://github.com/0day-ci/linux git fetch --no-tags linux-review Eric-Auger/SMMUv3-Nested-Stage-Setup-VFIO-part/20210224-051641 git checkout 3bb0b5b270edf8c80af65a89749296990f9b9213 # save the attached .config to linux build tree COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross ARCH=arm64 If you fix the issue, kindly add following tag as appropriate Reported-by: kernel test robot All errors (new ones prefixed by >>): In file included from drivers/vfio/vfio.c:32: In file included from include/linux/vfio.h:16: >> include/uapi/linux/vfio.h:1198:34: error: field has incomplete type 'struct >> iommu_pasid_table_config' struct iommu_pasid_table_config config; /* used on SET */ ^ include/uapi/linux/vfio.h:1198:9: note: forward declaration of 'struct iommu_pasid_table_config' struct iommu_pasid_table_config config; /* used on SET */ ^ 1 error generated. -- In file included from drivers/vfio/vfio_iommu_type1.c:36: In file included from include/linux/vfio.h:16: >> include/uapi/linux/vfio.h:1198:34: error: field has incomplete type 'struct >> iommu_pasid_table_config' struct iommu_pasid_table_config config; /* used on SET */ ^ include/uapi/linux/vfio.h:1198:9: note: forward declaration of 'struct iommu_pasid_table_config' struct iommu_pasid_table_config config; /* used on SET */ ^ >> drivers/vfio/vfio_iommu_type1.c:2597:3: error: implicit declaration of >> function 'iommu_detach_pasid_table' [-Werror,-Wimplicit-function-declaration] iommu_detach_pasid_table(d->domain); ^ drivers/vfio/vfio_iommu_type1.c:2597:3: note: did you mean 'vfio_detach_pasid_table'? drivers/vfio/vfio_iommu_type1.c:2591:1: note: 'vfio_detach_pasid_table' declared here vfio_detach_pasid_table(struct vfio_iommu *iommu) ^ >> drivers/vfio/vfio_iommu_type1.c:2611:9: error: implicit declaration of >> function 'iommu_uapi_attach_pasid_table' >> [-Werror,-Wimplicit-function-declaration] ret = iommu_uapi_attach_pasid_table(d->domain, (void __user *)arg); ^ drivers/vfio/vfio_iommu_type1.c:2614:5: error: implicit declaration of function 'iommu_detach_pasid_table' [-Werror,-Wimplicit-function-declaration] iommu_detach_pasid_table(d->domain); ^ 4 errors generated. vim +1198 include/uapi/linux/vfio.h 1184 1185 /* 1186 * VFIO_IOMMU_SET_PASID_TABLE - _IOWR(VFIO_TYPE, VFIO_BASE + 18, 1187 * struct vfio_iommu_type1_set_pasid_table) 1188 * 1189 * The SET operation passes a PASID table to the host while the 1190 * UNSET operation detaches the one currently programmed. Setting 1191 * a table while another is already programmed replaces the old table. 1192 */ 1193 struct vfio_iommu_type1_set_pasid_table { 1194 __u32 argsz; 1195 __u32 flags; 1196 #define VFIO_PASID_TABLE_FLAG_SET (1 << 0) 1197 #define VFIO_PASID_TABLE_FLAG_UNSET (1 << 1) > 1198 struct iommu_pasid_table_config config; /* used on SET */ 1199 }; 1200 --- 0-DAY CI Kernel Test Service, Intel Corporation https://lists.01.org/hyperkitty/list/kbuild-...@lists.01.org .config.gz Description: application/gzip ___ iommu mailing list iommu@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH v12 01/13] vfio: VFIO_IOMMU_SET_PASID_TABLE
Hi Eric, Thank you for the patch! Yet something to improve: [auto build test ERROR on v5.11] [also build test ERROR on next-20210223] [cannot apply to vfio/next] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in https://git-scm.com/docs/git-format-patch] url: https://github.com/0day-ci/linux/commits/Eric-Auger/SMMUv3-Nested-Stage-Setup-VFIO-part/20210224-051641 base:f40ddce88593482919761f74910f42f4b84c004b config: i386-randconfig-s001-20210223 (attached as .config) compiler: gcc-9 (Debian 9.3.0-15) 9.3.0 reproduce: # apt-get install sparse # sparse version: v0.6.3-229-g60c1f270-dirty # https://github.com/0day-ci/linux/commit/3bb0b5b270edf8c80af65a89749296990f9b9213 git remote add linux-review https://github.com/0day-ci/linux git fetch --no-tags linux-review Eric-Auger/SMMUv3-Nested-Stage-Setup-VFIO-part/20210224-051641 git checkout 3bb0b5b270edf8c80af65a89749296990f9b9213 # save the attached .config to linux build tree make W=1 C=1 CF='-fdiagnostic-prefix -D__CHECK_ENDIAN__' ARCH=i386 If you fix the issue, kindly add following tag as appropriate Reported-by: kernel test robot All errors (new ones prefixed by >>): In file included from include/linux/vfio.h:16, from drivers/gpu/drm/i915/gvt/dmabuf.h:33, from : >> include/uapi/linux/vfio.h:1198:34: error: field 'config' has incomplete type 1198 | struct iommu_pasid_table_config config; /* used on SET */ | ^~ vim +/config +1198 include/uapi/linux/vfio.h 1184 1185 /* 1186 * VFIO_IOMMU_SET_PASID_TABLE - _IOWR(VFIO_TYPE, VFIO_BASE + 18, 1187 * struct vfio_iommu_type1_set_pasid_table) 1188 * 1189 * The SET operation passes a PASID table to the host while the 1190 * UNSET operation detaches the one currently programmed. Setting 1191 * a table while another is already programmed replaces the old table. 1192 */ 1193 struct vfio_iommu_type1_set_pasid_table { 1194 __u32 argsz; 1195 __u32 flags; 1196 #define VFIO_PASID_TABLE_FLAG_SET (1 << 0) 1197 #define VFIO_PASID_TABLE_FLAG_UNSET (1 << 1) > 1198 struct iommu_pasid_table_config config; /* used on SET */ 1199 }; 1200 --- 0-DAY CI Kernel Test Service, Intel Corporation https://lists.01.org/hyperkitty/list/kbuild-...@lists.01.org .config.gz Description: application/gzip ___ iommu mailing list iommu@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH v12 01/13] vfio: VFIO_IOMMU_SET_PASID_TABLE
Hi Eric, On 2021/2/24 5:06, Eric Auger wrote: +/* + * VFIO_IOMMU_SET_PASID_TABLE - _IOWR(VFIO_TYPE, VFIO_BASE + 18, + * struct vfio_iommu_type1_set_pasid_table) + * + * The SET operation passes a PASID table to the host while the + * UNSET operation detaches the one currently programmed. Setting + * a table while another is already programmed replaces the old table. It looks to me that this description doesn't match the IOMMU part. [v14,05/13] iommu/smmuv3: Implement attach/detach_pasid_table | case IOMMU_PASID_CONFIG_TRANSLATE: | /* we do not support S1 <-> S1 transitions */ | if (smmu_domain->s1_cfg.set) | goto out; Maybe I've misread something? Thanks, Zenghui ___ iommu mailing list iommu@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH v12 01/13] vfio: VFIO_IOMMU_SET_PASID_TABLE
Hi Zenghui, On 4/7/21 11:33 AM, Zenghui Yu wrote: > Hi Eric, > > On 2021/2/24 5:06, Eric Auger wrote: >> +/* >> + * VFIO_IOMMU_SET_PASID_TABLE - _IOWR(VFIO_TYPE, VFIO_BASE + 18, >> + * struct vfio_iommu_type1_set_pasid_table) >> + * >> + * The SET operation passes a PASID table to the host while the >> + * UNSET operation detaches the one currently programmed. Setting >> + * a table while another is already programmed replaces the old table. > > It looks to me that this description doesn't match the IOMMU part. Yep that's misleanding. I replaced it by: It is allowed to "SET" the table several times without un-setting as long as the table config does not stay IOMMU_PASID_CONFIG_TRANSLATE. > > [v14,05/13] iommu/smmuv3: Implement attach/detach_pasid_table > > | case IOMMU_PASID_CONFIG_TRANSLATE: > | /* we do not support S1 <-> S1 transitions */ > | if (smmu_domain->s1_cfg.set) > | goto out; > > Maybe I've misread something? > > > Thanks, > Zenghui > Thanks Eric ___ iommu mailing list iommu@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/iommu