Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/840484/?format=api
{ "id": 840484, "url": "http://patchwork.ozlabs.org/api/patches/840484/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20171122185652.29785.75613.stgit@localhost.localdomain/", "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": "<20171122185652.29785.75613.stgit@localhost.localdomain>", "list_archive_url": null, "date": "2017-11-22T18:56:52", "name": "[jkirsher/next-queue,07/16] ixgbe: Drop l2_accel_priv data pointer from ring struct", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "4d233fd3ea0f56f4b01f81cc42d19244bc243d0a", "submitter": { "id": 252, "url": "http://patchwork.ozlabs.org/api/people/252/?format=api", "name": "Alexander Duyck", "email": "alexander.duyck@gmail.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/20171122185652.29785.75613.stgit@localhost.localdomain/mbox/", "series": [ { "id": 14756, "url": "http://patchwork.ozlabs.org/api/series/14756/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=14756", "date": "2017-11-22T18:56:10", "name": "ixgbe/fm10k: macvlan fixes", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/14756/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/840484/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/840484/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\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=gmail.com header.i=@gmail.com\n\theader.b=\"D59JSzt8\"; dkim-atps=neutral" ], "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 3yhsXf3b11z9ryv\n\tfor <incoming@patchwork.ozlabs.org>;\n\tThu, 23 Nov 2017 06:12:34 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 9055F888CF;\n\tWed, 22 Nov 2017 19:12:32 +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 WiOXLGSsYa-y; Wed, 22 Nov 2017 19:12:31 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id B67C38887B;\n\tWed, 22 Nov 2017 19:12:31 +0000 (UTC)", "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\tby ash.osuosl.org (Postfix) with ESMTP id 553B51CEF64\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 22 Nov 2017 18:56:55 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 4F274888C7\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 22 Nov 2017 18:56:55 +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 DvhrKxzfUkIp for <intel-wired-lan@lists.osuosl.org>;\n\tWed, 22 Nov 2017 18:56:54 +0000 (UTC)", "from mail-pf0-f195.google.com (mail-pf0-f195.google.com\n\t[209.85.192.195])\n\tby whitealder.osuosl.org (Postfix) with ESMTPS id 9224E888C8\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 22 Nov 2017 18:56:54 +0000 (UTC)", "by mail-pf0-f195.google.com with SMTP id i15so12464535pfa.3\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 22 Nov 2017 10:56:54 -0800 (PST)", "from localhost.localdomain ([2001:470:b:9c3:9e5c:8eff:fe4f:f2d0])\n\tby smtp.gmail.com with ESMTPSA id\n\tl5sm25416751pgo.24.2017.11.22.10.56.53\n\tfor <intel-wired-lan@lists.osuosl.org>\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tWed, 22 Nov 2017 10:56:53 -0800 (PST)" ], "X-Virus-Scanned": [ "amavisd-new at osuosl.org", "amavisd-new at osuosl.org" ], "X-Greylist": "domain auto-whitelisted by SQLgrey-1.7.6", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;\n\th=subject:from:to:date:message-id:in-reply-to:references:user-agent\n\t:mime-version:content-transfer-encoding;\n\tbh=eMMa1y2DI9Qz4I12Dm2pCvFAEvgE3ASdsavIMVpVfxk=;\n\tb=D59JSzt8W5u8uVZZOSAsIepOGZoyeE3w/6idXUZ/Es+mg+HapbpyDRxhWplOgALwYW\n\tQGSmc/76wlq3FKMRVhiOLF1v5EuLeUdPK7KG2+QcEs+IE0sDxvElsPsFIjwMPqTT+ss8\n\tq0rHpEjpLID/Ft51yYiQd87PZxtR4l4yycpwnmpPWIYnfy1CmlilmRADCF2L6f3itCzo\n\tDyqmi0S6HY1eZzC/FoD1edTo3e6hYukb5BPJhRgsrDCKre0kGNC+8HV2laT0lKc8QmVW\n\tu3+1N5luNkMOhH96868Zl3EY9Fh3XUGATXm467HN+jquSn/hUZ6X9jPczOS+C8X2uOE+\n\t2/xA==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:subject:from:to:date:message-id:in-reply-to\n\t:references:user-agent:mime-version:content-transfer-encoding;\n\tbh=eMMa1y2DI9Qz4I12Dm2pCvFAEvgE3ASdsavIMVpVfxk=;\n\tb=PmBUmFXrGalchWfUjnjFe758gAlCswxyvmaxY/3XCmiYv5EV5Y5X8VK1xscGR+u5kn\n\txx+8rIzlYUhooH6wAkE4de5voxqxJA9AGPnhHHm0yOLQ1YvbbCwq/9Pd2r0AHEDk5+5G\n\t2zjmefSjeJuuEQFwrnkC5fyoKsjMRtVyZlnnR+icCDZ/h3fUuvXJO5EPOhsz5LfiTWwT\n\tWjplHj0V5qPUGpRzgDGzV6JQJaF0Pv4o/3mlRs+c5vIglWmCbLxjrQJ6tTQOvRokzSx+\n\tGyDge4BbNn8HZHV/b59rRkm+dxilYbjf5U7TANnzkuppHHxoRMatTny9QYHD2hCqPV1f\n\tSk2Q==", "X-Gm-Message-State": "AJaThX61cUObYi/bxY8JQaFbdyf1dznvzx8Ku/mdCb5raR/1Rmd6qfpG\n\tgyhFHWjVrXs44BOpCCxzlZO8gw3z", "X-Google-Smtp-Source": "AGs4zMY5pn2SwUMhP48wGMiSqNevzhVB7w8ur2Os/Bqe1m7XHPSrAYcTpGEhEEXKvrRIDtpv1hJU/Q==", "X-Received": "by 10.98.215.19 with SMTP id b19mr19934231pfh.94.1511377013932; \n\tWed, 22 Nov 2017 10:56:53 -0800 (PST)", "From": "Alexander Duyck <alexander.duyck@gmail.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Wed, 22 Nov 2017 10:56:52 -0800", "Message-ID": "<20171122185652.29785.75613.stgit@localhost.localdomain>", "In-Reply-To": "<20171122185256.29785.93548.stgit@localhost.localdomain>", "References": "<20171122185256.29785.93548.stgit@localhost.localdomain>", "User-Agent": "StGit/0.17.1-dirty", "MIME-Version": "1.0", "Subject": "[Intel-wired-lan] [jkirsher/next-queue PATCH 07/16] ixgbe: Drop\n\tl2_accel_priv data pointer from ring struct", "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>", "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": "From: Alexander Duyck <alexander.h.duyck@intel.com>\n\nThe l2 acceleration private pointer isn't needed in the ring struct. It\nisn't really used anywhere other than to test and see if we are supporting\nan offloaded macvlan netdev, and it is much easier to test netdev for not\nbeing ixgbe based to verify that.\n\nSigned-off-by: Alexander Duyck <alexander.h.duyck@intel.com>\n---\n drivers/net/ethernet/intel/ixgbe/ixgbe.h | 1 -\n drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 23 +++++++++++++----------\n 2 files changed, 13 insertions(+), 11 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe.h b/drivers/net/ethernet/intel/ixgbe/ixgbe.h\nindex 7a421b70afce..09def116bb48 100644\n--- a/drivers/net/ethernet/intel/ixgbe/ixgbe.h\n+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe.h\n@@ -332,7 +332,6 @@ struct ixgbe_ring {\n \tstruct net_device *netdev;\t/* netdev ring belongs to */\n \tstruct bpf_prog *xdp_prog;\n \tstruct device *dev;\t\t/* device for DMA mapping */\n-\tstruct ixgbe_fwd_adapter *l2_accel_priv;\n \tvoid *desc;\t\t\t/* descriptor ring memory */\n \tunion {\n \t\tstruct ixgbe_tx_buffer *tx_buffer_info;\ndiff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c\nindex 69bababc0cf6..09754519a0d9 100644\n--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c\n+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c\n@@ -192,6 +192,13 @@ static int ixgbe_notify_dca(struct notifier_block *, unsigned long event,\n static bool ixgbe_check_cfg_remove(struct ixgbe_hw *hw, struct pci_dev *pdev);\n static void ixgbe_watchdog_link_is_down(struct ixgbe_adapter *);\n \n+static const struct net_device_ops ixgbe_netdev_ops;\n+\n+static bool netif_is_ixgbe(struct net_device *dev)\n+{\n+\treturn dev && (dev->netdev_ops == &ixgbe_netdev_ops);\n+}\n+\n static int ixgbe_read_pci_cfg_word_parent(struct ixgbe_adapter *adapter,\n \t\t\t\t\t u32 reg, u16 *value)\n {\n@@ -4479,8 +4486,9 @@ static void ixgbe_vlan_strip_disable(struct ixgbe_adapter *adapter)\n \t\tfor (i = 0; i < adapter->num_rx_queues; i++) {\n \t\t\tstruct ixgbe_ring *ring = adapter->rx_ring[i];\n \n-\t\t\tif (ring->l2_accel_priv)\n+\t\t\tif (!netif_is_ixgbe(ring->netdev))\n \t\t\t\tcontinue;\n+\n \t\t\tj = ring->reg_idx;\n \t\t\tvlnctrl = IXGBE_READ_REG(hw, IXGBE_RXDCTL(j));\n \t\t\tvlnctrl &= ~IXGBE_RXDCTL_VME;\n@@ -4516,8 +4524,9 @@ static void ixgbe_vlan_strip_enable(struct ixgbe_adapter *adapter)\n \t\tfor (i = 0; i < adapter->num_rx_queues; i++) {\n \t\t\tstruct ixgbe_ring *ring = adapter->rx_ring[i];\n \n-\t\t\tif (ring->l2_accel_priv)\n+\t\t\tif (!netif_is_ixgbe(ring->netdev))\n \t\t\t\tcontinue;\n+\n \t\t\tj = ring->reg_idx;\n \t\t\tvlnctrl = IXGBE_READ_REG(hw, IXGBE_RXDCTL(j));\n \t\t\tvlnctrl |= IXGBE_RXDCTL_VME;\n@@ -5331,7 +5340,6 @@ static void ixgbe_disable_fwd_ring(struct ixgbe_fwd_adapter *vadapter,\n \tusleep_range(10000, 20000);\n \tixgbe_irq_disable_queues(adapter, BIT_ULL(index));\n \tixgbe_clean_rx_ring(rx_ring);\n-\trx_ring->l2_accel_priv = NULL;\n }\n \n static int ixgbe_fwd_ring_down(struct net_device *vdev,\n@@ -5349,10 +5357,8 @@ static int ixgbe_fwd_ring_down(struct net_device *vdev,\n \t\tadapter->rx_ring[rxbase + i]->netdev = adapter->netdev;\n \t}\n \n-\tfor (i = 0; i < adapter->num_rx_queues_per_pool; i++) {\n-\t\tadapter->tx_ring[txbase + i]->l2_accel_priv = NULL;\n+\tfor (i = 0; i < adapter->num_rx_queues_per_pool; i++)\n \t\tadapter->tx_ring[txbase + i]->netdev = adapter->netdev;\n-\t}\n \n \n \treturn 0;\n@@ -5382,14 +5388,11 @@ static int ixgbe_fwd_ring_up(struct net_device *vdev,\n \n \tfor (i = 0; i < adapter->num_rx_queues_per_pool; i++) {\n \t\tadapter->rx_ring[rxbase + i]->netdev = vdev;\n-\t\tadapter->rx_ring[rxbase + i]->l2_accel_priv = accel;\n \t\tixgbe_configure_rx_ring(adapter, adapter->rx_ring[rxbase + i]);\n \t}\n \n-\tfor (i = 0; i < adapter->num_rx_queues_per_pool; i++) {\n+\tfor (i = 0; i < adapter->num_rx_queues_per_pool; i++)\n \t\tadapter->tx_ring[txbase + i]->netdev = vdev;\n-\t\tadapter->tx_ring[txbase + i]->l2_accel_priv = accel;\n-\t}\n \n \tqueues = min_t(unsigned int,\n \t\t adapter->num_rx_queues_per_pool, vdev->num_tx_queues);\n", "prefixes": [ "jkirsher/next-queue", "07/16" ] }