From patchwork Fri Sep 25 12:48:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "gregkh@linuxfoundation.org" X-Patchwork-Id: 309239 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=-10.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 519F8C4363D for ; Fri, 25 Sep 2020 12:52:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0EED52311D for ; Fri, 25 Sep 2020 12:52:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601038378; bh=5E59sdwFMdetVSIjlTCpU/oeiF9qgsrfJjSSWONpPp4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=KjUiVVQg56rlqztzLp/77WFaGzIydOp0LYPfMaWqGAEAXm3mWtWdYA+nNufyJ0rvH 5EtFcW9Bg9S3RcgYMYMZa89LncYPkVkJb162vibpQWXnKJFCFmEiTOlOIsK3OHcxnp v/7GSS+PmKcc14OWK1cxHleFPiZhZ6YqOWxrCnz0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729356AbgIYMw5 (ORCPT ); Fri, 25 Sep 2020 08:52:57 -0400 Received: from mail.kernel.org ([198.145.29.99]:57926 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729361AbgIYMw4 (ORCPT ); Fri, 25 Sep 2020 08:52:56 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (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 C17452072E; Fri, 25 Sep 2020 12:52:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601038376; bh=5E59sdwFMdetVSIjlTCpU/oeiF9qgsrfJjSSWONpPp4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FbSzOuxJ6gikxN77XYyMy1CNRy3QfHG7FbhR66jpKDZZlF9NKR/WiVXSxq5Nw4JHZ r8d/b+5bGSR+xfm81e3CkbsJ2zCuefl+2mvhx6Sbh0ZS6kjrtmwWF685R3OyGpMnqD fUIFsIkA/EWXpscLMJkNAoZ9SiY406a3pAIp1IPc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ganji Aravind , Jakub Kicinski Subject: [PATCH 5.4 10/43] cxgb4: Fix offset when clearing filter byte counters Date: Fri, 25 Sep 2020 14:48:22 +0200 Message-Id: <20200925124725.115153564@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200925124723.575329814@linuxfoundation.org> References: <20200925124723.575329814@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Ganji Aravind [ Upstream commit 94cc242a067a869c29800aa789d38b7676136e50 ] Pass the correct offset to clear the stale filter hit bytes counter. Otherwise, the counter starts incrementing from the stale information, instead of 0. Fixes: 12b276fbf6e0 ("cxgb4: add support to create hash filters") Signed-off-by: Ganji Aravind Signed-off-by: Jakub Kicinski Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) --- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.c +++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.c @@ -1617,13 +1617,16 @@ out: static int configure_filter_tcb(struct adapter *adap, unsigned int tid, struct filter_entry *f) { - if (f->fs.hitcnts) + if (f->fs.hitcnts) { set_tcb_field(adap, f, tid, TCB_TIMESTAMP_W, - TCB_TIMESTAMP_V(TCB_TIMESTAMP_M) | + TCB_TIMESTAMP_V(TCB_TIMESTAMP_M), + TCB_TIMESTAMP_V(0ULL), + 1); + set_tcb_field(adap, f, tid, TCB_RTT_TS_RECENT_AGE_W, TCB_RTT_TS_RECENT_AGE_V(TCB_RTT_TS_RECENT_AGE_M), - TCB_TIMESTAMP_V(0ULL) | TCB_RTT_TS_RECENT_AGE_V(0ULL), 1); + } if (f->fs.newdmac) set_tcb_tflag(adap, f, tid, TF_CCTRL_ECE_S, 1,