From 115170d12723496eb50e866c18cb103769261672 Mon Sep 17 00:00:00 2001
From: PeilinHe <he.peilin@zte.com.cn>
Date: Thu, 30 Apr 2026 11:21:48 +0800
Subject: [PATCH] anolis: kabi: reserve some space for kABI

ANBZ: #9814

Reserve some space for kABI.
Signed-off-by: Xu Xin <xu.xin16@zte.com.cn>
Reviewed-by: Long Yunjian <long.yunjian@zte.com.cn>
Reviewed-by: Liu Song <liu.song13@zte.com.cn>
Reviewed-by: Zhang Yufeng <zhang.yufeng2@zte.com.cn>
Link: https://gitee.com/anolis/cloud-kernel/pulls/3764
---
 arch/x86/include/asm/kvm_host.h | 4 ++++
 arch/x86/kvm/lapic.h            | 2 ++
 drivers/char/tpm/tpm_tis_core.h | 3 +++
 include/linux/dmaengine.h       | 4 ++++
 include/linux/kvm_host.h        | 2 ++
 net/openvswitch/datapath.h      | 4 ++++
 net/openvswitch/vport.h         | 4 ++++
 7 files changed, 23 insertions(+)

diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
index 455f20511563..6228c30ad23e 100644
--- a/arch/x86/include/asm/kvm_host.h
+++ b/arch/x86/include/asm/kvm_host.h
@@ -1467,6 +1467,10 @@ struct kvm_arch {
 	struct kvm_mmu_memory_cache split_desc_cache;
 
 	CK_KABI_RESERVE(1)
+	CK_KABI_RESERVE(2)
+	CK_KABI_RESERVE(3)
+	CK_KABI_RESERVE(4)
+	CK_KABI_RESERVE(5)
 };
 
 struct kvm_vm_stat {
diff --git a/arch/x86/kvm/lapic.h b/arch/x86/kvm/lapic.h
index 0a0ea4b5dd8c..9e69c4177c36 100644
--- a/arch/x86/kvm/lapic.h
+++ b/arch/x86/kvm/lapic.h
@@ -5,6 +5,7 @@
 #include <kvm/iodev.h>
 
 #include <linux/kvm_host.h>
+#include <linux/ck_kabi.h>
 
 #include "hyperv.h"
 #include "smm.h"
@@ -54,6 +55,7 @@ struct kvm_timer {
 	u32 timer_advance_ns;
 	atomic_t pending;			/* accumulated triggered timers */
 	bool hv_timer_in_use;
+	CK_KABI_RESERVE(1)
 };
 
 struct kvm_lapic {
diff --git a/drivers/char/tpm/tpm_tis_core.h b/drivers/char/tpm/tpm_tis_core.h
index 27e61ddfb622..abac496df097 100644
--- a/drivers/char/tpm/tpm_tis_core.h
+++ b/drivers/char/tpm/tpm_tis_core.h
@@ -20,6 +20,7 @@
 #define __TPM_TIS_CORE_H__
 
 #include "tpm.h"
+#include <linux/ck_kabi.h>
 
 enum tis_access {
 	TPM_ACCESS_VALID = 0x80,
@@ -112,6 +113,8 @@ struct tpm_tis_data {
 	unsigned short rng_quality;
 	unsigned int timeout_min; /* usecs */
 	unsigned int timeout_max; /* usecs */
+
+	CK_KABI_RESERVE(1)
 };
 
 /*
diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h
index cff3dba65820..371976b92d08 100644
--- a/include/linux/dmaengine.h
+++ b/include/linux/dmaengine.h
@@ -13,6 +13,7 @@
 #include <linux/bitmap.h>
 #include <linux/types.h>
 #include <asm/page.h>
+#include <linux/ck_kabi.h>
 
 /**
  * typedef dma_cookie_t - an opaque DMA cookie
@@ -942,6 +943,9 @@ struct dma_device {
 	/* debugfs support */
 	void (*dbg_summary_show)(struct seq_file *s, struct dma_device *dev);
 	struct dentry *dbg_dev_root;
+
+	CK_KABI_RESERVE(1)
+	CK_KABI_RESERVE(2)
 };
 
 static inline int dmaengine_slave_config(struct dma_chan *chan,
diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
index f7753eca807c..f192bda984df 100644
--- a/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
@@ -396,6 +396,7 @@ struct kvm_vcpu {
 	u64 last_used_slot_gen;
 
 	CK_KABI_RESERVE(1)
+	CK_KABI_RESERVE(2)
 };
 
 /*
@@ -594,6 +595,7 @@ struct kvm_memory_slot {
 	u16 as_id;
 
 	CK_KABI_RESERVE(1)
+	CK_KABI_RESERVE(2)
 
 #ifdef CONFIG_KVM_PRIVATE_MEM
 	struct {
diff --git a/net/openvswitch/datapath.h b/net/openvswitch/datapath.h
index 0cd29971a907..851ad724d76e 100644
--- a/net/openvswitch/datapath.h
+++ b/net/openvswitch/datapath.h
@@ -13,6 +13,7 @@
 #include <linux/skbuff.h>
 #include <linux/u64_stats_sync.h>
 #include <net/ip_tunnels.h>
+#include <linux/ck_kabi.h>
 
 #include "conntrack.h"
 #include "flow.h"
@@ -121,6 +122,9 @@ struct ovs_skb_cb {
 	u16			mru;
 	u16			acts_origlen;
 	u32			cutlen;
+
+	CK_KABI_RESERVE(1)
+	CK_KABI_RESERVE(2)
 };
 #define OVS_CB(skb) ((struct ovs_skb_cb *)(skb)->cb)
 
diff --git a/net/openvswitch/vport.h b/net/openvswitch/vport.h
index 3e71ca8ad8a7..3dc14b956a06 100644
--- a/net/openvswitch/vport.h
+++ b/net/openvswitch/vport.h
@@ -14,6 +14,7 @@
 #include <linux/skbuff.h>
 #include <linux/spinlock.h>
 #include <linux/u64_stats_sync.h>
+#include <linux/ck_kabi.h>
 
 #include "datapath.h"
 
@@ -85,6 +86,9 @@ struct vport {
 
 	struct list_head detach_list;
 	struct rcu_head rcu;
+
+	CK_KABI_RESERVE(1)
+	CK_KABI_RESERVE(2)
 };
 
 /**
-- 
Gitee