From patchwork Wed May 6 19:52:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 69872 X-Patchwork-Delegate: ferruh.yigit@amd.com 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 54599A034E; Wed, 6 May 2020 21:52:39 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id AC7431DADC; Wed, 6 May 2020 21:52:33 +0200 (CEST) Received: from mail-pg1-f195.google.com (mail-pg1-f195.google.com [209.85.215.195]) by dpdk.org (Postfix) with ESMTP id 160631DABE for ; Wed, 6 May 2020 21:52:32 +0200 (CEST) Received: by mail-pg1-f195.google.com with SMTP id t11so1621377pgg.2 for ; Wed, 06 May 2020 12:52:32 -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=Vc4xuG/PZ4zRCNQVj6ULrtMt+HpfQZytQ0xROP/ptPk=; b=TlhWdhC8/5RKko9NPUyvaTGaVF5HmyfeqibdZYUJxmxXgsLyFoChBh0j3Tb3cvEGn3 FCUBr8phfZCpTkh0xbGJXat83oxgTogHGzsZHAz50BaACQM+eT5lfnSUpsaadcsBmkI5 k5BejtlEb+M+Zmb7Yr0mW0QrbggMAa9xhYZSDFia8fwQAu/29o/NMhME9jbDtLvhO2Qa aTnQsxH2TwV7Nibg1dHArwGc8NEgNRN6N/JwNfGk2BRW/z1PucGe6xj7vGhvH9dMKZPE wPIBPf2BniseQtxfQsV+cUjceBvwCfqRrp73C0Fynb/Ka5GTTcLh2HEs+0CYI7rEVw4x ADvA== 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=Vc4xuG/PZ4zRCNQVj6ULrtMt+HpfQZytQ0xROP/ptPk=; b=SDrq0nRjoKXrySkGNDEPWBBD4iU0VpSrmu1qk2NsObGvQoMnvSp4+h498HEdvKc/a1 7s/blklNXzlttxHyJUgA0KHzsx2nfCpQBLwjG0t2q90tMRSOwrxUgZngmqixWnE5bNll eC+GSmNX3LAw3kDFPmsdCU4ZjY+MZ5Psn1j9YJmNCoHB5GNQTePjopeF46xMRd1GPvnb SeH7jFlewI5rvvD3t4B6JlZJW8qP4HGtwjN7Qd152rjYgPA183yUXOoGal7rEoS3IEiw y6WQ5LQnb9BaemxH6GoWoova4Ry3vOwMsPty9oyVISalvKsvv/eU14I9Ipp/b74exGFb W/Wg== X-Gm-Message-State: AGi0PubLpkyU8U+R4ClkdmlL75DQdPT38ojbbqbHyxAUouDkFKsN+PzV HcWzFXnuNu3wcgbCTUN7QWQU2b6SZCrajA== X-Google-Smtp-Source: APiQypIHQ8Uj1z6YZV8Wveg/ctvXElqvdQ2MwB4hNkQZDCV3DCJ1VyVsBVWCS5h7vEk8gOYNBZ1uSw== X-Received: by 2002:a62:6443:: with SMTP id y64mr9836349pfb.13.1588794750800; Wed, 06 May 2020 12:52:30 -0700 (PDT) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id w69sm2655604pff.168.2020.05.06.12.52.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 May 2020 12:52:29 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Wed, 6 May 2020 12:52:18 -0700 Message-Id: <20200506195221.26306-2-stephen@networkplumber.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200506195221.26306-1-stephen@networkplumber.org> References: <20200506192730.21613-1-stephen@networkplumber.org> <20200506195221.26306-1-stephen@networkplumber.org> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v2 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 these additional info queries. 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:52:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 69873 X-Patchwork-Delegate: ferruh.yigit@amd.com 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 17213A034E; Wed, 6 May 2020 21:52:47 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 08B311DAE4; Wed, 6 May 2020 21:52:36 +0200 (CEST) Received: from mail-pf1-f196.google.com (mail-pf1-f196.google.com [209.85.210.196]) by dpdk.org (Postfix) with ESMTP id 0D39D1DAE0 for ; Wed, 6 May 2020 21:52:33 +0200 (CEST) Received: by mail-pf1-f196.google.com with SMTP id y25so1589076pfn.5 for ; Wed, 06 May 2020 12:52:33 -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=WEMsiaPg/REhp1C6XOhQeXd2WKmnHOeO5EL4sxqueFaZpqojiBRXamyCNjlVwnrRwf phQygjXGjN4wiYIZKuqP1Iqx51Q2VRuoAtyDD8BIpYO94qzoENGElr76AjQgKy0CXCCT eyWOxhnIy6/ndpa9m87SucBMvDESMtAd+aM04eNy8Co6sDOqw1x88jmND7b/949KJx51 7Bzb4tdX7bOQvL39WS771onyVB/ji/kOnEpr7FmwHYG5EKaPfUmkLo0azhzyWO6DjfNT GCbks0nmBiAW/E0CLMjpHC/uy6Ki1wRPRqNFlo7ZlhI4J9FAgkcDnBSyXW81FSsillT5 BipA== 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=Wko4VM0OhzY4F2au2P3Hvad9mMMfuBCSD2uTUmlYcG9O4jWu3/b3NgYWkYF0/BQPoD VR8/2VhKnLuIvtnSSBMfcr2kRfyYDadV74B2XzOxEGXGhoKyvctxcrJ+I+THR+RCzej/ Dtt3wxY5JmM0FZ29JHSFHuaajUrydxAQGQfByxeqq59AWrfjJ+2sYGIdEoIbket5/UU/ IOWsIJ855P0x7ICilvurvxm714xnubDuOhBdj4X9a82Iij1vkcLxTKw/DcUKWEu2cM9E zqNJfd51RSCVNZlekZnBP6bukpmeLU7qLiSRzPdN2TB/QMtcASJHOaO137G8/CPZRMf6 vsCw== X-Gm-Message-State: AGi0PuakyP80WozHDE3ULHZdC2QMMQqJQTpzh8PBL7gdYFYVcdb1qDDf JAA9E35I4hDqyVFdY5CVyjmB1kx4OA23Jw== X-Google-Smtp-Source: APiQypL20UoTKyKTgWkVkQo656zEaOPZFo76AmXogDhQiWEleFW5en5Ic61zGgx/fNKTLk4F07EHDg== X-Received: by 2002:a63:6546:: with SMTP id z67mr8275326pgb.10.1588794752632; Wed, 06 May 2020 12:52:32 -0700 (PDT) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id w69sm2655604pff.168.2020.05.06.12.52.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 May 2020 12:52:31 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Wed, 6 May 2020 12:52:19 -0700 Message-Id: <20200506195221.26306-3-stephen@networkplumber.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200506195221.26306-1-stephen@networkplumber.org> References: <20200506192730.21613-1-stephen@networkplumber.org> <20200506195221.26306-1-stephen@networkplumber.org> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v2 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:52:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 69874 X-Patchwork-Delegate: ferruh.yigit@amd.com 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 6EA5BA034E; Wed, 6 May 2020 21:52:54 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 57D801DAED; Wed, 6 May 2020 21:52:37 +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 797371DAE3 for ; Wed, 6 May 2020 21:52:35 +0200 (CEST) Received: by mail-pj1-f67.google.com with SMTP id a5so1450576pjh.2 for ; Wed, 06 May 2020 12:52:35 -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=hQjmC4PTmOfcnNpr9QsC2/u/M5OFUoqgBcNnT9V9sEI=; b=lPbeA0ID/ENN5xFy3mmOsycuLKrdobM4HNZo1p3dCcffJtcWsQ7ZmADxqPpRZYe90W lCmSQhHw1+eSYI131O99vbXGtUDH6Gw4orU6rBoELM81QwsDtCFH1Mp683e7Sn0jS+gI E1eTs2CBHzEYvhSuy3OgwwS5OzObh902shhNBEroBtgHAskhYlFJuykeedw/MjDDdVhs 3ezsXYrX3Qx6C+SN6QMSsPOrmoeQhD9c/V1WxuxCdV7BGYBbiE2VuuHi3hlFU7jMHmwb LfgKzyZA52sTXR2CI/2PTVVORjTnQ/5/OqVaL16da/i9ZW+nzs6s/USYFTnO/fsHqE4/ Radw== 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=hQjmC4PTmOfcnNpr9QsC2/u/M5OFUoqgBcNnT9V9sEI=; b=PyhPXzlxujokxao2wdYdl7VO4iiki3XeFeBGmwpnO+PZ6n+t9R4BVhUGbJzMdD2zze HlqJkDze32sRD57ML/jIUvyJp8kkNStjk/vO/1E2xB0tjp5R7Uq49gcBOMye4G3Q1Zj7 wXJm8fhPWMN26xMoryGU4MWGSjdZHLHnSFg9Fc88l1xlGDjIRtNxaCnlxv0CQQwEzFE8 SqVMYlDRgUW07d+jrQw1F2hokmh4u7pC4zUPbnShi2uzNza1jR+kln+ZjWH9lBB6meAW b+l1ICqlpNBQdLn8OlPLLaz+mPCs8KFHwgdCSX1jGHWNv1B8CwYbmkKdqGw8nmg/VJWM Pfgw== X-Gm-Message-State: AGi0PuarQ/ObARyG0AWHyf3evhmqBEC2xAPE5sO62nClWxrcjyNUkZn8 mVSYSs9LqAYQ7lXCfwTif+timi6h5q5Wfw== X-Google-Smtp-Source: APiQypKfMMHE5mUeT98aNHWXqMIaHtZlpngBUf2Q2kUuPfgvaOe647gIhRA7mfukZ+PO99rIkGvOTw== X-Received: by 2002:a17:90b:4d10:: with SMTP id mw16mr10650364pjb.19.1588794754057; Wed, 06 May 2020 12:52:34 -0700 (PDT) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id w69sm2655604pff.168.2020.05.06.12.52.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 May 2020 12:52:33 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Wed, 6 May 2020 12:52:20 -0700 Message-Id: <20200506195221.26306-4-stephen@networkplumber.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200506195221.26306-1-stephen@networkplumber.org> References: <20200506192730.21613-1-stephen@networkplumber.org> <20200506195221.26306-1-stephen@networkplumber.org> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v2 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. Signed-off-by: Stephen Hemminger --- 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:52:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 69875 X-Patchwork-Delegate: ferruh.yigit@amd.com 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 81CD4A034E; Wed, 6 May 2020 21:53:01 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 935741DAF3; Wed, 6 May 2020 21:52:38 +0200 (CEST) Received: from mail-pl1-f195.google.com (mail-pl1-f195.google.com [209.85.214.195]) by dpdk.org (Postfix) with ESMTP id EB5611DAEA for ; Wed, 6 May 2020 21:52:36 +0200 (CEST) Received: by mail-pl1-f195.google.com with SMTP id s20so976453plp.6 for ; Wed, 06 May 2020 12:52:36 -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=cZ22W8WhYRTEcpUf5PX0PktaXMnRsrUQxbfjcyxH1UX6ODYuJlKnzQM8+EOfG5y1ni HQF0l86Ts+7s4byHk6U8Xsr6KEUKVVR2+o28wrhGsjCBM8EEjsqad2DZtrlom7DEV2w/ h87bKhvgNjh2+wdn4ekivmDzb5XD1AX4zmndUpbSt6pwpMSZ346hpvCRS0XimPHFqupP x8XDduGWLP8F3TDAaPQlWlYov4fOkJhvQa+oNAo8AVCFTRwf8h2yJ6tYz40OUjmXk8Gn yx1v6CJ/34+7nkWsjkyGds8lNfmZlWJo0KmOnwEpIlP3RT9SvivX6GH0CHeUbbkVBDXW tzCA== 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=b6PUGdL5/Jqo93KGhGS9JHp3QMv1RmVg3/s3yXcbHwR5ePt3ndwD29/7XGhAbRgJFW quD5PIQst/rHJrV6o530bDycCeTBQoMjQd8LBxXH/b3oiPqCMGfohIO89VJkVbQOnU4T YCb5O3Ol3tLD5tWGQpCQ3LLRbydRnE2SzotMOm/ZTnVo7rMvVHDGg0lGAxwBM7IAJ+xh CaYdgr5OPu1psWKn5+sPp+4tfh5t8HTSkLhnZoOK/lk1rWEH7+k0twmnQAAroy3kNQvA XLtMLy0x+BznPOmJQlnOlkKjyfIpT5bbla9CHSyhm5MaSeArx5iBsqyzcvdTu4qKo7GK 97xA== X-Gm-Message-State: AGi0PuZmMzHGlaF79NiNLGYU2xRWi7jP0YSGiYT83bOgKenZ5ONCD/fq 5AgfSDP1AzXaELAwaimpA4se80/q9hewYA== X-Google-Smtp-Source: APiQypK5vrBe45k32bRCLpvvcPhgZhGykBH8r7wMiM8JxTnMCeoy/kmIDZzx2TRx10AE58DCHdu/0g== X-Received: by 2002:a17:90b:4d09:: with SMTP id mw9mr11484778pjb.55.1588794755647; Wed, 06 May 2020 12:52:35 -0700 (PDT) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id w69sm2655604pff.168.2020.05.06.12.52.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 May 2020 12:52:34 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Wed, 6 May 2020 12:52:21 -0700 Message-Id: <20200506195221.26306-5-stephen@networkplumber.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200506195221.26306-1-stephen@networkplumber.org> References: <20200506192730.21613-1-stephen@networkplumber.org> <20200506195221.26306-1-stephen@networkplumber.org> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v2 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); }