Commit 320fae9e authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch '200GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/net-queue 

Tony Nguyen says:

====================
Intel Wired LAN Driver Updates 2023-12-26 (idpf)

This series contains updates to idpf driver only.

Alexander resolves issues in singleq mode to prevent corrupted frames
and leaking skbs.

Pavan prevents extra padding on RSS struct causing load failure due to
unexpected size.

* '200GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/net-queue:
  idpf: avoid compiler introduced padding in virtchnl2_rss_key struct
  idpf: fix corrupted frames and skb leaks in singleq mode
====================

Link: https://lore.kernel.org/r/20231226174125.2632875-1-anthony.l.nguyen@intel.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 2311e06b a613fb46

drivers/net/ethernet/intel/idpf/idpf_singleq_txrx.c

+0 −1
Original line number Diff line number Diff line
@@ -1044,7 +1044,6 @@ static int idpf_rx_singleq_clean(struct idpf_queue *rx_q, int budget) 
		}



		idpf_rx_sync_for_cpu(rx_buf, fields.size);

		skb = rx_q->skb;

		if (skb)

			idpf_rx_add_frag(rx_buf, skb, fields.size);

		else

drivers/net/ethernet/intel/idpf/idpf_txrx.c

+1 −1
Original line number Diff line number Diff line
@@ -396,7 +396,7 @@ static void idpf_rx_desc_rel(struct idpf_queue *rxq, bool bufq, s32 q_model) 
	if (!rxq)

		return;



	if (!bufq && idpf_is_queue_model_split(q_model) && rxq->skb) {

	if (rxq->skb) {

		dev_kfree_skb_any(rxq->skb);

		rxq->skb = NULL;

	}

drivers/net/ethernet/intel/idpf/virtchnl2.h

+3 −3
Original line number Diff line number Diff line
@@ -1104,9 +1104,9 @@ struct virtchnl2_rss_key { 
	__le32 vport_id;

	__le16 key_len;

	u8 pad;

	__DECLARE_FLEX_ARRAY(u8, key_flex);

};

VIRTCHNL2_CHECK_STRUCT_LEN(8, virtchnl2_rss_key);

	u8 key_flex[];

} __packed;

VIRTCHNL2_CHECK_STRUCT_LEN(7, virtchnl2_rss_key);



/**

 * struct virtchnl2_queue_chunk - chunk of contiguous queues