Apply GCP related changes

SOURCES/0001-Apply-GCP-related-changes.patch

@@ -0,0 +1,64 @@
+From b83e8fbcd577b06391823a5f900f828f5e4e0d29 Mon Sep 17 00:00:00 2001
+From: Andrew Lukoshko <alukoshko@almalinux.org>
+Date: Tue, 2 May 2023 13:47:05 +0200
+Subject: [PATCH] Apply GCP related changes
+
+---
+ drivers/net/ethernet/google/Kconfig        | 2 +-
+ drivers/net/ethernet/google/gve/gve_main.c | 6 ++----
+ drivers/net/ethernet/google/gve/gve_rx.c   | 2 +-
+ 3 files changed, 4 insertions(+), 6 deletions(-)
+
+diff --git a/drivers/net/ethernet/google/Kconfig b/drivers/net/ethernet/google/Kconfig
+index 8641a00f8..b8f04d052 100644
+--- a/drivers/net/ethernet/google/Kconfig
++++ b/drivers/net/ethernet/google/Kconfig
+@@ -17,7 +17,7 @@ if NET_VENDOR_GOOGLE
+ 
+ config GVE
+ 	tristate "Google Virtual NIC (gVNIC) support"
+-	depends on (PCI_MSI && (X86 || CPU_LITTLE_ENDIAN))
++	depends on PCI_MSI
+ 	help
+ 	  This driver supports Google Virtual NIC (gVNIC)"
+ 
+diff --git a/drivers/net/ethernet/google/gve/gve_main.c b/drivers/net/ethernet/google/gve/gve_main.c
+index 54e51c822..6cafee55e 100644
+--- a/drivers/net/ethernet/google/gve/gve_main.c
++++ b/drivers/net/ethernet/google/gve/gve_main.c
+@@ -857,8 +857,7 @@ static int gve_alloc_qpls(struct gve_priv *priv)
+ 	int i, j;
+ 	int err;
+ 
+-	/* Raw addressing means no QPLs */
+-	if (priv->queue_format == GVE_GQI_RDA_FORMAT)
++	if (num_qpls == 0)
+ 		return 0;
+ 
+ 	priv->qpls = kvcalloc(num_qpls, sizeof(*priv->qpls), GFP_KERNEL);
+@@ -901,8 +900,7 @@ static void gve_free_qpls(struct gve_priv *priv)
+ 	int num_qpls = gve_num_tx_qpls(priv) + gve_num_rx_qpls(priv);
+ 	int i;
+ 
+-	/* Raw addressing means no QPLs */
+-	if (priv->queue_format == GVE_GQI_RDA_FORMAT)
++	if (num_qpls == 0)
+ 		return;
+ 
+ 	kvfree(priv->qpl_cfg.qpl_id_map);
+diff --git a/drivers/net/ethernet/google/gve/gve_rx.c b/drivers/net/ethernet/google/gve/gve_rx.c
+index e4e98aa77..021bbf308 100644
+--- a/drivers/net/ethernet/google/gve/gve_rx.c
++++ b/drivers/net/ethernet/google/gve/gve_rx.c
+@@ -439,7 +439,7 @@ static bool gve_rx_ctx_init(struct gve_rx_ctx *ctx, struct gve_rx_ring *rx)
+ 		if (frag_size > rx->packet_buffer_size) {
+ 			packet_size_error = true;
+ 			netdev_warn(priv->dev,
+-				    "RX fragment error: packet_buffer_size=%d, frag_size=%d, droping packet.",
++				    "RX fragment error: packet_buffer_size=%d, frag_size=%d, dropping packet.",
+ 				    rx->packet_buffer_size, be16_to_cpu(desc->len));
+ 		}
+ 		page_info = &rx->data.page_info[idx];
+-- 
+2.39.2
+

SPECS/kernel.spec

@@ -538,7 +538,7 @@ Name: kernel
 License: GPLv2 and Redistributable, no modification permitted
 URL: https://www.kernel.org/
 Version: %{rpmversion}
-Release: %{pkg_release}
+Release: %{pkg_release}.gcp
 # DO NOT CHANGE THE 'ExclusiveArch' LINE TO TEMPORARILY EXCLUDE AN ARCHITECTURE BUILD.
 # SET %%nobuildarches (ABOVE) INSTEAD
 %if 0%{?fedora}
@@ -808,6 +808,9 @@ Source4002: gating.yaml
 Patch1: patch-%{rpmversion}-redhat.patch
 %endif
 
+# AlmaLinux GCP patch
+Patch2: 0001-Apply-GCP-related-changes.patch
+
 # empty final patch to facilitate testing of kernel patches
 Patch999999: linux-kernel-test.patch
 
@@ -1349,6 +1352,7 @@ cp -a %{SOURCE1} .
 ApplyOptionalPatch patch-%{rpmversion}-redhat.patch
 %endif
 
+ApplyOptionalPatch 0001-Apply-GCP-related-changes.patch
 ApplyOptionalPatch linux-kernel-test.patch
 
 # END OF PATCH APPLICATIONS
@@ -2993,6 +2997,9 @@ fi
 #
 #
 %changelog
+* Tue May 02 2023 Andrew Lukoshko <alukoshko@almalinux.org> [5.14.0-162.23.1.el9_1.gcp]
+- Apply GCP related changes
+
 * Thu Mar 23 2023 Patrick Talbert <ptalbert@redhat.com> [5.14.0-162.23.1.el9_1]
 - ovl: fail on invalid uid/gid mapping at copy up (Miklos Szeredi) [2165344 2165345] {CVE-2023-0386}
 - intel_idle: make SPR C1 and C1E be independent (David Arcari) [2168361 2125352]