Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/63688/?format=api
{ "id": 63688, "url": "http://patches.dpdk.org/api/patches/63688/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20191209214656.27347-12-cardigliano@ntop.org/", "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": "<20191209214656.27347-12-cardigliano@ntop.org>", "list_archive_url": "https://inbox.dpdk.org/dev/20191209214656.27347-12-cardigliano@ntop.org", "date": "2019-12-09T21:46:50", "name": "[v3,11/17] net/ionic: add RX filters support", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "3630a4649cba7dbdd7e7e2b144007ffe2a188eff", "submitter": { "id": 1465, "url": "http://patches.dpdk.org/api/people/1465/?format=api", "name": "Alfredo Cardigliano", "email": "cardigliano@ntop.org" }, "delegate": { "id": 319, "url": "http://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20191209214656.27347-12-cardigliano@ntop.org/mbox/", "series": [ { "id": 7760, "url": "http://patches.dpdk.org/api/series/7760/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=7760", "date": "2019-12-09T21:46:39", "name": "Introduces net/ionic PMD", "version": 3, "mbox": "http://patches.dpdk.org/series/7760/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/63688/comments/", "check": "fail", "checks": "http://patches.dpdk.org/api/patches/63688/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 3F9ECA04B3;\n\tMon, 9 Dec 2019 22:50:43 +0100 (CET)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 49E9C1BFB1;\n\tMon, 9 Dec 2019 22:48:56 +0100 (CET)", "from mail.ntop.org (mail-digitalocean.ntop.org [167.99.215.164])\n by dpdk.org (Postfix) with ESMTP id B63EB1BDFD\n for <dev@dpdk.org>; Mon, 9 Dec 2019 22:48:33 +0100 (CET)", "from devele.ntop.org (net-93-145-196-230.cust.vodafonedsl.it\n [93.145.196.230])\n by mail.ntop.org (Postfix) with ESMTPSA id 5F0C841B74;\n Mon, 9 Dec 2019 22:48:33 +0100 (CET)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ntop.org; s=mail;\n t=1575928113; bh=LSuhZZt5aDdfOrUnTbl0ODnRgPz7kDxnTwmwlOOA/Us=;\n h=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n b=chjqhLTy+b8qq+3/xUPFfY/GM3AT2N1QgCOiiUV+ChdCME4SwiZ8Rp03S85tYkOLb\n yUaUMyclFcoxVfaAMWJkOm9dCRfRKLKQTfuhQkboELP2EjL0a5RqEbyIunpbuZ/ypU\n q1JTH7mPGOGvB+aJ8zWkozuwZYu2uE4Rd5kXN55o=", "From": "Alfredo Cardigliano <cardigliano@ntop.org>", "To": "Alfredo Cardigliano <cardigliano@ntop.org>,\n John McNamara <john.mcnamara@intel.com>,\n Marko Kovacevic <marko.kovacevic@intel.com>", "Cc": "dev@dpdk.org", "Date": "Mon, 9 Dec 2019 22:46:50 +0100", "Message-Id": "<20191209214656.27347-12-cardigliano@ntop.org>", "X-Mailer": "git-send-email 2.17.1", "In-Reply-To": "<20191209214656.27347-1-cardigliano@ntop.org>", "References": "<20191209214656.27347-1-cardigliano@ntop.org>", "Subject": "[dpdk-dev] [PATCH v3 11/17] net/ionic: add RX filters support", "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": "Add support for managing RX filters based on MAC and VLAN.\nHardware cannot provide the list of filters, thus we keep\na local list.\nAdd support for promisc and allmulticast modes.\n\nSigned-off-by: Alfredo Cardigliano <cardigliano@ntop.org>\nReviewed-by: Shannon Nelson <snelson@pensando.io>\n---\n doc/guides/nics/features/ionic.ini | 4 +\n drivers/net/ionic/Makefile | 1 +\n drivers/net/ionic/ionic_ethdev.c | 8 +\n drivers/net/ionic/ionic_lif.c | 259 +++++++++++++++++++++++++++-\n drivers/net/ionic/ionic_lif.h | 16 ++\n drivers/net/ionic/ionic_rx_filter.c | 139 +++++++++++++++\n drivers/net/ionic/ionic_rx_filter.h | 47 +++++\n drivers/net/ionic/meson.build | 1 +\n 8 files changed, 468 insertions(+), 7 deletions(-)\n create mode 100644 drivers/net/ionic/ionic_rx_filter.c\n create mode 100644 drivers/net/ionic/ionic_rx_filter.h", "diff": "diff --git a/doc/guides/nics/features/ionic.ini b/doc/guides/nics/features/ionic.ini\nindex c69e5cbed..3dd5dab45 100644\n--- a/doc/guides/nics/features/ionic.ini\n+++ b/doc/guides/nics/features/ionic.ini\n@@ -8,6 +8,10 @@ Speed capabilities = Y\n Link status = Y\n Link status event = Y\n MTU update = Y\n+Promiscuous mode = Y\n+Allmulticast mode = Y\n+Unicast MAC filter = Y\n+VLAN filter = Y\n Linux UIO = Y\n Linux VFIO = Y\n x86-64 = Y\ndiff --git a/drivers/net/ionic/Makefile b/drivers/net/ionic/Makefile\nindex 79ec1f922..3291190cd 100644\n--- a/drivers/net/ionic/Makefile\n+++ b/drivers/net/ionic/Makefile\n@@ -37,6 +37,7 @@ endif\n # all source are stored in SRCS-y\n #\n SRCS-$(CONFIG_RTE_LIBRTE_IONIC_PMD) += ionic_mac_api.c\n+SRCS-$(CONFIG_RTE_LIBRTE_IONIC_PMD) += ionic_rx_filter.c\n SRCS-$(CONFIG_RTE_LIBRTE_IONIC_PMD) += ionic_dev.c\n SRCS-$(CONFIG_RTE_LIBRTE_IONIC_PMD) += ionic_ethdev.c\n SRCS-$(CONFIG_RTE_LIBRTE_IONIC_PMD) += ionic_lif.c\ndiff --git a/drivers/net/ionic/ionic_ethdev.c b/drivers/net/ionic/ionic_ethdev.c\nindex 3a6c14604..60151341a 100644\n--- a/drivers/net/ionic/ionic_ethdev.c\n+++ b/drivers/net/ionic/ionic_ethdev.c\n@@ -49,6 +49,14 @@ static const struct eth_dev_ops ionic_eth_dev_ops = {\n \t.link_update = ionic_dev_link_update,\n \t.dev_set_link_up = ionic_dev_set_link_up,\n \t.dev_set_link_down = ionic_dev_set_link_down,\n+\t.mac_addr_add = ionic_dev_add_mac,\n+\t.mac_addr_remove = ionic_dev_remove_mac,\n+\t.mac_addr_set = ionic_dev_set_mac,\n+\t.vlan_filter_set = ionic_dev_vlan_filter_set,\n+\t.promiscuous_enable = ionic_dev_promiscuous_enable,\n+\t.promiscuous_disable = ionic_dev_promiscuous_disable,\n+\t.allmulticast_enable = ionic_dev_allmulticast_enable,\n+\t.allmulticast_disable = ionic_dev_allmulticast_disable,\n };\n \n /*\ndiff --git a/drivers/net/ionic/ionic_lif.c b/drivers/net/ionic/ionic_lif.c\nindex bf6a7566c..564c57744 100644\n--- a/drivers/net/ionic/ionic_lif.c\n+++ b/drivers/net/ionic/ionic_lif.c\n@@ -9,6 +9,7 @@\n #include \"ionic_logs.h\"\n #include \"ionic_lif.h\"\n #include \"ionic_ethdev.h\"\n+#include \"ionic_rx_filter.h\"\n \n static int ionic_lif_addr_add(struct ionic_lif *lif, const uint8_t *addr);\n static int ionic_lif_addr_del(struct ionic_lif *lif, const uint8_t *addr);\n@@ -83,23 +84,205 @@ ionic_lif_reset(struct ionic_lif *lif)\n }\n \n static int\n-ionic_lif_addr_add(struct ionic_lif *lif __rte_unused,\n-\t\tconst uint8_t *addr __rte_unused)\n+ionic_lif_addr_add(struct ionic_lif *lif, const uint8_t *addr)\n {\n-\tIONIC_PRINT(INFO, \"%s: stubbed\", __func__);\n+\tstruct ionic_admin_ctx ctx = {\n+\t\t.pending_work = true,\n+\t\t.cmd.rx_filter_add = {\n+\t\t\t.opcode = IONIC_CMD_RX_FILTER_ADD,\n+\t\t\t.match = IONIC_RX_FILTER_MATCH_MAC,\n+\t\t},\n+\t};\n+\tint err;\n+\n+\tmemcpy(ctx.cmd.rx_filter_add.mac.addr, addr, RTE_ETHER_ADDR_LEN);\n+\n+\terr = ionic_adminq_post_wait(lif, &ctx);\n+\n+\tif (err)\n+\t\treturn err;\n+\n+\tIONIC_PRINT(INFO, \"rx_filter add (id %d)\",\n+\t\tctx.comp.rx_filter_add.filter_id);\n+\n+\treturn ionic_rx_filter_save(lif, 0, IONIC_RXQ_INDEX_ANY, &ctx);\n+}\n+\n+static int\n+ionic_lif_addr_del(struct ionic_lif *lif, const uint8_t *addr)\n+{\n+\tstruct ionic_admin_ctx ctx = {\n+\t\t.pending_work = true,\n+\t\t.cmd.rx_filter_del = {\n+\t\t\t.opcode = IONIC_CMD_RX_FILTER_DEL,\n+\t\t},\n+\t};\n+\tstruct ionic_rx_filter *f;\n+\tint err;\n+\n+\tIONIC_PRINT_CALL();\n+\n+\trte_spinlock_lock(&lif->rx_filters.lock);\n+\n+\tf = ionic_rx_filter_by_addr(lif, addr);\n+\n+\tif (!f) {\n+\t\trte_spinlock_unlock(&lif->rx_filters.lock);\n+\t\treturn -ENOENT;\n+\t}\n+\n+\tctx.cmd.rx_filter_del.filter_id = f->filter_id;\n+\tionic_rx_filter_free(f);\n+\n+\trte_spinlock_unlock(&lif->rx_filters.lock);\n+\n+\terr = ionic_adminq_post_wait(lif, &ctx);\n+\n+\tif (err)\n+\t\treturn err;\n+\n+\tIONIC_PRINT(INFO, \"rx_filter del (id %d)\",\n+\t\tctx.cmd.rx_filter_del.filter_id);\n \n \treturn 0;\n }\n \n+int\n+ionic_dev_add_mac(struct rte_eth_dev *eth_dev,\n+\t\tstruct rte_ether_addr *mac_addr,\n+\t\tuint32_t index __rte_unused, uint32_t pool __rte_unused)\n+{\n+\tstruct ionic_lif *lif = IONIC_ETH_DEV_TO_LIF(eth_dev);\n+\n+\tIONIC_PRINT_CALL();\n+\n+\treturn ionic_lif_addr_add(lif, (const uint8_t *)mac_addr);\n+}\n+\n+void\n+ionic_dev_remove_mac(struct rte_eth_dev *eth_dev, uint32_t index __rte_unused)\n+{\n+\tstruct ionic_lif *lif = IONIC_ETH_DEV_TO_LIF(eth_dev);\n+\tstruct ionic_adapter *adapter = lif->adapter;\n+\n+\tIONIC_PRINT_CALL();\n+\n+\tif (index >= adapter->max_mac_addrs) {\n+\t\tIONIC_PRINT(WARNING,\n+\t\t\t\"Index %u is above MAC filter limit %u\",\n+\t\t\tindex, adapter->max_mac_addrs);\n+\t\treturn;\n+\t}\n+\n+\tif (!rte_is_valid_assigned_ether_addr(ð_dev->data->mac_addrs[index]))\n+\t\treturn;\n+\n+\tionic_lif_addr_del(lif, (const uint8_t *)\n+\t\tð_dev->data->mac_addrs[index]);\n+}\n+\n+int\n+ionic_dev_set_mac(struct rte_eth_dev *eth_dev, struct rte_ether_addr *mac_addr)\n+{\n+\tstruct ionic_lif *lif = IONIC_ETH_DEV_TO_LIF(eth_dev);\n+\n+\tIONIC_PRINT_CALL();\n+\n+\tif (mac_addr == NULL) {\n+\t\tIONIC_PRINT(NOTICE, \"New mac is null\");\n+\t\treturn -1;\n+\t}\n+\n+\tif (!rte_is_zero_ether_addr((struct rte_ether_addr *)lif->mac_addr)) {\n+\t\tIONIC_PRINT(INFO, \"Deleting mac addr %pM\",\n+\t\t\tlif->mac_addr);\n+\t\tionic_lif_addr_del(lif, lif->mac_addr);\n+\t\tmemset(lif->mac_addr, 0, RTE_ETHER_ADDR_LEN);\n+\t}\n+\n+\tIONIC_PRINT(INFO, \"Updating mac addr\");\n+\n+\trte_ether_addr_copy(mac_addr, (struct rte_ether_addr *)lif->mac_addr);\n+\n+\treturn ionic_lif_addr_add(lif, (const uint8_t *)mac_addr);\n+}\n+\n static int\n-ionic_lif_addr_del(struct ionic_lif *lif __rte_unused,\n-\t\tconst uint8_t *addr __rte_unused)\n+ionic_vlan_rx_add_vid(struct ionic_lif *lif, uint16_t vid)\n {\n-\tIONIC_PRINT(INFO, \"%s: stubbed\", __func__);\n+\tstruct ionic_admin_ctx ctx = {\n+\t\t.pending_work = true,\n+\t\t.cmd.rx_filter_add = {\n+\t\t\t.opcode = IONIC_CMD_RX_FILTER_ADD,\n+\t\t\t.match = IONIC_RX_FILTER_MATCH_VLAN,\n+\t\t\t.vlan.vlan = vid,\n+\t\t},\n+\t};\n+\tint err;\n+\n+\terr = ionic_adminq_post_wait(lif, &ctx);\n+\n+\tif (err)\n+\t\treturn err;\n+\n+\tIONIC_PRINT(INFO, \"rx_filter add VLAN %d (id %d)\", vid,\n+\t\tctx.comp.rx_filter_add.filter_id);\n+\n+\treturn ionic_rx_filter_save(lif, 0, IONIC_RXQ_INDEX_ANY, &ctx);\n+}\n+\n+static int\n+ionic_vlan_rx_kill_vid(struct ionic_lif *lif, uint16_t vid)\n+{\n+\tstruct ionic_admin_ctx ctx = {\n+\t\t.pending_work = true,\n+\t\t.cmd.rx_filter_del = {\n+\t\t\t.opcode = IONIC_CMD_RX_FILTER_DEL,\n+\t\t},\n+\t};\n+\tstruct ionic_rx_filter *f;\n+\tint err;\n+\n+\tIONIC_PRINT_CALL();\n+\n+\trte_spinlock_lock(&lif->rx_filters.lock);\n+\n+\tf = ionic_rx_filter_by_vlan(lif, vid);\n+\tif (!f) {\n+\t\trte_spinlock_unlock(&lif->rx_filters.lock);\n+\t\treturn -ENOENT;\n+\t}\n+\n+\tctx.cmd.rx_filter_del.filter_id = f->filter_id;\n+\tionic_rx_filter_free(f);\n+\trte_spinlock_unlock(&lif->rx_filters.lock);\n+\n+\terr = ionic_adminq_post_wait(lif, &ctx);\n+\n+\tif (err)\n+\t\treturn err;\n+\n+\tIONIC_PRINT(INFO, \"rx_filter del VLAN %d (id %d)\", vid,\n+\t\tctx.cmd.rx_filter_del.filter_id);\n \n \treturn 0;\n }\n \n+int\n+ionic_dev_vlan_filter_set(struct rte_eth_dev *eth_dev, uint16_t vlan_id,\n+\t\tint on)\n+{\n+\tstruct ionic_lif *lif = IONIC_ETH_DEV_TO_LIF(eth_dev);\n+\tint err;\n+\n+\tif (on)\n+\t\terr = ionic_vlan_rx_add_vid(lif, vlan_id);\n+\telse\n+\t\terr = ionic_vlan_rx_kill_vid(lif, vlan_id);\n+\n+\treturn err;\n+}\n+\n static void\n ionic_lif_rx_mode(struct ionic_lif *lif, uint32_t rx_mode)\n {\n@@ -139,6 +322,59 @@ ionic_set_rx_mode(struct ionic_lif *lif, uint32_t rx_mode)\n \t}\n }\n \n+int\n+ionic_dev_promiscuous_enable(struct rte_eth_dev *eth_dev)\n+{\n+\tstruct ionic_lif *lif = IONIC_ETH_DEV_TO_LIF(eth_dev);\n+\tuint32_t rx_mode = lif->rx_mode;\n+\n+\tIONIC_PRINT_CALL();\n+\n+\trx_mode |= IONIC_RX_MODE_F_PROMISC;\n+\n+\tionic_set_rx_mode(lif, rx_mode);\n+\n+\treturn 0;\n+}\n+\n+int\n+ionic_dev_promiscuous_disable(struct rte_eth_dev *eth_dev)\n+{\n+\tstruct ionic_lif *lif = IONIC_ETH_DEV_TO_LIF(eth_dev);\n+\tuint32_t rx_mode = lif->rx_mode;\n+\n+\trx_mode &= ~IONIC_RX_MODE_F_PROMISC;\n+\n+\tionic_set_rx_mode(lif, rx_mode);\n+\n+\treturn 0;\n+}\n+\n+int\n+ionic_dev_allmulticast_enable(struct rte_eth_dev *eth_dev)\n+{\n+\tstruct ionic_lif *lif = IONIC_ETH_DEV_TO_LIF(eth_dev);\n+\tuint32_t rx_mode = lif->rx_mode;\n+\n+\trx_mode |= IONIC_RX_MODE_F_ALLMULTI;\n+\n+\tionic_set_rx_mode(lif, rx_mode);\n+\n+\treturn 0;\n+}\n+\n+int\n+ionic_dev_allmulticast_disable(struct rte_eth_dev *eth_dev)\n+{\n+\tstruct ionic_lif *lif = IONIC_ETH_DEV_TO_LIF(eth_dev);\n+\tuint32_t rx_mode = lif->rx_mode;\n+\n+\trx_mode &= ~IONIC_RX_MODE_F_ALLMULTI;\n+\n+\tionic_set_rx_mode(lif, rx_mode);\n+\n+\treturn 0;\n+}\n \n int\n ionic_lif_change_mtu(struct ionic_lif *lif, int new_mtu)\n@@ -855,17 +1091,25 @@ ionic_lif_init(struct ionic_lif *lif)\n \tif (err)\n \t\tgoto err_out_notifyq_deinit;\n \n-\terr = ionic_station_set(lif);\n+\terr = ionic_rx_filters_init(lif);\n \n \tif (err)\n \t\tgoto err_out_notifyq_deinit;\n \n+\terr = ionic_station_set(lif);\n+\n+\tif (err)\n+\t\tgoto err_out_rx_filter_deinit;\n+\n \tionic_lif_set_name(lif);\n \n \tlif->state |= IONIC_LIF_F_INITED;\n \n \treturn 0;\n \n+err_out_rx_filter_deinit:\n+\tionic_rx_filters_deinit(lif);\n+\n err_out_notifyq_deinit:\n \tionic_lif_qcq_deinit(lif, lif->notifyqcq);\n \n@@ -881,6 +1125,7 @@ ionic_lif_deinit(struct ionic_lif *lif)\n \tif (!(lif->state & IONIC_LIF_F_INITED))\n \t\treturn;\n \n+\tionic_rx_filters_deinit(lif);\n \tionic_lif_qcq_deinit(lif, lif->notifyqcq);\n \tionic_lif_qcq_deinit(lif, lif->adminqcq);\n \ndiff --git a/drivers/net/ionic/ionic_lif.h b/drivers/net/ionic/ionic_lif.h\nindex 9dbc54e27..e0863c5de 100644\n--- a/drivers/net/ionic/ionic_lif.h\n+++ b/drivers/net/ionic/ionic_lif.h\n@@ -12,6 +12,7 @@\n \n #include \"ionic_osdep.h\"\n #include \"ionic_dev.h\"\n+#include \"ionic_rx_filter.h\"\n \n #define IONIC_ADMINQ_LENGTH\t16\t/* must be a power of two */\n #define IONIC_NOTIFYQ_LENGTH\t64\t/* must be a power of two */\n@@ -53,6 +54,7 @@ struct ionic_lif {\n \trte_spinlock_t adminq_service_lock;\n \tstruct ionic_qcq *adminqcq;\n \tstruct ionic_qcq *notifyqcq;\n+\tstruct ionic_rx_filters rx_filters;\n \tstruct ionic_doorbell __iomem *kern_dbpage;\n \tuint64_t last_eid;\n \tuint64_t features;\n@@ -91,6 +93,20 @@ int ionic_qcq_service(struct ionic_qcq *qcq, int budget, ionic_cq_cb cb,\n \n int ionic_lif_change_mtu(struct ionic_lif *lif, int new_mtu);\n \n+int ionic_dev_add_mac(struct rte_eth_dev *eth_dev,\n+\tstruct rte_ether_addr *mac_addr,\n+\tuint32_t index __rte_unused, uint32_t pool __rte_unused);\n+void ionic_dev_remove_mac(struct rte_eth_dev *eth_dev,\n+\tuint32_t index __rte_unused);\n+int ionic_dev_set_mac(struct rte_eth_dev *eth_dev,\n+\tstruct rte_ether_addr *mac_addr);\n+int ionic_dev_vlan_filter_set(struct rte_eth_dev *eth_dev, uint16_t vlan_id,\n+\tint on);\n+int ionic_dev_promiscuous_enable(struct rte_eth_dev *dev);\n+int ionic_dev_promiscuous_disable(struct rte_eth_dev *dev);\n+int ionic_dev_allmulticast_enable(struct rte_eth_dev *dev);\n+int ionic_dev_allmulticast_disable(struct rte_eth_dev *dev);\n+\n void ionic_qcq_free(struct ionic_qcq *qcq);\n \n int ionic_qcq_enable(struct ionic_qcq *qcq);\ndiff --git a/drivers/net/ionic/ionic_rx_filter.c b/drivers/net/ionic/ionic_rx_filter.c\nnew file mode 100644\nindex 000000000..00b5cee49\n--- /dev/null\n+++ b/drivers/net/ionic/ionic_rx_filter.c\n@@ -0,0 +1,139 @@\n+/* SPDX-License-Identifier: (BSD-3-Clause OR GPL-2.0)\n+ * Copyright(c) 2018-2019 Pensando Systems, Inc. All rights reserved.\n+ */\n+\n+#include <errno.h>\n+\n+#include <rte_malloc.h>\n+\n+#include \"ionic_lif.h\"\n+#include \"ionic_rx_filter.h\"\n+\n+void\n+ionic_rx_filter_free(struct ionic_rx_filter *f)\n+{\n+\tLIST_REMOVE(f, by_id);\n+\tLIST_REMOVE(f, by_hash);\n+\trte_free(f);\n+}\n+\n+int\n+ionic_rx_filter_del(struct ionic_lif *lif, struct ionic_rx_filter *f)\n+{\n+\tstruct ionic_admin_ctx ctx = {\n+\t\t.pending_work = true,\n+\t\t.cmd.rx_filter_del = {\n+\t\t\t.opcode = IONIC_CMD_RX_FILTER_DEL,\n+\t\t\t.filter_id = f->filter_id,\n+\t\t},\n+\t};\n+\n+\treturn ionic_adminq_post(lif, &ctx);\n+}\n+\n+int\n+ionic_rx_filters_init(struct ionic_lif *lif)\n+{\n+\tuint32_t i;\n+\n+\trte_spinlock_init(&lif->rx_filters.lock);\n+\n+\tfor (i = 0; i < IONIC_RX_FILTER_HLISTS; i++) {\n+\t\tLIST_INIT(&lif->rx_filters.by_hash[i]);\n+\t\tLIST_INIT(&lif->rx_filters.by_id[i]);\n+\t}\n+\n+\treturn 0;\n+}\n+\n+void\n+ionic_rx_filters_deinit(struct ionic_lif *lif)\n+{\n+\tstruct ionic_rx_filter *f;\n+\tuint32_t i;\n+\n+\tfor (i = 0; i < IONIC_RX_FILTER_HLISTS; i++) {\n+\t\twhile (!LIST_EMPTY(&lif->rx_filters.by_id[i])) {\n+\t\t\tf = LIST_FIRST(&lif->rx_filters.by_id[i]);\n+\t\t\tionic_rx_filter_free(f);\n+\t\t}\n+\t}\n+}\n+\n+int\n+ionic_rx_filter_save(struct ionic_lif *lif, uint32_t flow_id,\n+\t\tuint16_t rxq_index, struct ionic_admin_ctx *ctx)\n+{\n+\tstruct ionic_rx_filter *f;\n+\tuint32_t key;\n+\n+\tf = rte_zmalloc(\"ionic\", sizeof(*f), 0);\n+\n+\tif (!f)\n+\t\treturn -ENOMEM;\n+\n+\tf->flow_id = flow_id;\n+\tf->filter_id = ctx->comp.rx_filter_add.filter_id;\n+\tf->rxq_index = rxq_index;\n+\tmemcpy(&f->cmd, &ctx->cmd, sizeof(f->cmd));\n+\n+\tswitch (f->cmd.match) {\n+\tcase IONIC_RX_FILTER_MATCH_VLAN:\n+\t\tkey = f->cmd.vlan.vlan & IONIC_RX_FILTER_HLISTS_MASK;\n+\t\tbreak;\n+\tcase IONIC_RX_FILTER_MATCH_MAC:\n+\t\tkey = *(uint32_t *)f->cmd.mac.addr &\n+\t\t\tIONIC_RX_FILTER_HLISTS_MASK;\n+\t\tbreak;\n+\tcase IONIC_RX_FILTER_MATCH_MAC_VLAN:\n+\t\tkey = f->cmd.mac_vlan.vlan & IONIC_RX_FILTER_HLISTS_MASK;\n+\t\tbreak;\n+\tdefault:\n+\t\treturn -EINVAL;\n+\t}\n+\n+\trte_spinlock_lock(&lif->rx_filters.lock);\n+\n+\tLIST_INSERT_HEAD(&lif->rx_filters.by_hash[key], f, by_hash);\n+\n+\tkey = f->filter_id & IONIC_RX_FILTER_HLISTS_MASK;\n+\n+\tLIST_INSERT_HEAD(&lif->rx_filters.by_id[key], f, by_id);\n+\n+\trte_spinlock_unlock(&lif->rx_filters.lock);\n+\n+\treturn 0;\n+}\n+\n+struct ionic_rx_filter *\n+ionic_rx_filter_by_vlan(struct ionic_lif *lif, uint16_t vid)\n+{\n+\tuint32_t key = vid & IONIC_RX_FILTER_HLISTS_MASK;\n+\tstruct ionic_rx_filter *f;\n+\n+\tLIST_FOREACH(f, &lif->rx_filters.by_hash[key], by_hash) {\n+\t\tif (f->cmd.match != IONIC_RX_FILTER_MATCH_VLAN)\n+\t\t\tcontinue;\n+\t\tif (f->cmd.vlan.vlan == vid)\n+\t\t\treturn f;\n+\t}\n+\n+\treturn NULL;\n+}\n+\n+struct ionic_rx_filter *\n+ionic_rx_filter_by_addr(struct ionic_lif *lif, const uint8_t *addr)\n+{\n+\tconst uint32_t key = *(const uint32_t *)addr &\n+\t\tIONIC_RX_FILTER_HLISTS_MASK;\n+\tstruct ionic_rx_filter *f;\n+\n+\tLIST_FOREACH(f, &lif->rx_filters.by_hash[key], by_hash) {\n+\t\tif (f->cmd.match != IONIC_RX_FILTER_MATCH_MAC)\n+\t\t\tcontinue;\n+\t\tif (memcmp(addr, f->cmd.mac.addr, RTE_ETHER_ADDR_LEN) == 0)\n+\t\t\treturn f;\n+\t}\n+\n+\treturn NULL;\n+}\ndiff --git a/drivers/net/ionic/ionic_rx_filter.h b/drivers/net/ionic/ionic_rx_filter.h\nnew file mode 100644\nindex 000000000..6204a7b53\n--- /dev/null\n+++ b/drivers/net/ionic/ionic_rx_filter.h\n@@ -0,0 +1,47 @@\n+/* SPDX-License-Identifier: (BSD-3-Clause OR GPL-2.0)\n+ * Copyright(c) 2018-2019 Pensando Systems, Inc. All rights reserved.\n+ */\n+\n+#ifndef _IONIC_RX_FILTER_H_\n+#define _IONIC_RX_FILTER_H_\n+\n+#include <rte_spinlock.h>\n+\n+#include \"ionic_osdep.h\"\n+#include \"ionic_if.h\"\n+\n+#define IONIC_RXQ_INDEX_ANY\t\t(0xFFFF)\n+struct ionic_rx_filter {\n+\tuint32_t flow_id;\n+\tuint32_t filter_id;\n+\tuint16_t rxq_index;\n+\tstruct ionic_rx_filter_add_cmd cmd;\n+\tLIST_ENTRY(ionic_rx_filter) by_hash;\n+\tLIST_ENTRY(ionic_rx_filter) by_id;\n+};\n+\n+#define IONIC_RX_FILTER_HLISTS\t(1 << 10)\n+#define IONIC_RX_FILTER_HLISTS_MASK\t(IONIC_RX_FILTER_HLISTS - 1)\n+struct ionic_rx_filters {\n+\trte_spinlock_t lock;\n+\tLIST_HEAD(rx_filters_by_hash, ionic_rx_filter)\n+\t\tby_hash[IONIC_RX_FILTER_HLISTS]; /* by pkt hash */\n+\tLIST_HEAD(rx_filters_by_id, ionic_rx_filter)\n+\t\tby_id[IONIC_RX_FILTER_HLISTS]; /* by filter_id */\n+};\n+\n+struct ionic_admin_ctx;\n+struct ionic_lif;\n+\n+void ionic_rx_filter_free(struct ionic_rx_filter *f);\n+int ionic_rx_filter_del(struct ionic_lif *lif, struct ionic_rx_filter *f);\n+int ionic_rx_filters_init(struct ionic_lif *lif);\n+void ionic_rx_filters_deinit(struct ionic_lif *lif);\n+int ionic_rx_filter_save(struct ionic_lif *lif, uint32_t flow_id,\n+\tuint16_t rxq_index, struct ionic_admin_ctx *ctx);\n+struct ionic_rx_filter *ionic_rx_filter_by_vlan(struct ionic_lif *lif,\n+\tuint16_t vid);\n+struct ionic_rx_filter *ionic_rx_filter_by_addr(struct ionic_lif *lif,\n+\tconst uint8_t *addr);\n+\n+#endif /* _IONIC_RX_FILTER_H_ */\ndiff --git a/drivers/net/ionic/meson.build b/drivers/net/ionic/meson.build\nindex f28016105..ec7246753 100644\n--- a/drivers/net/ionic/meson.build\n+++ b/drivers/net/ionic/meson.build\n@@ -3,6 +3,7 @@\n \n sources = files(\n \t'ionic_mac_api.c',\n+\t'ionic_rx_filter.c',\n \t'ionic_dev.c',\n \t'ionic_ethdev.c',\n \t'ionic_lif.c',\n", "prefixes": [ "v3", "11/17" ] }