From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id EC232A0524 for ; Fri, 5 Feb 2021 12:38:49 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E57D84067B; Fri, 5 Feb 2021 12:38:49 +0100 (CET) Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by mails.dpdk.org (Postfix) with ESMTP id 2DA5A188A5B for ; Fri, 5 Feb 2021 12:38:48 +0100 (CET) Received: by mail-wr1-f44.google.com with SMTP id q7so7267421wre.13 for ; Fri, 05 Feb 2021 03:38:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=dgzZbkT5c9INSfHv0yL2R+cbz588gyZy6oQ+KfRbcYY=; b=l+8aKrDH9sT7RR2BU+sdeGNpBQNbKZGEm8VA7nf1BR7cxK8/skkAe12ZAb2Dsqrg6f d/UCK7XITRcBs5Rq4rJSWoILxsNWIZRrrmNMj6WGbnnP4wWhsW6WaLbWEHoJLv61/08A guHefRJQOmG0Jerkq1fKWpqhDtCWSu7l9CEXphnadujx6Ld5PFOhrUTvyu9kMiI09SMD AK4axo1kZXAbbLv9U49sYSzFxDqdKf6CyKhaVvi8T7/AMwgUNbJEddXope53rO6208Ts 3ZXT4F0Kz9lj9Ke7aTZrG6eCyaOZzERni99Mzqv+PaLFKE9lnCFwDkzpBRiuP+yKMjDn EZpA== 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=dgzZbkT5c9INSfHv0yL2R+cbz588gyZy6oQ+KfRbcYY=; b=afKSTsvk6MhrLMCN1YbKIw/hVz5XyyVmbdnceirXgegTVovTEgjIc+xO1dZFrI9jfe rIpHo/fUo8YI0bufrSaYCpObAkzNQ6onPOgyKY8ZE/2dsyFD84DJDBbfOz4d6QIeRAoP 7SelubGMiVwvGneWFPNiNIZsC38+62Y0iKoYgWuD7FIst5EJ9UtHg63hOLv1ICkNU/SF dk3p2OMn6PcH4OA1ntJ3lacLJ0DW5vh3wRugxv0sLUlzT0sun4fvTleuDnllx+942ybE b6CbclqIOmpIxZH3/3cyrxRaUcBSwI7xpx/I0KNuVifUDnqTKaNxNz6XehoyBY+EoGLX 0d+Q== X-Gm-Message-State: AOAM530FpcgLFap6v8YDpqncVTvZCQ7xLP77j+K7FNZJMGTu6C2JzKRD Pp4NMXBj8vqRJleRVXqIsM0= X-Google-Smtp-Source: ABdhPJxRjgZwwHt6yZKsOiq5XxjcDNzO6609qqwUCNvcm+EypygFhicTAA9o8MLFI/fipj5zr8pw3A== X-Received: by 2002:a5d:4d8d:: with SMTP id b13mr4397984wru.178.1612525127901; Fri, 05 Feb 2021 03:38:47 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id m6sm8023549wmq.13.2021.02.05.03.38.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 03:38:47 -0800 (PST) From: luca.boccassi@gmail.com To: Liron Himi Cc: dpdk stable Date: Fri, 5 Feb 2021 11:19:01 +0000 Message-Id: <20210205111920.1272063-255-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210205111920.1272063-1-luca.boccassi@gmail.com> References: <20210205111920.1272063-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/mvpp2: remove debug log on fast-path' has been queued to stable release 20.11.1 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to stable release 20.11.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/07/21. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/1ddc1ca0def33078081f34f0e08a219504ec7702 Thanks. Luca Boccassi --- >From 1ddc1ca0def33078081f34f0e08a219504ec7702 Mon Sep 17 00:00:00 2001 From: Liron Himi Date: Wed, 27 Jan 2021 18:09:16 +0200 Subject: [PATCH] net/mvpp2: remove debug log on fast-path [ upstream commit fa876f3ae29885321c752468c22ad1c06a7a498c ] In case of non-ip frame the current code reached the 'default' case which result with function call to log a msg. Those kind of calls should not be performed on fast-path. The performance for this kind of frames increased by 50% Fixes: acab7d58c81b ("net/mvpp2: convert to dynamic logging") Signed-off-by: Liron Himi --- drivers/net/mvpp2/mrvl_ethdev.c | 27 ++++----------------------- 1 file changed, 4 insertions(+), 23 deletions(-) diff --git a/drivers/net/mvpp2/mrvl_ethdev.c b/drivers/net/mvpp2/mrvl_ethdev.c index 93fb30cdb8..bfe496ff74 100644 --- a/drivers/net/mvpp2/mrvl_ethdev.c +++ b/drivers/net/mvpp2/mrvl_ethdev.c @@ -2171,7 +2171,6 @@ mrvl_desc_to_packet_type_and_offset(struct pp2_ppio_desc *desc, *l4_offset = *l3_offset + MRVL_ARP_LENGTH; break; default: - MRVL_LOG(DEBUG, "Failed to recognise l3 packet type"); break; } @@ -2183,7 +2182,6 @@ mrvl_desc_to_packet_type_and_offset(struct pp2_ppio_desc *desc, packet_type |= RTE_PTYPE_L4_UDP; break; default: - MRVL_LOG(DEBUG, "Failed to recognise l4 packet type"); break; } @@ -2253,10 +2251,9 @@ mrvl_rx_pkt_burst(void *rxq, struct rte_mbuf **rx_pkts, uint16_t nb_pkts) ret = pp2_ppio_recv(q->priv->ppio, q->priv->rxq_map[q->queue_id].tc, q->priv->rxq_map[q->queue_id].inq, descs, &nb_pkts); - if (unlikely(ret < 0)) { - MRVL_LOG(ERR, "Failed to receive packets"); + if (unlikely(ret < 0)) return 0; - } + mrvl_port_bpool_size[bpool->pp2_id][bpool->id][core_id] -= nb_pkts; for (i = 0; i < nb_pkts; i++) { @@ -2319,21 +2316,13 @@ mrvl_rx_pkt_burst(void *rxq, struct rte_mbuf **rx_pkts, uint16_t nb_pkts) if (unlikely(num <= q->priv->bpool_min_size || (!rx_done && num < q->priv->bpool_init_size))) { - ret = mrvl_fill_bpool(q, MRVL_BURST_SIZE); - if (ret) - MRVL_LOG(ERR, "Failed to fill bpool"); + mrvl_fill_bpool(q, MRVL_BURST_SIZE); } else if (unlikely(num > q->priv->bpool_max_size)) { int i; int pkt_to_remove = num - q->priv->bpool_init_size; struct rte_mbuf *mbuf; struct pp2_buff_inf buff; - MRVL_LOG(DEBUG, - "port-%d:%d: bpool %d oversize - remove %d buffers (pool size: %d -> %d)", - bpool->pp2_id, q->priv->ppio->port_id, - bpool->id, pkt_to_remove, num, - q->priv->bpool_init_size); - for (i = 0; i < pkt_to_remove; i++) { ret = pp2_bpool_get_buff(hif, bpool, &buff); if (ret) @@ -2526,12 +2515,8 @@ mrvl_tx_pkt_burst(void *txq, struct rte_mbuf **tx_pkts, uint16_t nb_pkts) sq, q->queue_id, 0); sq_free_size = MRVL_PP2_TX_SHADOWQ_SIZE - sq->size - 1; - if (unlikely(nb_pkts > sq_free_size)) { - MRVL_LOG(DEBUG, - "No room in shadow queue for %d packets! %d packets will be sent.", - nb_pkts, sq_free_size); + if (unlikely(nb_pkts > sq_free_size)) nb_pkts = sq_free_size; - } for (i = 0; i < nb_pkts; i++) { struct rte_mbuf *mbuf = tx_pkts[i]; @@ -2648,10 +2633,6 @@ mrvl_tx_sg_pkt_burst(void *txq, struct rte_mbuf **tx_pkts, */ if (unlikely(total_descs > sq_free_size)) { total_descs -= nb_segs; - RTE_LOG(DEBUG, PMD, - "No room in shadow queue for %d packets! " - "%d packets will be sent.\n", - nb_pkts, i); break; } -- 2.29.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-05 11:18:40.407211870 +0000 +++ 0255-net-mvpp2-remove-debug-log-on-fast-path.patch 2021-02-05 11:18:29.270699946 +0000 @@ -1 +1 @@ -From fa876f3ae29885321c752468c22ad1c06a7a498c Mon Sep 17 00:00:00 2001 +From 1ddc1ca0def33078081f34f0e08a219504ec7702 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit fa876f3ae29885321c752468c22ad1c06a7a498c ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index 2f5b2f256b..a564752a57 100644 +index 93fb30cdb8..bfe496ff74 100644