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 3DA40A0032 for ; Fri, 18 Feb 2022 13:44:52 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3679641140; Fri, 18 Feb 2022 13:44:52 +0100 (CET) Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by mails.dpdk.org (Postfix) with ESMTP id 0C74840141 for ; Fri, 18 Feb 2022 13:44:51 +0100 (CET) Received: by mail-wm1-f52.google.com with SMTP id k41so5186255wms.0 for ; Fri, 18 Feb 2022 04:44:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=gMdNAjo7cKi1hiqefLJtwcT6HO6KxmdawnJFuQsnzww=; b=hiCU5eg7LGX94rNSceqKpNY/rDsLkprrAz6o0IqYHbCSke41b8MpDhZa4qS/TB7S0S WeCHO75tnb1pT/XDHWYWAAxmMgsYq0Nxe7hUZSSUZio9RDSYrCamov+iEQNacDFa+ui2 4ARzwN5rffXpqrJhuTAR64L5SwJbQ2rW9ZG1Lrv+pPwz3ogKFqs0x2S3y7ehnQjfkHCB pxj8j/onRN+vBUq4T/LFgI0uluwzQ6gy0Hoz6nQMyxuk2AD7rDd6NomEjvXh9M+2UmLN t+yHVSAnpAM5j3+1rjTUi0wUVr6bY6aRW7XpZlD3wMshIXA6XAVUyKYqYdZzdK76g0hi mq8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gMdNAjo7cKi1hiqefLJtwcT6HO6KxmdawnJFuQsnzww=; b=q5dEWrClnrcY/YPRoPCWsmNOYSOdQRXTWE6Q0r/GiGlrD/bdY4FGJcHOL/nq6yrZUm J0Lf4Mgt0WEF1ZQvPc1r3jYjd4euaJ9x9YtEpSm6ciOE08ApnrUmaPYFhCscquAIhTv0 aolDfZJPjDMdrQm1ANMGJr0n2uPm6UvvL0f3xdNyYcE3gmI3vEYux3nr31DRY1c12EON dWkZKjzl3AxeKBNonP5TmqYokTuU1jVlkmlvUALb5zwDi0vU3wISPTMxUMfkrL+IYROu qC2eeMQxNc2c0efnW7as3RhHAdKV2n/8D0MpWnMBwxzxisAtEox9xJUBu+vzvOdHg9NK zcGg== X-Gm-Message-State: AOAM533wPE7DVl0gKJK1NCwjtjZF3rclejuosKz8DeMshnP7f8b/1F7z lGTXsegQHyj28Db7aEpI9Y0x40eI0LLedJSd X-Google-Smtp-Source: ABdhPJw/GT6FCYgTTXqOW9FE55ZWnBzRo/Qx+4Cv1oSISzQ0EHasXeJTEr3hXcj68elViXwRMs51Fg== X-Received: by 2002:a7b:c3d3:0:b0:37b:ea2b:55a4 with SMTP id t19-20020a7bc3d3000000b0037bea2b55a4mr7031984wmj.85.1645188290705; Fri, 18 Feb 2022 04:44:50 -0800 (PST) Received: from localhost ([2a01:4b00:f41a:3600:360b:9754:2e3a:c344]) by smtp.gmail.com with ESMTPSA id b7sm30796907wrp.23.2022.02.18.04.44.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Feb 2022 04:44:50 -0800 (PST) From: luca.boccassi@gmail.com To: Bruce Richardson Cc: dpdk stable Subject: patch 'table: fix C++ include' has been queued to stable release 20.11.5 Date: Fri, 18 Feb 2022 12:39:11 +0000 Message-Id: <20220218123931.1749595-102-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220218123931.1749595-1-luca.boccassi@gmail.com> References: <20220218123931.1749595-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 20.11.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/20/22. 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/b6dd9d6b2c8c2a91b9790378d6e46d21d26e16fc Thanks. Luca Boccassi --- >From b6dd9d6b2c8c2a91b9790378d6e46d21d26e16fc Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Thu, 10 Feb 2022 15:42:37 +0000 Subject: [PATCH] table: fix C++ include [ upstream commit 097ea8e274440919433cd932ec7a1b2f3956180b ] Since C++ doesn't support automatic casting from void * to other types, we need to explicitly add the casts to any header files in DPDK. Fixes: ea7be0a0386e ("lib/librte_table: add hash function headers") Signed-off-by: Bruce Richardson --- lib/librte_table/rte_table_hash_func.h | 32 +++++++++++++------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/lib/librte_table/rte_table_hash_func.h b/lib/librte_table/rte_table_hash_func.h index c4c35cc06a..a962ec2f68 100644 --- a/lib/librte_table/rte_table_hash_func.h +++ b/lib/librte_table/rte_table_hash_func.h @@ -58,8 +58,8 @@ static inline uint64_t rte_table_hash_crc_key8(void *key, void *mask, __rte_unused uint32_t key_size, uint64_t seed) { - uint64_t *k = key; - uint64_t *m = mask; + uint64_t *k = (uint64_t *)key; + uint64_t *m = (uint64_t *)mask; uint64_t crc0; crc0 = rte_crc32_u64(seed, k[0] & m[0]); @@ -72,8 +72,8 @@ static inline uint64_t rte_table_hash_crc_key16(void *key, void *mask, __rte_unused uint32_t key_size, uint64_t seed) { - uint64_t *k = key; - uint64_t *m = mask; + uint64_t *k = (uint64_t *)key; + uint64_t *m = (uint64_t *)mask; uint64_t k0, crc0, crc1; k0 = k[0] & m[0]; @@ -91,8 +91,8 @@ static inline uint64_t rte_table_hash_crc_key24(void *key, void *mask, __rte_unused uint32_t key_size, uint64_t seed) { - uint64_t *k = key; - uint64_t *m = mask; + uint64_t *k = (uint64_t *)key; + uint64_t *m = (uint64_t *)mask; uint64_t k0, k2, crc0, crc1; k0 = k[0] & m[0]; @@ -113,8 +113,8 @@ static inline uint64_t rte_table_hash_crc_key32(void *key, void *mask, __rte_unused uint32_t key_size, uint64_t seed) { - uint64_t *k = key; - uint64_t *m = mask; + uint64_t *k = (uint64_t *)key; + uint64_t *m = (uint64_t *)mask; uint64_t k0, k2, crc0, crc1, crc2, crc3; k0 = k[0] & m[0]; @@ -139,8 +139,8 @@ static inline uint64_t rte_table_hash_crc_key40(void *key, void *mask, __rte_unused uint32_t key_size, uint64_t seed) { - uint64_t *k = key; - uint64_t *m = mask; + uint64_t *k = (uint64_t *)key; + uint64_t *m = (uint64_t *)mask; uint64_t k0, k2, crc0, crc1, crc2, crc3; k0 = k[0] & m[0]; @@ -165,8 +165,8 @@ static inline uint64_t rte_table_hash_crc_key48(void *key, void *mask, __rte_unused uint32_t key_size, uint64_t seed) { - uint64_t *k = key; - uint64_t *m = mask; + uint64_t *k = (uint64_t *)key; + uint64_t *m = (uint64_t *)mask; uint64_t k0, k2, k5, crc0, crc1, crc2, crc3; k0 = k[0] & m[0]; @@ -192,8 +192,8 @@ static inline uint64_t rte_table_hash_crc_key56(void *key, void *mask, __rte_unused uint32_t key_size, uint64_t seed) { - uint64_t *k = key; - uint64_t *m = mask; + uint64_t *k = (uint64_t *)key; + uint64_t *m = (uint64_t *)mask; uint64_t k0, k2, k5, crc0, crc1, crc2, crc3, crc4, crc5; k0 = k[0] & m[0]; @@ -222,8 +222,8 @@ static inline uint64_t rte_table_hash_crc_key64(void *key, void *mask, __rte_unused uint32_t key_size, uint64_t seed) { - uint64_t *k = key; - uint64_t *m = mask; + uint64_t *k = (uint64_t *)key; + uint64_t *m = (uint64_t *)mask; uint64_t k0, k2, k5, crc0, crc1, crc2, crc3, crc4, crc5; k0 = k[0] & m[0]; -- 2.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-18 12:37:41.735614132 +0000 +++ 0102-table-fix-C-include.patch 2022-02-18 12:37:37.834795136 +0000 @@ -1 +1 @@ -From 097ea8e274440919433cd932ec7a1b2f3956180b Mon Sep 17 00:00:00 2001 +From b6dd9d6b2c8c2a91b9790378d6e46d21d26e16fc Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 097ea8e274440919433cd932ec7a1b2f3956180b ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -14 +15 @@ - lib/table/rte_table_hash_func.h | 32 ++++++++++++++++---------------- + lib/librte_table/rte_table_hash_func.h | 32 +++++++++++++------------- @@ -17 +18 @@ -diff --git a/lib/table/rte_table_hash_func.h b/lib/table/rte_table_hash_func.h +diff --git a/lib/librte_table/rte_table_hash_func.h b/lib/librte_table/rte_table_hash_func.h @@ -19,2 +20,2 @@ ---- a/lib/table/rte_table_hash_func.h -+++ b/lib/table/rte_table_hash_func.h +--- a/lib/librte_table/rte_table_hash_func.h ++++ b/lib/librte_table/rte_table_hash_func.h