From patchwork Tue Feb 20 08:14:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 136889 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 5408043B51; Tue, 20 Feb 2024 09:15:30 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C995940A67; Tue, 20 Feb 2024 09:15:19 +0100 (CET) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2093.outbound.protection.outlook.com [40.107.93.93]) by mails.dpdk.org (Postfix) with ESMTP id 49BF14067A; Tue, 20 Feb 2024 09:15:18 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hwz5Wu7IpvbBmnD73xPOplVCMaRnIn5N/+k2to2T0634qW7WByPzjmZl2MehFxUP+RKmOP3XHjC42ztE1Jn+sru4yJm7kEHPGsMCS28njvCFNm4y7gxR0rKFb4BDaEPtDUH2hiaeQ4pl7CGM78ustRG5s0zgTCjyIyueo6USyST7IkVhQdXLqjkbpD19ZxRm4SnEWUSOnh4O2UlYrlCHXxgfPB9UxT9PqIWqbMm2DAo3xAAyrQLBbAHg0Fbq3mihqyFwdtiSQTVI4+4dwieEsS8a1zDcorravx6QaZWdII06TYVL/47DjZvQW9WNbRnRUjgKN2hhxrD7nVDX68vyzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=teaSL/IdWpRH5V0PhqXSOAAIlfIk6+TxDO/PNnp43kk=; b=JBetavn5Pr+CmCq0/R2zPxJMxEzvsNwVQ5efveC3lGzFht3YvufjphM1JygZscbj+GRNtYZqCbb5ZCpxoLG5ln329QPIY65W4JJy6Nxk34K7a37EeKsbIw8KJgwtxbSr44QQuxerb8ijU1GQyRbLXaAFSsZscSAST9xnQ2c+PQ0ezFPMSassUUx1q99NWErpZZ3x2HFd+vT7l7DzOcj3rKULixlmaOGqOt4OIOxcZ9XgyLn+K7MgvDjBhPgwZ2I17wu0osDvcm6+CboLv3Kdu03yPSuTLIBjIJEiF8zg0pNnAa7pmiYG2I5LoS3b29emYTPK+ilie40GTiN/OKiGzA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=corigine.com; dmarc=pass action=none header.from=corigine.com; dkim=pass header.d=corigine.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=corigine.onmicrosoft.com; s=selector2-corigine-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=teaSL/IdWpRH5V0PhqXSOAAIlfIk6+TxDO/PNnp43kk=; b=Y2HxlBsCoJNc3fMLrTLGa0mml30MBuHth+a0GBLCzUa5v6pU33eXHKGua1+UzEUfmoCk3Sz/lCCA98zOYN+DG7cVdu8cfmU1KRses1dbIDP+KPyMU4D2nHHml4GrINzfCevaEdh1lATPo3TWYUrLMdc6embkk1HVhpEoKYVXvog= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=corigine.com; Received: from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) by BY5PR13MB3874.namprd13.prod.outlook.com (2603:10b6:a03:220::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7292.39; Tue, 20 Feb 2024 08:15:17 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::8e02:f738:570a:f8aa]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::8e02:f738:570a:f8aa%7]) with mapi id 15.20.7292.036; Tue, 20 Feb 2024 08:15:17 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , peng.zhang@corigine.com, stable@dpdk.org, Long Wu Subject: [PATCH 2/2] net/nfp: fix meta data process problem of NFDk Date: Tue, 20 Feb 2024 16:14:51 +0800 Message-Id: <20240220081451.2640526-3-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20240220081451.2640526-1-chaoyong.he@corigine.com> References: <20240220081451.2640526-1-chaoyong.he@corigine.com> X-ClientProxiedBy: SJ0PR13CA0206.namprd13.prod.outlook.com (2603:10b6:a03:2c3::31) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|BY5PR13MB3874:EE_ X-MS-Office365-Filtering-Correlation-Id: 95df04c0-cc8b-4d07-6e2b-08dc31ec123f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: nW9McGO/11jxfY7jWi5AIgWwjJd0SOvYiFGfQZ3rtvdtEWVKZJndiw13qQVBGVL3obUIbodU6hXLodg1svTCrUaAl0vqFLL3z4fGm0/cxTw0oPh4FAUpeAtPezEBRTvaB1u6ah7sNf+OdYd0Zrv7VGkaJoo6iS7VLCDKU/hoEn9DnweyBw/PvcbxYxn2R5sl7DUuOlnGgmmVaZm4MjhTOu3vEG14mEb5UuXVC13hjafTqAuC9vM9wZVGk4z+EuC81/PfCl07UN6/O0AARC/kVn84w3wawpz9scaf2RQqOREnADCRV88uNwM0fjFpD4MmpL3l3BnhVU5ib/igxKGYTJ1SPwLh9rWeQajB8Z67c69ZKLTP86MYo3rn7bb3UuajCMSeLIwo/WTQy+xvlok+T9jh+rMLtJTvJxq71+i7/f9PNa0SgPywkBaklGvL1HM6t7Z5QkWChMCwKqrCMtotRQcqBwRl/8mAoval0SJUT6h+A4LPpJBTo3B94WNaLN5znXZocJAjKrb9n7gHJ+R/4PLciyq44uoQeJO+HaQt+TWrJailUFH7fTh4DLp5+CqhkP4stUlNJsdXklKcPt1Fy34PP6XFZZ2otw6lN3mGX1DIS44qGDSvFlj07XWHCBh2 X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SJ0PR13MB5545.namprd13.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(38350700005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ViOkvq5xvqyaZvMDlTKjxy6QnBlbWWfN2PlviMnKLGBYMWNzSQJsX1r5xSSHKHbH0BMj4N5THUI3j8wpzye2bbhCsmWzCwH/x1+jSDSg22H+qQx3rVhzoisyaQ+Snfv/uUyYq7ZnIH2JSc3tRvmoqHyVTuH+YBT7ApeaZU1euO05ErcCjGCT1ahskpSpfkgrpZvV9ZsXfMYF59wpWZmiBDrHFHODzF0yq4QWg3xZNWYR+8S9aiwTgU4moxtxjt9Y3oWBh6Tp0SPMtre14oCZ7bnzPrgd0etuoPWAyHSTYZjKSZQwgUM7tqg9Y/vgLvMr5ffGYRHvsdRvZ4duIcT0qPtAKjhlE27P0NVsITJ4ixzgv5lzRPHJDpq5Ce41fBYdU0j7F8DotNexm8qC6o1PAtgn1P+dYT9BNcWetviaJmSAkINMYwv24cVcRhNUFEGw7L70aoIuel8zZO6bDy2uMGJtWbiqGRxNLOHE9TF4TY47zSDLpXmZhf/YDW693qd5ooZeKWPYnro9t2yDbyDQ4nRnTfS5EwYJnMVZXL0jaVbVPvnY7lXG75l6WQaMAFzW6eYELF4qkwKaO4CxRupjInoaFih9S3SfEYpohUwffkTHJ9EZqOFn+mDoh4ZV67hFrfvm6a20Vi9gpQxIu/IMgDYwCi7Km7bzpxObPbkbp1Y3gSLZ83InnEzb9lGBjyTbZdJAZoUjiJPsDtSHGuAhKoHY75h3Ugf03NPg01dlfuQO73RR4oLo3b5IrHqSWnq9xiDzyIQUPaPZIlIo2fTAN966jNzCdFHafE50+FEVLLMnxLHcabN77F/PFJ5v3CInIhwIG5mP7S8uRDbrM70Vnhn400UzdpTy6RTXVSZIUw3KLFJ3q3xJP2bvStWh4dJDjyr8tQP1up6N5so4Kh7fvMpNj5G8F/1eWoRXC898NXJP/s7njFgURwexG+u4nIoRJeyLug9+XUOaMguGbwgorNMFaK6PRuJMCVoKS6SB4TIJm0/E2bAEAc8GwmIvKUarbwaC73oOMJNhA0rF9IMMTFXyHZEKQ5YcFpCt1w5/eUGlopcIXNCjNAPuOvDjH/buWgDmwyZAYQQCg/9keFTJQkjnsbka8nNqzmh2UlWao4YVkvdwQYBulaIXp+0zc7TB2LZ+iAVaDL7KJIY1GHrhM3h3fBuQ1r8gZUwUFUlysJXZcBs5DR0FV3sfXWOZCxJMOVRYSKUhJXwZVjIDxibw78VdKwmyxI2XT4+cxXa5Ro5oYal/mv+UfRmpDFRMmNZBR4maZs5caZfodc3GNMwhq8ErwX6X3AC8EHDD5QBT+LIEIe4mGtd0MdN1PJl6XLGY2be2ZoLKMEZ4AnwxK8GKH49wp9K/pAk9xrpK7dqNNLMBxp2TaLuoKc7aYNRYlcQVTTpzwhP87RW3xH/xYV1vlQFu4fMXw+EOPZCIYFleI7ihdt/rX2lfY6dc17anTsT7N8FQrjeYr7MEbr/qttXDF5yw5JlwxP5qRVEau+QVBFBM3EAh4yHUHdYfcAodqfmtOZWY48EbIsTx4E4yO8pwX/HfGrNod1u/JOiYeE2X2j9DJVbItFmv9IgMHEXzQWT0rjQvmhtl+cBImLIlyGXp2w== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 95df04c0-cc8b-4d07-6e2b-08dc31ec123f X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Feb 2024 08:15:17.0706 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: fe128f2c-073b-4c20-818e-7246a585940c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 8jdw959zRyxBTILbYjUWW5wRIOjlH1iRGcRYDABhgeMptUYymaV6GJPpFqE6qdY3WCsKlVJ6JKoPi3x9i1/aFK5mhU92LBME9mMSd+iBq+k= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR13MB3874 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 The Tx function can not check if the meta data process success for the process function with void return type. Fix it by change the return type of the meata data function from void to integer and add the error handle logic in the Tx function. Fixes: 7c82b8626af8 ("net/nfp: support VLAN insert with NFDk") Cc: peng.zhang@corigine.com Cc: stable@dpdk.org Signed-off-by: Chaoyong He Reviewed-by: Long Wu Reviewed-by: Peng Zhang --- drivers/net/nfp/nfdk/nfp_nfdk_dp.c | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/drivers/net/nfp/nfdk/nfp_nfdk_dp.c b/drivers/net/nfp/nfdk/nfp_nfdk_dp.c index a1c6ecdfe5..daf5ac5b30 100644 --- a/drivers/net/nfp/nfdk/nfp_nfdk_dp.c +++ b/drivers/net/nfp/nfdk/nfp_nfdk_dp.c @@ -169,7 +169,7 @@ nfp_net_nfdk_tx_maybe_close_block(struct nfp_net_txq *txq, return nop_slots; } -static void +static int nfp_net_nfdk_set_meta_data(struct rte_mbuf *pkt, struct nfp_net_txq *txq, uint64_t *metadata) @@ -206,8 +206,10 @@ nfp_net_nfdk_set_meta_data(struct rte_mbuf *pkt, meta_data.length += 3 * NFP_NET_META_FIELD_SIZE; } - if (meta_data.length == 0) - return; + if (meta_data.length == 0) { + *metadata = 0; + return 0; + } meta_type = meta_data.header; header_offset = meta_type << NFP_NET_META_NFDK_LENGTH; @@ -223,15 +225,16 @@ nfp_net_nfdk_set_meta_data(struct rte_mbuf *pkt, case NFP_NET_META_VLAN: if (vlan_layer > 0) { PMD_DRV_LOG(ERR, "At most 1 layers of vlan is supported"); - return; + return -EINVAL; } + nfp_net_set_meta_vlan(&meta_data, pkt, layer); vlan_layer++; break; case NFP_NET_META_IPSEC: if (ipsec_layer > 2) { PMD_DRV_LOG(ERR, "At most 3 layers of ipsec is supported for now."); - return; + return -EINVAL; } nfp_net_set_meta_ipsec(&meta_data, txq, pkt, layer, ipsec_layer); @@ -239,13 +242,15 @@ nfp_net_nfdk_set_meta_data(struct rte_mbuf *pkt, break; default: PMD_DRV_LOG(ERR, "The metadata type not supported"); - return; + return -ENOTSUP; } memcpy(meta, &meta_data.data[layer], sizeof(meta_data.data[layer])); } *metadata = NFDK_DESC_TX_CHAIN_META; + + return 0; } uint16_t @@ -292,6 +297,7 @@ nfp_net_nfdk_xmit_pkts_common(void *tx_queue, /* Sending packets */ while (npkts < nb_pkts && free_descs > 0) { + int ret; int nop_descs; uint32_t type; uint32_t dma_len; @@ -319,10 +325,13 @@ nfp_net_nfdk_xmit_pkts_common(void *tx_queue, temp_pkt = pkt; - if (repr_flag) + if (repr_flag) { metadata = NFDK_DESC_TX_CHAIN_META; - else - nfp_net_nfdk_set_meta_data(pkt, txq, &metadata); + } else { + ret = nfp_net_nfdk_set_meta_data(pkt, txq, &metadata); + if (unlikely(ret != 0)) + goto xmit_end; + } if (unlikely(pkt->nb_segs > 1 && (hw->super.ctrl & NFP_NET_CFG_CTRL_GATHER) == 0)) {