korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-11 04:18:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

netlink: create a new header for internal genetlink symbols

Browse Source 
There are things in linux/genetlink.h which are only used
under net/netlink/. Move them to a new local header.
A new header with just 2 externs isn't great, but alternative
would be to include af_netlink.h in genetlink.c which feels
even worse.

Link: https://lore.kernel.org/r/20240329175710.291749-2-kuba@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Jakub Kicinski 2024-03-29 10:57:08 -07:00
parent 092ca10741
commit 5bc63d3a6f
4 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/linux/genetlink.h
View File

@ -4,15 +4,10 @@
#include <uapi/linux/genetlink.h> #include <uapi/linux/genetlink.h>
/* All generic netlink requests are serialized by a global lock. */ /* All generic netlink requests are serialized by a global lock. */
extern void genl_lock(void); extern void genl_lock(void);
extern void genl_unlock(void); extern void genl_unlock(void);
/* for synchronisation between af_netlink and genetlink */
extern atomic_t genl_sk_destructing_cnt;
extern wait_queue_head_t genl_sk_destructing_waitq;
#define MODULE_ALIAS_GENL_FAMILY(family)\ #define MODULE_ALIAS_GENL_FAMILY(family)\
MODULE_ALIAS_NET_PF_PROTO_NAME(PF_NETLINK, NETLINK_GENERIC, "-family-" family) MODULE_ALIAS_NET_PF_PROTO_NAME(PF_NETLINK, NETLINK_GENERIC, "-family-" family)

2
net/netlink/af_netlink.c
View File

@ -59,7 +59,6 @@
#include <linux/rhashtable.h> #include <linux/rhashtable.h>
#include <asm/cacheflush.h> #include <asm/cacheflush.h>
#include <linux/hash.h> #include <linux/hash.h>
#include <linux/genetlink.h>
#include <linux/net_namespace.h> #include <linux/net_namespace.h>
#include <linux/nospec.h> #include <linux/nospec.h>
#include <linux/btf_ids.h> #include <linux/btf_ids.h>
@ -73,6 +72,7 @@
#include <trace/events/netlink.h> #include <trace/events/netlink.h>
#include "af_netlink.h" #include "af_netlink.h"
#include "genetlink.h"
struct listeners { struct listeners {
struct rcu_head rcu; struct rcu_head rcu;

2
net/netlink/genetlink.c
View File

@ -22,6 +22,8 @@
#include <net/sock.h> #include <net/sock.h>
#include <net/genetlink.h> #include <net/genetlink.h>
#include "genetlink.h"
static DEFINE_MUTEX(genl_mutex); /* serialization of message processing */ static DEFINE_MUTEX(genl_mutex); /* serialization of message processing */
static DECLARE_RWSEM(cb_lock); static DECLARE_RWSEM(cb_lock);

11
net/netlink/genetlink.h Normal file
View File

@ -0,0 +1,11 @@
/* SPDX-License-Identifier: GPL-2.0 */
#ifndef __NET_GENETLINK_H
#define __NET_GENETLINK_H
#include <linux/wait.h>
/* for synchronisation between af_netlink and genetlink */
extern atomic_t genl_sk_destructing_cnt;
extern wait_queue_head_t genl_sk_destructing_waitq;
#endif /* __LINUX_GENERIC_NETLINK_H */