From patchwork Mon May 29 00:53:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 767995 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3wbdYz3nlMz9s0m for ; Mon, 29 May 2017 10:55:03 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=netronome-com.20150623.gappssmtp.com header.i=@netronome-com.20150623.gappssmtp.com header.b="T1gWUHKm"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751052AbdE2Ayz (ORCPT ); Sun, 28 May 2017 20:54:55 -0400 Received: from mail-pg0-f43.google.com ([74.125.83.43]:35949 "EHLO mail-pg0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750995AbdE2Ayn (ORCPT ); Sun, 28 May 2017 20:54:43 -0400 Received: by mail-pg0-f43.google.com with SMTP id x64so15377796pgd.3 for ; Sun, 28 May 2017 17:54:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netronome-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=am6N73ip/UmwTwgB1SPHVQ+b87bAAyH0cmJomcTNbOs=; b=T1gWUHKmwlQQrO2P+eV6yAvIEj8DJoLZkI0GtIZrk/8Iyc4dHKuSITB8hQmOAf3XUK L2VOgUBu/uDWYSaNcOQNgNVaCw4mGGgRF72/+KmfIs7W83D3etneYOcKkLlc2YPeGKbs FTzHe7nGfzOsNNMuU3s/u4pkbJek3m0NxLfnOXSKpms3vg5gxLmYznowNjcyhdSMmWbY qfJSmjRlYp/ev4yOEQGi9scwMOcaYMYdCeB9DIkQUWCCWDoc25QGF03YfyRqali+4nTt hwxYdrhCDMgHM6SgfQ/RS5ZUwEKY5k8hspAZ/d7dS+47B4cxcpj8Q+FalZd/xjA7O+1h 5DqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=am6N73ip/UmwTwgB1SPHVQ+b87bAAyH0cmJomcTNbOs=; b=ZXZ3/pguZscp9qchdmkaWVUomSyN9sDtuSF7pwfItJeHjhvFQlDi8WNjT93X7fVIsZ MjbPGLlCZh2m9Hf6mDRvQiQ51qQ67hwmJqU+ew1wmG3ObKbZ+DUZAoSraynpvYmfS4ev ujrFLw5XYAGLb+3jiPc3BJHXbisCo8xXSSQNmrgp/3iCfwJbtpb3eHTqPJmeSGJh8QNt AVHUeD9ysxIWrf+3v9YBxUVmG/mProkvwp+Nnqgi+Dw5iJxMOz3bxkjPuBacm/LJSY1F ZD9dt35lDf//KGKQ8L4RjIz6KgX0uv2FBkjTZEytEKoi7WSBpwb5oCJ0gAqxVYxfiAFL d4Cw== X-Gm-Message-State: AODbwcBbnyAdUD8x3M2Z/FtYu4I4oHTgmnq+87IUkovza6xlNdMUiUNT rCJDkDvWjcvsAnL3No8= X-Received: by 10.99.116.74 with SMTP id e10mr13435237pgn.149.1496019277981; Sun, 28 May 2017 17:54:37 -0700 (PDT) Received: from jkicinski-Precision-T1700.netronome.com ([75.53.12.129]) by smtp.gmail.com with ESMTPSA id h84sm14580547pfh.45.2017.05.28.17.54.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 28 May 2017 17:54:37 -0700 (PDT) From: Jakub Kicinski To: netdev@vger.kernel.org Cc: oss-drivers@netronome.com, Jakub Kicinski Subject: [PATCH net-next v2 12/13] nfp: don't add ring size to index calculations Date: Sun, 28 May 2017 17:53:03 -0700 Message-Id: <20170529005304.20847-13-jakub.kicinski@netronome.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170529005304.20847-1-jakub.kicinski@netronome.com> References: <20170529005304.20847-1-jakub.kicinski@netronome.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Adding ring size to index calculation is pointless, since index will be masked with ring size - 1. Suggested-by: David Laight Signed-off-by: Jakub Kicinski --- drivers/net/ethernet/netronome/nfp/nfp_net_common.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c index 9312a737fbc9..68013d048e9d 100644 --- a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c +++ b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c @@ -928,7 +928,7 @@ static void nfp_net_tx_complete(struct nfp_net_tx_ring *tx_ring) if (qcp_rd_p == tx_ring->qcp_rd_p) return; - todo = D_IDX(tx_ring, qcp_rd_p + tx_ring->cnt - tx_ring->qcp_rd_p); + todo = D_IDX(tx_ring, qcp_rd_p - tx_ring->qcp_rd_p); while (todo--) { idx = D_IDX(tx_ring, tx_ring->rd_p++); @@ -999,7 +999,7 @@ static bool nfp_net_xdp_complete(struct nfp_net_tx_ring *tx_ring) if (qcp_rd_p == tx_ring->qcp_rd_p) return true; - todo = D_IDX(tx_ring, qcp_rd_p + tx_ring->cnt - tx_ring->qcp_rd_p); + todo = D_IDX(tx_ring, qcp_rd_p - tx_ring->qcp_rd_p); done_all = todo <= NFP_NET_XDP_MAX_COMPLETE; todo = min(todo, NFP_NET_XDP_MAX_COMPLETE);