From patchwork Tue Dec 29 20:08:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 85880 X-Patchwork-Delegate: thomas@monjalon.net 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 D09FCA09FF; Tue, 29 Dec 2020 21:09:37 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 91AA12BB8; Tue, 29 Dec 2020 21:09:20 +0100 (CET) Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) by dpdk.org (Postfix) with ESMTP id 9014C2B8E for ; Tue, 29 Dec 2020 21:09:18 +0100 (CET) Received: by mail-pl1-f171.google.com with SMTP id be12so7630812plb.4 for ; Tue, 29 Dec 2020 12:09:18 -0800 (PST) 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=+wz0cuFsr/Sdgpfo0HmuQYmPhRYvVLn8AMgzq82kvaM=; b=kIyf/NTMwBt0o5pcc2nA033OFonxvYKcmVypMZgTt/wyiqZ+m9jai++/OpaAxjmNpX r8EeA1tx5Es07HMMHRDqeTHyZ20ogEQpcSgKySyabrJbFatk5mM4RzqN/kXSWgeSc0TZ NI2e3P5UsXdCROpRp6HtJiljGpp44IWL2emjw7MRv80hlBzkhuHNDwweBI0SDqaJdiJn F6NbUCjsmouDQbsmxfA/l2Rk8M3DuaixoerCLrNmI8I8ohIhRT18dszEPTrrIEmgkRyq MbukCNn/DCKrS4hTODObhG2NXlK4keynRDjeBIULZsXcLLltrcNcFdgXPSp5LSi4gDND 2dpw== 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=+wz0cuFsr/Sdgpfo0HmuQYmPhRYvVLn8AMgzq82kvaM=; b=MCSHo9S8JCrHcH4Ek9FNvBsynTsrFLEIDfCaHVY3784R1DK5FoiL+6zB7M39S+toZ1 bpK3QR047n2yYCkwtapNhd6eimqbpjSsJa8trRDyXx1NIWQ583pMwrWHZCEl9AdRHnD/ Lk2D2VaxrNIa3JtMk685v6hlw6VBrpzx4OfdBSTT/6LTpWHJyGQzODCUop0AONqeU4ay G0o+okMqEe3gRd77Y68s/wClGu52+6WT5vxAvjZM19rJcCzi3+gH+wJtnS6noW06QyXd 676WlLW1/QamC936O12QIyKCA+NE/YEbdZKo/BhRK0rKwuX5lPTcTlbN9vJG0QOSr0ss xTOw== X-Gm-Message-State: AOAM532I4Na1D3zZ24e4PAutwC9asUKgaZ+Z64Z6I+znX/0udjyvkxTJ +mWbDQWEcf748vkOqGAc/AAhWsjB/n5IRQ== X-Google-Smtp-Source: ABdhPJzDQ5gWlLe3arP9XExM7lhFg//68ixJJaWNgVrOu/nMKTv+jIQ4XzUeuz7MuvCt4GS9Z3jJwA== X-Received: by 2002:a17:90a:a781:: with SMTP id f1mr5423056pjq.111.1609272556444; Tue, 29 Dec 2020 12:09:16 -0800 (PST) Received: from hermes.local (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id r14sm37763237pgi.27.2020.12.29.12.09.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Dec 2020 12:09:15 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Tue, 29 Dec 2020 12:08:59 -0800 Message-Id: <20201229200901.101171-2-stephen@networkplumber.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201229200901.101171-1-stephen@networkplumber.org> References: <20201227033335.85145-1-stephen@networkplumber.org> <20201229200901.101171-1-stephen@networkplumber.org> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v2 1/3] pdump: use rte_pktmbuf_free bulk 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" Use rte_pktmbuf_free_bulk instead of loop when freeing packets. Signed-off-by: Stephen Hemminger --- app/pdump/main.c | 8 ++++---- lib/librte_pdump/rte_pdump.c | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/pdump/main.c b/app/pdump/main.c index b34bf335317b..63bbe65cd843 100644 --- a/app/pdump/main.c +++ b/app/pdump/main.c @@ -477,10 +477,10 @@ pdump_rxtx(struct rte_ring *ring, uint16_t vdev_id, struct pdump_stats *stats) stats->tx_pkts += nb_in_txd; if (unlikely(nb_in_txd < nb_in_deq)) { - do { - rte_pktmbuf_free(rxtx_bufs[nb_in_txd]); - stats->freed_pkts++; - } while (++nb_in_txd < nb_in_deq); + unsigned int drops = nb_in_deq - nb_in_txd; + + rte_pktmbuf_free_bulk(&rxtx_bufs[nb_in_txd], drops); + stats->freed_pkts += drops; } } } diff --git a/lib/librte_pdump/rte_pdump.c b/lib/librte_pdump/rte_pdump.c index b3c8d5ce4384..3c11bd795bc1 100644 --- a/lib/librte_pdump/rte_pdump.c +++ b/lib/librte_pdump/rte_pdump.c @@ -93,11 +93,11 @@ pdump_copy(struct rte_mbuf **pkts, uint16_t nb_pkts, void *user_params) ring_enq = rte_ring_enqueue_burst(ring, (void *)dup_bufs, d_pkts, NULL); if (unlikely(ring_enq < d_pkts)) { + unsigned int drops = d_pkts - ring_enq; + PDUMP_LOG(DEBUG, "only %d of packets enqueued to ring\n", ring_enq); - do { - rte_pktmbuf_free(dup_bufs[ring_enq]); - } while (++ring_enq < d_pkts); + rte_pktmbuf_free_bulk(&dup_bufs[ring_enq], drops); } } From patchwork Tue Dec 29 20:09:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 85881 X-Patchwork-Delegate: thomas@monjalon.net 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 90C4AA09FF; Tue, 29 Dec 2020 21:09:50 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 48D5C2C27; Tue, 29 Dec 2020 21:09:22 +0100 (CET) Received: from mail-pf1-f175.google.com (mail-pf1-f175.google.com [209.85.210.175]) by dpdk.org (Postfix) with ESMTP id 2C4F42BFF for ; Tue, 29 Dec 2020 21:09:20 +0100 (CET) Received: by mail-pf1-f175.google.com with SMTP id f9so8500272pfc.11 for ; Tue, 29 Dec 2020 12:09:20 -0800 (PST) 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=aV9yUoo0rzdjLklqNlJXwTDcg3UKnX6zWGOlL5llG90=; b=DBK/fDb/RFaci8KKaMGeT7VjM+S+NV3CjDNF8VSMlaXFPFQn74Imi1tp2VPCfRo1fC hsKsmSJDEEbsOX39NHhkLXvymvP5+fMy6TAN0W3RGzx2luPtiSztL2ri/2R3IzYgQxGn ooCrMBcIlOZtau9c4nIrOyJqZBG+XRJxkCoXS8J21ourortzDHY5hX5RO0IvHviVNWlq zpEfkwnZ+aNmlqMQ9ljSuyVscvANRbLqhtEJWQj+GkOJdVxSYAIpovuVIUGlGuh+kGcC gYy3etiudh2ttsmVuW+zP0r+D5IE5pupZS+KIRc2qiBjawrUmQX1AacQmbi40ngOeEtK oq3w== 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=aV9yUoo0rzdjLklqNlJXwTDcg3UKnX6zWGOlL5llG90=; b=LoM0PmzV4ZO231QRBAQVxiUjVdlqXTukDVe24bsSpChiO4ogto6ZygXMJqPr64X3v9 v1bmVSntiZ711j2lhGgrHnRyMrqwE/HHf3vbwfmANgaqwdrAx9QB19rYL+c9uKUMGJV8 XKDdHR579cVKaXL9ufyK2HAMe2dKbAfSa+kkEL5T19WGFL/r+xeYGIvXw1C5viD5weXx Ob43mFPAQiWKE31cpHsJmDqFozhAO01LCLVfc1JPsQ/iugj9ZZdVz5N+yyKlmZ+EU6FX BYHzjhKrS0B5a2nUIybVDvS5tFuvSVZKp1S+MB4/spfBY5pkOBtgpKawmdmfCnzK7t/J FKlQ== X-Gm-Message-State: AOAM533gTMVkNSvh566vra05b1yUHOHZrOwnuJTazACyiJW34qDqFIY+ j3500GvmCXnEbIGEeULN/VFqBQS4BupdSQ== X-Google-Smtp-Source: ABdhPJyd0pyyTgOoASDuOoXn5Hq9nc/on0JRHSx7skAaeOB8fO/u9jKLKylBUWwRpmmitwAddeDSgg== X-Received: by 2002:a62:97:0:b029:1ab:93bf:43a1 with SMTP id 145-20020a6200970000b02901ab93bf43a1mr43770178pfa.75.1609272557849; Tue, 29 Dec 2020 12:09:17 -0800 (PST) Received: from hermes.local (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id r14sm37763237pgi.27.2020.12.29.12.09.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Dec 2020 12:09:16 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Tue, 29 Dec 2020 12:09:00 -0800 Message-Id: <20201229200901.101171-3-stephen@networkplumber.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201229200901.101171-1-stephen@networkplumber.org> References: <20201227033335.85145-1-stephen@networkplumber.org> <20201229200901.101171-1-stephen@networkplumber.org> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v2 2/3] pdump: replace DEVICE_ID_SIZE with RTE_DEV_NAME_MAX_LEN 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 device string has an existing size in rte_dev.h use that instead of defining our own. Signed-off-by: Stephen Hemminger --- lib/librte_pdump/rte_pdump.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/lib/librte_pdump/rte_pdump.c b/lib/librte_pdump/rte_pdump.c index 3c11bd795bc1..14a392ef0340 100644 --- a/lib/librte_pdump/rte_pdump.c +++ b/lib/librte_pdump/rte_pdump.c @@ -12,8 +12,6 @@ #include "rte_pdump.h" -#define DEVICE_ID_SIZE 64 - RTE_LOG_REGISTER(pdump_logtype, lib.pdump, NOTICE); /* Macro for printing using RTE_LOG */ @@ -39,14 +37,14 @@ struct pdump_request { uint32_t flags; union pdump_data { struct enable_v1 { - char device[DEVICE_ID_SIZE]; + char device[RTE_DEV_NAME_MAX_LEN]; uint16_t queue; struct rte_ring *ring; struct rte_mempool *mp; void *filter; } en_v1; struct disable_v1 { - char device[DEVICE_ID_SIZE]; + char device[RTE_DEV_NAME_MAX_LEN]; uint16_t queue; struct rte_ring *ring; struct rte_mempool *mp; @@ -485,9 +483,8 @@ rte_pdump_enable(uint16_t port, uint16_t queue, uint32_t flags, struct rte_mempool *mp, void *filter) { - - int ret = 0; - char name[DEVICE_ID_SIZE]; + int ret; + char name[RTE_DEV_NAME_MAX_LEN]; ret = pdump_validate_port(port, name); if (ret < 0) @@ -531,7 +528,7 @@ int rte_pdump_disable(uint16_t port, uint16_t queue, uint32_t flags) { int ret = 0; - char name[DEVICE_ID_SIZE]; + char name[RTE_DEV_NAME_MAX_LEN]; ret = pdump_validate_port(port, name); if (ret < 0) From patchwork Tue Dec 29 20:09:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 85882 X-Patchwork-Delegate: thomas@monjalon.net 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 439BBA09FF; Tue, 29 Dec 2020 21:10:11 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 9DEBCC9BC; Tue, 29 Dec 2020 21:09:24 +0100 (CET) Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.177]) by dpdk.org (Postfix) with ESMTP id 8607F2C1A for ; Tue, 29 Dec 2020 21:09:21 +0100 (CET) Received: by mail-pf1-f177.google.com with SMTP id c12so8501403pfo.10 for ; Tue, 29 Dec 2020 12:09:21 -0800 (PST) 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=x1ucAhzfqyeOFzDRefK0/VouBO/zsB4AICcG2eyiNLw=; b=dGxuJDiVnGQw37qHiWcmtwhPRxJFFimTECDfoiqoXHK4Iwk63cqQ89LaHp/15S3UnZ tW/r3t259WFh4gY7buAIFqK2N/X9J6LppQHJOcSIcdYauz4hRdKDjjJ4u97IRaUb3ao7 yRaPS9+34TJOqdELZDvi/50jfbMPp8e3feM+KzKeww7vVhJV7rYtEQ2Jw0O7Tg1AeJwI t7nuwtw+9vuHbBCp38yz0pp7lz/G2AFzauVuBw+lot3BT8+TEclcLNoelbI6w/q3p1pX /T948fgdM/KLkefq28ziuudpYgBHCEymqEIpTx87JZ0iI1zLSiit1B1GlI43aT98NiDu hmVA== 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=x1ucAhzfqyeOFzDRefK0/VouBO/zsB4AICcG2eyiNLw=; b=AbLmRM/B9K5CjyMah5rroW0IAOOhRqV0FxA5SqcUKiiY/zipsugHuCluPwBT9DMzyQ pu9mkPy2f5+ngfL4bst0dpWwinx2YVhVzgVF91joi2P6Typ9bd8gTX0Oiil9nOnYGxdD 6iHPhcS7KeejRYOrApjMtfQkwJqDYYIj2waVHNb5CbNeS+re0z/2+A3eTkzw8d660Z6P vd1u2GTLHpm+C5zft5jlJ3m8YWG7tRttmGuY3ukhBhh/XpT1wAzek6JQ0MQGJeJTVtUY EBwBOi57oqGpDToQl74fd3G79BgtTFXaMC0Q/UGK5j29kUeKf6OJc0bmTXIpOsD2IsD2 qGow== X-Gm-Message-State: AOAM533+nxFbgQ4wwBPhrUjgquDquQhHnx6AyR8jVfm/cliO18I/VVF9 vTWNX2+x/uiD9Rcr/HSWC25QcaXN1tzCrw== X-Google-Smtp-Source: ABdhPJzsgZh0DHdopWWsAyRNXqB++pSOj7Yw0r0nr11fqGTp1wAJxhTFq1WtabwDsO/8XuPOA5oDJg== X-Received: by 2002:aa7:83cd:0:b029:1a5:fb23:ad7f with SMTP id j13-20020aa783cd0000b02901a5fb23ad7fmr45930104pfn.46.1609272559358; Tue, 29 Dec 2020 12:09:19 -0800 (PST) Received: from hermes.local (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id r14sm37763237pgi.27.2020.12.29.12.09.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Dec 2020 12:09:18 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Tue, 29 Dec 2020 12:09:01 -0800 Message-Id: <20201229200901.101171-4-stephen@networkplumber.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201229200901.101171-1-stephen@networkplumber.org> References: <20201227033335.85145-1-stephen@networkplumber.org> <20201229200901.101171-1-stephen@networkplumber.org> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v2 3/3] pdump: cleanup checkpatch warnings 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" Checkpatch prefers 'unsigned int' over bare 'unsigned'. Reword the error messages for brevity and clarity so they don't have to be split across multiple lines. Signed-off-by: Stephen Hemminger --- lib/librte_pdump/rte_pdump.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/lib/librte_pdump/rte_pdump.c b/lib/librte_pdump/rte_pdump.c index 14a392ef0340..d20e944e0454 100644 --- a/lib/librte_pdump/rte_pdump.c +++ b/lib/librte_pdump/rte_pdump.c @@ -71,7 +71,7 @@ tx_cbs[RTE_MAX_ETHPORTS][RTE_MAX_QUEUES_PER_PORT]; static inline void pdump_copy(struct rte_mbuf **pkts, uint16_t nb_pkts, void *user_params) { - unsigned i; + unsigned int i; int ring_enq; uint16_t d_pkts = 0; struct rte_mbuf *dup_bufs[nb_pkts]; @@ -131,8 +131,7 @@ pdump_register_rx_callbacks(uint16_t end_q, uint16_t port, uint16_t queue, if (cbs && operation == ENABLE) { if (cbs->cb) { PDUMP_LOG(ERR, - "failed to add rx callback for port=%d " - "and queue=%d, callback already exists\n", + "rx callback for port=%d queue=%d, already exists\n", port, qid); return -EEXIST; } @@ -152,8 +151,7 @@ pdump_register_rx_callbacks(uint16_t end_q, uint16_t port, uint16_t queue, if (cbs->cb == NULL) { PDUMP_LOG(ERR, - "failed to delete non existing rx " - "callback for port=%d and queue=%d\n", + "no existing rx callback for port=%d queue=%d\n", port, qid); return -EINVAL; } @@ -186,8 +184,7 @@ pdump_register_tx_callbacks(uint16_t end_q, uint16_t port, uint16_t queue, if (cbs && operation == ENABLE) { if (cbs->cb) { PDUMP_LOG(ERR, - "failed to add tx callback for port=%d " - "and queue=%d, callback already exists\n", + "tx callback for port=%d queue=%d, already exists\n", port, qid); return -EEXIST; } @@ -207,8 +204,7 @@ pdump_register_tx_callbacks(uint16_t end_q, uint16_t port, uint16_t queue, if (cbs->cb == NULL) { PDUMP_LOG(ERR, - "failed to delete non existing tx " - "callback for port=%d and queue=%d\n", + "no existing tx callback for port=%d queue=%d\n", port, qid); return -EINVAL; } @@ -351,7 +347,9 @@ pdump_server(const struct rte_mp_msg *mp_msg, const void *peer) int rte_pdump_init(void) { - int ret = rte_mp_action_register(PDUMP_MP, pdump_server); + int ret; + + ret = rte_mp_action_register(PDUMP_MP, pdump_server); if (ret && rte_errno != ENOTSUP) return -1; return 0; @@ -374,14 +372,16 @@ pdump_validate_ring_mp(struct rte_ring *ring, struct rte_mempool *mp) return -1; } if (mp->flags & MEMPOOL_F_SP_PUT || mp->flags & MEMPOOL_F_SC_GET) { - PDUMP_LOG(ERR, "mempool with either SP or SC settings" - " is not valid for pdump, should have MP and MC settings\n"); + PDUMP_LOG(ERR, + "mempool with SP or SC set not valid for pdump," + "must have MP and MC set\n"); rte_errno = EINVAL; return -1; } if (rte_ring_is_prod_single(ring) || rte_ring_is_cons_single(ring)) { - PDUMP_LOG(ERR, "ring with either SP or SC settings" - " is not valid for pdump, should have MP and MC settings\n"); + PDUMP_LOG(ERR, + "ring with SP or SC set is not valid for pdump," + "must have MP and MC set\n"); rte_errno = EINVAL; return -1; }