From patchwork Thu Apr 4 17:51:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tyler Retzlaff X-Patchwork-Id: 139110 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 1788E43DFB; Thu, 4 Apr 2024 19:52:30 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A466B40A80; Thu, 4 Apr 2024 19:52:06 +0200 (CEST) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id 2A0CA406B6 for ; Thu, 4 Apr 2024 19:52:00 +0200 (CEST) Received: by linux.microsoft.com (Postfix, from userid 1086) id 1F8D120E97C5; Thu, 4 Apr 2024 10:51:58 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 1F8D120E97C5 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1712253119; bh=bWKkpIkco+xUc/mVbh93N8d7BsgVY+RUjxmmk+WDf5k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=p6k4pa2P3w8BjdKw/5I7xPYZUO7dYPY/3b0tPjqPF0SXTaGSmO0K17Yp5Nrr7xKOj VAVcqHIVwBywHt9+C/DKwhqEPVIFUkl9hKfsS4uTWugBtrxEKe0Lz5JRjTybOb75cO L2gcicv5qQgR6IHD835bTdiFHvjXWi3DeFHzcIbg= From: Tyler Retzlaff To: dev@dpdk.org Cc: Ajit Khaparde , Andrew Boyer , Andrew Rybchenko , Bruce Richardson , Chenbo Xia , Chengwen Feng , Dariusz Sosnowski , David Christensen , Hyong Youb Kim , Jerin Jacob , Jie Hai , Jingjing Wu , John Daley , Kevin Laatz , Kiran Kumar K , Konstantin Ananyev , Maciej Czekaj , Matan Azrad , Maxime Coquelin , Nithin Dabilpuram , Ori Kam , Ruifeng Wang , Satha Rao , Somnath Kotur , Suanming Mou , Sunil Kumar Kori , Viacheslav Ovsiienko , Yisen Zhuang , Yuying Zhang , mb@smartsharesystems.com, Tyler Retzlaff Subject: [PATCH v11 4/4] cryptodev: remove rte marker fields Date: Thu, 4 Apr 2024 10:51:55 -0700 Message-Id: <1712253115-8755-5-git-send-email-roretzla@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1712253115-8755-1-git-send-email-roretzla@linux.microsoft.com> References: <1706657173-26166-1-git-send-email-roretzla@linux.microsoft.com> <1712253115-8755-1-git-send-email-roretzla@linux.microsoft.com> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org RTE_MARKER typedefs are a GCC extension unsupported by MSVC. Remove RTE_MARKER fields from rte_mbuf struct. Maintain alignment of fields after removed cacheline1 marker by placing C11 alignas(RTE_CACHE_LINE_MIN_SIZE). Signed-off-by: Tyler Retzlaff Reviewed-by: Morten Brørup Acked-by: Stephen Hemminger --- doc/guides/rel_notes/release_24_07.rst | 3 +++ lib/cryptodev/cryptodev_pmd.h | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/doc/guides/rel_notes/release_24_07.rst b/doc/guides/rel_notes/release_24_07.rst index c191f53..1d23b49 100644 --- a/doc/guides/rel_notes/release_24_07.rst +++ b/doc/guides/rel_notes/release_24_07.rst @@ -71,6 +71,9 @@ Removed Items * mbuf: ``RTE_MARKER`` fields ``cacheline0`` and ``cacheline1`` have been removed from ``struct rte_mbuf``. +* cryptodev: ``RTE_MARKER`` fields ``cacheline0`` and ``cacheline1`` + have been removed from ``struct cryptodev_driver``. + * security: ``RTE_MARKER`` fields ``cacheline0`` and ``cacheline1`` have been removed from ``struct rte_security_session``. diff --git a/lib/cryptodev/cryptodev_pmd.h b/lib/cryptodev/cryptodev_pmd.h index d195b81..9daf129 100644 --- a/lib/cryptodev/cryptodev_pmd.h +++ b/lib/cryptodev/cryptodev_pmd.h @@ -5,6 +5,8 @@ #ifndef _CRYPTODEV_PMD_H_ #define _CRYPTODEV_PMD_H_ +#include + #ifdef __cplusplus extern "C" { #endif @@ -139,7 +141,6 @@ struct cryptodev_driver { * has a fixed algo, key, op-type, digest_len etc. */ struct rte_cryptodev_sym_session { - RTE_MARKER cacheline0; uint64_t opaque_data; /**< Can be used for external metadata */ uint32_t sess_data_sz; @@ -151,7 +152,7 @@ struct rte_cryptodev_sym_session { rte_iova_t driver_priv_data_iova; /**< Session driver data IOVA address */ - alignas(RTE_CACHE_LINE_MIN_SIZE) RTE_MARKER cacheline1; + alignas(RTE_CACHE_LINE_MIN_SIZE) /**< Second cache line - start of the driver session data */ uint8_t driver_priv_data[]; /**< Driver specific session data, variable size */