{"id":833253,"url":"http://patchwork.ozlabs.org/api/1.2/patches/833253/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20171102083136.2096-8-jakub.kicinski@netronome.com/","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/1.2/projects/7/?format=json","name":"Linux network development","link_name":"netdev","list_id":"netdev.vger.kernel.org","list_email":"netdev@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20171102083136.2096-8-jakub.kicinski@netronome.com>","list_archive_url":null,"date":"2017-11-02T08:31:35","name":"[net-next,7/8] nfp: use a counter instead of log message for allocation failures","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"ffe7c75d0eefc24fdc05901c40b959a54c2ecb8e","submitter":{"id":67484,"url":"http://patchwork.ozlabs.org/api/1.2/people/67484/?format=json","name":"Jakub Kicinski","email":"jakub.kicinski@netronome.com"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/1.2/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/20171102083136.2096-8-jakub.kicinski@netronome.com/mbox/","series":[{"id":11454,"url":"http://patchwork.ozlabs.org/api/1.2/series/11454/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=11454","date":"2017-11-02T08:31:28","name":"nfp: TC block fixes, app fallback and dev_alloc()","version":1,"mbox":"http://patchwork.ozlabs.org/series/11454/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/833253/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/833253/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"patchwork-incoming@ozlabs.org","Delivered-To":"patchwork-incoming@ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netdev-owner@vger.kernel.org;\n\treceiver=)","ozlabs.org; dkim=pass (2048-bit key;\n\tunprotected) header.d=netronome-com.20150623.gappssmtp.com\n\theader.i=@netronome-com.20150623.gappssmtp.com\n\theader.b=\"uTx2Bmj6\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3ySJHh5jknz9t2f\n\tfor ;\n\tThu, 2 Nov 2017 19:32:48 +1100 (AEDT)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S932591AbdKBIcq (ORCPT );\n\tThu, 2 Nov 2017 04:32:46 -0400","from mail-pg0-f68.google.com ([74.125.83.68]:43827 \"EHLO\n\tmail-pg0-f68.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1755436AbdKBIc3 (ORCPT\n\t); Thu, 2 Nov 2017 04:32:29 -0400","by mail-pg0-f68.google.com with SMTP id s75so4455071pgs.0\n\tfor ; Thu, 02 Nov 2017 01:32:28 -0700 (PDT)","from jkicinski-Precision-T1700.netronome.com ([75.53.12.129])\n\tby smtp.gmail.com with ESMTPSA id\n\tz13sm5390484pgc.29.2017.11.02.01.32.26\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);\n\tThu, 02 Nov 2017 01:32:27 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=netronome-com.20150623.gappssmtp.com; s=20150623;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references;\n\tbh=k1zN0vp/0H8gGJ1cROnBYrmyQeB5FIUGrPiju/H80vs=;\n\tb=uTx2Bmj6x0BHfHxfszgTbMIAOMfU4N6All8yAxj3p/EIge7rOcz4mJaQWrs4fnj/jk\n\tvRclpQzdzHDke5NAvtRDrjZClqsmOMzS3Dzx7kP6yNFLABsySvhvN64pfue1qyykGT1t\n\tfkYe3tTqnbSQNCm+BIH5QUkGdnLn98LXHfqVfk3hp+PbRXEjOkC2TPhBPGrj0JB2rjXU\n\taGP63biTnly91X3yYqUOUaPT/Cgq+8EE2/2lcJWnXDlcKqcBjj3cX2ONEywFNgrj8RLM\n\t2po8rZK7UMi1IjCHde61g/LSldiaGaSDxT5h8lODxVT/JAYaazi9LXET2YYel4cR1Vpk\n\tFzyw==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=k1zN0vp/0H8gGJ1cROnBYrmyQeB5FIUGrPiju/H80vs=;\n\tb=Ah7gg999X9epYe8U7fyRuWF3fLbTc9Ppdrg6pmn+dC8XaCkggRTJVHKFP75NzkrXyP\n\t2U8NlgWUFX/+Hqo0WIE6TIDB17R+BQ+K8NgS6FCDDyo/DA34QGG39ngHIRnq+GMCyZSJ\n\tsBsBZs00iT3GSv31qNymJSMZjDEb6Mc+VJtJ8NNLDCPIZGlDj1FkjRLpUMthsZFUnyon\n\tisRYI1PrWn4vylQilzlXPV7l7Crj3Hvd6Slkz2Yg06r1f/fUl4/rWrnT1ZFdyLSa6HW2\n\trTzl2HGR246rOAjm5PnP/BSb7Fd3sag4dJ1q+GiS4q0NIc2B0HzaZBgK7MdnIrYPA7N8\n\tb/bw==","X-Gm-Message-State":"AMCzsaWfnRnwz8CyYKzUDrCZyd6OVIdT6dh8KOHPR0m1KPJmQRVXtrWS\n\t/W+4/oOBjYBUY79Ki2r8bVHE5ldB","X-Google-Smtp-Source":"ABhQp+Tb665jyoqor0lLsl8AgQ9oVyee4WyKPwKvw+X7fG5VR3Jaqcx3rhgsyDPHsVSU0x+fDSNqtA==","X-Received":"by 10.84.174.67 with SMTP id q61mr2501411plb.184.1509611547611; \n\tThu, 02 Nov 2017 01:32:27 -0700 (PDT)","From":"Jakub Kicinski ","To":"netdev@vger.kernel.org","Cc":"oss-drivers@netronome.com, Jakub Kicinski ","Subject":"[PATCH net-next 7/8] nfp: use a counter instead of log message for\n\tallocation failures","Date":"Thu, 2 Nov 2017 01:31:35 -0700","Message-Id":"<20171102083136.2096-8-jakub.kicinski@netronome.com>","X-Mailer":"git-send-email 2.14.1","In-Reply-To":"<20171102083136.2096-1-jakub.kicinski@netronome.com>","References":"<20171102083136.2096-1-jakub.kicinski@netronome.com>","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"Add a counter incremented when allocation of replacement\nRX page fails.\n\nSigned-off-by: Jakub Kicinski \nReviewed-by: Simon Horman \n---\n drivers/net/ethernet/netronome/nfp/nfp_net.h | 3 +++\n drivers/net/ethernet/netronome/nfp/nfp_net_common.c | 15 ++++++++++-----\n drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c | 12 +++++++-----\n 3 files changed, 20 insertions(+), 10 deletions(-)","diff":"diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net.h b/drivers/net/ethernet/netronome/nfp/nfp_net.h\nindex d51d8237b984..3d411f0d15b6 100644\n--- a/drivers/net/ethernet/netronome/nfp/nfp_net.h\n+++ b/drivers/net/ethernet/netronome/nfp/nfp_net.h\n@@ -394,6 +394,7 @@ struct nfp_net_rx_ring {\n * @tx_lso:\t Counter of LSO packets sent\n * @tx_errors:\t How many TX errors were encountered\n * @tx_busy: How often was TX busy (no space)?\n+ * @rx_replace_buf_alloc_fail:\tCounter of RX buffer allocation failures\n * @irq_vector: Interrupt vector number (use for talking to the OS)\n * @handler: Interrupt handler for this ring vector\n * @name: Name of the interrupt vector\n@@ -437,6 +438,8 @@ struct nfp_net_r_vector {\n \tu64 hw_csum_tx_inner;\n \tu64 tx_gather;\n \tu64 tx_lso;\n+\n+\tu64 rx_replace_buf_alloc_fail;\n \tu64 tx_errors;\n \tu64 tx_busy;\n \ndiff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c\nindex 7147335a8b36..185a3dd35a3f 100644\n--- a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c\n+++ b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c\n@@ -1209,15 +1209,15 @@ static void *nfp_net_napi_alloc_one(struct nfp_net_dp *dp, dma_addr_t *dma_addr)\n \n \tif (!dp->xdp_prog) {\n \t\tfrag = napi_alloc_frag(dp->fl_bufsz);\n+\t\tif (unlikely(!frag))\n+\t\t\treturn NULL;\n \t} else {\n \t\tstruct page *page;\n \n \t\tpage = dev_alloc_page();\n-\t\tfrag = page ? page_address(page) : NULL;\n-\t}\n-\tif (!frag) {\n-\t\tnn_dp_warn(dp, \"Failed to alloc receive page frag\\n\");\n-\t\treturn NULL;\n+\t\tif (unlikely(!page))\n+\t\t\treturn NULL;\n+\t\tfrag = page_address(page);\n \t}\n \n \t*dma_addr = nfp_net_dma_map_rx(dp, frag);\n@@ -1514,6 +1514,11 @@ nfp_net_rx_drop(const struct nfp_net_dp *dp, struct nfp_net_r_vector *r_vec,\n {\n \tu64_stats_update_begin(&r_vec->rx_sync);\n \tr_vec->rx_drops++;\n+\t/* If we have both skb and rxbuf the replacement buffer allocation\n+\t * must have failed, count this as an alloc failure.\n+\t */\n+\tif (skb && rxbuf)\n+\t\tr_vec->rx_replace_buf_alloc_fail++;\n \tu64_stats_update_end(&r_vec->rx_sync);\n \n \t/* skb is build based on the frag, free_skb() would free the frag\ndiff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c b/drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c\nindex dc016dfec64d..6d5c376f0000 100644\n--- a/drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c\n+++ b/drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c\n@@ -181,7 +181,7 @@ static const struct nfp_et_stat nfp_mac_et_stats[] = {\n \n #define NN_ET_GLOBAL_STATS_LEN ARRAY_SIZE(nfp_net_et_stats)\n #define NN_ET_SWITCH_STATS_LEN 9\n-#define NN_ET_RVEC_GATHER_STATS 7\n+#define NN_ET_RVEC_GATHER_STATS 8\n \n static void nfp_net_get_nspinfo(struct nfp_app *app, char *version)\n {\n@@ -444,6 +444,7 @@ static u8 *nfp_vnic_get_sw_stats_strings(struct net_device *netdev, u8 *data)\n \tdata = nfp_pr_et(data, \"hw_rx_csum_ok\");\n \tdata = nfp_pr_et(data, \"hw_rx_csum_inner_ok\");\n \tdata = nfp_pr_et(data, \"hw_rx_csum_err\");\n+\tdata = nfp_pr_et(data, \"rx_replace_buf_alloc_fail\");\n \tdata = nfp_pr_et(data, \"hw_tx_csum\");\n \tdata = nfp_pr_et(data, \"hw_tx_inner_csum\");\n \tdata = nfp_pr_et(data, \"tx_gather\");\n@@ -468,16 +469,17 @@ static u64 *nfp_vnic_get_sw_stats(struct net_device *netdev, u64 *data)\n \t\t\ttmp[0] = nn->r_vecs[i].hw_csum_rx_ok;\n \t\t\ttmp[1] = nn->r_vecs[i].hw_csum_rx_inner_ok;\n \t\t\ttmp[2] = nn->r_vecs[i].hw_csum_rx_error;\n+\t\t\ttmp[3] = nn->r_vecs[i].rx_replace_buf_alloc_fail;\n \t\t} while (u64_stats_fetch_retry(&nn->r_vecs[i].rx_sync, start));\n \n \t\tdo {\n \t\t\tstart = u64_stats_fetch_begin(&nn->r_vecs[i].tx_sync);\n \t\t\tdata[1] = nn->r_vecs[i].tx_pkts;\n \t\t\tdata[2] = nn->r_vecs[i].tx_busy;\n-\t\t\ttmp[3] = nn->r_vecs[i].hw_csum_tx;\n-\t\t\ttmp[4] = nn->r_vecs[i].hw_csum_tx_inner;\n-\t\t\ttmp[5] = nn->r_vecs[i].tx_gather;\n-\t\t\ttmp[6] = nn->r_vecs[i].tx_lso;\n+\t\t\ttmp[4] = nn->r_vecs[i].hw_csum_tx;\n+\t\t\ttmp[5] = nn->r_vecs[i].hw_csum_tx_inner;\n+\t\t\ttmp[6] = nn->r_vecs[i].tx_gather;\n+\t\t\ttmp[7] = nn->r_vecs[i].tx_lso;\n \t\t} while (u64_stats_fetch_retry(&nn->r_vecs[i].tx_sync, start));\n \n \t\tdata += 3;\n","prefixes":["net-next","7/8"]}