linux-merge December 2024

linux-merge@lists.open-mesh.org

3 participants
44 discussions

[linux-next] LinuxNextTracking branch, master, updated. next-20241203
by batman＠open-mesh.org 03 Dec '24

03 Dec '24

The following commit has been merged in the master branch: commit 64e6fc27d60f8b186bd4d071a6266f8c4d5aa2f7 Merge: 9ad55a67a788c0806b0fe23be36fae6dbfbc3fc5 d53764723ecd639a0cc0c5ad24146847fc09f78d Author: Linus Torvalds <torvalds(a)linux-foundation.org> Date: Wed Nov 27 14:24:34 2024 -0800 Merge tag 'for-linus-iommufd' of git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd Pull more iommufd updates from Jason Gunthorpe: "Change the driver callback op domain_alloc_user() into two ops: domain_alloc_paging_flags() and domain_alloc_nesting() that better describe what the ops are expected to do. There will be per-driver cleanup based on this going into the next cycle via the driver trees" * tag 'for-linus-iommufd' of git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd: iommu: Rename ops->domain_alloc_user() to domain_alloc_paging_flags() iommu: Add ops->domain_alloc_nested() diff --combined include/linux/iommu.h index 301e97d745c13,1e3308e899969..318d27841130c --- a/include/linux/iommu.h +++ b/include/linux/iommu.h @@@ -557,17 -557,19 +557,19 @@@ iommu_copy_struct_from_full_user_array( * @domain_alloc: allocate and return an iommu domain if success. Otherwise * NULL is returned. The domain is not fully initialized until * the caller iommu_domain_alloc() returns. - * @domain_alloc_user: Allocate an iommu domain corresponding to the input - * parameters as defined in include/uapi/linux/iommufd.h. - * Upon success, if the @user_data is valid and the @parent - * points to a kernel-managed domain, the new domain must be - * IOMMU_DOMAIN_NESTED type; otherwise, the @parent must be - * NULL while the @user_data can be optionally provided, the - * new domain must support __IOMMU_DOMAIN_PAGING. - * Upon failure, ERR_PTR must be returned. + * @domain_alloc_paging_flags: Allocate an iommu domain corresponding to the + * input parameters as defined in + * include/uapi/linux/iommufd.h. The @user_data can be + * optionally provided, the new domain must support + * __IOMMU_DOMAIN_PAGING. Upon failure, ERR_PTR must be + * returned. * @domain_alloc_paging: Allocate an iommu_domain that can be used for - * UNMANAGED, DMA, and DMA_FQ domain types. + * UNMANAGED, DMA, and DMA_FQ domain types. This is the + * same as invoking domain_alloc_paging_flags() with + * @flags=0, @user_data=NULL. A driver should implement + * only one of the two ops. * @domain_alloc_sva: Allocate an iommu_domain for Shared Virtual Addressing. + * @domain_alloc_nested: Allocate an iommu_domain for nested translation. * @probe_device: Add device to iommu driver handling * @release_device: Remove device from iommu driver handling * @probe_finalize: Do final setup work after the device is added to an IOMMU @@@ -616,12 -618,15 +618,15 @@@ struct iommu_ops /* Domain allocation and freeing by the iommu driver */ struct iommu_domain *(*domain_alloc)(unsigned iommu_domain_type); - struct iommu_domain *(*domain_alloc_user)( - struct device *dev, u32 flags, struct iommu_domain *parent, + struct iommu_domain *(*domain_alloc_paging_flags)( + struct device *dev, u32 flags, const struct iommu_user_data *user_data); struct iommu_domain *(*domain_alloc_paging)(struct device *dev); struct iommu_domain *(*domain_alloc_sva)(struct device *dev, struct mm_struct *mm); + struct iommu_domain *(*domain_alloc_nested)( + struct device *dev, struct iommu_domain *parent, u32 flags, + const struct iommu_user_data *user_data); struct iommu_device *(*probe_device)(struct device *dev); void (*release_device)(struct device *dev); @@@ -841,6 -846,7 +846,6 @@@ static inline void iommu_iotlb_gather_i }; } -extern bool iommu_present(const struct bus_type *bus); extern bool device_iommu_capable(struct device *dev, enum iommu_cap cap); extern bool iommu_group_has_isolated_msi(struct iommu_group *group); struct iommu_domain *iommu_paging_domain_alloc_flags(struct device *dev, unsigned int flags); -- LinuxNextTracking

1 0

Build check errors found: 2024-12-03
by postmaster＠open-mesh.org 03 Dec '24

03 Dec '24

Name of failed tests ==================== main ---- * coccicheck * headers stable ------ * difference between net and batadv stable Output of different failed tests ================================ main: coccicheck ---------------- ./bridge_loop_avoidance.c:1499:8-27: WARNING: atomic_dec_and_test variation before object free at line 1510. stable: difference between net and batadv stable ------------------------------------------------ net/include/uapi/linux/batadv_packet.h | 29 +++--- net/net/batman-adv/bat_iv_ogm.c | 4 net/net/batman-adv/bridge_loop_avoidance.c | 8 - net/net/batman-adv/translation-table.c | 96 ++++---------------- 4 files changed, 45 insertions(+), 92 deletions(-) main: headers ------------- diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c index 3762bc8d..67481be6 100644 --- a/net/batman-adv/distributed-arp-table.c +++ b/net/batman-adv/distributed-arp-table.c @@ -7,7 +7,6 @@ #include "distributed-arp-table.h" #include "main.h" // IWYU pragma: keep -#include <linux/unaligned.h> #include <linux/atomic.h> #include <linux/bitops.h> #include <linux/byteorder/generic.h> @@ -32,6 +31,7 @@ #include <linux/stddef.h> #include <linux/string.h> #include <linux/udp.h> +#include <linux/unaligned.h> #include <linux/workqueue.h> #include <net/arp.h> #include <net/genetlink.h> Statistics ========== main ---- Failed tests: 2 Started build tests: 170 Tested Linux versions: 41 Tested configs: 98 stable ------ Failed tests: 1 Started build tests: 195 Tested Linux versions: 42 Tested configs: 95

1 0

Build check errors found: 2024-12-02
by postmaster＠open-mesh.org 02 Dec '24

02 Dec '24

Name of failed tests ==================== main ---- * coccicheck * headers stable ------ * difference between net and batadv stable Output of different failed tests ================================ main: coccicheck ---------------- ./bridge_loop_avoidance.c:1499:8-27: WARNING: atomic_dec_and_test variation before object free at line 1510. stable: difference between net and batadv stable ------------------------------------------------ net/include/uapi/linux/batadv_packet.h | 29 +++--- net/net/batman-adv/bat_iv_ogm.c | 4 net/net/batman-adv/bridge_loop_avoidance.c | 8 - net/net/batman-adv/translation-table.c | 96 ++++---------------- 4 files changed, 45 insertions(+), 92 deletions(-) main: headers ------------- diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c index 3762bc8d..67481be6 100644 --- a/net/batman-adv/distributed-arp-table.c +++ b/net/batman-adv/distributed-arp-table.c @@ -7,7 +7,6 @@ #include "distributed-arp-table.h" #include "main.h" // IWYU pragma: keep -#include <linux/unaligned.h> #include <linux/atomic.h> #include <linux/bitops.h> #include <linux/byteorder/generic.h> @@ -32,6 +31,7 @@ #include <linux/stddef.h> #include <linux/string.h> #include <linux/udp.h> +#include <linux/unaligned.h> #include <linux/workqueue.h> #include <net/arp.h> #include <net/genetlink.h> Statistics ========== main ---- Failed tests: 2 Started build tests: 169 Tested Linux versions: 41 Tested configs: 89 stable ------ Failed tests: 1 Started build tests: 158 Tested Linux versions: 42 Tested configs: 93

1 0

Build check errors found: 2024-12-01
by postmaster＠open-mesh.org 01 Dec '24

01 Dec '24

Name of failed tests ==================== main ---- * coccicheck * headers stable ------ * difference between net and batadv stable Output of different failed tests ================================ main: coccicheck ---------------- ./bridge_loop_avoidance.c:1499:8-27: WARNING: atomic_dec_and_test variation before object free at line 1510. stable: difference between net and batadv stable ------------------------------------------------ net/include/uapi/linux/batadv_packet.h | 29 +++--- net/net/batman-adv/bat_iv_ogm.c | 4 net/net/batman-adv/bridge_loop_avoidance.c | 8 - net/net/batman-adv/translation-table.c | 96 ++++---------------- 4 files changed, 45 insertions(+), 92 deletions(-) main: headers ------------- diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c index 3762bc8d..67481be6 100644 --- a/net/batman-adv/distributed-arp-table.c +++ b/net/batman-adv/distributed-arp-table.c @@ -7,7 +7,6 @@ #include "distributed-arp-table.h" #include "main.h" // IWYU pragma: keep -#include <linux/unaligned.h> #include <linux/atomic.h> #include <linux/bitops.h> #include <linux/byteorder/generic.h> @@ -32,6 +31,7 @@ #include <linux/stddef.h> #include <linux/string.h> #include <linux/udp.h> +#include <linux/unaligned.h> #include <linux/workqueue.h> #include <net/arp.h> #include <net/genetlink.h> Statistics ========== main ---- Failed tests: 2 Started build tests: 125 Tested Linux versions: 40 Tested configs: 82 stable ------ Failed tests: 1 Started build tests: 162 Tested Linux versions: 41 Tested configs: 93

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

linux-merge December 2024