Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/892990/?format=api
{ "id": 892990, "url": "http://patchwork.ozlabs.org/api/patches/892990/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20180329210751.11531-5-vinicius.gomes@intel.com/", "project": { "id": 46, "url": "http://patchwork.ozlabs.org/api/projects/46/?format=api", "name": "Intel Wired Ethernet development", "link_name": "intel-wired-lan", "list_id": "intel-wired-lan.osuosl.org", "list_email": "intel-wired-lan@osuosl.org", "web_url": "", "scm_url": "", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20180329210751.11531-5-vinicius.gomes@intel.com>", "list_archive_url": null, "date": "2018-03-29T21:07:45", "name": "[next-queue,v6,04/10] igb: Add support for MAC address filters specifying source addresses", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "676b8da263d736832f2653c61a23e8334dcff162", "submitter": { "id": 72272, "url": "http://patchwork.ozlabs.org/api/people/72272/?format=api", "name": "Vinicius Costa Gomes", "email": "vinicius.gomes@intel.com" }, "delegate": { "id": 68, "url": "http://patchwork.ozlabs.org/api/users/68/?format=api", "username": "jtkirshe", "first_name": "Jeff", "last_name": "Kirsher", "email": "jeffrey.t.kirsher@intel.com" }, "mbox": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20180329210751.11531-5-vinicius.gomes@intel.com/mbox/", "series": [ { "id": 36560, "url": "http://patchwork.ozlabs.org/api/series/36560/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=36560", "date": "2018-03-29T21:07:48", "name": "igb: offloading of receive filters", "version": 6, "mbox": "http://patchwork.ozlabs.org/series/36560/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/892990/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/892990/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<intel-wired-lan-bounces@osuosl.org>", "X-Original-To": [ "incoming@patchwork.ozlabs.org", "intel-wired-lan@lists.osuosl.org" ], "Delivered-To": [ "patchwork-incoming@bilbo.ozlabs.org", "intel-wired-lan@lists.osuosl.org" ], "Authentication-Results": [ "ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=osuosl.org\n\t(client-ip=140.211.166.138; helo=whitealder.osuosl.org;\n\tenvelope-from=intel-wired-lan-bounces@osuosl.org;\n\treceiver=<UNKNOWN>)", "ozlabs.org;\n\tdmarc=none (p=none dis=none) header.from=intel.com" ], "Received": [ "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 40By6Q6Bsjz9s34\n\tfor <incoming@patchwork.ozlabs.org>;\n\tFri, 30 Mar 2018 08:09:02 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 6AD6189AD3;\n\tThu, 29 Mar 2018 21:09:00 +0000 (UTC)", "from whitealder.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id qIfWai6Rl4Oc; Thu, 29 Mar 2018 21:08:57 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 78B3589ACF;\n\tThu, 29 Mar 2018 21:08:57 +0000 (UTC)", "from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n\tby ash.osuosl.org (Postfix) with ESMTP id 81F3F1C0BD3\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 29 Mar 2018 21:08:54 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 7DA1788AFD\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 29 Mar 2018 21:08:54 +0000 (UTC)", "from fraxinus.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id wcWtASdCpuyi for <intel-wired-lan@lists.osuosl.org>;\n\tThu, 29 Mar 2018 21:08:53 +0000 (UTC)", "from mga09.intel.com (mga09.intel.com [134.134.136.24])\n\tby fraxinus.osuosl.org (Postfix) with ESMTPS id CFF1A88BC9\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 29 Mar 2018 21:08:53 +0000 (UTC)", "from fmsmga005.fm.intel.com ([10.253.24.32])\n\tby orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t29 Mar 2018 14:08:53 -0700", "from ellie.jf.intel.com (HELO localhost.localdomain)\n\t([10.54.70.23])\n\tby fmsmga005.fm.intel.com with ESMTP; 29 Mar 2018 14:08:53 -0700" ], "X-Virus-Scanned": [ "amavisd-new at osuosl.org", "amavisd-new at osuosl.org" ], "X-Greylist": "domain auto-whitelisted by SQLgrey-1.7.6", "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.48,378,1517904000\"; d=\"scan'208\";a=\"216093121\"", "From": "Vinicius Costa Gomes <vinicius.gomes@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Thu, 29 Mar 2018 14:07:45 -0700", "Message-Id": "<20180329210751.11531-5-vinicius.gomes@intel.com>", "X-Mailer": "git-send-email 2.16.3", "In-Reply-To": "<20180329210751.11531-1-vinicius.gomes@intel.com>", "References": "<20180329210751.11531-1-vinicius.gomes@intel.com>", "Subject": "[Intel-wired-lan] [next-queue PATCH v6 04/10] igb: Add support for\n\tMAC address filters specifying source addresses", "X-BeenThere": "intel-wired-lan@osuosl.org", "X-Mailman-Version": "2.1.24", "Precedence": "list", "List-Id": "Intel Wired Ethernet Linux Kernel Driver Development\n\t<intel-wired-lan.osuosl.org>", "List-Unsubscribe": "<https://lists.osuosl.org/mailman/options/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@osuosl.org?subject=unsubscribe>", "List-Archive": "<http://lists.osuosl.org/pipermail/intel-wired-lan/>", "List-Post": "<mailto:intel-wired-lan@osuosl.org>", "List-Help": "<mailto:intel-wired-lan-request@osuosl.org?subject=help>", "List-Subscribe": "<https://lists.osuosl.org/mailman/listinfo/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@osuosl.org?subject=subscribe>", "Cc": "netdev@vger.kernel.org, jesus.sanchez-palencia@intel.com", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Errors-To": "intel-wired-lan-bounces@osuosl.org", "Sender": "\"Intel-wired-lan\" <intel-wired-lan-bounces@osuosl.org>" }, "content": "Makes it possible to direct packets to queues based on their source\naddress. Documents the expected usage of the 'flags' parameter.\n\nSigned-off-by: Vinicius Costa Gomes <vinicius.gomes@intel.com>\n---\n drivers/net/ethernet/intel/igb/e1000_defines.h | 1 +\n drivers/net/ethernet/intel/igb/igb.h | 1 +\n drivers/net/ethernet/intel/igb/igb_main.c | 40 ++++++++++++++++++++++----\n 3 files changed, 37 insertions(+), 5 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/igb/e1000_defines.h b/drivers/net/ethernet/intel/igb/e1000_defines.h\nindex 98534f765e0e..5417edbe3125 100644\n--- a/drivers/net/ethernet/intel/igb/e1000_defines.h\n+++ b/drivers/net/ethernet/intel/igb/e1000_defines.h\n@@ -491,6 +491,7 @@\n * manageability enabled, allowing us room for 15 multicast addresses.\n */\n #define E1000_RAH_AV 0x80000000 /* Receive descriptor valid */\n+#define E1000_RAH_ASEL_SRC_ADDR 0x00010000\n #define E1000_RAL_MAC_ADDR_LEN 4\n #define E1000_RAH_MAC_ADDR_LEN 2\n #define E1000_RAH_POOL_MASK 0x03FC0000\ndiff --git a/drivers/net/ethernet/intel/igb/igb.h b/drivers/net/ethernet/intel/igb/igb.h\nindex 8dbc399b345e..f3ecda46f287 100644\n--- a/drivers/net/ethernet/intel/igb/igb.h\n+++ b/drivers/net/ethernet/intel/igb/igb.h\n@@ -474,6 +474,7 @@ struct igb_mac_addr {\n \n #define IGB_MAC_STATE_DEFAULT\t0x1\n #define IGB_MAC_STATE_IN_USE\t0x2\n+#define IGB_MAC_STATE_SRC_ADDR 0x4\n \n /* board specific private data structure */\n struct igb_adapter {\ndiff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c\nindex 976898d39d6e..2033ec3c9b27 100644\n--- a/drivers/net/ethernet/intel/igb/igb_main.c\n+++ b/drivers/net/ethernet/intel/igb/igb_main.c\n@@ -6844,8 +6844,14 @@ static void igb_set_default_mac_filter(struct igb_adapter *adapter)\n \tigb_rar_set_index(adapter, 0);\n }\n \n-static int igb_add_mac_filter(struct igb_adapter *adapter, const u8 *addr,\n-\t\t\t const u8 queue)\n+/* Add a MAC filter for 'addr' directing matching traffic to 'queue',\n+ * 'flags' is used to indicate what kind of match is made, match is by\n+ * default for the destination address, if matching by source address\n+ * is desired the flag IGB_MAC_STATE_SRC_ADDR can be used.\n+ */\n+static int igb_add_mac_filter_flags(struct igb_adapter *adapter,\n+\t\t\t\t const u8 *addr, const u8 queue,\n+\t\t\t\t const u8 flags)\n {\n \tstruct e1000_hw *hw = &adapter->hw;\n \tint rar_entries = hw->mac.rar_entry_count -\n@@ -6865,7 +6871,7 @@ static int igb_add_mac_filter(struct igb_adapter *adapter, const u8 *addr,\n \n \t\tether_addr_copy(adapter->mac_table[i].addr, addr);\n \t\tadapter->mac_table[i].queue = queue;\n-\t\tadapter->mac_table[i].state |= IGB_MAC_STATE_IN_USE;\n+\t\tadapter->mac_table[i].state |= IGB_MAC_STATE_IN_USE | flags;\n \n \t\tigb_rar_set_index(adapter, i);\n \t\treturn i;\n@@ -6874,8 +6880,21 @@ static int igb_add_mac_filter(struct igb_adapter *adapter, const u8 *addr,\n \treturn -ENOSPC;\n }\n \n-static int igb_del_mac_filter(struct igb_adapter *adapter, const u8 *addr,\n+static int igb_add_mac_filter(struct igb_adapter *adapter, const u8 *addr,\n \t\t\t const u8 queue)\n+{\n+\treturn igb_add_mac_filter_flags(adapter, addr, queue, 0);\n+}\n+\n+/* Remove a MAC filter for 'addr' directing matching traffic to\n+ * 'queue', 'flags' is used to indicate what kind of match need to be\n+ * removed, match is by default for the destination address, if\n+ * matching by source address is to be removed the flag\n+ * IGB_MAC_STATE_SRC_ADDR can be used.\n+ */\n+static int igb_del_mac_filter_flags(struct igb_adapter *adapter,\n+\t\t\t\t const u8 *addr, const u8 queue,\n+\t\t\t\t const u8 flags)\n {\n \tstruct e1000_hw *hw = &adapter->hw;\n \tint rar_entries = hw->mac.rar_entry_count -\n@@ -6892,12 +6911,14 @@ static int igb_del_mac_filter(struct igb_adapter *adapter, const u8 *addr,\n \tfor (i = 0; i < rar_entries; i++) {\n \t\tif (!(adapter->mac_table[i].state & IGB_MAC_STATE_IN_USE))\n \t\t\tcontinue;\n+\t\tif ((adapter->mac_table[i].state & flags) != flags)\n+\t\t\tcontinue;\n \t\tif (adapter->mac_table[i].queue != queue)\n \t\t\tcontinue;\n \t\tif (!ether_addr_equal(adapter->mac_table[i].addr, addr))\n \t\t\tcontinue;\n \n-\t\tadapter->mac_table[i].state &= ~IGB_MAC_STATE_IN_USE;\n+\t\tadapter->mac_table[i].state = 0;\n \t\tmemset(adapter->mac_table[i].addr, 0, ETH_ALEN);\n \t\tadapter->mac_table[i].queue = 0;\n \n@@ -6908,6 +6929,12 @@ static int igb_del_mac_filter(struct igb_adapter *adapter, const u8 *addr,\n \treturn -ENOENT;\n }\n \n+static int igb_del_mac_filter(struct igb_adapter *adapter, const u8 *addr,\n+\t\t\t const u8 queue)\n+{\n+\treturn igb_del_mac_filter_flags(adapter, addr, queue, 0);\n+}\n+\n static int igb_uc_sync(struct net_device *netdev, const unsigned char *addr)\n {\n \tstruct igb_adapter *adapter = netdev_priv(netdev);\n@@ -8751,6 +8778,9 @@ static void igb_rar_set_index(struct igb_adapter *adapter, u32 index)\n \t\tif (is_valid_ether_addr(addr))\n \t\t\trar_high |= E1000_RAH_AV;\n \n+\t\tif (adapter->mac_table[index].state & IGB_MAC_STATE_SRC_ADDR)\n+\t\t\trar_high |= E1000_RAH_ASEL_SRC_ADDR;\n+\n \t\tswitch (hw->mac.type) {\n \t\tcase e1000_82575:\n \t\tcase e1000_i210:\n", "prefixes": [ "next-queue", "v6", "04/10" ] }