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 4BA02A10DA for ; Fri, 2 Aug 2019 04:58:46 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 26EE81C211; Fri, 2 Aug 2019 04:58:36 +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 1FB0B1C200 for ; Fri, 2 Aug 2019 04:58:32 +0200 (CEST) Received: by mail-pf1-f195.google.com with SMTP id q10so35189118pff.9 for ; Thu, 01 Aug 2019 19:58:31 -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=8v7OSOzARnVHBELM/KAu2BccRvpC7XvWrmT3Mxp8KjI=; b=lRD/1cKG90stvWMjNP7XOcA3QfA52V30HzlhbXI7h8c3t8Hc+ZGxygzpCnTpIX3gu7 fgd+B/Qxei4KktqRCyvI1lAhK29xyX//RDO/MHt5bTcN9YBZbVNbYInrgLlooM3sKZ7R iXSSR/vnjKZo22bnLxAZjlqcF0unD5ITpBSjxwTivj2oxHO46XsLS+cZwa3kQts+FMyq Cz5Itvf5o1ekvK2gFdn8ll41KJDpI7qJi5T0iI82kJOccCJMXGlopq9ikfHpyhf/8Eff nqHJN4C2dc8W31Q7oZAHjHoR5sRsxsAHQBoj8JCJ0cbbYlN6ujc40u3IFnPhMsLAdhX9 /Kdg== 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=8v7OSOzARnVHBELM/KAu2BccRvpC7XvWrmT3Mxp8KjI=; b=uWNzbwV0s5U1BxmXp6g0Xhy5S1/Hl9RWROEFtOpm6HzjV6gAtULKKCpA+mCnHokcj+ eml1QyOFlzhjklxeHEk0/X5bLFc3Gd7D3EfKult0sWHbqK/uWAfMIwBldBEBMmFrOMxe s7StHjv/Fv9GN+JVD/kyjm9OUyAzvUqOmsNBpkDqsGIeu/vGg+cPaFC6pG1DXfNH8Qj7 QTkJB05mC+a8j/Sp81sBSdjEKxNAhSBVdzspKt8fzyPz8KIx/ojP9pixVyvWB1IqJ6WB SjbPrYezcbJsMWCdcTk5TUdwz3vSraLJ47hlEc+u8vywbExnM4gdru3D2GPSJykqfhQ5 fseA== X-Gm-Message-State: APjAAAULfFosN7exIyM0eTevVFRG8fyUrhmAwKFA6tiimAZpk6MrqS5X 8x7L/PEMP83KxDc89mdUIDTiRrbcDLI= X-Google-Smtp-Source: APXvYqwKBSH7s6R2R1fqifrtdbRAwGCGrLooq7xHk9y4bdZ5BFGBmGeU9L6n52DPfZGKjnW7oNwCmg== X-Received: by 2002:a17:90a:d817:: with SMTP id a23mr1979559pjv.54.1564714710773; Thu, 01 Aug 2019 19:58:30 -0700 (PDT) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id a20sm5788738pjo.0.2019.08.01.19.58.29 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 01 Aug 2019 19:58:29 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Thu, 1 Aug 2019 19:58:24 -0700 Message-Id: <20190802025826.1174-3-stephen@networkplumber.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190802025826.1174-1-stephen@networkplumber.org> References: <20190726165054.24078-1-stephen@networkplumber.org> <20190802025826.1174-1-stephen@networkplumber.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v5 2/4] examples/multi_process/client_server_mp - fix crash in mp_client with sparse ports 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" From: Stephen Hemminger The mp_client crashes if run on Azure or any system where ethdev ports are owned. In that case, the tx_buffer and tx_stats for the real port were initialized correctly, but the wrong port was used. For example if the server has Ports 3 and 5. Then calling rte_eth_tx_buffer_flush on any other buffer will dereference null because the tx buffer for that port was not allocated. Also: - the flush code is common enough that it should not be marked unlikely - combine conditions to reduce indentation - avoid unnecessary if() if sent is zero. Fixes: e2366e74e029 ("examples: use buffered Tx") Signed-off-by: Stephen Hemminger --- .../client_server_mp/mp_client/client.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/examples/multi_process/client_server_mp/mp_client/client.c b/examples/multi_process/client_server_mp/mp_client/client.c index c23dd3f378f7..361d90b54b2d 100644 --- a/examples/multi_process/client_server_mp/mp_client/client.c +++ b/examples/multi_process/client_server_mp/mp_client/client.c @@ -246,19 +246,19 @@ main(int argc, char *argv[]) for (;;) { uint16_t i, rx_pkts; - uint16_t port; rx_pkts = rte_ring_dequeue_burst(rx_ring, pkts, PKT_READ_SIZE, NULL); - if (unlikely(rx_pkts == 0)){ - if (need_flush) - for (port = 0; port < ports->num_ports; port++) { - sent = rte_eth_tx_buffer_flush(ports->id[port], client_id, - tx_buffer[port]); - if (unlikely(sent)) - tx_stats->tx[port] += sent; - } + if (rx_pkts == 0 && need_flush) { + for (i = 0; i < ports->num_ports; i++) { + uint16_t port = ports->id[i]; + + sent = rte_eth_tx_buffer_flush(port, + client_id, + tx_buffer[port]); + tx_stats->tx[port] += sent; + } need_flush = 0; continue; } -- 2.20.1