Message ID | 20210411114659.15051-2-eric.auger@redhat.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | SMMUv3 Nested Stage Setup (VFIO part) | expand |
Hi Eric, Thank you for the patch! Yet something to improve: [auto build test ERROR on v5.12-rc6] [also build test ERROR on next-20210409] [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/20210411-195216 base: e49d033bddf5b565044e2abe4241353959bc9120 config: arm-randconfig-r003-20210411 (attached as .config) compiler: clang version 13.0.0 (https://github.com/llvm/llvm-project 9829f5e6b1bca9b61efc629770d28bb9014dec45) 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 arm cross compiling tool for clang build # apt-get install binutils-arm-linux-gnueabi # https://github.com/0day-ci/linux/commit/0af9db19db29eb2a707b9e1ca4ff9e1a08a1c511 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/20210411-195216 git checkout 0af9db19db29eb2a707b9e1ca4ff9e1a08a1c511 # save the attached .config to linux build tree COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross ARCH=arm If you fix the issue, kindly add following tag as appropriate Reported-by: kernel test robot <lkp@intel.com> 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:1226: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:1226:9: note: forward declaration of 'struct iommu_pasid_table_config' struct iommu_pasid_table_config config; /* used on SET */ ^ 1 error generated. vim +1226 include/uapi/linux/vfio.h 1211 1212 /* 1213 * VFIO_IOMMU_SET_PASID_TABLE - _IOWR(VFIO_TYPE, VFIO_BASE + 18, 1214 * struct vfio_iommu_type1_set_pasid_table) 1215 * 1216 * The SET operation passes a PASID table to the host while the 1217 * UNSET operation detaches the one currently programmed. It is 1218 * allowed to "SET" the table several times without unsetting as 1219 * long as the table config does not stay IOMMU_PASID_CONFIG_TRANSLATE. 1220 */ 1221 struct vfio_iommu_type1_set_pasid_table { 1222 __u32 argsz; 1223 __u32 flags; 1224 #define VFIO_PASID_TABLE_FLAG_SET (1 << 0) 1225 #define VFIO_PASID_TABLE_FLAG_UNSET (1 << 1) > 1226 struct iommu_pasid_table_config config; /* used on SET */ 1227 }; 1228 --- 0-DAY CI Kernel Test Service, Intel Corporation https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
Hi Eric, Thank you for the patch! Yet something to improve: [auto build test ERROR on v5.12-rc6] [also build test ERROR on next-20210409] [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/20210411-195216 base: e49d033bddf5b565044e2abe4241353959bc9120 config: i386-randconfig-s001-20210411 (attached as .config) compiler: gcc-9 (Debian 9.3.0-22) 9.3.0 reproduce: # apt-get install sparse # sparse version: v0.6.3-279-g6d5d9b42-dirty # https://github.com/0day-ci/linux/commit/0af9db19db29eb2a707b9e1ca4ff9e1a08a1c511 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/20210411-195216 git checkout 0af9db19db29eb2a707b9e1ca4ff9e1a08a1c511 # 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 <lkp@intel.com> All errors (new ones prefixed by >>): In file included from include/linux/vfio.h:16, from drivers/vfio/vfio.c:32: >> include/uapi/linux/vfio.h:1226:34: error: field 'config' has incomplete type 1226 | struct iommu_pasid_table_config config; /* used on SET */ | ^~~~~~ -- In file included from include/linux/vfio.h:16, from drivers/vfio/vfio_iommu_type1.c:37: >> include/uapi/linux/vfio.h:1226:34: error: field 'config' has incomplete type 1226 | struct iommu_pasid_table_config config; /* used on SET */ | ^~~~~~ drivers/vfio/vfio_iommu_type1.c: In function 'vfio_detach_pasid_table': >> drivers/vfio/vfio_iommu_type1.c:2844:3: error: implicit declaration of function 'iommu_detach_pasid_table'; did you mean 'vfio_detach_pasid_table'? [-Werror=implicit-function-declaration] 2844 | iommu_detach_pasid_table(d->domain); | ^~~~~~~~~~~~~~~~~~~~~~~~ | vfio_detach_pasid_table drivers/vfio/vfio_iommu_type1.c: In function 'vfio_attach_pasid_table': >> drivers/vfio/vfio_iommu_type1.c:2858:9: error: implicit declaration of function 'iommu_uapi_attach_pasid_table'; did you mean 'vfio_attach_pasid_table'? [-Werror=implicit-function-declaration] 2858 | ret = iommu_uapi_attach_pasid_table(d->domain, (void __user *)arg); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | vfio_attach_pasid_table cc1: some warnings being treated as errors vim +/config +1226 include/uapi/linux/vfio.h 1211 1212 /* 1213 * VFIO_IOMMU_SET_PASID_TABLE - _IOWR(VFIO_TYPE, VFIO_BASE + 18, 1214 * struct vfio_iommu_type1_set_pasid_table) 1215 * 1216 * The SET operation passes a PASID table to the host while the 1217 * UNSET operation detaches the one currently programmed. It is 1218 * allowed to "SET" the table several times without unsetting as 1219 * long as the table config does not stay IOMMU_PASID_CONFIG_TRANSLATE. 1220 */ 1221 struct vfio_iommu_type1_set_pasid_table { 1222 __u32 argsz; 1223 __u32 flags; 1224 #define VFIO_PASID_TABLE_FLAG_SET (1 << 0) 1225 #define VFIO_PASID_TABLE_FLAG_UNSET (1 << 1) > 1226 struct iommu_pasid_table_config config; /* used on SET */ 1227 }; 1228 --- 0-DAY CI Kernel Test Service, Intel Corporation https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
diff --git a/drivers/vfio/vfio_iommu_type1.c b/drivers/vfio/vfio_iommu_type1.c index 45cbfd4879a5..e575ef5dd6c6 100644 --- a/drivers/vfio/vfio_iommu_type1.c +++ b/drivers/vfio/vfio_iommu_type1.c @@ -2834,6 +2834,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) { @@ -3002,6 +3035,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) { @@ -3122,6 +3178,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 8ce36c1d53ca..c86b7b4a5064 100644 --- a/include/uapi/linux/vfio.h +++ b/include/uapi/linux/vfio.h @@ -14,6 +14,7 @@ #include <linux/types.h> #include <linux/ioctl.h> +#include <linux/iommu.h> #define VFIO_API_VERSION 0 @@ -1208,6 +1209,25 @@ 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. It is + * allowed to "SET" the table several times without unsetting as + * long as the table config does not stay IOMMU_PASID_CONFIG_TRANSLATE. + */ +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 -------- */ /*