From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4C2D5C31E5B for ; Tue, 18 Jun 2019 16:35:48 +0000 (UTC) Received: from dpdk.org (dpdk.org [92.243.14.124]) by mail.kernel.org (Postfix) with ESMTP id D263B20673 for ; Tue, 18 Jun 2019 16:35:47 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=networkplumber-org.20150623.gappssmtp.com header.i=@networkplumber-org.20150623.gappssmtp.com header.b="O/8JjnZS" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D263B20673 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=networkplumber.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=dev-bounces@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 3667E1C23C; Tue, 18 Jun 2019 18:35:47 +0200 (CEST) Received: from mail-pl1-f195.google.com (mail-pl1-f195.google.com [209.85.214.195]) by dpdk.org (Postfix) with ESMTP id EE5BC1C218 for ; Tue, 18 Jun 2019 18:35:45 +0200 (CEST) Received: by mail-pl1-f195.google.com with SMTP id k8so4964615plt.3 for ; Tue, 18 Jun 2019 09:35:45 -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=sbupyVG4Xfwd+q4+eSyzmdONYTtJNBAldraFpXs5bYM=; b=O/8JjnZSbmOn66lD5swJgD6l/Po/+gN4SML3L0JNsVQWs8ZXs1BZfv1VstPmaHL/3g 535nN1N1JX2pQ9izCSk6zCalnpoN16Wi1fFbOIkRO71QffBgkFGh6gBqfbmEz6V7RTQ6 bHaGIm6/kgFn6OxLYadD2cg1xUeE9a/JOYNJ4jFHKAo+zdnLQDAGTzCAwQYIJrSJp1Hl OLtKp2QBJeHBoYn+Rl7Is/RLSGPWFYVyLhaH9tG4CjpFw041eXoMjwyONybA2P55P2DE zfSycx9m1WkuDpp4wv8I4m6fqtl3lZI4z+f4XKKz+Z8R0qaLqovqiKS+fDSvuiacmQMT gqlg== 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=sbupyVG4Xfwd+q4+eSyzmdONYTtJNBAldraFpXs5bYM=; b=S8IwhbZItT3Wy06RaUbLx5S9ewnfq/gMRcDlpxzcrxDFkXM00ceZJbzMOrKcZB8Mjp +0FhyJo/sT+y2tpIo7S2E8BWHqj583KNFbo8Fyfo+CvYVOLjoT6fk/f6UzMBDGzrqXXR 1BP/40iR3cOkjvi4T2+hvRrxqFyAGWt7cS7v4+8JxZgCobL0bFvfvGsINhyrIZqbBzGV 7nzCqnuMWoPCvXpT2+BfgXBi4siiR6AidrYrdw4xnWG0DVph1v4/oudvTZTUiLL96gHz EX6iRdj/VhQ2nX6Ue6rpbuYmb/e1DGZdCtc7GJgw+G/PBG8e5IXXRRSC2Ln5snNesF8Z rTgA== X-Gm-Message-State: APjAAAWUlUJAQkF0mPYubCnIF/nIvPmA2XHH1iSg2QEDAZ18nxg8JUJL YqYFDXrUf6+Tpxafda14LW+iPBhoPYs= X-Google-Smtp-Source: APXvYqzMTnL/WFkMWD8ckJ5esVGy2Bg0ZiyVvJ0i3u11svTh4j/SYbw7wxV78afkBxr7sgSa0OFoVg== X-Received: by 2002:a17:902:4222:: with SMTP id g31mr36851785pld.41.1560875744883; Tue, 18 Jun 2019 09:35:44 -0700 (PDT) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id u21sm18477247pfl.33.2019.06.18.09.35.44 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 18 Jun 2019 09:35:44 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Tue, 18 Jun 2019 09:35:37 -0700 Message-Id: <20190618163537.14642-1-stephen@networkplumber.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190604000431.28763-1-stephen@networkplumber.org> References: <20190604000431.28763-1-stephen@networkplumber.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v2] examples/multi_process - 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. This is because the flush loop is confusing the index into the array of ports[] with the port id. 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 | 19 ++++++++++--------- 1 file changed, 10 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..db9ebbe2402a 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,20 @@ 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]); + if (unlikely(sent)) + tx_stats->tx[port] += sent; + } need_flush = 0; continue; } -- 2.20.1