From patchwork Wed May 6 19:27:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 69859 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 6321AA034E; Wed, 6 May 2020 21:27:55 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 796011D9FD; Wed, 6 May 2020 21:27:50 +0200 (CEST) Received: from mail-pj1-f67.google.com (mail-pj1-f67.google.com [209.85.216.67]) by dpdk.org (Postfix) with ESMTP id 50E8B1D9F0 for ; Wed, 6 May 2020 21:27:48 +0200 (CEST) Received: by mail-pj1-f67.google.com with SMTP id t9so1424400pjw.0 for ; Wed, 06 May 2020 12:27:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=EGzjZdZC5F4TNmyBK5aH1h2QVpcgQMd1zR1e/0s7q18=; b=ExzbKRE2yeA1LhpRRFNA9NAxF7ytMsgK7unaB7r0x7cM3Eafj929bjYU4R39NN+i+R icJX4bswD6BKr6YjNBgsKxJnQndZXuy8JlTEtEAKI6k8dic+QqsTUwjgnielHk/H5dwy V708lPm2ZEmi6daMZiOKOc7GERJPzzFdiPhacXoUDPgr0Zvd/PcboJH+Pbj1DdYRnGge THe2cTxiTQ2j0NEd9T70rjrmvdjF7F+8H1LwmN1CxnDbrshBZzSoVJcWQ6Pg/YrR0bWL j5Uy0XcG0vRrUWyNSqQaIgyDGboVBQvz3pjfV4A9bmH1FddrF/xehbevh7q4L/p+V8IE +FAA== 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:mime-version:content-transfer-encoding; bh=EGzjZdZC5F4TNmyBK5aH1h2QVpcgQMd1zR1e/0s7q18=; b=U0KNAHYD6P40EKkML642U8yeVrwE0+8/ceRkpL//cuqCur17Ofjk4oCrJHv/dDeQNY hlekgEkmHxkbjsPMdiOpJz06PuFX5gaK7JM68DhoYHqc3ti+YZmeVYbZMgNU5q0JH7+H e4ebxxD0QycOi/CrjbpJq6+NuI7mw/Z5BgIv2qQ3XPeTKjGZnTCnog+5TxVJSSr3/K7L 9OIbNC723MPtJIMPK6wd7zDekCzQS3nU0rWlqcRjlTH4b7Pps5qrgv56HwiFcGAy+eB1 O4irItfBeI6Lud8OqsNFkzDt9y2owx5st/yt4Gnszb//TyhYIb97CoLNA7NOFAtbTMsL voLQ== X-Gm-Message-State: AGi0PuZBgIf1r3LrUnixsa17hT2bLqZ9i3YqUqiLaWSYZEt0fpu7AA3Y vev1JH2sNt39bsQyRXVlcMnuB5/HB9ymPw== X-Google-Smtp-Source: APiQypJTffrwptCIKPR6bih5uW5mVa2smo420fQZaWseMIkf9mJRpE6RmBG0/QomDOqXkUbIf/vniA== X-Received: by 2002:a17:90a:3266:: with SMTP id k93mr11731539pjb.118.1588793267039; Wed, 06 May 2020 12:27:47 -0700 (PDT) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id i15sm2105511pgj.30.2020.05.06.12.27.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 May 2020 12:27:45 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Wed, 6 May 2020 12:27:27 -0700 Message-Id: <20200506192730.21613-2-stephen@networkplumber.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200506192730.21613-1-stephen@networkplumber.org> References: <20200506192730.21613-1-stephen@networkplumber.org> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH 1/4] net/netvsc: support per-queue info requests X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" There is not a lot of info here from this driver but worth supporting the standard values for number of descriptors and offloads flags. Signed-off-by: Stephen Hemminger --- drivers/net/netvsc/hn_ethdev.c | 2 ++ drivers/net/netvsc/hn_rxtx.c | 20 ++++++++++++++++++++ drivers/net/netvsc/hn_var.h | 2 ++ 3 files changed, 24 insertions(+) diff --git a/drivers/net/netvsc/hn_ethdev.c b/drivers/net/netvsc/hn_ethdev.c index 55b8a63804a9..b890fa3befa8 100644 --- a/drivers/net/netvsc/hn_ethdev.c +++ b/drivers/net/netvsc/hn_ethdev.c @@ -860,6 +860,8 @@ static const struct eth_dev_ops hn_eth_dev_ops = { .dev_stop = hn_dev_stop, .dev_close = hn_dev_close, .dev_infos_get = hn_dev_info_get, + .txq_info_get = hn_dev_tx_queue_info, + .rxq_info_get = hn_dev_rx_queue_info, .dev_supported_ptypes_get = hn_vf_supported_ptypes, .promiscuous_enable = hn_dev_promiscuous_enable, .promiscuous_disable = hn_dev_promiscuous_disable, diff --git a/drivers/net/netvsc/hn_rxtx.c b/drivers/net/netvsc/hn_rxtx.c index 31fae5597598..668f48fcbf15 100644 --- a/drivers/net/netvsc/hn_rxtx.c +++ b/drivers/net/netvsc/hn_rxtx.c @@ -319,6 +319,15 @@ hn_dev_tx_queue_setup(struct rte_eth_dev *dev, return err; } +void +hn_dev_tx_queue_info(struct rte_eth_dev *dev, uint16_t queue_id, + struct rte_eth_txq_info *qinfo) +{ + struct hn_tx_queue *txq = dev->data->tx_queues[queue_id]; + + qinfo->nb_desc = txq->txdesc_pool->size; + qinfo->conf.offloads = dev->data->dev_conf.txmode.offloads; +} static struct hn_txdesc *hn_txd_get(struct hn_tx_queue *txq) { @@ -859,6 +868,17 @@ struct hn_rx_queue *hn_rx_queue_alloc(struct hn_data *hv, return rxq; } +void +hn_dev_rx_queue_info(struct rte_eth_dev *dev, uint16_t queue_id, + struct rte_eth_rxq_info *qinfo) +{ + struct hn_rx_queue *rxq = dev->data->rx_queues[queue_id]; + + qinfo->mp = rxq->mb_pool; + qinfo->nb_desc = rxq->rx_ring->size; + qinfo->conf.offloads = dev->data->dev_conf.rxmode.offloads; +} + int hn_dev_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx, uint16_t nb_desc, diff --git a/drivers/net/netvsc/hn_var.h b/drivers/net/netvsc/hn_var.h index d1d38b459601..93168d2e0102 100644 --- a/drivers/net/netvsc/hn_var.h +++ b/drivers/net/netvsc/hn_var.h @@ -178,6 +178,8 @@ int hn_dev_rx_queue_setup(struct rte_eth_dev *dev, unsigned int socket_id, const struct rte_eth_rxconf *rx_conf, struct rte_mempool *mp); +void hn_dev_rx_queue_info(struct rte_eth_dev *dev, uint16_t queue_id, + struct rte_eth_rxq_info *qinfo); void hn_dev_rx_queue_release(void *arg); void hn_dev_free_queues(struct rte_eth_dev *dev); From patchwork Wed May 6 19:27:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 69860 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 97869A034E; Wed, 6 May 2020 21:28:05 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 1368D1DA45; Wed, 6 May 2020 21:27:53 +0200 (CEST) Received: from mail-pl1-f196.google.com (mail-pl1-f196.google.com [209.85.214.196]) by dpdk.org (Postfix) with ESMTP id E5A7B1D9FC for ; Wed, 6 May 2020 21:27:49 +0200 (CEST) Received: by mail-pl1-f196.google.com with SMTP id s10so941508plr.1 for ; Wed, 06 May 2020 12:27:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=fIZ5vffQKrcqzuRihAS9zQpoBRDYJOS2j2Y1Zo5vZf0=; b=kTmb/AeAlAB1y3uJXNINs0q6dLfVuLP5uSfwVW6dGar1gM+VgcEfuh5yYhqWqfkVPv qgRrdeOtRHMa7KaXW5jljJU5fdXQL/K2uWukT91xBp0d1YRyM1C069NuQPa05dx9nLOS JCQsir0XAX5tKA9C92kkDfgFq/m9k/3nawVFc91L5Ij9oY1dlEaUDiA01Bj2jIihb86g bjW0Rdx5UZv6zAP+/cz+zvq9Ld+fCTe97Oh4f9l1w+Za6N3fMBhEcCRVgV8hh9JcEAHh 4zDOqPS9tEoN1gBEul98hAT/St9qL2gn5xI99d3sc/kgAlNTo2v6LyKTHE9XuJNjQAWm 9LAg== 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:mime-version:content-transfer-encoding; bh=fIZ5vffQKrcqzuRihAS9zQpoBRDYJOS2j2Y1Zo5vZf0=; b=svsz0UOXOEPWUoAfVuhtHe/tqUoJWMeo0hBrZW4h+htF6iObLjdg1RUGmZ2zeziyoQ Ks82yc9jWE4p2rCTDtFjibBZ3woKEIiwQpWJavsx5yDlExpUMMoWixiCGD4cUeM/42pv k8R0ENVZuxxv80CimB6IOq2xyVKvs0W+WubaNFgq0dUV5iRFUivrMTxpq43YCxMpijWC brchb+yJagMANKExOMdjJdYdifv2BFPkQaJL35y0tIzQh0F7QF/ZxQmu2dFRq4lC/0VY vqDvRvuBvoH2jhV/FpmcuAFC0FLGshOvU1CMcMGN7QO2XnfddPpXtt2bySA/KKof6KRO akXQ== X-Gm-Message-State: AGi0PuYX77siIT9EbPTsQs4xoE0lsJLs62A+QZSCdkpJaNejdPbSnmJu lxrtqypyz56n7I3MlmYIoNwEY5D0YAIzIg== X-Google-Smtp-Source: APiQypINnFeqp29MfHVC3ze/12OUdVedlgLYrhKF6jokW03/+79HUHLvmD0GFh1eU0phWVFayFh3vA== X-Received: by 2002:a17:902:8303:: with SMTP id bd3mr9532780plb.217.1588793268465; Wed, 06 May 2020 12:27:48 -0700 (PDT) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id i15sm2105511pgj.30.2020.05.06.12.27.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 May 2020 12:27:47 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Wed, 6 May 2020 12:27:28 -0700 Message-Id: <20200506192730.21613-3-stephen@networkplumber.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200506192730.21613-1-stephen@networkplumber.org> References: <20200506192730.21613-1-stephen@networkplumber.org> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH 2/4] net/netvsc: implement rx/tx descriptor status functions X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" These functions are useful for applications and debugging. The netvsc PMD also transparently handles the rx/tx descriptor functions for underlying VF device. Signed-off-by: Stephen Hemminger --- drivers/net/netvsc/hn_ethdev.c | 3 +++ drivers/net/netvsc/hn_rxtx.c | 39 ++++++++++++++++++++++++++++++++++ drivers/net/netvsc/hn_var.h | 5 +++++ 3 files changed, 47 insertions(+) diff --git a/drivers/net/netvsc/hn_ethdev.c b/drivers/net/netvsc/hn_ethdev.c index b890fa3befa8..675a49e66a57 100644 --- a/drivers/net/netvsc/hn_ethdev.c +++ b/drivers/net/netvsc/hn_ethdev.c @@ -875,8 +875,11 @@ static const struct eth_dev_ops hn_eth_dev_ops = { .tx_queue_setup = hn_dev_tx_queue_setup, .tx_queue_release = hn_dev_tx_queue_release, .tx_done_cleanup = hn_dev_tx_done_cleanup, + .tx_descriptor_status = hn_dev_tx_descriptor_status, .rx_queue_setup = hn_dev_rx_queue_setup, .rx_queue_release = hn_dev_rx_queue_release, + .rx_queue_count = hn_dev_rx_queue_count, + .rx_descriptor_status = hn_dev_rx_queue_status, .link_update = hn_dev_link_update, .stats_get = hn_dev_stats_get, .stats_reset = hn_dev_stats_reset, diff --git a/drivers/net/netvsc/hn_rxtx.c b/drivers/net/netvsc/hn_rxtx.c index 668f48fcbf15..537fd0125687 100644 --- a/drivers/net/netvsc/hn_rxtx.c +++ b/drivers/net/netvsc/hn_rxtx.c @@ -369,6 +369,20 @@ hn_dev_tx_queue_release(void *arg) rte_free(txq); } +int hn_dev_tx_descriptor_status(void *arg, uint16_t offset) +{ + const struct hn_tx_queue *txq = arg; + uint16_t used; + + hn_process_events(txq->hv, txq->queue_id, 0); + + used = rte_mempool_in_use_count(txq->txdesc_pool); + if (offset < used) + return RTE_ETH_TX_DESC_FULL; + else + return RTE_ETH_TX_DESC_DONE; +} + static void hn_nvs_send_completed(struct rte_eth_dev *dev, uint16_t queue_id, unsigned long xactid, const struct hn_nvs_rndis_ack *ack) @@ -966,6 +980,31 @@ hn_dev_rx_queue_release(void *arg) hn_rx_queue_free(rxq, true); } +/* + * Get the number of used descriptor in a rx queue + * For this device that means how many packets are pending in the ring. + */ +uint32_t +hn_dev_rx_queue_count(struct rte_eth_dev *dev, uint16_t queue_id) +{ + struct hn_rx_queue *rxq = dev->data->rx_queues[queue_id]; + + return rte_ring_count(rxq->rx_ring); +} + +int hn_dev_rx_queue_status(void *arg, uint16_t offset) +{ + const struct hn_rx_queue *rxq = arg; + + hn_process_events(rxq->hv, rxq->queue_id, 0); + if (offset >= rxq->rx_ring->capacity) + return -EINVAL; + else if (offset < rte_ring_count(rxq->rx_ring)) + return RTE_ETH_RX_DESC_DONE; + else + return RTE_ETH_RX_DESC_AVAIL; +} + int hn_dev_tx_done_cleanup(void *arg, uint32_t free_cnt) { diff --git a/drivers/net/netvsc/hn_var.h b/drivers/net/netvsc/hn_var.h index 93168d2e0102..ded0d4c60a04 100644 --- a/drivers/net/netvsc/hn_var.h +++ b/drivers/net/netvsc/hn_var.h @@ -169,6 +169,7 @@ void hn_dev_tx_queue_release(void *arg); void hn_dev_tx_queue_info(struct rte_eth_dev *dev, uint16_t queue_idx, struct rte_eth_txq_info *qinfo); int hn_dev_tx_done_cleanup(void *arg, uint32_t free_cnt); +int hn_dev_tx_descriptor_status(void *arg, uint16_t offset); struct hn_rx_queue *hn_rx_queue_alloc(struct hn_data *hv, uint16_t queue_id, @@ -181,6 +182,8 @@ int hn_dev_rx_queue_setup(struct rte_eth_dev *dev, void hn_dev_rx_queue_info(struct rte_eth_dev *dev, uint16_t queue_id, struct rte_eth_rxq_info *qinfo); void hn_dev_rx_queue_release(void *arg); +uint32_t hn_dev_rx_queue_count(struct rte_eth_dev *dev, uint16_t queue_id); +int hn_dev_rx_queue_status(void *rxq, uint16_t offset); void hn_dev_free_queues(struct rte_eth_dev *dev); /* Check if VF is attached */ @@ -231,6 +234,8 @@ int hn_vf_tx_queue_setup(struct rte_eth_dev *dev, unsigned int socket_id, const struct rte_eth_txconf *tx_conf); void hn_vf_tx_queue_release(struct hn_data *hv, uint16_t queue_id); +int hn_vf_tx_queue_status(struct hn_data *hv, uint16_t queue_id, uint16_t offset); + int hn_vf_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx, uint16_t nb_desc, unsigned int socket_id, From patchwork Wed May 6 19:27:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 69861 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 019D4A034E; Wed, 6 May 2020 21:28:13 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 18CD41DA0E; Wed, 6 May 2020 21:27:55 +0200 (CEST) Received: from mail-pf1-f195.google.com (mail-pf1-f195.google.com [209.85.210.195]) by dpdk.org (Postfix) with ESMTP id 714111DA09 for ; Wed, 6 May 2020 21:27:51 +0200 (CEST) Received: by mail-pf1-f195.google.com with SMTP id x77so1545779pfc.0 for ; Wed, 06 May 2020 12:27:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=7zlbwXrKQWiCDsdzyzRp5gH2z/2CUQk+AgTY9p9fgHg=; b=VDYSVGMycpB1fBX55CMdOiq7sH6WgkwiaBIALIAIEYG/C9V1ayNn+Vt8MZNKZ9Fcsc MB5IDD+vlg+NW+Xg4Qhhs50jbE6m+i+imARm0cGNp2Iema8ldhFnIcYslsXNNWUB44e8 OYkxgkIxF/ZBZeHNn3MjqX7CYMVkVJbrAo/1HLSH7Bob5rLVJ/MZA2WCWwJE09on9npq 6COpF6QhTS1lODybgxqR5cqW1EFAif5uFqVB7TrjwVwUSstXTESZ1V0E8lQKqOciV58B 8UV0ThOak7AvJwpLu4uhOKf5XFHbvDd1qOS2/Op1HUXwdVwyR4D69aIvw/J444wgz7IT a5Jw== 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:mime-version:content-transfer-encoding; bh=7zlbwXrKQWiCDsdzyzRp5gH2z/2CUQk+AgTY9p9fgHg=; b=H3ARRUNCZP3CxMSLleQ79OGm1yJqtOUke43//l2vqLrTKZDJKtwH+ClDhgLfiEoW9j Q9YRzEd7YWlAyDvtpixhS8H88MQJH5Ephio4m5cTClntycFC3PhSb3NGNtL16M0A462T 1IHNkiQJblW1fG1WfPVCW6nQtVykWjsOoW75tYkygJmWB0gNL6edXoAe9V9UT9/bixg4 pZ/RkoxxHUt5JPl9OcCjEK0MQOBLDnI6VGaWSkNl/aPcyV4BVKWYkxogCIgTNSiCdBdb qzYTKndf9Bt+GeLwFit673raPgtcQVj71gcHnTXM8HgdqxmpoA1gO/FCt4lCMiU1R/Vo 3qpg== X-Gm-Message-State: AGi0PuaY8jjflV4PL8ckVzw8rv41FZDqCw0w5RdO9/6r8LSqPDCi+2OD EgQxhdsETHD7Kn622KAlprOBGrUMHO9WrQ== X-Google-Smtp-Source: APiQypIHatBBZF9LfQkQc2drB4YJUZaFDGKJot7jCMgeCI7A9ELtBzaRzn7TFEK25Rp6gxEBTnA53Q== X-Received: by 2002:a63:34ce:: with SMTP id b197mr8310568pga.436.1588793269974; Wed, 06 May 2020 12:27:49 -0700 (PDT) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id i15sm2105511pgj.30.2020.05.06.12.27.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 May 2020 12:27:48 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Wed, 6 May 2020 12:27:29 -0700 Message-Id: <20200506192730.21613-4-stephen@networkplumber.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200506192730.21613-1-stephen@networkplumber.org> References: <20200506192730.21613-1-stephen@networkplumber.org> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH 3/4] net/netvsc: change tx/rx error handling X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" The PMD_TX_LOG and PMD_RX_LOG can hide errors since the debug log is typically disabled. Change the code to use PMD_DRV_LOG for errors. Under load, the ring buffer to the host can fill. Add some statistics to estimate the impact and see other errors. --- drivers/net/netvsc/hn_ethdev.c | 1 + drivers/net/netvsc/hn_rxtx.c | 29 ++++++++++++++++++++--------- drivers/net/netvsc/hn_var.h | 1 + 3 files changed, 22 insertions(+), 9 deletions(-) diff --git a/drivers/net/netvsc/hn_ethdev.c b/drivers/net/netvsc/hn_ethdev.c index 675a49e66a57..0f4827c54be4 100644 --- a/drivers/net/netvsc/hn_ethdev.c +++ b/drivers/net/netvsc/hn_ethdev.c @@ -58,6 +58,7 @@ static const struct hn_xstats_name_off hn_stat_strings[] = { { "good_bytes", offsetof(struct hn_stats, bytes) }, { "errors", offsetof(struct hn_stats, errors) }, { "ring full", offsetof(struct hn_stats, ring_full) }, + { "channel full", offsetof(struct hn_stats, channel_full) }, { "multicast_packets", offsetof(struct hn_stats, multicast) }, { "broadcast_packets", offsetof(struct hn_stats, broadcast) }, { "undersize_packets", offsetof(struct hn_stats, size_bins[0]) }, diff --git a/drivers/net/netvsc/hn_rxtx.c b/drivers/net/netvsc/hn_rxtx.c index 537fd0125687..fa53c7becc12 100644 --- a/drivers/net/netvsc/hn_rxtx.c +++ b/drivers/net/netvsc/hn_rxtx.c @@ -403,8 +403,8 @@ hn_nvs_send_completed(struct rte_eth_dev *dev, uint16_t queue_id, txq->stats.bytes += txd->data_size; txq->stats.packets += txd->packets; } else { - PMD_TX_LOG(NOTICE, "port %u:%u complete tx %u failed status %u", - txq->port_id, txq->queue_id, txd->chim_index, ack->status); + PMD_DRV_LOG(NOTICE, "port %u:%u complete tx %u failed status %u", + txq->port_id, txq->queue_id, txd->chim_index, ack->status); ++txq->stats.errors; } @@ -429,8 +429,7 @@ hn_nvs_handle_comp(struct rte_eth_dev *dev, uint16_t queue_id, break; default: - PMD_TX_LOG(NOTICE, - "unexpected send completion type %u", + PMD_DRV_LOG(NOTICE, "unexpected send completion type %u", hdr->type); } } @@ -648,6 +647,7 @@ static void hn_rxpkt(struct hn_rx_queue *rxq, struct hn_rx_bufinfo *rxb, if (unlikely(rte_ring_sp_enqueue(rxq->rx_ring, m) != 0)) { ++rxq->stats.ring_full; + PMD_RX_LOG(DEBUG, "rx ring full"); rte_pktmbuf_free(m); } } @@ -1156,10 +1156,16 @@ static int hn_flush_txagg(struct hn_tx_queue *txq, bool *need_sig) if (likely(ret == 0)) hn_reset_txagg(txq); - else - PMD_TX_LOG(NOTICE, "port %u:%u send failed: %d", - txq->port_id, txq->queue_id, ret); + else if (ret == -EAGAIN) { + PMD_TX_LOG(DEBUG, "port %u:%u channel full", + txq->port_id, txq->queue_id); + ++txq->stats.channel_full; + } else { + ++txq->stats.errors; + PMD_DRV_LOG(NOTICE, "port %u:%u send failed: %d", + txq->port_id, txq->queue_id, ret); + } return ret; } @@ -1505,8 +1511,13 @@ hn_xmit_pkts(void *ptxq, struct rte_mbuf **tx_pkts, uint16_t nb_pkts) ret = hn_xmit_sg(txq, txd, m, &need_sig); if (unlikely(ret != 0)) { - PMD_TX_LOG(NOTICE, "sg send failed: %d", ret); - ++txq->stats.errors; + if (ret == -EAGAIN) { + PMD_TX_LOG(DEBUG, "sg channel full"); + ++txq->stats.channel_full; + } else { + PMD_DRV_LOG(NOTICE, "sg send failed: %d", ret); + ++txq->stats.errors; + } hn_txd_put(txq, txd); goto fail; } diff --git a/drivers/net/netvsc/hn_var.h b/drivers/net/netvsc/hn_var.h index ded0d4c60a04..20363389a0d6 100644 --- a/drivers/net/netvsc/hn_var.h +++ b/drivers/net/netvsc/hn_var.h @@ -40,6 +40,7 @@ struct hn_stats { uint64_t bytes; uint64_t errors; uint64_t ring_full; + uint64_t channel_full; uint64_t multicast; uint64_t broadcast; /* Size bins in array as RFC 2819, undersized [0], 64 [1], etc */ From patchwork Wed May 6 19:27:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 69862 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 39E75A034E; Wed, 6 May 2020 21:28:21 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 484731DA78; Wed, 6 May 2020 21:27:56 +0200 (CEST) Received: from mail-pg1-f193.google.com (mail-pg1-f193.google.com [209.85.215.193]) by dpdk.org (Postfix) with ESMTP id EA52F1DA29 for ; Wed, 6 May 2020 21:27:52 +0200 (CEST) Received: by mail-pg1-f193.google.com with SMTP id o18so1256025pgg.8 for ; Wed, 06 May 2020 12:27:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=TMjZAc7ZtbQCLRZe8Dgo+fJUCe6Jtnp/x2gI+KHy//8=; b=dUmAYQQ7E39QjXHyk60r2Bnm5k2kI69A9YP5N+FuEif8TysRTmzmYyl2aigalCO6pH Zex3ORjBYDhIN82x6ylnKp4rt3pRO7KlpK1MCvGToBCxlDX5LjT/0+GevkA9PpeBgFqD 3hAvEcypxBnovuC3Qc3ZRBG3brvEm7FVAKDsDpAMbmSulTRveDIo3wzsf9MtLqfP8VMY 5ziTsa7UZS/WXx/QrZztud4K35IyOvKMMW+cZWcNXK6/I0Dy3CTu/YeEn5AJ7JNbpjo8 WjMrnYAojx7AequbkE0elbLgmYhxGyQ/XSVJ27eJPjAXWifbpZsYKgRi7RREoPrzq9Hy 54rQ== 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:mime-version:content-transfer-encoding; bh=TMjZAc7ZtbQCLRZe8Dgo+fJUCe6Jtnp/x2gI+KHy//8=; b=C0lrmeNhy3yNhTlloC0pK2Pr3+rl1Q/H3pPk7eJrw9Hg05hhZoR7aWzvEcwYz9pyZf qhnxdYWkek6s/Xppg9UyN1F2xzG6psxFCBZxx8QWQELHPL4lcVTYm5acZxG6ZVpBc+EM NHaoieWaPm6QlLvIgIndK8q9YVKXT1XjNX7iisaRjOHCl+gvGlAPvdrieaUxFLMPuuvL hjR6vY6WHcSbe+SA1lHKn2Dmj37ASPASuKVNxCFD6G+bbnke+yGM8NOLdW8H8sVfuG0H u6bDlEDtcBTUuaP9Ctl9zFMsBCu3f2PFhmzAANpimx/1Jsv8YC8yewk2Qgic0D3u2o9o Cw/g== X-Gm-Message-State: AGi0Puatli7ueF99aRMhNPpIAxhTGNqHJqwb04gfP7NzECQo0Q85qD9N nwyG03uqqjpikZNzJRGfCdJ3mhYzmqQkUA== X-Google-Smtp-Source: APiQypKvCAjo1EtyTE6E3rnPBAzlaqIs0lTtria/h5LNNv0j5wW/TFvuUurWXi/tb3CVXNK9W6jgxg== X-Received: by 2002:a63:745:: with SMTP id 66mr8169735pgh.337.1588793271543; Wed, 06 May 2020 12:27:51 -0700 (PDT) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id i15sm2105511pgj.30.2020.05.06.12.27.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 May 2020 12:27:50 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Wed, 6 May 2020 12:27:30 -0700 Message-Id: <20200506192730.21613-5-stephen@networkplumber.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200506192730.21613-1-stephen@networkplumber.org> References: <20200506192730.21613-1-stephen@networkplumber.org> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH 4/4] bus/vmbus: improve debug output X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Make debug output more compact. Don't print pending size or interrupt mask for the transmit side (not applicable). Signed-off-by: Stephen Hemminger --- drivers/bus/vmbus/vmbus_channel.c | 42 +++++++++++++++++++------------ 1 file changed, 26 insertions(+), 16 deletions(-) diff --git a/drivers/bus/vmbus/vmbus_channel.c b/drivers/bus/vmbus/vmbus_channel.c index ff2985c25758..5df7deadd3f1 100644 --- a/drivers/bus/vmbus/vmbus_channel.c +++ b/drivers/bus/vmbus/vmbus_channel.c @@ -421,26 +421,36 @@ void rte_vmbus_chan_close(struct vmbus_channel *chan) static void vmbus_dump_ring(FILE *f, const char *id, const struct vmbus_br *br) { const struct vmbus_bufring *vbr = br->vbr; - struct vmbus_chanpkt_hdr pkt; - fprintf(f, "%s windex=%u rindex=%u mask=%u pending=%u feature=%#x\n", - id, vbr->windex, vbr->rindex, vbr->imask, - vbr->pending_send, vbr->feature_bits.value); - fprintf(f, " size=%u avail write=%u read=%u\n", - br->dsize, vmbus_br_availwrite(br, vbr->windex), + fprintf(f, "%s index=%u/%u avail=%u/%u\n", + id, vbr->windex, vbr->rindex, + vmbus_br_availwrite(br, vbr->windex), vmbus_br_availread(br)); - - if (vmbus_rxbr_peek(br, &pkt, sizeof(pkt)) == 0) - fprintf(f, " pkt type %#x len %u flags %#x xactid %#"PRIx64"\n", - pkt.type, - pkt.tlen << VMBUS_CHANPKT_SIZE_SHIFT, - pkt.flags, pkt.xactid); } void rte_vmbus_chan_dump(FILE *f, const struct vmbus_channel *chan) { - fprintf(f, "channel[%u] relid=%u monitor=%u\n", - chan->subchannel_id, chan->relid, chan->monitor_id); - vmbus_dump_ring(f, "rxbr", &chan->rxbr); - vmbus_dump_ring(f, "txbr", &chan->txbr); + const struct vmbus_br *rbr = &chan->rxbr; + const struct vmbus_bufring *vbr = rbr->vbr; + struct vmbus_chanpkt_hdr pkt; + + fprintf(f, "chan %u: relid=%u mask=%u", + chan->subchannel_id, chan->relid, vbr->imask); + + if (vbr->feature_bits.feat_pending_send_sz) + fprintf(f, " pending_sz=%u\n", + vbr->pending_send); + else + fprintf(f, "\n"); + + vmbus_dump_ring(f, " tx", &chan->txbr); + vmbus_dump_ring(f, " rx", rbr); + + /* show first packet if any from host */ + if (vmbus_rxbr_peek(rbr, &pkt, sizeof(pkt))) + return; + + fprintf(f, "[pkt type %#x len %u flags %#x xactid %#"PRIx64"]\n", + pkt.type, pkt.tlen << VMBUS_CHANPKT_SIZE_SHIFT, + pkt.flags, pkt.xactid); }