From patchwork Tue Mar 3 17:42:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 229874 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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, 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 25EFAC3F2D7 for ; Tue, 3 Mar 2020 18:13:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E8B782072D for ; Tue, 3 Mar 2020 18:13:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583259187; bh=aYvB/CLqNzY0NxikruZq6X2FXZDOhA/dHZFO0339dAo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=S3wGSR0peQtyBR//q1gR/D5ZOANTqpNmt+MN/uFeu8K5t9QN6YXrQbxcbLf21zgFx VjTJVJBRhtd8V+ofVOYDyRGBkW6qGXs91CPkCwcQqsNH0sDHW1+LCZDpjimTrmnF4A Tuga08Rj49VStTfioVZAWSLEkaeRes3plhIJLS1o= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731265AbgCCRrE (ORCPT ); Tue, 3 Mar 2020 12:47:04 -0500 Received: from mail.kernel.org ([198.145.29.99]:53856 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729206AbgCCRrD (ORCPT ); Tue, 3 Mar 2020 12:47:03 -0500 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 3ACAE20870; Tue, 3 Mar 2020 17:47:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583257622; bh=aYvB/CLqNzY0NxikruZq6X2FXZDOhA/dHZFO0339dAo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WUdk7AP/0SysO5OLXcGJzc4Hz75As0gHRZWkTS8HjVtzg/pvl0q+5/fpWDrWyh8Gk EGX918n4J23GV9RnyOU2Q0amih6zDmr/Vic2PCRcMMG17Wy08OiULaksGamc9YhYl6 W7acaxSQ6Ds8B8Vfp32hlUyIi2LPlfrwSb95XTmw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Brett Creeley , Andrew Bowers , Jeff Kirsher , Sasha Levin Subject: [PATCH 5.5 065/176] ice: Dont allow same value for Rx tail to be written twice Date: Tue, 3 Mar 2020 18:42:09 +0100 Message-Id: <20200303174312.166742616@linuxfoundation.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200303174304.593872177@linuxfoundation.org> References: <20200303174304.593872177@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: Brett Creeley [ Upstream commit 168983a8e19b89efd175661e53faa6246be363a0 ] Currently we compare the value we are about to write to the Rx tail register with the previous value of next_to_use. The problem with this is we only write tail on 8 descriptor boundaries, but next_to_use is updated whenever we clean Rx descriptors. Fix this by comparing the value we are about to write to tail with the previously written tail value. This will prevent duplicate Rx tail bumps. Signed-off-by: Brett Creeley Tested-by: Andrew Bowers Signed-off-by: Jeff Kirsher Signed-off-by: Sasha Levin --- drivers/net/ethernet/intel/ice/ice_txrx_lib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/intel/ice/ice_txrx_lib.c b/drivers/net/ethernet/intel/ice/ice_txrx_lib.c index 35bbc4ff603cd..6da048a6ca7c1 100644 --- a/drivers/net/ethernet/intel/ice/ice_txrx_lib.c +++ b/drivers/net/ethernet/intel/ice/ice_txrx_lib.c @@ -10,7 +10,7 @@ */ void ice_release_rx_desc(struct ice_ring *rx_ring, u32 val) { - u16 prev_ntu = rx_ring->next_to_use; + u16 prev_ntu = rx_ring->next_to_use & ~0x7; rx_ring->next_to_use = val;