import kernel-4.18.0-477.27.1.el8_8

SOURCES/4-backport-changes-from-https-kernel-googlesource-com-pub-scm-linux-kernel-git-torvalds-linux-tag-v6-5.patch

@@ -3366,7 +3366,7 @@ index a75430117fb8932052fbbfe1be3e3a279fc649aa..813da572abca2d198cc91eec85e74050
  
  bool gve_tx_poll(struct gve_notify_block *block, int budget)
 diff --git a/drivers/net/ethernet/google/gve/gve_tx_dqo.c b/drivers/net/ethernet/google/gve/gve_tx_dqo.c
-index bbf8bec56189fd874fcbb239104f9a6c64f4eb41..dedd5cd45a386353a1225e7145786a79958ecacc 100644
+index bbf8bec56189fd874fcbb239104f9a6c64f4eb41..16f4e2c826b106bc22f65c07c295d68ed1fa99b0 100644
 --- a/drivers/net/ethernet/google/gve/gve_tx_dqo.c
 +++ b/drivers/net/ethernet/google/gve/gve_tx_dqo.c
 @@ -8,6 +8,7 @@ #include "gve.h"
@@ -3395,17 +3395,15 @@ index bbf8bec56189fd874fcbb239104f9a6c64f4eb41..dedd5cd45a386353a1225e7145786a79
  	const int gso_size = shinfo->gso_size;
  	int cur_seg_num_bufs;
  	int cur_seg_size;
-@@ -645,6 +646,9 @@ 			net_err_ratelimited("%s: Failed to transmit TSO packet\n",
+@@ -645,6 +646,7 @@ 			net_err_ratelimited("%s: Failed to transmit TSO packet\n",
  					    priv->dev->name);
  			goto drop;
  		}
 +
-+		if (unlikely(ipv6_hopopt_jumbo_remove(skb)))
-+			goto drop;
  
  		num_buffer_descs = gve_num_buffer_descs_needed(skb);
  	} else {
-@@ -795,7 +799,7 @@ 		if (unlikely(pending_packet->state !=
+@@ -795,7 +797,7 @@ 		if (unlikely(pending_packet->state !=
  			     GVE_PACKET_STATE_PENDING_REINJECT_COMPL)) {
  			/* No outstanding miss completion but packet allocated
  			 * implies packet receives a re-injection completion
@@ -3414,7 +3412,7 @@ index bbf8bec56189fd874fcbb239104f9a6c64f4eb41..dedd5cd45a386353a1225e7145786a79
  			 * completing the packet.
  			 */
  			net_err_ratelimited("%s: Re-injection completion received without corresponding miss completion: %d\n",
-@@ -953,12 +957,18 @@
+@@ -953,12 +955,18 @@
  			atomic_set_release(&tx->dqo_compl.hw_tx_head, tx_head);
  		} else if (type == GVE_COMPL_TYPE_DQO_PKT) {
  			u16 compl_tag = le16_to_cpu(compl_desc->completion_tag);
@@ -3439,7 +3437,7 @@ index bbf8bec56189fd874fcbb239104f9a6c64f4eb41..dedd5cd45a386353a1225e7145786a79
  		} else if (type == GVE_COMPL_TYPE_DQO_MISS) {
  			u16 compl_tag = le16_to_cpu(compl_desc->completion_tag);
  
-@@ -972,7 +982,7 @@ 			gve_handle_packet_completion(priv, tx, !!napi,
+@@ -972,7 +980,7 @@ 			gve_handle_packet_completion(priv, tx, !!napi,
  						     compl_tag,
  						     &reinject_compl_bytes,
  						     &reinject_compl_pkts,