Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/564177/?format=api
{ "id": 564177, "url": "http://patchwork.ozlabs.org/api/patches/564177/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20160107071046.13648.85457.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": "<20160107071046.13648.85457.stgit@localhost.localdomain>", "list_archive_url": null, "date": "2016-01-07T07:10:47", "name": "[next,04/11] igb: Do not factor VLANs into RLPML calculation", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "22dd251eefd14d6113d58ea6a4c2a957f4cad87b", "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/20160107071046.13648.85457.stgit@localhost.localdomain/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/564177/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/564177/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 silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\tby ozlabs.org (Postfix) with ESMTP id BD1971402C0\n\tfor <incoming@patchwork.ozlabs.org>;\n\tThu, 7 Jan 2016 18:10:54 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id 14C3032D95;\n\tThu, 7 Jan 2016 07:10:54 +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 RxGDt8INsORd; Thu, 7 Jan 2016 07:10:52 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby silver.osuosl.org (Postfix) with ESMTP id 79E81303A9;\n\tThu, 7 Jan 2016 07:10:52 +0000 (UTC)", "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\tby ash.osuosl.org (Postfix) with ESMTP id DA22A1C09CE\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 7 Jan 2016 07:10:50 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 68DAE8B792\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 7 Jan 2016 07:10:50 +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 fVf+RUTPIkUB for <intel-wired-lan@lists.osuosl.org>;\n\tThu, 7 Jan 2016 07:10:49 +0000 (UTC)", "from mail-pa0-f41.google.com (mail-pa0-f41.google.com\n\t[209.85.220.41])\n\tby whitealder.osuosl.org (Postfix) with ESMTPS id 0189D8B549\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 7 Jan 2016 07:10:48 +0000 (UTC)", "by mail-pa0-f41.google.com with SMTP id qh10so1163979pab.2\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 06 Jan 2016 23:10:49 -0800 (PST)", "from localhost.localdomain\n\t(static-50-53-29-36.bvtn.or.frontiernet.net. [50.53.29.36])\n\tby smtp.gmail.com with ESMTPSA id\n\trt6sm149720506pab.17.2016.01.06.23.10.47\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tWed, 06 Jan 2016 23:10:48 -0800 (PST)" ], "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=VqNuYAfa; 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=/37Hs0AHKK1nHuRFPHiDuN+ct3rCM8nS8IiHb4NdaSg=;\n\tb=VqNuYAfaWSjm85jb6uY84rsaW32gB20Aei2bdy+znXe1ze90PwEu74PWsQPIL3PJQO\n\tjqMm4+ahUtxrv/MUsqSxLtGt0ObNe34wFBngMzhqExTcVU4PrNI1wdxqssMvukvXoTeV\n\tONk13+fcwN5QLNME+ZRQ620vLsrxMaCeBIr30=", "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=/37Hs0AHKK1nHuRFPHiDuN+ct3rCM8nS8IiHb4NdaSg=;\n\tb=B1KUgf0grE9mXYWme0rjNVzc9+c9ZryIgkOfpIV0v4onfSItxD0lACk/tlRw714z9g\n\t1BIujKtt1oNl0r/09WPDURMVJgMgyEi0g/fdJenCWuEVIw6ciMTXF6Qg5fVp7gZInnKm\n\tSfpKgvursd4WcLu+Kj4e2T+pOeRIFpCWA4PBs9xbrZ0t8hQvbw/qtU/Z5y2uMon2RZtQ\n\t9oMGWb7wr8QVpH5FUZqf7Uz5dyYCG4vWUNXxxxAcxL67VFGHD4HviDWikaHQWGavFt4f\n\tVwuZBPGUwKNv45EfYLuvy9MwGNanSZuUw99Cx5dMl1HhOZ5kfJ2IOUZMG8kVlPBjeiNc\n\t5qww==", "X-Gm-Message-State": "ALoCoQnN048E4Fykcn4S3e+TFPb7LH1A8XPBXttCIgJ+IpILh5JCEegnp/wEhi14Tz5YtXJBEdy+pvp4dqo98bO7PU9My0NCbg==", "X-Received": "by 10.67.23.226 with SMTP id id2mr147932097pad.149.1452150649120;\n\tWed, 06 Jan 2016 23:10:49 -0800 (PST)", "From": "Alexander Duyck <aduyck@mirantis.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Wed, 06 Jan 2016 23:10:47 -0800", "Message-ID": "<20160107071046.13648.85457.stgit@localhost.localdomain>", "In-Reply-To": "<20160107070850.13648.21033.stgit@localhost.localdomain>", "References": "<20160107070850.13648.21033.stgit@localhost.localdomain>", "User-Agent": "StGit/0.17.1-dirty", "MIME-Version": "1.0", "Subject": "[Intel-wired-lan] [next PATCH 04/11] igb: Do not factor VLANs into\n\tRLPML calculation", "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 RLPML registers already take the size of VLAN headers into account when\ndetermining the maximum packet length. This is called out in EAS documents\nfor several parts including the 82576 and the i350. As such we can drop\nthe addition of size to the value programmed into the RLPML registers.\n\nSigned-off-by: Alexander Duyck <aduyck@mirantis.com>\n---\n drivers/net/ethernet/intel/igb/igb.h | 1 -\n drivers/net/ethernet/intel/igb/igb_main.c | 43 +----------------------------\n 2 files changed, 2 insertions(+), 42 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/igb/igb.h b/drivers/net/ethernet/intel/igb/igb.h\nindex 145922ec2e0e..d557e99eab6c 100644\n--- a/drivers/net/ethernet/intel/igb/igb.h\n+++ b/drivers/net/ethernet/intel/igb/igb.h\n@@ -97,7 +97,6 @@ struct vf_data_storage {\n \tunsigned char vf_mac_addresses[ETH_ALEN];\n \tu16 vf_mc_hashes[IGB_MAX_VF_MC_ENTRIES];\n \tu16 num_vf_mc_hashes;\n-\tu16 vlans_enabled;\n \tu32 flags;\n \tunsigned long last_nack;\n \tu16 pf_vlan; /* When set, guest VLAN config not allowed. */\ndiff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c\nindex 5b200c9f7658..fd1ddc170a72 100644\n--- a/drivers/net/ethernet/intel/igb/igb_main.c\n+++ b/drivers/net/ethernet/intel/igb/igb_main.c\n@@ -3651,12 +3651,8 @@ static inline int igb_set_vf_rlpml(struct igb_adapter *adapter, int size,\n \tstruct e1000_hw *hw = &adapter->hw;\n \tu32 vmolr;\n \n-\t/* if it isn't the PF check to see if VFs are enabled and\n-\t * increase the size to support vlan tags\n-\t */\n-\tif (vfn < adapter->vfs_allocated_count &&\n-\t adapter->vf_data[vfn].vlans_enabled)\n-\t\tsize += VLAN_TAG_SIZE;\n+\tif (size > MAX_JUMBO_FRAME_SIZE)\n+\t\tsize = MAX_JUMBO_FRAME_SIZE;\n \n \tvmolr = rd32(E1000_VMOLR(vfn));\n \tvmolr &= ~E1000_VMOLR_RLPML_MASK;\n@@ -5915,8 +5911,6 @@ static void igb_clear_vf_vfta(struct igb_adapter *adapter, u32 vf)\n \n \t\twr32(E1000_VLVF(i), reg);\n \t}\n-\n-\tadapter->vf_data[vf].vlans_enabled = 0;\n }\n \n static s32 igb_vlvf_set(struct igb_adapter *adapter, u32 vid, bool add, u32 vf)\n@@ -5965,23 +5959,6 @@ static s32 igb_vlvf_set(struct igb_adapter *adapter, u32 vid, bool add, u32 vf)\n \t\t\treg &= ~E1000_VLVF_VLANID_MASK;\n \t\t\treg |= vid;\n \t\t\twr32(E1000_VLVF(i), reg);\n-\n-\t\t\t/* do not modify RLPML for PF devices */\n-\t\t\tif (vf >= adapter->vfs_allocated_count)\n-\t\t\t\treturn 0;\n-\n-\t\t\tif (!adapter->vf_data[vf].vlans_enabled) {\n-\t\t\t\tu32 size;\n-\n-\t\t\t\treg = rd32(E1000_VMOLR(vf));\n-\t\t\t\tsize = reg & E1000_VMOLR_RLPML_MASK;\n-\t\t\t\tsize += 4;\n-\t\t\t\treg &= ~E1000_VMOLR_RLPML_MASK;\n-\t\t\t\treg |= size;\n-\t\t\t\twr32(E1000_VMOLR(vf), reg);\n-\t\t\t}\n-\n-\t\t\tadapter->vf_data[vf].vlans_enabled++;\n \t\t}\n \t} else {\n \t\tif (i < E1000_VLVF_ARRAY_SIZE) {\n@@ -5993,22 +5970,6 @@ static s32 igb_vlvf_set(struct igb_adapter *adapter, u32 vid, bool add, u32 vf)\n \t\t\t\tigb_vfta_set(hw, vid, false);\n \t\t\t}\n \t\t\twr32(E1000_VLVF(i), reg);\n-\n-\t\t\t/* do not modify RLPML for PF devices */\n-\t\t\tif (vf >= adapter->vfs_allocated_count)\n-\t\t\t\treturn 0;\n-\n-\t\t\tadapter->vf_data[vf].vlans_enabled--;\n-\t\t\tif (!adapter->vf_data[vf].vlans_enabled) {\n-\t\t\t\tu32 size;\n-\n-\t\t\t\treg = rd32(E1000_VMOLR(vf));\n-\t\t\t\tsize = reg & E1000_VMOLR_RLPML_MASK;\n-\t\t\t\tsize -= 4;\n-\t\t\t\treg &= ~E1000_VMOLR_RLPML_MASK;\n-\t\t\t\treg |= size;\n-\t\t\t\twr32(E1000_VMOLR(vf), reg);\n-\t\t\t}\n \t\t}\n \t}\n \treturn 0;\n", "prefixes": [ "next", "04/11" ] }