add support for idpf PMD in DPDK
Subsystems (2)
cover add support for idpf PMD in DPDK
This is a draft of idpf (Infrastructure Data Path Function) PMD in DPDK for Intel Device ID of 0x1452.
Junfeng Guo (9):
net/idpf/base: introduce base code
net/idpf/base: add OS specific implementation
net/idpf: support device initialization
net/idpf: support queue ops
net/idpf: support getting device information
net/idpf: support packet type getting
net/idpf: support link update
net/idpf: support basic Rx/Tx
net/idpf: support RSS
drivers/net/idpf/base/iecm_alloc.h | 22 + drivers/net/idpf/base/iecm_common.c | 359 +++ drivers/net/idpf/base/iecm_controlq.c | 662 ++++ drivers/net/idpf/base/iecm_controlq.h | 214 ++ drivers/net/idpf/base/iecm_controlq_api.h | 227 ++ drivers/net/idpf/base/iecm_controlq_setup.c | 179 ++ drivers/net/idpf/base/iecm_devids.h | 17 + drivers/net/idpf/base/iecm_lan_pf_regs.h | 134 + drivers/net/idpf/base/iecm_lan_txrx.h | 428 +++ drivers/net/idpf/base/iecm_lan_vf_regs.h | 114 + drivers/net/idpf/base/iecm_osdep.h | 365 +++ drivers/net/idpf/base/iecm_prototype.h | 45 + drivers/net/idpf/base/iecm_type.h | 106 + drivers/net/idpf/base/meson.build | 27 + drivers/net/idpf/base/siov_regs.h | 41 + drivers/net/idpf/base/virtchnl.h | 2743 +++++++++++++++++ drivers/net/idpf/base/virtchnl2.h | 1411 +++++++++ drivers/net/idpf/base/virtchnl2_lan_desc.h | 603 ++++ drivers/net/idpf/base/virtchnl_inline_ipsec.h | 567 ++++ drivers/net/idpf/idpf_ethdev.c | 1030 +++++++ drivers/net/idpf/idpf_ethdev.h | 223 ++ drivers/net/idpf/idpf_logs.h | 38 + drivers/net/idpf/idpf_rxtx.c | 2180 +++++++++++++ drivers/net/idpf/idpf_rxtx.h | 203 ++ drivers/net/idpf/idpf_vchnl.c | 900 ++++++ drivers/net/idpf/meson.build | 19 + drivers/net/idpf/version.map | 3 + drivers/net/meson.build | 1 + 28 files changed, 12861 insertions(+) create mode 100644 drivers/net/idpf/base/iecm_alloc.h create mode 100644 drivers/net/idpf/base/iecm_common.c create mode 100644 drivers/net/idpf/base/iecm_controlq.c create mode 100644 drivers/net/idpf/base/iecm_controlq.h create mode 100644 drivers/net/idpf/base/iecm_controlq_api.h create mode 100644 drivers/net/idpf/base/iecm_controlq_setup.c create mode 100644 drivers/net/idpf/base/iecm_devids.h create mode 100644 drivers/net/idpf/base/iecm_lan_pf_regs.h create mode 100644 drivers/net/idpf/base/iecm_lan_txrx.h create mode 100644 drivers/net/idpf/base/iecm_lan_vf_regs.h create mode 100644 drivers/net/idpf/base/iecm_osdep.h create mode 100644 drivers/net/idpf/base/iecm_prototype.h create mode 100644 drivers/net/idpf/base/iecm_type.h create mode 100644 drivers/net/idpf/base/meson.build create mode 100644 drivers/net/idpf/base/siov_regs.h create mode 100644 drivers/net/idpf/base/virtchnl.h create mode 100644 drivers/net/idpf/base/virtchnl2.h create mode 100644 drivers/net/idpf/base/virtchnl2_lan_desc.h create mode 100644 drivers/net/idpf/base/virtchnl_inline_ipsec.h create mode 100644 drivers/net/idpf/idpf_ethdev.c create mode 100644 drivers/net/idpf/idpf_ethdev.h create mode 100644 drivers/net/idpf/idpf_logs.h create mode 100644 drivers/net/idpf/idpf_rxtx.c create mode 100644 drivers/net/idpf/idpf_rxtx.h create mode 100644 drivers/net/idpf/idpf_vchnl.c create mode 100644 drivers/net/idpf/meson.build create mode 100644 drivers/net/idpf/version.map
Signature · 1 line
2.25.1
RFC 1/9 net/idpf/base: introduce base code
Introduce base code for IDPF (Infrastructure Data Path Function) PMD.
--- drivers/net/idpf/base/iecm_alloc.h | 22 + drivers/net/idpf/base/iecm_common.c | 359 +++ drivers/net/idpf/base/iecm_controlq.c | 662 ++++ drivers/net/idpf/base/iecm_controlq.h | 214 ++ drivers/net/idpf/base/iecm_controlq_api.h | 227 ++ drivers/net/idpf/base/iecm_controlq_setup.c | 179 ++ drivers/net/idpf/base/iecm_devids.h | 17 + drivers/net/idpf/base/iecm_lan_pf_regs.h | 134 + drivers/net/idpf/base/iecm_lan_txrx.h | 428 +++ drivers/net/idpf/base/iecm_lan_vf_regs.h | 114 + drivers/net/idpf/base/iecm_prototype.h | 45 + drivers/net/idpf/base/iecm_type.h | 106 + drivers/net/idpf/base/meson.build | 27 + drivers/net/idpf/base/siov_regs.h | 41 + drivers/net/idpf/base/virtchnl.h | 2743 +++++++++++++++++ drivers/net/idpf/base/virtchnl2.h | 1411 +++++++++ drivers/net/idpf/base/virtchnl2_lan_desc.h | 603 ++++ drivers/net/idpf/base/virtchnl_inline_ipsec.h | 567 ++++ 18 files changed, 7899 insertions(+) create mode 100644 drivers/net/idpf/base/iecm_alloc.h create mode 100644 drivers/net/idpf/base/iecm_common.c create mode 100644 drivers/net/idpf/base/iecm_controlq.c create mode 100644 drivers/net/idpf/base/iecm_controlq.h create mode 100644 drivers/net/idpf/base/iecm_controlq_api.h create mode 100644 drivers/net/idpf/base/iecm_controlq_setup.c create mode 100644 drivers/net/idpf/base/iecm_devids.h create mode 100644 drivers/net/idpf/base/iecm_lan_pf_regs.h create mode 100644 drivers/net/idpf/base/iecm_lan_txrx.h create mode 100644 drivers/net/idpf/base/iecm_lan_vf_regs.h create mode 100644 drivers/net/idpf/base/iecm_prototype.h create mode 100644 drivers/net/idpf/base/iecm_type.h create mode 100644 drivers/net/idpf/base/meson.build create mode 100644 drivers/net/idpf/base/siov_regs.h create mode 100644 drivers/net/idpf/base/virtchnl.h create mode 100644 drivers/net/idpf/base/virtchnl2.h create mode 100644 drivers/net/idpf/base/virtchnl2_lan_desc.h create mode 100644 drivers/net/idpf/base/virtchnl_inline_ipsec.h
drivers/net/idpf/base/iecm_alloc.h new file +22 -0
@@ -0,0 +1,22 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* Copyright(c) 2001-2022 Intel Corporation +*/ + +#ifndef _IECM_ALLOC_H_ +#define _IECM_ALLOC_H_ + +/* Memory types */ +enum iecm_memset_type { +IECM_NONDMA_MEM =0 , +IECM_DMA_MEM +}; + +/* Memcpy types */ +enum iecm_memcpy_type { +IECM_NONDMA_TO_NONDMA =0 , +IECM_NONDMA_TO_DMA , +IECM_DMA_TO_DMA , +IECM_DMA_TO_NONDMA +}; + +#endif /* _IECM_ALLOC_H_ */
drivers/net/idpf/base/iecm_common.c new file +359 -0
359 lines not on this page · raw message
drivers/net/idpf/base/iecm_controlq.c new file +662 -0
662 lines not on this page · raw message
drivers/net/idpf/base/iecm_controlq.h new file +214 -0
214 lines not on this page · raw message
drivers/net/idpf/base/iecm_controlq_api.h new file +227 -0
227 lines not on this page · raw message
drivers/net/idpf/base/iecm_controlq_setup.c new file +179 -0
179 lines not on this page · raw message
drivers/net/idpf/base/iecm_devids.h new file +17 -0
@@ -0,0 +1,17 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* Copyright(c) 2001-2022 Intel Corporation +*/ + +#ifndef _IECM_DEVIDS_H_ +#define _IECM_DEVIDS_H_ + +/* Vendor ID */ +#define IECM_INTEL_VENDOR_ID 0x8086 + +/* Device IDs */ +#define IECM_DEV_ID_PF 0x1452 + + + + +#endif /* _IECM_DEVIDS_H_ */
drivers/net/idpf/base/iecm_lan_pf_regs.h new file +134 -0
134 lines not on this page · raw message
drivers/net/idpf/base/iecm_lan_txrx.h new file +428 -0
428 lines not on this page · raw message
drivers/net/idpf/base/iecm_lan_vf_regs.h new file +114 -0
114 lines not on this page · raw message
drivers/net/idpf/base/iecm_prototype.h new file +45 -0
45 lines not on this page · raw message
drivers/net/idpf/base/iecm_type.h new file +106 -0
106 lines not on this page · raw message
drivers/net/idpf/base/meson.build new file +27 -0
@@ -0,0 +1,27 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2022 Intel Corporation + +sources = [ + 'iecm_common.c', + 'iecm_controlq.c', + 'iecm_controlq_setup.c', +] + +error_cflags = ['-Wno-unused-value', + '-Wno-unused-but-set-variable', + '-Wno-unused-variable', + '-Wno-unused-parameter', +] + +c_args = cflags + +foreach flag: error_cflags + if cc.has_argument(flag) + c_args += flag + endif +endforeach + +base_lib = static_library('idpf_base', sources, + dependencies: static_rte_eal, + c_args: c_args) +base_objs = base_lib.extract_all_objects()
drivers/net/idpf/base/siov_regs.h new file +41 -0
41 lines not on this page · raw message
drivers/net/idpf/base/virtchnl.h new file +2743 -0
424 lines not on this page · raw message
drivers/net/idpf/base/virtchnl2.h new file +1411 -0
1,411 lines not on this page · raw message
drivers/net/idpf/base/virtchnl2_lan_desc.h new file +603 -0
603 lines not on this page · raw message
drivers/net/idpf/base/virtchnl_inline_ipsec.h new file +567 -0
567 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.25.1
Part of the diff is not shown here. View the raw message.
v2 cover add support for idpf PMD in DPDK
This is a draft of idpf (Infrastructure Data Path Function) PMD in DPDK for Intel Device ID of 0x1452.
v2:
fix code typo in func idpf_set_tx_function.
Junfeng Guo (9):
net/idpf/base: introduce base code
net/idpf/base: add OS specific implementation
net/idpf: support device initialization
net/idpf: support queue ops
net/idpf: support getting device information
net/idpf: support packet type getting
net/idpf: support link update
net/idpf: support basic Rx/Tx
net/idpf: support RSS
drivers/net/idpf/base/iecm_alloc.h | 22 + drivers/net/idpf/base/iecm_common.c | 359 +++ drivers/net/idpf/base/iecm_controlq.c | 662 ++++ drivers/net/idpf/base/iecm_controlq.h | 214 ++ drivers/net/idpf/base/iecm_controlq_api.h | 227 ++ drivers/net/idpf/base/iecm_controlq_setup.c | 179 ++ drivers/net/idpf/base/iecm_devids.h | 17 + drivers/net/idpf/base/iecm_lan_pf_regs.h | 134 + drivers/net/idpf/base/iecm_lan_txrx.h | 428 +++ drivers/net/idpf/base/iecm_lan_vf_regs.h | 114 + drivers/net/idpf/base/iecm_osdep.h | 365 +++ drivers/net/idpf/base/iecm_prototype.h | 45 + drivers/net/idpf/base/iecm_type.h | 106 + drivers/net/idpf/base/meson.build | 27 + drivers/net/idpf/base/siov_regs.h | 41 + drivers/net/idpf/base/virtchnl.h | 2743 +++++++++++++++++ drivers/net/idpf/base/virtchnl2.h | 1411 +++++++++ drivers/net/idpf/base/virtchnl2_lan_desc.h | 603 ++++ drivers/net/idpf/base/virtchnl_inline_ipsec.h | 567 ++++ drivers/net/idpf/idpf_ethdev.c | 1030 +++++++ drivers/net/idpf/idpf_ethdev.h | 223 ++ drivers/net/idpf/idpf_logs.h | 38 + drivers/net/idpf/idpf_rxtx.c | 2180 +++++++++++++ drivers/net/idpf/idpf_rxtx.h | 203 ++ drivers/net/idpf/idpf_vchnl.c | 900 ++++++ drivers/net/idpf/meson.build | 19 + drivers/net/idpf/version.map | 3 + drivers/net/meson.build | 1 + 28 files changed, 12861 insertions(+) create mode 100644 drivers/net/idpf/base/iecm_alloc.h create mode 100644 drivers/net/idpf/base/iecm_common.c create mode 100644 drivers/net/idpf/base/iecm_controlq.c create mode 100644 drivers/net/idpf/base/iecm_controlq.h create mode 100644 drivers/net/idpf/base/iecm_controlq_api.h create mode 100644 drivers/net/idpf/base/iecm_controlq_setup.c create mode 100644 drivers/net/idpf/base/iecm_devids.h create mode 100644 drivers/net/idpf/base/iecm_lan_pf_regs.h create mode 100644 drivers/net/idpf/base/iecm_lan_txrx.h create mode 100644 drivers/net/idpf/base/iecm_lan_vf_regs.h create mode 100644 drivers/net/idpf/base/iecm_osdep.h create mode 100644 drivers/net/idpf/base/iecm_prototype.h create mode 100644 drivers/net/idpf/base/iecm_type.h create mode 100644 drivers/net/idpf/base/meson.build create mode 100644 drivers/net/idpf/base/siov_regs.h create mode 100644 drivers/net/idpf/base/virtchnl.h create mode 100644 drivers/net/idpf/base/virtchnl2.h create mode 100644 drivers/net/idpf/base/virtchnl2_lan_desc.h create mode 100644 drivers/net/idpf/base/virtchnl_inline_ipsec.h create mode 100644 drivers/net/idpf/idpf_ethdev.c create mode 100644 drivers/net/idpf/idpf_ethdev.h create mode 100644 drivers/net/idpf/idpf_logs.h create mode 100644 drivers/net/idpf/idpf_rxtx.c create mode 100644 drivers/net/idpf/idpf_rxtx.h create mode 100644 drivers/net/idpf/idpf_vchnl.c create mode 100644 drivers/net/idpf/meson.build create mode 100644 drivers/net/idpf/version.map
Signature · 1 line
2.25.1
RFC v2 1/9 net/idpf/base: introduce base code
Introduce base code for IDPF (Infrastructure Data Path Function) PMD.
--- drivers/net/idpf/base/iecm_alloc.h | 22 + drivers/net/idpf/base/iecm_common.c | 359 +++ drivers/net/idpf/base/iecm_controlq.c | 662 ++++ drivers/net/idpf/base/iecm_controlq.h | 214 ++ drivers/net/idpf/base/iecm_controlq_api.h | 227 ++ drivers/net/idpf/base/iecm_controlq_setup.c | 179 ++ drivers/net/idpf/base/iecm_devids.h | 17 + drivers/net/idpf/base/iecm_lan_pf_regs.h | 134 + drivers/net/idpf/base/iecm_lan_txrx.h | 428 +++ drivers/net/idpf/base/iecm_lan_vf_regs.h | 114 + drivers/net/idpf/base/iecm_prototype.h | 45 + drivers/net/idpf/base/iecm_type.h | 106 + drivers/net/idpf/base/meson.build | 27 + drivers/net/idpf/base/siov_regs.h | 41 + drivers/net/idpf/base/virtchnl.h | 2743 +++++++++++++++++ drivers/net/idpf/base/virtchnl2.h | 1411 +++++++++ drivers/net/idpf/base/virtchnl2_lan_desc.h | 603 ++++ drivers/net/idpf/base/virtchnl_inline_ipsec.h | 567 ++++ 18 files changed, 7899 insertions(+) create mode 100644 drivers/net/idpf/base/iecm_alloc.h create mode 100644 drivers/net/idpf/base/iecm_common.c create mode 100644 drivers/net/idpf/base/iecm_controlq.c create mode 100644 drivers/net/idpf/base/iecm_controlq.h create mode 100644 drivers/net/idpf/base/iecm_controlq_api.h create mode 100644 drivers/net/idpf/base/iecm_controlq_setup.c create mode 100644 drivers/net/idpf/base/iecm_devids.h create mode 100644 drivers/net/idpf/base/iecm_lan_pf_regs.h create mode 100644 drivers/net/idpf/base/iecm_lan_txrx.h create mode 100644 drivers/net/idpf/base/iecm_lan_vf_regs.h create mode 100644 drivers/net/idpf/base/iecm_prototype.h create mode 100644 drivers/net/idpf/base/iecm_type.h create mode 100644 drivers/net/idpf/base/meson.build create mode 100644 drivers/net/idpf/base/siov_regs.h create mode 100644 drivers/net/idpf/base/virtchnl.h create mode 100644 drivers/net/idpf/base/virtchnl2.h create mode 100644 drivers/net/idpf/base/virtchnl2_lan_desc.h create mode 100644 drivers/net/idpf/base/virtchnl_inline_ipsec.h
drivers/net/idpf/base/iecm_alloc.h new file +22 -0
@@ -0,0 +1,22 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* Copyright(c) 2001-2022 Intel Corporation +*/ + +#ifndef _IECM_ALLOC_H_ +#define _IECM_ALLOC_H_ + +/* Memory types */ +enum iecm_memset_type { +IECM_NONDMA_MEM =0 , +IECM_DMA_MEM +}; + +/* Memcpy types */ +enum iecm_memcpy_type { +IECM_NONDMA_TO_NONDMA =0 , +IECM_NONDMA_TO_DMA , +IECM_DMA_TO_DMA , +IECM_DMA_TO_NONDMA +}; + +#endif /* _IECM_ALLOC_H_ */
drivers/net/idpf/base/iecm_common.c new file +359 -0
359 lines not on this page · raw message
drivers/net/idpf/base/iecm_controlq.c new file +662 -0
662 lines not on this page · raw message
drivers/net/idpf/base/iecm_controlq.h new file +214 -0
214 lines not on this page · raw message
drivers/net/idpf/base/iecm_controlq_api.h new file +227 -0
227 lines not on this page · raw message
drivers/net/idpf/base/iecm_controlq_setup.c new file +179 -0
179 lines not on this page · raw message
drivers/net/idpf/base/iecm_devids.h new file +17 -0
@@ -0,0 +1,17 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* Copyright(c) 2001-2022 Intel Corporation +*/ + +#ifndef _IECM_DEVIDS_H_ +#define _IECM_DEVIDS_H_ + +/* Vendor ID */ +#define IECM_INTEL_VENDOR_ID 0x8086 + +/* Device IDs */ +#define IECM_DEV_ID_PF 0x1452 + + + + +#endif /* _IECM_DEVIDS_H_ */
drivers/net/idpf/base/iecm_lan_pf_regs.h new file +134 -0
134 lines not on this page · raw message
drivers/net/idpf/base/iecm_lan_txrx.h new file +428 -0
428 lines not on this page · raw message
drivers/net/idpf/base/iecm_lan_vf_regs.h new file +114 -0
114 lines not on this page · raw message
drivers/net/idpf/base/iecm_prototype.h new file +45 -0
45 lines not on this page · raw message
drivers/net/idpf/base/iecm_type.h new file +106 -0
106 lines not on this page · raw message
drivers/net/idpf/base/meson.build new file +27 -0
@@ -0,0 +1,27 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2022 Intel Corporation + +sources = [ + 'iecm_common.c', + 'iecm_controlq.c', + 'iecm_controlq_setup.c', +] + +error_cflags = ['-Wno-unused-value', + '-Wno-unused-but-set-variable', + '-Wno-unused-variable', + '-Wno-unused-parameter', +] + +c_args = cflags + +foreach flag: error_cflags + if cc.has_argument(flag) + c_args += flag + endif +endforeach + +base_lib = static_library('idpf_base', sources, + dependencies: static_rte_eal, + c_args: c_args) +base_objs = base_lib.extract_all_objects()
drivers/net/idpf/base/siov_regs.h new file +41 -0
41 lines not on this page · raw message
drivers/net/idpf/base/virtchnl.h new file +2743 -0
424 lines not on this page · raw message
drivers/net/idpf/base/virtchnl2.h new file +1411 -0
1,411 lines not on this page · raw message
drivers/net/idpf/base/virtchnl2_lan_desc.h new file +603 -0
603 lines not on this page · raw message
drivers/net/idpf/base/virtchnl_inline_ipsec.h new file +567 -0
567 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.25.1
Part of the diff is not shown here. View the raw message.
RFC v2 2/9 net/idpf/base: add OS specific implementation
In reply to Junfeng GuoAdd some MACRO definations and small functions which are specific for DPDK.
--- drivers/net/idpf/base/iecm_osdep.h | 365 +++++++++++++++++++++++++++++ 1 file changed, 365 insertions(+) create mode 100644 drivers/net/idpf/base/iecm_osdep.h
drivers/net/idpf/base/iecm_osdep.h new file +365 -0
@@ -0,0 +1,365 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* Copyright(c) 2001-2022 Intel Corporation +*/ + +#ifndef _IECM_OSDEP_H_ +#define _IECM_OSDEP_H_ + +#include <string.h> +#include <stdint.h> +#include <stdio.h> +#include <stdarg.h> +#include <inttypes.h> +#include <sys/queue.h> +#include <stdbool.h> + +#include <rte_common.h> +#include <rte_memcpy.h> +#include <rte_malloc.h> +#include <rte_memzone.h> +#include <rte_byteorder.h> +#include <rte_cycles.h> +#include <rte_spinlock.h> +#include <rte_log.h> +#include <rte_random.h> +#include <rte_io.h> + +#include "../idpf_logs.h" + +#define INLINE inline +#define STATIC static + +typedef uint8_t u8 ; +typedef int8_t s8 ; +typedef uint16_t u16 ; +typedef int16_t s16 ; +typedef uint32_t u32 ; +typedef int32_t s32 ; +typedef uint64_t u64 ; +typedef uint64_t s64 ; + +typedef enum iecm_status iecm_status ; +typedef struct iecm_lock iecm_lock ; + +#define __iomem +#define hw_dbg(hw, S, A...) do {} while (0) +#define upper_32_bits (n) ((u32)(((n) >> 16) >> 16)) +#define lower_32_bits (n) ((u32)(n)) +#define low_16_bits (x) ((x) & 0xFFFF) +#define high_16_bits (x) (((x) & 0xFFFF0000) >> 16) + +#ifndef ETH_ADDR_LEN +#define ETH_ADDR_LEN 6 +#endif + +#ifndef __le16 +#define __le16 uint16_t +#endif +#ifndef __le32 +#define __le32 uint32_t +#endif +#ifndef __le64 +#define __le64 uint64_t +#endif +#ifndef __be16 +#define __be16 uint16_t +#endif +#ifndef __be32 +#define __be32 uint32_t +#endif +#ifndef __be64 +#define __be64 uint64_t +#endif + +#ifndef __always_unused +#define __always_unused __attribute__((__unused__)) +#endif +#ifndef __maybe_unused +#define __maybe_unused __attribute__((__unused__)) +#endif +#ifndef __packed +#define __packed __attribute__((packed)) +#endif + +#ifndef BIT_ULL +#define BIT_ULL (a) (1ULL << (a)) +#endif + +#ifndef BIT +#define BIT (a) (1ULL << (a)) +#endif + +#define FALSE 0 +#define TRUE 1 +#define false 0 +#define true 1 + +#define min (a, b) RTE_MIN(a, b) +#define max (a, b) RTE_MAX(a, b) + +#define ARRAY_SIZE (arr) (sizeof(arr) / sizeof(arr[0])) +#define FIELD_SIZEOF (t, f) (sizeof(((t *)0)->(f))) +#define MAKEMASK (m, s) ((m) << (s)) + +#define DEBUGOUT (S ) PMD_DRV_LOG_RAW(DEBUG, S) +#define DEBUGOUT2(S, A...) PMD_DRV_LOG_RAW(DEBUG, S, ##A) +#define DEBUGFUNC (F ) PMD_DRV_LOG_RAW(DEBUG, F) + +#define iecm_debug (h, m, s, ...) \ + do { \ + if (((m) & (h)->debug_mask)) \ + PMD_DRV_LOG_RAW(DEBUG, "iecm %02x.%x " s, \ + (h)->bus.device, (h)->bus.func, \ + ##__VA_ARGS__); \ + } while (0) + +#define iecm_info(hw, fmt, args...) iecm_debug(hw, IECM_DBG_ALL, fmt, ##args) +#define iecm_warn(hw, fmt, args...) iecm_debug(hw, IECM_DBG_ALL, fmt, ##args) +#define iecm_debug_array (hw, type, rowsize, groupsize, buf, len) \ + do { \ + struct iecm_hw *hw_l = hw; \ + u16 len_l = len; \ + u8 *buf_l = buf; \ + int i; \ + for (i = 0; i < len_l; i += 8) \ + iecm_debug(hw_l, type, \ + "0x%04X 0x%016"PRIx64"\n", \ + i, *((u64 *)((buf_l) + i))); \ + } while (0) +#define iecm_snprintf snprintf +#ifndef SNPRINTF +#define SNPRINTF iecm_snprintf +#endif + +#define IECM_PCI_REG (reg) rte_read32(reg) +#define IECM_PCI_REG_ADDR (a, reg) \ + ((volatile uint32_t *)((char *)(a)->hw_addr + (reg))) +#define IECM_PCI_REG64 (reg) rte_read64(reg) +#define IECM_PCI_REG_ADDR64 (a, reg) \ + ((volatile uint64_t *)((char *)(a)->hw_addr + (reg))) + +#define iecm_wmb () rte_io_wmb() +#define iecm_rmb () rte_io_rmb() +#define iecm_mb () rte_io_mb() + +static inline uint32_t iecm_read_addr (volatile void *addr) +{ +return rte_le_to_cpu_32 (IECM_PCI_REG (addr)); +} + +static inline uint64_t iecm_read_addr64 (volatile void *addr) +{ +return rte_le_to_cpu_64 (IECM_PCI_REG64 (addr)); +} + +#define IECM_PCI_REG_WRITE (reg, value) \ + rte_write32((rte_cpu_to_le_32(value)), reg) + +#define IECM_PCI_REG_WRITE64 (reg, value) \ + rte_write64((rte_cpu_to_le_64(value)), reg) + +#define IECM_READ_REG (hw, reg) iecm_read_addr(IECM_PCI_REG_ADDR((hw), (reg))) +#define IECM_WRITE_REG (hw, reg, value) \ + IECM_PCI_REG_WRITE(IECM_PCI_REG_ADDR((hw), (reg)), (value)) + +#define rd32 (a, reg) iecm_read_addr(IECM_PCI_REG_ADDR((a), (reg))) +#define wr32 (a, reg, value) \ + IECM_PCI_REG_WRITE(IECM_PCI_REG_ADDR((a), (reg)), (value)) +#define div64_long (n, d) ((n) / (d)) +#define rd64 (a, reg) iecm_read_addr64(IECM_PCI_REG_ADDR64((a), (reg))) + +#define BITS_PER_BYTE 8 + +/* memory allocation tracking */ +struct iecm_dma_mem { +void *va; +u64 pa; +u32 size; +const void *zone; +} __attribute__((packed)); + +struct iecm_virt_mem { +void *va; +u32 size; +} __attribute__((packed)); + +#define iecm_malloc (h, s) rte_zmalloc(NULL, s, 0) +#define iecm_calloc (h, c, s) rte_zmalloc(NULL, (c) * (s), 0) +#define iecm_free (h, m) rte_free(m) + +#define iecm_memset (a, b, c, d) memset((a), (b), (c)) +#define iecm_memcpy (a, b, c, d) rte_memcpy((a), (b), (c)) +#define iecm_memdup (a, b, c, d) rte_memcpy(iecm_malloc(a, c), b, c) + +#define CPU_TO_BE16 (o) rte_cpu_to_be_16(o) +#define CPU_TO_BE32 (o) rte_cpu_to_be_32(o) +#define CPU_TO_BE64 (o) rte_cpu_to_be_64(o) +#define CPU_TO_LE16 (o) rte_cpu_to_le_16(o) +#define CPU_TO_LE32 (s) rte_cpu_to_le_32(s) +#define CPU_TO_LE64 (h) rte_cpu_to_le_64(h) +#define LE16_TO_CPU (a) rte_le_to_cpu_16(a) +#define LE32_TO_CPU (c) rte_le_to_cpu_32(c) +#define LE64_TO_CPU (k) rte_le_to_cpu_64(k) + +#define NTOHS (a) rte_be_to_cpu_16(a) +#define NTOHL (a) rte_be_to_cpu_32(a) +#define HTONS (a) rte_cpu_to_be_16(a) +#define HTONL (a) rte_cpu_to_be_32(a) + +/* SW spinlock */ +struct iecm_lock { +rte_spinlock_t spinlock; +}; + +static inline void +iecm_init_lock (struct iecm_lock *sp) +{ +rte_spinlock_init (&sp->spinlock); +} + +static inline void +iecm_acquire_lock (struct iecm_lock *sp) +{ +rte_spinlock_lock (&sp->spinlock); +} + +static inline void +iecm_release_lock (struct iecm_lock *sp) +{ +rte_spinlock_unlock (&sp->spinlock); +} + +static inline void +iecm_destroy_lock (__attribute__((unused))struct iecm_lock *sp) +{ +} + +struct iecm_hw ; + +static inline void * +iecm_alloc_dma_mem (__attribute__((unused))struct iecm_hw *hw, +struct iecm_dma_mem *mem,u64 size) +{ +const struct rte_memzone *mz =NULL ; +char z_name[RTE_MEMZONE_NAMESIZE ]; + +if (!mem) +return NULL ; + +snprintf (z_name,sizeof (z_name),"iecm_dma_%" PRIu64,rte_rand ()); + mz =rte_memzone_reserve_aligned (z_name, size,SOCKET_ID_ANY , +RTE_MEMZONE_IOVA_CONTIG ,RTE_PGSIZE_4K ); +if (!mz) +return NULL ; + + mem->size = size; + mem->va = mz->addr; + mem->pa = mz->iova; + mem->zone = (const void *)mz; +memset (mem->va,0 , size); + +return mem->va; +} + +static inline void +iecm_free_dma_mem (__attribute__((unused))struct iecm_hw *hw, +struct iecm_dma_mem *mem) +{ +rte_memzone_free ((const struct rte_memzone *)mem->zone); + mem->size =0 ; + mem->va =NULL ; + mem->pa =0 ; +} + +static inline u8 +iecm_hweight8 (u32 num) +{ +u8 bits =0 ; +u32 i; + +for (i =0 ; i <8 ; i++) { + bits += (u8)(num &0x1 ); + num >>=1 ; + } + +return bits; +} + +static inline u8 +iecm_hweight32 (u32 num) +{ +u8 bits =0 ; +u32 i; + +for (i =0 ; i <32 ; i++) { + bits += (u8)(num &0x1 ); + num >>=1 ; + } + +return bits; +} + +#define DIV_ROUND_UP (n, d) (((n) + (d) - 1) / (d)) +#define DELAY (x) rte_delay_us(x) +#define iecm_usec_delay (x) rte_delay_us(x) +#define iecm_msec_delay (x, y) rte_delay_us(1000 * (x)) +#define udelay (x) DELAY(x) +#define msleep (x) DELAY(1000 * (x)) +#define usleep_range (min, max) msleep(DIV_ROUND_UP(min, 1000)) + +#ifndef IECM_DBG_TRACE +#define IECM_DBG_TRACE BIT_ULL(0) +#endif + +#ifndef DIVIDE_AND_ROUND_UP +#define DIVIDE_AND_ROUND_UP (a, b) (((a) + (b) - 1) / (b)) +#endif + +#ifndef IECM_INTEL_VENDOR_ID +#define IECM_INTEL_VENDOR_ID 0x8086 +#endif + +#ifndef IS_UNICAST_ETHER_ADDR +#define IS_UNICAST_ETHER_ADDR (addr) \ + ((bool)((((u8 *)(addr))[0] % ((u8)0x2)) == 0)) +#endif + +#ifndef IS_MULTICAST_ETHER_ADDR +#define IS_MULTICAST_ETHER_ADDR (addr) \ + ((bool)((((u8 *)(addr))[0] % ((u8)0x2)) == 1)) +#endif + +#ifndef IS_BROADCAST_ETHER_ADDR +/* Check whether an address is broadcast. */ +#define IS_BROADCAST_ETHER_ADDR (addr) \ + ((bool)((((u16 *)(addr))[0] == ((u16)0xffff)))) +#endif + +#ifndef IS_ZERO_ETHER_ADDR +#define IS_ZERO_ETHER_ADDR (addr) \ + (((bool)((((u16 *)(addr))[0] == ((u16)0x0)))) && \ + ((bool)((((u16 *)(addr))[1] == ((u16)0x0)))) && \ + ((bool)((((u16 *)(addr))[2] == ((u16)0x0))))) +#endif + +#ifndef LIST_HEAD_TYPE +#define LIST_HEAD_TYPE (list_name, type) LIST_HEAD(list_name, type) +#endif + +#ifndef LIST_ENTRY_TYPE +#define LIST_ENTRY_TYPE (type) LIST_ENTRY(type) +#endif + +#ifndef LIST_FOR_EACH_ENTRY_SAFE +#define LIST_FOR_EACH_ENTRY_SAFE (pos, temp, head, entry_type, list) \ + LIST_FOREACH(pos, head, list) + +#endif + +#ifndef LIST_FOR_EACH_ENTRY +#define LIST_FOR_EACH_ENTRY (pos, head, entry_type, list) \ + LIST_FOREACH(pos, head, list) + +#endif + +#endif /* _IECM_OSDEP_H_ */
Signature · 1 line
2.25.1
RFC v2 3/9 net/idpf: support device initialization
In reply to Junfeng GuoSupport dev init and add dev ops for IDPF PMD:
dev_configure
dev_start
dev_stop
dev_close
--- drivers/net/idpf/idpf_ethdev.c | 652 +++++++++++++++++++++++++++++++++ drivers/net/idpf/idpf_ethdev.h | 200 ++++++++++ drivers/net/idpf/idpf_logs.h | 38 ++ drivers/net/idpf/idpf_vchnl.c | 465 +++++++++++++++++++++++ drivers/net/idpf/meson.build | 18 + drivers/net/idpf/version.map | 3 + drivers/net/meson.build | 1 + 7 files changed, 1377 insertions(+) create mode 100644 drivers/net/idpf/idpf_ethdev.c create mode 100644 drivers/net/idpf/idpf_ethdev.h create mode 100644 drivers/net/idpf/idpf_logs.h create mode 100644 drivers/net/idpf/idpf_vchnl.c create mode 100644 drivers/net/idpf/meson.build create mode 100644 drivers/net/idpf/version.map
drivers/net/idpf/idpf_ethdev.c new file +652 -0
@@ -0,0 +1,652 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* Copyright(c) 2022 Intel Corporation +*/ + +#include <rte_atomic.h> +#include <rte_eal.h> +#include <rte_ether.h> +#include <ethdev_driver.h> +#include <ethdev_pci.h> +#include <rte_malloc.h> +#include <rte_memzone.h> +#include <rte_dev.h> + +#include "idpf_ethdev.h" + +#define VPORT_NUM "vport_num" + +struct idpf_adapter *adapter; +uint16_t vport_num =1 ; + +static const char *const idpf_valid_args[] = { +VPORT_NUM , +NULL +}; + +static int idpf_dev_configure (struct rte_eth_dev *dev); +static int idpf_dev_start (struct rte_eth_dev *dev); +static int idpf_dev_stop (struct rte_eth_dev *dev); +static int idpf_dev_close (struct rte_eth_dev *dev); + +static const struct eth_dev_ops idpf_eth_dev_ops = { + .dev_configure = idpf_dev_configure, + .dev_start = idpf_dev_start, + .dev_stop = idpf_dev_stop, + .dev_close = idpf_dev_close, +}; + + +static int +idpf_init_vport_req_info (struct rte_eth_dev *dev) +{ +struct virtchnl2_create_vport *vport_info; +uint16_t idx = adapter->next_vport_idx; + +if (!adapter->vport_req_info[idx]) { + adapter->vport_req_info[idx] =rte_zmalloc (NULL , +sizeof (struct virtchnl2_create_vport ),0 ); +if (!adapter->vport_req_info[idx]) { +PMD_INIT_LOG (ERR ,"Failed to allocate vport_req_info" ); +return -1 ; + } + } + + vport_info = + (struct virtchnl2_create_vport *)adapter->vport_req_info[idx]; + + vport_info->vport_type =rte_cpu_to_le_16 (VIRTCHNL2_VPORT_TYPE_DEFAULT ); + +return 0 ; +} + +static uint16_t +idpf_get_next_vport_idx (struct idpf_vport **vports,uint16_t max_vport_nb, +uint16_t cur_vport_idx) +{ +uint16_t vport_idx; +uint16_t i; + +if (cur_vport_idx < max_vport_nb && !vports[cur_vport_idx +1 ]) { + vport_idx = cur_vport_idx +1 ; +return vport_idx; + } + +for (i =0 ; i < max_vport_nb; i++) { +if (vports[i]) +continue ; + } + +if (i == max_vport_nb) + vport_idx =IDPF_INVALID_VPORT_IDX ; +else + vport_idx = i; + +return vport_idx; +} + +#ifndef IDPF_RSS_KEY_LEN +#define IDPF_RSS_KEY_LEN 52 +#endif + +static int +idpf_init_vport (struct rte_eth_dev *dev) +{ +uint16_t idx = adapter->next_vport_idx; +struct virtchnl2_create_vport *vport_info = + (struct virtchnl2_create_vport *)adapter->vport_recv_info[idx]; +struct idpf_vport *vport = + (struct idpf_vport *)dev->data->dev_private; +int i; + + vport->adapter = adapter; + vport->vport_id = vport_info->vport_id; + vport->txq_model = vport_info->txq_model; + vport->rxq_model = vport_info->rxq_model; + vport->num_tx_q = vport_info->num_tx_q; + vport->num_tx_complq = vport_info->num_tx_complq; + vport->num_rx_q = vport_info->num_rx_q; + vport->num_rx_bufq = vport_info->num_rx_bufq; + vport->max_mtu = vport_info->max_mtu; +rte_memcpy (vport->default_mac_addr, + vport_info->default_mac_addr,ETH_ALEN ); + vport->rss_algorithm = vport_info->rss_algorithm; + vport->rss_key_size =RTE_MIN (IDPF_RSS_KEY_LEN , + vport_info->rss_key_size); + vport->rss_lut_size = vport_info->rss_lut_size; + vport->sw_idx = idx; + +for (i =0 ; i < vport_info->chunks.num_chunks; i++) { +if (vport_info->chunks.chunks[i].type == +VIRTCHNL2_QUEUE_TYPE_TX ) { + vport->chunks_info.tx_start_qid = + vport_info->chunks.chunks[i].start_queue_id; + vport->chunks_info.tx_qtail_start = + vport_info->chunks.chunks[i].qtail_reg_start; + vport->chunks_info.tx_qtail_spacing = + vport_info->chunks.chunks[i].qtail_reg_spacing; + }else if (vport_info->chunks.chunks[i].type == +VIRTCHNL2_QUEUE_TYPE_RX ) { + vport->chunks_info.rx_start_qid = + vport_info->chunks.chunks[i].start_queue_id; + vport->chunks_info.rx_qtail_start = + vport_info->chunks.chunks[i].qtail_reg_start; + vport->chunks_info.rx_qtail_spacing = + vport_info->chunks.chunks[i].qtail_reg_spacing; + }else if (vport_info->chunks.chunks[i].type == +VIRTCHNL2_QUEUE_TYPE_TX_COMPLETION ) { + vport->chunks_info.tx_compl_start_qid = + vport_info->chunks.chunks[i].start_queue_id; + vport->chunks_info.tx_compl_qtail_start = + vport_info->chunks.chunks[i].qtail_reg_start; + vport->chunks_info.tx_compl_qtail_spacing = + vport_info->chunks.chunks[i].qtail_reg_spacing; + }else if (vport_info->chunks.chunks[i].type == +VIRTCHNL2_QUEUE_TYPE_RX_BUFFER ) { + vport->chunks_info.rx_buf_start_qid = + vport_info->chunks.chunks[i].start_queue_id; + vport->chunks_info.rx_buf_qtail_start = + vport_info->chunks.chunks[i].qtail_reg_start; + vport->chunks_info.rx_buf_qtail_spacing = + vport_info->chunks.chunks[i].qtail_reg_spacing; + } + } + + adapter->vports[idx] = vport; + adapter->cur_vport_nb++; + adapter->next_vport_idx =idpf_get_next_vport_idx (adapter->vports, + adapter->max_vport_nb, idx); +if (adapter->next_vport_idx ==IDPF_INVALID_VPORT_IDX ) { +PMD_INIT_LOG (ERR ,"Failed to get next vport id" ); +return -1 ; + } + +return 0 ; +} + +static int +idpf_dev_configure (struct rte_eth_dev *dev) +{ +int ret =0 ; + +if (dev->data->dev_conf.rxmode.mq_mode &RTE_ETH_MQ_RX_RSS_FLAG ) + dev->data->dev_conf.rxmode.offloads |= +RTE_ETH_RX_OFFLOAD_RSS_HASH ; + + ret =idpf_init_vport_req_info (dev); +if (ret) { +PMD_INIT_LOG (ERR ,"Failed to init vport req_info." ); +return ret; + } + + ret =idpf_create_vport (dev); +if (ret) { +PMD_INIT_LOG (ERR ,"Failed to create vport." ); +return ret; + } + + ret =idpf_init_vport (dev); +if (ret) { +PMD_INIT_LOG (ERR ,"Failed to init vports." ); +return ret; + } + +return ret; +} + +static int +idpf_dev_start (struct rte_eth_dev *dev) +{ +struct idpf_vport *vport = + (struct idpf_vport *)dev->data->dev_private; + +PMD_INIT_FUNC_TRACE (); + + vport->stopped =0 ; + +if (idpf_ena_dis_vport (vport, true)) { +PMD_DRV_LOG (ERR ,"Failed to enable vport" ); + goto err_vport; + } + +return 0 ; + +err_vport: +return -1 ; +} + +static int +idpf_dev_stop (struct rte_eth_dev *dev) +{ +struct idpf_vport *vport = + (struct idpf_vport *)dev->data->dev_private; + +PMD_INIT_FUNC_TRACE (); + +if (vport->stopped ==1 ) +return 0 ; + +if (idpf_ena_dis_vport (vport, false)) +PMD_DRV_LOG (ERR ,"disable vport failed" ); + + vport->stopped =1 ; + dev->data->dev_started =0 ; + +return 0 ; +} + +static int +idpf_dev_close (struct rte_eth_dev *dev) +{ +struct idpf_vport *vport = + (struct idpf_vport *)dev->data->dev_private; + +if (rte_eal_process_type () !=RTE_PROC_PRIMARY ) +return 0 ; + +idpf_dev_stop (dev); +idpf_destroy_vport (vport); + +return 0 ; +} + +static void +idpf_reset_pf (struct iecm_hw *hw) +{ +uint32_t reg; + + reg =IECM_READ_REG (hw,PFGEN_CTRL ); +IECM_WRITE_REG (hw,PFGEN_CTRL , (reg |PFGEN_CTRL_PFSWR )); +} + +#define IDPF_RESET_WAIT_CNT 100 +static int +idpf_check_pf_reset_done (struct iecm_hw *hw) +{ +uint32_t reg; +int i; + +for (i =0 ; i <IDPF_RESET_WAIT_CNT ; i++) { + reg =IECM_READ_REG (hw,PFGEN_RSTAT ); +if (reg !=0xFFFFFFFF && (reg &PFGEN_RSTAT_PFR_STATE_M )) +return 0 ; +rte_delay_ms (1000 ); + } + +PMD_INIT_LOG (ERR ,"IDPF reset timeout" ); +return -EBUSY ; +} + +#define CTLQ_NUM 2 +static int +idpf_init_mbx (struct iecm_hw *hw) +{ +struct iecm_ctlq_create_info ctlq_info[CTLQ_NUM ] = { + { + .type =IECM_CTLQ_TYPE_MAILBOX_TX , + .id =IDPF_CTLQ_ID , + .len =IDPF_CTLQ_LEN , + .buf_size =IDPF_DFLT_MBX_BUF_SIZE , + .reg = { + .head =PF_FW_ATQH , + .tail =PF_FW_ATQT , + .len =PF_FW_ATQLEN , + .bah =PF_FW_ATQBAH , + .bal =PF_FW_ATQBAL , + .len_mask =PF_FW_ATQLEN_ATQLEN_M , + .len_ena_mask =PF_FW_ATQLEN_ATQENABLE_M , + .head_mask =PF_FW_ATQH_ATQH_M , + } + }, + { + .type =IECM_CTLQ_TYPE_MAILBOX_RX , + .id =IDPF_CTLQ_ID , + .len =IDPF_CTLQ_LEN , + .buf_size =IDPF_DFLT_MBX_BUF_SIZE , + .reg = { + .head =PF_FW_ARQH , + .tail =PF_FW_ARQT , + .len =PF_FW_ARQLEN , + .bah =PF_FW_ARQBAH , + .bal =PF_FW_ARQBAL , + .len_mask =PF_FW_ARQLEN_ARQLEN_M , + .len_ena_mask =PF_FW_ARQLEN_ARQENABLE_M , + .head_mask =PF_FW_ARQH_ARQH_M , + } + } + }; +struct iecm_ctlq_info *ctlq; +int ret =0 ; + + ret =iecm_ctlq_init (hw,CTLQ_NUM , ctlq_info); +if (ret) +return ret; + +LIST_FOR_EACH_ENTRY_SAFE (ctlq,NULL , &hw->cq_list_head, + struct iecm_ctlq_info, cq_list) { +if (ctlq->q_id ==IDPF_CTLQ_ID && ctlq->cq_type ==IECM_CTLQ_TYPE_MAILBOX_TX ) + hw->asq = ctlq; +if (ctlq->q_id ==IDPF_CTLQ_ID && ctlq->cq_type ==IECM_CTLQ_TYPE_MAILBOX_RX ) + hw->arq = ctlq; + } + +if (!hw->asq || !hw->arq) { +iecm_ctlq_deinit (hw); + ret = -ENOENT ; + } + +return ret; +} + +static int +idpf_adapter_init (struct rte_eth_dev *dev) +{ +struct iecm_hw *hw = &adapter->hw; +struct rte_pci_device *pci_dev =IDPF_DEV_TO_PCI (dev); +int ret =0 ; + +if (adapter->initialized) +return 0 ; + + hw->hw_addr = (void *)pci_dev->mem_resource[0 ].addr; + hw->hw_addr_len = pci_dev->mem_resource[0 ].len; + hw->back = adapter; + hw->vendor_id = pci_dev->id.vendor_id; + hw->device_id = pci_dev->id.device_id; + hw->subsystem_vendor_id = pci_dev->id.subsystem_vendor_id; + +idpf_reset_pf (hw); + ret =idpf_check_pf_reset_done (hw); +if (ret) { +PMD_INIT_LOG (ERR ,"IDPF is still resetting" ); + goto err; + } + + ret =idpf_init_mbx (hw); +if (ret) { +PMD_INIT_LOG (ERR ,"Failed to init mailbox" ); + goto err; + } + + adapter->mbx_resp =rte_zmalloc ("idpf_adapter_mbx_resp" ,IDPF_DFLT_MBX_BUF_SIZE ,0 ); +if (!adapter->mbx_resp) { +PMD_INIT_LOG (ERR ,"Failed to allocate idpf_adapter_mbx_resp memory" ); + goto err_mbx; + } + +if (idpf_check_api_version (adapter)) { +PMD_INIT_LOG (ERR ,"Failed to check api version" ); + goto err_api; + } + + adapter->caps =rte_zmalloc ("idpf_caps" , +sizeof (struct virtchnl2_get_capabilities ),0 ); +if (!adapter->caps) { +PMD_INIT_LOG (ERR ,"Failed to allocate idpf_caps memory" ); + goto err_api; + } + +if (idpf_get_caps (adapter)) { +PMD_INIT_LOG (ERR ,"Failed to get capabilities" ); + goto err_caps; + } + + adapter->max_vport_nb = adapter->caps->max_vports; + + adapter->vport_req_info =rte_zmalloc ("vport_req_info" , + adapter->max_vport_nb * +sizeof (*adapter->vport_req_info), +0 ); +if (!adapter->vport_req_info) { +PMD_INIT_LOG (ERR ,"Failed to allocate vport_req_info memory" ); + goto err_caps; + } + + adapter->vport_recv_info =rte_zmalloc ("vport_recv_info" , + adapter->max_vport_nb * +sizeof (*adapter->vport_recv_info), +0 ); +if (!adapter->vport_recv_info) { +PMD_INIT_LOG (ERR ,"Failed to allocate vport_recv_info memory" ); + goto err_vport_recv_info; + } + + adapter->vports =rte_zmalloc ("vports" , + adapter->max_vport_nb * +sizeof (*adapter->vports), +0 ); +if (!adapter->vports) { +PMD_INIT_LOG (ERR ,"Failed to allocate vports memory" ); + goto err_vports; + } + + adapter->max_rxq_per_msg = (IDPF_DFLT_MBX_BUF_SIZE - +sizeof (struct virtchnl2_config_rx_queues )) / +sizeof (struct virtchnl2_rxq_info ); + adapter->max_txq_per_msg = (IDPF_DFLT_MBX_BUF_SIZE - +sizeof (struct virtchnl2_config_tx_queues )) / +sizeof (struct virtchnl2_txq_info ); + + adapter->cur_vport_nb =0 ; + adapter->next_vport_idx =0 ; + adapter->initialized = true; + +return ret; + +err_vports: +rte_free (adapter->vports); + adapter->vports =NULL ; +err_vport_recv_info: +rte_free (adapter->vport_req_info); + adapter->vport_req_info =NULL ; +err_caps: +rte_free (adapter->caps); + adapter->caps =NULL ; +err_api: +rte_free (adapter->mbx_resp); + adapter->mbx_resp =NULL ; +err_mbx: +iecm_ctlq_deinit (hw); +err: +return -1 ; +} + + +static int +idpf_dev_init(struct rte_eth_dev *dev, __rte_unused void *init_params) +{ +struct idpf_vport *vport = + (struct idpf_vport *)dev->data->dev_private; +int ret =0 ; + +PMD_INIT_FUNC_TRACE (); + + dev->dev_ops = &idpf_eth_dev_ops; + + ret =idpf_adapter_init (dev); +if (ret) { +PMD_INIT_LOG (ERR ,"Failed to init adapter." ); +return ret; + } + + dev->data->dev_flags |=RTE_ETH_DEV_AUTOFILL_QUEUE_XSTATS ; + + vport->dev_data = dev->data; + + dev->data->mac_addrs =rte_zmalloc (NULL ,RTE_ETHER_ADDR_LEN ,0 ); +if (dev->data->mac_addrs ==NULL ) { +PMD_INIT_LOG (ERR ,"Cannot allocate mac_addr memory." ); + ret = -ENOMEM ; + goto err; + } + +err: +return ret; +} + +static int +idpf_dev_uninit (struct rte_eth_dev *dev) +{ +if (rte_eal_process_type () !=RTE_PROC_PRIMARY ) +return -EPERM ; + +idpf_dev_close (dev); + +return 0 ; +} + +static const struct rte_pci_id pci_id_idpf_map[] = { + {RTE_PCI_DEVICE (IECM_INTEL_VENDOR_ID ,IECM_DEV_ID_PF ) }, + { .vendor_id =0 ,/* sentinel */ }, +}; + +static int +idpf_handle_vport_num (const char *key,const char *value,void *args) +{ +int *i = (int *)args; +char *end; +int num; + + num =strtoul (value, &end,10 ); + +if (num <=0 ) { +PMD_DRV_LOG (WARNING ,"invalid value:\"%s\" for key:\"%s\", value must be greater than 0" , + value, key); +return -1 ; + } + + *i = num; +return 0 ; +} + +static int +idpf_parse_vport_num (struct rte_devargs *devargs) +{ +struct rte_kvargs *kvlist; +const char *key ="vport_num" ; +int ret =0 ; + +if (devargs ==NULL ) +return 0 ; + + kvlist =rte_kvargs_parse (devargs->args, idpf_valid_args); +if (kvlist ==NULL ) +return 0 ; + + ret =rte_kvargs_process (kvlist, key, &idpf_handle_vport_num, + &vport_num); +if (ret) + goto bail; + +bail: +rte_kvargs_free (kvlist); +return ret; +} + +static int +idpf_pci_probe(struct rte_pci_driver *pci_drv __rte_unused, +struct rte_pci_device *pci_dev) +{ +char name[RTE_ETH_NAME_MAX_LEN ]; +int i, retval; + + retval =idpf_parse_vport_num (pci_dev->device.devargs); +if (retval) +return retval; + +if (!adapter) { + adapter = (struct idpf_adapter *)rte_zmalloc ("idpf_adapter" , +sizeof (struct idpf_adapter ),0 ); +if (!adapter) { +PMD_INIT_LOG (ERR ,"Failed to allocate adapter." ); +return -1 ; + } + } + +for (i =0 ; i < vport_num; i++) { +snprintf (name,sizeof (name),"idpf_vport_%d" , i); + retval =rte_eth_dev_create (&pci_dev->device, name, +sizeof (struct idpf_vport ), +NULL ,NULL , idpf_dev_init, +NULL ); +if (retval) +PMD_DRV_LOG (ERR ,"failed to creat vport %d" , i); + } + +return 0 ; +} + +static void +idpf_adapter_rel (struct idpf_adapter *adapter) +{ +struct iecm_hw *hw = &adapter->hw; +int i; + +iecm_ctlq_deinit (hw); + +if (adapter->caps) { +rte_free (adapter->caps); + adapter->caps =NULL ; + } + +if (adapter->mbx_resp) { +rte_free (adapter->mbx_resp); + adapter->mbx_resp =NULL ; + } + +if (adapter->vport_req_info) { +for (i =0 ; i < adapter->max_vport_nb; i++) { +if (adapter->vport_req_info[i]) { +rte_free (adapter->vport_req_info[i]); + adapter->vport_req_info[i] =NULL ; + } + } +rte_free (adapter->vport_req_info); + adapter->vport_req_info =NULL ; + } + +if (adapter->vport_recv_info) { +for (i =0 ; i < adapter->max_vport_nb; i++) { +if (adapter->vport_recv_info[i]) { +rte_free (adapter->vport_recv_info[i]); + adapter->vport_recv_info[i] =NULL ; + } + } + } + +if (adapter->vports) { +/* Needn't free adapter->vports[i] since it's private data */ +rte_free (adapter->vports); + adapter->vports =NULL ; + } +} + +static int +idpf_pci_remove (struct rte_pci_device *pci_dev) +{ +if (adapter) { +idpf_adapter_rel (adapter); +rte_free (adapter); + adapter =NULL ; + } + +return rte_eth_dev_pci_generic_remove (pci_dev, idpf_dev_uninit); +} + +static struct rte_pci_driver rte_idpf_pmd = { + .id_table = pci_id_idpf_map, + .drv_flags =RTE_PCI_DRV_NEED_MAPPING |RTE_PCI_DRV_INTR_LSC , + .probe = idpf_pci_probe, + .remove = idpf_pci_remove, +}; + +/** +* Driver initialization routine. +* Invoked once at EAL init time. +* Register itself as the [Poll Mode] Driver of PCI devices. +*/ +RTE_PMD_REGISTER_PCI (net_idpf, rte_idpf_pmd); +RTE_PMD_REGISTER_PCI_TABLE (net_idpf, pci_id_idpf_map); +RTE_PMD_REGISTER_KMOD_DEP (net_ice,"* igb_uio | uio_pci_generic | vfio-pci" ); + +RTE_LOG_REGISTER_SUFFIX (idpf_logtype_init, init,NOTICE ); +RTE_LOG_REGISTER_SUFFIX (idpf_logtype_driver, driver,NOTICE );
drivers/net/idpf/idpf_ethdev.h new file +200 -0
200 lines not on this page · raw message
drivers/net/idpf/idpf_logs.h new file +38 -0
@@ -0,0 +1,38 @@ +#ifndef _IDPF_LOGS_H_ +#define _IDPF_LOGS_H_ + +#include <rte_log.h> + +extern int idpf_logtype_init; +extern int idpf_logtype_driver; + +#define PMD_INIT_LOG(level, fmt, args...) \ + rte_log(RTE_LOG_ ## level, idpf_logtype_init, \ + "%s(): " fmt "\n", __func__, ##args) + +#define PMD_INIT_FUNC_TRACE () PMD_DRV_LOG(DEBUG, " >>") + +#define PMD_DRV_LOG_RAW(level, fmt, args...) \ + rte_log(RTE_LOG_ ## level, idpf_logtype_driver, \ + "%s(): " fmt "\n", __func__, ##args) + +#define PMD_DRV_LOG(level, fmt, args...) \ + PMD_DRV_LOG_RAW(level, fmt "\n", ## args) + +#define PMD_DRV_FUNC_TRACE () PMD_DRV_LOG(DEBUG, " >>") + +#ifdef RTE_LIBRTE_IDPF_DEBUG_RX +#define PMD_RX_LOG(level, fmt, args...) \ + RTE_LOG(level, PMD, "%s(): " fmt "\n", __func__, ## args) +#else +#define PMD_RX_LOG(level, fmt, args...) do { } while (0) +#endif + +#ifdef RTE_LIBRTE_IDPF_DEBUG_TX +#define PMD_TX_LOG(level, fmt, args...) \ + RTE_LOG(level, PMD, "%s(): " fmt "\n", __func__, ## args) +#else +#define PMD_TX_LOG(level, fmt, args...) do { } while (0) +#endif + +#endif /* _IDPF_LOGS_H_ */
drivers/net/idpf/idpf_vchnl.c new file +465 -0
465 lines not on this page · raw message
drivers/net/idpf/meson.build new file +18 -0
@@ -0,0 +1,18 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2022 Intel Corporation + +if is_windows + build = false + reason = 'not supported on Windows' + subdir_done() +endif + +subdir('base') +objs = [base_objs] + +sources = files( + 'idpf_ethdev.c', + 'idpf_vchnl.c', +) + +includes += include_directories('base')
drivers/net/idpf/version.map new file +3 -0
@@ -0,0 +1,3 @@ +DPDK_22 { + local: *; +};
drivers/net/meson.build +1 -0
@@ -28,6 +28,7 @@ drivers = [ 'i40e', 'iavf', 'ice', + 'idpf', 'igc', 'ionic', 'ipn3ke',
Signature · 1 line
2.25.1
RFC v2 4/9 net/idpf: support queue ops
In reply to Junfeng GuoAdd queue ops for IDPF PMD:
rx_queue_start
rx_queue_stop
tx_queue_start
tx_queue_stop
rx_queue_setup
rx_queue_release
tx_queue_setup
tx_queue_release
--- drivers/net/idpf/idpf_ethdev.c | 85 +++ drivers/net/idpf/idpf_ethdev.h | 5 + drivers/net/idpf/idpf_rxtx.c | 1252 ++++++++++++++++++++++++++++++++ drivers/net/idpf/idpf_rxtx.h | 167 +++++ drivers/net/idpf/idpf_vchnl.c | 342 +++++++++ drivers/net/idpf/meson.build | 1 + 6 files changed, 1852 insertions(+) create mode 100644 drivers/net/idpf/idpf_rxtx.c create mode 100644 drivers/net/idpf/idpf_rxtx.h
drivers/net/idpf/idpf_ethdev.c +85 -0
@@ -12,6 +12,7 @@#include <rte_dev.h> #include "idpf_ethdev.h" +#include "idpf_rxtx.h" #define VPORT_NUM "vport_num"
@@ -33,6 +34,14 @@ static const struct eth_dev_ops idpf_eth_dev_ops = { .dev_start = idpf_dev_start, .dev_stop = idpf_dev_stop, .dev_close = idpf_dev_close, + .rx_queue_start = idpf_rx_queue_start, + .rx_queue_stop = idpf_rx_queue_stop, + .tx_queue_start = idpf_tx_queue_start, + .tx_queue_stop = idpf_tx_queue_stop, + .rx_queue_setup = idpf_rx_queue_setup, + .rx_queue_release = idpf_dev_rx_queue_release, + .tx_queue_setup = idpf_tx_queue_setup, + .tx_queue_release = idpf_dev_tx_queue_release, };
@@ -193,6 +202,65 @@ idpf_dev_configure(struct rte_eth_dev *dev)return ret; } +static int +idpf_config_queues (struct idpf_vport *vport) +{ +int err; + + err =idpf_config_rxqs (vport); +if (err) +return err; + + err =idpf_config_txqs (vport); + +return err; +} + +static int +idpf_start_queues (struct rte_eth_dev *dev) +{ +struct idpf_vport *vport = + (struct idpf_vport *)dev->data->dev_private; +struct idpf_rx_queue *rxq; +struct idpf_tx_queue *txq; +int i, err =0 ; + +for (i =0 ; i < dev->data->nb_tx_queues; i++) { + txq = dev->data->tx_queues[i]; +if (txq->tx_deferred_start) +continue ; +if (idpf_tx_queue_init (dev, i) !=0 ) { +PMD_DRV_LOG (ERR ,"Fail to init tx queue %u" , i); +return -1 ; + } + } + +for (i =0 ; i < dev->data->nb_rx_queues; i++) { + rxq = dev->data->rx_queues[i]; +if (rxq->rx_deferred_start) +continue ; +if (idpf_rx_queue_init (dev, i) !=0 ) { +PMD_DRV_LOG (ERR ,"Fail to init rx queue %u" , i); +return -1 ; + } + } + + err =idpf_ena_dis_queues (vport, true); +if (err) { +PMD_DRV_LOG (ERR ,"Fail to start queues" ); +return err; + } + +for (i =0 ; i < dev->data->nb_tx_queues; i++) + dev->data->tx_queue_state[i] = +RTE_ETH_QUEUE_STATE_STARTED ; +for (i =0 ; i < dev->data->nb_rx_queues; i++) + dev->data->rx_queue_state[i] = +RTE_ETH_QUEUE_STATE_STARTED ; + +return err; +} +static int idpf_dev_start (struct rte_eth_dev *dev) {
@@ -203,6 +271,19 @@ idpf_dev_start(struct rte_eth_dev *dev) vport->stopped =0 ; +if (idpf_config_queues (vport)) { +PMD_DRV_LOG (ERR ,"Failed to configure queues" ); + goto err_queue; + } + +idpf_set_rx_function (dev); +idpf_set_tx_function (dev); + +if (idpf_start_queues (dev)) { +PMD_DRV_LOG (ERR ,"Failed to start queues" ); + goto err_queue; + } +if (idpf_ena_dis_vport (vport, true)) {PMD_DRV_LOG (ERR ,"Failed to enable vport" ); goto err_vport;
@@ -211,6 +292,8 @@ idpf_dev_start(struct rte_eth_dev *dev)return 0 ; err_vport: +idpf_stop_queues (dev); +err_queue:return -1 ; }
@@ -228,6 +311,8 @@ idpf_dev_stop(struct rte_eth_dev *dev)if (idpf_ena_dis_vport (vport, false))PMD_DRV_LOG (ERR ,"disable vport failed" ); +idpf_stop_queues (dev); + vport->stopped =1 ; dev->data->dev_started =0 ;
drivers/net/idpf/idpf_ethdev.h +5 -0
@@ -195,6 +195,11 @@ int idpf_get_caps(struct idpf_adapter *adapter); int idpf_create_vport(__rte_unused struct rte_eth_dev *dev);int idpf_destroy_vport (struct idpf_vport *vport); +int idpf_config_rxqs (struct idpf_vport *vport); +int idpf_config_txqs (struct idpf_vport *vport); +int idpf_switch_queue (struct idpf_vport *vport,uint16_t qid, +bool rx,bool on); +int idpf_ena_dis_queues (struct idpf_vport *vport,bool enable);int idpf_ena_dis_vport (struct idpf_vport *vport,bool enable);#endif /* _IDPF_ETHDEV_H_ */
drivers/net/idpf/idpf_rxtx.c new file +1252 -0
1,252 lines not on this page · raw message
drivers/net/idpf/idpf_rxtx.h new file +167 -0
167 lines not on this page · raw message
drivers/net/idpf/idpf_vchnl.c +342 -0
354 lines not on this page · raw message
drivers/net/idpf/meson.build +1 -0
@@ -12,6 +12,7 @@ objs = [base_objs] sources = files( 'idpf_ethdev.c', + 'idpf_rxtx.c', 'idpf_vchnl.c', )
Signature · 1 line
2.25.1
RFC v2 5/9 net/idpf: support getting device information
In reply to Junfeng GuoAdd ops dev_infos_get.
--- drivers/net/idpf/idpf_ethdev.c | 69 ++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+)
drivers/net/idpf/idpf_ethdev.c +69 -0
@@ -28,6 +28,8 @@ static int idpf_dev_configure(struct rte_eth_dev *dev);static int idpf_dev_start (struct rte_eth_dev *dev);static int idpf_dev_stop (struct rte_eth_dev *dev);static int idpf_dev_close (struct rte_eth_dev *dev); +static int idpf_dev_info_get (struct rte_eth_dev *dev, +struct rte_eth_dev_info *dev_info);static const struct eth_dev_ops idpf_eth_dev_ops = { .dev_configure = idpf_dev_configure,
@@ -42,8 +44,75 @@ static const struct eth_dev_ops idpf_eth_dev_ops = { .rx_queue_release = idpf_dev_rx_queue_release, .tx_queue_setup = idpf_tx_queue_setup, .tx_queue_release = idpf_dev_tx_queue_release, + .dev_infos_get = idpf_dev_info_get, }; +static int +idpf_dev_info_get(__rte_unused struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) +{ + dev_info->max_rx_queues = adapter->caps->max_rx_q; + dev_info->max_tx_queues = adapter->caps->max_tx_q; + dev_info->min_rx_bufsize =IDPF_MIN_BUF_SIZE ; + dev_info->max_rx_pktlen =IDPF_MAX_FRAME_SIZE ; + + dev_info->max_mtu = dev_info->max_rx_pktlen -IDPF_ETH_OVERHEAD ; + dev_info->min_mtu =RTE_ETHER_MIN_MTU ; + + dev_info->max_mac_addrs =IDPF_NUM_MACADDR_MAX ; + dev_info->dev_capa &= ~RTE_ETH_DEV_CAPA_FLOW_RULE_KEEP ; + dev_info->rx_offload_capa = +RTE_ETH_RX_OFFLOAD_VLAN_STRIP | +RTE_ETH_RX_OFFLOAD_QINQ_STRIP | +RTE_ETH_RX_OFFLOAD_IPV4_CKSUM | +RTE_ETH_RX_OFFLOAD_UDP_CKSUM | +RTE_ETH_RX_OFFLOAD_TCP_CKSUM | +RTE_ETH_RX_OFFLOAD_OUTER_IPV4_CKSUM | +RTE_ETH_RX_OFFLOAD_SCATTER | +RTE_ETH_RX_OFFLOAD_VLAN_FILTER | +RTE_ETH_RX_OFFLOAD_RSS_HASH ; + + dev_info->tx_offload_capa = +RTE_ETH_TX_OFFLOAD_VLAN_INSERT | +RTE_ETH_TX_OFFLOAD_QINQ_INSERT | +RTE_ETH_TX_OFFLOAD_IPV4_CKSUM | +RTE_ETH_TX_OFFLOAD_UDP_CKSUM | +RTE_ETH_TX_OFFLOAD_TCP_CKSUM | +RTE_ETH_TX_OFFLOAD_SCTP_CKSUM | +RTE_ETH_TX_OFFLOAD_OUTER_IPV4_CKSUM | +RTE_ETH_TX_OFFLOAD_TCP_TSO | +RTE_ETH_TX_OFFLOAD_VXLAN_TNL_TSO | +RTE_ETH_TX_OFFLOAD_GRE_TNL_TSO | +RTE_ETH_TX_OFFLOAD_IPIP_TNL_TSO | +RTE_ETH_TX_OFFLOAD_GENEVE_TNL_TSO | +RTE_ETH_TX_OFFLOAD_MULTI_SEGS | +RTE_ETH_TX_OFFLOAD_MBUF_FAST_FREE ; + + dev_info->default_rxconf = (struct rte_eth_rxconf ) { + .rx_free_thresh =IDPF_DEFAULT_RX_FREE_THRESH , + .rx_drop_en =0 , + .offloads =0 , + }; + + dev_info->default_txconf = (struct rte_eth_txconf ) { + .tx_free_thresh =IDPF_DEFAULT_RX_FREE_THRESH , + .tx_rs_thresh =IDPF_DEFAULT_TX_RS_THRESH , + .offloads =0 , + }; + + dev_info->rx_desc_lim = (struct rte_eth_desc_lim ) { + .nb_max =IDPF_MAX_RING_DESC , + .nb_min =IDPF_MIN_RING_DESC , + .nb_align =IDPF_ALIGN_RING_DESC , + }; + + dev_info->tx_desc_lim = (struct rte_eth_desc_lim ) { + .nb_max =IDPF_MAX_RING_DESC , + .nb_min =IDPF_MIN_RING_DESC , + .nb_align =IDPF_ALIGN_RING_DESC , + }; + +return 0 ; +}static int idpf_init_vport_req_info (struct rte_eth_dev *dev)
Signature · 1 line
2.25.1
RFC v2 6/9 net/idpf: support packet type getting
In reply to Junfeng GuoAdd ops dev_supported_ptypes_get.
--- drivers/net/idpf/idpf_ethdev.c | 3 ++ drivers/net/idpf/idpf_rxtx.c | 51 ++++++++++++++++++++++++++++++++++ drivers/net/idpf/idpf_rxtx.h | 3 ++ 3 files changed, 57 insertions(+)
drivers/net/idpf/idpf_ethdev.c +3 -0
@@ -32,6 +32,7 @@ static int idpf_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info);static const struct eth_dev_ops idpf_eth_dev_ops = { + .dev_supported_ptypes_get = idpf_dev_supported_ptypes_get, .dev_configure = idpf_dev_configure, .dev_start = idpf_dev_start, .dev_stop = idpf_dev_stop,
@@ -501,6 +502,8 @@ idpf_adapter_init(struct rte_eth_dev *dev)if (adapter->initialized)return 0 ; +idpf_set_default_ptype_table (dev); + hw->hw_addr = (void *)pci_dev->mem_resource[0 ].addr; hw->hw_addr_len = pci_dev->mem_resource[0 ].len; hw->back = adapter;
drivers/net/idpf/idpf_rxtx.c +51 -0
57 lines not on this page · raw message
drivers/net/idpf/idpf_rxtx.h +3 -0
@@ -164,4 +164,7 @@ void idpf_dev_tx_queue_release(struct rte_eth_dev *dev, uint16_t qid);void idpf_stop_queues (struct rte_eth_dev *dev); +void idpf_set_default_ptype_table (struct rte_eth_dev *dev); +const uint32_t *idpf_dev_supported_ptypes_get (struct rte_eth_dev *dev); +#endif /* _IDPF_RXTX_H_ */
Signature · 1 line
2.25.1
RFC v2 7/9 net/idpf: support link update
In reply to Junfeng GuoAdd ops link_update.
--- drivers/net/idpf/idpf_ethdev.c | 22 ++++++++++++++++++++++ drivers/net/idpf/idpf_ethdev.h | 2 ++ 2 files changed, 24 insertions(+)
drivers/net/idpf/idpf_ethdev.c +22 -0
@@ -31,6 +31,27 @@ static int idpf_dev_close(struct rte_eth_dev *dev);static int idpf_dev_info_get (struct rte_eth_dev *dev,struct rte_eth_dev_info *dev_info); +int +idpf_dev_link_update (struct rte_eth_dev *dev, + __rte_unused int wait_to_complete) +{ +struct idpf_vport *vport = + (struct idpf_vport *)dev->data->dev_private; +struct rte_eth_link new_link; + +memset (&new_link,0 ,sizeof (new_link)); + + new_link.link_speed =RTE_ETH_SPEED_NUM_NONE ; + + new_link.link_duplex =RTE_ETH_LINK_FULL_DUPLEX ; + new_link.link_status = vport->link_up ?RTE_ETH_LINK_UP : +RTE_ETH_LINK_DOWN ; + new_link.link_autoneg = !(dev->data->dev_conf.link_speeds & +RTE_ETH_LINK_SPEED_FIXED ); + +return rte_eth_linkstatus_set (dev, &new_link); +} +static const struct eth_dev_ops idpf_eth_dev_ops = { .dev_supported_ptypes_get = idpf_dev_supported_ptypes_get, .dev_configure = idpf_dev_configure,
@@ -46,6 +67,7 @@ static const struct eth_dev_ops idpf_eth_dev_ops = { .tx_queue_setup = idpf_tx_queue_setup, .tx_queue_release = idpf_dev_tx_queue_release, .dev_infos_get = idpf_dev_info_get, + .link_update = idpf_dev_link_update, }; static int
drivers/net/idpf/idpf_ethdev.h +2 -0
@@ -189,6 +189,8 @@ _atomic_set_cmd(struct idpf_adapter *adapter, enum virtchnl_ops ops)return !ret; } +int idpf_dev_link_update (struct rte_eth_dev *dev, + __rte_unused int wait_to_complete);void idpf_handle_virtchnl_msg (struct rte_eth_dev *dev);int idpf_check_api_version (struct idpf_adapter *adapter);int idpf_get_caps (struct idpf_adapter *adapter);
Signature · 1 line
2.25.1
RFC v2 8/9 net/idpf: support basic Rx/Tx
In reply to Junfeng GuoAdd basic RX & TX support in split queue mode and single queue mode. Using split queue mode by default.
--- drivers/net/idpf/idpf_ethdev.c | 93 ++++ drivers/net/idpf/idpf_rxtx.c | 877 +++++++++++++++++++++++++++++++++ drivers/net/idpf/idpf_rxtx.h | 33 ++ 3 files changed, 1003 insertions(+)
drivers/net/idpf/idpf_ethdev.c +93 -0
@@ -14,12 +14,16 @@#include "idpf_ethdev.h" #include "idpf_rxtx.h" +#define IDPF_TX_SINGLE_Q "tx_single" +#define IDPF_RX_SINGLE_Q "rx_single"#define VPORT_NUM "vport_num"struct idpf_adapter *adapter;uint16_t vport_num =1 ;static const char *const idpf_valid_args[] = { +IDPF_TX_SINGLE_Q , +IDPF_RX_SINGLE_Q ,VPORT_NUM ,NULL };
@@ -156,6 +160,30 @@ idpf_init_vport_req_info(struct rte_eth_dev *dev) (struct virtchnl2_create_vport *)adapter->vport_req_info[idx]; vport_info->vport_type =rte_cpu_to_le_16 (VIRTCHNL2_VPORT_TYPE_DEFAULT ); +if (!adapter->txq_model) { + vport_info->txq_model = +rte_cpu_to_le_16 (VIRTCHNL2_QUEUE_MODEL_SPLIT ); + vport_info->num_tx_q = dev->data->nb_tx_queues; + vport_info->num_tx_complq = + dev->data->nb_tx_queues *IDPF_TX_COMPLQ_PER_GRP ; + }else { + vport_info->txq_model = +rte_cpu_to_le_16 (VIRTCHNL2_QUEUE_MODEL_SINGLE ); + vport_info->num_tx_q = dev->data->nb_tx_queues; + vport_info->num_tx_complq =0 ; + } +if (!adapter->rxq_model) { + vport_info->rxq_model = +rte_cpu_to_le_16 (VIRTCHNL2_QUEUE_MODEL_SPLIT ); + vport_info->num_rx_q = dev->data->nb_rx_queues; + vport_info->num_rx_bufq = + dev->data->nb_rx_queues *IDPF_RX_BUFQ_PER_GRP ; + }else { + vport_info->rxq_model = +rte_cpu_to_le_16 (VIRTCHNL2_QUEUE_MODEL_SINGLE ); + vport_info->num_rx_q = dev->data->nb_rx_queues; + vport_info->num_rx_bufq =0 ; + }return 0 ; }
@@ -426,6 +454,56 @@ idpf_dev_close(struct rte_eth_dev *dev)return 0 ; } +static int +parse_bool (const char *key,const char *value,void *args) +{ +int *i = (int *)args; +char *end; +int num; + + num =strtoul (value, &end,10 ); + +if (num !=0 && num !=1 ) { +PMD_DRV_LOG (WARNING ,"invalid value:\"%s\" for key:\"%s\", " +"value must be 0 or 1" , + value, key); +return -1 ; + } + + *i = num; +return 0 ; +} + +static int idpf_parse_devargs (struct rte_eth_dev *dev) +{ +struct rte_devargs *devargs = dev->device->devargs; +struct rte_kvargs *kvlist; +int ret; + +if (!devargs) +return 0 ; + + kvlist =rte_kvargs_parse (devargs->args, idpf_valid_args); +if (!kvlist) { +PMD_INIT_LOG (ERR ,"invalid kvargs key" ); +return -EINVAL ; + } + + ret =rte_kvargs_process (kvlist,IDPF_TX_SINGLE_Q , &parse_bool, + &adapter->txq_model); +if (ret) + goto bail; + + ret =rte_kvargs_process (kvlist,IDPF_RX_SINGLE_Q , &parse_bool, + &adapter->rxq_model); +if (ret) + goto bail; + +bail: +rte_kvargs_free (kvlist); +return ret; +} +static void idpf_reset_pf (struct iecm_hw *hw) {
@@ -533,6 +611,12 @@ idpf_adapter_init(struct rte_eth_dev *dev) hw->device_id = pci_dev->id.device_id; hw->subsystem_vendor_id = pci_dev->id.subsystem_vendor_id; + ret =idpf_parse_devargs (dev); +if (ret) { +PMD_INIT_LOG (ERR ,"Failed to parse devargs" ); + goto err; + } +idpf_reset_pf (hw); ret =idpf_check_pf_reset_done (hw);if (ret) {
@@ -641,6 +725,15 @@ idpf_dev_init(struct rte_eth_dev *dev, __rte_unused void *init_params) dev->dev_ops = &idpf_eth_dev_ops; +/* for secondary processes, we don't initialise any further as primary +* has already done this work. +*/ +if (rte_eal_process_type () !=RTE_PROC_PRIMARY ) { +idpf_set_rx_function (dev); +idpf_set_tx_function (dev); +return ret; + } + ret =idpf_adapter_init (dev);if (ret) {PMD_INIT_LOG (ERR ,"Failed to init adapter." );
drivers/net/idpf/idpf_rxtx.c +877 -0
880 lines not on this page · raw message
drivers/net/idpf/idpf_rxtx.h +33 -0
@@ -35,6 +35,25 @@#define IDPF_TSO_MAX_SEG UINT8_MAX#define IDPF_TX_MAX_MTU_SEG 8 +#define IDPF_TX_CKSUM_OFFLOAD_MASK ( \ + RTE_MBUF_F_TX_IP_CKSUM | \ + RTE_MBUF_F_TX_L4_MASK | \ + RTE_MBUF_F_TX_TCP_SEG) + +#define IDPF_TX_OFFLOAD_MASK ( \ + RTE_MBUF_F_TX_OUTER_IPV6 | \ + RTE_MBUF_F_TX_OUTER_IPV4 | \ + RTE_MBUF_F_TX_IPV6 | \ + RTE_MBUF_F_TX_IPV4 | \ + RTE_MBUF_F_TX_VLAN | \ + RTE_MBUF_F_TX_IP_CKSUM | \ + RTE_MBUF_F_TX_L4_MASK | \ + RTE_MBUF_F_TX_TCP_SEG | \ + RTE_ETH_TX_OFFLOAD_SECURITY) + +#define IDPF_TX_OFFLOAD_NOTSUP_MASK \ + (RTE_MBUF_F_TX_OFFLOAD_MASK ^ IDPF_TX_OFFLOAD_MASK) +struct idpf_rx_queue {struct idpf_adapter *adapter;/* the adapter this queue belongs to */ struct rte_mempool *mp;/* mbuf pool to populate Rx ring */
@@ -162,8 +181,22 @@ int idpf_tx_queue_start(struct rte_eth_dev *dev, uint16_t tx_queue_id);int idpf_tx_queue_stop (struct rte_eth_dev *dev,uint16_t tx_queue_id);void idpf_dev_tx_queue_release (struct rte_eth_dev *dev,uint16_t qid); +uint16_t idpf_singleq_recv_pkts (void *rx_queue,struct rte_mbuf **rx_pkts, +uint16_t nb_pkts); +uint16_t idpf_splitq_recv_pkts (void *rx_queue,struct rte_mbuf **rx_pkts, +uint16_t nb_pkts); +uint16_t idpf_singleq_xmit_pkts (void *tx_queue,struct rte_mbuf **tx_pkts, +uint16_t nb_pkts); +uint16_t idpf_splitq_xmit_pkts (void *tx_queue,struct rte_mbuf **tx_pkts, +uint16_t nb_pkts); +uint16_t idpf_prep_pkts (void *tx_queue,struct rte_mbuf **tx_pkts, +uint16_t nb_pkts); +void idpf_stop_queues (struct rte_eth_dev *dev); +void idpf_set_rx_function (struct rte_eth_dev *dev); +void idpf_set_tx_function (struct rte_eth_dev *dev); +void idpf_set_default_ptype_table (struct rte_eth_dev *dev);const uint32_t *idpf_dev_supported_ptypes_get (struct rte_eth_dev *dev);
Signature · 1 line
2.25.1
RFC v2 9/9 net/idpf: support RSS
In reply to Junfeng GuoAdd RSS support.
--- drivers/net/idpf/idpf_ethdev.c | 106 +++++++++++++++++++++++++++++++++ drivers/net/idpf/idpf_ethdev.h | 18 +++++- drivers/net/idpf/idpf_vchnl.c | 93 +++++++++++++++++++++++++++++ 3 files changed, 216 insertions(+), 1 deletion(-)
drivers/net/idpf/idpf_ethdev.c +106 -0
@@ -85,6 +85,7 @@ idpf_dev_info_get(__rte_unused struct rte_eth_dev *dev, struct rte_eth_dev_info dev_info->max_mtu = dev_info->max_rx_pktlen -IDPF_ETH_OVERHEAD ; dev_info->min_mtu =RTE_ETHER_MIN_MTU ; + dev_info->flow_type_rss_offloads =IDPF_RSS_OFFLOAD_ALL ; dev_info->max_mac_addrs =IDPF_NUM_MACADDR_MAX ; dev_info->dev_capa &= ~RTE_ETH_DEV_CAPA_FLOW_RULE_KEEP ; dev_info->rx_offload_capa =
@@ -292,9 +293,96 @@ idpf_init_vport(struct rte_eth_dev *dev)return 0 ; } +static int +idpf_config_rss (struct idpf_vport *vport) +{ +int ret; + + ret =idpf_set_rss_key (vport); +if (ret) { +PMD_INIT_LOG (ERR ,"Failed to configure RSS key" ); +return ret; + } + + ret =idpf_set_rss_lut (vport); +if (ret) { +PMD_INIT_LOG (ERR ,"Failed to configure RSS lut" ); +return ret; + } + + ret =idpf_set_rss_hash (vport); +if (ret) { +PMD_INIT_LOG (ERR ,"Failed to configure RSS hash" ); +return ret; + } + +return ret; +} + +static int +idpf_init_rss (struct idpf_vport *vport) +{ +struct rte_eth_rss_conf *rss_conf; +uint16_t i, nb_q, lut_size; +int ret =0 ; + + rss_conf = &vport->dev_data->dev_conf.rx_adv_conf.rss_conf; + nb_q = vport->num_rx_q; + + vport->rss_key = (uint8_t *)rte_zmalloc ("rss_key" , + vport->rss_key_size,0 ); +if (!vport->rss_key) { +PMD_INIT_LOG (ERR ,"Failed to allocate RSS key" ); + ret = -ENOMEM ; + goto err_key; + } + + lut_size = vport->rss_lut_size; + vport->rss_lut = (uint32_t *)rte_zmalloc ("rss_lut" , +sizeof (uint32_t ) * lut_size,0 ); +if (!vport->rss_lut) { +PMD_INIT_LOG (ERR ,"Failed to allocate RSS lut" ); + ret = -ENOMEM ; + goto err_lut; + } + +if (!rss_conf->rss_key) { +for (i =0 ; i < vport->rss_key_size; i++) + vport->rss_key[i] = (uint8_t )rte_rand (); + }else { +rte_memcpy (vport->rss_key, rss_conf->rss_key, +RTE_MIN (rss_conf->rss_key_len, + vport->rss_key_size)); + } + +for (i =0 ; i < lut_size; i++) + vport->rss_lut[i] = i % nb_q; + + vport->rss_hf =IECM_DEFAULT_RSS_HASH_EXPANDED ; + + ret =idpf_config_rss (vport); +if (ret) { +PMD_INIT_LOG (ERR ,"Failed to configure RSS" ); + goto err_cfg; + } + +return ret; + +err_cfg: +rte_free (vport->rss_lut); + vport->rss_lut =NULL ; +err_lut: +rte_free (vport->rss_key); + vport->rss_key =NULL ; +err_key: +return ret; +} +static int idpf_dev_configure (struct rte_eth_dev *dev) { +struct idpf_vport *vport = + (struct idpf_vport *)dev->data->dev_private;int ret =0 ;if (dev->data->dev_conf.rxmode.mq_mode &RTE_ETH_MQ_RX_RSS_FLAG )
@@ -319,6 +407,14 @@ idpf_dev_configure(struct rte_eth_dev *dev)return ret; } +if (adapter->caps->rss_caps) { + ret =idpf_init_rss (vport); +if (ret) { +PMD_INIT_LOG (ERR ,"Failed to init rss" ); +return ret; + } + } +return ret; }
@@ -451,6 +547,16 @@ idpf_dev_close(struct rte_eth_dev *dev)idpf_dev_stop (dev);idpf_destroy_vport (vport); +if (vport->rss_lut) { +rte_free (vport->rss_lut); + vport->rss_lut =NULL ; + } + +if (vport->rss_key) { +rte_free (vport->rss_key); + vport->rss_key =NULL ; + } +return 0 ; }
drivers/net/idpf/idpf_ethdev.h +17 -1
@@ -43,6 +43,20 @@#define IDPF_ETH_OVERHEAD \ (RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN + IDPF_VLAN_TAG_SIZE * 2) +#define IDPF_RSS_OFFLOAD_ALL ( \ + RTE_ETH_RSS_IPV4 | \ + RTE_ETH_RSS_FRAG_IPV4 | \ + RTE_ETH_RSS_NONFRAG_IPV4_TCP | \ + RTE_ETH_RSS_NONFRAG_IPV4_UDP | \ + RTE_ETH_RSS_NONFRAG_IPV4_SCTP | \ + RTE_ETH_RSS_NONFRAG_IPV4_OTHER | \ + RTE_ETH_RSS_IPV6 | \ + RTE_ETH_RSS_FRAG_IPV6 | \ + RTE_ETH_RSS_NONFRAG_IPV6_TCP | \ + RTE_ETH_RSS_NONFRAG_IPV6_UDP | \ + RTE_ETH_RSS_NONFRAG_IPV6_SCTP | \ + RTE_ETH_RSS_NONFRAG_IPV6_OTHER) +#ifndef ETH_ADDR_LEN #define ETH_ADDR_LEN 6#endif
@@ -196,7 +210,9 @@ int idpf_check_api_version(struct idpf_adapter *adapter);int idpf_get_caps (struct idpf_adapter *adapter); int idpf_create_vport(__rte_unused struct rte_eth_dev *dev);int idpf_destroy_vport (struct idpf_vport *vport); - +int idpf_set_rss_key (struct idpf_vport *vport); +int idpf_set_rss_lut (struct idpf_vport *vport); +int idpf_set_rss_hash (struct idpf_vport *vport);int idpf_config_rxqs (struct idpf_vport *vport);int idpf_config_txqs (struct idpf_vport *vport); int idpf_switch_queue(struct idpf_vport *vport, uint16_t qid,
drivers/net/idpf/idpf_vchnl.c +93 -0
99 lines not on this page · raw message
Signature · 1 line
2.25.1
v3 cover add support for idpf PMD in DPDK
This is a draft of idpf (Infrastructure Data Path Function) PMD in DPDK for Intel Device ID of 0x1452 and 0x1453.
v3:
fix small issues and add support for device id 0x1453.
v2:
fix code typo in func idpf_set_tx_function.
Junfeng Guo (11):
net/idpf/base: introduce base code
net/idpf/base: add OS specific implementation
net/idpf: support device initialization
net/idpf: support queue ops
net/idpf: support getting device information
net/idpf: support packet type getting
net/idpf: support link update
net/idpf: support basic Rx/Tx
net/idpf: support RSS
net/idpf: support MTU configuration
net/idpf: add CPF device ID for idpf map table
drivers/net/idpf/base/iecm_alloc.h | 22 + drivers/net/idpf/base/iecm_common.c | 359 +++ drivers/net/idpf/base/iecm_controlq.c | 662 ++++ drivers/net/idpf/base/iecm_controlq.h | 214 ++ drivers/net/idpf/base/iecm_controlq_api.h | 227 ++ drivers/net/idpf/base/iecm_controlq_setup.c | 179 ++ drivers/net/idpf/base/iecm_devids.h | 18 + drivers/net/idpf/base/iecm_lan_pf_regs.h | 134 + drivers/net/idpf/base/iecm_lan_txrx.h | 428 +++ drivers/net/idpf/base/iecm_lan_vf_regs.h | 114 + drivers/net/idpf/base/iecm_osdep.h | 365 +++ drivers/net/idpf/base/iecm_prototype.h | 45 + drivers/net/idpf/base/iecm_type.h | 106 + drivers/net/idpf/base/meson.build | 27 + drivers/net/idpf/base/siov_regs.h | 41 + drivers/net/idpf/base/virtchnl.h | 2743 +++++++++++++++++ drivers/net/idpf/base/virtchnl2.h | 1411 +++++++++ drivers/net/idpf/base/virtchnl2_lan_desc.h | 603 ++++ drivers/net/idpf/base/virtchnl_inline_ipsec.h | 567 ++++ drivers/net/idpf/idpf_ethdev.c | 1055 +++++++ drivers/net/idpf/idpf_ethdev.h | 224 ++ drivers/net/idpf/idpf_logs.h | 38 + drivers/net/idpf/idpf_rxtx.c | 2180 +++++++++++++ drivers/net/idpf/idpf_rxtx.h | 203 ++ drivers/net/idpf/idpf_vchnl.c | 909 ++++++ drivers/net/idpf/meson.build | 19 + drivers/net/idpf/version.map | 3 + drivers/net/meson.build | 1 + 28 files changed, 12897 insertions(+) create mode 100644 drivers/net/idpf/base/iecm_alloc.h create mode 100644 drivers/net/idpf/base/iecm_common.c create mode 100644 drivers/net/idpf/base/iecm_controlq.c create mode 100644 drivers/net/idpf/base/iecm_controlq.h create mode 100644 drivers/net/idpf/base/iecm_controlq_api.h create mode 100644 drivers/net/idpf/base/iecm_controlq_setup.c create mode 100644 drivers/net/idpf/base/iecm_devids.h create mode 100644 drivers/net/idpf/base/iecm_lan_pf_regs.h create mode 100644 drivers/net/idpf/base/iecm_lan_txrx.h create mode 100644 drivers/net/idpf/base/iecm_lan_vf_regs.h create mode 100644 drivers/net/idpf/base/iecm_osdep.h create mode 100644 drivers/net/idpf/base/iecm_prototype.h create mode 100644 drivers/net/idpf/base/iecm_type.h create mode 100644 drivers/net/idpf/base/meson.build create mode 100644 drivers/net/idpf/base/siov_regs.h create mode 100644 drivers/net/idpf/base/virtchnl.h create mode 100644 drivers/net/idpf/base/virtchnl2.h create mode 100644 drivers/net/idpf/base/virtchnl2_lan_desc.h create mode 100644 drivers/net/idpf/base/virtchnl_inline_ipsec.h create mode 100644 drivers/net/idpf/idpf_ethdev.c create mode 100644 drivers/net/idpf/idpf_ethdev.h create mode 100644 drivers/net/idpf/idpf_logs.h create mode 100644 drivers/net/idpf/idpf_rxtx.c create mode 100644 drivers/net/idpf/idpf_rxtx.h create mode 100644 drivers/net/idpf/idpf_vchnl.c create mode 100644 drivers/net/idpf/meson.build create mode 100644 drivers/net/idpf/version.map
Signature · 1 line
2.25.1
RFC v3 1/11 net/idpf/base: introduce base code
Introduce base code for IDPF (Infrastructure Data Path Function) PMD.
--- drivers/net/idpf/base/iecm_alloc.h | 22 + drivers/net/idpf/base/iecm_common.c | 359 +++ drivers/net/idpf/base/iecm_controlq.c | 662 ++++ drivers/net/idpf/base/iecm_controlq.h | 214 ++ drivers/net/idpf/base/iecm_controlq_api.h | 227 ++ drivers/net/idpf/base/iecm_controlq_setup.c | 179 ++ drivers/net/idpf/base/iecm_devids.h | 17 + drivers/net/idpf/base/iecm_lan_pf_regs.h | 134 + drivers/net/idpf/base/iecm_lan_txrx.h | 428 +++ drivers/net/idpf/base/iecm_lan_vf_regs.h | 114 + drivers/net/idpf/base/iecm_prototype.h | 45 + drivers/net/idpf/base/iecm_type.h | 106 + drivers/net/idpf/base/meson.build | 27 + drivers/net/idpf/base/siov_regs.h | 41 + drivers/net/idpf/base/virtchnl.h | 2743 +++++++++++++++++ drivers/net/idpf/base/virtchnl2.h | 1411 +++++++++ drivers/net/idpf/base/virtchnl2_lan_desc.h | 603 ++++ drivers/net/idpf/base/virtchnl_inline_ipsec.h | 567 ++++ 18 files changed, 7899 insertions(+) create mode 100644 drivers/net/idpf/base/iecm_alloc.h create mode 100644 drivers/net/idpf/base/iecm_common.c create mode 100644 drivers/net/idpf/base/iecm_controlq.c create mode 100644 drivers/net/idpf/base/iecm_controlq.h create mode 100644 drivers/net/idpf/base/iecm_controlq_api.h create mode 100644 drivers/net/idpf/base/iecm_controlq_setup.c create mode 100644 drivers/net/idpf/base/iecm_devids.h create mode 100644 drivers/net/idpf/base/iecm_lan_pf_regs.h create mode 100644 drivers/net/idpf/base/iecm_lan_txrx.h create mode 100644 drivers/net/idpf/base/iecm_lan_vf_regs.h create mode 100644 drivers/net/idpf/base/iecm_prototype.h create mode 100644 drivers/net/idpf/base/iecm_type.h create mode 100644 drivers/net/idpf/base/meson.build create mode 100644 drivers/net/idpf/base/siov_regs.h create mode 100644 drivers/net/idpf/base/virtchnl.h create mode 100644 drivers/net/idpf/base/virtchnl2.h create mode 100644 drivers/net/idpf/base/virtchnl2_lan_desc.h create mode 100644 drivers/net/idpf/base/virtchnl_inline_ipsec.h
drivers/net/idpf/base/iecm_alloc.h new file +22 -0
@@ -0,0 +1,22 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* Copyright(c) 2001-2022 Intel Corporation +*/ + +#ifndef _IECM_ALLOC_H_ +#define _IECM_ALLOC_H_ + +/* Memory types */ +enum iecm_memset_type { +IECM_NONDMA_MEM =0 , +IECM_DMA_MEM +}; + +/* Memcpy types */ +enum iecm_memcpy_type { +IECM_NONDMA_TO_NONDMA =0 , +IECM_NONDMA_TO_DMA , +IECM_DMA_TO_DMA , +IECM_DMA_TO_NONDMA +}; + +#endif /* _IECM_ALLOC_H_ */
drivers/net/idpf/base/iecm_common.c new file +359 -0
359 lines not on this page · raw message
drivers/net/idpf/base/iecm_controlq.c new file +662 -0
662 lines not on this page · raw message
drivers/net/idpf/base/iecm_controlq.h new file +214 -0
214 lines not on this page · raw message
drivers/net/idpf/base/iecm_controlq_api.h new file +227 -0
227 lines not on this page · raw message
drivers/net/idpf/base/iecm_controlq_setup.c new file +179 -0
179 lines not on this page · raw message
drivers/net/idpf/base/iecm_devids.h new file +17 -0
@@ -0,0 +1,17 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* Copyright(c) 2001-2022 Intel Corporation +*/ + +#ifndef _IECM_DEVIDS_H_ +#define _IECM_DEVIDS_H_ + +/* Vendor ID */ +#define IECM_INTEL_VENDOR_ID 0x8086 + +/* Device IDs */ +#define IECM_DEV_ID_PF 0x1452 + + + + +#endif /* _IECM_DEVIDS_H_ */
drivers/net/idpf/base/iecm_lan_pf_regs.h new file +134 -0
134 lines not on this page · raw message
drivers/net/idpf/base/iecm_lan_txrx.h new file +428 -0
428 lines not on this page · raw message
drivers/net/idpf/base/iecm_lan_vf_regs.h new file +114 -0
114 lines not on this page · raw message
drivers/net/idpf/base/iecm_prototype.h new file +45 -0
45 lines not on this page · raw message
drivers/net/idpf/base/iecm_type.h new file +106 -0
106 lines not on this page · raw message
drivers/net/idpf/base/meson.build new file +27 -0
@@ -0,0 +1,27 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2022 Intel Corporation + +sources = [ + 'iecm_common.c', + 'iecm_controlq.c', + 'iecm_controlq_setup.c', +] + +error_cflags = ['-Wno-unused-value', + '-Wno-unused-but-set-variable', + '-Wno-unused-variable', + '-Wno-unused-parameter', +] + +c_args = cflags + +foreach flag: error_cflags + if cc.has_argument(flag) + c_args += flag + endif +endforeach + +base_lib = static_library('idpf_base', sources, + dependencies: static_rte_eal, + c_args: c_args) +base_objs = base_lib.extract_all_objects()
drivers/net/idpf/base/siov_regs.h new file +41 -0
41 lines not on this page · raw message
drivers/net/idpf/base/virtchnl.h new file +2743 -0
424 lines not on this page · raw message
drivers/net/idpf/base/virtchnl2.h new file +1411 -0
1,411 lines not on this page · raw message
drivers/net/idpf/base/virtchnl2_lan_desc.h new file +603 -0
603 lines not on this page · raw message
drivers/net/idpf/base/virtchnl_inline_ipsec.h new file +567 -0
567 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.25.1
Part of the diff is not shown here. View the raw message.
Re: [RFC v3 01/11] net/idpf/base: introduce base code
drivers/net/idpf/base/iecm_common.c line 128
Quoted 7 lines · On Wed, 18 May 2022 16:25:21 +0800 Junfeng Guo <[email protected]> wrote:
drivers/net/idpf/base/iecm_common.c new file +7
-0+/* TODO hardcode a mac addr for now */ + hw->mac.addr[0 ] =0x00 ; + hw->mac.addr[1 ] =0x00 ; + hw->mac.addr[2 ] =0x00 ; + hw->mac.addr[3 ] =0x00 ; + hw->mac.addr[4 ] =0x03 ; + hw->mac.addr[5 ] =0x14 ;
DPDK has ability to assign random ether address, please use that.
RFC v3 2/11 net/idpf/base: add OS specific implementation
In reply to Junfeng GuoAdd some MACRO definations and small functions which are specific for DPDK.
--- drivers/net/idpf/base/iecm_osdep.h | 365 +++++++++++++++++++++++++++++ 1 file changed, 365 insertions(+) create mode 100644 drivers/net/idpf/base/iecm_osdep.h
drivers/net/idpf/base/iecm_osdep.h new file +365 -0
@@ -0,0 +1,365 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* Copyright(c) 2001-2022 Intel Corporation +*/ + +#ifndef _IECM_OSDEP_H_ +#define _IECM_OSDEP_H_ + +#include <string.h> +#include <stdint.h> +#include <stdio.h> +#include <stdarg.h> +#include <inttypes.h> +#include <sys/queue.h> +#include <stdbool.h> + +#include <rte_common.h> +#include <rte_memcpy.h> +#include <rte_malloc.h> +#include <rte_memzone.h> +#include <rte_byteorder.h> +#include <rte_cycles.h> +#include <rte_spinlock.h> +#include <rte_log.h> +#include <rte_random.h> +#include <rte_io.h> + +#include "../idpf_logs.h" + +#define INLINE inline +#define STATIC static + +typedef uint8_t u8 ; +typedef int8_t s8 ; +typedef uint16_t u16 ; +typedef int16_t s16 ; +typedef uint32_t u32 ; +typedef int32_t s32 ; +typedef uint64_t u64 ; +typedef uint64_t s64 ; + +typedef enum iecm_status iecm_status ; +typedef struct iecm_lock iecm_lock ; + +#define __iomem +#define hw_dbg(hw, S, A...) do {} while (0) +#define upper_32_bits (n) ((u32)(((n) >> 16) >> 16)) +#define lower_32_bits (n) ((u32)(n)) +#define low_16_bits (x) ((x) & 0xFFFF) +#define high_16_bits (x) (((x) & 0xFFFF0000) >> 16) + +#ifndef ETH_ADDR_LEN +#define ETH_ADDR_LEN 6 +#endif + +#ifndef __le16 +#define __le16 uint16_t +#endif +#ifndef __le32 +#define __le32 uint32_t +#endif +#ifndef __le64 +#define __le64 uint64_t +#endif +#ifndef __be16 +#define __be16 uint16_t +#endif +#ifndef __be32 +#define __be32 uint32_t +#endif +#ifndef __be64 +#define __be64 uint64_t +#endif + +#ifndef __always_unused +#define __always_unused __attribute__((__unused__)) +#endif +#ifndef __maybe_unused +#define __maybe_unused __attribute__((__unused__)) +#endif +#ifndef __packed +#define __packed __attribute__((packed)) +#endif + +#ifndef BIT_ULL +#define BIT_ULL (a) (1ULL << (a)) +#endif + +#ifndef BIT +#define BIT (a) (1ULL << (a)) +#endif + +#define FALSE 0 +#define TRUE 1 +#define false 0 +#define true 1 + +#define min (a, b) RTE_MIN(a, b) +#define max (a, b) RTE_MAX(a, b) + +#define ARRAY_SIZE (arr) (sizeof(arr) / sizeof(arr[0])) +#define FIELD_SIZEOF (t, f) (sizeof(((t *)0)->(f))) +#define MAKEMASK (m, s) ((m) << (s)) + +#define DEBUGOUT (S ) PMD_DRV_LOG_RAW(DEBUG, S) +#define DEBUGOUT2(S, A...) PMD_DRV_LOG_RAW(DEBUG, S, ##A) +#define DEBUGFUNC (F ) PMD_DRV_LOG_RAW(DEBUG, F) + +#define iecm_debug (h, m, s, ...) \ + do { \ + if (((m) & (h)->debug_mask)) \ + PMD_DRV_LOG_RAW(DEBUG, "iecm %02x.%x " s, \ + (h)->bus.device, (h)->bus.func, \ + ##__VA_ARGS__); \ + } while (0) + +#define iecm_info(hw, fmt, args...) iecm_debug(hw, IECM_DBG_ALL, fmt, ##args) +#define iecm_warn(hw, fmt, args...) iecm_debug(hw, IECM_DBG_ALL, fmt, ##args) +#define iecm_debug_array (hw, type, rowsize, groupsize, buf, len) \ + do { \ + struct iecm_hw *hw_l = hw; \ + u16 len_l = len; \ + u8 *buf_l = buf; \ + int i; \ + for (i = 0; i < len_l; i += 8) \ + iecm_debug(hw_l, type, \ + "0x%04X 0x%016"PRIx64"\n", \ + i, *((u64 *)((buf_l) + i))); \ + } while (0) +#define iecm_snprintf snprintf +#ifndef SNPRINTF +#define SNPRINTF iecm_snprintf +#endif + +#define IECM_PCI_REG (reg) rte_read32(reg) +#define IECM_PCI_REG_ADDR (a, reg) \ + ((volatile uint32_t *)((char *)(a)->hw_addr + (reg))) +#define IECM_PCI_REG64 (reg) rte_read64(reg) +#define IECM_PCI_REG_ADDR64 (a, reg) \ + ((volatile uint64_t *)((char *)(a)->hw_addr + (reg))) + +#define iecm_wmb () rte_io_wmb() +#define iecm_rmb () rte_io_rmb() +#define iecm_mb () rte_io_mb() + +static inline uint32_t iecm_read_addr (volatile void *addr) +{ +return rte_le_to_cpu_32 (IECM_PCI_REG (addr)); +} + +static inline uint64_t iecm_read_addr64 (volatile void *addr) +{ +return rte_le_to_cpu_64 (IECM_PCI_REG64 (addr)); +} + +#define IECM_PCI_REG_WRITE (reg, value) \ + rte_write32((rte_cpu_to_le_32(value)), reg) + +#define IECM_PCI_REG_WRITE64 (reg, value) \ + rte_write64((rte_cpu_to_le_64(value)), reg) + +#define IECM_READ_REG (hw, reg) iecm_read_addr(IECM_PCI_REG_ADDR((hw), (reg))) +#define IECM_WRITE_REG (hw, reg, value) \ + IECM_PCI_REG_WRITE(IECM_PCI_REG_ADDR((hw), (reg)), (value)) + +#define rd32 (a, reg) iecm_read_addr(IECM_PCI_REG_ADDR((a), (reg))) +#define wr32 (a, reg, value) \ + IECM_PCI_REG_WRITE(IECM_PCI_REG_ADDR((a), (reg)), (value)) +#define div64_long (n, d) ((n) / (d)) +#define rd64 (a, reg) iecm_read_addr64(IECM_PCI_REG_ADDR64((a), (reg))) + +#define BITS_PER_BYTE 8 + +/* memory allocation tracking */ +struct iecm_dma_mem { +void *va; +u64 pa; +u32 size; +const void *zone; +} __attribute__((packed)); + +struct iecm_virt_mem { +void *va; +u32 size; +} __attribute__((packed)); + +#define iecm_malloc (h, s) rte_zmalloc(NULL, s, 0) +#define iecm_calloc (h, c, s) rte_zmalloc(NULL, (c) * (s), 0) +#define iecm_free (h, m) rte_free(m) + +#define iecm_memset (a, b, c, d) memset((a), (b), (c)) +#define iecm_memcpy (a, b, c, d) rte_memcpy((a), (b), (c)) +#define iecm_memdup (a, b, c, d) rte_memcpy(iecm_malloc(a, c), b, c) + +#define CPU_TO_BE16 (o) rte_cpu_to_be_16(o) +#define CPU_TO_BE32 (o) rte_cpu_to_be_32(o) +#define CPU_TO_BE64 (o) rte_cpu_to_be_64(o) +#define CPU_TO_LE16 (o) rte_cpu_to_le_16(o) +#define CPU_TO_LE32 (s) rte_cpu_to_le_32(s) +#define CPU_TO_LE64 (h) rte_cpu_to_le_64(h) +#define LE16_TO_CPU (a) rte_le_to_cpu_16(a) +#define LE32_TO_CPU (c) rte_le_to_cpu_32(c) +#define LE64_TO_CPU (k) rte_le_to_cpu_64(k) + +#define NTOHS (a) rte_be_to_cpu_16(a) +#define NTOHL (a) rte_be_to_cpu_32(a) +#define HTONS (a) rte_cpu_to_be_16(a) +#define HTONL (a) rte_cpu_to_be_32(a) + +/* SW spinlock */ +struct iecm_lock { +rte_spinlock_t spinlock; +}; + +static inline void +iecm_init_lock (struct iecm_lock *sp) +{ +rte_spinlock_init (&sp->spinlock); +} + +static inline void +iecm_acquire_lock (struct iecm_lock *sp) +{ +rte_spinlock_lock (&sp->spinlock); +} + +static inline void +iecm_release_lock (struct iecm_lock *sp) +{ +rte_spinlock_unlock (&sp->spinlock); +} + +static inline void +iecm_destroy_lock (__attribute__((unused))struct iecm_lock *sp) +{ +} + +struct iecm_hw ; + +static inline void * +iecm_alloc_dma_mem (__attribute__((unused))struct iecm_hw *hw, +struct iecm_dma_mem *mem,u64 size) +{ +const struct rte_memzone *mz =NULL ; +char z_name[RTE_MEMZONE_NAMESIZE ]; + +if (!mem) +return NULL ; + +snprintf (z_name,sizeof (z_name),"iecm_dma_%" PRIu64,rte_rand ()); + mz =rte_memzone_reserve_aligned (z_name, size,SOCKET_ID_ANY , +RTE_MEMZONE_IOVA_CONTIG ,RTE_PGSIZE_4K ); +if (!mz) +return NULL ; + + mem->size = size; + mem->va = mz->addr; + mem->pa = mz->iova; + mem->zone = (const void *)mz; +memset (mem->va,0 , size); + +return mem->va; +} + +static inline void +iecm_free_dma_mem (__attribute__((unused))struct iecm_hw *hw, +struct iecm_dma_mem *mem) +{ +rte_memzone_free ((const struct rte_memzone *)mem->zone); + mem->size =0 ; + mem->va =NULL ; + mem->pa =0 ; +} + +static inline u8 +iecm_hweight8 (u32 num) +{ +u8 bits =0 ; +u32 i; + +for (i =0 ; i <8 ; i++) { + bits += (u8)(num &0x1 ); + num >>=1 ; + } + +return bits; +} + +static inline u8 +iecm_hweight32 (u32 num) +{ +u8 bits =0 ; +u32 i; + +for (i =0 ; i <32 ; i++) { + bits += (u8)(num &0x1 ); + num >>=1 ; + } + +return bits; +} + +#define DIV_ROUND_UP (n, d) (((n) + (d) - 1) / (d)) +#define DELAY (x) rte_delay_us(x) +#define iecm_usec_delay (x) rte_delay_us(x) +#define iecm_msec_delay (x, y) rte_delay_us(1000 * (x)) +#define udelay (x) DELAY(x) +#define msleep (x) DELAY(1000 * (x)) +#define usleep_range (min, max) msleep(DIV_ROUND_UP(min, 1000)) + +#ifndef IECM_DBG_TRACE +#define IECM_DBG_TRACE BIT_ULL(0) +#endif + +#ifndef DIVIDE_AND_ROUND_UP +#define DIVIDE_AND_ROUND_UP (a, b) (((a) + (b) - 1) / (b)) +#endif + +#ifndef IECM_INTEL_VENDOR_ID +#define IECM_INTEL_VENDOR_ID 0x8086 +#endif + +#ifndef IS_UNICAST_ETHER_ADDR +#define IS_UNICAST_ETHER_ADDR (addr) \ + ((bool)((((u8 *)(addr))[0] % ((u8)0x2)) == 0)) +#endif + +#ifndef IS_MULTICAST_ETHER_ADDR +#define IS_MULTICAST_ETHER_ADDR (addr) \ + ((bool)((((u8 *)(addr))[0] % ((u8)0x2)) == 1)) +#endif + +#ifndef IS_BROADCAST_ETHER_ADDR +/* Check whether an address is broadcast. */ +#define IS_BROADCAST_ETHER_ADDR (addr) \ + ((bool)((((u16 *)(addr))[0] == ((u16)0xffff)))) +#endif + +#ifndef IS_ZERO_ETHER_ADDR +#define IS_ZERO_ETHER_ADDR (addr) \ + (((bool)((((u16 *)(addr))[0] == ((u16)0x0)))) && \ + ((bool)((((u16 *)(addr))[1] == ((u16)0x0)))) && \ + ((bool)((((u16 *)(addr))[2] == ((u16)0x0))))) +#endif + +#ifndef LIST_HEAD_TYPE +#define LIST_HEAD_TYPE (list_name, type) LIST_HEAD(list_name, type) +#endif + +#ifndef LIST_ENTRY_TYPE +#define LIST_ENTRY_TYPE (type) LIST_ENTRY(type) +#endif + +#ifndef LIST_FOR_EACH_ENTRY_SAFE +#define LIST_FOR_EACH_ENTRY_SAFE (pos, temp, head, entry_type, list) \ + LIST_FOREACH(pos, head, list) + +#endif + +#ifndef LIST_FOR_EACH_ENTRY +#define LIST_FOR_EACH_ENTRY (pos, head, entry_type, list) \ + LIST_FOREACH(pos, head, list) + +#endif + +#endif /* _IECM_OSDEP_H_ */
Signature · 1 line
2.25.1
RFC v3 3/11 net/idpf: support device initialization
In reply to Junfeng GuoSupport dev init and add dev ops for IDPF PMD:
dev_configure
dev_start
dev_stop
dev_close
--- drivers/net/idpf/idpf_ethdev.c | 655 +++++++++++++++++++++++++++++++++ drivers/net/idpf/idpf_ethdev.h | 200 ++++++++++ drivers/net/idpf/idpf_logs.h | 38 ++ drivers/net/idpf/idpf_vchnl.c | 475 ++++++++++++++++++++++++ drivers/net/idpf/meson.build | 18 + drivers/net/idpf/version.map | 3 + drivers/net/meson.build | 1 + 7 files changed, 1390 insertions(+) create mode 100644 drivers/net/idpf/idpf_ethdev.c create mode 100644 drivers/net/idpf/idpf_ethdev.h create mode 100644 drivers/net/idpf/idpf_logs.h create mode 100644 drivers/net/idpf/idpf_vchnl.c create mode 100644 drivers/net/idpf/meson.build create mode 100644 drivers/net/idpf/version.map
drivers/net/idpf/idpf_ethdev.c new file +655 -0
@@ -0,0 +1,655 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* Copyright(c) 2022 Intel Corporation +*/ + +#include <rte_atomic.h> +#include <rte_eal.h> +#include <rte_ether.h> +#include <ethdev_driver.h> +#include <ethdev_pci.h> +#include <rte_malloc.h> +#include <rte_memzone.h> +#include <rte_dev.h> + +#include "idpf_ethdev.h" + +#define VPORT_NUM "vport_num" + +struct idpf_adapter *adapter; +uint16_t vport_num =1 ; + +static const char *const idpf_valid_args[] = { +VPORT_NUM , +NULL +}; + +static int idpf_dev_configure (struct rte_eth_dev *dev); +static int idpf_dev_start (struct rte_eth_dev *dev); +static int idpf_dev_stop (struct rte_eth_dev *dev); +static int idpf_dev_close (struct rte_eth_dev *dev); + +static const struct eth_dev_ops idpf_eth_dev_ops = { + .dev_configure = idpf_dev_configure, + .dev_start = idpf_dev_start, + .dev_stop = idpf_dev_stop, + .dev_close = idpf_dev_close, +}; + + +static int +idpf_init_vport_req_info (struct rte_eth_dev *dev) +{ +struct virtchnl2_create_vport *vport_info; +uint16_t idx = adapter->next_vport_idx; + +if (!adapter->vport_req_info[idx]) { + adapter->vport_req_info[idx] =rte_zmalloc (NULL , +sizeof (struct virtchnl2_create_vport ),0 ); +if (!adapter->vport_req_info[idx]) { +PMD_INIT_LOG (ERR ,"Failed to allocate vport_req_info" ); +return -1 ; + } + } + + vport_info = + (struct virtchnl2_create_vport *)adapter->vport_req_info[idx]; + + vport_info->vport_type =rte_cpu_to_le_16 (VIRTCHNL2_VPORT_TYPE_DEFAULT ); + +return 0 ; +} + +static uint16_t +idpf_get_next_vport_idx (struct idpf_vport **vports,uint16_t max_vport_nb, +uint16_t cur_vport_idx) +{ +uint16_t vport_idx; +uint16_t i; + +if (cur_vport_idx < max_vport_nb && !vports[cur_vport_idx +1 ]) { + vport_idx = cur_vport_idx +1 ; +return vport_idx; + } + +for (i =0 ; i < max_vport_nb; i++) { +if (vports[i]) +continue ; + } + +if (i == max_vport_nb) + vport_idx =IDPF_INVALID_VPORT_IDX ; +else + vport_idx = i; + +return vport_idx; +} + +#ifndef IDPF_RSS_KEY_LEN +#define IDPF_RSS_KEY_LEN 52 +#endif + +static int +idpf_init_vport (struct rte_eth_dev *dev) +{ +uint16_t idx = adapter->next_vport_idx; +struct virtchnl2_create_vport *vport_info = + (struct virtchnl2_create_vport *)adapter->vport_recv_info[idx]; +struct idpf_vport *vport = + (struct idpf_vport *)dev->data->dev_private; +int i; + + vport->adapter = adapter; + vport->vport_id = vport_info->vport_id; + vport->txq_model = vport_info->txq_model; + vport->rxq_model = vport_info->rxq_model; + vport->num_tx_q = vport_info->num_tx_q; + vport->num_tx_complq = vport_info->num_tx_complq; + vport->num_rx_q = vport_info->num_rx_q; + vport->num_rx_bufq = vport_info->num_rx_bufq; + vport->max_mtu = vport_info->max_mtu; +rte_memcpy (vport->default_mac_addr, + vport_info->default_mac_addr,ETH_ALEN ); + vport->rss_algorithm = vport_info->rss_algorithm; + vport->rss_key_size =RTE_MIN (IDPF_RSS_KEY_LEN , + vport_info->rss_key_size); + vport->rss_lut_size = vport_info->rss_lut_size; + vport->sw_idx = idx; + +for (i =0 ; i < vport_info->chunks.num_chunks; i++) { +if (vport_info->chunks.chunks[i].type == +VIRTCHNL2_QUEUE_TYPE_TX ) { + vport->chunks_info.tx_start_qid = + vport_info->chunks.chunks[i].start_queue_id; + vport->chunks_info.tx_qtail_start = + vport_info->chunks.chunks[i].qtail_reg_start; + vport->chunks_info.tx_qtail_spacing = + vport_info->chunks.chunks[i].qtail_reg_spacing; + }else if (vport_info->chunks.chunks[i].type == +VIRTCHNL2_QUEUE_TYPE_RX ) { + vport->chunks_info.rx_start_qid = + vport_info->chunks.chunks[i].start_queue_id; + vport->chunks_info.rx_qtail_start = + vport_info->chunks.chunks[i].qtail_reg_start; + vport->chunks_info.rx_qtail_spacing = + vport_info->chunks.chunks[i].qtail_reg_spacing; + }else if (vport_info->chunks.chunks[i].type == +VIRTCHNL2_QUEUE_TYPE_TX_COMPLETION ) { + vport->chunks_info.tx_compl_start_qid = + vport_info->chunks.chunks[i].start_queue_id; + vport->chunks_info.tx_compl_qtail_start = + vport_info->chunks.chunks[i].qtail_reg_start; + vport->chunks_info.tx_compl_qtail_spacing = + vport_info->chunks.chunks[i].qtail_reg_spacing; + }else if (vport_info->chunks.chunks[i].type == +VIRTCHNL2_QUEUE_TYPE_RX_BUFFER ) { + vport->chunks_info.rx_buf_start_qid = + vport_info->chunks.chunks[i].start_queue_id; + vport->chunks_info.rx_buf_qtail_start = + vport_info->chunks.chunks[i].qtail_reg_start; + vport->chunks_info.rx_buf_qtail_spacing = + vport_info->chunks.chunks[i].qtail_reg_spacing; + } + } + + adapter->vports[idx] = vport; + adapter->cur_vport_nb++; + adapter->next_vport_idx =idpf_get_next_vport_idx (adapter->vports, + adapter->max_vport_nb, idx); +if (adapter->next_vport_idx ==IDPF_INVALID_VPORT_IDX ) { +PMD_INIT_LOG (ERR ,"Failed to get next vport id" ); +return -1 ; + } + +return 0 ; +} + +static int +idpf_dev_configure (struct rte_eth_dev *dev) +{ +int ret =0 ; + +if (dev->data->dev_conf.rxmode.mq_mode &RTE_ETH_MQ_RX_RSS_FLAG ) + dev->data->dev_conf.rxmode.offloads |= +RTE_ETH_RX_OFFLOAD_RSS_HASH ; + + ret =idpf_init_vport_req_info (dev); +if (ret) { +PMD_INIT_LOG (ERR ,"Failed to init vport req_info." ); +return ret; + } + + ret =idpf_create_vport (dev); +if (ret) { +PMD_INIT_LOG (ERR ,"Failed to create vport." ); +return ret; + } + + ret =idpf_init_vport (dev); +if (ret) { +PMD_INIT_LOG (ERR ,"Failed to init vports." ); +return ret; + } + +rte_ether_addr_copy ((struct rte_ether_addr *)vport->default_mac_addr, + &dev->data->mac_addrs[0 ]); + +return ret; +} + +static int +idpf_dev_start (struct rte_eth_dev *dev) +{ +struct idpf_vport *vport = + (struct idpf_vport *)dev->data->dev_private; + +PMD_INIT_FUNC_TRACE (); + + vport->stopped =0 ; + +if (idpf_ena_dis_vport (vport, true)) { +PMD_DRV_LOG (ERR ,"Failed to enable vport" ); + goto err_vport; + } + +return 0 ; + +err_vport: +return -1 ; +} + +static int +idpf_dev_stop (struct rte_eth_dev *dev) +{ +struct idpf_vport *vport = + (struct idpf_vport *)dev->data->dev_private; + +PMD_INIT_FUNC_TRACE (); + +if (vport->stopped ==1 ) +return 0 ; + +if (idpf_ena_dis_vport (vport, false)) +PMD_DRV_LOG (ERR ,"disable vport failed" ); + + vport->stopped =1 ; + dev->data->dev_started =0 ; + +return 0 ; +} + +static int +idpf_dev_close (struct rte_eth_dev *dev) +{ +struct idpf_vport *vport = + (struct idpf_vport *)dev->data->dev_private; + +if (rte_eal_process_type () !=RTE_PROC_PRIMARY ) +return 0 ; + +idpf_dev_stop (dev); +idpf_destroy_vport (vport); + +return 0 ; +} + +static void +idpf_reset_pf (struct iecm_hw *hw) +{ +uint32_t reg; + + reg =IECM_READ_REG (hw,PFGEN_CTRL ); +IECM_WRITE_REG (hw,PFGEN_CTRL , (reg |PFGEN_CTRL_PFSWR )); +} + +#define IDPF_RESET_WAIT_CNT 100 +static int +idpf_check_pf_reset_done (struct iecm_hw *hw) +{ +uint32_t reg; +int i; + +for (i =0 ; i <IDPF_RESET_WAIT_CNT ; i++) { + reg =IECM_READ_REG (hw,PFGEN_RSTAT ); +if (reg !=0xFFFFFFFF && (reg &PFGEN_RSTAT_PFR_STATE_M )) +return 0 ; +rte_delay_ms (1000 ); + } + +PMD_INIT_LOG (ERR ,"IDPF reset timeout" ); +return -EBUSY ; +} + +#define CTLQ_NUM 2 +static int +idpf_init_mbx (struct iecm_hw *hw) +{ +struct iecm_ctlq_create_info ctlq_info[CTLQ_NUM ] = { + { + .type =IECM_CTLQ_TYPE_MAILBOX_TX , + .id =IDPF_CTLQ_ID , + .len =IDPF_CTLQ_LEN , + .buf_size =IDPF_DFLT_MBX_BUF_SIZE , + .reg = { + .head =PF_FW_ATQH , + .tail =PF_FW_ATQT , + .len =PF_FW_ATQLEN , + .bah =PF_FW_ATQBAH , + .bal =PF_FW_ATQBAL , + .len_mask =PF_FW_ATQLEN_ATQLEN_M , + .len_ena_mask =PF_FW_ATQLEN_ATQENABLE_M , + .head_mask =PF_FW_ATQH_ATQH_M , + } + }, + { + .type =IECM_CTLQ_TYPE_MAILBOX_RX , + .id =IDPF_CTLQ_ID , + .len =IDPF_CTLQ_LEN , + .buf_size =IDPF_DFLT_MBX_BUF_SIZE , + .reg = { + .head =PF_FW_ARQH , + .tail =PF_FW_ARQT , + .len =PF_FW_ARQLEN , + .bah =PF_FW_ARQBAH , + .bal =PF_FW_ARQBAL , + .len_mask =PF_FW_ARQLEN_ARQLEN_M , + .len_ena_mask =PF_FW_ARQLEN_ARQENABLE_M , + .head_mask =PF_FW_ARQH_ARQH_M , + } + } + }; +struct iecm_ctlq_info *ctlq; +int ret =0 ; + + ret =iecm_ctlq_init (hw,CTLQ_NUM , ctlq_info); +if (ret) +return ret; + +LIST_FOR_EACH_ENTRY_SAFE (ctlq,NULL , &hw->cq_list_head, + struct iecm_ctlq_info, cq_list) { +if (ctlq->q_id ==IDPF_CTLQ_ID && ctlq->cq_type ==IECM_CTLQ_TYPE_MAILBOX_TX ) + hw->asq = ctlq; +if (ctlq->q_id ==IDPF_CTLQ_ID && ctlq->cq_type ==IECM_CTLQ_TYPE_MAILBOX_RX ) + hw->arq = ctlq; + } + +if (!hw->asq || !hw->arq) { +iecm_ctlq_deinit (hw); + ret = -ENOENT ; + } + +return ret; +} + +static int +idpf_adapter_init (struct rte_eth_dev *dev) +{ +struct iecm_hw *hw = &adapter->hw; +struct rte_pci_device *pci_dev =IDPF_DEV_TO_PCI (dev); +int ret =0 ; + +if (adapter->initialized) +return 0 ; + + hw->hw_addr = (void *)pci_dev->mem_resource[0 ].addr; + hw->hw_addr_len = pci_dev->mem_resource[0 ].len; + hw->back = adapter; + hw->vendor_id = pci_dev->id.vendor_id; + hw->device_id = pci_dev->id.device_id; + hw->subsystem_vendor_id = pci_dev->id.subsystem_vendor_id; + +idpf_reset_pf (hw); + ret =idpf_check_pf_reset_done (hw); +if (ret) { +PMD_INIT_LOG (ERR ,"IDPF is still resetting" ); + goto err; + } + + ret =idpf_init_mbx (hw); +if (ret) { +PMD_INIT_LOG (ERR ,"Failed to init mailbox" ); + goto err; + } + + adapter->mbx_resp =rte_zmalloc ("idpf_adapter_mbx_resp" ,IDPF_DFLT_MBX_BUF_SIZE ,0 ); +if (!adapter->mbx_resp) { +PMD_INIT_LOG (ERR ,"Failed to allocate idpf_adapter_mbx_resp memory" ); + goto err_mbx; + } + +if (idpf_check_api_version (adapter)) { +PMD_INIT_LOG (ERR ,"Failed to check api version" ); + goto err_api; + } + + adapter->caps =rte_zmalloc ("idpf_caps" , +sizeof (struct virtchnl2_get_capabilities ),0 ); +if (!adapter->caps) { +PMD_INIT_LOG (ERR ,"Failed to allocate idpf_caps memory" ); + goto err_api; + } + +if (idpf_get_caps (adapter)) { +PMD_INIT_LOG (ERR ,"Failed to get capabilities" ); + goto err_caps; + } + + adapter->max_vport_nb = adapter->caps->max_vports; + + adapter->vport_req_info =rte_zmalloc ("vport_req_info" , + adapter->max_vport_nb * +sizeof (*adapter->vport_req_info), +0 ); +if (!adapter->vport_req_info) { +PMD_INIT_LOG (ERR ,"Failed to allocate vport_req_info memory" ); + goto err_caps; + } + + adapter->vport_recv_info =rte_zmalloc ("vport_recv_info" , + adapter->max_vport_nb * +sizeof (*adapter->vport_recv_info), +0 ); +if (!adapter->vport_recv_info) { +PMD_INIT_LOG (ERR ,"Failed to allocate vport_recv_info memory" ); + goto err_vport_recv_info; + } + + adapter->vports =rte_zmalloc ("vports" , + adapter->max_vport_nb * +sizeof (*adapter->vports), +0 ); +if (!adapter->vports) { +PMD_INIT_LOG (ERR ,"Failed to allocate vports memory" ); + goto err_vports; + } + + adapter->max_rxq_per_msg = (IDPF_DFLT_MBX_BUF_SIZE - +sizeof (struct virtchnl2_config_rx_queues )) / +sizeof (struct virtchnl2_rxq_info ); + adapter->max_txq_per_msg = (IDPF_DFLT_MBX_BUF_SIZE - +sizeof (struct virtchnl2_config_tx_queues )) / +sizeof (struct virtchnl2_txq_info ); + + adapter->cur_vport_nb =0 ; + adapter->next_vport_idx =0 ; + adapter->initialized = true; + +return ret; + +err_vports: +rte_free (adapter->vports); + adapter->vports =NULL ; +err_vport_recv_info: +rte_free (adapter->vport_req_info); + adapter->vport_req_info =NULL ; +err_caps: +rte_free (adapter->caps); + adapter->caps =NULL ; +err_api: +rte_free (adapter->mbx_resp); + adapter->mbx_resp =NULL ; +err_mbx: +iecm_ctlq_deinit (hw); +err: +return -1 ; +} + + +static int +idpf_dev_init(struct rte_eth_dev *dev, __rte_unused void *init_params) +{ +struct idpf_vport *vport = + (struct idpf_vport *)dev->data->dev_private; +int ret =0 ; + +PMD_INIT_FUNC_TRACE (); + + dev->dev_ops = &idpf_eth_dev_ops; + + ret =idpf_adapter_init (dev); +if (ret) { +PMD_INIT_LOG (ERR ,"Failed to init adapter." ); +return ret; + } + + dev->data->dev_flags |=RTE_ETH_DEV_AUTOFILL_QUEUE_XSTATS ; + + vport->dev_data = dev->data; + + dev->data->mac_addrs =rte_zmalloc (NULL ,RTE_ETHER_ADDR_LEN ,0 ); +if (dev->data->mac_addrs ==NULL ) { +PMD_INIT_LOG (ERR ,"Cannot allocate mac_addr memory." ); + ret = -ENOMEM ; + goto err; + } + +err: +return ret; +} + +static int +idpf_dev_uninit (struct rte_eth_dev *dev) +{ +if (rte_eal_process_type () !=RTE_PROC_PRIMARY ) +return -EPERM ; + +idpf_dev_close (dev); + +return 0 ; +} + +static const struct rte_pci_id pci_id_idpf_map[] = { + {RTE_PCI_DEVICE (IECM_INTEL_VENDOR_ID ,IECM_DEV_ID_PF ) }, + { .vendor_id =0 ,/* sentinel */ }, +}; + +static int +idpf_handle_vport_num (const char *key,const char *value,void *args) +{ +int *i = (int *)args; +char *end; +int num; + + num =strtoul (value, &end,10 ); + +if (num <=0 ) { +PMD_DRV_LOG (WARNING ,"invalid value:\"%s\" for key:\"%s\", value must be greater than 0" , + value, key); +return -1 ; + } + + *i = num; +return 0 ; +} + +static int +idpf_parse_vport_num (struct rte_devargs *devargs) +{ +struct rte_kvargs *kvlist; +const char *key ="vport_num" ; +int ret =0 ; + +if (devargs ==NULL ) +return 0 ; + + kvlist =rte_kvargs_parse (devargs->args, idpf_valid_args); +if (kvlist ==NULL ) +return 0 ; + + ret =rte_kvargs_process (kvlist, key, &idpf_handle_vport_num, + &vport_num); +if (ret) + goto bail; + +bail: +rte_kvargs_free (kvlist); +return ret; +} + +static int +idpf_pci_probe(struct rte_pci_driver *pci_drv __rte_unused, +struct rte_pci_device *pci_dev) +{ +char name[RTE_ETH_NAME_MAX_LEN ]; +int i, retval; + + retval =idpf_parse_vport_num (pci_dev->device.devargs); +if (retval) +return retval; + +if (!adapter) { + adapter = (struct idpf_adapter *)rte_zmalloc ("idpf_adapter" , +sizeof (struct idpf_adapter ),0 ); +if (!adapter) { +PMD_INIT_LOG (ERR ,"Failed to allocate adapter." ); +return -1 ; + } + } + +for (i =0 ; i < vport_num; i++) { +snprintf (name,sizeof (name),"idpf_vport_%d" , i); + retval =rte_eth_dev_create (&pci_dev->device, name, +sizeof (struct idpf_vport ), +NULL ,NULL , idpf_dev_init, +NULL ); +if (retval) +PMD_DRV_LOG (ERR ,"failed to creat vport %d" , i); + } + +return 0 ; +} + +static void +idpf_adapter_rel (struct idpf_adapter *adapter) +{ +struct iecm_hw *hw = &adapter->hw; +int i; + +iecm_ctlq_deinit (hw); + +if (adapter->caps) { +rte_free (adapter->caps); + adapter->caps =NULL ; + } + +if (adapter->mbx_resp) { +rte_free (adapter->mbx_resp); + adapter->mbx_resp =NULL ; + } + +if (adapter->vport_req_info) { +for (i =0 ; i < adapter->max_vport_nb; i++) { +if (adapter->vport_req_info[i]) { +rte_free (adapter->vport_req_info[i]); + adapter->vport_req_info[i] =NULL ; + } + } +rte_free (adapter->vport_req_info); + adapter->vport_req_info =NULL ; + } + +if (adapter->vport_recv_info) { +for (i =0 ; i < adapter->max_vport_nb; i++) { +if (adapter->vport_recv_info[i]) { +rte_free (adapter->vport_recv_info[i]); + adapter->vport_recv_info[i] =NULL ; + } + } + } + +if (adapter->vports) { +/* Needn't free adapter->vports[i] since it's private data */ +rte_free (adapter->vports); + adapter->vports =NULL ; + } +} + +static int +idpf_pci_remove (struct rte_pci_device *pci_dev) +{ +if (adapter) { +idpf_adapter_rel (adapter); +rte_free (adapter); + adapter =NULL ; + } + +return rte_eth_dev_pci_generic_remove (pci_dev, idpf_dev_uninit); +} + +static struct rte_pci_driver rte_idpf_pmd = { + .id_table = pci_id_idpf_map, + .drv_flags =RTE_PCI_DRV_NEED_MAPPING |RTE_PCI_DRV_INTR_LSC , + .probe = idpf_pci_probe, + .remove = idpf_pci_remove, +}; + +/** +* Driver initialization routine. +* Invoked once at EAL init time. +* Register itself as the [Poll Mode] Driver of PCI devices. +*/ +RTE_PMD_REGISTER_PCI (net_idpf, rte_idpf_pmd); +RTE_PMD_REGISTER_PCI_TABLE (net_idpf, pci_id_idpf_map); +RTE_PMD_REGISTER_KMOD_DEP (net_ice,"* igb_uio | uio_pci_generic | vfio-pci" ); + +RTE_LOG_REGISTER_SUFFIX (idpf_logtype_init, init,NOTICE ); +RTE_LOG_REGISTER_SUFFIX (idpf_logtype_driver, driver,NOTICE );
drivers/net/idpf/idpf_ethdev.h new file +200 -0
200 lines not on this page · raw message
drivers/net/idpf/idpf_logs.h new file +38 -0
@@ -0,0 +1,38 @@ +#ifndef _IDPF_LOGS_H_ +#define _IDPF_LOGS_H_ + +#include <rte_log.h> + +extern int idpf_logtype_init; +extern int idpf_logtype_driver; + +#define PMD_INIT_LOG(level, fmt, args...) \ + rte_log(RTE_LOG_ ## level, idpf_logtype_init, \ + "%s(): " fmt "\n", __func__, ##args) + +#define PMD_INIT_FUNC_TRACE () PMD_DRV_LOG(DEBUG, " >>") + +#define PMD_DRV_LOG_RAW(level, fmt, args...) \ + rte_log(RTE_LOG_ ## level, idpf_logtype_driver, \ + "%s(): " fmt "\n", __func__, ##args) + +#define PMD_DRV_LOG(level, fmt, args...) \ + PMD_DRV_LOG_RAW(level, fmt "\n", ## args) + +#define PMD_DRV_FUNC_TRACE () PMD_DRV_LOG(DEBUG, " >>") + +#ifdef RTE_LIBRTE_IDPF_DEBUG_RX +#define PMD_RX_LOG(level, fmt, args...) \ + RTE_LOG(level, PMD, "%s(): " fmt "\n", __func__, ## args) +#else +#define PMD_RX_LOG(level, fmt, args...) do { } while (0) +#endif + +#ifdef RTE_LIBRTE_IDPF_DEBUG_TX +#define PMD_TX_LOG(level, fmt, args...) \ + RTE_LOG(level, PMD, "%s(): " fmt "\n", __func__, ## args) +#else +#define PMD_TX_LOG(level, fmt, args...) do { } while (0) +#endif + +#endif /* _IDPF_LOGS_H_ */
drivers/net/idpf/idpf_vchnl.c new file +475 -0
475 lines not on this page · raw message
drivers/net/idpf/meson.build new file +18 -0
@@ -0,0 +1,18 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2022 Intel Corporation + +if is_windows + build = false + reason = 'not supported on Windows' + subdir_done() +endif + +subdir('base') +objs = [base_objs] + +sources = files( + 'idpf_ethdev.c', + 'idpf_vchnl.c', +) + +includes += include_directories('base')
drivers/net/idpf/version.map new file +3 -0
@@ -0,0 +1,3 @@ +DPDK_22 { + local: *; +};
drivers/net/meson.build +1 -0
@@ -28,6 +28,7 @@ drivers = [ 'i40e', 'iavf', 'ice', + 'idpf', 'igc', 'ionic', 'ipn3ke',
Signature · 1 line
2.25.1
RFC v3 4/11 net/idpf: support queue ops
In reply to Junfeng GuoAdd queue ops for IDPF PMD:
rx_queue_start
rx_queue_stop
tx_queue_start
tx_queue_stop
rx_queue_setup
rx_queue_release
tx_queue_setup
tx_queue_release
--- drivers/net/idpf/idpf_ethdev.c | 92 +++ drivers/net/idpf/idpf_ethdev.h | 6 + drivers/net/idpf/idpf_rxtx.c | 1252 ++++++++++++++++++++++++++++++++ drivers/net/idpf/idpf_rxtx.h | 167 +++++ drivers/net/idpf/idpf_vchnl.c | 341 +++++++++ drivers/net/idpf/meson.build | 1 + 6 files changed, 1859 insertions(+) create mode 100644 drivers/net/idpf/idpf_rxtx.c create mode 100644 drivers/net/idpf/idpf_rxtx.h
drivers/net/idpf/idpf_ethdev.c +92 -0
@@ -12,6 +12,7 @@#include <rte_dev.h> #include "idpf_ethdev.h" +#include "idpf_rxtx.h" #define VPORT_NUM "vport_num"
@@ -33,6 +34,14 @@ static const struct eth_dev_ops idpf_eth_dev_ops = { .dev_start = idpf_dev_start, .dev_stop = idpf_dev_stop, .dev_close = idpf_dev_close, + .rx_queue_start = idpf_rx_queue_start, + .rx_queue_stop = idpf_rx_queue_stop, + .tx_queue_start = idpf_tx_queue_start, + .tx_queue_stop = idpf_tx_queue_stop, + .rx_queue_setup = idpf_rx_queue_setup, + .rx_queue_release = idpf_dev_rx_queue_release, + .tx_queue_setup = idpf_tx_queue_setup, + .tx_queue_release = idpf_dev_tx_queue_release, };
@@ -196,6 +205,65 @@ idpf_dev_configure(struct rte_eth_dev *dev)return ret; } +static int +idpf_config_queues (struct idpf_vport *vport) +{ +int err; + + err =idpf_config_rxqs (vport); +if (err) +return err; + + err =idpf_config_txqs (vport); + +return err; +} + +static int +idpf_start_queues (struct rte_eth_dev *dev) +{ +struct idpf_vport *vport = + (struct idpf_vport *)dev->data->dev_private; +struct idpf_rx_queue *rxq; +struct idpf_tx_queue *txq; +int i, err =0 ; + +for (i =0 ; i < dev->data->nb_tx_queues; i++) { + txq = dev->data->tx_queues[i]; +if (txq->tx_deferred_start) +continue ; +if (idpf_tx_queue_init (dev, i) !=0 ) { +PMD_DRV_LOG (ERR ,"Fail to init tx queue %u" , i); +return -1 ; + } + } + +for (i =0 ; i < dev->data->nb_rx_queues; i++) { + rxq = dev->data->rx_queues[i]; +if (rxq->rx_deferred_start) +continue ; +if (idpf_rx_queue_init (dev, i) !=0 ) { +PMD_DRV_LOG (ERR ,"Fail to init rx queue %u" , i); +return -1 ; + } + } + + err =idpf_ena_dis_queues (vport, true); +if (err) { +PMD_DRV_LOG (ERR ,"Fail to start queues" ); +return err; + } + +for (i =0 ; i < dev->data->nb_tx_queues; i++) + dev->data->tx_queue_state[i] = +RTE_ETH_QUEUE_STATE_STARTED ; +for (i =0 ; i < dev->data->nb_rx_queues; i++) + dev->data->rx_queue_state[i] = +RTE_ETH_QUEUE_STATE_STARTED ; + +return err; +} +static int idpf_dev_start (struct rte_eth_dev *dev) {
@@ -206,6 +274,26 @@ idpf_dev_start(struct rte_eth_dev *dev) vport->stopped =0 ; +if (dev->data->mtu > vport->max_mtu) { +PMD_DRV_LOG (ERR ,"MTU should be less than %d" , vport->max_mtu); + goto err_mtu; + } + + vport->max_pkt_len = dev->data->mtu +IDPF_ETH_OVERHEAD ; + +if (idpf_config_queues (vport)) { +PMD_DRV_LOG (ERR ,"Failed to configure queues" ); + goto err_mtu; + } + +idpf_set_rx_function (dev); +idpf_set_tx_function (dev); + +if (idpf_start_queues (dev)) { +PMD_DRV_LOG (ERR ,"Failed to start queues" ); + goto err_mtu; + } +if (idpf_ena_dis_vport (vport, true)) {PMD_DRV_LOG (ERR ,"Failed to enable vport" ); goto err_vport;
@@ -214,6 +302,8 @@ idpf_dev_start(struct rte_eth_dev *dev)return 0 ; err_vport: +idpf_stop_queues (dev); +err_mtu:return -1 ; }
@@ -231,6 +321,8 @@ idpf_dev_stop(struct rte_eth_dev *dev)if (idpf_ena_dis_vport (vport, false))PMD_DRV_LOG (ERR ,"disable vport failed" ); +idpf_stop_queues (dev); + vport->stopped =1 ; dev->data->dev_started =0 ;
drivers/net/idpf/idpf_ethdev.h +6 -0
@@ -94,6 +94,7 @@ struct idpf_vport {uint16_t sw_idx;/* SW idx */ struct rte_eth_dev_data *dev_data;/* Pointer to the device data */ +uint16_t max_pkt_len;/* Maximum packet length */ /* RSS info */ uint32_t *rss_lut;
@@ -195,6 +196,11 @@ int idpf_get_caps(struct idpf_adapter *adapter); int idpf_create_vport(__rte_unused struct rte_eth_dev *dev);int idpf_destroy_vport (struct idpf_vport *vport); +int idpf_config_rxqs (struct idpf_vport *vport); +int idpf_config_txqs (struct idpf_vport *vport); +int idpf_switch_queue (struct idpf_vport *vport,uint16_t qid, +bool rx,bool on); +int idpf_ena_dis_queues (struct idpf_vport *vport,bool enable);int idpf_ena_dis_vport (struct idpf_vport *vport,bool enable);#endif /* _IDPF_ETHDEV_H_ */
drivers/net/idpf/idpf_rxtx.c new file +1252 -0
1,252 lines not on this page · raw message
drivers/net/idpf/idpf_rxtx.h new file +167 -0
167 lines not on this page · raw message
drivers/net/idpf/idpf_vchnl.c +341 -0
353 lines not on this page · raw message
drivers/net/idpf/meson.build +1 -0
@@ -12,6 +12,7 @@ objs = [base_objs] sources = files( 'idpf_ethdev.c', + 'idpf_rxtx.c', 'idpf_vchnl.c', )
Signature · 1 line
2.25.1
RFC v3 5/11 net/idpf: support getting device information
In reply to Junfeng GuoAdd ops dev_infos_get.
--- drivers/net/idpf/idpf_ethdev.c | 69 ++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+)
drivers/net/idpf/idpf_ethdev.c +69 -0
@@ -28,6 +28,8 @@ static int idpf_dev_configure(struct rte_eth_dev *dev);static int idpf_dev_start (struct rte_eth_dev *dev);static int idpf_dev_stop (struct rte_eth_dev *dev);static int idpf_dev_close (struct rte_eth_dev *dev); +static int idpf_dev_info_get (struct rte_eth_dev *dev, +struct rte_eth_dev_info *dev_info);static const struct eth_dev_ops idpf_eth_dev_ops = { .dev_configure = idpf_dev_configure,
@@ -42,8 +44,75 @@ static const struct eth_dev_ops idpf_eth_dev_ops = { .rx_queue_release = idpf_dev_rx_queue_release, .tx_queue_setup = idpf_tx_queue_setup, .tx_queue_release = idpf_dev_tx_queue_release, + .dev_infos_get = idpf_dev_info_get, }; +static int +idpf_dev_info_get(__rte_unused struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) +{ + dev_info->max_rx_queues = adapter->caps->max_rx_q; + dev_info->max_tx_queues = adapter->caps->max_tx_q; + dev_info->min_rx_bufsize =IDPF_MIN_BUF_SIZE ; + dev_info->max_rx_pktlen =IDPF_MAX_FRAME_SIZE ; + + dev_info->max_mtu = dev_info->max_rx_pktlen -IDPF_ETH_OVERHEAD ; + dev_info->min_mtu =RTE_ETHER_MIN_MTU ; + + dev_info->max_mac_addrs =IDPF_NUM_MACADDR_MAX ; + dev_info->dev_capa &= ~RTE_ETH_DEV_CAPA_FLOW_RULE_KEEP ; + dev_info->rx_offload_capa = +RTE_ETH_RX_OFFLOAD_VLAN_STRIP | +RTE_ETH_RX_OFFLOAD_QINQ_STRIP | +RTE_ETH_RX_OFFLOAD_IPV4_CKSUM | +RTE_ETH_RX_OFFLOAD_UDP_CKSUM | +RTE_ETH_RX_OFFLOAD_TCP_CKSUM | +RTE_ETH_RX_OFFLOAD_OUTER_IPV4_CKSUM | +RTE_ETH_RX_OFFLOAD_SCATTER | +RTE_ETH_RX_OFFLOAD_VLAN_FILTER | +RTE_ETH_RX_OFFLOAD_RSS_HASH ; + + dev_info->tx_offload_capa = +RTE_ETH_TX_OFFLOAD_VLAN_INSERT | +RTE_ETH_TX_OFFLOAD_QINQ_INSERT | +RTE_ETH_TX_OFFLOAD_IPV4_CKSUM | +RTE_ETH_TX_OFFLOAD_UDP_CKSUM | +RTE_ETH_TX_OFFLOAD_TCP_CKSUM | +RTE_ETH_TX_OFFLOAD_SCTP_CKSUM | +RTE_ETH_TX_OFFLOAD_OUTER_IPV4_CKSUM | +RTE_ETH_TX_OFFLOAD_TCP_TSO | +RTE_ETH_TX_OFFLOAD_VXLAN_TNL_TSO | +RTE_ETH_TX_OFFLOAD_GRE_TNL_TSO | +RTE_ETH_TX_OFFLOAD_IPIP_TNL_TSO | +RTE_ETH_TX_OFFLOAD_GENEVE_TNL_TSO | +RTE_ETH_TX_OFFLOAD_MULTI_SEGS | +RTE_ETH_TX_OFFLOAD_MBUF_FAST_FREE ; + + dev_info->default_rxconf = (struct rte_eth_rxconf ) { + .rx_free_thresh =IDPF_DEFAULT_RX_FREE_THRESH , + .rx_drop_en =0 , + .offloads =0 , + }; + + dev_info->default_txconf = (struct rte_eth_txconf ) { + .tx_free_thresh =IDPF_DEFAULT_RX_FREE_THRESH , + .tx_rs_thresh =IDPF_DEFAULT_TX_RS_THRESH , + .offloads =0 , + }; + + dev_info->rx_desc_lim = (struct rte_eth_desc_lim ) { + .nb_max =IDPF_MAX_RING_DESC , + .nb_min =IDPF_MIN_RING_DESC , + .nb_align =IDPF_ALIGN_RING_DESC , + }; + + dev_info->tx_desc_lim = (struct rte_eth_desc_lim ) { + .nb_max =IDPF_MAX_RING_DESC , + .nb_min =IDPF_MIN_RING_DESC , + .nb_align =IDPF_ALIGN_RING_DESC , + }; + +return 0 ; +}static int idpf_init_vport_req_info (struct rte_eth_dev *dev)
Signature · 1 line
2.25.1
RFC v3 6/11 net/idpf: support packet type getting
In reply to Junfeng GuoAdd ops dev_supported_ptypes_get.
--- drivers/net/idpf/idpf_ethdev.c | 3 ++ drivers/net/idpf/idpf_rxtx.c | 51 ++++++++++++++++++++++++++++++++++ drivers/net/idpf/idpf_rxtx.h | 3 ++ 3 files changed, 57 insertions(+)
drivers/net/idpf/idpf_ethdev.c +3 -0
@@ -32,6 +32,7 @@ static int idpf_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info);static const struct eth_dev_ops idpf_eth_dev_ops = { + .dev_supported_ptypes_get = idpf_dev_supported_ptypes_get, .dev_configure = idpf_dev_configure, .dev_start = idpf_dev_start, .dev_stop = idpf_dev_stop,
@@ -511,6 +512,8 @@ idpf_adapter_init(struct rte_eth_dev *dev)if (adapter->initialized)return 0 ; +idpf_set_default_ptype_table (dev); + hw->hw_addr = (void *)pci_dev->mem_resource[0 ].addr; hw->hw_addr_len = pci_dev->mem_resource[0 ].len; hw->back = adapter;
drivers/net/idpf/idpf_rxtx.c +51 -0
57 lines not on this page · raw message
drivers/net/idpf/idpf_rxtx.h +3 -0
@@ -164,4 +164,7 @@ void idpf_dev_tx_queue_release(struct rte_eth_dev *dev, uint16_t qid);void idpf_stop_queues (struct rte_eth_dev *dev); +void idpf_set_default_ptype_table (struct rte_eth_dev *dev); +const uint32_t *idpf_dev_supported_ptypes_get (struct rte_eth_dev *dev); +#endif /* _IDPF_RXTX_H_ */
Signature · 1 line
2.25.1
RFC v3 7/11 net/idpf: support link update
In reply to Junfeng GuoAdd ops link_update.
--- drivers/net/idpf/idpf_ethdev.c | 22 ++++++++++++++++++++++ drivers/net/idpf/idpf_ethdev.h | 2 ++ 2 files changed, 24 insertions(+)
drivers/net/idpf/idpf_ethdev.c +22 -0
@@ -31,6 +31,27 @@ static int idpf_dev_close(struct rte_eth_dev *dev);static int idpf_dev_info_get (struct rte_eth_dev *dev,struct rte_eth_dev_info *dev_info); +int +idpf_dev_link_update (struct rte_eth_dev *dev, + __rte_unused int wait_to_complete) +{ +struct idpf_vport *vport = + (struct idpf_vport *)dev->data->dev_private; +struct rte_eth_link new_link; + +memset (&new_link,0 ,sizeof (new_link)); + + new_link.link_speed =RTE_ETH_SPEED_NUM_NONE ; + + new_link.link_duplex =RTE_ETH_LINK_FULL_DUPLEX ; + new_link.link_status = vport->link_up ?RTE_ETH_LINK_UP : +RTE_ETH_LINK_DOWN ; + new_link.link_autoneg = !(dev->data->dev_conf.link_speeds & +RTE_ETH_LINK_SPEED_FIXED ); + +return rte_eth_linkstatus_set (dev, &new_link); +} +static const struct eth_dev_ops idpf_eth_dev_ops = { .dev_supported_ptypes_get = idpf_dev_supported_ptypes_get, .dev_configure = idpf_dev_configure,
@@ -46,6 +67,7 @@ static const struct eth_dev_ops idpf_eth_dev_ops = { .tx_queue_setup = idpf_tx_queue_setup, .tx_queue_release = idpf_dev_tx_queue_release, .dev_infos_get = idpf_dev_info_get, + .link_update = idpf_dev_link_update, }; static int
drivers/net/idpf/idpf_ethdev.h +2 -0
@@ -190,6 +190,8 @@ _atomic_set_cmd(struct idpf_adapter *adapter, enum virtchnl_ops ops)return !ret; } +int idpf_dev_link_update (struct rte_eth_dev *dev, + __rte_unused int wait_to_complete);void idpf_handle_virtchnl_msg (struct rte_eth_dev *dev);int idpf_check_api_version (struct idpf_adapter *adapter);int idpf_get_caps (struct idpf_adapter *adapter);
Signature · 1 line
2.25.1
RFC v3 8/11 net/idpf: support basic Rx/Tx
In reply to Junfeng GuoAdd basic RX & TX support in split queue mode and single queue mode. Using split queue mode by default.
--- drivers/net/idpf/idpf_ethdev.c | 93 ++++ drivers/net/idpf/idpf_rxtx.c | 877 +++++++++++++++++++++++++++++++++ drivers/net/idpf/idpf_rxtx.h | 33 ++ 3 files changed, 1003 insertions(+)
drivers/net/idpf/idpf_ethdev.c +93 -0
@@ -14,12 +14,16 @@#include "idpf_ethdev.h" #include "idpf_rxtx.h" +#define IDPF_TX_SINGLE_Q "tx_single" +#define IDPF_RX_SINGLE_Q "rx_single"#define VPORT_NUM "vport_num"struct idpf_adapter *adapter;uint16_t vport_num =1 ;static const char *const idpf_valid_args[] = { +IDPF_TX_SINGLE_Q , +IDPF_RX_SINGLE_Q ,VPORT_NUM ,NULL };
@@ -156,6 +160,30 @@ idpf_init_vport_req_info(struct rte_eth_dev *dev) (struct virtchnl2_create_vport *)adapter->vport_req_info[idx]; vport_info->vport_type =rte_cpu_to_le_16 (VIRTCHNL2_VPORT_TYPE_DEFAULT ); +if (!adapter->txq_model) { + vport_info->txq_model = +rte_cpu_to_le_16 (VIRTCHNL2_QUEUE_MODEL_SPLIT ); + vport_info->num_tx_q = dev->data->nb_tx_queues; + vport_info->num_tx_complq = + dev->data->nb_tx_queues *IDPF_TX_COMPLQ_PER_GRP ; + }else { + vport_info->txq_model = +rte_cpu_to_le_16 (VIRTCHNL2_QUEUE_MODEL_SINGLE ); + vport_info->num_tx_q = dev->data->nb_tx_queues; + vport_info->num_tx_complq =0 ; + } +if (!adapter->rxq_model) { + vport_info->rxq_model = +rte_cpu_to_le_16 (VIRTCHNL2_QUEUE_MODEL_SPLIT ); + vport_info->num_rx_q = dev->data->nb_rx_queues; + vport_info->num_rx_bufq = + dev->data->nb_rx_queues *IDPF_RX_BUFQ_PER_GRP ; + }else { + vport_info->rxq_model = +rte_cpu_to_le_16 (VIRTCHNL2_QUEUE_MODEL_SINGLE ); + vport_info->num_rx_q = dev->data->nb_rx_queues; + vport_info->num_rx_bufq =0 ; + }return 0 ; }
@@ -436,6 +464,56 @@ idpf_dev_close(struct rte_eth_dev *dev)return 0 ; } +static int +parse_bool (const char *key,const char *value,void *args) +{ +int *i = (int *)args; +char *end; +int num; + + num =strtoul (value, &end,10 ); + +if (num !=0 && num !=1 ) { +PMD_DRV_LOG (WARNING ,"invalid value:\"%s\" for key:\"%s\", " +"value must be 0 or 1" , + value, key); +return -1 ; + } + + *i = num; +return 0 ; +} + +static int idpf_parse_devargs (struct rte_eth_dev *dev) +{ +struct rte_devargs *devargs = dev->device->devargs; +struct rte_kvargs *kvlist; +int ret; + +if (!devargs) +return 0 ; + + kvlist =rte_kvargs_parse (devargs->args, idpf_valid_args); +if (!kvlist) { +PMD_INIT_LOG (ERR ,"invalid kvargs key" ); +return -EINVAL ; + } + + ret =rte_kvargs_process (kvlist,IDPF_TX_SINGLE_Q , &parse_bool, + &adapter->txq_model); +if (ret) + goto bail; + + ret =rte_kvargs_process (kvlist,IDPF_RX_SINGLE_Q , &parse_bool, + &adapter->rxq_model); +if (ret) + goto bail; + +bail: +rte_kvargs_free (kvlist); +return ret; +} +static void idpf_reset_pf (struct iecm_hw *hw) {
@@ -543,6 +621,12 @@ idpf_adapter_init(struct rte_eth_dev *dev) hw->device_id = pci_dev->id.device_id; hw->subsystem_vendor_id = pci_dev->id.subsystem_vendor_id; + ret =idpf_parse_devargs (dev); +if (ret) { +PMD_INIT_LOG (ERR ,"Failed to parse devargs" ); + goto err; + } +idpf_reset_pf (hw); ret =idpf_check_pf_reset_done (hw);if (ret) {
@@ -651,6 +735,15 @@ idpf_dev_init(struct rte_eth_dev *dev, __rte_unused void *init_params) dev->dev_ops = &idpf_eth_dev_ops; +/* for secondary processes, we don't initialise any further as primary +* has already done this work. +*/ +if (rte_eal_process_type () !=RTE_PROC_PRIMARY ) { +idpf_set_rx_function (dev); +idpf_set_tx_function (dev); +return ret; + } + ret =idpf_adapter_init (dev);if (ret) {PMD_INIT_LOG (ERR ,"Failed to init adapter." );
drivers/net/idpf/idpf_rxtx.c +877 -0
880 lines not on this page · raw message
drivers/net/idpf/idpf_rxtx.h +33 -0
@@ -35,6 +35,25 @@#define IDPF_TSO_MAX_SEG UINT8_MAX#define IDPF_TX_MAX_MTU_SEG 8 +#define IDPF_TX_CKSUM_OFFLOAD_MASK ( \ + RTE_MBUF_F_TX_IP_CKSUM | \ + RTE_MBUF_F_TX_L4_MASK | \ + RTE_MBUF_F_TX_TCP_SEG) + +#define IDPF_TX_OFFLOAD_MASK ( \ + RTE_MBUF_F_TX_OUTER_IPV6 | \ + RTE_MBUF_F_TX_OUTER_IPV4 | \ + RTE_MBUF_F_TX_IPV6 | \ + RTE_MBUF_F_TX_IPV4 | \ + RTE_MBUF_F_TX_VLAN | \ + RTE_MBUF_F_TX_IP_CKSUM | \ + RTE_MBUF_F_TX_L4_MASK | \ + RTE_MBUF_F_TX_TCP_SEG | \ + RTE_ETH_TX_OFFLOAD_SECURITY) + +#define IDPF_TX_OFFLOAD_NOTSUP_MASK \ + (RTE_MBUF_F_TX_OFFLOAD_MASK ^ IDPF_TX_OFFLOAD_MASK) +struct idpf_rx_queue {struct idpf_adapter *adapter;/* the adapter this queue belongs to */ struct rte_mempool *mp;/* mbuf pool to populate Rx ring */
@@ -162,8 +181,22 @@ int idpf_tx_queue_start(struct rte_eth_dev *dev, uint16_t tx_queue_id);int idpf_tx_queue_stop (struct rte_eth_dev *dev,uint16_t tx_queue_id);void idpf_dev_tx_queue_release (struct rte_eth_dev *dev,uint16_t qid); +uint16_t idpf_singleq_recv_pkts (void *rx_queue,struct rte_mbuf **rx_pkts, +uint16_t nb_pkts); +uint16_t idpf_splitq_recv_pkts (void *rx_queue,struct rte_mbuf **rx_pkts, +uint16_t nb_pkts); +uint16_t idpf_singleq_xmit_pkts (void *tx_queue,struct rte_mbuf **tx_pkts, +uint16_t nb_pkts); +uint16_t idpf_splitq_xmit_pkts (void *tx_queue,struct rte_mbuf **tx_pkts, +uint16_t nb_pkts); +uint16_t idpf_prep_pkts (void *tx_queue,struct rte_mbuf **tx_pkts, +uint16_t nb_pkts); +void idpf_stop_queues (struct rte_eth_dev *dev); +void idpf_set_rx_function (struct rte_eth_dev *dev); +void idpf_set_tx_function (struct rte_eth_dev *dev); +void idpf_set_default_ptype_table (struct rte_eth_dev *dev);const uint32_t *idpf_dev_supported_ptypes_get (struct rte_eth_dev *dev);
Signature · 1 line
2.25.1
RFC v3 9/11 net/idpf: support RSS
In reply to Junfeng GuoAdd RSS support.
--- drivers/net/idpf/idpf_ethdev.c | 106 +++++++++++++++++++++++++++++++++ drivers/net/idpf/idpf_ethdev.h | 18 +++++- drivers/net/idpf/idpf_vchnl.c | 93 +++++++++++++++++++++++++++++ 3 files changed, 216 insertions(+), 1 deletion(-)
drivers/net/idpf/idpf_ethdev.c +106 -0
@@ -85,6 +85,7 @@ idpf_dev_info_get(__rte_unused struct rte_eth_dev *dev, struct rte_eth_dev_info dev_info->max_mtu = dev_info->max_rx_pktlen -IDPF_ETH_OVERHEAD ; dev_info->min_mtu =RTE_ETHER_MIN_MTU ; + dev_info->flow_type_rss_offloads =IDPF_RSS_OFFLOAD_ALL ; dev_info->max_mac_addrs =IDPF_NUM_MACADDR_MAX ; dev_info->dev_capa &= ~RTE_ETH_DEV_CAPA_FLOW_RULE_KEEP ; dev_info->rx_offload_capa =
@@ -292,9 +293,96 @@ idpf_init_vport(struct rte_eth_dev *dev)return 0 ; } +static int +idpf_config_rss (struct idpf_vport *vport) +{ +int ret; + + ret =idpf_set_rss_key (vport); +if (ret) { +PMD_INIT_LOG (ERR ,"Failed to configure RSS key" ); +return ret; + } + + ret =idpf_set_rss_lut (vport); +if (ret) { +PMD_INIT_LOG (ERR ,"Failed to configure RSS lut" ); +return ret; + } + + ret =idpf_set_rss_hash (vport); +if (ret) { +PMD_INIT_LOG (ERR ,"Failed to configure RSS hash" ); +return ret; + } + +return ret; +} + +static int +idpf_init_rss (struct idpf_vport *vport) +{ +struct rte_eth_rss_conf *rss_conf; +uint16_t i, nb_q, lut_size; +int ret =0 ; + + rss_conf = &vport->dev_data->dev_conf.rx_adv_conf.rss_conf; + nb_q = vport->num_rx_q; + + vport->rss_key = (uint8_t *)rte_zmalloc ("rss_key" , + vport->rss_key_size,0 ); +if (!vport->rss_key) { +PMD_INIT_LOG (ERR ,"Failed to allocate RSS key" ); + ret = -ENOMEM ; + goto err_key; + } + + lut_size = vport->rss_lut_size; + vport->rss_lut = (uint32_t *)rte_zmalloc ("rss_lut" , +sizeof (uint32_t ) * lut_size,0 ); +if (!vport->rss_lut) { +PMD_INIT_LOG (ERR ,"Failed to allocate RSS lut" ); + ret = -ENOMEM ; + goto err_lut; + } + +if (!rss_conf->rss_key) { +for (i =0 ; i < vport->rss_key_size; i++) + vport->rss_key[i] = (uint8_t )rte_rand (); + }else { +rte_memcpy (vport->rss_key, rss_conf->rss_key, +RTE_MIN (rss_conf->rss_key_len, + vport->rss_key_size)); + } + +for (i =0 ; i < lut_size; i++) + vport->rss_lut[i] = i % nb_q; + + vport->rss_hf =IECM_DEFAULT_RSS_HASH_EXPANDED ; + + ret =idpf_config_rss (vport); +if (ret) { +PMD_INIT_LOG (ERR ,"Failed to configure RSS" ); + goto err_cfg; + } + +return ret; + +err_cfg: +rte_free (vport->rss_lut); + vport->rss_lut =NULL ; +err_lut: +rte_free (vport->rss_key); + vport->rss_key =NULL ; +err_key: +return ret; +} +static int idpf_dev_configure (struct rte_eth_dev *dev) { +struct idpf_vport *vport = + (struct idpf_vport *)dev->data->dev_private;int ret =0 ;if (dev->data->dev_conf.rxmode.mq_mode &RTE_ETH_MQ_RX_RSS_FLAG )
@@ -322,6 +410,14 @@ idpf_dev_configure(struct rte_eth_dev *dev)rte_ether_addr_copy ((struct rte_ether_addr *)vport->default_mac_addr, &dev->data->mac_addrs[0 ]); +if (adapter->caps->rss_caps) { + ret =idpf_init_rss (vport); +if (ret) { +PMD_INIT_LOG (ERR ,"Failed to init rss" ); +return ret; + } + } +return ret; }
@@ -461,6 +557,16 @@ idpf_dev_close(struct rte_eth_dev *dev)idpf_dev_stop (dev);idpf_destroy_vport (vport); +if (vport->rss_lut) { +rte_free (vport->rss_lut); + vport->rss_lut =NULL ; + } + +if (vport->rss_key) { +rte_free (vport->rss_key); + vport->rss_key =NULL ; + } +return 0 ; }
drivers/net/idpf/idpf_ethdev.h +17 -1
@@ -43,6 +43,20 @@#define IDPF_ETH_OVERHEAD \ (RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN + IDPF_VLAN_TAG_SIZE * 2) +#define IDPF_RSS_OFFLOAD_ALL ( \ + RTE_ETH_RSS_IPV4 | \ + RTE_ETH_RSS_FRAG_IPV4 | \ + RTE_ETH_RSS_NONFRAG_IPV4_TCP | \ + RTE_ETH_RSS_NONFRAG_IPV4_UDP | \ + RTE_ETH_RSS_NONFRAG_IPV4_SCTP | \ + RTE_ETH_RSS_NONFRAG_IPV4_OTHER | \ + RTE_ETH_RSS_IPV6 | \ + RTE_ETH_RSS_FRAG_IPV6 | \ + RTE_ETH_RSS_NONFRAG_IPV6_TCP | \ + RTE_ETH_RSS_NONFRAG_IPV6_UDP | \ + RTE_ETH_RSS_NONFRAG_IPV6_SCTP | \ + RTE_ETH_RSS_NONFRAG_IPV6_OTHER) +#ifndef ETH_ADDR_LEN #define ETH_ADDR_LEN 6#endif
@@ -197,7 +211,9 @@ int idpf_check_api_version(struct idpf_adapter *adapter);int idpf_get_caps (struct idpf_adapter *adapter); int idpf_create_vport(__rte_unused struct rte_eth_dev *dev);int idpf_destroy_vport (struct idpf_vport *vport); - +int idpf_set_rss_key (struct idpf_vport *vport); +int idpf_set_rss_lut (struct idpf_vport *vport); +int idpf_set_rss_hash (struct idpf_vport *vport);int idpf_config_rxqs (struct idpf_vport *vport);int idpf_config_txqs (struct idpf_vport *vport); int idpf_switch_queue(struct idpf_vport *vport, uint16_t qid,
drivers/net/idpf/idpf_vchnl.c +93 -0
99 lines not on this page · raw message
Signature · 1 line
2.25.1
RFC v3 10/11 net/idpf: support MTU configuration
In reply to Junfeng Guosupport ops mtu_set.
--- drivers/net/idpf/idpf_ethdev.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
drivers/net/idpf/idpf_ethdev.c +14 -0
@@ -34,6 +34,7 @@ static int idpf_dev_stop(struct rte_eth_dev *dev);static int idpf_dev_close (struct rte_eth_dev *dev);static int idpf_dev_info_get (struct rte_eth_dev *dev,struct rte_eth_dev_info *dev_info); +static int idpf_dev_mtu_set (struct rte_eth_dev *dev,uint16_t mtu); int idpf_dev_link_update(struct rte_eth_dev *dev,
@@ -72,6 +73,7 @@ static const struct eth_dev_ops idpf_eth_dev_ops = { .tx_queue_release = idpf_dev_tx_queue_release, .dev_infos_get = idpf_dev_info_get, .link_update = idpf_dev_link_update, + .mtu_set = idpf_dev_mtu_set, }; static int
@@ -142,6 +144,18 @@ idpf_dev_info_get(__rte_unused struct rte_eth_dev *dev, struct rte_eth_dev_inforeturn 0 ; } +static int +idpf_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu __rte_unused) +{ +/* mtu setting is forbidden if port is start */ +if (dev->data->dev_started) { +PMD_DRV_LOG (ERR ,"port must be stopped before configuration" ); +return -EBUSY ; + } + +return 0 ; +} +static int idpf_init_vport_req_info (struct rte_eth_dev *dev) {
Signature · 1 line
2.25.1
RFC v3 11/11 net/idpf: add CPF device ID for idpf map table
In reply to Junfeng GuoThis patch adds CPF device ID. CPF data path is supported by idpf PMD now.
--- drivers/net/idpf/base/iecm_devids.h | 1 + drivers/net/idpf/idpf_ethdev.c | 1 + 2 files changed, 2 insertions(+)
drivers/net/idpf/base/iecm_devids.h +1 -0
@@ -10,6 +10,7 @@/* Device IDs */ #define IECM_DEV_ID_PF 0x1452 +#define IECM_DEV_ID_CPF 0x1453
drivers/net/idpf/idpf_ethdev.c +1 -0
@@ -898,6 +898,7 @@ idpf_dev_uninit(struct rte_eth_dev *dev)static const struct rte_pci_id pci_id_idpf_map[] = { {RTE_PCI_DEVICE (IECM_INTEL_VENDOR_ID ,IECM_DEV_ID_PF ) }, + {RTE_PCI_DEVICE (IECM_INTEL_VENDOR_ID ,IECM_DEV_ID_CPF ) }, { .vendor_id =0 ,/* sentinel */ }, };
Signature · 1 line
2.25.1
RFC 2/9 net/idpf/base: add OS specific implementation
In reply to Junfeng GuoAdd some MACRO definations and small functions which are specific for DPDK.
--- drivers/net/idpf/base/iecm_osdep.h | 365 +++++++++++++++++++++++++++++ 1 file changed, 365 insertions(+) create mode 100644 drivers/net/idpf/base/iecm_osdep.h
drivers/net/idpf/base/iecm_osdep.h new file +365 -0
@@ -0,0 +1,365 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* Copyright(c) 2001-2022 Intel Corporation +*/ + +#ifndef _IECM_OSDEP_H_ +#define _IECM_OSDEP_H_ + +#include <string.h> +#include <stdint.h> +#include <stdio.h> +#include <stdarg.h> +#include <inttypes.h> +#include <sys/queue.h> +#include <stdbool.h> + +#include <rte_common.h> +#include <rte_memcpy.h> +#include <rte_malloc.h> +#include <rte_memzone.h> +#include <rte_byteorder.h> +#include <rte_cycles.h> +#include <rte_spinlock.h> +#include <rte_log.h> +#include <rte_random.h> +#include <rte_io.h> + +#include "../idpf_logs.h" + +#define INLINE inline +#define STATIC static + +typedef uint8_t u8 ; +typedef int8_t s8 ; +typedef uint16_t u16 ; +typedef int16_t s16 ; +typedef uint32_t u32 ; +typedef int32_t s32 ; +typedef uint64_t u64 ; +typedef uint64_t s64 ; + +typedef enum iecm_status iecm_status ; +typedef struct iecm_lock iecm_lock ; + +#define __iomem +#define hw_dbg(hw, S, A...) do {} while (0) +#define upper_32_bits (n) ((u32)(((n) >> 16) >> 16)) +#define lower_32_bits (n) ((u32)(n)) +#define low_16_bits (x) ((x) & 0xFFFF) +#define high_16_bits (x) (((x) & 0xFFFF0000) >> 16) + +#ifndef ETH_ADDR_LEN +#define ETH_ADDR_LEN 6 +#endif + +#ifndef __le16 +#define __le16 uint16_t +#endif +#ifndef __le32 +#define __le32 uint32_t +#endif +#ifndef __le64 +#define __le64 uint64_t +#endif +#ifndef __be16 +#define __be16 uint16_t +#endif +#ifndef __be32 +#define __be32 uint32_t +#endif +#ifndef __be64 +#define __be64 uint64_t +#endif + +#ifndef __always_unused +#define __always_unused __attribute__((__unused__)) +#endif +#ifndef __maybe_unused +#define __maybe_unused __attribute__((__unused__)) +#endif +#ifndef __packed +#define __packed __attribute__((packed)) +#endif + +#ifndef BIT_ULL +#define BIT_ULL (a) (1ULL << (a)) +#endif + +#ifndef BIT +#define BIT (a) (1ULL << (a)) +#endif + +#define FALSE 0 +#define TRUE 1 +#define false 0 +#define true 1 + +#define min (a, b) RTE_MIN(a, b) +#define max (a, b) RTE_MAX(a, b) + +#define ARRAY_SIZE (arr) (sizeof(arr) / sizeof(arr[0])) +#define FIELD_SIZEOF (t, f) (sizeof(((t *)0)->(f))) +#define MAKEMASK (m, s) ((m) << (s)) + +#define DEBUGOUT (S ) PMD_DRV_LOG_RAW(DEBUG, S) +#define DEBUGOUT2(S, A...) PMD_DRV_LOG_RAW(DEBUG, S, ##A) +#define DEBUGFUNC (F ) PMD_DRV_LOG_RAW(DEBUG, F) + +#define iecm_debug (h, m, s, ...) \ + do { \ + if (((m) & (h)->debug_mask)) \ + PMD_DRV_LOG_RAW(DEBUG, "iecm %02x.%x " s, \ + (h)->bus.device, (h)->bus.func, \ + ##__VA_ARGS__); \ + } while (0) + +#define iecm_info(hw, fmt, args...) iecm_debug(hw, IECM_DBG_ALL, fmt, ##args) +#define iecm_warn(hw, fmt, args...) iecm_debug(hw, IECM_DBG_ALL, fmt, ##args) +#define iecm_debug_array (hw, type, rowsize, groupsize, buf, len) \ + do { \ + struct iecm_hw *hw_l = hw; \ + u16 len_l = len; \ + u8 *buf_l = buf; \ + int i; \ + for (i = 0; i < len_l; i += 8) \ + iecm_debug(hw_l, type, \ + "0x%04X 0x%016"PRIx64"\n", \ + i, *((u64 *)((buf_l) + i))); \ + } while (0) +#define iecm_snprintf snprintf +#ifndef SNPRINTF +#define SNPRINTF iecm_snprintf +#endif + +#define IECM_PCI_REG (reg) rte_read32(reg) +#define IECM_PCI_REG_ADDR (a, reg) \ + ((volatile uint32_t *)((char *)(a)->hw_addr + (reg))) +#define IECM_PCI_REG64 (reg) rte_read64(reg) +#define IECM_PCI_REG_ADDR64 (a, reg) \ + ((volatile uint64_t *)((char *)(a)->hw_addr + (reg))) + +#define iecm_wmb () rte_io_wmb() +#define iecm_rmb () rte_io_rmb() +#define iecm_mb () rte_io_mb() + +static inline uint32_t iecm_read_addr (volatile void *addr) +{ +return rte_le_to_cpu_32 (IECM_PCI_REG (addr)); +} + +static inline uint64_t iecm_read_addr64 (volatile void *addr) +{ +return rte_le_to_cpu_64 (IECM_PCI_REG64 (addr)); +} + +#define IECM_PCI_REG_WRITE (reg, value) \ + rte_write32((rte_cpu_to_le_32(value)), reg) + +#define IECM_PCI_REG_WRITE64 (reg, value) \ + rte_write64((rte_cpu_to_le_64(value)), reg) + +#define IECM_READ_REG (hw, reg) iecm_read_addr(IECM_PCI_REG_ADDR((hw), (reg))) +#define IECM_WRITE_REG (hw, reg, value) \ + IECM_PCI_REG_WRITE(IECM_PCI_REG_ADDR((hw), (reg)), (value)) + +#define rd32 (a, reg) iecm_read_addr(IECM_PCI_REG_ADDR((a), (reg))) +#define wr32 (a, reg, value) \ + IECM_PCI_REG_WRITE(IECM_PCI_REG_ADDR((a), (reg)), (value)) +#define div64_long (n, d) ((n) / (d)) +#define rd64 (a, reg) iecm_read_addr64(IECM_PCI_REG_ADDR64((a), (reg))) + +#define BITS_PER_BYTE 8 + +/* memory allocation tracking */ +struct iecm_dma_mem { +void *va; +u64 pa; +u32 size; +const void *zone; +} __attribute__((packed)); + +struct iecm_virt_mem { +void *va; +u32 size; +} __attribute__((packed)); + +#define iecm_malloc (h, s) rte_zmalloc(NULL, s, 0) +#define iecm_calloc (h, c, s) rte_zmalloc(NULL, (c) * (s), 0) +#define iecm_free (h, m) rte_free(m) + +#define iecm_memset (a, b, c, d) memset((a), (b), (c)) +#define iecm_memcpy (a, b, c, d) rte_memcpy((a), (b), (c)) +#define iecm_memdup (a, b, c, d) rte_memcpy(iecm_malloc(a, c), b, c) + +#define CPU_TO_BE16 (o) rte_cpu_to_be_16(o) +#define CPU_TO_BE32 (o) rte_cpu_to_be_32(o) +#define CPU_TO_BE64 (o) rte_cpu_to_be_64(o) +#define CPU_TO_LE16 (o) rte_cpu_to_le_16(o) +#define CPU_TO_LE32 (s) rte_cpu_to_le_32(s) +#define CPU_TO_LE64 (h) rte_cpu_to_le_64(h) +#define LE16_TO_CPU (a) rte_le_to_cpu_16(a) +#define LE32_TO_CPU (c) rte_le_to_cpu_32(c) +#define LE64_TO_CPU (k) rte_le_to_cpu_64(k) + +#define NTOHS (a) rte_be_to_cpu_16(a) +#define NTOHL (a) rte_be_to_cpu_32(a) +#define HTONS (a) rte_cpu_to_be_16(a) +#define HTONL (a) rte_cpu_to_be_32(a) + +/* SW spinlock */ +struct iecm_lock { +rte_spinlock_t spinlock; +}; + +static inline void +iecm_init_lock (struct iecm_lock *sp) +{ +rte_spinlock_init (&sp->spinlock); +} + +static inline void +iecm_acquire_lock (struct iecm_lock *sp) +{ +rte_spinlock_lock (&sp->spinlock); +} + +static inline void +iecm_release_lock (struct iecm_lock *sp) +{ +rte_spinlock_unlock (&sp->spinlock); +} + +static inline void +iecm_destroy_lock (__attribute__((unused))struct iecm_lock *sp) +{ +} + +struct iecm_hw ; + +static inline void * +iecm_alloc_dma_mem (__attribute__((unused))struct iecm_hw *hw, +struct iecm_dma_mem *mem,u64 size) +{ +const struct rte_memzone *mz =NULL ; +char z_name[RTE_MEMZONE_NAMESIZE ]; + +if (!mem) +return NULL ; + +snprintf (z_name,sizeof (z_name),"iecm_dma_%" PRIu64,rte_rand ()); + mz =rte_memzone_reserve_aligned (z_name, size,SOCKET_ID_ANY , +RTE_MEMZONE_IOVA_CONTIG ,RTE_PGSIZE_4K ); +if (!mz) +return NULL ; + + mem->size = size; + mem->va = mz->addr; + mem->pa = mz->iova; + mem->zone = (const void *)mz; +memset (mem->va,0 , size); + +return mem->va; +} + +static inline void +iecm_free_dma_mem (__attribute__((unused))struct iecm_hw *hw, +struct iecm_dma_mem *mem) +{ +rte_memzone_free ((const struct rte_memzone *)mem->zone); + mem->size =0 ; + mem->va =NULL ; + mem->pa =0 ; +} + +static inline u8 +iecm_hweight8 (u32 num) +{ +u8 bits =0 ; +u32 i; + +for (i =0 ; i <8 ; i++) { + bits += (u8)(num &0x1 ); + num >>=1 ; + } + +return bits; +} + +static inline u8 +iecm_hweight32 (u32 num) +{ +u8 bits =0 ; +u32 i; + +for (i =0 ; i <32 ; i++) { + bits += (u8)(num &0x1 ); + num >>=1 ; + } + +return bits; +} + +#define DIV_ROUND_UP (n, d) (((n) + (d) - 1) / (d)) +#define DELAY (x) rte_delay_us(x) +#define iecm_usec_delay (x) rte_delay_us(x) +#define iecm_msec_delay (x, y) rte_delay_us(1000 * (x)) +#define udelay (x) DELAY(x) +#define msleep (x) DELAY(1000 * (x)) +#define usleep_range (min, max) msleep(DIV_ROUND_UP(min, 1000)) + +#ifndef IECM_DBG_TRACE +#define IECM_DBG_TRACE BIT_ULL(0) +#endif + +#ifndef DIVIDE_AND_ROUND_UP +#define DIVIDE_AND_ROUND_UP (a, b) (((a) + (b) - 1) / (b)) +#endif + +#ifndef IECM_INTEL_VENDOR_ID +#define IECM_INTEL_VENDOR_ID 0x8086 +#endif + +#ifndef IS_UNICAST_ETHER_ADDR +#define IS_UNICAST_ETHER_ADDR (addr) \ + ((bool)((((u8 *)(addr))[0] % ((u8)0x2)) == 0)) +#endif + +#ifndef IS_MULTICAST_ETHER_ADDR +#define IS_MULTICAST_ETHER_ADDR (addr) \ + ((bool)((((u8 *)(addr))[0] % ((u8)0x2)) == 1)) +#endif + +#ifndef IS_BROADCAST_ETHER_ADDR +/* Check whether an address is broadcast. */ +#define IS_BROADCAST_ETHER_ADDR (addr) \ + ((bool)((((u16 *)(addr))[0] == ((u16)0xffff)))) +#endif + +#ifndef IS_ZERO_ETHER_ADDR +#define IS_ZERO_ETHER_ADDR (addr) \ + (((bool)((((u16 *)(addr))[0] == ((u16)0x0)))) && \ + ((bool)((((u16 *)(addr))[1] == ((u16)0x0)))) && \ + ((bool)((((u16 *)(addr))[2] == ((u16)0x0))))) +#endif + +#ifndef LIST_HEAD_TYPE +#define LIST_HEAD_TYPE (list_name, type) LIST_HEAD(list_name, type) +#endif + +#ifndef LIST_ENTRY_TYPE +#define LIST_ENTRY_TYPE (type) LIST_ENTRY(type) +#endif + +#ifndef LIST_FOR_EACH_ENTRY_SAFE +#define LIST_FOR_EACH_ENTRY_SAFE (pos, temp, head, entry_type, list) \ + LIST_FOREACH(pos, head, list) + +#endif + +#ifndef LIST_FOR_EACH_ENTRY +#define LIST_FOR_EACH_ENTRY (pos, head, entry_type, list) \ + LIST_FOREACH(pos, head, list) + +#endif + +#endif /* _IECM_OSDEP_H_ */
Signature · 1 line
2.25.1
RFC 3/9 net/idpf: support device initialization
In reply to Junfeng GuoSupport dev init and add dev ops for IDPF PMD:
dev_configure
dev_start
dev_stop
dev_close
--- drivers/net/idpf/idpf_ethdev.c | 652 +++++++++++++++++++++++++++++++++ drivers/net/idpf/idpf_ethdev.h | 200 ++++++++++ drivers/net/idpf/idpf_logs.h | 38 ++ drivers/net/idpf/idpf_vchnl.c | 465 +++++++++++++++++++++++ drivers/net/idpf/meson.build | 18 + drivers/net/idpf/version.map | 3 + drivers/net/meson.build | 1 + 7 files changed, 1377 insertions(+) create mode 100644 drivers/net/idpf/idpf_ethdev.c create mode 100644 drivers/net/idpf/idpf_ethdev.h create mode 100644 drivers/net/idpf/idpf_logs.h create mode 100644 drivers/net/idpf/idpf_vchnl.c create mode 100644 drivers/net/idpf/meson.build create mode 100644 drivers/net/idpf/version.map
drivers/net/idpf/idpf_ethdev.c new file +652 -0
@@ -0,0 +1,652 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* Copyright(c) 2022 Intel Corporation +*/ + +#include <rte_atomic.h> +#include <rte_eal.h> +#include <rte_ether.h> +#include <ethdev_driver.h> +#include <ethdev_pci.h> +#include <rte_malloc.h> +#include <rte_memzone.h> +#include <rte_dev.h> + +#include "idpf_ethdev.h" + +#define VPORT_NUM "vport_num" + +struct idpf_adapter *adapter; +uint16_t vport_num =1 ; + +static const char *const idpf_valid_args[] = { +VPORT_NUM , +NULL +}; + +static int idpf_dev_configure (struct rte_eth_dev *dev); +static int idpf_dev_start (struct rte_eth_dev *dev); +static int idpf_dev_stop (struct rte_eth_dev *dev); +static int idpf_dev_close (struct rte_eth_dev *dev); + +static const struct eth_dev_ops idpf_eth_dev_ops = { + .dev_configure = idpf_dev_configure, + .dev_start = idpf_dev_start, + .dev_stop = idpf_dev_stop, + .dev_close = idpf_dev_close, +}; + + +static int +idpf_init_vport_req_info (struct rte_eth_dev *dev) +{ +struct virtchnl2_create_vport *vport_info; +uint16_t idx = adapter->next_vport_idx; + +if (!adapter->vport_req_info[idx]) { + adapter->vport_req_info[idx] =rte_zmalloc (NULL , +sizeof (struct virtchnl2_create_vport ),0 ); +if (!adapter->vport_req_info[idx]) { +PMD_INIT_LOG (ERR ,"Failed to allocate vport_req_info" ); +return -1 ; + } + } + + vport_info = + (struct virtchnl2_create_vport *)adapter->vport_req_info[idx]; + + vport_info->vport_type =rte_cpu_to_le_16 (VIRTCHNL2_VPORT_TYPE_DEFAULT ); + +return 0 ; +} + +static uint16_t +idpf_get_next_vport_idx (struct idpf_vport **vports,uint16_t max_vport_nb, +uint16_t cur_vport_idx) +{ +uint16_t vport_idx; +uint16_t i; + +if (cur_vport_idx < max_vport_nb && !vports[cur_vport_idx +1 ]) { + vport_idx = cur_vport_idx +1 ; +return vport_idx; + } + +for (i =0 ; i < max_vport_nb; i++) { +if (vports[i]) +continue ; + } + +if (i == max_vport_nb) + vport_idx =IDPF_INVALID_VPORT_IDX ; +else + vport_idx = i; + +return vport_idx; +} + +#ifndef IDPF_RSS_KEY_LEN +#define IDPF_RSS_KEY_LEN 52 +#endif + +static int +idpf_init_vport (struct rte_eth_dev *dev) +{ +uint16_t idx = adapter->next_vport_idx; +struct virtchnl2_create_vport *vport_info = + (struct virtchnl2_create_vport *)adapter->vport_recv_info[idx]; +struct idpf_vport *vport = + (struct idpf_vport *)dev->data->dev_private; +int i; + + vport->adapter = adapter; + vport->vport_id = vport_info->vport_id; + vport->txq_model = vport_info->txq_model; + vport->rxq_model = vport_info->rxq_model; + vport->num_tx_q = vport_info->num_tx_q; + vport->num_tx_complq = vport_info->num_tx_complq; + vport->num_rx_q = vport_info->num_rx_q; + vport->num_rx_bufq = vport_info->num_rx_bufq; + vport->max_mtu = vport_info->max_mtu; +rte_memcpy (vport->default_mac_addr, + vport_info->default_mac_addr,ETH_ALEN ); + vport->rss_algorithm = vport_info->rss_algorithm; + vport->rss_key_size =RTE_MIN (IDPF_RSS_KEY_LEN , + vport_info->rss_key_size); + vport->rss_lut_size = vport_info->rss_lut_size; + vport->sw_idx = idx; + +for (i =0 ; i < vport_info->chunks.num_chunks; i++) { +if (vport_info->chunks.chunks[i].type == +VIRTCHNL2_QUEUE_TYPE_TX ) { + vport->chunks_info.tx_start_qid = + vport_info->chunks.chunks[i].start_queue_id; + vport->chunks_info.tx_qtail_start = + vport_info->chunks.chunks[i].qtail_reg_start; + vport->chunks_info.tx_qtail_spacing = + vport_info->chunks.chunks[i].qtail_reg_spacing; + }else if (vport_info->chunks.chunks[i].type == +VIRTCHNL2_QUEUE_TYPE_RX ) { + vport->chunks_info.rx_start_qid = + vport_info->chunks.chunks[i].start_queue_id; + vport->chunks_info.rx_qtail_start = + vport_info->chunks.chunks[i].qtail_reg_start; + vport->chunks_info.rx_qtail_spacing = + vport_info->chunks.chunks[i].qtail_reg_spacing; + }else if (vport_info->chunks.chunks[i].type == +VIRTCHNL2_QUEUE_TYPE_TX_COMPLETION ) { + vport->chunks_info.tx_compl_start_qid = + vport_info->chunks.chunks[i].start_queue_id; + vport->chunks_info.tx_compl_qtail_start = + vport_info->chunks.chunks[i].qtail_reg_start; + vport->chunks_info.tx_compl_qtail_spacing = + vport_info->chunks.chunks[i].qtail_reg_spacing; + }else if (vport_info->chunks.chunks[i].type == +VIRTCHNL2_QUEUE_TYPE_RX_BUFFER ) { + vport->chunks_info.rx_buf_start_qid = + vport_info->chunks.chunks[i].start_queue_id; + vport->chunks_info.rx_buf_qtail_start = + vport_info->chunks.chunks[i].qtail_reg_start; + vport->chunks_info.rx_buf_qtail_spacing = + vport_info->chunks.chunks[i].qtail_reg_spacing; + } + } + + adapter->vports[idx] = vport; + adapter->cur_vport_nb++; + adapter->next_vport_idx =idpf_get_next_vport_idx (adapter->vports, + adapter->max_vport_nb, idx); +if (adapter->next_vport_idx ==IDPF_INVALID_VPORT_IDX ) { +PMD_INIT_LOG (ERR ,"Failed to get next vport id" ); +return -1 ; + } + +return 0 ; +} + +static int +idpf_dev_configure (struct rte_eth_dev *dev) +{ +int ret =0 ; + +if (dev->data->dev_conf.rxmode.mq_mode &RTE_ETH_MQ_RX_RSS_FLAG ) + dev->data->dev_conf.rxmode.offloads |= +RTE_ETH_RX_OFFLOAD_RSS_HASH ; + + ret =idpf_init_vport_req_info (dev); +if (ret) { +PMD_INIT_LOG (ERR ,"Failed to init vport req_info." ); +return ret; + } + + ret =idpf_create_vport (dev); +if (ret) { +PMD_INIT_LOG (ERR ,"Failed to create vport." ); +return ret; + } + + ret =idpf_init_vport (dev); +if (ret) { +PMD_INIT_LOG (ERR ,"Failed to init vports." ); +return ret; + } + +return ret; +} + +static int +idpf_dev_start (struct rte_eth_dev *dev) +{ +struct idpf_vport *vport = + (struct idpf_vport *)dev->data->dev_private; + +PMD_INIT_FUNC_TRACE (); + + vport->stopped =0 ; + +if (idpf_ena_dis_vport (vport, true)) { +PMD_DRV_LOG (ERR ,"Failed to enable vport" ); + goto err_vport; + } + +return 0 ; + +err_vport: +return -1 ; +} + +static int +idpf_dev_stop (struct rte_eth_dev *dev) +{ +struct idpf_vport *vport = + (struct idpf_vport *)dev->data->dev_private; + +PMD_INIT_FUNC_TRACE (); + +if (vport->stopped ==1 ) +return 0 ; + +if (idpf_ena_dis_vport (vport, false)) +PMD_DRV_LOG (ERR ,"disable vport failed" ); + + vport->stopped =1 ; + dev->data->dev_started =0 ; + +return 0 ; +} + +static int +idpf_dev_close (struct rte_eth_dev *dev) +{ +struct idpf_vport *vport = + (struct idpf_vport *)dev->data->dev_private; + +if (rte_eal_process_type () !=RTE_PROC_PRIMARY ) +return 0 ; + +idpf_dev_stop (dev); +idpf_destroy_vport (vport); + +return 0 ; +} + +static void +idpf_reset_pf (struct iecm_hw *hw) +{ +uint32_t reg; + + reg =IECM_READ_REG (hw,PFGEN_CTRL ); +IECM_WRITE_REG (hw,PFGEN_CTRL , (reg |PFGEN_CTRL_PFSWR )); +} + +#define IDPF_RESET_WAIT_CNT 100 +static int +idpf_check_pf_reset_done (struct iecm_hw *hw) +{ +uint32_t reg; +int i; + +for (i =0 ; i <IDPF_RESET_WAIT_CNT ; i++) { + reg =IECM_READ_REG (hw,PFGEN_RSTAT ); +if (reg !=0xFFFFFFFF && (reg &PFGEN_RSTAT_PFR_STATE_M )) +return 0 ; +rte_delay_ms (1000 ); + } + +PMD_INIT_LOG (ERR ,"IDPF reset timeout" ); +return -EBUSY ; +} + +#define CTLQ_NUM 2 +static int +idpf_init_mbx (struct iecm_hw *hw) +{ +struct iecm_ctlq_create_info ctlq_info[CTLQ_NUM ] = { + { + .type =IECM_CTLQ_TYPE_MAILBOX_TX , + .id =IDPF_CTLQ_ID , + .len =IDPF_CTLQ_LEN , + .buf_size =IDPF_DFLT_MBX_BUF_SIZE , + .reg = { + .head =PF_FW_ATQH , + .tail =PF_FW_ATQT , + .len =PF_FW_ATQLEN , + .bah =PF_FW_ATQBAH , + .bal =PF_FW_ATQBAL , + .len_mask =PF_FW_ATQLEN_ATQLEN_M , + .len_ena_mask =PF_FW_ATQLEN_ATQENABLE_M , + .head_mask =PF_FW_ATQH_ATQH_M , + } + }, + { + .type =IECM_CTLQ_TYPE_MAILBOX_RX , + .id =IDPF_CTLQ_ID , + .len =IDPF_CTLQ_LEN , + .buf_size =IDPF_DFLT_MBX_BUF_SIZE , + .reg = { + .head =PF_FW_ARQH , + .tail =PF_FW_ARQT , + .len =PF_FW_ARQLEN , + .bah =PF_FW_ARQBAH , + .bal =PF_FW_ARQBAL , + .len_mask =PF_FW_ARQLEN_ARQLEN_M , + .len_ena_mask =PF_FW_ARQLEN_ARQENABLE_M , + .head_mask =PF_FW_ARQH_ARQH_M , + } + } + }; +struct iecm_ctlq_info *ctlq; +int ret =0 ; + + ret =iecm_ctlq_init (hw,CTLQ_NUM , ctlq_info); +if (ret) +return ret; + +LIST_FOR_EACH_ENTRY_SAFE (ctlq,NULL , &hw->cq_list_head, + struct iecm_ctlq_info, cq_list) { +if (ctlq->q_id ==IDPF_CTLQ_ID && ctlq->cq_type ==IECM_CTLQ_TYPE_MAILBOX_TX ) + hw->asq = ctlq; +if (ctlq->q_id ==IDPF_CTLQ_ID && ctlq->cq_type ==IECM_CTLQ_TYPE_MAILBOX_RX ) + hw->arq = ctlq; + } + +if (!hw->asq || !hw->arq) { +iecm_ctlq_deinit (hw); + ret = -ENOENT ; + } + +return ret; +} + +static int +idpf_adapter_init (struct rte_eth_dev *dev) +{ +struct iecm_hw *hw = &adapter->hw; +struct rte_pci_device *pci_dev =IDPF_DEV_TO_PCI (dev); +int ret =0 ; + +if (adapter->initialized) +return 0 ; + + hw->hw_addr = (void *)pci_dev->mem_resource[0 ].addr; + hw->hw_addr_len = pci_dev->mem_resource[0 ].len; + hw->back = adapter; + hw->vendor_id = pci_dev->id.vendor_id; + hw->device_id = pci_dev->id.device_id; + hw->subsystem_vendor_id = pci_dev->id.subsystem_vendor_id; + +idpf_reset_pf (hw); + ret =idpf_check_pf_reset_done (hw); +if (ret) { +PMD_INIT_LOG (ERR ,"IDPF is still resetting" ); + goto err; + } + + ret =idpf_init_mbx (hw); +if (ret) { +PMD_INIT_LOG (ERR ,"Failed to init mailbox" ); + goto err; + } + + adapter->mbx_resp =rte_zmalloc ("idpf_adapter_mbx_resp" ,IDPF_DFLT_MBX_BUF_SIZE ,0 ); +if (!adapter->mbx_resp) { +PMD_INIT_LOG (ERR ,"Failed to allocate idpf_adapter_mbx_resp memory" ); + goto err_mbx; + } + +if (idpf_check_api_version (adapter)) { +PMD_INIT_LOG (ERR ,"Failed to check api version" ); + goto err_api; + } + + adapter->caps =rte_zmalloc ("idpf_caps" , +sizeof (struct virtchnl2_get_capabilities ),0 ); +if (!adapter->caps) { +PMD_INIT_LOG (ERR ,"Failed to allocate idpf_caps memory" ); + goto err_api; + } + +if (idpf_get_caps (adapter)) { +PMD_INIT_LOG (ERR ,"Failed to get capabilities" ); + goto err_caps; + } + + adapter->max_vport_nb = adapter->caps->max_vports; + + adapter->vport_req_info =rte_zmalloc ("vport_req_info" , + adapter->max_vport_nb * +sizeof (*adapter->vport_req_info), +0 ); +if (!adapter->vport_req_info) { +PMD_INIT_LOG (ERR ,"Failed to allocate vport_req_info memory" ); + goto err_caps; + } + + adapter->vport_recv_info =rte_zmalloc ("vport_recv_info" , + adapter->max_vport_nb * +sizeof (*adapter->vport_recv_info), +0 ); +if (!adapter->vport_recv_info) { +PMD_INIT_LOG (ERR ,"Failed to allocate vport_recv_info memory" ); + goto err_vport_recv_info; + } + + adapter->vports =rte_zmalloc ("vports" , + adapter->max_vport_nb * +sizeof (*adapter->vports), +0 ); +if (!adapter->vports) { +PMD_INIT_LOG (ERR ,"Failed to allocate vports memory" ); + goto err_vports; + } + + adapter->max_rxq_per_msg = (IDPF_DFLT_MBX_BUF_SIZE - +sizeof (struct virtchnl2_config_rx_queues )) / +sizeof (struct virtchnl2_rxq_info ); + adapter->max_txq_per_msg = (IDPF_DFLT_MBX_BUF_SIZE - +sizeof (struct virtchnl2_config_tx_queues )) / +sizeof (struct virtchnl2_txq_info ); + + adapter->cur_vport_nb =0 ; + adapter->next_vport_idx =0 ; + adapter->initialized = true; + +return ret; + +err_vports: +rte_free (adapter->vports); + adapter->vports =NULL ; +err_vport_recv_info: +rte_free (adapter->vport_req_info); + adapter->vport_req_info =NULL ; +err_caps: +rte_free (adapter->caps); + adapter->caps =NULL ; +err_api: +rte_free (adapter->mbx_resp); + adapter->mbx_resp =NULL ; +err_mbx: +iecm_ctlq_deinit (hw); +err: +return -1 ; +} + + +static int +idpf_dev_init(struct rte_eth_dev *dev, __rte_unused void *init_params) +{ +struct idpf_vport *vport = + (struct idpf_vport *)dev->data->dev_private; +int ret =0 ; + +PMD_INIT_FUNC_TRACE (); + + dev->dev_ops = &idpf_eth_dev_ops; + + ret =idpf_adapter_init (dev); +if (ret) { +PMD_INIT_LOG (ERR ,"Failed to init adapter." ); +return ret; + } + + dev->data->dev_flags |=RTE_ETH_DEV_AUTOFILL_QUEUE_XSTATS ; + + vport->dev_data = dev->data; + + dev->data->mac_addrs =rte_zmalloc (NULL ,RTE_ETHER_ADDR_LEN ,0 ); +if (dev->data->mac_addrs ==NULL ) { +PMD_INIT_LOG (ERR ,"Cannot allocate mac_addr memory." ); + ret = -ENOMEM ; + goto err; + } + +err: +return ret; +} + +static int +idpf_dev_uninit (struct rte_eth_dev *dev) +{ +if (rte_eal_process_type () !=RTE_PROC_PRIMARY ) +return -EPERM ; + +idpf_dev_close (dev); + +return 0 ; +} + +static const struct rte_pci_id pci_id_idpf_map[] = { + {RTE_PCI_DEVICE (IECM_INTEL_VENDOR_ID ,IECM_DEV_ID_PF ) }, + { .vendor_id =0 ,/* sentinel */ }, +}; + +static int +idpf_handle_vport_num (const char *key,const char *value,void *args) +{ +int *i = (int *)args; +char *end; +int num; + + num =strtoul (value, &end,10 ); + +if (num <=0 ) { +PMD_DRV_LOG (WARNING ,"invalid value:\"%s\" for key:\"%s\", value must be greater than 0" , + value, key); +return -1 ; + } + + *i = num; +return 0 ; +} + +static int +idpf_parse_vport_num (struct rte_devargs *devargs) +{ +struct rte_kvargs *kvlist; +const char *key ="vport_num" ; +int ret =0 ; + +if (devargs ==NULL ) +return 0 ; + + kvlist =rte_kvargs_parse (devargs->args, idpf_valid_args); +if (kvlist ==NULL ) +return 0 ; + + ret =rte_kvargs_process (kvlist, key, &idpf_handle_vport_num, + &vport_num); +if (ret) + goto bail; + +bail: +rte_kvargs_free (kvlist); +return ret; +} + +static int +idpf_pci_probe(struct rte_pci_driver *pci_drv __rte_unused, +struct rte_pci_device *pci_dev) +{ +char name[RTE_ETH_NAME_MAX_LEN ]; +int i, retval; + + retval =idpf_parse_vport_num (pci_dev->device.devargs); +if (retval) +return retval; + +if (!adapter) { + adapter = (struct idpf_adapter *)rte_zmalloc ("idpf_adapter" , +sizeof (struct idpf_adapter ),0 ); +if (!adapter) { +PMD_INIT_LOG (ERR ,"Failed to allocate adapter." ); +return -1 ; + } + } + +for (i =0 ; i < vport_num; i++) { +snprintf (name,sizeof (name),"idpf_vport_%d" , i); + retval =rte_eth_dev_create (&pci_dev->device, name, +sizeof (struct idpf_vport ), +NULL ,NULL , idpf_dev_init, +NULL ); +if (retval) +PMD_DRV_LOG (ERR ,"failed to creat vport %d" , i); + } + +return 0 ; +} + +static void +idpf_adapter_rel (struct idpf_adapter *adapter) +{ +struct iecm_hw *hw = &adapter->hw; +int i; + +iecm_ctlq_deinit (hw); + +if (adapter->caps) { +rte_free (adapter->caps); + adapter->caps =NULL ; + } + +if (adapter->mbx_resp) { +rte_free (adapter->mbx_resp); + adapter->mbx_resp =NULL ; + } + +if (adapter->vport_req_info) { +for (i =0 ; i < adapter->max_vport_nb; i++) { +if (adapter->vport_req_info[i]) { +rte_free (adapter->vport_req_info[i]); + adapter->vport_req_info[i] =NULL ; + } + } +rte_free (adapter->vport_req_info); + adapter->vport_req_info =NULL ; + } + +if (adapter->vport_recv_info) { +for (i =0 ; i < adapter->max_vport_nb; i++) { +if (adapter->vport_recv_info[i]) { +rte_free (adapter->vport_recv_info[i]); + adapter->vport_recv_info[i] =NULL ; + } + } + } + +if (adapter->vports) { +/* Needn't free adapter->vports[i] since it's private data */ +rte_free (adapter->vports); + adapter->vports =NULL ; + } +} + +static int +idpf_pci_remove (struct rte_pci_device *pci_dev) +{ +if (adapter) { +idpf_adapter_rel (adapter); +rte_free (adapter); + adapter =NULL ; + } + +return rte_eth_dev_pci_generic_remove (pci_dev, idpf_dev_uninit); +} + +static struct rte_pci_driver rte_idpf_pmd = { + .id_table = pci_id_idpf_map, + .drv_flags =RTE_PCI_DRV_NEED_MAPPING |RTE_PCI_DRV_INTR_LSC , + .probe = idpf_pci_probe, + .remove = idpf_pci_remove, +}; + +/** +* Driver initialization routine. +* Invoked once at EAL init time. +* Register itself as the [Poll Mode] Driver of PCI devices. +*/ +RTE_PMD_REGISTER_PCI (net_idpf, rte_idpf_pmd); +RTE_PMD_REGISTER_PCI_TABLE (net_idpf, pci_id_idpf_map); +RTE_PMD_REGISTER_KMOD_DEP (net_ice,"* igb_uio | uio_pci_generic | vfio-pci" ); + +RTE_LOG_REGISTER_SUFFIX (idpf_logtype_init, init,NOTICE ); +RTE_LOG_REGISTER_SUFFIX (idpf_logtype_driver, driver,NOTICE );
drivers/net/idpf/idpf_ethdev.h new file +200 -0
200 lines not on this page · raw message
drivers/net/idpf/idpf_logs.h new file +38 -0
@@ -0,0 +1,38 @@ +#ifndef _IDPF_LOGS_H_ +#define _IDPF_LOGS_H_ + +#include <rte_log.h> + +extern int idpf_logtype_init; +extern int idpf_logtype_driver; + +#define PMD_INIT_LOG(level, fmt, args...) \ + rte_log(RTE_LOG_ ## level, idpf_logtype_init, \ + "%s(): " fmt "\n", __func__, ##args) + +#define PMD_INIT_FUNC_TRACE () PMD_DRV_LOG(DEBUG, " >>") + +#define PMD_DRV_LOG_RAW(level, fmt, args...) \ + rte_log(RTE_LOG_ ## level, idpf_logtype_driver, \ + "%s(): " fmt "\n", __func__, ##args) + +#define PMD_DRV_LOG(level, fmt, args...) \ + PMD_DRV_LOG_RAW(level, fmt "\n", ## args) + +#define PMD_DRV_FUNC_TRACE () PMD_DRV_LOG(DEBUG, " >>") + +#ifdef RTE_LIBRTE_IDPF_DEBUG_RX +#define PMD_RX_LOG(level, fmt, args...) \ + RTE_LOG(level, PMD, "%s(): " fmt "\n", __func__, ## args) +#else +#define PMD_RX_LOG(level, fmt, args...) do { } while (0) +#endif + +#ifdef RTE_LIBRTE_IDPF_DEBUG_TX +#define PMD_TX_LOG(level, fmt, args...) \ + RTE_LOG(level, PMD, "%s(): " fmt "\n", __func__, ## args) +#else +#define PMD_TX_LOG(level, fmt, args...) do { } while (0) +#endif + +#endif /* _IDPF_LOGS_H_ */
drivers/net/idpf/idpf_vchnl.c new file +465 -0
465 lines not on this page · raw message
drivers/net/idpf/meson.build new file +18 -0
@@ -0,0 +1,18 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2022 Intel Corporation + +if is_windows + build = false + reason = 'not supported on Windows' + subdir_done() +endif + +subdir('base') +objs = [base_objs] + +sources = files( + 'idpf_ethdev.c', + 'idpf_vchnl.c', +) + +includes += include_directories('base')
drivers/net/idpf/version.map new file +3 -0
@@ -0,0 +1,3 @@ +DPDK_22 { + local: *; +};
drivers/net/meson.build +1 -0
@@ -28,6 +28,7 @@ drivers = [ 'i40e', 'iavf', 'ice', + 'idpf', 'igc', 'ionic', 'ipn3ke',
Signature · 1 line
2.25.1
RFC 4/9 net/idpf: support queue ops
In reply to Junfeng GuoAdd queue ops for IDPF PMD:
rx_queue_start
rx_queue_stop
tx_queue_start
tx_queue_stop
rx_queue_setup
rx_queue_release
tx_queue_setup
tx_queue_release
--- drivers/net/idpf/idpf_ethdev.c | 85 +++ drivers/net/idpf/idpf_ethdev.h | 5 + drivers/net/idpf/idpf_rxtx.c | 1252 ++++++++++++++++++++++++++++++++ drivers/net/idpf/idpf_rxtx.h | 167 +++++ drivers/net/idpf/idpf_vchnl.c | 342 +++++++++ drivers/net/idpf/meson.build | 1 + 6 files changed, 1852 insertions(+) create mode 100644 drivers/net/idpf/idpf_rxtx.c create mode 100644 drivers/net/idpf/idpf_rxtx.h
drivers/net/idpf/idpf_ethdev.c +85 -0
@@ -12,6 +12,7 @@#include <rte_dev.h> #include "idpf_ethdev.h" +#include "idpf_rxtx.h" #define VPORT_NUM "vport_num"
@@ -33,6 +34,14 @@ static const struct eth_dev_ops idpf_eth_dev_ops = { .dev_start = idpf_dev_start, .dev_stop = idpf_dev_stop, .dev_close = idpf_dev_close, + .rx_queue_start = idpf_rx_queue_start, + .rx_queue_stop = idpf_rx_queue_stop, + .tx_queue_start = idpf_tx_queue_start, + .tx_queue_stop = idpf_tx_queue_stop, + .rx_queue_setup = idpf_rx_queue_setup, + .rx_queue_release = idpf_dev_rx_queue_release, + .tx_queue_setup = idpf_tx_queue_setup, + .tx_queue_release = idpf_dev_tx_queue_release, };
@@ -193,6 +202,65 @@ idpf_dev_configure(struct rte_eth_dev *dev)return ret; } +static int +idpf_config_queues (struct idpf_vport *vport) +{ +int err; + + err =idpf_config_rxqs (vport); +if (err) +return err; + + err =idpf_config_txqs (vport); + +return err; +} + +static int +idpf_start_queues (struct rte_eth_dev *dev) +{ +struct idpf_vport *vport = + (struct idpf_vport *)dev->data->dev_private; +struct idpf_rx_queue *rxq; +struct idpf_tx_queue *txq; +int i, err =0 ; + +for (i =0 ; i < dev->data->nb_tx_queues; i++) { + txq = dev->data->tx_queues[i]; +if (txq->tx_deferred_start) +continue ; +if (idpf_tx_queue_init (dev, i) !=0 ) { +PMD_DRV_LOG (ERR ,"Fail to init tx queue %u" , i); +return -1 ; + } + } + +for (i =0 ; i < dev->data->nb_rx_queues; i++) { + rxq = dev->data->rx_queues[i]; +if (rxq->rx_deferred_start) +continue ; +if (idpf_rx_queue_init (dev, i) !=0 ) { +PMD_DRV_LOG (ERR ,"Fail to init rx queue %u" , i); +return -1 ; + } + } + + err =idpf_ena_dis_queues (vport, true); +if (err) { +PMD_DRV_LOG (ERR ,"Fail to start queues" ); +return err; + } + +for (i =0 ; i < dev->data->nb_tx_queues; i++) + dev->data->tx_queue_state[i] = +RTE_ETH_QUEUE_STATE_STARTED ; +for (i =0 ; i < dev->data->nb_rx_queues; i++) + dev->data->rx_queue_state[i] = +RTE_ETH_QUEUE_STATE_STARTED ; + +return err; +} +static int idpf_dev_start (struct rte_eth_dev *dev) {
@@ -203,6 +271,19 @@ idpf_dev_start(struct rte_eth_dev *dev) vport->stopped =0 ; +if (idpf_config_queues (vport)) { +PMD_DRV_LOG (ERR ,"Failed to configure queues" ); + goto err_queue; + } + +idpf_set_rx_function (dev); +idpf_set_tx_function (dev); + +if (idpf_start_queues (dev)) { +PMD_DRV_LOG (ERR ,"Failed to start queues" ); + goto err_queue; + } +if (idpf_ena_dis_vport (vport, true)) {PMD_DRV_LOG (ERR ,"Failed to enable vport" ); goto err_vport;
@@ -211,6 +292,8 @@ idpf_dev_start(struct rte_eth_dev *dev)return 0 ; err_vport: +idpf_stop_queues (dev); +err_queue:return -1 ; }
@@ -228,6 +311,8 @@ idpf_dev_stop(struct rte_eth_dev *dev)if (idpf_ena_dis_vport (vport, false))PMD_DRV_LOG (ERR ,"disable vport failed" ); +idpf_stop_queues (dev); + vport->stopped =1 ; dev->data->dev_started =0 ;
drivers/net/idpf/idpf_ethdev.h +5 -0
@@ -195,6 +195,11 @@ int idpf_get_caps(struct idpf_adapter *adapter); int idpf_create_vport(__rte_unused struct rte_eth_dev *dev);int idpf_destroy_vport (struct idpf_vport *vport); +int idpf_config_rxqs (struct idpf_vport *vport); +int idpf_config_txqs (struct idpf_vport *vport); +int idpf_switch_queue (struct idpf_vport *vport,uint16_t qid, +bool rx,bool on); +int idpf_ena_dis_queues (struct idpf_vport *vport,bool enable);int idpf_ena_dis_vport (struct idpf_vport *vport,bool enable);#endif /* _IDPF_ETHDEV_H_ */
drivers/net/idpf/idpf_rxtx.c new file +1252 -0
1,252 lines not on this page · raw message
drivers/net/idpf/idpf_rxtx.h new file +167 -0
167 lines not on this page · raw message
drivers/net/idpf/idpf_vchnl.c +342 -0
354 lines not on this page · raw message
drivers/net/idpf/meson.build +1 -0
@@ -12,6 +12,7 @@ objs = [base_objs] sources = files( 'idpf_ethdev.c', + 'idpf_rxtx.c', 'idpf_vchnl.c', )
Signature · 1 line
2.25.1
RFC 5/9 net/idpf: support getting device information
In reply to Junfeng GuoAdd ops dev_infos_get.
--- drivers/net/idpf/idpf_ethdev.c | 69 ++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+)
drivers/net/idpf/idpf_ethdev.c +69 -0
@@ -28,6 +28,8 @@ static int idpf_dev_configure(struct rte_eth_dev *dev);static int idpf_dev_start (struct rte_eth_dev *dev);static int idpf_dev_stop (struct rte_eth_dev *dev);static int idpf_dev_close (struct rte_eth_dev *dev); +static int idpf_dev_info_get (struct rte_eth_dev *dev, +struct rte_eth_dev_info *dev_info);static const struct eth_dev_ops idpf_eth_dev_ops = { .dev_configure = idpf_dev_configure,
@@ -42,8 +44,75 @@ static const struct eth_dev_ops idpf_eth_dev_ops = { .rx_queue_release = idpf_dev_rx_queue_release, .tx_queue_setup = idpf_tx_queue_setup, .tx_queue_release = idpf_dev_tx_queue_release, + .dev_infos_get = idpf_dev_info_get, }; +static int +idpf_dev_info_get(__rte_unused struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) +{ + dev_info->max_rx_queues = adapter->caps->max_rx_q; + dev_info->max_tx_queues = adapter->caps->max_tx_q; + dev_info->min_rx_bufsize =IDPF_MIN_BUF_SIZE ; + dev_info->max_rx_pktlen =IDPF_MAX_FRAME_SIZE ; + + dev_info->max_mtu = dev_info->max_rx_pktlen -IDPF_ETH_OVERHEAD ; + dev_info->min_mtu =RTE_ETHER_MIN_MTU ; + + dev_info->max_mac_addrs =IDPF_NUM_MACADDR_MAX ; + dev_info->dev_capa &= ~RTE_ETH_DEV_CAPA_FLOW_RULE_KEEP ; + dev_info->rx_offload_capa = +RTE_ETH_RX_OFFLOAD_VLAN_STRIP | +RTE_ETH_RX_OFFLOAD_QINQ_STRIP | +RTE_ETH_RX_OFFLOAD_IPV4_CKSUM | +RTE_ETH_RX_OFFLOAD_UDP_CKSUM | +RTE_ETH_RX_OFFLOAD_TCP_CKSUM | +RTE_ETH_RX_OFFLOAD_OUTER_IPV4_CKSUM | +RTE_ETH_RX_OFFLOAD_SCATTER | +RTE_ETH_RX_OFFLOAD_VLAN_FILTER | +RTE_ETH_RX_OFFLOAD_RSS_HASH ; + + dev_info->tx_offload_capa = +RTE_ETH_TX_OFFLOAD_VLAN_INSERT | +RTE_ETH_TX_OFFLOAD_QINQ_INSERT | +RTE_ETH_TX_OFFLOAD_IPV4_CKSUM | +RTE_ETH_TX_OFFLOAD_UDP_CKSUM | +RTE_ETH_TX_OFFLOAD_TCP_CKSUM | +RTE_ETH_TX_OFFLOAD_SCTP_CKSUM | +RTE_ETH_TX_OFFLOAD_OUTER_IPV4_CKSUM | +RTE_ETH_TX_OFFLOAD_TCP_TSO | +RTE_ETH_TX_OFFLOAD_VXLAN_TNL_TSO | +RTE_ETH_TX_OFFLOAD_GRE_TNL_TSO | +RTE_ETH_TX_OFFLOAD_IPIP_TNL_TSO | +RTE_ETH_TX_OFFLOAD_GENEVE_TNL_TSO | +RTE_ETH_TX_OFFLOAD_MULTI_SEGS | +RTE_ETH_TX_OFFLOAD_MBUF_FAST_FREE ; + + dev_info->default_rxconf = (struct rte_eth_rxconf ) { + .rx_free_thresh =IDPF_DEFAULT_RX_FREE_THRESH , + .rx_drop_en =0 , + .offloads =0 , + }; + + dev_info->default_txconf = (struct rte_eth_txconf ) { + .tx_free_thresh =IDPF_DEFAULT_RX_FREE_THRESH , + .tx_rs_thresh =IDPF_DEFAULT_TX_RS_THRESH , + .offloads =0 , + }; + + dev_info->rx_desc_lim = (struct rte_eth_desc_lim ) { + .nb_max =IDPF_MAX_RING_DESC , + .nb_min =IDPF_MIN_RING_DESC , + .nb_align =IDPF_ALIGN_RING_DESC , + }; + + dev_info->tx_desc_lim = (struct rte_eth_desc_lim ) { + .nb_max =IDPF_MAX_RING_DESC , + .nb_min =IDPF_MIN_RING_DESC , + .nb_align =IDPF_ALIGN_RING_DESC , + }; + +return 0 ; +}static int idpf_init_vport_req_info (struct rte_eth_dev *dev)
Signature · 1 line
2.25.1
RFC 6/9 net/idpf: support packet type getting
In reply to Junfeng GuoAdd ops dev_supported_ptypes_get.
--- drivers/net/idpf/idpf_ethdev.c | 3 ++ drivers/net/idpf/idpf_rxtx.c | 51 ++++++++++++++++++++++++++++++++++ drivers/net/idpf/idpf_rxtx.h | 3 ++ 3 files changed, 57 insertions(+)
drivers/net/idpf/idpf_ethdev.c +3 -0
@@ -32,6 +32,7 @@ static int idpf_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info);static const struct eth_dev_ops idpf_eth_dev_ops = { + .dev_supported_ptypes_get = idpf_dev_supported_ptypes_get, .dev_configure = idpf_dev_configure, .dev_start = idpf_dev_start, .dev_stop = idpf_dev_stop,
@@ -501,6 +502,8 @@ idpf_adapter_init(struct rte_eth_dev *dev)if (adapter->initialized)return 0 ; +idpf_set_default_ptype_table (dev); + hw->hw_addr = (void *)pci_dev->mem_resource[0 ].addr; hw->hw_addr_len = pci_dev->mem_resource[0 ].len; hw->back = adapter;
drivers/net/idpf/idpf_rxtx.c +51 -0
57 lines not on this page · raw message
drivers/net/idpf/idpf_rxtx.h +3 -0
@@ -164,4 +164,7 @@ void idpf_dev_tx_queue_release(struct rte_eth_dev *dev, uint16_t qid);void idpf_stop_queues (struct rte_eth_dev *dev); +void idpf_set_default_ptype_table (struct rte_eth_dev *dev); +const uint32_t *idpf_dev_supported_ptypes_get (struct rte_eth_dev *dev); +#endif /* _IDPF_RXTX_H_ */
Signature · 1 line
2.25.1
RFC 7/9 net/idpf: support link update
In reply to Junfeng GuoAdd ops link_update.
--- drivers/net/idpf/idpf_ethdev.c | 22 ++++++++++++++++++++++ drivers/net/idpf/idpf_ethdev.h | 2 ++ 2 files changed, 24 insertions(+)
drivers/net/idpf/idpf_ethdev.c +22 -0
@@ -31,6 +31,27 @@ static int idpf_dev_close(struct rte_eth_dev *dev);static int idpf_dev_info_get (struct rte_eth_dev *dev,struct rte_eth_dev_info *dev_info); +int +idpf_dev_link_update (struct rte_eth_dev *dev, + __rte_unused int wait_to_complete) +{ +struct idpf_vport *vport = + (struct idpf_vport *)dev->data->dev_private; +struct rte_eth_link new_link; + +memset (&new_link,0 ,sizeof (new_link)); + + new_link.link_speed =RTE_ETH_SPEED_NUM_NONE ; + + new_link.link_duplex =RTE_ETH_LINK_FULL_DUPLEX ; + new_link.link_status = vport->link_up ?RTE_ETH_LINK_UP : +RTE_ETH_LINK_DOWN ; + new_link.link_autoneg = !(dev->data->dev_conf.link_speeds & +RTE_ETH_LINK_SPEED_FIXED ); + +return rte_eth_linkstatus_set (dev, &new_link); +} +static const struct eth_dev_ops idpf_eth_dev_ops = { .dev_supported_ptypes_get = idpf_dev_supported_ptypes_get, .dev_configure = idpf_dev_configure,
@@ -46,6 +67,7 @@ static const struct eth_dev_ops idpf_eth_dev_ops = { .tx_queue_setup = idpf_tx_queue_setup, .tx_queue_release = idpf_dev_tx_queue_release, .dev_infos_get = idpf_dev_info_get, + .link_update = idpf_dev_link_update, }; static int
drivers/net/idpf/idpf_ethdev.h +2 -0
@@ -189,6 +189,8 @@ _atomic_set_cmd(struct idpf_adapter *adapter, enum virtchnl_ops ops)return !ret; } +int idpf_dev_link_update (struct rte_eth_dev *dev, + __rte_unused int wait_to_complete);void idpf_handle_virtchnl_msg (struct rte_eth_dev *dev);int idpf_check_api_version (struct idpf_adapter *adapter);int idpf_get_caps (struct idpf_adapter *adapter);
Signature · 1 line
2.25.1
RFC 8/9 net/idpf: support basic Rx/Tx
In reply to Junfeng GuoAdd basic RX & TX support in split queue mode and single queue mode. Using split queue mode by default.
--- drivers/net/idpf/idpf_ethdev.c | 93 ++++ drivers/net/idpf/idpf_rxtx.c | 877 +++++++++++++++++++++++++++++++++ drivers/net/idpf/idpf_rxtx.h | 33 ++ 3 files changed, 1003 insertions(+)
drivers/net/idpf/idpf_ethdev.c +93 -0
@@ -14,12 +14,16 @@#include "idpf_ethdev.h" #include "idpf_rxtx.h" +#define IDPF_TX_SINGLE_Q "tx_single" +#define IDPF_RX_SINGLE_Q "rx_single"#define VPORT_NUM "vport_num"struct idpf_adapter *adapter;uint16_t vport_num =1 ;static const char *const idpf_valid_args[] = { +IDPF_TX_SINGLE_Q , +IDPF_RX_SINGLE_Q ,VPORT_NUM ,NULL };
@@ -156,6 +160,30 @@ idpf_init_vport_req_info(struct rte_eth_dev *dev) (struct virtchnl2_create_vport *)adapter->vport_req_info[idx]; vport_info->vport_type =rte_cpu_to_le_16 (VIRTCHNL2_VPORT_TYPE_DEFAULT ); +if (!adapter->txq_model) { + vport_info->txq_model = +rte_cpu_to_le_16 (VIRTCHNL2_QUEUE_MODEL_SPLIT ); + vport_info->num_tx_q = dev->data->nb_tx_queues; + vport_info->num_tx_complq = + dev->data->nb_tx_queues *IDPF_TX_COMPLQ_PER_GRP ; + }else { + vport_info->txq_model = +rte_cpu_to_le_16 (VIRTCHNL2_QUEUE_MODEL_SINGLE ); + vport_info->num_tx_q = dev->data->nb_tx_queues; + vport_info->num_tx_complq =0 ; + } +if (!adapter->rxq_model) { + vport_info->rxq_model = +rte_cpu_to_le_16 (VIRTCHNL2_QUEUE_MODEL_SPLIT ); + vport_info->num_rx_q = dev->data->nb_rx_queues; + vport_info->num_rx_bufq = + dev->data->nb_rx_queues *IDPF_RX_BUFQ_PER_GRP ; + }else { + vport_info->rxq_model = +rte_cpu_to_le_16 (VIRTCHNL2_QUEUE_MODEL_SINGLE ); + vport_info->num_rx_q = dev->data->nb_rx_queues; + vport_info->num_rx_bufq =0 ; + }return 0 ; }
@@ -426,6 +454,56 @@ idpf_dev_close(struct rte_eth_dev *dev)return 0 ; } +static int +parse_bool (const char *key,const char *value,void *args) +{ +int *i = (int *)args; +char *end; +int num; + + num =strtoul (value, &end,10 ); + +if (num !=0 && num !=1 ) { +PMD_DRV_LOG (WARNING ,"invalid value:\"%s\" for key:\"%s\", " +"value must be 0 or 1" , + value, key); +return -1 ; + } + + *i = num; +return 0 ; +} + +static int idpf_parse_devargs (struct rte_eth_dev *dev) +{ +struct rte_devargs *devargs = dev->device->devargs; +struct rte_kvargs *kvlist; +int ret; + +if (!devargs) +return 0 ; + + kvlist =rte_kvargs_parse (devargs->args, idpf_valid_args); +if (!kvlist) { +PMD_INIT_LOG (ERR ,"invalid kvargs key" ); +return -EINVAL ; + } + + ret =rte_kvargs_process (kvlist,IDPF_TX_SINGLE_Q , &parse_bool, + &adapter->txq_model); +if (ret) + goto bail; + + ret =rte_kvargs_process (kvlist,IDPF_RX_SINGLE_Q , &parse_bool, + &adapter->rxq_model); +if (ret) + goto bail; + +bail: +rte_kvargs_free (kvlist); +return ret; +} +static void idpf_reset_pf (struct iecm_hw *hw) {
@@ -533,6 +611,12 @@ idpf_adapter_init(struct rte_eth_dev *dev) hw->device_id = pci_dev->id.device_id; hw->subsystem_vendor_id = pci_dev->id.subsystem_vendor_id; + ret =idpf_parse_devargs (dev); +if (ret) { +PMD_INIT_LOG (ERR ,"Failed to parse devargs" ); + goto err; + } +idpf_reset_pf (hw); ret =idpf_check_pf_reset_done (hw);if (ret) {
@@ -641,6 +725,15 @@ idpf_dev_init(struct rte_eth_dev *dev, __rte_unused void *init_params) dev->dev_ops = &idpf_eth_dev_ops; +/* for secondary processes, we don't initialise any further as primary +* has already done this work. +*/ +if (rte_eal_process_type () !=RTE_PROC_PRIMARY ) { +idpf_set_rx_function (dev); +idpf_set_tx_function (dev); +return ret; + } + ret =idpf_adapter_init (dev);if (ret) {PMD_INIT_LOG (ERR ,"Failed to init adapter." );
drivers/net/idpf/idpf_rxtx.c +877 -0
880 lines not on this page · raw message
drivers/net/idpf/idpf_rxtx.h +33 -0
@@ -35,6 +35,25 @@#define IDPF_TSO_MAX_SEG UINT8_MAX#define IDPF_TX_MAX_MTU_SEG 8 +#define IDPF_TX_CKSUM_OFFLOAD_MASK ( \ + RTE_MBUF_F_TX_IP_CKSUM | \ + RTE_MBUF_F_TX_L4_MASK | \ + RTE_MBUF_F_TX_TCP_SEG) + +#define IDPF_TX_OFFLOAD_MASK ( \ + RTE_MBUF_F_TX_OUTER_IPV6 | \ + RTE_MBUF_F_TX_OUTER_IPV4 | \ + RTE_MBUF_F_TX_IPV6 | \ + RTE_MBUF_F_TX_IPV4 | \ + RTE_MBUF_F_TX_VLAN | \ + RTE_MBUF_F_TX_IP_CKSUM | \ + RTE_MBUF_F_TX_L4_MASK | \ + RTE_MBUF_F_TX_TCP_SEG | \ + RTE_ETH_TX_OFFLOAD_SECURITY) + +#define IDPF_TX_OFFLOAD_NOTSUP_MASK \ + (RTE_MBUF_F_TX_OFFLOAD_MASK ^ IDPF_TX_OFFLOAD_MASK) +struct idpf_rx_queue {struct idpf_adapter *adapter;/* the adapter this queue belongs to */ struct rte_mempool *mp;/* mbuf pool to populate Rx ring */
@@ -162,8 +181,22 @@ int idpf_tx_queue_start(struct rte_eth_dev *dev, uint16_t tx_queue_id);int idpf_tx_queue_stop (struct rte_eth_dev *dev,uint16_t tx_queue_id);void idpf_dev_tx_queue_release (struct rte_eth_dev *dev,uint16_t qid); +uint16_t idpf_singleq_recv_pkts (void *rx_queue,struct rte_mbuf **rx_pkts, +uint16_t nb_pkts); +uint16_t idpf_splitq_recv_pkts (void *rx_queue,struct rte_mbuf **rx_pkts, +uint16_t nb_pkts); +uint16_t idpf_singleq_xmit_pkts (void *tx_queue,struct rte_mbuf **tx_pkts, +uint16_t nb_pkts); +uint16_t idpf_splitq_xmit_pkts (void *tx_queue,struct rte_mbuf **tx_pkts, +uint16_t nb_pkts); +uint16_t idpf_prep_pkts (void *tx_queue,struct rte_mbuf **tx_pkts, +uint16_t nb_pkts); +void idpf_stop_queues (struct rte_eth_dev *dev); +void idpf_set_rx_function (struct rte_eth_dev *dev); +void idpf_set_tx_function (struct rte_eth_dev *dev); +void idpf_set_default_ptype_table (struct rte_eth_dev *dev);const uint32_t *idpf_dev_supported_ptypes_get (struct rte_eth_dev *dev);
Signature · 1 line
2.25.1
RFC 9/9 net/idpf: support RSS
In reply to Junfeng GuoAdd RSS support.
--- drivers/net/idpf/idpf_ethdev.c | 106 +++++++++++++++++++++++++++++++++ drivers/net/idpf/idpf_ethdev.h | 18 +++++- drivers/net/idpf/idpf_vchnl.c | 93 +++++++++++++++++++++++++++++ 3 files changed, 216 insertions(+), 1 deletion(-)
drivers/net/idpf/idpf_ethdev.c +106 -0
@@ -85,6 +85,7 @@ idpf_dev_info_get(__rte_unused struct rte_eth_dev *dev, struct rte_eth_dev_info dev_info->max_mtu = dev_info->max_rx_pktlen -IDPF_ETH_OVERHEAD ; dev_info->min_mtu =RTE_ETHER_MIN_MTU ; + dev_info->flow_type_rss_offloads =IDPF_RSS_OFFLOAD_ALL ; dev_info->max_mac_addrs =IDPF_NUM_MACADDR_MAX ; dev_info->dev_capa &= ~RTE_ETH_DEV_CAPA_FLOW_RULE_KEEP ; dev_info->rx_offload_capa =
@@ -292,9 +293,96 @@ idpf_init_vport(struct rte_eth_dev *dev)return 0 ; } +static int +idpf_config_rss (struct idpf_vport *vport) +{ +int ret; + + ret =idpf_set_rss_key (vport); +if (ret) { +PMD_INIT_LOG (ERR ,"Failed to configure RSS key" ); +return ret; + } + + ret =idpf_set_rss_lut (vport); +if (ret) { +PMD_INIT_LOG (ERR ,"Failed to configure RSS lut" ); +return ret; + } + + ret =idpf_set_rss_hash (vport); +if (ret) { +PMD_INIT_LOG (ERR ,"Failed to configure RSS hash" ); +return ret; + } + +return ret; +} + +static int +idpf_init_rss (struct idpf_vport *vport) +{ +struct rte_eth_rss_conf *rss_conf; +uint16_t i, nb_q, lut_size; +int ret =0 ; + + rss_conf = &vport->dev_data->dev_conf.rx_adv_conf.rss_conf; + nb_q = vport->num_rx_q; + + vport->rss_key = (uint8_t *)rte_zmalloc ("rss_key" , + vport->rss_key_size,0 ); +if (!vport->rss_key) { +PMD_INIT_LOG (ERR ,"Failed to allocate RSS key" ); + ret = -ENOMEM ; + goto err_key; + } + + lut_size = vport->rss_lut_size; + vport->rss_lut = (uint32_t *)rte_zmalloc ("rss_lut" , +sizeof (uint32_t ) * lut_size,0 ); +if (!vport->rss_lut) { +PMD_INIT_LOG (ERR ,"Failed to allocate RSS lut" ); + ret = -ENOMEM ; + goto err_lut; + } + +if (!rss_conf->rss_key) { +for (i =0 ; i < vport->rss_key_size; i++) + vport->rss_key[i] = (uint8_t )rte_rand (); + }else { +rte_memcpy (vport->rss_key, rss_conf->rss_key, +RTE_MIN (rss_conf->rss_key_len, + vport->rss_key_size)); + } + +for (i =0 ; i < lut_size; i++) + vport->rss_lut[i] = i % nb_q; + + vport->rss_hf =IECM_DEFAULT_RSS_HASH_EXPANDED ; + + ret =idpf_config_rss (vport); +if (ret) { +PMD_INIT_LOG (ERR ,"Failed to configure RSS" ); + goto err_cfg; + } + +return ret; + +err_cfg: +rte_free (vport->rss_lut); + vport->rss_lut =NULL ; +err_lut: +rte_free (vport->rss_key); + vport->rss_key =NULL ; +err_key: +return ret; +} +static int idpf_dev_configure (struct rte_eth_dev *dev) { +struct idpf_vport *vport = + (struct idpf_vport *)dev->data->dev_private;int ret =0 ;if (dev->data->dev_conf.rxmode.mq_mode &RTE_ETH_MQ_RX_RSS_FLAG )
@@ -319,6 +407,14 @@ idpf_dev_configure(struct rte_eth_dev *dev)return ret; } +if (adapter->caps->rss_caps) { + ret =idpf_init_rss (vport); +if (ret) { +PMD_INIT_LOG (ERR ,"Failed to init rss" ); +return ret; + } + } +return ret; }
@@ -451,6 +547,16 @@ idpf_dev_close(struct rte_eth_dev *dev)idpf_dev_stop (dev);idpf_destroy_vport (vport); +if (vport->rss_lut) { +rte_free (vport->rss_lut); + vport->rss_lut =NULL ; + } + +if (vport->rss_key) { +rte_free (vport->rss_key); + vport->rss_key =NULL ; + } +return 0 ; }
drivers/net/idpf/idpf_ethdev.h +17 -1
@@ -43,6 +43,20 @@#define IDPF_ETH_OVERHEAD \ (RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN + IDPF_VLAN_TAG_SIZE * 2) +#define IDPF_RSS_OFFLOAD_ALL ( \ + RTE_ETH_RSS_IPV4 | \ + RTE_ETH_RSS_FRAG_IPV4 | \ + RTE_ETH_RSS_NONFRAG_IPV4_TCP | \ + RTE_ETH_RSS_NONFRAG_IPV4_UDP | \ + RTE_ETH_RSS_NONFRAG_IPV4_SCTP | \ + RTE_ETH_RSS_NONFRAG_IPV4_OTHER | \ + RTE_ETH_RSS_IPV6 | \ + RTE_ETH_RSS_FRAG_IPV6 | \ + RTE_ETH_RSS_NONFRAG_IPV6_TCP | \ + RTE_ETH_RSS_NONFRAG_IPV6_UDP | \ + RTE_ETH_RSS_NONFRAG_IPV6_SCTP | \ + RTE_ETH_RSS_NONFRAG_IPV6_OTHER) +#ifndef ETH_ADDR_LEN #define ETH_ADDR_LEN 6#endif
@@ -196,7 +210,9 @@ int idpf_check_api_version(struct idpf_adapter *adapter);int idpf_get_caps (struct idpf_adapter *adapter); int idpf_create_vport(__rte_unused struct rte_eth_dev *dev);int idpf_destroy_vport (struct idpf_vport *vport); - +int idpf_set_rss_key (struct idpf_vport *vport); +int idpf_set_rss_lut (struct idpf_vport *vport); +int idpf_set_rss_hash (struct idpf_vport *vport);int idpf_config_rxqs (struct idpf_vport *vport);int idpf_config_txqs (struct idpf_vport *vport); int idpf_switch_queue(struct idpf_vport *vport, uint16_t qid,
drivers/net/idpf/idpf_vchnl.c +93 -0
99 lines not on this page · raw message
Signature · 1 line
2.25.1