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 78A77A04DD for ; Wed, 18 Nov 2020 17:38:10 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E3BDB3B5; Wed, 18 Nov 2020 17:37:37 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by dpdk.org (Postfix) with ESMTP id 652183B5 for ; Wed, 18 Nov 2020 17:37:36 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605717454; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=WWVVEIjVUA3hCmCnXQeRgWnXZKy+Rk75zoGMM3SYYCs=; b=G95aCk5nNcQGyHelVp/K41pwZOmyxnTPsTqw7D6rJy356cQ+KxyXPCrG8nBL3PznH8HVmF h0WpD0PxLS4gX2KriYdeWGfEnKftPwl+0bVs88Y9yQxS3LUE3v71FTdtyWmokiv8TYuwzo pillWshiBzXIVengHNf7zuau2dawRA0= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-589-QdwDnMmAMtmzg2Hp7NVzFw-1; Wed, 18 Nov 2020 11:37:30 -0500 X-MC-Unique: QdwDnMmAMtmzg2Hp7NVzFw-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DC0B8108E1AF; Wed, 18 Nov 2020 16:37:28 +0000 (UTC) Received: from rh.redhat.com (ovpn-113-249.ams2.redhat.com [10.36.113.249]) by smtp.corp.redhat.com (Postfix) with ESMTP id CE1065C1A3; Wed, 18 Nov 2020 16:37:27 +0000 (UTC) From: Kevin Traynor To: Bruce Richardson Cc: Radu Nicolau , dpdk stable Date: Wed, 18 Nov 2020 16:35:29 +0000 Message-Id: <20201118163558.1101823-43-ktraynor@redhat.com> In-Reply-To: <20201118163558.1101823-1-ktraynor@redhat.com> References: <20201118163558.1101823-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'examples/multi_process: fix build on Ubuntu 20.04' has been queued to LTS release 18.11.11 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 LTS release 18.11.11 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/24/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. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/60ea36a0a2673615056aec7f8585b7647fddf4ef Thanks. Kevin. --- >From 60ea36a0a2673615056aec7f8585b7647fddf4ef Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Wed, 28 Oct 2020 16:27:01 +0000 Subject: [PATCH] examples/multi_process: fix build on Ubuntu 20.04 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ upstream commit 27b549c12df2ef2db6b271795b4df7b14a2d9c2c ] Two warnings are reported by gcc 9.3.0 on Ubuntu 20.04. When producing a printable mac address the buffer was appropriately sized for holding the mac address exactly, but the actual snprintf included a '\n' character at the end, which means that the snprintf technically is getting truncated i.e. the \n would not be added due to lack of space. This gets flagged as a problem by modern versions of gcc, e.g. on Ubuntu 20.04. main.c:77:37: warning: ‘__builtin___snprintf_chk’ output truncated before the last format character [-Wformat-truncation=] 77 | "%02x:%02x:%02x:%02x:%02x:%02x\n", | ^ Since the \n is getting stripped anyway, we can fix the issue by just removing it. In the process we can switch to using the standard ethernet address formatting function from rte_ether.h. The other warning is about possible string truncation when getting the RX queue name: In file included from init.c:36: init.c: In function ‘init’: ../shared/common.h:38:28: warning: ‘%u’ directive output may be truncated writing between 1 and 10 bytes into a region of size 8 [-Wformat-truncation=] 38 | #define MP_CLIENT_RXQ_NAME "MProc_Client_%u_RX" | ^~~~~~~~~~~~~~~~~~~~ ../shared/common.h:52:35: note: in expansion of macro ‘MP_CLIENT_RXQ_NAME’ 52 | snprintf(buffer, sizeof(buffer), MP_CLIENT_RXQ_NAME, id); | ^~~~~~~~~~~~~~~~~~ This is a false positive, as the value of the "id" is limited to 255, being stored in the app as a uint8_t value, removing the possibility of the %u being replaced by anything other then 3 characters max (rather than up to 10 as thought by the compiler). Therefore, the warning can be easily removed by changing the type of the "id" parameter to the local function from "unsigned" to "uint8_t" also, ensuring the compiler is aware of the range limit. Fixes: af75078fece3 ("first public release") Signed-off-by: Bruce Richardson Acked-by: Radu Nicolau --- .../client_server_mp/mp_server/main.c | 17 ++++++++++------- .../client_server_mp/shared/common.h | 2 +- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/examples/multi_process/client_server_mp/mp_server/main.c b/examples/multi_process/client_server_mp/mp_server/main.c index 98d675910e..1a5bf534ff 100644 --- a/examples/multi_process/client_server_mp/mp_server/main.c +++ b/examples/multi_process/client_server_mp/mp_server/main.c @@ -60,16 +60,19 @@ static const char * get_printable_mac_addr(uint16_t port) { - static const char err_address[] = "00:00:00:00:00:00"; - static char addresses[RTE_MAX_ETHPORTS][sizeof(err_address)]; + static const struct ether_addr null_mac; /* static defaults to 0 */ + static char err_address[32]; + static char addresses[RTE_MAX_ETHPORTS][32]; - if (unlikely(port >= RTE_MAX_ETHPORTS)) + if (unlikely(port >= RTE_MAX_ETHPORTS)) { + if (err_address[0] == '\0') + rte_ether_format_addr(err_address, + sizeof(err_address), &null_mac); return err_address; + } if (unlikely(addresses[port][0]=='\0')){ struct ether_addr mac; rte_eth_macaddr_get(port, &mac); - snprintf(addresses[port], sizeof(addresses[port]), - "%02x:%02x:%02x:%02x:%02x:%02x\n", - mac.addr_bytes[0], mac.addr_bytes[1], mac.addr_bytes[2], - mac.addr_bytes[3], mac.addr_bytes[4], mac.addr_bytes[5]); + rte_ether_format_addr(addresses[port], + sizeof(addresses[port]), &mac); } return addresses[port]; diff --git a/examples/multi_process/client_server_mp/shared/common.h b/examples/multi_process/client_server_mp/shared/common.h index 6dd43fcac2..76beca0101 100644 --- a/examples/multi_process/client_server_mp/shared/common.h +++ b/examples/multi_process/client_server_mp/shared/common.h @@ -44,5 +44,5 @@ struct port_info { */ static inline const char * -get_rx_queue_name(unsigned id) +get_rx_queue_name(uint8_t id) { /* buffer for return value. Size calculated by %u being replaced -- 2.26.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-18 16:33:38.744111461 +0000 +++ 0043-examples-multi_process-fix-build-on-Ubuntu-20.04.patch 2020-11-18 16:33:37.942215070 +0000 @@ -1 +1 @@ -From 27b549c12df2ef2db6b271795b4df7b14a2d9c2c Mon Sep 17 00:00:00 2001 +From 60ea36a0a2673615056aec7f8585b7647fddf4ef Mon Sep 17 00:00:00 2001 @@ -8,0 +9,2 @@ +[ upstream commit 27b549c12df2ef2db6b271795b4df7b14a2d9c2c ] + @@ -50 +51,0 @@ -Cc: stable@dpdk.org @@ -60 +61 @@ -index ec7f6b11f3..b18e12dd4b 100644 +index 98d675910e..1a5bf534ff 100644 @@ -63 +64 @@ -@@ -60,10 +60,15 @@ static const char * +@@ -60,16 +60,19 @@ static const char * @@ -68 +69 @@ -+ static const struct rte_ether_addr null_mac; /* static defaults to 0 */ ++ static const struct ether_addr null_mac; /* static defaults to 0 */ @@ -71 +71,0 @@ - int ret; @@ -81,4 +81,2 @@ - struct rte_ether_addr mac; -@@ -74,8 +79,6 @@ get_printable_mac_addr(uint16_t port) - return err_address; - } + struct ether_addr mac; + rte_eth_macaddr_get(port, &mac);