Commit c43f1255 authored by Stanislav Fomichev's avatar Stanislav Fomichev Committed by Daniel Borkmann
Browse files

net: pass net_device argument to the eth_get_headlen 



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 <maxk@qti.qualcomm.com>
Cc: Saeed Mahameed <saeedm@mellanox.com>
Cc: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Cc: intel-wired-lan@lists.osuosl.org
Cc: Yisen Zhuang <yisen.zhuang@huawei.com>
Cc: Salil Mehta <salil.mehta@huawei.com>
Cc: Michael Chan <michael.chan@broadcom.com>
Cc: Igor Russkikh <igor.russkikh@aquantia.com>
Signed-off-by: default avatarStanislav Fomichev <sdf@google.com>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
parent 9b52e3f2

drivers/net/ethernet/aquantia/atlantic/aq_ring.c

+2 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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)));

CRA Git | Maintained and supported by SUSTech CRA and CCSE