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 7D055A00BE for ; Tue, 15 Mar 2022 14:32:59 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 770714014F; Tue, 15 Mar 2022 14:32:59 +0100 (CET) Received: from mail-ed1-f50.google.com (mail-ed1-f50.google.com [209.85.208.50]) by mails.dpdk.org (Postfix) with ESMTP id 8555F4014F for ; Tue, 15 Mar 2022 14:32:57 +0100 (CET) Received: by mail-ed1-f50.google.com with SMTP id g3so24246435edu.1 for ; Tue, 15 Mar 2022 06:32:57 -0700 (PDT) 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=6dbM3llHpUq+C7fTqwmviaCqcsccRh6FZJE0GARKbEg=; b=pTi6OsLOrYU8zlA4v0bxa8uCQX1p7uoesvM6d1+6X4FRKCg0KHaCsC48nx5EaPNas8 fItDcPrPymHupRsixEEMT5GEsj+AwK3WtE/2yCLD5NlZ/Ojm6aYLgJgMTJgz7/iwUdlg lXhRKu6eUpvLCUzXmcgxTQE3k+/AVUyU7h6u48lLtIXDb45K+V7ybOgVdPjr7o9iSKD4 q20wUEcEdPn42txTmMiPS4SXhYXe5AMU5f06PcRxq5SQ0ddgtHGqZObraHoLQR8wh2GP uFmWROchV+OmVyu8vB7+Fug1DInzKUi813QSpMspJihvXTmS+1D4e2Lt3PWGI6EcOV/l OAuA== 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=6dbM3llHpUq+C7fTqwmviaCqcsccRh6FZJE0GARKbEg=; b=UmNocssVxcoeMpJsJMFz0TLCx21sxUESzBs+RqAt3wo8fFfUdsfn55N8anPyMML4xM odV+iBACOfkDVRIpVqh/KMjDk7L5gBst/dl44qS1d2BXy+qPm5fA+vFWc8hcT7D2a/+v 4rfp6HP14cNzfOutgwP/8PT1zy9Zug3zGafjF0OkbNrLBVGk2QWI1wzdEH+bPaX3l7eb +V3tXusiMceOxuWycPfDs7xpRs/0RCfUuvkakybVLj5li0aud35iJQK3EXdgyRZY5bkp 6epurnoX7uc/ULBLqeo4UhCPVjg40KmWRJCWXFfKugNtIsLny9VNJGdQfckbPVFn3mav QJZA== X-Gm-Message-State: AOAM532c31BlsZj0bq0lFvWZk3a6QuEXX2tZpJoR4Mp+CGMpN9zvV6xa pidCmPRj/iODVLIugyEkdfU= X-Google-Smtp-Source: ABdhPJx/U4OYrzpyDpIjqiNS2E1uXhgz2+7ujixh6ClvR5h5xZMEsfMWW2yYYG65uY04khTo3lRg/Q== X-Received: by 2002:a50:f603:0:b0:416:ca73:1b65 with SMTP id c3-20020a50f603000000b00416ca731b65mr20921898edn.38.1647351174583; Tue, 15 Mar 2022 06:32:54 -0700 (PDT) Received: from localhost ([2a01:4b00:f41a:3600:360b:9754:2e3a:c344]) by smtp.gmail.com with ESMTPSA id hg8-20020a1709072cc800b006d6e469fbf0sm8075490ejc.134.2022.03.15.06.32.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Mar 2022 06:32:53 -0700 (PDT) From: luca.boccassi@gmail.com To: Bruce Richardson Cc: dpdk stable Subject: patch 'cryptodev: fix clang C++ include' has been queued to stable release 20.11.5 Date: Tue, 15 Mar 2022 13:32:32 +0000 Message-Id: <20220315133233.635559-9-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220315133233.635559-1-luca.boccassi@gmail.com> References: <20220218123931.1749595-1-luca.boccassi@gmail.com> <20220315133233.635559-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 03/17/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/975469beaa9b81eb743814f4af786f14e3f67e49 Thanks. Luca Boccassi --- >From 975469beaa9b81eb743814f4af786f14e3f67e49 Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Fri, 11 Mar 2022 20:05:22 +0000 Subject: [PATCH] cryptodev: fix clang C++ include [ upstream commit 1763c91b06ca65bbb8516f47b97cffe1cac97dde ] When compiling on FreeBSD with clang and include checking enabled, errors are emitted due to differences in how empty structs/unions are handled in C and C++, as C++ structs cannot have zero size. lib/cryptodev/rte_crypto.h:127:2: error: union has size 0 in C, non-zero size in C++ Since the contents of the union are all themselves of zero size, the actual union wrapper is unnecessary. We therefore remove it for C++ builds - though keep it for C builds for safety and clarity of understanding the code. Fixes: c0f87eb5252b ("cryptodev: change burst API to be crypto op oriented") Fixes: d2a4223c4c6d ("cryptodev: do not store pointer to op specific params") Signed-off-by: Bruce Richardson --- lib/librte_cryptodev/rte_crypto.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/lib/librte_cryptodev/rte_crypto.h b/lib/librte_cryptodev/rte_crypto.h index fd5ef3a876..2ba12cff2e 100644 --- a/lib/librte_cryptodev/rte_crypto.h +++ b/lib/librte_cryptodev/rte_crypto.h @@ -113,15 +113,24 @@ struct rte_crypto_op { rte_iova_t phys_addr; /**< physical address of crypto operation */ +/* empty structures do not have zero size in C++ leading to compilation errors + * with clang about structure/union having different sizes in C and C++. + * While things are clearer with an explicit union, since each field is + * zero-sized it's not actually needed, so omit it for C++ + */ +#ifndef __cplusplus __extension__ union { +#endif struct rte_crypto_sym_op sym[0]; /**< Symmetric operation parameters */ struct rte_crypto_asym_op asym[0]; /**< Asymmetric operation parameters */ +#ifndef __cplusplus }; /**< operation specific parameters */ +#endif }; /** -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-03-15 12:13:39.419845871 +0000 +++ 0009-cryptodev-fix-clang-C-include.patch 2022-03-15 12:13:39.076181169 +0000 @@ -1 +1 @@ -From 1763c91b06ca65bbb8516f47b97cffe1cac97dde Mon Sep 17 00:00:00 2001 +From 975469beaa9b81eb743814f4af786f14e3f67e49 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 1763c91b06ca65bbb8516f47b97cffe1cac97dde ] + @@ -20 +21,0 @@ -Cc: stable@dpdk.org @@ -24 +25 @@ - lib/cryptodev/rte_crypto.h | 9 +++++++++ + lib/librte_cryptodev/rte_crypto.h | 9 +++++++++ @@ -27,5 +28,5 @@ -diff --git a/lib/cryptodev/rte_crypto.h b/lib/cryptodev/rte_crypto.h -index a864f5036f..aeb3bf6e38 100644 ---- a/lib/cryptodev/rte_crypto.h -+++ b/lib/cryptodev/rte_crypto.h -@@ -123,15 +123,24 @@ struct rte_crypto_op { +diff --git a/lib/librte_cryptodev/rte_crypto.h b/lib/librte_cryptodev/rte_crypto.h +index fd5ef3a876..2ba12cff2e 100644 +--- a/lib/librte_cryptodev/rte_crypto.h ++++ b/lib/librte_cryptodev/rte_crypto.h +@@ -113,15 +113,24 @@ struct rte_crypto_op {