On 6/22/23 14:31, Artemii Morozov wrote:
> Extract VLAN TCI provided by the HW in the prefix and put it to mbuf.
> VLAN stripping is supported for ef100 datapath only. This is device
> level offload.
>
> Signed-off-by: Artemii Morozov <artemii.morozov@arknetworks.am>
> Reviewed-by: Viacheslav Galaktionov <viacheslav.galaktionov@arknetworks.am>
> Reviewed-by: Ivan Malov <ivan.malov@arknetworks.am>
> Reviewed-by: Andy Moreton <amoreton@xilinx.com>
One, but important question below:
> diff --git a/drivers/net/sfc/sfc_ef100_rx.c b/drivers/net/sfc/sfc_ef100_rx.c
> index 37b754fa33..07381df5cf 100644
> --- a/drivers/net/sfc/sfc_ef100_rx.c
> +++ b/drivers/net/sfc/sfc_ef100_rx.c
[snip]
> @@ -892,6 +905,15 @@ sfc_ef100_rx_qstart(struct sfc_dp_rxq *dp_rxq, unsigned int evq_read_ptr,
> (rxq->flags & SFC_EF100_RXQ_INGRESS_MPORT))
> return ENOTSUP;
>
> + /*
> + * Exclude the SFC_EF100_RXQ_VLAN_STRIPPED_TCI if offload was not requested
> + * or the prefix does not contain the corresponding field.
> + */
> + if (!((rxq->flags & SFC_EF100_RXQ_VLAN_STRIPPED_TCI) &&
Sorry, it is complicated to understand the condition. Please, avoid
leading not.
> + ((unsup_rx_prefix_fields &
> + (1U << EFX_RX_PREFIX_FIELD_VLAN_STRIP_TCI)) == 0)))
> + rxq->flags &= ~SFC_EF100_RXQ_VLAN_STRIPPED_TCI;
> +
I don't understand why do we need to check Rx prefix field presence
here. We should not allow to enable VLAN stripping if Rx prefix field
is not available.
> rxq->prefix_size = pinfo->erpl_length;
> rxq->rearm_data = sfc_ef100_mk_mbuf_rearm_data(rxq->dp.dpq.port_id,
> rxq->prefix_size);
[snip]
@@ -118,6 +118,8 @@ SFC EFX PMD has support for:
- Port representors (see :ref: switch_representation)
+- VLAN stripping (if running firmware variant supports it)
+
Non-supported Features
----------------------
@@ -132,8 +134,6 @@ The features not yet supported include:
- VLAN filtering
-- VLAN stripping
-
- LRO
@@ -177,6 +177,12 @@ New Features
See :doc:`../prog_guide/pdcp_lib` for more information.
+* **Updated Solarflare network PMD.**
+
+ Updated the Solarflare ``sfc_efx`` driver with changes including:
+
+ * Added VLAN stripping support on SN1000 SmartNICs
+
Removed Items
-------------
@@ -73,6 +73,7 @@ struct sfc_port {
unsigned int flow_ctrl;
boolean_t flow_ctrl_autoneg;
+ boolean_t vlan_strip;
size_t pdu;
/*
@@ -70,6 +70,7 @@ struct sfc_dp_rx_qcreate_info {
unsigned int flags;
#define SFC_RXQ_FLAG_RSS_HASH 0x1
#define SFC_RXQ_FLAG_INGRESS_MPORT 0x2
+#define SFC_RXQ_FLAG_VLAN_STRIPPED_TCI 0x4
/** Rx queue size */
unsigned int rxq_entries;
@@ -68,6 +68,7 @@ struct sfc_ef100_rxq {
#define SFC_EF100_RXQ_INGRESS_MPORT 0x80
#define SFC_EF100_RXQ_USER_FLAG 0x100
#define SFC_EF100_RXQ_NIC_DMA_MAP 0x200
+#define SFC_EF100_RXQ_VLAN_STRIPPED_TCI 0x400
unsigned int ptr_mask;
unsigned int evq_phase_bit_shift;
unsigned int ready_pkts;
@@ -392,6 +393,7 @@ static const efx_rx_prefix_layout_t sfc_ef100_rx_prefix_layout = {
SFC_EF100_RX_PREFIX_FIELD(RSS_HASH, B_FALSE),
SFC_EF100_RX_PREFIX_FIELD(USER_FLAG, B_FALSE),
SFC_EF100_RX_PREFIX_FIELD(USER_MARK, B_FALSE),
+ SFC_EF100_RX_PREFIX_FIELD(VLAN_STRIP_TCI, B_FALSE),
#undef SFC_EF100_RX_PREFIX_FIELD
}
@@ -472,6 +474,14 @@ sfc_ef100_rx_prefix_to_offloads(const struct sfc_ef100_rxq *rxq,
ESF_GZ_RX_PREFIX_INGRESS_MPORT);
}
+ if (rxq->flags & SFC_EF100_RXQ_VLAN_STRIPPED_TCI &&
+ EFX_TEST_XWORD_BIT(rx_prefix[0],
+ ESF_GZ_RX_PREFIX_VLAN_STRIPPED_LBN)) {
+ ol_flags |= RTE_MBUF_F_RX_VLAN | RTE_MBUF_F_RX_VLAN_STRIPPED;
+ m->vlan_tci = EFX_XWORD_FIELD(rx_prefix[0],
+ ESF_GZ_RX_PREFIX_VLAN_STRIP_TCI);
+ }
+
m->ol_flags = ol_flags;
return true;
}
@@ -813,6 +823,9 @@ sfc_ef100_rx_qcreate(uint16_t port_id, uint16_t queue_id,
if (info->flags & SFC_RXQ_FLAG_INGRESS_MPORT)
rxq->flags |= SFC_EF100_RXQ_INGRESS_MPORT;
+ if (info->flags & SFC_RXQ_FLAG_VLAN_STRIPPED_TCI)
+ rxq->flags |= SFC_EF100_RXQ_VLAN_STRIPPED_TCI;
+
sfc_ef100_rx_debug(rxq, "RxQ doorbell is %p", rxq->doorbell);
*dp_rxqp = &rxq->dp;
@@ -892,6 +905,15 @@ sfc_ef100_rx_qstart(struct sfc_dp_rxq *dp_rxq, unsigned int evq_read_ptr,
(rxq->flags & SFC_EF100_RXQ_INGRESS_MPORT))
return ENOTSUP;
+ /*
+ * Exclude the SFC_EF100_RXQ_VLAN_STRIPPED_TCI if offload was not requested
+ * or the prefix does not contain the corresponding field.
+ */
+ if (!((rxq->flags & SFC_EF100_RXQ_VLAN_STRIPPED_TCI) &&
+ ((unsup_rx_prefix_fields &
+ (1U << EFX_RX_PREFIX_FIELD_VLAN_STRIP_TCI)) == 0)))
+ rxq->flags &= ~SFC_EF100_RXQ_VLAN_STRIPPED_TCI;
+
rxq->prefix_size = pinfo->erpl_length;
rxq->rearm_data = sfc_ef100_mk_mbuf_rearm_data(rxq->dp.dpq.port_id,
rxq->prefix_size);
@@ -1004,7 +1026,7 @@ struct sfc_dp_rx sfc_ef100_rx = {
SFC_DP_RX_FEAT_FLOW_MARK |
SFC_DP_RX_FEAT_INTR |
SFC_DP_RX_FEAT_STATS,
- .dev_offload_capa = 0,
+ .dev_offload_capa = RTE_ETH_RX_OFFLOAD_VLAN_STRIP,
.queue_offload_capa = RTE_ETH_RX_OFFLOAD_CHECKSUM |
RTE_ETH_RX_OFFLOAD_OUTER_IPV4_CKSUM |
RTE_ETH_RX_OFFLOAD_OUTER_UDP_CKSUM |
@@ -225,6 +225,11 @@ sfc_port_start(struct sfc_adapter *sa)
if (rc != 0)
goto fail_mac_fcntl_set;
+ sfc_log_init(sa, "set vlan strip to %u", port->vlan_strip);
+ rc = efx_port_vlan_strip_set(sa->nic, port->vlan_strip);
+ if (rc != 0)
+ goto fail_mac_vlan_strip_set;
+
/* Preserve pause capabilities set by above efx_mac_fcntl_set() */
efx_phy_adv_cap_get(sa->nic, EFX_PHY_CAP_CURRENT, &phy_adv_cap);
SFC_ASSERT((port->phy_adv_cap & phy_pause_caps) == 0);
@@ -339,6 +344,7 @@ sfc_port_start(struct sfc_adapter *sa)
fail_mac_pdu_set:
fail_phy_adv_cap_set:
fail_mac_fcntl_set:
+fail_mac_vlan_strip_set:
#if EFSYS_OPT_LOOPBACK
fail_loopback_set:
#endif
@@ -375,11 +381,17 @@ sfc_port_configure(struct sfc_adapter *sa)
{
const struct rte_eth_dev_data *dev_data = sa->eth_dev->data;
struct sfc_port *port = &sa->port;
+ const struct rte_eth_rxmode *rxmode = &dev_data->dev_conf.rxmode;
sfc_log_init(sa, "entry");
port->pdu = EFX_MAC_PDU(dev_data->mtu);
+ if (rxmode->offloads & RTE_ETH_RX_OFFLOAD_VLAN_STRIP)
+ port->vlan_strip = true;
+ else
+ port->vlan_strip = false;
+
return 0;
}
@@ -938,6 +938,9 @@ sfc_rx_get_offload_mask(struct sfc_adapter *sa)
if (encp->enc_tunnel_encapsulations_supported == 0)
no_caps |= RTE_ETH_RX_OFFLOAD_OUTER_IPV4_CKSUM;
+ if (encp->enc_rx_vlan_stripping_supported == 0)
+ no_caps |= RTE_ETH_RX_OFFLOAD_VLAN_STRIP;
+
return ~no_caps;
}
@@ -1109,6 +1112,7 @@ sfc_rx_qinit(struct sfc_adapter *sa, sfc_sw_index_t sw_index,
struct sfc_rxq *rxq;
struct sfc_dp_rx_qcreate_info info;
struct sfc_dp_rx_hw_limits hw_limits;
+ struct sfc_port *port = &sa->port;
uint16_t rx_free_thresh;
const char *error;
@@ -1193,6 +1197,9 @@ sfc_rx_qinit(struct sfc_adapter *sa, sfc_sw_index_t sw_index,
sfc_ft_is_active(sa))
rxq_info->type_flags |= EFX_RXQ_FLAG_USER_MARK;
+ if (port->vlan_strip)
+ rxq_info->type_flags |= EFX_RXQ_FLAG_VLAN_STRIPPED_TCI;
+
rc = sfc_ev_qinit(sa, SFC_EVQ_TYPE_RX, sw_index,
evq_entries, socket_id, &evq);
if (rc != 0)
@@ -1228,6 +1235,9 @@ sfc_rx_qinit(struct sfc_adapter *sa, sfc_sw_index_t sw_index,
if (rxq_info->type_flags & EFX_RXQ_FLAG_INGRESS_MPORT)
rxq_info->rxq_flags |= SFC_RXQ_FLAG_INGRESS_MPORT;
+ if (rxq_info->type_flags & EFX_RXQ_FLAG_VLAN_STRIPPED_TCI)
+ rxq_info->rxq_flags |= SFC_RXQ_FLAG_VLAN_STRIPPED_TCI;
+
rxq->buf_size = buf_size;
rc = sfc_dma_alloc(sa, "rxq", sw_index, EFX_NIC_DMA_ADDR_RX_RING,