Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dfc96c19 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'netdev_diet' 



Thomas Graf says:

====================
Bring sizeof(net_device) down to < 2K bytes

The size of struct net_device crossed the 2K boundary a while ago which
is a waste in combination with many net namespaces. This series brings
the size of struct net_device down to well below 2K in total size with
a typical configuration. Some reserves a several holes leave room for
further expansion.

Before:
/* size: 2176, cachelines: 34, members: 121 */

After:
/* size: 1984, cachelines: 31, members: 120 */
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents cf890138 14ffbbb8

drivers/net/ethernet/intel/e1000e/e1000.h

+1 −0
Original line number Diff line number Diff line
@@ -343,6 +343,7 @@ struct e1000_adapter { 
	struct timecounter tc;

	struct ptp_clock *ptp_clock;

	struct ptp_clock_info ptp_clock_info;

	struct pm_qos_request pm_qos_req;



	u16 eee_advert;

};

drivers/net/ethernet/intel/e1000e/netdev.c

+4 −4
Original line number Diff line number Diff line
@@ -3297,9 +3297,9 @@ static void e1000_configure_rx(struct e1000_adapter *adapter) 
			ew32(RXDCTL(0), rxdctl | 0x3);

		}



		pm_qos_update_request(&adapter->netdev->pm_qos_req, lat);

		pm_qos_update_request(&adapter->pm_qos_req, lat);

	} else {

		pm_qos_update_request(&adapter->netdev->pm_qos_req,

		pm_qos_update_request(&adapter->pm_qos_req,

				      PM_QOS_DEFAULT_VALUE);

	}
@@ -4403,7 +4403,7 @@ static int e1000_open(struct net_device *netdev) 
		e1000_update_mng_vlan(adapter);



	/* DMA latency requirement to workaround jumbo issue */

	pm_qos_add_request(&adapter->netdev->pm_qos_req, PM_QOS_CPU_DMA_LATENCY,

	pm_qos_add_request(&adapter->pm_qos_req, PM_QOS_CPU_DMA_LATENCY,

			   PM_QOS_DEFAULT_VALUE);



	/* before we allocate an interrupt, we must be ready to handle it.
@@ -4514,7 +4514,7 @@ static int e1000_close(struct net_device *netdev) 
	    !test_bit(__E1000_TESTING, &adapter->state))

		e1000e_release_hw_control(adapter);



	pm_qos_remove_request(&adapter->netdev->pm_qos_req);

	pm_qos_remove_request(&adapter->pm_qos_req);



	pm_runtime_put_sync(&pdev->dev);

include/linux/netdevice.h

+21 −25
Original line number Diff line number Diff line
@@ -1313,6 +1313,8 @@ enum netdev_priv_flags { 
 *	@base_addr:	Device I/O address

 *	@irq:		Device IRQ number

 *

 *	@carrier_changes:	Stats to monitor carrier on<->off transitions

 *

 *	@state:		Generic network queuing layer state, see netdev_state_t

 *	@dev_list:	The global list of network devices

 *	@napi_list:	List entry, that is used for polling napi devices
@@ -1346,8 +1348,6 @@ enum netdev_priv_flags { 
 *	@tx_dropped:	Dropped packets by core network,

 *			do not use this in drivers

 *

 *	@carrier_changes:	Stats to monitor carrier on<->off transitions

 *

 *	@wireless_handlers:	List of functions to handle Wireless Extensions,

 *				instead of ioctl,

 *				see <net/iw_handler.h> for details.
@@ -1390,14 +1390,14 @@ enum netdev_priv_flags { 
 * 	@dev_port:		Used to differentiate devices that share

 * 				the same function

 *	@addr_list_lock:	XXX: need comments on this one

 *	@uc:			unicast mac addresses

 *	@mc:			multicast mac addresses

 *	@dev_addrs:		list of device hw addresses

 *	@queues_kset:		Group of all Kobjects in the Tx and RX queues

 *	@uc_promisc:		Counter, that indicates, that promiscuous mode

 *				has been enabled due to the need to listen to

 *				additional unicast addresses in a device that

 *				does not implement ndo_set_rx_mode()

 *	@uc:			unicast mac addresses

 *	@mc:			multicast mac addresses

 *	@dev_addrs:		list of device hw addresses

 *	@queues_kset:		Group of all Kobjects in the Tx and RX queues

 *	@promiscuity:		Number of times, the NIC is told to work in

 *				Promiscuous mode, if it becomes 0 the NIC will

 *				exit from working in Promiscuous mode
@@ -1427,6 +1427,12 @@ enum netdev_priv_flags { 
 *	@ingress_queue:		XXX: need comments on this one

 *	@broadcast:		hw bcast address

 *

 *	@rx_cpu_rmap:	CPU reverse-mapping for RX completion interrupts,

 *			indexed by RX queue number. Assigned by driver.

 *			This must only be set if the ndo_rx_flow_steer

 *			operation is defined

 *	@index_hlist:		Device index hash chain

 *

 *	@_tx:			Array of TX queues

 *	@num_tx_queues:		Number of TX queues allocated at alloc_netdev_mq() time

 *	@real_num_tx_queues: 	Number of TX queues currently active in device
@@ -1436,11 +1442,6 @@ enum netdev_priv_flags { 
 *

 *	@xps_maps:	XXX: need comments on this one

 *

 *	@rx_cpu_rmap:	CPU reverse-mapping for RX completion interrupts,

 *			indexed by RX queue number. Assigned by driver.

 *			This must only be set if the ndo_rx_flow_steer

 *			operation is defined

 *

 *	@trans_start:		Time (in jiffies) of last Tx

 *	@watchdog_timeo:	Represents the timeout that is used by

 *				the watchdog ( see dev_watchdog() )
@@ -1448,7 +1449,6 @@ enum netdev_priv_flags { 
 *

 *	@pcpu_refcnt:		Number of references to this device

 *	@todo_list:		Delayed register/unregister

 *	@index_hlist:		Device index hash chain

 *	@link_watch_list:	XXX: need comments on this one

 *

 *	@reg_state:		Register/unregister state machine
@@ -1515,6 +1515,8 @@ struct net_device { 
	unsigned long		base_addr;

	int			irq;



	atomic_t		carrier_changes;



	/*

	 *	Some hardware also needs these fields (state,dev_list,

	 *	napi_list,unreg_list,close_list) but they are not
@@ -1555,8 +1557,6 @@ struct net_device { 
	atomic_long_t		rx_dropped;

	atomic_long_t		tx_dropped;



	atomic_t		carrier_changes;



#ifdef CONFIG_WIRELESS_EXT

	const struct iw_handler_def *	wireless_handlers;

	struct iw_public_data *	wireless_data;
@@ -1596,6 +1596,8 @@ struct net_device { 
	unsigned short          dev_id;

	unsigned short          dev_port;

	spinlock_t		addr_list_lock;

	unsigned char		name_assign_type;

	bool			uc_promisc;

	struct netdev_hw_addr_list	uc;

	struct netdev_hw_addr_list	mc;

	struct netdev_hw_addr_list	dev_addrs;
@@ -1603,10 +1605,6 @@ struct net_device { 
#ifdef CONFIG_SYSFS

	struct kset		*queues_kset;

#endif



	unsigned char		name_assign_type;



	bool			uc_promisc;

	unsigned int		promiscuity;

	unsigned int		allmulti;
@@ -1653,7 +1651,10 @@ struct net_device { 


	struct netdev_queue __rcu *ingress_queue;

	unsigned char		broadcast[MAX_ADDR_LEN];



#ifdef CONFIG_RFS_ACCEL

	struct cpu_rmap		*rx_cpu_rmap;

#endif

	struct hlist_node	index_hlist;



/*

 * Cache lines mostly used on transmit path
@@ -1664,13 +1665,11 @@ struct net_device { 
	struct Qdisc		*qdisc;

	unsigned long		tx_queue_len;

	spinlock_t		tx_global_lock;

	int			watchdog_timeo;



#ifdef CONFIG_XPS

	struct xps_dev_maps __rcu *xps_maps;

#endif

#ifdef CONFIG_RFS_ACCEL

	struct cpu_rmap		*rx_cpu_rmap;

#endif



	/* These may be needed for future network-power-down code. */
@@ -1680,13 +1679,11 @@ struct net_device { 
	 */

	unsigned long		trans_start;



	int			watchdog_timeo;

	struct timer_list	watchdog_timer;



	int __percpu		*pcpu_refcnt;

	struct list_head	todo_list;



	struct hlist_node	index_hlist;

	struct list_head	link_watch_list;



	enum { NETREG_UNINITIALIZED=0,
@@ -1751,7 +1748,6 @@ struct net_device { 
#endif

	struct phy_device *phydev;

	struct lock_class_key *qdisc_tx_busylock;

	struct pm_qos_request	pm_qos_req;

};

#define to_net_dev(d) container_of(d, struct net_device, dev)