Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/522402/?format=api
{ "id": 522402, "url": "http://patchwork.ozlabs.org/api/patches/522402/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20150924160432.22015.84967.stgit@ahduyck-vm-fedora22/", "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": "<20150924160432.22015.84967.stgit@ahduyck-vm-fedora22>", "list_archive_url": null, "date": "2015-09-24T16:04:32", "name": "[net-next,v2,2/3] i40e/i40evf: Drop useless \"IN_NETPOLL\" flag", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "9593c852afe6f22afd7d6108ff3c4651c9de65ae", "submitter": { "id": 67293, "url": "http://patchwork.ozlabs.org/api/people/67293/?format=api", "name": "Alexander Duyck", "email": "aduyck@mirantis.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/20150924160432.22015.84967.stgit@ahduyck-vm-fedora22/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/522402/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/522402/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<intel-wired-lan-bounces@lists.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" ], "Received": [ "from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\n\tby ozlabs.org (Postfix) with ESMTP id 7137F140281\n\tfor <incoming@patchwork.ozlabs.org>;\n\tFri, 25 Sep 2015 02:04:37 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id A548A95D66;\n\tThu, 24 Sep 2015 16:04:36 +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 KqpaJ9uvSt1M; Thu, 24 Sep 2015 16:04:36 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 0EF8F95D62;\n\tThu, 24 Sep 2015 16:04:36 +0000 (UTC)", "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\tby ash.osuosl.org (Postfix) with ESMTP id D44A51C0110\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 24 Sep 2015 16:04:34 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id CEB7992588\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 24 Sep 2015 16:04:34 +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 frbGXApb7YBd for <intel-wired-lan@lists.osuosl.org>;\n\tThu, 24 Sep 2015 16:04:34 +0000 (UTC)", "from mail-pa0-f43.google.com (mail-pa0-f43.google.com\n\t[209.85.220.43])\n\tby whitealder.osuosl.org (Postfix) with ESMTPS id 1CECE9257F\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 24 Sep 2015 16:04:34 +0000 (UTC)", "by pacex6 with SMTP id ex6so76810759pac.0\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 24 Sep 2015 09:04:33 -0700 (PDT)", "from [192.168.122.149] (50-43-10-6.bvtn.or.frontiernet.net.\n\t[50.43.10.6]) by smtp.gmail.com with ESMTPSA id\n\trs8sm14432939pbb.14.2015.09.24.09.04.33\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tThu, 24 Sep 2015 09:04:33 -0700 (PDT)" ], "Authentication-Results": "ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=mirantis.com header.i=@mirantis.com\n\theader.b=L7XFZsMd; dkim-atps=neutral", "X-Virus-Scanned": [ "amavisd-new at osuosl.org", "amavisd-new at osuosl.org" ], "X-Greylist": "from auto-whitelisted by SQLgrey-1.7.6", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=mirantis.com;\n\ts=google; \n\th=subject:from:to:cc:date:message-id:in-reply-to:references\n\t:user-agent:mime-version:content-type:content-transfer-encoding;\n\tbh=BJDvIa9eNKoepUvUvlKLdAlsxFxgmdK4fbSc+10M/b0=;\n\tb=L7XFZsMdtylKywnH49dzzPBciuwa1Ltkj58r55nK1665FBzTdlrxw6SrPDHW6Q37Cs\n\te3xyF9jDadEuTXHaURCRijPGj7oBmUsS/r3Iv2qm0363Pkn3zKbLnN/BrVKc+PsgA9hW\n\tZUHfUVC185PJS2J8QH0h+AQbeULE9KZIH5tSA=", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20130820;\n\th=x-gm-message-state:subject:from:to:cc:date:message-id:in-reply-to\n\t:references:user-agent:mime-version:content-type\n\t:content-transfer-encoding;\n\tbh=BJDvIa9eNKoepUvUvlKLdAlsxFxgmdK4fbSc+10M/b0=;\n\tb=C58guzS9UwCoYWXjZEy2WYQHgmzwu/TWPNQWsb+YDWPU0+y7cLQopiGhPqlqMvGt5n\n\tfREFW9XbETAcrND82zeULsjCE3Cwmw5vcrFG/BY4dwABUXehW1CrWfWQ4Yl3sJApO4CW\n\t69/3puKoy3Xb+1ADerxe2krkGB96zuEnu3jylQuN2HIjbRpmDIo+vNDQZv/yfj6tqE0i\n\tQXfOYPMYjMp56vWHe9WSGqjvRnMVdQ1OXqBP78MTO60pKwKxISd35bCZIu+r12gCh1Xo\n\tTTua66HmTCZ/xHAW6IcvRuEZ9OvzigIcsnDUAh2RyQh6APWEVVjCQYCEuEYVzfy3Ft9P\n\twwUw==", "X-Gm-Message-State": "ALoCoQk5QNA/uY+WxZ+ixzHfUoKtNVaGJXXKOh0GbsZPed8agW8Z/eRiehg7bZLS1pIdEdVzzvtf", "X-Received": "by 10.68.113.37 with SMTP id iv5mr604205pbb.2.1443110673727;\n\tThu, 24 Sep 2015 09:04:33 -0700 (PDT)", "From": "Alexander Duyck <aduyck@mirantis.com>", "To": "netdev@vger.kernel.org, intel-wired-lan@lists.osuosl.org", "Date": "Thu, 24 Sep 2015 09:04:32 -0700", "Message-ID": "<20150924160432.22015.84967.stgit@ahduyck-vm-fedora22>", "In-Reply-To": "<20150924160027.22015.15754.stgit@ahduyck-vm-fedora22>", "References": "<20150924160027.22015.15754.stgit@ahduyck-vm-fedora22>", "User-Agent": "StGit/0.17.1-dirty", "MIME-Version": "1.0", "Subject": "[Intel-wired-lan] [net-next PATCH v2 2/3] i40e/i40evf: Drop useless\n\t\"IN_NETPOLL\" flag", "X-BeenThere": "intel-wired-lan@lists.osuosl.org", "X-Mailman-Version": "2.1.18-1", "Precedence": "list", "List-Id": "Intel Wired Ethernet Linux Kernel Driver Development\n\t<intel-wired-lan.lists.osuosl.org>", "List-Unsubscribe": "<http://lists.osuosl.org/mailman/options/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@lists.osuosl.org?subject=unsubscribe>", "List-Archive": "<http://lists.osuosl.org/pipermail/intel-wired-lan/>", "List-Post": "<mailto:intel-wired-lan@lists.osuosl.org>", "List-Help": "<mailto:intel-wired-lan-request@lists.osuosl.org?subject=help>", "List-Subscribe": "<http://lists.osuosl.org/mailman/listinfo/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@lists.osuosl.org?subject=subscribe>", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Errors-To": "intel-wired-lan-bounces@lists.osuosl.org", "Sender": "\"Intel-wired-lan\" <intel-wired-lan-bounces@lists.osuosl.org>" }, "content": "The code in i40e and i40evf is using an \"IN_NETPOLL\" flag that has never\nadded any value due to the fact that the Rx clean-up is handled in NAPI.\nAs such the flag was set, the queue was scheduled via NAPI, and then polled\nfrom the netpoll controller and if any Rx packets were processed the were\nprocessed in the wrong context.\n\nIn addition the flag itself just added an unneeded conditional to the\nhot-path so it can safely be dropped and save us a few instructions.\n\nSigned-off-by: Alexander Duyck <aduyck@mirantis.com>\n---\n drivers/net/ethernet/intel/i40e/i40e.h | 1 -\n drivers/net/ethernet/intel/i40e/i40e_main.c | 2 --\n drivers/net/ethernet/intel/i40e/i40e_txrx.c | 7 +------\n drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 7 +------\n drivers/net/ethernet/intel/i40evf/i40evf.h | 2 --\n 5 files changed, 2 insertions(+), 17 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40e/i40e.h b/drivers/net/ethernet/intel/i40e/i40e.h\nindex e1cd8ac19dfc..e87d96788af2 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e.h\n+++ b/drivers/net/ethernet/intel/i40e/i40e.h\n@@ -308,7 +308,6 @@ struct i40e_pf {\n #ifdef I40E_FCOE\n #define I40E_FLAG_FCOE_ENABLED\t\t\tBIT_ULL(11)\n #endif /* I40E_FCOE */\n-#define I40E_FLAG_IN_NETPOLL\t\t\tBIT_ULL(12)\n #define I40E_FLAG_16BYTE_RX_DESC_ENABLED\tBIT_ULL(13)\n #define I40E_FLAG_CLEAN_ADMINQ\t\t\tBIT_ULL(14)\n #define I40E_FLAG_FILTER_SYNC\t\t\tBIT_ULL(15)\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c\nindex f048002ad928..56fd4ddbb9a8 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_main.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c\n@@ -3749,14 +3749,12 @@ static void i40e_netpoll(struct net_device *netdev)\n \tif (test_bit(__I40E_DOWN, &vsi->state))\n \t\treturn;\n \n-\tpf->flags |= I40E_FLAG_IN_NETPOLL;\n \tif (pf->flags & I40E_FLAG_MSIX_ENABLED) {\n \t\tfor (i = 0; i < vsi->num_q_vectors; i++)\n \t\t\ti40e_msix_clean_rings(0, vsi->q_vectors[i]);\n \t} else {\n \t\ti40e_intr(pf->pdev->irq, netdev);\n \t}\n-\tpf->flags &= ~I40E_FLAG_IN_NETPOLL;\n }\n #endif\n \ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx.c b/drivers/net/ethernet/intel/i40e/i40e_txrx.c\nindex 66b1fd26f0fc..fe4ce5a807a3 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_txrx.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.c\n@@ -1345,16 +1345,11 @@ static void i40e_receive_skb(struct i40e_ring *rx_ring,\n \t\t\t struct sk_buff *skb, u16 vlan_tag)\n {\n \tstruct i40e_q_vector *q_vector = rx_ring->q_vector;\n-\tstruct i40e_vsi *vsi = rx_ring->vsi;\n-\tu64 flags = vsi->back->flags;\n \n \tif (vlan_tag & VLAN_VID_MASK)\n \t\t__vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), vlan_tag);\n \n-\tif (flags & I40E_FLAG_IN_NETPOLL)\n-\t\tnetif_rx(skb);\n-\telse\n-\t\tnapi_gro_receive(&q_vector->napi, skb);\n+\tnapi_gro_receive(&q_vector->napi, skb);\n }\n \n /**\ndiff --git a/drivers/net/ethernet/intel/i40evf/i40e_txrx.c b/drivers/net/ethernet/intel/i40evf/i40e_txrx.c\nindex c60e9cf016c2..cff9b47a5ebc 100644\n--- a/drivers/net/ethernet/intel/i40evf/i40e_txrx.c\n+++ b/drivers/net/ethernet/intel/i40evf/i40e_txrx.c\n@@ -822,16 +822,11 @@ static void i40e_receive_skb(struct i40e_ring *rx_ring,\n \t\t\t struct sk_buff *skb, u16 vlan_tag)\n {\n \tstruct i40e_q_vector *q_vector = rx_ring->q_vector;\n-\tstruct i40e_vsi *vsi = rx_ring->vsi;\n-\tu64 flags = vsi->back->flags;\n \n \tif (vlan_tag & VLAN_VID_MASK)\n \t\t__vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), vlan_tag);\n \n-\tif (flags & I40E_FLAG_IN_NETPOLL)\n-\t\tnetif_rx(skb);\n-\telse\n-\t\tnapi_gro_receive(&q_vector->napi, skb);\n+\tnapi_gro_receive(&q_vector->napi, skb);\n }\n \n /**\ndiff --git a/drivers/net/ethernet/intel/i40evf/i40evf.h b/drivers/net/ethernet/intel/i40evf/i40evf.h\nindex 132f03a0f87b..e18e4132b61b 100644\n--- a/drivers/net/ethernet/intel/i40evf/i40evf.h\n+++ b/drivers/net/ethernet/intel/i40evf/i40evf.h\n@@ -211,7 +211,6 @@ struct i40evf_adapter {\n #define I40EVF_FLAG_RX_1BUF_CAPABLE BIT(1)\n #define I40EVF_FLAG_RX_PS_CAPABLE BIT(2)\n #define I40EVF_FLAG_RX_PS_ENABLED BIT(3)\n-#define I40EVF_FLAG_IN_NETPOLL BIT(4)\n #define I40EVF_FLAG_IMIR_ENABLED BIT(5)\n #define I40EVF_FLAG_MQ_CAPABLE BIT(6)\n #define I40EVF_FLAG_NEED_LINK_UPDATE BIT(7)\n@@ -224,7 +223,6 @@ struct i40evf_adapter {\n /* duplicates for common code */\n #define I40E_FLAG_FDIR_ATR_ENABLED\t\t 0\n #define I40E_FLAG_DCB_ENABLED\t\t\t 0\n-#define I40E_FLAG_IN_NETPOLL\t\t\t I40EVF_FLAG_IN_NETPOLL\n #define I40E_FLAG_RX_CSUM_ENABLED I40EVF_FLAG_RX_CSUM_ENABLED\n #define I40E_FLAG_WB_ON_ITR_CAPABLE\t\tI40EVF_FLAG_WB_ON_ITR_CAPABLE\n #define I40E_FLAG_OUTER_UDP_CSUM_CAPABLE\tI40EVF_FLAG_OUTER_UDP_CSUM_CAPABLE\n", "prefixes": [ "net-next", "v2", "2/3" ] }