Received: by 2002:ac0:a5a7:0:0:0:0:0 with SMTP id m36-v6csp1965706imm; Thu, 9 Aug 2018 05:14:21 -0700 (PDT) X-Google-Smtp-Source: AA+uWPx8n72rR4MveqmfFAHQ27mAxmRbidqA9uhsupU0e4k/50stMM8mL/75c6x2RxvCw9V4jo29 X-Received: by 2002:a17:902:1001:: with SMTP id b1-v6mr1846385pla.155.1533816861121; Thu, 09 Aug 2018 05:14:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533816861; cv=none; d=google.com; s=arc-20160816; b=v3yxxbPGgg5F9Me0lmMmMkQ7u2NIt9npXs/yWup49H55W1AhttOBq4zo9zHEWk6FKd Ht6c8cs59q0pAf1xYlL5HGgckVopwMtFKHCB19Lh+2bsF8b9b0EeBDWm6+TtiT4QhdlZ 1lm1naKrWOEw0RglbtdKOXoE4C28EBe+1VIT9144VQ3h4UhoTJ4xrzUwIFCbV0ITvzPA Jr5ArE+cWFnui6s0wmvVfx1d+A3tc+nhBE9GT8gIqi3ig0koPoAJtYR3Wi4f7p4frq/P oDqgq1tuUuzny2cXkfDeFL97ERv0geSmn9qWepddgdJhpPp+6svQMEw8vzYzL7tsQcNF 93iA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:user-agent:in-reply-to :content-disposition:mime-version:references:message-id:subject:cc :to:from:date:dkim-signature:arc-authentication-results; bh=j+jIsr8SylJrzkdrD5baKVPDQAT/wnrVIUFNaQ2FDQE=; b=G/g5og0V2NoE0yUwd3HvvDuyOb9zmdv9F0h7AdQrTm/LUbYLD1UN4vN5yod+IeRIVI 27mp2otRYt2pEXfk4cQc8vN41GKoLE1l5ES1kpqBL1MGKvBJM/oHdD6g7ysNsHcGbxkm lyINR9SZioO77xH/llCmqKidqRwL6jU0ZP8puAyOsbF08fvktwmk7oFnB+wz6V7mBNX0 hT4YHJlho7L86TPatqn7iBo3rC0GSFzqav7dtFM3y14O88bjclTIdw0rZazCGKi4ewxO q9QwJKj3CNzy+4fvBrHYly1ngsNw5YQFEqR40VpLL5d+KOwmMqsNCgXT6ct5ab3+jt8I abmg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@lunn.ch header.s=20171124 header.b=6UxyO0hJ; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f10-v6si6158348pga.559.2018.08.09.05.14.04; Thu, 09 Aug 2018 05:14:21 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@lunn.ch header.s=20171124 header.b=6UxyO0hJ; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730839AbeHIOhv (ORCPT + 99 others); Thu, 9 Aug 2018 10:37:51 -0400 Received: from vps0.lunn.ch ([185.16.172.187]:59684 "EHLO vps0.lunn.ch" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730032AbeHIOhu (ORCPT ); Thu, 9 Aug 2018 10:37:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lunn.ch; s=20171124; h=In-Reply-To:Content-Type:MIME-Version:References:Message-ID:Subject:Cc:To:From:Date; bh=j+jIsr8SylJrzkdrD5baKVPDQAT/wnrVIUFNaQ2FDQE=; b=6UxyO0hJXS3Bnp7beOpnQw3xzckQPoQPdBlYIb0WnbUmUNXlO/z5HDmHDa96+QXmhAtM0YVhkq7k59XqNwiypa2wcH69rhI6bzV8jHlSPDY3azOv1ugG19HJZHWvaVR5OV98wNcdaXGr1rYiVnOtGsdEZg/FCVzB8c1E/RdXpzc=; Received: from andrew by vps0.lunn.ch with local (Exim 4.84_2) (envelope-from ) id 1fnjoT-0004VA-03; Thu, 09 Aug 2018 14:13:09 +0200 Date: Thu, 9 Aug 2018 14:13:08 +0200 From: Andrew Lunn To: Jisheng Zhang Cc: Thomas Petazzoni , "David S. Miller" , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Marek =?iso-8859-1?Q?Beh=FAn?= , Tomas Hlavacek , linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH] net: mvneta: use the correct napi pointer Message-ID: <20180809121308.GC16359@lunn.ch> References: <20180809200242.1166f86c@xhacker.debian> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20180809200242.1166f86c@xhacker.debian> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Aug 09, 2018 at 08:02:42PM +0800, Jisheng Zhang wrote: > if neta_armada3700 is true, the mvneta_pcpu_port's napi is invalid, we > should use pp->napi instead. Fix mvneta_config_rss() with this method. > Although we can fix mvneta_rx_hwbm() and mvneta_rx_swbm() in the same > manner, the napi parm of mvneta_poll() is always correct, so we can > pass the correct napi param to mvneta_rx_hwbm() and mvneta_rx_swbm() > > Signed-off-by: Jisheng Zhang Hi Jisheng How does this differ from commit 7a86f05faf112463cfbbdfd222012e247de461a1 Author: Andrew Lunn Date: Wed Jul 18 18:10:50 2018 +0200 net: ethernet: mvneta: Fix napi structure mixup on armada 3700 The mvneta Ethernet driver is used on a few different Marvell SoCs. Some SoCs have per cpu interrupts for Ethernet events. Some SoCs have a single interrupt, independent of the CPU. The driver handles this by having a per CPU napi structure when there are per CPU interrupts, and a global napi structure when there is a single interrupt. When the napi core calls mvneta_poll(), it passes the napi instance. This was not being propagated through the call chain, and instead the per-cpu napi instance was passed to napi_gro_receive() call. This breaks when there is a single global napi instance. Signed-off-by: Andrew Lunn Fixes: 2636ac3cc2b4 ("net: mvneta: Add network support for Armada 3700 SoC") Signed-off-by: Gregory CLEMENT Signed-off-by: David S. Miller which is already in net-next, and i hope net? Andrew