X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fnet%2Fsfc%2Fsfc_rx.c;h=ff4e69e6791ae25241aa66324a3fdd417ae1cf5a;hb=c6845644ccd307ba6c28dfa6e50e42fb0642f969;hp=23dff09672a0bae74f261ff029a73e38aabca5b1;hpb=4279b54e28385c4d787c7bc03c819c40949caed0;p=dpdk.git diff --git a/drivers/net/sfc/sfc_rx.c b/drivers/net/sfc/sfc_rx.c index 23dff09672..ff4e69e679 100644 --- a/drivers/net/sfc/sfc_rx.c +++ b/drivers/net/sfc/sfc_rx.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: BSD-3-Clause * - * Copyright (c) 2016-2018 Solarflare Communications Inc. - * All rights reserved. + * Copyright(c) 2019-2020 Xilinx, Inc. + * Copyright(c) 2016-2019 Solarflare Communications Inc. * * This software was jointly developed between OKTET Labs (under contract * for Solarflare) and Solarflare Communications, Inc. @@ -378,10 +378,20 @@ sfc_efx_rx_qdesc_status(struct sfc_dp_rxq *dp_rxq, uint16_t offset) boolean_t sfc_rx_check_scatter(size_t pdu, size_t rx_buf_size, uint32_t rx_prefix_size, - boolean_t rx_scatter_enabled, const char **error) + boolean_t rx_scatter_enabled, uint32_t rx_scatter_max, + const char **error) { - if ((rx_buf_size < pdu + rx_prefix_size) && !rx_scatter_enabled) { - *error = "Rx scatter is disabled and RxQ mbuf pool object size is too small"; + uint32_t effective_rx_scatter_max; + uint32_t rx_scatter_bufs; + + effective_rx_scatter_max = rx_scatter_enabled ? rx_scatter_max : 1; + rx_scatter_bufs = EFX_DIV_ROUND_UP(pdu + rx_prefix_size, rx_buf_size); + + if (rx_scatter_bufs > effective_rx_scatter_max) { + if (rx_scatter_enabled) + *error = "Possible number of Rx scatter buffers exceeds maximum number"; + else + *error = "Rx scatter is disabled and RxQ mbuf pool object size is too small"; return B_FALSE; } @@ -518,13 +528,22 @@ static sfc_dp_rx_qpurge_t sfc_efx_rx_qpurge; static sfc_dp_rx_qstart_t sfc_efx_rx_qstart; static int sfc_efx_rx_qstart(struct sfc_dp_rxq *dp_rxq, - __rte_unused unsigned int evq_read_ptr) + __rte_unused unsigned int evq_read_ptr, + const efx_rx_prefix_layout_t *pinfo) { /* libefx-based datapath is specific to libefx-based PMD */ struct sfc_efx_rxq *rxq = sfc_efx_rxq_by_dp_rxq(dp_rxq); struct sfc_rxq *crxq = sfc_rxq_by_dp_rxq(dp_rxq); int rc; + /* + * libefx API is used to extract information from Rx prefix and + * it guarantees consistency. Just do length check to ensure + * that we reserved space in Rx buffers correctly. + */ + if (rxq->prefix_size != pinfo->erpl_length) + return ENOTSUP; + rxq->common = crxq->common; rxq->pending = rxq->completed = rxq->added = rxq->pushed = 0; @@ -614,10 +633,11 @@ struct sfc_dp_rx sfc_efx_rx = { .dp = { .name = SFC_KVARG_DATAPATH_EFX, .type = SFC_DP_RX, - .hw_fw_caps = 0, + .hw_fw_caps = SFC_DP_HW_FW_CAP_RX_EFX, }, .features = SFC_DP_RX_FEAT_INTR, - .dev_offload_capa = DEV_RX_OFFLOAD_CHECKSUM, + .dev_offload_capa = DEV_RX_OFFLOAD_CHECKSUM | + DEV_RX_OFFLOAD_RSS_HASH, .queue_offload_capa = DEV_RX_OFFLOAD_SCATTER, .qsize_up_rings = sfc_efx_rx_qsize_up_rings, .qcreate = sfc_efx_rx_qcreate, @@ -718,7 +738,8 @@ retry: sfc_warn(sa, "promiscuous mode will be disabled"); port->promisc = B_FALSE; - rc = sfc_set_rx_mode(sa); + sa->eth_dev->data->promiscuous = 0; + rc = sfc_set_rx_mode_unchecked(sa); if (rc != 0) return rc; @@ -731,7 +752,8 @@ retry: sfc_warn(sa, "all-multicast mode will be disabled"); port->allmulti = B_FALSE; - rc = sfc_set_rx_mode(sa); + sa->eth_dev->data->all_multicast = 0; + rc = sfc_set_rx_mode_unchecked(sa); if (rc != 0) return rc; @@ -747,6 +769,7 @@ sfc_rx_qstart(struct sfc_adapter *sa, unsigned int sw_index) struct sfc_rxq_info *rxq_info; struct sfc_rxq *rxq; struct sfc_evq *evq; + efx_rx_prefix_layout_t pinfo; int rc; sfc_log_init(sa, "sw_index=%u", sw_index); @@ -798,9 +821,13 @@ sfc_rx_qstart(struct sfc_adapter *sa, unsigned int sw_index) if (rc != 0) goto fail_rx_qcreate; + rc = efx_rx_prefix_get_layout(rxq->common, &pinfo); + if (rc != 0) + goto fail_prefix_get_layout; + efx_rx_qenable(rxq->common); - rc = sa->priv.dp_rx->qstart(rxq_info->dp, evq->read_ptr); + rc = sa->priv.dp_rx->qstart(rxq_info->dp, evq->read_ptr, &pinfo); if (rc != 0) goto fail_dp_qstart; @@ -819,11 +846,14 @@ sfc_rx_qstart(struct sfc_adapter *sa, unsigned int sw_index) return 0; fail_mac_filter_default_rxq_set: + sfc_rx_qflush(sa, sw_index); sa->priv.dp_rx->qstop(rxq_info->dp, &rxq->evq->read_ptr); + rxq_info->state = SFC_RXQ_INITIALIZED; fail_dp_qstart: - sfc_rx_qflush(sa, sw_index); + efx_rx_qdestroy(rxq->common); +fail_prefix_get_layout: fail_rx_qcreate: fail_bad_contig_block_size: fail_mp_get_info: @@ -1019,7 +1049,7 @@ sfc_rx_mb_pool_buf_size(struct sfc_adapter *sa, struct rte_mempool *mb_pool) * Start is aligned the same or better than end, * just align length. */ - buf_size = P2ALIGN(buf_size, nic_align_end); + buf_size = EFX_P2ALIGN(uint32_t, buf_size, nic_align_end); } return buf_size; @@ -1079,6 +1109,7 @@ sfc_rx_qinit(struct sfc_adapter *sa, unsigned int sw_index, if (!sfc_rx_check_scatter(sa->port.pdu, buf_size, encp->enc_rx_prefix_size, (offloads & DEV_RX_OFFLOAD_SCATTER), + encp->enc_rx_scatter_max, &error)) { sfc_err(sa, "RxQ %u MTU check failed: %s", sw_index, error); sfc_err(sa, "RxQ %u calculated Rx buffer size is %u vs " @@ -1109,6 +1140,9 @@ sfc_rx_qinit(struct sfc_adapter *sa, unsigned int sw_index, DEV_RX_OFFLOAD_OUTER_IPV4_CKSUM) != 0) rxq_info->type_flags |= EFX_RXQ_FLAG_INNER_CLASSES; + if (offloads & DEV_RX_OFFLOAD_RSS_HASH) + rxq_info->type_flags |= EFX_RXQ_FLAG_RSS_HASH; + rc = sfc_ev_qinit(sa, SFC_EVQ_TYPE_RX, sw_index, evq_entries, socket_id, &evq); if (rc != 0) @@ -1134,6 +1168,13 @@ sfc_rx_qinit(struct sfc_adapter *sa, unsigned int sw_index, rxq_info->refill_threshold = RTE_MAX(rx_free_thresh, SFC_RX_REFILL_BULK); rxq_info->refill_mb_pool = mb_pool; + + if (rss->hash_support == EFX_RX_HASH_AVAILABLE && rss->channels > 0 && + (offloads & DEV_RX_OFFLOAD_RSS_HASH)) + rxq_info->rxq_flags = SFC_RXQ_FLAG_RSS_HASH; + else + rxq_info->rxq_flags = 0; + rxq->buf_size = buf_size; rc = sfc_dma_alloc(sa, "rxq", sw_index, @@ -1149,10 +1190,7 @@ sfc_rx_qinit(struct sfc_adapter *sa, unsigned int sw_index, info.buf_size = buf_size; info.batch_max = encp->enc_rx_batch_max; info.prefix_size = encp->enc_rx_prefix_size; - - if (rss->hash_support == EFX_RX_HASH_AVAILABLE && rss->channels > 0) - info.flags |= SFC_RXQ_FLAG_RSS_HASH; - + info.flags = rxq_info->rxq_flags; info.rxq_entries = rxq_info->entries; info.rxq_hw_ring = rxq->mem.esm_base; info.evq_hw_index = sfc_evq_index_by_rxq_sw_index(sa, sw_index); @@ -1402,7 +1440,7 @@ sfc_rx_process_adv_conf_rss(struct sfc_adapter *sa, if (conf->rss_key != NULL) { if (conf->rss_key_len != sizeof(rss->key)) { - sfc_err(sa, "RSS key size is wrong (should be %lu)", + sfc_err(sa, "RSS key size is wrong (should be %zu)", sizeof(rss->key)); return EINVAL; }