net/sfc: advertise offload caps directly by Rx datapaths
PATCH 1/2 net/sfc: advertise offload caps directly by Rx datapaths
Rx datapath feature bits were useful on migration from the old offload API to the new one. However, right now it just adds indirection which complicates code reading and understanding. Also addition of a new offloads requires addition of a new feature bits and makes patches longer and harder to understand. So, remove feature bits which correspond to Rx offloads and simply advertise device and per-queue offloads directly. Generic code could still mask some offloads if running HW or FW does not support it.
--- drivers/net/sfc/sfc_dp_rx.h | 25 +++++++++++++++++------ drivers/net/sfc/sfc_ef10_essb_rx.c | 5 +++-- drivers/net/sfc/sfc_ef10_rx.c | 8 ++++---- drivers/net/sfc/sfc_rx.c | 42 ++++++++++++++++++-------------------- 4 files changed, 46 insertions(+), 34 deletions(-)
drivers/net/sfc/sfc_dp_rx.h +19 -6
@@ -199,12 +199,19 @@ struct sfc_dp_rx {struct sfc_dp dp;unsigned int features; -#define SFC_DP_RX_FEAT_SCATTER 0x1 -#define SFC_DP_RX_FEAT_MULTI_PROCESS 0x2 -#define SFC_DP_RX_FEAT_TUNNELS 0x4 -#define SFC_DP_RX_FEAT_FLOW_FLAG 0x8 -#define SFC_DP_RX_FEAT_FLOW_MARK 0x10 -#define SFC_DP_RX_FEAT_CHECKSUM 0x20 +#define SFC_DP_RX_FEAT_MULTI_PROCESS 0x1 +#define SFC_DP_RX_FEAT_FLOW_FLAG 0x2 +#define SFC_DP_RX_FEAT_FLOW_MARK 0x4 +/** +* Rx offload capabilities supported by the datapath on device +* level only if HW/FW supports it. +*/ +uint64_t dev_offload_capa; +/** +* Rx offload capabilities supported by the datapath per-queue +* if HW/FW supports it. +*/ +uint64_t queue_offload_capa;sfc_dp_rx_get_dev_info_t *get_dev_info;sfc_dp_rx_pool_ops_supported_t *pool_ops_supported;sfc_dp_rx_qsize_up_rings_t *qsize_up_rings;
@@ -237,6 +244,12 @@ struct sfc_dp_rx { return (p == NULL) ? NULL : container_of(p, struct sfc_dp_rx, dp); } +static inline uint64_t +sfc_dp_rx_offload_capa (const struct sfc_dp_rx *dp_rx) +{ +return dp_rx->dev_offload_capa | dp_rx->queue_offload_capa; +} +/** Get Rx datapath ops by the datapath RxQ handle */ const struct sfc_dp_rx *sfc_dp_rx_by_dp_rxq (const struct sfc_dp_rxq *dp_rxq);
drivers/net/sfc/sfc_ef10_essb_rx.c +3 -2
@@ -714,8 +714,9 @@ struct sfc_dp_rx sfc_ef10_essb_rx = { SFC_DP_HW_FW_CAP_RX_ES_SUPER_BUFFER, }, .features =SFC_DP_RX_FEAT_FLOW_FLAG | -SFC_DP_RX_FEAT_FLOW_MARK | - SFC_DP_RX_FEAT_CHECKSUM, + SFC_DP_RX_FEAT_FLOW_MARK, + .dev_offload_capa = DEV_RX_OFFLOAD_CHECKSUM, + .queue_offload_capa = 0, .get_dev_info = sfc_ef10_essb_rx_get_dev_info, .pool_ops_supported = sfc_ef10_essb_rx_pool_ops_supported, .qsize_up_rings = sfc_ef10_essb_rx_qsize_up_rings,
drivers/net/sfc/sfc_ef10_rx.c +4 -4
@@ -750,10 +750,10 @@ struct sfc_dp_rx sfc_ef10_rx = { .type = SFC_DP_RX, .hw_fw_caps = SFC_DP_HW_FW_CAP_EF10, }, - .features =SFC_DP_RX_FEAT_SCATTER | -SFC_DP_RX_FEAT_MULTI_PROCESS | -SFC_DP_RX_FEAT_TUNNELS | - SFC_DP_RX_FEAT_CHECKSUM, + .features = SFC_DP_RX_FEAT_MULTI_PROCESS, + .dev_offload_capa =DEV_RX_OFFLOAD_CHECKSUM | + DEV_RX_OFFLOAD_OUTER_IPV4_CKSUM, + .queue_offload_capa = DEV_RX_OFFLOAD_SCATTER, .get_dev_info = sfc_ef10_rx_get_dev_info, .qsize_up_rings = sfc_ef10_rx_qsize_up_rings, .qcreate = sfc_ef10_rx_qcreate,
drivers/net/sfc/sfc_rx.c +20 -22
71 lines not on this page · raw message
Signature · 1 line
1.8.3.1
PATCH 2/2 net/sfc: advertise offload caps directly by Tx datapaths
Tx datapath feature bits were useful on migration from the old offload API to the new one. However, right now it just adds indirection which complicates code reading and understanding. Also addition of a new offloads requires addition of a new feature bits and makes patches longer and harder to understand. So, remove feature bits which correspond to Tx offloads and simply advertise device and per-queue offloads directly. Generic code could still mask some offloads if running HW or FW does not support it.
--- drivers/net/sfc/sfc.c | 7 +++-- drivers/net/sfc/sfc_dp_tx.h | 24 +++++++++++----- drivers/net/sfc/sfc_ef10_tx.c | 20 ++++++++++---- drivers/net/sfc/sfc_tx.c | 64 ++++++++++++++++++++----------------------- 4 files changed, 65 insertions(+), 50 deletions(-)
drivers/net/sfc/sfc.c +5 -2
@@ -744,13 +744,16 @@ sa->priv.shared->tunnel_encaps = encp->enc_tunnel_encapsulations_supported; -if (sa->priv.dp_tx->features &SFC_DP_TX_FEAT_TSO ) { +if (sfc_dp_tx_offload_capa (sa->priv.dp_tx) &DEV_TX_OFFLOAD_TCP_TSO ) { sa->tso = encp->enc_fw_assisted_tso_v2_enabled;if (!sa->tso)sfc_info (sa,"TSO support isn't available on this adapter" ); } -if (sa->tso && sa->priv.dp_tx->features &SFC_DP_TX_FEAT_TSO_ENCAP ) { +if (sa->tso && + (sfc_dp_tx_offload_capa (sa->priv.dp_tx) & + (DEV_TX_OFFLOAD_VXLAN_TNL_TSO | +DEV_TX_OFFLOAD_GENEVE_TNL_TSO )) !=0 ) { sa->tso_encap = encp->enc_fw_assisted_tso_v2_encap_enabled;if (!sa->tso_encap)sfc_info (sa,"Encapsulated TSO support isn't available on this adapter" );
drivers/net/sfc/sfc_dp_tx.h +17 -7
@@ -157,13 +157,17 @@ struct sfc_dp_tx {struct sfc_dp dp;unsigned int features; -#define SFC_DP_TX_FEAT_VLAN_INSERT 0x1 -#define SFC_DP_TX_FEAT_TSO 0x2 -#define SFC_DP_TX_FEAT_MULTI_SEG 0x4 -#define SFC_DP_TX_FEAT_MULTI_PROCESS 0x8 -#define SFC_DP_TX_FEAT_MULTI_POOL 0x10 -#define SFC_DP_TX_FEAT_REFCNT 0x20 -#define SFC_DP_TX_FEAT_TSO_ENCAP 0x40 +#define SFC_DP_TX_FEAT_MULTI_PROCESS 0x1 +/** +* Tx offload capabilities supported by the datapath on device +* level only if HW/FW supports it. +*/ +uint64_t dev_offload_capa; +/** +* Tx offload capabilities supported by the datapath per-queue +* if HW/FW supports it. +*/ +uint64_t queue_offload_capa;sfc_dp_tx_get_dev_info_t *get_dev_info;sfc_dp_tx_qsize_up_rings_t *qsize_up_rings;sfc_dp_tx_qcreate_t *qcreate;
@@ -196,6 +200,12 @@ struct sfc_dp_tx {/** Get Tx datapath ops by the datapath TxQ handle */ const struct sfc_dp_tx *sfc_dp_tx_by_dp_txq (const struct sfc_dp_txq *dp_txq); +static inline uint64_t +sfc_dp_tx_offload_capa (const struct sfc_dp_tx *dp_tx) +{ +return dp_tx->dev_offload_capa | dp_tx->queue_offload_capa; +} + static inline int sfc_dp_tx_prepare_pkt(struct rte_mbuf *m, uint32_t tso_tcp_header_offset_limit,
drivers/net/sfc/sfc_ef10_tx.c +14 -6
@@ -1098,12 +1098,15 @@ struct sfc_dp_tx sfc_ef10_tx = { .type = SFC_DP_TX, .hw_fw_caps = SFC_DP_HW_FW_CAP_EF10, }, - .features =SFC_DP_TX_FEAT_TSO | -SFC_DP_TX_FEAT_TSO_ENCAP | -SFC_DP_TX_FEAT_MULTI_SEG | -SFC_DP_TX_FEAT_MULTI_POOL | -SFC_DP_TX_FEAT_REFCNT | - SFC_DP_TX_FEAT_MULTI_PROCESS, + .features = SFC_DP_TX_FEAT_MULTI_PROCESS, + .dev_offload_capa = DEV_TX_OFFLOAD_MULTI_SEGS, + .queue_offload_capa =DEV_TX_OFFLOAD_IPV4_CKSUM | +DEV_TX_OFFLOAD_UDP_CKSUM | +DEV_TX_OFFLOAD_TCP_CKSUM | +DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM | +DEV_TX_OFFLOAD_TCP_TSO | +DEV_TX_OFFLOAD_VXLAN_TNL_TSO | + DEV_TX_OFFLOAD_GENEVE_TNL_TSO, .get_dev_info = sfc_ef10_get_dev_info, .qsize_up_rings = sfc_ef10_tx_qsize_up_rings, .qcreate = sfc_ef10_tx_qcreate,
@@ -1123,6 +1126,11 @@ struct sfc_dp_tx sfc_ef10_simple_tx = { .type = SFC_DP_TX, }, .features = SFC_DP_TX_FEAT_MULTI_PROCESS, + .dev_offload_capa = DEV_TX_OFFLOAD_MBUF_FAST_FREE, + .queue_offload_capa =DEV_TX_OFFLOAD_IPV4_CKSUM | +DEV_TX_OFFLOAD_UDP_CKSUM | +DEV_TX_OFFLOAD_TCP_CKSUM | + DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM, .get_dev_info = sfc_ef10_get_dev_info, .qsize_up_rings = sfc_ef10_tx_qsize_up_rings, .qcreate = sfc_ef10_tx_qcreate,
drivers/net/sfc/sfc_tx.c +29 -35
87 lines not on this page · raw message
Signature · 1 line
1.8.3.1
Quoted 9 lines · Andrew Rybchenko
Rx datapath feature bits were useful on migration from the old offload API to the new one. However, right now it just adds indirection which complicates code reading and understanding. Also addition of a new offloads requires addition of a new feature bits and makes patches longer and harder to understand. So, remove feature bits which correspond to Rx offloads and simply advertise device and per-queue offloads directly. Generic code could still mask some offloads if running HW or FW does not support it.
Quoted 3 lines
Signed-off-by Andrew Rybchenko <[email protected]>Reviewed-by Igor Romanov <[email protected]>Reviewed-by Ivan Malov <[email protected]>
Series applied to dpdk-next-net/master, thanks.