Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/81505/?format=api
{ "id": 81505, "url": "http://patches.dpdk.org/api/patches/81505/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1603183709-23420-60-git-send-email-arybchenko@solarflare.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": "<1603183709-23420-60-git-send-email-arybchenko@solarflare.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1603183709-23420-60-git-send-email-arybchenko@solarflare.com", "date": "2020-10-20T08:48:26", "name": "[59/62] common/sfc_efx/base: validate and compare outer match specs", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "01dcd73b8b28adfae7c38cb0b96c02fa8b963186", "submitter": { "id": 607, "url": "http://patches.dpdk.org/api/people/607/?format=api", "name": "Andrew Rybchenko", "email": "arybchenko@solarflare.com" }, "delegate": null, "mbox": "http://patches.dpdk.org/project/dpdk/patch/1603183709-23420-60-git-send-email-arybchenko@solarflare.com/mbox/", "series": [ { "id": 13132, "url": "http://patches.dpdk.org/api/series/13132/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=13132", "date": "2020-10-20T08:47:30", "name": "net/sfc: support flow API transfer rules", "version": 1, "mbox": "http://patches.dpdk.org/series/13132/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/81505/comments/", "check": "warning", "checks": "http://patches.dpdk.org/api/patches/81505/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 dpdk.org (dpdk.org [92.243.14.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id DB02BA04DD;\n\tTue, 20 Oct 2020 11:12:09 +0200 (CEST)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id A11E8E252;\n\tTue, 20 Oct 2020 10:50:39 +0200 (CEST)", "from dispatch1-us1.ppe-hosted.com (dispatch1-us1.ppe-hosted.com\n [148.163.129.52]) by dpdk.org (Postfix) with ESMTP id D7EC0BBC6\n for <dev@dpdk.org>; Tue, 20 Oct 2020 10:49:10 +0200 (CEST)", "from mx1-us1.ppe-hosted.com (unknown [10.7.65.64])\n by dispatch1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTP id\n 679B36004F for <dev@dpdk.org>; Tue, 20 Oct 2020 08:49:09 +0000 (UTC)", "from us4-mdac16-1.ut7.mdlocal (unknown [10.7.65.69])\n by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTP id 6742D200A4\n for <dev@dpdk.org>; Tue, 20 Oct 2020 08:49:09 +0000 (UTC)", "from mx1-us1.ppe-hosted.com (unknown [10.7.65.199])\n by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTPS id\n 46A6122004D\n for <dev@dpdk.org>; Tue, 20 Oct 2020 08:49:08 +0000 (UTC)", "from webmail.solarflare.com (uk.solarflare.com [193.34.186.16])\n (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits))\n (No client certificate requested)\n by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTPS id\n F0EFC18005B\n for <dev@dpdk.org>; Tue, 20 Oct 2020 08:49:07 +0000 (UTC)", "from ukex01.SolarFlarecom.com (10.17.10.4) by\n ukex01.SolarFlarecom.com (10.17.10.4) with Microsoft SMTP Server (TLS) id\n 15.0.1497.2; Tue, 20 Oct 2020 09:48:51 +0100", "from opal.uk.solarflarecom.com (10.17.10.1) by\n ukex01.SolarFlarecom.com (10.17.10.4) with Microsoft SMTP Server id\n 15.0.1497.2 via Frontend Transport; Tue, 20 Oct 2020 09:48:51 +0100", "from ukv-loginhost.uk.solarflarecom.com\n (ukv-loginhost.uk.solarflarecom.com [10.17.10.39])\n by opal.uk.solarflarecom.com (8.13.8/8.13.8) with ESMTP id 09K8mo3p030930;\n Tue, 20 Oct 2020 09:48:50 +0100", "from ukv-loginhost.uk.solarflarecom.com (localhost [127.0.0.1])\n by ukv-loginhost.uk.solarflarecom.com (Postfix) with ESMTP id DF5DC1613A9;\n Tue, 20 Oct 2020 09:48:50 +0100 (BST)" ], "X-Virus-Scanned": "Proofpoint Essentials engine", "From": "Andrew Rybchenko <arybchenko@solarflare.com>", "To": "<y@solarflare.com>", "CC": "<dev@dpdk.org>, Ivan Malov <ivan.malov@oktetlabs.ru>", "Date": "Tue, 20 Oct 2020 09:48:26 +0100", "Message-ID": "<1603183709-23420-60-git-send-email-arybchenko@solarflare.com>", "X-Mailer": "git-send-email 1.8.3.1", "In-Reply-To": "<1603183709-23420-1-git-send-email-arybchenko@solarflare.com>", "References": "<1603183709-23420-1-git-send-email-arybchenko@solarflare.com>", "MIME-Version": "1.0", "Content-Type": "text/plain", "X-TM-AS-Product-Ver": "SMEX-12.5.0.1300-8.6.1012-25736.003", "X-TM-AS-Result": "No-0.108200-8.000000-10", "X-TMASE-MatchedRID": "VmQnTTPLPg/MNfmX7cQoSspdsi/eZA1jaeMaKzvXUpljLp8Cm8vwF7KB\n pljvKsfOfGzuoVn0Vs6PQi9XuOWoONS7ezKc1Aokx5sgyUhLCNv3+mUqDWUKyF9QIc+ez/4+lSp\n EXhOCtBS9ScRxnMR7bitS3PG+1A2HWBF4xKGSZdloUArKobkzYlBijjE0XjY+GlfXMQviercMwu\n JBqQIpuemp9HBDaWugEarACDIZa3lUzR/yBHQjZsewkPVzkoGN8Cg+ULTCPpmbKItl61J/yZ+in\n TK0bC9eKrauXd3MZDVNXZdfUYkK/9Xsj4rlw2f6IQAAYCZV3NwHz0Cj1aP8G/5dQyNHcjPP/Qve\n 5Mgu3Xti6cHGNRve5BPszTkhMOsa1nj+CgxsDEvAhs1woh/pKjigZBQJvBjlD6DuZ3COjrnoW0N\n kKZgEnW3LgNyHejuiQwymtxuJ6y0=", "X-TM-AS-User-Approved-Sender": "Yes", "X-TM-AS-User-Blocked-Sender": "No", "X-TMASE-Result": "10--0.108200-8.000000", "X-TMASE-Version": "SMEX-12.5.0.1300-8.6.1012-25736.003", "X-MDID": "1603183748-rzKI_Tth7pfS", "X-PPE-DISP": "1603183748;rzKI_Tth7pfS", "Subject": "[dpdk-dev] [PATCH 59/62] common/sfc_efx/base: validate and compare\n\touter match specs", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "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": "From: Ivan Malov <ivan.malov@oktetlabs.ru>\n\nLet the client validate an outer match specification.\nLet the client comprare classes of two outer match specifications.\n\nSigned-off-by: Ivan Malov <ivan.malov@oktetlabs.ru>\nSigned-off-by: Andrew Rybchenko <arybchenko@solarflare.com>\nReviewed-by: Andy Moreton <amoreton@xilinx.com>\n---\n drivers/common/sfc_efx/base/efx_impl.h | 3 +\n drivers/common/sfc_efx/base/efx_mae.c | 126 ++++++++++++++++++++++++-\n 2 files changed, 126 insertions(+), 3 deletions(-)", "diff": "diff --git a/drivers/common/sfc_efx/base/efx_impl.h b/drivers/common/sfc_efx/base/efx_impl.h\nindex 6a8b8d65f1..d8423d49fe 100644\n--- a/drivers/common/sfc_efx/base/efx_impl.h\n+++ b/drivers/common/sfc_efx/base/efx_impl.h\n@@ -800,6 +800,9 @@ typedef struct efx_mae_s {\n \tsize_t\t\t\t\tem_action_rule_field_caps_size;\n \tuint32_t\t\t\tem_max_n_outer_prios;\n \tuint32_t\t\t\tem_encap_types_supported;\n+\t/** Outer rule match field capabilities. */\n+\tefx_mae_field_cap_t\t\t*em_outer_rule_field_caps;\n+\tsize_t\t\t\t\tem_outer_rule_field_caps_size;\n } efx_mae_t;\n \n #endif /* EFSYS_OPT_MAE */\ndiff --git a/drivers/common/sfc_efx/base/efx_mae.c b/drivers/common/sfc_efx/base/efx_mae.c\nindex 935cec5e18..45a796fdad 100644\n--- a/drivers/common/sfc_efx/base/efx_mae.c\n+++ b/drivers/common/sfc_efx/base/efx_mae.c\n@@ -74,6 +74,88 @@ efx_mae_get_capabilities(\n \treturn (rc);\n }\n \n+static\t__checkReturn\t\t\tefx_rc_t\n+efx_mae_get_outer_rule_caps(\n+\t__in\t\t\t\tefx_nic_t *enp,\n+\t__in\t\t\t\tunsigned int field_ncaps,\n+\t__out_ecount(field_ncaps)\tefx_mae_field_cap_t *field_caps)\n+{\n+\tefx_mcdi_req_t req;\n+\tEFX_MCDI_DECLARE_BUF(payload,\n+\t MC_CMD_MAE_GET_OR_CAPS_IN_LEN,\n+\t MC_CMD_MAE_GET_OR_CAPS_OUT_LENMAX_MCDI2);\n+\tunsigned int mcdi_field_ncaps;\n+\tunsigned int i;\n+\tefx_rc_t rc;\n+\n+\tif (MC_CMD_MAE_GET_OR_CAPS_OUT_LEN(field_ncaps) >\n+\t MC_CMD_MAE_GET_OR_CAPS_OUT_LENMAX_MCDI2) {\n+\t\trc = EINVAL;\n+\t\tgoto fail1;\n+\t}\n+\n+\treq.emr_cmd = MC_CMD_MAE_GET_OR_CAPS;\n+\treq.emr_in_buf = payload;\n+\treq.emr_in_length = MC_CMD_MAE_GET_OR_CAPS_IN_LEN;\n+\treq.emr_out_buf = payload;\n+\treq.emr_out_length = MC_CMD_MAE_GET_OR_CAPS_OUT_LEN(field_ncaps);\n+\n+\tefx_mcdi_execute(enp, &req);\n+\n+\tif (req.emr_rc != 0) {\n+\t\trc = req.emr_rc;\n+\t\tgoto fail2;\n+\t}\n+\n+\tmcdi_field_ncaps = MCDI_OUT_DWORD(req, MAE_GET_OR_CAPS_OUT_COUNT);\n+\n+\tif (req.emr_out_length_used <\n+\t MC_CMD_MAE_GET_OR_CAPS_OUT_LEN(mcdi_field_ncaps)) {\n+\t\trc = EMSGSIZE;\n+\t\tgoto fail3;\n+\t}\n+\n+\tif (mcdi_field_ncaps > field_ncaps) {\n+\t\trc = EMSGSIZE;\n+\t\tgoto fail4;\n+\t}\n+\n+\tfor (i = 0; i < mcdi_field_ncaps; ++i) {\n+\t\tuint32_t match_flag;\n+\t\tuint32_t mask_flag;\n+\n+\t\tfield_caps[i].emfc_support = MCDI_OUT_INDEXED_DWORD_FIELD(req,\n+\t\t MAE_GET_OR_CAPS_OUT_FIELD_FLAGS, i,\n+\t\t MAE_FIELD_FLAGS_SUPPORT_STATUS);\n+\n+\t\tmatch_flag = MCDI_OUT_INDEXED_DWORD_FIELD(req,\n+\t\t MAE_GET_OR_CAPS_OUT_FIELD_FLAGS, i,\n+\t\t MAE_FIELD_FLAGS_MATCH_AFFECTS_CLASS);\n+\n+\t\tfield_caps[i].emfc_match_affects_class =\n+\t\t (match_flag != 0) ? B_TRUE : B_FALSE;\n+\n+\t\tmask_flag = MCDI_OUT_INDEXED_DWORD_FIELD(req,\n+\t\t MAE_GET_OR_CAPS_OUT_FIELD_FLAGS, i,\n+\t\t MAE_FIELD_FLAGS_MASK_AFFECTS_CLASS);\n+\n+\t\tfield_caps[i].emfc_mask_affects_class =\n+\t\t (mask_flag != 0) ? B_TRUE : B_FALSE;\n+\t}\n+\n+\treturn (0);\n+\n+fail4:\n+\tEFSYS_PROBE(fail4);\n+fail3:\n+\tEFSYS_PROBE(fail3);\n+fail2:\n+\tEFSYS_PROBE(fail2);\n+fail1:\n+\tEFSYS_PROBE1(fail1, efx_rc_t, rc);\n+\treturn (rc);\n+}\n+\n static\t__checkReturn\t\t\tefx_rc_t\n efx_mae_get_action_rule_caps(\n \t__in\t\t\t\tefx_nic_t *enp,\n@@ -161,6 +243,8 @@ efx_mae_init(\n \t__in\t\t\t\tefx_nic_t *enp)\n {\n \tconst efx_nic_cfg_t *encp = efx_nic_cfg_get(enp);\n+\tefx_mae_field_cap_t *or_fcaps;\n+\tsize_t or_fcaps_size;\n \tefx_mae_field_cap_t *ar_fcaps;\n \tsize_t ar_fcaps_size;\n \tefx_mae_t *maep;\n@@ -183,11 +267,25 @@ efx_mae_init(\n \tif (rc != 0)\n \t\tgoto fail3;\n \n+\tor_fcaps_size = maep->em_max_nfields * sizeof (*or_fcaps);\n+\tEFSYS_KMEM_ALLOC(enp->en_esip, or_fcaps_size, or_fcaps);\n+\tif (or_fcaps == NULL) {\n+\t\trc = ENOMEM;\n+\t\tgoto fail4;\n+\t}\n+\n+\tmaep->em_outer_rule_field_caps_size = or_fcaps_size;\n+\tmaep->em_outer_rule_field_caps = or_fcaps;\n+\n+\trc = efx_mae_get_outer_rule_caps(enp, maep->em_max_nfields, or_fcaps);\n+\tif (rc != 0)\n+\t\tgoto fail5;\n+\n \tar_fcaps_size = maep->em_max_nfields * sizeof (*ar_fcaps);\n \tEFSYS_KMEM_ALLOC(enp->en_esip, ar_fcaps_size, ar_fcaps);\n \tif (ar_fcaps == NULL) {\n \t\trc = ENOMEM;\n-\t\tgoto fail4;\n+\t\tgoto fail6;\n \t}\n \n \tmaep->em_action_rule_field_caps_size = ar_fcaps_size;\n@@ -195,13 +293,18 @@ efx_mae_init(\n \n \trc = efx_mae_get_action_rule_caps(enp, maep->em_max_nfields, ar_fcaps);\n \tif (rc != 0)\n-\t\tgoto fail5;\n+\t\tgoto fail7;\n \n \treturn (0);\n \n-fail5:\n+fail7:\n \tEFSYS_PROBE(fail5);\n \tEFSYS_KMEM_FREE(enp->en_esip, ar_fcaps_size, ar_fcaps);\n+fail6:\n+\tEFSYS_PROBE(fail4);\n+fail5:\n+\tEFSYS_PROBE(fail5);\n+\tEFSYS_KMEM_FREE(enp->en_esip, or_fcaps_size, or_fcaps);\n fail4:\n \tEFSYS_PROBE(fail4);\n fail3:\n@@ -227,6 +330,8 @@ efx_mae_fini(\n \n \tEFSYS_KMEM_FREE(enp->en_esip, maep->em_action_rule_field_caps_size,\n \t maep->em_action_rule_field_caps);\n+\tEFSYS_KMEM_FREE(enp->en_esip, maep->em_outer_rule_field_caps_size,\n+\t maep->em_outer_rule_field_caps);\n \tEFSYS_KMEM_FREE(enp->en_esip, sizeof (*maep), maep);\n \tenp->en_maep = NULL;\n }\n@@ -711,6 +816,13 @@ efx_mae_match_spec_is_valid(\n \tconst uint8_t *mvp;\n \n \tswitch (spec->emms_type) {\n+\tcase EFX_MAE_RULE_OUTER:\n+\t\tfield_caps = maep->em_outer_rule_field_caps;\n+\t\tdesc_setp = __efx_mae_outer_rule_mv_desc_set;\n+\t\tdesc_set_nentries =\n+\t\t EFX_ARRAY_SIZE(__efx_mae_outer_rule_mv_desc_set);\n+\t\tmvp = spec->emms_mask_value_pairs.outer;\n+\t\tbreak;\n \tcase EFX_MAE_RULE_ACTION:\n \t\tfield_caps = maep->em_action_rule_field_caps;\n \t\tdesc_setp = __efx_mae_action_rule_mv_desc_set;\n@@ -1190,6 +1302,14 @@ efx_mae_match_specs_class_cmp(\n \tefx_rc_t rc;\n \n \tswitch (left->emms_type) {\n+\tcase EFX_MAE_RULE_OUTER:\n+\t\tfield_caps = maep->em_outer_rule_field_caps;\n+\t\tdesc_setp = __efx_mae_outer_rule_mv_desc_set;\n+\t\tdesc_set_nentries =\n+\t\t EFX_ARRAY_SIZE(__efx_mae_outer_rule_mv_desc_set);\n+\t\tmvpl = left->emms_mask_value_pairs.outer;\n+\t\tmvpr = right->emms_mask_value_pairs.outer;\n+\t\tbreak;\n \tcase EFX_MAE_RULE_ACTION:\n \t\tfield_caps = maep->em_action_rule_field_caps;\n \t\tdesc_setp = __efx_mae_action_rule_mv_desc_set;\n", "prefixes": [ "59/62" ] }