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 736F1454E9 for ; Tue, 25 Jun 2024 02:01:32 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6ECCC4113C; Tue, 25 Jun 2024 02:01:32 +0200 (CEST) Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) by mails.dpdk.org (Postfix) with ESMTP id 3613240EDD for ; Tue, 25 Jun 2024 02:01:31 +0200 (CEST) Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-421f4d1c057so40370825e9.3 for ; Mon, 24 Jun 2024 17:01:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719273691; x=1719878491; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=S203VmNtVv7FbKI0wp57Upx2WnR1BsZbQX81cXyYH/s=; b=bv2fsVpE41JfvmIxQ3A8WpckjC7iF2TI5TZ/JMXeU1LuSsSWX59RVyuoPbjaqKTLgf /yaN8TToLrQ9svBgTITzai0fv0pjAEhV76TGEF7n0/XZU8wXxxP16M9YBwn+hXf108Fo 9AiK5Q7ovxdOTEw7wlGMW6dzDDsqJ53xkdpvCYxUIMVr3017VmDTcQJrzQU8++PqXd1y UnAhAOZ0+wzS0Nu2Jzt/BKdNOMl0qxgLLFpRgYrW/HrhoI3dx/nu3yFbjHzNxjy9zuhc /rqZ+pylnZTxD8o2ADd9JOg1qbeIzFNMvxhUB63p2NKut7Z8krY1nbi3WvwFwgxHmrih Eomw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719273691; x=1719878491; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=S203VmNtVv7FbKI0wp57Upx2WnR1BsZbQX81cXyYH/s=; b=iL3/kL7TAi8JEPTH5m27qPYJYa2wbcKKKBHwDikvkxyTPnzE4eQjjsrtQ5yA027pYy H74om268Azu4gFPqvVVpvsDsLUInPE/Zgk61DbkXbudpD/KwnwZvbE9gEIAVyFxA/XVq NOxPzu0+RKFiPWoiGwmpRW2rorAdrLTTpgKdIGkdfxESaIu2B2d3Mkhi73mhp8I/5KFG 1lecXEFnnkMSjqbNuRrBHLLTtY3kb98xuKHmG59TtXtrZ/7/+I+WP4RzQH7OzrtnKrgL xIHbLROQwIDDbo8wdtrklTSMgKR2aot/s1oghdJK12M/yDWxsGftD7NkQthwh976lSGi 1xhA== X-Forwarded-Encrypted: i=1; AJvYcCWcMgE6pLawQ9f/g+yx26KISQdb4jstXOUeLpX2w84ok9ypyYNbRZhBZVBsqhJRFFacCMmTS0CzggGKNY61HkM= X-Gm-Message-State: AOJu0Yyt+zjtFBqc9OMmRpF7BU6g97HaHKnxjKFJJ7SmV4JD2OiuunVl O9b4I9HpKzt9HjMMIvdWbQ2v054b1klNWrq5ezYuMds6HMlTCx1r X-Google-Smtp-Source: AGHT+IGrCTbVKAC8pVwj3b6vYG7LD2nS/sJBI1v5IXO0JPeGJ39gHwI3kQyLwF2yBI4cAm5CE8ydjQ== X-Received: by 2002:a05:600c:358c:b0:424:9177:17ef with SMTP id 5b1f17b1804b1-42491771ccdmr28459795e9.39.1719273690753; Mon, 24 Jun 2024 17:01:30 -0700 (PDT) Received: from localhost ([137.220.120.171]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42481921f16sm149364245e9.41.2024.06.24.17.01.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Jun 2024 17:01:30 -0700 (PDT) From: luca.boccassi@gmail.com To: Stephen Hemminger Cc: Tyler Retzlaff , dpdk stable Subject: patch 'mempool: replace GCC pragma with cast' has been queued to stable release 22.11.6 Date: Tue, 25 Jun 2024 00:58:29 +0100 Message-Id: <20240624235907.885628-43-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240624235907.885628-1-luca.boccassi@gmail.com> References: <20240624235907.885628-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 22.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/27/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/9cdf5aecb261e85cc3ae75eda57a34c7a201b3d5 Thanks. Luca Boccassi --- >From 9cdf5aecb261e85cc3ae75eda57a34c7a201b3d5 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Mon, 1 Apr 2024 10:01:52 -0700 Subject: [PATCH] mempool: replace GCC pragma with cast [ upstream commit 23dc03f67279f6ced3dafd2e4c76c1b67a0102dc ] Building mempool with MSVC generates a warning because of this pragma (same with clang when debug is enabled). The issue the pragma was working around can be better solved by using an additional cast. Fixes: af75078fece3 ("first public release") Signed-off-by: Stephen Hemminger Acked-by: Tyler Retzlaff --- lib/mempool/rte_mempool.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/lib/mempool/rte_mempool.c b/lib/mempool/rte_mempool.c index 3de857abf5..258754cf67 100644 --- a/lib/mempool/rte_mempool.c +++ b/lib/mempool/rte_mempool.c @@ -1054,10 +1054,6 @@ rte_mempool_dump_cache(FILE *f, const struct rte_mempool *mp) return count; } -#ifndef __INTEL_COMPILER -#pragma GCC diagnostic ignored "-Wcast-qual" -#endif - /* check and update cookies or panic (internal) */ void rte_mempool_check_cookies(const struct rte_mempool *mp, void * const *obj_table_const, unsigned n, int free) @@ -1072,7 +1068,7 @@ void rte_mempool_check_cookies(const struct rte_mempool *mp, /* Force to drop the "const" attribute. This is done only when * DEBUG is enabled */ - tmp = (void *) obj_table_const; + tmp = (void *)(uintptr_t)obj_table_const; obj_table = tmp; while (n--) { @@ -1181,10 +1177,6 @@ mempool_audit_cookies(struct rte_mempool *mp) #define mempool_audit_cookies(mp) do {} while(0) #endif -#ifndef __INTEL_COMPILER -#pragma GCC diagnostic error "-Wcast-qual" -#endif - /* check cookies before and after objects */ static void mempool_audit_cache(const struct rte_mempool *mp) -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-06-25 00:22:16.153274784 +0100 +++ 0043-mempool-replace-GCC-pragma-with-cast.patch 2024-06-25 00:22:13.165185241 +0100 @@ -1 +1 @@ -From 23dc03f67279f6ced3dafd2e4c76c1b67a0102dc Mon Sep 17 00:00:00 2001 +From 9cdf5aecb261e85cc3ae75eda57a34c7a201b3d5 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 23dc03f67279f6ced3dafd2e4c76c1b67a0102dc ] + @@ -20 +22 @@ -index 7a98441a87..ff67fe4181 100644 +index 3de857abf5..258754cf67 100644 @@ -23 +25 @@ -@@ -1056,10 +1056,6 @@ rte_mempool_dump_cache(FILE *f, const struct rte_mempool *mp) +@@ -1054,10 +1054,6 @@ rte_mempool_dump_cache(FILE *f, const struct rte_mempool *mp) @@ -34 +36 @@ -@@ -1074,7 +1070,7 @@ void rte_mempool_check_cookies(const struct rte_mempool *mp, +@@ -1072,7 +1068,7 @@ void rte_mempool_check_cookies(const struct rte_mempool *mp, @@ -43 +45 @@ -@@ -1183,10 +1179,6 @@ mempool_audit_cookies(struct rte_mempool *mp) +@@ -1181,10 +1177,6 @@ mempool_audit_cookies(struct rte_mempool *mp)