Merge pull request #75 from GoogleCloudPlatform/dkms-fix

gve: update dkms.conf to use yes instead of Y

Author: josh8551021

build/README

@@ -154,7 +154,20 @@ Where gve-dkms_1.1.0_all.deb is the driver deb package that you have been suppli
 ```shell
 modprobe gve
 ```
-This loads the driver until you remove it with rmmod or you reboot.
+
+This loads the driver until you remove it with rmmod or you reboot. If a driver
+was already installed or came with the kernel and `modprobe` does not update the
+driver version, you need to manually remove the module and point to the `gve.ko`
+file installed from the debian package (you can find the path in the output of
+the command in step 1). You can use this command to do so:
+
+> [!WARNING]
+> Run this as a single line, as running `rmmod` alone will remove the existing
+> driver and disconnect you if connected over SSH.
+
+```bash
+sudo rmmod gve; sudo insmod /path/to/gve.ko
+```
 
 3. To have the driver automatically load on boot if you are using systemd run:
 ```shell

build/gve.h

@@ -901,7 +901,7 @@ static inline int gve_get_enable_header_split(struct gve_priv *priv)
 {
 	return test_bit(GVE_PRIV_FLAGS_ENABLE_HEADER_SPLIT, &priv->ethtool_flags);
 }
-static inline int gve_get_enable_max_rx_buffer_size(struct gve_priv *priv){
+static inline int gve_get_enable_max_rx_buffer_size(struct gve_priv *priv) {
 	return test_bit(GVE_PRIV_FLAGS_ENABLE_MAX_RX_BUFFER_SIZE, &priv->ethtool_flags);
 }
 #endif /* LINUX_VERSION_CODE < KERNEL_VERSION(6,8,0) */

build/gve_adminq.c

@@ -1388,7 +1388,7 @@ int gve_adminq_configure_rss(struct gve_priv *priv, struct ethtool_rxfh_param *r
 }
 #else /* LINUX_VERSION_CODE >= KERNEL_VERSION(6,8,0) || RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(9,5) */
 int gve_adminq_configure_rss(struct gve_priv *priv, const u32 *indir,
-			     const u8 *hash_key, const u8 hfunc){
+			     const u8 *hash_key, const u8 hfunc) {
 	dma_addr_t lut_bus = 0, key_bus = 0;
 	u16 key_size = 0, lut_size = 0;
 	union gve_adminq_command cmd;
@@ -1413,7 +1413,6 @@ default:  return -EOPNOTSUPP;
 		if (!lut)
 			return -ENOMEM;
 
-		
 		for(i = 0;i < priv->rss_lut_size;i++)
 			lut[i] = cpu_to_be32(indir[i]);
 	}
@@ -1569,7 +1568,7 @@ static int gve_adminq_process_rss_query(struct gve_priv *priv,
 #else /* LINUX_VERSION_CODE >= KERNEL_VERSION(6,8,0) || RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(9,5) */
 static int gve_adminq_process_rss_query(struct gve_priv *priv,
 					struct gve_query_rss_descriptor *descriptor,
-					u32 *indir, u8 *key, u8 *hfunc){
+					u32 *indir, u8 *key, u8 *hfunc) {
 	u32 total_memory_length;
 	u16 hash_lut_length;
 	void *rss_info_addr;
@@ -1588,12 +1587,10 @@ static int gve_adminq_process_rss_query(struct gve_priv *priv,
 	if (hfunc)
 		*hfunc = descriptor->hash_alg;
 
-	
 	rss_info_addr = (void *)(descriptor + 1);
 	if (key)
 		memcpy(key, rss_info_addr, priv->rss_key_size);
 
-	
 	rss_info_addr += priv->rss_key_size;
 	lut = (__be32 *)rss_info_addr;
 	if (indir) {
@@ -1635,7 +1632,7 @@ int gve_adminq_query_rss_config(struct gve_priv *priv, struct ethtool_rxfh_param
 }
 #else /* LINUX_VERSION_CODE >= KERNEL_VERSION(6,8,0) || RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(9,5) */
 int gve_adminq_query_rss_config(struct gve_priv *priv, u32 *indir, u8 *key,
-				u8 *hfunc){
+				u8 *hfunc) {
 	struct gve_query_rss_descriptor *descriptor;
 	union gve_adminq_command cmd;
 	dma_addr_t descriptor_bus;
@@ -1646,7 +1643,6 @@ int gve_adminq_query_rss_config(struct gve_priv *priv, u32 *indir, u8 *key,
 	if (!descriptor)
 		return -ENOMEM;
 
-	
 	memset(&cmd, 0, sizeof(cmd));
 	cmd.opcode = cpu_to_be32(GVE_ADMINQ_QUERY_RSS);
 	cmd.query_rss = (struct gve_adminq_query_rss){
@@ -1657,7 +1653,6 @@ int gve_adminq_query_rss_config(struct gve_priv *priv, u32 *indir, u8 *key,
 	if (err)
 		goto out;
 
-	
 	err = gve_adminq_process_rss_query(priv, descriptor, indir, key,
 					   hfunc);
 

build/gve_buffer_mgmt_dqo.c

@@ -14,7 +14,7 @@ int gve_buf_ref_cnt(struct gve_rx_buf_state_dqo *bs)
 
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(6,7,0))
 void gve_free_page_dqo(struct gve_priv *priv, struct gve_rx_buf_state_dqo *bs,
-		       bool free_page){
+		       bool free_page) {
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(4,6,0)
 	page_ref_sub(bs->page_info.page, bs->page_info.pagecnt_bias - 1);
 #else /* LINUX_VERSION_CODE >= KERNEL_VERSION(4,6,0) */
@@ -137,7 +137,7 @@ struct gve_rx_buf_state_dqo *gve_get_recycled_buf_state(struct gve_rx_ring *rx)
 
 	return NULL;
 #else /* (LINUX_VERSION_CODE < KERNEL_VERSION(6,7,0)) */
-	if (rx->dqo.qpl)return NULL;
+	if (rx->dqo.qpl) return NULL;
 	/* If there are no free buf states discard an entry from
 	 * `used_buf_states` so it can be used.
 	 */
@@ -147,7 +147,6 @@ struct gve_rx_buf_state_dqo *gve_get_recycled_buf_state(struct gve_rx_ring *rx)
 		if (gve_buf_ref_cnt(buf_state) == 0)
 			return buf_state;
 
-		
 		gve_free_page_dqo(rx->gve, buf_state, true);
 		gve_free_buf_state(rx, buf_state);
 	}
@@ -209,7 +208,7 @@ void gve_free_qpl_page_dqo(struct gve_rx_buf_state_dqo *buf_state)
 
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(6,7,0))
 int gve_alloc_page_dqo(struct gve_rx_ring *rx,
-		       struct gve_rx_buf_state_dqo *buf_state){
+		       struct gve_rx_buf_state_dqo *buf_state) {
 	struct gve_priv *priv = rx->gve;
 	u32 idx;
 

build/gve_ethtool.c

@@ -802,7 +802,6 @@ static int gve_set_priv_flags(struct net_device *netdev, u32 flags)
 		else
 			new_packet_buffer_size = GVE_DEFAULT_RX_BUFFER_SIZE;
 
-		
 		err = gve_set_buffer_size_config(priv, enable_hdr_split,
 						 new_packet_buffer_size);
 		if (err)
@@ -1006,13 +1005,12 @@ static int gve_get_rxfh(struct net_device *netdev, struct ethtool_rxfh_param *rx
 }
 #else /* LINUX_VERSION_CODE >= KERNEL_VERSION(6,8,0) || RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(9,5) */
 static int gve_get_rxfh(struct net_device *netdev, u32 *indir, u8 *key,
-			u8 *hfunc){
+			u8 *hfunc) {
 	struct gve_priv *priv = netdev_priv(netdev);
 
 	if (!priv->rss_key_size || !priv->rss_lut_size)
 		return -EOPNOTSUPP;
 
-	
 	return gve_adminq_query_rss_config(priv, indir, key, hfunc);
 }
 #endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(6,8,0) || RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(9,5) */
@@ -1030,13 +1028,12 @@ static int gve_set_rxfh(struct net_device *netdev, struct ethtool_rxfh_param *rx
 }
 #else /* LINUX_VERSION_CODE >= KERNEL_VERSION(6,8,0) || RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(9,5) */
 static int gve_set_rxfh(struct net_device *netdev, const u32 *indir,
-			const u8 *key, const u8 hfunc){
+			const u8 *key, const u8 hfunc) {
 	struct gve_priv *priv = netdev_priv(netdev);
 
 	if (!priv->rss_key_size || !priv->rss_lut_size)
 		return -EOPNOTSUPP;
 
-	
 	return gve_adminq_configure_rss(priv, indir, key, hfunc);
 }
 #endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(6,8,0) || RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(9,5) */

build/gve_main.c

@@ -38,7 +38,7 @@
 #define GVE_DEFAULT_RX_COPYBREAK	(256)
 
 #define DEFAULT_MSG_LEVEL	(NETIF_MSG_DRV | NETIF_MSG_LINK)
-#define GVE_VERSION		 "1.4.5-0--b95625d-oot"
+#define GVE_VERSION		 "1.4.5.1-0-d3ec7a0-d3ec7a0-oot"
 #define GVE_VERSION_PREFIX	"GVE-"
 
 // Minimum amount of time between queue kicks in msec (10 seconds)
@@ -151,7 +151,7 @@ static void gve_get_stats(struct net_device *dev, struct rtnl_link_stats64 *s)
 }
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(4,11,0)) && (RHEL_RELEASE_CODE <= RHEL_RELEASE_VERSION(7,6))
 static struct rtnl_link_stats64 *
-backport_gve_get_stats(struct net_device *dev, struct rtnl_link_stats64 *s){
+backport_gve_get_stats(struct net_device *dev, struct rtnl_link_stats64 *s) {
 	gve_get_stats(dev, s);
 	return s;
 }
@@ -270,7 +270,7 @@ static void gve_stats_report_schedule(struct gve_priv *priv)
 }
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(4,15,0)
-static void gve_stats_report_timer(unsigned long data){
+static void gve_stats_report_timer(unsigned long data) {
 	struct gve_priv *priv = (struct gve_priv *)data;
 	mod_timer(&priv->stats_report_timer,
 		  round_jiffies(jiffies + msecs_to_jiffies(priv->stats_report_timer_period)));
@@ -1480,7 +1480,7 @@ static void gve_drain_page_cache(struct gve_priv *priv)
 #endif /* LINUX_VERSION_CODE < KERNEL_VERSION(6,9,0) || RHEL_RELEASE_CODE < RHEL_RELEASE_VERSION(10,0) */
 	int i;
 #if LINUX_VERSION_CODE < KERNEL_VERSION(6,9,0) || RHEL_RELEASE_CODE < RHEL_RELEASE_VERSION(10,0)
-	for (i = 0; i < priv->rx_cfg.num_queues; i++) {
+	for (i = 0;i < priv->rx_cfg.num_queues;i++) {
 		nc = &priv->rx[i].page_cache;
 		if (nc->va) {
 			__page_frag_cache_drain(virt_to_page(nc->va),
@@ -2279,7 +2279,7 @@ static void gve_tx_timeout(struct net_device *dev, unsigned int txqueue)
 }
 #else /* (LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0) || RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(8, 3) || UBUNTU_VERSION_CODE >= UBUNTU_VERSION(5,4,0,1071) || defined(KUNIT_KERNEL)) */
 static void
-backport_gve_tx_timeout(struct net_device *dev){
+backport_gve_tx_timeout(struct net_device *dev) {
 	struct gve_priv *priv = netdev_priv(dev);
 	gve_schedule_reset(priv);
 	priv->tx_timeo_cnt++;
@@ -2288,13 +2288,9 @@ backport_gve_tx_timeout(struct net_device *dev){
 
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(6,8,0))
 int gve_set_buffer_size_config(struct gve_priv *priv, bool enable_hdr_split,
-			       int new_pkt_buf_size){
-	struct gve_tx_alloc_rings_cfg tx_alloc_cfg = {
-		0
-	};
-	struct gve_rx_alloc_rings_cfg rx_alloc_cfg = {
-		0
-	};
+			       int new_pkt_buf_size) {
+	struct gve_tx_alloc_rings_cfg tx_alloc_cfg = { 0 };
+	struct gve_rx_alloc_rings_cfg rx_alloc_cfg = { 0 };
 	int err = 0;
 
 	gve_get_curr_alloc_cfgs(priv, &tx_alloc_cfg, &rx_alloc_cfg);
@@ -2391,7 +2387,7 @@ static int gve_set_features(struct net_device *netdev,
 }
 
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(4,10,0))
-int gve_change_mtu(struct net_device *dev, int new_mtu){
+int gve_change_mtu(struct net_device *dev, int new_mtu) {
 	struct gve_priv *priv = netdev_priv(dev);
 
 	if (new_mtu < ETH_MIN_MTU || new_mtu > priv->max_mtu)

build/gve_rx_dqo.c

@@ -102,8 +102,8 @@ static void gve_rx_reset_ring_dqo(struct gve_priv *priv, int idx)
 			else
 				gve_free_qpl_page_dqo(bs);
 #else
-			if (bs->page_info.page)gve_free_page_dqo(priv, bs,
-								 !rx->dqo.qpl);
+			if (bs->page_info.page) gve_free_page_dqo(priv, bs,
+								  !rx->dqo.qpl);
 #endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(6,7,0)) */
 		}
 	}
@@ -153,8 +153,8 @@ void gve_rx_free_ring_dqo(struct gve_priv *priv, struct gve_rx_ring *rx,
 		else
 			gve_free_qpl_page_dqo(bs);
 #else
-		if (bs->page_info.page)gve_free_page_dqo(priv, bs,
-							 !rx->dqo.qpl);
+		if (bs->page_info.page) gve_free_page_dqo(priv, bs,
+							  !rx->dqo.qpl);
 #endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(6,7,0)) */
 	}
 
@@ -427,7 +427,6 @@ void gve_rx_post_buffers_dqo(struct gve_rx_ring *rx)
 			if (unlikely(!buf_state))
 				break;
 
-			
 			if (unlikely(gve_alloc_page_dqo(rx, buf_state))) {
 				u64_stats_update_begin(&rx->statss);
 				rx->rx_buf_alloc_fail++;

dkms.conf

@@ -5,4 +5,4 @@ DEST_MODULE_LOCATION="/updates"
 PACKAGE_NAME=gve
 PACKAGE_VERSION=
 REMAKE_INITRD=no
-AUTOINSTALL=Y
+AUTOINSTALL=yes

google/gve/gve_main.c

@@ -29,7 +29,7 @@
 #define GVE_DEFAULT_RX_COPYBREAK	(256)
 
 #define DEFAULT_MSG_LEVEL	(NETIF_MSG_DRV | NETIF_MSG_LINK)
-#define GVE_VERSION		"1.4.5"
+#define GVE_VERSION		"1.4.5.1"
 #define GVE_VERSION_PREFIX	"GVE-"
 
 // Minimum amount of time between queue kicks in msec (10 seconds)