Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1257852/?format=api
{ "id": 1257852, "url": "http://patchwork.ozlabs.org/api/patches/1257852/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20200318230102.36952-9-andre.guedes@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": "<20200318230102.36952-9-andre.guedes@intel.com>", "list_archive_url": null, "date": "2020-03-18T23:00:58", "name": "[08/12] igc: Remove IGC_MAC_STATE_QUEUE_STEERING", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "83ba54b0a85fb454037db5faba74b9515391f210", "submitter": { "id": 72323, "url": "http://patchwork.ozlabs.org/api/people/72323/?format=api", "name": "Andre Guedes", "email": "andre.guedes@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/20200318230102.36952-9-andre.guedes@intel.com/mbox/", "series": [ { "id": 165243, "url": "http://patchwork.ozlabs.org/api/series/165243/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=165243", "date": "2020-03-18T23:00:52", "name": "igc: Refactor MAC address filtering code", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/165243/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1257852/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1257852/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; spf=pass (sender SPF authorized)\n\tsmtp.mailfrom=osuosl.org (client-ip=140.211.166.136;\n\thelo=silver.osuosl.org;\n\tenvelope-from=intel-wired-lan-bounces@osuosl.org;\n\treceiver=<UNKNOWN>)", "ozlabs.org;\n\tdmarc=fail (p=none dis=none) header.from=intel.com" ], "Received": [ "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits)) (No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 48jQXt4mtjz9sR4\n\tfor <incoming@patchwork.ozlabs.org>;\n\tThu, 19 Mar 2020 10:02:22 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id BBEF120435;\n\tWed, 18 Mar 2020 23:02:20 +0000 (UTC)", "from silver.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id MAy30Mhfedhs; Wed, 18 Mar 2020 23:02:16 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby silver.osuosl.org (Postfix) with ESMTP id F171620405;\n\tWed, 18 Mar 2020 23:02:15 +0000 (UTC)", "from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n\tby ash.osuosl.org (Postfix) with ESMTP id D11CF1BF335\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 18 Mar 2020 23:02:12 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id BE72486644\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 18 Mar 2020 23:02:12 +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 wXy4KlE5lF5r for <intel-wired-lan@lists.osuosl.org>;\n\tWed, 18 Mar 2020 23:02:11 +0000 (UTC)", "from mga18.intel.com (mga18.intel.com [134.134.136.126])\n\tby fraxinus.osuosl.org (Postfix) with ESMTPS id 6C78186637\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 18 Mar 2020 23:02:11 +0000 (UTC)", "from orsmga006.jf.intel.com ([10.7.209.51])\n\tby orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; \n\t18 Mar 2020 16:02:10 -0700", "from ymtomada-mobl.amr.corp.intel.com ([10.251.21.179])\n\tby orsmga006.jf.intel.com with ESMTP; 18 Mar 2020 16:02:10 -0700" ], "X-Virus-Scanned": [ "amavisd-new at osuosl.org", "amavisd-new at osuosl.org" ], "X-Greylist": "domain auto-whitelisted by SQLgrey-1.7.6", "IronPort-SDR": [ "KGQXZ+OhPZcsX4MgGmEJVvPh/Rj7qZzGQEmZOsXqGHvHmY/kVvoKZNkMt5RXOHPbOtkycawqSS\n\t+o/p4nyp63cQ==", "60LxfirtSU7QxAE13eVL0LoyM65dggAUBv5MgNPLc9KHlDlZLUfl1rRVG9SwgLViPifdWeISTO\n\toiYbL9nzYFgA==" ], "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.70,569,1574150400\"; d=\"scan'208\";a=\"248341787\"", "From": "Andre Guedes <andre.guedes@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Wed, 18 Mar 2020 16:00:58 -0700", "Message-Id": "<20200318230102.36952-9-andre.guedes@intel.com>", "X-Mailer": "git-send-email 2.25.0", "In-Reply-To": "<20200318230102.36952-1-andre.guedes@intel.com>", "References": "<20200318230102.36952-1-andre.guedes@intel.com>", "MIME-Version": "1.0", "Subject": "[Intel-wired-lan] [PATCH 08/12] igc: Remove\n\tIGC_MAC_STATE_QUEUE_STEERING", "X-BeenThere": "intel-wired-lan@osuosl.org", "X-Mailman-Version": "2.1.29", "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>", "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": "The IGC_MAC_STATE_QUEUE_STEERING bit in mac_table[i].state is\nutilized to indicate that frames matching the filter are assigned to\nmac_table[i].queue. This bit is not strictly necessary since we can\nconvey the same information as follows: queue == -1 means queue\nassignment is disabled, otherwise it is enabled.\n\nIn addition to make the code simpler, this change fixes some awkward\nsituations where we pass a complete misleading 'queue' value such as in\nigc_uc_sync().\n\nSo this patch removes IGC_MAC_STATE_QUEUE_STEERING and also takes the\nopportunity to improve the igc_add_mac_filter documentation.\n\nSigned-off-by: Andre Guedes <andre.guedes@intel.com>\n---\n drivers/net/ethernet/intel/igc/igc.h | 3 +-\n drivers/net/ethernet/intel/igc/igc_main.c | 34 +++++++++++++----------\n 2 files changed, 21 insertions(+), 16 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/igc/igc.h b/drivers/net/ethernet/intel/igc/igc.h\nindex e743f92a27c6..192cef07bdf7 100644\n--- a/drivers/net/ethernet/intel/igc/igc.h\n+++ b/drivers/net/ethernet/intel/igc/igc.h\n@@ -470,14 +470,13 @@ struct igc_nfc_filter {\n \n struct igc_mac_addr {\n \tu8 addr[ETH_ALEN];\n-\tu8 queue;\n+\ts8 queue;\n \tu8 state; /* bitmask */\n };\n \n #define IGC_MAC_STATE_DEFAULT\t\t0x1\n #define IGC_MAC_STATE_IN_USE\t\t0x2\n #define IGC_MAC_STATE_SRC_ADDR\t\t0x4\n-#define IGC_MAC_STATE_QUEUE_STEERING\t0x8\n \n #define IGC_MAX_RXNFC_FILTERS\t\t16\n \ndiff --git a/drivers/net/ethernet/intel/igc/igc_main.c b/drivers/net/ethernet/intel/igc/igc_main.c\nindex 8a3cae2367d4..273817252823 100644\n--- a/drivers/net/ethernet/intel/igc/igc_main.c\n+++ b/drivers/net/ethernet/intel/igc/igc_main.c\n@@ -820,8 +820,9 @@ static void igc_set_default_mac_filter(struct igc_adapter *adapter)\n \n \tether_addr_copy(mac_table->addr, adapter->hw.mac.addr);\n \tmac_table->state = IGC_MAC_STATE_DEFAULT | IGC_MAC_STATE_IN_USE;\n+\tmac_table->queue = -1;\n \n-\tigc_set_mac_filter_hw(adapter, 0, mac_table->addr, -1);\n+\tigc_set_mac_filter_hw(adapter, 0, mac_table->addr, mac_table->queue);\n }\n \n /**\n@@ -2197,13 +2198,20 @@ static bool igc_mac_entry_can_be_used(const struct igc_mac_addr *entry,\n \treturn true;\n }\n \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 IGC_MAC_STATE_SRC_ADDR can be used.\n- */\n+/* Add MAC address filter to adapter.\n+ *\n+ * @adapter: Pointer to adapter where the filter should be added.\n+ * @addr: MAC address.\n+ * @queue: If non-negative, queue assignment feature is enabled and frames\n+ * matching the filter are enqueued onto 'queue'. Otherwise, queue assignment\n+ * is disabled.\n+ * @flags: Set IGC_MAC_STATE_SRC_ADDR bit to indicate @address is a source\n+ * address.\n+ *\n+ * In case of success, returns 0. Otherwise, it returns a negative errno code.\n+ */\n static int igc_add_mac_filter(struct igc_adapter *adapter, const u8 *addr,\n-\t\t\t const u8 queue, const u8 flags)\n+\t\t\t const s8 queue, const u8 flags)\n {\n \tstruct igc_hw *hw = &adapter->hw;\n \tint rar_entries = hw->mac.rar_entry_count;\n@@ -2267,11 +2275,11 @@ static int igc_del_mac_filter(struct igc_adapter *adapter, const u8 *addr,\n \t\tif (adapter->mac_table[i].state & IGC_MAC_STATE_DEFAULT) {\n \t\t\tadapter->mac_table[i].state =\n \t\t\t\tIGC_MAC_STATE_DEFAULT | IGC_MAC_STATE_IN_USE;\n-\t\t\tadapter->mac_table[i].queue = 0;\n+\t\t\tadapter->mac_table[i].queue = -1;\n \t\t\tigc_set_mac_filter_hw(adapter, 0, addr, -1);\n \t\t} else {\n \t\t\tadapter->mac_table[i].state = 0;\n-\t\t\tadapter->mac_table[i].queue = 0;\n+\t\t\tadapter->mac_table[i].queue = -1;\n \t\t\tmemset(adapter->mac_table[i].addr, 0, ETH_ALEN);\n \t\t\tigc_clear_mac_filter_hw(adapter, i);\n \t\t}\n@@ -2286,7 +2294,7 @@ static int igc_uc_sync(struct net_device *netdev, const unsigned char *addr)\n {\n \tstruct igc_adapter *adapter = netdev_priv(netdev);\n \n-\treturn igc_add_mac_filter(adapter, addr, adapter->num_rx_queues, 0);\n+\treturn igc_add_mac_filter(adapter, addr, -1, 0);\n }\n \n static int igc_uc_unsync(struct net_device *netdev, const unsigned char *addr)\n@@ -3731,15 +3739,13 @@ igc_features_check(struct sk_buff *skb, struct net_device *dev,\n int igc_add_mac_steering_filter(struct igc_adapter *adapter,\n \t\t\t\tconst u8 *addr, u8 queue, u8 flags)\n {\n-\treturn igc_add_mac_filter(adapter, addr, queue,\n-\t\t\t\t IGC_MAC_STATE_QUEUE_STEERING | flags);\n+\treturn igc_add_mac_filter(adapter, addr, queue, flags);\n }\n \n int igc_del_mac_steering_filter(struct igc_adapter *adapter,\n \t\t\t\tconst u8 *addr, u8 queue, u8 flags)\n {\n-\treturn igc_del_mac_filter(adapter, addr,\n-\t\t\t\t IGC_MAC_STATE_QUEUE_STEERING | flags);\n+\treturn igc_del_mac_filter(adapter, addr, flags);\n }\n \n static void igc_tsync_interrupt(struct igc_adapter *adapter)\n", "prefixes": [ "08/12" ] }