From patchwork Thu Nov 2 23:33:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander H Duyck X-Patchwork-Id: 833575 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=osuosl.org (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=intel-wired-lan-bounces@osuosl.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Vyuf/BAM"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3yShGj1pKFz9sPm for ; Fri, 3 Nov 2017 10:33:16 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id DC3AF26B5A; Thu, 2 Nov 2017 23:33:14 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id wDVJXYcldq3p; Thu, 2 Nov 2017 23:33:13 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 7822A26767; Thu, 2 Nov 2017 23:33:13 +0000 (UTC) X-Original-To: intel-wired-lan@lists.osuosl.org Delivered-To: intel-wired-lan@lists.osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 539E31C2306 for ; Thu, 2 Nov 2017 23:33:11 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 44D3488A58 for ; Thu, 2 Nov 2017 23:33:11 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id knyYmnip03MV for ; Thu, 2 Nov 2017 23:33:10 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pg0-f41.google.com (mail-pg0-f41.google.com [74.125.83.41]) by hemlock.osuosl.org (Postfix) with ESMTPS id D219D88A32 for ; Thu, 2 Nov 2017 23:33:10 +0000 (UTC) Received: by mail-pg0-f41.google.com with SMTP id 15so934375pgc.12 for ; Thu, 02 Nov 2017 16:33:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:from:to:date:message-id:user-agent:mime-version :content-transfer-encoding; bh=MReC3qTVF+z2W6v+623tDclV4ya43dzBuXngSFKHEEs=; b=Vyuf/BAMZQ3P2wlOHvWYIZ4YqRSCeGtA42Hbq+saVMbgEyQtHPx++8RpgvF1yNdyJW i/o+wQqfkmd8B9Qth9Fu2VcvWR5+hsNTl47Kzd1BvOq4GtLyGOgOjgYT/ktIDYhTIztB gH3WkslyaNgBnss9U8bf/2vjkG0W592RSAG8Syq12mXxLXitSuv+Qd+uC+GoGoVNJfw+ t1s80uuLsrleTtFBl9hJc6lZYtdM3IRFkKRzDVFAI4uQFiXU7FEFZJF8RrPfPiXbaoxx gk2weFgskGUKFAWgIDK2T29G65pkWQdF5PQp2fhddB5BdtVfBee7t8sGpXctlOnN8Bns mSUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:date:message-id:user-agent :mime-version:content-transfer-encoding; bh=MReC3qTVF+z2W6v+623tDclV4ya43dzBuXngSFKHEEs=; b=aUZmYEWZbyyrSPbPJa7YQrWOx2f6rm1uchBqRxB5GdfhoECXTrJX23GjvFBQkThcae UreUxe2qe34Zcxuk0g33UTSXn0hLC3w+ph+/qhujBJeyvxzPCJ+jG7HZn2UL6vrZIhKy 5CHsq6XCvhQlTq2LSbZTna2Qqk8O8QdaClpNZZlXprMWMZLyF9jtpIVZDR3pYHSySZsQ B6knZMdOo1J0Hv2FcIf1QzPgLOaUy0ylAa4HFgXSukiXNaJzy0ROxZ8AI7m+QUSyJhdS qFoR1ITbHJJJn77Fgh+2plXr8iJNgT+iwvdn/2U33X/MAiCBDC8V1lN1FXcR9Vu5euRo 01RQ== X-Gm-Message-State: AMCzsaWWIBdPxyLjC9Pg221ir0F/hQww2IwE0PYzYc6RYptGwKK6MjzT L60apNI3IceXxmmmvwIQvyo= X-Google-Smtp-Source: ABhQp+RpBvnS9CDacLFWlIwdt0UuP/jHCnjK3W5F4vjSr82UDo2ivL1QAVO7p82V7mn16Gl8lvVUAA== X-Received: by 10.84.242.74 with SMTP id c10mr5049750pll.141.1509665590285; Thu, 02 Nov 2017 16:33:10 -0700 (PDT) Received: from localhost.localdomain ([2001:470:b:9c3:9e5c:8eff:fe4f:f2d0]) by smtp.gmail.com with ESMTPSA id x79sm8790296pfa.156.2017.11.02.16.33.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 02 Nov 2017 16:33:09 -0700 (PDT) From: Alexander Duyck To: netdev@vger.kernel.org, intel-wired-lan@lists.osuosl.org Date: Thu, 02 Nov 2017 16:33:09 -0700 Message-ID: <20171102232857.15146.21583.stgit@localhost.localdomain> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Subject: [Intel-wired-lan] [jkirsher/next-queue PATCH 0/5] macvlan offload fixes X-BeenThere: intel-wired-lan@osuosl.org X-Mailman-Version: 2.1.24 Precedence: list List-Id: Intel Wired Ethernet Linux Kernel Driver Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-wired-lan-bounces@osuosl.org Sender: "Intel-wired-lan" I'm looking at performing a refactor of the macvlan offload code. However before I started I wanted to at least get things into a running state. The patches in this set are needed to address a number of issues that were preventing things from working as they were supposed to. With these changes in place I seem to be able to receive traffic as I am supposed to in the case of ixgbe and fm10k with the offload enabled, and I am now transmitting to the correct Tx ring in the case of ixgbe. The last two patches in the set are what I consider to be minor clean-ups to address the fact that we don't want packets to somehow stray and end up being transmitted on a queue that is supposed to be in use by a macvlan instead of the lowerdev itself. Acked-by: Shannon Nelson --- Alexander Duyck (5): ixgbe: Fix interaction between SR-IOV and macvlan offload fm10k: Fix VLAN configuration for macvlan offload ixgbe: Fix handling of macvlan Tx offload dev: Clean-up __skb_tx_hash to match up with traffic class based configs dev: Cap number of queues even with accel_priv drivers/net/ethernet/intel/fm10k/fm10k_netdev.c | 4 ++-- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 22 ++++++++++++++++++---- net/core/dev.c | 21 ++++++++++----------- 3 files changed, 30 insertions(+), 17 deletions(-) --