net: pass net_device argument to the eth_get_headlen
Subsystems (10)
PATCH 1/5 net: pass net_device argument to the eth_get_headlen
From: Stanislav Fomichev <[email protected]>
Update all users of eth_get_headlen to pass network device, fetch network namespace from it and pass it down to the flow dissector. This commit is a noop until administrator inserts BPF flow dissector program.
Cc Maxim Krasnyansky <[email protected]>
Cc Saeed Mahameed <[email protected]>
Cc Jeff Kirsher <[email protected]>
Cc intel-wired-lan at lists.osuosl.org
Cc Yisen Zhuang <[email protected]>
Cc Salil Mehta <[email protected]>
Cc Michael Chan <[email protected]>
Cc Igor Russkikh <[email protected]>
Signed-off-by Stanislav Fomichev <[email protected]>
Signed-off-by Daniel Borkmann <[email protected]>
--- drivers/net/ethernet/aquantia/atlantic/aq_ring.c | 3 ++- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 2 +- drivers/net/ethernet/hisilicon/hns/hns_enet.c | 2 +- drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 2 +- drivers/net/ethernet/intel/fm10k/fm10k_main.c | 2 +- drivers/net/ethernet/intel/i40e/i40e_txrx.c | 3 ++- drivers/net/ethernet/intel/iavf/iavf_txrx.c | 2 +- drivers/net/ethernet/intel/ice/ice_txrx.c | 2 +- drivers/net/ethernet/intel/igb/igb_main.c | 2 +- drivers/net/ethernet/intel/igc/igc_main.c | 2 +- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 2 +- drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 3 ++- drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 2 +- drivers/net/tun.c | 3 ++- include/linux/etherdevice.h | 2 +- net/ethernet/eth.c | 5 +++-- 16 files changed, 22 insertions(+), 17 deletions(-)
drivers/net/ethernet/aquantia/atlantic/aq_ring.c +2 -1
@@ -354,7 +354,8 @@ int aq_ring_rx_clean(struct aq_ring_s *self, hdr_len = buff->len;if (hdr_len >AQ_CFG_RX_HDR_SIZE ) - hdr_len =eth_get_headlen (aq_buf_vaddr (&buff->rxdata), + hdr_len =eth_get_headlen (skb->dev, +aq_buf_vaddr (&buff->rxdata),AQ_CFG_RX_HDR_SIZE ); memcpy(__skb_put(skb, hdr_len), aq_buf_vaddr(&buff->rxdata),
drivers/net/ethernet/broadcom/bnxt/bnxt.c +1 -1
@@ -899,7 +899,7 @@ static struct sk_buff *bnxt_rx_page_skb(struct bnxt *bp, DMA_ATTR_WEAK_ORDERING);if (unlikely (!payload)) - payload =eth_get_headlen (data_ptr, len); + payload =eth_get_headlen (bp->dev, data_ptr, len); skb =napi_alloc_skb (&rxr->bnapi->napi, payload);if (!skb) {
drivers/net/ethernet/hisilicon/hns/hns_enet.c +1 -1
@@ -598,7 +598,7 @@ static int hns_nic_poll_rx_skb(struct hns_nic_ring_data *ring_data, }else { ring->stats.seg_pkt_cnt++; - pull_len =eth_get_headlen (va,HNS_RX_HEAD_SIZE ); + pull_len =eth_get_headlen (ndev, va,HNS_RX_HEAD_SIZE );memcpy (__skb_put (skb, pull_len), va,ALIGN (pull_len,sizeof (long )));
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c +1 -1
@@ -2580,7 +2580,7 @@ static int hns3_alloc_skb(struct hns3_enet_ring *ring, int length, ring->stats.seg_pkt_cnt++;u64_stats_update_end (&ring->syncp); - ring->pull_len =eth_get_headlen (va,HNS3_RX_HEAD_SIZE ); + ring->pull_len =eth_get_headlen (netdev, va,HNS3_RX_HEAD_SIZE );__skb_put (skb, ring->pull_len);hns3_nic_reuse_page (skb, ring->frag_num++, ring, ring->pull_len, desc_cb);
drivers/net/ethernet/intel/fm10k/fm10k_main.c +1 -1
@@ -280,7 +280,7 @@ static bool fm10k_add_rx_frag(struct fm10k_rx_buffer *rx_buffer,/* we need the header to contain the greater of either ETH_HLEN or * 60 bytes if the skb->len is less than 60 for skb_pad. */ - pull_len =eth_get_headlen (va,FM10K_RX_HDR_LEN ); + pull_len =eth_get_headlen (skb->dev, va,FM10K_RX_HDR_LEN );/* align pull length to size of long to optimize memcpy performance */ memcpy (__skb_put (skb, pull_len), va,ALIGN (pull_len,sizeof (long )));
drivers/net/ethernet/intel/i40e/i40e_txrx.c +2 -1
@@ -2035,7 +2035,8 @@ static struct sk_buff *i40e_construct_skb(struct i40e_ring *rx_ring,/* Determine available headroom for copy */ headlen = size;if (headlen >I40E_RX_HDR_SIZE ) - headlen =eth_get_headlen (xdp->data,I40E_RX_HDR_SIZE ); + headlen =eth_get_headlen (skb->dev, xdp->data, +I40E_RX_HDR_SIZE );/* align pull length to size of long to optimize memcpy performance */ memcpy(__skb_put(skb, headlen), xdp->data,
drivers/net/ethernet/intel/iavf/iavf_txrx.c +1 -1
@@ -1315,7 +1315,7 @@ static struct sk_buff *iavf_construct_skb(struct iavf_ring *rx_ring,/* Determine available headroom for copy */ headlen = size;if (headlen >IAVF_RX_HDR_SIZE ) - headlen =eth_get_headlen (va,IAVF_RX_HDR_SIZE ); + headlen =eth_get_headlen (skb->dev, va,IAVF_RX_HDR_SIZE );/* align pull length to size of long to optimize memcpy performance */ memcpy (__skb_put (skb, headlen), va,ALIGN (headlen,sizeof (long )));
drivers/net/ethernet/intel/ice/ice_txrx.c +1 -1
@@ -699,7 +699,7 @@ ice_construct_skb(struct ice_ring *rx_ring, struct ice_rx_buf *rx_buf,/* Determine available headroom for copy */ headlen = size;if (headlen >ICE_RX_HDR_SIZE ) - headlen =eth_get_headlen (va,ICE_RX_HDR_SIZE ); + headlen =eth_get_headlen (skb->dev, va,ICE_RX_HDR_SIZE );/* align pull length to size of long to optimize memcpy performance */ memcpy (__skb_put (skb, headlen), va,ALIGN (headlen,sizeof (long )));
drivers/net/ethernet/intel/igb/igb_main.c +1 -1
@@ -8051,7 +8051,7 @@ static struct sk_buff *igb_construct_skb(struct igb_ring *rx_ring,/* Determine available headroom for copy */ headlen = size;if (headlen >IGB_RX_HDR_LEN ) - headlen =eth_get_headlen (va,IGB_RX_HDR_LEN ); + headlen =eth_get_headlen (skb->dev, va,IGB_RX_HDR_LEN );/* align pull length to size of long to optimize memcpy performance */ memcpy (__skb_put (skb, headlen), va,ALIGN (headlen,sizeof (long )));
drivers/net/ethernet/intel/igc/igc_main.c +1 -1
@@ -1199,7 +1199,7 @@ static struct sk_buff *igc_construct_skb(struct igc_ring *rx_ring,/* Determine available headroom for copy */ headlen = size;if (headlen >IGC_RX_HDR_LEN ) - headlen =eth_get_headlen (va,IGC_RX_HDR_LEN ); + headlen =eth_get_headlen (skb->dev, va,IGC_RX_HDR_LEN );/* align pull length to size of long to optimize memcpy performance */ memcpy (__skb_put (skb, headlen), va,ALIGN (headlen,sizeof (long )));
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +1 -1
@@ -1800,7 +1800,7 @@ static void ixgbe_pull_tail(struct ixgbe_ring *rx_ring,* we need the header to contain the greater of either ETH_HLEN or * 60 bytes if the skb->len is less than 60 for skb_pad. */ - pull_len =eth_get_headlen (va,IXGBE_RX_HDR_SIZE ); + pull_len =eth_get_headlen (skb->dev, va,IXGBE_RX_HDR_SIZE );/* align pull length to size of long to optimize memcpy performance */ skb_copy_to_linear_data (skb, va,ALIGN (pull_len,sizeof (long )));
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c +2 -1
@@ -895,7 +895,8 @@ struct sk_buff *ixgbevf_construct_skb(struct ixgbevf_ring *rx_ring,/* Determine available headroom for copy */ headlen = size;if (headlen >IXGBEVF_RX_HDR_SIZE ) - headlen =eth_get_headlen (xdp->data,IXGBEVF_RX_HDR_SIZE ); + headlen =eth_get_headlen (skb->dev, xdp->data, +IXGBEVF_RX_HDR_SIZE );/* align pull length to size of long to optimize memcpy performance */ memcpy(__skb_put(skb, headlen), xdp->data,
drivers/net/ethernet/mellanox/mlx5/core/en_tx.c +1 -1
@@ -163,7 +163,7 @@ static inline u16 mlx5e_calc_min_inline(enum mlx5_inline_modes mode,case MLX5_INLINE_MODE_NONE :return 0 ;case MLX5_INLINE_MODE_TCP_UDP : - hlen =eth_get_headlen (skb->data,skb_headlen (skb)); + hlen =eth_get_headlen (skb->dev, skb->data,skb_headlen (skb));if (hlen ==ETH_HLEN && !skb_vlan_tag_present (skb)) hlen +=VLAN_HLEN ;break ;
drivers/net/tun.c +2 -1
@@ -1965,7 +1965,8 @@ static ssize_t tun_get_user(struct tun_struct *tun, struct tun_file *tfile,if (frags) {/* Exercise flow dissector code path. */ -u32 headlen =eth_get_headlen (skb->data,skb_headlen (skb)); +u32 headlen =eth_get_headlen (tun->dev, skb->data, +skb_headlen (skb));if (unlikely (headlen >skb_headlen (skb))) {this_cpu_inc (tun->pcpu_stats->rx_dropped);
include/linux/etherdevice.h +1 -1
@@ -33,7 +33,7 @@ struct device;int eth_platform_get_mac_address (struct device *dev,u8 *mac_addr);unsigned char *arch_get_platform_mac_address (void );int nvmem_get_mac_address (struct device *dev,void *addrbuf); -u32 eth_get_headlen (void *data,unsigned int max_len); +u32 eth_get_headlen (const struct net_device *dev,void *data,unsigned int len);__be16 eth_type_trans (struct sk_buff *skb,struct net_device *dev);extern const struct header_ops eth_header_ops;
net/ethernet/eth.c +3 -2
@@ -119,13 +119,14 @@ EXPORT_SYMBOL(eth_header);/** * eth_get_headlen - determine the length of header for an ethernet frame +* @dev: pointer to network device * @data: pointer to start of frame * @len: total length of frame * * Make a best effort attempt to pull the length for all of the headers for * a given frame in a linear buffer. */ -u32 eth_get_headlen (void *data,unsigned int len) +u32 eth_get_headlen (const struct net_device *dev,void *data,unsigned int len) {const unsigned int flags =FLOW_DISSECTOR_F_PARSE_1ST_FRAG ;const struct ethhdr *eth = (const struct ethhdr *)data;
@@ -136,7 +137,7 @@ u32 eth_get_headlen(void *data, unsigned int len)return len;/* parse any remaining L2/L3 headers, check for L4 */ -if (!skb_flow_dissect_flow_keys_basic (NULL ,NULL , &keys, data, +if (!skb_flow_dissect_flow_keys_basic (dev_net (dev),NULL , &keys, data, eth->h_proto,sizeof (*eth), len, flags))return max_t (u32, keys.control.thoff,sizeof (*eth));
Signature · 1 line
2.17.1