Wang Wensheng (4): delayacct: Reserve kabi for task_delay_info xarray: Reserve kabi for xa_state sbitmap: Add kabi reserve iommu: Add kabi reserve
include/linux/delayacct.h | 3 +++ include/linux/iommu.h | 17 +++++++++++++++++ include/linux/sbitmap.h | 9 +++++++++ include/linux/xarray.h | 3 +++ 4 files changed, 32 insertions(+)
hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I9244H
---------------------------
Reserve space for task_delay_info in delayacct.h.
Signed-off-by: Wang Wensheng wangwensheng4@huawei.com --- include/linux/delayacct.h | 3 +++ 1 file changed, 3 insertions(+)
diff --git a/include/linux/delayacct.h b/include/linux/delayacct.h index 6639f48dac36..dd313e69374a 100644 --- a/include/linux/delayacct.h +++ b/include/linux/delayacct.h @@ -8,6 +8,7 @@ #define _LINUX_DELAYACCT_H
#include <uapi/linux/taskstats.h> +#include <linux/kabi.h>
#ifdef CONFIG_TASK_DELAY_ACCT struct task_delay_info { @@ -55,6 +56,8 @@ struct task_delay_info { u32 compact_count; /* total count of memory compact */ u32 wpcopy_count; /* total count of write-protect copy */ u32 irq_count; /* total count of IRQ/SOFTIRQ */ + KABI_RESERVE(1) + KABI_RESERVE(2) }; #endif
hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I9244H
---------------------------
Reserve space for xa_state in xarray.h.
Signed-off-by: Wang Wensheng wangwensheng4@huawei.com --- include/linux/xarray.h | 3 +++ 1 file changed, 3 insertions(+)
diff --git a/include/linux/xarray.h b/include/linux/xarray.h index cb571dfcf4b1..89ec31f1f023 100644 --- a/include/linux/xarray.h +++ b/include/linux/xarray.h @@ -19,6 +19,7 @@ #include <linux/sched/mm.h> #include <linux/spinlock.h> #include <linux/types.h> +#include <linux/kabi.h>
/* * The bottom two bits of the entry determine how the XArray interprets @@ -1352,6 +1353,8 @@ struct xa_state { struct xa_node *xa_alloc; xa_update_node_t xa_update; struct list_lru *xa_lru; + KABI_RESERVE(1) + KABI_RESERVE(2) };
/*
hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I9244H
---------------------------
Reserve space for sbitmap and sbitmap_queue in sbitmap.h.
Signed-off-by: Wang Wensheng wangwensheng4@huawei.com --- include/linux/sbitmap.h | 9 +++++++++ 1 file changed, 9 insertions(+)
diff --git a/include/linux/sbitmap.h b/include/linux/sbitmap.h index d662cf136021..03119f8b95c1 100644 --- a/include/linux/sbitmap.h +++ b/include/linux/sbitmap.h @@ -20,6 +20,7 @@ #include <linux/smp.h> #include <linux/types.h> #include <linux/wait.h> +#include <linux/kabi.h>
struct seq_file;
@@ -77,6 +78,10 @@ struct sbitmap { * cachelines until the map is exhausted. */ unsigned int __percpu *alloc_hint; + KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) + KABI_RESERVE(4) };
#define SBQ_WAIT_QUEUES 8 @@ -144,6 +149,10 @@ struct sbitmap_queue { * @wakeup_cnt: Number of thread wake ups issued. */ atomic_t wakeup_cnt; + KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) + KABI_RESERVE(4) };
/**
hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I9244H
---------------------------
Reserve space for iommu_domain, iommu_ops, iommu_domain_ops, iommu_device and dev_iommu in iommu.h.
Signed-off-by: Wang Wensheng wangwensheng4@huawei.com --- include/linux/iommu.h | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
diff --git a/include/linux/iommu.h b/include/linux/iommu.h index a9f9b8bb7540..08e5244bc305 100644 --- a/include/linux/iommu.h +++ b/include/linux/iommu.h @@ -14,6 +14,7 @@ #include <linux/err.h> #include <linux/of.h> #include <linux/iova_bitmap.h> +#include <linux/kabi.h> #include <uapi/linux/iommu.h>
#define IOMMU_READ (1 << 0) @@ -116,6 +117,10 @@ struct iommu_domain { }; }; struct mutex switch_log_lock; + KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) + KABI_RESERVE(4) };
static inline bool iommu_is_dma_domain(struct iommu_domain *domain) @@ -339,6 +344,10 @@ struct iommu_ops { const struct iommu_domain_ops *default_domain_ops; unsigned long pgsize_bitmap; struct module *owner; + KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) + KABI_RESERVE(4) };
/** @@ -424,6 +433,10 @@ struct iommu_domain_ops { unsigned long *bitmap, unsigned long base_iova, unsigned long bitmap_pgshift); void (*free)(struct iommu_domain *domain); + KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) + KABI_RESERVE(4) };
/** @@ -440,6 +453,8 @@ struct iommu_device { struct fwnode_handle *fwnode; struct device *dev; u32 max_pasids; + KABI_RESERVE(1) + KABI_RESERVE(2) };
/** @@ -497,6 +512,8 @@ struct dev_iommu { u32 attach_deferred:1; u32 pci_32bit_workaround:1; u32 require_direct:1; + KABI_RESERVE(1) + KABI_RESERVE(2) };
int iommu_device_register(struct iommu_device *iommu,
反馈： 您发送到kernel@openeuler.org的补丁/补丁集，已成功转换为PR！ PR链接地址： https://gitee.com/openeuler/kernel/pulls/4590 邮件列表地址：https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/2...
FeedBack: The patch(es) which you have sent to kernel@openeuler.org mailing list has been converted to a pull request successfully! Pull request link: https://gitee.com/openeuler/kernel/pulls/4590 Mailing list address: https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/2...
-
patchwork bot -
Wang Wensheng