From patchwork Sat Jan 20 01:54:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 863916 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) 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="yO85FYba"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zNgjs275jz9t3k for ; Sat, 20 Jan 2018 12:54:40 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756322AbeATByW (ORCPT ); Fri, 19 Jan 2018 20:54:22 -0500 Received: from mail-pg0-f65.google.com ([74.125.83.65]:34724 "EHLO mail-pg0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753427AbeATByT (ORCPT ); Fri, 19 Jan 2018 20:54:19 -0500 Received: by mail-pg0-f65.google.com with SMTP id r19so2736383pgn.1 for ; Fri, 19 Jan 2018 17:54:18 -0800 (PST) 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; bh=2OMk1S//zEAU1iflEBErKMyWsvZX/8Q/lqmMXP2Puo8=; b=yO85FYbaWxibVCPd6uaTiBBuHtiscC++enDzj+uXoYjKUQV45+OzIcW4Vfn4ePBdyu 9pr6oo+OgtySTY4fCC/K5xieApyuUFVB982rljh02sd6PqolkAOOmIFd8pXoSPl6u3SD zAI2jVTZ35IRvHof0q7kozon6M4GcXznDMkUxidQtdpw5NOR7uCGJZstuPGxGPdyLdvi cLCqi0IkelJW2+EaWIZDM4XbRneL/NfPvhirl2i7XurCgYjt7kUB40WVtp2xtyT6RU8i WNpcWP1gX20BOQseI1mtFrYm/U9WEOgdZoOd1ferVCYz8oO48jQdyQNoD9oae86F4sOT o4NQ== 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; bh=2OMk1S//zEAU1iflEBErKMyWsvZX/8Q/lqmMXP2Puo8=; b=BO4FaEH+foSVjnYcB6k/mmR5vI1WHLKaww81sAycnWgHbiF9Zq2yxRug/Crs4rm4HL OSnboK1l/QNb0HpOGKW2I42Z6oiZGxV6gVNFm9CDBegQMevY6xN8uWStA5YlT7JG83AS n+VVvuc4TQbU1pQldfMv4F6TatgjW6pmCGkL0s+4U0rAg0/IcteorT2M+KRdJv1y0WK8 7efgKl7IzyzVzizLxsNNR/m09cv2SYzjhZ/jmdv6ocOhFVNQhb599T+vlbVS3DTDtZAm JrNSH30OiwWvT7PkL+0uEZl2FpQMJH8qlkMbBHfu0zkNfXfET2yWwOGQbDh6ivsea6l/ 0XLQ== X-Gm-Message-State: AKwxytcpj0UzcY0VdnOjiCE+YXHcrkQy+E2lN8YierfKlQVhR2kwBKO0 D968oFiYgvBLmiorktQCCm4oOQ== X-Google-Smtp-Source: AH8x224DHJC1/0UJB4MC9Pr6FzBN/QDBv+jnIRQgPW+cORpHwRJsh2FfBFkLg4cxzWyKdmg/xNeKRg== X-Received: by 10.99.96.81 with SMTP id u78mr430534pgb.427.1516413258582; Fri, 19 Jan 2018 17:54:18 -0800 (PST) Received: from jkicinski-Precision-T1700.netronome.com ([75.53.12.129]) by smtp.gmail.com with ESMTPSA id u63sm11692935pfi.63.2018.01.19.17.54.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 19 Jan 2018 17:54:18 -0800 (PST) From: Jakub Kicinski To: davem@davemloft.net Cc: oss-drivers@netronome.com, netdev@vger.kernel.org, Pieter Jansen van Vuuren Subject: [PATCH net-next] nfp: flower: prioritize stats updates Date: Fri, 19 Jan 2018 17:54:08 -0800 Message-Id: <20180120015408.16539-1-jakub.kicinski@netronome.com> X-Mailer: git-send-email 2.15.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Pieter Jansen van Vuuren Previously it was possible to interrupt processing stats updates because they were handled in a work queue. Interrupting the stats updates could lead to a situation where we backup the control message queue. This patch moves the stats update processing out of the work queue to be processed as soon as hardware sends a request. Reported-by: Louis Peens Signed-off-by: Pieter Jansen van Vuuren Reviewed-by: Dirk van der Merwe Reviewed-by: Jakub Kicinski --- drivers/net/ethernet/netronome/nfp/flower/cmsg.c | 29 +++++++++++++++--------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/drivers/net/ethernet/netronome/nfp/flower/cmsg.c b/drivers/net/ethernet/netronome/nfp/flower/cmsg.c index 615314d9e7c6..baaea6f1a9d8 100644 --- a/drivers/net/ethernet/netronome/nfp/flower/cmsg.c +++ b/drivers/net/ethernet/netronome/nfp/flower/cmsg.c @@ -211,12 +211,6 @@ nfp_flower_cmsg_process_one_rx(struct nfp_app *app, struct sk_buff *skb) cmsg_hdr = nfp_flower_cmsg_get_hdr(skb); - if (unlikely(cmsg_hdr->version != NFP_FLOWER_CMSG_VER1)) { - nfp_flower_cmsg_warn(app, "Cannot handle repr control version %u\n", - cmsg_hdr->version); - goto out; - } - type = cmsg_hdr->type; switch (type) { case NFP_FLOWER_CMSG_TYPE_PORT_REIFY: @@ -225,9 +219,6 @@ nfp_flower_cmsg_process_one_rx(struct nfp_app *app, struct sk_buff *skb) case NFP_FLOWER_CMSG_TYPE_PORT_MOD: nfp_flower_cmsg_portmod_rx(app, skb); break; - case NFP_FLOWER_CMSG_TYPE_FLOW_STATS: - nfp_flower_rx_flow_stats(app, skb); - break; case NFP_FLOWER_CMSG_TYPE_NO_NEIGH: nfp_tunnel_request_route(app, skb); break; @@ -263,7 +254,23 @@ void nfp_flower_cmsg_process_rx(struct work_struct *work) void nfp_flower_cmsg_rx(struct nfp_app *app, struct sk_buff *skb) { struct nfp_flower_priv *priv = app->priv; + struct nfp_flower_cmsg_hdr *cmsg_hdr; + + cmsg_hdr = nfp_flower_cmsg_get_hdr(skb); + + if (unlikely(cmsg_hdr->version != NFP_FLOWER_CMSG_VER1)) { + nfp_flower_cmsg_warn(app, "Cannot handle repr control version %u\n", + cmsg_hdr->version); + dev_kfree_skb_any(skb); + return; + } - skb_queue_tail(&priv->cmsg_skbs, skb); - schedule_work(&priv->cmsg_work); + if (cmsg_hdr->type == NFP_FLOWER_CMSG_TYPE_FLOW_STATS) { + /* We need to deal with stats updates from HW asap */ + nfp_flower_rx_flow_stats(app, skb); + dev_consume_skb_any(skb); + } else { + skb_queue_tail(&priv->cmsg_skbs, skb); + schedule_work(&priv->cmsg_work); + } }