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 41546A034C for ; Fri, 25 Feb 2022 18:18:10 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3B92E410FD; Fri, 25 Feb 2022 18:18:10 +0100 (CET) Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) by mails.dpdk.org (Postfix) with ESMTP id 33E18410FD for ; Fri, 25 Feb 2022 18:18:09 +0100 (CET) Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (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 smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 114803F1DD for ; Fri, 25 Feb 2022 17:18:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1645809489; bh=amaDRqSUvdPdymzWWdeQIlWuNpG1YfwDuLcxGnS34D4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=qZRwRoO5IUPnfiOv62z2d9Fy5sYQ6f7M5k8yvi/zT2IC2p5E16mxV6l7R3zULtkFD V85HnqiDxnjI2RzwWIwPjF4KxXmMJX5/HUzx13yxHJDTv5paLz5XOgNiQKDyTJlMd4 AdLRhSNgc5XUJwXJ3dZvRF+vguM+AC6fFxmMwfYvWufcbwBRbQCCBXVM7aHEhKKUbF LB34DBNoIWaKWEJm9bBF8LkrIXHdZutKLWk6l1JAiFNXpbr8cT/k67BbTWT0A0qJUX 20Y1PiW4qmIPtHYgQQuTuv1gnM2PK0M4kTlbOeqFVs/6mxagg80Y4EE9eevxrylaIX NfEZ3UN34oAzg== Received: by mail-wm1-f70.google.com with SMTP id m21-20020a7bcf35000000b00380e364b5d2so1610825wmg.2 for ; Fri, 25 Feb 2022 09:18:09 -0800 (PST) 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=amaDRqSUvdPdymzWWdeQIlWuNpG1YfwDuLcxGnS34D4=; b=rqffLg3sq2QMQHEdntnOTNuUsw3FC+lO5dRfRl5cSuBOJsHEr7JCoHD4ERVCO7Jtgl 8W22vzoDbeTAyG9Wf9AOLCCHCCZJqmAWPt23SKOufnl92O8m3aDZPD1786OKs8fdmKej Q6xLKusnUBhaunXLiH/Q4vwhKS2OTGSYqdlHqUlPLqZqF8hvmG3j/M2lwtrZHryWjcBl 5exTtOgbavrHUcXwjgixCqSE8qYnvOs69CyNDiKN6PFhmjUIXEIPokI00qf4ZVCDQYNh 8HeGe45mhUPGV0geL2SyZoWvHuRrL9dN//93OzpjEcjO+Q3q+eDpvqiR+v6n9P0G8oCx 7ESA== X-Gm-Message-State: AOAM533P3xvyoXddxU8LV9mYDNddujWvt9GjCJTrcBViinNXp/PbgX5p nq5Re4/n7jTbIHy+IehZDceGU4T4j2UuJfMgcb2fstlIDcGnYmxlJn7DfEtPfFy1rGffDaTnPeN 0lfJXB3sy6qKiM30SeqXvn6GI X-Received: by 2002:adf:f6d2:0:b0:1ee:6e5:2a0a with SMTP id y18-20020adff6d2000000b001ee06e52a0amr6697285wrp.517.1645809488384; Fri, 25 Feb 2022 09:18:08 -0800 (PST) X-Google-Smtp-Source: ABdhPJzeFgqt0gbLc/SJVGPuZFNz7mg28zwMNjKeA9HG6y6ohQPwjIw0J/ZM8jdJO7GEk+K61ZzFIQ== X-Received: by 2002:adf:f6d2:0:b0:1ee:6e5:2a0a with SMTP id y18-20020adff6d2000000b001ee06e52a0amr6697264wrp.517.1645809488094; Fri, 25 Feb 2022 09:18:08 -0800 (PST) Received: from Keschdeichel.fritz.box (068-133-067-156.ip-addr.inexio.net. [156.67.133.68]) by smtp.gmail.com with ESMTPSA id s11-20020a5d69cb000000b001ef5b49d68esm3039655wrw.37.2022.02.25.09.18.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Feb 2022 09:18:07 -0800 (PST) From: christian.ehrhardt@canonical.com To: Bruce Richardson Cc: dpdk stable Subject: patch 'table: fix C++ include' has been queued to stable release 19.11.12 Date: Fri, 25 Feb 2022 18:15:39 +0100 Message-Id: <20220225171550.3499040-46-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.35.0 In-Reply-To: <20220225171550.3499040-1-christian.ehrhardt@canonical.com> References: <20220225171550.3499040-1-christian.ehrhardt@canonical.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 19.11.12 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/27/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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/b85a9bff6a1839071d619a78b5a830eb6fde9aac Thanks. Christian Ehrhardt --- >From b85a9bff6a1839071d619a78b5a830eb6fde9aac 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 350c795649..d4f126ab5f 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.35.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-25 16:58:46.015532124 +0100 +++ 0046-table-fix-C-include.patch 2022-02-25 16:58:44.288990455 +0100 @@ -1 +1 @@ -From 097ea8e274440919433cd932ec7a1b2f3956180b Mon Sep 17 00:00:00 2001 +From b85a9bff6a1839071d619a78b5a830eb6fde9aac 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,4 +18,4 @@ -diff --git a/lib/table/rte_table_hash_func.h b/lib/table/rte_table_hash_func.h -index c4c35cc06a..a962ec2f68 100644 ---- 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 +index 350c795649..d4f126ab5f 100644 +--- a/lib/librte_table/rte_table_hash_func.h ++++ b/lib/librte_table/rte_table_hash_func.h