Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/480315/?format=api
{ "id": 480315, "url": "http://patchwork.ozlabs.org/api/patches/480315/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1433374272-6684-3-git-send-email-jacob.e.keller@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": "<1433374272-6684-3-git-send-email-jacob.e.keller@intel.com>", "list_archive_url": null, "date": "2015-06-03T23:30:59", "name": "[rc2,02/15] fm10k: use correct ethernet driver Tx timestamp function", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "78a13c553f36965ccd156e5ad83d088019f482a9", "submitter": { "id": 9784, "url": "http://patchwork.ozlabs.org/api/people/9784/?format=api", "name": "Jacob Keller", "email": "jacob.e.keller@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/1433374272-6684-3-git-send-email-jacob.e.keller@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/480315/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/480315/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 (silver.osuosl.org [140.211.166.136])\n\tby ozlabs.org (Postfix) with ESMTP id 30C901401EF\n\tfor <incoming@patchwork.ozlabs.org>;\n\tThu, 4 Jun 2015 09:31:35 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id 7649F328FF;\n\tWed, 3 Jun 2015 23:31:34 +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 O3FplCwxDNHx; Wed, 3 Jun 2015 23:31:29 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby silver.osuosl.org (Postfix) with ESMTP id 28AD032940;\n\tWed, 3 Jun 2015 23:31:25 +0000 (UTC)", "from whitealder.osuosl.org (whitealder.osuosl.org\n\t[140.211.166.138])\n\tby ash.osuosl.org (Postfix) with ESMTP id 28BD41BFA20\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 3 Jun 2015 23:31:21 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 2517E8D175\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 3 Jun 2015 23:31:21 +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 s7AwlHAvDEik for <intel-wired-lan@lists.osuosl.org>;\n\tWed, 3 Jun 2015 23:31:18 +0000 (UTC)", "from mga14.intel.com (mga14.intel.com [192.55.52.115])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 465068D18D\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 3 Jun 2015 23:31:18 +0000 (UTC)", "from orsmga003.jf.intel.com ([10.7.209.27])\n\tby fmsmga103.fm.intel.com with ESMTP; 03 Jun 2015 16:31:18 -0700", "from jekeller-desk.amr.corp.intel.com (HELO\n\tjekeller-desk.jekeller.internal) ([134.134.3.151])\n\tby orsmga003.jf.intel.com with ESMTP; 03 Jun 2015 16:31:14 -0700" ], "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.13,549,1427785200\"; d=\"scan'208\";a=\"581683028\"", "From": "Jacob Keller <jacob.e.keller@intel.com>", "To": "Intel Wired LAN <intel-wired-lan@lists.osuosl.org>", "Date": "Wed, 3 Jun 2015 16:30:59 -0700", "Message-Id": "<1433374272-6684-3-git-send-email-jacob.e.keller@intel.com>", "X-Mailer": "git-send-email 2.1.0", "In-Reply-To": "<1433374272-6684-1-git-send-email-jacob.e.keller@intel.com>", "References": "<1433374272-6684-1-git-send-email-jacob.e.keller@intel.com>", "Subject": "[Intel-wired-lan] [rc2 02/15] fm10k: use correct ethernet driver Tx\n\ttimestamp function", "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>", "MIME-Version": "1.0", "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": "skb_complete_tx_timestamp is intended for use by PHY drivers which\nimplement a different method of returning timestamps. This method is\nintended to be used after a PHY driver accepts a cloned packet via its\nphy_driver.txtstamp function. It is not correct to use in the standard\nethernet driver such as fm10k. This patch fixes the following possible\nkernel panic.\n\n-rc2\n* fix typo missing ','\n\n[ 2744.552896] CPU: 0 PID: 0 Comm: swapper/0 Tainted: G W OE 3.19.3-200.fc21.x86_64 #1\n[ 2744.552899] Hardware name: Intel Corporation S2600CO/S2600CO, BIOS SE5C600.86B.02.03.8x23.060520140825 06/05/2014\n[ 2744.552901] 0000000000000000 2f4c8b10ea3f9848 ffff88081ee03a38 ffffffff8176e215\n[ 2744.552906] 0000000000000000 0000000000000000 ffff88081ee03a78 ffffffff8109bc1a\n[ 2744.552910] ffff88081ee03c50 ffff88080e55fc00 ffff88080e55fc00 ffffffff81647c50\n[ 2744.552914] Call Trace:\n[ 2744.552917] <IRQ> [<ffffffff8176e215>] dump_stack+0x45/0x57\n[ 2744.552931] [<ffffffff8109bc1a>] warn_slowpath_common+0x8a/0xc0\n[ 2744.552936] [<ffffffff81647c50>] ? skb_queue_purge+0x20/0x40\n[ 2744.552941] [<ffffffff8109bd4a>] warn_slowpath_null+0x1a/0x20\n[ 2744.552946] [<ffffffff81646911>] skb_release_head_state+0xe1/0xf0\n[ 2744.552950] [<ffffffff81647b26>] skb_release_all+0x16/0x30\n[ 2744.552954] [<ffffffff81647ba6>] kfree_skb+0x36/0x90\n[ 2744.552958] [<ffffffff81647c50>] skb_queue_purge+0x20/0x40\n[ 2744.552964] [<ffffffff81751f8d>] packet_sock_destruct+0x1d/0x90\n[ 2744.552968] [<ffffffff81642053>] __sk_free+0x23/0x140\n[ 2744.552973] [<ffffffff81642189>] sk_free+0x19/0x20\n[ 2744.552977] [<ffffffff81647d60>] skb_complete_tx_timestamp+0x50/0x60\n[ 2744.552988] [<ffffffffa02eee40>] fm10k_ts_tx_hwtstamp+0xd0/0x100 [fm10k]\n[ 2744.552994] [<ffffffffa02e054e>] fm10k_1588_msg_pf+0x12e/0x140 [fm10k]\n[ 2744.553002] [<ffffffffa02edf1d>] fm10k_tlv_msg_parse+0x8d/0xc0 [fm10k]\n[ 2744.553010] [<ffffffffa02eb2d0>] fm10k_mbx_dequeue_rx+0x60/0xb0 [fm10k]\n[ 2744.553016] [<ffffffffa02ebf98>] fm10k_sm_mbx_process+0x178/0x3c0 [fm10k]\n[ 2744.553022] [<ffffffffa02e09ca>] fm10k_msix_mbx_pf+0xfa/0x360 [fm10k]\n[ 2744.553030] [<ffffffff811030a7>] ? get_next_timer_interrupt+0x1f7/0x270\n[ 2744.553036] [<ffffffff810f2a47>] handle_irq_event_percpu+0x77/0x1a0\n[ 2744.553041] [<ffffffff810f2bab>] handle_irq_event+0x3b/0x60\n[ 2744.553045] [<ffffffff810f5d6e>] handle_edge_irq+0x6e/0x120\n[ 2744.553054] [<ffffffff81017414>] handle_irq+0x74/0x140\n[ 2744.553061] [<ffffffff810bb54a>] ? atomic_notifier_call_chain+0x1a/0x20\n[ 2744.553066] [<ffffffff8177777f>] do_IRQ+0x4f/0xf0\n[ 2744.553072] [<ffffffff8177556d>] common_interrupt+0x6d/0x6d\n[ 2744.553074] <EOI> [<ffffffff81609b16>] ? cpuidle_enter_state+0x66/0x160\n[ 2744.553084] [<ffffffff81609b01>] ? cpuidle_enter_state+0x51/0x160\n[ 2744.553087] [<ffffffff81609cf7>] cpuidle_enter+0x17/0x20\n[ 2744.553092] [<ffffffff810de101>] cpu_startup_entry+0x321/0x3c0\n[ 2744.553098] [<ffffffff81764497>] rest_init+0x77/0x80\n[ 2744.553103] [<ffffffff81d4f02c>] start_kernel+0x4a4/0x4c5\n[ 2744.553107] [<ffffffff81d4e120>] ? early_idt_handlers+0x120/0x120\n[ 2744.553110] [<ffffffff81d4e4d7>] x86_64_start_reservations+0x2a/0x2c\n[ 2744.553114] [<ffffffff81d4e62b>] x86_64_start_kernel+0x152/0x175\n\nSigned-off-by: Jacob Keller <jacob.e.keller@intel.com>\n---\n drivers/net/ethernet/intel/fm10k/fm10k_ptp.c | 5 +++--\n 1 file changed, 3 insertions(+), 2 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_ptp.c b/drivers/net/ethernet/intel/fm10k/fm10k_ptp.c\nindex 9043633c3e50..95f1d62b0690 100644\n--- a/drivers/net/ethernet/intel/fm10k/fm10k_ptp.c\n+++ b/drivers/net/ethernet/intel/fm10k/fm10k_ptp.c\n@@ -103,9 +103,10 @@ void fm10k_ts_tx_hwtstamp(struct fm10k_intfc *interface, __le16 dglort,\n \tif (!skb)\n \t\treturn;\n \n-\t/* timestamp the sk_buff and return it to the socket */\n+\t/* timestamp the sk_buff and free out copy */\n \tfm10k_systime_to_hwtstamp(interface, &shhwtstamps, systime);\n-\tskb_complete_tx_timestamp(skb, &shhwtstamps);\n+\tskb_tstamp_tx(skb, &shhwtstamps);\n+\tdev_kfree_skb_any(skb);\n }\n \n void fm10k_ts_tx_subtask(struct fm10k_intfc *interface)\n", "prefixes": [ "rc2", "02/15" ] }