Skip to content

Commit

Permalink
netdevice: shrink size of struct netdev_queue
Browse files Browse the repository at this point in the history
- trans_timeout is incremented when tx queue timed out (tx watchdog).
- tx_maxrate is set via sysfs

Moving tx_maxrate to read-mostly part shrinks the struct by 64 bytes.
While at it, also move trans_timeout (it is out-of-place in the
'write-mostly' part).

Signed-off-by: Florian Westphal <fw@strlen.de>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Florian Westphal authored and David S. Miller committed May 3, 2016
1 parent e8194d4 commit c0ef079
Showing 1 changed file with 6 additions and 7 deletions.
13 changes: 6 additions & 7 deletions include/linux/netdevice.h
Original file line number Diff line number Diff line change
Expand Up @@ -569,6 +569,12 @@ struct netdev_queue {
#if defined(CONFIG_XPS) && defined(CONFIG_NUMA)
int numa_node;
#endif
unsigned long tx_maxrate;
/*
* Number of TX timeouts for this queue
* (/sys/class/net/DEV/Q/trans_timeout)
*/
unsigned long trans_timeout;
/*
* write-mostly part
*/
Expand All @@ -579,18 +585,11 @@ struct netdev_queue {
*/
unsigned long trans_start;

/*
* Number of TX timeouts for this queue
* (/sys/class/net/DEV/Q/trans_timeout)
*/
unsigned long trans_timeout;

unsigned long state;

#ifdef CONFIG_BQL
struct dql dql;
#endif
unsigned long tx_maxrate;
} ____cacheline_aligned_in_smp;

static inline int netdev_queue_numa_node_read(const struct netdev_queue *q)
Expand Down

0 comments on commit c0ef079

Please sign in to comment.