Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/118384/?format=api
{ "id": 118384, "url": "http://patches.dpdk.org/api/patches/118384/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1666092434-10357-9-git-send-email-chaoyong.he@corigine.com/", "project": { "id": 1, "url": "http://patches.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": "<1666092434-10357-9-git-send-email-chaoyong.he@corigine.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1666092434-10357-9-git-send-email-chaoyong.he@corigine.com", "date": "2022-10-18T11:26:57", "name": "[v4,08/25] net/nfp: support IPv4 flow item", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "13d364d1cb2e28f3f878b387ec652d11f60d7ff6", "submitter": { "id": 2554, "url": "http://patches.dpdk.org/api/people/2554/?format=api", "name": "Chaoyong He", "email": "chaoyong.he@corigine.com" }, "delegate": { "id": 319, "url": "http://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/1666092434-10357-9-git-send-email-chaoyong.he@corigine.com/mbox/", "series": [ { "id": 25281, "url": "http://patches.dpdk.org/api/series/25281/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=25281", "date": "2022-10-18T11:26:49", "name": "add the basic rte_flow offload support of nfp PMD", "version": 4, "mbox": "http://patches.dpdk.org/series/25281/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/118384/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/118384/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 7203DA0560;\n\tTue, 18 Oct 2022 13:28:39 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 2C5C142825;\n\tTue, 18 Oct 2022 13:27:53 +0200 (CEST)", "from NAM11-BN8-obe.outbound.protection.outlook.com\n (mail-bn8nam11on2100.outbound.protection.outlook.com [40.107.236.100])\n by mails.dpdk.org (Postfix) with ESMTP id DDD0042825\n for <dev@dpdk.org>; Tue, 18 Oct 2022 13:27:50 +0200 (CEST)", "from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5)\n by CO3PR13MB5686.namprd13.prod.outlook.com (2603:10b6:303:179::20)\n with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5746.16; Tue, 18 Oct\n 2022 11:27:49 +0000", "from SJ0PR13MB5545.namprd13.prod.outlook.com\n ([fe80::7c26:1a0b:2825:6f4b]) by SJ0PR13MB5545.namprd13.prod.outlook.com\n ([fe80::7c26:1a0b:2825:6f4b%4]) with mapi id 15.20.5723.014; Tue, 18 Oct 2022\n 11:27:49 +0000" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=N2tn9g7nNuiypdAyLCq3TgZkCRyje0VWxOsdEBxaJk/3JZ2M5kgVK3j9zQHBVRYZBnGtSN419uCKkIzfBP63XDkrjHzmZTT5FXykmk0HaFtFTi9S3y88IAIo24UBGaibF6Rh/PxWDvviMtKKUOey8TSJZBIrc+QjfcqqXBouM8LR06seWtnrGffymbqLR1kmUKHVcF6eiW7Bx1nbJrdjmJDJZognLmNMaWbmpcwBH4QIJFv2PSv4ejTbOZfoCcmA4jKvTgfD4Nao9izLXbLM0gMB/UJKR/+vrMZ2fjQQZKfyqM3dqgT44sojSdqf6lPbhnSul4b1sEX0TFNKdT4GwA==", "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=+NEVMev4lb1YcJnFYlizjapQKja5zd/AZRvaZW9fla4=;\n b=aUB7vdto+z+9z4ldTWZoQsy3RwdlbrwUCmlLEp/YqYoE1o2m10YMhFE4xeT3tNKWlC0S+ELGLMjlXuojyXceC0ocBi1uJcxAzHamGisSP2Cg7uyI4GzhtLJkWwYpCvwwJcj6POJc9/DSuHCoXK2p3ozQwyVLodC77zcLJ1SwH1NDXB4IsIcJ/SHJEqFiTnUT5zv1raKmUUrQUaajk9vu9F2GUg0QcAgP/lbIcbzA5Agd1A9PcmSsqOkpQ4YF5iNuOEAdoEjdq/8qGWbvMV4eFpgqKPhHnPoHAyLh+KQxAe9nR0MS8QYFQycM/c9TkBHpUi407iwtAS0K7tb57Uv4fw==", "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=+NEVMev4lb1YcJnFYlizjapQKja5zd/AZRvaZW9fla4=;\n b=VmJklV+L7Rl7Z5Ac6n7yB5j9p9mFtPrzN+TgrMuwwtvleikp+TBBjxhFYInEf7vC0SK0iKH6oo9Adb1Aa9xVEOv2X6ghaKVlRbQVZg49D9/5ATlm2C6zdvgDXlIf//FluXcF/Ze+ufeYyTyFwANCMXRf6seiNmSElORif/TVCpw=", "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 v4 08/25] net/nfp: support IPv4 flow item", "Date": "Tue, 18 Oct 2022 19:26:57 +0800", "Message-Id": "<1666092434-10357-9-git-send-email-chaoyong.he@corigine.com>", "X-Mailer": "git-send-email 1.8.3.1", "In-Reply-To": "<1666092434-10357-1-git-send-email-chaoyong.he@corigine.com>", "References": "<1666092434-10357-1-git-send-email-chaoyong.he@corigine.com>", "Content-Type": "text/plain; charset=UTF-8", "Content-Transfer-Encoding": "8bit", "X-ClientProxiedBy": "SG2PR02CA0052.apcprd02.prod.outlook.com\n (2603:1096:4:54::16) 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_|CO3PR13MB5686:EE_", "X-MS-Office365-Filtering-Correlation-Id": "3972b8cb-ef24-44de-739d-08dab0fbc996", "X-MS-Exchange-SenderADCheck": "1", "X-MS-Exchange-AntiSpam-Relay": "0", "X-Microsoft-Antispam": "BCL:0;", "X-Microsoft-Antispam-Message-Info": "\n MfZAd3kahvz1vEON6r7UGN7y54U8Py8UJJ4/lygJI11klAD6FMgt4TBU69sImBlClL0QlxIuJ/z31qTzjIrlvxGVtzus20ae+ee7lG2/71GyDlz+5FEr4vz/1bGLwbqW2TUF3Ke4BeWU+sTBKA8crIdQgzqhcpKrQHmLrUd0Uz9Eyf86Up/LexONPldXlbw6KYpP0nTIH8E7R12fg+lvVbNCy+PrtIgpv+gZoNNIE2KpfsZ9lvZl8Ms/4RuU/IDqIpFg5O9RwnhiqTGWh3gPfbwIS+7tuW2AvQyDmM1VJqcdzOzZAWqiokCIubw9bW2ec2lWSQcxSIKE2CIG8k5FnAolST5aprfp26B9mdMULPbeM/htCERh47fpYIQsFFWVwH84kM8ANlHbmhaManB61oumJ3cjNQHcEFkEJZvjgnPPOI56BuyeDXGBQPAbUTofMf2D1SysQFosOoOQ89pkJKKkoPgWHvdwrtzkyBQdQB6O4xIAM5bemT9Sw63WjWCnc/sfZmq2bOQLwry9hqcMsoH2AzjuO9PimnS2LB8SYqWqHYtzb/SRZZUeE1Cq6xMUhxXAibyFsJC5ei+fdvj75Zqym9k5Mm79ZHozVdkEuIq25Zs5JihHDerUcElcDQ7QBCF9LyYSF9soFA+ElJg1i8M0pMtLOiMtGWSw9cG1XwNrDiJLq8HVVbOv3FH2UnOB1qs1HZU6j7pG0fSqHLwFP0TAFpAHRUnE17U3XVd0Rp8aZAZPgT2oDw9kEvh1Hf/vokr4hvX9SkgWQXVUKUGz4O9XPlsXJfvgSY9Yuqnci1R6p6gXpSM1Q8Leb5ID/3qb", "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:(13230022)(4636009)(346002)(366004)(39840400004)(396003)(136003)(376002)(451199015)(38350700002)(38100700002)(2906002)(66574015)(41300700001)(316002)(66946007)(66556008)(66476007)(83380400001)(4326008)(8676002)(6916009)(86362001)(44832011)(2616005)(8936002)(186003)(36756003)(5660300002)(6506007)(107886003)(6666004)(6486002)(478600001)(26005)(6512007)(52116002);\n DIR:OUT; SFP:1102;", "X-MS-Exchange-AntiSpam-MessageData-ChunkCount": "1", "X-MS-Exchange-AntiSpam-MessageData-0": "=?utf-8?q?7T/IBlRvsCN984ENxSVAtUZ2a7jT?=\n\t=?utf-8?q?6p4uYCBbmm5NkXZPyc25AXP6t/WRWUASql9GQUtNjgVZuCuyQl/LSagO6/CQ7pIeg?=\n\t=?utf-8?q?TTlQBkns8yiYdPCHfCFFsC5A9gKp+6IG2gV1C4PFfkosTE9Mtz7D1d5y7ev/cbVoT?=\n\t=?utf-8?q?HUzp+NBm8RLvBammc62rYQ9IRI01Cf2PdAQb/7M+FsGGoHBFwIi6kEmf4fAqub/bl?=\n\t=?utf-8?q?avKeOuNft0kZRVXTKdNX/5E4damU4lNHoqAINMKLj8N4HcPJ+8ywSI3qBbIxYRbWw?=\n\t=?utf-8?q?jEtYlFqp1vZg07AS0crPGHvbI0cT63Wsf+ccy5dp/6ik85oStG3x1o+Ngnt9HlXJt?=\n\t=?utf-8?q?Mn9MRfos1WVhB3OdjUxZ68+ErjZqab51RtmVsA5eBSrEKH9E1wArcbDOc76kce0yH?=\n\t=?utf-8?q?ygg7Bi8rFWEe03qIjcGs0S2CGoP6cUC0WzFWbik3T3Qfx+NGmGcXuhybxJcnKkFTK?=\n\t=?utf-8?q?Tv3pL8RCYOpB0bpTeCIkYeDUQWGnriGQ8YgvhFZTBsrv5kSITP9c+1uhvRn4gDQiu?=\n\t=?utf-8?q?9SmN9db9mK/2eQ9UIRmf61kKzC5rNFjcL8GuKys9Wf0SnBHWVEqep0eUhPScpd32N?=\n\t=?utf-8?q?ba+1NzyId6xwaYR5zFMtHgbLXx21UNFzPBEgb6omaR3bBvUwp6c1obW7F1aSN0hJ0?=\n\t=?utf-8?q?UPseUfMWNEcO0ltqUvrKZ7Ay7U9tgZBM2LdwKQlZh8193ZR5YR2maUnm42ZOrSJXj?=\n\t=?utf-8?q?XwshOkYlj38zp3ViLvEM/Pzd6uRzIfcGkcESmrnn1mqf65MGhBCJUUs2bqR8tR6QL?=\n\t=?utf-8?q?QpTVg9kwq8J+kxC6sITTqX7vrSOir8Z9WGFoROIdtpfCC+LYxfE2ikYiSA3hb+3aI?=\n\t=?utf-8?q?YTK7S9WxrpAOf4OI9XiNGn8TP+suyI3q2emyuczaEcyKsaDAS3pCEFG8DGmD/T5Dd?=\n\t=?utf-8?q?ssLnPaZY/Bh+MgJXHddH7P8H2K4kgVYWz2mmEjtoaKoRvHASmvnEblJgrF4DRNqfw?=\n\t=?utf-8?q?UMA+qUIGvuhpYGuXSV67RSWKqs5/aAgn7L4MRdK74V3sUpJLaDaWVWN9r5aNkcfbG?=\n\t=?utf-8?q?ANkn0A9Ucq2qwhlTXHAE4i6ZOh72ybOlwgmqGmpYZrwzzbpaqqvhmxCRyK0iJ4qf2?=\n\t=?utf-8?q?WpL+o5cCtjdkomOTI+9qcJE7PnkuXwlNdDl9sAzG1i6pGgqadqQjhQjk/8wkJzhhV?=\n\t=?utf-8?q?MJuF6sOlpQga+U9wkYX0UicXeFCFFd8IDGO5Yvm0CfH0PgDV84eIWeIvMuqW/6gbT?=\n\t=?utf-8?q?pjsXJ1z6rcsBpWr6RZ36OOTGBwy6tDK1iSlVDnO/s/kXAGywK81E9tFh1UYlY76Ms?=\n\t=?utf-8?q?9WhFhcraxz7M+1XGaI0BlfDDH311NHS49L5O9cKHIIN5eQ/kUxKU1mZmhg6m7XZfr?=\n\t=?utf-8?q?Edc+BjVmbf0e57JL/NhjjQRVfqXz77/wPTCOwO6QqIetgZYsQIrA2ZN9z+ayHm3IK?=\n\t=?utf-8?q?N1XHVR7lM2a8bNIDeL7R5q+AICBMMyJIM15GeHSc2kT1jpr/8+9X4sUuX3yJdwW0W?=\n\t=?utf-8?q?myxpu6vIW2RxOqstt60sfjBauVla4fKIin8BfVmWnu/uu+MlTXp2lhOqzc7SN2+ql?=\n\t=?utf-8?q?Fr+1gzrqhfWG8yh9uVc0dMVaQUiAZc6KyQ=3D=3D?=", "X-OriginatorOrg": "corigine.com", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n 3972b8cb-ef24-44de-739d-08dab0fbc996", "X-MS-Exchange-CrossTenant-AuthSource": "SJ0PR13MB5545.namprd13.prod.outlook.com", "X-MS-Exchange-CrossTenant-AuthAs": "Internal", "X-MS-Exchange-CrossTenant-OriginalArrivalTime": "18 Oct 2022 11:27:49.4831 (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 HJHpVjamRmo183JRSC2ayQCxWmGIDGKS1qA0819byveW1RtqNAkErx+aKmYp61QFPQv0Lna7eUke8t5MnobzxKJPQRhJ3GYOKxat3n5wVno=", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "CO3PR13MB5686", "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": "Add the corresponding data structure and logics, to support\nthe offload of IPv4 item.\n\nSigned-off-by: Chaoyong He <chaoyong.he@corigine.com>\nReviewed-by: Niklas Söderlund <niklas.soderlund@corigine.com>\n---\n doc/guides/nics/features/nfp.ini | 1 +\n drivers/net/nfp/flower/nfp_flower_cmsg.h | 38 ++++++++++++++++++\n drivers/net/nfp/nfp_flow.c | 68 +++++++++++++++++++++++++++++++-\n 3 files changed, 106 insertions(+), 1 deletion(-)", "diff": "diff --git a/doc/guides/nics/features/nfp.ini b/doc/guides/nics/features/nfp.ini\nindex b0af2a0..bf59123 100644\n--- a/doc/guides/nics/features/nfp.ini\n+++ b/doc/guides/nics/features/nfp.ini\n@@ -28,6 +28,7 @@ Usage doc = Y\n \n [rte_flow items]\n eth = Y\n+ipv4 = Y\n port_id = Y\n vlan = Y\n \ndiff --git a/drivers/net/nfp/flower/nfp_flower_cmsg.h b/drivers/net/nfp/flower/nfp_flower_cmsg.h\nindex d776e37..5964ecf 100644\n--- a/drivers/net/nfp/flower/nfp_flower_cmsg.h\n+++ b/drivers/net/nfp/flower/nfp_flower_cmsg.h\n@@ -253,6 +253,44 @@ struct nfp_flower_mac_mpls {\n \trte_be32_t mpls_lse;\n };\n \n+/*\n+ * L4 ports (for UDP, TCP, SCTP) (1W/4B)\n+ * 3 2 1\n+ * 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0\n+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+\n+ * | port_src | port_dst |\n+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+\n+ */\n+struct nfp_flower_tp_ports {\n+\trte_be16_t port_src;\n+\trte_be16_t port_dst;\n+};\n+\n+struct nfp_flower_ip_ext {\n+\tuint8_t tos;\n+\tuint8_t proto;\n+\tuint8_t ttl;\n+\tuint8_t flags;\n+};\n+\n+/*\n+ * L3 IPv4 details (3W/12B)\n+ * 3 2 1\n+ * 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0\n+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+\n+ * | DSCP |ECN| protocol | ttl | flags |\n+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+\n+ * | ipv4_addr_src |\n+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+\n+ * | ipv4_addr_dst |\n+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+\n+ */\n+struct nfp_flower_ipv4 {\n+\tstruct nfp_flower_ip_ext ip_ext;\n+\trte_be32_t ipv4_src;\n+\trte_be32_t ipv4_dst;\n+};\n+\n struct nfp_fl_act_head {\n \tuint8_t jump_id;\n \tuint8_t len_lw;\ndiff --git a/drivers/net/nfp/nfp_flow.c b/drivers/net/nfp/nfp_flow.c\nindex 72e642c..08c6ef8 100644\n--- a/drivers/net/nfp/nfp_flow.c\n+++ b/drivers/net/nfp/nfp_flow.c\n@@ -534,6 +534,11 @@ struct nfp_mask_id_entry {\n \t\t\tPMD_DRV_LOG(DEBUG, \"RTE_FLOW_ITEM_TYPE_VLAN detected\");\n \t\t\tkey_ls->vlan = NFP_FLOWER_MASK_VLAN_CFI;\n \t\t\tbreak;\n+\t\tcase RTE_FLOW_ITEM_TYPE_IPV4:\n+\t\t\tPMD_DRV_LOG(DEBUG, \"RTE_FLOW_ITEM_TYPE_IPV4 detected\");\n+\t\t\tkey_ls->key_layer |= NFP_FLOWER_LAYER_IPV4;\n+\t\t\tkey_ls->key_size += sizeof(struct nfp_flower_ipv4);\n+\t\t\tbreak;\n \t\tdefault:\n \t\t\tPMD_DRV_LOG(ERR, \"Item type %d not supported.\", item->type);\n \t\t\treturn -ENOTSUP;\n@@ -674,13 +679,58 @@ struct nfp_mask_id_entry {\n \treturn 0;\n }\n \n+static int\n+nfp_flow_merge_ipv4(struct rte_flow *nfp_flow,\n+\t\tchar **mbuf_off,\n+\t\tconst struct rte_flow_item *item,\n+\t\tconst struct nfp_flow_item_proc *proc,\n+\t\tbool is_mask)\n+{\n+\tstruct nfp_flower_ipv4 *ipv4;\n+\tconst struct rte_ipv4_hdr *hdr;\n+\tstruct nfp_flower_meta_tci *meta_tci;\n+\tconst struct rte_flow_item_ipv4 *spec;\n+\tconst struct rte_flow_item_ipv4 *mask;\n+\n+\tspec = item->spec;\n+\tmask = item->mask ? item->mask : proc->mask_default;\n+\tmeta_tci = (struct nfp_flower_meta_tci *)nfp_flow->payload.unmasked_data;\n+\n+\tif (spec == NULL) {\n+\t\tPMD_DRV_LOG(DEBUG, \"nfp flow merge ipv4: no item->spec!\");\n+\t\tgoto ipv4_end;\n+\t}\n+\n+\t/*\n+\t * reserve space for L4 info.\n+\t * rte_flow has ipv4 before L4 but NFP flower fw requires L4 before ipv4\n+\t */\n+\tif (meta_tci->nfp_flow_key_layer & NFP_FLOWER_LAYER_TP)\n+\t\t*mbuf_off += sizeof(struct nfp_flower_tp_ports);\n+\n+\thdr = is_mask ? &mask->hdr : &spec->hdr;\n+\tipv4 = (struct nfp_flower_ipv4 *)*mbuf_off;\n+\n+\tipv4->ip_ext.tos = hdr->type_of_service;\n+\tipv4->ip_ext.proto = hdr->next_proto_id;\n+\tipv4->ip_ext.ttl = hdr->time_to_live;\n+\tipv4->ipv4_src = hdr->src_addr;\n+\tipv4->ipv4_dst = hdr->dst_addr;\n+\n+ipv4_end:\n+\t*mbuf_off += sizeof(struct nfp_flower_ipv4);\n+\n+\treturn 0;\n+}\n+\n /* Graph of supported items and associated process function */\n static const struct nfp_flow_item_proc nfp_flow_item_proc_list[] = {\n \t[RTE_FLOW_ITEM_TYPE_END] = {\n \t\t.next_item = NEXT_ITEM(RTE_FLOW_ITEM_TYPE_ETH),\n \t},\n \t[RTE_FLOW_ITEM_TYPE_ETH] = {\n-\t\t.next_item = NEXT_ITEM(RTE_FLOW_ITEM_TYPE_VLAN),\n+\t\t.next_item = NEXT_ITEM(RTE_FLOW_ITEM_TYPE_VLAN,\n+\t\t\tRTE_FLOW_ITEM_TYPE_IPV4),\n \t\t.mask_support = &(const struct rte_flow_item_eth){\n \t\t\t.hdr = {\n \t\t\t\t.dst_addr.addr_bytes = \"\\xff\\xff\\xff\\xff\\xff\\xff\",\n@@ -694,6 +744,7 @@ struct nfp_mask_id_entry {\n \t\t.merge = nfp_flow_merge_eth,\n \t},\n \t[RTE_FLOW_ITEM_TYPE_VLAN] = {\n+\t\t.next_item = NEXT_ITEM(RTE_FLOW_ITEM_TYPE_IPV4),\n \t\t.mask_support = &(const struct rte_flow_item_vlan){\n \t\t\t.hdr = {\n \t\t\t\t.vlan_tci = RTE_BE16(0xefff),\n@@ -705,6 +756,21 @@ struct nfp_mask_id_entry {\n \t\t.mask_sz = sizeof(struct rte_flow_item_vlan),\n \t\t.merge = nfp_flow_merge_vlan,\n \t},\n+\t[RTE_FLOW_ITEM_TYPE_IPV4] = {\n+\t\t.mask_support = &(const struct rte_flow_item_ipv4){\n+\t\t\t.hdr = {\n+\t\t\t\t.type_of_service = 0xff,\n+\t\t\t\t.fragment_offset = RTE_BE16(0xffff),\n+\t\t\t\t.time_to_live = 0xff,\n+\t\t\t\t.next_proto_id = 0xff,\n+\t\t\t\t.src_addr = RTE_BE32(0xffffffff),\n+\t\t\t\t.dst_addr = RTE_BE32(0xffffffff),\n+\t\t\t},\n+\t\t},\n+\t\t.mask_default = &rte_flow_item_ipv4_mask,\n+\t\t.mask_sz = sizeof(struct rte_flow_item_ipv4),\n+\t\t.merge = nfp_flow_merge_ipv4,\n+\t},\n };\n \n static int\n", "prefixes": [ "v4", "08/25" ] }