From patchwork Tue Mar 31 08:57:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 228544 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BBAFAC43331 for ; Tue, 31 Mar 2020 09:23:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8FF5C208E0 for ; Tue, 31 Mar 2020 09:23:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585646613; bh=oPbydZY17y4a3IXLWo/OfOPZEnYr7ykeYMkHBINCVYQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=o17NWFsHRxehWdtabd7ZsMhcxx2w5286ixIpkiajrQB4t+94dgSxO2qVOgDxGi3oJ gxHZae04rESaJOFnOvUKp83NcHoGo3N8RTDuP6UqIMRVcH36X9Ln0OebsWdwmrqQPe ZiXNYrlgedtygDdPwgTbCkvik6JOnM7BGCePN3n4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730457AbgCaJCU (ORCPT ); Tue, 31 Mar 2020 05:02:20 -0400 Received: from mail.kernel.org ([198.145.29.99]:41778 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730400AbgCaJCR (ORCPT ); Tue, 31 Mar 2020 05:02:17 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id E94AD20B1F; Tue, 31 Mar 2020 09:02:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585645337; bh=oPbydZY17y4a3IXLWo/OfOPZEnYr7ykeYMkHBINCVYQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cm2F8FV2ueUuAeBUdlSFcmxj/6H9U9x7SfOm9jJRDBYUzd+s725BUaRE+fMsCfd2y +LZuzAsXqHXgtJQldJ9WLA/Q8WD4tuqUPxjVokV0MmS6frkercRokYMOX6wI3Ay39o r58E1YTTYWWTJ1WWVFmyHbk0mbLAYiDspb/cueuY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jisheng Zhang , "David S. Miller" Subject: [PATCH 5.5 022/170] net: mvneta: Fix the case where the last poll did not process all rx Date: Tue, 31 Mar 2020 10:57:16 +0200 Message-Id: <20200331085426.396523514@linuxfoundation.org> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200331085423.990189598@linuxfoundation.org> References: <20200331085423.990189598@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Jisheng Zhang [ Upstream commit 065fd83e1be2e1ba0d446a257fd86a3cc7bddb51 ] For the case where the last mvneta_poll did not process all RX packets, we need to xor the pp->cause_rx_tx or port->cause_rx_tx before claculating the rx_queue. Fixes: 2dcf75e2793c ("net: mvneta: Associate RX queues with each CPU") Signed-off-by: Jisheng Zhang Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/marvell/mvneta.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --- a/drivers/net/ethernet/marvell/mvneta.c +++ b/drivers/net/ethernet/marvell/mvneta.c @@ -3036,11 +3036,10 @@ static int mvneta_poll(struct napi_struc /* For the case where the last mvneta_poll did not process all * RX packets */ - rx_queue = fls(((cause_rx_tx >> 8) & 0xff)); - cause_rx_tx |= pp->neta_armada3700 ? pp->cause_rx_tx : port->cause_rx_tx; + rx_queue = fls(((cause_rx_tx >> 8) & 0xff)); if (rx_queue) { rx_queue = rx_queue - 1; if (pp->bm_priv)