Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/840487/?format=api
{ "id": 840487, "url": "http://patchwork.ozlabs.org/api/patches/840487/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20171122185717.29785.71937.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": "<20171122185717.29785.71937.stgit@localhost.localdomain>", "list_archive_url": null, "date": "2017-11-22T18:57:17", "name": "[jkirsher/next-queue,11/16] ixgbe/fm10k: Record macvlan stats instead of Rx queue for macvlan offloaded rings", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "163c8480e00e35545fb6d8c01d516bb86ad7609c", "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/20171122185717.29785.71937.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/840487/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/840487/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.137; helo=fraxinus.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=\"OGX9h7d6\"; dkim-atps=neutral" ], "Received": [ "from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\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 3yhsXh1f6Vz9ryv\n\tfor <incoming@patchwork.ozlabs.org>;\n\tThu, 23 Nov 2017 06:12:36 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id BF96887A1C;\n\tWed, 22 Nov 2017 19:12:34 +0000 (UTC)", "from fraxinus.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id 5YMWlVDGoExA; Wed, 22 Nov 2017 19:12:32 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 1CBD387A58;\n\tWed, 22 Nov 2017 19:12:32 +0000 (UTC)", "from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\n\tby ash.osuosl.org (Postfix) with ESMTP id 926001C2314\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 22 Nov 2017 18:57:19 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 8B93E88AA8\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 22 Nov 2017 18:57:19 +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 t9+YNFtB+UbK for <intel-wired-lan@lists.osuosl.org>;\n\tWed, 22 Nov 2017 18:57:18 +0000 (UTC)", "from mail-pf0-f193.google.com (mail-pf0-f193.google.com\n\t[209.85.192.193])\n\tby hemlock.osuosl.org (Postfix) with ESMTPS id 9B6EA88AA0\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 22 Nov 2017 18:57:18 +0000 (UTC)", "by mail-pf0-f193.google.com with SMTP id k24so2708434pfb.1\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 22 Nov 2017 10:57:18 -0800 (PST)", "from localhost.localdomain ([2001:470:b:9c3:9e5c:8eff:fe4f:f2d0])\n\tby smtp.gmail.com with ESMTPSA id\n\te17sm30675004pfb.53.2017.11.22.10.57.17\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:57:17 -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=hrC05/tHsbuqNdEo467NBlP4sRVR95SXsqJnRXjbw8I=;\n\tb=OGX9h7d6mWje0fzDny6kCU239U2ykgzV0XF6B+MOTB4owi7dmMXaLaGzOmV0By0MR5\n\tHTfbYrAIFESmCaEZeDhLNQnST/iBcQvEChwcPelfG56EH+gik9h8gYbQan2EcCNwQimK\n\tIvin7hlVJZAoGjI0EgEqtgn+tS4/yuKPsxuPfyMmZTSrfQvfuP26H0E4/aqpfG/Uzque\n\thM8qWceFB7Ug7E4nec91F/VfuoyLrHzDv7X5ADPSBBf7e+j5o5jfq5a0Pex3+9rEG84Y\n\tt9c8MygKHfbNJtht/Gd/AJGbXo6JYybffPKI04yQn3OewOyZ3DJ47NYMRMR7m1zn2MY2\n\t/Utg==", "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=hrC05/tHsbuqNdEo467NBlP4sRVR95SXsqJnRXjbw8I=;\n\tb=c4K4qbY+cO54euamHD5SjJhwpNWWR02+6NPGDJsyF8wENJqGoaJ2H9/C8aSR06SsJL\n\te/4rTqR7xfXE3dGDRYGrHqEd/rIdbJ+bfLq/cTyxx5yZACzSlUKDrb2HdsJMPk04QKi3\n\tuBNWaKn4a6os7ZABxBeuTPb109EO03szf2RGiY5DdUZc+nlgZ1rnYvMFTO9ZraiehxSu\n\tA0ADNww6uOH7ED0PMa4YrbPbkTELa10XQBVxZHPtSzytuWeI5di/wFSZ1qp5GijIPy8M\n\thmyvloSZquwVOEfPnT7bYgwwfe65xJ3YoY7xb+brnKTHVrbSrKPUa3EpCRcrg0TSRDml\n\t0v5Q==", "X-Gm-Message-State": "AJaThX57MScLy1PKIhflAzn1NjfjP73A/9Z16KV7jdjJ2XXhwC2rAmBa\n\t6xcL4Q5wM6fvnjvmOP/8gJxsQEJJ", "X-Google-Smtp-Source": "AGs4zMb+SvmMz/5An35Jq5akf16G65LHLPgVyXSOxn9Pk9TOAJzyE1E1GGRKi18erpDksGglxNW4/g==", "X-Received": "by 10.98.59.66 with SMTP id i63mr20315345pfa.117.1511377038025; \n\tWed, 22 Nov 2017 10:57:18 -0800 (PST)", "From": "Alexander Duyck <alexander.duyck@gmail.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Wed, 22 Nov 2017 10:57:17 -0800", "Message-ID": "<20171122185717.29785.71937.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 11/16] ixgbe/fm10k:\n\tRecord macvlan stats instead of Rx queue for macvlan offloaded rings", "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\nWe shouldn't be recording the Rx queue on macvlan offloaded frames since\nthe macvlan is normally brought up as a single queue device, and it will\ntrigger warnings for RPS if we have recorded queue IDs larger than the\n\"real_num_rx_queues\" value recorded for the device.\n\nInstead we should be recording the macvlan statistics since we are\nbypassing the normal macvlan statistics that would have been generated by\nthe receive path.\n\nSigned-off-by: Alexander Duyck <alexander.h.duyck@intel.com>\n---\n drivers/net/ethernet/intel/fm10k/fm10k_main.c | 14 ++++++--------\n drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 10 ++++++++--\n 2 files changed, 14 insertions(+), 10 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_main.c b/drivers/net/ethernet/intel/fm10k/fm10k_main.c\nindex dbd69310f263..9abd7fff91f3 100644\n--- a/drivers/net/ethernet/intel/fm10k/fm10k_main.c\n+++ b/drivers/net/ethernet/intel/fm10k/fm10k_main.c\n@@ -446,13 +446,13 @@ static void fm10k_type_trans(struct fm10k_ring *rx_ring,\n \n \tskb->protocol = eth_type_trans(skb, dev);\n \n+\t/* Record Rx queue, or update macvlan statistics */\n \tif (!l2_accel)\n-\t\treturn;\n-\n-\t/* update MACVLAN statistics */\n-\tmacvlan_count_rx(netdev_priv(dev), skb->len + ETH_HLEN, 1,\n-\t\t\t !!(rx_desc->w.hdr_info &\n-\t\t\t cpu_to_le16(FM10K_RXD_HDR_INFO_XC_MASK)));\n+\t\tskb_record_rx_queue(skb, rx_ring->queue_index);\n+\telse\n+\t\tmacvlan_count_rx(netdev_priv(dev), skb->len + ETH_HLEN, true,\n+\t\t\t\t (skb->pkt_type == PACKET_BROADCAST) ||\n+\t\t\t\t (skb->pkt_type == PACKET_MULTICAST));\n }\n \n /**\n@@ -479,8 +479,6 @@ static unsigned int fm10k_process_skb_fields(struct fm10k_ring *rx_ring,\n \n \tFM10K_CB(skb)->fi.w.vlan = rx_desc->w.vlan;\n \n-\tskb_record_rx_queue(skb, rx_ring->queue_index);\n-\n \tFM10K_CB(skb)->fi.d.glort = rx_desc->d.glort;\n \n \tif (rx_desc->w.vlan) {\ndiff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c\nindex 090d73df46cc..825d093ebf2e 100644\n--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c\n+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c\n@@ -1749,9 +1749,15 @@ static void ixgbe_process_skb_fields(struct ixgbe_ring *rx_ring,\n \t\t__vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), vid);\n \t}\n \n-\tskb_record_rx_queue(skb, rx_ring->queue_index);\n-\n \tskb->protocol = eth_type_trans(skb, dev);\n+\n+\t/* record Rx queue, or update MACVLAN statistics */\n+\tif (netif_is_ixgbe(dev))\n+\t\tskb_record_rx_queue(skb, rx_ring->queue_index);\n+\telse\n+\t\tmacvlan_count_rx(netdev_priv(dev), skb->len + ETH_HLEN, true,\n+\t\t\t\t (skb->pkt_type == PACKET_BROADCAST) ||\n+\t\t\t\t (skb->pkt_type == PACKET_MULTICAST));\n }\n \n static void ixgbe_rx_skb(struct ixgbe_q_vector *q_vector,\n", "prefixes": [ "jkirsher/next-queue", "11/16" ] }