Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/87867/?format=api
{ "id": 87867, "url": "http://patches.dpdk.org/api/patches/87867/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20210211141620.12482-13-hemant.agrawal@nxp.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": "<20210211141620.12482-13-hemant.agrawal@nxp.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20210211141620.12482-13-hemant.agrawal@nxp.com", "date": "2021-02-11T14:16:12", "name": "[v2,12/20] net/dpaa2: support dpdmux to not drop parse err pkts", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "d1cc5c864f2d65eac628bf5ea05e79b63090a8af", "submitter": { "id": 477, "url": "http://patches.dpdk.org/api/people/477/?format=api", "name": "Hemant Agrawal", "email": "hemant.agrawal@nxp.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/20210211141620.12482-13-hemant.agrawal@nxp.com/mbox/", "series": [ { "id": 15239, "url": "http://patches.dpdk.org/api/series/15239/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=15239", "date": "2021-02-11T14:16:00", "name": "NXP DPAAx ethernet PMD changes", "version": 2, "mbox": "http://patches.dpdk.org/series/15239/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/87867/comments/", "check": "warning", "checks": "http://patches.dpdk.org/api/patches/87867/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 26870A054A;\n\tThu, 11 Feb 2021 15:29:45 +0100 (CET)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 8C9081CC58F;\n\tThu, 11 Feb 2021 15:28:16 +0100 (CET)", "from inva020.nxp.com (inva020.nxp.com [92.121.34.13])\n by mails.dpdk.org (Postfix) with ESMTP id 9FDCD1CC55F\n for <dev@dpdk.org>; Thu, 11 Feb 2021 15:28:04 +0100 (CET)", "from inva020.nxp.com (localhost [127.0.0.1])\n by inva020.eu-rdc02.nxp.com (Postfix) with ESMTP id 8300C1A05FD;\n Thu, 11 Feb 2021 15:28:04 +0100 (CET)", "from invc005.ap-rdc01.nxp.com (invc005.ap-rdc01.nxp.com\n [165.114.16.14])\n by inva020.eu-rdc02.nxp.com (Postfix) with ESMTP id 188DA1A05F0;\n Thu, 11 Feb 2021 15:28:03 +0100 (CET)", "from bf-netperf1.ap.freescale.net (bf-netperf1.ap.freescale.net\n [10.232.133.63])\n by invc005.ap-rdc01.nxp.com (Postfix) with ESMTP id 6B56A402F0;\n Thu, 11 Feb 2021 15:28:01 +0100 (CET)" ], "From": "Hemant Agrawal <hemant.agrawal@nxp.com>", "To": "dev@dpdk.org,\n\tferruh.yigit@intel.com", "Date": "Thu, 11 Feb 2021 19:46:12 +0530", "Message-Id": "<20210211141620.12482-13-hemant.agrawal@nxp.com>", "X-Mailer": "git-send-email 2.17.1", "In-Reply-To": "<20210211141620.12482-1-hemant.agrawal@nxp.com>", "References": "<20210120142723.14090-1-hemant.agrawal@nxp.com>\n <20210211141620.12482-1-hemant.agrawal@nxp.com>", "X-Virus-Scanned": "ClamAV using ClamSMTP", "Subject": "[dpdk-dev] [PATCH v2 12/20] net/dpaa2: support dpdmux to not drop\n parse err pkts", "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", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "DPDMUX should not drop parse error packets. They shall\nbe left to the decision of the connected DPNI interfaces\n\nSigned-off-by: Hemant Agrawal <hemant.agrawal@nxp.com>\n---\n drivers/net/dpaa2/dpaa2_mux.c | 18 ++++\n drivers/net/dpaa2/mc/dpdmux.c | 37 +++++++++\n drivers/net/dpaa2/mc/fsl_dpdmux.h | 113 +++++++++++++++++++++++++-\n drivers/net/dpaa2/mc/fsl_dpdmux_cmd.h | 25 ++++--\n 4 files changed, 187 insertions(+), 6 deletions(-)", "diff": "diff --git a/drivers/net/dpaa2/dpaa2_mux.c b/drivers/net/dpaa2/dpaa2_mux.c\nindex 1ff00ca8f7..811f417491 100644\n--- a/drivers/net/dpaa2/dpaa2_mux.c\n+++ b/drivers/net/dpaa2/dpaa2_mux.c\n@@ -324,6 +324,24 @@ dpaa2_create_dpdmux_device(int vdev_fd __rte_unused,\n \t\t}\n \t}\n \n+\tif (maj_ver >= 6 && min_ver >= 9) {\n+\t\tstruct dpdmux_error_cfg mux_err_cfg;\n+\n+\t\tmemset(&mux_err_cfg, 0, sizeof(mux_err_cfg));\n+\t\tmux_err_cfg.error_action = DPDMUX_ERROR_ACTION_CONTINUE;\n+\t\tmux_err_cfg.errors = DPDMUX_ERROR_DISC;\n+\n+\t\tret = dpdmux_if_set_errors_behavior(&dpdmux_dev->dpdmux,\n+\t\t\t\tCMD_PRI_LOW,\n+\t\t\t\tdpdmux_dev->token, dpdmux_id,\n+\t\t\t\t&mux_err_cfg);\n+\t\tif (ret) {\n+\t\t\tDPAA2_PMD_ERR(\"dpdmux_if_set_errors_behavior %s err %d\",\n+\t\t\t\t __func__, ret);\n+\t\t\tgoto init_err;\n+\t\t}\n+\t}\n+\n \tdpdmux_dev->dpdmux_id = dpdmux_id;\n \tdpdmux_dev->num_ifs = attr.num_ifs;\n \ndiff --git a/drivers/net/dpaa2/mc/dpdmux.c b/drivers/net/dpaa2/mc/dpdmux.c\nindex 57c811c70f..93912ef9d3 100644\n--- a/drivers/net/dpaa2/mc/dpdmux.c\n+++ b/drivers/net/dpaa2/mc/dpdmux.c\n@@ -1012,3 +1012,40 @@ int dpdmux_get_api_version(struct fsl_mc_io *mc_io,\n \n \treturn 0;\n }\n+\n+/**\n+ * dpdmux_if_set_errors_behavior() - Set errors behavior\n+ * @cmd_flags:\tCommand flags; one or more of 'MC_CMD_FLAG_'\n+ * @token:\tToken of DPSW object\n+ * @if_id: Interface Identifier\n+ * @cfg:\tErrors configuration\n+ *\n+ * Provides a set of frame errors that will be rejected or accepted by the\n+ * dpdmux interface. The frame with this errors will no longer be dropped by\n+ * the dpdmux interface. When frame has parsing error the distribution to\n+ * expected interface may fail. If the frame must be distributed using the\n+ * information from a header that was not parsed due errors the frame may\n+ * be discarded or end up on a default interface because needed data was not\n+ * parsed properly.\n+ * This function may be called numerous times with different error masks\n+ *\n+ * Return:\t'0' on Success; Error code otherwise.\n+ */\n+int dpdmux_if_set_errors_behavior(struct fsl_mc_io *mc_io, uint32_t cmd_flags,\n+\t\tuint16_t token, uint16_t if_id, struct dpdmux_error_cfg *cfg)\n+{\n+\tstruct mc_command cmd = { 0 };\n+\tstruct dpdmux_cmd_set_errors_behavior *cmd_params;\n+\n+\t/* prepare command */\n+\tcmd.header = mc_encode_cmd_header(DPDMUX_CMDID_SET_ERRORS_BEHAVIOR,\n+\t\t\t\t\tcmd_flags,\n+\t\t\t\t\ttoken);\n+\tcmd_params = (struct dpdmux_cmd_set_errors_behavior *)cmd.params;\n+\tcmd_params->errors = cpu_to_le32(cfg->errors);\n+\tdpdmux_set_field(cmd_params->flags, ERROR_ACTION, cfg->error_action);\n+\tcmd_params->if_id = cpu_to_le16(if_id);\n+\n+\t/* send command to mc*/\n+\treturn mc_send_command(mc_io, &cmd);\n+}\ndiff --git a/drivers/net/dpaa2/mc/fsl_dpdmux.h b/drivers/net/dpaa2/mc/fsl_dpdmux.h\nindex f035f0f24e..7968161cea 100644\n--- a/drivers/net/dpaa2/mc/fsl_dpdmux.h\n+++ b/drivers/net/dpaa2/mc/fsl_dpdmux.h\n@@ -39,6 +39,12 @@ int dpdmux_close(struct fsl_mc_io *mc_io,\n */\n #define DPDMUX_OPT_CLS_MASK_SUPPORT\t\t0x0000000000000020ULL\n \n+/**\n+ * Automatic max frame length - maximum frame length for dpdmux interface will\n+ * be changed automatically by connected dpni objects.\n+ */\n+#define DPDMUX_OPT_AUTO_MAX_FRAME_LEN\t0x0000000000000040ULL\n+\n #define DPDMUX_IRQ_INDEX_IF\t0x0000\n #define DPDMUX_IRQ_INDEX\t0x0001\n \n@@ -203,6 +209,7 @@ int dpdmux_set_max_frame_length(struct fsl_mc_io *mc_io,\n * @DPDMUX_CNT_EGR_FRAME: Counts egress frames\n * @DPDMUX_CNT_EGR_BYTE: Counts egress bytes\n * @DPDMUX_CNT_EGR_FRAME_DISCARD: Counts discarded egress frames\n+ * @DPDMUX_CNT_ING_NO_BUFFER_DISCARD: Counts ingress no buffer discard frames\n */\n enum dpdmux_counter_type {\n \tDPDMUX_CNT_ING_FRAME = 0x0,\n@@ -215,7 +222,8 @@ enum dpdmux_counter_type {\n \tDPDMUX_CNT_ING_BCAST_BYTES = 0x7,\n \tDPDMUX_CNT_EGR_FRAME = 0x8,\n \tDPDMUX_CNT_EGR_BYTE = 0x9,\n-\tDPDMUX_CNT_EGR_FRAME_DISCARD = 0xa\n+\tDPDMUX_CNT_EGR_FRAME_DISCARD = 0xa,\n+\tDPDMUX_CNT_ING_NO_BUFFER_DISCARD = 0xb,\n };\n \n /**\n@@ -447,4 +455,107 @@ int dpdmux_get_api_version(struct fsl_mc_io *mc_io,\n \t\t\t uint16_t *major_ver,\n \t\t\t uint16_t *minor_ver);\n \n+/**\n+ * Discard bit. This bit must be used together with other bits in\n+ * DPDMUX_ERROR_ACTION_CONTINUE to disable discarding of frames containing\n+ * errors\n+ */\n+#define DPDMUX_ERROR_DISC\t\t0x80000000\n+/**\n+ * MACSEC is enabled\n+ */\n+#define DPDMUX_ERROR_MS\t\t\t0x40000000\n+/**\n+ * PTP event frame\n+ */\n+#define DPDMUX_ERROR_PTP\t\t\t0x08000000\n+/**\n+ * This is a multicast frame\n+ */\n+#define DPDMUX_ERROR_MC\t\t\t0x04000000\n+/**\n+ * This is a broadcast frame\n+ */\n+#define DPDMUX_ERROR_BC\t\t\t0x02000000\n+/**\n+ * Invalid Key composition or key size error\n+ */\n+#define DPDMUX_ERROR_KSE\t\t\t0x00040000\n+/**\n+ * Extract out of frame header\n+ */\n+#define DPDMUX_ERROR_EOFHE\t\t0x00020000\n+/**\n+ * Maximum number of chained lookups is reached\n+ */\n+#define DPDMUX_ERROR_MNLE\t\t\t0x00010000\n+/**\n+ * Invalid table ID\n+ */\n+#define DPDMUX_ERROR_TIDE\t\t\t0x00008000\n+/**\n+ * Policer initialization entry error\n+ */\n+#define DPDMUX_ERROR_PIEE\t\t\t0x00004000\n+/**\n+ * Frame length error\n+ */\n+#define DPDMUX_ERROR_FLE\t\t\t0x00002000\n+/**\n+ * Frame physical error\n+ */\n+#define DPDMUX_ERROR_FPE\t\t\t0x00001000\n+/**\n+ * Cycle limit is exceeded and frame parsing is forced to terminate early\n+ */\n+#define DPDMUX_ERROR_PTE\t\t\t0x00000080\n+/**\n+ * Invalid softparse instruction is encountered\n+ */\n+#define DPDMUX_ERROR_ISP\t\t\t0x00000040\n+/**\n+ * Parsing header error\n+ */\n+#define DPDMUX_ERROR_PHE\t\t\t0x00000020\n+/*\n+ * Block limit is exceeded. Maximum data that can be read and parsed is 256\n+ * bytes.\n+ * Parser will set this bit if it needs more that this limit to parse.\n+ */\n+#define DPDMUX_ERROR_BLE\t\t\t0x00000010\n+/**\n+ * L3 checksum validation\n+ */\n+#define DPDMUX__ERROR_L3CV\t\t\t0x00000008\n+/**\n+ * L3 checksum error\n+ */\n+#define DPDMUX__ERROR_L3CE\t\t\t0x00000004\n+/**\n+ * L4 checksum validation\n+ */\n+#define DPDMUX__ERROR_L4CV\t\t\t0x00000002\n+/**\n+ * L4 checksum error\n+ */\n+#define DPDMUX__ERROR_L4CE\t\t\t0x00000001\n+\n+enum dpdmux_error_action {\n+\tDPDMUX_ERROR_ACTION_DISCARD = 0,\n+\tDPDMUX_ERROR_ACTION_CONTINUE = 1\n+};\n+\n+/**\n+ * Configure how dpdmux interface behaves on errors\n+ * @errors - or'ed combination of DPDMUX_ERROR_*\n+ * @action - set to DPDMUX_ERROR_ACTION_DISCARD or DPDMUX_ERROR_ACTION_CONTINUE\n+ */\n+struct dpdmux_error_cfg {\n+\tuint32_t errors;\n+\tenum dpdmux_error_action error_action;\n+};\n+\n+int dpdmux_if_set_errors_behavior(struct fsl_mc_io *mc_io, uint32_t cmd_flags,\n+\t\tuint16_t token, uint16_t if_id, struct dpdmux_error_cfg *cfg);\n+\n #endif /* __FSL_DPDMUX_H */\ndiff --git a/drivers/net/dpaa2/mc/fsl_dpdmux_cmd.h b/drivers/net/dpaa2/mc/fsl_dpdmux_cmd.h\nindex 2444e9a2e5..2ab4d75dfb 100644\n--- a/drivers/net/dpaa2/mc/fsl_dpdmux_cmd.h\n+++ b/drivers/net/dpaa2/mc/fsl_dpdmux_cmd.h\n@@ -9,30 +9,35 @@\n \n /* DPDMUX Version */\n #define DPDMUX_VER_MAJOR\t\t6\n-#define DPDMUX_VER_MINOR\t\t3\n+#define DPDMUX_VER_MINOR\t\t9\n \n #define DPDMUX_CMD_BASE_VERSION\t\t1\n #define DPDMUX_CMD_VERSION_2\t\t2\n+#define DPDMUX_CMD_VERSION_3\t\t3\n+#define DPDMUX_CMD_VERSION_4\t\t4\n #define DPDMUX_CMD_ID_OFFSET\t\t4\n \n #define DPDMUX_CMD(id)\t(((id) << DPDMUX_CMD_ID_OFFSET) |\\\n \t\t\t\tDPDMUX_CMD_BASE_VERSION)\n #define DPDMUX_CMD_V2(id) (((id) << DPDMUX_CMD_ID_OFFSET) | \\\n \t\t\t\tDPDMUX_CMD_VERSION_2)\n+#define DPDMUX_CMD_V3(id)\t(((id) << DPDMUX_CMD_ID_OFFSET) |\\\n+\t\t\t\tDPDMUX_CMD_VERSION_3)\n+#define DPDMUX_CMD_V4(id)\t(((id) << DPDMUX_CMD_ID_OFFSET) |\\\n+\t\t\t\tDPDMUX_CMD_VERSION_4)\n \n /* Command IDs */\n #define DPDMUX_CMDID_CLOSE\t\t\tDPDMUX_CMD(0x800)\n #define DPDMUX_CMDID_OPEN\t\t\tDPDMUX_CMD(0x806)\n-#define DPDMUX_CMDID_CREATE\t\t\tDPDMUX_CMD(0x906)\n+#define DPDMUX_CMDID_CREATE\t\t\tDPDMUX_CMD_V4(0x906)\n #define DPDMUX_CMDID_DESTROY\t\t\tDPDMUX_CMD(0x986)\n #define DPDMUX_CMDID_GET_API_VERSION\t\tDPDMUX_CMD(0xa06)\n \n #define DPDMUX_CMDID_ENABLE\t\t\tDPDMUX_CMD(0x002)\n #define DPDMUX_CMDID_DISABLE\t\t\tDPDMUX_CMD(0x003)\n-#define DPDMUX_CMDID_GET_ATTR\t\t\tDPDMUX_CMD(0x004)\n+#define DPDMUX_CMDID_GET_ATTR\t\t\tDPDMUX_CMD_V2(0x004)\n #define DPDMUX_CMDID_RESET\t\t\tDPDMUX_CMD(0x005)\n #define DPDMUX_CMDID_IS_ENABLED\t\t\tDPDMUX_CMD(0x006)\n-\n #define DPDMUX_CMDID_SET_MAX_FRAME_LENGTH\tDPDMUX_CMD(0x0a1)\n \n #define DPDMUX_CMDID_UL_RESET_COUNTERS\t\tDPDMUX_CMD(0x0a3)\n@@ -49,7 +54,7 @@\n #define DPDMUX_CMDID_IF_GET_LINK_STATE\t\tDPDMUX_CMD_V2(0x0b4)\n \n #define DPDMUX_CMDID_SET_CUSTOM_KEY\t\tDPDMUX_CMD(0x0b5)\n-#define DPDMUX_CMDID_ADD_CUSTOM_CLS_ENTRY\tDPDMUX_CMD(0x0b6)\n+#define DPDMUX_CMDID_ADD_CUSTOM_CLS_ENTRY\tDPDMUX_CMD_V2(0x0b6)\n #define DPDMUX_CMDID_REMOVE_CUSTOM_CLS_ENTRY\tDPDMUX_CMD(0x0b7)\n \n #define DPDMUX_CMDID_IF_SET_DEFAULT\t\tDPDMUX_CMD(0x0b8)\n@@ -57,6 +62,7 @@\n \n #define DPDMUX_CMDID_SET_RESETABLE\t\tDPDMUX_CMD(0x0ba)\n #define DPDMUX_CMDID_GET_RESETABLE\t\tDPDMUX_CMD(0x0bb)\n+#define DPDMUX_CMDID_SET_ERRORS_BEHAVIOR\tDPDMUX_CMD(0x0bf)\n \n #define DPDMUX_MASK(field) \\\n \tGENMASK(DPDMUX_##field##_SHIFT + DPDMUX_##field##_SIZE - 1, \\\n@@ -233,5 +239,14 @@ struct dpdmux_rsp_get_skip_reset_flags {\n \tuint8_t skip_reset_flags;\n };\n \n+#define DPDMUX_ERROR_ACTION_SHIFT\t\t0\n+#define DPDMUX_ERROR_ACTION_SIZE\t\t4\n+\n+struct dpdmux_cmd_set_errors_behavior {\n+\tuint32_t errors;\n+\tuint16_t flags;\n+\tuint16_t if_id;\n+};\n+\n #pragma pack(pop)\n #endif /* _FSL_DPDMUX_CMD_H */\n", "prefixes": [ "v2", "12/20" ] }