Skip to contentSkip to conversation

net/gve: Check whether the driver is compatible with the device presented.

PATCH In review Rushil Gupta 4 participants 32 messages Apr 14, 2023 – May 31, 2023

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net/gve: Check whether the driver is compatible with the device presented.

Change gve_driver_info fields to report DPDK as OS type and DPDK RTE version as OS version, reserving driver_version fields for GVE driver version based on features.

This patch is dependent on https://patchwork.dpdk.org/project/dpdk/list/?series=27687&state=*

---
 drivers/net/gve/base/gve.h        |  3 --
 drivers/net/gve/base/gve_adminq.c | 19 +++++++++
 drivers/net/gve/base/gve_adminq.h | 49 ++++++++++++++++++++++-
 drivers/net/gve/base/gve_osdep.h  | 36 +++++++++++++++++
 drivers/net/gve/gve_ethdev.c      | 65 +++++++++++++++++++++++++------
 drivers/net/gve/gve_ethdev.h      |  2 +-
 drivers/net/gve/gve_version.c     | 14 +++++++
 drivers/net/gve/gve_version.h     | 25 ++++++++++++
 drivers/net/gve/meson.build       |  1 +
 9 files changed, 198 insertions(+), 16 deletions(-)
 create mode 100644 drivers/net/gve/gve_version.c
 create mode 100644 drivers/net/gve/gve_version.h
drivers/net/gve/base/gve.h +0 -3
index 2dc4507acb..89f9654a72 100644
@@ -8,9 +8,6 @@
 
 #include "gve_desc.h"
 
-#define GVE_VERSION		"1.3.0"
-#define GVE_VERSION_PREFIX	"GVE-"
-
 #ifndef GOOGLE_VENDOR_ID
 #define GOOGLE_VENDOR_ID	0x1ae0
 #endif
drivers/net/gve/base/gve_adminq.c +19 -0
index e745b709b2..2e5099a5b0 100644
@@ -401,6 +401,9 @@ static int gve_adminq_issue_cmd(struct gve_priv *priv,
 	case GVE_ADMINQ_GET_PTYPE_MAP:
 		priv->adminq_get_ptype_map_cnt++;
 		break;
+	case GVE_ADMINQ_VERIFY_DRIVER_COMPATIBILITY:
+		priv->adminq_verify_driver_compatibility_cnt++;
+		break;
 	default:
 		PMD_DRV_LOG(ERR, "unknown AQ command opcode %d", opcode);
 	}
@@ -465,6 +468,22 @@ int gve_adminq_configure_device_resources(struct gve_priv *priv,
 	return gve_adminq_execute_cmd(priv, &cmd);
 }
 
+int gve_adminq_verify_driver_compatibility(struct gve_priv *priv,
+					   u64 driver_info_len,
+					   dma_addr_t driver_info_addr)
+{
+	union gve_adminq_command cmd;
+
+	memset(&cmd, 0, sizeof(cmd));
+	cmd.opcode = cpu_to_be32(GVE_ADMINQ_VERIFY_DRIVER_COMPATIBILITY);
+	cmd.verify_driver_compatibility = (struct gve_adminq_verify_driver_compatibility) {
+		.driver_info_len = cpu_to_be64(driver_info_len),
+		.driver_info_addr = cpu_to_be64(driver_info_addr),
+	};
+
+	return gve_adminq_execute_cmd(priv, &cmd);
+}
+
 int gve_adminq_deconfigure_device_resources(struct gve_priv *priv)
 {
 	union gve_adminq_command cmd;
drivers/net/gve/base/gve_adminq.h +48 -1

76 lines not on this page · raw message

drivers/net/gve/base/gve_osdep.h +36 -0
index 7cb73002f4..a5efa8543e 100644
@@ -21,9 +21,14 @@
 #include <rte_malloc.h>
 #include <rte_memcpy.h>
 #include <rte_memzone.h>
+#include <rte_version.h>
 
 #include "../gve_logs.h"
 
+#ifdef __linux__
+#include <sys/utsname.h>
+#endif
+
 typedef uint8_t u8;
 typedef uint16_t u16;
 typedef uint32_t u32;
@@ -69,6 +74,12 @@ typedef rte_iova_t dma_addr_t;
 
 #define msleep(ms)		rte_delay_ms(ms)
 
+#define OS_VERSION_STRLEN 128
+struct os_version_string {
+	char os_version_str1[OS_VERSION_STRLEN];
+	char os_version_str2[OS_VERSION_STRLEN];
+};
+
 /* These macros are used to generate compilation errors if a struct/union
  * is not exactly the correct length. It gives a divide by zero error if
  * the struct/union is not of the correct size, otherwise it creates an
@@ -79,6 +90,12 @@ typedef rte_iova_t dma_addr_t;
 #define GVE_CHECK_UNION_LEN(n, X) enum gve_static_asset_enum_##X \
 	{ gve_static_assert_##X = (n) / ((sizeof(union X) == (n)) ? 1 : 0) }
 
+#ifndef LINUX_VERSION_MAJOR
+#define LINUX_VERSION_MAJOR (((LINUX_VERSION_CODE) >> 16) & 0xff)
+#define LINUX_VERSION_SUBLEVEL (((LINUX_VERSION_CODE) >> 8) & 0xff)
+#define LINUX_VERSION_PATCHLEVEL ((LINUX_VERSION_CODE) & 0xff)
+#endif
+
 static __rte_always_inline u8
 readb(volatile void *addr)
 {
@@ -156,4 +173,23 @@ gve_free_dma_mem(struct gve_dma_mem *mem)
 	mem->pa = 0;
 }
 
+static inline void
+populate_driver_version_strings(struct os_version_string *os_version_str)
+{
+#ifdef __linux__
+	struct utsname uts;
+	if (uname(&uts) >= 0) {
+		/* release */
+		rte_strscpy(os_version_str->os_version_str1, uts.release,
+			sizeof(os_version_str->os_version_str1));
+		/* version */
+		rte_strscpy(os_version_str->os_version_str2, uts.version,
+			sizeof(os_version_str->os_version_str2));
+	}
+#else
+	/* gVNIC is currently not supported on OS like FreeBSD */
+	RTE_SET_USED(os_version_str);
+#endif
+}
+
 #endif /* _GVE_OSDEP_H_ */
drivers/net/gve/gve_ethdev.c +54 -11

87 lines not on this page · raw message

drivers/net/gve/gve_ethdev.h +1 -1
index 42a02cf5d4..23ccff37d3 100644
@@ -222,7 +222,7 @@ struct gve_priv {
 	uint32_t adminq_report_stats_cnt;
 	uint32_t adminq_report_link_speed_cnt;
 	uint32_t adminq_get_ptype_map_cnt;
-
+	uint32_t adminq_verify_driver_compatibility_cnt;
 	volatile uint32_t state_flags;
 
 	/* Gvnic device link speed from hypervisor. */
drivers/net/gve/gve_version.c new file +14 -0
new file mode 100644
index 0000000000..7eaa689d90
@@ -0,0 +1,14 @@
+/* SPDX-License-Identifier: MIT
+ * Google Virtual Ethernet (gve) driver
+ * Copyright (C) 2015-2023 Google, Inc.
+ */
+#include "gve_version.h"
+
+const char *gve_version_string(void)
+{
+	static char gve_version[10];
+	snprintf(gve_version, sizeof(gve_version), "%s%d.%d.%d",
+		GVE_VERSION_PREFIX, GVE_VERSION_MAJOR, GVE_VERSION_MINOR,
+		GVE_VERSION_SUB);
+	return gve_version;
+}
drivers/net/gve/gve_version.h new file +25 -0
new file mode 100644
index 0000000000..9af6a00568
@@ -0,0 +1,25 @@
+/* SPDX-License-Identifier: MIT
+ * Google Virtual Ethernet (gve) driver
+ * Copyright (C) 2015-2023 Google, Inc.
+ */
+
+#ifndef _GVE_VERSION_H_
+#define _GVE_VERSION_H_
+
+#include <rte_version.h>
+
+#define GVE_VERSION_PREFIX "DPDK-"
+#define GVE_VERSION_MAJOR 1
+#define GVE_VERSION_MINOR 0
+#define GVE_VERSION_SUB 0
+
+#define DPDK_VERSION_MAJOR (100 * RTE_VER_YEAR + RTE_VER_MONTH)
+#define DPDK_VERSION_MINOR RTE_VER_MINOR
+#define DPDK_VERSION_SUB RTE_VER_RELEASE
+
+
+const char *
+gve_version_string(void);
+
+
+#endif /* GVE_VERSION_H */
drivers/net/gve/meson.build +1 -0
index af0010c01c..a37c4bafa2 100644
@@ -12,5 +12,6 @@ sources = files(
         'gve_rx.c',
         'gve_tx.c',
         'gve_ethdev.c',
+        'gve_version.c',
 )
 includes += include_directories('base')
Signature · 1 line
2.40.0.634.g4ca3ef3211-goog
#1 lore raw

Hi Ferruh,

Here is the summary of the dependency of related patches:

P1: necessary headers update

    https://patchwork.dpdk.org/project/dpdk/list/?series=27647&state=*
P2: minor update for base code
    https://patchwork.dpdk.org/project/dpdk/list/?series=27653&state=*
P3: gve PMD enhancement
    https://patchwork.dpdk.org/project/dpdk/list/?series=27687&state=*
P4: add new AdminQ cmd to verify drv cap
    https://patchwork.dpdk.org/project/dpdk/list/?series=27703&state=*

The merging order could be: P1 > P2 > P3 > P4, due to the dependency. Just to inform you about this here. Thanks for the review!

Regards,
Junfeng

Quoted 445 lines

-----Original Message-----
From: Rushil Gupta <[email protected]>
Sent: Friday, April 14, 2023 13:15
To: [email protected]; Zhang, Qi Z <[email protected]>; Wu, Jingjing <[email protected]>
Cc: Guo, Junfeng <[email protected]>; [email protected]; [email protected]; Rushil Gupta <[email protected]>; Jeroen de Borst <[email protected]>
Subject: [PATCH] net/gve: Check whether the driver is compatible with the device presented.

Change gve_driver_info fields to report DPDK as OS type and DPDK RTE version as OS version, reserving driver_version fields for GVE driver version based on features.

This patch is dependent on
https://patchwork.dpdk.org/project/dpdk/list/?series=27687&state=*

---
 drivers/net/gve/base/gve.h        |  3 --
 drivers/net/gve/base/gve_adminq.c | 19 +++++++++
 drivers/net/gve/base/gve_adminq.h | 49 ++++++++++++++++++++++-
 drivers/net/gve/base/gve_osdep.h  | 36 +++++++++++++++++
 drivers/net/gve/gve_ethdev.c      | 65 +++++++++++++++++++++++++-----
(quoted diff) +0 -1
-
 drivers/net/gve/gve_ethdev.h      |  2 +-
 drivers/net/gve/gve_version.c     | 14 +++++++
 drivers/net/gve/gve_version.h     | 25 ++++++++++++
 drivers/net/gve/meson.build       |  1 +
 9 files changed, 198 insertions(+), 16 deletions(-)
 create mode 100644 drivers/net/gve/gve_version.c
 create mode 100644 drivers/net/gve/gve_version.h
drivers/net/gve/base/gve.h +0 -3
index 2dc4507acb..89f9654a72 100644
@@ -8,9 +8,6 @@
 
 #include "gve_desc.h"
 
-#define GVE_VERSION		"1.3.0"
-#define GVE_VERSION_PREFIX	"GVE-"
-
 #ifndef GOOGLE_VENDOR_ID
 #define GOOGLE_VENDOR_ID	0x1ae0
 #endif
drivers/net/gve/base/gve_adminq.c +3 -0
index e745b709b2..2e5099a5b0 100644
@@ -401,6 +401,9 @@ static int gve_adminq_issue_cmd(struct gve_priv
 *priv,
 	case GVE_ADMINQ_GET_PTYPE_MAP:
 		priv->adminq_get_ptype_map_cnt++;
 		break;
+	case GVE_ADMINQ_VERIFY_DRIVER_COMPATIBILITY:
+		priv->adminq_verify_driver_compatibility_cnt++;
+		break;
 	default:
 		PMD_DRV_LOG(ERR, "unknown AQ command

opcode %d", opcode);

drivers/net/gve/base/gve_adminq.c +16 -0
 	}
@@ -465,6 +468,22 @@ int
 gve_adminq_configure_device_resources(struct gve_priv *priv,
 	return gve_adminq_execute_cmd(priv, &cmd);
 }
 
+int gve_adminq_verify_driver_compatibility(struct gve_priv *priv,
+					   u64 driver_info_len,
+					   dma_addr_t driver_info_addr)
+{
+	union gve_adminq_command cmd;
+
+	memset(&cmd, 0, sizeof(cmd));
+	cmd.opcode =
 cpu_to_be32(GVE_ADMINQ_VERIFY_DRIVER_COMPATIBILITY);
+	cmd.verify_driver_compatibility = (struct
 gve_adminq_verify_driver_compatibility) {
+		.driver_info_len = cpu_to_be64(driver_info_len),
+		.driver_info_addr = cpu_to_be64(driver_info_addr),
+	};
+
+	return gve_adminq_execute_cmd(priv, &cmd);
+}
+

int gve_adminq_deconfigure_device_resources(struct gve_priv *priv) {

drivers/net/gve/base/gve_adminq.c +0 -0
 	union gve_adminq_command cmd;
drivers/net/gve/base/gve_adminq.h +45 -1
index 05550119de..edac32f031 100644
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: MIT
  * Google Virtual Ethernet (gve) driver
- * Copyright (C) 2015-2022 Google, Inc.
+ * Copyright (C) 2015-2023 Google, Inc.
  */
 
 #ifndef _GVE_ADMINQ_H
@@ -23,6 +23,7 @@ enum gve_adminq_opcodes {
 	GVE_ADMINQ_REPORT_STATS			= 0xC,
 	GVE_ADMINQ_REPORT_LINK_SPEED		= 0xD,
 	GVE_ADMINQ_GET_PTYPE_MAP		= 0xE,
+	GVE_ADMINQ_VERIFY_DRIVER_COMPATIBILITY	= 0xF,
 };
 
 /* Admin queue status codes */
@@ -145,6 +146,47 @@ enum gve_sup_feature_mask {
 };
 
 #define GVE_DEV_OPT_LEN_GQI_RAW_ADDRESSING 0x0
+enum gve_driver_capbility {
+	gve_driver_capability_gqi_qpl = 0,
+	gve_driver_capability_gqi_rda = 1,
+	gve_driver_capability_dqo_qpl = 2, /* reserved for future use */
+	gve_driver_capability_dqo_rda = 3,
+};
+
+#define GVE_CAP1(a) BIT((int)a)
+#define GVE_CAP2(a) BIT(((int)a) - 64)
+#define GVE_CAP3(a) BIT(((int)a) - 128)
+#define GVE_CAP4(a) BIT(((int)a) - 192)
+
+#define GVE_DRIVER_CAPABILITY_FLAGS1 \
+	(GVE_CAP1(gve_driver_capability_gqi_qpl) | \
+	 GVE_CAP1(gve_driver_capability_gqi_rda) | \
+	 GVE_CAP1(gve_driver_capability_dqo_rda))
+
+#define GVE_DRIVER_CAPABILITY_FLAGS2 0x0
+#define GVE_DRIVER_CAPABILITY_FLAGS3 0x0
+#define GVE_DRIVER_CAPABILITY_FLAGS4 0x0
+
+struct gve_driver_info {
+	u8 os_type;	/* 0x05 = DPDK */
+	u8 driver_major;
+	u8 driver_minor;
+	u8 driver_sub;
+	__be32 os_version_major;
+	__be32 os_version_minor;
+	__be32 os_version_sub;
+	__be64 driver_capability_flags[4];
+	u8 os_version_str1[OS_VERSION_STRLEN];
+	u8 os_version_str2[OS_VERSION_STRLEN];
+};
+
+struct gve_adminq_verify_driver_compatibility {
+	__be64 driver_info_len;
+	__be64 driver_info_addr;
+};
+
+GVE_CHECK_STRUCT_LEN(16,  gve_adminq_verify_driver_compatibility);
+
 
 struct gve_adminq_configure_device_resources {
 	__be64 counter_array;
@@ -345,6 +387,8 @@ union gve_adminq_command {
 			struct gve_adminq_report_stats report_stats;
 			struct gve_adminq_report_link_speed
 report_link_speed;
 			struct gve_adminq_get_ptype_map
 get_ptype_map;
+			struct gve_adminq_verify_driver_compatibility
+				verify_driver_compatibility;
 		};
drivers/net/gve/base/gve_adminq.h +3 -0
 	};
 	u8 reserved[64];
@@ -378,4 +422,7 @@ struct gve_ptype_lut;
 int gve_adminq_get_ptype_map_dqo(struct gve_priv *priv,
 				 struct gve_ptype_lut *ptype_lut);
 
+int gve_adminq_verify_driver_compatibility(struct gve_priv *priv,
+					   u64 driver_info_len,
+					   dma_addr_t driver_info_addr);
 #endif /* _GVE_ADMINQ_H */
drivers/net/gve/base/gve_osdep.h +11 -0
index 7cb73002f4..a5efa8543e 100644
@@ -21,9 +21,14 @@
 #include <rte_malloc.h>
 #include <rte_memcpy.h>
 #include <rte_memzone.h>
+#include <rte_version.h>
 
 #include "../gve_logs.h"
 
+#ifdef __linux__
+#include <sys/utsname.h>
+#endif
+
 typedef uint8_t u8;
 typedef uint16_t u16;
 typedef uint32_t u32;
@@ -69,6 +74,12 @@ typedef rte_iova_t dma_addr_t;
 
 #define msleep(ms)		rte_delay_ms(ms)
 
+#define OS_VERSION_STRLEN 128
+struct os_version_string {
+	char os_version_str1[OS_VERSION_STRLEN];
+	char os_version_str2[OS_VERSION_STRLEN];
+};
+
 /* These macros are used to generate compilation errors if a

struct/union
* is not exactly the correct length. It gives a divide by zero error if
* the struct/union is not of the correct size, otherwise it creates an

drivers/net/gve/base/gve_osdep.h +6 -0
@@ -79,6 +90,12 @@ typedef rte_iova_t dma_addr_t;
 #define GVE_CHECK_UNION_LEN(n, X) enum
 gve_static_asset_enum_##X \
 	{ gve_static_assert_##X = (n) / ((sizeof(union X) == (n)) ? 1 : 0) }
 
+#ifndef LINUX_VERSION_MAJOR
+#define LINUX_VERSION_MAJOR (((LINUX_VERSION_CODE) >> 16) &
 0xff)
+#define LINUX_VERSION_SUBLEVEL (((LINUX_VERSION_CODE) >> 8) &
 0xff)
+#define LINUX_VERSION_PATCHLEVEL ((LINUX_VERSION_CODE) & 0xff)
+#endif
+

static __rte_always_inline u8
readb(volatile void *addr)
{

drivers/net/gve/base/gve_osdep.h +2 -0
@@ -156,4 +173,23 @@ gve_free_dma_mem(struct gve_dma_mem
 *mem)
 	mem->pa = 0;
 }
 
+static inline void
+populate_driver_version_strings(struct os_version_string

*os_version_str)

drivers/net/gve/base/gve_osdep.h +17 -0
+{
+#ifdef __linux__
+	struct utsname uts;
+	if (uname(&uts) >= 0) {
+		/* release */
+		rte_strscpy(os_version_str->os_version_str1, uts.release,
+			sizeof(os_version_str->os_version_str1));
+		/* version */
+		rte_strscpy(os_version_str->os_version_str2, uts.version,
+			sizeof(os_version_str->os_version_str2));
+	}
+#else
+	/* gVNIC is currently not supported on OS like FreeBSD */
+	RTE_SET_USED(os_version_str);
+#endif
+}
+
 #endif /* _GVE_OSDEP_H_ */
drivers/net/gve/gve_ethdev.c +17 -11
index cf28a4a3b7..1d6e134fff 100644
@@ -5,21 +5,13 @@
 #include "gve_ethdev.h"
 #include "base/gve_adminq.h"
 #include "base/gve_register.h"
-
-const char gve_version_str[] = GVE_VERSION;
-static const char gve_version_prefix[] = GVE_VERSION_PREFIX;
+#include "base/gve_osdep.h"
+#include "gve_version.h"
 
 static void
 gve_write_version(uint8_t *driver_version_register)
 {
-	const char *c = gve_version_prefix;
-
-	while (*c) {
-		writeb(*c, driver_version_register);
-		c++;
-	}
-
-	c = gve_version_str;
+	const char *c = gve_version_string();
 	while (*c) {
 		writeb(*c, driver_version_register);
 		c++;
@@ -265,6 +257,52 @@ gve_dev_close(struct rte_eth_dev *dev)
 	return err;
 }
 
+static int
+gve_verify_driver_compatibility(struct gve_priv *priv)
+{
+	const struct rte_memzone *driver_info_bus;
+	struct gve_driver_info *driver_info;
+	int err;
+
+	driver_info_bus =
 rte_memzone_reserve_aligned("verify_driver_compatibility",
+						      sizeof(struct
 gve_driver_info),
+						      rte_socket_id(),
+
 RTE_MEMZONE_IOVA_CONTIG, PAGE_SIZE);
+	if (driver_info_bus == NULL) {
+		PMD_DRV_LOG(ERR,
+			    "Could not alloc memzone for driver

compatibility");

drivers/net/gve/gve_ethdev.c +9 -0
+		return -ENOMEM;
+	}
+	driver_info = (struct gve_driver_info *)driver_info_bus->addr;
+	*driver_info = (struct gve_driver_info) {
+		.os_type = 5, /* DPDK */
+		.driver_major = GVE_VERSION_MAJOR,
+		.driver_minor = GVE_VERSION_MINOR,
+		.driver_sub = GVE_VERSION_SUB,
+		.os_version_major =

cpu_to_be32(DPDK_VERSION_MAJOR),

drivers/net/gve/gve_ethdev.c +1 -0
+		.os_version_minor =

cpu_to_be32(DPDK_VERSION_MINOR),

drivers/net/gve/gve_ethdev.c +10 -0
+		.os_version_sub = cpu_to_be32(DPDK_VERSION_SUB),
+		.driver_capability_flags = {
+			cpu_to_be64(GVE_DRIVER_CAPABILITY_FLAGS1),
+			cpu_to_be64(GVE_DRIVER_CAPABILITY_FLAGS2),
+			cpu_to_be64(GVE_DRIVER_CAPABILITY_FLAGS3),
+			cpu_to_be64(GVE_DRIVER_CAPABILITY_FLAGS4),
+		},
+	};
+
+	populate_driver_version_strings((struct os_version_string

*)&driver_info->os_version_str1);

drivers/net/gve/gve_ethdev.c +3 -0
+
+	err = gve_adminq_verify_driver_compatibility(priv,
+		sizeof(struct gve_driver_info),

(dma_addr_t)driver_info_bus);

drivers/net/gve/gve_ethdev.c +9 -0
+
+	/* It's ok if the device doesn't support this */
+	if (err == -EOPNOTSUPP)
+		err = 0;
+
+	rte_memzone_free(driver_info_bus);
+	return err;
+}
+
 static int
 gve_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info

*dev_info)
{

drivers/net/gve/gve_ethdev.c +5 -0
@@ -672,6 +710,11 @@ gve_init_priv(struct gve_priv *priv, bool
 skip_describe_device)
 		PMD_DRV_LOG(ERR, "Failed to alloc admin queue:
 err=%d", err);
 		return err;
 	}
+	err = gve_verify_driver_compatibility(priv);
+	if (err) {
+		PMD_DRV_LOG(ERR, "Could not verify driver
 compatibility: err=%d", err);
+		goto free_adminq;
+	}
drivers/net/gve/gve_ethdev.c +0 -0
 	if (skip_describe_device)
 		goto setup_device;
drivers/net/gve/gve_ethdev.h +1 -1
index 42a02cf5d4..23ccff37d3 100644
@@ -222,7 +222,7 @@ struct gve_priv {
 	uint32_t adminq_report_stats_cnt;
 	uint32_t adminq_report_link_speed_cnt;
 	uint32_t adminq_get_ptype_map_cnt;
-
+	uint32_t adminq_verify_driver_compatibility_cnt;
 	volatile uint32_t state_flags;
 
 	/* Gvnic device link speed from hypervisor. */
drivers/net/gve/gve_version.c new file +11 -0
new file mode 100644
index 0000000000..7eaa689d90
@@ -0,0 +1,14 @@
+/* SPDX-License-Identifier: MIT
+ * Google Virtual Ethernet (gve) driver
+ * Copyright (C) 2015-2023 Google, Inc.
+ */
+#include "gve_version.h"
+
+const char *gve_version_string(void)
+{
+	static char gve_version[10];
+	snprintf(gve_version, sizeof(gve_version), "%s%d.%d.%d",
+		GVE_VERSION_PREFIX, GVE_VERSION_MAJOR,

GVE_VERSION_MINOR,

drivers/net/gve/gve_version.c new file +3 -0
+		GVE_VERSION_SUB);
+	return gve_version;
+}
drivers/net/gve/gve_version.h new file +16 -0
new file mode 100644
index 0000000000..9af6a00568
@@ -0,0 +1,25 @@
+/* SPDX-License-Identifier: MIT
+ * Google Virtual Ethernet (gve) driver
+ * Copyright (C) 2015-2023 Google, Inc.
+ */
+
+#ifndef _GVE_VERSION_H_
+#define _GVE_VERSION_H_
+
+#include <rte_version.h>
+
+#define GVE_VERSION_PREFIX "DPDK-"
+#define GVE_VERSION_MAJOR 1
+#define GVE_VERSION_MINOR 0
+#define GVE_VERSION_SUB 0
+
+#define DPDK_VERSION_MAJOR (100 * RTE_VER_YEAR +

RTE_VER_MONTH)

drivers/net/gve/gve_version.h new file +9 -0
+#define DPDK_VERSION_MINOR RTE_VER_MINOR
+#define DPDK_VERSION_SUB RTE_VER_RELEASE
+
+
+const char *
+gve_version_string(void);
+
+
+#endif /* GVE_VERSION_H */
drivers/net/gve/meson.build +1 -1
index af0010c01c..a37c4bafa2 100644
@@ -12,5 +12,6 @@ sources = files(
         'gve_rx.c',
         'gve_tx.c',
         'gve_ethdev.c',
+        'gve_version.c',
 )
 includes += include_directories('base')
--

2.40.0.634.g4ca3ef3211-goog

#2 lore raw
Quoted 13 lines · Junfeng

Hi Ferruh,

Here is the summary of the dependency of related patches:

P1: necessary headers update

    https://patchwork.dpdk.org/project/dpdk/list/?series=27647&state=*
P2: minor update for base code
    https://patchwork.dpdk.org/project/dpdk/list/?series=27653&state=*
P3: gve PMD enhancement
    https://patchwork.dpdk.org/project/dpdk/list/?series=27687&state=*
P4: add new AdminQ cmd to verify drv cap
    https://patchwork.dpdk.org/project/dpdk/list/?series=27703&state=*
Quoted 3 lines

The merging order could be: P1 > P2 > P3 > P4, due to the dependency. Just to inform you about this here. Thanks for the review!

Thanks Junfeng, this is useful.

Btw, we have a defined syntax for this [1], having it in commit log may help automated CI to parse it and apply in correct order (when it is fully supported in CI :) )

[1]
https://doc.dpdk.org/guides/contributing/patches.html#patch-dependencies

Depends-on: series-NNNNN ("Title of the series")
or
Depends-on: patch-NNNNN ("Title of the patch")

And I just recognized that syntax is not clear for multiple dependency case, we should define it better.

#3 lore raw
Quoted 43 lines

-----Original Message-----
From: Ferruh Yigit <[email protected]>
Sent: Friday, April 14, 2023 23:40
To: Guo, Junfeng <[email protected]>; Rushil Gupta <[email protected]>; Zhang, Qi Z <[email protected]>; Wu, Jingjing <[email protected]>
Cc: [email protected]; [email protected]; Jeroen de Borst <[email protected]>; Aaron Conole <[email protected]>; dpdklab <[email protected]>
Subject: Re: [PATCH] net/gve: Check whether the driver is compatible with the device presented.

Quoted 13 lines · Junfeng

Hi Ferruh,

Here is the summary of the dependency of related patches:

P1: necessary headers update

    https://patchwork.dpdk.org/project/dpdk/list/?series=27647&state=*
P2: minor update for base code
    https://patchwork.dpdk.org/project/dpdk/list/?series=27653&state=*
P3: gve PMD enhancement
    https://patchwork.dpdk.org/project/dpdk/list/?series=27687&state=*
P4: add new AdminQ cmd to verify drv cap
    https://patchwork.dpdk.org/project/dpdk/list/?series=27703&state=*
Quoted 3 lines

The merging order could be: P1 > P2 > P3 > P4, due to the dependency. Just to inform you about this here. Thanks for the review!

Thanks Junfeng, this is useful.

Btw, we have a defined syntax for this [1], having it in commit log may help automated CI to parse it and apply in correct order (when it is fully supported in CI :) )

[1]
https://doc.dpdk.org/guides/contributing/patches.html#patch-
dependencies

Quoted 6 lines

Depends-on: series-NNNNN ("Title of the series")
or
Depends-on: patch-NNNNN ("Title of the patch")

And I just recognized that syntax is not clear for multiple dependency case, we should define it better.

Sure, we will try this in the coming version patches.

Really a good solution for the patch dependencies! Thanks for the enhancement!

#4 lore raw

PATCH 1/1 net/gve: Check whether the driver is compatible with the device presented.

In reply to Rushil Gupta

Change gve_driver_info fields to report DPDK as OS type and DPDK RTE version as OS version, reserving driver_version fields for GVE driver version based on features.

Depends-on: series-27687

---
 drivers/net/gve/base/gve.h        |  3 --
 drivers/net/gve/base/gve_adminq.c | 19 +++++++++
 drivers/net/gve/base/gve_adminq.h | 49 ++++++++++++++++++++++-
 drivers/net/gve/base/gve_osdep.h  | 36 +++++++++++++++++
 drivers/net/gve/gve_ethdev.c      | 65 +++++++++++++++++++++++++------
 drivers/net/gve/gve_ethdev.h      |  2 +-
 drivers/net/gve/gve_version.c     | 14 +++++++
 drivers/net/gve/gve_version.h     | 25 ++++++++++++
 drivers/net/gve/meson.build       |  1 +
 9 files changed, 198 insertions(+), 16 deletions(-)
 create mode 100644 drivers/net/gve/gve_version.c
 create mode 100644 drivers/net/gve/gve_version.h
drivers/net/gve/base/gve.h +0 -3
index 2dc4507acb..89f9654a72 100644
@@ -8,9 +8,6 @@
 
 #include "gve_desc.h"
 
-#define GVE_VERSION		"1.3.0"
-#define GVE_VERSION_PREFIX	"GVE-"
-
 #ifndef GOOGLE_VENDOR_ID
 #define GOOGLE_VENDOR_ID	0x1ae0
 #endif
drivers/net/gve/base/gve_adminq.c +19 -0
index e745b709b2..2e5099a5b0 100644
@@ -401,6 +401,9 @@ static int gve_adminq_issue_cmd(struct gve_priv *priv,
 	case GVE_ADMINQ_GET_PTYPE_MAP:
 		priv->adminq_get_ptype_map_cnt++;
 		break;
+	case GVE_ADMINQ_VERIFY_DRIVER_COMPATIBILITY:
+		priv->adminq_verify_driver_compatibility_cnt++;
+		break;
 	default:
 		PMD_DRV_LOG(ERR, "unknown AQ command opcode %d", opcode);
 	}
@@ -465,6 +468,22 @@ int gve_adminq_configure_device_resources(struct gve_priv *priv,
 	return gve_adminq_execute_cmd(priv, &cmd);
 }
 
+int gve_adminq_verify_driver_compatibility(struct gve_priv *priv,
+					   u64 driver_info_len,
+					   dma_addr_t driver_info_addr)
+{
+	union gve_adminq_command cmd;
+
+	memset(&cmd, 0, sizeof(cmd));
+	cmd.opcode = cpu_to_be32(GVE_ADMINQ_VERIFY_DRIVER_COMPATIBILITY);
+	cmd.verify_driver_compatibility = (struct gve_adminq_verify_driver_compatibility) {
+		.driver_info_len = cpu_to_be64(driver_info_len),
+		.driver_info_addr = cpu_to_be64(driver_info_addr),
+	};
+
+	return gve_adminq_execute_cmd(priv, &cmd);
+}
+
 int gve_adminq_deconfigure_device_resources(struct gve_priv *priv)
 {
 	union gve_adminq_command cmd;
drivers/net/gve/base/gve_adminq.h +48 -1

76 lines not on this page · raw message

drivers/net/gve/base/gve_osdep.h +36 -0
index 7cb73002f4..a5efa8543e 100644
@@ -21,9 +21,14 @@
 #include <rte_malloc.h>
 #include <rte_memcpy.h>
 #include <rte_memzone.h>
+#include <rte_version.h>
 
 #include "../gve_logs.h"
 
+#ifdef __linux__
+#include <sys/utsname.h>
+#endif
+
 typedef uint8_t u8;
 typedef uint16_t u16;
 typedef uint32_t u32;
@@ -69,6 +74,12 @@ typedef rte_iova_t dma_addr_t;
 
 #define msleep(ms)		rte_delay_ms(ms)
 
+#define OS_VERSION_STRLEN 128
+struct os_version_string {
+	char os_version_str1[OS_VERSION_STRLEN];
+	char os_version_str2[OS_VERSION_STRLEN];
+};
+
 /* These macros are used to generate compilation errors if a struct/union
  * is not exactly the correct length. It gives a divide by zero error if
  * the struct/union is not of the correct size, otherwise it creates an
@@ -79,6 +90,12 @@ typedef rte_iova_t dma_addr_t;
 #define GVE_CHECK_UNION_LEN(n, X) enum gve_static_asset_enum_##X \
 	{ gve_static_assert_##X = (n) / ((sizeof(union X) == (n)) ? 1 : 0) }
 
+#ifndef LINUX_VERSION_MAJOR
+#define LINUX_VERSION_MAJOR (((LINUX_VERSION_CODE) >> 16) & 0xff)
+#define LINUX_VERSION_SUBLEVEL (((LINUX_VERSION_CODE) >> 8) & 0xff)
+#define LINUX_VERSION_PATCHLEVEL ((LINUX_VERSION_CODE) & 0xff)
+#endif
+
 static __rte_always_inline u8
 readb(volatile void *addr)
 {
@@ -156,4 +173,23 @@ gve_free_dma_mem(struct gve_dma_mem *mem)
 	mem->pa = 0;
 }
 
+static inline void
+populate_driver_version_strings(struct os_version_string *os_version_str)
+{
+#ifdef __linux__
+	struct utsname uts;
+	if (uname(&uts) >= 0) {
+		/* release */
+		rte_strscpy(os_version_str->os_version_str1, uts.release,
+			sizeof(os_version_str->os_version_str1));
+		/* version */
+		rte_strscpy(os_version_str->os_version_str2, uts.version,
+			sizeof(os_version_str->os_version_str2));
+	}
+#else
+	/* gVNIC is currently not supported on OS like FreeBSD */
+	RTE_SET_USED(os_version_str);
+#endif
+}
+
 #endif /* _GVE_OSDEP_H_ */
drivers/net/gve/gve_ethdev.c +54 -11

87 lines not on this page · raw message

drivers/net/gve/gve_ethdev.h +1 -1
index 42a02cf5d4..23ccff37d3 100644
@@ -222,7 +222,7 @@ struct gve_priv {
 	uint32_t adminq_report_stats_cnt;
 	uint32_t adminq_report_link_speed_cnt;
 	uint32_t adminq_get_ptype_map_cnt;
-
+	uint32_t adminq_verify_driver_compatibility_cnt;
 	volatile uint32_t state_flags;
 
 	/* Gvnic device link speed from hypervisor. */
drivers/net/gve/gve_version.c new file +14 -0
new file mode 100644
index 0000000000..7eaa689d90
@@ -0,0 +1,14 @@
+/* SPDX-License-Identifier: MIT
+ * Google Virtual Ethernet (gve) driver
+ * Copyright (C) 2015-2023 Google, Inc.
+ */
+#include "gve_version.h"
+
+const char *gve_version_string(void)
+{
+	static char gve_version[10];
+	snprintf(gve_version, sizeof(gve_version), "%s%d.%d.%d",
+		GVE_VERSION_PREFIX, GVE_VERSION_MAJOR, GVE_VERSION_MINOR,
+		GVE_VERSION_SUB);
+	return gve_version;
+}
drivers/net/gve/gve_version.h new file +25 -0
new file mode 100644
index 0000000000..9af6a00568
@@ -0,0 +1,25 @@
+/* SPDX-License-Identifier: MIT
+ * Google Virtual Ethernet (gve) driver
+ * Copyright (C) 2015-2023 Google, Inc.
+ */
+
+#ifndef _GVE_VERSION_H_
+#define _GVE_VERSION_H_
+
+#include <rte_version.h>
+
+#define GVE_VERSION_PREFIX "DPDK-"
+#define GVE_VERSION_MAJOR 1
+#define GVE_VERSION_MINOR 0
+#define GVE_VERSION_SUB 0
+
+#define DPDK_VERSION_MAJOR (100 * RTE_VER_YEAR + RTE_VER_MONTH)
+#define DPDK_VERSION_MINOR RTE_VER_MINOR
+#define DPDK_VERSION_SUB RTE_VER_RELEASE
+
+
+const char *
+gve_version_string(void);
+
+
+#endif /* GVE_VERSION_H */
drivers/net/gve/meson.build +1 -0
index af0010c01c..a37c4bafa2 100644
@@ -12,5 +12,6 @@ sources = files(
         'gve_rx.c',
         'gve_tx.c',
         'gve_ethdev.c',
+        'gve_version.c',
 )
 includes += include_directories('base')
Signature · 1 line
2.40.0.634.g4ca3ef3211-goog
#5 lore raw
Quoted 4 lines · Rushil Gupta

Change gve_driver_info fields to report DPDK as OS type and DPDK RTE version as OS version, reserving driver_version fields for GVE driver version based on features.

'./devtools/check-git-log.sh' is giving some warnings, can you please check them?

Contribution guide documentation may help to fix reported issues:
https://doc.dpdk.org/guides/contributing/patches.html#commit-messages-subject-line

Quoted 96 lines

Depends-on: series-27687

---
 drivers/net/gve/base/gve.h        |  3 --
 drivers/net/gve/base/gve_adminq.c | 19 +++++++++
 drivers/net/gve/base/gve_adminq.h | 49 ++++++++++++++++++++++-
 drivers/net/gve/base/gve_osdep.h  | 36 +++++++++++++++++
 drivers/net/gve/gve_ethdev.c      | 65 +++++++++++++++++++++++++------
 drivers/net/gve/gve_ethdev.h      |  2 +-
 drivers/net/gve/gve_version.c     | 14 +++++++
 drivers/net/gve/gve_version.h     | 25 ++++++++++++
 drivers/net/gve/meson.build       |  1 +
 9 files changed, 198 insertions(+), 16 deletions(-)
 create mode 100644 drivers/net/gve/gve_version.c
 create mode 100644 drivers/net/gve/gve_version.h
drivers/net/gve/base/gve.h +0 -3
index 2dc4507acb..89f9654a72 100644
@@ -8,9 +8,6 @@
 
 #include "gve_desc.h"
 
-#define GVE_VERSION		"1.3.0"
-#define GVE_VERSION_PREFIX	"GVE-"
-
 #ifndef GOOGLE_VENDOR_ID
 #define GOOGLE_VENDOR_ID	0x1ae0
 #endif
drivers/net/gve/base/gve_adminq.c +19 -0
index e745b709b2..2e5099a5b0 100644
@@ -401,6 +401,9 @@ static int gve_adminq_issue_cmd(struct gve_priv *priv,
 	case GVE_ADMINQ_GET_PTYPE_MAP:
 		priv->adminq_get_ptype_map_cnt++;
 		break;
+	case GVE_ADMINQ_VERIFY_DRIVER_COMPATIBILITY:
+		priv->adminq_verify_driver_compatibility_cnt++;
+		break;
 	default:
 		PMD_DRV_LOG(ERR, "unknown AQ command opcode %d", opcode);
 	}
@@ -465,6 +468,22 @@ int gve_adminq_configure_device_resources(struct gve_priv *priv,
 	return gve_adminq_execute_cmd(priv, &cmd);
 }
 
+int gve_adminq_verify_driver_compatibility(struct gve_priv *priv,
+					   u64 driver_info_len,
+					   dma_addr_t driver_info_addr)
+{
+	union gve_adminq_command cmd;
+
+	memset(&cmd, 0, sizeof(cmd));
+	cmd.opcode = cpu_to_be32(GVE_ADMINQ_VERIFY_DRIVER_COMPATIBILITY);
+	cmd.verify_driver_compatibility = (struct gve_adminq_verify_driver_compatibility) {
+		.driver_info_len = cpu_to_be64(driver_info_len),
+		.driver_info_addr = cpu_to_be64(driver_info_addr),
+	};
+
+	return gve_adminq_execute_cmd(priv, &cmd);
+}
+
 int gve_adminq_deconfigure_device_resources(struct gve_priv *priv)
 {
 	union gve_adminq_command cmd;
drivers/net/gve/base/gve_adminq.h +3 -1
index 05550119de..edac32f031 100644
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: MIT
  * Google Virtual Ethernet (gve) driver
- * Copyright (C) 2015-2022 Google, Inc.
+ * Copyright (C) 2015-2023 Google, Inc.
  */
 
 #ifndef _GVE_ADMINQ_H
@@ -23,6 +23,7 @@ enum gve_adminq_opcodes {
 	GVE_ADMINQ_REPORT_STATS			= 0xC,
 	GVE_ADMINQ_REPORT_LINK_SPEED		= 0xD,
 	GVE_ADMINQ_GET_PTYPE_MAP		= 0xE,
+	GVE_ADMINQ_VERIFY_DRIVER_COMPATIBILITY	= 0xF,
 };
 
 /* Admin queue status codes */
@@ -145,6 +146,47 @@ enum gve_sup_feature_mask {
 };
 
 #define GVE_DEV_OPT_LEN_GQI_RAW_ADDRESSING 0x0
+enum gve_driver_capbility {

drivers/net/gve/base/gve_adminq.h enum gve_sup_feature_mask { · line 159

Quoted 10 lines
drivers/net/gve/base/gve_adminq.h +10 -0
+	gve_driver_capability_gqi_qpl = 0,
+	gve_driver_capability_gqi_rda = 1,
+	gve_driver_capability_dqo_qpl = 2, /* reserved for future use */
+	gve_driver_capability_dqo_rda = 3,
+};
+
+#define GVE_CAP1(a) BIT((int)a)
+#define GVE_CAP2(a) BIT(((int)a) - 64)
+#define GVE_CAP3(a) BIT(((int)a) - 128)
+#define GVE_CAP3(a) BIT(((int)a) - 192)

GVE_CAP2, GVE_CAP3 & GVE_CAP4 seems not used, do we need to add them now? And I guess '(((int)a) - 64)' usage is to unset some bits, will it be better to '(a & ~(1 << 6))' ?

Quoted 20 lines
drivers/net/gve/base/gve_adminq.h +20 -0
+
+#define GVE_DRIVER_CAPABILITY_FLAGS1 \
+	(GVE_CAP1(gve_driver_capability_gqi_qpl) | \
+	 GVE_CAP1(gve_driver_capability_gqi_rda) | \
+	 GVE_CAP1(gve_driver_capability_dqo_rda))
+
+#define GVE_DRIVER_CAPABILITY_FLAGS2 0x0
+#define GVE_DRIVER_CAPABILITY_FLAGS3 0x0
+#define GVE_DRIVER_CAPABILITY_FLAGS4 0x0
+
+struct gve_driver_info {
+	u8 os_type;	/* 0x05 = DPDK */
+	u8 driver_major;
+	u8 driver_minor;
+	u8 driver_sub;
+	__be32 os_version_major;
+	__be32 os_version_minor;
+	__be32 os_version_sub;
+	__be64 driver_capability_flags[4];
+	u8 os_version_str1[OS_VERSION_STRLEN];

drivers/net/gve/base/gve_adminq.h enum gve_sup_feature_mask { · line 189

Quoted 10 lines
drivers/net/gve/base/gve_adminq.h +10 -0
+	u8 os_version_str2[OS_VERSION_STRLEN];
+};
+
+struct gve_adminq_verify_driver_compatibility {
+	__be64 driver_info_len;
+	__be64 driver_info_addr;
+};
+
+GVE_CHECK_STRUCT_LEN(16,  gve_adminq_verify_driver_compatibility);
+

It looks like we need a static assert helper for DPDK, I will try to send something.

Quoted 53 lines
drivers/net/gve/base/gve_adminq.h +5 -0
 struct gve_adminq_configure_device_resources {
 	__be64 counter_array;
@@ -345,6 +387,8 @@ union gve_adminq_command {
 			struct gve_adminq_report_stats report_stats;
 			struct gve_adminq_report_link_speed report_link_speed;
 			struct gve_adminq_get_ptype_map get_ptype_map;
+			struct gve_adminq_verify_driver_compatibility
+				verify_driver_compatibility;
 		};
 	};
 	u8 reserved[64];
@@ -378,4 +422,7 @@ struct gve_ptype_lut;
 int gve_adminq_get_ptype_map_dqo(struct gve_priv *priv,
 				 struct gve_ptype_lut *ptype_lut);
 
+int gve_adminq_verify_driver_compatibility(struct gve_priv *priv,
+					   u64 driver_info_len,
+					   dma_addr_t driver_info_addr);
 #endif /* _GVE_ADMINQ_H */
drivers/net/gve/base/gve_osdep.h +11 -0
index 7cb73002f4..a5efa8543e 100644
@@ -21,9 +21,14 @@
 #include <rte_malloc.h>
 #include <rte_memcpy.h>
 #include <rte_memzone.h>
+#include <rte_version.h>
 
 #include "../gve_logs.h"
 
+#ifdef __linux__
+#include <sys/utsname.h>
+#endif
+
 typedef uint8_t u8;
 typedef uint16_t u16;
 typedef uint32_t u32;
@@ -69,6 +74,12 @@ typedef rte_iova_t dma_addr_t;
 
 #define msleep(ms)		rte_delay_ms(ms)
 
+#define OS_VERSION_STRLEN 128
+struct os_version_string {
+	char os_version_str1[OS_VERSION_STRLEN];
+	char os_version_str2[OS_VERSION_STRLEN];
+};
+
 /* These macros are used to generate compilation errors if a struct/union
  * is not exactly the correct length. It gives a divide by zero error if
  * the struct/union is not of the correct size, otherwise it creates an

drivers/net/gve/base/gve_osdep.h typedef rte_iova_t dma_addr_t; · line 98

Quoted 9 lines
drivers/net/gve/base/gve_osdep.h +6 -0
@@ -79,6 +90,12 @@ typedef rte_iova_t dma_addr_t;
 #define GVE_CHECK_UNION_LEN(n, X) enum gve_static_asset_enum_##X \
 	{ gve_static_assert_##X = (n) / ((sizeof(union X) == (n)) ? 1 : 0) }
 
+#ifndef LINUX_VERSION_MAJOR
+#define LINUX_VERSION_MAJOR (((LINUX_VERSION_CODE) >> 16) & 0xff)
+#define LINUX_VERSION_SUBLEVEL (((LINUX_VERSION_CODE) >> 8) & 0xff)
+#define LINUX_VERSION_PATCHLEVEL ((LINUX_VERSION_CODE) & 0xff)
+#endif
+

Do we need Linux version macros in DPDK? They are not used at all.

Quoted 10 lines
drivers/net/gve/base/gve_osdep.h +3 -0
 static __rte_always_inline u8
 readb(volatile void *addr)
 {
@@ -156,4 +173,23 @@ gve_free_dma_mem(struct gve_dma_mem *mem)
 	mem->pa = 0;
 }
 
+static inline void
+populate_driver_version_strings(struct os_version_string *os_version_str)
+{

drivers/net/gve/base/gve_osdep.h gve_free_dma_mem(struct gve_dma_mem *mem) · line 188

Quoted 10 lines
drivers/net/gve/base/gve_osdep.h +10 -0
+#ifdef __linux__
+	struct utsname uts;
+	if (uname(&uts) >= 0) {
+		/* release */
+		rte_strscpy(os_version_str->os_version_str1, uts.release,
+			sizeof(os_version_str->os_version_str1));
+		/* version */
+		rte_strscpy(os_version_str->os_version_str2, uts.version,
+			sizeof(os_version_str->os_version_str2));
+	}

Since OS type is reported as DPDK, do we need underlying Linux release information to the FW?

If not we can remove #ifdef and 'uname()' to reduce platform specific code.

drivers/net/gve/base/gve_osdep.h gve_free_dma_mem(struct gve_dma_mem *mem) · line 190

Quoted 2 lines
drivers/net/gve/base/gve_osdep.h +2 -0
+#else
+	/* gVNIC is currently not supported on OS like FreeBSD */

meson file only disable for Windows, for FreeBSD driver is compiled. If driver is only supported on Linux, can you change the meson file to reflec this?

Quoted 35 lines
drivers/net/gve/base/gve_osdep.h +4 -0
+	RTE_SET_USED(os_version_str);
+#endif
+}
+
 #endif /* _GVE_OSDEP_H_ */
drivers/net/gve/gve_ethdev.c +3 -11
index cf28a4a3b7..1d6e134fff 100644
@@ -5,21 +5,13 @@
 #include "gve_ethdev.h"
 #include "base/gve_adminq.h"
 #include "base/gve_register.h"
-
-const char gve_version_str[] = GVE_VERSION;
-static const char gve_version_prefix[] = GVE_VERSION_PREFIX;
+#include "base/gve_osdep.h"
+#include "gve_version.h"
 
 static void
 gve_write_version(uint8_t *driver_version_register)
 {
-	const char *c = gve_version_prefix;
-
-	while (*c) {
-		writeb(*c, driver_version_register);
-		c++;
-	}
-
-	c = gve_version_str;
+	const char *c = gve_version_string();
 	while (*c) {
 		writeb(*c, driver_version_register);
 		c++;

drivers/net/gve/gve_ethdev.c gve_dev_close(struct rte_eth_dev *dev) · line 263

Quoted 7 lines
drivers/net/gve/gve_ethdev.c +4 -0
@@ -265,6 +257,52 @@ gve_dev_close(struct rte_eth_dev *dev)
 	return err;
 }
 
+static int
+gve_verify_driver_compatibility(struct gve_priv *priv)
+{
+	const struct rte_memzone *driver_info_bus;

What does '_bus' indicates in the variable name?

drivers/net/gve/gve_ethdev.c gve_dev_close(struct rte_eth_dev *dev) · line 270

Quoted 7 lines
drivers/net/gve/gve_ethdev.c +7 -0
+	struct gve_driver_info *driver_info;
+	int err;
+
+	driver_info_bus = rte_memzone_reserve_aligned("verify_driver_compatibility",
+						      sizeof(struct gve_driver_info),
+						      rte_socket_id(),
+						      RTE_MEMZONE_IOVA_CONTIG, PAGE_SIZE);

There is no benefit to use DPDK memory APIs for this usage, a 'malloc()' will do the work, and maybe better as compilers/static analyzers recognizes it more.

Quoted 14 lines
drivers/net/gve/gve_ethdev.c +14 -0
+	if (driver_info_bus == NULL) {
+		PMD_DRV_LOG(ERR,
+			    "Could not alloc memzone for driver compatibility");
+		return -ENOMEM;
+	}
+	driver_info = (struct gve_driver_info *)driver_info_bus->addr;
+	*driver_info = (struct gve_driver_info) {
+		.os_type = 5, /* DPDK */
+		.driver_major = GVE_VERSION_MAJOR,
+		.driver_minor = GVE_VERSION_MINOR,
+		.driver_sub = GVE_VERSION_SUB,
+		.os_version_major = cpu_to_be32(DPDK_VERSION_MAJOR),
+		.os_version_minor = cpu_to_be32(DPDK_VERSION_MINOR),
+		.os_version_sub = cpu_to_be32(DPDK_VERSION_SUB),

drivers/net/gve/gve_ethdev.c gve_dev_close(struct rte_eth_dev *dev) · line 294

Quoted 10 lines
drivers/net/gve/gve_ethdev.c +10 -0
+		.driver_capability_flags = {
+			cpu_to_be64(GVE_DRIVER_CAPABILITY_FLAGS1),
+			cpu_to_be64(GVE_DRIVER_CAPABILITY_FLAGS2),
+			cpu_to_be64(GVE_DRIVER_CAPABILITY_FLAGS3),
+			cpu_to_be64(GVE_DRIVER_CAPABILITY_FLAGS4),
+		},
+	};
+
+	populate_driver_version_strings((struct os_version_string *)&driver_info->os_version_str1);
+

If you pass two strings as parameter to 'populate_driver_version_strings()' can you get rid of interim type "struct os_version_string" and above casting?

drivers/net/gve/gve_ethdev.c gve_dev_close(struct rte_eth_dev *dev) · line 300

Quoted 6 lines
drivers/net/gve/gve_ethdev.c +6 -0
+	err = gve_adminq_verify_driver_compatibility(priv,
+		sizeof(struct gve_driver_info), (dma_addr_t)driver_info_bus);
+
+	/* It's ok if the device doesn't support this */
+	if (err == -EOPNOTSUPP)
+		err = 0;

Is this error saying DPDK version is not supported?
Where a change should go to be able to identify and verify DPDK platform in GVE? Does it require continious update as DPDK get updated?

Quoted 39 lines
drivers/net/gve/gve_ethdev.c +10 -0
+
+	rte_memzone_free(driver_info_bus);
+	return err;
+}
+
 static int
 gve_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
 {
@@ -672,6 +710,11 @@ gve_init_priv(struct gve_priv *priv, bool skip_describe_device)
 		PMD_DRV_LOG(ERR, "Failed to alloc admin queue: err=%d", err);
 		return err;
 	}
+	err = gve_verify_driver_compatibility(priv);
+	if (err) {
+		PMD_DRV_LOG(ERR, "Could not verify driver compatibility: err=%d", err);
+		goto free_adminq;
+	}
 
 	if (skip_describe_device)
 		goto setup_device;
drivers/net/gve/gve_ethdev.h +1 -1
index 42a02cf5d4..23ccff37d3 100644
@@ -222,7 +222,7 @@ struct gve_priv {
 	uint32_t adminq_report_stats_cnt;
 	uint32_t adminq_report_link_speed_cnt;
 	uint32_t adminq_get_ptype_map_cnt;
-
+	uint32_t adminq_verify_driver_compatibility_cnt;
 	volatile uint32_t state_flags;
 
 	/* Gvnic device link speed from hypervisor. */
drivers/net/gve/gve_version.c new file +0 -0
new file mode 100644
index 0000000000..7eaa689d90

drivers/net/gve/gve_version.c line 4

Quoted 4 lines
drivers/net/gve/gve_version.c new file +4 -0
@@ -0,0 +1,14 @@
+/* SPDX-License-Identifier: MIT
+ * Google Virtual Ethernet (gve) driver
+ * Copyright (C) 2015-2023 Google, Inc.
+ */

This is not base code, but DPDK layer, license should be BSD-3.

Quoted 16 lines
drivers/net/gve/gve_version.c new file +10 -0
+#include "gve_version.h"
+
+const char *gve_version_string(void)
+{
+	static char gve_version[10];
+	snprintf(gve_version, sizeof(gve_version), "%s%d.%d.%d",
+		GVE_VERSION_PREFIX, GVE_VERSION_MAJOR, GVE_VERSION_MINOR,
+		GVE_VERSION_SUB);
+	return gve_version;
+}
drivers/net/gve/gve_version.h new file +0 -0
new file mode 100644
index 0000000000..9af6a00568

drivers/net/gve/gve_version.h line 5

Quoted 5 lines
drivers/net/gve/gve_version.h new file +5 -0
@@ -0,0 +1,25 @@
+/* SPDX-License-Identifier: MIT
+ * Google Virtual Ethernet (gve) driver
+ * Copyright (C) 2015-2023 Google, Inc.
+ */
+

This is not base code, but DPDK layer, license should be BSD-3.

drivers/net/gve/gve_version.h line 15

Quoted 10 lines
drivers/net/gve/gve_version.h new file +10 -0
+#ifndef _GVE_VERSION_H_
+#define _GVE_VERSION_H_
+
+#include <rte_version.h>
+
+#define GVE_VERSION_PREFIX "DPDK-"
+#define GVE_VERSION_MAJOR 1
+#define GVE_VERSION_MINOR 0
+#define GVE_VERSION_SUB 0
+

Is this GVE base version, or DPDK gve version?
Previous version information was "GVE-1.3.0", now it is becoming "DPDK-1.0.0",
is this breaking the version link with GVE base version and creating a new versioning scheme for DPDK GVE driver?

Btw, documentation still has "v1.3.0. GVE base code", should it be updated as well?

drivers/net/gve/gve_version.h line 19

Quoted 4 lines
drivers/net/gve/gve_version.h new file +4 -0
+#define DPDK_VERSION_MAJOR (100 * RTE_VER_YEAR + RTE_VER_MONTH)
+#define DPDK_VERSION_MINOR RTE_VER_MINOR
+#define DPDK_VERSION_SUB RTE_VER_RELEASE
+

RTE_VER_RELEASE is 1 (-rc1), 2 (-rc2), etc... And if it is not release candidate it is always 99, so it may not be very usefull for the official releases and changes frequently for the development tree, are you sure to use this value?

Quoted 17 lines
drivers/net/gve/gve_version.h new file +6 -0
+
+const char *
+gve_version_string(void);
+
+
+#endif /* GVE_VERSION_H */
drivers/net/gve/meson.build +1 -0
index af0010c01c..a37c4bafa2 100644
@@ -12,5 +12,6 @@ sources = files(
         'gve_rx.c',
         'gve_tx.c',
         'gve_ethdev.c',
+        'gve_version.c',
 )
 includes += include_directories('base')
#6 lore raw

Thanks for reviewing Ferruh Yigit! I wanted to answer your queries before sending the next patch.

Please find answers below:

Quoted 7 lines · Ferruh Yigit
Quoted 4 lines · Rushil Gupta

Change gve_driver_info fields to report DPDK as OS type and DPDK RTE version as OS version, reserving driver_version fields for GVE driver version based on features.

Quoted 6 lines

'./devtools/check-git-log.sh' is giving some warnings, can you please check them?

Contribution guide documentation may help to fix reported issues:
https://doc.dpdk.org/guides/contributing/patches.html#commit-messages-subject-line

I did run ./devtools/checkpatches.sh but not ./devtools/check-git-log.sh. I will run both before sending the next patch.

Quoted 94 lines
Quoted 94 lines

Depends-on: series-27687

---
 drivers/net/gve/base/gve.h        |  3 --
 drivers/net/gve/base/gve_adminq.c | 19 +++++++++
 drivers/net/gve/base/gve_adminq.h | 49 ++++++++++++++++++++++-
 drivers/net/gve/base/gve_osdep.h  | 36 +++++++++++++++++
 drivers/net/gve/gve_ethdev.c      | 65 +++++++++++++++++++++++++------
 drivers/net/gve/gve_ethdev.h      |  2 +-
 drivers/net/gve/gve_version.c     | 14 +++++++
 drivers/net/gve/gve_version.h     | 25 ++++++++++++
 drivers/net/gve/meson.build       |  1 +
 9 files changed, 198 insertions(+), 16 deletions(-)
 create mode 100644 drivers/net/gve/gve_version.c
 create mode 100644 drivers/net/gve/gve_version.h
drivers/net/gve/base/gve.h +0 -3
index 2dc4507acb..89f9654a72 100644
@@ -8,9 +8,6 @@
 
 #include "gve_desc.h"
 
-#define GVE_VERSION          "1.3.0"
-#define GVE_VERSION_PREFIX   "GVE-"
-
 #ifndef GOOGLE_VENDOR_ID
 #define GOOGLE_VENDOR_ID     0x1ae0
 #endif
drivers/net/gve/base/gve_adminq.c +19 -0
index e745b709b2..2e5099a5b0 100644
@@ -401,6 +401,9 @@ static int gve_adminq_issue_cmd(struct gve_priv *priv,
      case GVE_ADMINQ_GET_PTYPE_MAP:
              priv->adminq_get_ptype_map_cnt++;
              break;
+     case GVE_ADMINQ_VERIFY_DRIVER_COMPATIBILITY:
+             priv->adminq_verify_driver_compatibility_cnt++;
+             break;
      default:
              PMD_DRV_LOG(ERR, "unknown AQ command opcode %d", opcode);
      }
@@ -465,6 +468,22 @@ int gve_adminq_configure_device_resources(struct gve_priv *priv,
      return gve_adminq_execute_cmd(priv, &cmd);
 }
 
+int gve_adminq_verify_driver_compatibility(struct gve_priv *priv,
+                                        u64 driver_info_len,
+                                        dma_addr_t driver_info_addr)
+{
+     union gve_adminq_command cmd;
+
+     memset(&cmd, 0, sizeof(cmd));
+     cmd.opcode = cpu_to_be32(GVE_ADMINQ_VERIFY_DRIVER_COMPATIBILITY);
+     cmd.verify_driver_compatibility = (struct gve_adminq_verify_driver_compatibility) {
+             .driver_info_len = cpu_to_be64(driver_info_len),
+             .driver_info_addr = cpu_to_be64(driver_info_addr),
+     };
+
+     return gve_adminq_execute_cmd(priv, &cmd);
+}
+
 int gve_adminq_deconfigure_device_resources(struct gve_priv *priv)
 {
      union gve_adminq_command cmd;
drivers/net/gve/base/gve_adminq.h +2 -1
index 05550119de..edac32f031 100644
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: MIT
  * Google Virtual Ethernet (gve) driver
- * Copyright (C) 2015-2022 Google, Inc.
+ * Copyright (C) 2015-2023 Google, Inc.
  */
 
 #ifndef _GVE_ADMINQ_H
@@ -23,6 +23,7 @@ enum gve_adminq_opcodes {
      GVE_ADMINQ_REPORT_STATS                 = 0xC,
      GVE_ADMINQ_REPORT_LINK_SPEED            = 0xD,
      GVE_ADMINQ_GET_PTYPE_MAP                = 0xE,
+     GVE_ADMINQ_VERIFY_DRIVER_COMPATIBILITY  = 0xF,
 };
 
 /* Admin queue status codes */
@@ -145,6 +146,47 @@ enum gve_sup_feature_mask {
 };
 
Quoted 16 lines

drivers/net/gve/base/gve_adminq.h enum gve_sup_feature_mask {

Quoted 12 lines
drivers/net/gve/base/gve_adminq.h +11 -0
 #define GVE_DEV_OPT_LEN_GQI_RAW_ADDRESSING 0x0
+enum gve_driver_capbility {
+     gve_driver_capability_gqi_qpl = 0,
+     gve_driver_capability_gqi_rda = 1,
+     gve_driver_capability_dqo_qpl = 2, /* reserved for future use */
+     gve_driver_capability_dqo_rda = 3,
+};
+
+#define GVE_CAP1(a) BIT((int)a)
+#define GVE_CAP2(a) BIT(((int)a) - 64)
+#define GVE_CAP3(a) BIT(((int)a) - 128)
+#define GVE_CAP3(a) BIT(((int)a) - 192)

GVE_CAP2, GVE_CAP3 & GVE_CAP4 seems not used, do we need to add them now? And I guess '(((int)a) - 64)' usage is to unset some bits, will it be better to '(a & ~(1 << 6))' ?

Sure; I will remove GVE_CAP2, GVE_CAP3 & GVE_CAP4.

Quoted 91 lines
Quoted 21 lines
drivers/net/gve/base/gve_adminq.h +20 -0
+
+#define GVE_DRIVER_CAPABILITY_FLAGS1 \
+     (GVE_CAP1(gve_driver_capability_gqi_qpl) | \
+      GVE_CAP1(gve_driver_capability_gqi_rda) | \
+      GVE_CAP1(gve_driver_capability_dqo_rda))
+
+#define GVE_DRIVER_CAPABILITY_FLAGS2 0x0
+#define GVE_DRIVER_CAPABILITY_FLAGS3 0x0
+#define GVE_DRIVER_CAPABILITY_FLAGS4 0x0
+
+struct gve_driver_info {
+     u8 os_type;     /* 0x05 = DPDK */
+     u8 driver_major;
+     u8 driver_minor;
+     u8 driver_sub;
+     __be32 os_version_major;
+     __be32 os_version_minor;
+     __be32 os_version_sub;
+     __be64 driver_capability_flags[4];
+     u8 os_version_str1[OS_VERSION_STRLEN];

drivers/net/gve/base/gve_adminq.h enum gve_sup_feature_mask { · line 189

Quoted 10 lines
drivers/net/gve/base/gve_adminq.h +10 -0
+     u8 os_version_str2[OS_VERSION_STRLEN];
+};
+
+struct gve_adminq_verify_driver_compatibility {
+     __be64 driver_info_len;
+     __be64 driver_info_addr;
+};
+
+GVE_CHECK_STRUCT_LEN(16,  gve_adminq_verify_driver_compatibility);
+

It looks like we need a static assert helper for DPDK, I will try to send something.

Quoted 56 lines
drivers/net/gve/base/gve_adminq.h +5 -0
 struct gve_adminq_configure_device_resources {
      __be64 counter_array;
@@ -345,6 +387,8 @@ union gve_adminq_command {
                      struct gve_adminq_report_stats report_stats;
                      struct gve_adminq_report_link_speed report_link_speed;
                      struct gve_adminq_get_ptype_map get_ptype_map;
+                     struct gve_adminq_verify_driver_compatibility
+                             verify_driver_compatibility;
              };
      };
      u8 reserved[64];
@@ -378,4 +422,7 @@ struct gve_ptype_lut;
 int gve_adminq_get_ptype_map_dqo(struct gve_priv *priv,
                               struct gve_ptype_lut *ptype_lut);
 
+int gve_adminq_verify_driver_compatibility(struct gve_priv *priv,
+                                        u64 driver_info_len,
+                                        dma_addr_t driver_info_addr);
 #endif /* _GVE_ADMINQ_H */
drivers/net/gve/base/gve_osdep.h +11 -0
index 7cb73002f4..a5efa8543e 100644
@@ -21,9 +21,14 @@
 #include <rte_malloc.h>
 #include <rte_memcpy.h>
 #include <rte_memzone.h>
+#include <rte_version.h>
 
 #include "../gve_logs.h"
 
+#ifdef __linux__
+#include <sys/utsname.h>
+#endif
+
 typedef uint8_t u8;
 typedef uint16_t u16;
 typedef uint32_t u32;
@@ -69,6 +74,12 @@ typedef rte_iova_t dma_addr_t;
 
 #define msleep(ms)           rte_delay_ms(ms)
 
+#define OS_VERSION_STRLEN 128
+struct os_version_string {
+     char os_version_str1[OS_VERSION_STRLEN];
+     char os_version_str2[OS_VERSION_STRLEN];
+};
+
 /* These macros are used to generate compilation errors if a struct/union
  * is not exactly the correct length. It gives a divide by zero error if
  * the struct/union is not of the correct size, otherwise it creates an
@@ -79,6 +90,12 @@ typedef rte_iova_t dma_addr_t;
 #define GVE_CHECK_UNION_LEN(n, X) enum gve_static_asset_enum_##X \
      { gve_static_assert_##X = (n) / ((sizeof(union X) == (n)) ? 1 : 0) }
 
Quoted 8 lines

drivers/net/gve/base/gve_osdep.h typedef rte_iova_t dma_addr_t; · line 98

Quoted 6 lines
drivers/net/gve/base/gve_osdep.h +6 -0
+#ifndef LINUX_VERSION_MAJOR
+#define LINUX_VERSION_MAJOR (((LINUX_VERSION_CODE) >> 16) & 0xff)
+#define LINUX_VERSION_SUBLEVEL (((LINUX_VERSION_CODE) >> 8) & 0xff)
+#define LINUX_VERSION_PATCHLEVEL ((LINUX_VERSION_CODE) & 0xff)
+#endif
+

Do we need Linux version macros in DPDK? They are not used at all.

You are right. Will remove.

Quoted 25 lines
Quoted 11 lines
drivers/net/gve/base/gve_osdep.h +3 -0
 static __rte_always_inline u8
 readb(volatile void *addr)
 {
@@ -156,4 +173,23 @@ gve_free_dma_mem(struct gve_dma_mem *mem)
      mem->pa = 0;
 }
 
+static inline void
+populate_driver_version_strings(struct os_version_string *os_version_str)
+{

drivers/net/gve/base/gve_osdep.h gve_free_dma_mem(struct gve_dma_mem *mem) · line 188

Quoted 10 lines
drivers/net/gve/base/gve_osdep.h +10 -0
+#ifdef __linux__
+     struct utsname uts;
+     if (uname(&uts) >= 0) {
+             /* release */
+             rte_strscpy(os_version_str->os_version_str1, uts.release,
+                     sizeof(os_version_str->os_version_str1));
+             /* version */
+             rte_strscpy(os_version_str->os_version_str2, uts.version,
+                     sizeof(os_version_str->os_version_str2));
+     }

Since OS type is reported as DPDK, do we need underlying Linux release information to the FW?

Quoted 1 line

If not we can remove #ifdef and 'uname()' to reduce platform specific code.

Yes it is a GCE business requirement (to look at DPDK usage by linux kernel version).

Quoted 8 lines

drivers/net/gve/base/gve_osdep.h gve_free_dma_mem(struct gve_dma_mem *mem) · line 190

Quoted 3 lines
drivers/net/gve/base/gve_osdep.h +2 -0
+#else
+     /* gVNIC is currently not supported on OS like FreeBSD */

meson file only disable for Windows, for FreeBSD driver is compiled. If driver is only supported on Linux, can you change the meson file to reflec this?

Ok will do.

Quoted 38 lines
Quoted 38 lines
drivers/net/gve/base/gve_osdep.h +4 -0
+     RTE_SET_USED(os_version_str);
+#endif
+}
+
 #endif /* _GVE_OSDEP_H_ */
drivers/net/gve/gve_ethdev.c +3 -11
index cf28a4a3b7..1d6e134fff 100644
@@ -5,21 +5,13 @@
 #include "gve_ethdev.h"
 #include "base/gve_adminq.h"
 #include "base/gve_register.h"
-
-const char gve_version_str[] = GVE_VERSION;
-static const char gve_version_prefix[] = GVE_VERSION_PREFIX;
+#include "base/gve_osdep.h"
+#include "gve_version.h"
 
 static void
 gve_write_version(uint8_t *driver_version_register)
 {
-     const char *c = gve_version_prefix;
-
-     while (*c) {
-             writeb(*c, driver_version_register);
-             c++;
-     }
-
-     c = gve_version_str;
+     const char *c = gve_version_string();
      while (*c) {
              writeb(*c, driver_version_register);
              c++;
@@ -265,6 +257,52 @@ gve_dev_close(struct rte_eth_dev *dev)
      return err;
 }
 
Quoted 6 lines

drivers/net/gve/gve_ethdev.c gve_dev_close(struct rte_eth_dev *dev) · line 263

Quoted 4 lines
drivers/net/gve/gve_ethdev.c +4 -0
+static int
+gve_verify_driver_compatibility(struct gve_priv *priv)
+{
+     const struct rte_memzone *driver_info_bus;

What does '_bus' indicates in the variable name?

This seems like a typo. Will correct.

Quoted 9 lines

drivers/net/gve/gve_ethdev.c gve_dev_close(struct rte_eth_dev *dev) · line 270

Quoted 8 lines
drivers/net/gve/gve_ethdev.c +7 -0
+     struct gve_driver_info *driver_info;
+     int err;
+
+     driver_info_bus = rte_memzone_reserve_aligned("verify_driver_compatibility",
+                                                   sizeof(struct gve_driver_info),
+                                                   rte_socket_id(),
+                                                   RTE_MEMZONE_IOVA_CONTIG, PAGE_SIZE);
Quoted 3 lines

There is no benefit to use DPDK memory APIs for this usage, a 'malloc()' will do the work, and maybe better as compilers/static analyzers recognizes it more.

Makes sense.

Quoted 21 lines
Quoted 21 lines
drivers/net/gve/gve_ethdev.c +20 -0
+     if (driver_info_bus == NULL) {
+             PMD_DRV_LOG(ERR,
+                         "Could not alloc memzone for driver compatibility");
+             return -ENOMEM;
+     }
+     driver_info = (struct gve_driver_info *)driver_info_bus->addr;
+     *driver_info = (struct gve_driver_info) {
+             .os_type = 5, /* DPDK */
+             .driver_major = GVE_VERSION_MAJOR,
+             .driver_minor = GVE_VERSION_MINOR,
+             .driver_sub = GVE_VERSION_SUB,
+             .os_version_major = cpu_to_be32(DPDK_VERSION_MAJOR),
+             .os_version_minor = cpu_to_be32(DPDK_VERSION_MINOR),
+             .os_version_sub = cpu_to_be32(DPDK_VERSION_SUB),
+             .driver_capability_flags = {
+                     cpu_to_be64(GVE_DRIVER_CAPABILITY_FLAGS1),
+                     cpu_to_be64(GVE_DRIVER_CAPABILITY_FLAGS2),
+                     cpu_to_be64(GVE_DRIVER_CAPABILITY_FLAGS3),
+                     cpu_to_be64(GVE_DRIVER_CAPABILITY_FLAGS4),
+             },
Quoted 8 lines

drivers/net/gve/gve_ethdev.c gve_dev_close(struct rte_eth_dev *dev) · line 294

Quoted 4 lines
drivers/net/gve/gve_ethdev.c +4 -0
+     };
+
+     populate_driver_version_strings((struct os_version_string *)&driver_info->os_version_str1);
+

If you pass two strings as parameter to 'populate_driver_version_strings()' can you get rid of interim type "struct os_version_string" and above casting?

Ok.

Quoted 8 lines

drivers/net/gve/gve_ethdev.c gve_dev_close(struct rte_eth_dev *dev) · line 300

Quoted 7 lines
drivers/net/gve/gve_ethdev.c +6 -0
+     err = gve_adminq_verify_driver_compatibility(priv,
+             sizeof(struct gve_driver_info), (dma_addr_t)driver_info_bus);
+
+     /* It's ok if the device doesn't support this */
+     if (err == -EOPNOTSUPP)
+             err = 0;
Quoted 4 lines

Is this error saying DPDK version is not supported?
Where a change should go to be able to identify and verify DPDK platform in GVE? Does it require continious update as DPDK get updated?

This means vNIC doesn't support verify and log adminq information (because of older hypervisor).
Does it require continuous update : No. This is to make sure we return proper error code for older vNIC.

Quoted 32 lines
Quoted 32 lines
drivers/net/gve/gve_ethdev.c +10 -0
+
+     rte_memzone_free(driver_info_bus);
+     return err;
+}
+
 static int
 gve_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
 {
@@ -672,6 +710,11 @@ gve_init_priv(struct gve_priv *priv, bool skip_describe_device)
              PMD_DRV_LOG(ERR, "Failed to alloc admin queue: err=%d", err);
              return err;
      }
+     err = gve_verify_driver_compatibility(priv);
+     if (err) {
+             PMD_DRV_LOG(ERR, "Could not verify driver compatibility: err=%d", err);
+             goto free_adminq;
+     }
 
      if (skip_describe_device)
              goto setup_device;
drivers/net/gve/gve_ethdev.h +1 -1
index 42a02cf5d4..23ccff37d3 100644
@@ -222,7 +222,7 @@ struct gve_priv {
      uint32_t adminq_report_stats_cnt;
      uint32_t adminq_report_link_speed_cnt;
      uint32_t adminq_get_ptype_map_cnt;
-
+     uint32_t adminq_verify_driver_compatibility_cnt;
      volatile uint32_t state_flags;
 
Quoted 14 lines

drivers/net/gve/gve_version.c line 4

Quoted 11 lines
drivers/net/gve/gve_ethdev.h +0 -0
      /* Gvnic device link speed from hypervisor. */
drivers/net/gve/gve_version.c new file +4 -0
new file mode 100644
index 0000000000..7eaa689d90
@@ -0,0 +1,14 @@
+/* SPDX-License-Identifier: MIT
+ * Google Virtual Ethernet (gve) driver
+ * Copyright (C) 2015-2023 Google, Inc.
+ */

This is not base code, but DPDK layer, license should be BSD-3.

Ok

Quoted 15 lines
Quoted 15 lines
drivers/net/gve/gve_version.c new file +10 -0
+#include "gve_version.h"
+
+const char *gve_version_string(void)
+{
+     static char gve_version[10];
+     snprintf(gve_version, sizeof(gve_version), "%s%d.%d.%d",
+             GVE_VERSION_PREFIX, GVE_VERSION_MAJOR, GVE_VERSION_MINOR,
+             GVE_VERSION_SUB);
+     return gve_version;
+}
drivers/net/gve/gve_version.h new file +0 -0
new file mode 100644
index 0000000000..9af6a00568
Quoted 9 lines

drivers/net/gve/gve_version.h line 5

Quoted 6 lines
drivers/net/gve/gve_version.h new file +5 -0
@@ -0,0 +1,25 @@
+/* SPDX-License-Identifier: MIT
+ * Google Virtual Ethernet (gve) driver
+ * Copyright (C) 2015-2023 Google, Inc.
+ */
+

This is not base code, but DPDK layer, license should be BSD-3.

Ok

Quoted 17 lines

drivers/net/gve/gve_version.h line 15

Quoted 10 lines
drivers/net/gve/gve_version.h new file +10 -0
+#ifndef _GVE_VERSION_H_
+#define _GVE_VERSION_H_
+
+#include <rte_version.h>
+
+#define GVE_VERSION_PREFIX "DPDK-"
+#define GVE_VERSION_MAJOR 1
+#define GVE_VERSION_MINOR 0
+#define GVE_VERSION_SUB 0
+

Is this GVE base version, or DPDK gve version?
Previous version information was "GVE-1.3.0", now it is becoming "DPDK-1.0.0",
is this breaking the version link with GVE base version and creating a new versioning scheme for DPDK GVE driver?

Quoted 3 lines

Btw, documentation still has "v1.3.0. GVE base code", should it be updated as well?

DPDK-1.0.0 is the DPDK driver version. GVE driver versioning only applies for linux kernel Gvnic driver.
Similarly Windows Gvnic driver has different versioning system.

Quoted 11 lines

drivers/net/gve/gve_version.h line 19

Quoted 5 lines
drivers/net/gve/gve_version.h new file +4 -0
+#define DPDK_VERSION_MAJOR (100 * RTE_VER_YEAR + RTE_VER_MONTH)
+#define DPDK_VERSION_MINOR RTE_VER_MINOR
+#define DPDK_VERSION_SUB RTE_VER_RELEASE
+

RTE_VER_RELEASE is 1 (-rc1), 2 (-rc2), etc... And if it is not release candidate it is always 99, so it may not be very usefull for the official releases and changes frequently for the development tree, are you sure to use this value?

It is ok for our usecase.

Quoted 19 lines
Quoted 18 lines
drivers/net/gve/gve_version.h new file +6 -0
+
+const char *
+gve_version_string(void);
+
+
+#endif /* GVE_VERSION_H */
drivers/net/gve/meson.build +1 -0
index af0010c01c..a37c4bafa2 100644
@@ -12,5 +12,6 @@ sources = files(
         'gve_rx.c',
         'gve_tx.c',
         'gve_ethdev.c',
+        'gve_version.c',
 )
 includes += include_directories('base')
#7 lore raw
Quoted 16 lines · Rushil Gupta
Quoted 16 lines

drivers/net/gve/gve_version.h line 15

Quoted 10 lines
drivers/net/gve/gve_version.h new file +10 -0
+#ifndef _GVE_VERSION_H_
+#define _GVE_VERSION_H_
+
+#include <rte_version.h>
+
+#define GVE_VERSION_PREFIX "DPDK-"
+#define GVE_VERSION_MAJOR 1
+#define GVE_VERSION_MINOR 0
+#define GVE_VERSION_SUB 0
+

Is this GVE base version, or DPDK gve version?
Previous version information was "GVE-1.3.0", now it is becoming "DPDK-1.0.0",
is this breaking the version link with GVE base version and creating a new versioning scheme for DPDK GVE driver?

Quoted 6 lines
Quoted 3 lines

Btw, documentation still has "v1.3.0. GVE base code", should it be updated as well?

DPDK-1.0.0 is the DPDK driver version. GVE driver versioning only applies for linux kernel Gvnic driver.
Similarly Windows Gvnic driver has different versioning system.

So creating a new versioning scheme for DPDK driver, I guess that is OK. Since there is a new version, is it clear how to manage the versioning, like when to update major version and when to update minor etc? If so can you please document this?

And base code is still coming from the Linux kernel driver, I wonder if a mapping between versions of these two is required.
As mentioned "v1.3.0" is still in the documentation, what happens if base code updated and some relevant update is required in the dpdk driver code? How to record/manage this?
Some drivers records the base code version in a readme file in the base folder, maybe same can be done.

#8 lore raw

Sounds good. I will document the versioning in a separate patch. For now, the DPDK driver with DQO changes is reported as 1.0.0.

I think there is some confusion here. The base code is not coming from the linux kernel driver.
Linux kernel driver is in a different repository and it has nothing to do with the dpdk driver version. Ideally, we'd want the base code of both drivers to be the same but there are several higher priority projects that are taking precedence.

Btw I have addressed your comments:
http://patchwork.dpdk.org/project/dpdk/patch/[email protected]/

Quoted 38 lines · Ferruh Yigit
Quoted 16 lines · Rushil Gupta
Quoted 16 lines

drivers/net/gve/gve_version.h line 15

Quoted 10 lines
drivers/net/gve/gve_version.h new file +10 -0
+#ifndef _GVE_VERSION_H_
+#define _GVE_VERSION_H_
+
+#include <rte_version.h>
+
+#define GVE_VERSION_PREFIX "DPDK-"
+#define GVE_VERSION_MAJOR 1
+#define GVE_VERSION_MINOR 0
+#define GVE_VERSION_SUB 0
+

Is this GVE base version, or DPDK gve version?
Previous version information was "GVE-1.3.0", now it is becoming "DPDK-1.0.0",
is this breaking the version link with GVE base version and creating a new versioning scheme for DPDK GVE driver?

Quoted 6 lines
Quoted 3 lines

Btw, documentation still has "v1.3.0. GVE base code", should it be updated as well?

DPDK-1.0.0 is the DPDK driver version. GVE driver versioning only applies for linux kernel Gvnic driver.
Similarly Windows Gvnic driver has different versioning system.

So creating a new versioning scheme for DPDK driver, I guess that is OK. Since there is a new version, is it clear how to manage the versioning, like when to update major version and when to update minor etc? If so can you please document this?

And base code is still coming from the Linux kernel driver, I wonder if a mapping between versions of these two is required.
As mentioned "v1.3.0" is still in the documentation, what happens if base code updated and some relevant update is required in the dpdk driver code? How to record/manage this?
Some drivers records the base code version in a readme file in the base folder, maybe same can be done.

#9 lore raw

PATCH v2 1/1 net/gve: check driver compatibility

In reply to Rushil Gupta

Change gve_driver_info fields to report DPDK as OS type and DPDK RTE version as OS version, reserving driver_version fields for GVE driver version based on features.

---
 drivers/net/gve/base/gve.h        |  3 --
 drivers/net/gve/base/gve_adminq.c | 19 ++++++++++
 drivers/net/gve/base/gve_adminq.h | 46 ++++++++++++++++++++++-
 drivers/net/gve/base/gve_osdep.h  | 24 ++++++++++++
 drivers/net/gve/gve_ethdev.c      | 61 +++++++++++++++++++++++++------
 drivers/net/gve/gve_ethdev.h      |  2 +-
 drivers/net/gve/gve_version.c     | 14 +++++++
 drivers/net/gve/gve_version.h     | 25 +++++++++++++
 drivers/net/gve/meson.build       |  7 ++++
 9 files changed, 185 insertions(+), 16 deletions(-)
 create mode 100644 drivers/net/gve/gve_version.c
 create mode 100644 drivers/net/gve/gve_version.h
drivers/net/gve/base/gve.h +0 -3
index 2dc4507acb..89f9654a72 100644
@@ -8,9 +8,6 @@
 
 #include "gve_desc.h"
 
-#define GVE_VERSION		"1.3.0"
-#define GVE_VERSION_PREFIX	"GVE-"
-
 #ifndef GOOGLE_VENDOR_ID
 #define GOOGLE_VENDOR_ID	0x1ae0
 #endif
drivers/net/gve/base/gve_adminq.c +19 -0
index e745b709b2..2e5099a5b0 100644
@@ -401,6 +401,9 @@ static int gve_adminq_issue_cmd(struct gve_priv *priv,
 	case GVE_ADMINQ_GET_PTYPE_MAP:
 		priv->adminq_get_ptype_map_cnt++;
 		break;
+	case GVE_ADMINQ_VERIFY_DRIVER_COMPATIBILITY:
+		priv->adminq_verify_driver_compatibility_cnt++;
+		break;
 	default:
 		PMD_DRV_LOG(ERR, "unknown AQ command opcode %d", opcode);
 	}
@@ -465,6 +468,22 @@ int gve_adminq_configure_device_resources(struct gve_priv *priv,
 	return gve_adminq_execute_cmd(priv, &cmd);
 }
 
+int gve_adminq_verify_driver_compatibility(struct gve_priv *priv,
+					   u64 driver_info_len,
+					   dma_addr_t driver_info_addr)
+{
+	union gve_adminq_command cmd;
+
+	memset(&cmd, 0, sizeof(cmd));
+	cmd.opcode = cpu_to_be32(GVE_ADMINQ_VERIFY_DRIVER_COMPATIBILITY);
+	cmd.verify_driver_compatibility = (struct gve_adminq_verify_driver_compatibility) {
+		.driver_info_len = cpu_to_be64(driver_info_len),
+		.driver_info_addr = cpu_to_be64(driver_info_addr),
+	};
+
+	return gve_adminq_execute_cmd(priv, &cmd);
+}
+
 int gve_adminq_deconfigure_device_resources(struct gve_priv *priv)
 {
 	union gve_adminq_command cmd;
drivers/net/gve/base/gve_adminq.h +45 -1

73 lines not on this page · raw message

drivers/net/gve/base/gve_osdep.h +24 -0
index 7cb73002f4..43081ec2a9 100644
@@ -21,9 +21,14 @@
 #include <rte_malloc.h>
 #include <rte_memcpy.h>
 #include <rte_memzone.h>
+#include <rte_version.h>
 
 #include "../gve_logs.h"
 
+#ifdef __linux__
+#include <sys/utsname.h>
+#endif
+
 typedef uint8_t u8;
 typedef uint16_t u16;
 typedef uint32_t u32;
@@ -69,6 +74,12 @@ typedef rte_iova_t dma_addr_t;
 
 #define msleep(ms)		rte_delay_ms(ms)
 
+#define OS_VERSION_STRLEN 128
+struct os_version_string {
+	char os_version_str1[OS_VERSION_STRLEN];
+	char os_version_str2[OS_VERSION_STRLEN];
+};
+
 /* These macros are used to generate compilation errors if a struct/union
  * is not exactly the correct length. It gives a divide by zero error if
  * the struct/union is not of the correct size, otherwise it creates an
@@ -156,4 +167,17 @@ gve_free_dma_mem(struct gve_dma_mem *mem)
 	mem->pa = 0;
 }
 
+static inline void
+populate_driver_version_strings(char *str1, char *str2)
+{
+	struct utsname uts;
+	if (uname(&uts) >= 0) {
+		/* release */
+		rte_strscpy(str1, uts.release,
+			OS_VERSION_STRLEN);
+		/* version */
+		rte_strscpy(str2, uts.version,
+			OS_VERSION_STRLEN);
+	}
+}
 #endif /* _GVE_OSDEP_H_ */
drivers/net/gve/gve_ethdev.c +50 -11

83 lines not on this page · raw message

drivers/net/gve/gve_ethdev.h +1 -1
index 42a02cf5d4..23ccff37d3 100644
@@ -222,7 +222,7 @@ struct gve_priv {
 	uint32_t adminq_report_stats_cnt;
 	uint32_t adminq_report_link_speed_cnt;
 	uint32_t adminq_get_ptype_map_cnt;
-
+	uint32_t adminq_verify_driver_compatibility_cnt;
 	volatile uint32_t state_flags;
 
 	/* Gvnic device link speed from hypervisor. */
drivers/net/gve/gve_version.c new file +14 -0
new file mode 100644
index 0000000000..f02b4f696f
@@ -0,0 +1,14 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Google Virtual Ethernet (gve) driver
+ * Copyright (C) 2015-2023 Google, Inc.
+ */
+#include "gve_version.h"
+
+const char *gve_version_string(void)
+{
+	static char gve_version[10];
+	snprintf(gve_version, sizeof(gve_version), "%s%d.%d.%d",
+		GVE_VERSION_PREFIX, GVE_VERSION_MAJOR, GVE_VERSION_MINOR,
+		GVE_VERSION_SUB);
+	return gve_version;
+}
drivers/net/gve/gve_version.h new file +25 -0
new file mode 100644
index 0000000000..eca717d64b
@@ -0,0 +1,25 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Google Virtual Ethernet (gve) driver
+ * Copyright (C) 2015-2023 Google, Inc.
+ */
+
+#ifndef _GVE_VERSION_H_
+#define _GVE_VERSION_H_
+
+#include <rte_version.h>
+
+#define GVE_VERSION_PREFIX "DPDK-"
+#define GVE_VERSION_MAJOR 1
+#define GVE_VERSION_MINOR 0
+#define GVE_VERSION_SUB 0
+
+#define DPDK_VERSION_MAJOR (100 * RTE_VER_YEAR + RTE_VER_MONTH)
+#define DPDK_VERSION_MINOR RTE_VER_MINOR
+#define DPDK_VERSION_SUB RTE_VER_RELEASE
+
+
+const char *
+gve_version_string(void);
+
+
+#endif /* GVE_VERSION_H */
drivers/net/gve/meson.build +7 -0
index af0010c01c..62ab02d0dc 100644
@@ -7,10 +7,17 @@ if is_windows
     subdir_done()
 endif
 
+if is_freebsd
+    build = false
+    reason = 'not supported on FreeBSD'
+    subdir_done()
+endif
+
 sources = files(
         'base/gve_adminq.c',
         'gve_rx.c',
         'gve_tx.c',
         'gve_ethdev.c',
+        'gve_version.c',
 )
 includes += include_directories('base')
Signature · 1 line
2.40.1.521.gf1e218fcd8-goog
#10 lore raw

Re: [v2] net/gve: check driver compatibility

Quoted 8 lines · Rushil Gupta

Change gve_driver_info fields to report DPDK as OS type and DPDK RTE version as OS version, reserving driver_version fields for GVE driver version based on features.

Quoted 14 lines
---
 drivers/net/gve/base/gve.h        |  3 --
 drivers/net/gve/base/gve_adminq.c | 19 ++++++++++
 drivers/net/gve/base/gve_adminq.h | 46 ++++++++++++++++++++++-
 drivers/net/gve/base/gve_osdep.h  | 24 ++++++++++++
 drivers/net/gve/gve_ethdev.c      | 61 +++++++++++++++++++++++++------
 drivers/net/gve/gve_ethdev.h      |  2 +-
 drivers/net/gve/gve_version.c     | 14 +++++++
 drivers/net/gve/gve_version.h     | 25 +++++++++++++
 drivers/net/gve/meson.build       |  7 ++++
 9 files changed, 185 insertions(+), 16 deletions(-)
 create mode 100644 drivers/net/gve/gve_version.c
 create mode 100644 drivers/net/gve/gve_version.h

'doc/guides/nics/gve.rst' has following reference to Linux kernel version:

"
The base code is under MIT license and based on GVE kernel driver v1.3.0. "

Previously you mentioned that Linux kernel code has nothing to do with DPDK version, should above note removed or updated?

<...>

drivers/net/gve/gve_ethdev.c gve_dev_close(struct rte_eth_dev *dev) · line 266

Quoted 7 lines
drivers/net/gve/gve_ethdev.c +7 -0
+static int
+gve_verify_driver_compatibility(struct gve_priv *priv)
+{
+	struct gve_driver_info *driver_info;
+	int err;
+
+	driver_info = rte_zmalloc("driver info", sizeof(struct gve_driver_info), 0);

Can use calloc(), no need to use DPDK memory APIs. This memory is not for datapath, and only used for short time.

drivers/net/gve/gve_ethdev.c gve_dev_close(struct rte_eth_dev *dev) · line 269

Quoted 3 lines
drivers/net/gve/gve_ethdev.c +3 -0
+	if (driver_info == NULL) {
+		PMD_DRV_LOG(ERR,
+			    "Could not alloc for driver compatibility");

Message can be misleading, adding 'verify' may help.

Quoted 11 lines
drivers/net/gve/gve_ethdev.c +11 -0
+		return -ENOMEM;
+	}
+	*driver_info = (struct gve_driver_info) {
+		.os_type = 5, /* DPDK */
+		.driver_major = GVE_VERSION_MAJOR,
+		.driver_minor = GVE_VERSION_MINOR,
+		.driver_sub = GVE_VERSION_SUB,
+		.os_version_major = cpu_to_be32(DPDK_VERSION_MAJOR),
+		.os_version_minor = cpu_to_be32(DPDK_VERSION_MINOR),
+		.os_version_sub = cpu_to_be32(DPDK_VERSION_SUB),
+		.driver_capability_flags = {

drivers/net/gve/gve_ethdev.c gve_dev_close(struct rte_eth_dev *dev) · line 290

Quoted 10 lines
drivers/net/gve/gve_ethdev.c +10 -0
+			cpu_to_be64(GVE_DRIVER_CAPABILITY_FLAGS1),
+			cpu_to_be64(GVE_DRIVER_CAPABILITY_FLAGS2),
+			cpu_to_be64(GVE_DRIVER_CAPABILITY_FLAGS3),
+			cpu_to_be64(GVE_DRIVER_CAPABILITY_FLAGS4),
+		},
+	};
+
+	populate_driver_version_strings((char *)driver_info->os_version_str1,
+			(char *)driver_info->os_version_str2);
+

Is it accepted by adminq_verify if 'os_version_str1' & 'os_version_str2' is not set? If not 'populate_driver_version_strings()' should return success/error value.

Quoted 45 lines
drivers/net/gve/gve_ethdev.c +16 -0
+	err = gve_adminq_verify_driver_compatibility(priv,
+		sizeof(struct gve_driver_info), (dma_addr_t)driver_info);
+
+	/* It's ok if the device doesn't support this */
+	if (err == -EOPNOTSUPP)
+		err = 0;
+
+	rte_free(driver_info);
+	return err;
+}
+
 static int
 gve_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
 {
@@ -672,6 +706,11 @@ gve_init_priv(struct gve_priv *priv, bool skip_describe_device)
 		PMD_DRV_LOG(ERR, "Failed to alloc admin queue: err=%d", err);
 		return err;
 	}
+	err = gve_verify_driver_compatibility(priv);
+	if (err) {
+		PMD_DRV_LOG(ERR, "Could not verify driver compatibility: err=%d", err);
+		goto free_adminq;
+	}
 
 	if (skip_describe_device)
 		goto setup_device;
drivers/net/gve/gve_ethdev.h +1 -1
index 42a02cf5d4..23ccff37d3 100644
@@ -222,7 +222,7 @@ struct gve_priv {
 	uint32_t adminq_report_stats_cnt;
 	uint32_t adminq_report_link_speed_cnt;
 	uint32_t adminq_get_ptype_map_cnt;
-
+	uint32_t adminq_verify_driver_compatibility_cnt;
 	volatile uint32_t state_flags;
 
 	/* Gvnic device link speed from hypervisor. */
drivers/net/gve/gve_version.c new file +0 -0
new file mode 100644
index 0000000000..f02b4f696f

drivers/net/gve/gve_version.c line 2

Quoted 2 lines
drivers/net/gve/gve_version.c new file +2 -0
@@ -0,0 +1,14 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Google Virtual Ethernet (gve) driver

Is above line added intentionally?
Normally SPDX tag only contains license and copyright information, please check 'gve_ethdev.c' for sample tag.

drivers/net/gve/gve_version.c line 9

Quoted 7 lines
drivers/net/gve/gve_version.c new file +7 -0
+ * Copyright (C) 2015-2023 Google, Inc.
+ */
+#include "gve_version.h"
+
+const char *gve_version_string(void)
+{
+	static char gve_version[10];

DPDK-1.0.0 => 10 chars, it doesn't left room for terminating NULL, but at least 'gve_write_version()' seems expecting to have one.

drivers/net/gve/gve_version.c line 12

Quoted 3 lines
drivers/net/gve/gve_version.c new file +3 -0
+	snprintf(gve_version, sizeof(gve_version), "%s%d.%d.%d",
+		GVE_VERSION_PREFIX, GVE_VERSION_MAJOR, GVE_VERSION_MINOR,
+		GVE_VERSION_SUB);

'snprintf()' adds terminating NULL, truncating version string, need more space in the 'gve_version' array.

drivers/net/gve/gve_version.h line 2

Quoted 10 lines
drivers/net/gve/gve_version.c new file +2 -0
+	return gve_version;
+}
drivers/net/gve/gve_version.h new file +2 -0
new file mode 100644
index 0000000000..eca717d64b
@@ -0,0 +1,25 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Google Virtual Ethernet (gve) driver

Ditto

Quoted 28 lines
drivers/net/gve/gve_version.h new file +23 -0
+ * Copyright (C) 2015-2023 Google, Inc.
+ */
+
+#ifndef _GVE_VERSION_H_
+#define _GVE_VERSION_H_
+
+#include <rte_version.h>
+
+#define GVE_VERSION_PREFIX "DPDK-"
+#define GVE_VERSION_MAJOR 1
+#define GVE_VERSION_MINOR 0
+#define GVE_VERSION_SUB 0
+
+#define DPDK_VERSION_MAJOR (100 * RTE_VER_YEAR + RTE_VER_MONTH)
+#define DPDK_VERSION_MINOR RTE_VER_MINOR
+#define DPDK_VERSION_SUB RTE_VER_RELEASE
+
+
+const char *
+gve_version_string(void);
+
+
+#endif /* GVE_VERSION_H */
drivers/net/gve/meson.build +0 -0
index af0010c01c..62ab02d0dc 100644

drivers/net/gve/meson.build if is_windows · line 15

Quoted 9 lines
drivers/net/gve/meson.build +6 -0
@@ -7,10 +7,17 @@ if is_windows
     subdir_done()
 endif
 
+if is_freebsd
+    build = false
+    reason = 'not supported on FreeBSD'
+    subdir_done()
+endif
+

instead of both 'is_windows' & 'is_freebsd' checks, can check as "not is_linux":

if not is_linux
build = false
reason = 'only supported on Linux'
endif

#11 lore raw

Re: [v2] net/gve: check driver compatibility

Thanks for reviewing. Here is v3:
http://patchwork.dpdk.org/project/dpdk/patch/[email protected]/

Quoted 26 lines · Ferruh Yigit
Quoted 8 lines · Rushil Gupta

Change gve_driver_info fields to report DPDK as OS type and DPDK RTE version as OS version, reserving driver_version fields for GVE driver version based on features.

Quoted 14 lines
---
 drivers/net/gve/base/gve.h        |  3 --
 drivers/net/gve/base/gve_adminq.c | 19 ++++++++++
 drivers/net/gve/base/gve_adminq.h | 46 ++++++++++++++++++++++-
 drivers/net/gve/base/gve_osdep.h  | 24 ++++++++++++
 drivers/net/gve/gve_ethdev.c      | 61 +++++++++++++++++++++++++------
 drivers/net/gve/gve_ethdev.h      |  2 +-
 drivers/net/gve/gve_version.c     | 14 +++++++
 drivers/net/gve/gve_version.h     | 25 +++++++++++++
 drivers/net/gve/meson.build       |  7 ++++
 9 files changed, 185 insertions(+), 16 deletions(-)
 create mode 100644 drivers/net/gve/gve_version.c
 create mode 100644 drivers/net/gve/gve_version.h

'doc/guides/nics/gve.rst' has following reference to Linux kernel version:

Quoted 8 lines

"
The base code is under MIT license and based on GVE kernel driver v1.3.0. "

Previously you mentioned that Linux kernel code has nothing to do with DPDK version, should above note removed or updated?

I will address this in the license patch 23.11. We will port all of our

MIT licenses to BSD.
http://patchwork.dpdk.org/project/dpdk/patch/[email protected]/
For now let's keep this change separate from license update/removal.

Quoted 11 lines

<...>

drivers/net/gve/gve_ethdev.c gve_dev_close(struct rte_eth_dev *dev)

Quoted 7 lines
drivers/net/gve/gve_ethdev.c +7 -0
+static int
+gve_verify_driver_compatibility(struct gve_priv *priv)
+{
+     struct gve_driver_info *driver_info;
+     int err;
+
+     driver_info = rte_zmalloc("driver info", sizeof(struct

gve_driver_info), 0);

Quoted 3 lines

Can use calloc(), no need to use DPDK memory APIs. This memory is not for datapath, and only used for short time.

Done

Quoted 7 lines

drivers/net/gve/gve_ethdev.c gve_dev_close(struct rte_eth_dev *dev) · line 269

Quoted 4 lines
drivers/net/gve/gve_ethdev.c +3 -0
+     if (driver_info == NULL) {
+             PMD_DRV_LOG(ERR,
+                         "Could not alloc for driver compatibility");

Message can be misleading, adding 'verify' may help.

Done

Quoted 20 lines
Quoted 10 lines
drivers/net/gve/gve_ethdev.c +9 -0
+             return -ENOMEM;
+     }
+     *driver_info = (struct gve_driver_info) {
+             .os_type = 5, /* DPDK */
+             .driver_major = GVE_VERSION_MAJOR,
+             .driver_minor = GVE_VERSION_MINOR,
+             .driver_sub = GVE_VERSION_SUB,
+             .os_version_major = cpu_to_be32(DPDK_VERSION_MAJOR),
+             .os_version_minor = cpu_to_be32(DPDK_VERSION_MINOR),

drivers/net/gve/gve_ethdev.c gve_dev_close(struct rte_eth_dev *dev)

Quoted 10 lines
drivers/net/gve/gve_ethdev.c +10 -0
+             .os_version_sub = cpu_to_be32(DPDK_VERSION_SUB),
+             .driver_capability_flags = {
+                     cpu_to_be64(GVE_DRIVER_CAPABILITY_FLAGS1),
+                     cpu_to_be64(GVE_DRIVER_CAPABILITY_FLAGS2),
+                     cpu_to_be64(GVE_DRIVER_CAPABILITY_FLAGS3),
+                     cpu_to_be64(GVE_DRIVER_CAPABILITY_FLAGS4),
+             },
+     };
+
+     populate_driver_version_strings((char
Quoted 8 lines

*)driver_info->os_version_str1,

Review

Quoted 2 lines
(quoted diff) +2 -0
+                     (char *)driver_info->os_version_str2);
+

Is it accepted by adminq_verify if 'os_version_str1' & 'os_version_str2' is not set? If not 'populate_driver_version_strings()' should return success/error value.

It is acceptable if 'os_version_str1' & 'os_version_str2' are not set.

Quoted 46 lines
Quoted 4 lines
drivers/net/gve/gve_ethdev.c +3 -0
+     err = gve_adminq_verify_driver_compatibility(priv,
+             sizeof(struct gve_driver_info), (dma_addr_t)driver_info);
+

drivers/net/gve/gve_ethdev.c gve_dev_close(struct rte_eth_dev *dev)

Quoted 10 lines
drivers/net/gve/gve_ethdev.c +8 -0
+     /* It's ok if the device doesn't support this */
+     if (err == -EOPNOTSUPP)
+             err = 0;
+
+     rte_free(driver_info);
+     return err;
+}
+
 static int
 gve_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info

*dev_info)

Review gve_init_priv(struct gve_priv *priv, bool

Quoted 2 lines

{

(quoted diff) +0 -0
@@ -672,6 +706,11 @@ gve_init_priv(struct gve_priv *priv, bool

skip_describe_device)

Review gve_init_priv(struct gve_priv *priv, bool · line 706

Quoted 1 line
(quoted diff) +0 -0
              PMD_DRV_LOG(ERR, "Failed to alloc admin queue: err=%d",

err);

drivers/net/gve/gve_ethdev.c gve_init_priv(struct gve_priv *priv, bool skip_describe_device)

Quoted 5 lines
drivers/net/gve/gve_ethdev.c +3 -0
              return err;
      }
+     err = gve_verify_driver_compatibility(priv);
+     if (err) {
+             PMD_DRV_LOG(ERR, "Could not verify driver compatibility:

err=%d", err);

Review

Quoted 19 lines
drivers/net/gve/gve_ethdev.c +2 -0
+             goto free_adminq;
+     }
 
      if (skip_describe_device)
              goto setup_device;
drivers/net/gve/gve_ethdev.h +1 -1
index 42a02cf5d4..23ccff37d3 100644
@@ -222,7 +222,7 @@ struct gve_priv {
      uint32_t adminq_report_stats_cnt;
      uint32_t adminq_report_link_speed_cnt;
      uint32_t adminq_get_ptype_map_cnt;
-
+     uint32_t adminq_verify_driver_compatibility_cnt;
      volatile uint32_t state_flags;
 
      /* Gvnic device link speed from hypervisor. */
(quoted diff) +0 -0

b/drivers/net/gve/gve_version.c

Quoted 12 lines

drivers/net/gve/gve_version.c line 2

Quoted 7 lines

new file mode 100644
index 0000000000..f02b4f696f

drivers/net/gve/gve_version.c new file +2 -0
@@ -0,0 +1,14 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Google Virtual Ethernet (gve) driver

Is above line added intentionally?
Normally SPDX tag only contains license and copyright information, please check 'gve_ethdev.c' for sample tag.

Fixed.

Quoted 12 lines

drivers/net/gve/gve_version.c line 9

Quoted 8 lines
drivers/net/gve/gve_version.c new file +7 -0
+ * Copyright (C) 2015-2023 Google, Inc.
+ */
+#include "gve_version.h"
+
+const char *gve_version_string(void)
+{
+     static char gve_version[10];

DPDK-1.0.0 => 10 chars, it doesn't left room for terminating NULL, but at least 'gve_write_version()' seems expecting to have one.

Great catch! Fixed.

Quoted 12 lines

drivers/net/gve/gve_version.c line 12

Quoted 4 lines
drivers/net/gve/gve_version.c new file +3 -0
+     snprintf(gve_version, sizeof(gve_version), "%s%d.%d.%d",
+             GVE_VERSION_PREFIX, GVE_VERSION_MAJOR, GVE_VERSION_MINOR,
+             GVE_VERSION_SUB);

'snprintf()' adds terminating NULL, truncating version string, need more space in the 'gve_version' array.

Review

Quoted 3 lines
drivers/net/gve/gve_version.c new file +2 -0
+     return gve_version;
+}
(quoted diff) +0 -0

b/drivers/net/gve/gve_version.h

Quoted 10 lines

drivers/net/gve/gve_version.h line 2

Quoted 7 lines

new file mode 100644
index 0000000000..eca717d64b

drivers/net/gve/gve_version.h new file +2 -0
@@ -0,0 +1,25 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Google Virtual Ethernet (gve) driver

Ditto

Fixed.

Quoted 42 lines
Quoted 29 lines
drivers/net/gve/gve_version.h new file +23 -0
+ * Copyright (C) 2015-2023 Google, Inc.
+ */
+
+#ifndef _GVE_VERSION_H_
+#define _GVE_VERSION_H_
+
+#include <rte_version.h>
+
+#define GVE_VERSION_PREFIX "DPDK-"
+#define GVE_VERSION_MAJOR 1
+#define GVE_VERSION_MINOR 0
+#define GVE_VERSION_SUB 0
+
+#define DPDK_VERSION_MAJOR (100 * RTE_VER_YEAR + RTE_VER_MONTH)
+#define DPDK_VERSION_MINOR RTE_VER_MINOR
+#define DPDK_VERSION_SUB RTE_VER_RELEASE
+
+
+const char *
+gve_version_string(void);
+
+
+#endif /* GVE_VERSION_H */
drivers/net/gve/meson.build +0 -0
index af0010c01c..62ab02d0dc 100644

drivers/net/gve/meson.build if is_windows · line 15

Quoted 9 lines
drivers/net/gve/meson.build +6 -0
@@ -7,10 +7,17 @@ if is_windows
     subdir_done()
 endif
 
+if is_freebsd
+    build = false
+    reason = 'not supported on FreeBSD'
+    subdir_done()
+endif
+

instead of both 'is_windows' & 'is_freebsd' checks, can check as "not is_linux":

Quoted 5 lines

if not is_linux
build = false
reason = 'only supported on Linux'
endif

Fixed.

#12 lore raw

PATCH v3 1/1 net/gve: check driver compatibility

In reply to Rushil Gupta

Change gve_driver_info fields to report DPDK as OS type and DPDK RTE version as OS version, reserving driver_version fields for GVE driver version based on features.

---
 0001-net-gve-check-driver-compatibility.patch | 388 ++++++++++++++++++
 drivers/net/gve/base/gve.h                    |   3 -
 drivers/net/gve/base/gve_adminq.c             |  19 +
 drivers/net/gve/base/gve_adminq.h             |  46 ++-
 drivers/net/gve/base/gve_osdep.h              |  24 ++
 drivers/net/gve/gve_ethdev.c                  |  60 ++-
 drivers/net/gve/gve_ethdev.h                  |   2 +-
 drivers/net/gve/gve_version.c                 |  13 +
 drivers/net/gve/gve_version.h                 |  24 ++
 drivers/net/gve/meson.build                   |   5 +-
 10 files changed, 566 insertions(+), 18 deletions(-)
 create mode 100644 0001-net-gve-check-driver-compatibility.patch
 create mode 100644 drivers/net/gve/gve_version.c
 create mode 100644 drivers/net/gve/gve_version.h
0001-net-gve-check-driver-compatibility.patch new file +388 -0
new file mode 100644
index 0000000000..0187db7dc2
@@ -0,0 +1,388 @@
+From 1624a08eaa94242286da930b92b227759f906bd9 Mon Sep 17 00:00:00 2001
+From: Rushil Gupta <[email protected]>
+Date: Thu, 13 Apr 2023 22:06:20 -0700
+Subject: [v3] net/gve: check driver compatibility
+
+Change gve_driver_info fields to report DPDK as OS type and DPDK RTE
+version as OS version, reserving driver_version fields for GVE driver
+version based on features.
+
+Signed-off-by: Rushil Gupta <[email protected]>
+Signed-off-by: Joshua Washington <[email protected]>
+Signed-off-by: Junfeng Guo <[email protected]>
+Signed-off-by: Jeroen de Borst <[email protected]>
+---
+ drivers/net/gve/base/gve.h        |  3 --
+ drivers/net/gve/base/gve_adminq.c | 19 ++++++++++
+ drivers/net/gve/base/gve_adminq.h | 46 ++++++++++++++++++++++-
+ drivers/net/gve/base/gve_osdep.h  | 24 ++++++++++++
+ drivers/net/gve/gve_ethdev.c      | 61 +++++++++++++++++++++++++------
+ drivers/net/gve/gve_ethdev.h      |  2 +-
+ drivers/net/gve/gve_version.c     | 13 +++++++
+ drivers/net/gve/gve_version.h     | 24 ++++++++++++
+ drivers/net/gve/meson.build       |  5 ++-
+ 9 files changed, 179 insertions(+), 18 deletions(-)
+ create mode 100644 drivers/net/gve/gve_version.c
+ create mode 100644 drivers/net/gve/gve_version.h
+
+diff --git a/drivers/net/gve/base/gve.h b/drivers/net/gve/base/gve.h
+index 2dc4507acb..89f9654a72 100644
+--- a/drivers/net/gve/base/gve.h
++++ b/drivers/net/gve/base/gve.h
+@@ -8,9 +8,6 @@
+ 
+ #include "gve_desc.h"
+ 
+-#define GVE_VERSION		"1.3.0"
+-#define GVE_VERSION_PREFIX	"GVE-"
+-
+ #ifndef GOOGLE_VENDOR_ID
+ #define GOOGLE_VENDOR_ID	0x1ae0
+ #endif
+diff --git a/drivers/net/gve/base/gve_adminq.c b/drivers/net/gve/base/gve_adminq.c
+index e745b709b2..2e5099a5b0 100644
+--- a/drivers/net/gve/base/gve_adminq.c
++++ b/drivers/net/gve/base/gve_adminq.c
+@@ -401,6 +401,9 @@ static int gve_adminq_issue_cmd(struct gve_priv *priv,
+ 	case GVE_ADMINQ_GET_PTYPE_MAP:
+ 		priv->adminq_get_ptype_map_cnt++;
+ 		break;
++	case GVE_ADMINQ_VERIFY_DRIVER_COMPATIBILITY:
++		priv->adminq_verify_driver_compatibility_cnt++;
++		break;
+ 	default:
+ 		PMD_DRV_LOG(ERR, "unknown AQ command opcode %d", opcode);
+ 	}
+@@ -465,6 +468,22 @@ int gve_adminq_configure_device_resources(struct gve_priv *priv,
+ 	return gve_adminq_execute_cmd(priv, &cmd);
+ }
+ 
++int gve_adminq_verify_driver_compatibility(struct gve_priv *priv,
++					   u64 driver_info_len,
++					   dma_addr_t driver_info_addr)
++{
++	union gve_adminq_command cmd;
++
++	memset(&cmd, 0, sizeof(cmd));
++	cmd.opcode = cpu_to_be32(GVE_ADMINQ_VERIFY_DRIVER_COMPATIBILITY);
++	cmd.verify_driver_compatibility = (struct gve_adminq_verify_driver_compatibility) {
++		.driver_info_len = cpu_to_be64(driver_info_len),
++		.driver_info_addr = cpu_to_be64(driver_info_addr),
++	};
++
++	return gve_adminq_execute_cmd(priv, &cmd);
++}
++
+ int gve_adminq_deconfigure_device_resources(struct gve_priv *priv)
+ {
+ 	union gve_adminq_command cmd;
+diff --git a/drivers/net/gve/base/gve_adminq.h b/drivers/net/gve/base/gve_adminq.h
+index 05550119de..e30b184913 100644
+--- a/drivers/net/gve/base/gve_adminq.h
++++ b/drivers/net/gve/base/gve_adminq.h
+@@ -1,6 +1,6 @@
+ /* SPDX-License-Identifier: MIT
+  * Google Virtual Ethernet (gve) driver
+- * Copyright (C) 2015-2022 Google, Inc.
++ * Copyright (C) 2015-2023 Google, Inc.
+  */
+ 
+ #ifndef _GVE_ADMINQ_H
+@@ -23,6 +23,7 @@ enum gve_adminq_opcodes {
+ 	GVE_ADMINQ_REPORT_STATS			= 0xC,
+ 	GVE_ADMINQ_REPORT_LINK_SPEED		= 0xD,
+ 	GVE_ADMINQ_GET_PTYPE_MAP		= 0xE,
++	GVE_ADMINQ_VERIFY_DRIVER_COMPATIBILITY	= 0xF,
+ };
+ 
+ /* Admin queue status codes */
+@@ -145,6 +146,44 @@ enum gve_sup_feature_mask {
+ };
+ 
+ #define GVE_DEV_OPT_LEN_GQI_RAW_ADDRESSING 0x0
++enum gve_driver_capbility {
++	gve_driver_capability_gqi_qpl = 0,
++	gve_driver_capability_gqi_rda = 1,
++	gve_driver_capability_dqo_qpl = 2, /* reserved for future use */
++	gve_driver_capability_dqo_rda = 3,
++};
++
++#define GVE_CAP1(a) BIT((int)a)
++
++#define GVE_DRIVER_CAPABILITY_FLAGS1 \
++	(GVE_CAP1(gve_driver_capability_gqi_qpl) | \
++	 GVE_CAP1(gve_driver_capability_gqi_rda) | \
++	 GVE_CAP1(gve_driver_capability_dqo_rda))
++
++#define GVE_DRIVER_CAPABILITY_FLAGS2 0x0
++#define GVE_DRIVER_CAPABILITY_FLAGS3 0x0
++#define GVE_DRIVER_CAPABILITY_FLAGS4 0x0
++
++struct gve_driver_info {
++	u8 os_type;	/* 0x05 = DPDK */
++	u8 driver_major;
++	u8 driver_minor;
++	u8 driver_sub;
++	__be32 os_version_major;
++	__be32 os_version_minor;
++	__be32 os_version_sub;
++	__be64 driver_capability_flags[4];
++	u8 os_version_str1[OS_VERSION_STRLEN];
++	u8 os_version_str2[OS_VERSION_STRLEN];
++};
++
++struct gve_adminq_verify_driver_compatibility {
++	__be64 driver_info_len;
++	__be64 driver_info_addr;
++};
++
++GVE_CHECK_STRUCT_LEN(16,  gve_adminq_verify_driver_compatibility);
++
+ 
+ struct gve_adminq_configure_device_resources {
+ 	__be64 counter_array;
+@@ -345,6 +384,8 @@ union gve_adminq_command {
+ 			struct gve_adminq_report_stats report_stats;
+ 			struct gve_adminq_report_link_speed report_link_speed;
+ 			struct gve_adminq_get_ptype_map get_ptype_map;
++			struct gve_adminq_verify_driver_compatibility
++				verify_driver_compatibility;
+ 		};
+ 	};
+ 	u8 reserved[64];
+@@ -378,4 +419,7 @@ struct gve_ptype_lut;
+ int gve_adminq_get_ptype_map_dqo(struct gve_priv *priv,
+ 				 struct gve_ptype_lut *ptype_lut);
+ 
++int gve_adminq_verify_driver_compatibility(struct gve_priv *priv,
++					   u64 driver_info_len,
++					   dma_addr_t driver_info_addr);
+ #endif /* _GVE_ADMINQ_H */
+diff --git a/drivers/net/gve/base/gve_osdep.h b/drivers/net/gve/base/gve_osdep.h
+index 7cb73002f4..43081ec2a9 100644
+--- a/drivers/net/gve/base/gve_osdep.h
++++ b/drivers/net/gve/base/gve_osdep.h
+@@ -21,9 +21,14 @@
+ #include <rte_malloc.h>
+ #include <rte_memcpy.h>
+ #include <rte_memzone.h>
++#include <rte_version.h>
+ 
+ #include "../gve_logs.h"
+ 
++#ifdef __linux__
++#include <sys/utsname.h>
++#endif
++
+ typedef uint8_t u8;
+ typedef uint16_t u16;
+ typedef uint32_t u32;
+@@ -69,6 +74,12 @@ typedef rte_iova_t dma_addr_t;
+ 
+ #define msleep(ms)		rte_delay_ms(ms)
+ 
++#define OS_VERSION_STRLEN 128
++struct os_version_string {
++	char os_version_str1[OS_VERSION_STRLEN];
++	char os_version_str2[OS_VERSION_STRLEN];
++};
++
+ /* These macros are used to generate compilation errors if a struct/union
+  * is not exactly the correct length. It gives a divide by zero error if
+  * the struct/union is not of the correct size, otherwise it creates an
+@@ -156,4 +167,17 @@ gve_free_dma_mem(struct gve_dma_mem *mem)
+ 	mem->pa = 0;
+ }
+ 
++static inline void
++populate_driver_version_strings(char *str1, char *str2)
++{
++	struct utsname uts;
++	if (uname(&uts) >= 0) {
++		/* release */
++		rte_strscpy(str1, uts.release,
++			OS_VERSION_STRLEN);
++		/* version */
++		rte_strscpy(str2, uts.version,
++			OS_VERSION_STRLEN);
++	}
++}
+ #endif /* _GVE_OSDEP_H_ */
+diff --git a/drivers/net/gve/gve_ethdev.c b/drivers/net/gve/gve_ethdev.c
+index cf28a4a3b7..2766ca0d3b 100644
+--- a/drivers/net/gve/gve_ethdev.c
++++ b/drivers/net/gve/gve_ethdev.c
+@@ -5,21 +5,13 @@
+ #include "gve_ethdev.h"
+ #include "base/gve_adminq.h"
+ #include "base/gve_register.h"
+-
+-const char gve_version_str[] = GVE_VERSION;
+-static const char gve_version_prefix[] = GVE_VERSION_PREFIX;
++#include "base/gve_osdep.h"
++#include "gve_version.h"
+ 
+ static void
+ gve_write_version(uint8_t *driver_version_register)
+ {
+-	const char *c = gve_version_prefix;
+-
+-	while (*c) {
+-		writeb(*c, driver_version_register);
+-		c++;
+-	}
+-
+-	c = gve_version_str;
++	const char *c = gve_version_string();
+ 	while (*c) {
+ 		writeb(*c, driver_version_register);
+ 		c++;
+@@ -265,6 +257,48 @@ gve_dev_close(struct rte_eth_dev *dev)
+ 	return err;
+ }
+ 
++static int
++gve_verify_driver_compatibility(struct gve_priv *priv)
++{
++	struct gve_driver_info *driver_info;
++	int err;
++
++	driver_info = calloc(sizeof(struct gve_driver_info), 0);
++	if (driver_info == NULL) {
++		PMD_DRV_LOG(ERR,
++			    "Could not alloc for verify driver compatibility");
++		return -ENOMEM;
++	}
++	*driver_info = (struct gve_driver_info) {
++		.os_type = 5, /* DPDK */
++		.driver_major = GVE_VERSION_MAJOR,
++		.driver_minor = GVE_VERSION_MINOR,
++		.driver_sub = GVE_VERSION_SUB,
++		.os_version_major = cpu_to_be32(DPDK_VERSION_MAJOR),
++		.os_version_minor = cpu_to_be32(DPDK_VERSION_MINOR),
++		.os_version_sub = cpu_to_be32(DPDK_VERSION_SUB),
++		.driver_capability_flags = {
++			cpu_to_be64(GVE_DRIVER_CAPABILITY_FLAGS1),
++			cpu_to_be64(GVE_DRIVER_CAPABILITY_FLAGS2),
++			cpu_to_be64(GVE_DRIVER_CAPABILITY_FLAGS3),
++			cpu_to_be64(GVE_DRIVER_CAPABILITY_FLAGS4),
++		},
++	};
++
++	populate_driver_version_strings((char *)driver_info->os_version_str1,
++			(char *)driver_info->os_version_str2);
++
++	err = gve_adminq_verify_driver_compatibility(priv,
++		sizeof(struct gve_driver_info), (dma_addr_t)driver_info);
++
++	/* It's ok if the device doesn't support this */
++	if (err == -EOPNOTSUPP)
++		err = 0;
++
++	free(driver_info);
++	return err;
++}
++
+ static int
+ gve_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
+ {
+@@ -672,6 +706,11 @@ gve_init_priv(struct gve_priv *priv, bool skip_describe_device)
+ 		PMD_DRV_LOG(ERR, "Failed to alloc admin queue: err=%d", err);
+ 		return err;
+ 	}
++	err = gve_verify_driver_compatibility(priv);
++	if (err) {
++		PMD_DRV_LOG(ERR, "Could not verify driver compatibility: err=%d", err);
++		goto free_adminq;
++	}
+ 
+ 	if (skip_describe_device)
+ 		goto setup_device;
+diff --git a/drivers/net/gve/gve_ethdev.h b/drivers/net/gve/gve_ethdev.h
+index 42a02cf5d4..23ccff37d3 100644
+--- a/drivers/net/gve/gve_ethdev.h
++++ b/drivers/net/gve/gve_ethdev.h
+@@ -222,7 +222,7 @@ struct gve_priv {
+ 	uint32_t adminq_report_stats_cnt;
+ 	uint32_t adminq_report_link_speed_cnt;
+ 	uint32_t adminq_get_ptype_map_cnt;
+-
++	uint32_t adminq_verify_driver_compatibility_cnt;
+ 	volatile uint32_t state_flags;
+ 
+ 	/* Gvnic device link speed from hypervisor. */
+diff --git a/drivers/net/gve/gve_version.c b/drivers/net/gve/gve_version.c
+new file mode 100644
+index 0000000000..5fe34dc179
+--- /dev/null
++++ b/drivers/net/gve/gve_version.c
+@@ -0,0 +1,13 @@
++/* SPDX-License-Identifier: BSD-3-Clause
++ * Copyright (C) 2015-2023 Google, Inc.
++ */
++#include "gve_version.h"
++
++const char *gve_version_string(void)
++{
++	static char gve_version[20];
++	snprintf(gve_version, sizeof(gve_version), "%s%d.%d.%d",
++		GVE_VERSION_PREFIX, GVE_VERSION_MAJOR, GVE_VERSION_MINOR,
++		GVE_VERSION_SUB);
++	return gve_version;
++}
+diff --git a/drivers/net/gve/gve_version.h b/drivers/net/gve/gve_version.h
+new file mode 100644
+index 0000000000..4dd998dca1
+--- /dev/null
++++ b/drivers/net/gve/gve_version.h
+@@ -0,0 +1,24 @@
++/* SPDX-License-Identifier: BSD-3-Clause
++ * Copyright (C) 2015-2023 Google, Inc.
++ */
++
++#ifndef _GVE_VERSION_H_
++#define _GVE_VERSION_H_
++
++#include <rte_version.h>
++
++#define GVE_VERSION_PREFIX "DPDK-"
++#define GVE_VERSION_MAJOR 1
++#define GVE_VERSION_MINOR 0
++#define GVE_VERSION_SUB 0
++
++#define DPDK_VERSION_MAJOR (100 * RTE_VER_YEAR + RTE_VER_MONTH)
++#define DPDK_VERSION_MINOR RTE_VER_MINOR
++#define DPDK_VERSION_SUB RTE_VER_RELEASE
++
++
++const char *
++gve_version_string(void);
++
++
++#endif /* GVE_VERSION_H */
+diff --git a/drivers/net/gve/meson.build b/drivers/net/gve/meson.build
+index af0010c01c..365b7ffdaa 100644
+--- a/drivers/net/gve/meson.build
++++ b/drivers/net/gve/meson.build
+@@ -1,9 +1,9 @@
+ # SPDX-License-Identifier: BSD-3-Clause
+ # Copyright(C) 2022 Intel Corporation
+ 
+-if is_windows
++if not is_linux
+     build = false
+-    reason = 'not supported on Windows'
++    reason = 'only supported on Linux'
+     subdir_done()
+ endif
+ 
+@@ -12,5 +12,6 @@ sources = files(
+         'gve_rx.c',
+         'gve_tx.c',
+         'gve_ethdev.c',
++        'gve_version.c',
+ )
+ includes += include_directories('base')
+-- 
+2.40.1.698.g37aff9b760-goog
+
drivers/net/gve/base/gve.h +0 -3
index 2b7cf7d99b..f7b297e759 100644
@@ -9,9 +9,6 @@
 #include "gve_desc.h"
 #include "gve_desc_dqo.h"
 
-#define GVE_VERSION		"1.3.0"
-#define GVE_VERSION_PREFIX	"GVE-"
-
 #ifndef GOOGLE_VENDOR_ID
 #define GOOGLE_VENDOR_ID	0x1ae0
 #endif
drivers/net/gve/base/gve_adminq.c +19 -0
index e963f910a0..41202725e6 100644
@@ -401,6 +401,9 @@ static int gve_adminq_issue_cmd(struct gve_priv *priv,
 	case GVE_ADMINQ_GET_PTYPE_MAP:
 		priv->adminq_get_ptype_map_cnt++;
 		break;
+	case GVE_ADMINQ_VERIFY_DRIVER_COMPATIBILITY:
+		priv->adminq_verify_driver_compatibility_cnt++;
+		break;
 	default:
 		PMD_DRV_LOG(ERR, "unknown AQ command opcode %d", opcode);
 	}
@@ -465,6 +468,22 @@ int gve_adminq_configure_device_resources(struct gve_priv *priv,
 	return gve_adminq_execute_cmd(priv, &cmd);
 }
 
+int gve_adminq_verify_driver_compatibility(struct gve_priv *priv,
+					   u64 driver_info_len,
+					   dma_addr_t driver_info_addr)
+{
+	union gve_adminq_command cmd;
+
+	memset(&cmd, 0, sizeof(cmd));
+	cmd.opcode = cpu_to_be32(GVE_ADMINQ_VERIFY_DRIVER_COMPATIBILITY);
+	cmd.verify_driver_compatibility = (struct gve_adminq_verify_driver_compatibility) {
+		.driver_info_len = cpu_to_be64(driver_info_len),
+		.driver_info_addr = cpu_to_be64(driver_info_addr),
+	};
+
+	return gve_adminq_execute_cmd(priv, &cmd);
+}
+
 int gve_adminq_deconfigure_device_resources(struct gve_priv *priv)
 {
 	union gve_adminq_command cmd;
drivers/net/gve/base/gve_adminq.h +45 -1

73 lines not on this page · raw message

drivers/net/gve/base/gve_osdep.h +24 -0
index abf3d379ae..5e8ae1eac6 100644
@@ -21,9 +21,14 @@
 #include <rte_malloc.h>
 #include <rte_memcpy.h>
 #include <rte_memzone.h>
+#include <rte_version.h>
 
 #include "../gve_logs.h"
 
+#ifdef __linux__
+#include <sys/utsname.h>
+#endif
+
 typedef uint8_t u8;
 typedef uint16_t u16;
 typedef uint32_t u32;
@@ -73,6 +78,12 @@ typedef rte_iova_t dma_addr_t;
 
 #define msleep(ms)		rte_delay_ms(ms)
 
+#define OS_VERSION_STRLEN 128
+struct os_version_string {
+	char os_version_str1[OS_VERSION_STRLEN];
+	char os_version_str2[OS_VERSION_STRLEN];
+};
+
 /* These macros are used to generate compilation errors if a struct/union
  * is not exactly the correct length. It gives a divide by zero error if
  * the struct/union is not of the correct size, otherwise it creates an
@@ -160,4 +171,17 @@ gve_free_dma_mem(struct gve_dma_mem *mem)
 	mem->pa = 0;
 }
 
+static inline void
+populate_driver_version_strings(char *str1, char *str2)
+{
+	struct utsname uts;
+	if (uname(&uts) >= 0) {
+		/* release */
+		rte_strscpy(str1, uts.release,
+			OS_VERSION_STRLEN);
+		/* version */
+		rte_strscpy(str2, uts.version,
+			OS_VERSION_STRLEN);
+	}
+}
 #endif /* _GVE_OSDEP_H_ */
drivers/net/gve/gve_ethdev.c +49 -11

82 lines not on this page · raw message

drivers/net/gve/gve_ethdev.h +1 -1
index cd62debd22..c9bcfa553c 100644
@@ -268,7 +268,7 @@ struct gve_priv {
 	uint32_t adminq_report_stats_cnt;
 	uint32_t adminq_report_link_speed_cnt;
 	uint32_t adminq_get_ptype_map_cnt;
-
+	uint32_t adminq_verify_driver_compatibility_cnt;
 	volatile uint32_t state_flags;
 
 	/* Gvnic device link speed from hypervisor. */
drivers/net/gve/gve_version.c new file +13 -0
new file mode 100644
index 0000000000..5fe34dc179
@@ -0,0 +1,13 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (C) 2015-2023 Google, Inc.
+ */
+#include "gve_version.h"
+
+const char *gve_version_string(void)
+{
+	static char gve_version[20];
+	snprintf(gve_version, sizeof(gve_version), "%s%d.%d.%d",
+		GVE_VERSION_PREFIX, GVE_VERSION_MAJOR, GVE_VERSION_MINOR,
+		GVE_VERSION_SUB);
+	return gve_version;
+}
drivers/net/gve/gve_version.h new file +24 -0
new file mode 100644
index 0000000000..4dd998dca1
@@ -0,0 +1,24 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (C) 2015-2023 Google, Inc.
+ */
+
+#ifndef _GVE_VERSION_H_
+#define _GVE_VERSION_H_
+
+#include <rte_version.h>
+
+#define GVE_VERSION_PREFIX "DPDK-"
+#define GVE_VERSION_MAJOR 1
+#define GVE_VERSION_MINOR 0
+#define GVE_VERSION_SUB 0
+
+#define DPDK_VERSION_MAJOR (100 * RTE_VER_YEAR + RTE_VER_MONTH)
+#define DPDK_VERSION_MINOR RTE_VER_MINOR
+#define DPDK_VERSION_SUB RTE_VER_RELEASE
+
+
+const char *
+gve_version_string(void);
+
+
+#endif /* GVE_VERSION_H */
drivers/net/gve/meson.build +3 -2
index c9d87903f9..61d195009c 100644
@@ -1,9 +1,9 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(C) 2022 Intel Corporation
 
-if is_windows
+if not is_linux
     build = false
-    reason = 'not supported on Windows'
+    reason = 'only supported on Linux'
     subdir_done()
 endif
 
@@ -14,5 +14,6 @@ sources = files(
         'gve_rx_dqo.c',
         'gve_tx_dqo.c',
         'gve_ethdev.c',
+        'gve_version.c',
 )
 includes += include_directories('base')
Signature · 1 line
2.40.1.698.g37aff9b760-goog
#13 lore raw

PATCH 1/1 net/gve: check driver compatibility

In reply to Rushil Gupta

Change gve_driver_info fields to report DPDK as OS type and DPDK RTE version as OS version, reserving driver_version fields for GVE driver version based on features.

---
 0001-net-gve-check-driver-compatibility.patch | 388 ++++++++++++++++++
 drivers/net/gve/base/gve.h                    |   3 -
 drivers/net/gve/base/gve_adminq.c             |  19 +
 drivers/net/gve/base/gve_adminq.h             |  46 ++-
 drivers/net/gve/base/gve_osdep.h              |  24 ++
 drivers/net/gve/gve_ethdev.c                  |  60 ++-
 drivers/net/gve/gve_ethdev.h                  |   2 +-
 drivers/net/gve/gve_version.c                 |  13 +
 drivers/net/gve/gve_version.h                 |  24 ++
 drivers/net/gve/meson.build                   |   5 +-
 10 files changed, 566 insertions(+), 18 deletions(-)
 create mode 100644 0001-net-gve-check-driver-compatibility.patch
 create mode 100644 drivers/net/gve/gve_version.c
 create mode 100644 drivers/net/gve/gve_version.h
0001-net-gve-check-driver-compatibility.patch new file +388 -0
new file mode 100644
index 0000000000..0187db7dc2
@@ -0,0 +1,388 @@
+From 1624a08eaa94242286da930b92b227759f906bd9 Mon Sep 17 00:00:00 2001
+From: Rushil Gupta <[email protected]>
+Date: Thu, 13 Apr 2023 22:06:20 -0700
+Subject: [v3] net/gve: check driver compatibility
+
+Change gve_driver_info fields to report DPDK as OS type and DPDK RTE
+version as OS version, reserving driver_version fields for GVE driver
+version based on features.
+
+Signed-off-by: Rushil Gupta <[email protected]>
+Signed-off-by: Joshua Washington <[email protected]>
+Signed-off-by: Junfeng Guo <[email protected]>
+Signed-off-by: Jeroen de Borst <[email protected]>
+---
+ drivers/net/gve/base/gve.h        |  3 --
+ drivers/net/gve/base/gve_adminq.c | 19 ++++++++++
+ drivers/net/gve/base/gve_adminq.h | 46 ++++++++++++++++++++++-
+ drivers/net/gve/base/gve_osdep.h  | 24 ++++++++++++
+ drivers/net/gve/gve_ethdev.c      | 61 +++++++++++++++++++++++++------
+ drivers/net/gve/gve_ethdev.h      |  2 +-
+ drivers/net/gve/gve_version.c     | 13 +++++++
+ drivers/net/gve/gve_version.h     | 24 ++++++++++++
+ drivers/net/gve/meson.build       |  5 ++-
+ 9 files changed, 179 insertions(+), 18 deletions(-)
+ create mode 100644 drivers/net/gve/gve_version.c
+ create mode 100644 drivers/net/gve/gve_version.h
+
+diff --git a/drivers/net/gve/base/gve.h b/drivers/net/gve/base/gve.h
+index 2dc4507acb..89f9654a72 100644
+--- a/drivers/net/gve/base/gve.h
++++ b/drivers/net/gve/base/gve.h
+@@ -8,9 +8,6 @@
+ 
+ #include "gve_desc.h"
+ 
+-#define GVE_VERSION		"1.3.0"
+-#define GVE_VERSION_PREFIX	"GVE-"
+-
+ #ifndef GOOGLE_VENDOR_ID
+ #define GOOGLE_VENDOR_ID	0x1ae0
+ #endif
+diff --git a/drivers/net/gve/base/gve_adminq.c b/drivers/net/gve/base/gve_adminq.c
+index e745b709b2..2e5099a5b0 100644
+--- a/drivers/net/gve/base/gve_adminq.c
++++ b/drivers/net/gve/base/gve_adminq.c
+@@ -401,6 +401,9 @@ static int gve_adminq_issue_cmd(struct gve_priv *priv,
+ 	case GVE_ADMINQ_GET_PTYPE_MAP:
+ 		priv->adminq_get_ptype_map_cnt++;
+ 		break;
++	case GVE_ADMINQ_VERIFY_DRIVER_COMPATIBILITY:
++		priv->adminq_verify_driver_compatibility_cnt++;
++		break;
+ 	default:
+ 		PMD_DRV_LOG(ERR, "unknown AQ command opcode %d", opcode);
+ 	}
+@@ -465,6 +468,22 @@ int gve_adminq_configure_device_resources(struct gve_priv *priv,
+ 	return gve_adminq_execute_cmd(priv, &cmd);
+ }
+ 
++int gve_adminq_verify_driver_compatibility(struct gve_priv *priv,
++					   u64 driver_info_len,
++					   dma_addr_t driver_info_addr)
++{
++	union gve_adminq_command cmd;
++
++	memset(&cmd, 0, sizeof(cmd));
++	cmd.opcode = cpu_to_be32(GVE_ADMINQ_VERIFY_DRIVER_COMPATIBILITY);
++	cmd.verify_driver_compatibility = (struct gve_adminq_verify_driver_compatibility) {
++		.driver_info_len = cpu_to_be64(driver_info_len),
++		.driver_info_addr = cpu_to_be64(driver_info_addr),
++	};
++
++	return gve_adminq_execute_cmd(priv, &cmd);
++}
++
+ int gve_adminq_deconfigure_device_resources(struct gve_priv *priv)
+ {
+ 	union gve_adminq_command cmd;
+diff --git a/drivers/net/gve/base/gve_adminq.h b/drivers/net/gve/base/gve_adminq.h
+index 05550119de..e30b184913 100644
+--- a/drivers/net/gve/base/gve_adminq.h
++++ b/drivers/net/gve/base/gve_adminq.h
+@@ -1,6 +1,6 @@
+ /* SPDX-License-Identifier: MIT
+  * Google Virtual Ethernet (gve) driver
+- * Copyright (C) 2015-2022 Google, Inc.
++ * Copyright (C) 2015-2023 Google, Inc.
+  */
+ 
+ #ifndef _GVE_ADMINQ_H
+@@ -23,6 +23,7 @@ enum gve_adminq_opcodes {
+ 	GVE_ADMINQ_REPORT_STATS			= 0xC,
+ 	GVE_ADMINQ_REPORT_LINK_SPEED		= 0xD,
+ 	GVE_ADMINQ_GET_PTYPE_MAP		= 0xE,
++	GVE_ADMINQ_VERIFY_DRIVER_COMPATIBILITY	= 0xF,
+ };
+ 
+ /* Admin queue status codes */
+@@ -145,6 +146,44 @@ enum gve_sup_feature_mask {
+ };
+ 
+ #define GVE_DEV_OPT_LEN_GQI_RAW_ADDRESSING 0x0
++enum gve_driver_capbility {
++	gve_driver_capability_gqi_qpl = 0,
++	gve_driver_capability_gqi_rda = 1,
++	gve_driver_capability_dqo_qpl = 2, /* reserved for future use */
++	gve_driver_capability_dqo_rda = 3,
++};
++
++#define GVE_CAP1(a) BIT((int)a)
++
++#define GVE_DRIVER_CAPABILITY_FLAGS1 \
++	(GVE_CAP1(gve_driver_capability_gqi_qpl) | \
++	 GVE_CAP1(gve_driver_capability_gqi_rda) | \
++	 GVE_CAP1(gve_driver_capability_dqo_rda))
++
++#define GVE_DRIVER_CAPABILITY_FLAGS2 0x0
++#define GVE_DRIVER_CAPABILITY_FLAGS3 0x0
++#define GVE_DRIVER_CAPABILITY_FLAGS4 0x0
++
++struct gve_driver_info {
++	u8 os_type;	/* 0x05 = DPDK */
++	u8 driver_major;
++	u8 driver_minor;
++	u8 driver_sub;
++	__be32 os_version_major;
++	__be32 os_version_minor;
++	__be32 os_version_sub;
++	__be64 driver_capability_flags[4];
++	u8 os_version_str1[OS_VERSION_STRLEN];
++	u8 os_version_str2[OS_VERSION_STRLEN];
++};
++
++struct gve_adminq_verify_driver_compatibility {
++	__be64 driver_info_len;
++	__be64 driver_info_addr;
++};
++
++GVE_CHECK_STRUCT_LEN(16,  gve_adminq_verify_driver_compatibility);
++
+ 
+ struct gve_adminq_configure_device_resources {
+ 	__be64 counter_array;
+@@ -345,6 +384,8 @@ union gve_adminq_command {
+ 			struct gve_adminq_report_stats report_stats;
+ 			struct gve_adminq_report_link_speed report_link_speed;
+ 			struct gve_adminq_get_ptype_map get_ptype_map;
++			struct gve_adminq_verify_driver_compatibility
++				verify_driver_compatibility;
+ 		};
+ 	};
+ 	u8 reserved[64];
+@@ -378,4 +419,7 @@ struct gve_ptype_lut;
+ int gve_adminq_get_ptype_map_dqo(struct gve_priv *priv,
+ 				 struct gve_ptype_lut *ptype_lut);
+ 
++int gve_adminq_verify_driver_compatibility(struct gve_priv *priv,
++					   u64 driver_info_len,
++					   dma_addr_t driver_info_addr);
+ #endif /* _GVE_ADMINQ_H */
+diff --git a/drivers/net/gve/base/gve_osdep.h b/drivers/net/gve/base/gve_osdep.h
+index 7cb73002f4..43081ec2a9 100644
+--- a/drivers/net/gve/base/gve_osdep.h
++++ b/drivers/net/gve/base/gve_osdep.h
+@@ -21,9 +21,14 @@
+ #include <rte_malloc.h>
+ #include <rte_memcpy.h>
+ #include <rte_memzone.h>
++#include <rte_version.h>
+ 
+ #include "../gve_logs.h"
+ 
++#ifdef __linux__
++#include <sys/utsname.h>
++#endif
++
+ typedef uint8_t u8;
+ typedef uint16_t u16;
+ typedef uint32_t u32;
+@@ -69,6 +74,12 @@ typedef rte_iova_t dma_addr_t;
+ 
+ #define msleep(ms)		rte_delay_ms(ms)
+ 
++#define OS_VERSION_STRLEN 128
++struct os_version_string {
++	char os_version_str1[OS_VERSION_STRLEN];
++	char os_version_str2[OS_VERSION_STRLEN];
++};
++
+ /* These macros are used to generate compilation errors if a struct/union
+  * is not exactly the correct length. It gives a divide by zero error if
+  * the struct/union is not of the correct size, otherwise it creates an
+@@ -156,4 +167,17 @@ gve_free_dma_mem(struct gve_dma_mem *mem)
+ 	mem->pa = 0;
+ }
+ 
++static inline void
++populate_driver_version_strings(char *str1, char *str2)
++{
++	struct utsname uts;
++	if (uname(&uts) >= 0) {
++		/* release */
++		rte_strscpy(str1, uts.release,
++			OS_VERSION_STRLEN);
++		/* version */
++		rte_strscpy(str2, uts.version,
++			OS_VERSION_STRLEN);
++	}
++}
+ #endif /* _GVE_OSDEP_H_ */
+diff --git a/drivers/net/gve/gve_ethdev.c b/drivers/net/gve/gve_ethdev.c
+index cf28a4a3b7..2766ca0d3b 100644
+--- a/drivers/net/gve/gve_ethdev.c
++++ b/drivers/net/gve/gve_ethdev.c
+@@ -5,21 +5,13 @@
+ #include "gve_ethdev.h"
+ #include "base/gve_adminq.h"
+ #include "base/gve_register.h"
+-
+-const char gve_version_str[] = GVE_VERSION;
+-static const char gve_version_prefix[] = GVE_VERSION_PREFIX;
++#include "base/gve_osdep.h"
++#include "gve_version.h"
+ 
+ static void
+ gve_write_version(uint8_t *driver_version_register)
+ {
+-	const char *c = gve_version_prefix;
+-
+-	while (*c) {
+-		writeb(*c, driver_version_register);
+-		c++;
+-	}
+-
+-	c = gve_version_str;
++	const char *c = gve_version_string();
+ 	while (*c) {
+ 		writeb(*c, driver_version_register);
+ 		c++;
+@@ -265,6 +257,48 @@ gve_dev_close(struct rte_eth_dev *dev)
+ 	return err;
+ }
+ 
++static int
++gve_verify_driver_compatibility(struct gve_priv *priv)
++{
++	struct gve_driver_info *driver_info;
++	int err;
++
++	driver_info = calloc(sizeof(struct gve_driver_info), 0);
++	if (driver_info == NULL) {
++		PMD_DRV_LOG(ERR,
++			    "Could not alloc for verify driver compatibility");
++		return -ENOMEM;
++	}
++	*driver_info = (struct gve_driver_info) {
++		.os_type = 5, /* DPDK */
++		.driver_major = GVE_VERSION_MAJOR,
++		.driver_minor = GVE_VERSION_MINOR,
++		.driver_sub = GVE_VERSION_SUB,
++		.os_version_major = cpu_to_be32(DPDK_VERSION_MAJOR),
++		.os_version_minor = cpu_to_be32(DPDK_VERSION_MINOR),
++		.os_version_sub = cpu_to_be32(DPDK_VERSION_SUB),
++		.driver_capability_flags = {
++			cpu_to_be64(GVE_DRIVER_CAPABILITY_FLAGS1),
++			cpu_to_be64(GVE_DRIVER_CAPABILITY_FLAGS2),
++			cpu_to_be64(GVE_DRIVER_CAPABILITY_FLAGS3),
++			cpu_to_be64(GVE_DRIVER_CAPABILITY_FLAGS4),
++		},
++	};
++
++	populate_driver_version_strings((char *)driver_info->os_version_str1,
++			(char *)driver_info->os_version_str2);
++
++	err = gve_adminq_verify_driver_compatibility(priv,
++		sizeof(struct gve_driver_info), (dma_addr_t)driver_info);
++
++	/* It's ok if the device doesn't support this */
++	if (err == -EOPNOTSUPP)
++		err = 0;
++
++	free(driver_info);
++	return err;
++}
++
+ static int
+ gve_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
+ {
+@@ -672,6 +706,11 @@ gve_init_priv(struct gve_priv *priv, bool skip_describe_device)
+ 		PMD_DRV_LOG(ERR, "Failed to alloc admin queue: err=%d", err);
+ 		return err;
+ 	}
++	err = gve_verify_driver_compatibility(priv);
++	if (err) {
++		PMD_DRV_LOG(ERR, "Could not verify driver compatibility: err=%d", err);
++		goto free_adminq;
++	}
+ 
+ 	if (skip_describe_device)
+ 		goto setup_device;
+diff --git a/drivers/net/gve/gve_ethdev.h b/drivers/net/gve/gve_ethdev.h
+index 42a02cf5d4..23ccff37d3 100644
+--- a/drivers/net/gve/gve_ethdev.h
++++ b/drivers/net/gve/gve_ethdev.h
+@@ -222,7 +222,7 @@ struct gve_priv {
+ 	uint32_t adminq_report_stats_cnt;
+ 	uint32_t adminq_report_link_speed_cnt;
+ 	uint32_t adminq_get_ptype_map_cnt;
+-
++	uint32_t adminq_verify_driver_compatibility_cnt;
+ 	volatile uint32_t state_flags;
+ 
+ 	/* Gvnic device link speed from hypervisor. */
+diff --git a/drivers/net/gve/gve_version.c b/drivers/net/gve/gve_version.c
+new file mode 100644
+index 0000000000..5fe34dc179
+--- /dev/null
++++ b/drivers/net/gve/gve_version.c
+@@ -0,0 +1,13 @@
++/* SPDX-License-Identifier: BSD-3-Clause
++ * Copyright (C) 2015-2023 Google, Inc.
++ */
++#include "gve_version.h"
++
++const char *gve_version_string(void)
++{
++	static char gve_version[20];
++	snprintf(gve_version, sizeof(gve_version), "%s%d.%d.%d",
++		GVE_VERSION_PREFIX, GVE_VERSION_MAJOR, GVE_VERSION_MINOR,
++		GVE_VERSION_SUB);
++	return gve_version;
++}
+diff --git a/drivers/net/gve/gve_version.h b/drivers/net/gve/gve_version.h
+new file mode 100644
+index 0000000000..4dd998dca1
+--- /dev/null
++++ b/drivers/net/gve/gve_version.h
+@@ -0,0 +1,24 @@
++/* SPDX-License-Identifier: BSD-3-Clause
++ * Copyright (C) 2015-2023 Google, Inc.
++ */
++
++#ifndef _GVE_VERSION_H_
++#define _GVE_VERSION_H_
++
++#include <rte_version.h>
++
++#define GVE_VERSION_PREFIX "DPDK-"
++#define GVE_VERSION_MAJOR 1
++#define GVE_VERSION_MINOR 0
++#define GVE_VERSION_SUB 0
++
++#define DPDK_VERSION_MAJOR (100 * RTE_VER_YEAR + RTE_VER_MONTH)
++#define DPDK_VERSION_MINOR RTE_VER_MINOR
++#define DPDK_VERSION_SUB RTE_VER_RELEASE
++
++
++const char *
++gve_version_string(void);
++
++
++#endif /* GVE_VERSION_H */
+diff --git a/drivers/net/gve/meson.build b/drivers/net/gve/meson.build
+index af0010c01c..365b7ffdaa 100644
+--- a/drivers/net/gve/meson.build
++++ b/drivers/net/gve/meson.build
+@@ -1,9 +1,9 @@
+ # SPDX-License-Identifier: BSD-3-Clause
+ # Copyright(C) 2022 Intel Corporation
+ 
+-if is_windows
++if not is_linux
+     build = false
+-    reason = 'not supported on Windows'
++    reason = 'only supported on Linux'
+     subdir_done()
+ endif
+ 
+@@ -12,5 +12,6 @@ sources = files(
+         'gve_rx.c',
+         'gve_tx.c',
+         'gve_ethdev.c',
++        'gve_version.c',
+ )
+ includes += include_directories('base')
+-- 
+2.40.1.698.g37aff9b760-goog
+
drivers/net/gve/base/gve.h +0 -3
index 2b7cf7d99b..f7b297e759 100644
@@ -9,9 +9,6 @@
 #include "gve_desc.h"
 #include "gve_desc_dqo.h"
 
-#define GVE_VERSION		"1.3.0"
-#define GVE_VERSION_PREFIX	"GVE-"
-
 #ifndef GOOGLE_VENDOR_ID
 #define GOOGLE_VENDOR_ID	0x1ae0
 #endif
drivers/net/gve/base/gve_adminq.c +19 -0
index e963f910a0..41202725e6 100644
@@ -401,6 +401,9 @@ static int gve_adminq_issue_cmd(struct gve_priv *priv,
 	case GVE_ADMINQ_GET_PTYPE_MAP:
 		priv->adminq_get_ptype_map_cnt++;
 		break;
+	case GVE_ADMINQ_VERIFY_DRIVER_COMPATIBILITY:
+		priv->adminq_verify_driver_compatibility_cnt++;
+		break;
 	default:
 		PMD_DRV_LOG(ERR, "unknown AQ command opcode %d", opcode);
 	}
@@ -465,6 +468,22 @@ int gve_adminq_configure_device_resources(struct gve_priv *priv,
 	return gve_adminq_execute_cmd(priv, &cmd);
 }
 
+int gve_adminq_verify_driver_compatibility(struct gve_priv *priv,
+					   u64 driver_info_len,
+					   dma_addr_t driver_info_addr)
+{
+	union gve_adminq_command cmd;
+
+	memset(&cmd, 0, sizeof(cmd));
+	cmd.opcode = cpu_to_be32(GVE_ADMINQ_VERIFY_DRIVER_COMPATIBILITY);
+	cmd.verify_driver_compatibility = (struct gve_adminq_verify_driver_compatibility) {
+		.driver_info_len = cpu_to_be64(driver_info_len),
+		.driver_info_addr = cpu_to_be64(driver_info_addr),
+	};
+
+	return gve_adminq_execute_cmd(priv, &cmd);
+}
+
 int gve_adminq_deconfigure_device_resources(struct gve_priv *priv)
 {
 	union gve_adminq_command cmd;
drivers/net/gve/base/gve_adminq.h +45 -1

73 lines not on this page · raw message

drivers/net/gve/base/gve_osdep.h +24 -0
index abf3d379ae..5e8ae1eac6 100644
@@ -21,9 +21,14 @@
 #include <rte_malloc.h>
 #include <rte_memcpy.h>
 #include <rte_memzone.h>
+#include <rte_version.h>
 
 #include "../gve_logs.h"
 
+#ifdef __linux__
+#include <sys/utsname.h>
+#endif
+
 typedef uint8_t u8;
 typedef uint16_t u16;
 typedef uint32_t u32;
@@ -73,6 +78,12 @@ typedef rte_iova_t dma_addr_t;
 
 #define msleep(ms)		rte_delay_ms(ms)
 
+#define OS_VERSION_STRLEN 128
+struct os_version_string {
+	char os_version_str1[OS_VERSION_STRLEN];
+	char os_version_str2[OS_VERSION_STRLEN];
+};
+
 /* These macros are used to generate compilation errors if a struct/union
  * is not exactly the correct length. It gives a divide by zero error if
  * the struct/union is not of the correct size, otherwise it creates an
@@ -160,4 +171,17 @@ gve_free_dma_mem(struct gve_dma_mem *mem)
 	mem->pa = 0;
 }
 
+static inline void
+populate_driver_version_strings(char *str1, char *str2)
+{
+	struct utsname uts;
+	if (uname(&uts) >= 0) {
+		/* release */
+		rte_strscpy(str1, uts.release,
+			OS_VERSION_STRLEN);
+		/* version */
+		rte_strscpy(str2, uts.version,
+			OS_VERSION_STRLEN);
+	}
+}
 #endif /* _GVE_OSDEP_H_ */
drivers/net/gve/gve_ethdev.c +49 -11

82 lines not on this page · raw message

drivers/net/gve/gve_ethdev.h +1 -1
index cd62debd22..c9bcfa553c 100644
@@ -268,7 +268,7 @@ struct gve_priv {
 	uint32_t adminq_report_stats_cnt;
 	uint32_t adminq_report_link_speed_cnt;
 	uint32_t adminq_get_ptype_map_cnt;
-
+	uint32_t adminq_verify_driver_compatibility_cnt;
 	volatile uint32_t state_flags;
 
 	/* Gvnic device link speed from hypervisor. */
drivers/net/gve/gve_version.c new file +13 -0
new file mode 100644
index 0000000000..5fe34dc179
@@ -0,0 +1,13 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (C) 2015-2023 Google, Inc.
+ */
+#include "gve_version.h"
+
+const char *gve_version_string(void)
+{
+	static char gve_version[20];
+	snprintf(gve_version, sizeof(gve_version), "%s%d.%d.%d",
+		GVE_VERSION_PREFIX, GVE_VERSION_MAJOR, GVE_VERSION_MINOR,
+		GVE_VERSION_SUB);
+	return gve_version;
+}
drivers/net/gve/gve_version.h new file +24 -0
new file mode 100644
index 0000000000..4dd998dca1
@@ -0,0 +1,24 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (C) 2015-2023 Google, Inc.
+ */
+
+#ifndef _GVE_VERSION_H_
+#define _GVE_VERSION_H_
+
+#include <rte_version.h>
+
+#define GVE_VERSION_PREFIX "DPDK-"
+#define GVE_VERSION_MAJOR 1
+#define GVE_VERSION_MINOR 0
+#define GVE_VERSION_SUB 0
+
+#define DPDK_VERSION_MAJOR (100 * RTE_VER_YEAR + RTE_VER_MONTH)
+#define DPDK_VERSION_MINOR RTE_VER_MINOR
+#define DPDK_VERSION_SUB RTE_VER_RELEASE
+
+
+const char *
+gve_version_string(void);
+
+
+#endif /* GVE_VERSION_H */
drivers/net/gve/meson.build +3 -2
index c9d87903f9..61d195009c 100644
@@ -1,9 +1,9 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(C) 2022 Intel Corporation
 
-if is_windows
+if not is_linux
     build = false
-    reason = 'not supported on Windows'
+    reason = 'only supported on Linux'
     subdir_done()
 endif
 
@@ -14,5 +14,6 @@ sources = files(
         'gve_rx_dqo.c',
         'gve_tx_dqo.c',
         'gve_ethdev.c',
+        'gve_version.c',
 )
 includes += include_directories('base')
Signature · 1 line
2.40.1.698.g37aff9b760-goog
#14 lore raw

PATCH 1/1 net/gve: check driver compatibility

In reply to Rushil Gupta

Change gve_driver_info fields to report DPDK as OS type and DPDK RTE version as OS version, reserving driver_version fields for GVE driver version based on features.

---
 drivers/net/gve/base/gve.h        |  3 --
 drivers/net/gve/base/gve_adminq.c | 19 ++++++++++
 drivers/net/gve/base/gve_adminq.h | 46 ++++++++++++++++++++++-
 drivers/net/gve/base/gve_osdep.h  | 24 ++++++++++++
 drivers/net/gve/gve_ethdev.c      | 61 +++++++++++++++++++++++++------
 drivers/net/gve/gve_ethdev.h      |  2 +-
 drivers/net/gve/gve_version.c     | 13 +++++++
 drivers/net/gve/gve_version.h     | 24 ++++++++++++
 drivers/net/gve/meson.build       |  5 ++-
 9 files changed, 179 insertions(+), 18 deletions(-)
 create mode 100644 drivers/net/gve/gve_version.c
 create mode 100644 drivers/net/gve/gve_version.h
drivers/net/gve/base/gve.h +0 -3
index 2b7cf7d99b..f7b297e759 100644
@@ -9,9 +9,6 @@
 #include "gve_desc.h"
 #include "gve_desc_dqo.h"
 
-#define GVE_VERSION		"1.3.0"
-#define GVE_VERSION_PREFIX	"GVE-"
-
 #ifndef GOOGLE_VENDOR_ID
 #define GOOGLE_VENDOR_ID	0x1ae0
 #endif
drivers/net/gve/base/gve_adminq.c +19 -0
index e963f910a0..41202725e6 100644
@@ -401,6 +401,9 @@ static int gve_adminq_issue_cmd(struct gve_priv *priv,
 	case GVE_ADMINQ_GET_PTYPE_MAP:
 		priv->adminq_get_ptype_map_cnt++;
 		break;
+	case GVE_ADMINQ_VERIFY_DRIVER_COMPATIBILITY:
+		priv->adminq_verify_driver_compatibility_cnt++;
+		break;
 	default:
 		PMD_DRV_LOG(ERR, "unknown AQ command opcode %d", opcode);
 	}
@@ -465,6 +468,22 @@ int gve_adminq_configure_device_resources(struct gve_priv *priv,
 	return gve_adminq_execute_cmd(priv, &cmd);
 }
 
+int gve_adminq_verify_driver_compatibility(struct gve_priv *priv,
+					   u64 driver_info_len,
+					   dma_addr_t driver_info_addr)
+{
+	union gve_adminq_command cmd;
+
+	memset(&cmd, 0, sizeof(cmd));
+	cmd.opcode = cpu_to_be32(GVE_ADMINQ_VERIFY_DRIVER_COMPATIBILITY);
+	cmd.verify_driver_compatibility = (struct gve_adminq_verify_driver_compatibility) {
+		.driver_info_len = cpu_to_be64(driver_info_len),
+		.driver_info_addr = cpu_to_be64(driver_info_addr),
+	};
+
+	return gve_adminq_execute_cmd(priv, &cmd);
+}
+
 int gve_adminq_deconfigure_device_resources(struct gve_priv *priv)
 {
 	union gve_adminq_command cmd;
drivers/net/gve/base/gve_adminq.h +45 -1

73 lines not on this page · raw message

drivers/net/gve/base/gve_osdep.h +24 -0
index abf3d379ae..5e8ae1eac6 100644
@@ -21,9 +21,14 @@
 #include <rte_malloc.h>
 #include <rte_memcpy.h>
 #include <rte_memzone.h>
+#include <rte_version.h>
 
 #include "../gve_logs.h"
 
+#ifdef __linux__
+#include <sys/utsname.h>
+#endif
+
 typedef uint8_t u8;
 typedef uint16_t u16;
 typedef uint32_t u32;
@@ -73,6 +78,12 @@ typedef rte_iova_t dma_addr_t;
 
 #define msleep(ms)		rte_delay_ms(ms)
 
+#define OS_VERSION_STRLEN 128
+struct os_version_string {
+	char os_version_str1[OS_VERSION_STRLEN];
+	char os_version_str2[OS_VERSION_STRLEN];
+};
+
 /* These macros are used to generate compilation errors if a struct/union
  * is not exactly the correct length. It gives a divide by zero error if
  * the struct/union is not of the correct size, otherwise it creates an
@@ -160,4 +171,17 @@ gve_free_dma_mem(struct gve_dma_mem *mem)
 	mem->pa = 0;
 }
 
+static inline void
+populate_driver_version_strings(char *str1, char *str2)
+{
+	struct utsname uts;
+	if (uname(&uts) >= 0) {
+		/* release */
+		rte_strscpy(str1, uts.release,
+			OS_VERSION_STRLEN);
+		/* version */
+		rte_strscpy(str2, uts.version,
+			OS_VERSION_STRLEN);
+	}
+}
 #endif /* _GVE_OSDEP_H_ */
drivers/net/gve/gve_ethdev.c +50 -11

83 lines not on this page · raw message

drivers/net/gve/gve_ethdev.h +1 -1
index cd62debd22..c9bcfa553c 100644
@@ -268,7 +268,7 @@ struct gve_priv {
 	uint32_t adminq_report_stats_cnt;
 	uint32_t adminq_report_link_speed_cnt;
 	uint32_t adminq_get_ptype_map_cnt;
-
+	uint32_t adminq_verify_driver_compatibility_cnt;
 	volatile uint32_t state_flags;
 
 	/* Gvnic device link speed from hypervisor. */
drivers/net/gve/gve_version.c new file +13 -0
new file mode 100644
index 0000000000..5fe34dc179
@@ -0,0 +1,13 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (C) 2015-2023 Google, Inc.
+ */
+#include "gve_version.h"
+
+const char *gve_version_string(void)
+{
+	static char gve_version[20];
+	snprintf(gve_version, sizeof(gve_version), "%s%d.%d.%d",
+		GVE_VERSION_PREFIX, GVE_VERSION_MAJOR, GVE_VERSION_MINOR,
+		GVE_VERSION_SUB);
+	return gve_version;
+}
drivers/net/gve/gve_version.h new file +24 -0
new file mode 100644
index 0000000000..4dd998dca1
@@ -0,0 +1,24 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (C) 2015-2023 Google, Inc.
+ */
+
+#ifndef _GVE_VERSION_H_
+#define _GVE_VERSION_H_
+
+#include <rte_version.h>
+
+#define GVE_VERSION_PREFIX "DPDK-"
+#define GVE_VERSION_MAJOR 1
+#define GVE_VERSION_MINOR 0
+#define GVE_VERSION_SUB 0
+
+#define DPDK_VERSION_MAJOR (100 * RTE_VER_YEAR + RTE_VER_MONTH)
+#define DPDK_VERSION_MINOR RTE_VER_MINOR
+#define DPDK_VERSION_SUB RTE_VER_RELEASE
+
+
+const char *
+gve_version_string(void);
+
+
+#endif /* GVE_VERSION_H */
drivers/net/gve/meson.build +3 -2
index c9d87903f9..61d195009c 100644
@@ -1,9 +1,9 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(C) 2022 Intel Corporation
 
-if is_windows
+if not is_linux
     build = false
-    reason = 'not supported on Windows'
+    reason = 'only supported on Linux'
     subdir_done()
 endif
 
@@ -14,5 +14,6 @@ sources = files(
         'gve_rx_dqo.c',
         'gve_tx_dqo.c',
         'gve_ethdev.c',
+        'gve_version.c',
 )
 includes += include_directories('base')
Signature · 1 line
2.40.1.698.g37aff9b760-goog
#15 lore raw

Re: [PATCH] net/gve: check driver compatibility

Hi Ferruh
I have updated the latest patch here:
http://patchwork.dpdk.org/project/dpdk/patch/[email protected]/
However, using calloc causes issue while executing verify-compatibility command.

sudo dpdk-testpmd -a 00:04.0 -l 0-32 -- --forward-mode=rxonly --txq=16 --rxq=16 --nb-cores=16 --stats-period 5
...
EAL: Using IOMMU type 8 (No-IOMMU)
EAL: Probe PCI driver: net_gve (1ae0:42) device: 0000:00:04.0 (socket -1) gve_adminq_parse_err(): AQ command failed with status -9 gve_init_priv(): Could not verify driver compatibility: err=-22
EAL: Releasing PCI mapped resource for 0000:00:04.0
...
EAL: Error - exiting with code: 1

This is probably because the adminq command is sharing memory to report driver-info to the gvnic device and that needs to be in dpdk memory.

Quoted 384 lines · Rushil Gupta

Change gve_driver_info fields to report DPDK as OS type and DPDK RTE version as OS version, reserving driver_version fields for GVE driver version based on features.

---
 drivers/net/gve/base/gve.h        |  3 --
 drivers/net/gve/base/gve_adminq.c | 19 ++++++++++
 drivers/net/gve/base/gve_adminq.h | 46 ++++++++++++++++++++++-
 drivers/net/gve/base/gve_osdep.h  | 24 ++++++++++++
 drivers/net/gve/gve_ethdev.c      | 61 +++++++++++++++++++++++++------
 drivers/net/gve/gve_ethdev.h      |  2 +-
 drivers/net/gve/gve_version.c     | 13 +++++++
 drivers/net/gve/gve_version.h     | 24 ++++++++++++
 drivers/net/gve/meson.build       |  5 ++-
 9 files changed, 179 insertions(+), 18 deletions(-)
 create mode 100644 drivers/net/gve/gve_version.c
 create mode 100644 drivers/net/gve/gve_version.h
drivers/net/gve/base/gve.h +0 -3
index 2b7cf7d99b..f7b297e759 100644
@@ -9,9 +9,6 @@
 #include "gve_desc.h"
 #include "gve_desc_dqo.h"
 
-#define GVE_VERSION            "1.3.0"
-#define GVE_VERSION_PREFIX     "GVE-"
-
 #ifndef GOOGLE_VENDOR_ID
 #define GOOGLE_VENDOR_ID       0x1ae0
 #endif
drivers/net/gve/base/gve_adminq.c +19 -0
index e963f910a0..41202725e6 100644
@@ -401,6 +401,9 @@ static int gve_adminq_issue_cmd(struct gve_priv *priv,
        case GVE_ADMINQ_GET_PTYPE_MAP:
                priv->adminq_get_ptype_map_cnt++;
                break;
+       case GVE_ADMINQ_VERIFY_DRIVER_COMPATIBILITY:
+               priv->adminq_verify_driver_compatibility_cnt++;
+               break;
        default:
                PMD_DRV_LOG(ERR, "unknown AQ command opcode %d", opcode);
        }
@@ -465,6 +468,22 @@ int gve_adminq_configure_device_resources(struct gve_priv *priv,
        return gve_adminq_execute_cmd(priv, &cmd);
 }
 
+int gve_adminq_verify_driver_compatibility(struct gve_priv *priv,
+                                          u64 driver_info_len,
+                                          dma_addr_t driver_info_addr)
+{
+       union gve_adminq_command cmd;
+
+       memset(&cmd, 0, sizeof(cmd));
+       cmd.opcode = cpu_to_be32(GVE_ADMINQ_VERIFY_DRIVER_COMPATIBILITY);
+       cmd.verify_driver_compatibility = (struct gve_adminq_verify_driver_compatibility) {
+               .driver_info_len = cpu_to_be64(driver_info_len),
+               .driver_info_addr = cpu_to_be64(driver_info_addr),
+       };
+
+       return gve_adminq_execute_cmd(priv, &cmd);
+}
+
 int gve_adminq_deconfigure_device_resources(struct gve_priv *priv)
 {
        union gve_adminq_command cmd;
drivers/net/gve/base/gve_adminq.h +45 -1
index 05550119de..e30b184913 100644
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: MIT
  * Google Virtual Ethernet (gve) driver
- * Copyright (C) 2015-2022 Google, Inc.
+ * Copyright (C) 2015-2023 Google, Inc.
  */
 
 #ifndef _GVE_ADMINQ_H
@@ -23,6 +23,7 @@ enum gve_adminq_opcodes {
        GVE_ADMINQ_REPORT_STATS                 = 0xC,
        GVE_ADMINQ_REPORT_LINK_SPEED            = 0xD,
        GVE_ADMINQ_GET_PTYPE_MAP                = 0xE,
+       GVE_ADMINQ_VERIFY_DRIVER_COMPATIBILITY  = 0xF,
 };
 
 /* Admin queue status codes */
@@ -145,6 +146,44 @@ enum gve_sup_feature_mask {
 };
 
 #define GVE_DEV_OPT_LEN_GQI_RAW_ADDRESSING 0x0
+enum gve_driver_capbility {
+       gve_driver_capability_gqi_qpl = 0,
+       gve_driver_capability_gqi_rda = 1,
+       gve_driver_capability_dqo_qpl = 2, /* reserved for future use */
+       gve_driver_capability_dqo_rda = 3,
+};
+
+#define GVE_CAP1(a) BIT((int)a)
+
+#define GVE_DRIVER_CAPABILITY_FLAGS1 \
+       (GVE_CAP1(gve_driver_capability_gqi_qpl) | \
+        GVE_CAP1(gve_driver_capability_gqi_rda) | \
+        GVE_CAP1(gve_driver_capability_dqo_rda))
+
+#define GVE_DRIVER_CAPABILITY_FLAGS2 0x0
+#define GVE_DRIVER_CAPABILITY_FLAGS3 0x0
+#define GVE_DRIVER_CAPABILITY_FLAGS4 0x0
+
+struct gve_driver_info {
+       u8 os_type;     /* 0x05 = DPDK */
+       u8 driver_major;
+       u8 driver_minor;
+       u8 driver_sub;
+       __be32 os_version_major;
+       __be32 os_version_minor;
+       __be32 os_version_sub;
+       __be64 driver_capability_flags[4];
+       u8 os_version_str1[OS_VERSION_STRLEN];
+       u8 os_version_str2[OS_VERSION_STRLEN];
+};
+
+struct gve_adminq_verify_driver_compatibility {
+       __be64 driver_info_len;
+       __be64 driver_info_addr;
+};
+
+GVE_CHECK_STRUCT_LEN(16,  gve_adminq_verify_driver_compatibility);
+
 
 struct gve_adminq_configure_device_resources {
        __be64 counter_array;
@@ -345,6 +384,8 @@ union gve_adminq_command {
                        struct gve_adminq_report_stats report_stats;
                        struct gve_adminq_report_link_speed report_link_speed;
                        struct gve_adminq_get_ptype_map get_ptype_map;
+                       struct gve_adminq_verify_driver_compatibility
+                               verify_driver_compatibility;
                };
        };
        u8 reserved[64];
@@ -378,4 +419,7 @@ struct gve_ptype_lut;
 int gve_adminq_get_ptype_map_dqo(struct gve_priv *priv,
                                 struct gve_ptype_lut *ptype_lut);
 
+int gve_adminq_verify_driver_compatibility(struct gve_priv *priv,
+                                          u64 driver_info_len,
+                                          dma_addr_t driver_info_addr);
 #endif /* _GVE_ADMINQ_H */
drivers/net/gve/base/gve_osdep.h +24 -0
index abf3d379ae..5e8ae1eac6 100644
@@ -21,9 +21,14 @@
 #include <rte_malloc.h>
 #include <rte_memcpy.h>
 #include <rte_memzone.h>
+#include <rte_version.h>
 
 #include "../gve_logs.h"
 
+#ifdef __linux__
+#include <sys/utsname.h>
+#endif
+
 typedef uint8_t u8;
 typedef uint16_t u16;
 typedef uint32_t u32;
@@ -73,6 +78,12 @@ typedef rte_iova_t dma_addr_t;
 
 #define msleep(ms)             rte_delay_ms(ms)
 
+#define OS_VERSION_STRLEN 128
+struct os_version_string {
+       char os_version_str1[OS_VERSION_STRLEN];
+       char os_version_str2[OS_VERSION_STRLEN];
+};
+
 /* These macros are used to generate compilation errors if a struct/union
  * is not exactly the correct length. It gives a divide by zero error if
  * the struct/union is not of the correct size, otherwise it creates an
@@ -160,4 +171,17 @@ gve_free_dma_mem(struct gve_dma_mem *mem)
        mem->pa = 0;
 }
 
+static inline void
+populate_driver_version_strings(char *str1, char *str2)
+{
+       struct utsname uts;
+       if (uname(&uts) >= 0) {
+               /* release */
+               rte_strscpy(str1, uts.release,
+                       OS_VERSION_STRLEN);
+               /* version */
+               rte_strscpy(str2, uts.version,
+                       OS_VERSION_STRLEN);
+       }
+}
 #endif /* _GVE_OSDEP_H_ */
drivers/net/gve/gve_ethdev.c +50 -11
index 1dcb3b3a01..71d131fb41 100644
@@ -5,21 +5,13 @@
 #include "gve_ethdev.h"
 #include "base/gve_adminq.h"
 #include "base/gve_register.h"
-
-const char gve_version_str[] = GVE_VERSION;
-static const char gve_version_prefix[] = GVE_VERSION_PREFIX;
+#include "base/gve_osdep.h"
+#include "gve_version.h"
 
 static void
 gve_write_version(uint8_t *driver_version_register)
 {
-       const char *c = gve_version_prefix;
-
-       while (*c) {
-               writeb(*c, driver_version_register);
-               c++;
-       }
-
-       c = gve_version_str;
+       const char *c = gve_version_string();
        while (*c) {
                writeb(*c, driver_version_register);
                c++;
@@ -245,6 +237,48 @@ gve_dev_close(struct rte_eth_dev *dev)
        return err;
 }
 
+static int
+gve_verify_driver_compatibility(struct gve_priv *priv)
+{
+       struct gve_driver_info *driver_info;
+       int err;
+
+       driver_info = rte_zmalloc("driver info",
+                       sizeof(struct gve_driver_info), 0);
+       if (driver_info == NULL) {
+               PMD_DRV_LOG(ERR,
+                           "Could not alloc for verify driver compatibility");
+               return -ENOMEM;
+       }
+       *driver_info = (struct gve_driver_info) {
+               .os_type = 5, /* DPDK */
+               .driver_major = GVE_VERSION_MAJOR,
+               .driver_minor = GVE_VERSION_MINOR,
+               .driver_sub = GVE_VERSION_SUB,
+               .os_version_major = cpu_to_be32(DPDK_VERSION_MAJOR),
+               .os_version_minor = cpu_to_be32(DPDK_VERSION_MINOR),
+               .os_version_sub = cpu_to_be32(DPDK_VERSION_SUB),
+               .driver_capability_flags = {
+                       cpu_to_be64(GVE_DRIVER_CAPABILITY_FLAGS1),
+                       cpu_to_be64(GVE_DRIVER_CAPABILITY_FLAGS2),
+                       cpu_to_be64(GVE_DRIVER_CAPABILITY_FLAGS3),
+                       cpu_to_be64(GVE_DRIVER_CAPABILITY_FLAGS4),
+               },
+       };
+
+       populate_driver_version_strings((char *)driver_info->os_version_str1,
+                       (char *)driver_info->os_version_str2);
+
+       err = gve_adminq_verify_driver_compatibility(priv,
+               sizeof(struct gve_driver_info), (dma_addr_t)driver_info);
+       /* It's ok if the device doesn't support this */
+       if (err == -EOPNOTSUPP)
+               err = 0;
+
+       rte_free(driver_info);
+       return err;
+}
+
 static int
 gve_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
 {
@@ -679,6 +713,11 @@ gve_init_priv(struct gve_priv *priv, bool skip_describe_device)
                PMD_DRV_LOG(ERR, "Failed to alloc admin queue: err=%d", err);
                return err;
        }
+       err = gve_verify_driver_compatibility(priv);
+       if (err) {
+               PMD_DRV_LOG(ERR, "Could not verify driver compatibility: err=%d", err);
+               goto free_adminq;
+       }
 
        if (skip_describe_device)
                goto setup_device;
drivers/net/gve/gve_ethdev.h +1 -1
index cd62debd22..c9bcfa553c 100644
@@ -268,7 +268,7 @@ struct gve_priv {
        uint32_t adminq_report_stats_cnt;
        uint32_t adminq_report_link_speed_cnt;
        uint32_t adminq_get_ptype_map_cnt;
-
+       uint32_t adminq_verify_driver_compatibility_cnt;
        volatile uint32_t state_flags;
 
        /* Gvnic device link speed from hypervisor. */
drivers/net/gve/gve_version.c new file +13 -0
new file mode 100644
index 0000000000..5fe34dc179
@@ -0,0 +1,13 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (C) 2015-2023 Google, Inc.
+ */
+#include "gve_version.h"
+
+const char *gve_version_string(void)
+{
+       static char gve_version[20];
+       snprintf(gve_version, sizeof(gve_version), "%s%d.%d.%d",
+               GVE_VERSION_PREFIX, GVE_VERSION_MAJOR, GVE_VERSION_MINOR,
+               GVE_VERSION_SUB);
+       return gve_version;
+}
drivers/net/gve/gve_version.h new file +24 -0
new file mode 100644
index 0000000000..4dd998dca1
@@ -0,0 +1,24 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (C) 2015-2023 Google, Inc.
+ */
+
+#ifndef _GVE_VERSION_H_
+#define _GVE_VERSION_H_
+
+#include <rte_version.h>
+
+#define GVE_VERSION_PREFIX "DPDK-"
+#define GVE_VERSION_MAJOR 1
+#define GVE_VERSION_MINOR 0
+#define GVE_VERSION_SUB 0
+
+#define DPDK_VERSION_MAJOR (100 * RTE_VER_YEAR + RTE_VER_MONTH)
+#define DPDK_VERSION_MINOR RTE_VER_MINOR
+#define DPDK_VERSION_SUB RTE_VER_RELEASE
+
+
+const char *
+gve_version_string(void);
+
+
+#endif /* GVE_VERSION_H */
drivers/net/gve/meson.build +3 -3
index c9d87903f9..61d195009c 100644
@@ -1,9 +1,9 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(C) 2022 Intel Corporation
 
-if is_windows
+if not is_linux
     build = false
-    reason = 'not supported on Windows'
+    reason = 'only supported on Linux'
     subdir_done()
 endif
 
@@ -14,5 +14,6 @@ sources = files(
         'gve_rx_dqo.c',
         'gve_tx_dqo.c',
         'gve_ethdev.c',
+        'gve_version.c',
 )
 includes += include_directories('base')
--

2.40.1.698.g37aff9b760-goog

#16 lore raw

Re: [PATCH] net/gve: check driver compatibility

Quoted 17 lines · Rushil Gupta

Hi Ferruh
I have updated the latest patch here:
http://patchwork.dpdk.org/project/dpdk/patch/[email protected]/
However, using calloc causes issue while executing verify-compatibility command.

sudo dpdk-testpmd -a 00:04.0 -l 0-32 -- --forward-mode=rxonly --txq=16 --rxq=16 --nb-cores=16 --stats-period 5
...
EAL: Using IOMMU type 8 (No-IOMMU)
EAL: Probe PCI driver: net_gve (1ae0:42) device: 0000:00:04.0 (socket -1) gve_adminq_parse_err(): AQ command failed with status -9 gve_init_priv(): Could not verify driver compatibility: err=-22
EAL: Releasing PCI mapped resource for 0000:00:04.0
...
EAL: Error - exiting with code: 1

Quoted 5 lines

This is probably because the adminq command is sharing memory to report driver-info to the gvnic device and that needs to be in dpdk memory.

Hi Rushil,

That is OK, I missed this requirement.

Admin command passes pointers for device to process, what is the address type requirement here?
Some other commands pass pysical address (iova address) via the command.

Both 'calloc()' and 'rte_zmalloc()' returns (guest) virtual address, why one doesn't work but other does?

Initial version was passing 'rte_memzone' pointer, are you updating the hyperviser side based on changes on dpdk side?

And perhaps better to switch to 'rte_memzone_reserve_aligned()' as done initial version and pass (guest) pysical address via adminq, if that is the requirement?

Quoted 386 lines · Rushil Gupta
Quoted 384 lines

Change gve_driver_info fields to report DPDK as OS type and DPDK RTE version as OS version, reserving driver_version fields for GVE driver version based on features.

---
 drivers/net/gve/base/gve.h        |  3 --
 drivers/net/gve/base/gve_adminq.c | 19 ++++++++++
 drivers/net/gve/base/gve_adminq.h | 46 ++++++++++++++++++++++-
 drivers/net/gve/base/gve_osdep.h  | 24 ++++++++++++
 drivers/net/gve/gve_ethdev.c      | 61 +++++++++++++++++++++++++------
 drivers/net/gve/gve_ethdev.h      |  2 +-
 drivers/net/gve/gve_version.c     | 13 +++++++
 drivers/net/gve/gve_version.h     | 24 ++++++++++++
 drivers/net/gve/meson.build       |  5 ++-
 9 files changed, 179 insertions(+), 18 deletions(-)
 create mode 100644 drivers/net/gve/gve_version.c
 create mode 100644 drivers/net/gve/gve_version.h
drivers/net/gve/base/gve.h +0 -3
index 2b7cf7d99b..f7b297e759 100644
@@ -9,9 +9,6 @@
 #include "gve_desc.h"
 #include "gve_desc_dqo.h"
 
-#define GVE_VERSION            "1.3.0"
-#define GVE_VERSION_PREFIX     "GVE-"
-
 #ifndef GOOGLE_VENDOR_ID
 #define GOOGLE_VENDOR_ID       0x1ae0
 #endif
drivers/net/gve/base/gve_adminq.c +19 -0
index e963f910a0..41202725e6 100644
@@ -401,6 +401,9 @@ static int gve_adminq_issue_cmd(struct gve_priv *priv,
        case GVE_ADMINQ_GET_PTYPE_MAP:
                priv->adminq_get_ptype_map_cnt++;
                break;
+       case GVE_ADMINQ_VERIFY_DRIVER_COMPATIBILITY:
+               priv->adminq_verify_driver_compatibility_cnt++;
+               break;
        default:
                PMD_DRV_LOG(ERR, "unknown AQ command opcode %d", opcode);
        }
@@ -465,6 +468,22 @@ int gve_adminq_configure_device_resources(struct gve_priv *priv,
        return gve_adminq_execute_cmd(priv, &cmd);
 }
 
+int gve_adminq_verify_driver_compatibility(struct gve_priv *priv,
+                                          u64 driver_info_len,
+                                          dma_addr_t driver_info_addr)
+{
+       union gve_adminq_command cmd;
+
+       memset(&cmd, 0, sizeof(cmd));
+       cmd.opcode = cpu_to_be32(GVE_ADMINQ_VERIFY_DRIVER_COMPATIBILITY);
+       cmd.verify_driver_compatibility = (struct gve_adminq_verify_driver_compatibility) {
+               .driver_info_len = cpu_to_be64(driver_info_len),
+               .driver_info_addr = cpu_to_be64(driver_info_addr),
+       };
+
+       return gve_adminq_execute_cmd(priv, &cmd);
+}
+
 int gve_adminq_deconfigure_device_resources(struct gve_priv *priv)
 {
        union gve_adminq_command cmd;
drivers/net/gve/base/gve_adminq.h +45 -1
index 05550119de..e30b184913 100644
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: MIT
  * Google Virtual Ethernet (gve) driver
- * Copyright (C) 2015-2022 Google, Inc.
+ * Copyright (C) 2015-2023 Google, Inc.
  */
 
 #ifndef _GVE_ADMINQ_H
@@ -23,6 +23,7 @@ enum gve_adminq_opcodes {
        GVE_ADMINQ_REPORT_STATS                 = 0xC,
        GVE_ADMINQ_REPORT_LINK_SPEED            = 0xD,
        GVE_ADMINQ_GET_PTYPE_MAP                = 0xE,
+       GVE_ADMINQ_VERIFY_DRIVER_COMPATIBILITY  = 0xF,
 };
 
 /* Admin queue status codes */
@@ -145,6 +146,44 @@ enum gve_sup_feature_mask {
 };
 
 #define GVE_DEV_OPT_LEN_GQI_RAW_ADDRESSING 0x0
+enum gve_driver_capbility {
+       gve_driver_capability_gqi_qpl = 0,
+       gve_driver_capability_gqi_rda = 1,
+       gve_driver_capability_dqo_qpl = 2, /* reserved for future use */
+       gve_driver_capability_dqo_rda = 3,
+};
+
+#define GVE_CAP1(a) BIT((int)a)
+
+#define GVE_DRIVER_CAPABILITY_FLAGS1 \
+       (GVE_CAP1(gve_driver_capability_gqi_qpl) | \
+        GVE_CAP1(gve_driver_capability_gqi_rda) | \
+        GVE_CAP1(gve_driver_capability_dqo_rda))
+
+#define GVE_DRIVER_CAPABILITY_FLAGS2 0x0
+#define GVE_DRIVER_CAPABILITY_FLAGS3 0x0
+#define GVE_DRIVER_CAPABILITY_FLAGS4 0x0
+
+struct gve_driver_info {
+       u8 os_type;     /* 0x05 = DPDK */
+       u8 driver_major;
+       u8 driver_minor;
+       u8 driver_sub;
+       __be32 os_version_major;
+       __be32 os_version_minor;
+       __be32 os_version_sub;
+       __be64 driver_capability_flags[4];
+       u8 os_version_str1[OS_VERSION_STRLEN];
+       u8 os_version_str2[OS_VERSION_STRLEN];
+};
+
+struct gve_adminq_verify_driver_compatibility {
+       __be64 driver_info_len;
+       __be64 driver_info_addr;
+};
+
+GVE_CHECK_STRUCT_LEN(16,  gve_adminq_verify_driver_compatibility);
+
 
 struct gve_adminq_configure_device_resources {
        __be64 counter_array;
@@ -345,6 +384,8 @@ union gve_adminq_command {
                        struct gve_adminq_report_stats report_stats;
                        struct gve_adminq_report_link_speed report_link_speed;
                        struct gve_adminq_get_ptype_map get_ptype_map;
+                       struct gve_adminq_verify_driver_compatibility
+                               verify_driver_compatibility;
                };
        };
        u8 reserved[64];
@@ -378,4 +419,7 @@ struct gve_ptype_lut;
 int gve_adminq_get_ptype_map_dqo(struct gve_priv *priv,
                                 struct gve_ptype_lut *ptype_lut);
 
+int gve_adminq_verify_driver_compatibility(struct gve_priv *priv,
+                                          u64 driver_info_len,
+                                          dma_addr_t driver_info_addr);
 #endif /* _GVE_ADMINQ_H */
drivers/net/gve/base/gve_osdep.h +24 -0
index abf3d379ae..5e8ae1eac6 100644
@@ -21,9 +21,14 @@
 #include <rte_malloc.h>
 #include <rte_memcpy.h>
 #include <rte_memzone.h>
+#include <rte_version.h>
 
 #include "../gve_logs.h"
 
+#ifdef __linux__
+#include <sys/utsname.h>
+#endif
+
 typedef uint8_t u8;
 typedef uint16_t u16;
 typedef uint32_t u32;
@@ -73,6 +78,12 @@ typedef rte_iova_t dma_addr_t;
 
 #define msleep(ms)             rte_delay_ms(ms)
 
+#define OS_VERSION_STRLEN 128
+struct os_version_string {
+       char os_version_str1[OS_VERSION_STRLEN];
+       char os_version_str2[OS_VERSION_STRLEN];
+};
+
 /* These macros are used to generate compilation errors if a struct/union
  * is not exactly the correct length. It gives a divide by zero error if
  * the struct/union is not of the correct size, otherwise it creates an
@@ -160,4 +171,17 @@ gve_free_dma_mem(struct gve_dma_mem *mem)
        mem->pa = 0;
 }
 
+static inline void
+populate_driver_version_strings(char *str1, char *str2)
+{
+       struct utsname uts;
+       if (uname(&uts) >= 0) {
+               /* release */
+               rte_strscpy(str1, uts.release,
+                       OS_VERSION_STRLEN);
+               /* version */
+               rte_strscpy(str2, uts.version,
+                       OS_VERSION_STRLEN);
+       }
+}
 #endif /* _GVE_OSDEP_H_ */
drivers/net/gve/gve_ethdev.c +50 -11
index 1dcb3b3a01..71d131fb41 100644
@@ -5,21 +5,13 @@
 #include "gve_ethdev.h"
 #include "base/gve_adminq.h"
 #include "base/gve_register.h"
-
-const char gve_version_str[] = GVE_VERSION;
-static const char gve_version_prefix[] = GVE_VERSION_PREFIX;
+#include "base/gve_osdep.h"
+#include "gve_version.h"
 
 static void
 gve_write_version(uint8_t *driver_version_register)
 {
-       const char *c = gve_version_prefix;
-
-       while (*c) {
-               writeb(*c, driver_version_register);
-               c++;
-       }
-
-       c = gve_version_str;
+       const char *c = gve_version_string();
        while (*c) {
                writeb(*c, driver_version_register);
                c++;
@@ -245,6 +237,48 @@ gve_dev_close(struct rte_eth_dev *dev)
        return err;
 }
 
+static int
+gve_verify_driver_compatibility(struct gve_priv *priv)
+{
+       struct gve_driver_info *driver_info;
+       int err;
+
+       driver_info = rte_zmalloc("driver info",
+                       sizeof(struct gve_driver_info), 0);
+       if (driver_info == NULL) {
+               PMD_DRV_LOG(ERR,
+                           "Could not alloc for verify driver compatibility");
+               return -ENOMEM;
+       }
+       *driver_info = (struct gve_driver_info) {
+               .os_type = 5, /* DPDK */
+               .driver_major = GVE_VERSION_MAJOR,
+               .driver_minor = GVE_VERSION_MINOR,
+               .driver_sub = GVE_VERSION_SUB,
+               .os_version_major = cpu_to_be32(DPDK_VERSION_MAJOR),
+               .os_version_minor = cpu_to_be32(DPDK_VERSION_MINOR),
+               .os_version_sub = cpu_to_be32(DPDK_VERSION_SUB),
+               .driver_capability_flags = {
+                       cpu_to_be64(GVE_DRIVER_CAPABILITY_FLAGS1),
+                       cpu_to_be64(GVE_DRIVER_CAPABILITY_FLAGS2),
+                       cpu_to_be64(GVE_DRIVER_CAPABILITY_FLAGS3),
+                       cpu_to_be64(GVE_DRIVER_CAPABILITY_FLAGS4),
+               },
+       };
+
+       populate_driver_version_strings((char *)driver_info->os_version_str1,
+                       (char *)driver_info->os_version_str2);
+
+       err = gve_adminq_verify_driver_compatibility(priv,
+               sizeof(struct gve_driver_info), (dma_addr_t)driver_info);
+       /* It's ok if the device doesn't support this */
+       if (err == -EOPNOTSUPP)
+               err = 0;
+
+       rte_free(driver_info);
+       return err;
+}
+
 static int
 gve_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
 {
@@ -679,6 +713,11 @@ gve_init_priv(struct gve_priv *priv, bool skip_describe_device)
                PMD_DRV_LOG(ERR, "Failed to alloc admin queue: err=%d", err);
                return err;
        }
+       err = gve_verify_driver_compatibility(priv);
+       if (err) {
+               PMD_DRV_LOG(ERR, "Could not verify driver compatibility: err=%d", err);
+               goto free_adminq;
+       }
 
        if (skip_describe_device)
                goto setup_device;
drivers/net/gve/gve_ethdev.h +1 -1
index cd62debd22..c9bcfa553c 100644
@@ -268,7 +268,7 @@ struct gve_priv {
        uint32_t adminq_report_stats_cnt;
        uint32_t adminq_report_link_speed_cnt;
        uint32_t adminq_get_ptype_map_cnt;
-
+       uint32_t adminq_verify_driver_compatibility_cnt;
        volatile uint32_t state_flags;
 
        /* Gvnic device link speed from hypervisor. */
drivers/net/gve/gve_version.c new file +13 -0
new file mode 100644
index 0000000000..5fe34dc179
@@ -0,0 +1,13 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (C) 2015-2023 Google, Inc.
+ */
+#include "gve_version.h"
+
+const char *gve_version_string(void)
+{
+       static char gve_version[20];
+       snprintf(gve_version, sizeof(gve_version), "%s%d.%d.%d",
+               GVE_VERSION_PREFIX, GVE_VERSION_MAJOR, GVE_VERSION_MINOR,
+               GVE_VERSION_SUB);
+       return gve_version;
+}
drivers/net/gve/gve_version.h new file +24 -0
new file mode 100644
index 0000000000..4dd998dca1
@@ -0,0 +1,24 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (C) 2015-2023 Google, Inc.
+ */
+
+#ifndef _GVE_VERSION_H_
+#define _GVE_VERSION_H_
+
+#include <rte_version.h>
+
+#define GVE_VERSION_PREFIX "DPDK-"
+#define GVE_VERSION_MAJOR 1
+#define GVE_VERSION_MINOR 0
+#define GVE_VERSION_SUB 0
+
+#define DPDK_VERSION_MAJOR (100 * RTE_VER_YEAR + RTE_VER_MONTH)
+#define DPDK_VERSION_MINOR RTE_VER_MINOR
+#define DPDK_VERSION_SUB RTE_VER_RELEASE
+
+
+const char *
+gve_version_string(void);
+
+
+#endif /* GVE_VERSION_H */
drivers/net/gve/meson.build +3 -3
index c9d87903f9..61d195009c 100644
@@ -1,9 +1,9 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(C) 2022 Intel Corporation
 
-if is_windows
+if not is_linux
     build = false
-    reason = 'not supported on Windows'
+    reason = 'only supported on Linux'
     subdir_done()
 endif
 
@@ -14,5 +14,6 @@ sources = files(
         'gve_rx_dqo.c',
         'gve_tx_dqo.c',
         'gve_ethdev.c',
+        'gve_version.c',
 )
 includes += include_directories('base')
--

2.40.1.698.g37aff9b760-goog

#17 lore raw

Re: [PATCH] net/gve: check driver compatibility

I agree. Other adminq commands like gve_adminq_report_link_speed use gve_alloc_dma_mem and gve_free_dma_mem (which use rte_memzone_reserve_aligned under the hood)
so let's stick to that.

Quoted 432 lines · Ferruh Yigit
Quoted 17 lines · Rushil Gupta

Hi Ferruh
I have updated the latest patch here:
http://patchwork.dpdk.org/project/dpdk/patch/[email protected]/
However, using calloc causes issue while executing verify-compatibility command.

sudo dpdk-testpmd -a 00:04.0 -l 0-32 -- --forward-mode=rxonly --txq=16 --rxq=16 --nb-cores=16 --stats-period 5
...
EAL: Using IOMMU type 8 (No-IOMMU)
EAL: Probe PCI driver: net_gve (1ae0:42) device: 0000:00:04.0 (socket -1) gve_adminq_parse_err(): AQ command failed with status -9 gve_init_priv(): Could not verify driver compatibility: err=-22
EAL: Releasing PCI mapped resource for 0000:00:04.0
...
EAL: Error - exiting with code: 1

Quoted 5 lines

This is probably because the adminq command is sharing memory to report driver-info to the gvnic device and that needs to be in dpdk memory.

Hi Rushil,

That is OK, I missed this requirement.

Admin command passes pointers for device to process, what is the address type requirement here?
Some other commands pass pysical address (iova address) via the command.

Both 'calloc()' and 'rte_zmalloc()' returns (guest) virtual address, why one doesn't work but other does?

Initial version was passing 'rte_memzone' pointer, are you updating the hyperviser side based on changes on dpdk side?

And perhaps better to switch to 'rte_memzone_reserve_aligned()' as done initial version and pass (guest) pysical address via adminq, if that is the requirement?

Quoted 386 lines · Rushil Gupta
Quoted 384 lines

Change gve_driver_info fields to report DPDK as OS type and DPDK RTE version as OS version, reserving driver_version fields for GVE driver version based on features.

---
 drivers/net/gve/base/gve.h        |  3 --
 drivers/net/gve/base/gve_adminq.c | 19 ++++++++++
 drivers/net/gve/base/gve_adminq.h | 46 ++++++++++++++++++++++-
 drivers/net/gve/base/gve_osdep.h  | 24 ++++++++++++
 drivers/net/gve/gve_ethdev.c      | 61 +++++++++++++++++++++++++------
 drivers/net/gve/gve_ethdev.h      |  2 +-
 drivers/net/gve/gve_version.c     | 13 +++++++
 drivers/net/gve/gve_version.h     | 24 ++++++++++++
 drivers/net/gve/meson.build       |  5 ++-
 9 files changed, 179 insertions(+), 18 deletions(-)
 create mode 100644 drivers/net/gve/gve_version.c
 create mode 100644 drivers/net/gve/gve_version.h
drivers/net/gve/base/gve.h +0 -3
index 2b7cf7d99b..f7b297e759 100644
@@ -9,9 +9,6 @@
 #include "gve_desc.h"
 #include "gve_desc_dqo.h"
 
-#define GVE_VERSION            "1.3.0"
-#define GVE_VERSION_PREFIX     "GVE-"
-
 #ifndef GOOGLE_VENDOR_ID
 #define GOOGLE_VENDOR_ID       0x1ae0
 #endif
drivers/net/gve/base/gve_adminq.c +19 -0
index e963f910a0..41202725e6 100644
@@ -401,6 +401,9 @@ static int gve_adminq_issue_cmd(struct gve_priv *priv,
        case GVE_ADMINQ_GET_PTYPE_MAP:
                priv->adminq_get_ptype_map_cnt++;
                break;
+       case GVE_ADMINQ_VERIFY_DRIVER_COMPATIBILITY:
+               priv->adminq_verify_driver_compatibility_cnt++;
+               break;
        default:
                PMD_DRV_LOG(ERR, "unknown AQ command opcode %d", opcode);
        }
@@ -465,6 +468,22 @@ int gve_adminq_configure_device_resources(struct gve_priv *priv,
        return gve_adminq_execute_cmd(priv, &cmd);
 }
 
+int gve_adminq_verify_driver_compatibility(struct gve_priv *priv,
+                                          u64 driver_info_len,
+                                          dma_addr_t driver_info_addr)
+{
+       union gve_adminq_command cmd;
+
+       memset(&cmd, 0, sizeof(cmd));
+       cmd.opcode = cpu_to_be32(GVE_ADMINQ_VERIFY_DRIVER_COMPATIBILITY);
+       cmd.verify_driver_compatibility = (struct gve_adminq_verify_driver_compatibility) {
+               .driver_info_len = cpu_to_be64(driver_info_len),
+               .driver_info_addr = cpu_to_be64(driver_info_addr),
+       };
+
+       return gve_adminq_execute_cmd(priv, &cmd);
+}
+
 int gve_adminq_deconfigure_device_resources(struct gve_priv *priv)
 {
        union gve_adminq_command cmd;
drivers/net/gve/base/gve_adminq.h +45 -1
index 05550119de..e30b184913 100644
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: MIT
  * Google Virtual Ethernet (gve) driver
- * Copyright (C) 2015-2022 Google, Inc.
+ * Copyright (C) 2015-2023 Google, Inc.
  */
 
 #ifndef _GVE_ADMINQ_H
@@ -23,6 +23,7 @@ enum gve_adminq_opcodes {
        GVE_ADMINQ_REPORT_STATS                 = 0xC,
        GVE_ADMINQ_REPORT_LINK_SPEED            = 0xD,
        GVE_ADMINQ_GET_PTYPE_MAP                = 0xE,
+       GVE_ADMINQ_VERIFY_DRIVER_COMPATIBILITY  = 0xF,
 };
 
 /* Admin queue status codes */
@@ -145,6 +146,44 @@ enum gve_sup_feature_mask {
 };
 
 #define GVE_DEV_OPT_LEN_GQI_RAW_ADDRESSING 0x0
+enum gve_driver_capbility {
+       gve_driver_capability_gqi_qpl = 0,
+       gve_driver_capability_gqi_rda = 1,
+       gve_driver_capability_dqo_qpl = 2, /* reserved for future use */
+       gve_driver_capability_dqo_rda = 3,
+};
+
+#define GVE_CAP1(a) BIT((int)a)
+
+#define GVE_DRIVER_CAPABILITY_FLAGS1 \
+       (GVE_CAP1(gve_driver_capability_gqi_qpl) | \
+        GVE_CAP1(gve_driver_capability_gqi_rda) | \
+        GVE_CAP1(gve_driver_capability_dqo_rda))
+
+#define GVE_DRIVER_CAPABILITY_FLAGS2 0x0
+#define GVE_DRIVER_CAPABILITY_FLAGS3 0x0
+#define GVE_DRIVER_CAPABILITY_FLAGS4 0x0
+
+struct gve_driver_info {
+       u8 os_type;     /* 0x05 = DPDK */
+       u8 driver_major;
+       u8 driver_minor;
+       u8 driver_sub;
+       __be32 os_version_major;
+       __be32 os_version_minor;
+       __be32 os_version_sub;
+       __be64 driver_capability_flags[4];
+       u8 os_version_str1[OS_VERSION_STRLEN];
+       u8 os_version_str2[OS_VERSION_STRLEN];
+};
+
+struct gve_adminq_verify_driver_compatibility {
+       __be64 driver_info_len;
+       __be64 driver_info_addr;
+};
+
+GVE_CHECK_STRUCT_LEN(16,  gve_adminq_verify_driver_compatibility);
+
 
 struct gve_adminq_configure_device_resources {
        __be64 counter_array;
@@ -345,6 +384,8 @@ union gve_adminq_command {
                        struct gve_adminq_report_stats report_stats;
                        struct gve_adminq_report_link_speed report_link_speed;
                        struct gve_adminq_get_ptype_map get_ptype_map;
+                       struct gve_adminq_verify_driver_compatibility
+                               verify_driver_compatibility;
                };
        };
        u8 reserved[64];
@@ -378,4 +419,7 @@ struct gve_ptype_lut;
 int gve_adminq_get_ptype_map_dqo(struct gve_priv *priv,
                                 struct gve_ptype_lut *ptype_lut);
 
+int gve_adminq_verify_driver_compatibility(struct gve_priv *priv,
+                                          u64 driver_info_len,
+                                          dma_addr_t driver_info_addr);
 #endif /* _GVE_ADMINQ_H */
drivers/net/gve/base/gve_osdep.h +24 -0
index abf3d379ae..5e8ae1eac6 100644
@@ -21,9 +21,14 @@
 #include <rte_malloc.h>
 #include <rte_memcpy.h>
 #include <rte_memzone.h>
+#include <rte_version.h>
 
 #include "../gve_logs.h"
 
+#ifdef __linux__
+#include <sys/utsname.h>
+#endif
+
 typedef uint8_t u8;
 typedef uint16_t u16;
 typedef uint32_t u32;
@@ -73,6 +78,12 @@ typedef rte_iova_t dma_addr_t;
 
 #define msleep(ms)             rte_delay_ms(ms)
 
+#define OS_VERSION_STRLEN 128
+struct os_version_string {
+       char os_version_str1[OS_VERSION_STRLEN];
+       char os_version_str2[OS_VERSION_STRLEN];
+};
+
 /* These macros are used to generate compilation errors if a struct/union
  * is not exactly the correct length. It gives a divide by zero error if
  * the struct/union is not of the correct size, otherwise it creates an
@@ -160,4 +171,17 @@ gve_free_dma_mem(struct gve_dma_mem *mem)
        mem->pa = 0;
 }
 
+static inline void
+populate_driver_version_strings(char *str1, char *str2)
+{
+       struct utsname uts;
+       if (uname(&uts) >= 0) {
+               /* release */
+               rte_strscpy(str1, uts.release,
+                       OS_VERSION_STRLEN);
+               /* version */
+               rte_strscpy(str2, uts.version,
+                       OS_VERSION_STRLEN);
+       }
+}
 #endif /* _GVE_OSDEP_H_ */
drivers/net/gve/gve_ethdev.c +50 -11
index 1dcb3b3a01..71d131fb41 100644
@@ -5,21 +5,13 @@
 #include "gve_ethdev.h"
 #include "base/gve_adminq.h"
 #include "base/gve_register.h"
-
-const char gve_version_str[] = GVE_VERSION;
-static const char gve_version_prefix[] = GVE_VERSION_PREFIX;
+#include "base/gve_osdep.h"
+#include "gve_version.h"
 
 static void
 gve_write_version(uint8_t *driver_version_register)
 {
-       const char *c = gve_version_prefix;
-
-       while (*c) {
-               writeb(*c, driver_version_register);
-               c++;
-       }
-
-       c = gve_version_str;
+       const char *c = gve_version_string();
        while (*c) {
                writeb(*c, driver_version_register);
                c++;
@@ -245,6 +237,48 @@ gve_dev_close(struct rte_eth_dev *dev)
        return err;
 }
 
+static int
+gve_verify_driver_compatibility(struct gve_priv *priv)
+{
+       struct gve_driver_info *driver_info;
+       int err;
+
+       driver_info = rte_zmalloc("driver info",
+                       sizeof(struct gve_driver_info), 0);
+       if (driver_info == NULL) {
+               PMD_DRV_LOG(ERR,
+                           "Could not alloc for verify driver compatibility");
+               return -ENOMEM;
+       }
+       *driver_info = (struct gve_driver_info) {
+               .os_type = 5, /* DPDK */
+               .driver_major = GVE_VERSION_MAJOR,
+               .driver_minor = GVE_VERSION_MINOR,
+               .driver_sub = GVE_VERSION_SUB,
+               .os_version_major = cpu_to_be32(DPDK_VERSION_MAJOR),
+               .os_version_minor = cpu_to_be32(DPDK_VERSION_MINOR),
+               .os_version_sub = cpu_to_be32(DPDK_VERSION_SUB),
+               .driver_capability_flags = {
+                       cpu_to_be64(GVE_DRIVER_CAPABILITY_FLAGS1),
+                       cpu_to_be64(GVE_DRIVER_CAPABILITY_FLAGS2),
+                       cpu_to_be64(GVE_DRIVER_CAPABILITY_FLAGS3),
+                       cpu_to_be64(GVE_DRIVER_CAPABILITY_FLAGS4),
+               },
+       };
+
+       populate_driver_version_strings((char *)driver_info->os_version_str1,
+                       (char *)driver_info->os_version_str2);
+
+       err = gve_adminq_verify_driver_compatibility(priv,
+               sizeof(struct gve_driver_info), (dma_addr_t)driver_info);
+       /* It's ok if the device doesn't support this */
+       if (err == -EOPNOTSUPP)
+               err = 0;
+
+       rte_free(driver_info);
+       return err;
+}
+
 static int
 gve_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
 {
@@ -679,6 +713,11 @@ gve_init_priv(struct gve_priv *priv, bool skip_describe_device)
                PMD_DRV_LOG(ERR, "Failed to alloc admin queue: err=%d", err);
                return err;
        }
+       err = gve_verify_driver_compatibility(priv);
+       if (err) {
+               PMD_DRV_LOG(ERR, "Could not verify driver compatibility: err=%d", err);
+               goto free_adminq;
+       }
 
        if (skip_describe_device)
                goto setup_device;
drivers/net/gve/gve_ethdev.h +1 -1
index cd62debd22..c9bcfa553c 100644
@@ -268,7 +268,7 @@ struct gve_priv {
        uint32_t adminq_report_stats_cnt;
        uint32_t adminq_report_link_speed_cnt;
        uint32_t adminq_get_ptype_map_cnt;
-
+       uint32_t adminq_verify_driver_compatibility_cnt;
        volatile uint32_t state_flags;
 
        /* Gvnic device link speed from hypervisor. */
drivers/net/gve/gve_version.c new file +13 -0
new file mode 100644
index 0000000000..5fe34dc179
@@ -0,0 +1,13 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (C) 2015-2023 Google, Inc.
+ */
+#include "gve_version.h"
+
+const char *gve_version_string(void)
+{
+       static char gve_version[20];
+       snprintf(gve_version, sizeof(gve_version), "%s%d.%d.%d",
+               GVE_VERSION_PREFIX, GVE_VERSION_MAJOR, GVE_VERSION_MINOR,
+               GVE_VERSION_SUB);
+       return gve_version;
+}
drivers/net/gve/gve_version.h new file +24 -0
new file mode 100644
index 0000000000..4dd998dca1
@@ -0,0 +1,24 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (C) 2015-2023 Google, Inc.
+ */
+
+#ifndef _GVE_VERSION_H_
+#define _GVE_VERSION_H_
+
+#include <rte_version.h>
+
+#define GVE_VERSION_PREFIX "DPDK-"
+#define GVE_VERSION_MAJOR 1
+#define GVE_VERSION_MINOR 0
+#define GVE_VERSION_SUB 0
+
+#define DPDK_VERSION_MAJOR (100 * RTE_VER_YEAR + RTE_VER_MONTH)
+#define DPDK_VERSION_MINOR RTE_VER_MINOR
+#define DPDK_VERSION_SUB RTE_VER_RELEASE
+
+
+const char *
+gve_version_string(void);
+
+
+#endif /* GVE_VERSION_H */
drivers/net/gve/meson.build +3 -3
index c9d87903f9..61d195009c 100644
@@ -1,9 +1,9 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(C) 2022 Intel Corporation
 
-if is_windows
+if not is_linux
     build = false
-    reason = 'not supported on Windows'
+    reason = 'only supported on Linux'
     subdir_done()
 endif
 
@@ -14,5 +14,6 @@ sources = files(
         'gve_rx_dqo.c',
         'gve_tx_dqo.c',
         'gve_ethdev.c',
+        'gve_version.c',
 )
 includes += include_directories('base')
--

2.40.1.698.g37aff9b760-goog

#18 lore raw

PATCH v4 1/1 net/gve: check driver compatibility

In reply to Rushil Gupta

Change gve_driver_info fields to report DPDK as OS type and DPDK RTE version as OS version, reserving driver_version fields for GVE driver version based on features.

---
 drivers/net/gve/base/gve.h        |  3 --
 drivers/net/gve/base/gve_adminq.c | 19 +++++++++
 drivers/net/gve/base/gve_adminq.h | 46 ++++++++++++++++++++-
 drivers/net/gve/base/gve_osdep.h  | 24 +++++++++++
 drivers/net/gve/gve_ethdev.c      | 68 ++++++++++++++++++++++++++-----
 drivers/net/gve/gve_ethdev.h      |  2 +-
 drivers/net/gve/gve_version.c     | 13 ++++++
 drivers/net/gve/gve_version.h     | 24 +++++++++++
 drivers/net/gve/meson.build       |  5 ++-
 9 files changed, 186 insertions(+), 18 deletions(-)
 create mode 100644 drivers/net/gve/gve_version.c
 create mode 100644 drivers/net/gve/gve_version.h
drivers/net/gve/base/gve.h +0 -3
index 2b7cf7d99b..f7b297e759 100644
@@ -9,9 +9,6 @@
 #include "gve_desc.h"
 #include "gve_desc_dqo.h"
 
-#define GVE_VERSION		"1.3.0"
-#define GVE_VERSION_PREFIX	"GVE-"
-
 #ifndef GOOGLE_VENDOR_ID
 #define GOOGLE_VENDOR_ID	0x1ae0
 #endif
drivers/net/gve/base/gve_adminq.c +19 -0
index e963f910a0..41202725e6 100644
@@ -401,6 +401,9 @@ static int gve_adminq_issue_cmd(struct gve_priv *priv,
 	case GVE_ADMINQ_GET_PTYPE_MAP:
 		priv->adminq_get_ptype_map_cnt++;
 		break;
+	case GVE_ADMINQ_VERIFY_DRIVER_COMPATIBILITY:
+		priv->adminq_verify_driver_compatibility_cnt++;
+		break;
 	default:
 		PMD_DRV_LOG(ERR, "unknown AQ command opcode %d", opcode);
 	}
@@ -465,6 +468,22 @@ int gve_adminq_configure_device_resources(struct gve_priv *priv,
 	return gve_adminq_execute_cmd(priv, &cmd);
 }
 
+int gve_adminq_verify_driver_compatibility(struct gve_priv *priv,
+					   u64 driver_info_len,
+					   dma_addr_t driver_info_addr)
+{
+	union gve_adminq_command cmd;
+
+	memset(&cmd, 0, sizeof(cmd));
+	cmd.opcode = cpu_to_be32(GVE_ADMINQ_VERIFY_DRIVER_COMPATIBILITY);
+	cmd.verify_driver_compatibility = (struct gve_adminq_verify_driver_compatibility) {
+		.driver_info_len = cpu_to_be64(driver_info_len),
+		.driver_info_addr = cpu_to_be64(driver_info_addr),
+	};
+
+	return gve_adminq_execute_cmd(priv, &cmd);
+}
+
 int gve_adminq_deconfigure_device_resources(struct gve_priv *priv)
 {
 	union gve_adminq_command cmd;
drivers/net/gve/base/gve_adminq.h +45 -1

73 lines not on this page · raw message

drivers/net/gve/base/gve_osdep.h +24 -0
index abf3d379ae..5e8ae1eac6 100644
@@ -21,9 +21,14 @@
 #include <rte_malloc.h>
 #include <rte_memcpy.h>
 #include <rte_memzone.h>
+#include <rte_version.h>
 
 #include "../gve_logs.h"
 
+#ifdef __linux__
+#include <sys/utsname.h>
+#endif
+
 typedef uint8_t u8;
 typedef uint16_t u16;
 typedef uint32_t u32;
@@ -73,6 +78,12 @@ typedef rte_iova_t dma_addr_t;
 
 #define msleep(ms)		rte_delay_ms(ms)
 
+#define OS_VERSION_STRLEN 128
+struct os_version_string {
+	char os_version_str1[OS_VERSION_STRLEN];
+	char os_version_str2[OS_VERSION_STRLEN];
+};
+
 /* These macros are used to generate compilation errors if a struct/union
  * is not exactly the correct length. It gives a divide by zero error if
  * the struct/union is not of the correct size, otherwise it creates an
@@ -160,4 +171,17 @@ gve_free_dma_mem(struct gve_dma_mem *mem)
 	mem->pa = 0;
 }
 
+static inline void
+populate_driver_version_strings(char *str1, char *str2)
+{
+	struct utsname uts;
+	if (uname(&uts) >= 0) {
+		/* release */
+		rte_strscpy(str1, uts.release,
+			OS_VERSION_STRLEN);
+		/* version */
+		rte_strscpy(str2, uts.version,
+			OS_VERSION_STRLEN);
+	}
+}
 #endif /* _GVE_OSDEP_H_ */
drivers/net/gve/gve_ethdev.c +57 -11

90 lines not on this page · raw message

drivers/net/gve/gve_ethdev.h +1 -1
index cd62debd22..c9bcfa553c 100644
@@ -268,7 +268,7 @@ struct gve_priv {
 	uint32_t adminq_report_stats_cnt;
 	uint32_t adminq_report_link_speed_cnt;
 	uint32_t adminq_get_ptype_map_cnt;
-
+	uint32_t adminq_verify_driver_compatibility_cnt;
 	volatile uint32_t state_flags;
 
 	/* Gvnic device link speed from hypervisor. */
drivers/net/gve/gve_version.c new file +13 -0
new file mode 100644
index 0000000000..5fe34dc179
@@ -0,0 +1,13 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (C) 2015-2023 Google, Inc.
+ */
+#include "gve_version.h"
+
+const char *gve_version_string(void)
+{
+	static char gve_version[20];
+	snprintf(gve_version, sizeof(gve_version), "%s%d.%d.%d",
+		GVE_VERSION_PREFIX, GVE_VERSION_MAJOR, GVE_VERSION_MINOR,
+		GVE_VERSION_SUB);
+	return gve_version;
+}
drivers/net/gve/gve_version.h new file +24 -0
new file mode 100644
index 0000000000..4dd998dca1
@@ -0,0 +1,24 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (C) 2015-2023 Google, Inc.
+ */
+
+#ifndef _GVE_VERSION_H_
+#define _GVE_VERSION_H_
+
+#include <rte_version.h>
+
+#define GVE_VERSION_PREFIX "DPDK-"
+#define GVE_VERSION_MAJOR 1
+#define GVE_VERSION_MINOR 0
+#define GVE_VERSION_SUB 0
+
+#define DPDK_VERSION_MAJOR (100 * RTE_VER_YEAR + RTE_VER_MONTH)
+#define DPDK_VERSION_MINOR RTE_VER_MINOR
+#define DPDK_VERSION_SUB RTE_VER_RELEASE
+
+
+const char *
+gve_version_string(void);
+
+
+#endif /* GVE_VERSION_H */
drivers/net/gve/meson.build +3 -2
index c9d87903f9..61d195009c 100644
@@ -1,9 +1,9 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(C) 2022 Intel Corporation
 
-if is_windows
+if not is_linux
     build = false
-    reason = 'not supported on Windows'
+    reason = 'only supported on Linux'
     subdir_done()
 endif
 
@@ -14,5 +14,6 @@ sources = files(
         'gve_rx_dqo.c',
         'gve_tx_dqo.c',
         'gve_ethdev.c',
+        'gve_version.c',
 )
 includes += include_directories('base')
Signature · 1 line
2.40.1.698.g37aff9b760-goog
#19 lore raw

PATCH v4 1/1 net/gve: check driver compatibility

In reply to Rushil Gupta

Change gve_driver_info fields to report DPDK as OS type and DPDK RTE version as OS version, reserving driver_version fields for GVE driver version based on features.

---
 drivers/net/gve/base/gve.h        |  3 --
 drivers/net/gve/base/gve_adminq.c | 19 +++++++++
 drivers/net/gve/base/gve_adminq.h | 46 ++++++++++++++++++++-
 drivers/net/gve/base/gve_osdep.h  | 24 +++++++++++
 drivers/net/gve/gve_ethdev.c      | 67 ++++++++++++++++++++++++++-----
 drivers/net/gve/gve_ethdev.h      |  2 +-
 drivers/net/gve/gve_version.c     | 13 ++++++
 drivers/net/gve/gve_version.h     | 24 +++++++++++
 drivers/net/gve/meson.build       |  5 ++-
 9 files changed, 185 insertions(+), 18 deletions(-)
 create mode 100644 drivers/net/gve/gve_version.c
 create mode 100644 drivers/net/gve/gve_version.h
drivers/net/gve/base/gve.h +0 -3
index 2b7cf7d99b..f7b297e759 100644
@@ -9,9 +9,6 @@
 #include "gve_desc.h"
 #include "gve_desc_dqo.h"
 
-#define GVE_VERSION		"1.3.0"
-#define GVE_VERSION_PREFIX	"GVE-"
-
 #ifndef GOOGLE_VENDOR_ID
 #define GOOGLE_VENDOR_ID	0x1ae0
 #endif
drivers/net/gve/base/gve_adminq.c +19 -0
index e963f910a0..41202725e6 100644
@@ -401,6 +401,9 @@ static int gve_adminq_issue_cmd(struct gve_priv *priv,
 	case GVE_ADMINQ_GET_PTYPE_MAP:
 		priv->adminq_get_ptype_map_cnt++;
 		break;
+	case GVE_ADMINQ_VERIFY_DRIVER_COMPATIBILITY:
+		priv->adminq_verify_driver_compatibility_cnt++;
+		break;
 	default:
 		PMD_DRV_LOG(ERR, "unknown AQ command opcode %d", opcode);
 	}
@@ -465,6 +468,22 @@ int gve_adminq_configure_device_resources(struct gve_priv *priv,
 	return gve_adminq_execute_cmd(priv, &cmd);
 }
 
+int gve_adminq_verify_driver_compatibility(struct gve_priv *priv,
+					   u64 driver_info_len,
+					   dma_addr_t driver_info_addr)
+{
+	union gve_adminq_command cmd;
+
+	memset(&cmd, 0, sizeof(cmd));
+	cmd.opcode = cpu_to_be32(GVE_ADMINQ_VERIFY_DRIVER_COMPATIBILITY);
+	cmd.verify_driver_compatibility = (struct gve_adminq_verify_driver_compatibility) {
+		.driver_info_len = cpu_to_be64(driver_info_len),
+		.driver_info_addr = cpu_to_be64(driver_info_addr),
+	};
+
+	return gve_adminq_execute_cmd(priv, &cmd);
+}
+
 int gve_adminq_deconfigure_device_resources(struct gve_priv *priv)
 {
 	union gve_adminq_command cmd;
drivers/net/gve/base/gve_adminq.h +45 -1

73 lines not on this page · raw message

drivers/net/gve/base/gve_osdep.h +24 -0
index abf3d379ae..5e8ae1eac6 100644
@@ -21,9 +21,14 @@
 #include <rte_malloc.h>
 #include <rte_memcpy.h>
 #include <rte_memzone.h>
+#include <rte_version.h>
 
 #include "../gve_logs.h"
 
+#ifdef __linux__
+#include <sys/utsname.h>
+#endif
+
 typedef uint8_t u8;
 typedef uint16_t u16;
 typedef uint32_t u32;
@@ -73,6 +78,12 @@ typedef rte_iova_t dma_addr_t;
 
 #define msleep(ms)		rte_delay_ms(ms)
 
+#define OS_VERSION_STRLEN 128
+struct os_version_string {
+	char os_version_str1[OS_VERSION_STRLEN];
+	char os_version_str2[OS_VERSION_STRLEN];
+};
+
 /* These macros are used to generate compilation errors if a struct/union
  * is not exactly the correct length. It gives a divide by zero error if
  * the struct/union is not of the correct size, otherwise it creates an
@@ -160,4 +171,17 @@ gve_free_dma_mem(struct gve_dma_mem *mem)
 	mem->pa = 0;
 }
 
+static inline void
+populate_driver_version_strings(char *str1, char *str2)
+{
+	struct utsname uts;
+	if (uname(&uts) >= 0) {
+		/* release */
+		rte_strscpy(str1, uts.release,
+			OS_VERSION_STRLEN);
+		/* version */
+		rte_strscpy(str2, uts.version,
+			OS_VERSION_STRLEN);
+	}
+}
 #endif /* _GVE_OSDEP_H_ */
drivers/net/gve/gve_ethdev.c +56 -11

89 lines not on this page · raw message

drivers/net/gve/gve_ethdev.h +1 -1
index cd62debd22..c9bcfa553c 100644
@@ -268,7 +268,7 @@ struct gve_priv {
 	uint32_t adminq_report_stats_cnt;
 	uint32_t adminq_report_link_speed_cnt;
 	uint32_t adminq_get_ptype_map_cnt;
-
+	uint32_t adminq_verify_driver_compatibility_cnt;
 	volatile uint32_t state_flags;
 
 	/* Gvnic device link speed from hypervisor. */
drivers/net/gve/gve_version.c new file +13 -0
new file mode 100644
index 0000000000..5fe34dc179
@@ -0,0 +1,13 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (C) 2015-2023 Google, Inc.
+ */
+#include "gve_version.h"
+
+const char *gve_version_string(void)
+{
+	static char gve_version[20];
+	snprintf(gve_version, sizeof(gve_version), "%s%d.%d.%d",
+		GVE_VERSION_PREFIX, GVE_VERSION_MAJOR, GVE_VERSION_MINOR,
+		GVE_VERSION_SUB);
+	return gve_version;
+}
drivers/net/gve/gve_version.h new file +24 -0
new file mode 100644
index 0000000000..4dd998dca1
@@ -0,0 +1,24 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (C) 2015-2023 Google, Inc.
+ */
+
+#ifndef _GVE_VERSION_H_
+#define _GVE_VERSION_H_
+
+#include <rte_version.h>
+
+#define GVE_VERSION_PREFIX "DPDK-"
+#define GVE_VERSION_MAJOR 1
+#define GVE_VERSION_MINOR 0
+#define GVE_VERSION_SUB 0
+
+#define DPDK_VERSION_MAJOR (100 * RTE_VER_YEAR + RTE_VER_MONTH)
+#define DPDK_VERSION_MINOR RTE_VER_MINOR
+#define DPDK_VERSION_SUB RTE_VER_RELEASE
+
+
+const char *
+gve_version_string(void);
+
+
+#endif /* GVE_VERSION_H */
drivers/net/gve/meson.build +3 -2
index c9d87903f9..61d195009c 100644
@@ -1,9 +1,9 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(C) 2022 Intel Corporation
 
-if is_windows
+if not is_linux
     build = false
-    reason = 'not supported on Windows'
+    reason = 'only supported on Linux'
     subdir_done()
 endif
 
@@ -14,5 +14,6 @@ sources = files(
         'gve_rx_dqo.c',
         'gve_tx_dqo.c',
         'gve_ethdev.c',
+        'gve_version.c',
 )
 includes += include_directories('base')
Signature · 1 line
2.40.1.698.g37aff9b760-goog
#20 lore raw

Re: [v4] net/gve: check driver compatibility

Quoted 12 lines · On Fri, 19 May 2023 13:46:18 -0700 Rushil Gupta <[email protected]> wrote:
drivers/net/gve/base/gve_osdep.h +5 -0
+#include <rte_version.h>
 
 #include "../gve_logs.h"
 
+#ifdef __linux__
+#include <sys/utsname.h>
+#endif
+
 typedef uint8_t u8;
 typedef uint16_t u16;
 typedef uint32_t u32;

drivers/net/gve/base/gve_osdep.h typedef rte_iova_t dma_addr_t; · line 86

Quoted 9 lines
drivers/net/gve/base/gve_osdep.h +6 -0
@@ -73,6 +78,12 @@ typedef rte_iova_t dma_addr_t;
 
 #define msleep(ms)		rte_delay_ms(ms)
 
+#define OS_VERSION_STRLEN 128
+struct os_version_string {
+	char os_version_str1[OS_VERSION_STRLEN];
+	char os_version_str2[OS_VERSION_STRLEN];
+};
+

Not sure this a good idea. Are you having the host validate against DPDK versions. This is a bad idea.

Better to use feature bits like virtio and not be creating and validating strings about versions. For example, ever minor stable release changes this.

#21 lore raw

Re: [v4] net/gve: check driver compatibility

We are not validating anything.
This is for our internal analysis and product requirements.

Quoted 32 lines · Stephen Hemminger
Quoted 12 lines · On Fri, 19 May 2023 13:46:18 -0700 Rushil Gupta <[email protected]> wrote:
drivers/net/gve/base/gve_osdep.h +5 -0
+#include <rte_version.h>
 
 #include "../gve_logs.h"
 
+#ifdef __linux__
+#include <sys/utsname.h>
+#endif
+
 typedef uint8_t u8;
 typedef uint16_t u16;
 typedef uint32_t u32;

drivers/net/gve/base/gve_osdep.h typedef rte_iova_t dma_addr_t; · line 86

Quoted 9 lines
drivers/net/gve/base/gve_osdep.h +6 -0
@@ -73,6 +78,12 @@ typedef rte_iova_t dma_addr_t;
 
 #define msleep(ms)           rte_delay_ms(ms)
 
+#define OS_VERSION_STRLEN 128
+struct os_version_string {
+     char os_version_str1[OS_VERSION_STRLEN];
+     char os_version_str2[OS_VERSION_STRLEN];
+};
+

Not sure this a good idea. Are you having the host validate against DPDK versions. This is a bad idea.

Better to use feature bits like virtio and not be creating and validating strings about versions. For example, ever minor stable release changes this.

#22 lore raw

Re: [v4] net/gve: check driver compatibility

In reply to Rushil Gupta
Quoted 30 lines · Rushil Gupta
drivers/net/gve/gve_ethdev.c +30 -0
+static int
+gve_verify_driver_compatibility(struct gve_priv *priv)
+{
+	const struct rte_memzone *driver_info_mem;
+	struct gve_driver_info *driver_info;
+	int err;
+
+	driver_info_mem = rte_memzone_reserve_aligned("verify_driver_compatibility",
+			sizeof(struct gve_driver_info),
+			rte_socket_id(),
+			RTE_MEMZONE_IOVA_CONTIG, PAGE_SIZE);
+
+	if (driver_info_mem == NULL) {
+		PMD_DRV_LOG(ERR,
+			    "Could not alloc memzone for driver compatibility");
+		return -ENOMEM;
+	}
+	driver_info = (struct gve_driver_info *)driver_info_mem->addr;
+
+	*driver_info = (struct gve_driver_info) {
+		.os_type = 5, /* DPDK */
+		.driver_major = GVE_VERSION_MAJOR,
+		.driver_minor = GVE_VERSION_MINOR,
+		.driver_sub = GVE_VERSION_SUB,
+		.os_version_major = cpu_to_be32(DPDK_VERSION_MAJOR),
+		.os_version_minor = cpu_to_be32(DPDK_VERSION_MINOR),
+		.os_version_sub = cpu_to_be32(DPDK_VERSION_SUB),
+		.driver_capability_flags = {
+			cpu_to_be64(GVE_DRIVER_CAPABILITY_FLAGS1),
+			cpu_to_be64(GVE_DRIVER_CAPABILITY_FLAGS2),

drivers/net/gve/gve_ethdev.c gve_dev_close(struct rte_eth_dev *dev) · line 279

Quoted 10 lines
drivers/net/gve/gve_ethdev.c +10 -0
+			cpu_to_be64(GVE_DRIVER_CAPABILITY_FLAGS3),
+			cpu_to_be64(GVE_DRIVER_CAPABILITY_FLAGS4),
+		},
+	};
+
+	populate_driver_version_strings((char *)driver_info->os_version_str1,
+			(char *)driver_info->os_version_str2);
+
+	err = gve_adminq_verify_driver_compatibility(priv,
+		sizeof(struct gve_driver_info), (dma_addr_t)driver_info);

Back to previous discussion, other commands pass physical address to the admin command, but this pass virtual address.
To follow the same semantic, shouldn't above be 'driver_info_mem.iova'?

I asked before but not able to get an answer, what is the memory type requirement for device?
Why virtual address obtained via 'calloc()' is not working, but virtual address from hugepages are working?

#23 lore raw

Re: [v4] net/gve: check driver compatibility

1. This is the excerpt from the google's virtual nic spec:
"In addition to the device-owned register file, vector table, and doorbells, the gVNIC device uses *DMA* (which in most cases amounts to ordinary memory access by host software since we're dealing with a virtual device, but guests must assume the device could be backed by actual hardware) to access physical memory. The following are all located in physical memory: Admin queue - 4096-byte command queue used for configuring gVNIC.
Some commands require an additional dma memory region to be passed to the device. These memory regions are allocated to execute the command and freed when the command completes."
The calloc by default doesn't allow memory to be shared between the dpdk process and hypervisor (where virtual device lives); so that's the reason it doesn't work.

2. I also have a query: RHEL8 compilation in ci/Intel-compilation context fails due to; is this because of if not is_linux

meson.build:67:0: ERROR: Include dir lib/eal/linux/include does not exist.

Passes: http://patchwork.dpdk.org/project/dpdk/patch/[email protected]/

Fails: http://patchwork.dpdk.org/project/dpdk/patch/[email protected]/

Quoted 54 lines · Ferruh Yigit

drivers/net/gve/gve_ethdev.c gve_dev_close(struct rte_eth_dev *dev)

Quoted 8 lines · Rushil Gupta
drivers/net/gve/gve_ethdev.c +8 -0
+static int
+gve_verify_driver_compatibility(struct gve_priv *priv)
+{
+     const struct rte_memzone *driver_info_mem;
+     struct gve_driver_info *driver_info;
+     int err;
+
+     driver_info_mem =

rte_memzone_reserve_aligned("verify_driver_compatibility",

drivers/net/gve/gve_ethdev.c gve_dev_close(struct rte_eth_dev *dev)

Quoted 7 lines
drivers/net/gve/gve_ethdev.c +7 -0
+                     sizeof(struct gve_driver_info),
+                     rte_socket_id(),
+                     RTE_MEMZONE_IOVA_CONTIG, PAGE_SIZE);
+
+     if (driver_info_mem == NULL) {
+             PMD_DRV_LOG(ERR,
+                         "Could not alloc memzone for driver

compatibility");

Quoted 11 lines
drivers/net/gve/gve_ethdev.c +11 -0
+             return -ENOMEM;
+     }
+     driver_info = (struct gve_driver_info *)driver_info_mem->addr;
+
+     *driver_info = (struct gve_driver_info) {
+             .os_type = 5, /* DPDK */
+             .driver_major = GVE_VERSION_MAJOR,
+             .driver_minor = GVE_VERSION_MINOR,
+             .driver_sub = GVE_VERSION_SUB,
+             .os_version_major = cpu_to_be32(DPDK_VERSION_MAJOR),
+             .os_version_minor = cpu_to_be32(DPDK_VERSION_MINOR),

drivers/net/gve/gve_ethdev.c gve_dev_close(struct rte_eth_dev *dev)

Quoted 10 lines
drivers/net/gve/gve_ethdev.c +10 -0
+             .os_version_sub = cpu_to_be32(DPDK_VERSION_SUB),
+             .driver_capability_flags = {
+                     cpu_to_be64(GVE_DRIVER_CAPABILITY_FLAGS1),
+                     cpu_to_be64(GVE_DRIVER_CAPABILITY_FLAGS2),
+                     cpu_to_be64(GVE_DRIVER_CAPABILITY_FLAGS3),
+                     cpu_to_be64(GVE_DRIVER_CAPABILITY_FLAGS4),
+             },
+     };
+
+     populate_driver_version_strings((char

*)driver_info->os_version_str1,

drivers/net/gve/gve_ethdev.c gve_dev_close(struct rte_eth_dev *dev) · line 279

Quoted 4 lines
drivers/net/gve/gve_ethdev.c +4 -0
+                     (char *)driver_info->os_version_str2);
+
+     err = gve_adminq_verify_driver_compatibility(priv,
+             sizeof(struct gve_driver_info), (dma_addr_t)driver_info);

Back to previous discussion, other commands pass physical address to the admin command, but this pass virtual address.
To follow the same semantic, shouldn't above be 'driver_info_mem.iova'?

I asked before but not able to get an answer, what is the memory type requirement for device?
Why virtual address obtained via 'calloc()' is not working, but virtual address from hugepages are working?

#24 lore raw

Re: [v4] net/gve: check driver compatibility

Quoted 6 lines · Rushil Gupta

1. This is the excerpt from the google's virtual nic spec:
"In addition to the device-owned register file, vector table, and doorbells, the gVNIC device uses *DMA* (which in most cases amounts to ordinary memory access by host software since we're dealing with a virtual device, but guests must assume the device could be backed by actual hardware) to access physical memory. The following are all

Quoted 9 lines

located in physical memory: Admin queue - 4096-byte command queue used for configuring gVNIC.
Some commands require an additional dma memory region to be passed to the device. These memory regions are allocated to execute the command and freed when the command completes."
The calloc by default doesn't allow memory to be shared between the dpdk process and hypervisor (where virtual device lives); so that's the reason it doesn't work.

Thanks Rushil for the info.
So, I expect gVNIC requires physical address to be passed in the admin command, as 'driver_info_mem.iova'.

What confuses me is, latest version passes another virtual address 'driver_info' ('driver_info_mem->addr').

Quoted 5 lines

2. I also have a query: RHEL8 compilation in ci/Intel-compilation context fails due to; is this because of if not is_linux

meson.build:67:0: ERROR: Include dir lib/eal/linux/include does not exist.

This error shouldn't be related with not is_linux, but I am not sure about its root case, if it still exists in next version we can communicate with CI team for details. For now I assume this is an infrastructure issue.

Quoted 65 lines

Passes:
http://patchwork.dpdk.org/project/dpdk/patch/[email protected]/ <http://patchwork.dpdk.org/project/dpdk/patch/[email protected]/>

Fails:
http://patchwork.dpdk.org/project/dpdk/patch/[email protected]/ <http://patchwork.dpdk.org/project/dpdk/patch/[email protected]/>

On Mon, May 22, 2023 at 1:52 AM Ferruh Yigit <[email protected] <mailto:[email protected]>> wrote:

On 5/19/2023 9:46 PM, Rushil Gupta wrote:
> +static int
> +gve_verify_driver_compatibility(struct gve_priv *priv) > +{
> +     const struct rte_memzone *driver_info_mem;
> +     struct gve_driver_info *driver_info;
> +     int err;
> +
> +     driver_info_mem = rte_memzone_reserve_aligned("verify_driver_compatibility", > +                     sizeof(struct gve_driver_info),
> +                     rte_socket_id(),
> +                     RTE_MEMZONE_IOVA_CONTIG, PAGE_SIZE); > +
> +     if (driver_info_mem == NULL) {
> +             PMD_DRV_LOG(ERR,
> +                         "Could not alloc memzone for driver compatibility");
> +             return -ENOMEM;
> +     }
> +     driver_info = (struct gve_driver_info *)driver_info_mem->addr; > +
> +     *driver_info = (struct gve_driver_info) {
> +             .os_type = 5, /* DPDK */
> +             .driver_major = GVE_VERSION_MAJOR,
> +             .driver_minor = GVE_VERSION_MINOR,
> +             .driver_sub = GVE_VERSION_SUB,
> +             .os_version_major = cpu_to_be32(DPDK_VERSION_MAJOR), > +             .os_version_minor = cpu_to_be32(DPDK_VERSION_MINOR), > +             .os_version_sub = cpu_to_be32(DPDK_VERSION_SUB), > +             .driver_capability_flags = {
> +                     cpu_to_be64(GVE_DRIVER_CAPABILITY_FLAGS1), > +                     cpu_to_be64(GVE_DRIVER_CAPABILITY_FLAGS2), > +                     cpu_to_be64(GVE_DRIVER_CAPABILITY_FLAGS3), > +                     cpu_to_be64(GVE_DRIVER_CAPABILITY_FLAGS4), > +             },
> +     };
> +
> +     populate_driver_version_strings((char *)driver_info->os_version_str1,
> +                     (char *)driver_info->os_version_str2); > +
> +     err = gve_adminq_verify_driver_compatibility(priv, > +             sizeof(struct gve_driver_info), (dma_addr_t)driver_info);

Back to previous discussion, other commands pass physical address to the admin command, but this pass virtual address.
To follow the same semantic, shouldn't above be 'driver_info_mem.iova'?

I asked before but not able to get an answer, what is the memory type requirement for device?
Why virtual address obtained via 'calloc()' is not working, but virtual address from hugepages are working?

#25 lore raw

Re: [v4] net/gve: check driver compatibility

In reply to Rushil Gupta
Quoted 6 lines · Rushil Gupta
drivers/net/gve/base/gve_osdep.h +0 -0
index abf3d379ae..5e8ae1eac6 100644
@@ -21,9 +21,14 @@
 #include <rte_malloc.h>

drivers/net/gve/base/gve_osdep.h line 31

Quoted 10 lines
drivers/net/gve/base/gve_osdep.h +5 -0
 #include <rte_memcpy.h>
 #include <rte_memzone.h>
+#include <rte_version.h>
 
 #include "../gve_logs.h"
 
+#ifdef __linux__
+#include <sys/utsname.h>
+#endif
+

Can you please use 'RTE_EXEC_ENV_LINUX' macro instead of '__linux__'?

#26 lore raw

Re: [v4] net/gve: check driver compatibility

As noted from spec: "Some commands require an additional dma memory
region to be passed to the device"
We are passing virtual addresses to devices (please look at link-speed
and describe-device adminq commands):
describe device:
https://github.com/DPDK/dpdk/blob/main/drivers/net/gve/base/gve_adminq.c#L704
link-speed: https://github.com/DPDK/dpdk/blob/main/drivers/net/gve/base/gve_adminq.c#L869

These adminq commands rely on gve_dma_alloc which presents mz->addr and not iova as memory region:
https://github.com/DPDK/dpdk/blob/main/drivers/net/gve/base/gve_osdep.h#L139

Here is the new patch:
http://patchwork.dpdk.org/project/dpdk/patch/[email protected]/

Quoted 20 lines · Ferruh Yigit
Quoted 6 lines · Rushil Gupta
drivers/net/gve/base/gve_osdep.h +0 -0
index abf3d379ae..5e8ae1eac6 100644
@@ -21,9 +21,14 @@
 #include <rte_malloc.h>

drivers/net/gve/base/gve_osdep.h line 31

Quoted 10 lines
drivers/net/gve/base/gve_osdep.h +5 -0
 #include <rte_memcpy.h>
 #include <rte_memzone.h>
+#include <rte_version.h>
 
 #include "../gve_logs.h"
 
+#ifdef __linux__
+#include <sys/utsname.h>
+#endif
+

Can you please use 'RTE_EXEC_ENV_LINUX' macro instead of '__linux__'?

#27 lore raw

Re: [v4] net/gve: check driver compatibility

http://patchwork.dpdk.org/project/dpdk/patch/[email protected]/
Does this look good to you?

Quoted 39 lines · Rushil Gupta

As noted from spec: "Some commands require an additional dma memory
region to be passed to the device"
We are passing virtual addresses to devices (please look at link-speed
and describe-device adminq commands):
describe device:
https://github.com/DPDK/dpdk/blob/main/drivers/net/gve/base/gve_adminq.c#L704
link-speed: https://github.com/DPDK/dpdk/blob/main/drivers/net/gve/base/gve_adminq.c#L869

These adminq commands rely on gve_dma_alloc which presents mz->addr and not iova as memory region:
https://github.com/DPDK/dpdk/blob/main/drivers/net/gve/base/gve_osdep.h#L139

Here is the new patch:
http://patchwork.dpdk.org/project/dpdk/patch/[email protected]/

Quoted 20 lines · Ferruh Yigit
Quoted 6 lines · Rushil Gupta
drivers/net/gve/base/gve_osdep.h +0 -0
index abf3d379ae..5e8ae1eac6 100644
@@ -21,9 +21,14 @@
 #include <rte_malloc.h>

drivers/net/gve/base/gve_osdep.h line 31

Quoted 10 lines
drivers/net/gve/base/gve_osdep.h +5 -0
 #include <rte_memcpy.h>
 #include <rte_memzone.h>
+#include <rte_version.h>
 
 #include "../gve_logs.h"
 
+#ifdef __linux__
+#include <sys/utsname.h>
+#endif
+

Can you please use 'RTE_EXEC_ENV_LINUX' macro instead of '__linux__'?

#28 lore raw

PATCH v5 1/1 net/gve: check driver compatibility

In reply to Rushil Gupta

Change gve_driver_info fields to report DPDK as OS type and DPDK RTE version as OS version, reserving driver_version fields for GVE driver version based on features.

---
 drivers/net/gve/base/gve.h        |  3 --
 drivers/net/gve/base/gve_adminq.c | 19 +++++++++
 drivers/net/gve/base/gve_adminq.h | 46 ++++++++++++++++++++-
 drivers/net/gve/base/gve_osdep.h  | 24 +++++++++++
 drivers/net/gve/gve_ethdev.c      | 67 ++++++++++++++++++++++++++-----
 drivers/net/gve/gve_ethdev.h      |  2 +-
 drivers/net/gve/gve_version.c     | 13 ++++++
 drivers/net/gve/gve_version.h     | 24 +++++++++++
 drivers/net/gve/meson.build       |  5 ++-
 9 files changed, 185 insertions(+), 18 deletions(-)
 create mode 100644 drivers/net/gve/gve_version.c
 create mode 100644 drivers/net/gve/gve_version.h
drivers/net/gve/base/gve.h +0 -3
index 2b7cf7d99b..f7b297e759 100644
@@ -9,9 +9,6 @@
 #include "gve_desc.h"
 #include "gve_desc_dqo.h"
 
-#define GVE_VERSION		"1.3.0"
-#define GVE_VERSION_PREFIX	"GVE-"
-
 #ifndef GOOGLE_VENDOR_ID
 #define GOOGLE_VENDOR_ID	0x1ae0
 #endif
drivers/net/gve/base/gve_adminq.c +19 -0
index e963f910a0..41202725e6 100644
@@ -401,6 +401,9 @@ static int gve_adminq_issue_cmd(struct gve_priv *priv,
 	case GVE_ADMINQ_GET_PTYPE_MAP:
 		priv->adminq_get_ptype_map_cnt++;
 		break;
+	case GVE_ADMINQ_VERIFY_DRIVER_COMPATIBILITY:
+		priv->adminq_verify_driver_compatibility_cnt++;
+		break;
 	default:
 		PMD_DRV_LOG(ERR, "unknown AQ command opcode %d", opcode);
 	}
@@ -465,6 +468,22 @@ int gve_adminq_configure_device_resources(struct gve_priv *priv,
 	return gve_adminq_execute_cmd(priv, &cmd);
 }
 
+int gve_adminq_verify_driver_compatibility(struct gve_priv *priv,
+					   u64 driver_info_len,
+					   dma_addr_t driver_info_addr)
+{
+	union gve_adminq_command cmd;
+
+	memset(&cmd, 0, sizeof(cmd));
+	cmd.opcode = cpu_to_be32(GVE_ADMINQ_VERIFY_DRIVER_COMPATIBILITY);
+	cmd.verify_driver_compatibility = (struct gve_adminq_verify_driver_compatibility) {
+		.driver_info_len = cpu_to_be64(driver_info_len),
+		.driver_info_addr = cpu_to_be64(driver_info_addr),
+	};
+
+	return gve_adminq_execute_cmd(priv, &cmd);
+}
+
 int gve_adminq_deconfigure_device_resources(struct gve_priv *priv)
 {
 	union gve_adminq_command cmd;
drivers/net/gve/base/gve_adminq.h +45 -1

73 lines not on this page · raw message

drivers/net/gve/base/gve_osdep.h +24 -0
index abf3d379ae..a3702f4b8c 100644
@@ -21,9 +21,14 @@
 #include <rte_malloc.h>
 #include <rte_memcpy.h>
 #include <rte_memzone.h>
+#include <rte_version.h>
 
 #include "../gve_logs.h"
 
+#ifdef RTE_EXEC_ENV_LINUX
+#include <sys/utsname.h>
+#endif
+
 typedef uint8_t u8;
 typedef uint16_t u16;
 typedef uint32_t u32;
@@ -73,6 +78,12 @@ typedef rte_iova_t dma_addr_t;
 
 #define msleep(ms)		rte_delay_ms(ms)
 
+#define OS_VERSION_STRLEN 128
+struct os_version_string {
+	char os_version_str1[OS_VERSION_STRLEN];
+	char os_version_str2[OS_VERSION_STRLEN];
+};
+
 /* These macros are used to generate compilation errors if a struct/union
  * is not exactly the correct length. It gives a divide by zero error if
  * the struct/union is not of the correct size, otherwise it creates an
@@ -160,4 +171,17 @@ gve_free_dma_mem(struct gve_dma_mem *mem)
 	mem->pa = 0;
 }
 
+static inline void
+populate_driver_version_strings(char *str1, char *str2)
+{
+	struct utsname uts;
+	if (uname(&uts) >= 0) {
+		/* release */
+		rte_strscpy(str1, uts.release,
+			OS_VERSION_STRLEN);
+		/* version */
+		rte_strscpy(str2, uts.version,
+			OS_VERSION_STRLEN);
+	}
+}
 #endif /* _GVE_OSDEP_H_ */
drivers/net/gve/gve_ethdev.c +56 -11

89 lines not on this page · raw message

drivers/net/gve/gve_ethdev.h +1 -1
index cd62debd22..c9bcfa553c 100644
@@ -268,7 +268,7 @@ struct gve_priv {
 	uint32_t adminq_report_stats_cnt;
 	uint32_t adminq_report_link_speed_cnt;
 	uint32_t adminq_get_ptype_map_cnt;
-
+	uint32_t adminq_verify_driver_compatibility_cnt;
 	volatile uint32_t state_flags;
 
 	/* Gvnic device link speed from hypervisor. */
drivers/net/gve/gve_version.c new file +13 -0
new file mode 100644
index 0000000000..5fe34dc179
@@ -0,0 +1,13 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (C) 2015-2023 Google, Inc.
+ */
+#include "gve_version.h"
+
+const char *gve_version_string(void)
+{
+	static char gve_version[20];
+	snprintf(gve_version, sizeof(gve_version), "%s%d.%d.%d",
+		GVE_VERSION_PREFIX, GVE_VERSION_MAJOR, GVE_VERSION_MINOR,
+		GVE_VERSION_SUB);
+	return gve_version;
+}
drivers/net/gve/gve_version.h new file +24 -0
new file mode 100644
index 0000000000..4dd998dca1
@@ -0,0 +1,24 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (C) 2015-2023 Google, Inc.
+ */
+
+#ifndef _GVE_VERSION_H_
+#define _GVE_VERSION_H_
+
+#include <rte_version.h>
+
+#define GVE_VERSION_PREFIX "DPDK-"
+#define GVE_VERSION_MAJOR 1
+#define GVE_VERSION_MINOR 0
+#define GVE_VERSION_SUB 0
+
+#define DPDK_VERSION_MAJOR (100 * RTE_VER_YEAR + RTE_VER_MONTH)
+#define DPDK_VERSION_MINOR RTE_VER_MINOR
+#define DPDK_VERSION_SUB RTE_VER_RELEASE
+
+
+const char *
+gve_version_string(void);
+
+
+#endif /* GVE_VERSION_H */
drivers/net/gve/meson.build +3 -2
index c9d87903f9..61d195009c 100644
@@ -1,9 +1,9 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(C) 2022 Intel Corporation
 
-if is_windows
+if not is_linux
     build = false
-    reason = 'not supported on Windows'
+    reason = 'only supported on Linux'
     subdir_done()
 endif
 
@@ -14,5 +14,6 @@ sources = files(
         'gve_rx_dqo.c',
         'gve_tx_dqo.c',
         'gve_ethdev.c',
+        'gve_version.c',
 )
 includes += include_directories('base')
Signature · 1 line
2.41.0.rc0.172.g3f132b7071-goog
Reviewed-by on v5 1/1 Applied
#29 lore raw

Re: [v5] net/gve: check driver compatibility

Quoted 8 lines · Rushil Gupta

Change gve_driver_info fields to report DPDK as OS type and DPDK RTE version as OS version, reserving driver_version fields for GVE driver version based on features.

Applied to dpdk-next-net/main, thanks.

#30 lore raw

PATCH v3 1/1 net/gve: check driver compatibility

In reply to Rushil Gupta

Change gve_driver_info fields to report DPDK as OS type and DPDK RTE version as OS version, reserving driver_version fields for GVE driver version based on features.

---
 drivers/net/gve/base/gve.h        |  3 --
 drivers/net/gve/base/gve_adminq.c | 19 ++++++++++
 drivers/net/gve/base/gve_adminq.h | 46 ++++++++++++++++++++++-
 drivers/net/gve/base/gve_osdep.h  | 24 ++++++++++++
 drivers/net/gve/gve_ethdev.c      | 61 +++++++++++++++++++++++++------
 drivers/net/gve/gve_ethdev.h      |  2 +-
 drivers/net/gve/gve_version.c     | 13 +++++++
 drivers/net/gve/gve_version.h     | 24 ++++++++++++
 drivers/net/gve/meson.build       |  5 ++-
 9 files changed, 179 insertions(+), 18 deletions(-)
 create mode 100644 drivers/net/gve/gve_version.c
 create mode 100644 drivers/net/gve/gve_version.h
drivers/net/gve/base/gve.h +0 -3
index 2dc4507acb..89f9654a72 100644
@@ -8,9 +8,6 @@
 
 #include "gve_desc.h"
 
-#define GVE_VERSION		"1.3.0"
-#define GVE_VERSION_PREFIX	"GVE-"
-
 #ifndef GOOGLE_VENDOR_ID
 #define GOOGLE_VENDOR_ID	0x1ae0
 #endif
drivers/net/gve/base/gve_adminq.c +19 -0
index e745b709b2..2e5099a5b0 100644
@@ -401,6 +401,9 @@ static int gve_adminq_issue_cmd(struct gve_priv *priv,
 	case GVE_ADMINQ_GET_PTYPE_MAP:
 		priv->adminq_get_ptype_map_cnt++;
 		break;
+	case GVE_ADMINQ_VERIFY_DRIVER_COMPATIBILITY:
+		priv->adminq_verify_driver_compatibility_cnt++;
+		break;
 	default:
 		PMD_DRV_LOG(ERR, "unknown AQ command opcode %d", opcode);
 	}
@@ -465,6 +468,22 @@ int gve_adminq_configure_device_resources(struct gve_priv *priv,
 	return gve_adminq_execute_cmd(priv, &cmd);
 }
 
+int gve_adminq_verify_driver_compatibility(struct gve_priv *priv,
+					   u64 driver_info_len,
+					   dma_addr_t driver_info_addr)
+{
+	union gve_adminq_command cmd;
+
+	memset(&cmd, 0, sizeof(cmd));
+	cmd.opcode = cpu_to_be32(GVE_ADMINQ_VERIFY_DRIVER_COMPATIBILITY);
+	cmd.verify_driver_compatibility = (struct gve_adminq_verify_driver_compatibility) {
+		.driver_info_len = cpu_to_be64(driver_info_len),
+		.driver_info_addr = cpu_to_be64(driver_info_addr),
+	};
+
+	return gve_adminq_execute_cmd(priv, &cmd);
+}
+
 int gve_adminq_deconfigure_device_resources(struct gve_priv *priv)
 {
 	union gve_adminq_command cmd;
drivers/net/gve/base/gve_adminq.h +45 -1

73 lines not on this page · raw message

drivers/net/gve/base/gve_osdep.h +24 -0
index 7cb73002f4..43081ec2a9 100644
@@ -21,9 +21,14 @@
 #include <rte_malloc.h>
 #include <rte_memcpy.h>
 #include <rte_memzone.h>
+#include <rte_version.h>
 
 #include "../gve_logs.h"
 
+#ifdef __linux__
+#include <sys/utsname.h>
+#endif
+
 typedef uint8_t u8;
 typedef uint16_t u16;
 typedef uint32_t u32;
@@ -69,6 +74,12 @@ typedef rte_iova_t dma_addr_t;
 
 #define msleep(ms)		rte_delay_ms(ms)
 
+#define OS_VERSION_STRLEN 128
+struct os_version_string {
+	char os_version_str1[OS_VERSION_STRLEN];
+	char os_version_str2[OS_VERSION_STRLEN];
+};
+
 /* These macros are used to generate compilation errors if a struct/union
  * is not exactly the correct length. It gives a divide by zero error if
  * the struct/union is not of the correct size, otherwise it creates an
@@ -156,4 +167,17 @@ gve_free_dma_mem(struct gve_dma_mem *mem)
 	mem->pa = 0;
 }
 
+static inline void
+populate_driver_version_strings(char *str1, char *str2)
+{
+	struct utsname uts;
+	if (uname(&uts) >= 0) {
+		/* release */
+		rte_strscpy(str1, uts.release,
+			OS_VERSION_STRLEN);
+		/* version */
+		rte_strscpy(str2, uts.version,
+			OS_VERSION_STRLEN);
+	}
+}
 #endif /* _GVE_OSDEP_H_ */
drivers/net/gve/gve_ethdev.c +50 -11

83 lines not on this page · raw message

drivers/net/gve/gve_ethdev.h +1 -1
index 42a02cf5d4..23ccff37d3 100644
@@ -222,7 +222,7 @@ struct gve_priv {
 	uint32_t adminq_report_stats_cnt;
 	uint32_t adminq_report_link_speed_cnt;
 	uint32_t adminq_get_ptype_map_cnt;
-
+	uint32_t adminq_verify_driver_compatibility_cnt;
 	volatile uint32_t state_flags;
 
 	/* Gvnic device link speed from hypervisor. */
drivers/net/gve/gve_version.c new file +13 -0
new file mode 100644
index 0000000000..5fe34dc179
@@ -0,0 +1,13 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (C) 2015-2023 Google, Inc.
+ */
+#include "gve_version.h"
+
+const char *gve_version_string(void)
+{
+	static char gve_version[20];
+	snprintf(gve_version, sizeof(gve_version), "%s%d.%d.%d",
+		GVE_VERSION_PREFIX, GVE_VERSION_MAJOR, GVE_VERSION_MINOR,
+		GVE_VERSION_SUB);
+	return gve_version;
+}
drivers/net/gve/gve_version.h new file +24 -0
new file mode 100644
index 0000000000..4dd998dca1
@@ -0,0 +1,24 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (C) 2015-2023 Google, Inc.
+ */
+
+#ifndef _GVE_VERSION_H_
+#define _GVE_VERSION_H_
+
+#include <rte_version.h>
+
+#define GVE_VERSION_PREFIX "DPDK-"
+#define GVE_VERSION_MAJOR 1
+#define GVE_VERSION_MINOR 0
+#define GVE_VERSION_SUB 0
+
+#define DPDK_VERSION_MAJOR (100 * RTE_VER_YEAR + RTE_VER_MONTH)
+#define DPDK_VERSION_MINOR RTE_VER_MINOR
+#define DPDK_VERSION_SUB RTE_VER_RELEASE
+
+
+const char *
+gve_version_string(void);
+
+
+#endif /* GVE_VERSION_H */
drivers/net/gve/meson.build +3 -2
index af0010c01c..365b7ffdaa 100644
@@ -1,9 +1,9 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(C) 2022 Intel Corporation
 
-if is_windows
+if not is_linux
     build = false
-    reason = 'not supported on Windows'
+    reason = 'only supported on Linux'
     subdir_done()
 endif
 
@@ -12,5 +12,6 @@ sources = files(
         'gve_rx.c',
         'gve_tx.c',
         'gve_ethdev.c',
+        'gve_version.c',
 )
 includes += include_directories('base')
Signature · 1 line
2.40.1.698.g37aff9b760-goog
#31 lore raw

PATCH v2 1/1 net/gve: check driver compatibility

In reply to Rushil Gupta

Change gve_driver_info fields to report DPDK as OS type and DPDK RTE version as OS version, reserving driver_version fields for GVE driver version based on features.

---
 drivers/net/gve/base/gve.h        |  3 --
 drivers/net/gve/base/gve_adminq.c | 19 ++++++++++
 drivers/net/gve/base/gve_adminq.h | 46 ++++++++++++++++++++++-
 drivers/net/gve/base/gve_osdep.h  | 24 ++++++++++++
 drivers/net/gve/gve_ethdev.c      | 61 +++++++++++++++++++++++++------
 drivers/net/gve/gve_ethdev.h      |  2 +-
 drivers/net/gve/gve_version.c     | 14 +++++++
 drivers/net/gve/gve_version.h     | 25 +++++++++++++
 drivers/net/gve/meson.build       |  7 ++++
 9 files changed, 185 insertions(+), 16 deletions(-)
 create mode 100644 drivers/net/gve/gve_version.c
 create mode 100644 drivers/net/gve/gve_version.h
drivers/net/gve/base/gve.h +0 -3
index 2dc4507acb..89f9654a72 100644
@@ -8,9 +8,6 @@
 
 #include "gve_desc.h"
 
-#define GVE_VERSION		"1.3.0"
-#define GVE_VERSION_PREFIX	"GVE-"
-
 #ifndef GOOGLE_VENDOR_ID
 #define GOOGLE_VENDOR_ID	0x1ae0
 #endif
drivers/net/gve/base/gve_adminq.c +19 -0
index e745b709b2..2e5099a5b0 100644
@@ -401,6 +401,9 @@ static int gve_adminq_issue_cmd(struct gve_priv *priv,
 	case GVE_ADMINQ_GET_PTYPE_MAP:
 		priv->adminq_get_ptype_map_cnt++;
 		break;
+	case GVE_ADMINQ_VERIFY_DRIVER_COMPATIBILITY:
+		priv->adminq_verify_driver_compatibility_cnt++;
+		break;
 	default:
 		PMD_DRV_LOG(ERR, "unknown AQ command opcode %d", opcode);
 	}
@@ -465,6 +468,22 @@ int gve_adminq_configure_device_resources(struct gve_priv *priv,
 	return gve_adminq_execute_cmd(priv, &cmd);
 }
 
+int gve_adminq_verify_driver_compatibility(struct gve_priv *priv,
+					   u64 driver_info_len,
+					   dma_addr_t driver_info_addr)
+{
+	union gve_adminq_command cmd;
+
+	memset(&cmd, 0, sizeof(cmd));
+	cmd.opcode = cpu_to_be32(GVE_ADMINQ_VERIFY_DRIVER_COMPATIBILITY);
+	cmd.verify_driver_compatibility = (struct gve_adminq_verify_driver_compatibility) {
+		.driver_info_len = cpu_to_be64(driver_info_len),
+		.driver_info_addr = cpu_to_be64(driver_info_addr),
+	};
+
+	return gve_adminq_execute_cmd(priv, &cmd);
+}
+
 int gve_adminq_deconfigure_device_resources(struct gve_priv *priv)
 {
 	union gve_adminq_command cmd;
drivers/net/gve/base/gve_adminq.h +45 -1

73 lines not on this page · raw message

drivers/net/gve/base/gve_osdep.h +24 -0
index 7cb73002f4..43081ec2a9 100644
@@ -21,9 +21,14 @@
 #include <rte_malloc.h>
 #include <rte_memcpy.h>
 #include <rte_memzone.h>
+#include <rte_version.h>
 
 #include "../gve_logs.h"
 
+#ifdef __linux__
+#include <sys/utsname.h>
+#endif
+
 typedef uint8_t u8;
 typedef uint16_t u16;
 typedef uint32_t u32;
@@ -69,6 +74,12 @@ typedef rte_iova_t dma_addr_t;
 
 #define msleep(ms)		rte_delay_ms(ms)
 
+#define OS_VERSION_STRLEN 128
+struct os_version_string {
+	char os_version_str1[OS_VERSION_STRLEN];
+	char os_version_str2[OS_VERSION_STRLEN];
+};
+
 /* These macros are used to generate compilation errors if a struct/union
  * is not exactly the correct length. It gives a divide by zero error if
  * the struct/union is not of the correct size, otherwise it creates an
@@ -156,4 +167,17 @@ gve_free_dma_mem(struct gve_dma_mem *mem)
 	mem->pa = 0;
 }
 
+static inline void
+populate_driver_version_strings(char *str1, char *str2)
+{
+	struct utsname uts;
+	if (uname(&uts) >= 0) {
+		/* release */
+		rte_strscpy(str1, uts.release,
+			OS_VERSION_STRLEN);
+		/* version */
+		rte_strscpy(str2, uts.version,
+			OS_VERSION_STRLEN);
+	}
+}
 #endif /* _GVE_OSDEP_H_ */
drivers/net/gve/gve_ethdev.c +50 -11

83 lines not on this page · raw message

drivers/net/gve/gve_ethdev.h +1 -1
index 42a02cf5d4..23ccff37d3 100644
@@ -222,7 +222,7 @@ struct gve_priv {
 	uint32_t adminq_report_stats_cnt;
 	uint32_t adminq_report_link_speed_cnt;
 	uint32_t adminq_get_ptype_map_cnt;
-
+	uint32_t adminq_verify_driver_compatibility_cnt;
 	volatile uint32_t state_flags;
 
 	/* Gvnic device link speed from hypervisor. */
drivers/net/gve/gve_version.c new file +14 -0
new file mode 100644
index 0000000000..f02b4f696f
@@ -0,0 +1,14 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Google Virtual Ethernet (gve) driver
+ * Copyright (C) 2015-2023 Google, Inc.
+ */
+#include "gve_version.h"
+
+const char *gve_version_string(void)
+{
+	static char gve_version[10];
+	snprintf(gve_version, sizeof(gve_version), "%s%d.%d.%d",
+		GVE_VERSION_PREFIX, GVE_VERSION_MAJOR, GVE_VERSION_MINOR,
+		GVE_VERSION_SUB);
+	return gve_version;
+}
drivers/net/gve/gve_version.h new file +25 -0
new file mode 100644
index 0000000000..eca717d64b
@@ -0,0 +1,25 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Google Virtual Ethernet (gve) driver
+ * Copyright (C) 2015-2023 Google, Inc.
+ */
+
+#ifndef _GVE_VERSION_H_
+#define _GVE_VERSION_H_
+
+#include <rte_version.h>
+
+#define GVE_VERSION_PREFIX "DPDK-"
+#define GVE_VERSION_MAJOR 1
+#define GVE_VERSION_MINOR 0
+#define GVE_VERSION_SUB 0
+
+#define DPDK_VERSION_MAJOR (100 * RTE_VER_YEAR + RTE_VER_MONTH)
+#define DPDK_VERSION_MINOR RTE_VER_MINOR
+#define DPDK_VERSION_SUB RTE_VER_RELEASE
+
+
+const char *
+gve_version_string(void);
+
+
+#endif /* GVE_VERSION_H */
drivers/net/gve/meson.build +7 -0
index af0010c01c..62ab02d0dc 100644
@@ -7,10 +7,17 @@ if is_windows
     subdir_done()
 endif
 
+if is_freebsd
+    build = false
+    reason = 'not supported on FreeBSD'
+    subdir_done()
+endif
+
 sources = files(
         'base/gve_adminq.c',
         'gve_rx.c',
         'gve_tx.c',
         'gve_ethdev.c',
+        'gve_version.c',
 )
 includes += include_directories('base')
Signature · 1 line
2.40.1.521.gf1e218fcd8-goog