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 C8852A046B for ; Fri, 26 Jul 2019 18:51:21 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 303DC1C515; Fri, 26 Jul 2019 18:51:15 +0200 (CEST) Received: from mail-pl1-f194.google.com (mail-pl1-f194.google.com [209.85.214.194]) by dpdk.org (Postfix) with ESMTP id AFFBD1C4FF for ; Fri, 26 Jul 2019 18:51:05 +0200 (CEST) Received: by mail-pl1-f194.google.com with SMTP id k8so24982005plt.3 for ; Fri, 26 Jul 2019 09:51:05 -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=r6lOyyzm0n16mMTrTJL2LNGIxCJl1cXhOv3jdU3TdwSexQnBpXH1+VEhVgq5bmr2sg 3RMEdWxmQc5PCTeFnDgUPvxRRK9W8sp5zkX2YWM38yvzIBMTrlDo21hvakpYpv/skUjK vKlMbeFDWctB2sJ/ZAbqz61aQlqwxfGwKI/M9uRA0bQ36wU4DGHEIAen/idFsoR3o9pL B8HlS9IIouL/fExlCfPjfbFkyK2fTzUa4WtY7G24c1aC6hZpzClPfVu8b6JYLqZeIJEj kKA8PmdY6HXg/rviu+J3fQmAAJkg6FgGaxdRpxa1eiKbOD/jWe6K3q7Gv2CQ7qRQEjno PDdg== 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=CMPVz2GZTgieG/TbZeOVmNkuOJFoJm8aDU7bbOYrI6wRHekTFAma3A/IhDdC01HEfb 83USbvkI+V6iRHCGxVuw/ksErdbh6uw+8SHG/TxJ9I9ruGyvds/tqCA5zaufVRHNKwLn k3QP1Ca7e2kC1FTsQ8D/MuJbEc2XEUUzJDfa0wIypmTbH4cqxNtTOgISsCXkXUfYYIB2 2iqjBVZiV0bVcurB8e4tkfVdPh7KdTPTHChgdPEKUMi036mhv7D8ieHQYwJQ0638Zgug mzuOCSFHCL1zvONlP9uZr+ZNRVBssgASOhvUhP+LyP4iuT7iIndRonFihvu5ZvonEcUg BNHg== X-Gm-Message-State: APjAAAWyWEstF9el+dActtucv1ep3mAc5AvoNAkYx1GNFsgVTYNE5Zcv eJbEkj4Y4dsT4mVdeeqNCjFSffS0 X-Google-Smtp-Source: APXvYqyTnw2CKhU/elZDMInhDDNs/54zhBjyH1T7CC+2YRG9olH1DTUtO3Qy7LsbWfVKndEGLnD89Q== X-Received: by 2002:a17:902:7781:: with SMTP id o1mr97324417pll.205.1564159864665; Fri, 26 Jul 2019 09:51:04 -0700 (PDT) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id s3sm14747747pgq.17.2019.07.26.09.51.03 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Fri, 26 Jul 2019 09:51:03 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Fri, 26 Jul 2019 09:50:52 -0700 Message-Id: <20190726165054.24078-3-stephen@networkplumber.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190726165054.24078-1-stephen@networkplumber.org> References: <20190709150939.31338-1-stephen@networkplumber.org> <20190726165054.24078-1-stephen@networkplumber.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v4 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