From patchwork Wed Dec 21 10:50:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srujana Challa X-Patchwork-Id: 121229 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 104FBA034C; Wed, 21 Dec 2022 11:50:28 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 01BB040FDF; Wed, 21 Dec 2022 11:50:28 +0100 (CET) Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com [67.231.148.174]) by mails.dpdk.org (Postfix) with ESMTP id BF16B40A7A for ; Wed, 21 Dec 2022 11:50:26 +0100 (CET) Received: from pps.filterd (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 2BLA3bPW017580; Wed, 21 Dec 2022 02:50:25 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : mime-version : content-transfer-encoding : content-type; s=pfpt0220; bh=DsNWQo9yzLmmheYsxGYW10jceVh9efei9f+BAcjUiiQ=; b=Q5PnmPU1Kcf0AcpkWiTILtsidyS+TcK0ELKH5T+BZYxFOB4lqzGgKaEfjVsxDGVC+vo4 EgFJ7pRVVr4fIRVYNxY4XWwKn5hZbB3EPZHiEoLqpJXCtZ/9S+B8lyKGvR1lvTw5ZLTa Xr6zmXxDKP+2RnKkbObOo7mVM/THpBuYiwf1wFfoNtRuyYK34wgc5DsDPKKUpVNqoUha XxbDW4U1TJA7z50Q455f/zwj6G9iYWxIMiBR1i1FhPa/XTAP6E8Ad4NJO6ZdpF2j1aGe mMwQle9PA1RFWOqZuQbIzQGwgPOhDuvosutGK6kOw6cDAK4onFkKW1ptZT0NHmv3sXS+ iA== Received: from dc5-exch02.marvell.com ([199.233.59.182]) by mx0a-0016f401.pphosted.com (PPS) with ESMTPS id 3mksux9wb5-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Wed, 21 Dec 2022 02:50:25 -0800 Received: from DC5-EXCH01.marvell.com (10.69.176.38) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server (TLS) id 15.0.1497.42; Wed, 21 Dec 2022 02:50:12 -0800 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server id 15.0.1497.42 via Frontend Transport; Wed, 21 Dec 2022 02:50:11 -0800 Received: from localhost.localdomain (unknown [10.28.36.175]) by maili.marvell.com (Postfix) with ESMTP id 7C4D25B6947; Wed, 21 Dec 2022 02:50:09 -0800 (PST) From: Srujana Challa To: , CC: , , , , , Subject: [PATCH 1/4] common/cnxk: add CPT HW error callback register functions Date: Wed, 21 Dec 2022 16:20:04 +0530 Message-ID: <20221221105007.2667292-1-schalla@marvell.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Proofpoint-GUID: fIsH_55oE8zdbrXeb8RWfBjAlvoBFZd6 X-Proofpoint-ORIG-GUID: fIsH_55oE8zdbrXeb8RWfBjAlvoBFZd6 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.923,Hydra:6.0.545,FMLib:17.11.122.1 definitions=2022-12-21_05,2022-12-21_01,2022-06-22_01 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 Adds functions to register callback API to report CPT_MISC_INT to the driver. Signed-off-by: Srujana Challa --- drivers/common/cnxk/roc_cpt.c | 32 ++++++++++++++++++++++++++++++++ drivers/common/cnxk/roc_cpt.h | 8 +++++++- drivers/common/cnxk/version.map | 2 ++ 3 files changed, 41 insertions(+), 1 deletion(-) diff --git a/drivers/common/cnxk/roc_cpt.c b/drivers/common/cnxk/roc_cpt.c index fb97ec89b2..553a5a2c80 100644 --- a/drivers/common/cnxk/roc_cpt.c +++ b/drivers/common/cnxk/roc_cpt.c @@ -25,6 +25,11 @@ #define CPT_LF_DEFAULT_NB_DESC 1024 #define CPT_LF_FC_MIN_THRESHOLD 32 +static struct cpt_int_cb { + roc_cpt_int_misc_cb_t cb; + void *cb_args; +} int_cb; + static void cpt_lf_misc_intr_enb_dis(struct roc_cpt_lf *lf, bool enb) { @@ -57,6 +62,9 @@ cpt_lf_misc_irq(void *param) /* Clear interrupt */ plt_write64(intr, lf->rbase + CPT_LF_MISC_INT); + + if (int_cb.cb != NULL) + int_cb.cb(lf, int_cb.cb_args); } static int @@ -1079,3 +1087,27 @@ roc_cpt_ctx_write(struct roc_cpt_lf *lf, void *sa_dptr, void *sa_cptr, return 0; } + +void +roc_cpt_int_misc_cb_register(roc_cpt_int_misc_cb_t cb, void *args) +{ + if (int_cb.cb != NULL) + return; + + int_cb.cb = cb; + int_cb.cb_args = args; + return 0; +} + +int +roc_cpt_int_misc_cb_unregister(roc_cpt_int_misc_cb_t cb, void *args) +{ + if (int_cb.cb == NULL) + return 0; + if (int_cb.cb != cb || int_cb.cb_args != args) + return -EINVAL; + + int_cb.cb = NULL; + int_cb.cb_args = NULL; + return 0; +} diff --git a/drivers/common/cnxk/roc_cpt.h b/drivers/common/cnxk/roc_cpt.h index bc9cc19edd..ac8be1b475 100644 --- a/drivers/common/cnxk/roc_cpt.h +++ b/drivers/common/cnxk/roc_cpt.h @@ -131,7 +131,7 @@ struct roc_cpt { union cpt_eng_caps hw_caps[CPT_MAX_ENG_TYPES]; uint8_t eng_grp[CPT_MAX_ENG_TYPES]; uint8_t cpt_revision; - + void *opaque; #define ROC_CPT_MEM_SZ (6 * 1024) uint8_t reserved[ROC_CPT_MEM_SZ] __plt_cache_aligned; } __plt_cache_aligned; @@ -144,6 +144,9 @@ struct roc_cpt_rxc_time_cfg { uint16_t zombie_thres; }; +/* CPT MISC interrupt callback */ +typedef void (*roc_cpt_int_misc_cb_t)(struct roc_cpt_lf *lf, void *args); + int __roc_api roc_cpt_rxc_time_cfg(struct roc_cpt *roc_cpt, struct roc_cpt_rxc_time_cfg *cfg); int __roc_api roc_cpt_dev_init(struct roc_cpt *roc_cpt); @@ -174,4 +177,7 @@ int __roc_api roc_cpt_lmtline_init(struct roc_cpt *roc_cpt, void __roc_api roc_cpt_parse_hdr_dump(const struct cpt_parse_hdr_s *cpth); int __roc_api roc_cpt_ctx_write(struct roc_cpt_lf *lf, void *sa_dptr, void *sa_cptr, uint16_t sa_len); + +void __roc_api roc_cpt_int_misc_cb_register(roc_cpt_int_misc_cb_t cb, void *args); +int __roc_api roc_cpt_int_misc_cb_unregister(roc_cpt_int_misc_cb_t cb, void *args); #endif /* _ROC_CPT_H_ */ diff --git a/drivers/common/cnxk/version.map b/drivers/common/cnxk/version.map index 17f0ec6b48..d6d96dd3eb 100644 --- a/drivers/common/cnxk/version.map +++ b/drivers/common/cnxk/version.map @@ -78,6 +78,8 @@ INTERNAL { roc_cpt_parse_hdr_dump; roc_cpt_rxc_time_cfg; roc_cpt_ctx_write; + roc_cpt_int_misc_cb_register; + roc_cpt_int_misc_cb_unregister; roc_dpi_configure; roc_dpi_dev_fini; roc_dpi_dev_init; From patchwork Wed Dec 21 10:50:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srujana Challa X-Patchwork-Id: 121231 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 96ABBA034C; Wed, 21 Dec 2022 11:50:41 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0AC8B42D21; Wed, 21 Dec 2022 11:50:38 +0100 (CET) Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com [67.231.148.174]) by mails.dpdk.org (Postfix) with ESMTP id 9D94742D1A for ; Wed, 21 Dec 2022 11:50:36 +0100 (CET) Received: from pps.filterd (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 2BLA1fFj017744; Wed, 21 Dec 2022 02:50:35 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=pfpt0220; bh=rJCrfWCVkDP/9V65B4r2SsUz3oKoerIpsKxSdh6RSRs=; b=PvMP25HzqZ2wD1I2KRhgLPahG8WfUrv6nxB4n4j/cFMr8mgv7q5NsBcvmB8OkNcbg+2y 8uCo05dAtye3vwrNjUgTxSYTuWON1c6UsRRs77sJiF6Dntf8tJxaWqh6kVVaMREI7cYK huxUyWghXuuvKAKVtWxtnYK+vK5iAu0pY8fzrzkH9y7C7505MZB1Zo0PcBihLiKjgfFR 6OnZAKolsdQSfbOW74wxO60XRw2+WCeYtQRlhEdCML045sq/R5+ql9GXdg2KHqJ8JwaQ XG3Q6bqB6jFFp62Ddk5GvgwAd1r/wPI9i4dJz/x5JC7qC3Ym5hGkMke6CplcewMRFwwi bw== Received: from dc5-exch01.marvell.com ([199.233.59.181]) by mx0a-0016f401.pphosted.com (PPS) with ESMTPS id 3mksux9waw-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Wed, 21 Dec 2022 02:50:33 -0800 Received: from DC5-EXCH01.marvell.com (10.69.176.38) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server (TLS) id 15.0.1497.42; Wed, 21 Dec 2022 02:50:14 -0800 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server id 15.0.1497.42 via Frontend Transport; Wed, 21 Dec 2022 02:50:14 -0800 Received: from localhost.localdomain (unknown [10.28.36.175]) by maili.marvell.com (Postfix) with ESMTP id 6678E3F7073; Wed, 21 Dec 2022 02:50:12 -0800 (PST) From: Srujana Challa To: , CC: , , , , , Subject: [PATCH 2/4] crypto/cnxk: add callback to report CPT HW error Date: Wed, 21 Dec 2022 16:20:05 +0530 Message-ID: <20221221105007.2667292-2-schalla@marvell.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221221105007.2667292-1-schalla@marvell.com> References: <20221221105007.2667292-1-schalla@marvell.com> MIME-Version: 1.0 X-Proofpoint-GUID: uCtsTrz_lVQj4vQfJBq2S07LGahPpAXt X-Proofpoint-ORIG-GUID: uCtsTrz_lVQj4vQfJBq2S07LGahPpAXt X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.923,Hydra:6.0.545,FMLib:17.11.122.1 definitions=2022-12-21_05,2022-12-21_01,2022-06-22_01 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 Adds and register callback to report CPT MISC error interrupts to the application using rte_cryptodev_pmd_callback_process. Signed-off-by: Srujana Challa --- drivers/crypto/cnxk/cnxk_cryptodev.c | 12 ++++++++++++ drivers/crypto/cnxk/cnxk_cryptodev.h | 1 + drivers/crypto/cnxk/cnxk_cryptodev_ops.c | 8 ++++++++ 3 files changed, 21 insertions(+) diff --git a/drivers/crypto/cnxk/cnxk_cryptodev.c b/drivers/crypto/cnxk/cnxk_cryptodev.c index 35635f7831..fee272d425 100644 --- a/drivers/crypto/cnxk/cnxk_cryptodev.c +++ b/drivers/crypto/cnxk/cnxk_cryptodev.c @@ -2,6 +2,7 @@ * Copyright(C) 2021 Marvell. */ +#include #include #include "roc_cpt.h" @@ -56,3 +57,14 @@ cnxk_cpt_eng_grp_add(struct roc_cpt *roc_cpt) return 0; } + +void +cnxk_cpt_int_misc_cb(struct roc_cpt_lf *lf, __rte_unused void *args) +{ + struct roc_cpt *roc_cpt = lf->roc_cpt; + + if (roc_cpt == NULL) + return; + + rte_cryptodev_pmd_callback_process(roc_cpt->opaque, RTE_CRYPTODEV_EVENT_ERROR); +} diff --git a/drivers/crypto/cnxk/cnxk_cryptodev.h b/drivers/crypto/cnxk/cnxk_cryptodev.h index 48bd6e144c..fcb1c48b5a 100644 --- a/drivers/crypto/cnxk/cnxk_cryptodev.h +++ b/drivers/crypto/cnxk/cnxk_cryptodev.h @@ -31,5 +31,6 @@ struct cnxk_cpt_vf { uint64_t cnxk_cpt_default_ff_get(void); int cnxk_cpt_eng_grp_add(struct roc_cpt *roc_cpt); int cnxk_cpt_parse_devargs(struct rte_devargs *devargs, struct cnxk_cpt_vf *vf); +void cnxk_cpt_int_misc_cb(struct roc_cpt_lf *lf, void *args); #endif /* _CNXK_CRYPTODEV_H_ */ diff --git a/drivers/crypto/cnxk/cnxk_cryptodev_ops.c b/drivers/crypto/cnxk/cnxk_cryptodev_ops.c index a9c42205e6..91c7a686c2 100644 --- a/drivers/crypto/cnxk/cnxk_cryptodev_ops.c +++ b/drivers/crypto/cnxk/cnxk_cryptodev_ops.c @@ -91,6 +91,9 @@ cnxk_cpt_dev_config(struct rte_cryptodev *dev, return ret; } } + roc_cpt->opaque = dev; + /* Register callback to handle CPT_MISC_INT */ + roc_cpt_int_misc_cb_register(cnxk_cpt_int_misc_cb, NULL); return 0; } @@ -150,6 +153,11 @@ cnxk_cpt_dev_close(struct rte_cryptodev *dev) roc_ae_ec_grp_put(); } + ret = roc_cpt_int_misc_cb_unregister(cnxk_cpt_int_misc_cb, NULL); + if (ret < 0) { + plt_err("Could not unregister CPT_MISC_INT cb"); + return ret; + } roc_cpt_dev_clear(&vf->cpt); return 0; From patchwork Wed Dec 21 10:50:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srujana Challa X-Patchwork-Id: 121232 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 C42F0A034C; Wed, 21 Dec 2022 11:50:47 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id EA5D142D1F; Wed, 21 Dec 2022 11:50:40 +0100 (CET) Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com [67.231.148.174]) by mails.dpdk.org (Postfix) with ESMTP id A13FF42D1A for ; Wed, 21 Dec 2022 11:50:37 +0100 (CET) Received: from pps.filterd (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 2BLA3bPc017580; Wed, 21 Dec 2022 02:50:36 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=pfpt0220; bh=2cH0YKxtd4VSZCu60fQUiQOG7B2dZOkvD16oFse1EsA=; b=JRz8oxWz6QuaCtrSZjxVIBMJhgSl8f71WsSh52YGE4M3ilkVVzICtJSzeR8eET/9NKxk XNh5lxTEuzqtpKWRWAQmEmtL+aKYOz34cO2IgQHDRAPypdCYOSfl3yJRhjrGwpjUUW4g 1DeQkHQgGD/+WhQjEil8pzPHxvDfkKzB2mIVTG2X27SY7OQ2EgNN548etMyIYn6Fenpp 0FzKrNLhSyZHk1iwTnUiQWORd9sGJubDGyPJlnLy01LoKD5GDQCTqxz3dmFh559uPzvJ AC8YE1NBIW3+chsK2GjJA0AieHPGh03JrOAfFy3CctPlOH+PFsuZlztogGUlypeAvhuj Xw== Received: from dc5-exch01.marvell.com ([199.233.59.181]) by mx0a-0016f401.pphosted.com (PPS) with ESMTPS id 3mksux9wdw-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Wed, 21 Dec 2022 02:50:36 -0800 Received: from DC5-EXCH02.marvell.com (10.69.176.39) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server (TLS) id 15.0.1497.42; Wed, 21 Dec 2022 02:50:19 -0800 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server id 15.0.1497.42 via Frontend Transport; Wed, 21 Dec 2022 02:50:19 -0800 Received: from localhost.localdomain (unknown [10.28.36.175]) by maili.marvell.com (Postfix) with ESMTP id 4336B3F70A4; Wed, 21 Dec 2022 02:50:15 -0800 (PST) From: Srujana Challa To: , CC: , , , , , Subject: [PATCH 3/4] cryptodev: introduce query API for error interrupt event Date: Wed, 21 Dec 2022 16:20:06 +0530 Message-ID: <20221221105007.2667292-3-schalla@marvell.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221221105007.2667292-1-schalla@marvell.com> References: <20221221105007.2667292-1-schalla@marvell.com> MIME-Version: 1.0 X-Proofpoint-GUID: kHworc23uhN6dOrepvQTwPYFhcsv95Pn X-Proofpoint-ORIG-GUID: kHworc23uhN6dOrepvQTwPYFhcsv95Pn X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.923,Hydra:6.0.545,FMLib:17.11.122.1 definitions=2022-12-21_05,2022-12-21_01,2022-06-22_01 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 An event RTE_CRYPTODEV_EVENT_ERROR gets fired when crypto PMD receives an error interrupt. This patch adds query function for the application, to get more info about the event. Signed-off-by: Srujana Challa --- lib/cryptodev/cryptodev_pmd.h | 9 +++++++++ lib/cryptodev/rte_cryptodev.c | 19 +++++++++++++++++++ lib/cryptodev/rte_cryptodev.h | 19 +++++++++++++++++++ lib/cryptodev/version.map | 3 +++ 4 files changed, 50 insertions(+) diff --git a/lib/cryptodev/cryptodev_pmd.h b/lib/cryptodev/cryptodev_pmd.h index 0020102eb7..0dfad9e24f 100644 --- a/lib/cryptodev/cryptodev_pmd.h +++ b/lib/cryptodev/cryptodev_pmd.h @@ -451,6 +451,13 @@ typedef int (*cryptodev_session_event_mdata_set_t)( enum rte_crypto_op_sess_type sess_type, void *ev_mdata); +/** + * @internal Query queue pair error interrupt event. + * @see rte_cryptodev_queue_pair_event_error_query() + */ +typedef int (*cryptodev_queue_pair_event_error_query_t)(struct rte_cryptodev *dev, + uint16_t qp_id); + /** Crypto device operations function pointer table */ struct rte_cryptodev_ops { cryptodev_configure_t dev_configure; /**< Configure device. */ @@ -497,6 +504,8 @@ struct rte_cryptodev_ops { }; cryptodev_session_event_mdata_set_t session_ev_mdata_set; /**< Set a Crypto or Security session even meta data. */ + cryptodev_queue_pair_event_error_query_t queue_pair_event_error_query; + /**< Query queue error interrupt event */ }; diff --git a/lib/cryptodev/rte_cryptodev.c b/lib/cryptodev/rte_cryptodev.c index 2165a0688c..89ff66d2ba 100644 --- a/lib/cryptodev/rte_cryptodev.c +++ b/lib/cryptodev/rte_cryptodev.c @@ -1863,6 +1863,25 @@ rte_cryptodev_pmd_callback_process(struct rte_cryptodev *dev, rte_spinlock_unlock(&rte_cryptodev_cb_lock); } +int +rte_cryptodev_queue_pair_event_error_query(uint8_t dev_id, uint16_t qp_id) +{ + struct rte_cryptodev *dev; + + if (!rte_cryptodev_is_valid_dev(dev_id)) { + CDEV_LOG_ERR("Invalid dev_id=%" PRIu8, dev_id); + return -EINVAL; + } + dev = &rte_crypto_devices[dev_id]; + + if (qp_id >= dev->data->nb_queue_pairs) + return -EINVAL; + if (*dev->dev_ops->queue_pair_event_error_query == NULL) + return -ENOTSUP; + + return dev->dev_ops->queue_pair_event_error_query(dev, qp_id); +} + struct rte_mempool * rte_cryptodev_sym_session_pool_create(const char *name, uint32_t nb_elts, uint32_t elt_size, uint32_t cache_size, uint16_t user_data_size, diff --git a/lib/cryptodev/rte_cryptodev.h b/lib/cryptodev/rte_cryptodev.h index 86d792e2e7..5f11a538fb 100644 --- a/lib/cryptodev/rte_cryptodev.h +++ b/lib/cryptodev/rte_cryptodev.h @@ -871,6 +871,25 @@ rte_cryptodev_callback_unregister(uint8_t dev_id, enum rte_cryptodev_event_type event, rte_cryptodev_cb_fn cb_fn, void *cb_arg); +/** + * @warning + * @b EXPERIMENTAL: this API may change without prior notice. + * + * Query a cryptodev queue pair if there are pending RTE_CRYPTODEV_EVENT_ERROR + * events. + * + * @param dev_id The device identifier. + * @param qp_id Queue pair index to be queried. + * + * @return + * - 1 if requested queue has a pending event. + * - 0 if no pending event is found. + * - a negative value on failure + */ +__rte_experimental +int +rte_cryptodev_queue_pair_event_error_query(uint8_t dev_id, uint16_t qp_id); + struct rte_cryptodev_callback; /** Structure to keep track of registered callbacks */ diff --git a/lib/cryptodev/version.map b/lib/cryptodev/version.map index 00c99fb45c..214c91a06f 100644 --- a/lib/cryptodev/version.map +++ b/lib/cryptodev/version.map @@ -150,6 +150,9 @@ EXPERIMENTAL { __rte_cryptodev_trace_sym_session_get_user_data; __rte_cryptodev_trace_sym_session_set_user_data; __rte_cryptodev_trace_count; + + # added in 23.03 + rte_cryptodev_queue_pair_event_error_query; }; INTERNAL { From patchwork Wed Dec 21 10:50:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srujana Challa X-Patchwork-Id: 121230 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 CD957A034C; Wed, 21 Dec 2022 11:50:31 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DBDCC42D0D; Wed, 21 Dec 2022 11:50:29 +0100 (CET) Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com [67.231.148.174]) by mails.dpdk.org (Postfix) with ESMTP id 0047140A7F for ; Wed, 21 Dec 2022 11:50:27 +0100 (CET) Received: from pps.filterd (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 2BLA3bPX017580; Wed, 21 Dec 2022 02:50:27 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=pfpt0220; bh=LkFOFdyfCIcMNLPOcxok6PkPUEo+vwReNbJuyhDOtpo=; b=hhzSyDHvp53dXUAChgn0tWq3g/JMgADVCAcS2X7kb2Y6KoeCIthlRmOSS8pjeVg0wXSm dv47Egte48j/lXn+Z3h2nrnby6uHBivTqiQMa/XNFMq/aXAlLMKJs5tjNW4O0Tdle8Y3 t5N/QnU4Sga9gu0tBFxHzESqCYiKVtvJy0UKn45F8GYYFhBYdxb6RjTf1tK7ScbX2Ug6 fce+S2mhMLUX+F7TsqCdbQmrvlGzxNT5aCJDOfrBabcuSUNbsbUCaF1zJk0UO4TD71pG edhsTEBkgQxRtuI2fBJpze5T5uaJSfdA8DSddALFB7IrVdu0eClbRChxxKfkaW/iQR+j uw== Received: from dc5-exch02.marvell.com ([199.233.59.182]) by mx0a-0016f401.pphosted.com (PPS) with ESMTPS id 3mksux9wb5-5 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Wed, 21 Dec 2022 02:50:26 -0800 Received: from DC5-EXCH01.marvell.com (10.69.176.38) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server (TLS) id 15.0.1497.42; Wed, 21 Dec 2022 02:50:21 -0800 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server id 15.0.1497.42 via Frontend Transport; Wed, 21 Dec 2022 02:50:21 -0800 Received: from localhost.localdomain (unknown [10.28.36.175]) by maili.marvell.com (Postfix) with ESMTP id 20FBD3F7080; Wed, 21 Dec 2022 02:50:17 -0800 (PST) From: Srujana Challa To: , CC: , , , , , Subject: [PATCH 4/4] crypto/cnxk: add error interrupt event query handler Date: Wed, 21 Dec 2022 16:20:07 +0530 Message-ID: <20221221105007.2667292-4-schalla@marvell.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221221105007.2667292-1-schalla@marvell.com> References: <20221221105007.2667292-1-schalla@marvell.com> MIME-Version: 1.0 X-Proofpoint-GUID: Tkyohuj2zz1XKaUiQz9678jCRnQ5QC5I X-Proofpoint-ORIG-GUID: Tkyohuj2zz1XKaUiQz9678jCRnQ5QC5I X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.923,Hydra:6.0.545,FMLib:17.11.122.1 definitions=2022-12-21_05,2022-12-21_01,2022-06-22_01 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 Adds RTE_CRYPTODEV_EVENT_ERROR query handler for cn9k/cn10k PMD. The query handler finds the next queue pair ID with pending error interrupt event if any, starting from the given queue pair index, for the device. Signed-off-by: Srujana Challa --- drivers/common/cnxk/roc_cpt.c | 4 +++- drivers/common/cnxk/roc_cpt.h | 1 + drivers/crypto/cnxk/cn10k_cryptodev_ops.c | 1 + drivers/crypto/cnxk/cn9k_cryptodev_ops.c | 1 + drivers/crypto/cnxk/cnxk_cryptodev_ops.c | 15 +++++++++++++++ drivers/crypto/cnxk/cnxk_cryptodev_ops.h | 1 + 6 files changed, 22 insertions(+), 1 deletion(-) diff --git a/drivers/common/cnxk/roc_cpt.c b/drivers/common/cnxk/roc_cpt.c index 553a5a2c80..3d90260b96 100644 --- a/drivers/common/cnxk/roc_cpt.c +++ b/drivers/common/cnxk/roc_cpt.c @@ -63,8 +63,10 @@ cpt_lf_misc_irq(void *param) /* Clear interrupt */ plt_write64(intr, lf->rbase + CPT_LF_MISC_INT); - if (int_cb.cb != NULL) + if (int_cb.cb != NULL) { + lf->error_event_pending = 1; int_cb.cb(lf, int_cb.cb_args); + } } static int diff --git a/drivers/common/cnxk/roc_cpt.h b/drivers/common/cnxk/roc_cpt.h index ac8be1b475..e9ce4cb831 100644 --- a/drivers/common/cnxk/roc_cpt.h +++ b/drivers/common/cnxk/roc_cpt.h @@ -119,6 +119,7 @@ struct roc_cpt_lf { uint64_t io_addr; uint8_t *iq_vaddr; struct roc_nix *inl_outb_nix; + uint8_t error_event_pending; } __plt_cache_aligned; struct roc_cpt { diff --git a/drivers/crypto/cnxk/cn10k_cryptodev_ops.c b/drivers/crypto/cnxk/cn10k_cryptodev_ops.c index 7dad370047..009d26d433 100644 --- a/drivers/crypto/cnxk/cn10k_cryptodev_ops.c +++ b/drivers/crypto/cnxk/cn10k_cryptodev_ops.c @@ -1082,4 +1082,5 @@ struct rte_cryptodev_ops cn10k_cpt_ops = { /* Event crypto ops */ .session_ev_mdata_set = cn10k_cpt_crypto_adapter_ev_mdata_set, + .queue_pair_event_error_query = cnxk_cpt_queue_pair_event_error_query, }; diff --git a/drivers/crypto/cnxk/cn9k_cryptodev_ops.c b/drivers/crypto/cnxk/cn9k_cryptodev_ops.c index 04c004bc7a..a86d45a40c 100644 --- a/drivers/crypto/cnxk/cn9k_cryptodev_ops.c +++ b/drivers/crypto/cnxk/cn9k_cryptodev_ops.c @@ -759,5 +759,6 @@ struct rte_cryptodev_ops cn9k_cpt_ops = { /* Event crypto ops */ .session_ev_mdata_set = cn9k_cpt_crypto_adapter_ev_mdata_set, + .queue_pair_event_error_query = cnxk_cpt_queue_pair_event_error_query, }; diff --git a/drivers/crypto/cnxk/cnxk_cryptodev_ops.c b/drivers/crypto/cnxk/cnxk_cryptodev_ops.c index 91c7a686c2..d8cbe5cd74 100644 --- a/drivers/crypto/cnxk/cnxk_cryptodev_ops.c +++ b/drivers/crypto/cnxk/cnxk_cryptodev_ops.c @@ -806,3 +806,18 @@ cnxk_cpt_dump_on_err(struct cnxk_cpt_qp *qp) plt_print(""); roc_cpt_afs_print(qp->lf.roc_cpt); } + +int +cnxk_cpt_queue_pair_event_error_query(struct rte_cryptodev *dev, uint16_t qp_id) +{ + struct cnxk_cpt_vf *vf = dev->data->dev_private; + struct roc_cpt *roc_cpt = &vf->cpt; + struct roc_cpt_lf *lf; + + lf = roc_cpt->lf[qp_id]; + if (lf && lf->error_event_pending) { + lf->error_event_pending = 0; + return 1; + } + return 0; +} diff --git a/drivers/crypto/cnxk/cnxk_cryptodev_ops.h b/drivers/crypto/cnxk/cnxk_cryptodev_ops.h index 13c90444d6..2b25cfe1c4 100644 --- a/drivers/crypto/cnxk/cnxk_cryptodev_ops.h +++ b/drivers/crypto/cnxk/cnxk_cryptodev_ops.h @@ -128,6 +128,7 @@ int cnxk_ae_session_cfg(struct rte_cryptodev *dev, struct rte_crypto_asym_xform *xform, struct rte_cryptodev_asym_session *sess); void cnxk_cpt_dump_on_err(struct cnxk_cpt_qp *qp); +int cnxk_cpt_queue_pair_event_error_query(struct rte_cryptodev *dev, uint16_t qp_id); static __rte_always_inline void pending_queue_advance(uint64_t *index, const uint64_t mask)