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 ED199A0093 for ; Thu, 17 Mar 2022 15:18:11 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E9B44410F7; Thu, 17 Mar 2022 15:18:11 +0100 (CET) Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) by mails.dpdk.org (Postfix) with ESMTP id 69E49410F7 for ; Thu, 17 Mar 2022 15:18:10 +0100 (CET) Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) (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-0.canonical.com (Postfix) with ESMTPS id 336FD3F312 for ; Thu, 17 Mar 2022 14:18:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1647526688; bh=lDv5+7HqyZQhRIL4MSa8baQibRIcqYtD8iHubWCzpx8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=skHTkiJfMejorOus+gKupHxQugBns2En4DLXqeRBtNX1QrKZY4cUJXItNl61mMdW/ Yfr0a+ECrgV17WTsN7tq804PEUwSP7cr9cdedqtQ36Rz5uhUkIR7Vid2evFjx7bsnU QGz5MZfGEwwIUre3znIFVQKz6bTKYz68HcY9ojgaBhQUG3JLmK09ajDeD3V7qlDcvx fOb2J5x0N7AXxkkfufsaMBdYrRsInoX8vrQWJVeN6x5nGkvLDMhlpjp8pj0Z1uEIBb lD+1AFSgMNPMwnQnrTIec6MbD8WsjcAShrvbwF/DMmXxTeIHh102yUY6AH6N7KyonV dftb37+5yw4/A== Received: by mail-ed1-f72.google.com with SMTP id b71-20020a509f4d000000b00418d658e9d1so3164866edf.19 for ; Thu, 17 Mar 2022 07:18:08 -0700 (PDT) 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=lDv5+7HqyZQhRIL4MSa8baQibRIcqYtD8iHubWCzpx8=; b=v2I/pwhtqUSiUO87hv38tCjOxlXaQdl5qW71kTtb/sPmUgd3PuiIfgxACVjsGUBt7J jhCEu1b4PRFFgdu3GjJWwp6zQCBRU6s5w2+bEhWufeuk5h6B3mecONgYYIDmPkIr1oEX ylWRrxnRTPJjzbcDRx3tEx6VjluQRvZkTE5uzMdvF3bKkJM8qleU033qyFgw5aOlKvs0 Nx8rqlN+f/3IPcY8i4hfFPvmTpJ+M2NGo5BW0OmtsVlNBqhNvkpXR8mvOjtgzSpK1VGr irSBnKGyCqMTvjSn/iMzWOCD72LEUChuN88cKs29KOjoK1P4pjzjoE8hBwgmVXI88vxo tFyQ== X-Gm-Message-State: AOAM533vEibTiTTxImi9VvckKDV+B2fLO4paI2SxvZcPGousAFmWaPut /Cd4pIiDtwn3LA004wwpQqktRDVw8LBAIkbuKsZTWvszZvxVSiHyYAN4Pkm/2VWjxU4Y1WjeYjh hsBQ/GKkI9+fBDJvGPQv7RjhU X-Received: by 2002:a17:906:4783:b0:6d0:9b6e:b5a5 with SMTP id cw3-20020a170906478300b006d09b6eb5a5mr4830268ejc.526.1647526687346; Thu, 17 Mar 2022 07:18:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwt0XNmyEfvBMwosxfAHiNFmksz3f3xe3BQ79gUM2NHRoI/56a+t866qZADZg9YuAR5G5gQcw== X-Received: by 2002:a17:906:4783:b0:6d0:9b6e:b5a5 with SMTP id cw3-20020a170906478300b006d09b6eb5a5mr4830237ejc.526.1647526687062; Thu, 17 Mar 2022 07:18:07 -0700 (PDT) Received: from localhost.localdomain (068-133-067-156.ip-addr.inexio.net. [156.67.133.68]) by smtp.gmail.com with ESMTPSA id p22-20020a17090664d600b006df6790a519sm2525197ejn.116.2022.03.17.07.18.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Mar 2022 07:18:06 -0700 (PDT) From: christian.ehrhardt@canonical.com To: Bruce Richardson Cc: dpdk stable Subject: patch 'cryptodev: fix clang C++ include' has been queued to stable release 19.11.12 Date: Thu, 17 Mar 2022 15:17:45 +0100 Message-Id: <20220317141747.1955930-7-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220317141747.1955930-1-christian.ehrhardt@canonical.com> References: <20220317141747.1955930-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 03/19/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/f9b9d26a695a2558f38d19919b2e9df3eca78821 Thanks. Christian Ehrhardt --- >From f9b9d26a695a2558f38d19919b2e9df3eca78821 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.35.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-03-17 14:33:42.352609334 +0100 +++ 0007-cryptodev-fix-clang-C-include.patch 2022-03-17 14:33:41.872623036 +0100 @@ -1 +1 @@ -From 1763c91b06ca65bbb8516f47b97cffe1cac97dde Mon Sep 17 00:00:00 2001 +From f9b9d26a695a2558f38d19919b2e9df3eca78821 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 {