redonkable
/
remarkable-linux
1
0
Fork 0
Code Releases Activity

netns: make struct pernet_operations::id unsigned int 

Make struct pernet_operations::id unsigned.

There are 2 reasons to do so:

1)
This field is really an index into an zero based array and
thus is unsigned entity. Using negative value is out-of-bound
access by definition.

2)
On x86_64 unsigned 32-bit data which are mixed with pointers
via array indexing or offsets added or subtracted to pointers
are preffered to signed 32-bit data.

"int" being used as an array index needs to be sign-extended
to 64-bit before being used.

	void f(long *p, int i)
	{
		g(p[i]);
	}

  roughly translates to

	movsx	rsi, esi
	mov	rdi, [rsi+...]
	call 	g

MOVSX is 3 byte instruction which isn't necessary if the variable is
unsigned because x86_64 is zero extending by default.

Now, there is net_generic() function which, you guessed it right, uses
"int" as an array index:

	static inline void *net_generic(const struct net *net, int id)
	{
		...
		ptr = ng->ptr[id - 1];
		...
	}

And this function is used a lot, so those sign extensions add up.

Patch snipes ~1730 bytes on allyesconfig kernel (without all junk
messing with code generation):

	add/remove: 0/0 grow/shrink: 70/598 up/down: 396/-2126 (-1730)

Unfortunately some functions actually grow bigger.
This is a semmingly random artefact of code generation with register
allocator being used differently. gcc decides that some variable
needs to live in new r8+ registers and every access now requires REX
prefix. Or it is shifted into r12, so [r12+0] addressing mode has to be
used which is longer than [r8]

However, overall balance is in negative direction:

	add/remove: 0/0 grow/shrink: 70/598 up/down: 396/-2126 (-1730)
	function                                     old     new   delta
	nfsd4_lock                                  3886    3959     +73
	tipc_link_build_proto_msg                   1096    1140     +44
	mac80211_hwsim_new_radio                    2776    2808     +32
	tipc_mon_rcv                                1032    1058     +26
	svcauth_gss_legacy_init                     1413    1429     +16
	tipc_bcbase_select_primary                   379     392     +13
	nfsd4_exchange_id                           1247    1260     +13
	nfsd4_setclientid_confirm                    782     793     +11
		...
	put_client_renew_locked                      494     480     -14
	ip_set_sockfn_get                            730     716     -14
	geneve_sock_add                              829     813     -16
	nfsd4_sequence_done                          721     703     -18
	nlmclnt_lookup_host                          708     686     -22
	nfsd4_lockt                                 1085    1063     -22
	nfs_get_client                              1077    1050     -27
	tcf_bpf_init                                1106    1076     -30
	nfsd4_encode_fattr                          5997    5930     -67
	Total: Before=154856051, After=154854321, chg -0.00%

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
zero-colors
Alexey Dobriyan 2016-11-17 04:58:21 +03:00 committed by David S. Miller
parent e68b6e50fa
commit c7d03a00b5
73 changed files with 80 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/infiniband/core/cma.c
View File

@ -116,7 +116,7 @@ static LIST_HEAD(dev_list);
static LIST_HEAD(listen_any_list); static LIST_HEAD(listen_any_list);
static DEFINE_MUTEX(lock); static DEFINE_MUTEX(lock);
static struct workqueue_struct *cma_wq; static struct workqueue_struct *cma_wq;
static int cma_pernet_id; static unsigned int cma_pernet_id;
struct cma_pernet { struct cma_pernet {
struct idr tcp_ps; struct idr tcp_ps;

2
drivers/net/bonding/bond_main.c
View File

@ -199,7 +199,7 @@ MODULE_PARM_DESC(lp_interval, "The number of seconds between instances where "
atomic_t netpoll_block_tx = ATOMIC_INIT(0); atomic_t netpoll_block_tx = ATOMIC_INIT(0);
#endif #endif
int bond_net_id __read_mostly; unsigned int bond_net_id __read_mostly;
static __be32 arp_target[BOND_MAX_ARP_TARGETS]; static __be32 arp_target[BOND_MAX_ARP_TARGETS];
static int arp_ip_count; static int arp_ip_count;

2
drivers/net/geneve.c
View File

@ -43,7 +43,7 @@ struct geneve_net {
struct list_head sock_list; struct list_head sock_list;
}; };
static int geneve_net_id; static unsigned int geneve_net_id;
union geneve_addr { union geneve_addr {
struct sockaddr_in sin; struct sockaddr_in sin;

2
drivers/net/gtp.c
View File

@ -77,7 +77,7 @@ struct gtp_dev {
struct hlist_head *addr_hash; struct hlist_head *addr_hash;
}; };
static int gtp_net_id __read_mostly; static unsigned int gtp_net_id __read_mostly;
struct gtp_net { struct gtp_net {
struct list_head gtp_dev_list; struct list_head gtp_dev_list;

2
drivers/net/ppp/ppp_generic.c
View File

@ -204,7 +204,7 @@ static atomic_t ppp_unit_count = ATOMIC_INIT(0);
static atomic_t channel_count = ATOMIC_INIT(0); static atomic_t channel_count = ATOMIC_INIT(0);
/* per-net private data for this module */ /* per-net private data for this module */
static int ppp_net_id __read_mostly; static unsigned int ppp_net_id __read_mostly;
struct ppp_net { struct ppp_net {
/* units to ppp mapping */ /* units to ppp mapping */
struct idr units_idr; struct idr units_idr;

2
drivers/net/ppp/pppoe.c
View File

@ -95,7 +95,7 @@ static const struct proto_ops pppoe_ops;
static const struct ppp_channel_ops pppoe_chan_ops; static const struct ppp_channel_ops pppoe_chan_ops;
/* per-net private data for this module */ /* per-net private data for this module */
static int pppoe_net_id __read_mostly; static unsigned int pppoe_net_id __read_mostly;
struct pppoe_net { struct pppoe_net {
/* /*
* we could use _single_ hash table for all * we could use _single_ hash table for all

2
drivers/net/vxlan.c
View File

@ -52,7 +52,7 @@ static bool log_ecn_error = true;
module_param(log_ecn_error, bool, 0644); module_param(log_ecn_error, bool, 0644);
MODULE_PARM_DESC(log_ecn_error, "Log packets received with corrupted ECN"); MODULE_PARM_DESC(log_ecn_error, "Log packets received with corrupted ECN");
static int vxlan_net_id; static unsigned int vxlan_net_id;
static struct rtnl_link_ops vxlan_link_ops; static struct rtnl_link_ops vxlan_link_ops;
static const u8 all_zeros_mac[ETH_ALEN + 2]; static const u8 all_zeros_mac[ETH_ALEN + 2];

2
drivers/net/wireless/mac80211_hwsim.c
View File

@ -250,7 +250,7 @@ static inline void hwsim_clear_chanctx_magic(struct ieee80211_chanctx_conf *c)
cp->magic = 0; cp->magic = 0;
} }
static int hwsim_net_id; static unsigned int hwsim_net_id;
static int hwsim_netgroup; static int hwsim_netgroup;

2
fs/lockd/netns.h
View File

@ -15,6 +15,6 @@ struct lockd_net {
struct list_head nsm_handles; struct list_head nsm_handles;
}; };
extern int lockd_net_id; extern unsigned int lockd_net_id;
#endif #endif

2
fs/lockd/svc.c
View File

@ -57,7 +57,7 @@ static struct task_struct *nlmsvc_task;
static struct svc_rqst *nlmsvc_rqst; static struct svc_rqst *nlmsvc_rqst;
unsigned long nlmsvc_timeout; unsigned long nlmsvc_timeout;
int lockd_net_id; unsigned int lockd_net_id;
/* /*
* These can be set at insmod time (useful for NFS as root filesystem), * These can be set at insmod time (useful for NFS as root filesystem),

2
fs/nfs/inode.c
View File

@ -2015,7 +2015,7 @@ static void nfsiod_stop(void)
destroy_workqueue(wq); destroy_workqueue(wq);
} }
int nfs_net_id; unsigned int nfs_net_id;
EXPORT_SYMBOL_GPL(nfs_net_id); EXPORT_SYMBOL_GPL(nfs_net_id);
static int nfs_net_init(struct net *net) static int nfs_net_init(struct net *net)

2
fs/nfs/netns.h
View File

@ -35,6 +35,6 @@ struct nfs_net {
#endif #endif
}; };
extern int nfs_net_id; extern unsigned int nfs_net_id;
#endif #endif

2
fs/nfs_common/grace.c
View File

@ -9,7 +9,7 @@
#include <net/netns/generic.h> #include <net/netns/generic.h>
#include <linux/fs.h> #include <linux/fs.h>
static int grace_net_id; static unsigned int grace_net_id;
static DEFINE_SPINLOCK(grace_lock); static DEFINE_SPINLOCK(grace_lock);
/** /**

2
fs/nfsd/netns.h
View File

@ -124,5 +124,5 @@ struct nfsd_net {
/* Simple check to find out if a given net was properly initialized */ /* Simple check to find out if a given net was properly initialized */
#define nfsd_netns_ready(nn) ((nn)->sessionid_hashtbl) #define nfsd_netns_ready(nn) ((nn)->sessionid_hashtbl)
extern int nfsd_net_id; extern unsigned int nfsd_net_id;
#endif /* __NFSD_NETNS_H__ */ #endif /* __NFSD_NETNS_H__ */

2
fs/nfsd/nfsctl.c
View File

@ -1201,7 +1201,7 @@ static int create_proc_exports_entry(void)
} }
#endif #endif
int nfsd_net_id; unsigned int nfsd_net_id;
static __net_init int nfsd_init_net(struct net *net) static __net_init int nfsd_init_net(struct net *net)
{ {

2
include/net/bonding.h
View File

@ -681,7 +681,7 @@ static inline int bond_get_targets_ip(__be32 *targets, __be32 ip)
} }
/* exported from bond_main.c */ /* exported from bond_main.c */
extern int bond_net_id; extern unsigned int bond_net_id;
extern const struct bond_parm_tbl bond_lacp_tbl[]; extern const struct bond_parm_tbl bond_lacp_tbl[];
extern const struct bond_parm_tbl xmit_hashtype_tbl[]; extern const struct bond_parm_tbl xmit_hashtype_tbl[];
extern const struct bond_parm_tbl arp_validate_tbl[]; extern const struct bond_parm_tbl arp_validate_tbl[];

6
include/net/ip_tunnels.h
View File

@ -129,7 +129,7 @@ struct ip_tunnel {
#endif #endif
struct ip_tunnel_prl_entry __rcu *prl; /* potential router list */ struct ip_tunnel_prl_entry __rcu *prl; /* potential router list */
unsigned int prl_count; /* # of entries in PRL */ unsigned int prl_count; /* # of entries in PRL */
int ip_tnl_net_id; unsigned int ip_tnl_net_id;
struct gro_cells gro_cells; struct gro_cells gro_cells;
bool collect_md; bool collect_md;
bool ignore_df; bool ignore_df;
@ -248,7 +248,7 @@ void ip_tunnel_uninit(struct net_device *dev);
void ip_tunnel_dellink(struct net_device *dev, struct list_head *head); void ip_tunnel_dellink(struct net_device *dev, struct list_head *head);
struct net *ip_tunnel_get_link_net(const struct net_device *dev); struct net *ip_tunnel_get_link_net(const struct net_device *dev);
int ip_tunnel_get_iflink(const struct net_device *dev); int ip_tunnel_get_iflink(const struct net_device *dev);
int ip_tunnel_init_net(struct net *net, int ip_tnl_net_id, int ip_tunnel_init_net(struct net *net, unsigned int ip_tnl_net_id,
struct rtnl_link_ops *ops, char *devname); struct rtnl_link_ops *ops, char *devname);
void ip_tunnel_delete_net(struct ip_tunnel_net *itn, struct rtnl_link_ops *ops); void ip_tunnel_delete_net(struct ip_tunnel_net *itn, struct rtnl_link_ops *ops);
@ -275,7 +275,7 @@ int ip_tunnel_changelink(struct net_device *dev, struct nlattr *tb[],
struct ip_tunnel_parm *p); struct ip_tunnel_parm *p);
int ip_tunnel_newlink(struct net_device *dev, struct nlattr *tb[], int ip_tunnel_newlink(struct net_device *dev, struct nlattr *tb[],
struct ip_tunnel_parm *p); struct ip_tunnel_parm *p);
void ip_tunnel_setup(struct net_device *dev, int net_id); void ip_tunnel_setup(struct net_device *dev, unsigned int net_id);
struct ip_tunnel_encap_ops { struct ip_tunnel_encap_ops {
size_t (*encap_hlen)(struct ip_tunnel_encap *e); size_t (*encap_hlen)(struct ip_tunnel_encap *e);

2
include/net/net_namespace.h
View File

@ -291,7 +291,7 @@ struct pernet_operations {
int (*init)(struct net *net); int (*init)(struct net *net);
void (*exit)(struct net *net); void (*exit)(struct net *net);
void (*exit_batch)(struct list_head *net_exit_list); void (*exit_batch)(struct list_head *net_exit_list);
int *id; unsigned int *id;
size_t size; size_t size;
}; };

2
include/net/netfilter/nf_conntrack_l4proto.h
View File

@ -98,7 +98,7 @@ struct nf_conntrack_l4proto {
const struct nla_policy *nla_policy; const struct nla_policy *nla_policy;
} ctnl_timeout; } ctnl_timeout;
#endif #endif
int *net_id; unsigned int *net_id;
/* Init l4proto pernet data */ /* Init l4proto pernet data */
int (*init_net)(struct net *net, u_int16_t proto); int (*init_net)(struct net *net, u_int16_t proto);

2
include/net/netfilter/nf_conntrack_synproxy.h
View File

@ -54,7 +54,7 @@ struct synproxy_net {
struct synproxy_stats __percpu *stats; struct synproxy_stats __percpu *stats;
}; };
extern int synproxy_net_id; extern unsigned int synproxy_net_id;
static inline struct synproxy_net *synproxy_pernet(struct net *net) static inline struct synproxy_net *synproxy_pernet(struct net *net)
{ {
return net_generic(net, synproxy_net_id); return net_generic(net, synproxy_net_id);

2
include/net/netns/generic.h
View File

@ -31,7 +31,7 @@ struct net_generic {
void *ptr[0]; void *ptr[0];
}; };
static inline void *net_generic(const struct net *net, int id) static inline void *net_generic(const struct net *net, unsigned int id)
{ {
struct net_generic *ng; struct net_generic *ng;
void *ptr; void *ptr;

2
kernel/audit.c
View File

@ -126,7 +126,7 @@ static atomic_t audit_lost = ATOMIC_INIT(0);
/* The netlink socket. */ /* The netlink socket. */
static struct sock *audit_sock; static struct sock *audit_sock;
static int audit_net_id; static unsigned int audit_net_id;
/* Hash for inode-based rules */ /* Hash for inode-based rules */
struct list_head audit_inode_hash[AUDIT_INODE_BUCKETS]; struct list_head audit_inode_hash[AUDIT_INODE_BUCKETS];

2
net/8021q/vlan.c
View File

@ -44,7 +44,7 @@
/* Global VLAN variables */ /* Global VLAN variables */
int vlan_net_id __read_mostly; unsigned int vlan_net_id __read_mostly;
const char vlan_fullname[] = "802.1Q VLAN Support"; const char vlan_fullname[] = "802.1Q VLAN Support";
const char vlan_version[] = DRV_VERSION; const char vlan_version[] = DRV_VERSION;

2
net/8021q/vlan.h
View File

@ -159,7 +159,7 @@ void vlan_netlink_fini(void);
extern struct rtnl_link_ops vlan_link_ops; extern struct rtnl_link_ops vlan_link_ops;
extern int vlan_net_id; extern unsigned int vlan_net_id;
struct proc_dir_entry; struct proc_dir_entry;

2
net/bridge/br_netfilter_hooks.c
View File

@ -46,7 +46,7 @@
#include <linux/sysctl.h> #include <linux/sysctl.h>
#endif #endif
static int brnf_net_id __read_mostly; static unsigned int brnf_net_id __read_mostly;
struct brnf_net { struct brnf_net {
bool enabled; bool enabled;

2
net/caif/caif_dev.c
View File

@ -52,7 +52,7 @@ struct caif_net {
struct caif_device_entry_list caifdevs; struct caif_device_entry_list caifdevs;
}; };
static int caif_net_id; static unsigned int caif_net_id;
static int q_high = 50; /* Percent */ static int q_high = 50; /* Percent */
struct cfcnfg *get_cfcnfg(struct net *net) struct cfcnfg *get_cfcnfg(struct net *net)

7
net/core/net_namespace.c
View File

@ -55,7 +55,7 @@ static struct net_generic *net_alloc_generic(void)
return ng; return ng;
} }
static int net_assign_generic(struct net *net, int id, void *data) static int net_assign_generic(struct net *net, unsigned int id, void *data)
{ {
struct net_generic *ng, *old_ng; struct net_generic *ng, *old_ng;
@ -122,8 +122,7 @@ out:
static void ops_free(const struct pernet_operations *ops, struct net *net) static void ops_free(const struct pernet_operations *ops, struct net *net)
{ {
if (ops->id && ops->size) { if (ops->id && ops->size) {
int id = *ops->id; kfree(net_generic(net, *ops->id));
kfree(net_generic(net, id));
} }
} }
@ -881,7 +880,7 @@ again:
} }
return error; return error;
} }
max_gen_ptrs = max_t(unsigned int, max_gen_ptrs, *ops->id); max_gen_ptrs = max(max_gen_ptrs, *ops->id);
} }
error = __register_pernet_operations(list, ops); error = __register_pernet_operations(list, ops);
if (error) { if (error) {

2
net/core/pktgen.c
View File

@ -413,7 +413,7 @@ struct pktgen_hdr {
}; };
static int pg_net_id __read_mostly; static unsigned int pg_net_id __read_mostly;
struct pktgen_net { struct pktgen_net {
struct net *net; struct net *net;

4
net/ipv4/ip_gre.c
View File

@ -113,8 +113,8 @@ MODULE_PARM_DESC(log_ecn_error, "Log packets received with corrupted ECN");
static struct rtnl_link_ops ipgre_link_ops __read_mostly; static struct rtnl_link_ops ipgre_link_ops __read_mostly;
static int ipgre_tunnel_init(struct net_device *dev); static int ipgre_tunnel_init(struct net_device *dev);
static int ipgre_net_id __read_mostly; static unsigned int ipgre_net_id __read_mostly;
static int gre_tap_net_id __read_mostly; static unsigned int gre_tap_net_id __read_mostly;
static void ipgre_err(struct sk_buff *skb, u32 info, static void ipgre_err(struct sk_buff *skb, u32 info,
const struct tnl_ptk_info *tpi) const struct tnl_ptk_info *tpi)

4
net/ipv4/ip_tunnel.c
View File

@ -994,7 +994,7 @@ int ip_tunnel_get_iflink(const struct net_device *dev)
} }
EXPORT_SYMBOL(ip_tunnel_get_iflink); EXPORT_SYMBOL(ip_tunnel_get_iflink);
int ip_tunnel_init_net(struct net *net, int ip_tnl_net_id, int ip_tunnel_init_net(struct net *net, unsigned int ip_tnl_net_id,
struct rtnl_link_ops *ops, char *devname) struct rtnl_link_ops *ops, char *devname)
{ {
struct ip_tunnel_net *itn = net_generic(net, ip_tnl_net_id); struct ip_tunnel_net *itn = net_generic(net, ip_tnl_net_id);
@ -1196,7 +1196,7 @@ void ip_tunnel_uninit(struct net_device *dev)
EXPORT_SYMBOL_GPL(ip_tunnel_uninit); EXPORT_SYMBOL_GPL(ip_tunnel_uninit);
/* Do least required initialization, rest of init is done in tunnel_init call */ /* Do least required initialization, rest of init is done in tunnel_init call */
void ip_tunnel_setup(struct net_device *dev, int net_id) void ip_tunnel_setup(struct net_device *dev, unsigned int net_id)
{ {
struct ip_tunnel *tunnel = netdev_priv(dev); struct ip_tunnel *tunnel = netdev_priv(dev);
tunnel->ip_tnl_net_id = net_id; tunnel->ip_tnl_net_id = net_id;

2
net/ipv4/ip_vti.c
View File

@ -46,7 +46,7 @@
static struct rtnl_link_ops vti_link_ops __read_mostly; static struct rtnl_link_ops vti_link_ops __read_mostly;
static int vti_net_id __read_mostly; static unsigned int vti_net_id __read_mostly;
static int vti_tunnel_init(struct net_device *dev); static int vti_tunnel_init(struct net_device *dev);
static int vti_input(struct sk_buff *skb, int nexthdr, __be32 spi, static int vti_input(struct sk_buff *skb, int nexthdr, __be32 spi,

2
net/ipv4/ipip.c
View File

@ -121,7 +121,7 @@ static bool log_ecn_error = true;
module_param(log_ecn_error, bool, 0644); module_param(log_ecn_error, bool, 0644);
MODULE_PARM_DESC(log_ecn_error, "Log packets received with corrupted ECN"); MODULE_PARM_DESC(log_ecn_error, "Log packets received with corrupted ECN");
static int ipip_net_id __read_mostly; static unsigned int ipip_net_id __read_mostly;
static int ipip_tunnel_init(struct net_device *dev); static int ipip_tunnel_init(struct net_device *dev);
static struct rtnl_link_ops ipip_link_ops __read_mostly; static struct rtnl_link_ops ipip_link_ops __read_mostly;

2
net/ipv4/netfilter/ipt_CLUSTERIP.c
View File

@ -62,7 +62,7 @@ struct clusterip_config {
static const struct file_operations clusterip_proc_fops; static const struct file_operations clusterip_proc_fops;
#endif #endif
static int clusterip_net_id __read_mostly; static unsigned int clusterip_net_id __read_mostly;
struct clusterip_net { struct clusterip_net {
struct list_head configs; struct list_head configs;

2
net/ipv6/ip6_gre.c
View File

@ -64,7 +64,7 @@ MODULE_PARM_DESC(log_ecn_error, "Log packets received with corrupted ECN");
#define IP6_GRE_HASH_SIZE_SHIFT 5 #define IP6_GRE_HASH_SIZE_SHIFT 5
#define IP6_GRE_HASH_SIZE (1 << IP6_GRE_HASH_SIZE_SHIFT) #define IP6_GRE_HASH_SIZE (1 << IP6_GRE_HASH_SIZE_SHIFT)
static int ip6gre_net_id __read_mostly; static unsigned int ip6gre_net_id __read_mostly;
struct ip6gre_net { struct ip6gre_net {
struct ip6_tnl __rcu *tunnels[4][IP6_GRE_HASH_SIZE]; struct ip6_tnl __rcu *tunnels[4][IP6_GRE_HASH_SIZE];

2
net/ipv6/ip6_tunnel.c
View File

@ -83,7 +83,7 @@ static int ip6_tnl_dev_init(struct net_device *dev);
static void ip6_tnl_dev_setup(struct net_device *dev); static void ip6_tnl_dev_setup(struct net_device *dev);
static struct rtnl_link_ops ip6_link_ops __read_mostly; static struct rtnl_link_ops ip6_link_ops __read_mostly;
static int ip6_tnl_net_id __read_mostly; static unsigned int ip6_tnl_net_id __read_mostly;
struct ip6_tnl_net { struct ip6_tnl_net {
/* the IPv6 tunnel fallback device */ /* the IPv6 tunnel fallback device */
struct net_device *fb_tnl_dev; struct net_device *fb_tnl_dev;

2
net/ipv6/ip6_vti.c
View File

@ -64,7 +64,7 @@ static int vti6_dev_init(struct net_device *dev);
static void vti6_dev_setup(struct net_device *dev); static void vti6_dev_setup(struct net_device *dev);
static struct rtnl_link_ops vti6_link_ops __read_mostly; static struct rtnl_link_ops vti6_link_ops __read_mostly;
static int vti6_net_id __read_mostly; static unsigned int vti6_net_id __read_mostly;
struct vti6_net { struct vti6_net {
/* the vti6 tunnel fallback device */ /* the vti6 tunnel fallback device */
struct net_device *fb_tnl_dev; struct net_device *fb_tnl_dev;

2
net/ipv6/sit.c
View File

@ -76,7 +76,7 @@ static bool check_6rd(struct ip_tunnel *tunnel, const struct in6_addr *v6dst,
__be32 *v4dst); __be32 *v4dst);
static struct rtnl_link_ops sit_link_ops __read_mostly; static struct rtnl_link_ops sit_link_ops __read_mostly;
static int sit_net_id __read_mostly; static unsigned int sit_net_id __read_mostly;
struct sit_net { struct sit_net {
struct ip_tunnel __rcu *tunnels_r_l[IP6_SIT_HASH_SIZE]; struct ip_tunnel __rcu *tunnels_r_l[IP6_SIT_HASH_SIZE];
struct ip_tunnel __rcu *tunnels_r[IP6_SIT_HASH_SIZE]; struct ip_tunnel __rcu *tunnels_r[IP6_SIT_HASH_SIZE];

2
net/ipv6/xfrm6_tunnel.c
View File

@ -44,7 +44,7 @@ struct xfrm6_tunnel_net {
u32 spi; u32 spi;
}; };
static int xfrm6_tunnel_net_id __read_mostly; static unsigned int xfrm6_tunnel_net_id __read_mostly;
static inline struct xfrm6_tunnel_net *xfrm6_tunnel_pernet(struct net *net) static inline struct xfrm6_tunnel_net *xfrm6_tunnel_pernet(struct net *net)
{ {
return net_generic(net, xfrm6_tunnel_net_id); return net_generic(net, xfrm6_tunnel_net_id);

2
net/key/af_key.c
View File

@ -36,7 +36,7 @@
#define _X2KEY(x) ((x) == XFRM_INF ? 0 : (x)) #define _X2KEY(x) ((x) == XFRM_INF ? 0 : (x))
#define _KEY2X(x) ((x) == 0 ? XFRM_INF : (x)) #define _KEY2X(x) ((x) == 0 ? XFRM_INF : (x))
static int pfkey_net_id __read_mostly; static unsigned int pfkey_net_id __read_mostly;
struct netns_pfkey { struct netns_pfkey {
/* List of all pfkey sockets. */ /* List of all pfkey sockets. */
struct hlist_head table; struct hlist_head table;

2
net/netfilter/ipset/ip_set_core.c
View File

@ -36,7 +36,7 @@ struct ip_set_net {
bool is_destroyed; /* all sets are destroyed */ bool is_destroyed; /* all sets are destroyed */
}; };
static int ip_set_net_id __read_mostly; static unsigned int ip_set_net_id __read_mostly;
static inline struct ip_set_net *ip_set_pernet(struct net *net) static inline struct ip_set_net *ip_set_pernet(struct net *net)
{ {

2
net/netfilter/ipvs/ip_vs_core.c
View File

@ -70,7 +70,7 @@ EXPORT_SYMBOL(ip_vs_get_debug_level);
#endif #endif
EXPORT_SYMBOL(ip_vs_new_conn_out); EXPORT_SYMBOL(ip_vs_new_conn_out);
static int ip_vs_net_id __read_mostly; static unsigned int ip_vs_net_id __read_mostly;
/* netns cnt used for uniqueness */ /* netns cnt used for uniqueness */
static atomic_t ipvs_netns_cnt = ATOMIC_INIT(0); static atomic_t ipvs_netns_cnt = ATOMIC_INIT(0);

2
net/netfilter/nf_conntrack_proto_dccp.c
View File

@ -385,7 +385,7 @@ dccp_state_table[CT_DCCP_ROLE_MAX + 1][DCCP_PKT_SYNCACK + 1][CT_DCCP_MAX + 1] =
}; };
/* this module per-net specifics */ /* this module per-net specifics */
static int dccp_net_id __read_mostly; static unsigned int dccp_net_id __read_mostly;
struct dccp_net { struct dccp_net {
struct nf_proto_net pn; struct nf_proto_net pn;
int dccp_loose; int dccp_loose;

2
net/netfilter/nf_conntrack_proto_gre.c
View File

@ -53,7 +53,7 @@ static unsigned int gre_timeouts[GRE_CT_MAX] = {
[GRE_CT_REPLIED] = 180*HZ, [GRE_CT_REPLIED] = 180*HZ,
}; };
static int proto_gre_net_id __read_mostly; static unsigned int proto_gre_net_id __read_mostly;
struct netns_proto_gre { struct netns_proto_gre {
struct nf_proto_net nf; struct nf_proto_net nf;
rwlock_t keymap_lock; rwlock_t keymap_lock;

2
net/netfilter/nf_conntrack_proto_sctp.c
View File

@ -144,7 +144,7 @@ static const u8 sctp_conntracks[2][11][SCTP_CONNTRACK_MAX] = {
} }
}; };
static int sctp_net_id __read_mostly; static unsigned int sctp_net_id __read_mostly;
struct sctp_net { struct sctp_net {
struct nf_proto_net pn; struct nf_proto_net pn;
unsigned int timeouts[SCTP_CONNTRACK_MAX]; unsigned int timeouts[SCTP_CONNTRACK_MAX];

2
net/netfilter/nf_conntrack_proto_udplite.c
View File

@ -35,7 +35,7 @@ static unsigned int udplite_timeouts[UDPLITE_CT_MAX] = {
[UDPLITE_CT_REPLIED] = 180*HZ, [UDPLITE_CT_REPLIED] = 180*HZ,
}; };
static int udplite_net_id __read_mostly; static unsigned int udplite_net_id __read_mostly;
struct udplite_net { struct udplite_net {
struct nf_proto_net pn; struct nf_proto_net pn;
unsigned int timeouts[UDPLITE_CT_MAX]; unsigned int timeouts[UDPLITE_CT_MAX];

2
net/netfilter/nf_synproxy_core.c
View File

@ -24,7 +24,7 @@
#include <net/netfilter/nf_conntrack_synproxy.h> #include <net/netfilter/nf_conntrack_synproxy.h>
#include <net/netfilter/nf_conntrack_zones.h> #include <net/netfilter/nf_conntrack_zones.h>
int synproxy_net_id; unsigned int synproxy_net_id;
EXPORT_SYMBOL_GPL(synproxy_net_id); EXPORT_SYMBOL_GPL(synproxy_net_id);
bool bool

2
net/netfilter/nfnetlink_log.c
View File

@ -80,7 +80,7 @@ struct nfulnl_instance {
#define INSTANCE_BUCKETS 16 #define INSTANCE_BUCKETS 16
static int nfnl_log_net_id __read_mostly; static unsigned int nfnl_log_net_id __read_mostly;
struct nfnl_log_net { struct nfnl_log_net {
spinlock_t instances_lock; spinlock_t instances_lock;

2
net/netfilter/nfnetlink_queue.c
View File

@ -77,7 +77,7 @@ struct nfqnl_instance {
typedef int (*nfqnl_cmpfn)(struct nf_queue_entry *, unsigned long); typedef int (*nfqnl_cmpfn)(struct nf_queue_entry *, unsigned long);
static int nfnl_queue_net_id __read_mostly; static unsigned int nfnl_queue_net_id __read_mostly;
#define INSTANCE_BUCKETS 16 #define INSTANCE_BUCKETS 16
struct nfnl_queue_net { struct nfnl_queue_net {

2
net/netfilter/xt_hashlimit.c
View File

@ -49,7 +49,7 @@ struct hashlimit_net {
struct proc_dir_entry *ip6t_hashlimit; struct proc_dir_entry *ip6t_hashlimit;
}; };
static int hashlimit_net_id; static unsigned int hashlimit_net_id;
static inline struct hashlimit_net *hashlimit_pernet(struct net *net) static inline struct hashlimit_net *hashlimit_pernet(struct net *net)
{ {
return net_generic(net, hashlimit_net_id); return net_generic(net, hashlimit_net_id);

2
net/netfilter/xt_recent.c
View File

@ -95,7 +95,7 @@ struct recent_net {
#endif #endif
}; };
static int recent_net_id __read_mostly; static unsigned int recent_net_id __read_mostly;
static inline struct recent_net *recent_pernet(struct net *net) static inline struct recent_net *recent_pernet(struct net *net)
{ {

2
net/openvswitch/datapath.c
View File

@ -58,7 +58,7 @@
#include "vport-internal_dev.h" #include "vport-internal_dev.h"
#include "vport-netdev.h" #include "vport-netdev.h"
int ovs_net_id __read_mostly; unsigned int ovs_net_id __read_mostly;
static struct genl_family dp_packet_genl_family; static struct genl_family dp_packet_genl_family;
static struct genl_family dp_flow_genl_family; static struct genl_family dp_flow_genl_family;

2
net/openvswitch/datapath.h
View File

@ -144,7 +144,7 @@ struct ovs_net {
bool xt_label; bool xt_label;
}; };
extern int ovs_net_id; extern unsigned int ovs_net_id;
void ovs_lock(void); void ovs_lock(void);
void ovs_unlock(void); void ovs_unlock(void);

2
net/phonet/pn_dev.c
View File

@ -44,7 +44,7 @@ struct phonet_net {
struct phonet_routes routes; struct phonet_routes routes;
}; };
static int phonet_net_id __read_mostly; static unsigned int phonet_net_id __read_mostly;
static struct phonet_net *phonet_pernet(struct net *net) static struct phonet_net *phonet_pernet(struct net *net)
{ {

2
net/rds/tcp.c
View File

@ -366,7 +366,7 @@ struct rds_transport rds_tcp_transport = {
.t_mp_capable = 1, .t_mp_capable = 1,
}; };
static int rds_tcp_netid; static unsigned int rds_tcp_netid;
/* per-network namespace private data for this module */ /* per-network namespace private data for this module */
struct rds_tcp_net { struct rds_tcp_net {

2
net/sched/act_bpf.c
View File

@ -33,7 +33,7 @@ struct tcf_bpf_cfg {
bool is_ebpf; bool is_ebpf;
}; };
static int bpf_net_id; static unsigned int bpf_net_id;
static struct tc_action_ops act_bpf_ops; static struct tc_action_ops act_bpf_ops;
static int tcf_bpf(struct sk_buff *skb, const struct tc_action *act, static int tcf_bpf(struct sk_buff *skb, const struct tc_action *act,

2
net/sched/act_connmark.c
View File

@ -30,7 +30,7 @@
#define CONNMARK_TAB_MASK 3 #define CONNMARK_TAB_MASK 3
static int connmark_net_id; static unsigned int connmark_net_id;
static struct tc_action_ops act_connmark_ops; static struct tc_action_ops act_connmark_ops;
static int tcf_connmark(struct sk_buff *skb, const struct tc_action *a, static int tcf_connmark(struct sk_buff *skb, const struct tc_action *a,

2
net/sched/act_csum.c
View File

@ -42,7 +42,7 @@ static const struct nla_policy csum_policy[TCA_CSUM_MAX + 1] = {
[TCA_CSUM_PARMS] = { .len = sizeof(struct tc_csum), }, [TCA_CSUM_PARMS] = { .len = sizeof(struct tc_csum), },
}; };
static int csum_net_id; static unsigned int csum_net_id;
static struct tc_action_ops act_csum_ops; static struct tc_action_ops act_csum_ops;
static int tcf_csum_init(struct net *net, struct nlattr *nla, static int tcf_csum_init(struct net *net, struct nlattr *nla,

2
net/sched/act_gact.c
View File

@ -25,7 +25,7 @@
#define GACT_TAB_MASK 15 #define GACT_TAB_MASK 15
static int gact_net_id; static unsigned int gact_net_id;
static struct tc_action_ops act_gact_ops; static struct tc_action_ops act_gact_ops;
#ifdef CONFIG_GACT_PROB #ifdef CONFIG_GACT_PROB

2
net/sched/act_ife.c
View File

@ -35,7 +35,7 @@
#define IFE_TAB_MASK 15 #define IFE_TAB_MASK 15
static int ife_net_id; static unsigned int ife_net_id;
static int max_metacnt = IFE_META_MAX + 1; static int max_metacnt = IFE_META_MAX + 1;
static struct tc_action_ops act_ife_ops; static struct tc_action_ops act_ife_ops;

4
net/sched/act_ipt.c
View File

@ -30,10 +30,10 @@
#define IPT_TAB_MASK 15 #define IPT_TAB_MASK 15
static int ipt_net_id; static unsigned int ipt_net_id;
static struct tc_action_ops act_ipt_ops; static struct tc_action_ops act_ipt_ops;
static int xt_net_id; static unsigned int xt_net_id;
static struct tc_action_ops act_xt_ops; static struct tc_action_ops act_xt_ops;
static int ipt_init_target(struct xt_entry_target *t, char *table, static int ipt_init_target(struct xt_entry_target *t, char *table,

2
net/sched/act_mirred.c
View File

@ -70,7 +70,7 @@ static const struct nla_policy mirred_policy[TCA_MIRRED_MAX + 1] = {
[TCA_MIRRED_PARMS] = { .len = sizeof(struct tc_mirred) }, [TCA_MIRRED_PARMS] = { .len = sizeof(struct tc_mirred) },
}; };
static int mirred_net_id; static unsigned int mirred_net_id;
static struct tc_action_ops act_mirred_ops; static struct tc_action_ops act_mirred_ops;
static bool dev_is_mac_header_xmit(const struct net_device *dev) static bool dev_is_mac_header_xmit(const struct net_device *dev)

2
net/sched/act_nat.c
View File

@ -31,7 +31,7 @@
#define NAT_TAB_MASK 15 #define NAT_TAB_MASK 15
static int nat_net_id; static unsigned int nat_net_id;
static struct tc_action_ops act_nat_ops; static struct tc_action_ops act_nat_ops;
static const struct nla_policy nat_policy[TCA_NAT_MAX + 1] = { static const struct nla_policy nat_policy[TCA_NAT_MAX + 1] = {

2
net/sched/act_pedit.c
View File

@ -25,7 +25,7 @@
#define PEDIT_TAB_MASK 15 #define PEDIT_TAB_MASK 15
static int pedit_net_id; static unsigned int pedit_net_id;
static struct tc_action_ops act_pedit_ops; static struct tc_action_ops act_pedit_ops;
static const struct nla_policy pedit_policy[TCA_PEDIT_MAX + 1] = { static const struct nla_policy pedit_policy[TCA_PEDIT_MAX + 1] = {

2
net/sched/act_police.c
View File

@ -55,7 +55,7 @@ struct tc_police_compat {
/* Each policer is serialized by its individual spinlock */ /* Each policer is serialized by its individual spinlock */
static int police_net_id; static unsigned int police_net_id;
static struct tc_action_ops act_police_ops; static struct tc_action_ops act_police_ops;
static int tcf_act_police_walker(struct net *net, struct sk_buff *skb, static int tcf_act_police_walker(struct net *net, struct sk_buff *skb,

2
net/sched/act_simple.c
View File

@ -26,7 +26,7 @@
#define SIMP_TAB_MASK 7 #define SIMP_TAB_MASK 7
static int simp_net_id; static unsigned int simp_net_id;
static struct tc_action_ops act_simp_ops; static struct tc_action_ops act_simp_ops;
#define SIMP_MAX_DATA 32 #define SIMP_MAX_DATA 32

2
net/sched/act_skbedit.c
View File

@ -29,7 +29,7 @@
#define SKBEDIT_TAB_MASK 15 #define SKBEDIT_TAB_MASK 15
static int skbedit_net_id; static unsigned int skbedit_net_id;
static struct tc_action_ops act_skbedit_ops; static struct tc_action_ops act_skbedit_ops;
static int tcf_skbedit(struct sk_buff *skb, const struct tc_action *a, static int tcf_skbedit(struct sk_buff *skb, const struct tc_action *a,

2
net/sched/act_skbmod.c
View File

@ -22,7 +22,7 @@
#define SKBMOD_TAB_MASK 15 #define SKBMOD_TAB_MASK 15
static int skbmod_net_id; static unsigned int skbmod_net_id;
static struct tc_action_ops act_skbmod_ops; static struct tc_action_ops act_skbmod_ops;
#define MAX_EDIT_LEN ETH_HLEN #define MAX_EDIT_LEN ETH_HLEN

2
net/sched/act_tunnel_key.c
View File

@ -22,7 +22,7 @@
#define TUNNEL_KEY_TAB_MASK 15 #define TUNNEL_KEY_TAB_MASK 15
static int tunnel_key_net_id; static unsigned int tunnel_key_net_id;
static struct tc_action_ops act_tunnel_key_ops; static struct tc_action_ops act_tunnel_key_ops;
static int tunnel_key_act(struct sk_buff *skb, const struct tc_action *a, static int tunnel_key_act(struct sk_buff *skb, const struct tc_action *a,

2
net/sched/act_vlan.c
View File

@ -21,7 +21,7 @@
#define VLAN_TAB_MASK 15 #define VLAN_TAB_MASK 15
static int vlan_net_id; static unsigned int vlan_net_id;
static struct tc_action_ops act_vlan_ops; static struct tc_action_ops act_vlan_ops;
static int tcf_vlan(struct sk_buff *skb, const struct tc_action *a, static int tcf_vlan(struct sk_buff *skb, const struct tc_action *a,

2
net/sunrpc/netns.h
View File

@ -34,7 +34,7 @@ struct sunrpc_net {
struct proc_dir_entry *use_gssp_proc; struct proc_dir_entry *use_gssp_proc;
}; };
extern int sunrpc_net_id; extern unsigned int sunrpc_net_id;
int ip_map_cache_create(struct net *); int ip_map_cache_create(struct net *);
void ip_map_cache_destroy(struct net *); void ip_map_cache_destroy(struct net *);

2
net/sunrpc/sunrpc_syms.c
View File

@ -24,7 +24,7 @@
#include "netns.h" #include "netns.h"
int sunrpc_net_id; unsigned int sunrpc_net_id;
EXPORT_SYMBOL_GPL(sunrpc_net_id); EXPORT_SYMBOL_GPL(sunrpc_net_id);
static __net_init int sunrpc_init_net(struct net *net) static __net_init int sunrpc_init_net(struct net *net)

2
net/tipc/core.c
View File

@ -47,7 +47,7 @@
#include <linux/module.h> #include <linux/module.h>
/* configurable TIPC parameters */ /* configurable TIPC parameters */
int tipc_net_id __read_mostly; unsigned int tipc_net_id __read_mostly;
int sysctl_tipc_rmem[3] __read_mostly; /* min/default/max */ int sysctl_tipc_rmem[3] __read_mostly; /* min/default/max */
static int __net_init tipc_init_net(struct net *net) static int __net_init tipc_init_net(struct net *net)

2
net/tipc/core.h
View File

@ -74,7 +74,7 @@ struct tipc_monitor;
#define MAX_BEARERS 3 #define MAX_BEARERS 3
#define TIPC_DEF_MON_THRESHOLD 32 #define TIPC_DEF_MON_THRESHOLD 32
extern int tipc_net_id __read_mostly; extern unsigned int tipc_net_id __read_mostly;
extern int sysctl_tipc_rmem[3] __read_mostly; extern int sysctl_tipc_rmem[3] __read_mostly;
extern int sysctl_tipc_named_timeout __read_mostly; extern int sysctl_tipc_named_timeout __read_mostly;