Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/21140/?format=api
{ "id": 21140, "url": "https://patches.dpdk.org/api/patches/21140/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/1488470591-5853-3-git-send-email-arybchenko@solarflare.com/", "project": { "id": 1, "url": "https://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": "<1488470591-5853-3-git-send-email-arybchenko@solarflare.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1488470591-5853-3-git-send-email-arybchenko@solarflare.com", "date": "2017-03-02T16:03:02", "name": "[dpdk-dev,02/11] net/sfc/base: improve API to get supported filter matches", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": true, "hash": "4ccecc5425947ae57edb104685a5e65bd4dbb2d3", "submitter": { "id": 607, "url": "https://patches.dpdk.org/api/people/607/?format=api", "name": "Andrew Rybchenko", "email": "arybchenko@solarflare.com" }, "delegate": { "id": 319, "url": "https://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/1488470591-5853-3-git-send-email-arybchenko@solarflare.com/mbox/", "series": [], "comments": "https://patches.dpdk.org/api/patches/21140/comments/", "check": "warning", "checks": "https://patches.dpdk.org/api/patches/21140/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [IPv6:::1])\n\tby dpdk.org (Postfix) with ESMTP id 96729F614;\n\tThu, 2 Mar 2017 17:04:15 +0100 (CET)", "from nbfkord-smmo01.seg.att.com (nbfkord-smmo01.seg.att.com\n\t[209.65.160.76]) by dpdk.org (Postfix) with ESMTP id D932B2952\n\tfor <dev@dpdk.org>; Thu, 2 Mar 2017 17:03:48 +0100 (CET)", "from unknown [12.187.104.26]\n\tby nbfkord-smmo01.seg.att.com(mxl_mta-7.2.4-7) with SMTP id\n\t46248b85.0.805630.00-2341.2324231.nbfkord-smmo01.seg.att.com\n\t(envelope-from <arybchenko@solarflare.com>); \n\tThu, 02 Mar 2017 16:03:49 +0000 (UTC)", "from ocex03.SolarFlarecom.com (10.20.40.36) by\n\tocex03.SolarFlarecom.com (10.20.40.36) with Microsoft SMTP Server\n\t(TLS) id 15.0.1044.25; Thu, 2 Mar 2017 08:03:41 -0800", "from opal.uk.solarflarecom.com (10.17.10.1) by\n\tocex03.SolarFlarecom.com (10.20.40.36) with Microsoft SMTP Server\n\t(TLS) id\n\t15.0.1044.25 via Frontend Transport; Thu, 2 Mar 2017 08:03:40 -0800", "from uklogin.uk.solarflarecom.com (uklogin.uk.solarflarecom.com\n\t[10.17.10.10])\n\tby opal.uk.solarflarecom.com (8.13.8/8.13.8) with ESMTP id\n\tv22G3dd0007949; Thu, 2 Mar 2017 16:03:39 GMT", "from uklogin.uk.solarflarecom.com (localhost.localdomain\n\t[127.0.0.1])\n\tby uklogin.uk.solarflarecom.com (8.13.8/8.13.8) with ESMTP id\n\tv22G3dWl005942; Thu, 2 Mar 2017 16:03:39 GMT" ], "X-MXL-Hash": "58b842650659cd2d-0b3e40f223eadf59334c54586cc6d1357bf5cf69", "From": "Andrew Rybchenko <arybchenko@solarflare.com>", "To": "<dev@dpdk.org>", "CC": "Mark Spender <mspender@solarflare.com>", "Date": "Thu, 2 Mar 2017 16:03:02 +0000", "Message-ID": "<1488470591-5853-3-git-send-email-arybchenko@solarflare.com>", "X-Mailer": "git-send-email 1.8.2.3", "In-Reply-To": "<1488470591-5853-1-git-send-email-arybchenko@solarflare.com>", "References": "<1488470591-5853-1-git-send-email-arybchenko@solarflare.com>", "MIME-Version": "1.0", "Content-Type": "text/plain", "X-AnalysisOut": [ "[v=2.1 cv=LaQ6n2ri c=1 sm=1 tr=0 a=8BlWFWvVlq5taO8ncb8nKg==]", "[:17 a=6Iz7jQTuP9IA:10 a=zRKbQ67AAAAA:8 a=2uROUVfLlKyts5k6O]", "[Y8A:9 a=hQHmqYwCie8EHdUt:21 a=iEp2qHqSOV2Z8eOM:21 a=TV43RA]", "[2N5QS5ylXj:21 a=PA03WX8tBzeizutn5_OT:22]" ], "X-Spam": "[F=0.4999352646; CM=0.500; S=0.499(2015072901)]", "X-MAIL-FROM": "<arybchenko@solarflare.com>", "X-SOURCE-IP": "[12.187.104.26]", "Subject": "[dpdk-dev] [PATCH 02/11] net/sfc/base: improve API to get supported\n\tfilter matches", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<http://dpdk.org/ml/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://dpdk.org/ml/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<http://dpdk.org/ml/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "From: Mark Spender <mspender@solarflare.com>\n\nThe previous API had various problems, including the length of the\ncaller provided buffer not being specified, no means being available\nto discover how big the buffer needs to be, and a lack of clarity of\nwhat the resulting list contains.\n\nTo improve it:\n- add the buffer length as a parameter\n- if the provided buffer is too short, fail with ENOSPC and return\n the required length\n- ensure that the list contents are valid and add comments describing it\n\nIt is safe to change this API as, unsuprisingly, it has no users.\n\nSigned-off-by: Mark Spender <mspender@solarflare.com>\nSigned-off-by: Andrew Rybchenko <arybchenko@solarflare.com>\n---\n drivers/net/sfc/base/ef10_filter.c | 90 +++++++++++++++++++++++++++++++-------\n drivers/net/sfc/base/ef10_impl.h | 7 +--\n drivers/net/sfc/base/efx.h | 7 +--\n drivers/net/sfc/base/efx_filter.c | 68 +++++++++++++++++++---------\n drivers/net/sfc/base/efx_impl.h | 3 +-\n 5 files changed, 132 insertions(+), 43 deletions(-)", "diff": "diff --git a/drivers/net/sfc/base/ef10_filter.c b/drivers/net/sfc/base/ef10_filter.c\nindex f520147..695bb84 100644\n--- a/drivers/net/sfc/base/ef10_filter.c\n+++ b/drivers/net/sfc/base/ef10_filter.c\n@@ -868,13 +868,16 @@ ef10_filter_delete(\n \n static\t__checkReturn\tefx_rc_t\n efx_mcdi_get_parser_disp_info(\n-\t__in\t\tefx_nic_t *enp,\n-\t__out\t\tuint32_t *list,\n-\t__out\t\tsize_t *length)\n+\t__in\t\t\t\tefx_nic_t *enp,\n+\t__out_ecount(buffer_length)\tuint32_t *buffer,\n+\t__in\t\t\t\tsize_t buffer_length,\n+\t__out\t\t\t\tsize_t *list_lengthp)\n {\n \tefx_mcdi_req_t req;\n \tuint8_t payload[MAX(MC_CMD_GET_PARSER_DISP_INFO_IN_LEN,\n \t\t\t MC_CMD_GET_PARSER_DISP_INFO_OUT_LENMAX)];\n+\tsize_t matches_count;\n+\tsize_t list_size;\n \tefx_rc_t rc;\n \n \t(void) memset(payload, 0, sizeof (payload));\n@@ -894,25 +897,41 @@ efx_mcdi_get_parser_disp_info(\n \t\tgoto fail1;\n \t}\n \n-\t*length = MCDI_OUT_DWORD(req,\n+\tmatches_count = MCDI_OUT_DWORD(req,\n \t GET_PARSER_DISP_INFO_OUT_NUM_SUPPORTED_MATCHES);\n \n \tif (req.emr_out_length_used <\n-\t MC_CMD_GET_PARSER_DISP_INFO_OUT_LEN(*length)) {\n+\t MC_CMD_GET_PARSER_DISP_INFO_OUT_LEN(matches_count)) {\n \t\trc = EMSGSIZE;\n \t\tgoto fail2;\n \t}\n \n-\tmemcpy(list,\n-\t MCDI_OUT2(req,\n-\t uint32_t,\n-\t GET_PARSER_DISP_INFO_OUT_SUPPORTED_MATCHES),\n-\t (*length) * sizeof (uint32_t));\n+\t*list_lengthp = matches_count;\n+\n+\tif (buffer_length < matches_count) {\n+\t\trc = ENOSPC;\n+\t\tgoto fail3;\n+\t}\n+\n+\t/*\n+\t * Check that the elements in the list in the MCDI response are the size\n+\t * we expect, so we can just copy them directly. Any conversion of the\n+\t * flags is handled by the caller.\n+\t */\n \tEFX_STATIC_ASSERT(sizeof (uint32_t) ==\n \t MC_CMD_GET_PARSER_DISP_INFO_OUT_SUPPORTED_MATCHES_LEN);\n \n+\tlist_size = matches_count *\n+\t\tMC_CMD_GET_PARSER_DISP_INFO_OUT_SUPPORTED_MATCHES_LEN;\n+\tmemcpy(buffer,\n+\t MCDI_OUT2(req, uint32_t,\n+\t\t GET_PARSER_DISP_INFO_OUT_SUPPORTED_MATCHES),\n+\t list_size);\n+\n \treturn (0);\n \n+fail3:\n+\tEFSYS_PROBE(fail3);\n fail2:\n \tEFSYS_PROBE(fail2);\n fail1:\n@@ -923,14 +942,55 @@ efx_mcdi_get_parser_disp_info(\n \n \t__checkReturn\tefx_rc_t\n ef10_filter_supported_filters(\n-\t__in\t\tefx_nic_t *enp,\n-\t__out\t\tuint32_t *list,\n-\t__out\t\tsize_t *length)\n+\t__in\t\t\t\tefx_nic_t *enp,\n+\t__out_ecount(buffer_length)\tuint32_t *buffer,\n+\t__in\t\t\t\tsize_t buffer_length,\n+\t__out\t\t\t\tsize_t *list_lengthp)\n {\n-\tefx_rc_t rc;\n \n-\tif ((rc = efx_mcdi_get_parser_disp_info(enp, list, length)) != 0)\n+\tsize_t mcdi_list_length;\n+\tsize_t list_length;\n+\tuint32_t i;\n+\tefx_rc_t rc;\n+\tuint32_t all_filter_flags =\n+\t (EFX_FILTER_MATCH_REM_HOST | EFX_FILTER_MATCH_LOC_HOST |\n+\t EFX_FILTER_MATCH_REM_MAC | EFX_FILTER_MATCH_REM_PORT |\n+\t EFX_FILTER_MATCH_LOC_MAC | EFX_FILTER_MATCH_LOC_PORT |\n+\t EFX_FILTER_MATCH_ETHER_TYPE | EFX_FILTER_MATCH_INNER_VID |\n+\t EFX_FILTER_MATCH_OUTER_VID | EFX_FILTER_MATCH_IP_PROTO |\n+\t EFX_FILTER_MATCH_UNKNOWN_MCAST_DST |\n+\t EFX_FILTER_MATCH_UNKNOWN_UCAST_DST);\n+\n+\trc = efx_mcdi_get_parser_disp_info(enp, buffer, buffer_length,\n+\t\t\t\t\t &mcdi_list_length);\n+\tif (rc != 0) {\n+\t\tif (rc == ENOSPC) {\n+\t\t\t/* Pass through mcdi_list_length for the list length */\n+\t\t\t*list_lengthp = mcdi_list_length;\n+\t\t}\n \t\tgoto fail1;\n+\t}\n+\n+\t/*\n+\t * The static assertions in ef10_filter_init() ensure that the values of\n+\t * the EFX_FILTER_MATCH flags match those used by MCDI, so they don't\n+\t * need to be converted.\n+\t *\n+\t * In case support is added to MCDI for additional flags, remove any\n+\t * matches from the list which include flags we don't support. The order\n+\t * of the matches is preserved as they are ordered from highest to\n+\t * lowest priority.\n+\t */\n+\tEFSYS_ASSERT(mcdi_list_length <= buffer_length);\n+\tlist_length = 0;\n+\tfor (i = 0; i < mcdi_list_length; i++) {\n+\t\tif ((buffer[i] & ~all_filter_flags) == 0) {\n+\t\t\tbuffer[list_length] = buffer[i];\n+\t\t\tlist_length++;\n+\t\t}\n+\t}\n+\n+\t*list_lengthp = list_length;\n \n \treturn (0);\n \ndiff --git a/drivers/net/sfc/base/ef10_impl.h b/drivers/net/sfc/base/ef10_impl.h\nindex 192be5d..8c3dffe 100644\n--- a/drivers/net/sfc/base/ef10_impl.h\n+++ b/drivers/net/sfc/base/ef10_impl.h\n@@ -1043,9 +1043,10 @@ ef10_filter_delete(\n \n extern\t__checkReturn\tefx_rc_t\n ef10_filter_supported_filters(\n-\t__in\t\tefx_nic_t *enp,\n-\t__out\t\tuint32_t *list,\n-\t__out\t\tsize_t *length);\n+\t__in\t\t\t\tefx_nic_t *enp,\n+\t__out_ecount(buffer_length)\tuint32_t *buffer,\n+\t__in\t\t\t\tsize_t buffer_length,\n+\t__out\t\t\t\tsize_t *list_lengthp);\n \n extern\t__checkReturn\tefx_rc_t\n ef10_filter_reconfigure(\ndiff --git a/drivers/net/sfc/base/efx.h b/drivers/net/sfc/base/efx.h\nindex 3c26f70..e67bf37 100644\n--- a/drivers/net/sfc/base/efx.h\n+++ b/drivers/net/sfc/base/efx.h\n@@ -2289,9 +2289,10 @@ efx_filter_restore(\n \n extern\t__checkReturn\tefx_rc_t\n efx_filter_supported_filters(\n-\t__in\t\tefx_nic_t *enp,\n-\t__out\t\tuint32_t *list,\n-\t__out\t\tsize_t *length);\n+\t__in\t\t\t\tefx_nic_t *enp,\n+\t__out_ecount(buffer_length)\tuint32_t *buffer,\n+\t__in\t\t\t\tsize_t buffer_length,\n+\t__out\t\t\t\tsize_t *list_lengthp);\n \n extern\t\t\tvoid\n efx_filter_spec_init_rx(\ndiff --git a/drivers/net/sfc/base/efx_filter.c b/drivers/net/sfc/base/efx_filter.c\nindex 4f58a7d..ba31026 100644\n--- a/drivers/net/sfc/base/efx_filter.c\n+++ b/drivers/net/sfc/base/efx_filter.c\n@@ -61,9 +61,10 @@ siena_filter_delete(\n \n static\t__checkReturn\tefx_rc_t\n siena_filter_supported_filters(\n-\t__in\t\tefx_nic_t *enp,\n-\t__out\t\tuint32_t *list,\n-\t__out\t\tsize_t *length);\n+\t__in\t\t\t\tefx_nic_t *enp,\n+\t__out_ecount(buffer_length)\tuint32_t *buffer,\n+\t__in\t\t\t\tsize_t buffer_length,\n+\t__out\t\t\t\tsize_t *list_lengthp);\n \n #endif /* EFSYS_OPT_SIENA */\n \n@@ -209,11 +210,22 @@ efx_filter_fini(\n \tenp->en_mod_flags &= ~EFX_MOD_FILTER;\n }\n \n+/*\n+ * Query the possible combinations of match flags which can be filtered on.\n+ * These are returned as a list, of which each 32 bit element is a bitmask\n+ * formed of EFX_FILTER_MATCH flags.\n+ *\n+ * The combinations are ordered in priority from highest to lowest.\n+ *\n+ * If the provided buffer is too short to hold the list, the call with fail with\n+ * ENOSPC and *list_lengthp will be set to the buffer length required.\n+ */\n \t__checkReturn\tefx_rc_t\n efx_filter_supported_filters(\n-\t__in\t\tefx_nic_t *enp,\n-\t__out\t\tuint32_t *list,\n-\t__out\t\tsize_t *length)\n+\t__in\t\t\t\tefx_nic_t *enp,\n+\t__out_ecount(buffer_length)\tuint32_t *buffer,\n+\t__in\t\t\t\tsize_t buffer_length,\n+\t__out\t\t\t\tsize_t *list_lengthp)\n {\n \tefx_rc_t rc;\n \n@@ -222,11 +234,20 @@ efx_filter_supported_filters(\n \tEFSYS_ASSERT3U(enp->en_mod_flags, &, EFX_MOD_FILTER);\n \tEFSYS_ASSERT(enp->en_efop->efo_supported_filters != NULL);\n \n-\tif ((rc = enp->en_efop->efo_supported_filters(enp, list, length)) != 0)\n+\tif (buffer == NULL) {\n+\t\trc = EINVAL;\n \t\tgoto fail1;\n+\t}\n+\n+\trc = enp->en_efop->efo_supported_filters(enp, buffer, buffer_length,\n+\t\t\t\t\t\t list_lengthp);\n+\tif (rc != 0)\n+\t\tgoto fail2;\n \n \treturn (0);\n \n+fail2:\n+\tEFSYS_PROBE(fail2);\n fail1:\n \tEFSYS_PROBE1(fail1, efx_rc_t, rc);\n \n@@ -1346,23 +1367,20 @@ siena_filter_delete(\n \treturn (rc);\n }\n \n-#define\tMAX_SUPPORTED 4\n+#define\tSIENA_MAX_SUPPORTED_MATCHES 4\n \n static\t__checkReturn\tefx_rc_t\n siena_filter_supported_filters(\n-\t__in\t\tefx_nic_t *enp,\n-\t__out\t\tuint32_t *list,\n-\t__out\t\tsize_t *length)\n+\t__in\t\t\t\tefx_nic_t *enp,\n+\t__out_ecount(buffer_length)\tuint32_t *buffer,\n+\t__in\t\t\t\tsize_t buffer_length,\n+\t__out\t\t\t\tsize_t *list_lengthp)\n {\n-\tint index = 0;\n-\tuint32_t rx_matches[MAX_SUPPORTED];\n+\tuint32_t index = 0;\n+\tuint32_t rx_matches[SIENA_MAX_SUPPORTED_MATCHES];\n+\tsize_t list_length;\n \tefx_rc_t rc;\n \n-\tif (list == NULL) {\n-\t\trc = EINVAL;\n-\t\tgoto fail1;\n-\t}\n-\n \trx_matches[index++] =\n \t EFX_FILTER_MATCH_ETHER_TYPE | EFX_FILTER_MATCH_IP_PROTO |\n \t EFX_FILTER_MATCH_LOC_HOST | EFX_FILTER_MATCH_LOC_PORT |\n@@ -1379,14 +1397,22 @@ siena_filter_supported_filters(\n \t\trx_matches[index++] = EFX_FILTER_MATCH_LOC_MAC;\n \t}\n \n-\tEFSYS_ASSERT3U(index, <=, MAX_SUPPORTED);\n+\tEFSYS_ASSERT3U(index, <=, SIENA_MAX_SUPPORTED_MATCHES);\n+\tlist_length = index;\n+\n+\t*list_lengthp = list_length;\n+\n+\tif (buffer_length < list_length) {\n+\t\trc = ENOSPC;\n+\t\tgoto fail1;\n+\t}\n \n-\t*length = index;\n-\tmemcpy(list, rx_matches, *length);\n+\tmemcpy(buffer, rx_matches, list_length * sizeof (rx_matches[0]));\n \n \treturn (0);\n \n fail1:\n+\tEFSYS_PROBE1(fail1, efx_rc_t, rc);\n \n \treturn (rc);\n }\ndiff --git a/drivers/net/sfc/base/efx_impl.h b/drivers/net/sfc/base/efx_impl.h\nindex 3a520a8..01304f2 100644\n--- a/drivers/net/sfc/base/efx_impl.h\n+++ b/drivers/net/sfc/base/efx_impl.h\n@@ -234,7 +234,8 @@ typedef struct efx_filter_ops_s {\n \tefx_rc_t\t(*efo_add)(efx_nic_t *, efx_filter_spec_t *,\n \t\t\t\t boolean_t may_replace);\n \tefx_rc_t\t(*efo_delete)(efx_nic_t *, efx_filter_spec_t *);\n-\tefx_rc_t\t(*efo_supported_filters)(efx_nic_t *, uint32_t *, size_t *);\n+\tefx_rc_t\t(*efo_supported_filters)(efx_nic_t *, uint32_t *,\n+\t\t\t\t size_t, size_t *);\n \tefx_rc_t\t(*efo_reconfigure)(efx_nic_t *, uint8_t const *, boolean_t,\n \t\t\t\t boolean_t, boolean_t, boolean_t,\n \t\t\t\t uint8_t const *, uint32_t);\n", "prefixes": [ "dpdk-dev", "02/11" ] }