From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 9FE3CA0553 for ; Mon, 17 Feb 2020 18:46:33 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 94E581DAA7; Mon, 17 Feb 2020 18:46:33 +0100 (CET) Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by dpdk.org (Postfix) with ESMTP id 311061DAB3 for ; Mon, 17 Feb 2020 18:46:32 +0100 (CET) Received: by mail-wm1-f67.google.com with SMTP id b17so204174wmb.0 for ; Mon, 17 Feb 2020 09:46:32 -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=JY6WC2q1jUIFzszSiDI1JLFJfK6uOPgaJZjlXKdqga4=; b=WQw2n8EFyEfvUzzGiZc6BSAux2jpBDNFwtDNOXn7RBvMfUI4GSiSq+xDMotJifuYEk sgIYx/yHXv+7RBekB4HCnnyV8f/N6E9wU8CMvmssojeZClVs4Zav1ZJoPTcCqtjVu6F6 EYnkTOqnW/TLWtdY/aCTHbxz/sAt5Yw7dbWt5kvh5q5kIFBny6PKi6VE9iXJ96LwDxmb 5kh5m8vLf1NdP3vCZydVmUiMT3jVzFBVwt6MK9ootjaaUvNoo2Z+6fXyUunriMrRi+ho 1umMOB7hH0VXxFV6Ii3xQK+aW7bYk1ib3sgz/+MPLZ1OqBPqwpp5GVc+JRuZT0UhZZZ+ +ulA== 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=JY6WC2q1jUIFzszSiDI1JLFJfK6uOPgaJZjlXKdqga4=; b=DTCT42NIxt6BjDNM91PdiVRp/dNvxr7ntk06m2grkdKeDjCGx8QEotFpMIRgRqlBKU WZSFbZ3tG+oq1Z8ksaFZMBJYrrbMCV0qDg0fpLyCg9OqBl1hoOio5gBmywxnjIOMlUVt fGZwDHxTNRZHLdvOUQlxkIibe0DchRvqzt6QCLtV5JJuckV9c4spKkO06GqgNkegAohN 9iJYGfOcrD2DRgcZHAybUOyPhVTzk2k1NE6iy0KNrrqUiiFycf5evm9lD091hHfIz07Q 5gqJ2FUHk8YHK6aKhuojidCjmOC3T1G2lFo2P+0+d+CE/88j9ke9xWfZn3vr/NzAAjEa jcDw== X-Gm-Message-State: APjAAAVLdV202dLpH4ybvgXE1iu3rNs60cOtq/+wYwsf02Rrs1YsYHB4 a1cDs1/QqYKhnAGDXY67qeI= X-Google-Smtp-Source: APXvYqwmZGZ3UUPz8tQoUH7imGAv2jeUfjYDLPJvTJlBoNg0zYNTAsc64N5NcxpSf8hlcdTz7c5AAw== X-Received: by 2002:a1c:491:: with SMTP id 139mr135554wme.117.1581961591915; Mon, 17 Feb 2020 09:46:31 -0800 (PST) Received: from localhost (userh634.uk.uudial.com. [194.69.103.7]) by smtp.gmail.com with ESMTPSA id u4sm2055897wrt.37.2020.02.17.09.46.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Feb 2020 09:46:31 -0800 (PST) From: luca.boccassi@gmail.com To: Viacheslav Ovsiienko Cc: Ferruh Yigit , dpdk stable Date: Mon, 17 Feb 2020 17:45:18 +0000 Message-Id: <20200217174546.25334-26-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200217174546.25334-1-luca.boccassi@gmail.com> References: <20200211112216.3929-190-luca.boccassi@gmail.com> <20200217174546.25334-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'app/testpmd: fix txonly flow generation entropy' has been queued to stable release 19.11.1 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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 19.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/19/20. 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. Thanks. Luca Boccassi --- >From 7b6cf048069f44735326a74cdc56d43e86d2ad84 Mon Sep 17 00:00:00 2001 From: Viacheslav Ovsiienko Date: Sun, 9 Feb 2020 17:02:39 +0000 Subject: [PATCH] app/testpmd: fix txonly flow generation entropy [ upstream commit 0eb89ba9f49f3f5979a974b9208100eed36c382e ] The testpmd application in txonly forwarding mode has an option to generate the packet flows by varying the destination IP address. The patch increments the IP for each packet sent, this improves the entropy and RSS distribution on the peer receiving size is getting more uniform. Fixes: 01b645dcff7f ("app/testpmd: move txonly prepare in separate function") Signed-off-by: Viacheslav Ovsiienko Reviewed-by: Ferruh Yigit --- app/test-pmd/txonly.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/test-pmd/txonly.c b/app/test-pmd/txonly.c index d42a157f8f..8ed436def5 100644 --- a/app/test-pmd/txonly.c +++ b/app/test-pmd/txonly.c @@ -153,7 +153,6 @@ pkt_burst_prepare(struct rte_mbuf *pkt, struct rte_mempool *mbp, const uint16_t vlan_tci_outer, const uint64_t ol_flags) { struct rte_mbuf *pkt_segs[RTE_MAX_SEGS_PER_PKT]; - uint8_t ip_var = RTE_PER_LCORE(_ip_var); struct rte_mbuf *pkt_seg; uint32_t nb_segs, pkt_len; uint8_t i; @@ -192,6 +191,7 @@ pkt_burst_prepare(struct rte_mbuf *pkt, struct rte_mempool *mbp, copy_buf_to_pkt(&pkt_ip_hdr, sizeof(pkt_ip_hdr), pkt, sizeof(struct rte_ether_hdr)); if (txonly_multi_flow) { + uint8_t ip_var = RTE_PER_LCORE(_ip_var); struct rte_ipv4_hdr *ip_hdr; uint32_t addr; @@ -207,6 +207,7 @@ pkt_burst_prepare(struct rte_mbuf *pkt, struct rte_mempool *mbp, */ addr = (tx_ip_dst_addr | (ip_var++ << 8)) + rte_lcore_id(); ip_hdr->src_addr = rte_cpu_to_be_32(addr); + RTE_PER_LCORE(_ip_var) = ip_var; } copy_buf_to_pkt(&pkt_udp_hdr, sizeof(pkt_udp_hdr), pkt, sizeof(struct rte_ether_hdr) + @@ -314,7 +315,7 @@ pkt_burst_transmit(struct fwd_stream *fs) fs->tx_packets += nb_tx; if (txonly_multi_flow) - RTE_PER_LCORE(_ip_var) += nb_tx; + RTE_PER_LCORE(_ip_var) -= nb_pkt - nb_tx; #ifdef RTE_TEST_PMD_RECORD_BURST_STATS fs->tx_burst_stats.pkt_burst_spread[nb_tx]++; -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-02-17 17:00:16.051158752 +0000 +++ 0026-app-testpmd-fix-txonly-flow-generation-entropy.patch 2020-02-17 17:00:15.323950682 +0000 @@ -1,8 +1,10 @@ -From 0eb89ba9f49f3f5979a974b9208100eed36c382e Mon Sep 17 00:00:00 2001 +From 7b6cf048069f44735326a74cdc56d43e86d2ad84 Mon Sep 17 00:00:00 2001 From: Viacheslav Ovsiienko Date: Sun, 9 Feb 2020 17:02:39 +0000 Subject: [PATCH] app/testpmd: fix txonly flow generation entropy +[ upstream commit 0eb89ba9f49f3f5979a974b9208100eed36c382e ] + The testpmd application in txonly forwarding mode has an option to generate the packet flows by varying the destination IP address. The patch increments the IP for each packet sent, this improves @@ -10,7 +12,6 @@ is getting more uniform. Fixes: 01b645dcff7f ("app/testpmd: move txonly prepare in separate function") -Cc: stable@dpdk.org Signed-off-by: Viacheslav Ovsiienko Reviewed-by: Ferruh Yigit @@ -19,7 +20,7 @@ 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/test-pmd/txonly.c b/app/test-pmd/txonly.c -index 4b5bec443b..8a1989fc96 100644 +index d42a157f8f..8ed436def5 100644 --- a/app/test-pmd/txonly.c +++ b/app/test-pmd/txonly.c @@ -153,7 +153,6 @@ pkt_burst_prepare(struct rte_mbuf *pkt, struct rte_mempool *mbp, @@ -30,7 +31,7 @@ struct rte_mbuf *pkt_seg; uint32_t nb_segs, pkt_len; uint8_t i; -@@ -193,6 +192,7 @@ pkt_burst_prepare(struct rte_mbuf *pkt, struct rte_mempool *mbp, +@@ -192,6 +191,7 @@ pkt_burst_prepare(struct rte_mbuf *pkt, struct rte_mempool *mbp, copy_buf_to_pkt(&pkt_ip_hdr, sizeof(pkt_ip_hdr), pkt, sizeof(struct rte_ether_hdr)); if (txonly_multi_flow) { @@ -38,7 +39,7 @@ struct rte_ipv4_hdr *ip_hdr; uint32_t addr; -@@ -208,6 +208,7 @@ pkt_burst_prepare(struct rte_mbuf *pkt, struct rte_mempool *mbp, +@@ -207,6 +207,7 @@ pkt_burst_prepare(struct rte_mbuf *pkt, struct rte_mempool *mbp, */ addr = (tx_ip_dst_addr | (ip_var++ << 8)) + rte_lcore_id(); ip_hdr->src_addr = rte_cpu_to_be_32(addr); @@ -46,7 +47,7 @@ } copy_buf_to_pkt(&pkt_udp_hdr, sizeof(pkt_udp_hdr), pkt, sizeof(struct rte_ether_hdr) + -@@ -315,7 +316,7 @@ pkt_burst_transmit(struct fwd_stream *fs) +@@ -314,7 +315,7 @@ pkt_burst_transmit(struct fwd_stream *fs) fs->tx_packets += nb_tx; if (txonly_multi_flow)