Skip to content

[Deepin Kernel SIG] kABI: Introduce generic kABI macros to use for kABI workarounds #388

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Avenger-285714 merged 3 commits into from
Aug 28, 2024
Merged

[Deepin Kernel SIG] kABI: Introduce generic kABI macros to use for kABI workarounds #388

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
64ccab9
kABI: Introduce generic kABI macros to use for kABI workarounds
Aug 27, 2024
414832c
kabi: Introduce CONFIG_KABI_RESERVE
Aug 27, 2024
d666fd6
KABI: Init base for KABI paddings
Aug 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions MAINTAINERS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5773,6 +5773,14 @@ M: "WangYuli" <wangyuli@uniontech.com>
S: Maintained
F: lib/fonts/font_cjk*

DEEPIN KABI-HELPERS
M: "Lugang He" <helugang@uniontech.com>
M: "WangYuli" <wangyuli@uniontech.com>
M: "Wentao Guan" <guanwentao@uniontech.com>
M: "Winston Wen" <wentao@uniontech.com>
S: Maintained
F: include/linux/deepin_kabi.h

DEEPIN OWNERS
M: "WangYuli" <wangyuli@uniontech.com>
S: Maintained
Expand Down
9 changes: 9 additions & 0 deletions drivers/pci/pci.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,6 +310,15 @@ struct pci_sriov {
u16 subsystem_device; /* VF subsystem device */
resource_size_t barsz[PCI_SRIOV_NUM_BARS]; /* VF BAR size */
bool drivers_autoprobe; /* Auto probing of VFs by driver */

DEEPIN_KABI_RESERVE(1)
DEEPIN_KABI_RESERVE(2)
DEEPIN_KABI_RESERVE(3)
DEEPIN_KABI_RESERVE(4)
DEEPIN_KABI_RESERVE(5)
DEEPIN_KABI_RESERVE(6)
DEEPIN_KABI_RESERVE(7)
DEEPIN_KABI_RESERVE(8)
};

#ifdef CONFIG_PCI_DOE
Expand Down
5 changes: 5 additions & 0 deletions include/crypto/akcipher.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

#include <linux/atomic.h>
#include <linux/crypto.h>
#include <linux/deepin_kabi.h>

/**
* struct akcipher_request - public key request
Expand Down Expand Up @@ -127,6 +128,10 @@ struct akcipher_alg {
int (*init)(struct crypto_akcipher *tfm);
void (*exit)(struct crypto_akcipher *tfm);

DEEPIN_KABI_RESERVE(1)
DEEPIN_KABI_RESERVE(2)
DEEPIN_KABI_RESERVE(3)

#ifdef CONFIG_CRYPTO_STATS
struct crypto_istat_akcipher stat;
#endif
Expand Down
5 changes: 5 additions & 0 deletions include/crypto/public_key.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

#include <linux/keyctl.h>
#include <linux/oid_registry.h>
#include <linux/deepin_kabi.h>

/*
* Cryptographic data for the public-key subtype of the asymmetric key type.
Expand All @@ -32,6 +33,10 @@ struct public_key {
#define KEY_EFLAG_CA 0 /* set if the CA basic constraints is set */
#define KEY_EFLAG_DIGITALSIG 1 /* set if the digitalSignature usage is set */
#define KEY_EFLAG_KEYCERTSIGN 2 /* set if the keyCertSign usage is set */
DEEPIN_KABI_RESERVE(1)
DEEPIN_KABI_RESERVE(2)
DEEPIN_KABI_RESERVE(3)
DEEPIN_KABI_RESERVE(4)
};

extern void public_key_free(struct public_key *key);
Expand Down
4 changes: 4 additions & 0 deletions include/linux/can/core.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
#include <linux/can.h>
#include <linux/skbuff.h>
#include <linux/netdevice.h>
#include <linux/deepin_kabi.h>

#define DNAME(dev) ((dev) ? (dev)->name : "any")

Expand All @@ -32,6 +33,9 @@ struct can_proto {
int protocol;
const struct proto_ops *ops;
struct proto *prot;

DEEPIN_KABI_RESERVE(1)
DEEPIN_KABI_RESERVE(2)
};

/* required_size
Expand Down
6 changes: 6 additions & 0 deletions include/linux/can/dev.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
#include <linux/can/skb.h>
#include <linux/ethtool.h>
#include <linux/netdevice.h>
#include <linux/deepin_kabi.h>

/*
* CAN mode
Expand Down Expand Up @@ -85,6 +86,11 @@ struct can_priv {
int (*do_get_berr_counter)(const struct net_device *dev,
struct can_berr_counter *bec);
int (*do_get_auto_tdcv)(const struct net_device *dev, u32 *tdcv);

DEEPIN_KABI_RESERVE(1)
DEEPIN_KABI_RESERVE(2)
DEEPIN_KABI_RESERVE(3)
DEEPIN_KABI_RESERVE(4)
};

static inline bool can_tdc_is_enabled(const struct can_priv *priv)
Expand Down
4 changes: 4 additions & 0 deletions include/linux/can/rx-offload.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

#include <linux/netdevice.h>
#include <linux/can.h>
#include <linux/deepin_kabi.h>

struct can_rx_offload {
struct net_device *dev;
Expand All @@ -29,6 +30,9 @@ struct can_rx_offload {
struct napi_struct napi;

bool inc;

DEEPIN_KABI_RESERVE(1)
DEEPIN_KABI_RESERVE(2)
};

int can_rx_offload_add_timestamp(struct net_device *dev,
Expand Down
5 changes: 5 additions & 0 deletions include/linux/cred.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
#include <linux/atomic.h>
#include <linux/uidgid.h>
#include <linux/sched.h>
#include <linux/deepin_kabi.h>
#include <linux/sched/user.h>

struct cred;
Expand Down Expand Up @@ -143,6 +144,10 @@ struct cred {
int non_rcu; /* Can we skip RCU deletion? */
struct rcu_head rcu; /* RCU deletion hook */
};
DEEPIN_KABI_RESERVE(1)
DEEPIN_KABI_RESERVE(2)
DEEPIN_KABI_RESERVE(3)
DEEPIN_KABI_RESERVE(4)
} __randomize_layout;

extern void __put_cred(struct cred *);
Expand Down
Loading