From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id A221A45804 for ; Fri, 23 Aug 2024 18:21:04 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9DAF443380; Fri, 23 Aug 2024 18:21:04 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 3960A4336F for ; Fri, 23 Aug 2024 18:21:03 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1724430062; 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=ifOKJvgZ/P+wloTnHOesEBc9CPjSedwebRTeku8Fwas=; b=EeCGK3y3jHKeiHTAqvdzNJoUlQNdlOdYo62wlAK0IhNe8B2VgrW07VYR+aTyMIlqU+PbG8 RlJVG0kKTtZQin47VFVMRtJyTRJCVxL/7TZM6J07it38JZM5Aeak0QxKGdRhgTY42RixgT x9/QcZoU8uQxiSxLpd44S0M6EhNJ0+8= Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-504-em2um14rOfW6caeeajojlw-1; Fri, 23 Aug 2024 12:20:59 -0400 X-MC-Unique: em2um14rOfW6caeeajojlw-1 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 485261955D4C; Fri, 23 Aug 2024 16:20:58 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.193.224]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id B67CF1956053; Fri, 23 Aug 2024 16:20:56 +0000 (UTC) From: Kevin Traynor To: Stephen Hemminger Cc: Harry van Haaren , dpdk stable Subject: patch 'event/sw: fix warning from useless snprintf' has been queued to stable release 21.11.8 Date: Fri, 23 Aug 2024 17:17:45 +0100 Message-ID: <20240823161929.1004778-37-ktraynor@redhat.com> In-Reply-To: <20240823161929.1004778-1-ktraynor@redhat.com> References: <20240823161929.1004778-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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 Hi, FYI, your patch has been queued to stable release 21.11.8 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/28/24. 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 This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/4722e89fcd6993d2de347b9145340efe776528c0 Thanks. Kevin --- >From 4722e89fcd6993d2de347b9145340efe776528c0 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Tue, 23 Apr 2024 20:45:40 -0700 Subject: [PATCH] event/sw: fix warning from useless snprintf [ upstream commit 510e2b655b46d91d3cc189882e6392afdc0363ff ] With GCC-14, this warning is generated: drivers/event/sw/sw_evdev.c:263:3: warning: snprintf' will always be truncated; specified size is 12, but format string expands to at least 13 snprintf(buf, sizeof(buf), "sw%d_iq_%d_rob", dev_id, i); ^ Yet the whole printf to the buf is unnecessary. The type string argument has never been implemented, and should just be NULL. Removing the unnecessary snprintf, then means IQ_ROB_NAMESIZE can be removed. Fixes: 5ffb2f142d95 ("event/sw: support event queues") Signed-off-by: Stephen Hemminger Acked-by: Harry van Haaren --- drivers/event/sw/iq_chunk.h | 2 -- drivers/event/sw/sw_evdev.c | 5 +---- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/event/sw/iq_chunk.h b/drivers/event/sw/iq_chunk.h index 31d013eab7..7820815c38 100644 --- a/drivers/event/sw/iq_chunk.h +++ b/drivers/event/sw/iq_chunk.h @@ -10,6 +10,4 @@ #include -#define IQ_ROB_NAMESIZE 12 - struct sw_queue_chunk { struct rte_event events[SW_EVS_PER_Q_CHUNK]; diff --git a/drivers/event/sw/sw_evdev.c b/drivers/event/sw/sw_evdev.c index e43bf250d6..d1fd0eeb4f 100644 --- a/drivers/event/sw/sw_evdev.c +++ b/drivers/event/sw/sw_evdev.c @@ -230,7 +230,5 @@ qid_init(struct sw_evdev *sw, unsigned int idx, int type, { unsigned int i; - int dev_id = sw->data->dev_id; int socket_id = sw->data->socket_id; - char buf[IQ_ROB_NAMESIZE]; struct sw_qid *qid = &sw->qids[idx]; @@ -262,6 +260,5 @@ qid_init(struct sw_evdev *sw, unsigned int idx, int type, } - snprintf(buf, sizeof(buf), "sw%d_iq_%d_rob", dev_id, i); - qid->reorder_buffer = rte_zmalloc_socket(buf, + qid->reorder_buffer = rte_zmalloc_socket(NULL, window_size * sizeof(qid->reorder_buffer[0]), 0, socket_id); -- 2.46.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-08-23 17:18:11.051820611 +0100 +++ 0037-event-sw-fix-warning-from-useless-snprintf.patch 2024-08-23 17:18:09.677429955 +0100 @@ -1 +1 @@ -From 510e2b655b46d91d3cc189882e6392afdc0363ff Mon Sep 17 00:00:00 2001 +From 4722e89fcd6993d2de347b9145340efe776528c0 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 510e2b655b46d91d3cc189882e6392afdc0363ff ] + @@ -18 +19,0 @@ -Cc: stable@dpdk.org @@ -28 +29 @@ -index 7a7a8782e6..e638142dbc 100644 +index 31d013eab7..7820815c38 100644 @@ -36 +37 @@ - struct __rte_cache_aligned sw_queue_chunk { + struct sw_queue_chunk { @@ -39 +40 @@ -index 1c01b069fe..19a52afc7d 100644 +index e43bf250d6..d1fd0eeb4f 100644 @@ -42 +43 @@ -@@ -229,7 +229,5 @@ qid_init(struct sw_evdev *sw, unsigned int idx, int type, +@@ -230,7 +230,5 @@ qid_init(struct sw_evdev *sw, unsigned int idx, int type, @@ -50 +51 @@ -@@ -261,6 +259,5 @@ qid_init(struct sw_evdev *sw, unsigned int idx, int type, +@@ -262,6 +260,5 @@ qid_init(struct sw_evdev *sw, unsigned int idx, int type,