Commit 4d242a19 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'net-create-a-net-core-internal-header' 

Jakub Kicinski says:

====================
net: create a net/core/ internal header

We are adding stuff to netdevice.h which really should be
local to net/core/. Create a net/core/dev.h header and use it.
Minor cleanups precede.
====================

Link: https://lore.kernel.org/r/20220406213754.731066-1-kuba@kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents e8bd7025 6264f58c

drivers/net/hyperv/netvsc_bpf.c

+2 −4
Original line number Diff line number Diff line
@@ -137,7 +137,6 @@ int netvsc_xdp_set(struct net_device *dev, struct bpf_prog *prog, 
int netvsc_vf_setxdp(struct net_device *vf_netdev, struct bpf_prog *prog)

{

	struct netdev_bpf xdp;

	bpf_op_t ndo_bpf;

	int ret;



	ASSERT_RTNL();
@@ -145,8 +144,7 @@ int netvsc_vf_setxdp(struct net_device *vf_netdev, struct bpf_prog *prog) 
	if (!vf_netdev)

		return 0;



	ndo_bpf = vf_netdev->netdev_ops->ndo_bpf;

	if (!ndo_bpf)

	if (!vf_netdev->netdev_ops->ndo_bpf)

		return 0;



	memset(&xdp, 0, sizeof(xdp));
@@ -157,7 +155,7 @@ int netvsc_vf_setxdp(struct net_device *vf_netdev, struct bpf_prog *prog) 
	xdp.command = XDP_SETUP_PROG;

	xdp.prog = prog;



	ret = ndo_bpf(vf_netdev, &xdp);

	ret = vf_netdev->netdev_ops->ndo_bpf(vf_netdev, &xdp);



	if (ret && prog)

		bpf_prog_put(prog);

include/linux/netdevice.h

+2 −70
Original line number Diff line number Diff line
@@ -59,7 +59,8 @@ struct dsa_port; 
struct ip_tunnel_parm;

struct macsec_context;

struct macsec_ops;



struct netdev_name_node;

struct sd_flow_limit;

struct sfp_bus;

/* 802.11 specific */

struct wireless_dev;
@@ -1020,16 +1021,6 @@ struct dev_ifalias { 
struct devlink;

struct tlsdev_ops;



struct netdev_name_node {

	struct hlist_node hlist;

	struct list_head list;

	struct net_device *dev;

	const char *name;

};



int netdev_name_node_alt_create(struct net_device *dev, const char *name);

int netdev_name_node_alt_destroy(struct net_device *dev, const char *name);



struct netdev_net_notifier {

	struct list_head list;

	struct notifier_block *nb;
@@ -2975,7 +2966,6 @@ struct net_device *dev_get_by_index(struct net *net, int ifindex); 
struct net_device *__dev_get_by_index(struct net *net, int ifindex);

struct net_device *dev_get_by_index_rcu(struct net *net, int ifindex);

struct net_device *dev_get_by_napi_id(unsigned int napi_id);

int netdev_get_name(struct net *net, char *name, int ifindex);

int dev_restart(struct net_device *dev);
@@ -3034,19 +3024,6 @@ static inline bool dev_has_header(const struct net_device *dev) 
	return dev->header_ops && dev->header_ops->create;

}



#ifdef CONFIG_NET_FLOW_LIMIT

#define FLOW_LIMIT_HISTORY	(1 << 7)  /* must be ^2 and !overflow buckets */

struct sd_flow_limit {

	u64			count;

	unsigned int		num_buckets;

	unsigned int		history_head;

	u16			history[FLOW_LIMIT_HISTORY];

	u8			buckets[];

};



extern int netdev_flow_limit_table_len;

#endif /* CONFIG_NET_FLOW_LIMIT */



/*

 * Incoming packets are placed on per-CPU queues

 */
@@ -3770,7 +3747,6 @@ int dev_change_flags(struct net_device *dev, unsigned int flags, 
		     struct netlink_ext_ack *extack);

void __dev_notify_flags(struct net_device *, unsigned int old_flags,

			unsigned int gchanges);

int dev_change_name(struct net_device *, const char *);

int dev_set_alias(struct net_device *, const char *, size_t);

int dev_get_alias(const struct net_device *, char *, size_t);

int __dev_change_net_namespace(struct net_device *dev, struct net *net,
@@ -3782,13 +3758,7 @@ int dev_change_net_namespace(struct net_device *dev, struct net *net, 
	return __dev_change_net_namespace(dev, net, pat, 0);

}

int __dev_set_mtu(struct net_device *, int);

int dev_validate_mtu(struct net_device *dev, int mtu,

		     struct netlink_ext_ack *extack);

int dev_set_mtu_ext(struct net_device *dev, int mtu,

		    struct netlink_ext_ack *extack);

int dev_set_mtu(struct net_device *, int);

int dev_change_tx_queue_len(struct net_device *, unsigned long);

void dev_set_group(struct net_device *, int);

int dev_pre_changeaddr_notify(struct net_device *dev, const char *addr,

			      struct netlink_ext_ack *extack);

int dev_set_mac_address(struct net_device *dev, struct sockaddr *sa,
@@ -3796,24 +3766,13 @@ int dev_set_mac_address(struct net_device *dev, struct sockaddr *sa, 
int dev_set_mac_address_user(struct net_device *dev, struct sockaddr *sa,

			     struct netlink_ext_ack *extack);

int dev_get_mac_address(struct sockaddr *sa, struct net *net, char *dev_name);

int dev_change_carrier(struct net_device *, bool new_carrier);

int dev_get_phys_port_id(struct net_device *dev,

			 struct netdev_phys_item_id *ppid);

int dev_get_phys_port_name(struct net_device *dev,

			   char *name, size_t len);

int dev_get_port_parent_id(struct net_device *dev,

			   struct netdev_phys_item_id *ppid, bool recurse);

bool netdev_port_same_parent_id(struct net_device *a, struct net_device *b);

int dev_change_proto_down(struct net_device *dev, bool proto_down);

void dev_change_proto_down_reason(struct net_device *dev, unsigned long mask,

				  u32 value);

struct sk_buff *validate_xmit_skb_list(struct sk_buff *skb, struct net_device *dev, bool *again);

struct sk_buff *dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev,

				    struct netdev_queue *txq, int *ret);



typedef int (*bpf_op_t)(struct net_device *dev, struct netdev_bpf *bpf);

int dev_change_xdp_fd(struct net_device *dev, struct netlink_ext_ack *extack,

		      int fd, int expected_fd, u32 flags);

int bpf_xdp_link_attach(const union bpf_attr *attr, struct bpf_prog *prog);

u8 dev_xdp_prog_count(struct net_device *dev);

u32 dev_xdp_prog_id(struct net_device *dev, enum bpf_xdp_mode mode);
@@ -3898,13 +3857,6 @@ static __always_inline int ____dev_forward_skb(struct net_device *dev, 
bool dev_nit_active(struct net_device *dev);

void dev_queue_xmit_nit(struct sk_buff *skb, struct net_device *dev);



extern int		netdev_budget;

extern unsigned int	netdev_budget_usecs;



/* Used by rtnetlink.c:__rtnl_unlock()/rtnl_unlock() */

extern struct list_head net_todo_list;

void netdev_run_todo(void);



static inline void __dev_put(struct net_device *dev)

{

	if (dev) {
@@ -4021,10 +3973,7 @@ static inline void dev_replace_track(struct net_device *odev, 
 * called netif_lowerlayer_*() because they represent the state of any

 * kind of lower layer not just hardware media.

 */



void linkwatch_init_dev(struct net_device *dev);

void linkwatch_fire_event(struct net_device *dev);

void linkwatch_forget_dev(struct net_device *dev);



/**

 *	netif_carrier_ok - test if carrier present
@@ -4470,9 +4419,6 @@ int dev_addr_add(struct net_device *dev, const unsigned char *addr, 
		 unsigned char addr_type);

int dev_addr_del(struct net_device *dev, const unsigned char *addr,

		 unsigned char addr_type);

void dev_addr_flush(struct net_device *dev);

int dev_addr_init(struct net_device *dev);

void dev_addr_check(struct net_device *dev);



/* Functions used for unicast addresses handling */

int dev_uc_add(struct net_device *dev, const unsigned char *addr);
@@ -4562,7 +4508,6 @@ static inline void __dev_mc_unsync(struct net_device *dev, 


/* Functions used for secondary unicast and multicast support */

void dev_set_rx_mode(struct net_device *dev);

void __dev_set_rx_mode(struct net_device *dev);

int dev_set_promiscuity(struct net_device *dev, int inc);

int dev_set_allmulti(struct net_device *dev, int inc);

void netdev_state_change(struct net_device *dev);
@@ -4580,11 +4525,6 @@ void dev_fetch_sw_netstats(struct rtnl_link_stats64 *s, 
void dev_get_tstats64(struct net_device *dev, struct rtnl_link_stats64 *s);



extern int		netdev_max_backlog;

extern int		netdev_tstamp_prequeue;

extern int		netdev_unregister_timeout_secs;

extern int		weight_p;

extern int		dev_weight_rx_bias;

extern int		dev_weight_tx_bias;

extern int		dev_rx_weight;

extern int		dev_tx_weight;

extern int		gro_normal_batch;
@@ -4772,12 +4712,6 @@ static inline void netdev_rx_csum_fault(struct net_device *dev, 
void net_enable_timestamp(void);

void net_disable_timestamp(void);



#ifdef CONFIG_PROC_FS

int __init dev_proc_init(void);

#else

#define dev_proc_init() 0

#endif



static inline netdev_tx_t __netdev_start_xmit(const struct net_device_ops *ops,

					      struct sk_buff *skb, struct net_device *dev,

					      bool more)
@@ -4813,8 +4747,6 @@ extern const struct kobj_ns_type_operations net_ns_type_operations; 


const char *netdev_drivername(const struct net_device *dev);



void linkwatch_run_queue(void);



static inline netdev_features_t netdev_intersect_features(netdev_features_t f1,

							  netdev_features_t f2)

{

net/core/dev.c

+1 −6
Original line number Diff line number Diff line
@@ -151,6 +151,7 @@ 
#include <linux/prandom.h>

#include <linux/once_lite.h>



#include "dev.h"

#include "net-sysfs.h"
@@ -8645,7 +8646,6 @@ void dev_set_group(struct net_device *dev, int new_group) 
{

	dev->group = new_group;

}

EXPORT_SYMBOL(dev_set_group);



/**

 *	dev_pre_changeaddr_notify - Call NETDEV_PRE_CHANGEADDR.
@@ -8760,7 +8760,6 @@ int dev_change_carrier(struct net_device *dev, bool new_carrier) 
		return -ENODEV;

	return ops->ndo_change_carrier(dev, new_carrier);

}

EXPORT_SYMBOL(dev_change_carrier);



/**

 *	dev_get_phys_port_id - Get device physical port ID
@@ -8778,7 +8777,6 @@ int dev_get_phys_port_id(struct net_device *dev, 
		return -EOPNOTSUPP;

	return ops->ndo_get_phys_port_id(dev, ppid);

}

EXPORT_SYMBOL(dev_get_phys_port_id);



/**

 *	dev_get_phys_port_name - Get device physical port name
@@ -8801,7 +8799,6 @@ int dev_get_phys_port_name(struct net_device *dev, 
	}

	return devlink_compat_phys_port_name_get(dev, name, len);

}

EXPORT_SYMBOL(dev_get_phys_port_name);



/**

 *	dev_get_port_parent_id - Get the device's port parent identifier
@@ -8883,7 +8880,6 @@ int dev_change_proto_down(struct net_device *dev, bool proto_down) 
	dev->proto_down = proto_down;

	return 0;

}

EXPORT_SYMBOL(dev_change_proto_down);



/**

 *	dev_change_proto_down_reason - proto down reason
@@ -8908,7 +8904,6 @@ void dev_change_proto_down_reason(struct net_device *dev, unsigned long mask, 
		}

	}

}

EXPORT_SYMBOL(dev_change_proto_down_reason);



struct bpf_xdp_link {

	struct bpf_link link;

net/core/dev.h

0 → 100644
+91 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-or-later */

#ifndef _NET_CORE_DEV_H

#define _NET_CORE_DEV_H



#include <linux/types.h>



struct net;

struct net_device;

struct netdev_bpf;

struct netdev_phys_item_id;

struct netlink_ext_ack;



/* Random bits of netdevice that don't need to be exposed */

#define FLOW_LIMIT_HISTORY	(1 << 7)  /* must be ^2 and !overflow buckets */

struct sd_flow_limit {

	u64			count;

	unsigned int		num_buckets;

	unsigned int		history_head;

	u16			history[FLOW_LIMIT_HISTORY];

	u8			buckets[];

};



extern int netdev_flow_limit_table_len;



#ifdef CONFIG_PROC_FS

int __init dev_proc_init(void);

#else

#define dev_proc_init() 0

#endif



void linkwatch_init_dev(struct net_device *dev);

void linkwatch_forget_dev(struct net_device *dev);

void linkwatch_run_queue(void);



void dev_addr_flush(struct net_device *dev);

int dev_addr_init(struct net_device *dev);

void dev_addr_check(struct net_device *dev);



/* sysctls not referred to from outside net/core/ */

extern int		netdev_budget;

extern unsigned int	netdev_budget_usecs;



extern int		netdev_tstamp_prequeue;

extern int		netdev_unregister_timeout_secs;

extern int		weight_p;

extern int		dev_weight_rx_bias;

extern int		dev_weight_tx_bias;



/* rtnl helpers */

extern struct list_head net_todo_list;

void netdev_run_todo(void);



/* netdev management, shared between various uAPI entry points */

struct netdev_name_node {

	struct hlist_node hlist;

	struct list_head list;

	struct net_device *dev;

	const char *name;

};



int netdev_get_name(struct net *net, char *name, int ifindex);

int dev_change_name(struct net_device *dev, const char *newname);



int netdev_name_node_alt_create(struct net_device *dev, const char *name);

int netdev_name_node_alt_destroy(struct net_device *dev, const char *name);



int dev_validate_mtu(struct net_device *dev, int mtu,

		     struct netlink_ext_ack *extack);

int dev_set_mtu_ext(struct net_device *dev, int mtu,

		    struct netlink_ext_ack *extack);



int dev_get_phys_port_id(struct net_device *dev,

			 struct netdev_phys_item_id *ppid);

int dev_get_phys_port_name(struct net_device *dev,

			   char *name, size_t len);



int dev_change_proto_down(struct net_device *dev, bool proto_down);

void dev_change_proto_down_reason(struct net_device *dev, unsigned long mask,

				  u32 value);



typedef int (*bpf_op_t)(struct net_device *dev, struct netdev_bpf *bpf);

int dev_change_xdp_fd(struct net_device *dev, struct netlink_ext_ack *extack,

		      int fd, int expected_fd, u32 flags);



int dev_change_tx_queue_len(struct net_device *dev, unsigned long new_len);

void dev_set_group(struct net_device *dev, int new_group);

int dev_change_carrier(struct net_device *dev, bool new_carrier);



void __dev_set_rx_mode(struct net_device *dev);



#endif

net/core/dev_addr_lists.c

+2 −0
Original line number Diff line number Diff line
@@ -12,6 +12,8 @@ 
#include <linux/export.h>

#include <linux/list.h>



#include "dev.h"



/*

 * General list handling functions

 */