Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1269222/?format=api
{ "id": 1269222, "url": "http://patchwork.ozlabs.org/api/patches/1269222/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20200411002834.13916-3-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": "<20200411002834.13916-3-andre.guedes@intel.com>", "list_archive_url": null, "date": "2020-04-11T00:28:32", "name": "[2/4] igc: Remove mac_table from igc_adapter", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "89ad60a87422ddfae7c947145aa983a0113ce873", "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/20200411002834.13916-3-andre.guedes@intel.com/mbox/", "series": [ { "id": 169691, "url": "http://patchwork.ozlabs.org/api/series/169691/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=169691", "date": "2020-04-11T00:28:30", "name": "igc: Enable NFC rules based on source MAC address", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/169691/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1269222/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1269222/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.133;\n\thelo=hemlock.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 hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\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 48zbN35DvYz9sQt\n\tfor <incoming@patchwork.ozlabs.org>;\n\tSat, 11 Apr 2020 10:28:51 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 96D5488390;\n\tSat, 11 Apr 2020 00:28:48 +0000 (UTC)", "from hemlock.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id 6SZZeiCRTFDw; Sat, 11 Apr 2020 00:28:47 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 606198836F;\n\tSat, 11 Apr 2020 00:28:47 +0000 (UTC)", "from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n\tby ash.osuosl.org (Postfix) with ESMTP id 988171BF2C1\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tSat, 11 Apr 2020 00:28:43 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 9591E85DCF\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tSat, 11 Apr 2020 00:28:43 +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 PbEDJvovpd69 for <intel-wired-lan@lists.osuosl.org>;\n\tSat, 11 Apr 2020 00:28:41 +0000 (UTC)", "from mga02.intel.com (mga02.intel.com [134.134.136.20])\n\tby fraxinus.osuosl.org (Postfix) with ESMTPS id 16133862A5\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tSat, 11 Apr 2020 00:28:41 +0000 (UTC)", "from fmsmga001.fm.intel.com ([10.253.24.23])\n\tby orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; \n\t10 Apr 2020 17:28:40 -0700", "from nwu5-mobl1.amr.corp.intel.com ([10.134.124.160])\n\tby fmsmga001.fm.intel.com with ESMTP; 10 Apr 2020 17:28:39 -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": [ "JkvawzYrYmj3zg+zlttvOWx+ltH+ZmM1M0VlCQ5omFP8FcS3/dVTVh2cKsCpIxKQfQO7wZPAHn\n\t4RCdTZ01tPWQ==", "N5IXqyAH9oCfxj4NERpey5K5pBnp2b/RGjZOyvQ1afNkML905XezlBlKvIxvetzuLo4zQZJbJH\n\tlrruvLoGrS5w==" ], "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.72,368,1580803200\"; d=\"scan'208\";a=\"362585533\"", "From": "Andre Guedes <andre.guedes@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Fri, 10 Apr 2020 17:28:32 -0700", "Message-Id": "<20200411002834.13916-3-andre.guedes@intel.com>", "X-Mailer": "git-send-email 2.26.0", "In-Reply-To": "<20200411002834.13916-1-andre.guedes@intel.com>", "References": "<20200411002834.13916-1-andre.guedes@intel.com>", "MIME-Version": "1.0", "Subject": "[Intel-wired-lan] [PATCH 2/4] igc: Remove mac_table from igc_adapter", "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": "In igc_adapter we keep a sort of shadow copy of RAL and RAH registers.\nThere is not much benefit in keeping it, at the cost of maintainability,\nsince adding/removing MAC address filters is not hot path, and we\nalready keep filters information in adapter->nfc_filter_list for cleanup\nand restoration purposes.\n\nSo in order to simplify the MAC address filtering code and prepare it\nfor source address support, this patch removes the mac_table from\nigc_adapter.\n\nSigned-off-by: Andre Guedes <andre.guedes@intel.com>\n---\n drivers/net/ethernet/intel/igc/igc.h | 11 ----\n drivers/net/ethernet/intel/igc/igc_defines.h | 1 +\n drivers/net/ethernet/intel/igc/igc_main.c | 57 +++++++-------------\n 3 files changed, 21 insertions(+), 48 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/igc/igc.h b/drivers/net/ethernet/intel/igc/igc.h\nindex c4c4498ab48f..654481cea1f2 100644\n--- a/drivers/net/ethernet/intel/igc/igc.h\n+++ b/drivers/net/ethernet/intel/igc/igc.h\n@@ -190,8 +190,6 @@ struct igc_adapter {\n \t/* lock for RX network flow classification filter */\n \tspinlock_t nfc_lock;\n \n-\tstruct igc_mac_addr *mac_table;\n-\n \tu8 rss_indir_tbl[IGC_RETA_SIZE];\n \n \tunsigned long link_check_timeout;\n@@ -470,15 +468,6 @@ struct igc_nfc_filter {\n \tu16 action;\n };\n \n-struct igc_mac_addr {\n-\tu8 addr[ETH_ALEN];\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-\n #define IGC_MAX_RXNFC_FILTERS\t\t16\n \n /* igc_desc_unused - calculate if we have unused descriptors */\ndiff --git a/drivers/net/ethernet/intel/igc/igc_defines.h b/drivers/net/ethernet/intel/igc/igc_defines.h\nindex 1127ef81e374..e190a7f83c3c 100644\n--- a/drivers/net/ethernet/intel/igc/igc_defines.h\n+++ b/drivers/net/ethernet/intel/igc/igc_defines.h\n@@ -62,6 +62,7 @@\n * (RAR[15]) for our directed address used by controllers with\n * manageability enabled, allowing us room for 15 multicast addresses.\n */\n+#define IGC_RAH_RAH_MASK\t0x0000FFFF\n #define IGC_RAH_QSEL_MASK\t0x000C0000\n #define IGC_RAH_QSEL_SHIFT\t18\n #define IGC_RAH_QSEL_ENABLE\tBIT(28)\ndiff --git a/drivers/net/ethernet/intel/igc/igc_main.c b/drivers/net/ethernet/intel/igc/igc_main.c\nindex 411af7eafe19..1779d20299d0 100644\n--- a/drivers/net/ethernet/intel/igc/igc_main.c\n+++ b/drivers/net/ethernet/intel/igc/igc_main.c\n@@ -820,17 +820,12 @@ static void igc_clear_mac_filter_hw(struct igc_adapter *adapter, int index)\n /* Set default MAC address for the PF in the first RAR entry */\n static void igc_set_default_mac_filter(struct igc_adapter *adapter)\n {\n-\tstruct igc_mac_addr *mac_table = &adapter->mac_table[0];\n \tstruct net_device *dev = adapter->netdev;\n \tu8 *addr = adapter->hw.mac.addr;\n \n \tnetdev_dbg(dev, \"Set default MAC address filter: address %pM\", addr);\n \n-\tether_addr_copy(mac_table->addr, 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, addr, mac_table->queue);\n+\tigc_set_mac_filter_hw(adapter, 0, addr, -1);\n }\n \n /**\n@@ -2187,16 +2182,21 @@ static void igc_nfc_filter_restore(struct igc_adapter *adapter)\n \n static int igc_find_mac_filter(struct igc_adapter *adapter, const u8 *addr)\n {\n-\tint max_entries = adapter->hw.mac.rar_entry_count;\n-\tstruct igc_mac_addr *entry;\n+\tstruct igc_hw *hw = &adapter->hw;\n+\tint max_entries = hw->mac.rar_entry_count;\n+\tu32 ral, rah;\n \tint i;\n \n \tfor (i = 0; i < max_entries; i++) {\n-\t\tentry = &adapter->mac_table[i];\n+\t\tral = rd32(IGC_RAL(i));\n+\t\trah = rd32(IGC_RAH(i));\n \n-\t\tif (!(entry->state & IGC_MAC_STATE_IN_USE))\n+\t\tif (!(rah & IGC_RAH_AV))\n \t\t\tcontinue;\n-\t\tif (!ether_addr_equal(addr, entry->addr))\n+\t\tif ((rah & IGC_RAH_RAH_MASK) !=\n+\t\t le16_to_cpup((__le16 *)(addr + 4)))\n+\t\t\tcontinue;\n+\t\tif (ral != le32_to_cpup((__le32 *)(addr)))\n \t\t\tcontinue;\n \n \t\treturn i;\n@@ -2207,14 +2207,15 @@ static int igc_find_mac_filter(struct igc_adapter *adapter, const u8 *addr)\n \n static int igc_get_avail_mac_filter_slot(struct igc_adapter *adapter)\n {\n-\tint max_entries = adapter->hw.mac.rar_entry_count;\n-\tstruct igc_mac_addr *entry;\n+\tstruct igc_hw *hw = &adapter->hw;\n+\tint max_entries = hw->mac.rar_entry_count;\n+\tu32 rah;\n \tint i;\n \n \tfor (i = 0; i < max_entries; i++) {\n-\t\tentry = &adapter->mac_table[i];\n+\t\trah = rd32(IGC_RAH(i));\n \n-\t\tif (!(entry->state & IGC_MAC_STATE_IN_USE))\n+\t\tif (!(rah & IGC_RAH_AV))\n \t\t\treturn i;\n \t}\n \n@@ -2242,7 +2243,7 @@ int igc_add_mac_filter(struct igc_adapter *adapter, const u8 *addr,\n \n \tindex = igc_find_mac_filter(adapter, addr);\n \tif (index >= 0)\n-\t\tgoto update_queue_assignment;\n+\t\tgoto update_filter;\n \n \tindex = igc_get_avail_mac_filter_slot(adapter);\n \tif (index < 0)\n@@ -2251,11 +2252,7 @@ int igc_add_mac_filter(struct igc_adapter *adapter, const u8 *addr,\n \tnetdev_dbg(dev, \"Add MAC address filter: index %d address %pM queue %d\",\n \t\t index, addr, queue);\n \n-\tether_addr_copy(adapter->mac_table[index].addr, addr);\n-\tadapter->mac_table[index].state |= IGC_MAC_STATE_IN_USE;\n-update_queue_assignment:\n-\tadapter->mac_table[index].queue = queue;\n-\n+update_filter:\n \tigc_set_mac_filter_hw(adapter, index, addr, queue);\n \treturn 0;\n }\n@@ -2270,7 +2267,6 @@ int igc_add_mac_filter(struct igc_adapter *adapter, const u8 *addr,\n int igc_del_mac_filter(struct igc_adapter *adapter, const u8 *addr)\n {\n \tstruct net_device *dev = adapter->netdev;\n-\tstruct igc_mac_addr *entry;\n \tint index;\n \n \tif (!is_valid_ether_addr(addr))\n@@ -2280,24 +2276,18 @@ int igc_del_mac_filter(struct igc_adapter *adapter, const u8 *addr)\n \tif (index < 0)\n \t\treturn -ENOENT;\n \n-\tentry = &adapter->mac_table[index];\n-\n-\tif (entry->state & IGC_MAC_STATE_DEFAULT) {\n+\tif (index == 0) {\n \t\t/* If this is the default filter, we don't actually delete it.\n \t\t * We just reset to its default value i.e. disable queue\n \t\t * assignment.\n \t\t */\n \t\tnetdev_dbg(dev, \"Disable default MAC filter queue assignment\");\n \n-\t\tentry->queue = -1;\n-\t\tigc_set_mac_filter_hw(adapter, 0, addr, entry->queue);\n+\t\tigc_set_mac_filter_hw(adapter, 0, addr, -1);\n \t} else {\n \t\tnetdev_dbg(dev, \"Delete MAC address filter: index %d address %pM\",\n \t\t\t index, addr);\n \n-\t\tentry->state = 0;\n-\t\tentry->queue = -1;\n-\t\tmemset(entry->addr, 0, ETH_ALEN);\n \t\tigc_clear_mac_filter_hw(adapter, index);\n \t}\n \n@@ -3405,8 +3395,6 @@ static int igc_sw_init(struct igc_adapter *adapter)\n \tstruct pci_dev *pdev = adapter->pdev;\n \tstruct igc_hw *hw = &adapter->hw;\n \n-\tint size = sizeof(struct igc_mac_addr) * hw->mac.rar_entry_count;\n-\n \tpci_read_config_word(pdev, PCI_COMMAND, &hw->bus.pci_cmd_word);\n \n \t/* set default ring sizes */\n@@ -3430,10 +3418,6 @@ static int igc_sw_init(struct igc_adapter *adapter)\n \t/* Assume MSI-X interrupts, will be checked during IRQ allocation */\n \tadapter->flags |= IGC_FLAG_HAS_MSIX;\n \n-\tadapter->mac_table = kzalloc(size, GFP_ATOMIC);\n-\tif (!adapter->mac_table)\n-\t\treturn -ENOMEM;\n-\n \tigc_init_queue_configuration(adapter);\n \n \t/* This call may decrease the number of queues */\n@@ -5139,7 +5123,6 @@ static void igc_remove(struct pci_dev *pdev)\n \tpci_iounmap(pdev, adapter->io_addr);\n \tpci_release_mem_regions(pdev);\n \n-\tkfree(adapter->mac_table);\n \tfree_netdev(netdev);\n \n \tpci_disable_pcie_error_reporting(pdev);\n", "prefixes": [ "2/4" ] }