Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/128239/?format=api
{ "id": 128239, "url": "http://patchwork.dpdk.org/api/patches/128239/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/20230607015709.336420-5-chaoyong.he@corigine.com/", "project": { "id": 1, "url": "http://patchwork.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20230607015709.336420-5-chaoyong.he@corigine.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20230607015709.336420-5-chaoyong.he@corigine.com", "date": "2023-06-07T01:57:03", "name": "[04/10] net/nfp: add the insert metadata logic of NFDk", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "1dc94a121e139a7053d032ac1432a0208c83fff0", "submitter": { "id": 2554, "url": "http://patchwork.dpdk.org/api/people/2554/?format=api", "name": "Chaoyong He", "email": "chaoyong.he@corigine.com" }, "delegate": { "id": 319, "url": "http://patchwork.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "http://patchwork.dpdk.org/project/dpdk/patch/20230607015709.336420-5-chaoyong.he@corigine.com/mbox/", "series": [ { "id": 28380, "url": "http://patchwork.dpdk.org/api/series/28380/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=28380", "date": "2023-06-07T01:56:59", "name": "support rte_flow for flower firmware with NFDk", "version": 1, "mbox": "http://patchwork.dpdk.org/series/28380/mbox/" } ], "comments": "http://patchwork.dpdk.org/api/patches/128239/comments/", "check": "success", "checks": "http://patchwork.dpdk.org/api/patches/128239/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "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])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 9BAD242C45;\n\tWed, 7 Jun 2023 03:58:26 +0200 (CEST)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 7D34E42D3D;\n\tWed, 7 Jun 2023 03:58:02 +0200 (CEST)", "from NAM11-CO1-obe.outbound.protection.outlook.com\n (mail-co1nam11on2116.outbound.protection.outlook.com [40.107.220.116])\n by mails.dpdk.org (Postfix) with ESMTP id 190A242D35\n for <dev@dpdk.org>; Wed, 7 Jun 2023 03:58:01 +0200 (CEST)", "from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5)\n by PH7PR13MB5453.namprd13.prod.outlook.com (2603:10b6:510:138::5)\n with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6455.33; Wed, 7 Jun\n 2023 01:57:59 +0000", "from SJ0PR13MB5545.namprd13.prod.outlook.com\n ([fe80::d2cb:a650:e1ce:2174]) by SJ0PR13MB5545.namprd13.prod.outlook.com\n ([fe80::d2cb:a650:e1ce:2174%3]) with mapi id 15.20.6455.030; Wed, 7 Jun 2023\n 01:57:59 +0000" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=cwkHSn0pd/WVJE7ue2d2DinK2/ovrStdBuK4h2NNxQSQbPZZtBexmz37ikfcvq0tsenagTTlQHR2yhLhgXM1XJfv1TGRL95njYQVdHjgrO7BLaCayBTv8d4M259Jj871p47vVzNzzFKJMv5s8bXzwDzucVfUX17hGr3DlQc4/dZgmWBH1VWTBP6oRwuLVMR64f7u6nJNodDlzMYahpHC+QKwrE5iqSzV5Nm6qvS0rpkh/NH5j0E/T3L6DFMce7VhIr3xWEgOucbRhKfK9epZwl2R2Z3RHRPJQ7w8uZn/EmRwYSmpEdtxgLBhB/WtP8fIXGaGbxm26Wf5145Lr4HjTg==", "ARC-Message-Signature": "i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com;\n s=arcselector9901;\n 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;\n bh=nPmFhjSbwv5QpgeUFfQLKB3IkjZy2b7+bxlC1rgB8M4=;\n b=cFrxIG+YDD5rThFcLIIumPq58y5zZ2IeX3GLJPeD/6VUZhAplc967Jx4F5+IKEFyG6BmDOc2zPI59cJEh/i4nT7KIz80KYzGLner4+59r2mj9AUoHl2UJ/jrzwKoufddSIJKMkY2ryOaUcUgQfj//92ew/rvw2mE5n+t9KPOYSpH50jd+ajVcTB5A0K3VTKL5AS+PeFul/mnfV/ONyEZh9uowdEtoBrzKz5n1vikHNl14XirLlw8ztlUG2/OFIUsUrvbtZz70UUC02KziWsA3hYq4Oh3OdGUr+Hn9NCX+aCpupu3Y7+T4FB+ty/acRS96L7z/Vv9cqWKVdqVHZGLBQ==", "ARC-Authentication-Results": "i=1; mx.microsoft.com 1; spf=pass\n smtp.mailfrom=corigine.com; dmarc=pass action=none header.from=corigine.com;\n dkim=pass header.d=corigine.com; arc=none", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=corigine.onmicrosoft.com; s=selector2-corigine-onmicrosoft-com;\n h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;\n bh=nPmFhjSbwv5QpgeUFfQLKB3IkjZy2b7+bxlC1rgB8M4=;\n b=UULmocrC9Hcxx8YyAVIPue7w5qEW1ADePwOWr7Z+zAfUOoFkeAKjgtTbD8jJbwQ0sBY4IYm6D9Kd96NnRHsaVUJFvhS6MIQEpGDbKx5nKYuAU+0BjlyrfssbCpHxwH08If8fFxAxaNBz5KZOFTqQxtV68C/jemBi8xLtON7V2eM=", "Authentication-Results": "dkim=none (message not signed)\n header.d=none;dmarc=none action=none header.from=corigine.com;", "From": "Chaoyong He <chaoyong.he@corigine.com>", "To": "dev@dpdk.org", "Cc": "oss-drivers@corigine.com, niklas.soderlund@corigine.com,\n Chaoyong He <chaoyong.he@corigine.com>", "Subject": "[PATCH 04/10] net/nfp: add the insert metadata logic of NFDk", "Date": "Wed, 7 Jun 2023 09:57:03 +0800", "Message-Id": "<20230607015709.336420-5-chaoyong.he@corigine.com>", "X-Mailer": "git-send-email 2.39.1", "In-Reply-To": "<20230607015709.336420-1-chaoyong.he@corigine.com>", "References": "<20230607015709.336420-1-chaoyong.he@corigine.com>", "Content-Type": "text/plain; charset=UTF-8", "Content-Transfer-Encoding": "8bit", "X-ClientProxiedBy": "SG2PR02CA0131.apcprd02.prod.outlook.com\n (2603:1096:4:188::6) To SJ0PR13MB5545.namprd13.prod.outlook.com\n (2603:10b6:a03:424::5)", "MIME-Version": "1.0", "X-MS-PublicTrafficType": "Email", "X-MS-TrafficTypeDiagnostic": "SJ0PR13MB5545:EE_|PH7PR13MB5453:EE_", "X-MS-Office365-Filtering-Correlation-Id": "7e270682-cbb0-42c1-4716-08db66fa9e60", "X-MS-Exchange-SenderADCheck": "1", "X-MS-Exchange-AntiSpam-Relay": "0", "X-Microsoft-Antispam": "BCL:0;", "X-Microsoft-Antispam-Message-Info": "\n DfCvqNc0JglJWTCOW5aK3rf9xXIMltGxIaMIHiok8n1SkVFiw+bH/WpsohUZxCdfttWo12CShu6lsu2X1BU48kgeM0LEzeJeNMkz+KA1nbTBJUDgMergf+FNnjU3+hGN5We3AvNTJSi4Jv6IlIz6ztCfjonM+JtcyoK7qdhP+KCeKJvFvo0WLqXdcG/yk2qM4cmX1rMQTCBZ/oA+dCaKnI65nK8naMKs8ndMBndQJIuzZ/rgLzGGiyV5FFN5Myy0Cy/pDu48QbN4hM8SHCswbimy8qiJJK9sKifXnYkTtvYhbM9KFhDSp5vZ27VOhA6VbNOo9uosMy9RKkGWpdFDDtfxwQOM+39eXExtgvk1ek9lAwqw9lpoH1JslynnaES1gAG8pegmmwSWGbgl3CD7F8X661fKQ8F84TqLwJl6WvyF/+ckHLVLwdK9MQ116weXGTgfwvGteEeoRV0BUuHXlMtcnU6zaj38Elhr0SqRunoWm+ecqCfID8AoA+P87d13hMXTZlADgO6Di9CJ7I+IFDzKUI1lqv3hE7q4mdAcQ+EfLTeweaAYsM3B36/5xTYPlAZoq/O45l4SvfNfiZTZ4Vn90LTxA9vCqbV3OkqzvBFyqZDUsiaSaahCobNZ07ow", "X-Forefront-Antispam-Report": "CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:;\n IPV:NLI; SFV:NSPM; H:SJ0PR13MB5545.namprd13.prod.outlook.com; PTR:; CAT:NONE;\n SFS:(13230028)(4636009)(346002)(396003)(376002)(136003)(366004)(39840400004)(451199021)(107886003)(1076003)(6506007)(26005)(6512007)(36756003)(66574015)(83380400001)(38350700002)(86362001)(38100700002)(186003)(2616005)(8676002)(4326008)(41300700001)(44832011)(6916009)(478600001)(66946007)(66476007)(2906002)(316002)(8936002)(5660300002)(6486002)(52116002)(66556008)(6666004);\n DIR:OUT; SFP:1102;", "X-MS-Exchange-AntiSpam-MessageData-ChunkCount": "1", "X-MS-Exchange-AntiSpam-MessageData-0": "=?utf-8?q?WIby2mzzec1urvhUMP24cyUuAZfo?=\n\t=?utf-8?q?XtLU5sWaGCUWxBNPaes2YPOObAtS4m6KKr+MHHkGkp33kQP0V7C9tOfls4D/GUBoL?=\n\t=?utf-8?q?uCInYPArSUbsqiVcE2d5TSfkjbDNrAV2Rg323dL1won9SYME8KivM442kn81JxLrm?=\n\t=?utf-8?q?X2gI8/VdYjorfrfcGcO98UKth/NvCjw+UNfHWDKMlGOWrDP5nUUWzFAU/bDxsqXDr?=\n\t=?utf-8?q?QV1UABZqoH5ei09bPKExZDQRxb3BaMw5el/9kPKptHo/9OCF5kIewZXGDTWbi7xsC?=\n\t=?utf-8?q?FIZ0WhuZgqA+CTI9PfQifBkAxvHqdKQBwTkHwkBLaQsZyW4GYffmjUw0Fqjbnt4Wf?=\n\t=?utf-8?q?XnD82tM3ec9Ztfl6rRIVctrBLVRllzTeGtUCPZl7MsAnfw7bPgWE3p24IvxhCWtsF?=\n\t=?utf-8?q?im+7/Va0LXn4ipZG3aBJSAtr7p963AaoH0Fd66eQ5Rh+U6qCHgB3T/ZzNjzu/sJN7?=\n\t=?utf-8?q?BEFPmMrpukY7JMsL7mdAex37CXATMZdyFNOZ5tZYzJW0KKb4qQrqZ/woLPhJl5WCL?=\n\t=?utf-8?q?+wq3R21fa6kqeQ8bkb5g+Av/MD++rF4NLxkanfI9bQ0ITRE859XRICxy0cxL0bMdQ?=\n\t=?utf-8?q?OVDlT9y5aLQuW2j+yTPjI1suj13rdVf8XwszW1s+KVF+OGgy1FppvH4Hc3LNWv1xK?=\n\t=?utf-8?q?by3dsgRqaP0517uKDq87SHNEDIXJHmgFXw7Xu5QdeHj1UGf2llx7yhlR9FTkNlLiY?=\n\t=?utf-8?q?7TuOsh4dVQFyqjlqCuTCiyYHmqjm8Qyid5p5OinHsVSLCvN1vsbjvvYo+GJgFRSid?=\n\t=?utf-8?q?TBQHxh0WvGP6/fW9ogWKLd5i/SPTuQBT2sCapsDTD6G1d9OQDizp2BK5/QsKkHHRK?=\n\t=?utf-8?q?5PLwJKwEWR+NgHZopV+0TyggKA0VmCIpccEdrkv+AFwO4TiKf3eh07BvAQWBDZUzy?=\n\t=?utf-8?q?ub8gW97Jc36rZ2amUl3DBra54nPQqA0vAnb0qcBjdT64BWFLg9OzE4taYo8fVIie3?=\n\t=?utf-8?q?CMTrfIMu9SLPHR7v/QlQrw59+UtDCdfXPHrOvlb2zEuPljSLVtz/QBC9xGHZ7ylpV?=\n\t=?utf-8?q?lQpnhnBW5Rd9JLPC2FeV8DC4JlQFn+J5+MadC3RE/cmwAGByqO74LtlYSN5QdDw20?=\n\t=?utf-8?q?6VXBxHjVkZTUVc6tDdmPRNUEGkGaff086GzOSaZHgRWTOwOOMxy+MP3/n/HzlRlil?=\n\t=?utf-8?q?93Mlp9EhnSCzzbUQTaGiAdKvk3BeYDkPeFnhPwzAMOGrSch7xcBOCXTXlTJhRkThn?=\n\t=?utf-8?q?MlQTio9h2LBYb2Ig/16rG4pBVlX1k0DYaNCevJ04yb5agn6fMuMRtlQ2GkmirT9aN?=\n\t=?utf-8?q?0Af4srOMqjUF0KidX+b7izGYGP91DANGHBSHLhsOmvtTAMJtAqLkjo21kXNA4ezJq?=\n\t=?utf-8?q?rqVuinLgQprsZzcHjedph1fqVTEdtd6/Tb2ZFzSgyVH+2F0dWosqhs2uIauMadXXZ?=\n\t=?utf-8?q?aXGUUJu9PZ75zVLyN2PKTt/a3A16jTJDYJd3iff5nRCK5LLMIQaeTtgLwPuADMODA?=\n\t=?utf-8?q?2KjGC1DwwOlD5n0xRONH3+Ar95gwjTz9r3sLYWQZBI3m3rM9hc2kFx5FcCCF5rabO?=\n\t=?utf-8?q?ZXqkJNq0WgCDpyCbECRX7ikyluAwK1lXlQ=3D=3D?=", "X-OriginatorOrg": "corigine.com", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n 7e270682-cbb0-42c1-4716-08db66fa9e60", "X-MS-Exchange-CrossTenant-AuthSource": "SJ0PR13MB5545.namprd13.prod.outlook.com", "X-MS-Exchange-CrossTenant-AuthAs": "Internal", "X-MS-Exchange-CrossTenant-OriginalArrivalTime": "07 Jun 2023 01:57:59.0469 (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": "\n OloY/ZCtjv82ZpbSXVUvZTd4LATX9qF5KpM15pzqG6aaLOXjDckPskhukktJhIodJ6Y6L7FFuciM/Wu4RzTIGAFzAgKNYAgrd/VGVN29bvI=", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "PH7PR13MB5453", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org" }, "content": "NFD3 and NFDk have the same format metadata for the RX direction,\nwhile they are different for the TX direction.\n\nAdd the insert metadata logic of NFDk.\n\nSigned-off-by: Chaoyong He <chaoyong.he@corigine.com>\nReviewed-by: Niklas Söderlund <niklas.soderlund@corigine.com>\n---\n drivers/net/nfp/flower/nfp_flower.c | 8 +++++++-\n drivers/net/nfp/nfdk/nfp_nfdk.h | 2 ++\n drivers/net/nfp/nfdk/nfp_nfdk_dp.c | 18 ++++++++++++++++++\n 3 files changed, 27 insertions(+), 1 deletion(-)", "diff": "diff --git a/drivers/net/nfp/flower/nfp_flower.c b/drivers/net/nfp/flower/nfp_flower.c\nindex 3636c347bb..8631664180 100644\n--- a/drivers/net/nfp/flower/nfp_flower.c\n+++ b/drivers/net/nfp/flower/nfp_flower.c\n@@ -16,6 +16,7 @@\n #include \"../nfp_cpp_bridge.h\"\n #include \"../nfp_rxtx.h\"\n #include \"../nfd3/nfp_nfd3.h\"\n+#include \"../nfdk/nfp_nfdk.h\"\n #include \"../nfpcore/nfp_mip.h\"\n #include \"../nfpcore/nfp_rtsym.h\"\n #include \"../nfpcore/nfp_nsp.h\"\n@@ -1061,11 +1062,16 @@ nfp_flower_enable_services(struct nfp_app_fw_flower *app_fw_flower)\n static void\n nfp_flower_pkt_add_metadata_register(struct nfp_app_fw_flower *app_fw_flower)\n {\n+\tstruct nfp_net_hw *hw;\n \tstruct nfp_flower_nfd_func *nfd_func;\n \n+\thw = app_fw_flower->pf_hw;\n \tnfd_func = &app_fw_flower->nfd_func;\n \n-\tnfd_func->pkt_add_metadata_t = nfp_flower_nfd3_pkt_add_metadata;\n+\tif (hw->ver.extend == NFP_NET_CFG_VERSION_DP_NFD3)\n+\t\tnfd_func->pkt_add_metadata_t = nfp_flower_nfd3_pkt_add_metadata;\n+\telse\n+\t\tnfd_func->pkt_add_metadata_t = nfp_flower_nfdk_pkt_add_metadata;\n }\n \n uint32_t\ndiff --git a/drivers/net/nfp/nfdk/nfp_nfdk.h b/drivers/net/nfp/nfdk/nfp_nfdk.h\nindex c39501990a..0e3c6cc90d 100644\n--- a/drivers/net/nfp/nfdk/nfp_nfdk.h\n+++ b/drivers/net/nfp/nfdk/nfp_nfdk.h\n@@ -227,6 +227,8 @@ nfp_net_nfdk_tx_tso(struct nfp_net_txq *txq,\n \treturn txd.raw;\n }\n \n+uint32_t nfp_flower_nfdk_pkt_add_metadata(struct rte_mbuf *mbuf,\n+\t\tuint32_t port_id);\n uint16_t nfp_net_nfdk_xmit_pkts(void *tx_queue,\n \t\tstruct rte_mbuf **tx_pkts,\n \t\tuint16_t nb_pkts);\ndiff --git a/drivers/net/nfp/nfdk/nfp_nfdk_dp.c b/drivers/net/nfp/nfdk/nfp_nfdk_dp.c\nindex 9b815800bb..59c507e03b 100644\n--- a/drivers/net/nfp/nfdk/nfp_nfdk_dp.c\n+++ b/drivers/net/nfp/nfdk/nfp_nfdk_dp.c\n@@ -12,8 +12,26 @@\n #include \"../nfp_rxtx.h\"\n #include \"../nfpcore/nfp_mip.h\"\n #include \"../nfpcore/nfp_rtsym.h\"\n+#include \"../flower/nfp_flower.h\"\n+#include \"../flower/nfp_flower_cmsg.h\"\n #include \"nfp_nfdk.h\"\n \n+uint32_t\n+nfp_flower_nfdk_pkt_add_metadata(struct rte_mbuf *mbuf,\n+\t\tuint32_t port_id)\n+{\n+\tuint32_t header;\n+\tchar *meta_offset;\n+\n+\tmeta_offset = rte_pktmbuf_prepend(mbuf, FLOWER_PKT_DATA_OFFSET);\n+\theader = NFP_NET_META_PORTID << NFP_NET_META_NFDK_LENGTH | FLOWER_PKT_DATA_OFFSET;\n+\t*(rte_be32_t *)meta_offset = rte_cpu_to_be_32(header);\n+\tmeta_offset += NFP_NET_META_HEADER_SIZE;\n+\t*(rte_be32_t *)meta_offset = rte_cpu_to_be_32(port_id);\n+\n+\treturn FLOWER_PKT_DATA_OFFSET;\n+}\n+\n static inline uint16_t\n nfp_net_nfdk_headlen_to_segs(uint16_t headlen)\n {\n", "prefixes": [ "04/10" ] }