hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I9S5ZK

-------------------------------------

Reserve for the iova and memory alloc related functions. It is used for future patches to merge.

Signed-off-by: Zhang Zekun zhangzekun11@huawei.com --- drivers/iommu/iommu.c | 4 ++++ include/linux/iova.h | 8 ++++++++ 2 files changed, 12 insertions(+)

diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c index ba33d11f2fdb..bd14b73dccb7 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -58,6 +58,10 @@ struct iommu_group { struct iommu_domain *default_domain; struct iommu_domain *domain; struct list_head entry; + KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) + KABI_RESERVE(4) };

struct group_device { diff --git a/include/linux/iova.h b/include/linux/iova.h index dda350fc6aca..b8d89ffacc58 100644 --- a/include/linux/iova.h +++ b/include/linux/iova.h @@ -35,6 +35,8 @@ struct iova_rcache { struct iova_cpu_rcache __percpu *cpu_rcaches; struct iova_domain *iovad; struct delayed_work work; + KABI_RESERVE(1) + KABI_RESERVE(2) };

struct iova_domain; @@ -64,6 +66,8 @@ struct iova_fq { struct iova_fq_entry entries[IOVA_FQ_SIZE]; unsigned head, tail; spinlock_t lock; + KABI_RESERVE(1) + KABI_RESERVE(2) };

/* holds all the iova translations for a domain */ @@ -98,6 +102,10 @@ struct iova_domain { atomic_t fq_timer_on; /* 1 when timer is active, 0 when not */ struct work_struct free_iova_work; + KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) + KABI_RESERVE(4) };

static inline unsigned long iova_size(struct iova *iova)