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 2AD70A10DA for ; Sat, 3 Aug 2019 01:52:48 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 2F7F11C43C; Sat, 3 Aug 2019 01:52:37 +0200 (CEST) Received: from mail-pf1-f194.google.com (mail-pf1-f194.google.com [209.85.210.194]) by dpdk.org (Postfix) with ESMTP id 1BDA21C2ED for ; Sat, 3 Aug 2019 01:52:33 +0200 (CEST) Received: by mail-pf1-f194.google.com with SMTP id b13so36771105pfo.1 for ; Fri, 02 Aug 2019 16: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=8v7OSOzARnVHBELM/KAu2BccRvpC7XvWrmT3Mxp8KjI=; b=z+EC+KZ3Hxt68Qh9e34WkkC+eK9OIUZjm7zwDV7dSfijXQ1+12p3+cs2HlfI2ZIqM4 hPe5SoezHssT9/LDcrR8E+5xfub5VWHFtqxuQ/ENNbGqF+/K4Eaq9GHlc2R6ZGddu9fb PCavJUNoSQEQnIy8X2wB3Cg+31hkIVmcwJVF9/FippDyT+RMCFg9jWQ0VLW6s6h1JpN2 lIAeLhc9LRkc6BhjmbeTMqUr16tqu2QwpAyXW5MTpayDVt8h9CuN4i2css7Wk1WhJ/TC t3y+hSeFMATQodk6lNXgujIiRMQlrEoCNcIJEuWkm5wlpgr5i1rhQZtQPYQHHE9YBwLZ uSTA== 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=Jvfoj4j6pGonHvvVZX/s83haaDFEc+w9T3dj/GtP0dKuBOQi9Uu/9P2I7Nd8qDVHM3 u2D5x/6qhUJ/I1/Z3XK7CmLxwar5k+1Xgkq34sTB5j9Oj1idJFexqj9lzH9tAlLPvjnJ wqb0QxW1dptzTnvuF0YJYokre1IuohC/J5BNpyAvYvEAhvRb7vXBGxNFNQEX2WHebLqo f0ecZor5jaVqv73Ge70gwp66DSyiHmEa/Jq61N7om6qu/9sjMQQyqNw25d6GU/L2RCw7 ljTHzPdB3Jrvjvv0kEv9jW8i48zULio/G5l2WfnKJFBqHE4qLMILrhZTQTgUlTxqa6SS n6GA== X-Gm-Message-State: APjAAAU8jOL2YnQfuOxuxnXw6emzQRe4/TAMM4DjA0e/ibga5c4iImOR SgFNxaUOdpBrnHseDMAW6DYrUrZ8 X-Google-Smtp-Source: APXvYqy4XQkoavYqkbTycjW6E6Ibj1sEojPSavDC74wRMpH0NPKXeXA4PsDZ9EHSfq5/vTNFThtIAA== X-Received: by 2002:a63:f304:: with SMTP id l4mr125462287pgh.66.1564789951925; Fri, 02 Aug 2019 16:52:31 -0700 (PDT) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id t6sm5629229pgu.23.2019.08.02.16.52.30 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Fri, 02 Aug 2019 16:52:31 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Fri, 2 Aug 2019 16:52:22 -0700 Message-Id: <20190802235222.20682-3-stephen@networkplumber.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190802235222.20682-1-stephen@networkplumber.org> References: <20190726165054.24078-1-stephen@networkplumber.org> <20190802235222.20682-1-stephen@networkplumber.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v6 2/2] 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