Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/8490/?format=api
{ "id": 8490, "url": "https://patches.dpdk.org/api/patches/8490/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/1446259484-21070-3-git-send-email-shaopeng.he@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": "<1446259484-21070-3-git-send-email-shaopeng.he@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1446259484-21070-3-git-send-email-shaopeng.he@intel.com", "date": "2015-10-31T02:44:42", "name": "[dpdk-dev,v4,2/4] fm10k: add VMDQ support in MAC/VLAN filter", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "f320901faa00bbd07e2f90d47ebc9658401d7a2d", "submitter": { "id": 226, "url": "https://patches.dpdk.org/api/people/226/?format=api", "name": "He, Shaopeng", "email": "shaopeng.he@intel.com" }, "delegate": null, "mbox": "https://patches.dpdk.org/project/dpdk/patch/1446259484-21070-3-git-send-email-shaopeng.he@intel.com/mbox/", "series": [], "comments": "https://patches.dpdk.org/api/patches/8490/comments/", "check": "pending", "checks": "https://patches.dpdk.org/api/patches/8490/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 DB6528E7B;\n\tSat, 31 Oct 2015 03:45:06 +0100 (CET)", "from mga14.intel.com (mga14.intel.com [192.55.52.115])\n\tby dpdk.org (Postfix) with ESMTP id 27D2D8E76\n\tfor <dev@dpdk.org>; Sat, 31 Oct 2015 03:44:58 +0100 (CET)", "from orsmga002.jf.intel.com ([10.7.209.21])\n\tby fmsmga103.fm.intel.com with ESMTP; 30 Oct 2015 19:44:58 -0700", "from shvmail01.sh.intel.com ([10.239.29.42])\n\tby orsmga002.jf.intel.com with ESMTP; 30 Oct 2015 19:44:56 -0700", "from shecgisg004.sh.intel.com (shecgisg004.sh.intel.com\n\t[10.239.29.89])\n\tby shvmail01.sh.intel.com with ESMTP id t9V2isVq027068;\n\tSat, 31 Oct 2015 10:44:54 +0800", "from shecgisg004.sh.intel.com (localhost [127.0.0.1])\n\tby shecgisg004.sh.intel.com (8.13.6/8.13.6/SuSE Linux 0.8) with ESMTP\n\tid t9V2ipkM021119; Sat, 31 Oct 2015 10:44:53 +0800", "(from heshaope@localhost)\n\tby shecgisg004.sh.intel.com (8.13.6/8.13.6/Submit) id t9V2ipM8021115; \n\tSat, 31 Oct 2015 10:44:51 +0800" ], "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.20,221,1444719600\"; d=\"scan'208\";a=\"839305961\"", "From": "Shaopeng He <shaopeng.he@intel.com>", "To": "dev@dpdk.org", "Date": "Sat, 31 Oct 2015 10:44:42 +0800", "Message-Id": "<1446259484-21070-3-git-send-email-shaopeng.he@intel.com>", "X-Mailer": "git-send-email 1.7.4.1", "In-Reply-To": "<1446259484-21070-1-git-send-email-shaopeng.he@intel.com>", "References": "<1445937709-5445-1-git-send-email-shaopeng.he@intel.com>\n\t<1446259484-21070-1-git-send-email-shaopeng.he@intel.com>", "Subject": "[dpdk-dev] [PATCH v4 2/4] fm10k: add VMDQ support in MAC/VLAN filter", "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": "The patch does below things for fm10k MAC/VLAN filter:\n- Add separate functions for VMDQ and main VSI to change\n MAC filter.\n- Disable modification to VLAN filter in VMDQ mode.\n- In device close phase, delete logic ports to remove all\n MAC/VLAN filters belonging to those ports.\n\nSigned-off-by: Shaopeng He <shaopeng.he@intel.com>\nAcked-by: Jingjing Wu <jingjing.wu@intel.com>\nAcked-by: Michael Qiu <michael.qiu@intel.com>\n---\n drivers/net/fm10k/fm10k.h | 3 +\n drivers/net/fm10k/fm10k_ethdev.c | 150 +++++++++++++++++++++++++--------------\n 2 files changed, 99 insertions(+), 54 deletions(-)", "diff": "diff --git a/drivers/net/fm10k/fm10k.h b/drivers/net/fm10k/fm10k.h\nindex c089882..439e95f 100644\n--- a/drivers/net/fm10k/fm10k.h\n+++ b/drivers/net/fm10k/fm10k.h\n@@ -126,6 +126,9 @@\n struct fm10k_macvlan_filter_info {\n \tuint16_t vlan_num; /* Total VLAN number */\n \tuint16_t mac_num; /* Total mac number */\n+\tuint16_t nb_queue_pools; /* Active queue pools number */\n+\t/* VMDQ ID for each MAC address */\n+\tuint8_t mac_vmdq_id[FM10K_MAX_MACADDR_NUM];\n \tuint32_t vfta[FM10K_VFTA_SIZE]; /* VLAN bitmap */\n };\n \ndiff --git a/drivers/net/fm10k/fm10k_ethdev.c b/drivers/net/fm10k/fm10k_ethdev.c\nindex 75d1fa3..76c050a 100644\n--- a/drivers/net/fm10k/fm10k_ethdev.c\n+++ b/drivers/net/fm10k/fm10k_ethdev.c\n@@ -45,6 +45,8 @@\n #define FM10K_MBXLOCK_DELAY_US 20\n #define UINT64_LOWER_32BITS_MASK 0x00000000ffffffffULL\n \n+#define MAIN_VSI_POOL_NUMBER 0\n+\n /* Max try times to acquire switch status */\n #define MAX_QUERY_SWITCH_STATE_TIMES 10\n /* Wait interval to get switch status */\n@@ -61,10 +63,8 @@ static void fm10k_dev_allmulticast_disable(struct rte_eth_dev *dev);\n static inline int fm10k_glort_valid(struct fm10k_hw *hw);\n static int\n fm10k_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on);\n-static void\n-fm10k_MAC_filter_set(struct rte_eth_dev *dev, const u8 *mac, bool add);\n-static void\n-fm10k_MACVLAN_remove_all(struct rte_eth_dev *dev);\n+static void fm10k_MAC_filter_set(struct rte_eth_dev *dev,\n+\tconst u8 *mac, bool add, uint32_t pool);\n static void fm10k_tx_queue_release(void *queue);\n static void fm10k_rx_queue_release(void *queue);\n \n@@ -883,10 +883,17 @@ static void\n fm10k_dev_close(struct rte_eth_dev *dev)\n {\n \tstruct fm10k_hw *hw = FM10K_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n+\tuint16_t nb_lport;\n+\tstruct fm10k_macvlan_filter_info *macvlan;\n \n \tPMD_INIT_FUNC_TRACE();\n \n-\tfm10k_MACVLAN_remove_all(dev);\n+\tmacvlan = FM10K_DEV_PRIVATE_TO_MACVLAN(dev->data->dev_private);\n+\tnb_lport = macvlan->nb_queue_pools ? macvlan->nb_queue_pools : 1;\n+\tfm10k_mbx_lock(hw);\n+\thw->mac.ops.update_lport_state(hw, hw->mac.dglort_map,\n+\t\tnb_lport, false);\n+\tfm10k_mbx_unlock(hw);\n \n \t/* Stop mailbox service first */\n \tfm10k_close_mbx_service(hw);\n@@ -1024,6 +1031,11 @@ fm10k_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on)\n \thw = FM10K_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n \tmacvlan = FM10K_DEV_PRIVATE_TO_MACVLAN(dev->data->dev_private);\n \n+\tif (macvlan->nb_queue_pools > 0) { /* VMDQ mode */\n+\t\tPMD_INIT_LOG(ERR, \"Cannot change VLAN filter in VMDQ mode\");\n+\t\treturn (-EINVAL);\n+\t}\n+\n \tif (vlan_id > ETH_VLAN_ID_MAX) {\n \t\tPMD_INIT_LOG(ERR, \"Invalid vlan_id: must be < 4096\");\n \t\treturn (-EINVAL);\n@@ -1101,38 +1113,80 @@ fm10k_vlan_offload_set(__rte_unused struct rte_eth_dev *dev, int mask)\n \t}\n }\n \n-/* Add/Remove a MAC address, and update filters */\n-static void\n-fm10k_MAC_filter_set(struct rte_eth_dev *dev, const u8 *mac, bool add)\n+/* Add/Remove a MAC address, and update filters to main VSI */\n+static void fm10k_MAC_filter_set_main_vsi(struct rte_eth_dev *dev,\n+\t\tconst u8 *mac, bool add, uint32_t pool)\n {\n-\tuint32_t i, j, k;\n-\tstruct fm10k_hw *hw;\n+\tstruct fm10k_hw *hw = FM10K_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n \tstruct fm10k_macvlan_filter_info *macvlan;\n+\tuint32_t i, j, k;\n \n-\thw = FM10K_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n \tmacvlan = FM10K_DEV_PRIVATE_TO_MACVLAN(dev->data->dev_private);\n \n-\ti = 0;\n-\tfor (j = 0; j < FM10K_VFTA_SIZE; j++) {\n-\t\tif (macvlan->vfta[j]) {\n-\t\t\tfor (k = 0; k < FM10K_UINT32_BIT_SIZE; k++) {\n-\t\t\t\tif (macvlan->vfta[j] & (1 << k)) {\n-\t\t\t\t\tif (i + 1 > macvlan->vlan_num) {\n-\t\t\t\t\t\tPMD_INIT_LOG(ERR, \"vlan number \"\n-\t\t\t\t\t\t\t\t\"not match\");\n-\t\t\t\t\t\treturn;\n-\t\t\t\t\t}\n-\t\t\t\t\tfm10k_mbx_lock(hw);\n-\t\t\t\t\tfm10k_update_uc_addr(hw,\n-\t\t\t\t\t\thw->mac.dglort_map, mac,\n-\t\t\t\t\t\tj * FM10K_UINT32_BIT_SIZE + k,\n-\t\t\t\t\t\tadd, 0);\n-\t\t\t\t\tfm10k_mbx_unlock(hw);\n-\t\t\t\t\ti++;\n-\t\t\t\t}\n+\tif (pool != MAIN_VSI_POOL_NUMBER) {\n+\t\tPMD_DRV_LOG(ERR, \"VMDQ not enabled, can't set \"\n+\t\t\t\"mac to pool %u\", pool);\n+\t\treturn;\n+\t}\n+\tfor (i = 0, j = 0; j < FM10K_VFTA_SIZE; j++) {\n+\t\tif (!macvlan->vfta[j])\n+\t\t\tcontinue;\n+\t\tfor (k = 0; k < FM10K_UINT32_BIT_SIZE; k++) {\n+\t\t\tif (!(macvlan->vfta[j] & (1 << k)))\n+\t\t\t\tcontinue;\n+\t\t\tif (i + 1 > macvlan->vlan_num) {\n+\t\t\t\tPMD_INIT_LOG(ERR, \"vlan number not match\");\n+\t\t\t\treturn;\n \t\t\t}\n+\t\t\tfm10k_mbx_lock(hw);\n+\t\t\tfm10k_update_uc_addr(hw, hw->mac.dglort_map, mac,\n+\t\t\t\tj * FM10K_UINT32_BIT_SIZE + k, add, 0);\n+\t\t\tfm10k_mbx_unlock(hw);\n+\t\t\ti++;\n \t\t}\n \t}\n+}\n+\n+/* Add/Remove a MAC address, and update filters to VMDQ */\n+static void fm10k_MAC_filter_set_vmdq(struct rte_eth_dev *dev,\n+\t\tconst u8 *mac, bool add, uint32_t pool)\n+{\n+\tstruct fm10k_hw *hw = FM10K_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n+\tstruct fm10k_macvlan_filter_info *macvlan;\n+\tstruct rte_eth_vmdq_rx_conf *vmdq_conf;\n+\tuint32_t i;\n+\n+\tmacvlan = FM10K_DEV_PRIVATE_TO_MACVLAN(dev->data->dev_private);\n+\tvmdq_conf = &dev->data->dev_conf.rx_adv_conf.vmdq_rx_conf;\n+\n+\tif (pool > macvlan->nb_queue_pools) {\n+\t\tPMD_DRV_LOG(ERR, \"Pool number %u invalid.\"\n+\t\t\t\" Max pool is %u\",\n+\t\t\tpool, macvlan->nb_queue_pools);\n+\t\treturn;\n+\t}\n+\tfor (i = 0; i < vmdq_conf->nb_pool_maps; i++) {\n+\t\tif (!(vmdq_conf->pool_map[i].pools & (1UL << pool)))\n+\t\t\tcontinue;\n+\t\tfm10k_mbx_lock(hw);\n+\t\tfm10k_update_uc_addr(hw, hw->mac.dglort_map + pool, mac,\n+\t\t\tvmdq_conf->pool_map[i].vlan_id, add, 0);\n+\t\tfm10k_mbx_unlock(hw);\n+\t}\n+}\n+\n+/* Add/Remove a MAC address, and update filters */\n+static void fm10k_MAC_filter_set(struct rte_eth_dev *dev,\n+\t\tconst u8 *mac, bool add, uint32_t pool)\n+{\n+\tstruct fm10k_macvlan_filter_info *macvlan;\n+\n+\tmacvlan = FM10K_DEV_PRIVATE_TO_MACVLAN(dev->data->dev_private);\n+\n+\tif (macvlan->nb_queue_pools > 0) /* VMDQ mode */\n+\t\tfm10k_MAC_filter_set_vmdq(dev, mac, add, pool);\n+\telse\n+\t\tfm10k_MAC_filter_set_main_vsi(dev, mac, add, pool);\n \n \tif (add)\n \t\tmacvlan->mac_num++;\n@@ -1143,11 +1197,15 @@ fm10k_MAC_filter_set(struct rte_eth_dev *dev, const u8 *mac, bool add)\n /* Add a MAC address, and update filters */\n static void\n fm10k_macaddr_add(struct rte_eth_dev *dev,\n-\t\t struct ether_addr *mac_addr,\n-\t\t __rte_unused uint32_t index,\n-\t\t __rte_unused uint32_t pool)\n+\t\tstruct ether_addr *mac_addr,\n+\t\tuint32_t index,\n+\t\tuint32_t pool)\n {\n-\tfm10k_MAC_filter_set(dev, mac_addr->addr_bytes, TRUE);\n+\tstruct fm10k_macvlan_filter_info *macvlan;\n+\n+\tmacvlan = FM10K_DEV_PRIVATE_TO_MACVLAN(dev->data->dev_private);\n+\tfm10k_MAC_filter_set(dev, mac_addr->addr_bytes, TRUE, pool);\n+\tmacvlan->mac_vmdq_id[index] = pool;\n }\n \n /* Remove a MAC address, and update filters */\n@@ -1155,29 +1213,12 @@ static void\n fm10k_macaddr_remove(struct rte_eth_dev *dev, uint32_t index)\n {\n \tstruct rte_eth_dev_data *data = dev->data;\n-\n-\tif (index < FM10K_MAX_MACADDR_NUM)\n-\t\tfm10k_MAC_filter_set(dev, data->mac_addrs[index].addr_bytes,\n-\t\t\t\tFALSE);\n-}\n-\n-/* Remove all VLAN and MAC address table entries */\n-static void\n-fm10k_MACVLAN_remove_all(struct rte_eth_dev *dev)\n-{\n-\tuint32_t j, k;\n \tstruct fm10k_macvlan_filter_info *macvlan;\n \n \tmacvlan = FM10K_DEV_PRIVATE_TO_MACVLAN(dev->data->dev_private);\n-\tfor (j = 0; j < FM10K_VFTA_SIZE; j++) {\n-\t\tif (macvlan->vfta[j]) {\n-\t\t\tfor (k = 0; k < FM10K_UINT32_BIT_SIZE; k++) {\n-\t\t\t\tif (macvlan->vfta[j] & (1 << k))\n-\t\t\t\t\tfm10k_vlan_filter_set(dev,\n-\t\t\t\t\t\tj * FM10K_UINT32_BIT_SIZE + k, false);\n-\t\t\t}\n-\t\t}\n-\t}\n+\tfm10k_MAC_filter_set(dev, data->mac_addrs[index].addr_bytes,\n+\t\t\tFALSE, macvlan->mac_vmdq_id[index]);\n+\tmacvlan->mac_vmdq_id[index] = 0;\n }\n \n static inline int\n@@ -2267,7 +2308,8 @@ eth_fm10k_dev_init(struct rte_eth_dev *dev)\n \tfm10k_mbx_unlock(hw);\n \n \t/* Add default mac address */\n-\tfm10k_MAC_filter_set(dev, hw->mac.addr, true);\n+\tfm10k_MAC_filter_set(dev, hw->mac.addr, true,\n+\t\tMAIN_VSI_POOL_NUMBER);\n \n \treturn 0;\n }\n", "prefixes": [ "dpdk-dev", "v4", "2/4" ] }