jsauer/torvalds-linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-01-11 17:10:13 +00:00
Code

IOMU Fixes for Linux v6.19-rc4

Browse Source 
Including:
 
 	- Generic IO-Page-Table code:
 	  - Several Kconfig-related build fixes
 	  - Fix for when gcc 8.5 on PPC refuses to inline a function from a
 	    header file.
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEr9jSbILcajRFYWYyK/BELZcBGuMFAmliiDkACgkQK/BELZcB
 GuNXgQ//ROiKTCUpZj+qin9X3kM/VVgofwHIkE7xhTL0jzV99dv3eLsc9A268dWD
 c1y1/o9HP3wi/e8ESTUFUXi5OnTJqdoQ1nxQWpBr6xn3si6yNQir4gvqbSvLjcKG
 keVrIBYUn79yV6FJDUkM5NGcLYIX1gMIFxkj/xjkjlsaCG3z8VoRyW4zb1ZN3tZn
 R8Mgy7BquRhMbL0NBLn0AkSJgxxHoIiiL0Itdgke00ODkj1yq71e2vbf8X4XU9SJ
 OGtVCXzC3FxAsdhxpS0mQJqnX9ZN1UjDVzw+/3NJ/+OQPI3lR6KjG6x+v8yk70uf
 G8kSSCpqHpkInCNXzRPtURDoUM4EsdtHtKtd5VNz8Xuxkcfdie1NeKclNPnRxc7L
 7z+vBikZ3G5vvk5wjn/o/sailN4HVGuebBavgNeWKPttaeGig71rbkJ3aUP6C0QH
 Cdf9rkV/UtJcmI8h4MlFMirw7cRH280hldQj4WWUt0KKta4gMeClII/PXsQOyYB4
 BEkwaA8wc8J/W3UWz37UJqlhIYMjJdRwo4WaUjwtS1+Mtudh6wN1YKDQ1hKnNtua
 6qza5gN5Zn6Q0TiqHFj0vsxvsTjijhMIqlEdReHeF5W0KDNrYl2Y9rfjk/QpDrYa
 yZ53ccQMFbEwrVKPM+Mxt1FIuF1aiG5vRneLU3NW7qX80xfIU78=
 =h82g
 -----END PGP SIGNATURE-----

Merge tag 'iommu-fixes-v6.19-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/iommu/linux

Pull iomu fixes from Joerg Roedel:

 - several Kconfig-related build fixes

 - fix for when gcc 8.5 on PPC refuses to inline a function from a
   header file

* tag 'iommu-fixes-v6.19-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/iommu/linux:
  iommupt: Make pt_feature() always_inline
  iommufd/selftest: Prevent module/builtin conflicts in kconfig
  iommufd/selftest: Add missing kconfig for DMA_SHARED_BUFFER
  iommupt: Fix the kunit building
This commit is contained in:
Linus Torvalds 2026-01-10 07:14:40 -10:00
commit 97313d6113
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/iommu/generic_pt/.kunitconfig
View File

@ -1,4 +1,5 @@
CONFIG_KUNIT=y CONFIG_KUNIT=y
CONFIG_COMPILE_TEST=y
CONFIG_GENERIC_PT=y CONFIG_GENERIC_PT=y
CONFIG_DEBUG_GENERIC_PT=y CONFIG_DEBUG_GENERIC_PT=y
CONFIG_IOMMU_PT=y CONFIG_IOMMU_PT=y
@ -11,4 +12,3 @@ CONFIG_IOMMUFD=y
CONFIG_DEBUG_KERNEL=y CONFIG_DEBUG_KERNEL=y
CONFIG_FAULT_INJECTION=y CONFIG_FAULT_INJECTION=y
CONFIG_RUNTIME_TESTING_MENU=y CONFIG_RUNTIME_TESTING_MENU=y
CONFIG_IOMMUFD_TEST=y

4
drivers/iommu/generic_pt/pt_defs.h
View File

@ -202,7 +202,7 @@ static inline bool pt_table_install32(struct pt_state *pts, u32 table_entry)
#define PT_SUPPORTED_FEATURE(feature_nr) (PT_SUPPORTED_FEATURES & BIT(feature_nr)) #define PT_SUPPORTED_FEATURE(feature_nr) (PT_SUPPORTED_FEATURES & BIT(feature_nr))
static inline bool pt_feature(const struct pt_common *common, static __always_inline bool pt_feature(const struct pt_common *common,
unsigned int feature_nr) unsigned int feature_nr)
{ {
if (PT_FORCE_ENABLED_FEATURES & BIT(feature_nr)) if (PT_FORCE_ENABLED_FEATURES & BIT(feature_nr))
@ -212,7 +212,7 @@ static inline bool pt_feature(const struct pt_common *common,
return common->features & BIT(feature_nr); return common->features & BIT(feature_nr);
} }
static inline bool pts_feature(const struct pt_state *pts, static __always_inline bool pts_feature(const struct pt_state *pts,
unsigned int feature_nr) unsigned int feature_nr)
{ {
return pt_feature(pts->range->common, feature_nr); return pt_feature(pts->range->common, feature_nr);

3
drivers/iommu/iommufd/Kconfig
View File

@ -41,7 +41,8 @@ config IOMMUFD_TEST
depends on DEBUG_KERNEL depends on DEBUG_KERNEL
depends on FAULT_INJECTION depends on FAULT_INJECTION
depends on RUNTIME_TESTING_MENU depends on RUNTIME_TESTING_MENU
depends on IOMMU_PT_AMDV1 depends on IOMMU_PT_AMDV1=y || IOMMUFD=IOMMU_PT_AMDV1
select DMA_SHARED_BUFFER
select IOMMUFD_DRIVER select IOMMUFD_DRIVER
default n default n
help help