Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/840494/?format=api
{ "id": 840494, "url": "http://patchwork.ozlabs.org/api/patches/840494/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20171122185735.29785.22305.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": "<20171122185735.29785.22305.stgit@localhost.localdomain>", "list_archive_url": null, "date": "2017-11-22T18:57:35", "name": "[jkirsher/next-queue,14/16] ixgbe: Fix handling of macvlan Tx offload", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "a9bfaf724c916731aad29b92b0f91965f911b5ff", "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/20171122185735.29785.22305.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/840494/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/840494/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=\"SF2C5aQx\"; 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 3yhssg1snQz9ryQ\n\tfor <incoming@patchwork.ozlabs.org>;\n\tThu, 23 Nov 2017 06:27:18 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 5DD0286D61;\n\tWed, 22 Nov 2017 19:27:17 +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 el9TjvM3qcR4; Wed, 22 Nov 2017 19:27:14 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 18ED58681D;\n\tWed, 22 Nov 2017 19:27:14 +0000 (UTC)", "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\tby ash.osuosl.org (Postfix) with ESMTP id A7A2D1C2314\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 22 Nov 2017 18:57:38 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id 9DAAB30195\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 22 Nov 2017 18:57:38 +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 LDBQCRz7vhzz for <intel-wired-lan@lists.osuosl.org>;\n\tWed, 22 Nov 2017 18:57:36 +0000 (UTC)", "from mail-pf0-f194.google.com (mail-pf0-f194.google.com\n\t[209.85.192.194])\n\tby silver.osuosl.org (Postfix) with ESMTPS id C58B02F806\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 22 Nov 2017 18:57:36 +0000 (UTC)", "by mail-pf0-f194.google.com with SMTP id t69so12463069pfg.4\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 22 Nov 2017 10:57:36 -0800 (PST)", "from localhost.localdomain ([2001:470:b:9c3:9e5c:8eff:fe4f:f2d0])\n\tby smtp.gmail.com with ESMTPSA id\n\tj62sm2847122pgc.35.2017.11.22.10.57.35\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:35 -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=x0bVRKKUwp4af/Jh92iV/VuRacn/wyDL6AUFay73s78=;\n\tb=SF2C5aQxzmGEO/GHA2+ykgpGjXQ/wGCezvKnRU/0/P7qv2zkzfhd2cT9MGHVrPiQFV\n\tYwwfhtAj1NRPcPJyw4jKke91aYWayLpKHpHZzdB34rG/gnOkmmix7LgM8eVmZJBlEcoU\n\tpCdpUWF7KOlNskE8kOOluhO9Ip1kAjuOSFRSxWCGBwm5/xDMiCWkbzyYHGY6dqKGks4n\n\tjWJL8PIjSq7xiC/Mn2BJhxJucOcSybsNfbdScCHBdykqZq8F1kALoxEIdE6mGzxqRg6U\n\tPauCedIGf4IaezdC0YYCQFLC2Qj4rlS1+CYBROJOiYCDT0CQ7uIiSdwOVq7a96gNQ0Kz\n\t6dfA==", "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=x0bVRKKUwp4af/Jh92iV/VuRacn/wyDL6AUFay73s78=;\n\tb=S7r01dlh/m/k0qtNyvA1pMc1tfFEU7EvCcCdT4k+SDr6k8mJiqsSkjyKUeKiM7Fgfm\n\tb/llqeWN2hlMunMljH6Hx+rwv/yeXsveZnNPINrPrIlTaRTlBDV1gkr5FbgdFQKXa0Kd\n\tVT2yjj3kmPO0arrs/hjuTqnSYiJgZCJ9vQ4V4Gj2y+O2gvTo1Qz5vtUqapjgNbntRSDr\n\tLC9wRn+VXPG3Xf5Ck4qOx6chHtMfMnGjNuLwdR+uOA+jNONHxMDxPAx41WIztnn+76Kk\n\tU5OP6EHoxx9B+OvLueBTfg1FbJSUkMvCYakx67jzFjqA6A7tWb9YnbyNuHk6ZzC+9Ock\n\tL9DA==", "X-Gm-Message-State": "AJaThX7GW/2mrzynkO5W5kGr4x4bSJjnaSUG6a6um19vlBh/LKrbxWqH\n\tOm8sngp+pG5THAAf0FHokaWRG9ER", "X-Google-Smtp-Source": "AGs4zMZYg/fxryXFZw7r04AFLB73b0PNy/tyWpFI0fs2khWMipiD0TVsa8XabgqJCO1vfr0sth1MOA==", "X-Received": "by 10.99.120.196 with SMTP id\n\tt187mr13269571pgc.285.1511377056148; \n\tWed, 22 Nov 2017 10:57:36 -0800 (PST)", "From": "Alexander Duyck <alexander.duyck@gmail.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Wed, 22 Nov 2017 10:57:35 -0800", "Message-ID": "<20171122185735.29785.22305.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 14/16] ixgbe: Fix\n\thandling of macvlan Tx offload", "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\nThis update makes it so that we report the actual number of Tx queues via\nreal_num_tx_queues but are still restricted to RSS on only the first pool\nby setting num_tc equal to 1. Doing this locks us into only having the\nability to setup XPS on the queues in that pool, and only those queues\nshould be used for transmitting anything other than macvlan traffic.\n\nSigned-off-by: Alexander Duyck <alexander.h.duyck@intel.com>\n---\n drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c | 4 ++++\n drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 20 ++++++++++----------\n 2 files changed, 14 insertions(+), 10 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c\nindex cfe5a6af04d0..b3c282d09b18 100644\n--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c\n+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c\n@@ -619,6 +619,10 @@ static bool ixgbe_set_sriov_queues(struct ixgbe_adapter *adapter)\n \t}\n \n #endif\n+\t/* populate TC0 for use by pool 0 */\n+\tnetdev_set_tc_queue(adapter->netdev, 0,\n+\t\t\t adapter->num_rx_queues_per_pool, 0);\n+\n \treturn true;\n }\n \ndiff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c\nindex bcd05761b8e1..dba69c0bc644 100644\n--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c\n+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c\n@@ -6563,20 +6563,12 @@ int ixgbe_open(struct net_device *netdev)\n \t\tgoto err_req_irq;\n \n \t/* Notify the stack of the actual queue counts. */\n-\tif (adapter->num_rx_pools > 1)\n-\t\tqueues = adapter->num_rx_queues_per_pool;\n-\telse\n-\t\tqueues = adapter->num_tx_queues;\n-\n+\tqueues = adapter->num_tx_queues;\n \terr = netif_set_real_num_tx_queues(netdev, queues);\n \tif (err)\n \t\tgoto err_set_queues;\n \n-\tif (adapter->num_rx_pools > 1 &&\n-\t adapter->num_rx_queues > IXGBE_MAX_L2A_QUEUES)\n-\t\tqueues = IXGBE_MAX_L2A_QUEUES;\n-\telse\n-\t\tqueues = adapter->num_rx_queues;\n+\tqueues = adapter->num_rx_queues;\n \terr = netif_set_real_num_rx_queues(netdev, queues);\n \tif (err)\n \t\tgoto err_set_queues;\n@@ -8806,6 +8798,14 @@ int ixgbe_setup_tc(struct net_device *dev, u8 tc)\n \t} else {\n \t\tnetdev_reset_tc(dev);\n \n+\t\t/* To support macvlan offload we have to use num_tc to\n+\t\t * restrict the queues that can be used by the device.\n+\t\t * By doing this we can avoid reporting a false number of\n+\t\t * queues.\n+\t\t */\n+\t\tif (!tc && adapter->num_rx_pools > 1)\n+\t\t\tnetdev_set_num_tc(dev, 1);\n+\n \t\tif (adapter->hw.mac.type == ixgbe_mac_82598EB)\n \t\t\tadapter->hw.fc.requested_mode = adapter->last_lfc_mode;\n \n", "prefixes": [ "jkirsher/next-queue", "14/16" ] }