From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 2684CA0C3F; Wed, 28 Apr 2021 16:17:20 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9157F40697; Wed, 28 Apr 2021 16:17:19 +0200 (CEST) Received: from shelob.oktetlabs.ru (shelob.oktetlabs.ru [91.220.146.113]) by mails.dpdk.org (Postfix) with ESMTP id 87E5D40147 for ; Wed, 28 Apr 2021 16:17:18 +0200 (CEST) Received: by shelob.oktetlabs.ru (Postfix, from userid 122) id 29ECB7F5B0; Wed, 28 Apr 2021 17:17:18 +0300 (MSK) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shelob.oktetlabs.ru X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=ALL_TRUSTED, DKIM_ADSP_DISCARD, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from aros.oktetlabs.ru (aros.oktetlabs.ru [192.168.38.17]) by shelob.oktetlabs.ru (Postfix) with ESMTP id 9FA6B7F515; Wed, 28 Apr 2021 17:17:10 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 shelob.oktetlabs.ru 9FA6B7F515 Authentication-Results: shelob.oktetlabs.ru/9FA6B7F515; dkim=none; dkim-atps=neutral From: Andrew Rybchenko To: dev@dpdk.org Cc: Andy Moreton , Ivan Malov Date: Wed, 28 Apr 2021 17:17:02 +0300 Message-Id: <20210428141702.2172676-1-andrew.rybchenko@oktetlabs.ru> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH] net/sfc: fix mark support in EF100 native Rx datapath X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 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" Decouple user mark from user flag. Usage of mark does not require to use flag as well. Flag is not actually supported yet. Fixes: 1aacc3d388d3 ("net/sfc: support user mark and flag Rx for EF100") Cc: stabledpdk.org Signed-off-by: Andrew Rybchenko Reviewed-by: Andy Moreton Reviewed-by: Ivan Malov --- drivers/net/sfc/sfc_ef100_rx.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/drivers/net/sfc/sfc_ef100_rx.c b/drivers/net/sfc/sfc_ef100_rx.c index 07b37ff47f..8cde24c585 100644 --- a/drivers/net/sfc/sfc_ef100_rx.c +++ b/drivers/net/sfc/sfc_ef100_rx.c @@ -46,6 +46,9 @@ ((_ndesc) - 1 /* head must not step on tail */ - \ 1 /* Rx error */ - 1 /* flush */) +/** Invalid user mark value when the mark should be treated as unset */ +#define SFC_EF100_USER_MARK_INVALID 0 + struct sfc_ef100_rx_sw_desc { struct rte_mbuf *mbuf; }; @@ -365,7 +368,6 @@ static const efx_rx_prefix_layout_t sfc_ef100_rx_prefix_layout = { SFC_EF100_RX_PREFIX_FIELD(LENGTH, B_FALSE), SFC_EF100_RX_PREFIX_FIELD(RSS_HASH_VALID, B_FALSE), - SFC_EF100_RX_PREFIX_FIELD(USER_FLAG, B_FALSE), SFC_EF100_RX_PREFIX_FIELD(CLASS, B_FALSE), SFC_EF100_RX_PREFIX_FIELD(RSS_HASH, B_FALSE), SFC_EF100_RX_PREFIX_FIELD(USER_MARK, B_FALSE), @@ -404,12 +406,16 @@ sfc_ef100_rx_prefix_to_offloads(const struct sfc_ef100_rxq *rxq, ESF_GZ_RX_PREFIX_RSS_HASH); } - if ((rxq->flags & SFC_EF100_RXQ_USER_MARK) && - EFX_TEST_OWORD_BIT(rx_prefix[0], ESF_GZ_RX_PREFIX_USER_FLAG_LBN)) { - ol_flags |= PKT_RX_FDIR_ID; + if (rxq->flags & SFC_EF100_RXQ_USER_MARK) { + uint32_t user_mark; + /* EFX_OWORD_FIELD converts little-endian to CPU */ - m->hash.fdir.hi = EFX_OWORD_FIELD(rx_prefix[0], - ESF_GZ_RX_PREFIX_USER_MARK); + user_mark = EFX_OWORD_FIELD(rx_prefix[0], + ESF_GZ_RX_PREFIX_USER_MARK); + if (user_mark != SFC_EF100_USER_MARK_INVALID) { + ol_flags |= PKT_RX_FDIR_ID; + m->hash.fdir.hi = user_mark; + } } m->ol_flags = ol_flags; @@ -794,8 +800,7 @@ sfc_ef100_rx_qstart(struct sfc_dp_rxq *dp_rxq, unsigned int evq_read_ptr, rxq->flags &= ~SFC_EF100_RXQ_RSS_HASH; if ((unsup_rx_prefix_fields & - ((1U << EFX_RX_PREFIX_FIELD_USER_FLAG) | - (1U << EFX_RX_PREFIX_FIELD_USER_MARK))) == 0) + (1U << EFX_RX_PREFIX_FIELD_USER_MARK)) == 0) rxq->flags |= SFC_EF100_RXQ_USER_MARK; else rxq->flags &= ~SFC_EF100_RXQ_USER_MARK; -- 2.30.2