Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/77426/?format=api
{ "id": 77426, "url": "http://patches.dpdk.org/api/patches/77426/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20200911131954.15999-40-qi.z.zhang@intel.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": "<20200911131954.15999-40-qi.z.zhang@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20200911131954.15999-40-qi.z.zhang@intel.com", "date": "2020-09-11T13:19:53", "name": "[v2,39/40] net/ice/base: rename ACL priority values", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "eebf707f20ee4c4eeccc66ff3508f2ae84154444", "submitter": { "id": 504, "url": "http://patches.dpdk.org/api/people/504/?format=api", "name": "Qi Zhang", "email": "qi.z.zhang@intel.com" }, "delegate": null, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20200911131954.15999-40-qi.z.zhang@intel.com/mbox/", "series": [ { "id": 12148, "url": "http://patches.dpdk.org/api/series/12148/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=12148", "date": "2020-09-11T13:19:15", "name": "ice base code update", "version": 2, "mbox": "http://patches.dpdk.org/series/12148/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/77426/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/77426/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 3B3A8A04B6;\n\tFri, 11 Sep 2020 15:24:07 +0200 (CEST)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 1C1A51C2E9;\n\tFri, 11 Sep 2020 15:17:12 +0200 (CEST)", "from mga18.intel.com (mga18.intel.com [134.134.136.126])\n by dpdk.org (Postfix) with ESMTP id 8A2171C229\n for <dev@dpdk.org>; Fri, 11 Sep 2020 15:16:57 +0200 (CEST)", "from fmsmga003.fm.intel.com ([10.253.24.29])\n by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 11 Sep 2020 06:16:57 -0700", "from dpdk51.sh.intel.com ([10.67.111.82])\n by FMSMGA003.fm.intel.com with ESMTP; 11 Sep 2020 06:16:55 -0700" ], "IronPort-SDR": [ "\n ahwkbXCgDddNrxP/pvzJDWWjS/vtoNVtdrQbFch+CIXnPZetNm72DhlYBeWcGx7sMMl4985kes\n kpDCmY4ItIrw==", "\n bchJbzNfTYMXCxLMDn/h4+SM2dnHEMKA81Www1T6BroqEqBdQV7S/gXxXuatVGLfdqyud4ji8A\n GRuZu5/sZcmw==" ], "X-IronPort-AV": [ "E=McAfee;i=\"6000,8403,9740\"; a=\"146482428\"", "E=Sophos;i=\"5.76,415,1592895600\"; d=\"scan'208\";a=\"146482428\"", "E=Sophos;i=\"5.76,415,1592895600\"; d=\"scan'208\";a=\"342296785\"" ], "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "From": "Qi Zhang <qi.z.zhang@intel.com>", "To": "ferruh.yigit@intel.com", "Cc": "dev@dpdk.org, Qi Zhang <qi.z.zhang@intel.com>,\n Tony Nguyen <anthony.l.nguyen@intel.com>", "Date": "Fri, 11 Sep 2020 21:19:53 +0800", "Message-Id": "<20200911131954.15999-40-qi.z.zhang@intel.com>", "X-Mailer": "git-send-email 2.13.6", "In-Reply-To": "<20200911131954.15999-1-qi.z.zhang@intel.com>", "References": "<20200907112826.48493-1-qi.z.zhang@intel.com>\n <20200911131954.15999-1-qi.z.zhang@intel.com>", "Subject": "[dpdk-dev] [PATCH v2 39/40] net/ice/base: rename ACL priority values", "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": "The naming convention used to shorten 'priority' is 'prio'.\nConvert the ACL related entries that use 'prior' to 'prio'.\n\nAlso, as ICE_LOW, ICE_NORMAL,... are not very descriptive of what\nthey represent. Add 'ACL_PRIO' to help convey their use.\n\nSigned-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>\nSigned-off-by: Qi Zhang <qi.z.zhang@intel.com>\nAcked-by: Qiming Yang <qiming.yang@intel.com>\n---\n drivers/net/ice/base/ice_acl.h | 16 ++++++++--------\n drivers/net/ice/base/ice_acl_ctrl.c | 32 +++++++++++++++++---------------\n drivers/net/ice/base/ice_flow.c | 25 ++++++++++++-------------\n 3 files changed, 37 insertions(+), 36 deletions(-)", "diff": "diff --git a/drivers/net/ice/base/ice_acl.h b/drivers/net/ice/base/ice_acl.h\nindex f87a0aa79..21aa5088f 100644\n--- a/drivers/net/ice/base/ice_acl.h\n+++ b/drivers/net/ice/base/ice_acl.h\n@@ -47,11 +47,11 @@ struct ice_acl_tbl {\n };\n \n #define ICE_MAX_ACL_TCAM_ENTRY (ICE_AQC_ACL_TCAM_DEPTH * ICE_AQC_ACL_SLICES)\n-enum ice_acl_entry_prior {\n-\tICE_LOW = 0,\n-\tICE_NORMAL,\n-\tICE_HIGH,\n-\tICE_MAX_PRIOR\n+enum ice_acl_entry_prio {\n+\tICE_ACL_PRIO_LOW = 0,\n+\tICE_ACL_PRIO_NORMAL,\n+\tICE_ACL_PRIO_HIGH,\n+\tICE_ACL_MAX_PRIO\n };\n \n /* Scenario structure\n@@ -74,8 +74,8 @@ struct ice_acl_scen {\n \t * be available in this scenario\n \t */\n \tice_declare_bitmap(entry_bitmap, ICE_MAX_ACL_TCAM_ENTRY);\n-\tu16 first_idx[ICE_MAX_PRIOR];\n-\tu16 last_idx[ICE_MAX_PRIOR];\n+\tu16 first_idx[ICE_ACL_MAX_PRIO];\n+\tu16 last_idx[ICE_ACL_MAX_PRIO];\n \n \tu16 id;\n \tu16 start;\t/* Number of entry from the start of the parent table */\n@@ -192,7 +192,7 @@ ice_aq_query_acl_scen(struct ice_hw *hw, u16 scen_id,\n \t\t struct ice_aqc_acl_scen *buf, struct ice_sq_cd *cd);\n enum ice_status\n ice_acl_add_entry(struct ice_hw *hw, struct ice_acl_scen *scen,\n-\t\t enum ice_acl_entry_prior prior, u8 *keys, u8 *inverts,\n+\t\t enum ice_acl_entry_prio prio, u8 *keys, u8 *inverts,\n \t\t struct ice_acl_act_entry *acts, u8 acts_cnt, u16 *entry_idx);\n enum ice_status\n ice_acl_prog_act(struct ice_hw *hw, struct ice_acl_scen *scen,\ndiff --git a/drivers/net/ice/base/ice_acl_ctrl.c b/drivers/net/ice/base/ice_acl_ctrl.c\nindex bd09e9d77..3c4d45cc0 100644\n--- a/drivers/net/ice/base/ice_acl_ctrl.c\n+++ b/drivers/net/ice/base/ice_acl_ctrl.c\n@@ -25,19 +25,21 @@ static void ice_acl_init_entry(struct ice_acl_scen *scen)\n \t * normal priority: start from the highest index, 50% of total entries\n \t * high priority: start from the lowest index, 25% of total entries\n \t */\n-\tscen->first_idx[ICE_LOW] = scen->num_entry - 1;\n-\tscen->first_idx[ICE_NORMAL] = scen->num_entry - scen->num_entry / 4 - 1;\n-\tscen->first_idx[ICE_HIGH] = 0;\n-\n-\tscen->last_idx[ICE_LOW] = scen->num_entry - scen->num_entry / 4;\n-\tscen->last_idx[ICE_NORMAL] = scen->num_entry / 4;\n-\tscen->last_idx[ICE_HIGH] = scen->num_entry / 4 - 1;\n+\tscen->first_idx[ICE_ACL_PRIO_LOW] = scen->num_entry - 1;\n+\tscen->first_idx[ICE_ACL_PRIO_NORMAL] = scen->num_entry -\n+\t\tscen->num_entry / 4 - 1;\n+\tscen->first_idx[ICE_ACL_PRIO_HIGH] = 0;\n+\n+\tscen->last_idx[ICE_ACL_PRIO_LOW] = scen->num_entry -\n+\t\tscen->num_entry / 4;\n+\tscen->last_idx[ICE_ACL_PRIO_NORMAL] = scen->num_entry / 4;\n+\tscen->last_idx[ICE_ACL_PRIO_HIGH] = scen->num_entry / 4 - 1;\n }\n \n /**\n * ice_acl_scen_assign_entry_idx\n * @scen: pointer to the scenario struct\n- * @prior: the priority of the flow entry being allocated\n+ * @prio: the priority of the flow entry being allocated\n *\n * To find the index of an available entry in scenario\n *\n@@ -46,16 +48,16 @@ static void ice_acl_init_entry(struct ice_acl_scen *scen)\n */\n static u16\n ice_acl_scen_assign_entry_idx(struct ice_acl_scen *scen,\n-\t\t\t enum ice_acl_entry_prior prior)\n+\t\t\t enum ice_acl_entry_prio prio)\n {\n \tu16 first_idx, last_idx, i;\n \ts8 step;\n \n-\tif (prior >= ICE_MAX_PRIOR)\n+\tif (prio >= ICE_ACL_MAX_PRIO)\n \t\treturn ICE_ACL_SCEN_ENTRY_INVAL;\n \n-\tfirst_idx = scen->first_idx[prior];\n-\tlast_idx = scen->last_idx[prior];\n+\tfirst_idx = scen->first_idx[prio];\n+\tlast_idx = scen->last_idx[prio];\n \tstep = first_idx <= last_idx ? 1 : -1;\n \n \tfor (i = first_idx; i != last_idx + step; i += step)\n@@ -953,7 +955,7 @@ enum ice_status ice_acl_destroy_tbl(struct ice_hw *hw)\n * ice_acl_add_entry - Add a flow entry to an ACL scenario\n * @hw: pointer to the HW struct\n * @scen: scenario to add the entry to\n- * @prior: priority level of the entry being added\n+ * @prio: priority level of the entry being added\n * @keys: buffer of the value of the key to be programmed to the ACL entry\n * @inverts: buffer of the value of the key inverts to be programmed\n * @acts: pointer to a buffer containing formatted actions\n@@ -967,7 +969,7 @@ enum ice_status ice_acl_destroy_tbl(struct ice_hw *hw)\n */\n enum ice_status\n ice_acl_add_entry(struct ice_hw *hw, struct ice_acl_scen *scen,\n-\t\t enum ice_acl_entry_prior prior, u8 *keys, u8 *inverts,\n+\t\t enum ice_acl_entry_prio prio, u8 *keys, u8 *inverts,\n \t\t struct ice_acl_act_entry *acts, u8 acts_cnt, u16 *entry_idx)\n {\n \tu8 i, entry_tcam, num_cscd, offset;\n@@ -978,7 +980,7 @@ ice_acl_add_entry(struct ice_hw *hw, struct ice_acl_scen *scen,\n \tif (!scen)\n \t\treturn ICE_ERR_DOES_NOT_EXIST;\n \n-\t*entry_idx = ice_acl_scen_assign_entry_idx(scen, prior);\n+\t*entry_idx = ice_acl_scen_assign_entry_idx(scen, prio);\n \tif (*entry_idx >= scen->num_entry) {\n \t\t*entry_idx = 0;\n \t\treturn ICE_ERR_MAX_LIMIT;\ndiff --git a/drivers/net/ice/base/ice_flow.c b/drivers/net/ice/base/ice_flow.c\nindex cd3ce8231..de5dfb228 100644\n--- a/drivers/net/ice/base/ice_flow.c\n+++ b/drivers/net/ice/base/ice_flow.c\n@@ -2715,30 +2715,30 @@ ice_flow_acl_find_scen_entry_cond(struct ice_flow_prof *prof,\n }\n \n /**\n- * ice_flow_acl_convert_to_acl_prior - Convert to ACL priority\n+ * ice_flow_acl_convert_to_acl_prio - Convert to ACL priority\n * @p: flow priority\n */\n-static enum ice_acl_entry_prior\n-ice_flow_acl_convert_to_acl_prior(enum ice_flow_priority p)\n+static enum ice_acl_entry_prio\n+ice_flow_acl_convert_to_acl_prio(enum ice_flow_priority p)\n {\n-\tenum ice_acl_entry_prior acl_prior;\n+\tenum ice_acl_entry_prio acl_prio;\n \n \tswitch (p) {\n \tcase ICE_FLOW_PRIO_LOW:\n-\t\tacl_prior = ICE_LOW;\n+\t\tacl_prio = ICE_ACL_PRIO_LOW;\n \t\tbreak;\n \tcase ICE_FLOW_PRIO_NORMAL:\n-\t\tacl_prior = ICE_NORMAL;\n+\t\tacl_prio = ICE_ACL_PRIO_NORMAL;\n \t\tbreak;\n \tcase ICE_FLOW_PRIO_HIGH:\n-\t\tacl_prior = ICE_HIGH;\n+\t\tacl_prio = ICE_ACL_PRIO_HIGH;\n \t\tbreak;\n \tdefault:\n-\t\tacl_prior = ICE_NORMAL;\n+\t\tacl_prio = ICE_ACL_PRIO_NORMAL;\n \t\tbreak;\n \t}\n \n-\treturn acl_prior;\n+\treturn acl_prio;\n }\n \n /**\n@@ -2878,15 +2878,15 @@ ice_flow_acl_add_scen_entry_sync(struct ice_hw *hw, struct ice_flow_prof *prof,\n \t\t\t ICE_NONDMA_TO_NONDMA);\n \n \tif (do_add_entry) {\n-\t\tenum ice_acl_entry_prior prior;\n+\t\tenum ice_acl_entry_prio prio;\n \t\tu8 *keys, *inverts;\n \t\tu16 entry_idx;\n \n \t\tkeys = (u8 *)e->entry;\n \t\tinverts = keys + (e->entry_sz / 2);\n-\t\tprior = ice_flow_acl_convert_to_acl_prior(e->priority);\n+\t\tprio = ice_flow_acl_convert_to_acl_prio(e->priority);\n \n-\t\tstatus = ice_acl_add_entry(hw, prof->cfg.scen, prior, keys,\n+\t\tstatus = ice_acl_add_entry(hw, prof->cfg.scen, prio, keys,\n \t\t\t\t\t inverts, acts, e->acts_cnt,\n \t\t\t\t\t &entry_idx);\n \t\tif (status)\n@@ -2904,7 +2904,6 @@ ice_flow_acl_add_scen_entry_sync(struct ice_hw *hw, struct ice_flow_prof *prof,\n \t\t\texist->acts = (struct ice_flow_action *)\n \t\t\t\tice_calloc(hw, exist->acts_cnt,\n \t\t\t\t\t sizeof(struct ice_flow_action));\n-\n \t\t\tif (!exist->acts) {\n \t\t\t\tstatus = ICE_ERR_NO_MEMORY;\n \t\t\t\tgoto out;\n", "prefixes": [ "v2", "39/40" ] }