Patch Detail

HTTP 200 OK
Allow: GET, PUT, PATCH, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "id": 1123,
    "url": "https://patches.dpdk.org/api/patches/1123/?format=api",
    "web_url": "https://patches.dpdk.org/project/dpdk/patch/1415095289-28961-6-git-send-email-jing.d.chen@intel.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": "<1415095289-28961-6-git-send-email-jing.d.chen@intel.com>",
    "list_archive_url": "https://inbox.dpdk.org/dev/1415095289-28961-6-git-send-email-jing.d.chen@intel.com",
    "date": "2014-11-04T10:01:28",
    "name": "[dpdk-dev,v3,5/6] i40e: macaddr add/del enhancement",
    "commit_ref": null,
    "pull_url": null,
    "state": "accepted",
    "archived": true,
    "hash": "1f5afdafc025d86423eec434339da71f91288347",
    "submitter": {
        "id": 40,
        "url": "https://patches.dpdk.org/api/people/40/?format=api",
        "name": "Chen, Jing D",
        "email": "jing.d.chen@intel.com"
    },
    "delegate": null,
    "mbox": "https://patches.dpdk.org/project/dpdk/patch/1415095289-28961-6-git-send-email-jing.d.chen@intel.com/mbox/",
    "series": [],
    "comments": "https://patches.dpdk.org/api/patches/1123/comments/",
    "check": "pending",
    "checks": "https://patches.dpdk.org/api/patches/1123/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 38B497E9F;\n\tTue,  4 Nov 2014 10:53:16 +0100 (CET)",
            "from mga09.intel.com (mga09.intel.com [134.134.136.24])\n\tby dpdk.org (Postfix) with ESMTP id 0F5087E99\n\tfor <dev@dpdk.org>; Tue,  4 Nov 2014 10:53:14 +0100 (CET)",
            "from orsmga002.jf.intel.com ([10.7.209.21])\n\tby orsmga102.jf.intel.com with ESMTP; 04 Nov 2014 02:00:16 -0800",
            "from shvmail01.sh.intel.com ([10.239.29.42])\n\tby orsmga002.jf.intel.com with ESMTP; 04 Nov 2014 02:01:51 -0800",
            "from shecgisg003.sh.intel.com (shecgisg003.sh.intel.com\n\t[10.239.29.90])\n\tby shvmail01.sh.intel.com with ESMTP id sA4A1nL9022052;\n\tTue, 4 Nov 2014 18:01:49 +0800",
            "from shecgisg003.sh.intel.com (localhost [127.0.0.1])\n\tby shecgisg003.sh.intel.com (8.13.6/8.13.6/SuSE Linux 0.8) with ESMTP\n\tid sA4A1k2T029030; Tue, 4 Nov 2014 18:01:48 +0800",
            "(from jingche2@localhost)\n\tby shecgisg003.sh.intel.com (8.13.6/8.13.6/Submit) id sA4A1kwc029026; \n\tTue, 4 Nov 2014 18:01:46 +0800"
        ],
        "X-ExtLoop1": "1",
        "X-IronPort-AV": "E=Sophos;i=\"5.07,312,1413270000\"; d=\"scan'208\";a=\"631028200\"",
        "From": "\"Chen Jing D(Mark)\" <jing.d.chen@intel.com>",
        "To": "dev@dpdk.org",
        "Date": "Tue,  4 Nov 2014 18:01:28 +0800",
        "Message-Id": "<1415095289-28961-6-git-send-email-jing.d.chen@intel.com>",
        "X-Mailer": "git-send-email 1.7.12.2",
        "In-Reply-To": "<1415095289-28961-1-git-send-email-jing.d.chen@intel.com>",
        "References": "<1411478047-1251-2-git-send-email-jing.d.chen@intel.com>\n\t<1415095289-28961-1-git-send-email-jing.d.chen@intel.com>",
        "Subject": "[dpdk-dev] [PATCH v3 5/6] i40e: macaddr add/del enhancement",
        "X-BeenThere": "dev@dpdk.org",
        "X-Mailman-Version": "2.1.15",
        "Precedence": "list",
        "List-Id": "patches and discussions about DPDK <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: \"Chen Jing D(Mark)\" <jing.d.chen@intel.com>\n\nChange i40e_macaddr_add and i40e_macaddr_remove functions to support\nmultiple macaddr add/delete. In the meanwhile, support macaddr ops\non different pools.\n\nSigned-off-by: Chen Jing D(Mark) <jing.d.chen@intel.com>\n---\n lib/librte_pmd_i40e/i40e_ethdev.c |   90 +++++++++++++++++-------------------\n 1 files changed, 43 insertions(+), 47 deletions(-)",
    "diff": "diff --git a/lib/librte_pmd_i40e/i40e_ethdev.c b/lib/librte_pmd_i40e/i40e_ethdev.c\nindex 020881f..21401f8 100644\n--- a/lib/librte_pmd_i40e/i40e_ethdev.c\n+++ b/lib/librte_pmd_i40e/i40e_ethdev.c\n@@ -1573,48 +1573,41 @@ i40e_priority_flow_ctrl_set(__rte_unused struct rte_eth_dev *dev,\n static void\n i40e_macaddr_add(struct rte_eth_dev *dev,\n \t\t struct ether_addr *mac_addr,\n-\t\t __attribute__((unused)) uint32_t index,\n-\t\t __attribute__((unused)) uint32_t pool)\n+\t\t __rte_unused uint32_t index,\n+\t\t uint32_t pool)\n {\n \tstruct i40e_pf *pf = I40E_DEV_PRIVATE_TO_PF(dev->data->dev_private);\n-\tstruct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n \tstruct i40e_mac_filter_info mac_filter;\n-\tstruct i40e_vsi *vsi = pf->main_vsi;\n-\tstruct ether_addr old_mac;\n+\tstruct i40e_vsi *vsi;\n \tint ret;\n \n-\tif (!is_valid_assigned_ether_addr(mac_addr)) {\n-\t\tPMD_DRV_LOG(ERR, \"Invalid ethernet address\");\n+\t/* If VMDQ not enabled or configured, return */\n+\tif (pool != 0 && (!(pf->flags | I40E_FLAG_VMDQ) || !pf->nb_cfg_vmdq_vsi)) {\n+\t\tPMD_DRV_LOG(ERR, \"VMDQ not %s, can't set mac to pool %u\",\n+\t\t\tpf->flags | I40E_FLAG_VMDQ ? \"configured\" : \"enabled\",\n+\t\t\tpool);\n \t\treturn;\n \t}\n \n-\tif (is_same_ether_addr(mac_addr, &(pf->dev_addr))) {\n-\t\tPMD_DRV_LOG(INFO, \"Ignore adding permanent mac address\");\n-\t\treturn;\n-\t}\n-\n-\t/* Write mac address */\n-\tret = i40e_aq_mac_address_write(hw, I40E_AQC_WRITE_TYPE_LAA_ONLY,\n-\t\t\t\t\tmac_addr->addr_bytes, NULL);\n-\tif (ret != I40E_SUCCESS) {\n-\t\tPMD_DRV_LOG(ERR, \"Failed to write mac address\");\n+\tif (pool > pf->nb_cfg_vmdq_vsi) {\n+\t\tPMD_DRV_LOG(ERR, \"Pool number %u invalid. Max pool is %u\",\n+\t\t\t\tpool, pf->nb_cfg_vmdq_vsi);\n \t\treturn;\n \t}\n \n-\t(void)rte_memcpy(&old_mac, hw->mac.addr, ETHER_ADDR_LEN);\n-\t(void)rte_memcpy(hw->mac.addr, mac_addr->addr_bytes,\n-\t\t\tETHER_ADDR_LEN);\n \t(void)rte_memcpy(&mac_filter.mac_addr, mac_addr, ETHER_ADDR_LEN);\n \tmac_filter.filter_type = RTE_MACVLAN_PERFECT_MATCH;\n \n+\tif (pool == 0)\n+\t\tvsi = pf->main_vsi;\n+\telse\n+\t\tvsi = pf->vmdq[pool - 1].vsi;\n+\n \tret = i40e_vsi_add_mac(vsi, &mac_filter);\n \tif (ret != I40E_SUCCESS) {\n \t\tPMD_DRV_LOG(ERR, \"Failed to add MACVLAN filter\");\n \t\treturn;\n \t}\n-\n-\tether_addr_copy(mac_addr, &pf->dev_addr);\n-\ti40e_vsi_delete_mac(vsi, &old_mac);\n }\n \n /* Remove a MAC address, and update filters */\n@@ -1622,36 +1615,39 @@ static void\n i40e_macaddr_remove(struct rte_eth_dev *dev, uint32_t index)\n {\n \tstruct i40e_pf *pf = I40E_DEV_PRIVATE_TO_PF(dev->data->dev_private);\n-\tstruct i40e_vsi *vsi = pf->main_vsi;\n-\tstruct rte_eth_dev_data *data = I40E_VSI_TO_DEV_DATA(vsi);\n+\tstruct i40e_vsi *vsi;\n+\tstruct rte_eth_dev_data *data = dev->data;\n \tstruct ether_addr *macaddr;\n \tint ret;\n-\tstruct i40e_hw *hw =\n-\t\tI40E_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n-\n-\tif (index >= vsi->max_macaddrs)\n-\t\treturn;\n+\tuint32_t i;\n+\tuint64_t pool_sel;\n \n \tmacaddr = &(data->mac_addrs[index]);\n-\tif (!is_valid_assigned_ether_addr(macaddr))\n-\t\treturn;\n-\n-\tret = i40e_aq_mac_address_write(hw, I40E_AQC_WRITE_TYPE_LAA_ONLY,\n-\t\t\t\t\thw->mac.perm_addr, NULL);\n-\tif (ret != I40E_SUCCESS) {\n-\t\tPMD_DRV_LOG(ERR, \"Failed to write mac address\");\n-\t\treturn;\n-\t}\n-\n-\t(void)rte_memcpy(hw->mac.addr, hw->mac.perm_addr, ETHER_ADDR_LEN);\n \n-\tret = i40e_vsi_delete_mac(vsi, macaddr);\n-\tif (ret != I40E_SUCCESS)\n-\t\treturn;\n+\tpool_sel = dev->data->mac_pool_sel[index];\n+\n+\tfor (i = 0; i < sizeof(pool_sel) * CHAR_BIT; i++) {\n+\t\tif (pool_sel & (1ULL << i)) {\n+\t\t\tif (i == 0)\n+\t\t\t\tvsi = pf->main_vsi;\n+\t\t\telse {\n+\t\t\t\t/* No VMDQ pool enabled or configured */\n+\t\t\t\tif (!(pf->flags | I40E_FLAG_VMDQ) ||\n+\t\t\t\t\t(i > pf->nb_cfg_vmdq_vsi)) {\n+\t\t\t\t\tPMD_DRV_LOG(ERR, \"No VMDQ pool enabled\"\n+\t\t\t\t\t\t\t\"/configured\");\n+\t\t\t\t\treturn;\n+\t\t\t\t}\n+\t\t\t\tvsi = pf->vmdq[i - 1].vsi;\n+\t\t\t}\n+\t\t\tret = i40e_vsi_delete_mac(vsi, macaddr);\n \n-\t/* Clear device address as it has been removed */\n-\tif (is_same_ether_addr(&(pf->dev_addr), macaddr))\n-\t\tmemset(&pf->dev_addr, 0, sizeof(struct ether_addr));\n+\t\t\tif (ret) {\n+\t\t\t\tPMD_DRV_LOG(ERR, \"Failed to remove MACVLAN filter\");\n+\t\t\t\treturn;\n+\t\t\t}\n+\t\t}\n+\t}\n }\n \n /* Set perfect match or hash match of MAC and VLAN for a VF */\n",
    "prefixes": [
        "dpdk-dev",
        "v3",
        "5/6"
    ]
}