From patchwork Mon Mar 20 10:15:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Rybchenko X-Patchwork-Id: 21994 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 709B4CFBA; Mon, 20 Mar 2017 11:16:11 +0100 (CET) Received: from nbfkord-smmo01.seg.att.com (nbfkord-smmo01.seg.att.com [209.65.160.76]) by dpdk.org (Postfix) with ESMTP id 3E047695D for ; Mon, 20 Mar 2017 11:15:51 +0100 (CET) Received: from unknown [12.187.104.26] (EHLO nbfkord-smmo01.seg.att.com) by nbfkord-smmo01.seg.att.com(mxl_mta-7.2.4-7) with ESMTP id 7dbafc85.2ab1d7e12940.553588.00-2498.1325623.nbfkord-smmo01.seg.att.com (envelope-from ); Mon, 20 Mar 2017 10:15:51 +0000 (UTC) X-MXL-Hash: 58cfabd764aac249-73a51fb5a66c722ae0314ef3bec55cf2651815a9 Received: from unknown [12.187.104.26] by nbfkord-smmo01.seg.att.com(mxl_mta-7.2.4-7) with SMTP id ecbafc85.0.553578.00-2398.1325556.nbfkord-smmo01.seg.att.com (envelope-from ); Mon, 20 Mar 2017 10:15:43 +0000 (UTC) X-MXL-Hash: 58cfabcf640c2feb-88b03955466e3193d516514726422cc76cd44b8c Received: from ocex03.SolarFlarecom.com (10.20.40.36) by ocex03.SolarFlarecom.com (10.20.40.36) with Microsoft SMTP Server (TLS) id 15.0.1044.25; Mon, 20 Mar 2017 03:15:35 -0700 Received: from opal.uk.solarflarecom.com (10.17.10.1) by ocex03.SolarFlarecom.com (10.20.40.36) with Microsoft SMTP Server (TLS) id 15.0.1044.25 via Frontend Transport; Mon, 20 Mar 2017 03:15:34 -0700 Received: from uklogin.uk.solarflarecom.com (uklogin.uk.solarflarecom.com [10.17.10.10]) by opal.uk.solarflarecom.com (8.13.8/8.13.8) with ESMTP id v2KAFXCj027540; Mon, 20 Mar 2017 10:15:33 GMT Received: from uklogin.uk.solarflarecom.com (localhost.localdomain [127.0.0.1]) by uklogin.uk.solarflarecom.com (8.13.8/8.13.8) with ESMTP id v2KAFX9N002212; Mon, 20 Mar 2017 10:15:33 GMT From: Andrew Rybchenko To: CC: Ferruh Yigit Date: Mon, 20 Mar 2017 10:15:09 +0000 Message-ID: <1490004919-2177-4-git-send-email-arybchenko@solarflare.com> X-Mailer: git-send-email 1.8.2.3 In-Reply-To: <1490004919-2177-1-git-send-email-arybchenko@solarflare.com> References: <1488438439-14776-1-git-send-email-arybchenko@solarflare.com> <1490004919-2177-1-git-send-email-arybchenko@solarflare.com> MIME-Version: 1.0 X-AnalysisOut: [v=2.1 cv=Tung8Wjh c=1 sm=1 tr=0 a=8BlWFWvVlq5taO8ncb8nKg==] X-AnalysisOut: [:17 a=6Iz7jQTuP9IA:10 a=zRKbQ67AAAAA:8 a=U6Epw9jfaybZQRngH] X-AnalysisOut: [skA:9 a=PA03WX8tBzeizutn5_OT:22] X-Spam: [F=0.3315814387; CM=0.500; S=0.331(2015072901)] X-MAIL-FROM: X-SOURCE-IP: [12.187.104.26] Subject: [dpdk-dev] [PATCH v2 03/13] net/sfc: do not use Rx queue control state on datapath X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Rx queue flags should keep the information required on datapath. It is a preparation to split control and data paths. Signed-off-by: Andrew Rybchenko --- drivers/net/sfc/sfc_ev.c | 5 +++-- drivers/net/sfc/sfc_rx.c | 12 +++++++----- drivers/net/sfc/sfc_rx.h | 12 +++++------- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/drivers/net/sfc/sfc_ev.c b/drivers/net/sfc/sfc_ev.c index bb22001..cc2a30f 100644 --- a/drivers/net/sfc/sfc_ev.c +++ b/drivers/net/sfc/sfc_ev.c @@ -101,7 +101,7 @@ sfc_ev_rx(void *arg, __rte_unused uint32_t label, uint32_t id, SFC_ASSERT(rxq != NULL); SFC_ASSERT(rxq->evq == evq); - SFC_ASSERT(rxq->state & SFC_RXQ_STARTED); + SFC_ASSERT(rxq->flags & SFC_RXQ_FLAG_STARTED); stop = (id + 1) & rxq->ptr_mask; pending_id = rxq->pending & rxq->ptr_mask; @@ -434,7 +434,8 @@ sfc_ev_qpoll(struct sfc_evq *evq) struct sfc_adapter *sa = evq->sa; int rc; - if ((evq->rxq != NULL) && (evq->rxq->state & SFC_RXQ_RUNNING)) { + if ((evq->rxq != NULL) && + (evq->rxq->flags & SFC_RXQ_FLAG_RUNNING)) { unsigned int rxq_sw_index = sfc_rxq_sw_index(evq->rxq); sfc_warn(sa, diff --git a/drivers/net/sfc/sfc_rx.c b/drivers/net/sfc/sfc_rx.c index d6ba4e9..6af1574 100644 --- a/drivers/net/sfc/sfc_rx.c +++ b/drivers/net/sfc/sfc_rx.c @@ -219,7 +219,7 @@ sfc_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts) boolean_t discard_next = B_FALSE; struct rte_mbuf *scatter_pkt = NULL; - if (unlikely((rxq->state & SFC_RXQ_RUNNING) == 0)) + if (unlikely((rxq->flags & SFC_RXQ_FLAG_RUNNING) == 0)) return 0; sfc_ev_qpoll(rxq->evq); @@ -320,7 +320,7 @@ sfc_rx_qdesc_npending(struct sfc_adapter *sa, unsigned int sw_index) SFC_ASSERT(sw_index < sa->rxq_count); rxq = sa->rxq_info[sw_index].rxq; - if (rxq == NULL || (rxq->state & SFC_RXQ_RUNNING) == 0) + if (rxq == NULL || (rxq->flags & SFC_RXQ_FLAG_RUNNING) == 0) return 0; sfc_ev_qpoll(rxq->evq); @@ -331,7 +331,7 @@ sfc_rx_qdesc_npending(struct sfc_adapter *sa, unsigned int sw_index) int sfc_rx_qdesc_done(struct sfc_rxq *rxq, unsigned int offset) { - if ((rxq->state & SFC_RXQ_RUNNING) == 0) + if ((rxq->flags & SFC_RXQ_FLAG_RUNNING) == 0) return 0; sfc_ev_qpoll(rxq->evq); @@ -486,7 +486,8 @@ sfc_rx_qstart(struct sfc_adapter *sa, unsigned int sw_index) rxq->pending = rxq->completed = rxq->added = rxq->pushed = 0; - rxq->state |= (SFC_RXQ_STARTED | SFC_RXQ_RUNNING); + rxq->state |= SFC_RXQ_STARTED; + rxq->flags |= SFC_RXQ_FLAG_STARTED | SFC_RXQ_FLAG_RUNNING; sfc_rx_qrefill(rxq); @@ -533,13 +534,14 @@ sfc_rx_qstop(struct sfc_adapter *sa, unsigned int sw_index) sa->eth_dev->data->rx_queue_state[sw_index] = RTE_ETH_QUEUE_STATE_STOPPED; - rxq->state &= ~SFC_RXQ_RUNNING; + rxq->flags &= ~SFC_RXQ_FLAG_RUNNING; if (sw_index == 0) efx_mac_filter_default_rxq_clear(sa->nic); sfc_rx_qflush(sa, sw_index); + rxq->flags &= ~SFC_RXQ_FLAG_STARTED; rxq->state = SFC_RXQ_INITIALIZED; efx_rx_qdestroy(rxq->common); diff --git a/drivers/net/sfc/sfc_rx.h b/drivers/net/sfc/sfc_rx.h index 4e1b4c6..b2ca1fa 100644 --- a/drivers/net/sfc/sfc_rx.h +++ b/drivers/net/sfc/sfc_rx.h @@ -61,8 +61,6 @@ enum sfc_rxq_state_bit { #define SFC_RXQ_INITIALIZED (1 << SFC_RXQ_INITIALIZED_BIT) SFC_RXQ_STARTED_BIT, #define SFC_RXQ_STARTED (1 << SFC_RXQ_STARTED_BIT) - SFC_RXQ_RUNNING_BIT, -#define SFC_RXQ_RUNNING (1 << SFC_RXQ_RUNNING_BIT) SFC_RXQ_FLUSHING_BIT, #define SFC_RXQ_FLUSHING (1 << SFC_RXQ_FLUSHING_BIT) SFC_RXQ_FLUSHED_BIT, @@ -79,16 +77,15 @@ struct sfc_rxq { /* Used on data path */ struct sfc_evq *evq; struct sfc_rx_sw_desc *sw_desc; - unsigned int state; + unsigned int flags; +#define SFC_RXQ_FLAG_STARTED 0x1 +#define SFC_RXQ_FLAG_RUNNING 0x2 +#define SFC_RXQ_FLAG_RSS_HASH 0x4 unsigned int ptr_mask; unsigned int pending; unsigned int completed; uint16_t batch_max; uint16_t prefix_size; -#if EFSYS_OPT_RX_SCALE - unsigned int flags; -#define SFC_RXQ_FLAG_RSS_HASH 0x1 -#endif /* Used on refill */ unsigned int added; @@ -102,6 +99,7 @@ struct sfc_rxq { /* Not used on data path */ unsigned int hw_index; + unsigned int state; }; static inline unsigned int