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 366074416A; Thu, 6 Jun 2024 15:48:06 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BA2DB40EAB; Thu, 6 Jun 2024 15:48:05 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.14]) by mails.dpdk.org (Postfix) with ESMTP id F195240E96 for ; Thu, 6 Jun 2024 15:48:03 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1717681685; x=1749217685; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=oXBX8EbMCebQ901qWjp4v0PDuEWQWkRFLO9AIfjC5Jo=; b=girYmknlDVvaKBNLhX7CJe6i79t8wD4hRR7o442zo9BTpAQDVQsVWd6k Roh+Do590K+3W8TJvzRjWl7zpppbS5pu0ZvCui2jLrpu+SzauDS2uuUT0 O1ADgFF2KFNjYFnNVFIVTYF8q6HiF7A5MxQrNRCqdRXwSxao7AacRR5cV 8H+Junh/zI1u7tIDOvobhqVNKjcCAv0K9S4Jf/COyt1Ngvx4aeHhlFvtR s9JJt2CwZa3ZdKoMd80h3kZyYT6u1aYD6u8BKKXfYa9a8BBNRzYiXmGeD IVw12cdo1J9wSnYO6WW379mrSPRC00JbUFf+TpK3Gf+YPnISzQgnHpen3 g==; X-CSE-ConnectionGUID: 8xqMsDZaSaaDoylewfZeug== X-CSE-MsgGUID: z8VZ+ubIR8Oc/9t5plYZZg== X-IronPort-AV: E=McAfee;i="6600,9927,11095"; a="18173961" X-IronPort-AV: E=Sophos;i="6.08,219,1712646000"; d="scan'208";a="18173961" Received: from orviesa010.jf.intel.com ([10.64.159.150]) by orvoesa106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Jun 2024 06:48:03 -0700 X-CSE-ConnectionGUID: rAGDQNoyTrCnQEBkLLAqVA== X-CSE-MsgGUID: akWbtqBCSPK7YedMiVmuDQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,219,1712646000"; d="scan'208";a="37902861" Received: from txandevlnx322.an.intel.com ([10.123.117.44]) by orviesa010.jf.intel.com with ESMTP; 06 Jun 2024 06:48:02 -0700 From: Ganapati Kundapura To: jerinjacobk@gmail.com, dev@dpdk.org, abhinandan.gujjar@intel.com Cc: jay.jayatheerthan@intel.com Subject: [PATCH v5] eventdev/crypto: restore opaque field between dequeue and enqueue Date: Thu, 6 Jun 2024 08:48:00 -0500 Message-Id: <20240606134800.2049198-1-ganapati.kundapura@intel.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20240606133511.2047397-1-ganapati.kundapura@intel.com> References: <20240606133511.2047397-1-ganapati.kundapura@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 For session-less crypto operations, event info is contained in crypto op metadata for each event which is restored in event from the crypto op metadata response info. For session based crypto operations, crypto op contains per session based event info in crypto op metadata. If any PMD passes any implementation specific data in "struct rte_event::impl_opaque" on each event, it's not getting restored. This patch stores "struct rte_event::impl_opaque" in mbuf dynamic field before enqueueing to cryptodev and restores "struct rte_event::impl_opaque" from mbuf dynamic field after dequeueing crypto op from cryptodev for session based crypto operations. Fixes: 7901eac3409a ("eventdev: add crypto adapter implementation") Acked-by: Abhinandan Gujjar Signed-off-by: Ganapati Kundapura --- v5: * Replaced ev::impl_opaque with "struct rte_event::impl_opaque" * in eca_init_service() v4: * Replaced ev::impl_opaque with "struct rte_event::impl_opaque" * Added Acked-by v3: * Added Fixes tag v2: * Fixed TYPO_SPELLING warning in commit header diff --git a/lib/eventdev/rte_event_crypto_adapter.c b/lib/eventdev/rte_event_crypto_adapter.c index db1c7f3..939ca1c 100644 --- a/lib/eventdev/rte_event_crypto_adapter.c +++ b/lib/eventdev/rte_event_crypto_adapter.c @@ -138,6 +138,28 @@ static struct event_crypto_adapter **event_crypto_adapter; } \ } while (0) +#define ECA_DYNFIELD_NAME "eca_ev_opaque_data" +/* Device-specific metadata field type */ +typedef uint8_t eca_dynfield_t; + +/* mbuf dynamic field offset for device-specific metadata */ +int eca_dynfield_offset = -1; + +static int +eca_dynfield_register(void) +{ + static const struct rte_mbuf_dynfield eca_dynfield_desc = { + .name = ECA_DYNFIELD_NAME, + .size = sizeof(eca_dynfield_t), + .align = alignof(eca_dynfield_t), + .flags = 0, + }; + + eca_dynfield_offset = + rte_mbuf_dynfield_register(&eca_dynfield_desc); + return eca_dynfield_offset; +} + static inline int eca_valid_id(uint8_t id) { @@ -491,6 +513,25 @@ eca_enq_to_cryptodev(struct event_crypto_adapter *adapter, struct rte_event *ev, crypto_op = ev[i].event_ptr; if (crypto_op == NULL) continue; + + /** "struct rte_event::impl_opaque" field passed on from + * eventdev PMD could have different value per event. + * For session-based crypto operations retain + * "struct rte_event::impl_opaque" into mbuf dynamic field and + * restore it back after copying event information from + * session event metadata. + * For session-less, each crypto operation carries event + * metadata and retains "struct rte_event:impl_opaque" + * information to be passed back to eventdev PMD. + */ + if (crypto_op->sess_type == RTE_CRYPTO_OP_WITH_SESSION) { + struct rte_mbuf *mbuf = crypto_op->sym->m_src; + + *RTE_MBUF_DYNFIELD(mbuf, + eca_dynfield_offset, + eca_dynfield_t *) = ev[i].impl_opaque; + } + m_data = rte_cryptodev_session_event_mdata_get(crypto_op); if (m_data == NULL) { rte_pktmbuf_free(crypto_op->sym->m_src); @@ -657,6 +698,21 @@ eca_ops_enqueue_burst(struct event_crypto_adapter *adapter, rte_memcpy(ev, &m_data->response_info, sizeof(*ev)); ev->event_ptr = ops[i]; + + /** Restore "struct rte_event::impl_opaque" from mbuf + * dynamic field for session based crypto operation. + * For session-less, each crypto operations carries event + * metadata and retains "struct rte_event::impl_opaque" + * information to be passed back to eventdev PMD. + */ + if (ops[i]->sess_type == RTE_CRYPTO_OP_WITH_SESSION) { + struct rte_mbuf *mbuf = ops[i]->sym->m_src; + + ev->impl_opaque = *RTE_MBUF_DYNFIELD(mbuf, + eca_dynfield_offset, + eca_dynfield_t *); + } + ev->event_type = RTE_EVENT_TYPE_CRYPTODEV; if (adapter->implicit_release_disabled) ev->op = RTE_EVENT_OP_FORWARD; @@ -895,6 +951,18 @@ eca_init_service(struct event_crypto_adapter *adapter, uint8_t id) } adapter->implicit_release_disabled = (uint8_t)impl_rel; + + /** Register for mbuf dyn field to store/restore + * "struct rte_event::impl_opaque" + */ + eca_dynfield_offset = eca_dynfield_register(); + if (eca_dynfield_offset < 0) { + RTE_EDEV_LOG_ERR("Failed to register eca mbuf dyn field"); + eca_circular_buffer_free(&adapter->ebuf); + rte_free(adapter); + return -EINVAL; + } + adapter->service_inited = 1; return ret; -- 2.6.4