Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/553601/?format=api
{ "id": 553601, "url": "http://patchwork.ozlabs.org/api/patches/553601/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20151207214354.7597.22257.stgit@neerav-dbg1.jf.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": "<20151207214354.7597.22257.stgit@neerav-dbg1.jf.intel.com>", "list_archive_url": null, "date": "2015-12-07T21:43:55", "name": "ixgbe: Fix MDD events generated when FCoE+SRIOV are enabled", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "621526b9718c8cee50e53ffa90a833020edcc711", "submitter": { "id": 11203, "url": "http://patchwork.ozlabs.org/api/people/11203/?format=api", "name": "Parikh, Neerav", "email": "neerav.parikh@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/20151207214354.7597.22257.stgit@neerav-dbg1.jf.intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/553601/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/553601/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 2C4951401B5\n\tfor <incoming@patchwork.ozlabs.org>;\n\tTue, 8 Dec 2015 08:47:17 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id 714B332DE4;\n\tMon, 7 Dec 2015 21:47:16 +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 DuwrJzpeuTUc; Mon, 7 Dec 2015 21:47:14 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby silver.osuosl.org (Postfix) with ESMTP id 9D5BE32DA5;\n\tMon, 7 Dec 2015 21:47:14 +0000 (UTC)", "from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\n\tby ash.osuosl.org (Postfix) with ESMTP id 600801C1323\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 7 Dec 2015 21:47:13 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 5D0339316A\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 7 Dec 2015 21:47:13 +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 mwrjq1BzRz7Z for <intel-wired-lan@lists.osuosl.org>;\n\tMon, 7 Dec 2015 21:47:12 +0000 (UTC)", "from mga03.intel.com (mga03.intel.com [134.134.136.65])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 14AC29314A\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 7 Dec 2015 21:47:12 +0000 (UTC)", "from fmsmga003.fm.intel.com ([10.253.24.29])\n\tby orsmga103.jf.intel.com with ESMTP; 07 Dec 2015 13:47:11 -0800", "from neerav-dbg1.jf.intel.com ([10.166.50.8])\n\tby FMSMGA003.fm.intel.com with ESMTP; 07 Dec 2015 13:47:11 -0800" ], "X-Virus-Scanned": [ "amavisd-new at osuosl.org", "amavisd-new at osuosl.org" ], "X-Greylist": "domain auto-whitelisted by SQLgrey-1.7.6", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.20,396,1444719600\"; d=\"scan'208\";a=\"614113112\"", "To": "intel-wired-lan@lists.osuosl.org", "From": "Neerav Parikh <neerav.parikh@intel.com>", "Date": "Mon, 07 Dec 2015 13:43:55 -0800", "Message-ID": "<20151207214354.7597.22257.stgit@neerav-dbg1.jf.intel.com>", "User-Agent": "StGit/0.16", "MIME-Version": "1.0", "Subject": "[Intel-wired-lan] [PATCH] ixgbe: Fix MDD events generated when\n\tFCoE+SRIOV are enabled", "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": "When FCoE is enabled with SR-IOV on the X550 NIC the hardware\ngenerates MDD events.\n\nThis patch fixes these by setting the expected values in the\nTx context descriptors for FCoE/FIP frames and adding a flush\nafter writing the RDLEN register.\n\nSigned-off-by: Neerav Parikh <neerav.parikh@intel.com>\n---\n drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c | 5 ++++-\n drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 18 ++++++++++++++++++\n drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 1 +\n 3 files changed, 23 insertions(+), 1 deletion(-)", "diff": "diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c\nindex 5f98870..78ffef4 100644\n--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c\n+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c\n@@ -517,6 +517,7 @@ int ixgbe_fso(struct ixgbe_ring *tx_ring,\n \tu32 vlan_macip_lens;\n \tu32 fcoe_sof_eof = 0;\n \tu32 mss_l4len_idx;\n+\tu32 type_tucmd = IXGBE_ADVTXT_TUCMD_FCOE;\n \tu8 sof, eof;\n \n \tif (skb_is_gso(skb) && (skb_shinfo(skb)->gso_type != SKB_GSO_FCOE)) {\n@@ -593,6 +594,8 @@ int ixgbe_fso(struct ixgbe_ring *tx_ring,\n \t\t\t\t\t skb_shinfo(skb)->gso_size);\n \t\tfirst->bytecount += (first->gso_segs - 1) * *hdr_len;\n \t\tfirst->tx_flags |= IXGBE_TX_FLAGS_TSO;\n+\t\t/* Hardware expects L4T to be RSV for FCoE TSO */\n+\t\ttype_tucmd |= IXGBE_ADVTXD_TUCMD_L4T_RSV;\n \t}\n \n \t/* set flag indicating FCOE to ixgbe_tx_map call */\n@@ -610,7 +613,7 @@ int ixgbe_fso(struct ixgbe_ring *tx_ring,\n \n \t/* write context desc */\n \tixgbe_tx_ctxtdesc(tx_ring, vlan_macip_lens, fcoe_sof_eof,\n-\t\t\t IXGBE_ADVTXT_TUCMD_FCOE, mss_l4len_idx);\n+\t\t\t type_tucmd, mss_l4len_idx);\n \n \treturn 0;\n }\ndiff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c\nindex ebd4522..c31ed4c 100644\n--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c\n+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c\n@@ -3619,6 +3619,9 @@ void ixgbe_configure_rx_ring(struct ixgbe_adapter *adapter,\n \tIXGBE_WRITE_REG(hw, IXGBE_RDBAH(reg_idx), (rdba >> 32));\n \tIXGBE_WRITE_REG(hw, IXGBE_RDLEN(reg_idx),\n \t\t\tring->count * sizeof(union ixgbe_adv_rx_desc));\n+\t/* Force flushing of IXGBE_RDLEN to prevent MDD */\n+\tIXGBE_WRITE_FLUSH(hw);\n+\n \tIXGBE_WRITE_REG(hw, IXGBE_RDH(reg_idx), 0);\n \tIXGBE_WRITE_REG(hw, IXGBE_RDT(reg_idx), 0);\n \tring->tail = adapter->io_addr + IXGBE_RDT(reg_idx);\n@@ -7641,6 +7644,21 @@ netdev_tx_t ixgbe_xmit_frame_ring(struct sk_buff *skb,\n \t\t\tgoto out_drop;\n \n \t\tgoto xmit_fcoe;\n+\t} else if (protocol == htons(ETH_P_FIP)) {\n+\t\t/* A zero as offset will result in HW generating malicious event\n+\t\t * when trying to Tx a FIP frame. So, set a valid header length\n+\t\t * to prevent such an event.\n+\t\t */\n+\t\tif (!skb_network_offset(skb)) {\n+\t\t\tif (tx_flags & (IXGBE_TX_FLAGS_HW_VLAN |\n+\t\t\t IXGBE_TX_FLAGS_SW_VLAN))\n+\t\t\t\tskb_set_network_header(skb,\n+\t\t\t\t\t\t sizeof(struct ethhdr) +\n+\t\t\t\t\t\t sizeof(struct vlan_hdr));\n+\t\t\telse\n+\t\t\t\tskb_set_network_header(skb,\n+\t\t\t\t\t\t sizeof(struct ethhdr));\n+\t\t}\n \t}\n \n #endif /* IXGBE_FCOE */\ndiff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h\nindex 1329edd..e93c264 100644\n--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h\n+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h\n@@ -2780,6 +2780,7 @@ struct ixgbe_adv_tx_context_desc {\n #define IXGBE_ADVTXD_TUCMD_L4T_UDP 0x00000000 /* L4 Packet TYPE of UDP */\n #define IXGBE_ADVTXD_TUCMD_L4T_TCP 0x00000800 /* L4 Packet TYPE of TCP */\n #define IXGBE_ADVTXD_TUCMD_L4T_SCTP 0x00001000 /* L4 Packet TYPE of SCTP */\n+#define IXGBE_ADVTXD_TUCMD_L4T_RSV 0x00001800 /* RSV L4 Packet TYPE */\n #define IXGBE_ADVTXD_TUCMD_MKRREQ 0x00002000 /*Req requires Markers and CRC*/\n #define IXGBE_ADVTXD_POPTS_IPSEC 0x00000400 /* IPSec offload request */\n #define IXGBE_ADVTXD_TUCMD_IPSEC_TYPE_ESP 0x00002000 /* IPSec Type ESP */\n", "prefixes": [] }