From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id A904F42A9A; Mon, 8 May 2023 21:15:57 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9C43E410F2; Mon, 8 May 2023 21:15:57 +0200 (CEST) Received: from mail-yw1-f201.google.com (mail-yw1-f201.google.com [209.85.128.201]) by mails.dpdk.org (Postfix) with ESMTP id 7B78F410ED for ; Mon, 8 May 2023 21:15:56 +0200 (CEST) Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-55da0b03448so79225137b3.2 for ; Mon, 08 May 2023 12:15:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1683573356; x=1686165356; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=fw5nRqlTf6+tzIRxd31pXr6eQiNVQaViZOKfA0adLeM=; b=HtxtuTaMqUOsTDanxey/9t2umruFbK6myMgd6oieHgzv8/+MpZ59gwDkOM5BG6glVV bl78Mis3czQGn6ShduZza3+tp8Iz5PdvgDxhS28UmDJikrX7B/uWtd59o7X0gGoid1X6 AKRxjsdIZN2DyzLGCSIrTC9Hc8fdKlyK8K/yH9NKOA5NvlBZk+I5ytA9yfGy8Q/QKlH7 gHR/Rp0b5dGmt1k9h8sIF/KRaBs/wBt40y08EHqYwzGSkgzii6kdZodqsP8J4T/wMuUA ODQo5FPLgRF0tPws6jbYyiIrTy0C1fHMUsFFmlUa1OUWdWZwg9G2DJiizCKQqad8/fK9 k9qg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683573356; x=1686165356; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=fw5nRqlTf6+tzIRxd31pXr6eQiNVQaViZOKfA0adLeM=; b=OKpHCem16ErtDtKWW4a2MwJmh5phfbzJWOuHRXVx3i9kOIgA0z7upiQh09WyXg9NpS aRqjFnQfL15N3XwnIgogWNPW8wbXGty/SfaH3xy2xV2zeGwWr2N+GEYMs7Nvz6X4Auyl u1zh7jLwCRE5h3KkB1IPqjSRQva/w16yO74WC/SfFNtXMIYq2O1FCGybwycVmHICF+8f NAYq2mrsd5Wh16sMAN/vi/G82yJeKSJFLkDNbdtIbq7N6kMFPCTctd60bqhE8xzeOWLf DxV4XaCLmU1RqFnZJ02btMAtcea6fA2vXESknAwbVCsa9vyl8qciSeZ3eyPuIlEfT3nS jJIQ== X-Gm-Message-State: AC+VfDyBukwlsh+fKlpjxIPVG4iVPb+TUzmY6VVLJYQ6MBXGunONcEt1 DMjrEMOqh6YG6RYdEI7BDGzVSDzcgdaP X-Google-Smtp-Source: ACHHUZ6kRJYq+ONhFAgz4W0dALEoNKWg/3GNYNGNrw3Cs82IV2AbifVVjDTIUb5yIdTk0uu+wNSrBxjaYsFd X-Received: from rushilg.sea.corp.google.com ([2620:15c:100:202:58e0:a1a2:b9a6:9dc3]) (user=rushilg job=sendgmr) by 2002:a81:c102:0:b0:54c:7a1:ef50 with SMTP id f2-20020a81c102000000b0054c07a1ef50mr7008080ywi.6.1683573355935; Mon, 08 May 2023 12:15:55 -0700 (PDT) Date: Mon, 8 May 2023 12:15:52 -0700 In-Reply-To: <20230426213700.2668699-1-rushilg@google.com> Mime-Version: 1.0 References: <20230426213700.2668699-1-rushilg@google.com> X-Mailer: git-send-email 2.40.1.521.gf1e218fcd8-goog Message-ID: <20230508191552.104540-1-rushilg@google.com> Subject: [v2] net/gve: check driver compatibility From: Rushil Gupta To: ferruh.yigit@amd.com, qi.z.zhang@intel.com, jingjing.wu@intel.com Cc: junfeng.guo@intel.com, joshwash@google.com, dev@dpdk.org, Rushil Gupta , Jeroen de Borst Content-Type: text/plain; charset="UTF-8" X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org 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 Signed-off-by: Joshua Washington Signed-off-by: Junfeng Guo Signed-off-by: Jeroen de Borst --- 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 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 #include #include +#include #include "../gve_logs.h" +#ifdef __linux__ +#include +#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..12a4d07252 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 = rte_zmalloc("driver info", sizeof(struct gve_driver_info), 0); + if (driver_info == NULL) { + PMD_DRV_LOG(ERR, + "Could not alloc for 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) { @@ -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..f02b4f696f --- /dev/null +++ b/drivers/net/gve/gve_version.c @@ -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; +} diff --git a/drivers/net/gve/gve_version.h b/drivers/net/gve/gve_version.h new file mode 100644 index 0000000000..eca717d64b --- /dev/null +++ b/drivers/net/gve/gve_version.h @@ -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 + +#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..62ab02d0dc 100644 --- a/drivers/net/gve/meson.build +++ b/drivers/net/gve/meson.build @@ -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') -- 2.40.1.521.gf1e218fcd8-goog