security: support MACsec
Subsystems (2)
PATCH v2 4/15 common/cnxk: add MACsec secy and flow configuration
In reply to Akhil GoyalAdded ROC APIs to configure MACsec secy policy and flow entries.
--- drivers/common/cnxk/roc_mbox.h | 38 +++++++++ drivers/common/cnxk/roc_mcs.h | 37 +++++++++ drivers/common/cnxk/roc_mcs_sec_cfg.c | 115 ++++++++++++++++++++++++++ drivers/common/cnxk/version.map | 5 ++ 4 files changed, 195 insertions(+)
drivers/common/cnxk/roc_mbox.h +38 -0
@@ -300,10 +300,14 @@ struct mbox_msghdr {M (MCS_ALLOC_RESOURCES ,0xa000 , mcs_alloc_resources, mcs_alloc_rsrc_req, \ mcs_alloc_rsrc_rsp) \ M(MCS_FREE_RESOURCES, 0xa001, mcs_free_resources, mcs_free_rsrc_req, msg_rsp) \ +M (MCS_FLOWID_ENTRY_WRITE ,0xa002 , mcs_flowid_entry_write, mcs_flowid_entry_write_req, \ + msg_rsp) \ + M(MCS_SECY_PLCY_WRITE, 0xa003, mcs_secy_plcy_write, mcs_secy_plcy_write_req, msg_rsp) \ M(MCS_RX_SC_CAM_WRITE, 0xa004, mcs_rx_sc_cam_write, mcs_rx_sc_cam_write_req, msg_rsp) \ M(MCS_SA_PLCY_WRITE, 0xa005, mcs_sa_plcy_write, mcs_sa_plcy_write_req, msg_rsp) \ M(MCS_TX_SC_SA_MAP_WRITE, 0xa006, mcs_tx_sc_sa_map_write, mcs_tx_sc_sa_map, msg_rsp) \ M(MCS_RX_SC_SA_MAP_WRITE, 0xa007, mcs_rx_sc_sa_map_write, mcs_rx_sc_sa_map, msg_rsp) \ + M(MCS_FLOWID_ENA_ENTRY, 0xa008, mcs_flowid_ena_entry, mcs_flowid_ena_dis_entry, msg_rsp) \M (MCS_GET_HW_INFO ,0xa00b , mcs_get_hw_info, msg_req, mcs_hw_info) \/* Messages initiated by AF (range 0xC00 - 0xDFF) */
@@ -729,6 +733,31 @@ struct mcs_free_rsrc_req { uint64_t __io rsvd; }; +struct mcs_flowid_entry_write_req { +struct mbox_msghdr hdr; + uint64_t __io data[4]; + uint64_t __io mask[4]; + uint64_t __io sci; /* CNF10K-B for tx_secy_mem_map */ + uint8_t __io flow_id; + uint8_t __io secy_id; /* secyid for which flowid is mapped */ +/* sc_id is Valid if dir = MCS_TX, SC_CAM id mapped to flowid */ + uint8_t __io sc_id; + uint8_t __io ena; /* Enable tcam entry */ + uint8_t __io ctr_pkt; + uint8_t __io mcs_id; + uint8_t __io dir; + uint64_t __io rsvd; +}; + +struct mcs_secy_plcy_write_req { +struct mbox_msghdr hdr; + uint64_t __io plcy; + uint8_t __io secy_id; + uint8_t __io mcs_id; + uint8_t __io dir; + uint64_t __io rsvd; +}; +/* RX SC_CAM mapping */ struct mcs_rx_sc_cam_write_req {struct mbox_msghdr hdr;
@@ -774,6 +803,15 @@ struct mcs_rx_sc_sa_map { uint64_t __io rsvd; }; +struct mcs_flowid_ena_dis_entry { +struct mbox_msghdr hdr; + uint8_t __io flow_id; + uint8_t __io ena; + uint8_t __io mcs_id; + uint8_t __io dir; + uint64_t __io rsvd; +}; +struct mcs_hw_info {struct mbox_msghdr hdr; uint8_t __io num_mcs_blks; /* Number of MCS blocks */
drivers/common/cnxk/roc_mcs.h +37 -0
@@ -32,6 +32,24 @@ struct roc_mcs_free_rsrc_req {uint8_t all;/* Free all the cam resources */ }; +struct roc_mcs_flowid_entry_write_req { +uint64_t data[4 ]; +uint64_t mask[4 ]; +uint64_t sci;/* 105N for tx_secy_mem_map */ +uint8_t flow_id; +uint8_t secy_id;/* secyid for which flowid is mapped */ +uint8_t sc_id;/* Valid if dir = MCS_TX, SC_CAM id mapped to flowid */ +uint8_t ena;/* Enable tcam entry */ +uint8_t ctr_pkt; +uint8_t dir; +}; + +struct roc_mcs_secy_plcy_write_req { +uint64_t plcy; +uint8_t secy_id; +uint8_t dir; +}; +/* RX SC_CAM mapping */ struct roc_mcs_rx_sc_cam_write_req {uint64_t sci;/* SCI */
@@ -64,6 +82,12 @@ struct roc_mcs_rx_sc_sa_map {uint8_t an;/* value range 0-3, sc_id + an used as index SA_MEM_MAP */ }; +struct roc_mcs_flowid_ena_dis_entry { +uint8_t flow_id; +uint8_t ena; +uint8_t dir; +}; +struct roc_mcs_hw_info {uint8_t num_mcs_blks;/* Number of MCS blocks */ uint8_t tcam_entries;/* RX/TX Tcam entries per mcs block */
@@ -112,6 +136,11 @@ __roc_api int roc_mcs_rx_sc_cam_read(struct roc_mcs *mcs, struct roc_mcs_rx_sc_cam_write_req *rx_sc_cam); __roc_api int roc_mcs_rx_sc_cam_enable(struct roc_mcs *mcs,struct roc_mcs_rx_sc_cam_write_req *rx_sc_cam); +/* SECY policy read and write */ +__roc_api int roc_mcs_secy_policy_write(struct roc_mcs *mcs, +struct roc_mcs_secy_plcy_write_req *secy_plcy); +__roc_api int roc_mcs_secy_policy_read(struct roc_mcs *mcs, +struct roc_mcs_rx_sc_cam_write_req *rx_sc_cam);/* RX SC-SA MAP read and write */ __roc_api int roc_mcs_rx_sc_sa_map_write(struct roc_mcs *mcs,struct roc_mcs_rx_sc_sa_map *rx_sc_sa_map);
@@ -122,4 +151,12 @@ __roc_api int roc_mcs_tx_sc_sa_map_write(struct roc_mcs *mcs, struct roc_mcs_tx_sc_sa_map *tx_sc_sa_map); __roc_api int roc_mcs_tx_sc_sa_map_read(struct roc_mcs *mcs,struct roc_mcs_tx_sc_sa_map *tx_sc_sa_map); +/* Flow entry read, write and enable */ +__roc_api int roc_mcs_flowid_entry_write(struct roc_mcs *mcs, +struct roc_mcs_flowid_entry_write_req *flowid_req); +__roc_api int roc_mcs_flowid_entry_read(struct roc_mcs *mcs, +struct roc_mcs_flowid_entry_write_req *flowid_rsp); +__roc_api int roc_mcs_flowid_entry_enable(struct roc_mcs *mcs, +struct roc_mcs_flowid_ena_dis_entry *entry); +#endif /* _ROC_MCS_H_ */
drivers/common/cnxk/roc_mcs_sec_cfg.c +115 -0
124 lines not on this page · raw message
drivers/common/cnxk/version.map +5 -0
@@ -138,6 +138,9 @@ INTERNAL { roc_mcs_dev_init; roc_mcs_dev_fini; roc_mcs_dev_get; + roc_mcs_flowid_entry_enable; + roc_mcs_flowid_entry_read; + roc_mcs_flowid_entry_write; roc_mcs_hw_info_get; roc_mcs_rsrc_alloc; roc_mcs_rsrc_free;
@@ -148,6 +151,8 @@ INTERNAL { roc_mcs_rx_sc_sa_map_write; roc_mcs_sa_policy_read; roc_mcs_sa_policy_write; + roc_mcs_secy_policy_read; + roc_mcs_secy_policy_write; roc_mcs_tx_sc_sa_map_read; roc_mcs_tx_sc_sa_map_write; roc_nix_bpf_alloc;
Signature · 1 line
2.25.1
PATCH v2 5/15 common/cnxk: add MACsec PN and LMAC mode configuration
In reply to Akhil GoyalAdded ROC APIs for setting packet number and LMAC
related configurations.
--- drivers/common/cnxk/roc_mbox.h | 56 +++++++++++++++++++++ drivers/common/cnxk/roc_mcs.c | 71 +++++++++++++++++++++++++++ drivers/common/cnxk/roc_mcs.h | 48 ++++++++++++++++++ drivers/common/cnxk/roc_mcs_sec_cfg.c | 31 ++++++++++++ drivers/common/cnxk/version.map | 5 ++ 5 files changed, 211 insertions(+)
drivers/common/cnxk/roc_mbox.h +56 -0
@@ -308,7 +308,11 @@ struct mbox_msghdr { M(MCS_TX_SC_SA_MAP_WRITE, 0xa006, mcs_tx_sc_sa_map_write, mcs_tx_sc_sa_map, msg_rsp) \ M(MCS_RX_SC_SA_MAP_WRITE, 0xa007, mcs_rx_sc_sa_map_write, mcs_rx_sc_sa_map, msg_rsp) \ M(MCS_FLOWID_ENA_ENTRY, 0xa008, mcs_flowid_ena_entry, mcs_flowid_ena_dis_entry, msg_rsp) \ + M(MCS_PN_TABLE_WRITE, 0xa009, mcs_pn_table_write, mcs_pn_table_write_req, msg_rsp) \ + M(MCS_SET_ACTIVE_LMAC, 0xa00a, mcs_set_active_lmac, mcs_set_active_lmac, msg_rsp) \ M(MCS_GET_HW_INFO, 0xa00b, mcs_get_hw_info, msg_req, mcs_hw_info) \ + M(MCS_SET_LMAC_MODE, 0xa013, mcs_set_lmac_mode, mcs_set_lmac_mode, msg_rsp) \ +M (MCS_SET_PN_THRESHOLD ,0xa014 , mcs_set_pn_threshold, mcs_set_pn_threshold, msg_rsp) \ /* Messages initiated by AF (range 0xC00 - 0xDFF) */#define MBOX_UP_CGX_MESSAGES \
@@ -812,6 +816,34 @@ struct mcs_flowid_ena_dis_entry { uint64_t __io rsvd; }; +struct mcs_pn_table_write_req { +struct mbox_msghdr hdr; + uint64_t __io next_pn; + uint8_t __io pn_id; + uint8_t __io mcs_id; + uint8_t __io dir; + uint64_t __io rsvd; +}; + +struct mcs_cam_entry_read_req { +struct mbox_msghdr hdr; + uint8_t __io rsrc_type; /* TCAM/SECY/SC/SA/PN */ + uint8_t __io rsrc_id; + uint8_t __io mcs_id; + uint8_t __io dir; + uint64_t __io rsvd; +}; + +struct mcs_cam_entry_read_rsp { +struct mbox_msghdr hdr; + uint64_t __io reg_val[10]; + uint8_t __io rsrc_type; + uint8_t __io rsrc_id; + uint8_t __io mcs_id; + uint8_t __io dir; + uint64_t __io rsvd; +}; +struct mcs_hw_info {struct mbox_msghdr hdr; uint8_t __io num_mcs_blks; /* Number of MCS blocks */
@@ -822,6 +854,30 @@ struct mcs_hw_info { uint64_t __io rsvd[16]; }; +struct mcs_set_active_lmac { +struct mbox_msghdr hdr; + uint32_t __io lmac_bmap; /* bitmap of active lmac per mcs block */ + uint8_t __io mcs_id; + uint16_t __io channel_base; /* MCS channel base */ + uint64_t __io rsvd; +}; + +struct mcs_set_lmac_mode { +struct mbox_msghdr hdr; + uint8_t __io mode; /* '1' for internal bypass mode (passthrough), '0' for MCS processing */ + uint8_t __io lmac_id; + uint8_t __io mcs_id; + uint64_t __io rsvd; +}; + +struct mcs_set_pn_threshold { +struct mbox_msghdr hdr; + uint64_t __io threshold; + uint8_t __io xpn; /* '1' for setting xpn threshold */ + uint8_t __io mcs_id; + uint8_t __io dir; + uint64_t __io rsvd; +};/* NPA mbox message formats */
drivers/common/cnxk/roc_mcs.c +71 -0
77 lines not on this page · raw message
drivers/common/cnxk/roc_mcs.h +48 -0
72 lines not on this page · raw message
drivers/common/cnxk/roc_mcs_sec_cfg.c +31 -0
@@ -210,6 +210,37 @@ roc_mcs_sa_policy_read(struct roc_mcs *mcs __plt_unused,return -ENOTSUP ; } +int +roc_mcs_pn_table_write (struct roc_mcs *mcs,struct roc_mcs_pn_table_write_req *pn_table) +{ +struct mcs_pn_table_write_req *pn; +struct msg_rsp *rsp; + +MCS_SUPPORT_CHECK ; + +if (pn_table ==NULL ) +return -EINVAL ; + + pn =mbox_alloc_msg_mcs_pn_table_write (mcs->mbox); +if (pn ==NULL ) +return -ENOMEM ; + + pn->next_pn = pn_table->next_pn; + pn->pn_id = pn_table->pn_id; + pn->mcs_id = mcs->idx; + pn->dir = pn_table->dir; + +return mbox_process_msg (mcs->mbox, (void *)&rsp); +} + +int +roc_mcs_pn_table_read(struct roc_mcs *mcs __plt_unused, + struct roc_mcs_pn_table_write_req *sa __plt_unused) +{ +MCS_SUPPORT_CHECK ; + +return -ENOTSUP ; +}int roc_mcs_rx_sc_cam_write (struct roc_mcs *mcs,struct roc_mcs_rx_sc_cam_write_req *rx_sc_cam)
drivers/common/cnxk/version.map +5 -0
@@ -135,6 +135,7 @@ INTERNAL { roc_se_auth_key_set; roc_se_ciph_key_set; roc_se_ctx_init; + roc_mcs_active_lmac_set; roc_mcs_dev_init; roc_mcs_dev_fini; roc_mcs_dev_get;
@@ -142,6 +143,10 @@ INTERNAL { roc_mcs_flowid_entry_read; roc_mcs_flowid_entry_write; roc_mcs_hw_info_get; + roc_mcs_lmac_mode_set; + roc_mcs_pn_table_write; + roc_mcs_pn_table_read; + roc_mcs_pn_threshold_set; roc_mcs_rsrc_alloc; roc_mcs_rsrc_free; roc_mcs_rx_sc_cam_enable;
Signature · 1 line
2.25.1
PATCH v2 6/15 common/cnxk: add MACsec stats
In reply to Akhil GoyalAdded ROC APIs for MACsec stats for SC/SECY/FLOW/PORT
--- drivers/common/cnxk/meson.build | 1 + drivers/common/cnxk/roc_mbox.h | 93 ++++++++++++++ drivers/common/cnxk/roc_mcs.h | 85 ++++++++++++ drivers/common/cnxk/roc_mcs_stats.c | 193 ++++++++++++++++++++++++++++ drivers/common/cnxk/version.map | 5 + 5 files changed, 377 insertions(+) create mode 100644 drivers/common/cnxk/roc_mcs_stats.c
drivers/common/cnxk/meson.build +1 -0
@@ -28,6 +28,7 @@ sources = files( 'roc_mbox.c', 'roc_mcs.c', 'roc_mcs_sec_cfg.c', + 'roc_mcs_stats.c', 'roc_ml.c', 'roc_model.c', 'roc_nix.c',
drivers/common/cnxk/roc_mbox.h +93 -0
105 lines not on this page · raw message
drivers/common/cnxk/roc_mcs.h +85 -0
95 lines not on this page · raw message
drivers/common/cnxk/roc_mcs_stats.c new file +193 -0
193 lines not on this page · raw message
drivers/common/cnxk/version.map +5 -0
@@ -142,11 +142,13 @@ INTERNAL { roc_mcs_flowid_entry_enable; roc_mcs_flowid_entry_read; roc_mcs_flowid_entry_write; + roc_mcs_flowid_stats_get; roc_mcs_hw_info_get; roc_mcs_lmac_mode_set; roc_mcs_pn_table_write; roc_mcs_pn_table_read; roc_mcs_pn_threshold_set; + roc_mcs_port_stats_get; roc_mcs_rsrc_alloc; roc_mcs_rsrc_free; roc_mcs_rx_sc_cam_enable;
@@ -156,8 +158,11 @@ INTERNAL { roc_mcs_rx_sc_sa_map_write; roc_mcs_sa_policy_read; roc_mcs_sa_policy_write; + roc_mcs_sc_stats_get; roc_mcs_secy_policy_read; roc_mcs_secy_policy_write; + roc_mcs_secy_stats_get; + roc_mcs_stats_clear; roc_mcs_tx_sc_sa_map_read; roc_mcs_tx_sc_sa_map_write; roc_nix_bpf_alloc;
Signature · 1 line
2.25.1
PATCH v2 7/15 common/cnxk: add MACsec interrupt APIs
In reply to Akhil GoyalAdded ROC APIs to support various MACsec interrupts.
--- drivers/common/cnxk/roc_dev.c | 86 +++++++++++++++++ drivers/common/cnxk/roc_mbox.h | 37 +++++++- drivers/common/cnxk/roc_mcs.c | 117 +++++++++++++++++++++++ drivers/common/cnxk/roc_mcs.h | 144 +++++++++++++++++++++++++++++ drivers/common/cnxk/roc_mcs_priv.h | 8 ++ drivers/common/cnxk/version.map | 3 + 6 files changed, 394 insertions(+), 1 deletion(-)
drivers/common/cnxk/roc_dev.c +86 -0
@@ -514,6 +514,91 @@ pf_vf_mbox_send_up_msg(struct dev *dev, void *rec_msg) } } +static int +mbox_up_handler_mcs_intr_notify (struct dev *dev,struct mcs_intr_info *info,struct msg_rsp *rsp) +{ +struct roc_mcs_event_desc desc = {0 }; +struct roc_mcs *mcs; + +plt_base_dbg ("pf:%d/vf:%d msg id 0x%x (%s) from: pf:%d/vf:%d" ,dev_get_pf (dev->pf_func), +dev_get_vf (dev->pf_func), info->hdr.id,mbox_id2name (info->hdr.id), +dev_get_pf (info->hdr.pcifunc),dev_get_vf (info->hdr.pcifunc)); + + mcs =roc_idev_mcs_get (info->mcs_id); +if (!mcs) + goto exit; + +if (info->intr_mask) { +switch (info->intr_mask) { +case MCS_CPM_RX_SECTAG_V_EQ1_INT : + desc.type =ROC_MCS_EVENT_SECTAG_VAL_ERR ; + desc.subtype =ROC_MCS_EVENT_RX_SECTAG_V_EQ1 ; +break ; +case MCS_CPM_RX_SECTAG_E_EQ0_C_EQ1_INT : + desc.type =ROC_MCS_EVENT_SECTAG_VAL_ERR ; + desc.subtype =ROC_MCS_EVENT_RX_SECTAG_E_EQ0_C_EQ1 ; +break ; +case MCS_CPM_RX_SECTAG_SL_GTE48_INT : + desc.type =ROC_MCS_EVENT_SECTAG_VAL_ERR ; + desc.subtype =ROC_MCS_EVENT_RX_SECTAG_SL_GTE48 ; +break ; +case MCS_CPM_RX_SECTAG_ES_EQ1_SC_EQ1_INT : + desc.type =ROC_MCS_EVENT_SECTAG_VAL_ERR ; + desc.subtype =ROC_MCS_EVENT_RX_SECTAG_ES_EQ1_SC_EQ1 ; +break ; +case MCS_CPM_RX_SECTAG_SC_EQ1_SCB_EQ1_INT : + desc.type =ROC_MCS_EVENT_SECTAG_VAL_ERR ; + desc.subtype =ROC_MCS_EVENT_RX_SECTAG_SC_EQ1_SCB_EQ1 ; +break ; +case MCS_CPM_RX_PACKET_XPN_EQ0_INT : + desc.type =ROC_MCS_EVENT_RX_SA_PN_HARD_EXP ; + desc.metadata.sa_idx = info->sa_id; +break ; +case MCS_CPM_RX_PN_THRESH_REACHED_INT : + desc.type =ROC_MCS_EVENT_RX_SA_PN_SOFT_EXP ; + desc.metadata.sa_idx = info->sa_id; +break ; +case MCS_CPM_TX_PACKET_XPN_EQ0_INT : + desc.type =ROC_MCS_EVENT_TX_SA_PN_HARD_EXP ; + desc.metadata.sa_idx = info->sa_id; +break ; +case MCS_CPM_TX_PN_THRESH_REACHED_INT : + desc.type =ROC_MCS_EVENT_TX_SA_PN_SOFT_EXP ; + desc.metadata.sa_idx = info->sa_id; +break ; +case MCS_CPM_TX_SA_NOT_VALID_INT : + desc.type =ROC_MCS_EVENT_SA_NOT_VALID ; +break ; +case MCS_BBE_RX_DFIFO_OVERFLOW_INT : +case MCS_BBE_TX_DFIFO_OVERFLOW_INT : + desc.type =ROC_MCS_EVENT_FIFO_OVERFLOW ; + desc.subtype =ROC_MCS_EVENT_DATA_FIFO_OVERFLOW ; + desc.metadata.lmac_id = info->lmac_id; +break ; +case MCS_BBE_RX_PLFIFO_OVERFLOW_INT : +case MCS_BBE_TX_PLFIFO_OVERFLOW_INT : + desc.type =ROC_MCS_EVENT_FIFO_OVERFLOW ; + desc.subtype =ROC_MCS_EVENT_POLICY_FIFO_OVERFLOW ; + desc.metadata.lmac_id = info->lmac_id; +break ; +case MCS_PAB_RX_CHAN_OVERFLOW_INT : +case MCS_PAB_TX_CHAN_OVERFLOW_INT : + desc.type =ROC_MCS_EVENT_FIFO_OVERFLOW ; + desc.subtype =ROC_MCS_EVENT_PKT_ASSM_FIFO_OVERFLOW ; + desc.metadata.lmac_id = info->lmac_id; +break ; +default : + goto exit; + } + +mcs_event_cb_process (mcs, &desc); + } + +exit: + rsp->hdr.rc =0 ; +return 0 ; +} +static int mbox_up_handler_cgx_link_event (struct dev *dev,struct cgx_link_info_msg *msg,struct msg_rsp *rsp)
@@ -602,6 +687,7 @@ mbox_process_msgs_up(struct dev *dev, struct mbox_msghdr *req)return err; \ }MBOX_UP_CGX_MESSAGES + MBOX_UP_MCS_MESSAGES#undef M }
drivers/common/cnxk/roc_mbox.h +36 -1
@@ -316,6 +316,7 @@ struct mbox_msghdr { M(MCS_GET_SC_STATS, 0xa00e, mcs_get_sc_stats, mcs_stats_req, mcs_sc_stats) \ M(MCS_GET_PORT_STATS, 0xa010, mcs_get_port_stats, mcs_stats_req, mcs_port_stats) \ M(MCS_CLEAR_STATS, 0xa011, mcs_clear_stats, mcs_clear_stats, msg_rsp) \ + M(MCS_INTR_CFG, 0xa012, mcs_intr_cfg, mcs_intr_cfg, msg_rsp) \ M(MCS_SET_LMAC_MODE, 0xa013, mcs_set_lmac_mode, mcs_set_lmac_mode, msg_rsp) \M (MCS_SET_PN_THRESHOLD ,0xa014 , mcs_set_pn_threshold, mcs_set_pn_threshold, msg_rsp) \
@@ -324,9 +325,11 @@ struct mbox_msghdr { M(CGX_LINK_EVENT, 0xC00, cgx_link_event, cgx_link_info_msg, msg_rsp) \ M(CGX_PTP_RX_INFO, 0xC01, cgx_ptp_rx_info, cgx_ptp_rx_info_msg, msg_rsp) +#define MBOX_UP_MCS_MESSAGES M(MCS_INTR_NOTIFY, 0xE00, mcs_intr_notify, mcs_intr_info, msg_rsp) +enum { #define M(_name, _id, _1, _2, _3) MBOX_MSG_##_name = _id, - MBOX_MESSAGES MBOX_UP_CGX_MESSAGES + MBOX_MESSAGES MBOX_UP_CGX_MESSAGES MBOX_UP_MCS_MESSAGES#undef M };
@@ -867,6 +870,38 @@ struct mcs_set_active_lmac { uint64_t __io rsvd; }; +#define MCS_CPM_RX_SECTAG_V_EQ1_INT BIT_ULL(0) +#define MCS_CPM_RX_SECTAG_E_EQ0_C_EQ1_INT BIT_ULL(1) +#define MCS_CPM_RX_SECTAG_SL_GTE48_INT BIT_ULL(2) +#define MCS_CPM_RX_SECTAG_ES_EQ1_SC_EQ1_INT BIT_ULL(3) +#define MCS_CPM_RX_SECTAG_SC_EQ1_SCB_EQ1_INT BIT_ULL(4) +#define MCS_CPM_RX_PACKET_XPN_EQ0_INT BIT_ULL(5) +#define MCS_CPM_RX_PN_THRESH_REACHED_INT BIT_ULL(6) +#define MCS_CPM_TX_PACKET_XPN_EQ0_INT BIT_ULL(7) +#define MCS_CPM_TX_PN_THRESH_REACHED_INT BIT_ULL(8) +#define MCS_CPM_TX_SA_NOT_VALID_INT BIT_ULL(9) +#define MCS_BBE_RX_DFIFO_OVERFLOW_INT BIT_ULL(10) +#define MCS_BBE_RX_PLFIFO_OVERFLOW_INT BIT_ULL(11) +#define MCS_BBE_TX_DFIFO_OVERFLOW_INT BIT_ULL(12) +#define MCS_BBE_TX_PLFIFO_OVERFLOW_INT BIT_ULL(13) +#define MCS_PAB_RX_CHAN_OVERFLOW_INT BIT_ULL(14) +#define MCS_PAB_TX_CHAN_OVERFLOW_INT BIT_ULL(15) + +struct mcs_intr_cfg { +struct mbox_msghdr hdr; + uint64_t __io intr_mask; /* Interrupt enable mask */ + uint8_t __io mcs_id; +}; + +struct mcs_intr_info { +struct mbox_msghdr hdr; + uint64_t __io intr_mask; + int __io sa_id; + uint8_t __io mcs_id; + uint8_t __io lmac_id; + uint64_t __io rsvd; +}; +struct mcs_set_lmac_mode {struct mbox_msghdr hdr; uint8_t __io mode; /* '1' for internal bypass mode (passthrough), '0' for MCS processing */
drivers/common/cnxk/roc_mcs.c +117 -0
141 lines not on this page · raw message
drivers/common/cnxk/roc_mcs.h +144 -0
160 lines not on this page · raw message
drivers/common/cnxk/roc_mcs_priv.h +8 -0
@@ -62,4 +62,12 @@ roc_mcs_to_mcs_priv(struct roc_mcs *roc_mcs) return (struct mcs_priv *)&roc_mcs->reserved[0]; } +static inline void * +roc_mcs_to_mcs_cb_list (struct roc_mcs *roc_mcs) +{ +return (void *)((uintptr_t )roc_mcs->reserved +sizeof (struct mcs_priv )); +} + +int mcs_event_cb_process (struct roc_mcs *mcs,struct roc_mcs_event_desc *desc); +#endif /* _ROC_MCS_PRIV_H_ */
drivers/common/cnxk/version.map +3 -0
@@ -139,11 +139,14 @@ INTERNAL { roc_mcs_dev_init; roc_mcs_dev_fini; roc_mcs_dev_get; + roc_mcs_event_cb_register; + roc_mcs_event_cb_unregister; roc_mcs_flowid_entry_enable; roc_mcs_flowid_entry_read; roc_mcs_flowid_entry_write; roc_mcs_flowid_stats_get; roc_mcs_hw_info_get; + roc_mcs_intr_configure; roc_mcs_lmac_mode_set; roc_mcs_pn_table_write; roc_mcs_pn_table_read;
Signature · 1 line
2.25.1
PATCH v2 8/15 common/cnxk: add MACsec port configuration
In reply to Akhil GoyalAdded ROC APIs for MACsec port configurations
--- drivers/common/cnxk/roc_mbox.h | 40 ++++ drivers/common/cnxk/roc_mcs.c | 346 ++++++++++++++++++++++++++++++++ drivers/common/cnxk/roc_mcs.h | 48 +++++ drivers/common/cnxk/version.map | 4 + 4 files changed, 438 insertions(+)
drivers/common/cnxk/roc_mbox.h +40 -0
@@ -319,6 +319,9 @@ struct mbox_msghdr { M(MCS_INTR_CFG, 0xa012, mcs_intr_cfg, mcs_intr_cfg, msg_rsp) \ M(MCS_SET_LMAC_MODE, 0xa013, mcs_set_lmac_mode, mcs_set_lmac_mode, msg_rsp) \ M(MCS_SET_PN_THRESHOLD, 0xa014, mcs_set_pn_threshold, mcs_set_pn_threshold, msg_rsp) \ + M(MCS_PORT_RESET, 0xa018, mcs_port_reset, mcs_port_reset_req, msg_rsp) \ + M(MCS_PORT_CFG_SET, 0xa019, mcs_port_cfg_set, mcs_port_cfg_set_req, msg_rsp) \ +M (MCS_PORT_CFG_GET ,0xa020 , mcs_port_cfg_get, mcs_port_cfg_get_req, mcs_port_cfg_get_rsp) \ /* Messages initiated by AF (range 0xC00 - 0xDFF) */#define MBOX_UP_CGX_MESSAGES \
@@ -919,6 +922,43 @@ struct mcs_set_pn_threshold { uint64_t __io rsvd; }; +struct mcs_port_cfg_set_req { +struct mbox_msghdr hdr; + uint8_t __io cstm_tag_rel_mode_sel; + uint8_t __io custom_hdr_enb; + uint8_t __io fifo_skid; + uint8_t __io lmac_mode; + uint8_t __io lmac_id; + uint8_t __io mcs_id; + uint64_t __io rsvd; +}; + +struct mcs_port_cfg_get_req { +struct mbox_msghdr hdr; + uint8_t __io lmac_id; + uint8_t __io mcs_id; + uint64_t __io rsvd; +}; + +struct mcs_port_cfg_get_rsp { +struct mbox_msghdr hdr; + uint8_t __io cstm_tag_rel_mode_sel; + uint8_t __io custom_hdr_enb; + uint8_t __io fifo_skid; + uint8_t __io lmac_mode; + uint8_t __io lmac_id; + uint8_t __io mcs_id; + uint64_t __io rsvd; +}; + +struct mcs_port_reset_req { +struct mbox_msghdr hdr; + uint8_t __io reset; + uint8_t __io mcs_id; + uint8_t __io lmac_id; + uint64_t __io rsvd; +}; +struct mcs_stats_req {struct mbox_msghdr hdr; uint8_t __io id;
drivers/common/cnxk/roc_mcs.c +346 -0
364 lines not on this page · raw message
drivers/common/cnxk/roc_mcs.h +48 -0
64 lines not on this page · raw message
drivers/common/cnxk/version.map +4 -0
@@ -151,6 +151,10 @@ INTERNAL { roc_mcs_pn_table_write; roc_mcs_pn_table_read; roc_mcs_pn_threshold_set; + roc_mcs_port_cfg_get; + roc_mcs_port_cfg_set; + roc_mcs_port_recovery; + roc_mcs_port_reset; roc_mcs_port_stats_get; roc_mcs_rsrc_alloc; roc_mcs_rsrc_free;
Signature · 1 line
2.25.1
PATCH v2 9/15 common/cnxk: add MACsec control port configuration
In reply to Akhil GoyalAdded ROC APIs to configure MACsec control port.
--- drivers/common/cnxk/roc_mbox.h | 72 ++++++++++++++++++++ drivers/common/cnxk/roc_mcs.c | 117 ++++++++++++++++++++++++++++++++ drivers/common/cnxk/roc_mcs.h | 65 ++++++++++++++++++ drivers/common/cnxk/version.map | 4 ++ 4 files changed, 258 insertions(+)
drivers/common/cnxk/roc_mbox.h +72 -0
@@ -319,9 +319,17 @@ struct mbox_msghdr { M(MCS_INTR_CFG, 0xa012, mcs_intr_cfg, mcs_intr_cfg, msg_rsp) \ M(MCS_SET_LMAC_MODE, 0xa013, mcs_set_lmac_mode, mcs_set_lmac_mode, msg_rsp) \ M(MCS_SET_PN_THRESHOLD, 0xa014, mcs_set_pn_threshold, mcs_set_pn_threshold, msg_rsp) \ +M (MCS_ALLOC_CTRL_PKT_RULE ,0xa015 , mcs_alloc_ctrl_pkt_rule, mcs_alloc_ctrl_pkt_rule_req, \ + mcs_alloc_ctrl_pkt_rule_rsp) \ +M (MCS_FREE_CTRL_PKT_RULE ,0xa016 , mcs_free_ctrl_pkt_rule, mcs_free_ctrl_pkt_rule_req, \ + msg_rsp) \ +M (MCS_CTRL_PKT_RULE_WRITE ,0xa017 , mcs_ctrl_pkt_rule_write, mcs_ctrl_pkt_rule_write_req, \ + msg_rsp) \ M(MCS_PORT_RESET, 0xa018, mcs_port_reset, mcs_port_reset_req, msg_rsp) \ M(MCS_PORT_CFG_SET, 0xa019, mcs_port_cfg_set, mcs_port_cfg_set_req, msg_rsp) \ M(MCS_PORT_CFG_GET, 0xa020, mcs_port_cfg_get, mcs_port_cfg_get_req, mcs_port_cfg_get_rsp) \ +M (MCS_CUSTOM_TAG_CFG_GET ,0xa021 , mcs_custom_tag_cfg_get, mcs_custom_tag_cfg_get_req, \ + mcs_custom_tag_cfg_get_rsp) \ /* Messages initiated by AF (range 0xC00 - 0xDFF) */#define MBOX_UP_CGX_MESSAGES \
@@ -922,6 +930,53 @@ struct mcs_set_pn_threshold { uint64_t __io rsvd; }; +enum mcs_ctrl_pkt_rule_type { +MCS_CTRL_PKT_RULE_TYPE_ETH , +MCS_CTRL_PKT_RULE_TYPE_DA , +MCS_CTRL_PKT_RULE_TYPE_RANGE , +MCS_CTRL_PKT_RULE_TYPE_COMBO , +MCS_CTRL_PKT_RULE_TYPE_MAC , +}; + +struct mcs_alloc_ctrl_pkt_rule_req { +struct mbox_msghdr hdr; + uint8_t __io rule_type; + uint8_t __io mcs_id; /* MCS block ID */ + uint8_t __io dir; /* Macsec ingress or egress side */ + uint64_t __io rsvd; +}; + +struct mcs_alloc_ctrl_pkt_rule_rsp { +struct mbox_msghdr hdr; + uint8_t __io rule_idx; + uint8_t __io rule_type; + uint8_t __io mcs_id; + uint8_t __io dir; + uint64_t __io rsvd; +}; + +struct mcs_free_ctrl_pkt_rule_req { +struct mbox_msghdr hdr; + uint8_t __io rule_idx; + uint8_t __io rule_type; + uint8_t __io mcs_id; + uint8_t __io dir; + uint8_t __io all; /* Free all the rule resources */ + uint64_t __io rsvd; +}; + +struct mcs_ctrl_pkt_rule_write_req { +struct mbox_msghdr hdr; + uint64_t __io data0; + uint64_t __io data1; + uint64_t __io data2; + uint8_t __io rule_idx; + uint8_t __io rule_type; + uint8_t __io mcs_id; + uint8_t __io dir; + uint64_t __io rsvd; +}; +struct mcs_port_cfg_set_req {struct mbox_msghdr hdr; uint8_t __io cstm_tag_rel_mode_sel;
@@ -951,6 +1006,23 @@ struct mcs_port_cfg_get_rsp { uint64_t __io rsvd; }; +struct mcs_custom_tag_cfg_get_req { +struct mbox_msghdr hdr; + uint8_t __io mcs_id; + uint8_t __io dir; + uint64_t __io rsvd; +}; + +struct mcs_custom_tag_cfg_get_rsp { +struct mbox_msghdr hdr; + uint16_t __io cstm_etype[8]; + uint8_t __io cstm_indx[8]; + uint8_t __io cstm_etype_en; + uint8_t __io mcs_id; + uint8_t __io dir; + uint64_t __io rsvd; +}; +struct mcs_port_reset_req {struct mbox_msghdr hdr; uint8_t __io reset;
drivers/common/cnxk/roc_mcs.c +117 -0
129 lines not on this page · raw message
drivers/common/cnxk/roc_mcs.h +65 -0
89 lines not on this page · raw message
drivers/common/cnxk/version.map +4 -0
@@ -136,6 +136,10 @@ INTERNAL { roc_se_ciph_key_set; roc_se_ctx_init; roc_mcs_active_lmac_set; + roc_mcs_ctrl_pkt_rule_alloc; + roc_mcs_ctrl_pkt_rule_free; + roc_mcs_ctrl_pkt_rule_write; + roc_mcs_custom_tag_cfg_get; roc_mcs_dev_init; roc_mcs_dev_fini; roc_mcs_dev_get;
Signature · 1 line
2.25.1
PATCH v2 10/15 common/cnxk: add MACsec FIPS mbox
In reply to Akhil GoyalAdded MACsec FIPS configuration mbox
--- drivers/common/cnxk/roc_mbox.h | 74 ++++++++++++++++++++++++++++++++++ drivers/common/cnxk/roc_mcs.h | 69 +++++++++++++++++++++++++++++++ 2 files changed, 143 insertions(+)
drivers/common/cnxk/roc_mbox.h +74 -0
@@ -330,6 +330,15 @@ struct mbox_msghdr { M(MCS_PORT_CFG_GET, 0xa020, mcs_port_cfg_get, mcs_port_cfg_get_req, mcs_port_cfg_get_rsp) \M (MCS_CUSTOM_TAG_CFG_GET ,0xa021 , mcs_custom_tag_cfg_get, mcs_custom_tag_cfg_get_req, \ mcs_custom_tag_cfg_get_rsp) \ + M(MCS_FIPS_RESET, 0xa040, mcs_fips_reset, mcs_fips_req, msg_rsp) \ + M(MCS_FIPS_MODE_SET, 0xa041, mcs_fips_mode_set, mcs_fips_mode_req, msg_rsp) \ + M(MCS_FIPS_CTL_SET, 0xa042, mcs_fips_ctl_set, mcs_fips_ctl_req, msg_rsp) \ + M(MCS_FIPS_IV_SET, 0xa043, mcs_fips_iv_set, mcs_fips_iv_req, msg_rsp) \ + M(MCS_FIPS_CTR_SET, 0xa044, mcs_fips_ctr_set, mcs_fips_ctr_req, msg_rsp) \ + M(MCS_FIPS_KEY_SET, 0xa045, mcs_fips_key_set, mcs_fips_key_req, msg_rsp) \ + M(MCS_FIPS_BLOCK_SET, 0xa046, mcs_fips_block_set, mcs_fips_block_req, msg_rsp) \ + M(MCS_FIPS_START, 0xa047, mcs_fips_start, mcs_fips_req, msg_rsp) \ +M (MCS_FIPS_RESULT_GET ,0xa048 , mcs_fips_result_get, mcs_fips_req, mcs_fips_result_rsp) /* Messages initiated by AF (range 0xC00 - 0xDFF) */#define MBOX_UP_CGX_MESSAGES \
@@ -1119,6 +1128,71 @@ struct mcs_clear_stats { uint8_t __io all; /* All resources stats mapped to PF are cleared */ }; +struct mcs_fips_req { +struct mbox_msghdr hdr; + uint8_t __io mcs_id; + uint8_t __io dir; +}; + +struct mcs_fips_mode_req { +struct mbox_msghdr hdr; + uint64_t __io mode; + uint8_t __io mcs_id; + uint8_t __io dir; +}; + +struct mcs_fips_ctl_req { +struct mbox_msghdr hdr; + uint64_t __io ctl; + uint8_t __io mcs_id; + uint8_t __io dir; +}; + +struct mcs_fips_iv_req { +struct mbox_msghdr hdr; + uint32_t __io iv_bits95_64; + uint64_t __io iv_bits63_0; + uint8_t __io mcs_id; + uint8_t __io dir; +}; + +struct mcs_fips_ctr_req { +struct mbox_msghdr hdr; + uint32_t __io fips_ctr; + uint8_t __io mcs_id; + uint8_t __io dir; +}; + +struct mcs_fips_key_req { +struct mbox_msghdr hdr; + uint64_t __io sak_bits255_192; + uint64_t __io sak_bits191_128; + uint64_t __io sak_bits127_64; + uint64_t __io sak_bits63_0; + uint64_t __io hashkey_bits127_64; + uint64_t __io hashkey_bits63_0; + uint8_t __io sak_len; + uint8_t __io mcs_id; + uint8_t __io dir; +}; + +struct mcs_fips_block_req { +struct mbox_msghdr hdr; + uint64_t __io blk_bits127_64; + uint64_t __io blk_bits63_0; + uint8_t __io mcs_id; + uint8_t __io dir; +}; + +struct mcs_fips_result_rsp { +struct mbox_msghdr hdr; + uint64_t __io blk_bits127_64; + uint64_t __io blk_bits63_0; + uint64_t __io icv_bits127_64; + uint64_t __io icv_bits63_0; + uint8_t __io result_pass; +}; +/* NPA mbox message formats */ /* NPA mailbox error codes
drivers/common/cnxk/roc_mcs.h +69 -0
79 lines not on this page · raw message
Signature · 1 line
2.25.1
PATCH v2 11/15 common/cnxk: derive hash key for MACsec
In reply to Akhil GoyalMACsec hardware configuration need hash key to be generated from the cipher key of AES-GCM-128/256.
Added an ROC API to derive the hash key and extend the case for AES-256 as well.
--- drivers/common/cnxk/roc_aes.c | 86 ++++++++++++++++++++++----------- drivers/common/cnxk/roc_aes.h | 4 +- drivers/common/cnxk/version.map | 1 + 3 files changed, 60 insertions(+), 31 deletions(-)
drivers/common/cnxk/roc_aes.c +57 -29
@@ -4,9 +4,10 @@#include "roc_api.h" -#define KEY_WORD_LEN (ROC_CPT_AES_XCBC_KEY_LENGTH / sizeof(uint32_t)) -#define KEY_ROUNDS 10/* (Nr+1)*Nb */ -#define KEY_SCHEDULE_LEN ((KEY_ROUNDS + 1) * 4)/* (Nr+1)*Nb words */ +#define KEY128_ROUNDS 10/* (Nr+1)*Nb */ +#define KEY256_ROUNDS 14/* (Nr+1)*Nb */ +#define KEY_SCHEDULE_LEN (nr) ((nr + 1) * 4)/* (Nr+1)*Nb words */ +#define AES_HASH_KEY_LEN 16/* * AES 128 implementation based on NIST FIPS 197 suitable for LittleEndian
@@ -93,22 +94,30 @@ GF8mul(uint8_t byte, uint32_t mp) }static void -aes_key_expand (const uint8_t *key,uint32_t *ks) +aes_key_expand (const uint8_t *key,uint32_t len,uint32_t *ks) { -unsigned int i =4 ; +uint32_t len_words = len /sizeof (uint32_t ); +unsigned int schedule_len; +unsigned int i = len_words;uint32_t temp; + schedule_len = (len ==ROC_CPT_AES128_KEY_LEN ) ?KEY_SCHEDULE_LEN (KEY128_ROUNDS ) : +KEY_SCHEDULE_LEN (KEY256_ROUNDS );/* Skip key in ks */ -memcpy (ks, key,KEY_WORD_LEN *sizeof (uint32_t )); +memcpy (ks, key, len); -while (i <KEY_SCHEDULE_LEN ) { +while (i < schedule_len) { temp = ks[i -1 ]; -if ((i &0x3 ) ==0 ) { +if ((i & (len_words -1 )) ==0 ) { temp =rot_word (temp); temp =sub_word (temp); - temp ^= (uint32_t )GF8mul (1 ,1 << ((i >>2 ) -1 )); + temp ^= (uint32_t )GF8mul (1 ,1 << ((i / len_words) -1 )); } - ks[i] = ks[i -4 ] ^ temp; +if (len ==ROC_CPT_AES256_KEY_LEN ) { +if ((i % len_words) ==4 ) + temp =sub_word (temp); + } + ks[i] = ks[i - len_words] ^ temp; i++; } }
@@ -145,64 +154,83 @@ mix_columns(uint8_t *sRc) }static void -cipher (uint8_t *in,uint8_t *out,uint32_t *ks) +cipher (uint8_t *in,uint8_t *out,uint32_t *ks,uint32_t key_rounds,uint8_t in_len) { -uint32_t state[KEY_WORD_LEN ]; +uint8_t data_word_len = in_len /sizeof (uint32_t ); +uint32_t state[data_word_len];unsigned int i, round;memcpy (state, in,sizeof (state));/* AddRoundKey(state, w[0, Nb-1]) // See Sec. 5.1.4 */ -for (i =0 ; i <KEY_WORD_LEN ; i++) +for (i =0 ; i < data_word_len; i++) state[i] ^= ks[i]; -for (round =1 ; round <KEY_ROUNDS ; round++) { +for (round =1 ; round < key_rounds; round++) {/* SubBytes(state) // See Sec. 5.1.1 */ -for (i =0 ; i <KEY_WORD_LEN ; i++) +for (i =0 ; i < data_word_len; i++) state[i] =sub_word (state[i]);/* ShiftRows(state) // See Sec. 5.1.2 */ -for (i =0 ; i <KEY_WORD_LEN ; i++) +for (i =0 ; i < data_word_len; i++)shift_word ((uint8_t *)state, i, i);/* MixColumns(state) // See Sec. 5.1.3 */ -for (i =0 ; i <KEY_WORD_LEN ; i++) +for (i =0 ; i < data_word_len; i++)mix_columns ((uint8_t *)&state[i]);/* AddRoundKey(state, w[round*Nb, (round+1)*Nb-1]) */ -for (i =0 ; i <KEY_WORD_LEN ; i++) - state[i] ^= ks[round *4 + i]; +for (i =0 ; i < data_word_len; i++) + state[i] ^= ks[round * data_word_len + i]; }/* SubBytes(state) */ -for (i =0 ; i <KEY_WORD_LEN ; i++) +for (i =0 ; i < data_word_len; i++) state[i] =sub_word (state[i]);/* ShiftRows(state) */ -for (i =0 ; i <KEY_WORD_LEN ; i++) +for (i =0 ; i < data_word_len; i++)shift_word ((uint8_t *)state, i, i);/* AddRoundKey(state, w[Nr*Nb, (Nr+1)*Nb-1]) */ -for (i =0 ; i <KEY_WORD_LEN ; i++) - state[i] ^= ks[KEY_ROUNDS *4 + i]; -memcpy (out, state,KEY_WORD_LEN *sizeof (uint32_t )); +for (i =0 ; i < data_word_len; i++) + state[i] ^= ks[key_rounds * data_word_len + i]; +memcpy (out, state, data_word_len *sizeof (uint32_t )); }void roc_aes_xcbc_key_derive (const uint8_t *auth_key,uint8_t *derived_key) { -uint32_t aes_ks[KEY_SCHEDULE_LEN ] = {0 }; +uint32_t aes_ks[KEY_SCHEDULE_LEN (KEY128_ROUNDS )] = {0 };uint8_t k1[16 ] = {[0 ...15 ] =0x01 };uint8_t k2[16 ] = {[0 ...15 ] =0x02 };uint8_t k3[16 ] = {[0 ...15 ] =0x03 }; -aes_key_expand (auth_key, aes_ks); +aes_key_expand (auth_key,ROC_CPT_AES_XCBC_KEY_LENGTH , aes_ks); -cipher (k1, derived_key, aes_ks); +cipher (k1, derived_key, aes_ks,KEY128_ROUNDS ,sizeof (k1)); derived_key +=sizeof (k1); -cipher (k2, derived_key, aes_ks); +cipher (k2, derived_key, aes_ks,KEY128_ROUNDS ,sizeof (k2)); derived_key +=sizeof (k2); -cipher (k3, derived_key, aes_ks); +cipher (k3, derived_key, aes_ks,KEY128_ROUNDS ,sizeof (k3)); +} + +void +roc_aes_hash_key_derive (const uint8_t *key,uint16_t len,uint8_t hash_key[]) +{ +uint8_t data[AES_HASH_KEY_LEN ] = {0x0 }; + +if (len ==ROC_CPT_AES128_KEY_LEN ) { +uint32_t aes_ks[KEY_SCHEDULE_LEN (KEY128_ROUNDS )] = {0 }; + +aes_key_expand (key,ROC_CPT_AES128_KEY_LEN , aes_ks); +cipher (data, hash_key, aes_ks,KEY128_ROUNDS ,sizeof (data)); + }else { +uint32_t aes_ks[KEY_SCHEDULE_LEN (KEY256_ROUNDS )] = {0 }; + +aes_key_expand (key,ROC_CPT_AES256_KEY_LEN , aes_ks); +cipher (data, hash_key, aes_ks,KEY256_ROUNDS ,sizeof (data)); + } }
drivers/common/cnxk/roc_aes.h +2 -2
@@ -8,7 +8,7 @@/* * Derive k1, k2, k3 from 128 bit AES key */ -void __roc_api roc_aes_xcbc_key_derive(const uint8_t *auth_key, -uint8_t *derived_key); +void __roc_api roc_aes_xcbc_key_derive(const uint8_t *auth_key, uint8_t *derived_key); +void __roc_api roc_aes_hash_key_derive(const uint8_t *key, uint16_t len, uint8_t *hash_key);#endif /* _ROC_AES_H_ */
drivers/common/cnxk/version.map +1 -0
@@ -30,6 +30,7 @@ INTERNAL { roc_ae_ec_grp_put; roc_ae_fpm_get; roc_ae_fpm_put; + roc_aes_hash_key_derive; roc_aes_xcbc_key_derive; roc_bphy_cgx_cpri_mode_change; roc_bphy_cgx_cpri_mode_misc;
Signature · 1 line
2.25.1
PATCH v2 12/15 net/cnxk: add MACsec initialization
In reply to Akhil GoyalAdded initialization routines for MACsec for
cn10kb platform.
--- drivers/net/cnxk/cn10k_ethdev_sec.c | 6 ++ drivers/net/cnxk/cnxk_ethdev.c | 13 +++ drivers/net/cnxk/cnxk_ethdev.h | 14 +++ drivers/net/cnxk/cnxk_ethdev_mcs.c | 151 ++++++++++++++++++++++++++++ drivers/net/cnxk/cnxk_ethdev_mcs.h | 61 +++++++++++ drivers/net/cnxk/meson.build | 1 + 6 files changed, 246 insertions(+) create mode 100644 drivers/net/cnxk/cnxk_ethdev_mcs.c create mode 100644 drivers/net/cnxk/cnxk_ethdev_mcs.h
drivers/net/cnxk/cn10k_ethdev_sec.c +6 -0
@@ -1090,9 +1090,15 @@ cn10k_eth_sec_ops_override(void) init_once =1 ;/* Update platform specific ops */ + cnxk_eth_sec_ops.macsec_sa_create =NULL ; + cnxk_eth_sec_ops.macsec_sc_create =NULL ; + cnxk_eth_sec_ops.macsec_sa_destroy =NULL ; + cnxk_eth_sec_ops.macsec_sc_destroy =NULL ; cnxk_eth_sec_ops.session_create = cn10k_eth_sec_session_create; cnxk_eth_sec_ops.session_destroy = cn10k_eth_sec_session_destroy; cnxk_eth_sec_ops.capabilities_get = cn10k_eth_sec_capabilities_get; cnxk_eth_sec_ops.session_update = cn10k_eth_sec_session_update; cnxk_eth_sec_ops.session_stats_get = cn10k_eth_sec_session_stats_get; + cnxk_eth_sec_ops.macsec_sc_stats_get =NULL ; + cnxk_eth_sec_ops.macsec_sa_stats_get =NULL ; }
drivers/net/cnxk/cnxk_ethdev.c +13 -0
@@ -1961,6 +1961,16 @@ cnxk_eth_dev_init(struct rte_eth_dev *eth_dev)if (rc) goto free_mac_addrs; +if (roc_feature_nix_has_macsec ()) { + rc =cnxk_mcs_dev_init (dev,0 ); +if (rc) { +plt_err ("Failed to init MCS" ); + goto free_mac_addrs; + } + dev->rx_offload_capa |=RTE_ETH_RX_OFFLOAD_MACSEC_STRIP ; + dev->tx_offload_capa |=RTE_ETH_TX_OFFLOAD_MACSEC_INSERT ; + } + plt_nix_dbg("Port=%d pf=%d vf=%d ver=%s hwcap=0x%" PRIx64 " rxoffload_capa=0x%" PRIx64 " txoffload_capa=0x%" PRIx64, eth_dev->data->port_id, roc_nix_get_pf(nix),
@@ -2058,6 +2068,9 @@ cnxk_eth_dev_uninit(struct rte_eth_dev *eth_dev, bool reset) } eth_dev->data->nb_rx_queues =0 ; +if (roc_feature_nix_has_macsec ()) +cnxk_mcs_dev_fini (dev); +/* Free security resources */ nix_security_release (dev);
drivers/net/cnxk/cnxk_ethdev.h +14 -0
@@ -395,6 +395,9 @@ struct cnxk_eth_dev {/* Reassembly dynfield/flag offsets */ int reass_dynfield_off;int reass_dynflag_bit; + +/* MCS device */ +struct cnxk_mcs_dev *mcs_dev; };struct cnxk_eth_rxq_sp {
@@ -623,6 +626,17 @@ int cnxk_nix_cman_config_set(struct rte_eth_dev *dev, const struct rte_eth_cman_int cnxk_nix_cman_config_get (struct rte_eth_dev *dev,struct rte_eth_cman_config *config); +int cnxk_mcs_dev_init (struct cnxk_eth_dev *dev,uint8_t mcs_idx); +void cnxk_mcs_dev_fini (struct cnxk_eth_dev *dev); + +struct cnxk_macsec_sess *cnxk_eth_macsec_sess_get_by_sess (struct cnxk_eth_dev *dev, +const struct rte_security_session *sess); +int cnxk_mcs_flow_configure (struct rte_eth_dev *eth_dev,const struct rte_flow_attr *attr, +const struct rte_flow_item pattern[], +const struct rte_flow_action actions[],struct rte_flow_error *error, +void **mcs_flow); +int cnxk_mcs_flow_destroy (struct cnxk_eth_dev *eth_dev,void *mcs_flow); +/* Other private functions */ int nix_recalc_mtu (struct rte_eth_dev *eth_dev);int nix_mtr_validate (struct rte_eth_dev *dev,uint32_t id);
drivers/net/cnxk/cnxk_ethdev_mcs.c new file +151 -0
151 lines not on this page · raw message
drivers/net/cnxk/cnxk_ethdev_mcs.h new file +61 -0
61 lines not on this page · raw message
drivers/net/cnxk/meson.build +1 -0
@@ -22,6 +22,7 @@ sources = files( 'cnxk_ethdev.c', 'cnxk_ethdev_cman.c', 'cnxk_ethdev_devargs.c', + 'cnxk_ethdev_mcs.c', 'cnxk_ethdev_mtr.c', 'cnxk_ethdev_ops.c', 'cnxk_ethdev_sec.c',
Signature · 1 line
2.25.1
PATCH v2 13/15 net/cnxk: create/destroy MACsec SC/SA
In reply to Akhil GoyalAdded support to create/destroy MACsec SA and SC.
--- drivers/net/cnxk/cn10k_ethdev_sec.c | 9 +- drivers/net/cnxk/cnxk_ethdev_mcs.c | 250 ++++++++++++++++++++++++++++ drivers/net/cnxk/cnxk_ethdev_mcs.h | 16 ++ 3 files changed, 271 insertions(+), 4 deletions(-)
drivers/net/cnxk/cn10k_ethdev_sec.c +5 -4
@@ -9,6 +9,7 @@#include <rte_pmd_cnxk.h> #include <cn10k_ethdev.h> +#include <cnxk_ethdev_mcs.h> #include <cnxk_security.h> #include <roc_priv.h>
@@ -1090,10 +1091,10 @@ cn10k_eth_sec_ops_override(void) init_once =1 ;/* Update platform specific ops */ - cnxk_eth_sec_ops.macsec_sa_create =NULL ; - cnxk_eth_sec_ops.macsec_sc_create =NULL ; - cnxk_eth_sec_ops.macsec_sa_destroy =NULL ; - cnxk_eth_sec_ops.macsec_sc_destroy =NULL ; + cnxk_eth_sec_ops.macsec_sa_create = cnxk_eth_macsec_sa_create; + cnxk_eth_sec_ops.macsec_sc_create = cnxk_eth_macsec_sc_create; + cnxk_eth_sec_ops.macsec_sa_destroy = cnxk_eth_macsec_sa_destroy; + cnxk_eth_sec_ops.macsec_sc_destroy = cnxk_eth_macsec_sc_destroy; cnxk_eth_sec_ops.session_create = cn10k_eth_sec_session_create; cnxk_eth_sec_ops.session_destroy = cn10k_eth_sec_session_destroy; cnxk_eth_sec_ops.capabilities_get = cn10k_eth_sec_capabilities_get;
drivers/net/cnxk/cnxk_ethdev_mcs.c +250 -0
256 lines not on this page · raw message
drivers/net/cnxk/cnxk_ethdev_mcs.h +16 -0
@@ -13,6 +13,14 @@ struct cnxk_mcs_dev {uint8_t idx; }; +enum cnxk_mcs_rsrc_type { +CNXK_MCS_RSRC_TYPE_FLOWID , +CNXK_MCS_RSRC_TYPE_SECY , +CNXK_MCS_RSRC_TYPE_SC , +CNXK_MCS_RSRC_TYPE_SA , +CNXK_MCS_RSRC_TYPE_PORT , +}; +struct cnxk_mcs_event_data {/* Valid for below events * - ROC_MCS_EVENT_RX_SA_PN_SOFT_EXP
@@ -59,3 +67,11 @@ struct cnxk_mcs_event_desc {enum roc_mcs_event_subtype subtype;struct cnxk_mcs_event_data metadata; }; + +int cnxk_eth_macsec_sa_create (void *device,struct rte_security_macsec_sa *conf); +int cnxk_eth_macsec_sc_create (void *device,struct rte_security_macsec_sc *conf); + +int cnxk_eth_macsec_sa_destroy (void *device,uint16_t sa_id, +enum rte_security_macsec_direction dir); +int cnxk_eth_macsec_sc_destroy (void *device,uint16_t sc_id, +enum rte_security_macsec_direction dir);
Signature · 1 line
2.25.1
PATCH v2 14/15 net/cnxk: add MACsec session and flow configuration
In reply to Akhil GoyalAdded support for MACsec session/flow create/destroy.
--- drivers/net/cnxk/cn10k_ethdev_sec.c | 11 +- drivers/net/cnxk/cn10k_flow.c | 23 ++- drivers/net/cnxk/cnxk_ethdev.c | 2 + drivers/net/cnxk/cnxk_ethdev.h | 16 ++ drivers/net/cnxk/cnxk_ethdev_mcs.c | 261 ++++++++++++++++++++++++++++ drivers/net/cnxk/cnxk_ethdev_mcs.h | 25 +++ drivers/net/cnxk/cnxk_ethdev_sec.c | 2 +- drivers/net/cnxk/cnxk_flow.c | 5 + 8 files changed, 341 insertions(+), 4 deletions(-)
drivers/net/cnxk/cn10k_ethdev_sec.c +9 -2
@@ -642,7 +642,9 @@ cn10k_eth_sec_session_create(void *device,if (conf->action_type !=RTE_SECURITY_ACTION_TYPE_INLINE_PROTOCOL )return -ENOTSUP ; -if (conf->protocol !=RTE_SECURITY_PROTOCOL_IPSEC ) +if (conf->protocol ==RTE_SECURITY_PROTOCOL_MACSEC ) +return cnxk_eth_macsec_session_create (dev, conf, sess); +else if (conf->protocol !=RTE_SECURITY_PROTOCOL_IPSEC )return -ENOTSUP ;if (rte_security_dynfield_register () <0 )
@@ -887,13 +889,18 @@ cn10k_eth_sec_session_destroy(void *device, struct rte_security_session *sess) {struct rte_eth_dev *eth_dev = (struct rte_eth_dev *)device;struct cnxk_eth_dev *dev =cnxk_eth_pmd_priv (eth_dev); +struct cnxk_macsec_sess *macsec_sess;struct cnxk_eth_sec_sess *eth_sec;rte_spinlock_t *lock;void *sa_dptr; eth_sec =cnxk_eth_sec_sess_get_by_sess (dev, sess); -if (!eth_sec) +if (!eth_sec) { + macsec_sess =cnxk_eth_macsec_sess_get_by_sess (dev, sess); +if (macsec_sess) +return cnxk_eth_macsec_session_destroy (dev, sess);return -ENOENT ; + } lock = eth_sec->inb ? &dev->inb.lock : &dev->outb.lock;rte_spinlock_lock (lock);
drivers/net/cnxk/cn10k_flow.c +22 -1
@@ -1,10 +1,11 @@/* SPDX-License-Identifier: BSD-3-Clause * Copyright(C) 2020 Marvell. */ -#include <cnxk_flow.h> #include "cn10k_flow.h" #include "cn10k_ethdev.h" #include "cn10k_rx.h" +#include "cnxk_ethdev_mcs.h" +#include <cnxk_flow.h> static int cn10k_mtr_connect (struct rte_eth_dev *eth_dev,uint32_t mtr_id)
@@ -133,6 +134,7 @@ cn10k_flow_create(struct rte_eth_dev *eth_dev, const struct rte_flow_attr *attr,const struct rte_flow_action *act_q =NULL ;struct roc_npc *npc = &dev->npc;struct roc_npc_flow *flow; +void *mcs_flow =NULL ;int vtag_actions =0 ;uint32_t req_act =0 ;int mark_actions;
@@ -187,6 +189,17 @@ cn10k_flow_create(struct rte_eth_dev *eth_dev, const struct rte_flow_attr *attr, } } +if (actions[0 ].type ==RTE_FLOW_ACTION_TYPE_SECURITY && +cnxk_eth_macsec_sess_get_by_sess (dev, actions[0 ].conf) !=NULL ) { + rc =cnxk_mcs_flow_configure (eth_dev, attr, pattern, actions, error, &mcs_flow); +if (rc) { +rte_flow_error_set (error, rc,RTE_FLOW_ERROR_TYPE_ACTION ,NULL , +"Failed to configure mcs flow" ); +return NULL ; + } +return (struct rte_flow *)mcs_flow; + } + flow =cnxk_flow_create (eth_dev, attr, pattern, actions, error);if (!flow) {if (mtr)
@@ -265,6 +278,14 @@ cn10k_flow_destroy(struct rte_eth_dev *eth_dev, struct rte_flow *rte_flow, } } +if (cnxk_eth_macsec_sess_get_by_sess (dev, (void *)flow) !=NULL ) { + rc =cnxk_mcs_flow_destroy (dev, (void *)flow); +if (rc <0 ) +rte_flow_error_set (error, rc,RTE_FLOW_ERROR_TYPE_UNSPECIFIED , +NULL ,"Failed to free mcs flow" ); +return rc; + } + mtr_id = flow->mtr_id; rc =cnxk_flow_destroy (eth_dev, flow, error);if (!rc && mtr_id !=ROC_NIX_MTR_ID_INVALID ) {
drivers/net/cnxk/cnxk_ethdev.c +2 -0
@@ -1969,6 +1969,8 @@ cnxk_eth_dev_init(struct rte_eth_dev *eth_dev) } dev->rx_offload_capa |=RTE_ETH_RX_OFFLOAD_MACSEC_STRIP ; dev->tx_offload_capa |=RTE_ETH_TX_OFFLOAD_MACSEC_INSERT ; + +TAILQ_INIT (&dev->mcs_list); } plt_nix_dbg("Port=%d pf=%d vf=%d ver=%s hwcap=0x%" PRIx64
drivers/net/cnxk/cnxk_ethdev.h +16 -0
@@ -292,6 +292,21 @@ struct cnxk_eth_dev_sec_outb {uint64_t cpt_eng_caps; }; +/* MACsec session private data */ +struct cnxk_macsec_sess { +/* List entry */ +TAILQ_ENTRY (cnxk_macsec_sess) entry; + +/* Back pointer to session */ +struct rte_security_session *sess; +enum mcs_direction dir; +uint64_t sci; +uint8_t secy_id; +uint8_t sc_id; +uint8_t flow_id; +}; +TAILQ_HEAD (cnxk_macsec_sess_list, cnxk_macsec_sess); +struct cnxk_eth_dev {/* ROC NIX */ struct roc_nix nix;
@@ -398,6 +413,7 @@ struct cnxk_eth_dev {/* MCS device */ struct cnxk_mcs_dev *mcs_dev; +struct cnxk_macsec_sess_list mcs_list; };struct cnxk_eth_rxq_sp {
drivers/net/cnxk/cnxk_ethdev_mcs.c +261 -0
267 lines not on this page · raw message
drivers/net/cnxk/cnxk_ethdev_mcs.h +25 -0
@@ -21,6 +21,27 @@ enum cnxk_mcs_rsrc_type { CNXK_MCS_RSRC_TYPE_PORT, }; +struct cnxk_mcs_flow_opts { +uint32_t outer_tag_id; +/**< {VLAN_ID[11:0]}, or 20-bit MPLS label*/ +uint8_t outer_priority; +/**< {PCP/Pbits, DE/CFI} or {1'b0, EXP} for MPLS.*/ +uint32_t second_outer_tag_id; +/**< {VLAN_ID[11:0]}, or 20-bit MPLS label*/ +uint8_t second_outer_priority; +/**< {PCP/Pbits, DE/CFI} or {1'b0, EXP} for MPLS. */ +uint16_t bonus_data; +/**< 2 bytes of additional bonus data extracted from one of the custom tags*/ +uint8_t tag_match_bitmap; +uint8_t packet_type; +uint8_t outer_vlan_type; +uint8_t inner_vlan_type; +uint8_t num_tags; +bool express; +uint8_t lmac_id; +uint8_t flowid_user; +}; +struct cnxk_mcs_event_data {/* Valid for below events * - ROC_MCS_EVENT_RX_SA_PN_SOFT_EXP
@@ -75,3 +96,7 @@ int cnxk_eth_macsec_sa_destroy(void *device, uint16_t sa_id, enum rte_security_macsec_direction dir);int cnxk_eth_macsec_sc_destroy (void *device,uint16_t sc_id,enum rte_security_macsec_direction dir); + +int cnxk_eth_macsec_session_create (struct cnxk_eth_dev *dev,struct rte_security_session_conf *conf, +struct rte_security_session *sess); +int cnxk_eth_macsec_session_destroy (struct cnxk_eth_dev *dev,struct rte_security_session *sess);
drivers/net/cnxk/cnxk_ethdev_sec.c +1 -1
@@ -284,7 +284,7 @@ cnxk_eth_sec_sess_get_by_sess(struct cnxk_eth_dev *dev,static unsigned int cnxk_eth_sec_session_get_size(void *device __rte_unused) { -return sizeof (struct cnxk_eth_sec_sess ); +return RTE_MAX (sizeof (struct cnxk_macsec_sess ),sizeof (struct cnxk_eth_sec_sess )); }struct rte_security_ops cnxk_eth_sec_ops = {
drivers/net/cnxk/cnxk_flow.c +5 -0
@@ -300,6 +300,11 @@ cnxk_flow_validate(struct rte_eth_dev *eth_dev,uint32_t flowkey_cfg =0 ;int rc; +/* Skip flow validation for MACsec. */ +if (actions[0 ].type ==RTE_FLOW_ACTION_TYPE_SECURITY && +cnxk_eth_macsec_sess_get_by_sess (dev, actions[0 ].conf) !=NULL ) +return 0 ; +memset (&flow,0 ,sizeof (flow)); flow.is_validate = true;
Signature · 1 line
2.25.1
PATCH v2 15/15 net/cnxk: add MACsec stats
In reply to Akhil GoyalAdded support for MACsec SC/flow/session stats.
--- drivers/net/cnxk/cn10k_ethdev_sec.c | 11 +++-- drivers/net/cnxk/cnxk_ethdev_mcs.c | 64 +++++++++++++++++++++++++++++ drivers/net/cnxk/cnxk_ethdev_mcs.h | 9 ++++ 3 files changed, 81 insertions(+), 3 deletions(-)
drivers/net/cnxk/cn10k_ethdev_sec.c +8 -3
@@ -1058,12 +1058,17 @@ cn10k_eth_sec_session_stats_get(void *device, struct rte_security_session *sess, {struct rte_eth_dev *eth_dev = (struct rte_eth_dev *)device;struct cnxk_eth_dev *dev =cnxk_eth_pmd_priv (eth_dev); +struct cnxk_macsec_sess *macsec_sess;struct cnxk_eth_sec_sess *eth_sec;int rc; eth_sec =cnxk_eth_sec_sess_get_by_sess (dev, sess); -if (eth_sec ==NULL ) +if (eth_sec ==NULL ) { + macsec_sess =cnxk_eth_macsec_sess_get_by_sess (dev, sess); +if (macsec_sess) +return cnxk_eth_macsec_session_stats_get (dev, macsec_sess, stats);return -EINVAL ; + } rc =roc_nix_inl_sa_sync (&dev->nix, eth_sec->sa, eth_sec->inb,ROC_NIX_INL_SA_OP_FLUSH );
@@ -1107,6 +1112,6 @@ cn10k_eth_sec_ops_override(void) cnxk_eth_sec_ops.capabilities_get = cn10k_eth_sec_capabilities_get; cnxk_eth_sec_ops.session_update = cn10k_eth_sec_session_update; cnxk_eth_sec_ops.session_stats_get = cn10k_eth_sec_session_stats_get; - cnxk_eth_sec_ops.macsec_sc_stats_get =NULL ; - cnxk_eth_sec_ops.macsec_sa_stats_get =NULL ; + cnxk_eth_sec_ops.macsec_sc_stats_get = cnxk_eth_macsec_sc_stats_get; + cnxk_eth_sec_ops.macsec_sa_stats_get = cnxk_eth_macsec_sa_stats_get; }
drivers/net/cnxk/cnxk_ethdev_mcs.c +64 -0
70 lines not on this page · raw message
drivers/net/cnxk/cnxk_ethdev_mcs.h +9 -0
@@ -97,6 +97,15 @@ int cnxk_eth_macsec_sa_destroy(void *device, uint16_t sa_id,int cnxk_eth_macsec_sc_destroy (void *device,uint16_t sc_id,enum rte_security_macsec_direction dir); +int cnxk_eth_macsec_sa_stats_get (void *device,uint16_t sa_id, +enum rte_security_macsec_direction dir, +struct rte_security_macsec_sa_stats *stats); +int cnxk_eth_macsec_sc_stats_get (void *device,uint16_t sa_id, +enum rte_security_macsec_direction dir, +struct rte_security_macsec_sc_stats *stats); +int cnxk_eth_macsec_session_stats_get (struct cnxk_eth_dev *dev,struct cnxk_macsec_sess *sess, +struct rte_security_stats *stats); +int cnxk_eth_macsec_session_create (struct cnxk_eth_dev *dev,struct rte_security_session_conf *conf,struct rte_security_session *sess);int cnxk_eth_macsec_session_destroy (struct cnxk_eth_dev *dev,struct rte_security_session *sess);
Signature · 1 line
2.25.1
v3 cover net/cnxk: add MACsec support
In reply to Akhil GoyalAdded MACsec support in Marvell cnxk PMD. The patchset is pending from last release [1] Sending as a new series as the functionality is now complete and tested on hardware.
[1] https://patches.dpdk.org/project/dpdk/cover/[email protected]/
Changes in v3:
- rebased
- fixed warning PRI*64
- added release notes
Changes in v2:
- Addressed review comments from Jerin.
Akhil Goyal (15):
common/cnxk: add ROC MACsec initialization common/cnxk: add MACsec SA configuration common/cnxk: add MACsec SC configuration APIs common/cnxk: add MACsec secy and flow configuration common/cnxk: add MACsec PN and LMAC mode configuration common/cnxk: add MACsec stats
common/cnxk: add MACsec interrupt APIs common/cnxk: add MACsec port configuration common/cnxk: add MACsec control port configuration common/cnxk: add MACsec FIPS mbox common/cnxk: derive hash key for MACsec net/cnxk: add MACsec initialization
net/cnxk: create/destroy MACsec SC/SA net/cnxk: add MACsec session and flow configuration net/cnxk: add MACsec stats
doc/guides/rel_notes/release_23_07.rst | 5 + drivers/common/cnxk/meson.build | 3 + drivers/common/cnxk/roc_aes.c | 86 ++- drivers/common/cnxk/roc_aes.h | 4 +- drivers/common/cnxk/roc_api.h | 3 + drivers/common/cnxk/roc_dev.c | 86 +++ drivers/common/cnxk/roc_features.h | 12 + drivers/common/cnxk/roc_idev.c | 46 ++ drivers/common/cnxk/roc_idev.h | 3 + drivers/common/cnxk/roc_idev_priv.h | 1 + drivers/common/cnxk/roc_mbox.h | 524 ++++++++++++++- drivers/common/cnxk/roc_mcs.c | 871 +++++++++++++++++++++++++ drivers/common/cnxk/roc_mcs.h | 621 ++++++++++++++++++ drivers/common/cnxk/roc_mcs_priv.h | 73 +++ drivers/common/cnxk/roc_mcs_sec_cfg.c | 528 +++++++++++++++ drivers/common/cnxk/roc_mcs_stats.c | 193 ++++++ drivers/common/cnxk/roc_priv.h | 3 + drivers/common/cnxk/roc_utils.c | 5 + drivers/common/cnxk/version.map | 45 ++ drivers/net/cnxk/cn10k_ethdev_sec.c | 25 +- drivers/net/cnxk/cn10k_flow.c | 23 +- drivers/net/cnxk/cnxk_ethdev.c | 15 + drivers/net/cnxk/cnxk_ethdev.h | 30 + drivers/net/cnxk/cnxk_ethdev_mcs.c | 726 +++++++++++++++++++++ drivers/net/cnxk/cnxk_ethdev_mcs.h | 111 ++++ drivers/net/cnxk/cnxk_ethdev_sec.c | 2 +- drivers/net/cnxk/cnxk_flow.c | 5 + drivers/net/cnxk/meson.build | 1 + 28 files changed, 4012 insertions(+), 38 deletions(-) create mode 100644 drivers/common/cnxk/roc_mcs.c create mode 100644 drivers/common/cnxk/roc_mcs.h create mode 100644 drivers/common/cnxk/roc_mcs_priv.h create mode 100644 drivers/common/cnxk/roc_mcs_sec_cfg.c create mode 100644 drivers/common/cnxk/roc_mcs_stats.c create mode 100644 drivers/net/cnxk/cnxk_ethdev_mcs.c create mode 100644 drivers/net/cnxk/cnxk_ethdev_mcs.h
Signature · 1 line
2.25.1
PATCH v3 1/15 common/cnxk: add ROC MACsec initialization
Added ROC init and fini APIs for supporting MACsec.
--- drivers/common/cnxk/meson.build | 1 + drivers/common/cnxk/roc_api.h | 3 + drivers/common/cnxk/roc_features.h | 12 ++ drivers/common/cnxk/roc_idev.c | 46 ++++++ drivers/common/cnxk/roc_idev.h | 3 + drivers/common/cnxk/roc_idev_priv.h | 1 + drivers/common/cnxk/roc_mbox.h | 65 +++++++- drivers/common/cnxk/roc_mcs.c | 220 ++++++++++++++++++++++++++++ drivers/common/cnxk/roc_mcs.h | 41 ++++++ drivers/common/cnxk/roc_mcs_priv.h | 65 ++++++++ drivers/common/cnxk/roc_priv.h | 3 + drivers/common/cnxk/roc_utils.c | 5 + drivers/common/cnxk/version.map | 7 + 13 files changed, 471 insertions(+), 1 deletion(-) create mode 100644 drivers/common/cnxk/roc_mcs.c create mode 100644 drivers/common/cnxk/roc_mcs.h create mode 100644 drivers/common/cnxk/roc_mcs_priv.h
drivers/common/cnxk/meson.build +1 -0
@@ -26,6 +26,7 @@ sources = files( 'roc_irq.c', 'roc_ie_ot.c', 'roc_mbox.c', + 'roc_mcs.c', 'roc_ml.c', 'roc_model.c', 'roc_nix.c',
drivers/common/cnxk/roc_api.h +3 -0
@@ -114,4 +114,7 @@/* ML */ #include "roc_ml.h" +/* MACsec */ +#include "roc_mcs.h" +#endif /* _ROC_API_H_ */
drivers/common/cnxk/roc_features.h +12 -0
@@ -59,4 +59,16 @@ roc_feature_nix_has_age_drop_stats(void) {return (roc_model_is_cn10kb () ||roc_model_is_cn10ka_b0 ()); } + +static inline bool +roc_feature_nix_has_macsec (void ) +{ +return roc_model_is_cn10kb (); +} + +static inline bool +roc_feature_bphy_has_macsec (void ) +{ +return roc_model_is_cnf10kb (); +}#endif
drivers/common/cnxk/roc_idev.c +46 -0
58 lines not on this page · raw message
drivers/common/cnxk/roc_idev.h +3 -0
@@ -19,4 +19,7 @@ struct roc_nix *__roc_api roc_idev_npa_nix_get(void); uint64_t __roc_api roc_idev_nix_inl_meta_aura_get(void); struct roc_nix_list *__roc_api roc_idev_nix_list_get(void); +struct roc_mcs *__roc_api roc_idev_mcs_get(uint8_t mcs_idx); +void __roc_api roc_idev_mcs_set(struct roc_mcs *mcs); +void __roc_api roc_idev_mcs_free(struct roc_mcs *mcs);#endif /* _ROC_IDEV_H_ */
drivers/common/cnxk/roc_idev_priv.h +1 -0
@@ -31,6 +31,7 @@ struct idev_cfg {struct roc_bphy *bphy;struct roc_cpt *cpt;struct roc_sso *sso; +struct roc_mcs_head mcs_list;struct nix_inl_dev *nix_inl_dev;struct idev_nix_inl_cfg inl_cfg;struct roc_nix_list roc_nix_list;
drivers/common/cnxk/roc_mbox.h +64 -1
77 lines not on this page · raw message
drivers/common/cnxk/roc_mcs.c new file +220 -0
220 lines not on this page · raw message
drivers/common/cnxk/roc_mcs.h new file +41 -0
41 lines not on this page · raw message
drivers/common/cnxk/roc_mcs_priv.h new file +65 -0
65 lines not on this page · raw message
drivers/common/cnxk/roc_priv.h +3 -0
@@ -44,6 +44,9 @@/* DPI */ #include "roc_dpi_priv.h" +/* MCS */ +#include "roc_mcs_priv.h" +/* REE */ #include "roc_ree_priv.h"
drivers/common/cnxk/roc_utils.c +5 -0
@@ -16,6 +16,7 @@ roc_error_msg_get(int errorcode)case NPA_ERR_PARAM :case NPC_ERR_PARAM :case SSO_ERR_PARAM : +case MCS_ERR_PARAM :case UTIL_ERR_PARAM : err_msg ="Invalid parameter" ;break ;
@@ -35,6 +36,7 @@ roc_error_msg_get(int errorcode) err_msg ="Operation not supported" ;break ;case NIX_ERR_HW_NOTSUP : +case MCS_ERR_HW_NOTSUP : err_msg ="Hardware does not support" ;break ;case NIX_ERR_QUEUE_INVALID_RANGE :
@@ -223,6 +225,9 @@ roc_error_msg_get(int errorcode)case SSO_ERR_DEVICE_NOT_BOUNDED : err_msg ="SSO pf/vf not found" ;break ; +case MCS_ERR_DEVICE_NOT_FOUND : + err_msg ="MCS device not found" ; +break ;case UTIL_ERR_FS : err_msg ="file operation failed" ;break ;
drivers/common/cnxk/version.map +7 -0
@@ -94,6 +94,9 @@ INTERNAL { roc_idev_cpt_get; roc_idev_cpt_set; roc_idev_lmt_base_addr_get; + roc_idev_mcs_free; + roc_idev_mcs_get; + roc_idev_mcs_set; roc_idev_npa_maxpools_get; roc_idev_npa_maxpools_set; roc_idev_npa_nix_get;
@@ -132,6 +135,10 @@ INTERNAL { roc_se_auth_key_set; roc_se_ciph_key_set; roc_se_ctx_init; + roc_mcs_dev_init; + roc_mcs_dev_fini; + roc_mcs_dev_get; + roc_mcs_hw_info_get; roc_nix_bpf_alloc; roc_nix_bpf_config; roc_nix_bpf_connect;
Signature · 1 line
2.25.1
PATCH v3 2/15 common/cnxk: add MACsec SA configuration
In reply to Akhil GoyalAdded ROC APIs to allocate/free MACsec resources
and APIs to write SA policy.
--- drivers/common/cnxk/meson.build | 1 + drivers/common/cnxk/roc_mbox.h | 12 ++ drivers/common/cnxk/roc_mcs.h | 43 ++++++ drivers/common/cnxk/roc_mcs_sec_cfg.c | 211 ++++++++++++++++++++++++++ drivers/common/cnxk/version.map | 4 + 5 files changed, 271 insertions(+) create mode 100644 drivers/common/cnxk/roc_mcs_sec_cfg.c
drivers/common/cnxk/meson.build +1 -0
@@ -27,6 +27,7 @@ sources = files( 'roc_ie_ot.c', 'roc_mbox.c', 'roc_mcs.c', + 'roc_mcs_sec_cfg.c', 'roc_ml.c', 'roc_model.c', 'roc_nix.c',
drivers/common/cnxk/roc_mbox.h +12 -0
@@ -300,6 +300,7 @@ struct mbox_msghdr {M (MCS_ALLOC_RESOURCES ,0xa000 , mcs_alloc_resources, mcs_alloc_rsrc_req, \ mcs_alloc_rsrc_rsp) \ M(MCS_FREE_RESOURCES, 0xa001, mcs_free_resources, mcs_free_rsrc_req, msg_rsp) \ + M(MCS_SA_PLCY_WRITE, 0xa005, mcs_sa_plcy_write, mcs_sa_plcy_write_req, msg_rsp) \M (MCS_GET_HW_INFO ,0xa00b , mcs_get_hw_info, msg_req, mcs_hw_info) \/* Messages initiated by AF (range 0xC00 - 0xDFF) */
@@ -725,6 +726,17 @@ struct mcs_free_rsrc_req { uint64_t __io rsvd; }; +struct mcs_sa_plcy_write_req { +struct mbox_msghdr hdr; + uint64_t __io plcy[2][9]; /* Support 2 SA policy */ + uint8_t __io sa_index[2]; + uint8_t __io sa_cnt; + uint8_t __io mcs_id; + uint8_t __io dir; + uint64_t __io rsvd; +}; + +struct mcs_hw_info {struct mbox_msghdr hdr; uint8_t __io num_mcs_blks; /* Number of MCS blocks */
drivers/common/cnxk/roc_mcs.h +43 -0
53 lines not on this page · raw message
drivers/common/cnxk/roc_mcs_sec_cfg.c new file +211 -0
211 lines not on this page · raw message
drivers/common/cnxk/version.map +4 -0
@@ -139,6 +139,10 @@ INTERNAL { roc_mcs_dev_fini; roc_mcs_dev_get; roc_mcs_hw_info_get; + roc_mcs_rsrc_alloc; + roc_mcs_rsrc_free; + roc_mcs_sa_policy_read; + roc_mcs_sa_policy_write; roc_nix_bpf_alloc; roc_nix_bpf_config; roc_nix_bpf_connect;
Signature · 1 line
2.25.1
PATCH v3 3/15 common/cnxk: add MACsec SC configuration APIs
In reply to Akhil GoyalAdded ROC APIs to configure MACsec secure channel(SC) and its mapping with SAs for both Rx and Tx.
--- drivers/common/cnxk/roc_mbox.h | 37 ++++++ drivers/common/cnxk/roc_mcs.h | 41 ++++++ drivers/common/cnxk/roc_mcs_sec_cfg.c | 171 ++++++++++++++++++++++++++ drivers/common/cnxk/version.map | 7 ++ 4 files changed, 256 insertions(+)
drivers/common/cnxk/roc_mbox.h +37 -0
@@ -300,7 +300,10 @@ struct mbox_msghdr {M (MCS_ALLOC_RESOURCES ,0xa000 , mcs_alloc_resources, mcs_alloc_rsrc_req, \ mcs_alloc_rsrc_rsp) \ M(MCS_FREE_RESOURCES, 0xa001, mcs_free_resources, mcs_free_rsrc_req, msg_rsp) \ + M(MCS_RX_SC_CAM_WRITE, 0xa004, mcs_rx_sc_cam_write, mcs_rx_sc_cam_write_req, msg_rsp) \ M(MCS_SA_PLCY_WRITE, 0xa005, mcs_sa_plcy_write, mcs_sa_plcy_write_req, msg_rsp) \ + M(MCS_TX_SC_SA_MAP_WRITE, 0xa006, mcs_tx_sc_sa_map_write, mcs_tx_sc_sa_map, msg_rsp) \ + M(MCS_RX_SC_SA_MAP_WRITE, 0xa007, mcs_rx_sc_sa_map_write, mcs_rx_sc_sa_map, msg_rsp) \M (MCS_GET_HW_INFO ,0xa00b , mcs_get_hw_info, msg_req, mcs_hw_info) \/* Messages initiated by AF (range 0xC00 - 0xDFF) */
@@ -726,6 +729,16 @@ struct mcs_free_rsrc_req { uint64_t __io rsvd; }; +/* RX SC_CAM mapping */ +struct mcs_rx_sc_cam_write_req { +struct mbox_msghdr hdr; + uint64_t __io sci; /* SCI */ + uint64_t __io secy_id; /* secy index mapped to SC */ + uint8_t __io sc_id; /* SC CAM entry index */ + uint8_t __io mcs_id; + uint64_t __io rsvd; +}; +struct mcs_sa_plcy_write_req {struct mbox_msghdr hdr; uint64_t __io plcy[2][9]; /* Support 2 SA policy */
@@ -736,6 +749,30 @@ struct mcs_sa_plcy_write_req { uint64_t __io rsvd; }; +struct mcs_tx_sc_sa_map { +struct mbox_msghdr hdr; + uint8_t __io sa_index0; + uint8_t __io sa_index1; + uint8_t __io rekey_ena; + uint8_t __io sa_index0_vld; + uint8_t __io sa_index1_vld; + uint8_t __io tx_sa_active; + uint64_t __io sectag_sci; + uint8_t __io sc_id; /* used as index for SA_MEM_MAP */ + uint8_t __io mcs_id; + uint64_t __io rsvd; +}; + +struct mcs_rx_sc_sa_map { +struct mbox_msghdr hdr; + uint8_t __io sa_index; + uint8_t __io sa_in_use; + uint8_t __io sc_id; +/* an range is 0-3, sc_id + an used as index SA_MEM_MAP */ + uint8_t __io an; + uint8_t __io mcs_id; + uint64_t __io rsvd; +};struct mcs_hw_info {struct mbox_msghdr hdr;
drivers/common/cnxk/roc_mcs.h +41 -0
57 lines not on this page · raw message
drivers/common/cnxk/roc_mcs_sec_cfg.c +171 -0
174 lines not on this page · raw message
drivers/common/cnxk/version.map +7 -0
@@ -141,8 +141,15 @@ INTERNAL { roc_mcs_hw_info_get; roc_mcs_rsrc_alloc; roc_mcs_rsrc_free; + roc_mcs_rx_sc_cam_enable; + roc_mcs_rx_sc_cam_read; + roc_mcs_rx_sc_cam_write; + roc_mcs_rx_sc_sa_map_read; + roc_mcs_rx_sc_sa_map_write; roc_mcs_sa_policy_read; roc_mcs_sa_policy_write; + roc_mcs_tx_sc_sa_map_read; + roc_mcs_tx_sc_sa_map_write; roc_nix_bpf_alloc; roc_nix_bpf_config; roc_nix_bpf_connect;
Signature · 1 line
2.25.1
PATCH v3 4/15 common/cnxk: add MACsec secy and flow configuration
In reply to Akhil GoyalAdded ROC APIs to configure MACsec secy policy and flow entries.
--- drivers/common/cnxk/roc_mbox.h | 38 +++++++++ drivers/common/cnxk/roc_mcs.h | 37 +++++++++ drivers/common/cnxk/roc_mcs_sec_cfg.c | 115 ++++++++++++++++++++++++++ drivers/common/cnxk/version.map | 5 ++ 4 files changed, 195 insertions(+)
drivers/common/cnxk/roc_mbox.h +38 -0
@@ -300,10 +300,14 @@ struct mbox_msghdr {M (MCS_ALLOC_RESOURCES ,0xa000 , mcs_alloc_resources, mcs_alloc_rsrc_req, \ mcs_alloc_rsrc_rsp) \ M(MCS_FREE_RESOURCES, 0xa001, mcs_free_resources, mcs_free_rsrc_req, msg_rsp) \ +M (MCS_FLOWID_ENTRY_WRITE ,0xa002 , mcs_flowid_entry_write, mcs_flowid_entry_write_req, \ + msg_rsp) \ + M(MCS_SECY_PLCY_WRITE, 0xa003, mcs_secy_plcy_write, mcs_secy_plcy_write_req, msg_rsp) \ M(MCS_RX_SC_CAM_WRITE, 0xa004, mcs_rx_sc_cam_write, mcs_rx_sc_cam_write_req, msg_rsp) \ M(MCS_SA_PLCY_WRITE, 0xa005, mcs_sa_plcy_write, mcs_sa_plcy_write_req, msg_rsp) \ M(MCS_TX_SC_SA_MAP_WRITE, 0xa006, mcs_tx_sc_sa_map_write, mcs_tx_sc_sa_map, msg_rsp) \ M(MCS_RX_SC_SA_MAP_WRITE, 0xa007, mcs_rx_sc_sa_map_write, mcs_rx_sc_sa_map, msg_rsp) \ + M(MCS_FLOWID_ENA_ENTRY, 0xa008, mcs_flowid_ena_entry, mcs_flowid_ena_dis_entry, msg_rsp) \M (MCS_GET_HW_INFO ,0xa00b , mcs_get_hw_info, msg_req, mcs_hw_info) \/* Messages initiated by AF (range 0xC00 - 0xDFF) */
@@ -729,6 +733,31 @@ struct mcs_free_rsrc_req { uint64_t __io rsvd; }; +struct mcs_flowid_entry_write_req { +struct mbox_msghdr hdr; + uint64_t __io data[4]; + uint64_t __io mask[4]; + uint64_t __io sci; /* CNF10K-B for tx_secy_mem_map */ + uint8_t __io flow_id; + uint8_t __io secy_id; /* secyid for which flowid is mapped */ +/* sc_id is Valid if dir = MCS_TX, SC_CAM id mapped to flowid */ + uint8_t __io sc_id; + uint8_t __io ena; /* Enable tcam entry */ + uint8_t __io ctr_pkt; + uint8_t __io mcs_id; + uint8_t __io dir; + uint64_t __io rsvd; +}; + +struct mcs_secy_plcy_write_req { +struct mbox_msghdr hdr; + uint64_t __io plcy; + uint8_t __io secy_id; + uint8_t __io mcs_id; + uint8_t __io dir; + uint64_t __io rsvd; +}; +/* RX SC_CAM mapping */ struct mcs_rx_sc_cam_write_req {struct mbox_msghdr hdr;
@@ -774,6 +803,15 @@ struct mcs_rx_sc_sa_map { uint64_t __io rsvd; }; +struct mcs_flowid_ena_dis_entry { +struct mbox_msghdr hdr; + uint8_t __io flow_id; + uint8_t __io ena; + uint8_t __io mcs_id; + uint8_t __io dir; + uint64_t __io rsvd; +}; +struct mcs_hw_info {struct mbox_msghdr hdr; uint8_t __io num_mcs_blks; /* Number of MCS blocks */
drivers/common/cnxk/roc_mcs.h +37 -0
@@ -32,6 +32,24 @@ struct roc_mcs_free_rsrc_req {uint8_t all;/* Free all the cam resources */ }; +struct roc_mcs_flowid_entry_write_req { +uint64_t data[4 ]; +uint64_t mask[4 ]; +uint64_t sci;/* 105N for tx_secy_mem_map */ +uint8_t flow_id; +uint8_t secy_id;/* secyid for which flowid is mapped */ +uint8_t sc_id;/* Valid if dir = MCS_TX, SC_CAM id mapped to flowid */ +uint8_t ena;/* Enable tcam entry */ +uint8_t ctr_pkt; +uint8_t dir; +}; + +struct roc_mcs_secy_plcy_write_req { +uint64_t plcy; +uint8_t secy_id; +uint8_t dir; +}; +/* RX SC_CAM mapping */ struct roc_mcs_rx_sc_cam_write_req {uint64_t sci;/* SCI */
@@ -64,6 +82,12 @@ struct roc_mcs_rx_sc_sa_map {uint8_t an;/* value range 0-3, sc_id + an used as index SA_MEM_MAP */ }; +struct roc_mcs_flowid_ena_dis_entry { +uint8_t flow_id; +uint8_t ena; +uint8_t dir; +}; +struct roc_mcs_hw_info {uint8_t num_mcs_blks;/* Number of MCS blocks */ uint8_t tcam_entries;/* RX/TX Tcam entries per mcs block */
@@ -112,6 +136,11 @@ __roc_api int roc_mcs_rx_sc_cam_read(struct roc_mcs *mcs, struct roc_mcs_rx_sc_cam_write_req *rx_sc_cam); __roc_api int roc_mcs_rx_sc_cam_enable(struct roc_mcs *mcs,struct roc_mcs_rx_sc_cam_write_req *rx_sc_cam); +/* SECY policy read and write */ +__roc_api int roc_mcs_secy_policy_write(struct roc_mcs *mcs, +struct roc_mcs_secy_plcy_write_req *secy_plcy); +__roc_api int roc_mcs_secy_policy_read(struct roc_mcs *mcs, +struct roc_mcs_rx_sc_cam_write_req *rx_sc_cam);/* RX SC-SA MAP read and write */ __roc_api int roc_mcs_rx_sc_sa_map_write(struct roc_mcs *mcs,struct roc_mcs_rx_sc_sa_map *rx_sc_sa_map);
@@ -122,4 +151,12 @@ __roc_api int roc_mcs_tx_sc_sa_map_write(struct roc_mcs *mcs, struct roc_mcs_tx_sc_sa_map *tx_sc_sa_map); __roc_api int roc_mcs_tx_sc_sa_map_read(struct roc_mcs *mcs,struct roc_mcs_tx_sc_sa_map *tx_sc_sa_map); +/* Flow entry read, write and enable */ +__roc_api int roc_mcs_flowid_entry_write(struct roc_mcs *mcs, +struct roc_mcs_flowid_entry_write_req *flowid_req); +__roc_api int roc_mcs_flowid_entry_read(struct roc_mcs *mcs, +struct roc_mcs_flowid_entry_write_req *flowid_rsp); +__roc_api int roc_mcs_flowid_entry_enable(struct roc_mcs *mcs, +struct roc_mcs_flowid_ena_dis_entry *entry); +#endif /* _ROC_MCS_H_ */
drivers/common/cnxk/roc_mcs_sec_cfg.c +115 -0
124 lines not on this page · raw message
drivers/common/cnxk/version.map +5 -0
@@ -138,6 +138,9 @@ INTERNAL { roc_mcs_dev_init; roc_mcs_dev_fini; roc_mcs_dev_get; + roc_mcs_flowid_entry_enable; + roc_mcs_flowid_entry_read; + roc_mcs_flowid_entry_write; roc_mcs_hw_info_get; roc_mcs_rsrc_alloc; roc_mcs_rsrc_free;
@@ -148,6 +151,8 @@ INTERNAL { roc_mcs_rx_sc_sa_map_write; roc_mcs_sa_policy_read; roc_mcs_sa_policy_write; + roc_mcs_secy_policy_read; + roc_mcs_secy_policy_write; roc_mcs_tx_sc_sa_map_read; roc_mcs_tx_sc_sa_map_write; roc_nix_bpf_alloc;
Signature · 1 line
2.25.1
PATCH v3 5/15 common/cnxk: add MACsec PN and LMAC mode configuration
In reply to Akhil GoyalAdded ROC APIs for setting packet number and LMAC
related configurations.
--- drivers/common/cnxk/roc_mbox.h | 56 +++++++++++++++++++++ drivers/common/cnxk/roc_mcs.c | 71 +++++++++++++++++++++++++++ drivers/common/cnxk/roc_mcs.h | 48 ++++++++++++++++++ drivers/common/cnxk/roc_mcs_sec_cfg.c | 31 ++++++++++++ drivers/common/cnxk/version.map | 5 ++ 5 files changed, 211 insertions(+)
drivers/common/cnxk/roc_mbox.h +56 -0
@@ -308,7 +308,11 @@ struct mbox_msghdr { M(MCS_TX_SC_SA_MAP_WRITE, 0xa006, mcs_tx_sc_sa_map_write, mcs_tx_sc_sa_map, msg_rsp) \ M(MCS_RX_SC_SA_MAP_WRITE, 0xa007, mcs_rx_sc_sa_map_write, mcs_rx_sc_sa_map, msg_rsp) \ M(MCS_FLOWID_ENA_ENTRY, 0xa008, mcs_flowid_ena_entry, mcs_flowid_ena_dis_entry, msg_rsp) \ + M(MCS_PN_TABLE_WRITE, 0xa009, mcs_pn_table_write, mcs_pn_table_write_req, msg_rsp) \ + M(MCS_SET_ACTIVE_LMAC, 0xa00a, mcs_set_active_lmac, mcs_set_active_lmac, msg_rsp) \ M(MCS_GET_HW_INFO, 0xa00b, mcs_get_hw_info, msg_req, mcs_hw_info) \ + M(MCS_SET_LMAC_MODE, 0xa013, mcs_set_lmac_mode, mcs_set_lmac_mode, msg_rsp) \ +M (MCS_SET_PN_THRESHOLD ,0xa014 , mcs_set_pn_threshold, mcs_set_pn_threshold, msg_rsp) \ /* Messages initiated by AF (range 0xC00 - 0xDFF) */#define MBOX_UP_CGX_MESSAGES \
@@ -812,6 +816,34 @@ struct mcs_flowid_ena_dis_entry { uint64_t __io rsvd; }; +struct mcs_pn_table_write_req { +struct mbox_msghdr hdr; + uint64_t __io next_pn; + uint8_t __io pn_id; + uint8_t __io mcs_id; + uint8_t __io dir; + uint64_t __io rsvd; +}; + +struct mcs_cam_entry_read_req { +struct mbox_msghdr hdr; + uint8_t __io rsrc_type; /* TCAM/SECY/SC/SA/PN */ + uint8_t __io rsrc_id; + uint8_t __io mcs_id; + uint8_t __io dir; + uint64_t __io rsvd; +}; + +struct mcs_cam_entry_read_rsp { +struct mbox_msghdr hdr; + uint64_t __io reg_val[10]; + uint8_t __io rsrc_type; + uint8_t __io rsrc_id; + uint8_t __io mcs_id; + uint8_t __io dir; + uint64_t __io rsvd; +}; +struct mcs_hw_info {struct mbox_msghdr hdr; uint8_t __io num_mcs_blks; /* Number of MCS blocks */
@@ -822,6 +854,30 @@ struct mcs_hw_info { uint64_t __io rsvd[16]; }; +struct mcs_set_active_lmac { +struct mbox_msghdr hdr; + uint32_t __io lmac_bmap; /* bitmap of active lmac per mcs block */ + uint8_t __io mcs_id; + uint16_t __io channel_base; /* MCS channel base */ + uint64_t __io rsvd; +}; + +struct mcs_set_lmac_mode { +struct mbox_msghdr hdr; + uint8_t __io mode; /* '1' for internal bypass mode (passthrough), '0' for MCS processing */ + uint8_t __io lmac_id; + uint8_t __io mcs_id; + uint64_t __io rsvd; +}; + +struct mcs_set_pn_threshold { +struct mbox_msghdr hdr; + uint64_t __io threshold; + uint8_t __io xpn; /* '1' for setting xpn threshold */ + uint8_t __io mcs_id; + uint8_t __io dir; + uint64_t __io rsvd; +};/* NPA mbox message formats */
drivers/common/cnxk/roc_mcs.c +71 -0
77 lines not on this page · raw message
drivers/common/cnxk/roc_mcs.h +48 -0
72 lines not on this page · raw message
drivers/common/cnxk/roc_mcs_sec_cfg.c +31 -0
@@ -210,6 +210,37 @@ roc_mcs_sa_policy_read(struct roc_mcs *mcs __plt_unused,return -ENOTSUP ; } +int +roc_mcs_pn_table_write (struct roc_mcs *mcs,struct roc_mcs_pn_table_write_req *pn_table) +{ +struct mcs_pn_table_write_req *pn; +struct msg_rsp *rsp; + +MCS_SUPPORT_CHECK ; + +if (pn_table ==NULL ) +return -EINVAL ; + + pn =mbox_alloc_msg_mcs_pn_table_write (mcs->mbox); +if (pn ==NULL ) +return -ENOMEM ; + + pn->next_pn = pn_table->next_pn; + pn->pn_id = pn_table->pn_id; + pn->mcs_id = mcs->idx; + pn->dir = pn_table->dir; + +return mbox_process_msg (mcs->mbox, (void *)&rsp); +} + +int +roc_mcs_pn_table_read(struct roc_mcs *mcs __plt_unused, + struct roc_mcs_pn_table_write_req *sa __plt_unused) +{ +MCS_SUPPORT_CHECK ; + +return -ENOTSUP ; +}int roc_mcs_rx_sc_cam_write (struct roc_mcs *mcs,struct roc_mcs_rx_sc_cam_write_req *rx_sc_cam)
drivers/common/cnxk/version.map +5 -0
@@ -135,6 +135,7 @@ INTERNAL { roc_se_auth_key_set; roc_se_ciph_key_set; roc_se_ctx_init; + roc_mcs_active_lmac_set; roc_mcs_dev_init; roc_mcs_dev_fini; roc_mcs_dev_get;
@@ -142,6 +143,10 @@ INTERNAL { roc_mcs_flowid_entry_read; roc_mcs_flowid_entry_write; roc_mcs_hw_info_get; + roc_mcs_lmac_mode_set; + roc_mcs_pn_table_write; + roc_mcs_pn_table_read; + roc_mcs_pn_threshold_set; roc_mcs_rsrc_alloc; roc_mcs_rsrc_free; roc_mcs_rx_sc_cam_enable;
Signature · 1 line
2.25.1
PATCH v3 6/15 common/cnxk: add MACsec stats
In reply to Akhil GoyalAdded ROC APIs for MACsec stats for SC/SECY/FLOW/PORT
--- drivers/common/cnxk/meson.build | 1 + drivers/common/cnxk/roc_mbox.h | 93 ++++++++++++++ drivers/common/cnxk/roc_mcs.h | 85 ++++++++++++ drivers/common/cnxk/roc_mcs_stats.c | 193 ++++++++++++++++++++++++++++ drivers/common/cnxk/version.map | 5 + 5 files changed, 377 insertions(+) create mode 100644 drivers/common/cnxk/roc_mcs_stats.c
drivers/common/cnxk/meson.build +1 -0
@@ -28,6 +28,7 @@ sources = files( 'roc_mbox.c', 'roc_mcs.c', 'roc_mcs_sec_cfg.c', + 'roc_mcs_stats.c', 'roc_ml.c', 'roc_model.c', 'roc_nix.c',
drivers/common/cnxk/roc_mbox.h +93 -0
105 lines not on this page · raw message
drivers/common/cnxk/roc_mcs.h +85 -0
95 lines not on this page · raw message
drivers/common/cnxk/roc_mcs_stats.c new file +193 -0
193 lines not on this page · raw message
drivers/common/cnxk/version.map +5 -0
@@ -142,11 +142,13 @@ INTERNAL { roc_mcs_flowid_entry_enable; roc_mcs_flowid_entry_read; roc_mcs_flowid_entry_write; + roc_mcs_flowid_stats_get; roc_mcs_hw_info_get; roc_mcs_lmac_mode_set; roc_mcs_pn_table_write; roc_mcs_pn_table_read; roc_mcs_pn_threshold_set; + roc_mcs_port_stats_get; roc_mcs_rsrc_alloc; roc_mcs_rsrc_free; roc_mcs_rx_sc_cam_enable;
@@ -156,8 +158,11 @@ INTERNAL { roc_mcs_rx_sc_sa_map_write; roc_mcs_sa_policy_read; roc_mcs_sa_policy_write; + roc_mcs_sc_stats_get; roc_mcs_secy_policy_read; roc_mcs_secy_policy_write; + roc_mcs_secy_stats_get; + roc_mcs_stats_clear; roc_mcs_tx_sc_sa_map_read; roc_mcs_tx_sc_sa_map_write; roc_nix_bpf_alloc;
Signature · 1 line
2.25.1
PATCH v3 7/15 common/cnxk: add MACsec interrupt APIs
In reply to Akhil GoyalAdded ROC APIs to support various MACsec interrupts.
--- drivers/common/cnxk/roc_dev.c | 86 +++++++++++++++++ drivers/common/cnxk/roc_mbox.h | 37 +++++++- drivers/common/cnxk/roc_mcs.c | 117 +++++++++++++++++++++++ drivers/common/cnxk/roc_mcs.h | 144 +++++++++++++++++++++++++++++ drivers/common/cnxk/roc_mcs_priv.h | 8 ++ drivers/common/cnxk/version.map | 3 + 6 files changed, 394 insertions(+), 1 deletion(-)
drivers/common/cnxk/roc_dev.c +86 -0
@@ -527,6 +527,91 @@ pf_vf_mbox_send_up_msg(struct dev *dev, void *rec_msg) } } +static int +mbox_up_handler_mcs_intr_notify (struct dev *dev,struct mcs_intr_info *info,struct msg_rsp *rsp) +{ +struct roc_mcs_event_desc desc = {0 }; +struct roc_mcs *mcs; + +plt_base_dbg ("pf:%d/vf:%d msg id 0x%x (%s) from: pf:%d/vf:%d" ,dev_get_pf (dev->pf_func), +dev_get_vf (dev->pf_func), info->hdr.id,mbox_id2name (info->hdr.id), +dev_get_pf (info->hdr.pcifunc),dev_get_vf (info->hdr.pcifunc)); + + mcs =roc_idev_mcs_get (info->mcs_id); +if (!mcs) + goto exit; + +if (info->intr_mask) { +switch (info->intr_mask) { +case MCS_CPM_RX_SECTAG_V_EQ1_INT : + desc.type =ROC_MCS_EVENT_SECTAG_VAL_ERR ; + desc.subtype =ROC_MCS_EVENT_RX_SECTAG_V_EQ1 ; +break ; +case MCS_CPM_RX_SECTAG_E_EQ0_C_EQ1_INT : + desc.type =ROC_MCS_EVENT_SECTAG_VAL_ERR ; + desc.subtype =ROC_MCS_EVENT_RX_SECTAG_E_EQ0_C_EQ1 ; +break ; +case MCS_CPM_RX_SECTAG_SL_GTE48_INT : + desc.type =ROC_MCS_EVENT_SECTAG_VAL_ERR ; + desc.subtype =ROC_MCS_EVENT_RX_SECTAG_SL_GTE48 ; +break ; +case MCS_CPM_RX_SECTAG_ES_EQ1_SC_EQ1_INT : + desc.type =ROC_MCS_EVENT_SECTAG_VAL_ERR ; + desc.subtype =ROC_MCS_EVENT_RX_SECTAG_ES_EQ1_SC_EQ1 ; +break ; +case MCS_CPM_RX_SECTAG_SC_EQ1_SCB_EQ1_INT : + desc.type =ROC_MCS_EVENT_SECTAG_VAL_ERR ; + desc.subtype =ROC_MCS_EVENT_RX_SECTAG_SC_EQ1_SCB_EQ1 ; +break ; +case MCS_CPM_RX_PACKET_XPN_EQ0_INT : + desc.type =ROC_MCS_EVENT_RX_SA_PN_HARD_EXP ; + desc.metadata.sa_idx = info->sa_id; +break ; +case MCS_CPM_RX_PN_THRESH_REACHED_INT : + desc.type =ROC_MCS_EVENT_RX_SA_PN_SOFT_EXP ; + desc.metadata.sa_idx = info->sa_id; +break ; +case MCS_CPM_TX_PACKET_XPN_EQ0_INT : + desc.type =ROC_MCS_EVENT_TX_SA_PN_HARD_EXP ; + desc.metadata.sa_idx = info->sa_id; +break ; +case MCS_CPM_TX_PN_THRESH_REACHED_INT : + desc.type =ROC_MCS_EVENT_TX_SA_PN_SOFT_EXP ; + desc.metadata.sa_idx = info->sa_id; +break ; +case MCS_CPM_TX_SA_NOT_VALID_INT : + desc.type =ROC_MCS_EVENT_SA_NOT_VALID ; +break ; +case MCS_BBE_RX_DFIFO_OVERFLOW_INT : +case MCS_BBE_TX_DFIFO_OVERFLOW_INT : + desc.type =ROC_MCS_EVENT_FIFO_OVERFLOW ; + desc.subtype =ROC_MCS_EVENT_DATA_FIFO_OVERFLOW ; + desc.metadata.lmac_id = info->lmac_id; +break ; +case MCS_BBE_RX_PLFIFO_OVERFLOW_INT : +case MCS_BBE_TX_PLFIFO_OVERFLOW_INT : + desc.type =ROC_MCS_EVENT_FIFO_OVERFLOW ; + desc.subtype =ROC_MCS_EVENT_POLICY_FIFO_OVERFLOW ; + desc.metadata.lmac_id = info->lmac_id; +break ; +case MCS_PAB_RX_CHAN_OVERFLOW_INT : +case MCS_PAB_TX_CHAN_OVERFLOW_INT : + desc.type =ROC_MCS_EVENT_FIFO_OVERFLOW ; + desc.subtype =ROC_MCS_EVENT_PKT_ASSM_FIFO_OVERFLOW ; + desc.metadata.lmac_id = info->lmac_id; +break ; +default : + goto exit; + } + +mcs_event_cb_process (mcs, &desc); + } + +exit: + rsp->hdr.rc =0 ; +return 0 ; +} +static int mbox_up_handler_cgx_link_event (struct dev *dev,struct cgx_link_info_msg *msg,struct msg_rsp *rsp)
@@ -615,6 +700,7 @@ mbox_process_msgs_up(struct dev *dev, struct mbox_msghdr *req)return err; \ }MBOX_UP_CGX_MESSAGES + MBOX_UP_MCS_MESSAGES#undef M }
drivers/common/cnxk/roc_mbox.h +36 -1
@@ -316,6 +316,7 @@ struct mbox_msghdr { M(MCS_GET_SC_STATS, 0xa00e, mcs_get_sc_stats, mcs_stats_req, mcs_sc_stats) \ M(MCS_GET_PORT_STATS, 0xa010, mcs_get_port_stats, mcs_stats_req, mcs_port_stats) \ M(MCS_CLEAR_STATS, 0xa011, mcs_clear_stats, mcs_clear_stats, msg_rsp) \ + M(MCS_INTR_CFG, 0xa012, mcs_intr_cfg, mcs_intr_cfg, msg_rsp) \ M(MCS_SET_LMAC_MODE, 0xa013, mcs_set_lmac_mode, mcs_set_lmac_mode, msg_rsp) \M (MCS_SET_PN_THRESHOLD ,0xa014 , mcs_set_pn_threshold, mcs_set_pn_threshold, msg_rsp) \
@@ -324,9 +325,11 @@ struct mbox_msghdr { M(CGX_LINK_EVENT, 0xC00, cgx_link_event, cgx_link_info_msg, msg_rsp) \ M(CGX_PTP_RX_INFO, 0xC01, cgx_ptp_rx_info, cgx_ptp_rx_info_msg, msg_rsp) +#define MBOX_UP_MCS_MESSAGES M(MCS_INTR_NOTIFY, 0xE00, mcs_intr_notify, mcs_intr_info, msg_rsp) +enum { #define M(_name, _id, _1, _2, _3) MBOX_MSG_##_name = _id, - MBOX_MESSAGES MBOX_UP_CGX_MESSAGES + MBOX_MESSAGES MBOX_UP_CGX_MESSAGES MBOX_UP_MCS_MESSAGES#undef M };
@@ -867,6 +870,38 @@ struct mcs_set_active_lmac { uint64_t __io rsvd; }; +#define MCS_CPM_RX_SECTAG_V_EQ1_INT BIT_ULL(0) +#define MCS_CPM_RX_SECTAG_E_EQ0_C_EQ1_INT BIT_ULL(1) +#define MCS_CPM_RX_SECTAG_SL_GTE48_INT BIT_ULL(2) +#define MCS_CPM_RX_SECTAG_ES_EQ1_SC_EQ1_INT BIT_ULL(3) +#define MCS_CPM_RX_SECTAG_SC_EQ1_SCB_EQ1_INT BIT_ULL(4) +#define MCS_CPM_RX_PACKET_XPN_EQ0_INT BIT_ULL(5) +#define MCS_CPM_RX_PN_THRESH_REACHED_INT BIT_ULL(6) +#define MCS_CPM_TX_PACKET_XPN_EQ0_INT BIT_ULL(7) +#define MCS_CPM_TX_PN_THRESH_REACHED_INT BIT_ULL(8) +#define MCS_CPM_TX_SA_NOT_VALID_INT BIT_ULL(9) +#define MCS_BBE_RX_DFIFO_OVERFLOW_INT BIT_ULL(10) +#define MCS_BBE_RX_PLFIFO_OVERFLOW_INT BIT_ULL(11) +#define MCS_BBE_TX_DFIFO_OVERFLOW_INT BIT_ULL(12) +#define MCS_BBE_TX_PLFIFO_OVERFLOW_INT BIT_ULL(13) +#define MCS_PAB_RX_CHAN_OVERFLOW_INT BIT_ULL(14) +#define MCS_PAB_TX_CHAN_OVERFLOW_INT BIT_ULL(15) + +struct mcs_intr_cfg { +struct mbox_msghdr hdr; + uint64_t __io intr_mask; /* Interrupt enable mask */ + uint8_t __io mcs_id; +}; + +struct mcs_intr_info { +struct mbox_msghdr hdr; + uint64_t __io intr_mask; + int __io sa_id; + uint8_t __io mcs_id; + uint8_t __io lmac_id; + uint64_t __io rsvd; +}; +struct mcs_set_lmac_mode {struct mbox_msghdr hdr; uint8_t __io mode; /* '1' for internal bypass mode (passthrough), '0' for MCS processing */
drivers/common/cnxk/roc_mcs.c +117 -0
141 lines not on this page · raw message
drivers/common/cnxk/roc_mcs.h +144 -0
160 lines not on this page · raw message
drivers/common/cnxk/roc_mcs_priv.h +8 -0
@@ -62,4 +62,12 @@ roc_mcs_to_mcs_priv(struct roc_mcs *roc_mcs) return (struct mcs_priv *)&roc_mcs->reserved[0]; } +static inline void * +roc_mcs_to_mcs_cb_list (struct roc_mcs *roc_mcs) +{ +return (void *)((uintptr_t )roc_mcs->reserved +sizeof (struct mcs_priv )); +} + +int mcs_event_cb_process (struct roc_mcs *mcs,struct roc_mcs_event_desc *desc); +#endif /* _ROC_MCS_PRIV_H_ */
drivers/common/cnxk/version.map +3 -0
@@ -139,11 +139,14 @@ INTERNAL { roc_mcs_dev_init; roc_mcs_dev_fini; roc_mcs_dev_get; + roc_mcs_event_cb_register; + roc_mcs_event_cb_unregister; roc_mcs_flowid_entry_enable; roc_mcs_flowid_entry_read; roc_mcs_flowid_entry_write; roc_mcs_flowid_stats_get; roc_mcs_hw_info_get; + roc_mcs_intr_configure; roc_mcs_lmac_mode_set; roc_mcs_pn_table_write; roc_mcs_pn_table_read;
Signature · 1 line
2.25.1
PATCH v3 8/15 common/cnxk: add MACsec port configuration
In reply to Akhil GoyalAdded ROC APIs for MACsec port configurations
--- drivers/common/cnxk/roc_mbox.h | 40 ++++ drivers/common/cnxk/roc_mcs.c | 346 ++++++++++++++++++++++++++++++++ drivers/common/cnxk/roc_mcs.h | 48 +++++ drivers/common/cnxk/version.map | 4 + 4 files changed, 438 insertions(+)
drivers/common/cnxk/roc_mbox.h +40 -0
@@ -319,6 +319,9 @@ struct mbox_msghdr { M(MCS_INTR_CFG, 0xa012, mcs_intr_cfg, mcs_intr_cfg, msg_rsp) \ M(MCS_SET_LMAC_MODE, 0xa013, mcs_set_lmac_mode, mcs_set_lmac_mode, msg_rsp) \ M(MCS_SET_PN_THRESHOLD, 0xa014, mcs_set_pn_threshold, mcs_set_pn_threshold, msg_rsp) \ + M(MCS_PORT_RESET, 0xa018, mcs_port_reset, mcs_port_reset_req, msg_rsp) \ + M(MCS_PORT_CFG_SET, 0xa019, mcs_port_cfg_set, mcs_port_cfg_set_req, msg_rsp) \ +M (MCS_PORT_CFG_GET ,0xa020 , mcs_port_cfg_get, mcs_port_cfg_get_req, mcs_port_cfg_get_rsp) \ /* Messages initiated by AF (range 0xC00 - 0xDFF) */#define MBOX_UP_CGX_MESSAGES \
@@ -919,6 +922,43 @@ struct mcs_set_pn_threshold { uint64_t __io rsvd; }; +struct mcs_port_cfg_set_req { +struct mbox_msghdr hdr; + uint8_t __io cstm_tag_rel_mode_sel; + uint8_t __io custom_hdr_enb; + uint8_t __io fifo_skid; + uint8_t __io lmac_mode; + uint8_t __io lmac_id; + uint8_t __io mcs_id; + uint64_t __io rsvd; +}; + +struct mcs_port_cfg_get_req { +struct mbox_msghdr hdr; + uint8_t __io lmac_id; + uint8_t __io mcs_id; + uint64_t __io rsvd; +}; + +struct mcs_port_cfg_get_rsp { +struct mbox_msghdr hdr; + uint8_t __io cstm_tag_rel_mode_sel; + uint8_t __io custom_hdr_enb; + uint8_t __io fifo_skid; + uint8_t __io lmac_mode; + uint8_t __io lmac_id; + uint8_t __io mcs_id; + uint64_t __io rsvd; +}; + +struct mcs_port_reset_req { +struct mbox_msghdr hdr; + uint8_t __io reset; + uint8_t __io mcs_id; + uint8_t __io lmac_id; + uint64_t __io rsvd; +}; +struct mcs_stats_req {struct mbox_msghdr hdr; uint8_t __io id;
drivers/common/cnxk/roc_mcs.c +346 -0
364 lines not on this page · raw message
drivers/common/cnxk/roc_mcs.h +48 -0
64 lines not on this page · raw message
drivers/common/cnxk/version.map +4 -0
@@ -151,6 +151,10 @@ INTERNAL { roc_mcs_pn_table_write; roc_mcs_pn_table_read; roc_mcs_pn_threshold_set; + roc_mcs_port_cfg_get; + roc_mcs_port_cfg_set; + roc_mcs_port_recovery; + roc_mcs_port_reset; roc_mcs_port_stats_get; roc_mcs_rsrc_alloc; roc_mcs_rsrc_free;
Signature · 1 line
2.25.1
PATCH v3 9/15 common/cnxk: add MACsec control port configuration
In reply to Akhil GoyalAdded ROC APIs to configure MACsec control port.
--- drivers/common/cnxk/roc_mbox.h | 72 ++++++++++++++++++++ drivers/common/cnxk/roc_mcs.c | 117 ++++++++++++++++++++++++++++++++ drivers/common/cnxk/roc_mcs.h | 65 ++++++++++++++++++ drivers/common/cnxk/version.map | 4 ++ 4 files changed, 258 insertions(+)
drivers/common/cnxk/roc_mbox.h +72 -0
@@ -319,9 +319,17 @@ struct mbox_msghdr { M(MCS_INTR_CFG, 0xa012, mcs_intr_cfg, mcs_intr_cfg, msg_rsp) \ M(MCS_SET_LMAC_MODE, 0xa013, mcs_set_lmac_mode, mcs_set_lmac_mode, msg_rsp) \ M(MCS_SET_PN_THRESHOLD, 0xa014, mcs_set_pn_threshold, mcs_set_pn_threshold, msg_rsp) \ +M (MCS_ALLOC_CTRL_PKT_RULE ,0xa015 , mcs_alloc_ctrl_pkt_rule, mcs_alloc_ctrl_pkt_rule_req, \ + mcs_alloc_ctrl_pkt_rule_rsp) \ +M (MCS_FREE_CTRL_PKT_RULE ,0xa016 , mcs_free_ctrl_pkt_rule, mcs_free_ctrl_pkt_rule_req, \ + msg_rsp) \ +M (MCS_CTRL_PKT_RULE_WRITE ,0xa017 , mcs_ctrl_pkt_rule_write, mcs_ctrl_pkt_rule_write_req, \ + msg_rsp) \ M(MCS_PORT_RESET, 0xa018, mcs_port_reset, mcs_port_reset_req, msg_rsp) \ M(MCS_PORT_CFG_SET, 0xa019, mcs_port_cfg_set, mcs_port_cfg_set_req, msg_rsp) \ M(MCS_PORT_CFG_GET, 0xa020, mcs_port_cfg_get, mcs_port_cfg_get_req, mcs_port_cfg_get_rsp) \ +M (MCS_CUSTOM_TAG_CFG_GET ,0xa021 , mcs_custom_tag_cfg_get, mcs_custom_tag_cfg_get_req, \ + mcs_custom_tag_cfg_get_rsp) \ /* Messages initiated by AF (range 0xC00 - 0xDFF) */#define MBOX_UP_CGX_MESSAGES \
@@ -922,6 +930,53 @@ struct mcs_set_pn_threshold { uint64_t __io rsvd; }; +enum mcs_ctrl_pkt_rule_type { +MCS_CTRL_PKT_RULE_TYPE_ETH , +MCS_CTRL_PKT_RULE_TYPE_DA , +MCS_CTRL_PKT_RULE_TYPE_RANGE , +MCS_CTRL_PKT_RULE_TYPE_COMBO , +MCS_CTRL_PKT_RULE_TYPE_MAC , +}; + +struct mcs_alloc_ctrl_pkt_rule_req { +struct mbox_msghdr hdr; + uint8_t __io rule_type; + uint8_t __io mcs_id; /* MCS block ID */ + uint8_t __io dir; /* Macsec ingress or egress side */ + uint64_t __io rsvd; +}; + +struct mcs_alloc_ctrl_pkt_rule_rsp { +struct mbox_msghdr hdr; + uint8_t __io rule_idx; + uint8_t __io rule_type; + uint8_t __io mcs_id; + uint8_t __io dir; + uint64_t __io rsvd; +}; + +struct mcs_free_ctrl_pkt_rule_req { +struct mbox_msghdr hdr; + uint8_t __io rule_idx; + uint8_t __io rule_type; + uint8_t __io mcs_id; + uint8_t __io dir; + uint8_t __io all; /* Free all the rule resources */ + uint64_t __io rsvd; +}; + +struct mcs_ctrl_pkt_rule_write_req { +struct mbox_msghdr hdr; + uint64_t __io data0; + uint64_t __io data1; + uint64_t __io data2; + uint8_t __io rule_idx; + uint8_t __io rule_type; + uint8_t __io mcs_id; + uint8_t __io dir; + uint64_t __io rsvd; +}; +struct mcs_port_cfg_set_req {struct mbox_msghdr hdr; uint8_t __io cstm_tag_rel_mode_sel;
@@ -951,6 +1006,23 @@ struct mcs_port_cfg_get_rsp { uint64_t __io rsvd; }; +struct mcs_custom_tag_cfg_get_req { +struct mbox_msghdr hdr; + uint8_t __io mcs_id; + uint8_t __io dir; + uint64_t __io rsvd; +}; + +struct mcs_custom_tag_cfg_get_rsp { +struct mbox_msghdr hdr; + uint16_t __io cstm_etype[8]; + uint8_t __io cstm_indx[8]; + uint8_t __io cstm_etype_en; + uint8_t __io mcs_id; + uint8_t __io dir; + uint64_t __io rsvd; +}; +struct mcs_port_reset_req {struct mbox_msghdr hdr; uint8_t __io reset;
drivers/common/cnxk/roc_mcs.c +117 -0
129 lines not on this page · raw message
drivers/common/cnxk/roc_mcs.h +65 -0
89 lines not on this page · raw message
drivers/common/cnxk/version.map +4 -0
@@ -136,6 +136,10 @@ INTERNAL { roc_se_ciph_key_set; roc_se_ctx_init; roc_mcs_active_lmac_set; + roc_mcs_ctrl_pkt_rule_alloc; + roc_mcs_ctrl_pkt_rule_free; + roc_mcs_ctrl_pkt_rule_write; + roc_mcs_custom_tag_cfg_get; roc_mcs_dev_init; roc_mcs_dev_fini; roc_mcs_dev_get;
Signature · 1 line
2.25.1
PATCH v3 10/15 common/cnxk: add MACsec FIPS mbox
In reply to Akhil GoyalAdded MACsec FIPS configuration mbox
--- drivers/common/cnxk/roc_mbox.h | 74 ++++++++++++++++++++++++++++++++++ drivers/common/cnxk/roc_mcs.h | 69 +++++++++++++++++++++++++++++++ 2 files changed, 143 insertions(+)
drivers/common/cnxk/roc_mbox.h +74 -0
@@ -330,6 +330,15 @@ struct mbox_msghdr { M(MCS_PORT_CFG_GET, 0xa020, mcs_port_cfg_get, mcs_port_cfg_get_req, mcs_port_cfg_get_rsp) \M (MCS_CUSTOM_TAG_CFG_GET ,0xa021 , mcs_custom_tag_cfg_get, mcs_custom_tag_cfg_get_req, \ mcs_custom_tag_cfg_get_rsp) \ + M(MCS_FIPS_RESET, 0xa040, mcs_fips_reset, mcs_fips_req, msg_rsp) \ + M(MCS_FIPS_MODE_SET, 0xa041, mcs_fips_mode_set, mcs_fips_mode_req, msg_rsp) \ + M(MCS_FIPS_CTL_SET, 0xa042, mcs_fips_ctl_set, mcs_fips_ctl_req, msg_rsp) \ + M(MCS_FIPS_IV_SET, 0xa043, mcs_fips_iv_set, mcs_fips_iv_req, msg_rsp) \ + M(MCS_FIPS_CTR_SET, 0xa044, mcs_fips_ctr_set, mcs_fips_ctr_req, msg_rsp) \ + M(MCS_FIPS_KEY_SET, 0xa045, mcs_fips_key_set, mcs_fips_key_req, msg_rsp) \ + M(MCS_FIPS_BLOCK_SET, 0xa046, mcs_fips_block_set, mcs_fips_block_req, msg_rsp) \ + M(MCS_FIPS_START, 0xa047, mcs_fips_start, mcs_fips_req, msg_rsp) \ +M (MCS_FIPS_RESULT_GET ,0xa048 , mcs_fips_result_get, mcs_fips_req, mcs_fips_result_rsp) /* Messages initiated by AF (range 0xC00 - 0xDFF) */#define MBOX_UP_CGX_MESSAGES \
@@ -1119,6 +1128,71 @@ struct mcs_clear_stats { uint8_t __io all; /* All resources stats mapped to PF are cleared */ }; +struct mcs_fips_req { +struct mbox_msghdr hdr; + uint8_t __io mcs_id; + uint8_t __io dir; +}; + +struct mcs_fips_mode_req { +struct mbox_msghdr hdr; + uint64_t __io mode; + uint8_t __io mcs_id; + uint8_t __io dir; +}; + +struct mcs_fips_ctl_req { +struct mbox_msghdr hdr; + uint64_t __io ctl; + uint8_t __io mcs_id; + uint8_t __io dir; +}; + +struct mcs_fips_iv_req { +struct mbox_msghdr hdr; + uint32_t __io iv_bits95_64; + uint64_t __io iv_bits63_0; + uint8_t __io mcs_id; + uint8_t __io dir; +}; + +struct mcs_fips_ctr_req { +struct mbox_msghdr hdr; + uint32_t __io fips_ctr; + uint8_t __io mcs_id; + uint8_t __io dir; +}; + +struct mcs_fips_key_req { +struct mbox_msghdr hdr; + uint64_t __io sak_bits255_192; + uint64_t __io sak_bits191_128; + uint64_t __io sak_bits127_64; + uint64_t __io sak_bits63_0; + uint64_t __io hashkey_bits127_64; + uint64_t __io hashkey_bits63_0; + uint8_t __io sak_len; + uint8_t __io mcs_id; + uint8_t __io dir; +}; + +struct mcs_fips_block_req { +struct mbox_msghdr hdr; + uint64_t __io blk_bits127_64; + uint64_t __io blk_bits63_0; + uint8_t __io mcs_id; + uint8_t __io dir; +}; + +struct mcs_fips_result_rsp { +struct mbox_msghdr hdr; + uint64_t __io blk_bits127_64; + uint64_t __io blk_bits63_0; + uint64_t __io icv_bits127_64; + uint64_t __io icv_bits63_0; + uint8_t __io result_pass; +}; +/* NPA mbox message formats */ /* NPA mailbox error codes
drivers/common/cnxk/roc_mcs.h +69 -0
79 lines not on this page · raw message
Signature · 1 line
2.25.1
PATCH v3 11/15 common/cnxk: derive hash key for MACsec
In reply to Akhil GoyalMACsec hardware configuration need hash key to be generated from the cipher key of AES-GCM-128/256.
Added an ROC API to derive the hash key and extend the case for AES-256 as well.
--- drivers/common/cnxk/roc_aes.c | 86 ++++++++++++++++++++++----------- drivers/common/cnxk/roc_aes.h | 4 +- drivers/common/cnxk/version.map | 1 + 3 files changed, 60 insertions(+), 31 deletions(-)
drivers/common/cnxk/roc_aes.c +57 -29
@@ -4,9 +4,10 @@#include "roc_api.h" -#define KEY_WORD_LEN (ROC_CPT_AES_XCBC_KEY_LENGTH / sizeof(uint32_t)) -#define KEY_ROUNDS 10/* (Nr+1)*Nb */ -#define KEY_SCHEDULE_LEN ((KEY_ROUNDS + 1) * 4)/* (Nr+1)*Nb words */ +#define KEY128_ROUNDS 10/* (Nr+1)*Nb */ +#define KEY256_ROUNDS 14/* (Nr+1)*Nb */ +#define KEY_SCHEDULE_LEN (nr) ((nr + 1) * 4)/* (Nr+1)*Nb words */ +#define AES_HASH_KEY_LEN 16/* * AES 128 implementation based on NIST FIPS 197 suitable for LittleEndian
@@ -93,22 +94,30 @@ GF8mul(uint8_t byte, uint32_t mp) }static void -aes_key_expand (const uint8_t *key,uint32_t *ks) +aes_key_expand (const uint8_t *key,uint32_t len,uint32_t *ks) { -unsigned int i =4 ; +uint32_t len_words = len /sizeof (uint32_t ); +unsigned int schedule_len; +unsigned int i = len_words;uint32_t temp; + schedule_len = (len ==ROC_CPT_AES128_KEY_LEN ) ?KEY_SCHEDULE_LEN (KEY128_ROUNDS ) : +KEY_SCHEDULE_LEN (KEY256_ROUNDS );/* Skip key in ks */ -memcpy (ks, key,KEY_WORD_LEN *sizeof (uint32_t )); +memcpy (ks, key, len); -while (i <KEY_SCHEDULE_LEN ) { +while (i < schedule_len) { temp = ks[i -1 ]; -if ((i &0x3 ) ==0 ) { +if ((i & (len_words -1 )) ==0 ) { temp =rot_word (temp); temp =sub_word (temp); - temp ^= (uint32_t )GF8mul (1 ,1 << ((i >>2 ) -1 )); + temp ^= (uint32_t )GF8mul (1 ,1 << ((i / len_words) -1 )); } - ks[i] = ks[i -4 ] ^ temp; +if (len ==ROC_CPT_AES256_KEY_LEN ) { +if ((i % len_words) ==4 ) + temp =sub_word (temp); + } + ks[i] = ks[i - len_words] ^ temp; i++; } }
@@ -145,64 +154,83 @@ mix_columns(uint8_t *sRc) }static void -cipher (uint8_t *in,uint8_t *out,uint32_t *ks) +cipher (uint8_t *in,uint8_t *out,uint32_t *ks,uint32_t key_rounds,uint8_t in_len) { -uint32_t state[KEY_WORD_LEN ]; +uint8_t data_word_len = in_len /sizeof (uint32_t ); +uint32_t state[data_word_len];unsigned int i, round;memcpy (state, in,sizeof (state));/* AddRoundKey(state, w[0, Nb-1]) // See Sec. 5.1.4 */ -for (i =0 ; i <KEY_WORD_LEN ; i++) +for (i =0 ; i < data_word_len; i++) state[i] ^= ks[i]; -for (round =1 ; round <KEY_ROUNDS ; round++) { +for (round =1 ; round < key_rounds; round++) {/* SubBytes(state) // See Sec. 5.1.1 */ -for (i =0 ; i <KEY_WORD_LEN ; i++) +for (i =0 ; i < data_word_len; i++) state[i] =sub_word (state[i]);/* ShiftRows(state) // See Sec. 5.1.2 */ -for (i =0 ; i <KEY_WORD_LEN ; i++) +for (i =0 ; i < data_word_len; i++)shift_word ((uint8_t *)state, i, i);/* MixColumns(state) // See Sec. 5.1.3 */ -for (i =0 ; i <KEY_WORD_LEN ; i++) +for (i =0 ; i < data_word_len; i++)mix_columns ((uint8_t *)&state[i]);/* AddRoundKey(state, w[round*Nb, (round+1)*Nb-1]) */ -for (i =0 ; i <KEY_WORD_LEN ; i++) - state[i] ^= ks[round *4 + i]; +for (i =0 ; i < data_word_len; i++) + state[i] ^= ks[round * data_word_len + i]; }/* SubBytes(state) */ -for (i =0 ; i <KEY_WORD_LEN ; i++) +for (i =0 ; i < data_word_len; i++) state[i] =sub_word (state[i]);/* ShiftRows(state) */ -for (i =0 ; i <KEY_WORD_LEN ; i++) +for (i =0 ; i < data_word_len; i++)shift_word ((uint8_t *)state, i, i);/* AddRoundKey(state, w[Nr*Nb, (Nr+1)*Nb-1]) */ -for (i =0 ; i <KEY_WORD_LEN ; i++) - state[i] ^= ks[KEY_ROUNDS *4 + i]; -memcpy (out, state,KEY_WORD_LEN *sizeof (uint32_t )); +for (i =0 ; i < data_word_len; i++) + state[i] ^= ks[key_rounds * data_word_len + i]; +memcpy (out, state, data_word_len *sizeof (uint32_t )); }void roc_aes_xcbc_key_derive (const uint8_t *auth_key,uint8_t *derived_key) { -uint32_t aes_ks[KEY_SCHEDULE_LEN ] = {0 }; +uint32_t aes_ks[KEY_SCHEDULE_LEN (KEY128_ROUNDS )] = {0 };uint8_t k1[16 ] = {[0 ...15 ] =0x01 };uint8_t k2[16 ] = {[0 ...15 ] =0x02 };uint8_t k3[16 ] = {[0 ...15 ] =0x03 }; -aes_key_expand (auth_key, aes_ks); +aes_key_expand (auth_key,ROC_CPT_AES_XCBC_KEY_LENGTH , aes_ks); -cipher (k1, derived_key, aes_ks); +cipher (k1, derived_key, aes_ks,KEY128_ROUNDS ,sizeof (k1)); derived_key +=sizeof (k1); -cipher (k2, derived_key, aes_ks); +cipher (k2, derived_key, aes_ks,KEY128_ROUNDS ,sizeof (k2)); derived_key +=sizeof (k2); -cipher (k3, derived_key, aes_ks); +cipher (k3, derived_key, aes_ks,KEY128_ROUNDS ,sizeof (k3)); +} + +void +roc_aes_hash_key_derive (const uint8_t *key,uint16_t len,uint8_t hash_key[]) +{ +uint8_t data[AES_HASH_KEY_LEN ] = {0x0 }; + +if (len ==ROC_CPT_AES128_KEY_LEN ) { +uint32_t aes_ks[KEY_SCHEDULE_LEN (KEY128_ROUNDS )] = {0 }; + +aes_key_expand (key,ROC_CPT_AES128_KEY_LEN , aes_ks); +cipher (data, hash_key, aes_ks,KEY128_ROUNDS ,sizeof (data)); + }else { +uint32_t aes_ks[KEY_SCHEDULE_LEN (KEY256_ROUNDS )] = {0 }; + +aes_key_expand (key,ROC_CPT_AES256_KEY_LEN , aes_ks); +cipher (data, hash_key, aes_ks,KEY256_ROUNDS ,sizeof (data)); + } }
drivers/common/cnxk/roc_aes.h +2 -2
@@ -8,7 +8,7 @@/* * Derive k1, k2, k3 from 128 bit AES key */ -void __roc_api roc_aes_xcbc_key_derive(const uint8_t *auth_key, -uint8_t *derived_key); +void __roc_api roc_aes_xcbc_key_derive(const uint8_t *auth_key, uint8_t *derived_key); +void __roc_api roc_aes_hash_key_derive(const uint8_t *key, uint16_t len, uint8_t *hash_key);#endif /* _ROC_AES_H_ */
drivers/common/cnxk/version.map +1 -0
@@ -30,6 +30,7 @@ INTERNAL { roc_ae_ec_grp_put; roc_ae_fpm_get; roc_ae_fpm_put; + roc_aes_hash_key_derive; roc_aes_xcbc_key_derive; roc_bphy_cgx_cpri_mode_change; roc_bphy_cgx_cpri_mode_misc;
Signature · 1 line
2.25.1
PATCH v3 12/15 net/cnxk: add MACsec initialization
In reply to Akhil GoyalAdded initialization routines for MACsec for
cn10kb platform.
--- drivers/net/cnxk/cn10k_ethdev_sec.c | 6 ++ drivers/net/cnxk/cnxk_ethdev.c | 13 +++ drivers/net/cnxk/cnxk_ethdev.h | 14 +++ drivers/net/cnxk/cnxk_ethdev_mcs.c | 151 ++++++++++++++++++++++++++++ drivers/net/cnxk/cnxk_ethdev_mcs.h | 61 +++++++++++ drivers/net/cnxk/meson.build | 1 + 6 files changed, 246 insertions(+) create mode 100644 drivers/net/cnxk/cnxk_ethdev_mcs.c create mode 100644 drivers/net/cnxk/cnxk_ethdev_mcs.h
drivers/net/cnxk/cn10k_ethdev_sec.c +6 -0
@@ -1090,9 +1090,15 @@ cn10k_eth_sec_ops_override(void) init_once =1 ;/* Update platform specific ops */ + cnxk_eth_sec_ops.macsec_sa_create =NULL ; + cnxk_eth_sec_ops.macsec_sc_create =NULL ; + cnxk_eth_sec_ops.macsec_sa_destroy =NULL ; + cnxk_eth_sec_ops.macsec_sc_destroy =NULL ; cnxk_eth_sec_ops.session_create = cn10k_eth_sec_session_create; cnxk_eth_sec_ops.session_destroy = cn10k_eth_sec_session_destroy; cnxk_eth_sec_ops.capabilities_get = cn10k_eth_sec_capabilities_get; cnxk_eth_sec_ops.session_update = cn10k_eth_sec_session_update; cnxk_eth_sec_ops.session_stats_get = cn10k_eth_sec_session_stats_get; + cnxk_eth_sec_ops.macsec_sc_stats_get =NULL ; + cnxk_eth_sec_ops.macsec_sa_stats_get =NULL ; }
drivers/net/cnxk/cnxk_ethdev.c +13 -0
@@ -1961,6 +1961,16 @@ cnxk_eth_dev_init(struct rte_eth_dev *eth_dev)if (rc) goto free_mac_addrs; +if (roc_feature_nix_has_macsec ()) { + rc =cnxk_mcs_dev_init (dev,0 ); +if (rc) { +plt_err ("Failed to init MCS" ); + goto free_mac_addrs; + } + dev->rx_offload_capa |=RTE_ETH_RX_OFFLOAD_MACSEC_STRIP ; + dev->tx_offload_capa |=RTE_ETH_TX_OFFLOAD_MACSEC_INSERT ; + } + plt_nix_dbg("Port=%d pf=%d vf=%d ver=%s hwcap=0x%" PRIx64 " rxoffload_capa=0x%" PRIx64 " txoffload_capa=0x%" PRIx64, eth_dev->data->port_id, roc_nix_get_pf(nix),
@@ -2058,6 +2068,9 @@ cnxk_eth_dev_uninit(struct rte_eth_dev *eth_dev, bool reset) } eth_dev->data->nb_rx_queues =0 ; +if (roc_feature_nix_has_macsec ()) +cnxk_mcs_dev_fini (dev); +/* Free security resources */ nix_security_release (dev);
drivers/net/cnxk/cnxk_ethdev.h +14 -0
@@ -395,6 +395,9 @@ struct cnxk_eth_dev {/* Reassembly dynfield/flag offsets */ int reass_dynfield_off;int reass_dynflag_bit; + +/* MCS device */ +struct cnxk_mcs_dev *mcs_dev; };struct cnxk_eth_rxq_sp {
@@ -623,6 +626,17 @@ int cnxk_nix_cman_config_set(struct rte_eth_dev *dev, const struct rte_eth_cman_int cnxk_nix_cman_config_get (struct rte_eth_dev *dev,struct rte_eth_cman_config *config); +int cnxk_mcs_dev_init (struct cnxk_eth_dev *dev,uint8_t mcs_idx); +void cnxk_mcs_dev_fini (struct cnxk_eth_dev *dev); + +struct cnxk_macsec_sess *cnxk_eth_macsec_sess_get_by_sess (struct cnxk_eth_dev *dev, +const struct rte_security_session *sess); +int cnxk_mcs_flow_configure (struct rte_eth_dev *eth_dev,const struct rte_flow_attr *attr, +const struct rte_flow_item pattern[], +const struct rte_flow_action actions[],struct rte_flow_error *error, +void **mcs_flow); +int cnxk_mcs_flow_destroy (struct cnxk_eth_dev *eth_dev,void *mcs_flow); +/* Other private functions */ int nix_recalc_mtu (struct rte_eth_dev *eth_dev);int nix_mtr_validate (struct rte_eth_dev *dev,uint32_t id);
drivers/net/cnxk/cnxk_ethdev_mcs.c new file +151 -0
151 lines not on this page · raw message
drivers/net/cnxk/cnxk_ethdev_mcs.h new file +61 -0
61 lines not on this page · raw message
drivers/net/cnxk/meson.build +1 -0
@@ -22,6 +22,7 @@ sources = files( 'cnxk_ethdev.c', 'cnxk_ethdev_cman.c', 'cnxk_ethdev_devargs.c', + 'cnxk_ethdev_mcs.c', 'cnxk_ethdev_mtr.c', 'cnxk_ethdev_ops.c', 'cnxk_ethdev_sec.c',
Signature · 1 line
2.25.1
PATCH v3 13/15 net/cnxk: create/destroy MACsec SC/SA
In reply to Akhil GoyalAdded support to create/destroy MACsec SA and SC.
--- drivers/net/cnxk/cn10k_ethdev_sec.c | 9 +- drivers/net/cnxk/cnxk_ethdev_mcs.c | 250 ++++++++++++++++++++++++++++ drivers/net/cnxk/cnxk_ethdev_mcs.h | 16 ++ 3 files changed, 271 insertions(+), 4 deletions(-)
drivers/net/cnxk/cn10k_ethdev_sec.c +5 -4
@@ -9,6 +9,7 @@#include <rte_pmd_cnxk.h> #include <cn10k_ethdev.h> +#include <cnxk_ethdev_mcs.h> #include <cnxk_security.h> #include <roc_priv.h>
@@ -1090,10 +1091,10 @@ cn10k_eth_sec_ops_override(void) init_once =1 ;/* Update platform specific ops */ - cnxk_eth_sec_ops.macsec_sa_create =NULL ; - cnxk_eth_sec_ops.macsec_sc_create =NULL ; - cnxk_eth_sec_ops.macsec_sa_destroy =NULL ; - cnxk_eth_sec_ops.macsec_sc_destroy =NULL ; + cnxk_eth_sec_ops.macsec_sa_create = cnxk_eth_macsec_sa_create; + cnxk_eth_sec_ops.macsec_sc_create = cnxk_eth_macsec_sc_create; + cnxk_eth_sec_ops.macsec_sa_destroy = cnxk_eth_macsec_sa_destroy; + cnxk_eth_sec_ops.macsec_sc_destroy = cnxk_eth_macsec_sc_destroy; cnxk_eth_sec_ops.session_create = cn10k_eth_sec_session_create; cnxk_eth_sec_ops.session_destroy = cn10k_eth_sec_session_destroy; cnxk_eth_sec_ops.capabilities_get = cn10k_eth_sec_capabilities_get;
drivers/net/cnxk/cnxk_ethdev_mcs.c +250 -0
256 lines not on this page · raw message
drivers/net/cnxk/cnxk_ethdev_mcs.h +16 -0
@@ -13,6 +13,14 @@ struct cnxk_mcs_dev {uint8_t idx; }; +enum cnxk_mcs_rsrc_type { +CNXK_MCS_RSRC_TYPE_FLOWID , +CNXK_MCS_RSRC_TYPE_SECY , +CNXK_MCS_RSRC_TYPE_SC , +CNXK_MCS_RSRC_TYPE_SA , +CNXK_MCS_RSRC_TYPE_PORT , +}; +struct cnxk_mcs_event_data {/* Valid for below events * - ROC_MCS_EVENT_RX_SA_PN_SOFT_EXP
@@ -59,3 +67,11 @@ struct cnxk_mcs_event_desc {enum roc_mcs_event_subtype subtype;struct cnxk_mcs_event_data metadata; }; + +int cnxk_eth_macsec_sa_create (void *device,struct rte_security_macsec_sa *conf); +int cnxk_eth_macsec_sc_create (void *device,struct rte_security_macsec_sc *conf); + +int cnxk_eth_macsec_sa_destroy (void *device,uint16_t sa_id, +enum rte_security_macsec_direction dir); +int cnxk_eth_macsec_sc_destroy (void *device,uint16_t sc_id, +enum rte_security_macsec_direction dir);
Signature · 1 line
2.25.1
PATCH v3 14/15 net/cnxk: add MACsec session and flow configuration
In reply to Akhil GoyalAdded support for MACsec session/flow create/destroy.
--- drivers/net/cnxk/cn10k_ethdev_sec.c | 11 +- drivers/net/cnxk/cn10k_flow.c | 23 ++- drivers/net/cnxk/cnxk_ethdev.c | 2 + drivers/net/cnxk/cnxk_ethdev.h | 16 ++ drivers/net/cnxk/cnxk_ethdev_mcs.c | 261 ++++++++++++++++++++++++++++ drivers/net/cnxk/cnxk_ethdev_mcs.h | 25 +++ drivers/net/cnxk/cnxk_ethdev_sec.c | 2 +- drivers/net/cnxk/cnxk_flow.c | 5 + 8 files changed, 341 insertions(+), 4 deletions(-)
drivers/net/cnxk/cn10k_ethdev_sec.c +9 -2
@@ -642,7 +642,9 @@ cn10k_eth_sec_session_create(void *device,if (conf->action_type !=RTE_SECURITY_ACTION_TYPE_INLINE_PROTOCOL )return -ENOTSUP ; -if (conf->protocol !=RTE_SECURITY_PROTOCOL_IPSEC ) +if (conf->protocol ==RTE_SECURITY_PROTOCOL_MACSEC ) +return cnxk_eth_macsec_session_create (dev, conf, sess); +else if (conf->protocol !=RTE_SECURITY_PROTOCOL_IPSEC )return -ENOTSUP ;if (rte_security_dynfield_register () <0 )
@@ -887,13 +889,18 @@ cn10k_eth_sec_session_destroy(void *device, struct rte_security_session *sess) {struct rte_eth_dev *eth_dev = (struct rte_eth_dev *)device;struct cnxk_eth_dev *dev =cnxk_eth_pmd_priv (eth_dev); +struct cnxk_macsec_sess *macsec_sess;struct cnxk_eth_sec_sess *eth_sec;rte_spinlock_t *lock;void *sa_dptr; eth_sec =cnxk_eth_sec_sess_get_by_sess (dev, sess); -if (!eth_sec) +if (!eth_sec) { + macsec_sess =cnxk_eth_macsec_sess_get_by_sess (dev, sess); +if (macsec_sess) +return cnxk_eth_macsec_session_destroy (dev, sess);return -ENOENT ; + } lock = eth_sec->inb ? &dev->inb.lock : &dev->outb.lock;rte_spinlock_lock (lock);
drivers/net/cnxk/cn10k_flow.c +22 -1
@@ -1,10 +1,11 @@/* SPDX-License-Identifier: BSD-3-Clause * Copyright(C) 2020 Marvell. */ -#include <cnxk_flow.h> #include "cn10k_flow.h" #include "cn10k_ethdev.h" #include "cn10k_rx.h" +#include "cnxk_ethdev_mcs.h" +#include <cnxk_flow.h> static int cn10k_mtr_connect (struct rte_eth_dev *eth_dev,uint32_t mtr_id)
@@ -133,6 +134,7 @@ cn10k_flow_create(struct rte_eth_dev *eth_dev, const struct rte_flow_attr *attr,const struct rte_flow_action *act_q =NULL ;struct roc_npc *npc = &dev->npc;struct roc_npc_flow *flow; +void *mcs_flow =NULL ;int vtag_actions =0 ;uint32_t req_act =0 ;int mark_actions;
@@ -187,6 +189,17 @@ cn10k_flow_create(struct rte_eth_dev *eth_dev, const struct rte_flow_attr *attr, } } +if (actions[0 ].type ==RTE_FLOW_ACTION_TYPE_SECURITY && +cnxk_eth_macsec_sess_get_by_sess (dev, actions[0 ].conf) !=NULL ) { + rc =cnxk_mcs_flow_configure (eth_dev, attr, pattern, actions, error, &mcs_flow); +if (rc) { +rte_flow_error_set (error, rc,RTE_FLOW_ERROR_TYPE_ACTION ,NULL , +"Failed to configure mcs flow" ); +return NULL ; + } +return (struct rte_flow *)mcs_flow; + } + flow =cnxk_flow_create (eth_dev, attr, pattern, actions, error);if (!flow) {if (mtr)
@@ -265,6 +278,14 @@ cn10k_flow_destroy(struct rte_eth_dev *eth_dev, struct rte_flow *rte_flow, } } +if (cnxk_eth_macsec_sess_get_by_sess (dev, (void *)flow) !=NULL ) { + rc =cnxk_mcs_flow_destroy (dev, (void *)flow); +if (rc <0 ) +rte_flow_error_set (error, rc,RTE_FLOW_ERROR_TYPE_UNSPECIFIED , +NULL ,"Failed to free mcs flow" ); +return rc; + } + mtr_id = flow->mtr_id; rc =cnxk_flow_destroy (eth_dev, flow, error);if (!rc && mtr_id !=ROC_NIX_MTR_ID_INVALID ) {
drivers/net/cnxk/cnxk_ethdev.c +2 -0
@@ -1969,6 +1969,8 @@ cnxk_eth_dev_init(struct rte_eth_dev *eth_dev) } dev->rx_offload_capa |=RTE_ETH_RX_OFFLOAD_MACSEC_STRIP ; dev->tx_offload_capa |=RTE_ETH_TX_OFFLOAD_MACSEC_INSERT ; + +TAILQ_INIT (&dev->mcs_list); } plt_nix_dbg("Port=%d pf=%d vf=%d ver=%s hwcap=0x%" PRIx64
drivers/net/cnxk/cnxk_ethdev.h +16 -0
@@ -292,6 +292,21 @@ struct cnxk_eth_dev_sec_outb {uint64_t cpt_eng_caps; }; +/* MACsec session private data */ +struct cnxk_macsec_sess { +/* List entry */ +TAILQ_ENTRY (cnxk_macsec_sess) entry; + +/* Back pointer to session */ +struct rte_security_session *sess; +enum mcs_direction dir; +uint64_t sci; +uint8_t secy_id; +uint8_t sc_id; +uint8_t flow_id; +}; +TAILQ_HEAD (cnxk_macsec_sess_list, cnxk_macsec_sess); +struct cnxk_eth_dev {/* ROC NIX */ struct roc_nix nix;
@@ -398,6 +413,7 @@ struct cnxk_eth_dev {/* MCS device */ struct cnxk_mcs_dev *mcs_dev; +struct cnxk_macsec_sess_list mcs_list; };struct cnxk_eth_rxq_sp {
drivers/net/cnxk/cnxk_ethdev_mcs.c +261 -0
267 lines not on this page · raw message
drivers/net/cnxk/cnxk_ethdev_mcs.h +25 -0
@@ -21,6 +21,27 @@ enum cnxk_mcs_rsrc_type { CNXK_MCS_RSRC_TYPE_PORT, }; +struct cnxk_mcs_flow_opts { +uint32_t outer_tag_id; +/**< {VLAN_ID[11:0]}, or 20-bit MPLS label*/ +uint8_t outer_priority; +/**< {PCP/Pbits, DE/CFI} or {1'b0, EXP} for MPLS.*/ +uint32_t second_outer_tag_id; +/**< {VLAN_ID[11:0]}, or 20-bit MPLS label*/ +uint8_t second_outer_priority; +/**< {PCP/Pbits, DE/CFI} or {1'b0, EXP} for MPLS. */ +uint16_t bonus_data; +/**< 2 bytes of additional bonus data extracted from one of the custom tags*/ +uint8_t tag_match_bitmap; +uint8_t packet_type; +uint8_t outer_vlan_type; +uint8_t inner_vlan_type; +uint8_t num_tags; +bool express; +uint8_t lmac_id; +uint8_t flowid_user; +}; +struct cnxk_mcs_event_data {/* Valid for below events * - ROC_MCS_EVENT_RX_SA_PN_SOFT_EXP
@@ -75,3 +96,7 @@ int cnxk_eth_macsec_sa_destroy(void *device, uint16_t sa_id, enum rte_security_macsec_direction dir);int cnxk_eth_macsec_sc_destroy (void *device,uint16_t sc_id,enum rte_security_macsec_direction dir); + +int cnxk_eth_macsec_session_create (struct cnxk_eth_dev *dev,struct rte_security_session_conf *conf, +struct rte_security_session *sess); +int cnxk_eth_macsec_session_destroy (struct cnxk_eth_dev *dev,struct rte_security_session *sess);
drivers/net/cnxk/cnxk_ethdev_sec.c +1 -1
@@ -284,7 +284,7 @@ cnxk_eth_sec_sess_get_by_sess(struct cnxk_eth_dev *dev,static unsigned int cnxk_eth_sec_session_get_size(void *device __rte_unused) { -return sizeof (struct cnxk_eth_sec_sess ); +return RTE_MAX (sizeof (struct cnxk_macsec_sess ),sizeof (struct cnxk_eth_sec_sess )); }struct rte_security_ops cnxk_eth_sec_ops = {
drivers/net/cnxk/cnxk_flow.c +5 -0
@@ -300,6 +300,11 @@ cnxk_flow_validate(struct rte_eth_dev *eth_dev,uint32_t flowkey_cfg =0 ;int rc; +/* Skip flow validation for MACsec. */ +if (actions[0 ].type ==RTE_FLOW_ACTION_TYPE_SECURITY && +cnxk_eth_macsec_sess_get_by_sess (dev, actions[0 ].conf) !=NULL ) +return 0 ; +memset (&flow,0 ,sizeof (flow)); flow.is_validate = true;
Signature · 1 line
2.25.1
PATCH v3 15/15 net/cnxk: add MACsec stats
In reply to Akhil GoyalAdded support for MACsec SC/flow/session stats.
--- doc/guides/rel_notes/release_23_07.rst | 5 ++ drivers/net/cnxk/cn10k_ethdev_sec.c | 11 +++-- drivers/net/cnxk/cnxk_ethdev_mcs.c | 64 ++++++++++++++++++++++++++ drivers/net/cnxk/cnxk_ethdev_mcs.h | 9 ++++ 4 files changed, 86 insertions(+), 3 deletions(-)
doc/guides/rel_notes/release_23_07.rst +5 -0
@@ -139,6 +139,11 @@ New Features for new capability registers, large passthrough BAR and some performance enhancements for UPT. +* **Updated Marvell cnxk ethdev driver.** + + Added support for Inline MACsec processing using rte_security framework + for CN103 platform. + * **Added new algorithms to cryptodev.** * Added asymmetric algorithm ShangMi 2 (SM2) along with prime field curve support.
drivers/net/cnxk/cn10k_ethdev_sec.c +8 -3
@@ -1058,12 +1058,17 @@ cn10k_eth_sec_session_stats_get(void *device, struct rte_security_session *sess, {struct rte_eth_dev *eth_dev = (struct rte_eth_dev *)device;struct cnxk_eth_dev *dev =cnxk_eth_pmd_priv (eth_dev); +struct cnxk_macsec_sess *macsec_sess;struct cnxk_eth_sec_sess *eth_sec;int rc; eth_sec =cnxk_eth_sec_sess_get_by_sess (dev, sess); -if (eth_sec ==NULL ) +if (eth_sec ==NULL ) { + macsec_sess =cnxk_eth_macsec_sess_get_by_sess (dev, sess); +if (macsec_sess) +return cnxk_eth_macsec_session_stats_get (dev, macsec_sess, stats);return -EINVAL ; + } rc =roc_nix_inl_sa_sync (&dev->nix, eth_sec->sa, eth_sec->inb,ROC_NIX_INL_SA_OP_FLUSH );
@@ -1107,6 +1112,6 @@ cn10k_eth_sec_ops_override(void) cnxk_eth_sec_ops.capabilities_get = cn10k_eth_sec_capabilities_get; cnxk_eth_sec_ops.session_update = cn10k_eth_sec_session_update; cnxk_eth_sec_ops.session_stats_get = cn10k_eth_sec_session_stats_get; - cnxk_eth_sec_ops.macsec_sc_stats_get =NULL ; - cnxk_eth_sec_ops.macsec_sa_stats_get =NULL ; + cnxk_eth_sec_ops.macsec_sc_stats_get = cnxk_eth_macsec_sc_stats_get; + cnxk_eth_sec_ops.macsec_sa_stats_get = cnxk_eth_macsec_sa_stats_get; }
drivers/net/cnxk/cnxk_ethdev_mcs.c +64 -0
70 lines not on this page · raw message
drivers/net/cnxk/cnxk_ethdev_mcs.h +9 -0
@@ -97,6 +97,15 @@ int cnxk_eth_macsec_sa_destroy(void *device, uint16_t sa_id,int cnxk_eth_macsec_sc_destroy (void *device,uint16_t sc_id,enum rte_security_macsec_direction dir); +int cnxk_eth_macsec_sa_stats_get (void *device,uint16_t sa_id, +enum rte_security_macsec_direction dir, +struct rte_security_macsec_sa_stats *stats); +int cnxk_eth_macsec_sc_stats_get (void *device,uint16_t sa_id, +enum rte_security_macsec_direction dir, +struct rte_security_macsec_sc_stats *stats); +int cnxk_eth_macsec_session_stats_get (struct cnxk_eth_dev *dev,struct cnxk_macsec_sess *sess, +struct rte_security_stats *stats); +int cnxk_eth_macsec_session_create (struct cnxk_eth_dev *dev,struct rte_security_session_conf *conf,struct rte_security_session *sess);int cnxk_eth_macsec_session_destroy (struct cnxk_eth_dev *dev,struct rte_security_session *sess);
Signature · 1 line
2.25.1
v4 cover net/cnxk: add MACsec support
In reply to Akhil GoyalAdded MACsec support in Marvell cnxk PMD. The patchset is pending from last release [1] Sending as a new series as the functionality is now complete and tested on hardware.
[1] https://patches.dpdk.org/project/dpdk/cover/[email protected]/
Changes in v4:
Fix build with RHEL/CentOS
Changes in v3:
- rebased
- fixed warning PRI*64
- added release notes
Changes in v2:
- Addressed review comments from Jerin.
Akhil Goyal (15):
common/cnxk: add ROC MACsec initialization common/cnxk: add MACsec SA configuration common/cnxk: add MACsec SC configuration APIs common/cnxk: add MACsec secy and flow configuration common/cnxk: add MACsec PN and LMAC mode configuration common/cnxk: add MACsec stats
common/cnxk: add MACsec interrupt APIs common/cnxk: add MACsec port configuration common/cnxk: add MACsec control port configuration common/cnxk: add MACsec FIPS mbox common/cnxk: derive hash key for MACsec net/cnxk: add MACsec initialization
net/cnxk: create/destroy MACsec SC/SA net/cnxk: add MACsec session and flow configuration net/cnxk: add MACsec stats
doc/guides/rel_notes/release_23_07.rst | 5 + drivers/common/cnxk/meson.build | 3 + drivers/common/cnxk/roc_aes.c | 86 ++- drivers/common/cnxk/roc_aes.h | 4 +- drivers/common/cnxk/roc_api.h | 3 + drivers/common/cnxk/roc_dev.c | 86 +++ drivers/common/cnxk/roc_features.h | 12 + drivers/common/cnxk/roc_idev.c | 46 ++ drivers/common/cnxk/roc_idev.h | 3 + drivers/common/cnxk/roc_idev_priv.h | 1 + drivers/common/cnxk/roc_mbox.h | 524 ++++++++++++++- drivers/common/cnxk/roc_mcs.c | 871 +++++++++++++++++++++++++ drivers/common/cnxk/roc_mcs.h | 621 ++++++++++++++++++ drivers/common/cnxk/roc_mcs_priv.h | 73 +++ drivers/common/cnxk/roc_mcs_sec_cfg.c | 528 +++++++++++++++ drivers/common/cnxk/roc_mcs_stats.c | 193 ++++++ drivers/common/cnxk/roc_priv.h | 3 + drivers/common/cnxk/roc_utils.c | 5 + drivers/common/cnxk/version.map | 45 ++ drivers/net/cnxk/cn10k_ethdev_sec.c | 25 +- drivers/net/cnxk/cn10k_flow.c | 23 +- drivers/net/cnxk/cnxk_ethdev.c | 15 + drivers/net/cnxk/cnxk_ethdev.h | 30 + drivers/net/cnxk/cnxk_ethdev_mcs.c | 730 +++++++++++++++++++++ drivers/net/cnxk/cnxk_ethdev_mcs.h | 111 ++++ drivers/net/cnxk/cnxk_ethdev_sec.c | 2 +- drivers/net/cnxk/cnxk_flow.c | 5 + drivers/net/cnxk/meson.build | 1 + 28 files changed, 4016 insertions(+), 38 deletions(-) create mode 100644 drivers/common/cnxk/roc_mcs.c create mode 100644 drivers/common/cnxk/roc_mcs.h create mode 100644 drivers/common/cnxk/roc_mcs_priv.h create mode 100644 drivers/common/cnxk/roc_mcs_sec_cfg.c create mode 100644 drivers/common/cnxk/roc_mcs_stats.c create mode 100644 drivers/net/cnxk/cnxk_ethdev_mcs.c create mode 100644 drivers/net/cnxk/cnxk_ethdev_mcs.h
Signature · 1 line
2.25.1
PATCH v4 1/15 common/cnxk: add ROC MACsec initialization
Added ROC init and fini APIs for supporting MACsec.
--- drivers/common/cnxk/meson.build | 1 + drivers/common/cnxk/roc_api.h | 3 + drivers/common/cnxk/roc_features.h | 12 ++ drivers/common/cnxk/roc_idev.c | 46 ++++++ drivers/common/cnxk/roc_idev.h | 3 + drivers/common/cnxk/roc_idev_priv.h | 1 + drivers/common/cnxk/roc_mbox.h | 65 +++++++- drivers/common/cnxk/roc_mcs.c | 220 ++++++++++++++++++++++++++++ drivers/common/cnxk/roc_mcs.h | 41 ++++++ drivers/common/cnxk/roc_mcs_priv.h | 65 ++++++++ drivers/common/cnxk/roc_priv.h | 3 + drivers/common/cnxk/roc_utils.c | 5 + drivers/common/cnxk/version.map | 7 + 13 files changed, 471 insertions(+), 1 deletion(-) create mode 100644 drivers/common/cnxk/roc_mcs.c create mode 100644 drivers/common/cnxk/roc_mcs.h create mode 100644 drivers/common/cnxk/roc_mcs_priv.h
drivers/common/cnxk/meson.build +1 -0
@@ -26,6 +26,7 @@ sources = files( 'roc_irq.c', 'roc_ie_ot.c', 'roc_mbox.c', + 'roc_mcs.c', 'roc_ml.c', 'roc_model.c', 'roc_nix.c',
drivers/common/cnxk/roc_api.h +3 -0
@@ -114,4 +114,7 @@/* ML */ #include "roc_ml.h" +/* MACsec */ +#include "roc_mcs.h" +#endif /* _ROC_API_H_ */
drivers/common/cnxk/roc_features.h +12 -0
@@ -59,4 +59,16 @@ roc_feature_nix_has_age_drop_stats(void) {return (roc_model_is_cn10kb () ||roc_model_is_cn10ka_b0 ()); } + +static inline bool +roc_feature_nix_has_macsec (void ) +{ +return roc_model_is_cn10kb (); +} + +static inline bool +roc_feature_bphy_has_macsec (void ) +{ +return roc_model_is_cnf10kb (); +}#endif
drivers/common/cnxk/roc_idev.c +46 -0
58 lines not on this page · raw message
drivers/common/cnxk/roc_idev.h +3 -0
@@ -19,4 +19,7 @@ struct roc_nix *__roc_api roc_idev_npa_nix_get(void); uint64_t __roc_api roc_idev_nix_inl_meta_aura_get(void); struct roc_nix_list *__roc_api roc_idev_nix_list_get(void); +struct roc_mcs *__roc_api roc_idev_mcs_get(uint8_t mcs_idx); +void __roc_api roc_idev_mcs_set(struct roc_mcs *mcs); +void __roc_api roc_idev_mcs_free(struct roc_mcs *mcs);#endif /* _ROC_IDEV_H_ */
drivers/common/cnxk/roc_idev_priv.h +1 -0
@@ -31,6 +31,7 @@ struct idev_cfg {struct roc_bphy *bphy;struct roc_cpt *cpt;struct roc_sso *sso; +struct roc_mcs_head mcs_list;struct nix_inl_dev *nix_inl_dev;struct idev_nix_inl_cfg inl_cfg;struct roc_nix_list roc_nix_list;
drivers/common/cnxk/roc_mbox.h +64 -1
77 lines not on this page · raw message
drivers/common/cnxk/roc_mcs.c new file +220 -0
220 lines not on this page · raw message
drivers/common/cnxk/roc_mcs.h new file +41 -0
41 lines not on this page · raw message
drivers/common/cnxk/roc_mcs_priv.h new file +65 -0
65 lines not on this page · raw message
drivers/common/cnxk/roc_priv.h +3 -0
@@ -44,6 +44,9 @@/* DPI */ #include "roc_dpi_priv.h" +/* MCS */ +#include "roc_mcs_priv.h" +/* REE */ #include "roc_ree_priv.h"
drivers/common/cnxk/roc_utils.c +5 -0
@@ -16,6 +16,7 @@ roc_error_msg_get(int errorcode)case NPA_ERR_PARAM :case NPC_ERR_PARAM :case SSO_ERR_PARAM : +case MCS_ERR_PARAM :case UTIL_ERR_PARAM : err_msg ="Invalid parameter" ;break ;
@@ -35,6 +36,7 @@ roc_error_msg_get(int errorcode) err_msg ="Operation not supported" ;break ;case NIX_ERR_HW_NOTSUP : +case MCS_ERR_HW_NOTSUP : err_msg ="Hardware does not support" ;break ;case NIX_ERR_QUEUE_INVALID_RANGE :
@@ -223,6 +225,9 @@ roc_error_msg_get(int errorcode)case SSO_ERR_DEVICE_NOT_BOUNDED : err_msg ="SSO pf/vf not found" ;break ; +case MCS_ERR_DEVICE_NOT_FOUND : + err_msg ="MCS device not found" ; +break ;case UTIL_ERR_FS : err_msg ="file operation failed" ;break ;
drivers/common/cnxk/version.map +7 -0
@@ -94,6 +94,9 @@ INTERNAL { roc_idev_cpt_get; roc_idev_cpt_set; roc_idev_lmt_base_addr_get; + roc_idev_mcs_free; + roc_idev_mcs_get; + roc_idev_mcs_set; roc_idev_npa_maxpools_get; roc_idev_npa_maxpools_set; roc_idev_npa_nix_get;
@@ -132,6 +135,10 @@ INTERNAL { roc_se_auth_key_set; roc_se_ciph_key_set; roc_se_ctx_init; + roc_mcs_dev_init; + roc_mcs_dev_fini; + roc_mcs_dev_get; + roc_mcs_hw_info_get; roc_nix_bpf_alloc; roc_nix_bpf_config; roc_nix_bpf_connect;
Signature · 1 line
2.25.1
PATCH v4 2/15 common/cnxk: add MACsec SA configuration
In reply to Akhil GoyalAdded ROC APIs to allocate/free MACsec resources
and APIs to write SA policy.
--- drivers/common/cnxk/meson.build | 1 + drivers/common/cnxk/roc_mbox.h | 12 ++ drivers/common/cnxk/roc_mcs.h | 43 ++++++ drivers/common/cnxk/roc_mcs_sec_cfg.c | 211 ++++++++++++++++++++++++++ drivers/common/cnxk/version.map | 4 + 5 files changed, 271 insertions(+) create mode 100644 drivers/common/cnxk/roc_mcs_sec_cfg.c
drivers/common/cnxk/meson.build +1 -0
@@ -27,6 +27,7 @@ sources = files( 'roc_ie_ot.c', 'roc_mbox.c', 'roc_mcs.c', + 'roc_mcs_sec_cfg.c', 'roc_ml.c', 'roc_model.c', 'roc_nix.c',
drivers/common/cnxk/roc_mbox.h +12 -0
@@ -300,6 +300,7 @@ struct mbox_msghdr {M (MCS_ALLOC_RESOURCES ,0xa000 , mcs_alloc_resources, mcs_alloc_rsrc_req, \ mcs_alloc_rsrc_rsp) \ M(MCS_FREE_RESOURCES, 0xa001, mcs_free_resources, mcs_free_rsrc_req, msg_rsp) \ + M(MCS_SA_PLCY_WRITE, 0xa005, mcs_sa_plcy_write, mcs_sa_plcy_write_req, msg_rsp) \M (MCS_GET_HW_INFO ,0xa00b , mcs_get_hw_info, msg_req, mcs_hw_info) \/* Messages initiated by AF (range 0xC00 - 0xDFF) */
@@ -725,6 +726,17 @@ struct mcs_free_rsrc_req { uint64_t __io rsvd; }; +struct mcs_sa_plcy_write_req { +struct mbox_msghdr hdr; + uint64_t __io plcy[2][9]; /* Support 2 SA policy */ + uint8_t __io sa_index[2]; + uint8_t __io sa_cnt; + uint8_t __io mcs_id; + uint8_t __io dir; + uint64_t __io rsvd; +}; + +struct mcs_hw_info {struct mbox_msghdr hdr; uint8_t __io num_mcs_blks; /* Number of MCS blocks */
drivers/common/cnxk/roc_mcs.h +43 -0
53 lines not on this page · raw message
drivers/common/cnxk/roc_mcs_sec_cfg.c new file +211 -0
211 lines not on this page · raw message
drivers/common/cnxk/version.map +4 -0
@@ -139,6 +139,10 @@ INTERNAL { roc_mcs_dev_fini; roc_mcs_dev_get; roc_mcs_hw_info_get; + roc_mcs_rsrc_alloc; + roc_mcs_rsrc_free; + roc_mcs_sa_policy_read; + roc_mcs_sa_policy_write; roc_nix_bpf_alloc; roc_nix_bpf_config; roc_nix_bpf_connect;
Signature · 1 line
2.25.1
PATCH v4 3/15 common/cnxk: add MACsec SC configuration APIs
In reply to Akhil GoyalAdded ROC APIs to configure MACsec secure channel(SC) and its mapping with SAs for both Rx and Tx.
--- drivers/common/cnxk/roc_mbox.h | 37 ++++++ drivers/common/cnxk/roc_mcs.h | 41 ++++++ drivers/common/cnxk/roc_mcs_sec_cfg.c | 171 ++++++++++++++++++++++++++ drivers/common/cnxk/version.map | 7 ++ 4 files changed, 256 insertions(+)
drivers/common/cnxk/roc_mbox.h +37 -0
@@ -300,7 +300,10 @@ struct mbox_msghdr {M (MCS_ALLOC_RESOURCES ,0xa000 , mcs_alloc_resources, mcs_alloc_rsrc_req, \ mcs_alloc_rsrc_rsp) \ M(MCS_FREE_RESOURCES, 0xa001, mcs_free_resources, mcs_free_rsrc_req, msg_rsp) \ + M(MCS_RX_SC_CAM_WRITE, 0xa004, mcs_rx_sc_cam_write, mcs_rx_sc_cam_write_req, msg_rsp) \ M(MCS_SA_PLCY_WRITE, 0xa005, mcs_sa_plcy_write, mcs_sa_plcy_write_req, msg_rsp) \ + M(MCS_TX_SC_SA_MAP_WRITE, 0xa006, mcs_tx_sc_sa_map_write, mcs_tx_sc_sa_map, msg_rsp) \ + M(MCS_RX_SC_SA_MAP_WRITE, 0xa007, mcs_rx_sc_sa_map_write, mcs_rx_sc_sa_map, msg_rsp) \M (MCS_GET_HW_INFO ,0xa00b , mcs_get_hw_info, msg_req, mcs_hw_info) \/* Messages initiated by AF (range 0xC00 - 0xDFF) */
@@ -726,6 +729,16 @@ struct mcs_free_rsrc_req { uint64_t __io rsvd; }; +/* RX SC_CAM mapping */ +struct mcs_rx_sc_cam_write_req { +struct mbox_msghdr hdr; + uint64_t __io sci; /* SCI */ + uint64_t __io secy_id; /* secy index mapped to SC */ + uint8_t __io sc_id; /* SC CAM entry index */ + uint8_t __io mcs_id; + uint64_t __io rsvd; +}; +struct mcs_sa_plcy_write_req {struct mbox_msghdr hdr; uint64_t __io plcy[2][9]; /* Support 2 SA policy */
@@ -736,6 +749,30 @@ struct mcs_sa_plcy_write_req { uint64_t __io rsvd; }; +struct mcs_tx_sc_sa_map { +struct mbox_msghdr hdr; + uint8_t __io sa_index0; + uint8_t __io sa_index1; + uint8_t __io rekey_ena; + uint8_t __io sa_index0_vld; + uint8_t __io sa_index1_vld; + uint8_t __io tx_sa_active; + uint64_t __io sectag_sci; + uint8_t __io sc_id; /* used as index for SA_MEM_MAP */ + uint8_t __io mcs_id; + uint64_t __io rsvd; +}; + +struct mcs_rx_sc_sa_map { +struct mbox_msghdr hdr; + uint8_t __io sa_index; + uint8_t __io sa_in_use; + uint8_t __io sc_id; +/* an range is 0-3, sc_id + an used as index SA_MEM_MAP */ + uint8_t __io an; + uint8_t __io mcs_id; + uint64_t __io rsvd; +};struct mcs_hw_info {struct mbox_msghdr hdr;
drivers/common/cnxk/roc_mcs.h +41 -0
57 lines not on this page · raw message
drivers/common/cnxk/roc_mcs_sec_cfg.c +171 -0
174 lines not on this page · raw message
drivers/common/cnxk/version.map +7 -0
@@ -141,8 +141,15 @@ INTERNAL { roc_mcs_hw_info_get; roc_mcs_rsrc_alloc; roc_mcs_rsrc_free; + roc_mcs_rx_sc_cam_enable; + roc_mcs_rx_sc_cam_read; + roc_mcs_rx_sc_cam_write; + roc_mcs_rx_sc_sa_map_read; + roc_mcs_rx_sc_sa_map_write; roc_mcs_sa_policy_read; roc_mcs_sa_policy_write; + roc_mcs_tx_sc_sa_map_read; + roc_mcs_tx_sc_sa_map_write; roc_nix_bpf_alloc; roc_nix_bpf_config; roc_nix_bpf_connect;
Signature · 1 line
2.25.1
PATCH v4 4/15 common/cnxk: add MACsec secy and flow configuration
In reply to Akhil GoyalAdded ROC APIs to configure MACsec secy policy and flow entries.
--- drivers/common/cnxk/roc_mbox.h | 38 +++++++++ drivers/common/cnxk/roc_mcs.h | 37 +++++++++ drivers/common/cnxk/roc_mcs_sec_cfg.c | 115 ++++++++++++++++++++++++++ drivers/common/cnxk/version.map | 5 ++ 4 files changed, 195 insertions(+)
drivers/common/cnxk/roc_mbox.h +38 -0
@@ -300,10 +300,14 @@ struct mbox_msghdr {M (MCS_ALLOC_RESOURCES ,0xa000 , mcs_alloc_resources, mcs_alloc_rsrc_req, \ mcs_alloc_rsrc_rsp) \ M(MCS_FREE_RESOURCES, 0xa001, mcs_free_resources, mcs_free_rsrc_req, msg_rsp) \ +M (MCS_FLOWID_ENTRY_WRITE ,0xa002 , mcs_flowid_entry_write, mcs_flowid_entry_write_req, \ + msg_rsp) \ + M(MCS_SECY_PLCY_WRITE, 0xa003, mcs_secy_plcy_write, mcs_secy_plcy_write_req, msg_rsp) \ M(MCS_RX_SC_CAM_WRITE, 0xa004, mcs_rx_sc_cam_write, mcs_rx_sc_cam_write_req, msg_rsp) \ M(MCS_SA_PLCY_WRITE, 0xa005, mcs_sa_plcy_write, mcs_sa_plcy_write_req, msg_rsp) \ M(MCS_TX_SC_SA_MAP_WRITE, 0xa006, mcs_tx_sc_sa_map_write, mcs_tx_sc_sa_map, msg_rsp) \ M(MCS_RX_SC_SA_MAP_WRITE, 0xa007, mcs_rx_sc_sa_map_write, mcs_rx_sc_sa_map, msg_rsp) \ + M(MCS_FLOWID_ENA_ENTRY, 0xa008, mcs_flowid_ena_entry, mcs_flowid_ena_dis_entry, msg_rsp) \M (MCS_GET_HW_INFO ,0xa00b , mcs_get_hw_info, msg_req, mcs_hw_info) \/* Messages initiated by AF (range 0xC00 - 0xDFF) */
@@ -729,6 +733,31 @@ struct mcs_free_rsrc_req { uint64_t __io rsvd; }; +struct mcs_flowid_entry_write_req { +struct mbox_msghdr hdr; + uint64_t __io data[4]; + uint64_t __io mask[4]; + uint64_t __io sci; /* CNF10K-B for tx_secy_mem_map */ + uint8_t __io flow_id; + uint8_t __io secy_id; /* secyid for which flowid is mapped */ +/* sc_id is Valid if dir = MCS_TX, SC_CAM id mapped to flowid */ + uint8_t __io sc_id; + uint8_t __io ena; /* Enable tcam entry */ + uint8_t __io ctr_pkt; + uint8_t __io mcs_id; + uint8_t __io dir; + uint64_t __io rsvd; +}; + +struct mcs_secy_plcy_write_req { +struct mbox_msghdr hdr; + uint64_t __io plcy; + uint8_t __io secy_id; + uint8_t __io mcs_id; + uint8_t __io dir; + uint64_t __io rsvd; +}; +/* RX SC_CAM mapping */ struct mcs_rx_sc_cam_write_req {struct mbox_msghdr hdr;
@@ -774,6 +803,15 @@ struct mcs_rx_sc_sa_map { uint64_t __io rsvd; }; +struct mcs_flowid_ena_dis_entry { +struct mbox_msghdr hdr; + uint8_t __io flow_id; + uint8_t __io ena; + uint8_t __io mcs_id; + uint8_t __io dir; + uint64_t __io rsvd; +}; +struct mcs_hw_info {struct mbox_msghdr hdr; uint8_t __io num_mcs_blks; /* Number of MCS blocks */
drivers/common/cnxk/roc_mcs.h +37 -0
@@ -32,6 +32,24 @@ struct roc_mcs_free_rsrc_req {uint8_t all;/* Free all the cam resources */ }; +struct roc_mcs_flowid_entry_write_req { +uint64_t data[4 ]; +uint64_t mask[4 ]; +uint64_t sci;/* 105N for tx_secy_mem_map */ +uint8_t flow_id; +uint8_t secy_id;/* secyid for which flowid is mapped */ +uint8_t sc_id;/* Valid if dir = MCS_TX, SC_CAM id mapped to flowid */ +uint8_t ena;/* Enable tcam entry */ +uint8_t ctr_pkt; +uint8_t dir; +}; + +struct roc_mcs_secy_plcy_write_req { +uint64_t plcy; +uint8_t secy_id; +uint8_t dir; +}; +/* RX SC_CAM mapping */ struct roc_mcs_rx_sc_cam_write_req {uint64_t sci;/* SCI */
@@ -64,6 +82,12 @@ struct roc_mcs_rx_sc_sa_map {uint8_t an;/* value range 0-3, sc_id + an used as index SA_MEM_MAP */ }; +struct roc_mcs_flowid_ena_dis_entry { +uint8_t flow_id; +uint8_t ena; +uint8_t dir; +}; +struct roc_mcs_hw_info {uint8_t num_mcs_blks;/* Number of MCS blocks */ uint8_t tcam_entries;/* RX/TX Tcam entries per mcs block */
@@ -112,6 +136,11 @@ __roc_api int roc_mcs_rx_sc_cam_read(struct roc_mcs *mcs, struct roc_mcs_rx_sc_cam_write_req *rx_sc_cam); __roc_api int roc_mcs_rx_sc_cam_enable(struct roc_mcs *mcs,struct roc_mcs_rx_sc_cam_write_req *rx_sc_cam); +/* SECY policy read and write */ +__roc_api int roc_mcs_secy_policy_write(struct roc_mcs *mcs, +struct roc_mcs_secy_plcy_write_req *secy_plcy); +__roc_api int roc_mcs_secy_policy_read(struct roc_mcs *mcs, +struct roc_mcs_rx_sc_cam_write_req *rx_sc_cam);/* RX SC-SA MAP read and write */ __roc_api int roc_mcs_rx_sc_sa_map_write(struct roc_mcs *mcs,struct roc_mcs_rx_sc_sa_map *rx_sc_sa_map);
@@ -122,4 +151,12 @@ __roc_api int roc_mcs_tx_sc_sa_map_write(struct roc_mcs *mcs, struct roc_mcs_tx_sc_sa_map *tx_sc_sa_map); __roc_api int roc_mcs_tx_sc_sa_map_read(struct roc_mcs *mcs,struct roc_mcs_tx_sc_sa_map *tx_sc_sa_map); +/* Flow entry read, write and enable */ +__roc_api int roc_mcs_flowid_entry_write(struct roc_mcs *mcs, +struct roc_mcs_flowid_entry_write_req *flowid_req); +__roc_api int roc_mcs_flowid_entry_read(struct roc_mcs *mcs, +struct roc_mcs_flowid_entry_write_req *flowid_rsp); +__roc_api int roc_mcs_flowid_entry_enable(struct roc_mcs *mcs, +struct roc_mcs_flowid_ena_dis_entry *entry); +#endif /* _ROC_MCS_H_ */
drivers/common/cnxk/roc_mcs_sec_cfg.c +115 -0
124 lines not on this page · raw message
drivers/common/cnxk/version.map +5 -0
@@ -138,6 +138,9 @@ INTERNAL { roc_mcs_dev_init; roc_mcs_dev_fini; roc_mcs_dev_get; + roc_mcs_flowid_entry_enable; + roc_mcs_flowid_entry_read; + roc_mcs_flowid_entry_write; roc_mcs_hw_info_get; roc_mcs_rsrc_alloc; roc_mcs_rsrc_free;
@@ -148,6 +151,8 @@ INTERNAL { roc_mcs_rx_sc_sa_map_write; roc_mcs_sa_policy_read; roc_mcs_sa_policy_write; + roc_mcs_secy_policy_read; + roc_mcs_secy_policy_write; roc_mcs_tx_sc_sa_map_read; roc_mcs_tx_sc_sa_map_write; roc_nix_bpf_alloc;
Signature · 1 line
2.25.1
PATCH v4 5/15 common/cnxk: add MACsec PN and LMAC mode configuration
In reply to Akhil GoyalAdded ROC APIs for setting packet number and LMAC
related configurations.
--- drivers/common/cnxk/roc_mbox.h | 56 +++++++++++++++++++++ drivers/common/cnxk/roc_mcs.c | 71 +++++++++++++++++++++++++++ drivers/common/cnxk/roc_mcs.h | 48 ++++++++++++++++++ drivers/common/cnxk/roc_mcs_sec_cfg.c | 31 ++++++++++++ drivers/common/cnxk/version.map | 5 ++ 5 files changed, 211 insertions(+)
drivers/common/cnxk/roc_mbox.h +56 -0
@@ -308,7 +308,11 @@ struct mbox_msghdr { M(MCS_TX_SC_SA_MAP_WRITE, 0xa006, mcs_tx_sc_sa_map_write, mcs_tx_sc_sa_map, msg_rsp) \ M(MCS_RX_SC_SA_MAP_WRITE, 0xa007, mcs_rx_sc_sa_map_write, mcs_rx_sc_sa_map, msg_rsp) \ M(MCS_FLOWID_ENA_ENTRY, 0xa008, mcs_flowid_ena_entry, mcs_flowid_ena_dis_entry, msg_rsp) \ + M(MCS_PN_TABLE_WRITE, 0xa009, mcs_pn_table_write, mcs_pn_table_write_req, msg_rsp) \ + M(MCS_SET_ACTIVE_LMAC, 0xa00a, mcs_set_active_lmac, mcs_set_active_lmac, msg_rsp) \ M(MCS_GET_HW_INFO, 0xa00b, mcs_get_hw_info, msg_req, mcs_hw_info) \ + M(MCS_SET_LMAC_MODE, 0xa013, mcs_set_lmac_mode, mcs_set_lmac_mode, msg_rsp) \ +M (MCS_SET_PN_THRESHOLD ,0xa014 , mcs_set_pn_threshold, mcs_set_pn_threshold, msg_rsp) \ /* Messages initiated by AF (range 0xC00 - 0xDFF) */#define MBOX_UP_CGX_MESSAGES \
@@ -812,6 +816,34 @@ struct mcs_flowid_ena_dis_entry { uint64_t __io rsvd; }; +struct mcs_pn_table_write_req { +struct mbox_msghdr hdr; + uint64_t __io next_pn; + uint8_t __io pn_id; + uint8_t __io mcs_id; + uint8_t __io dir; + uint64_t __io rsvd; +}; + +struct mcs_cam_entry_read_req { +struct mbox_msghdr hdr; + uint8_t __io rsrc_type; /* TCAM/SECY/SC/SA/PN */ + uint8_t __io rsrc_id; + uint8_t __io mcs_id; + uint8_t __io dir; + uint64_t __io rsvd; +}; + +struct mcs_cam_entry_read_rsp { +struct mbox_msghdr hdr; + uint64_t __io reg_val[10]; + uint8_t __io rsrc_type; + uint8_t __io rsrc_id; + uint8_t __io mcs_id; + uint8_t __io dir; + uint64_t __io rsvd; +}; +struct mcs_hw_info {struct mbox_msghdr hdr; uint8_t __io num_mcs_blks; /* Number of MCS blocks */
@@ -822,6 +854,30 @@ struct mcs_hw_info { uint64_t __io rsvd[16]; }; +struct mcs_set_active_lmac { +struct mbox_msghdr hdr; + uint32_t __io lmac_bmap; /* bitmap of active lmac per mcs block */ + uint8_t __io mcs_id; + uint16_t __io channel_base; /* MCS channel base */ + uint64_t __io rsvd; +}; + +struct mcs_set_lmac_mode { +struct mbox_msghdr hdr; + uint8_t __io mode; /* '1' for internal bypass mode (passthrough), '0' for MCS processing */ + uint8_t __io lmac_id; + uint8_t __io mcs_id; + uint64_t __io rsvd; +}; + +struct mcs_set_pn_threshold { +struct mbox_msghdr hdr; + uint64_t __io threshold; + uint8_t __io xpn; /* '1' for setting xpn threshold */ + uint8_t __io mcs_id; + uint8_t __io dir; + uint64_t __io rsvd; +};/* NPA mbox message formats */
drivers/common/cnxk/roc_mcs.c +71 -0
77 lines not on this page · raw message
drivers/common/cnxk/roc_mcs.h +48 -0
72 lines not on this page · raw message
drivers/common/cnxk/roc_mcs_sec_cfg.c +31 -0
@@ -210,6 +210,37 @@ roc_mcs_sa_policy_read(struct roc_mcs *mcs __plt_unused,return -ENOTSUP ; } +int +roc_mcs_pn_table_write (struct roc_mcs *mcs,struct roc_mcs_pn_table_write_req *pn_table) +{ +struct mcs_pn_table_write_req *pn; +struct msg_rsp *rsp; + +MCS_SUPPORT_CHECK ; + +if (pn_table ==NULL ) +return -EINVAL ; + + pn =mbox_alloc_msg_mcs_pn_table_write (mcs->mbox); +if (pn ==NULL ) +return -ENOMEM ; + + pn->next_pn = pn_table->next_pn; + pn->pn_id = pn_table->pn_id; + pn->mcs_id = mcs->idx; + pn->dir = pn_table->dir; + +return mbox_process_msg (mcs->mbox, (void *)&rsp); +} + +int +roc_mcs_pn_table_read(struct roc_mcs *mcs __plt_unused, + struct roc_mcs_pn_table_write_req *sa __plt_unused) +{ +MCS_SUPPORT_CHECK ; + +return -ENOTSUP ; +}int roc_mcs_rx_sc_cam_write (struct roc_mcs *mcs,struct roc_mcs_rx_sc_cam_write_req *rx_sc_cam)
drivers/common/cnxk/version.map +5 -0
@@ -135,6 +135,7 @@ INTERNAL { roc_se_auth_key_set; roc_se_ciph_key_set; roc_se_ctx_init; + roc_mcs_active_lmac_set; roc_mcs_dev_init; roc_mcs_dev_fini; roc_mcs_dev_get;
@@ -142,6 +143,10 @@ INTERNAL { roc_mcs_flowid_entry_read; roc_mcs_flowid_entry_write; roc_mcs_hw_info_get; + roc_mcs_lmac_mode_set; + roc_mcs_pn_table_write; + roc_mcs_pn_table_read; + roc_mcs_pn_threshold_set; roc_mcs_rsrc_alloc; roc_mcs_rsrc_free; roc_mcs_rx_sc_cam_enable;
Signature · 1 line
2.25.1
PATCH v4 6/15 common/cnxk: add MACsec stats
In reply to Akhil GoyalAdded ROC APIs for MACsec stats for SC/SECY/FLOW/PORT
--- drivers/common/cnxk/meson.build | 1 + drivers/common/cnxk/roc_mbox.h | 93 ++++++++++++++ drivers/common/cnxk/roc_mcs.h | 85 ++++++++++++ drivers/common/cnxk/roc_mcs_stats.c | 193 ++++++++++++++++++++++++++++ drivers/common/cnxk/version.map | 5 + 5 files changed, 377 insertions(+) create mode 100644 drivers/common/cnxk/roc_mcs_stats.c
drivers/common/cnxk/meson.build +1 -0
@@ -28,6 +28,7 @@ sources = files( 'roc_mbox.c', 'roc_mcs.c', 'roc_mcs_sec_cfg.c', + 'roc_mcs_stats.c', 'roc_ml.c', 'roc_model.c', 'roc_nix.c',
drivers/common/cnxk/roc_mbox.h +93 -0
105 lines not on this page · raw message
drivers/common/cnxk/roc_mcs.h +85 -0
95 lines not on this page · raw message
drivers/common/cnxk/roc_mcs_stats.c new file +193 -0
193 lines not on this page · raw message
drivers/common/cnxk/version.map +5 -0
@@ -142,11 +142,13 @@ INTERNAL { roc_mcs_flowid_entry_enable; roc_mcs_flowid_entry_read; roc_mcs_flowid_entry_write; + roc_mcs_flowid_stats_get; roc_mcs_hw_info_get; roc_mcs_lmac_mode_set; roc_mcs_pn_table_write; roc_mcs_pn_table_read; roc_mcs_pn_threshold_set; + roc_mcs_port_stats_get; roc_mcs_rsrc_alloc; roc_mcs_rsrc_free; roc_mcs_rx_sc_cam_enable;
@@ -156,8 +158,11 @@ INTERNAL { roc_mcs_rx_sc_sa_map_write; roc_mcs_sa_policy_read; roc_mcs_sa_policy_write; + roc_mcs_sc_stats_get; roc_mcs_secy_policy_read; roc_mcs_secy_policy_write; + roc_mcs_secy_stats_get; + roc_mcs_stats_clear; roc_mcs_tx_sc_sa_map_read; roc_mcs_tx_sc_sa_map_write; roc_nix_bpf_alloc;
Signature · 1 line
2.25.1
PATCH v4 7/15 common/cnxk: add MACsec interrupt APIs
In reply to Akhil GoyalAdded ROC APIs to support various MACsec interrupts.
--- drivers/common/cnxk/roc_dev.c | 86 +++++++++++++++++ drivers/common/cnxk/roc_mbox.h | 37 +++++++- drivers/common/cnxk/roc_mcs.c | 117 +++++++++++++++++++++++ drivers/common/cnxk/roc_mcs.h | 144 +++++++++++++++++++++++++++++ drivers/common/cnxk/roc_mcs_priv.h | 8 ++ drivers/common/cnxk/version.map | 3 + 6 files changed, 394 insertions(+), 1 deletion(-)
drivers/common/cnxk/roc_dev.c +86 -0
@@ -527,6 +527,91 @@ pf_vf_mbox_send_up_msg(struct dev *dev, void *rec_msg) } } +static int +mbox_up_handler_mcs_intr_notify (struct dev *dev,struct mcs_intr_info *info,struct msg_rsp *rsp) +{ +struct roc_mcs_event_desc desc = {0 }; +struct roc_mcs *mcs; + +plt_base_dbg ("pf:%d/vf:%d msg id 0x%x (%s) from: pf:%d/vf:%d" ,dev_get_pf (dev->pf_func), +dev_get_vf (dev->pf_func), info->hdr.id,mbox_id2name (info->hdr.id), +dev_get_pf (info->hdr.pcifunc),dev_get_vf (info->hdr.pcifunc)); + + mcs =roc_idev_mcs_get (info->mcs_id); +if (!mcs) + goto exit; + +if (info->intr_mask) { +switch (info->intr_mask) { +case MCS_CPM_RX_SECTAG_V_EQ1_INT : + desc.type =ROC_MCS_EVENT_SECTAG_VAL_ERR ; + desc.subtype =ROC_MCS_EVENT_RX_SECTAG_V_EQ1 ; +break ; +case MCS_CPM_RX_SECTAG_E_EQ0_C_EQ1_INT : + desc.type =ROC_MCS_EVENT_SECTAG_VAL_ERR ; + desc.subtype =ROC_MCS_EVENT_RX_SECTAG_E_EQ0_C_EQ1 ; +break ; +case MCS_CPM_RX_SECTAG_SL_GTE48_INT : + desc.type =ROC_MCS_EVENT_SECTAG_VAL_ERR ; + desc.subtype =ROC_MCS_EVENT_RX_SECTAG_SL_GTE48 ; +break ; +case MCS_CPM_RX_SECTAG_ES_EQ1_SC_EQ1_INT : + desc.type =ROC_MCS_EVENT_SECTAG_VAL_ERR ; + desc.subtype =ROC_MCS_EVENT_RX_SECTAG_ES_EQ1_SC_EQ1 ; +break ; +case MCS_CPM_RX_SECTAG_SC_EQ1_SCB_EQ1_INT : + desc.type =ROC_MCS_EVENT_SECTAG_VAL_ERR ; + desc.subtype =ROC_MCS_EVENT_RX_SECTAG_SC_EQ1_SCB_EQ1 ; +break ; +case MCS_CPM_RX_PACKET_XPN_EQ0_INT : + desc.type =ROC_MCS_EVENT_RX_SA_PN_HARD_EXP ; + desc.metadata.sa_idx = info->sa_id; +break ; +case MCS_CPM_RX_PN_THRESH_REACHED_INT : + desc.type =ROC_MCS_EVENT_RX_SA_PN_SOFT_EXP ; + desc.metadata.sa_idx = info->sa_id; +break ; +case MCS_CPM_TX_PACKET_XPN_EQ0_INT : + desc.type =ROC_MCS_EVENT_TX_SA_PN_HARD_EXP ; + desc.metadata.sa_idx = info->sa_id; +break ; +case MCS_CPM_TX_PN_THRESH_REACHED_INT : + desc.type =ROC_MCS_EVENT_TX_SA_PN_SOFT_EXP ; + desc.metadata.sa_idx = info->sa_id; +break ; +case MCS_CPM_TX_SA_NOT_VALID_INT : + desc.type =ROC_MCS_EVENT_SA_NOT_VALID ; +break ; +case MCS_BBE_RX_DFIFO_OVERFLOW_INT : +case MCS_BBE_TX_DFIFO_OVERFLOW_INT : + desc.type =ROC_MCS_EVENT_FIFO_OVERFLOW ; + desc.subtype =ROC_MCS_EVENT_DATA_FIFO_OVERFLOW ; + desc.metadata.lmac_id = info->lmac_id; +break ; +case MCS_BBE_RX_PLFIFO_OVERFLOW_INT : +case MCS_BBE_TX_PLFIFO_OVERFLOW_INT : + desc.type =ROC_MCS_EVENT_FIFO_OVERFLOW ; + desc.subtype =ROC_MCS_EVENT_POLICY_FIFO_OVERFLOW ; + desc.metadata.lmac_id = info->lmac_id; +break ; +case MCS_PAB_RX_CHAN_OVERFLOW_INT : +case MCS_PAB_TX_CHAN_OVERFLOW_INT : + desc.type =ROC_MCS_EVENT_FIFO_OVERFLOW ; + desc.subtype =ROC_MCS_EVENT_PKT_ASSM_FIFO_OVERFLOW ; + desc.metadata.lmac_id = info->lmac_id; +break ; +default : + goto exit; + } + +mcs_event_cb_process (mcs, &desc); + } + +exit: + rsp->hdr.rc =0 ; +return 0 ; +} +static int mbox_up_handler_cgx_link_event (struct dev *dev,struct cgx_link_info_msg *msg,struct msg_rsp *rsp)
@@ -615,6 +700,7 @@ mbox_process_msgs_up(struct dev *dev, struct mbox_msghdr *req)return err; \ }MBOX_UP_CGX_MESSAGES + MBOX_UP_MCS_MESSAGES#undef M }
drivers/common/cnxk/roc_mbox.h +36 -1
@@ -316,6 +316,7 @@ struct mbox_msghdr { M(MCS_GET_SC_STATS, 0xa00e, mcs_get_sc_stats, mcs_stats_req, mcs_sc_stats) \ M(MCS_GET_PORT_STATS, 0xa010, mcs_get_port_stats, mcs_stats_req, mcs_port_stats) \ M(MCS_CLEAR_STATS, 0xa011, mcs_clear_stats, mcs_clear_stats, msg_rsp) \ + M(MCS_INTR_CFG, 0xa012, mcs_intr_cfg, mcs_intr_cfg, msg_rsp) \ M(MCS_SET_LMAC_MODE, 0xa013, mcs_set_lmac_mode, mcs_set_lmac_mode, msg_rsp) \M (MCS_SET_PN_THRESHOLD ,0xa014 , mcs_set_pn_threshold, mcs_set_pn_threshold, msg_rsp) \
@@ -324,9 +325,11 @@ struct mbox_msghdr { M(CGX_LINK_EVENT, 0xC00, cgx_link_event, cgx_link_info_msg, msg_rsp) \ M(CGX_PTP_RX_INFO, 0xC01, cgx_ptp_rx_info, cgx_ptp_rx_info_msg, msg_rsp) +#define MBOX_UP_MCS_MESSAGES M(MCS_INTR_NOTIFY, 0xE00, mcs_intr_notify, mcs_intr_info, msg_rsp) +enum { #define M(_name, _id, _1, _2, _3) MBOX_MSG_##_name = _id, - MBOX_MESSAGES MBOX_UP_CGX_MESSAGES + MBOX_MESSAGES MBOX_UP_CGX_MESSAGES MBOX_UP_MCS_MESSAGES#undef M };
@@ -867,6 +870,38 @@ struct mcs_set_active_lmac { uint64_t __io rsvd; }; +#define MCS_CPM_RX_SECTAG_V_EQ1_INT BIT_ULL(0) +#define MCS_CPM_RX_SECTAG_E_EQ0_C_EQ1_INT BIT_ULL(1) +#define MCS_CPM_RX_SECTAG_SL_GTE48_INT BIT_ULL(2) +#define MCS_CPM_RX_SECTAG_ES_EQ1_SC_EQ1_INT BIT_ULL(3) +#define MCS_CPM_RX_SECTAG_SC_EQ1_SCB_EQ1_INT BIT_ULL(4) +#define MCS_CPM_RX_PACKET_XPN_EQ0_INT BIT_ULL(5) +#define MCS_CPM_RX_PN_THRESH_REACHED_INT BIT_ULL(6) +#define MCS_CPM_TX_PACKET_XPN_EQ0_INT BIT_ULL(7) +#define MCS_CPM_TX_PN_THRESH_REACHED_INT BIT_ULL(8) +#define MCS_CPM_TX_SA_NOT_VALID_INT BIT_ULL(9) +#define MCS_BBE_RX_DFIFO_OVERFLOW_INT BIT_ULL(10) +#define MCS_BBE_RX_PLFIFO_OVERFLOW_INT BIT_ULL(11) +#define MCS_BBE_TX_DFIFO_OVERFLOW_INT BIT_ULL(12) +#define MCS_BBE_TX_PLFIFO_OVERFLOW_INT BIT_ULL(13) +#define MCS_PAB_RX_CHAN_OVERFLOW_INT BIT_ULL(14) +#define MCS_PAB_TX_CHAN_OVERFLOW_INT BIT_ULL(15) + +struct mcs_intr_cfg { +struct mbox_msghdr hdr; + uint64_t __io intr_mask; /* Interrupt enable mask */ + uint8_t __io mcs_id; +}; + +struct mcs_intr_info { +struct mbox_msghdr hdr; + uint64_t __io intr_mask; + int __io sa_id; + uint8_t __io mcs_id; + uint8_t __io lmac_id; + uint64_t __io rsvd; +}; +struct mcs_set_lmac_mode {struct mbox_msghdr hdr; uint8_t __io mode; /* '1' for internal bypass mode (passthrough), '0' for MCS processing */
drivers/common/cnxk/roc_mcs.c +117 -0
141 lines not on this page · raw message
drivers/common/cnxk/roc_mcs.h +144 -0
160 lines not on this page · raw message
drivers/common/cnxk/roc_mcs_priv.h +8 -0
@@ -62,4 +62,12 @@ roc_mcs_to_mcs_priv(struct roc_mcs *roc_mcs) return (struct mcs_priv *)&roc_mcs->reserved[0]; } +static inline void * +roc_mcs_to_mcs_cb_list (struct roc_mcs *roc_mcs) +{ +return (void *)((uintptr_t )roc_mcs->reserved +sizeof (struct mcs_priv )); +} + +int mcs_event_cb_process (struct roc_mcs *mcs,struct roc_mcs_event_desc *desc); +#endif /* _ROC_MCS_PRIV_H_ */
drivers/common/cnxk/version.map +3 -0
@@ -139,11 +139,14 @@ INTERNAL { roc_mcs_dev_init; roc_mcs_dev_fini; roc_mcs_dev_get; + roc_mcs_event_cb_register; + roc_mcs_event_cb_unregister; roc_mcs_flowid_entry_enable; roc_mcs_flowid_entry_read; roc_mcs_flowid_entry_write; roc_mcs_flowid_stats_get; roc_mcs_hw_info_get; + roc_mcs_intr_configure; roc_mcs_lmac_mode_set; roc_mcs_pn_table_write; roc_mcs_pn_table_read;
Signature · 1 line
2.25.1
PATCH v4 8/15 common/cnxk: add MACsec port configuration
In reply to Akhil GoyalAdded ROC APIs for MACsec port configurations
--- drivers/common/cnxk/roc_mbox.h | 40 ++++ drivers/common/cnxk/roc_mcs.c | 346 ++++++++++++++++++++++++++++++++ drivers/common/cnxk/roc_mcs.h | 48 +++++ drivers/common/cnxk/version.map | 4 + 4 files changed, 438 insertions(+)
drivers/common/cnxk/roc_mbox.h +40 -0
@@ -319,6 +319,9 @@ struct mbox_msghdr { M(MCS_INTR_CFG, 0xa012, mcs_intr_cfg, mcs_intr_cfg, msg_rsp) \ M(MCS_SET_LMAC_MODE, 0xa013, mcs_set_lmac_mode, mcs_set_lmac_mode, msg_rsp) \ M(MCS_SET_PN_THRESHOLD, 0xa014, mcs_set_pn_threshold, mcs_set_pn_threshold, msg_rsp) \ + M(MCS_PORT_RESET, 0xa018, mcs_port_reset, mcs_port_reset_req, msg_rsp) \ + M(MCS_PORT_CFG_SET, 0xa019, mcs_port_cfg_set, mcs_port_cfg_set_req, msg_rsp) \ +M (MCS_PORT_CFG_GET ,0xa020 , mcs_port_cfg_get, mcs_port_cfg_get_req, mcs_port_cfg_get_rsp) \ /* Messages initiated by AF (range 0xC00 - 0xDFF) */#define MBOX_UP_CGX_MESSAGES \
@@ -919,6 +922,43 @@ struct mcs_set_pn_threshold { uint64_t __io rsvd; }; +struct mcs_port_cfg_set_req { +struct mbox_msghdr hdr; + uint8_t __io cstm_tag_rel_mode_sel; + uint8_t __io custom_hdr_enb; + uint8_t __io fifo_skid; + uint8_t __io lmac_mode; + uint8_t __io lmac_id; + uint8_t __io mcs_id; + uint64_t __io rsvd; +}; + +struct mcs_port_cfg_get_req { +struct mbox_msghdr hdr; + uint8_t __io lmac_id; + uint8_t __io mcs_id; + uint64_t __io rsvd; +}; + +struct mcs_port_cfg_get_rsp { +struct mbox_msghdr hdr; + uint8_t __io cstm_tag_rel_mode_sel; + uint8_t __io custom_hdr_enb; + uint8_t __io fifo_skid; + uint8_t __io lmac_mode; + uint8_t __io lmac_id; + uint8_t __io mcs_id; + uint64_t __io rsvd; +}; + +struct mcs_port_reset_req { +struct mbox_msghdr hdr; + uint8_t __io reset; + uint8_t __io mcs_id; + uint8_t __io lmac_id; + uint64_t __io rsvd; +}; +struct mcs_stats_req {struct mbox_msghdr hdr; uint8_t __io id;
drivers/common/cnxk/roc_mcs.c +346 -0
364 lines not on this page · raw message
drivers/common/cnxk/roc_mcs.h +48 -0
64 lines not on this page · raw message
drivers/common/cnxk/version.map +4 -0
@@ -151,6 +151,10 @@ INTERNAL { roc_mcs_pn_table_write; roc_mcs_pn_table_read; roc_mcs_pn_threshold_set; + roc_mcs_port_cfg_get; + roc_mcs_port_cfg_set; + roc_mcs_port_recovery; + roc_mcs_port_reset; roc_mcs_port_stats_get; roc_mcs_rsrc_alloc; roc_mcs_rsrc_free;
Signature · 1 line
2.25.1
PATCH v4 9/15 common/cnxk: add MACsec control port configuration
In reply to Akhil GoyalAdded ROC APIs to configure MACsec control port.
--- drivers/common/cnxk/roc_mbox.h | 72 ++++++++++++++++++++ drivers/common/cnxk/roc_mcs.c | 117 ++++++++++++++++++++++++++++++++ drivers/common/cnxk/roc_mcs.h | 65 ++++++++++++++++++ drivers/common/cnxk/version.map | 4 ++ 4 files changed, 258 insertions(+)
drivers/common/cnxk/roc_mbox.h +72 -0
@@ -319,9 +319,17 @@ struct mbox_msghdr { M(MCS_INTR_CFG, 0xa012, mcs_intr_cfg, mcs_intr_cfg, msg_rsp) \ M(MCS_SET_LMAC_MODE, 0xa013, mcs_set_lmac_mode, mcs_set_lmac_mode, msg_rsp) \ M(MCS_SET_PN_THRESHOLD, 0xa014, mcs_set_pn_threshold, mcs_set_pn_threshold, msg_rsp) \ +M (MCS_ALLOC_CTRL_PKT_RULE ,0xa015 , mcs_alloc_ctrl_pkt_rule, mcs_alloc_ctrl_pkt_rule_req, \ + mcs_alloc_ctrl_pkt_rule_rsp) \ +M (MCS_FREE_CTRL_PKT_RULE ,0xa016 , mcs_free_ctrl_pkt_rule, mcs_free_ctrl_pkt_rule_req, \ + msg_rsp) \ +M (MCS_CTRL_PKT_RULE_WRITE ,0xa017 , mcs_ctrl_pkt_rule_write, mcs_ctrl_pkt_rule_write_req, \ + msg_rsp) \ M(MCS_PORT_RESET, 0xa018, mcs_port_reset, mcs_port_reset_req, msg_rsp) \ M(MCS_PORT_CFG_SET, 0xa019, mcs_port_cfg_set, mcs_port_cfg_set_req, msg_rsp) \ M(MCS_PORT_CFG_GET, 0xa020, mcs_port_cfg_get, mcs_port_cfg_get_req, mcs_port_cfg_get_rsp) \ +M (MCS_CUSTOM_TAG_CFG_GET ,0xa021 , mcs_custom_tag_cfg_get, mcs_custom_tag_cfg_get_req, \ + mcs_custom_tag_cfg_get_rsp) \ /* Messages initiated by AF (range 0xC00 - 0xDFF) */#define MBOX_UP_CGX_MESSAGES \
@@ -922,6 +930,53 @@ struct mcs_set_pn_threshold { uint64_t __io rsvd; }; +enum mcs_ctrl_pkt_rule_type { +MCS_CTRL_PKT_RULE_TYPE_ETH , +MCS_CTRL_PKT_RULE_TYPE_DA , +MCS_CTRL_PKT_RULE_TYPE_RANGE , +MCS_CTRL_PKT_RULE_TYPE_COMBO , +MCS_CTRL_PKT_RULE_TYPE_MAC , +}; + +struct mcs_alloc_ctrl_pkt_rule_req { +struct mbox_msghdr hdr; + uint8_t __io rule_type; + uint8_t __io mcs_id; /* MCS block ID */ + uint8_t __io dir; /* Macsec ingress or egress side */ + uint64_t __io rsvd; +}; + +struct mcs_alloc_ctrl_pkt_rule_rsp { +struct mbox_msghdr hdr; + uint8_t __io rule_idx; + uint8_t __io rule_type; + uint8_t __io mcs_id; + uint8_t __io dir; + uint64_t __io rsvd; +}; + +struct mcs_free_ctrl_pkt_rule_req { +struct mbox_msghdr hdr; + uint8_t __io rule_idx; + uint8_t __io rule_type; + uint8_t __io mcs_id; + uint8_t __io dir; + uint8_t __io all; /* Free all the rule resources */ + uint64_t __io rsvd; +}; + +struct mcs_ctrl_pkt_rule_write_req { +struct mbox_msghdr hdr; + uint64_t __io data0; + uint64_t __io data1; + uint64_t __io data2; + uint8_t __io rule_idx; + uint8_t __io rule_type; + uint8_t __io mcs_id; + uint8_t __io dir; + uint64_t __io rsvd; +}; +struct mcs_port_cfg_set_req {struct mbox_msghdr hdr; uint8_t __io cstm_tag_rel_mode_sel;
@@ -951,6 +1006,23 @@ struct mcs_port_cfg_get_rsp { uint64_t __io rsvd; }; +struct mcs_custom_tag_cfg_get_req { +struct mbox_msghdr hdr; + uint8_t __io mcs_id; + uint8_t __io dir; + uint64_t __io rsvd; +}; + +struct mcs_custom_tag_cfg_get_rsp { +struct mbox_msghdr hdr; + uint16_t __io cstm_etype[8]; + uint8_t __io cstm_indx[8]; + uint8_t __io cstm_etype_en; + uint8_t __io mcs_id; + uint8_t __io dir; + uint64_t __io rsvd; +}; +struct mcs_port_reset_req {struct mbox_msghdr hdr; uint8_t __io reset;
drivers/common/cnxk/roc_mcs.c +117 -0
129 lines not on this page · raw message
drivers/common/cnxk/roc_mcs.h +65 -0
89 lines not on this page · raw message
drivers/common/cnxk/version.map +4 -0
@@ -136,6 +136,10 @@ INTERNAL { roc_se_ciph_key_set; roc_se_ctx_init; roc_mcs_active_lmac_set; + roc_mcs_ctrl_pkt_rule_alloc; + roc_mcs_ctrl_pkt_rule_free; + roc_mcs_ctrl_pkt_rule_write; + roc_mcs_custom_tag_cfg_get; roc_mcs_dev_init; roc_mcs_dev_fini; roc_mcs_dev_get;
Signature · 1 line
2.25.1
PATCH v4 10/15 common/cnxk: add MACsec FIPS mbox
In reply to Akhil GoyalAdded MACsec FIPS configuration mbox
--- drivers/common/cnxk/roc_mbox.h | 74 ++++++++++++++++++++++++++++++++++ drivers/common/cnxk/roc_mcs.h | 69 +++++++++++++++++++++++++++++++ 2 files changed, 143 insertions(+)
drivers/common/cnxk/roc_mbox.h +74 -0
@@ -330,6 +330,15 @@ struct mbox_msghdr { M(MCS_PORT_CFG_GET, 0xa020, mcs_port_cfg_get, mcs_port_cfg_get_req, mcs_port_cfg_get_rsp) \M (MCS_CUSTOM_TAG_CFG_GET ,0xa021 , mcs_custom_tag_cfg_get, mcs_custom_tag_cfg_get_req, \ mcs_custom_tag_cfg_get_rsp) \ + M(MCS_FIPS_RESET, 0xa040, mcs_fips_reset, mcs_fips_req, msg_rsp) \ + M(MCS_FIPS_MODE_SET, 0xa041, mcs_fips_mode_set, mcs_fips_mode_req, msg_rsp) \ + M(MCS_FIPS_CTL_SET, 0xa042, mcs_fips_ctl_set, mcs_fips_ctl_req, msg_rsp) \ + M(MCS_FIPS_IV_SET, 0xa043, mcs_fips_iv_set, mcs_fips_iv_req, msg_rsp) \ + M(MCS_FIPS_CTR_SET, 0xa044, mcs_fips_ctr_set, mcs_fips_ctr_req, msg_rsp) \ + M(MCS_FIPS_KEY_SET, 0xa045, mcs_fips_key_set, mcs_fips_key_req, msg_rsp) \ + M(MCS_FIPS_BLOCK_SET, 0xa046, mcs_fips_block_set, mcs_fips_block_req, msg_rsp) \ + M(MCS_FIPS_START, 0xa047, mcs_fips_start, mcs_fips_req, msg_rsp) \ +M (MCS_FIPS_RESULT_GET ,0xa048 , mcs_fips_result_get, mcs_fips_req, mcs_fips_result_rsp) /* Messages initiated by AF (range 0xC00 - 0xDFF) */#define MBOX_UP_CGX_MESSAGES \
@@ -1119,6 +1128,71 @@ struct mcs_clear_stats { uint8_t __io all; /* All resources stats mapped to PF are cleared */ }; +struct mcs_fips_req { +struct mbox_msghdr hdr; + uint8_t __io mcs_id; + uint8_t __io dir; +}; + +struct mcs_fips_mode_req { +struct mbox_msghdr hdr; + uint64_t __io mode; + uint8_t __io mcs_id; + uint8_t __io dir; +}; + +struct mcs_fips_ctl_req { +struct mbox_msghdr hdr; + uint64_t __io ctl; + uint8_t __io mcs_id; + uint8_t __io dir; +}; + +struct mcs_fips_iv_req { +struct mbox_msghdr hdr; + uint32_t __io iv_bits95_64; + uint64_t __io iv_bits63_0; + uint8_t __io mcs_id; + uint8_t __io dir; +}; + +struct mcs_fips_ctr_req { +struct mbox_msghdr hdr; + uint32_t __io fips_ctr; + uint8_t __io mcs_id; + uint8_t __io dir; +}; + +struct mcs_fips_key_req { +struct mbox_msghdr hdr; + uint64_t __io sak_bits255_192; + uint64_t __io sak_bits191_128; + uint64_t __io sak_bits127_64; + uint64_t __io sak_bits63_0; + uint64_t __io hashkey_bits127_64; + uint64_t __io hashkey_bits63_0; + uint8_t __io sak_len; + uint8_t __io mcs_id; + uint8_t __io dir; +}; + +struct mcs_fips_block_req { +struct mbox_msghdr hdr; + uint64_t __io blk_bits127_64; + uint64_t __io blk_bits63_0; + uint8_t __io mcs_id; + uint8_t __io dir; +}; + +struct mcs_fips_result_rsp { +struct mbox_msghdr hdr; + uint64_t __io blk_bits127_64; + uint64_t __io blk_bits63_0; + uint64_t __io icv_bits127_64; + uint64_t __io icv_bits63_0; + uint8_t __io result_pass; +}; +/* NPA mbox message formats */ /* NPA mailbox error codes
drivers/common/cnxk/roc_mcs.h +69 -0
79 lines not on this page · raw message
Signature · 1 line
2.25.1
PATCH v4 11/15 common/cnxk: derive hash key for MACsec
In reply to Akhil GoyalMACsec hardware configuration need hash key to be generated from the cipher key of AES-GCM-128/256.
Added an ROC API to derive the hash key and extend the case for AES-256 as well.
--- drivers/common/cnxk/roc_aes.c | 86 ++++++++++++++++++++++----------- drivers/common/cnxk/roc_aes.h | 4 +- drivers/common/cnxk/version.map | 1 + 3 files changed, 60 insertions(+), 31 deletions(-)
drivers/common/cnxk/roc_aes.c +57 -29
@@ -4,9 +4,10 @@#include "roc_api.h" -#define KEY_WORD_LEN (ROC_CPT_AES_XCBC_KEY_LENGTH / sizeof(uint32_t)) -#define KEY_ROUNDS 10/* (Nr+1)*Nb */ -#define KEY_SCHEDULE_LEN ((KEY_ROUNDS + 1) * 4)/* (Nr+1)*Nb words */ +#define KEY128_ROUNDS 10/* (Nr+1)*Nb */ +#define KEY256_ROUNDS 14/* (Nr+1)*Nb */ +#define KEY_SCHEDULE_LEN (nr) ((nr + 1) * 4)/* (Nr+1)*Nb words */ +#define AES_HASH_KEY_LEN 16/* * AES 128 implementation based on NIST FIPS 197 suitable for LittleEndian
@@ -93,22 +94,30 @@ GF8mul(uint8_t byte, uint32_t mp) }static void -aes_key_expand (const uint8_t *key,uint32_t *ks) +aes_key_expand (const uint8_t *key,uint32_t len,uint32_t *ks) { -unsigned int i =4 ; +uint32_t len_words = len /sizeof (uint32_t ); +unsigned int schedule_len; +unsigned int i = len_words;uint32_t temp; + schedule_len = (len ==ROC_CPT_AES128_KEY_LEN ) ?KEY_SCHEDULE_LEN (KEY128_ROUNDS ) : +KEY_SCHEDULE_LEN (KEY256_ROUNDS );/* Skip key in ks */ -memcpy (ks, key,KEY_WORD_LEN *sizeof (uint32_t )); +memcpy (ks, key, len); -while (i <KEY_SCHEDULE_LEN ) { +while (i < schedule_len) { temp = ks[i -1 ]; -if ((i &0x3 ) ==0 ) { +if ((i & (len_words -1 )) ==0 ) { temp =rot_word (temp); temp =sub_word (temp); - temp ^= (uint32_t )GF8mul (1 ,1 << ((i >>2 ) -1 )); + temp ^= (uint32_t )GF8mul (1 ,1 << ((i / len_words) -1 )); } - ks[i] = ks[i -4 ] ^ temp; +if (len ==ROC_CPT_AES256_KEY_LEN ) { +if ((i % len_words) ==4 ) + temp =sub_word (temp); + } + ks[i] = ks[i - len_words] ^ temp; i++; } }
@@ -145,64 +154,83 @@ mix_columns(uint8_t *sRc) }static void -cipher (uint8_t *in,uint8_t *out,uint32_t *ks) +cipher (uint8_t *in,uint8_t *out,uint32_t *ks,uint32_t key_rounds,uint8_t in_len) { -uint32_t state[KEY_WORD_LEN ]; +uint8_t data_word_len = in_len /sizeof (uint32_t ); +uint32_t state[data_word_len];unsigned int i, round;memcpy (state, in,sizeof (state));/* AddRoundKey(state, w[0, Nb-1]) // See Sec. 5.1.4 */ -for (i =0 ; i <KEY_WORD_LEN ; i++) +for (i =0 ; i < data_word_len; i++) state[i] ^= ks[i]; -for (round =1 ; round <KEY_ROUNDS ; round++) { +for (round =1 ; round < key_rounds; round++) {/* SubBytes(state) // See Sec. 5.1.1 */ -for (i =0 ; i <KEY_WORD_LEN ; i++) +for (i =0 ; i < data_word_len; i++) state[i] =sub_word (state[i]);/* ShiftRows(state) // See Sec. 5.1.2 */ -for (i =0 ; i <KEY_WORD_LEN ; i++) +for (i =0 ; i < data_word_len; i++)shift_word ((uint8_t *)state, i, i);/* MixColumns(state) // See Sec. 5.1.3 */ -for (i =0 ; i <KEY_WORD_LEN ; i++) +for (i =0 ; i < data_word_len; i++)mix_columns ((uint8_t *)&state[i]);/* AddRoundKey(state, w[round*Nb, (round+1)*Nb-1]) */ -for (i =0 ; i <KEY_WORD_LEN ; i++) - state[i] ^= ks[round *4 + i]; +for (i =0 ; i < data_word_len; i++) + state[i] ^= ks[round * data_word_len + i]; }/* SubBytes(state) */ -for (i =0 ; i <KEY_WORD_LEN ; i++) +for (i =0 ; i < data_word_len; i++) state[i] =sub_word (state[i]);/* ShiftRows(state) */ -for (i =0 ; i <KEY_WORD_LEN ; i++) +for (i =0 ; i < data_word_len; i++)shift_word ((uint8_t *)state, i, i);/* AddRoundKey(state, w[Nr*Nb, (Nr+1)*Nb-1]) */ -for (i =0 ; i <KEY_WORD_LEN ; i++) - state[i] ^= ks[KEY_ROUNDS *4 + i]; -memcpy (out, state,KEY_WORD_LEN *sizeof (uint32_t )); +for (i =0 ; i < data_word_len; i++) + state[i] ^= ks[key_rounds * data_word_len + i]; +memcpy (out, state, data_word_len *sizeof (uint32_t )); }void roc_aes_xcbc_key_derive (const uint8_t *auth_key,uint8_t *derived_key) { -uint32_t aes_ks[KEY_SCHEDULE_LEN ] = {0 }; +uint32_t aes_ks[KEY_SCHEDULE_LEN (KEY128_ROUNDS )] = {0 };uint8_t k1[16 ] = {[0 ...15 ] =0x01 };uint8_t k2[16 ] = {[0 ...15 ] =0x02 };uint8_t k3[16 ] = {[0 ...15 ] =0x03 }; -aes_key_expand (auth_key, aes_ks); +aes_key_expand (auth_key,ROC_CPT_AES_XCBC_KEY_LENGTH , aes_ks); -cipher (k1, derived_key, aes_ks); +cipher (k1, derived_key, aes_ks,KEY128_ROUNDS ,sizeof (k1)); derived_key +=sizeof (k1); -cipher (k2, derived_key, aes_ks); +cipher (k2, derived_key, aes_ks,KEY128_ROUNDS ,sizeof (k2)); derived_key +=sizeof (k2); -cipher (k3, derived_key, aes_ks); +cipher (k3, derived_key, aes_ks,KEY128_ROUNDS ,sizeof (k3)); +} + +void +roc_aes_hash_key_derive (const uint8_t *key,uint16_t len,uint8_t hash_key[]) +{ +uint8_t data[AES_HASH_KEY_LEN ] = {0x0 }; + +if (len ==ROC_CPT_AES128_KEY_LEN ) { +uint32_t aes_ks[KEY_SCHEDULE_LEN (KEY128_ROUNDS )] = {0 }; + +aes_key_expand (key,ROC_CPT_AES128_KEY_LEN , aes_ks); +cipher (data, hash_key, aes_ks,KEY128_ROUNDS ,sizeof (data)); + }else { +uint32_t aes_ks[KEY_SCHEDULE_LEN (KEY256_ROUNDS )] = {0 }; + +aes_key_expand (key,ROC_CPT_AES256_KEY_LEN , aes_ks); +cipher (data, hash_key, aes_ks,KEY256_ROUNDS ,sizeof (data)); + } }
drivers/common/cnxk/roc_aes.h +2 -2
@@ -8,7 +8,7 @@/* * Derive k1, k2, k3 from 128 bit AES key */ -void __roc_api roc_aes_xcbc_key_derive(const uint8_t *auth_key, -uint8_t *derived_key); +void __roc_api roc_aes_xcbc_key_derive(const uint8_t *auth_key, uint8_t *derived_key); +void __roc_api roc_aes_hash_key_derive(const uint8_t *key, uint16_t len, uint8_t *hash_key);#endif /* _ROC_AES_H_ */
drivers/common/cnxk/version.map +1 -0
@@ -30,6 +30,7 @@ INTERNAL { roc_ae_ec_grp_put; roc_ae_fpm_get; roc_ae_fpm_put; + roc_aes_hash_key_derive; roc_aes_xcbc_key_derive; roc_bphy_cgx_cpri_mode_change; roc_bphy_cgx_cpri_mode_misc;
Signature · 1 line
2.25.1
PATCH v4 12/15 net/cnxk: add MACsec initialization
In reply to Akhil GoyalAdded initialization routines for MACsec for
cn10kb platform.
--- drivers/net/cnxk/cn10k_ethdev_sec.c | 6 ++ drivers/net/cnxk/cnxk_ethdev.c | 13 +++ drivers/net/cnxk/cnxk_ethdev.h | 14 +++ drivers/net/cnxk/cnxk_ethdev_mcs.c | 151 ++++++++++++++++++++++++++++ drivers/net/cnxk/cnxk_ethdev_mcs.h | 61 +++++++++++ drivers/net/cnxk/meson.build | 1 + 6 files changed, 246 insertions(+) create mode 100644 drivers/net/cnxk/cnxk_ethdev_mcs.c create mode 100644 drivers/net/cnxk/cnxk_ethdev_mcs.h
drivers/net/cnxk/cn10k_ethdev_sec.c +6 -0
@@ -1090,9 +1090,15 @@ cn10k_eth_sec_ops_override(void) init_once =1 ;/* Update platform specific ops */ + cnxk_eth_sec_ops.macsec_sa_create =NULL ; + cnxk_eth_sec_ops.macsec_sc_create =NULL ; + cnxk_eth_sec_ops.macsec_sa_destroy =NULL ; + cnxk_eth_sec_ops.macsec_sc_destroy =NULL ; cnxk_eth_sec_ops.session_create = cn10k_eth_sec_session_create; cnxk_eth_sec_ops.session_destroy = cn10k_eth_sec_session_destroy; cnxk_eth_sec_ops.capabilities_get = cn10k_eth_sec_capabilities_get; cnxk_eth_sec_ops.session_update = cn10k_eth_sec_session_update; cnxk_eth_sec_ops.session_stats_get = cn10k_eth_sec_session_stats_get; + cnxk_eth_sec_ops.macsec_sc_stats_get =NULL ; + cnxk_eth_sec_ops.macsec_sa_stats_get =NULL ; }
drivers/net/cnxk/cnxk_ethdev.c +13 -0
@@ -1961,6 +1961,16 @@ cnxk_eth_dev_init(struct rte_eth_dev *eth_dev)if (rc) goto free_mac_addrs; +if (roc_feature_nix_has_macsec ()) { + rc =cnxk_mcs_dev_init (dev,0 ); +if (rc) { +plt_err ("Failed to init MCS" ); + goto free_mac_addrs; + } + dev->rx_offload_capa |=RTE_ETH_RX_OFFLOAD_MACSEC_STRIP ; + dev->tx_offload_capa |=RTE_ETH_TX_OFFLOAD_MACSEC_INSERT ; + } + plt_nix_dbg("Port=%d pf=%d vf=%d ver=%s hwcap=0x%" PRIx64 " rxoffload_capa=0x%" PRIx64 " txoffload_capa=0x%" PRIx64, eth_dev->data->port_id, roc_nix_get_pf(nix),
@@ -2058,6 +2068,9 @@ cnxk_eth_dev_uninit(struct rte_eth_dev *eth_dev, bool reset) } eth_dev->data->nb_rx_queues =0 ; +if (roc_feature_nix_has_macsec ()) +cnxk_mcs_dev_fini (dev); +/* Free security resources */ nix_security_release (dev);
drivers/net/cnxk/cnxk_ethdev.h +14 -0
@@ -395,6 +395,9 @@ struct cnxk_eth_dev {/* Reassembly dynfield/flag offsets */ int reass_dynfield_off;int reass_dynflag_bit; + +/* MCS device */ +struct cnxk_mcs_dev *mcs_dev; };struct cnxk_eth_rxq_sp {
@@ -623,6 +626,17 @@ int cnxk_nix_cman_config_set(struct rte_eth_dev *dev, const struct rte_eth_cman_int cnxk_nix_cman_config_get (struct rte_eth_dev *dev,struct rte_eth_cman_config *config); +int cnxk_mcs_dev_init (struct cnxk_eth_dev *dev,uint8_t mcs_idx); +void cnxk_mcs_dev_fini (struct cnxk_eth_dev *dev); + +struct cnxk_macsec_sess *cnxk_eth_macsec_sess_get_by_sess (struct cnxk_eth_dev *dev, +const struct rte_security_session *sess); +int cnxk_mcs_flow_configure (struct rte_eth_dev *eth_dev,const struct rte_flow_attr *attr, +const struct rte_flow_item pattern[], +const struct rte_flow_action actions[],struct rte_flow_error *error, +void **mcs_flow); +int cnxk_mcs_flow_destroy (struct cnxk_eth_dev *eth_dev,void *mcs_flow); +/* Other private functions */ int nix_recalc_mtu (struct rte_eth_dev *eth_dev);int nix_mtr_validate (struct rte_eth_dev *dev,uint32_t id);
drivers/net/cnxk/cnxk_ethdev_mcs.c new file +151 -0
151 lines not on this page · raw message
drivers/net/cnxk/cnxk_ethdev_mcs.h new file +61 -0
61 lines not on this page · raw message
drivers/net/cnxk/meson.build +1 -0
@@ -22,6 +22,7 @@ sources = files( 'cnxk_ethdev.c', 'cnxk_ethdev_cman.c', 'cnxk_ethdev_devargs.c', + 'cnxk_ethdev_mcs.c', 'cnxk_ethdev_mtr.c', 'cnxk_ethdev_ops.c', 'cnxk_ethdev_sec.c',
Signature · 1 line
2.25.1
PATCH v4 13/15 net/cnxk: create/destroy MACsec SC/SA
In reply to Akhil GoyalAdded support to create/destroy MACsec SA and SC.
--- drivers/net/cnxk/cn10k_ethdev_sec.c | 9 +- drivers/net/cnxk/cnxk_ethdev_mcs.c | 253 ++++++++++++++++++++++++++++ drivers/net/cnxk/cnxk_ethdev_mcs.h | 16 ++ 3 files changed, 274 insertions(+), 4 deletions(-)
drivers/net/cnxk/cn10k_ethdev_sec.c +5 -4
@@ -9,6 +9,7 @@#include <rte_pmd_cnxk.h> #include <cn10k_ethdev.h> +#include <cnxk_ethdev_mcs.h> #include <cnxk_security.h> #include <roc_priv.h>
@@ -1090,10 +1091,10 @@ cn10k_eth_sec_ops_override(void) init_once =1 ;/* Update platform specific ops */ - cnxk_eth_sec_ops.macsec_sa_create =NULL ; - cnxk_eth_sec_ops.macsec_sc_create =NULL ; - cnxk_eth_sec_ops.macsec_sa_destroy =NULL ; - cnxk_eth_sec_ops.macsec_sc_destroy =NULL ; + cnxk_eth_sec_ops.macsec_sa_create = cnxk_eth_macsec_sa_create; + cnxk_eth_sec_ops.macsec_sc_create = cnxk_eth_macsec_sc_create; + cnxk_eth_sec_ops.macsec_sa_destroy = cnxk_eth_macsec_sa_destroy; + cnxk_eth_sec_ops.macsec_sc_destroy = cnxk_eth_macsec_sc_destroy; cnxk_eth_sec_ops.session_create = cn10k_eth_sec_session_create; cnxk_eth_sec_ops.session_destroy = cn10k_eth_sec_session_destroy; cnxk_eth_sec_ops.capabilities_get = cn10k_eth_sec_capabilities_get;
drivers/net/cnxk/cnxk_ethdev_mcs.c +253 -0
259 lines not on this page · raw message
drivers/net/cnxk/cnxk_ethdev_mcs.h +16 -0
@@ -13,6 +13,14 @@ struct cnxk_mcs_dev {uint8_t idx; }; +enum cnxk_mcs_rsrc_type { +CNXK_MCS_RSRC_TYPE_FLOWID , +CNXK_MCS_RSRC_TYPE_SECY , +CNXK_MCS_RSRC_TYPE_SC , +CNXK_MCS_RSRC_TYPE_SA , +CNXK_MCS_RSRC_TYPE_PORT , +}; +struct cnxk_mcs_event_data {/* Valid for below events * - ROC_MCS_EVENT_RX_SA_PN_SOFT_EXP
@@ -59,3 +67,11 @@ struct cnxk_mcs_event_desc {enum roc_mcs_event_subtype subtype;struct cnxk_mcs_event_data metadata; }; + +int cnxk_eth_macsec_sa_create (void *device,struct rte_security_macsec_sa *conf); +int cnxk_eth_macsec_sc_create (void *device,struct rte_security_macsec_sc *conf); + +int cnxk_eth_macsec_sa_destroy (void *device,uint16_t sa_id, +enum rte_security_macsec_direction dir); +int cnxk_eth_macsec_sc_destroy (void *device,uint16_t sc_id, +enum rte_security_macsec_direction dir);
Signature · 1 line
2.25.1
PATCH v4 14/15 net/cnxk: add MACsec session and flow configuration
In reply to Akhil GoyalAdded support for MACsec session/flow create/destroy.
--- drivers/net/cnxk/cn10k_ethdev_sec.c | 11 +- drivers/net/cnxk/cn10k_flow.c | 23 ++- drivers/net/cnxk/cnxk_ethdev.c | 2 + drivers/net/cnxk/cnxk_ethdev.h | 16 ++ drivers/net/cnxk/cnxk_ethdev_mcs.c | 262 ++++++++++++++++++++++++++++ drivers/net/cnxk/cnxk_ethdev_mcs.h | 25 +++ drivers/net/cnxk/cnxk_ethdev_sec.c | 2 +- drivers/net/cnxk/cnxk_flow.c | 5 + 8 files changed, 342 insertions(+), 4 deletions(-)
drivers/net/cnxk/cn10k_ethdev_sec.c +9 -2
@@ -642,7 +642,9 @@ cn10k_eth_sec_session_create(void *device,if (conf->action_type !=RTE_SECURITY_ACTION_TYPE_INLINE_PROTOCOL )return -ENOTSUP ; -if (conf->protocol !=RTE_SECURITY_PROTOCOL_IPSEC ) +if (conf->protocol ==RTE_SECURITY_PROTOCOL_MACSEC ) +return cnxk_eth_macsec_session_create (dev, conf, sess); +else if (conf->protocol !=RTE_SECURITY_PROTOCOL_IPSEC )return -ENOTSUP ;if (rte_security_dynfield_register () <0 )
@@ -887,13 +889,18 @@ cn10k_eth_sec_session_destroy(void *device, struct rte_security_session *sess) {struct rte_eth_dev *eth_dev = (struct rte_eth_dev *)device;struct cnxk_eth_dev *dev =cnxk_eth_pmd_priv (eth_dev); +struct cnxk_macsec_sess *macsec_sess;struct cnxk_eth_sec_sess *eth_sec;rte_spinlock_t *lock;void *sa_dptr; eth_sec =cnxk_eth_sec_sess_get_by_sess (dev, sess); -if (!eth_sec) +if (!eth_sec) { + macsec_sess =cnxk_eth_macsec_sess_get_by_sess (dev, sess); +if (macsec_sess) +return cnxk_eth_macsec_session_destroy (dev, sess);return -ENOENT ; + } lock = eth_sec->inb ? &dev->inb.lock : &dev->outb.lock;rte_spinlock_lock (lock);
drivers/net/cnxk/cn10k_flow.c +22 -1
@@ -1,10 +1,11 @@/* SPDX-License-Identifier: BSD-3-Clause * Copyright(C) 2020 Marvell. */ -#include <cnxk_flow.h> #include "cn10k_flow.h" #include "cn10k_ethdev.h" #include "cn10k_rx.h" +#include "cnxk_ethdev_mcs.h" +#include <cnxk_flow.h> static int cn10k_mtr_connect (struct rte_eth_dev *eth_dev,uint32_t mtr_id)
@@ -133,6 +134,7 @@ cn10k_flow_create(struct rte_eth_dev *eth_dev, const struct rte_flow_attr *attr,const struct rte_flow_action *act_q =NULL ;struct roc_npc *npc = &dev->npc;struct roc_npc_flow *flow; +void *mcs_flow =NULL ;int vtag_actions =0 ;uint32_t req_act =0 ;int mark_actions;
@@ -187,6 +189,17 @@ cn10k_flow_create(struct rte_eth_dev *eth_dev, const struct rte_flow_attr *attr, } } +if (actions[0 ].type ==RTE_FLOW_ACTION_TYPE_SECURITY && +cnxk_eth_macsec_sess_get_by_sess (dev, actions[0 ].conf) !=NULL ) { + rc =cnxk_mcs_flow_configure (eth_dev, attr, pattern, actions, error, &mcs_flow); +if (rc) { +rte_flow_error_set (error, rc,RTE_FLOW_ERROR_TYPE_ACTION ,NULL , +"Failed to configure mcs flow" ); +return NULL ; + } +return (struct rte_flow *)mcs_flow; + } + flow =cnxk_flow_create (eth_dev, attr, pattern, actions, error);if (!flow) {if (mtr)
@@ -265,6 +278,14 @@ cn10k_flow_destroy(struct rte_eth_dev *eth_dev, struct rte_flow *rte_flow, } } +if (cnxk_eth_macsec_sess_get_by_sess (dev, (void *)flow) !=NULL ) { + rc =cnxk_mcs_flow_destroy (dev, (void *)flow); +if (rc <0 ) +rte_flow_error_set (error, rc,RTE_FLOW_ERROR_TYPE_UNSPECIFIED , +NULL ,"Failed to free mcs flow" ); +return rc; + } + mtr_id = flow->mtr_id; rc =cnxk_flow_destroy (eth_dev, flow, error);if (!rc && mtr_id !=ROC_NIX_MTR_ID_INVALID ) {
drivers/net/cnxk/cnxk_ethdev.c +2 -0
@@ -1969,6 +1969,8 @@ cnxk_eth_dev_init(struct rte_eth_dev *eth_dev) } dev->rx_offload_capa |=RTE_ETH_RX_OFFLOAD_MACSEC_STRIP ; dev->tx_offload_capa |=RTE_ETH_TX_OFFLOAD_MACSEC_INSERT ; + +TAILQ_INIT (&dev->mcs_list); } plt_nix_dbg("Port=%d pf=%d vf=%d ver=%s hwcap=0x%" PRIx64
drivers/net/cnxk/cnxk_ethdev.h +16 -0
@@ -292,6 +292,21 @@ struct cnxk_eth_dev_sec_outb {uint64_t cpt_eng_caps; }; +/* MACsec session private data */ +struct cnxk_macsec_sess { +/* List entry */ +TAILQ_ENTRY (cnxk_macsec_sess) entry; + +/* Back pointer to session */ +struct rte_security_session *sess; +enum mcs_direction dir; +uint64_t sci; +uint8_t secy_id; +uint8_t sc_id; +uint8_t flow_id; +}; +TAILQ_HEAD (cnxk_macsec_sess_list, cnxk_macsec_sess); +struct cnxk_eth_dev {/* ROC NIX */ struct roc_nix nix;
@@ -398,6 +413,7 @@ struct cnxk_eth_dev {/* MCS device */ struct cnxk_mcs_dev *mcs_dev; +struct cnxk_macsec_sess_list mcs_list; };struct cnxk_eth_rxq_sp {
drivers/net/cnxk/cnxk_ethdev_mcs.c +262 -0
268 lines not on this page · raw message
drivers/net/cnxk/cnxk_ethdev_mcs.h +25 -0
@@ -21,6 +21,27 @@ enum cnxk_mcs_rsrc_type { CNXK_MCS_RSRC_TYPE_PORT, }; +struct cnxk_mcs_flow_opts { +uint32_t outer_tag_id; +/**< {VLAN_ID[11:0]}, or 20-bit MPLS label*/ +uint8_t outer_priority; +/**< {PCP/Pbits, DE/CFI} or {1'b0, EXP} for MPLS.*/ +uint32_t second_outer_tag_id; +/**< {VLAN_ID[11:0]}, or 20-bit MPLS label*/ +uint8_t second_outer_priority; +/**< {PCP/Pbits, DE/CFI} or {1'b0, EXP} for MPLS. */ +uint16_t bonus_data; +/**< 2 bytes of additional bonus data extracted from one of the custom tags*/ +uint8_t tag_match_bitmap; +uint8_t packet_type; +uint8_t outer_vlan_type; +uint8_t inner_vlan_type; +uint8_t num_tags; +bool express; +uint8_t lmac_id; +uint8_t flowid_user; +}; +struct cnxk_mcs_event_data {/* Valid for below events * - ROC_MCS_EVENT_RX_SA_PN_SOFT_EXP
@@ -75,3 +96,7 @@ int cnxk_eth_macsec_sa_destroy(void *device, uint16_t sa_id, enum rte_security_macsec_direction dir);int cnxk_eth_macsec_sc_destroy (void *device,uint16_t sc_id,enum rte_security_macsec_direction dir); + +int cnxk_eth_macsec_session_create (struct cnxk_eth_dev *dev,struct rte_security_session_conf *conf, +struct rte_security_session *sess); +int cnxk_eth_macsec_session_destroy (struct cnxk_eth_dev *dev,struct rte_security_session *sess);
drivers/net/cnxk/cnxk_ethdev_sec.c +1 -1
@@ -284,7 +284,7 @@ cnxk_eth_sec_sess_get_by_sess(struct cnxk_eth_dev *dev,static unsigned int cnxk_eth_sec_session_get_size(void *device __rte_unused) { -return sizeof (struct cnxk_eth_sec_sess ); +return RTE_MAX (sizeof (struct cnxk_macsec_sess ),sizeof (struct cnxk_eth_sec_sess )); }struct rte_security_ops cnxk_eth_sec_ops = {
drivers/net/cnxk/cnxk_flow.c +5 -0
@@ -289,6 +289,11 @@ cnxk_flow_validate(struct rte_eth_dev *eth_dev, const struct rte_flow_attr *attruint16_t dst_pf_func =0 ;int rc; +/* Skip flow validation for MACsec. */ +if (actions[0 ].type ==RTE_FLOW_ACTION_TYPE_SECURITY && +cnxk_eth_macsec_sess_get_by_sess (dev, actions[0 ].conf) !=NULL ) +return 0 ; +memset (&flow,0 ,sizeof (flow)); flow.is_validate = true;
Signature · 1 line
2.25.1
PATCH v4 15/15 net/cnxk: add MACsec stats
In reply to Akhil GoyalAdded support for MACsec SC/flow/session stats.
--- doc/guides/rel_notes/release_23_07.rst | 5 ++ drivers/net/cnxk/cn10k_ethdev_sec.c | 11 +++-- drivers/net/cnxk/cnxk_ethdev_mcs.c | 64 ++++++++++++++++++++++++++ drivers/net/cnxk/cnxk_ethdev_mcs.h | 9 ++++ 4 files changed, 86 insertions(+), 3 deletions(-)
doc/guides/rel_notes/release_23_07.rst +5 -0
@@ -139,6 +139,11 @@ New Features for new capability registers, large passthrough BAR and some performance enhancements for UPT. +* **Updated Marvell cnxk ethdev driver.** + + Added support for Inline MACsec processing using rte_security framework + for CN103 platform. + * **Added new algorithms to cryptodev.** * Added asymmetric algorithm ShangMi 2 (SM2) along with prime field curve support.
drivers/net/cnxk/cn10k_ethdev_sec.c +8 -3
@@ -1058,12 +1058,17 @@ cn10k_eth_sec_session_stats_get(void *device, struct rte_security_session *sess, {struct rte_eth_dev *eth_dev = (struct rte_eth_dev *)device;struct cnxk_eth_dev *dev =cnxk_eth_pmd_priv (eth_dev); +struct cnxk_macsec_sess *macsec_sess;struct cnxk_eth_sec_sess *eth_sec;int rc; eth_sec =cnxk_eth_sec_sess_get_by_sess (dev, sess); -if (eth_sec ==NULL ) +if (eth_sec ==NULL ) { + macsec_sess =cnxk_eth_macsec_sess_get_by_sess (dev, sess); +if (macsec_sess) +return cnxk_eth_macsec_session_stats_get (dev, macsec_sess, stats);return -EINVAL ; + } rc =roc_nix_inl_sa_sync (&dev->nix, eth_sec->sa, eth_sec->inb,ROC_NIX_INL_SA_OP_FLUSH );
@@ -1107,6 +1112,6 @@ cn10k_eth_sec_ops_override(void) cnxk_eth_sec_ops.capabilities_get = cn10k_eth_sec_capabilities_get; cnxk_eth_sec_ops.session_update = cn10k_eth_sec_session_update; cnxk_eth_sec_ops.session_stats_get = cn10k_eth_sec_session_stats_get; - cnxk_eth_sec_ops.macsec_sc_stats_get =NULL ; - cnxk_eth_sec_ops.macsec_sa_stats_get =NULL ; + cnxk_eth_sec_ops.macsec_sc_stats_get = cnxk_eth_macsec_sc_stats_get; + cnxk_eth_sec_ops.macsec_sa_stats_get = cnxk_eth_macsec_sa_stats_get; }
drivers/net/cnxk/cnxk_ethdev_mcs.c +64 -0
70 lines not on this page · raw message
drivers/net/cnxk/cnxk_ethdev_mcs.h +9 -0
@@ -97,6 +97,15 @@ int cnxk_eth_macsec_sa_destroy(void *device, uint16_t sa_id,int cnxk_eth_macsec_sc_destroy (void *device,uint16_t sc_id,enum rte_security_macsec_direction dir); +int cnxk_eth_macsec_sa_stats_get (void *device,uint16_t sa_id, +enum rte_security_macsec_direction dir, +struct rte_security_macsec_sa_stats *stats); +int cnxk_eth_macsec_sc_stats_get (void *device,uint16_t sa_id, +enum rte_security_macsec_direction dir, +struct rte_security_macsec_sc_stats *stats); +int cnxk_eth_macsec_session_stats_get (struct cnxk_eth_dev *dev,struct cnxk_macsec_sess *sess, +struct rte_security_stats *stats); +int cnxk_eth_macsec_session_create (struct cnxk_eth_dev *dev,struct rte_security_session_conf *conf,struct rte_security_session *sess);int cnxk_eth_macsec_session_destroy (struct cnxk_eth_dev *dev,struct rte_security_session *sess);
Signature · 1 line
2.25.1
Re: [PATCH v4 15/15] net/cnxk: add MACsec stats
Quoted 16 lines · Akhil Goyal
Added support for MACsec SC/flow/session stats.
Signed-off-by Akhil Goyal <[email protected]>--- doc/guides/rel_notes/release_23_07.rst | 5 ++ drivers/net/cnxk/cn10k_ethdev_sec.c | 11 +++-- drivers/net/cnxk/cnxk_ethdev_mcs.c | 64 ++++++++++++++++++++++++++ drivers/net/cnxk/cnxk_ethdev_mcs.h | 9 ++++ 4 files changed, 86 insertions(+), 3 deletions(-)doc/guides/rel_notes/release_23_07.rst +0
-0
doc/guides/rel_notes/release_23_07.rst New Features · line 142
Quoted 4 lines
doc/guides/rel_notes/release_23_07.rst +1
-0@@ -139,6 +139,11 @@ New Features for new capability registers, large passthrough BAR and some performance enhancements for UPT. +* **Updated Marvell cnxk ethdev driver.**
1) Please rebase with dpdk-next-mrvl where this line already exists
2) Change the copyright year to 2023 for new files
3) Fix the following warnings
### [PATCH] common/cnxk: add MACsec interrupt APIs
WARNING:SPACING: space prohibited between function name and open parenthesis '(' #240: FILE: drivers/common/cnxk/roc_mcs.c:157:
+ TAILQ_FOREACH (cb, cb_list, next) {
WARNING:SPACING: space prohibited between function name and open parenthesis '(' #293: FILE: drivers/common/cnxk/roc_mcs.c:210:
+ TAILQ_FOREACH (cb, cb_list, next) {
total: 0 errors, 2 warnings, 482 lines checked
Good to merge the next version.
v5 cover net/cnxk: add MACsec support
In reply to Akhil GoyalAdded MACsec support in Marvell cnxk PMD. The patchset is pending from last release [1] Sending as a new series as the functionality is now complete and tested on hardware.
[1] https://patches.dpdk.org/project/dpdk/cover/[email protected]/
Changes in v5:
- fix copyright year
- fix release notes
- fix checkpatch warning
Changes in v4:
Fix build with RHEL/CentOS
Changes in v3:
- rebased
- fixed warning PRI*64
- added release notes
Changes in v2:
- Addressed review comments from Jerin.
Akhil Goyal (15):
common/cnxk: add ROC MACsec initialization common/cnxk: add MACsec SA configuration common/cnxk: add MACsec SC configuration APIs common/cnxk: add MACsec secy and flow configuration common/cnxk: add MACsec PN and LMAC mode configuration common/cnxk: add MACsec stats
common/cnxk: add MACsec interrupt APIs common/cnxk: add MACsec port configuration common/cnxk: add MACsec control port configuration common/cnxk: add MACsec FIPS mbox common/cnxk: derive hash key for MACsec net/cnxk: add MACsec initialization
net/cnxk: create/destroy MACsec SC/SA net/cnxk: add MACsec session and flow configuration net/cnxk: add MACsec stats
doc/guides/rel_notes/release_23_07.rst | 10 +- drivers/common/cnxk/meson.build | 3 + drivers/common/cnxk/roc_aes.c | 86 ++- drivers/common/cnxk/roc_aes.h | 4 +- drivers/common/cnxk/roc_api.h | 3 + drivers/common/cnxk/roc_dev.c | 86 +++ drivers/common/cnxk/roc_features.h | 12 + drivers/common/cnxk/roc_idev.c | 46 ++ drivers/common/cnxk/roc_idev.h | 3 + drivers/common/cnxk/roc_idev_priv.h | 1 + drivers/common/cnxk/roc_mbox.h | 524 ++++++++++++++- drivers/common/cnxk/roc_mcs.c | 871 +++++++++++++++++++++++++ drivers/common/cnxk/roc_mcs.h | 624 ++++++++++++++++++ drivers/common/cnxk/roc_mcs_priv.h | 73 +++ drivers/common/cnxk/roc_mcs_sec_cfg.c | 528 +++++++++++++++ drivers/common/cnxk/roc_mcs_stats.c | 193 ++++++ drivers/common/cnxk/roc_priv.h | 3 + drivers/common/cnxk/roc_utils.c | 5 + drivers/common/cnxk/version.map | 45 ++ drivers/net/cnxk/cn10k_ethdev_sec.c | 25 +- drivers/net/cnxk/cn10k_flow.c | 23 +- drivers/net/cnxk/cnxk_ethdev.c | 15 + drivers/net/cnxk/cnxk_ethdev.h | 30 + drivers/net/cnxk/cnxk_ethdev_mcs.c | 730 +++++++++++++++++++++ drivers/net/cnxk/cnxk_ethdev_mcs.h | 116 ++++ drivers/net/cnxk/cnxk_ethdev_sec.c | 2 +- drivers/net/cnxk/cnxk_flow.c | 5 + drivers/net/cnxk/meson.build | 1 + 28 files changed, 4025 insertions(+), 42 deletions(-) create mode 100644 drivers/common/cnxk/roc_mcs.c create mode 100644 drivers/common/cnxk/roc_mcs.h create mode 100644 drivers/common/cnxk/roc_mcs_priv.h create mode 100644 drivers/common/cnxk/roc_mcs_sec_cfg.c create mode 100644 drivers/common/cnxk/roc_mcs_stats.c create mode 100644 drivers/net/cnxk/cnxk_ethdev_mcs.c create mode 100644 drivers/net/cnxk/cnxk_ethdev_mcs.h
Signature · 1 line
2.25.1
PATCH v5 1/15 common/cnxk: add ROC MACsec initialization
Added ROC init and fini APIs for supporting MACsec.
--- drivers/common/cnxk/meson.build | 1 + drivers/common/cnxk/roc_api.h | 3 + drivers/common/cnxk/roc_features.h | 12 ++ drivers/common/cnxk/roc_idev.c | 46 ++++++ drivers/common/cnxk/roc_idev.h | 3 + drivers/common/cnxk/roc_idev_priv.h | 1 + drivers/common/cnxk/roc_mbox.h | 65 +++++++- drivers/common/cnxk/roc_mcs.c | 220 ++++++++++++++++++++++++++++ drivers/common/cnxk/roc_mcs.h | 42 ++++++ drivers/common/cnxk/roc_mcs_priv.h | 65 ++++++++ drivers/common/cnxk/roc_priv.h | 3 + drivers/common/cnxk/roc_utils.c | 5 + drivers/common/cnxk/version.map | 7 + 13 files changed, 472 insertions(+), 1 deletion(-) create mode 100644 drivers/common/cnxk/roc_mcs.c create mode 100644 drivers/common/cnxk/roc_mcs.h create mode 100644 drivers/common/cnxk/roc_mcs_priv.h
drivers/common/cnxk/meson.build +1 -0
@@ -26,6 +26,7 @@ sources = files( 'roc_irq.c', 'roc_ie_ot.c', 'roc_mbox.c', + 'roc_mcs.c', 'roc_ml.c', 'roc_model.c', 'roc_nix.c',
drivers/common/cnxk/roc_api.h +3 -0
@@ -114,4 +114,7 @@/* ML */ #include "roc_ml.h" +/* MACsec */ +#include "roc_mcs.h" +#endif /* _ROC_API_H_ */
drivers/common/cnxk/roc_features.h +12 -0
@@ -59,4 +59,16 @@ roc_feature_nix_has_age_drop_stats(void) {return (roc_model_is_cn10kb () ||roc_model_is_cn10ka_b0 ()); } + +static inline bool +roc_feature_nix_has_macsec (void ) +{ +return roc_model_is_cn10kb (); +} + +static inline bool +roc_feature_bphy_has_macsec (void ) +{ +return roc_model_is_cnf10kb (); +}#endif
drivers/common/cnxk/roc_idev.c +46 -0
58 lines not on this page · raw message
drivers/common/cnxk/roc_idev.h +3 -0
@@ -19,4 +19,7 @@ struct roc_nix *__roc_api roc_idev_npa_nix_get(void); uint64_t __roc_api roc_idev_nix_inl_meta_aura_get(void); struct roc_nix_list *__roc_api roc_idev_nix_list_get(void); +struct roc_mcs *__roc_api roc_idev_mcs_get(uint8_t mcs_idx); +void __roc_api roc_idev_mcs_set(struct roc_mcs *mcs); +void __roc_api roc_idev_mcs_free(struct roc_mcs *mcs);#endif /* _ROC_IDEV_H_ */
drivers/common/cnxk/roc_idev_priv.h +1 -0
@@ -31,6 +31,7 @@ struct idev_cfg {struct roc_bphy *bphy;struct roc_cpt *cpt;struct roc_sso *sso; +struct roc_mcs_head mcs_list;struct nix_inl_dev *nix_inl_dev;struct idev_nix_inl_cfg inl_cfg;struct roc_nix_list roc_nix_list;
drivers/common/cnxk/roc_mbox.h +64 -1
77 lines not on this page · raw message
drivers/common/cnxk/roc_mcs.c new file +220 -0
220 lines not on this page · raw message
drivers/common/cnxk/roc_mcs.h new file +42 -0
42 lines not on this page · raw message
drivers/common/cnxk/roc_mcs_priv.h new file +65 -0
65 lines not on this page · raw message
drivers/common/cnxk/roc_priv.h +3 -0
@@ -44,6 +44,9 @@/* DPI */ #include "roc_dpi_priv.h" +/* MCS */ +#include "roc_mcs_priv.h" +/* REE */ #include "roc_ree_priv.h"
drivers/common/cnxk/roc_utils.c +5 -0
@@ -16,6 +16,7 @@ roc_error_msg_get(int errorcode)case NPA_ERR_PARAM :case NPC_ERR_PARAM :case SSO_ERR_PARAM : +case MCS_ERR_PARAM :case UTIL_ERR_PARAM : err_msg ="Invalid parameter" ;break ;
@@ -35,6 +36,7 @@ roc_error_msg_get(int errorcode) err_msg ="Operation not supported" ;break ;case NIX_ERR_HW_NOTSUP : +case MCS_ERR_HW_NOTSUP : err_msg ="Hardware does not support" ;break ;case NIX_ERR_QUEUE_INVALID_RANGE :
@@ -223,6 +225,9 @@ roc_error_msg_get(int errorcode)case SSO_ERR_DEVICE_NOT_BOUNDED : err_msg ="SSO pf/vf not found" ;break ; +case MCS_ERR_DEVICE_NOT_FOUND : + err_msg ="MCS device not found" ; +break ;case UTIL_ERR_FS : err_msg ="file operation failed" ;break ;
drivers/common/cnxk/version.map +7 -0
@@ -94,6 +94,9 @@ INTERNAL { roc_idev_cpt_get; roc_idev_cpt_set; roc_idev_lmt_base_addr_get; + roc_idev_mcs_free; + roc_idev_mcs_get; + roc_idev_mcs_set; roc_idev_npa_maxpools_get; roc_idev_npa_maxpools_set; roc_idev_npa_nix_get;
@@ -132,6 +135,10 @@ INTERNAL { roc_se_auth_key_set; roc_se_ciph_key_set; roc_se_ctx_init; + roc_mcs_dev_init; + roc_mcs_dev_fini; + roc_mcs_dev_get; + roc_mcs_hw_info_get; roc_nix_bpf_alloc; roc_nix_bpf_config; roc_nix_bpf_connect;
Signature · 1 line
2.25.1
PATCH v5 2/15 common/cnxk: add MACsec SA configuration
In reply to Akhil GoyalAdded ROC APIs to allocate/free MACsec resources
and APIs to write SA policy.
--- drivers/common/cnxk/meson.build | 1 + drivers/common/cnxk/roc_mbox.h | 12 ++ drivers/common/cnxk/roc_mcs.h | 43 ++++++ drivers/common/cnxk/roc_mcs_sec_cfg.c | 211 ++++++++++++++++++++++++++ drivers/common/cnxk/version.map | 4 + 5 files changed, 271 insertions(+) create mode 100644 drivers/common/cnxk/roc_mcs_sec_cfg.c
drivers/common/cnxk/meson.build +1 -0
@@ -27,6 +27,7 @@ sources = files( 'roc_ie_ot.c', 'roc_mbox.c', 'roc_mcs.c', + 'roc_mcs_sec_cfg.c', 'roc_ml.c', 'roc_model.c', 'roc_nix.c',
drivers/common/cnxk/roc_mbox.h +12 -0
@@ -300,6 +300,7 @@ struct mbox_msghdr {M (MCS_ALLOC_RESOURCES ,0xa000 , mcs_alloc_resources, mcs_alloc_rsrc_req, \ mcs_alloc_rsrc_rsp) \ M(MCS_FREE_RESOURCES, 0xa001, mcs_free_resources, mcs_free_rsrc_req, msg_rsp) \ + M(MCS_SA_PLCY_WRITE, 0xa005, mcs_sa_plcy_write, mcs_sa_plcy_write_req, msg_rsp) \M (MCS_GET_HW_INFO ,0xa00b , mcs_get_hw_info, msg_req, mcs_hw_info) \/* Messages initiated by AF (range 0xC00 - 0xDFF) */
@@ -725,6 +726,17 @@ struct mcs_free_rsrc_req { uint64_t __io rsvd; }; +struct mcs_sa_plcy_write_req { +struct mbox_msghdr hdr; + uint64_t __io plcy[2][9]; /* Support 2 SA policy */ + uint8_t __io sa_index[2]; + uint8_t __io sa_cnt; + uint8_t __io mcs_id; + uint8_t __io dir; + uint64_t __io rsvd; +}; + +struct mcs_hw_info {struct mbox_msghdr hdr; uint8_t __io num_mcs_blks; /* Number of MCS blocks */
drivers/common/cnxk/roc_mcs.h +43 -0
53 lines not on this page · raw message
drivers/common/cnxk/roc_mcs_sec_cfg.c new file +211 -0
211 lines not on this page · raw message
drivers/common/cnxk/version.map +4 -0
@@ -139,6 +139,10 @@ INTERNAL { roc_mcs_dev_fini; roc_mcs_dev_get; roc_mcs_hw_info_get; + roc_mcs_rsrc_alloc; + roc_mcs_rsrc_free; + roc_mcs_sa_policy_read; + roc_mcs_sa_policy_write; roc_nix_bpf_alloc; roc_nix_bpf_config; roc_nix_bpf_connect;
Signature · 1 line
2.25.1
PATCH v5 3/15 common/cnxk: add MACsec SC configuration APIs
In reply to Akhil GoyalAdded ROC APIs to configure MACsec secure channel(SC) and its mapping with SAs for both Rx and Tx.
--- drivers/common/cnxk/roc_mbox.h | 37 ++++++ drivers/common/cnxk/roc_mcs.h | 42 +++++++ drivers/common/cnxk/roc_mcs_sec_cfg.c | 171 ++++++++++++++++++++++++++ drivers/common/cnxk/version.map | 7 ++ 4 files changed, 257 insertions(+)
drivers/common/cnxk/roc_mbox.h +37 -0
@@ -300,7 +300,10 @@ struct mbox_msghdr {M (MCS_ALLOC_RESOURCES ,0xa000 , mcs_alloc_resources, mcs_alloc_rsrc_req, \ mcs_alloc_rsrc_rsp) \ M(MCS_FREE_RESOURCES, 0xa001, mcs_free_resources, mcs_free_rsrc_req, msg_rsp) \ + M(MCS_RX_SC_CAM_WRITE, 0xa004, mcs_rx_sc_cam_write, mcs_rx_sc_cam_write_req, msg_rsp) \ M(MCS_SA_PLCY_WRITE, 0xa005, mcs_sa_plcy_write, mcs_sa_plcy_write_req, msg_rsp) \ + M(MCS_TX_SC_SA_MAP_WRITE, 0xa006, mcs_tx_sc_sa_map_write, mcs_tx_sc_sa_map, msg_rsp) \ + M(MCS_RX_SC_SA_MAP_WRITE, 0xa007, mcs_rx_sc_sa_map_write, mcs_rx_sc_sa_map, msg_rsp) \M (MCS_GET_HW_INFO ,0xa00b , mcs_get_hw_info, msg_req, mcs_hw_info) \/* Messages initiated by AF (range 0xC00 - 0xDFF) */
@@ -726,6 +729,16 @@ struct mcs_free_rsrc_req { uint64_t __io rsvd; }; +/* RX SC_CAM mapping */ +struct mcs_rx_sc_cam_write_req { +struct mbox_msghdr hdr; + uint64_t __io sci; /* SCI */ + uint64_t __io secy_id; /* secy index mapped to SC */ + uint8_t __io sc_id; /* SC CAM entry index */ + uint8_t __io mcs_id; + uint64_t __io rsvd; +}; +struct mcs_sa_plcy_write_req {struct mbox_msghdr hdr; uint64_t __io plcy[2][9]; /* Support 2 SA policy */
@@ -736,6 +749,30 @@ struct mcs_sa_plcy_write_req { uint64_t __io rsvd; }; +struct mcs_tx_sc_sa_map { +struct mbox_msghdr hdr; + uint8_t __io sa_index0; + uint8_t __io sa_index1; + uint8_t __io rekey_ena; + uint8_t __io sa_index0_vld; + uint8_t __io sa_index1_vld; + uint8_t __io tx_sa_active; + uint64_t __io sectag_sci; + uint8_t __io sc_id; /* used as index for SA_MEM_MAP */ + uint8_t __io mcs_id; + uint64_t __io rsvd; +}; + +struct mcs_rx_sc_sa_map { +struct mbox_msghdr hdr; + uint8_t __io sa_index; + uint8_t __io sa_in_use; + uint8_t __io sc_id; +/* an range is 0-3, sc_id + an used as index SA_MEM_MAP */ + uint8_t __io an; + uint8_t __io mcs_id; + uint64_t __io rsvd; +};struct mcs_hw_info {struct mbox_msghdr hdr;
drivers/common/cnxk/roc_mcs.h +42 -0
58 lines not on this page · raw message
drivers/common/cnxk/roc_mcs_sec_cfg.c +171 -0
174 lines not on this page · raw message
drivers/common/cnxk/version.map +7 -0
@@ -141,8 +141,15 @@ INTERNAL { roc_mcs_hw_info_get; roc_mcs_rsrc_alloc; roc_mcs_rsrc_free; + roc_mcs_rx_sc_cam_enable; + roc_mcs_rx_sc_cam_read; + roc_mcs_rx_sc_cam_write; + roc_mcs_rx_sc_sa_map_read; + roc_mcs_rx_sc_sa_map_write; roc_mcs_sa_policy_read; roc_mcs_sa_policy_write; + roc_mcs_tx_sc_sa_map_read; + roc_mcs_tx_sc_sa_map_write; roc_nix_bpf_alloc; roc_nix_bpf_config; roc_nix_bpf_connect;
Signature · 1 line
2.25.1
PATCH v5 4/15 common/cnxk: add MACsec secy and flow configuration
In reply to Akhil GoyalAdded ROC APIs to configure MACsec secy policy and flow entries.
--- drivers/common/cnxk/roc_mbox.h | 38 +++++++++ drivers/common/cnxk/roc_mcs.h | 37 +++++++++ drivers/common/cnxk/roc_mcs_sec_cfg.c | 115 ++++++++++++++++++++++++++ drivers/common/cnxk/version.map | 5 ++ 4 files changed, 195 insertions(+)
drivers/common/cnxk/roc_mbox.h +38 -0
@@ -300,10 +300,14 @@ struct mbox_msghdr {M (MCS_ALLOC_RESOURCES ,0xa000 , mcs_alloc_resources, mcs_alloc_rsrc_req, \ mcs_alloc_rsrc_rsp) \ M(MCS_FREE_RESOURCES, 0xa001, mcs_free_resources, mcs_free_rsrc_req, msg_rsp) \ +M (MCS_FLOWID_ENTRY_WRITE ,0xa002 , mcs_flowid_entry_write, mcs_flowid_entry_write_req, \ + msg_rsp) \ + M(MCS_SECY_PLCY_WRITE, 0xa003, mcs_secy_plcy_write, mcs_secy_plcy_write_req, msg_rsp) \ M(MCS_RX_SC_CAM_WRITE, 0xa004, mcs_rx_sc_cam_write, mcs_rx_sc_cam_write_req, msg_rsp) \ M(MCS_SA_PLCY_WRITE, 0xa005, mcs_sa_plcy_write, mcs_sa_plcy_write_req, msg_rsp) \ M(MCS_TX_SC_SA_MAP_WRITE, 0xa006, mcs_tx_sc_sa_map_write, mcs_tx_sc_sa_map, msg_rsp) \ M(MCS_RX_SC_SA_MAP_WRITE, 0xa007, mcs_rx_sc_sa_map_write, mcs_rx_sc_sa_map, msg_rsp) \ + M(MCS_FLOWID_ENA_ENTRY, 0xa008, mcs_flowid_ena_entry, mcs_flowid_ena_dis_entry, msg_rsp) \M (MCS_GET_HW_INFO ,0xa00b , mcs_get_hw_info, msg_req, mcs_hw_info) \/* Messages initiated by AF (range 0xC00 - 0xDFF) */
@@ -729,6 +733,31 @@ struct mcs_free_rsrc_req { uint64_t __io rsvd; }; +struct mcs_flowid_entry_write_req { +struct mbox_msghdr hdr; + uint64_t __io data[4]; + uint64_t __io mask[4]; + uint64_t __io sci; /* CNF10K-B for tx_secy_mem_map */ + uint8_t __io flow_id; + uint8_t __io secy_id; /* secyid for which flowid is mapped */ +/* sc_id is Valid if dir = MCS_TX, SC_CAM id mapped to flowid */ + uint8_t __io sc_id; + uint8_t __io ena; /* Enable tcam entry */ + uint8_t __io ctr_pkt; + uint8_t __io mcs_id; + uint8_t __io dir; + uint64_t __io rsvd; +}; + +struct mcs_secy_plcy_write_req { +struct mbox_msghdr hdr; + uint64_t __io plcy; + uint8_t __io secy_id; + uint8_t __io mcs_id; + uint8_t __io dir; + uint64_t __io rsvd; +}; +/* RX SC_CAM mapping */ struct mcs_rx_sc_cam_write_req {struct mbox_msghdr hdr;
@@ -774,6 +803,15 @@ struct mcs_rx_sc_sa_map { uint64_t __io rsvd; }; +struct mcs_flowid_ena_dis_entry { +struct mbox_msghdr hdr; + uint8_t __io flow_id; + uint8_t __io ena; + uint8_t __io mcs_id; + uint8_t __io dir; + uint64_t __io rsvd; +}; +struct mcs_hw_info {struct mbox_msghdr hdr; uint8_t __io num_mcs_blks; /* Number of MCS blocks */
drivers/common/cnxk/roc_mcs.h +37 -0
@@ -32,6 +32,24 @@ struct roc_mcs_free_rsrc_req {uint8_t all;/* Free all the cam resources */ }; +struct roc_mcs_flowid_entry_write_req { +uint64_t data[4 ]; +uint64_t mask[4 ]; +uint64_t sci;/* 105N for tx_secy_mem_map */ +uint8_t flow_id; +uint8_t secy_id;/* secyid for which flowid is mapped */ +uint8_t sc_id;/* Valid if dir = MCS_TX, SC_CAM id mapped to flowid */ +uint8_t ena;/* Enable tcam entry */ +uint8_t ctr_pkt; +uint8_t dir; +}; + +struct roc_mcs_secy_plcy_write_req { +uint64_t plcy; +uint8_t secy_id; +uint8_t dir; +}; +/* RX SC_CAM mapping */ struct roc_mcs_rx_sc_cam_write_req {uint64_t sci;/* SCI */
@@ -64,6 +82,12 @@ struct roc_mcs_rx_sc_sa_map {uint8_t an;/* value range 0-3, sc_id + an used as index SA_MEM_MAP */ }; +struct roc_mcs_flowid_ena_dis_entry { +uint8_t flow_id; +uint8_t ena; +uint8_t dir; +}; +struct roc_mcs_hw_info {uint8_t num_mcs_blks;/* Number of MCS blocks */ uint8_t tcam_entries;/* RX/TX Tcam entries per mcs block */
@@ -113,6 +137,11 @@ __roc_api int roc_mcs_rx_sc_cam_read(struct roc_mcs *mcs, struct roc_mcs_rx_sc_cam_write_req *rx_sc_cam); __roc_api int roc_mcs_rx_sc_cam_enable(struct roc_mcs *mcs,struct roc_mcs_rx_sc_cam_write_req *rx_sc_cam); +/* SECY policy read and write */ +__roc_api int roc_mcs_secy_policy_write(struct roc_mcs *mcs, +struct roc_mcs_secy_plcy_write_req *secy_plcy); +__roc_api int roc_mcs_secy_policy_read(struct roc_mcs *mcs, +struct roc_mcs_rx_sc_cam_write_req *rx_sc_cam);/* RX SC-SA MAP read and write */ __roc_api int roc_mcs_rx_sc_sa_map_write(struct roc_mcs *mcs,struct roc_mcs_rx_sc_sa_map *rx_sc_sa_map);
@@ -124,4 +153,12 @@ __roc_api int roc_mcs_tx_sc_sa_map_write(struct roc_mcs *mcs, __roc_api int roc_mcs_tx_sc_sa_map_read(struct roc_mcs *mcs,struct roc_mcs_tx_sc_sa_map *tx_sc_sa_map); +/* Flow entry read, write and enable */ +__roc_api int roc_mcs_flowid_entry_write(struct roc_mcs *mcs, +struct roc_mcs_flowid_entry_write_req *flowid_req); +__roc_api int roc_mcs_flowid_entry_read(struct roc_mcs *mcs, +struct roc_mcs_flowid_entry_write_req *flowid_rsp); +__roc_api int roc_mcs_flowid_entry_enable(struct roc_mcs *mcs, +struct roc_mcs_flowid_ena_dis_entry *entry); +#endif /* ROC_MCS_H */
drivers/common/cnxk/roc_mcs_sec_cfg.c +115 -0
124 lines not on this page · raw message
drivers/common/cnxk/version.map +5 -0
@@ -138,6 +138,9 @@ INTERNAL { roc_mcs_dev_init; roc_mcs_dev_fini; roc_mcs_dev_get; + roc_mcs_flowid_entry_enable; + roc_mcs_flowid_entry_read; + roc_mcs_flowid_entry_write; roc_mcs_hw_info_get; roc_mcs_rsrc_alloc; roc_mcs_rsrc_free;
@@ -148,6 +151,8 @@ INTERNAL { roc_mcs_rx_sc_sa_map_write; roc_mcs_sa_policy_read; roc_mcs_sa_policy_write; + roc_mcs_secy_policy_read; + roc_mcs_secy_policy_write; roc_mcs_tx_sc_sa_map_read; roc_mcs_tx_sc_sa_map_write; roc_nix_bpf_alloc;
Signature · 1 line
2.25.1
PATCH v5 5/15 common/cnxk: add MACsec PN and LMAC mode configuration
In reply to Akhil GoyalAdded ROC APIs for setting packet number and LMAC
related configurations.
--- drivers/common/cnxk/roc_mbox.h | 56 +++++++++++++++++++++ drivers/common/cnxk/roc_mcs.c | 71 +++++++++++++++++++++++++++ drivers/common/cnxk/roc_mcs.h | 49 ++++++++++++++++++ drivers/common/cnxk/roc_mcs_sec_cfg.c | 31 ++++++++++++ drivers/common/cnxk/version.map | 5 ++ 5 files changed, 212 insertions(+)
drivers/common/cnxk/roc_mbox.h +56 -0
@@ -308,7 +308,11 @@ struct mbox_msghdr { M(MCS_TX_SC_SA_MAP_WRITE, 0xa006, mcs_tx_sc_sa_map_write, mcs_tx_sc_sa_map, msg_rsp) \ M(MCS_RX_SC_SA_MAP_WRITE, 0xa007, mcs_rx_sc_sa_map_write, mcs_rx_sc_sa_map, msg_rsp) \ M(MCS_FLOWID_ENA_ENTRY, 0xa008, mcs_flowid_ena_entry, mcs_flowid_ena_dis_entry, msg_rsp) \ + M(MCS_PN_TABLE_WRITE, 0xa009, mcs_pn_table_write, mcs_pn_table_write_req, msg_rsp) \ + M(MCS_SET_ACTIVE_LMAC, 0xa00a, mcs_set_active_lmac, mcs_set_active_lmac, msg_rsp) \ M(MCS_GET_HW_INFO, 0xa00b, mcs_get_hw_info, msg_req, mcs_hw_info) \ + M(MCS_SET_LMAC_MODE, 0xa013, mcs_set_lmac_mode, mcs_set_lmac_mode, msg_rsp) \ +M (MCS_SET_PN_THRESHOLD ,0xa014 , mcs_set_pn_threshold, mcs_set_pn_threshold, msg_rsp) \ /* Messages initiated by AF (range 0xC00 - 0xDFF) */#define MBOX_UP_CGX_MESSAGES \
@@ -812,6 +816,34 @@ struct mcs_flowid_ena_dis_entry { uint64_t __io rsvd; }; +struct mcs_pn_table_write_req { +struct mbox_msghdr hdr; + uint64_t __io next_pn; + uint8_t __io pn_id; + uint8_t __io mcs_id; + uint8_t __io dir; + uint64_t __io rsvd; +}; + +struct mcs_cam_entry_read_req { +struct mbox_msghdr hdr; + uint8_t __io rsrc_type; /* TCAM/SECY/SC/SA/PN */ + uint8_t __io rsrc_id; + uint8_t __io mcs_id; + uint8_t __io dir; + uint64_t __io rsvd; +}; + +struct mcs_cam_entry_read_rsp { +struct mbox_msghdr hdr; + uint64_t __io reg_val[10]; + uint8_t __io rsrc_type; + uint8_t __io rsrc_id; + uint8_t __io mcs_id; + uint8_t __io dir; + uint64_t __io rsvd; +}; +struct mcs_hw_info {struct mbox_msghdr hdr; uint8_t __io num_mcs_blks; /* Number of MCS blocks */
@@ -822,6 +854,30 @@ struct mcs_hw_info { uint64_t __io rsvd[16]; }; +struct mcs_set_active_lmac { +struct mbox_msghdr hdr; + uint32_t __io lmac_bmap; /* bitmap of active lmac per mcs block */ + uint8_t __io mcs_id; + uint16_t __io channel_base; /* MCS channel base */ + uint64_t __io rsvd; +}; + +struct mcs_set_lmac_mode { +struct mbox_msghdr hdr; + uint8_t __io mode; /* '1' for internal bypass mode (passthrough), '0' for MCS processing */ + uint8_t __io lmac_id; + uint8_t __io mcs_id; + uint64_t __io rsvd; +}; + +struct mcs_set_pn_threshold { +struct mbox_msghdr hdr; + uint64_t __io threshold; + uint8_t __io xpn; /* '1' for setting xpn threshold */ + uint8_t __io mcs_id; + uint8_t __io dir; + uint64_t __io rsvd; +};/* NPA mbox message formats */
drivers/common/cnxk/roc_mcs.c +71 -0
77 lines not on this page · raw message
drivers/common/cnxk/roc_mcs.h +49 -0
73 lines not on this page · raw message
drivers/common/cnxk/roc_mcs_sec_cfg.c +31 -0
@@ -210,6 +210,37 @@ roc_mcs_sa_policy_read(struct roc_mcs *mcs __plt_unused,return -ENOTSUP ; } +int +roc_mcs_pn_table_write (struct roc_mcs *mcs,struct roc_mcs_pn_table_write_req *pn_table) +{ +struct mcs_pn_table_write_req *pn; +struct msg_rsp *rsp; + +MCS_SUPPORT_CHECK ; + +if (pn_table ==NULL ) +return -EINVAL ; + + pn =mbox_alloc_msg_mcs_pn_table_write (mcs->mbox); +if (pn ==NULL ) +return -ENOMEM ; + + pn->next_pn = pn_table->next_pn; + pn->pn_id = pn_table->pn_id; + pn->mcs_id = mcs->idx; + pn->dir = pn_table->dir; + +return mbox_process_msg (mcs->mbox, (void *)&rsp); +} + +int +roc_mcs_pn_table_read(struct roc_mcs *mcs __plt_unused, + struct roc_mcs_pn_table_write_req *sa __plt_unused) +{ +MCS_SUPPORT_CHECK ; + +return -ENOTSUP ; +}int roc_mcs_rx_sc_cam_write (struct roc_mcs *mcs,struct roc_mcs_rx_sc_cam_write_req *rx_sc_cam)
drivers/common/cnxk/version.map +5 -0
@@ -135,6 +135,7 @@ INTERNAL { roc_se_auth_key_set; roc_se_ciph_key_set; roc_se_ctx_init; + roc_mcs_active_lmac_set; roc_mcs_dev_init; roc_mcs_dev_fini; roc_mcs_dev_get;
@@ -142,6 +143,10 @@ INTERNAL { roc_mcs_flowid_entry_read; roc_mcs_flowid_entry_write; roc_mcs_hw_info_get; + roc_mcs_lmac_mode_set; + roc_mcs_pn_table_write; + roc_mcs_pn_table_read; + roc_mcs_pn_threshold_set; roc_mcs_rsrc_alloc; roc_mcs_rsrc_free; roc_mcs_rx_sc_cam_enable;
Signature · 1 line
2.25.1
PATCH v5 6/15 common/cnxk: add MACsec stats
In reply to Akhil GoyalAdded ROC APIs for MACsec stats for SC/SECY/FLOW/PORT
--- drivers/common/cnxk/meson.build | 1 + drivers/common/cnxk/roc_mbox.h | 93 ++++++++++++++ drivers/common/cnxk/roc_mcs.h | 85 ++++++++++++ drivers/common/cnxk/roc_mcs_stats.c | 193 ++++++++++++++++++++++++++++ drivers/common/cnxk/version.map | 5 + 5 files changed, 377 insertions(+) create mode 100644 drivers/common/cnxk/roc_mcs_stats.c
drivers/common/cnxk/meson.build +1 -0
@@ -28,6 +28,7 @@ sources = files( 'roc_mbox.c', 'roc_mcs.c', 'roc_mcs_sec_cfg.c', + 'roc_mcs_stats.c', 'roc_ml.c', 'roc_model.c', 'roc_nix.c',
drivers/common/cnxk/roc_mbox.h +93 -0
105 lines not on this page · raw message
drivers/common/cnxk/roc_mcs.h +85 -0
95 lines not on this page · raw message
drivers/common/cnxk/roc_mcs_stats.c new file +193 -0
193 lines not on this page · raw message
drivers/common/cnxk/version.map +5 -0
@@ -142,11 +142,13 @@ INTERNAL { roc_mcs_flowid_entry_enable; roc_mcs_flowid_entry_read; roc_mcs_flowid_entry_write; + roc_mcs_flowid_stats_get; roc_mcs_hw_info_get; roc_mcs_lmac_mode_set; roc_mcs_pn_table_write; roc_mcs_pn_table_read; roc_mcs_pn_threshold_set; + roc_mcs_port_stats_get; roc_mcs_rsrc_alloc; roc_mcs_rsrc_free; roc_mcs_rx_sc_cam_enable;
@@ -156,8 +158,11 @@ INTERNAL { roc_mcs_rx_sc_sa_map_write; roc_mcs_sa_policy_read; roc_mcs_sa_policy_write; + roc_mcs_sc_stats_get; roc_mcs_secy_policy_read; roc_mcs_secy_policy_write; + roc_mcs_secy_stats_get; + roc_mcs_stats_clear; roc_mcs_tx_sc_sa_map_read; roc_mcs_tx_sc_sa_map_write; roc_nix_bpf_alloc;
Signature · 1 line
2.25.1
PATCH v5 7/15 common/cnxk: add MACsec interrupt APIs
In reply to Akhil GoyalAdded ROC APIs to support various MACsec interrupts.
--- drivers/common/cnxk/roc_dev.c | 86 +++++++++++++++++ drivers/common/cnxk/roc_mbox.h | 37 +++++++- drivers/common/cnxk/roc_mcs.c | 117 +++++++++++++++++++++++ drivers/common/cnxk/roc_mcs.h | 144 +++++++++++++++++++++++++++++ drivers/common/cnxk/roc_mcs_priv.h | 8 ++ drivers/common/cnxk/version.map | 3 + 6 files changed, 394 insertions(+), 1 deletion(-)
drivers/common/cnxk/roc_dev.c +86 -0
@@ -527,6 +527,91 @@ pf_vf_mbox_send_up_msg(struct dev *dev, void *rec_msg) } } +static int +mbox_up_handler_mcs_intr_notify (struct dev *dev,struct mcs_intr_info *info,struct msg_rsp *rsp) +{ +struct roc_mcs_event_desc desc = {0 }; +struct roc_mcs *mcs; + +plt_base_dbg ("pf:%d/vf:%d msg id 0x%x (%s) from: pf:%d/vf:%d" ,dev_get_pf (dev->pf_func), +dev_get_vf (dev->pf_func), info->hdr.id,mbox_id2name (info->hdr.id), +dev_get_pf (info->hdr.pcifunc),dev_get_vf (info->hdr.pcifunc)); + + mcs =roc_idev_mcs_get (info->mcs_id); +if (!mcs) + goto exit; + +if (info->intr_mask) { +switch (info->intr_mask) { +case MCS_CPM_RX_SECTAG_V_EQ1_INT : + desc.type =ROC_MCS_EVENT_SECTAG_VAL_ERR ; + desc.subtype =ROC_MCS_EVENT_RX_SECTAG_V_EQ1 ; +break ; +case MCS_CPM_RX_SECTAG_E_EQ0_C_EQ1_INT : + desc.type =ROC_MCS_EVENT_SECTAG_VAL_ERR ; + desc.subtype =ROC_MCS_EVENT_RX_SECTAG_E_EQ0_C_EQ1 ; +break ; +case MCS_CPM_RX_SECTAG_SL_GTE48_INT : + desc.type =ROC_MCS_EVENT_SECTAG_VAL_ERR ; + desc.subtype =ROC_MCS_EVENT_RX_SECTAG_SL_GTE48 ; +break ; +case MCS_CPM_RX_SECTAG_ES_EQ1_SC_EQ1_INT : + desc.type =ROC_MCS_EVENT_SECTAG_VAL_ERR ; + desc.subtype =ROC_MCS_EVENT_RX_SECTAG_ES_EQ1_SC_EQ1 ; +break ; +case MCS_CPM_RX_SECTAG_SC_EQ1_SCB_EQ1_INT : + desc.type =ROC_MCS_EVENT_SECTAG_VAL_ERR ; + desc.subtype =ROC_MCS_EVENT_RX_SECTAG_SC_EQ1_SCB_EQ1 ; +break ; +case MCS_CPM_RX_PACKET_XPN_EQ0_INT : + desc.type =ROC_MCS_EVENT_RX_SA_PN_HARD_EXP ; + desc.metadata.sa_idx = info->sa_id; +break ; +case MCS_CPM_RX_PN_THRESH_REACHED_INT : + desc.type =ROC_MCS_EVENT_RX_SA_PN_SOFT_EXP ; + desc.metadata.sa_idx = info->sa_id; +break ; +case MCS_CPM_TX_PACKET_XPN_EQ0_INT : + desc.type =ROC_MCS_EVENT_TX_SA_PN_HARD_EXP ; + desc.metadata.sa_idx = info->sa_id; +break ; +case MCS_CPM_TX_PN_THRESH_REACHED_INT : + desc.type =ROC_MCS_EVENT_TX_SA_PN_SOFT_EXP ; + desc.metadata.sa_idx = info->sa_id; +break ; +case MCS_CPM_TX_SA_NOT_VALID_INT : + desc.type =ROC_MCS_EVENT_SA_NOT_VALID ; +break ; +case MCS_BBE_RX_DFIFO_OVERFLOW_INT : +case MCS_BBE_TX_DFIFO_OVERFLOW_INT : + desc.type =ROC_MCS_EVENT_FIFO_OVERFLOW ; + desc.subtype =ROC_MCS_EVENT_DATA_FIFO_OVERFLOW ; + desc.metadata.lmac_id = info->lmac_id; +break ; +case MCS_BBE_RX_PLFIFO_OVERFLOW_INT : +case MCS_BBE_TX_PLFIFO_OVERFLOW_INT : + desc.type =ROC_MCS_EVENT_FIFO_OVERFLOW ; + desc.subtype =ROC_MCS_EVENT_POLICY_FIFO_OVERFLOW ; + desc.metadata.lmac_id = info->lmac_id; +break ; +case MCS_PAB_RX_CHAN_OVERFLOW_INT : +case MCS_PAB_TX_CHAN_OVERFLOW_INT : + desc.type =ROC_MCS_EVENT_FIFO_OVERFLOW ; + desc.subtype =ROC_MCS_EVENT_PKT_ASSM_FIFO_OVERFLOW ; + desc.metadata.lmac_id = info->lmac_id; +break ; +default : + goto exit; + } + +mcs_event_cb_process (mcs, &desc); + } + +exit: + rsp->hdr.rc =0 ; +return 0 ; +} +static int mbox_up_handler_cgx_link_event (struct dev *dev,struct cgx_link_info_msg *msg,struct msg_rsp *rsp)
@@ -615,6 +700,7 @@ mbox_process_msgs_up(struct dev *dev, struct mbox_msghdr *req)return err; \ }MBOX_UP_CGX_MESSAGES + MBOX_UP_MCS_MESSAGES#undef M }
drivers/common/cnxk/roc_mbox.h +36 -1
@@ -316,6 +316,7 @@ struct mbox_msghdr { M(MCS_GET_SC_STATS, 0xa00e, mcs_get_sc_stats, mcs_stats_req, mcs_sc_stats) \ M(MCS_GET_PORT_STATS, 0xa010, mcs_get_port_stats, mcs_stats_req, mcs_port_stats) \ M(MCS_CLEAR_STATS, 0xa011, mcs_clear_stats, mcs_clear_stats, msg_rsp) \ + M(MCS_INTR_CFG, 0xa012, mcs_intr_cfg, mcs_intr_cfg, msg_rsp) \ M(MCS_SET_LMAC_MODE, 0xa013, mcs_set_lmac_mode, mcs_set_lmac_mode, msg_rsp) \M (MCS_SET_PN_THRESHOLD ,0xa014 , mcs_set_pn_threshold, mcs_set_pn_threshold, msg_rsp) \
@@ -324,9 +325,11 @@ struct mbox_msghdr { M(CGX_LINK_EVENT, 0xC00, cgx_link_event, cgx_link_info_msg, msg_rsp) \ M(CGX_PTP_RX_INFO, 0xC01, cgx_ptp_rx_info, cgx_ptp_rx_info_msg, msg_rsp) +#define MBOX_UP_MCS_MESSAGES M(MCS_INTR_NOTIFY, 0xE00, mcs_intr_notify, mcs_intr_info, msg_rsp) +enum { #define M(_name, _id, _1, _2, _3) MBOX_MSG_##_name = _id, - MBOX_MESSAGES MBOX_UP_CGX_MESSAGES + MBOX_MESSAGES MBOX_UP_CGX_MESSAGES MBOX_UP_MCS_MESSAGES#undef M };
@@ -867,6 +870,38 @@ struct mcs_set_active_lmac { uint64_t __io rsvd; }; +#define MCS_CPM_RX_SECTAG_V_EQ1_INT BIT_ULL(0) +#define MCS_CPM_RX_SECTAG_E_EQ0_C_EQ1_INT BIT_ULL(1) +#define MCS_CPM_RX_SECTAG_SL_GTE48_INT BIT_ULL(2) +#define MCS_CPM_RX_SECTAG_ES_EQ1_SC_EQ1_INT BIT_ULL(3) +#define MCS_CPM_RX_SECTAG_SC_EQ1_SCB_EQ1_INT BIT_ULL(4) +#define MCS_CPM_RX_PACKET_XPN_EQ0_INT BIT_ULL(5) +#define MCS_CPM_RX_PN_THRESH_REACHED_INT BIT_ULL(6) +#define MCS_CPM_TX_PACKET_XPN_EQ0_INT BIT_ULL(7) +#define MCS_CPM_TX_PN_THRESH_REACHED_INT BIT_ULL(8) +#define MCS_CPM_TX_SA_NOT_VALID_INT BIT_ULL(9) +#define MCS_BBE_RX_DFIFO_OVERFLOW_INT BIT_ULL(10) +#define MCS_BBE_RX_PLFIFO_OVERFLOW_INT BIT_ULL(11) +#define MCS_BBE_TX_DFIFO_OVERFLOW_INT BIT_ULL(12) +#define MCS_BBE_TX_PLFIFO_OVERFLOW_INT BIT_ULL(13) +#define MCS_PAB_RX_CHAN_OVERFLOW_INT BIT_ULL(14) +#define MCS_PAB_TX_CHAN_OVERFLOW_INT BIT_ULL(15) + +struct mcs_intr_cfg { +struct mbox_msghdr hdr; + uint64_t __io intr_mask; /* Interrupt enable mask */ + uint8_t __io mcs_id; +}; + +struct mcs_intr_info { +struct mbox_msghdr hdr; + uint64_t __io intr_mask; + int __io sa_id; + uint8_t __io mcs_id; + uint8_t __io lmac_id; + uint64_t __io rsvd; +}; +struct mcs_set_lmac_mode {struct mbox_msghdr hdr; uint8_t __io mode; /* '1' for internal bypass mode (passthrough), '0' for MCS processing */
drivers/common/cnxk/roc_mcs.c +117 -0
141 lines not on this page · raw message
drivers/common/cnxk/roc_mcs.h +144 -0
160 lines not on this page · raw message
drivers/common/cnxk/roc_mcs_priv.h +8 -0
@@ -62,4 +62,12 @@ roc_mcs_to_mcs_priv(struct roc_mcs *roc_mcs) return (struct mcs_priv *)&roc_mcs->reserved[0]; } +static inline void * +roc_mcs_to_mcs_cb_list (struct roc_mcs *roc_mcs) +{ +return (void *)((uintptr_t )roc_mcs->reserved +sizeof (struct mcs_priv )); +} + +int mcs_event_cb_process (struct roc_mcs *mcs,struct roc_mcs_event_desc *desc); +#endif /* _ROC_MCS_PRIV_H_ */
drivers/common/cnxk/version.map +3 -0
@@ -139,11 +139,14 @@ INTERNAL { roc_mcs_dev_init; roc_mcs_dev_fini; roc_mcs_dev_get; + roc_mcs_event_cb_register; + roc_mcs_event_cb_unregister; roc_mcs_flowid_entry_enable; roc_mcs_flowid_entry_read; roc_mcs_flowid_entry_write; roc_mcs_flowid_stats_get; roc_mcs_hw_info_get; + roc_mcs_intr_configure; roc_mcs_lmac_mode_set; roc_mcs_pn_table_write; roc_mcs_pn_table_read;
Signature · 1 line
2.25.1
PATCH v5 8/15 common/cnxk: add MACsec port configuration
In reply to Akhil GoyalAdded ROC APIs for MACsec port configurations
--- drivers/common/cnxk/roc_mbox.h | 40 ++++ drivers/common/cnxk/roc_mcs.c | 346 ++++++++++++++++++++++++++++++++ drivers/common/cnxk/roc_mcs.h | 48 +++++ drivers/common/cnxk/version.map | 4 + 4 files changed, 438 insertions(+)
drivers/common/cnxk/roc_mbox.h +40 -0
@@ -319,6 +319,9 @@ struct mbox_msghdr { M(MCS_INTR_CFG, 0xa012, mcs_intr_cfg, mcs_intr_cfg, msg_rsp) \ M(MCS_SET_LMAC_MODE, 0xa013, mcs_set_lmac_mode, mcs_set_lmac_mode, msg_rsp) \ M(MCS_SET_PN_THRESHOLD, 0xa014, mcs_set_pn_threshold, mcs_set_pn_threshold, msg_rsp) \ + M(MCS_PORT_RESET, 0xa018, mcs_port_reset, mcs_port_reset_req, msg_rsp) \ + M(MCS_PORT_CFG_SET, 0xa019, mcs_port_cfg_set, mcs_port_cfg_set_req, msg_rsp) \ +M (MCS_PORT_CFG_GET ,0xa020 , mcs_port_cfg_get, mcs_port_cfg_get_req, mcs_port_cfg_get_rsp) \ /* Messages initiated by AF (range 0xC00 - 0xDFF) */#define MBOX_UP_CGX_MESSAGES \
@@ -919,6 +922,43 @@ struct mcs_set_pn_threshold { uint64_t __io rsvd; }; +struct mcs_port_cfg_set_req { +struct mbox_msghdr hdr; + uint8_t __io cstm_tag_rel_mode_sel; + uint8_t __io custom_hdr_enb; + uint8_t __io fifo_skid; + uint8_t __io lmac_mode; + uint8_t __io lmac_id; + uint8_t __io mcs_id; + uint64_t __io rsvd; +}; + +struct mcs_port_cfg_get_req { +struct mbox_msghdr hdr; + uint8_t __io lmac_id; + uint8_t __io mcs_id; + uint64_t __io rsvd; +}; + +struct mcs_port_cfg_get_rsp { +struct mbox_msghdr hdr; + uint8_t __io cstm_tag_rel_mode_sel; + uint8_t __io custom_hdr_enb; + uint8_t __io fifo_skid; + uint8_t __io lmac_mode; + uint8_t __io lmac_id; + uint8_t __io mcs_id; + uint64_t __io rsvd; +}; + +struct mcs_port_reset_req { +struct mbox_msghdr hdr; + uint8_t __io reset; + uint8_t __io mcs_id; + uint8_t __io lmac_id; + uint64_t __io rsvd; +}; +struct mcs_stats_req {struct mbox_msghdr hdr; uint8_t __io id;
drivers/common/cnxk/roc_mcs.c +346 -0
364 lines not on this page · raw message
drivers/common/cnxk/roc_mcs.h +48 -0
64 lines not on this page · raw message
drivers/common/cnxk/version.map +4 -0
@@ -151,6 +151,10 @@ INTERNAL { roc_mcs_pn_table_write; roc_mcs_pn_table_read; roc_mcs_pn_threshold_set; + roc_mcs_port_cfg_get; + roc_mcs_port_cfg_set; + roc_mcs_port_recovery; + roc_mcs_port_reset; roc_mcs_port_stats_get; roc_mcs_rsrc_alloc; roc_mcs_rsrc_free;
Signature · 1 line
2.25.1
PATCH v5 9/15 common/cnxk: add MACsec control port configuration
In reply to Akhil GoyalAdded ROC APIs to configure MACsec control port.
--- drivers/common/cnxk/roc_mbox.h | 72 ++++++++++++++++++++ drivers/common/cnxk/roc_mcs.c | 117 ++++++++++++++++++++++++++++++++ drivers/common/cnxk/roc_mcs.h | 65 ++++++++++++++++++ drivers/common/cnxk/version.map | 4 ++ 4 files changed, 258 insertions(+)
drivers/common/cnxk/roc_mbox.h +72 -0
@@ -319,9 +319,17 @@ struct mbox_msghdr { M(MCS_INTR_CFG, 0xa012, mcs_intr_cfg, mcs_intr_cfg, msg_rsp) \ M(MCS_SET_LMAC_MODE, 0xa013, mcs_set_lmac_mode, mcs_set_lmac_mode, msg_rsp) \ M(MCS_SET_PN_THRESHOLD, 0xa014, mcs_set_pn_threshold, mcs_set_pn_threshold, msg_rsp) \ +M (MCS_ALLOC_CTRL_PKT_RULE ,0xa015 , mcs_alloc_ctrl_pkt_rule, mcs_alloc_ctrl_pkt_rule_req, \ + mcs_alloc_ctrl_pkt_rule_rsp) \ +M (MCS_FREE_CTRL_PKT_RULE ,0xa016 , mcs_free_ctrl_pkt_rule, mcs_free_ctrl_pkt_rule_req, \ + msg_rsp) \ +M (MCS_CTRL_PKT_RULE_WRITE ,0xa017 , mcs_ctrl_pkt_rule_write, mcs_ctrl_pkt_rule_write_req, \ + msg_rsp) \ M(MCS_PORT_RESET, 0xa018, mcs_port_reset, mcs_port_reset_req, msg_rsp) \ M(MCS_PORT_CFG_SET, 0xa019, mcs_port_cfg_set, mcs_port_cfg_set_req, msg_rsp) \ M(MCS_PORT_CFG_GET, 0xa020, mcs_port_cfg_get, mcs_port_cfg_get_req, mcs_port_cfg_get_rsp) \ +M (MCS_CUSTOM_TAG_CFG_GET ,0xa021 , mcs_custom_tag_cfg_get, mcs_custom_tag_cfg_get_req, \ + mcs_custom_tag_cfg_get_rsp) \ /* Messages initiated by AF (range 0xC00 - 0xDFF) */#define MBOX_UP_CGX_MESSAGES \
@@ -922,6 +930,53 @@ struct mcs_set_pn_threshold { uint64_t __io rsvd; }; +enum mcs_ctrl_pkt_rule_type { +MCS_CTRL_PKT_RULE_TYPE_ETH , +MCS_CTRL_PKT_RULE_TYPE_DA , +MCS_CTRL_PKT_RULE_TYPE_RANGE , +MCS_CTRL_PKT_RULE_TYPE_COMBO , +MCS_CTRL_PKT_RULE_TYPE_MAC , +}; + +struct mcs_alloc_ctrl_pkt_rule_req { +struct mbox_msghdr hdr; + uint8_t __io rule_type; + uint8_t __io mcs_id; /* MCS block ID */ + uint8_t __io dir; /* Macsec ingress or egress side */ + uint64_t __io rsvd; +}; + +struct mcs_alloc_ctrl_pkt_rule_rsp { +struct mbox_msghdr hdr; + uint8_t __io rule_idx; + uint8_t __io rule_type; + uint8_t __io mcs_id; + uint8_t __io dir; + uint64_t __io rsvd; +}; + +struct mcs_free_ctrl_pkt_rule_req { +struct mbox_msghdr hdr; + uint8_t __io rule_idx; + uint8_t __io rule_type; + uint8_t __io mcs_id; + uint8_t __io dir; + uint8_t __io all; /* Free all the rule resources */ + uint64_t __io rsvd; +}; + +struct mcs_ctrl_pkt_rule_write_req { +struct mbox_msghdr hdr; + uint64_t __io data0; + uint64_t __io data1; + uint64_t __io data2; + uint8_t __io rule_idx; + uint8_t __io rule_type; + uint8_t __io mcs_id; + uint8_t __io dir; + uint64_t __io rsvd; +}; +struct mcs_port_cfg_set_req {struct mbox_msghdr hdr; uint8_t __io cstm_tag_rel_mode_sel;
@@ -951,6 +1006,23 @@ struct mcs_port_cfg_get_rsp { uint64_t __io rsvd; }; +struct mcs_custom_tag_cfg_get_req { +struct mbox_msghdr hdr; + uint8_t __io mcs_id; + uint8_t __io dir; + uint64_t __io rsvd; +}; + +struct mcs_custom_tag_cfg_get_rsp { +struct mbox_msghdr hdr; + uint16_t __io cstm_etype[8]; + uint8_t __io cstm_indx[8]; + uint8_t __io cstm_etype_en; + uint8_t __io mcs_id; + uint8_t __io dir; + uint64_t __io rsvd; +}; +struct mcs_port_reset_req {struct mbox_msghdr hdr; uint8_t __io reset;
drivers/common/cnxk/roc_mcs.c +117 -0
129 lines not on this page · raw message
drivers/common/cnxk/roc_mcs.h +65 -0
89 lines not on this page · raw message
drivers/common/cnxk/version.map +4 -0
@@ -136,6 +136,10 @@ INTERNAL { roc_se_ciph_key_set; roc_se_ctx_init; roc_mcs_active_lmac_set; + roc_mcs_ctrl_pkt_rule_alloc; + roc_mcs_ctrl_pkt_rule_free; + roc_mcs_ctrl_pkt_rule_write; + roc_mcs_custom_tag_cfg_get; roc_mcs_dev_init; roc_mcs_dev_fini; roc_mcs_dev_get;
Signature · 1 line
2.25.1
PATCH v5 10/15 common/cnxk: add MACsec FIPS mbox
In reply to Akhil GoyalAdded MACsec FIPS configuration mbox
--- drivers/common/cnxk/roc_mbox.h | 74 ++++++++++++++++++++++++++++++++++ drivers/common/cnxk/roc_mcs.h | 69 +++++++++++++++++++++++++++++++ 2 files changed, 143 insertions(+)
drivers/common/cnxk/roc_mbox.h +74 -0
@@ -330,6 +330,15 @@ struct mbox_msghdr { M(MCS_PORT_CFG_GET, 0xa020, mcs_port_cfg_get, mcs_port_cfg_get_req, mcs_port_cfg_get_rsp) \M (MCS_CUSTOM_TAG_CFG_GET ,0xa021 , mcs_custom_tag_cfg_get, mcs_custom_tag_cfg_get_req, \ mcs_custom_tag_cfg_get_rsp) \ + M(MCS_FIPS_RESET, 0xa040, mcs_fips_reset, mcs_fips_req, msg_rsp) \ + M(MCS_FIPS_MODE_SET, 0xa041, mcs_fips_mode_set, mcs_fips_mode_req, msg_rsp) \ + M(MCS_FIPS_CTL_SET, 0xa042, mcs_fips_ctl_set, mcs_fips_ctl_req, msg_rsp) \ + M(MCS_FIPS_IV_SET, 0xa043, mcs_fips_iv_set, mcs_fips_iv_req, msg_rsp) \ + M(MCS_FIPS_CTR_SET, 0xa044, mcs_fips_ctr_set, mcs_fips_ctr_req, msg_rsp) \ + M(MCS_FIPS_KEY_SET, 0xa045, mcs_fips_key_set, mcs_fips_key_req, msg_rsp) \ + M(MCS_FIPS_BLOCK_SET, 0xa046, mcs_fips_block_set, mcs_fips_block_req, msg_rsp) \ + M(MCS_FIPS_START, 0xa047, mcs_fips_start, mcs_fips_req, msg_rsp) \ +M (MCS_FIPS_RESULT_GET ,0xa048 , mcs_fips_result_get, mcs_fips_req, mcs_fips_result_rsp) /* Messages initiated by AF (range 0xC00 - 0xDFF) */#define MBOX_UP_CGX_MESSAGES \
@@ -1119,6 +1128,71 @@ struct mcs_clear_stats { uint8_t __io all; /* All resources stats mapped to PF are cleared */ }; +struct mcs_fips_req { +struct mbox_msghdr hdr; + uint8_t __io mcs_id; + uint8_t __io dir; +}; + +struct mcs_fips_mode_req { +struct mbox_msghdr hdr; + uint64_t __io mode; + uint8_t __io mcs_id; + uint8_t __io dir; +}; + +struct mcs_fips_ctl_req { +struct mbox_msghdr hdr; + uint64_t __io ctl; + uint8_t __io mcs_id; + uint8_t __io dir; +}; + +struct mcs_fips_iv_req { +struct mbox_msghdr hdr; + uint32_t __io iv_bits95_64; + uint64_t __io iv_bits63_0; + uint8_t __io mcs_id; + uint8_t __io dir; +}; + +struct mcs_fips_ctr_req { +struct mbox_msghdr hdr; + uint32_t __io fips_ctr; + uint8_t __io mcs_id; + uint8_t __io dir; +}; + +struct mcs_fips_key_req { +struct mbox_msghdr hdr; + uint64_t __io sak_bits255_192; + uint64_t __io sak_bits191_128; + uint64_t __io sak_bits127_64; + uint64_t __io sak_bits63_0; + uint64_t __io hashkey_bits127_64; + uint64_t __io hashkey_bits63_0; + uint8_t __io sak_len; + uint8_t __io mcs_id; + uint8_t __io dir; +}; + +struct mcs_fips_block_req { +struct mbox_msghdr hdr; + uint64_t __io blk_bits127_64; + uint64_t __io blk_bits63_0; + uint8_t __io mcs_id; + uint8_t __io dir; +}; + +struct mcs_fips_result_rsp { +struct mbox_msghdr hdr; + uint64_t __io blk_bits127_64; + uint64_t __io blk_bits63_0; + uint64_t __io icv_bits127_64; + uint64_t __io icv_bits63_0; + uint8_t __io result_pass; +}; +/* NPA mbox message formats */ /* NPA mailbox error codes
drivers/common/cnxk/roc_mcs.h +69 -0
79 lines not on this page · raw message
Signature · 1 line
2.25.1
PATCH v5 11/15 common/cnxk: derive hash key for MACsec
In reply to Akhil GoyalMACsec hardware configuration need hash key to be generated from the cipher key of AES-GCM-128/256.
Added an ROC API to derive the hash key and extend the case for AES-256 as well.
--- drivers/common/cnxk/roc_aes.c | 86 ++++++++++++++++++++++----------- drivers/common/cnxk/roc_aes.h | 4 +- drivers/common/cnxk/version.map | 1 + 3 files changed, 60 insertions(+), 31 deletions(-)
drivers/common/cnxk/roc_aes.c +57 -29
@@ -4,9 +4,10 @@#include "roc_api.h" -#define KEY_WORD_LEN (ROC_CPT_AES_XCBC_KEY_LENGTH / sizeof(uint32_t)) -#define KEY_ROUNDS 10/* (Nr+1)*Nb */ -#define KEY_SCHEDULE_LEN ((KEY_ROUNDS + 1) * 4)/* (Nr+1)*Nb words */ +#define KEY128_ROUNDS 10/* (Nr+1)*Nb */ +#define KEY256_ROUNDS 14/* (Nr+1)*Nb */ +#define KEY_SCHEDULE_LEN (nr) ((nr + 1) * 4)/* (Nr+1)*Nb words */ +#define AES_HASH_KEY_LEN 16/* * AES 128 implementation based on NIST FIPS 197 suitable for LittleEndian
@@ -93,22 +94,30 @@ GF8mul(uint8_t byte, uint32_t mp) }static void -aes_key_expand (const uint8_t *key,uint32_t *ks) +aes_key_expand (const uint8_t *key,uint32_t len,uint32_t *ks) { -unsigned int i =4 ; +uint32_t len_words = len /sizeof (uint32_t ); +unsigned int schedule_len; +unsigned int i = len_words;uint32_t temp; + schedule_len = (len ==ROC_CPT_AES128_KEY_LEN ) ?KEY_SCHEDULE_LEN (KEY128_ROUNDS ) : +KEY_SCHEDULE_LEN (KEY256_ROUNDS );/* Skip key in ks */ -memcpy (ks, key,KEY_WORD_LEN *sizeof (uint32_t )); +memcpy (ks, key, len); -while (i <KEY_SCHEDULE_LEN ) { +while (i < schedule_len) { temp = ks[i -1 ]; -if ((i &0x3 ) ==0 ) { +if ((i & (len_words -1 )) ==0 ) { temp =rot_word (temp); temp =sub_word (temp); - temp ^= (uint32_t )GF8mul (1 ,1 << ((i >>2 ) -1 )); + temp ^= (uint32_t )GF8mul (1 ,1 << ((i / len_words) -1 )); } - ks[i] = ks[i -4 ] ^ temp; +if (len ==ROC_CPT_AES256_KEY_LEN ) { +if ((i % len_words) ==4 ) + temp =sub_word (temp); + } + ks[i] = ks[i - len_words] ^ temp; i++; } }
@@ -145,64 +154,83 @@ mix_columns(uint8_t *sRc) }static void -cipher (uint8_t *in,uint8_t *out,uint32_t *ks) +cipher (uint8_t *in,uint8_t *out,uint32_t *ks,uint32_t key_rounds,uint8_t in_len) { -uint32_t state[KEY_WORD_LEN ]; +uint8_t data_word_len = in_len /sizeof (uint32_t ); +uint32_t state[data_word_len];unsigned int i, round;memcpy (state, in,sizeof (state));/* AddRoundKey(state, w[0, Nb-1]) // See Sec. 5.1.4 */ -for (i =0 ; i <KEY_WORD_LEN ; i++) +for (i =0 ; i < data_word_len; i++) state[i] ^= ks[i]; -for (round =1 ; round <KEY_ROUNDS ; round++) { +for (round =1 ; round < key_rounds; round++) {/* SubBytes(state) // See Sec. 5.1.1 */ -for (i =0 ; i <KEY_WORD_LEN ; i++) +for (i =0 ; i < data_word_len; i++) state[i] =sub_word (state[i]);/* ShiftRows(state) // See Sec. 5.1.2 */ -for (i =0 ; i <KEY_WORD_LEN ; i++) +for (i =0 ; i < data_word_len; i++)shift_word ((uint8_t *)state, i, i);/* MixColumns(state) // See Sec. 5.1.3 */ -for (i =0 ; i <KEY_WORD_LEN ; i++) +for (i =0 ; i < data_word_len; i++)mix_columns ((uint8_t *)&state[i]);/* AddRoundKey(state, w[round*Nb, (round+1)*Nb-1]) */ -for (i =0 ; i <KEY_WORD_LEN ; i++) - state[i] ^= ks[round *4 + i]; +for (i =0 ; i < data_word_len; i++) + state[i] ^= ks[round * data_word_len + i]; }/* SubBytes(state) */ -for (i =0 ; i <KEY_WORD_LEN ; i++) +for (i =0 ; i < data_word_len; i++) state[i] =sub_word (state[i]);/* ShiftRows(state) */ -for (i =0 ; i <KEY_WORD_LEN ; i++) +for (i =0 ; i < data_word_len; i++)shift_word ((uint8_t *)state, i, i);/* AddRoundKey(state, w[Nr*Nb, (Nr+1)*Nb-1]) */ -for (i =0 ; i <KEY_WORD_LEN ; i++) - state[i] ^= ks[KEY_ROUNDS *4 + i]; -memcpy (out, state,KEY_WORD_LEN *sizeof (uint32_t )); +for (i =0 ; i < data_word_len; i++) + state[i] ^= ks[key_rounds * data_word_len + i]; +memcpy (out, state, data_word_len *sizeof (uint32_t )); }void roc_aes_xcbc_key_derive (const uint8_t *auth_key,uint8_t *derived_key) { -uint32_t aes_ks[KEY_SCHEDULE_LEN ] = {0 }; +uint32_t aes_ks[KEY_SCHEDULE_LEN (KEY128_ROUNDS )] = {0 };uint8_t k1[16 ] = {[0 ...15 ] =0x01 };uint8_t k2[16 ] = {[0 ...15 ] =0x02 };uint8_t k3[16 ] = {[0 ...15 ] =0x03 }; -aes_key_expand (auth_key, aes_ks); +aes_key_expand (auth_key,ROC_CPT_AES_XCBC_KEY_LENGTH , aes_ks); -cipher (k1, derived_key, aes_ks); +cipher (k1, derived_key, aes_ks,KEY128_ROUNDS ,sizeof (k1)); derived_key +=sizeof (k1); -cipher (k2, derived_key, aes_ks); +cipher (k2, derived_key, aes_ks,KEY128_ROUNDS ,sizeof (k2)); derived_key +=sizeof (k2); -cipher (k3, derived_key, aes_ks); +cipher (k3, derived_key, aes_ks,KEY128_ROUNDS ,sizeof (k3)); +} + +void +roc_aes_hash_key_derive (const uint8_t *key,uint16_t len,uint8_t hash_key[]) +{ +uint8_t data[AES_HASH_KEY_LEN ] = {0x0 }; + +if (len ==ROC_CPT_AES128_KEY_LEN ) { +uint32_t aes_ks[KEY_SCHEDULE_LEN (KEY128_ROUNDS )] = {0 }; + +aes_key_expand (key,ROC_CPT_AES128_KEY_LEN , aes_ks); +cipher (data, hash_key, aes_ks,KEY128_ROUNDS ,sizeof (data)); + }else { +uint32_t aes_ks[KEY_SCHEDULE_LEN (KEY256_ROUNDS )] = {0 }; + +aes_key_expand (key,ROC_CPT_AES256_KEY_LEN , aes_ks); +cipher (data, hash_key, aes_ks,KEY256_ROUNDS ,sizeof (data)); + } }
drivers/common/cnxk/roc_aes.h +2 -2
@@ -8,7 +8,7 @@/* * Derive k1, k2, k3 from 128 bit AES key */ -void __roc_api roc_aes_xcbc_key_derive(const uint8_t *auth_key, -uint8_t *derived_key); +void __roc_api roc_aes_xcbc_key_derive(const uint8_t *auth_key, uint8_t *derived_key); +void __roc_api roc_aes_hash_key_derive(const uint8_t *key, uint16_t len, uint8_t *hash_key);#endif /* _ROC_AES_H_ */
drivers/common/cnxk/version.map +1 -0
@@ -30,6 +30,7 @@ INTERNAL { roc_ae_ec_grp_put; roc_ae_fpm_get; roc_ae_fpm_put; + roc_aes_hash_key_derive; roc_aes_xcbc_key_derive; roc_bphy_cgx_cpri_mode_change; roc_bphy_cgx_cpri_mode_misc;
Signature · 1 line
2.25.1
PATCH v5 12/15 net/cnxk: add MACsec initialization
In reply to Akhil GoyalAdded initialization routines for MACsec for
cn10kb platform.
--- drivers/net/cnxk/cn10k_ethdev_sec.c | 6 ++ drivers/net/cnxk/cnxk_ethdev.c | 13 +++ drivers/net/cnxk/cnxk_ethdev.h | 14 +++ drivers/net/cnxk/cnxk_ethdev_mcs.c | 151 ++++++++++++++++++++++++++++ drivers/net/cnxk/cnxk_ethdev_mcs.h | 66 ++++++++++++ drivers/net/cnxk/meson.build | 1 + 6 files changed, 251 insertions(+) create mode 100644 drivers/net/cnxk/cnxk_ethdev_mcs.c create mode 100644 drivers/net/cnxk/cnxk_ethdev_mcs.h
drivers/net/cnxk/cn10k_ethdev_sec.c +6 -0
@@ -1090,9 +1090,15 @@ cn10k_eth_sec_ops_override(void) init_once =1 ;/* Update platform specific ops */ + cnxk_eth_sec_ops.macsec_sa_create =NULL ; + cnxk_eth_sec_ops.macsec_sc_create =NULL ; + cnxk_eth_sec_ops.macsec_sa_destroy =NULL ; + cnxk_eth_sec_ops.macsec_sc_destroy =NULL ; cnxk_eth_sec_ops.session_create = cn10k_eth_sec_session_create; cnxk_eth_sec_ops.session_destroy = cn10k_eth_sec_session_destroy; cnxk_eth_sec_ops.capabilities_get = cn10k_eth_sec_capabilities_get; cnxk_eth_sec_ops.session_update = cn10k_eth_sec_session_update; cnxk_eth_sec_ops.session_stats_get = cn10k_eth_sec_session_stats_get; + cnxk_eth_sec_ops.macsec_sc_stats_get =NULL ; + cnxk_eth_sec_ops.macsec_sa_stats_get =NULL ; }
drivers/net/cnxk/cnxk_ethdev.c +13 -0
@@ -1961,6 +1961,16 @@ cnxk_eth_dev_init(struct rte_eth_dev *eth_dev)if (rc) goto free_mac_addrs; +if (roc_feature_nix_has_macsec ()) { + rc =cnxk_mcs_dev_init (dev,0 ); +if (rc) { +plt_err ("Failed to init MCS" ); + goto free_mac_addrs; + } + dev->rx_offload_capa |=RTE_ETH_RX_OFFLOAD_MACSEC_STRIP ; + dev->tx_offload_capa |=RTE_ETH_TX_OFFLOAD_MACSEC_INSERT ; + } + plt_nix_dbg("Port=%d pf=%d vf=%d ver=%s hwcap=0x%" PRIx64 " rxoffload_capa=0x%" PRIx64 " txoffload_capa=0x%" PRIx64, eth_dev->data->port_id, roc_nix_get_pf(nix),
@@ -2058,6 +2068,9 @@ cnxk_eth_dev_uninit(struct rte_eth_dev *eth_dev, bool reset) } eth_dev->data->nb_rx_queues =0 ; +if (roc_feature_nix_has_macsec ()) +cnxk_mcs_dev_fini (dev); +/* Free security resources */ nix_security_release (dev);
drivers/net/cnxk/cnxk_ethdev.h +14 -0
@@ -395,6 +395,9 @@ struct cnxk_eth_dev {/* Reassembly dynfield/flag offsets */ int reass_dynfield_off;int reass_dynflag_bit; + +/* MCS device */ +struct cnxk_mcs_dev *mcs_dev; };struct cnxk_eth_rxq_sp {
@@ -623,6 +626,17 @@ int cnxk_nix_cman_config_set(struct rte_eth_dev *dev, const struct rte_eth_cman_int cnxk_nix_cman_config_get (struct rte_eth_dev *dev,struct rte_eth_cman_config *config); +int cnxk_mcs_dev_init (struct cnxk_eth_dev *dev,uint8_t mcs_idx); +void cnxk_mcs_dev_fini (struct cnxk_eth_dev *dev); + +struct cnxk_macsec_sess *cnxk_eth_macsec_sess_get_by_sess (struct cnxk_eth_dev *dev, +const struct rte_security_session *sess); +int cnxk_mcs_flow_configure (struct rte_eth_dev *eth_dev,const struct rte_flow_attr *attr, +const struct rte_flow_item pattern[], +const struct rte_flow_action actions[],struct rte_flow_error *error, +void **mcs_flow); +int cnxk_mcs_flow_destroy (struct cnxk_eth_dev *eth_dev,void *mcs_flow); +/* Other private functions */ int nix_recalc_mtu (struct rte_eth_dev *eth_dev);int nix_mtr_validate (struct rte_eth_dev *dev,uint32_t id);
drivers/net/cnxk/cnxk_ethdev_mcs.c new file +151 -0
151 lines not on this page · raw message
drivers/net/cnxk/cnxk_ethdev_mcs.h new file +66 -0
66 lines not on this page · raw message
drivers/net/cnxk/meson.build +1 -0
@@ -22,6 +22,7 @@ sources = files( 'cnxk_ethdev.c', 'cnxk_ethdev_cman.c', 'cnxk_ethdev_devargs.c', + 'cnxk_ethdev_mcs.c', 'cnxk_ethdev_mtr.c', 'cnxk_ethdev_ops.c', 'cnxk_ethdev_sec.c',
Signature · 1 line
2.25.1
PATCH v5 13/15 net/cnxk: create/destroy MACsec SC/SA
In reply to Akhil GoyalAdded support to create/destroy MACsec SA and SC.
--- drivers/net/cnxk/cn10k_ethdev_sec.c | 9 +- drivers/net/cnxk/cnxk_ethdev_mcs.c | 253 ++++++++++++++++++++++++++++ drivers/net/cnxk/cnxk_ethdev_mcs.h | 16 ++ 3 files changed, 274 insertions(+), 4 deletions(-)
drivers/net/cnxk/cn10k_ethdev_sec.c +5 -4
@@ -9,6 +9,7 @@#include <rte_pmd_cnxk.h> #include <cn10k_ethdev.h> +#include <cnxk_ethdev_mcs.h> #include <cnxk_security.h> #include <roc_priv.h>
@@ -1090,10 +1091,10 @@ cn10k_eth_sec_ops_override(void) init_once =1 ;/* Update platform specific ops */ - cnxk_eth_sec_ops.macsec_sa_create =NULL ; - cnxk_eth_sec_ops.macsec_sc_create =NULL ; - cnxk_eth_sec_ops.macsec_sa_destroy =NULL ; - cnxk_eth_sec_ops.macsec_sc_destroy =NULL ; + cnxk_eth_sec_ops.macsec_sa_create = cnxk_eth_macsec_sa_create; + cnxk_eth_sec_ops.macsec_sc_create = cnxk_eth_macsec_sc_create; + cnxk_eth_sec_ops.macsec_sa_destroy = cnxk_eth_macsec_sa_destroy; + cnxk_eth_sec_ops.macsec_sc_destroy = cnxk_eth_macsec_sc_destroy; cnxk_eth_sec_ops.session_create = cn10k_eth_sec_session_create; cnxk_eth_sec_ops.session_destroy = cn10k_eth_sec_session_destroy; cnxk_eth_sec_ops.capabilities_get = cn10k_eth_sec_capabilities_get;
drivers/net/cnxk/cnxk_ethdev_mcs.c +253 -0
259 lines not on this page · raw message
drivers/net/cnxk/cnxk_ethdev_mcs.h +16 -0
@@ -16,6 +16,14 @@ struct cnxk_mcs_dev {uint8_t idx; }; +enum cnxk_mcs_rsrc_type { +CNXK_MCS_RSRC_TYPE_FLOWID , +CNXK_MCS_RSRC_TYPE_SECY , +CNXK_MCS_RSRC_TYPE_SC , +CNXK_MCS_RSRC_TYPE_SA , +CNXK_MCS_RSRC_TYPE_PORT , +}; +struct cnxk_mcs_event_data {/* Valid for below events * - ROC_MCS_EVENT_RX_SA_PN_SOFT_EXP
@@ -63,4 +71,12 @@ struct cnxk_mcs_event_desc { struct cnxk_mcs_event_data metadata; }; +int cnxk_eth_macsec_sa_create (void *device,struct rte_security_macsec_sa *conf); +int cnxk_eth_macsec_sc_create (void *device,struct rte_security_macsec_sc *conf); + +int cnxk_eth_macsec_sa_destroy (void *device,uint16_t sa_id, +enum rte_security_macsec_direction dir); +int cnxk_eth_macsec_sc_destroy (void *device,uint16_t sc_id, +enum rte_security_macsec_direction dir); +#endif /* CNXK_ETHDEV_MCS_H */
Signature · 1 line
2.25.1
PATCH v5 14/15 net/cnxk: add MACsec session and flow configuration
In reply to Akhil GoyalAdded support for MACsec session/flow create/destroy.
--- drivers/net/cnxk/cn10k_ethdev_sec.c | 11 +- drivers/net/cnxk/cn10k_flow.c | 23 ++- drivers/net/cnxk/cnxk_ethdev.c | 2 + drivers/net/cnxk/cnxk_ethdev.h | 16 ++ drivers/net/cnxk/cnxk_ethdev_mcs.c | 262 ++++++++++++++++++++++++++++ drivers/net/cnxk/cnxk_ethdev_mcs.h | 25 +++ drivers/net/cnxk/cnxk_ethdev_sec.c | 2 +- drivers/net/cnxk/cnxk_flow.c | 5 + 8 files changed, 342 insertions(+), 4 deletions(-)
drivers/net/cnxk/cn10k_ethdev_sec.c +9 -2
@@ -642,7 +642,9 @@ cn10k_eth_sec_session_create(void *device,if (conf->action_type !=RTE_SECURITY_ACTION_TYPE_INLINE_PROTOCOL )return -ENOTSUP ; -if (conf->protocol !=RTE_SECURITY_PROTOCOL_IPSEC ) +if (conf->protocol ==RTE_SECURITY_PROTOCOL_MACSEC ) +return cnxk_eth_macsec_session_create (dev, conf, sess); +else if (conf->protocol !=RTE_SECURITY_PROTOCOL_IPSEC )return -ENOTSUP ;if (rte_security_dynfield_register () <0 )
@@ -887,13 +889,18 @@ cn10k_eth_sec_session_destroy(void *device, struct rte_security_session *sess) {struct rte_eth_dev *eth_dev = (struct rte_eth_dev *)device;struct cnxk_eth_dev *dev =cnxk_eth_pmd_priv (eth_dev); +struct cnxk_macsec_sess *macsec_sess;struct cnxk_eth_sec_sess *eth_sec;rte_spinlock_t *lock;void *sa_dptr; eth_sec =cnxk_eth_sec_sess_get_by_sess (dev, sess); -if (!eth_sec) +if (!eth_sec) { + macsec_sess =cnxk_eth_macsec_sess_get_by_sess (dev, sess); +if (macsec_sess) +return cnxk_eth_macsec_session_destroy (dev, sess);return -ENOENT ; + } lock = eth_sec->inb ? &dev->inb.lock : &dev->outb.lock;rte_spinlock_lock (lock);
drivers/net/cnxk/cn10k_flow.c +22 -1
@@ -1,10 +1,11 @@/* SPDX-License-Identifier: BSD-3-Clause * Copyright(C) 2020 Marvell. */ -#include <cnxk_flow.h> #include "cn10k_flow.h" #include "cn10k_ethdev.h" #include "cn10k_rx.h" +#include "cnxk_ethdev_mcs.h" +#include <cnxk_flow.h> static int cn10k_mtr_connect (struct rte_eth_dev *eth_dev,uint32_t mtr_id)
@@ -133,6 +134,7 @@ cn10k_flow_create(struct rte_eth_dev *eth_dev, const struct rte_flow_attr *attr,const struct rte_flow_action *act_q =NULL ;struct roc_npc *npc = &dev->npc;struct roc_npc_flow *flow; +void *mcs_flow =NULL ;int vtag_actions =0 ;uint32_t req_act =0 ;int mark_actions;
@@ -187,6 +189,17 @@ cn10k_flow_create(struct rte_eth_dev *eth_dev, const struct rte_flow_attr *attr, } } +if (actions[0 ].type ==RTE_FLOW_ACTION_TYPE_SECURITY && +cnxk_eth_macsec_sess_get_by_sess (dev, actions[0 ].conf) !=NULL ) { + rc =cnxk_mcs_flow_configure (eth_dev, attr, pattern, actions, error, &mcs_flow); +if (rc) { +rte_flow_error_set (error, rc,RTE_FLOW_ERROR_TYPE_ACTION ,NULL , +"Failed to configure mcs flow" ); +return NULL ; + } +return (struct rte_flow *)mcs_flow; + } + flow =cnxk_flow_create (eth_dev, attr, pattern, actions, error);if (!flow) {if (mtr)
@@ -265,6 +278,14 @@ cn10k_flow_destroy(struct rte_eth_dev *eth_dev, struct rte_flow *rte_flow, } } +if (cnxk_eth_macsec_sess_get_by_sess (dev, (void *)flow) !=NULL ) { + rc =cnxk_mcs_flow_destroy (dev, (void *)flow); +if (rc <0 ) +rte_flow_error_set (error, rc,RTE_FLOW_ERROR_TYPE_UNSPECIFIED , +NULL ,"Failed to free mcs flow" ); +return rc; + } + mtr_id = flow->mtr_id; rc =cnxk_flow_destroy (eth_dev, flow, error);if (!rc && mtr_id !=ROC_NIX_MTR_ID_INVALID ) {
drivers/net/cnxk/cnxk_ethdev.c +2 -0
@@ -1969,6 +1969,8 @@ cnxk_eth_dev_init(struct rte_eth_dev *eth_dev) } dev->rx_offload_capa |=RTE_ETH_RX_OFFLOAD_MACSEC_STRIP ; dev->tx_offload_capa |=RTE_ETH_TX_OFFLOAD_MACSEC_INSERT ; + +TAILQ_INIT (&dev->mcs_list); } plt_nix_dbg("Port=%d pf=%d vf=%d ver=%s hwcap=0x%" PRIx64
drivers/net/cnxk/cnxk_ethdev.h +16 -0
@@ -292,6 +292,21 @@ struct cnxk_eth_dev_sec_outb {uint64_t cpt_eng_caps; }; +/* MACsec session private data */ +struct cnxk_macsec_sess { +/* List entry */ +TAILQ_ENTRY (cnxk_macsec_sess) entry; + +/* Back pointer to session */ +struct rte_security_session *sess; +enum mcs_direction dir; +uint64_t sci; +uint8_t secy_id; +uint8_t sc_id; +uint8_t flow_id; +}; +TAILQ_HEAD (cnxk_macsec_sess_list, cnxk_macsec_sess); +struct cnxk_eth_dev {/* ROC NIX */ struct roc_nix nix;
@@ -398,6 +413,7 @@ struct cnxk_eth_dev {/* MCS device */ struct cnxk_mcs_dev *mcs_dev; +struct cnxk_macsec_sess_list mcs_list; };struct cnxk_eth_rxq_sp {
drivers/net/cnxk/cnxk_ethdev_mcs.c +262 -0
268 lines not on this page · raw message
drivers/net/cnxk/cnxk_ethdev_mcs.h +25 -0
@@ -24,6 +24,27 @@ enum cnxk_mcs_rsrc_type { CNXK_MCS_RSRC_TYPE_PORT, }; +struct cnxk_mcs_flow_opts { +uint32_t outer_tag_id; +/**< {VLAN_ID[11:0]}, or 20-bit MPLS label*/ +uint8_t outer_priority; +/**< {PCP/Pbits, DE/CFI} or {1'b0, EXP} for MPLS.*/ +uint32_t second_outer_tag_id; +/**< {VLAN_ID[11:0]}, or 20-bit MPLS label*/ +uint8_t second_outer_priority; +/**< {PCP/Pbits, DE/CFI} or {1'b0, EXP} for MPLS. */ +uint16_t bonus_data; +/**< 2 bytes of additional bonus data extracted from one of the custom tags*/ +uint8_t tag_match_bitmap; +uint8_t packet_type; +uint8_t outer_vlan_type; +uint8_t inner_vlan_type; +uint8_t num_tags; +bool express; +uint8_t lmac_id; +uint8_t flowid_user; +}; +struct cnxk_mcs_event_data {/* Valid for below events * - ROC_MCS_EVENT_RX_SA_PN_SOFT_EXP
@@ -79,4 +100,8 @@ int cnxk_eth_macsec_sa_destroy(void *device, uint16_t sa_id,int cnxk_eth_macsec_sc_destroy (void *device,uint16_t sc_id,enum rte_security_macsec_direction dir); +int cnxk_eth_macsec_session_create (struct cnxk_eth_dev *dev,struct rte_security_session_conf *conf, +struct rte_security_session *sess); +int cnxk_eth_macsec_session_destroy (struct cnxk_eth_dev *dev,struct rte_security_session *sess); +#endif /* CNXK_ETHDEV_MCS_H */
drivers/net/cnxk/cnxk_ethdev_sec.c +1 -1
@@ -284,7 +284,7 @@ cnxk_eth_sec_sess_get_by_sess(struct cnxk_eth_dev *dev,static unsigned int cnxk_eth_sec_session_get_size(void *device __rte_unused) { -return sizeof (struct cnxk_eth_sec_sess ); +return RTE_MAX (sizeof (struct cnxk_macsec_sess ),sizeof (struct cnxk_eth_sec_sess )); }struct rte_security_ops cnxk_eth_sec_ops = {
drivers/net/cnxk/cnxk_flow.c +5 -0
@@ -289,6 +289,11 @@ cnxk_flow_validate(struct rte_eth_dev *eth_dev, const struct rte_flow_attr *attruint16_t dst_pf_func =0 ;int rc; +/* Skip flow validation for MACsec. */ +if (actions[0 ].type ==RTE_FLOW_ACTION_TYPE_SECURITY && +cnxk_eth_macsec_sess_get_by_sess (dev, actions[0 ].conf) !=NULL ) +return 0 ; +memset (&flow,0 ,sizeof (flow)); flow.is_validate = true;
Signature · 1 line
2.25.1
PATCH v5 15/15 net/cnxk: add MACsec stats
In reply to Akhil GoyalAdded support for MACsec SC/flow/session stats.
--- doc/guides/rel_notes/release_23_07.rst | 10 ++-- drivers/net/cnxk/cn10k_ethdev_sec.c | 11 +++-- drivers/net/cnxk/cnxk_ethdev_mcs.c | 64 ++++++++++++++++++++++++++ drivers/net/cnxk/cnxk_ethdev_mcs.h | 9 ++++ 4 files changed, 87 insertions(+), 7 deletions(-)
doc/guides/rel_notes/release_23_07.rst +6 -4
@@ -139,6 +139,12 @@ New Features for new capability registers, large passthrough BAR and some performance enhancements for UPT. +* **Updated Marvell cnxk ethdev driver.** + + * Extended ``RTE_FLOW_ACTION_TYPE_PORT_ID`` to redirect traffic across PF ports. + * Added support for Inline MACsec processing using rte_security framework + for CN103 platform. + * **Added new algorithms to cryptodev.** * Added asymmetric algorithm ShangMi 2 (SM2) along with prime field curve support.
@@ -155,10 +161,6 @@ New Features * Added support for SM3 hash operations. * Added support for AES-CCM in cn9k and cn10k drivers. -* **Updated Marvell cnxk ethdev driver.** - - * Extended ``RTE_FLOW_ACTION_TYPE_PORT_ID`` to redirect traffic across PF ports. - * **Updated OpenSSL crypto driver.** * Added SM2 algorithm support in asymmetric crypto operations.
drivers/net/cnxk/cn10k_ethdev_sec.c +8 -3
@@ -1058,12 +1058,17 @@ cn10k_eth_sec_session_stats_get(void *device, struct rte_security_session *sess, {struct rte_eth_dev *eth_dev = (struct rte_eth_dev *)device;struct cnxk_eth_dev *dev =cnxk_eth_pmd_priv (eth_dev); +struct cnxk_macsec_sess *macsec_sess;struct cnxk_eth_sec_sess *eth_sec;int rc; eth_sec =cnxk_eth_sec_sess_get_by_sess (dev, sess); -if (eth_sec ==NULL ) +if (eth_sec ==NULL ) { + macsec_sess =cnxk_eth_macsec_sess_get_by_sess (dev, sess); +if (macsec_sess) +return cnxk_eth_macsec_session_stats_get (dev, macsec_sess, stats);return -EINVAL ; + } rc =roc_nix_inl_sa_sync (&dev->nix, eth_sec->sa, eth_sec->inb,ROC_NIX_INL_SA_OP_FLUSH );
@@ -1107,6 +1112,6 @@ cn10k_eth_sec_ops_override(void) cnxk_eth_sec_ops.capabilities_get = cn10k_eth_sec_capabilities_get; cnxk_eth_sec_ops.session_update = cn10k_eth_sec_session_update; cnxk_eth_sec_ops.session_stats_get = cn10k_eth_sec_session_stats_get; - cnxk_eth_sec_ops.macsec_sc_stats_get =NULL ; - cnxk_eth_sec_ops.macsec_sa_stats_get =NULL ; + cnxk_eth_sec_ops.macsec_sc_stats_get = cnxk_eth_macsec_sc_stats_get; + cnxk_eth_sec_ops.macsec_sa_stats_get = cnxk_eth_macsec_sa_stats_get; }
drivers/net/cnxk/cnxk_ethdev_mcs.c +64 -0
70 lines not on this page · raw message
drivers/net/cnxk/cnxk_ethdev_mcs.h +9 -0
@@ -100,6 +100,15 @@ int cnxk_eth_macsec_sa_destroy(void *device, uint16_t sa_id,int cnxk_eth_macsec_sc_destroy (void *device,uint16_t sc_id,enum rte_security_macsec_direction dir); +int cnxk_eth_macsec_sa_stats_get (void *device,uint16_t sa_id, +enum rte_security_macsec_direction dir, +struct rte_security_macsec_sa_stats *stats); +int cnxk_eth_macsec_sc_stats_get (void *device,uint16_t sa_id, +enum rte_security_macsec_direction dir, +struct rte_security_macsec_sc_stats *stats); +int cnxk_eth_macsec_session_stats_get (struct cnxk_eth_dev *dev,struct cnxk_macsec_sess *sess, +struct rte_security_stats *stats); +int cnxk_eth_macsec_session_create (struct cnxk_eth_dev *dev,struct rte_security_session_conf *conf,struct rte_security_session *sess);int cnxk_eth_macsec_session_destroy (struct cnxk_eth_dev *dev,struct rte_security_session *sess);
Signature · 1 line
2.25.1
Re: [PATCH v5 15/15] net/cnxk: add MACsec stats
Quoted 4 lines · Akhil Goyal
Added support for MACsec SC/flow/session stats.
Signed-off-by Akhil Goyal <[email protected]>
Series applied to dpdk-next-net-mrvl/for-next-net. Thanks
Quoted 165 lines
--- doc/guides/rel_notes/release_23_07.rst | 10 ++-- drivers/net/cnxk/cn10k_ethdev_sec.c | 11 +++-- drivers/net/cnxk/cnxk_ethdev_mcs.c | 64 ++++++++++++++++++++++++++ drivers/net/cnxk/cnxk_ethdev_mcs.h | 9 ++++ 4 files changed, 87 insertions(+), 7 deletions(-)doc/guides/rel_notes/release_23_07.rst +6
-4@@ -139,6 +139,12 @@ New Features for new capability registers, large passthrough BAR and some performance enhancements for UPT. +* **Updated Marvell cnxk ethdev driver.** + + * Extended ``RTE_FLOW_ACTION_TYPE_PORT_ID`` to redirect traffic across PF ports. + * Added support for Inline MACsec processing using rte_security framework + for CN103 platform. + * **Added new algorithms to cryptodev.** * Added asymmetric algorithm ShangMi 2 (SM2) along with prime field curve support.@@ -155,10 +161,6 @@ New Features * Added support for SM3 hash operations. * Added support for AES-CCM in cn9k and cn10k drivers. -* **Updated Marvell cnxk ethdev driver.** - - * Extended ``RTE_FLOW_ACTION_TYPE_PORT_ID`` to redirect traffic across PF ports. - * **Updated OpenSSL crypto driver.** * Added SM2 algorithm support in asymmetric crypto operations.drivers/net/cnxk/cn10k_ethdev_sec.c +8
-3@@ -1058,12 +1058,17 @@ cn10k_eth_sec_session_stats_get(void *device, struct rte_security_session *sess, {struct rte_eth_dev *eth_dev = (struct rte_eth_dev *)device;struct cnxk_eth_dev *dev =cnxk_eth_pmd_priv (eth_dev); +struct cnxk_macsec_sess *macsec_sess;struct cnxk_eth_sec_sess *eth_sec;int rc; eth_sec =cnxk_eth_sec_sess_get_by_sess (dev, sess); -if (eth_sec ==NULL ) +if (eth_sec ==NULL ) { + macsec_sess =cnxk_eth_macsec_sess_get_by_sess (dev, sess); +if (macsec_sess) +return cnxk_eth_macsec_session_stats_get (dev, macsec_sess, stats);return -EINVAL ; + } rc =roc_nix_inl_sa_sync (&dev->nix, eth_sec->sa, eth_sec->inb,ROC_NIX_INL_SA_OP_FLUSH );@@ -1107,6 +1112,6 @@ cn10k_eth_sec_ops_override(void) cnxk_eth_sec_ops.capabilities_get = cn10k_eth_sec_capabilities_get; cnxk_eth_sec_ops.session_update = cn10k_eth_sec_session_update; cnxk_eth_sec_ops.session_stats_get = cn10k_eth_sec_session_stats_get; - cnxk_eth_sec_ops.macsec_sc_stats_get =NULL ; - cnxk_eth_sec_ops.macsec_sa_stats_get =NULL ; + cnxk_eth_sec_ops.macsec_sc_stats_get = cnxk_eth_macsec_sc_stats_get; + cnxk_eth_sec_ops.macsec_sa_stats_get = cnxk_eth_macsec_sa_stats_get; }drivers/net/cnxk/cnxk_ethdev_mcs.c +64
-0@@ -521,6 +521,70 @@ cnxk_mcs_flow_destroy(struct cnxk_eth_dev *dev, void *flow)return ret; } +int +cnxk_eth_macsec_sa_stats_get (void *device,uint16_t sa_id,enum rte_security_macsec_direction dir, +struct rte_security_macsec_sa_stats *stats) +{ +RTE_SET_USED (device); +RTE_SET_USED (sa_id); +RTE_SET_USED (dir); +RTE_SET_USED (stats); + +return 0 ; +} + +int +cnxk_eth_macsec_sc_stats_get (void *device,uint16_t sc_id,enum rte_security_macsec_direction dir, +struct rte_security_macsec_sc_stats *stats) +{ +struct rte_eth_dev *eth_dev = (struct rte_eth_dev *)device; +struct cnxk_eth_dev *dev =cnxk_eth_pmd_priv (eth_dev); +struct cnxk_mcs_dev *mcs_dev = dev->mcs_dev; +struct roc_mcs_stats_req req = {0 }; + +if (!roc_feature_nix_has_macsec ()) +return -ENOTSUP ; + + req.id = sc_id; + req.dir = (dir ==RTE_SECURITY_MACSEC_DIR_RX ) ?MCS_RX :MCS_TX ; + +return roc_mcs_sc_stats_get (mcs_dev->mdev, &req, (struct roc_mcs_sc_stats *)stats); +} + +int +cnxk_eth_macsec_session_stats_get (struct cnxk_eth_dev *dev,struct cnxk_macsec_sess *sess, +struct rte_security_stats *stats) +{ +struct cnxk_mcs_dev *mcs_dev = dev->mcs_dev; +struct roc_mcs_flowid_stats flow_stats = {0 }; +struct roc_mcs_port_stats port_stats = {0 }; +struct roc_mcs_stats_req req = {0 }; + +if (!roc_feature_nix_has_macsec ()) +return -ENOTSUP ; + + req.id = sess->flow_id; + req.dir = sess->dir; +roc_mcs_flowid_stats_get (mcs_dev->mdev, &req, &flow_stats); +plt_nix_dbg ("\n******* FLOW_ID IDX[%u] STATS dir: %u********\n" , sess->flow_id, sess->dir); +plt_nix_dbg ("TX: tcam_hit_cnt: 0x%" PRIx64"\n" , flow_stats.tcam_hit_cnt); + + req.id = mcs_dev->port_id; + req.dir = sess->dir; +roc_mcs_port_stats_get (mcs_dev->mdev, &req, &port_stats); +plt_nix_dbg ("\n********** PORT[0] STATS ****************\n" ); +plt_nix_dbg ("RX tcam_miss_cnt: 0x%" PRIx64"\n" , port_stats.tcam_miss_cnt); +plt_nix_dbg ("RX parser_err_cnt: 0x%" PRIx64"\n" , port_stats.parser_err_cnt); +plt_nix_dbg ("RX preempt_err_cnt: 0x%" PRIx64"\n" , port_stats.preempt_err_cnt); +plt_nix_dbg ("RX sectag_insert_err_cnt: 0x%" PRIx64"\n" , port_stats.sectag_insert_err_cnt); + + req.id = sess->secy_id; + req.dir = sess->dir; + +return roc_mcs_secy_stats_get (mcs_dev->mdev, &req, + (struct roc_mcs_secy_stats *)(&stats->macsec)); +} +static int cnxk_mcs_event_cb (void *userdata,struct roc_mcs_event_desc *desc,void *cb_arg) {drivers/net/cnxk/cnxk_ethdev_mcs.h +9
-1@@ -100,6 +100,15 @@ int cnxk_eth_macsec_sa_destroy(void *device, uint16_t sa_id,int cnxk_eth_macsec_sc_destroy (void *device,uint16_t sc_id,enum rte_security_macsec_direction dir); +int cnxk_eth_macsec_sa_stats_get (void *device,uint16_t sa_id, +enum rte_security_macsec_direction dir, +struct rte_security_macsec_sa_stats *stats); +int cnxk_eth_macsec_sc_stats_get (void *device,uint16_t sa_id, +enum rte_security_macsec_direction dir, +struct rte_security_macsec_sc_stats *stats); +int cnxk_eth_macsec_session_stats_get (struct cnxk_eth_dev *dev,struct cnxk_macsec_sess *sess, +struct rte_security_stats *stats); +int cnxk_eth_macsec_session_create (struct cnxk_eth_dev *dev,struct rte_security_session_conf *conf,struct rte_security_session *sess);int cnxk_eth_macsec_session_destroy (struct cnxk_eth_dev *dev,struct rte_security_session *sess); --2.25.1
Quoted 20 lines
Subject: [PATCH v2 0/3] security: support MACsec
Added support for MACsec in
rte_securityfor offloading MACsec Protocol operation to inline NIC device or a crypto device.To support MACsec we cannot just make one security session and send with the packet to process it. MACsec specifications suggest, it can have 3 different entities - SECY Entity, SC(secure channel) and SA(security association). And same SA can be used by multiple SCs and similarly many SECY can have same SCs. Hence, in order to support this many to one relationships between all entities, 2 new APIs are created -
rte_security_macsec_sc_createandrte_security_sa_create. Flow of execution of the APIs would be as
-rte_security_macsec_sa_create
-rte_security_macsec_sc_create
-rte_security_session_create(for secy)
And in case of inline protocol processingrte_flowcan be created withrte_securityaction similar to IPsec flows except that the flow item will be MACsec instead of IPsec.
Quoted 7 lines
A new flow item is added for MACsec header and a set of events are added to specify the errors occurred during inline protocol processing.
New APIs are also created for getting SC and SA stats.
Patches for PMD implementation and test app are submitted separately which can be separately applied after RC1.
WIP Patches are sent to support this series to be merged in RC1.
http://patches.dpdk.org/project/dpdk/list/?series=24879
Quoted 30 lines
Changes in v2:
- Incorporated comments from Olivier except the one to splittci_aninto bitfields.
- added release notes and removed deprecation notice.
- added some missing fields inrte_securitypatch.Akhil Goyal (3):
net: add MACsec header
ethdev: add MACsec flow item
security: support MACsecdoc/api/doxy-api-index.md | 3 +- doc/guides/prog_guide/rte_security.rst | 107 ++++++- doc/guides/rel_notes/deprecation.rst | 5 - doc/guides/rel_notes/release_22_11.rst | 10 + lib/ethdev/rte_ethdev.h | 55 ++++ lib/ethdev/rte_flow.h | 18 ++ lib/net/meson.build | 1 + lib/net/rte_macsec.h | 61 ++++ lib/security/rte_security.c | 86 ++++++ lib/security/rte_security.h | 370 ++++++++++++++++++++++++- lib/security/rte_security_driver.h | 86 ++++++ lib/security/version.map | 6 + 12 files changed, 789 insertions(+), 19 deletions(-) create mode 100644 lib/net/rte_macsec.h--
2.25.1
v3 cover security: support MACsec
In reply to Akhil GoyalAdded support for MACsec in rte_security for offloading MACsec Protocol operation to inline NIC device or a crypto device.
To support MACsec we cannot just make one security session and send with the packet to process it. MACsec specifications suggest, it can have 3 different entities - SECY Entity, SC(secure channel) and SA(security association). And same SA can be used by multiple SCs and similarly many SECY can have same SCs. Hence, in order to support this many to one relationships between all entities, 2 new APIs are created - rte_security_macsec_sc_create and rte_security_sa_create. Flow of execution of the APIs would be as
- rte_security_macsec_sa_create
- rte_security_macsec_sc_create
- rte_security_session_create(for secy)
And in case of inline protocol processing rte_flow can be created with rte_security action similar to IPsec flows except that the flow item will be MACsec instead of IPsec.
A new flow item is added for MACsec header and a set of events are added to specify the errors occurred during inline protocol processing.
New APIs are also created for getting SC and SA stats.
Patches for PMD implementation and test app are submitted separately which can be separately applied after RC1.
Changes in v3:
- fix doc build in documentation of patch 2/3
- fix checkpatch in patch 3/3
- fix comments
- fix namespace in MACsec ethdev events
Changes in v2:
- Incorporated comments from Olivier except the one to split tci_an into bitfields.
- added release notes and removed deprecation notice.
- added some missing fields in rte_security patch.
Akhil Goyal (3):
net: add MACsec header
ethdev: add MACsec flow item
security: support MACsec
doc/api/doxy-api-index.md | 3 +- doc/guides/prog_guide/rte_security.rst | 107 ++++++- doc/guides/rel_notes/deprecation.rst | 5 - doc/guides/rel_notes/release_22_11.rst | 10 + lib/ethdev/rte_ethdev.h | 76 +++++ lib/ethdev/rte_flow.h | 18 ++ lib/net/meson.build | 1 + lib/net/rte_macsec.h | 61 ++++ lib/security/rte_security.c | 86 ++++++ lib/security/rte_security.h | 370 ++++++++++++++++++++++++- lib/security/rte_security_driver.h | 86 ++++++ lib/security/version.map | 6 + 12 files changed, 810 insertions(+), 19 deletions(-) create mode 100644 lib/net/rte_macsec.h
Signature · 1 line
2.25.1
PATCH v3 1/3 net: add MACsec header
Added MACsec protocol header to be used for supporting MACsec protocol offload in hardware or directly in the application.
--- doc/api/doxy-api-index.md | 3 +- lib/net/meson.build | 1 + lib/net/rte_macsec.h | 61 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 64 insertions(+), 1 deletion(-) create mode 100644 lib/net/rte_macsec.h
doc/api/doxy-api-index.md +2 -1
@@ -126,7 +126,8 @@ The public API headers are grouped by topics: [Geneve](@ref rte_geneve.h), [eCPRI](@ref rte_ecpri.h), [L2TPv2](@ref rte_l2tpv2.h), - [PPP](@ref rte_ppp.h) + [PPP](@ref rte_ppp.h), + [MACsec](@ref rte_macsec.h) - **QoS**: [metering](@ref rte_meter.h),
lib/net/meson.build +1 -0
@@ -21,6 +21,7 @@ headers = files( 'rte_geneve.h', 'rte_l2tpv2.h', 'rte_ppp.h', + 'rte_macsec.h', ) sources = files(
lib/net/rte_macsec.h new file +61 -0
61 lines not on this page · raw message
Signature · 1 line
2.25.1
PATCH v3 2/3 ethdev: add MACsec flow item
In reply to Akhil GoyalA new flow item is defined for MACsec flows which can be offloaded to an inline device. If the flow matches with MACsec header, device will process as per the security session created using rte_security APIs.
If an error comes while MACsec processing in HW, PMD will notify with the events defined in this patch.
--- lib/ethdev/rte_ethdev.h | 76 +++++++++++++++++++++++++++++++++++++++++ lib/ethdev/rte_flow.h | 18 ++++++++++ 2 files changed, 94 insertions(+)
lib/ethdev/rte_ethdev.h +76 -0
@@ -3579,6 +3579,82 @@ rte_eth_tx_buffer_count_callback(struct rte_mbuf **pkts, uint16_t unsent,int rte_eth_tx_done_cleanup (uint16_t port_id,uint16_t queue_id,uint32_t free_cnt); +/** +* Subtypes for MACsec offload event(@ref RTE_ETH_EVENT_MACSEC) raised by +* Ethernet device. +*/ +enum rte_eth_event_macsec_subtype { +/** Notifies unknown MACsec subevent. */ +RTE_ETH_SUBEVENT_MACSEC_UNKNOWN , +/** +* Subevent of RTE_ETH_EVENT_MACSEC_SECTAG_VAL_ERR sectag validation events +* Validation check: SecTag.TCI.V = 1 +*/ +RTE_ETH_SUBEVENT_MACSEC_RX_SECTAG_V_EQ1 , +/** +* Subevent of RTE_ETH_EVENT_MACSEC_SECTAG_VAL_ERR sectag validation events +* Validation check: SecTag.TCI.E = 0 && SecTag.TCI.C = 1 +*/ +RTE_ETH_SUBEVENT_MACSEC_RX_SECTAG_E_EQ0_C_EQ1 , +/** +* Subevent of RTE_ETH_EVENT_MACSEC_SECTAG_VAL_ERR sectag validation events +* Validation check: SecTag.SL >= 'd48 +*/ +RTE_ETH_SUBEVENT_MACSEC_RX_SECTAG_SL_GTE48 , +/** +* Subevent of RTE_ETH_EVENT_MACSEC_SECTAG_VAL_ERR sectag validation events +* Validation check: SecTag.TCI.ES = 1 && SecTag.TCI.SC = 1 +*/ +RTE_ETH_SUBEVENT_MACSEC_RX_SECTAG_ES_EQ1_SC_EQ1 , +/** +* Subevent of RTE_ETH_EVENT_MACSEC_SECTAG_VAL_ERR sectag validation events +* Validation check: SecTag.TCI.SC = 1 && SecTag.TCI.SCB = 1 +*/ +RTE_ETH_SUBEVENT_MACSEC_RX_SECTAG_SC_EQ1_SCB_EQ1 , +}; + +/** +* Event types for MACsec offload event(@ref RTE_ETH_EVENT_MACSEC) raised by +* eth device. +*/ +enum rte_eth_event_macsec_type { +/** Notifies unknown MACsec event. */ +RTE_ETH_EVENT_MACSEC_UNKNOWN , +/** Notifies Sectag validation failure events. */ +RTE_ETH_EVENT_MACSEC_SECTAG_VAL_ERR , +/** Notifies Rx SA hard expiry events. */ +RTE_ETH_EVENT_MACSEC_RX_SA_PN_HARD_EXP , +/** Notifies Rx SA soft expiry events. */ +RTE_ETH_EVENT_MACSEC_RX_SA_PN_SOFT_EXP , +/** Notifies Tx SA hard expiry events. */ +RTE_ETH_EVENT_MACSEC_TX_SA_PN_HARD_EXP , +/** Notifies Tx SA soft events. */ +RTE_ETH_EVENT_MACSEC_TX_SA_PN_SOFT_EXP , +/** Notifies Invalid SA event. */ +RTE_ETH_EVENT_MACSEC_SA_NOT_VALID , +}; + +/** +* Descriptor for @ref RTE_ETH_EVENT_MACSEC event. Used by eth dev to send extra +* information of the MACsec offload event. +*/ +struct rte_eth_event_macsec_desc { +/** Type of RTE_ETH_EVENT_MACSEC_* event. */ +enum rte_eth_event_macsec_type type; +/** Type of RTE_ETH_SUBEVENT_MACSEC_* subevent. */ +enum rte_eth_event_macsec_subtype subtype; +/** +* Event specific metadata. +* +* For the following events, *userdata* registered +* with the *rte_security_session* would be returned +* as metadata, +* +* @see struct rte_security_session_conf. +*/ +uint64_t metadata; +}; +/** * Subtypes for IPsec offload event(@ref RTE_ETH_EVENT_IPSEC) raised by * eth device.
lib/ethdev/rte_flow.h +18 -0
@@ -35,6 +35,7 @@#include <rte_l2tpv2.h> #include <rte_ppp.h> #include <rte_gre.h> +#include <rte_macsec.h> #ifdef __cplusplusextern "C" {
@@ -626,6 +627,13 @@ enum rte_flow_item_type {* See struct rte_flow_item_gre_opt. */ RTE_FLOW_ITEM_TYPE_GRE_OPTION , + +/** +* Matches MACsec Ethernet Header. +* +* See struct rte_flow_item_macsec. +*/ + RTE_FLOW_ITEM_TYPE_MACSEC, };/**
@@ -1099,6 +1107,16 @@ struct rte_flow_item_gre_opt {struct rte_gre_hdr_opt_sequence sequence; }; +/** +* RTE_FLOW_ITEM_TYPE_MACSEC. +* +* Matches MACsec header. +*/ +struct rte_flow_item_macsec { +struct rte_macsec_hdr macsec_hdr; +}; + +/** * RTE_FLOW_ITEM_TYPE_FUZZY *
Signature · 1 line
2.25.1
PATCH v3 3/3 security: support MACsec
In reply to Akhil GoyalAdded support for MACsec in rte_security for offloading MACsec Protocol operation to inline NIC device or a crypto device.
To support MACsec we cannot just make one security session and send with the packet to process it. MACsec specifications suggest, it has 3 different entities - SECY Entity, SC (secure channel) and SA (security association). And same SA can be used by multiple SCs and similarly many SECY can have same SCs. Hence, in order to support this many to one relationships between all entities, 2 new APIs are created - rte_security_macsec_sc_create and rte_security_macsec_sa_create. Flow of execution of the APIs would be as
- rte_security_macsec_sa_create
- rte_security_macsec_sc_create
- rte_security_session_create (for secy)
And in case of inline protocol processing rte_flow can be created with rte_security action. A new flow item will be added for MACsec header. New APIs are also created for getting SC and SA stats.
--- doc/guides/prog_guide/rte_security.rst | 107 ++++++- doc/guides/rel_notes/deprecation.rst | 5 - doc/guides/rel_notes/release_22_11.rst | 10 + lib/security/rte_security.c | 86 ++++++ lib/security/rte_security.h | 370 ++++++++++++++++++++++++- lib/security/rte_security_driver.h | 86 ++++++ lib/security/version.map | 6 + 7 files changed, 652 insertions(+), 18 deletions(-)
doc/guides/prog_guide/rte_security.rst +102 -5
@@ -347,6 +347,55 @@ The CRC is Ethernet CRC-32 as specified in Ethernet/[ISO/IEC 8802-3]. * Other DOCSIS protocol functionality such as Header Checksum (HCS) calculation may be added in the future. +MACSEC Protocol +~~~~~~~~~~~~~~~ + +Media Access Control security (MACsec) provides point-to-point security on Ethernet +links and is defined by IEEE standard 802.1AE. MACsec secures an Ethernet link for +almost all traffic, including frames from the Link Layer Discovery Protocol (LLDP), +Link Aggregation Control Protocol (LACP), Dynamic Host Configuration Protocol (DHCP), +Address Resolution Protocol (ARP), and other protocols that are not typically secured +on an Ethernet link because of limitations with other security solutions. + +.. code-block:: c + + Receive Transmit + ------- -------- + + Ethernet frame Ethernet frame + from network towards network + | ^ + ~ | + | ~ + V | + +-----------------------+ +------------------+ +-------------------------+ + | Secure frame verify | | Cipher Suite(SA) | | Secure Frame Generation | + +-----------------------+<-----+------------------+----->+-------------------------+ + | SecTAG + ICV remove | | SECY | SC | | SecTAG + ICV Added | + +---+-------------------+ +------------------+ +-------------------------+ + | ^ + | | + V | + Packet to Core/App Packet from core/App + + + +To configure MACsec on an inline NIC device or a lookaside crypto device, a security +association (SA) and a secure channel (SC) are created before creating rte_security +session. + +SA is created using API ``rte_security_macsec_sa_create`` which allows setting +SA keys, salt, SSCI, packet number (PN) into the PMD and the API returns a handle +which can be used to map it with a secure channel using the API +``rte_security_macsec_sc_create``. Same SAs can be used for multiple SCs. +The Rx SC will need a set of 4 SAs for each of the association numbers (AN). +For Tx SC a single SA is set which will be used by hardware to process the packet. + +The API ``rte_security_macsec_sc_create`` returns a handle for SC and this handle +is set in ``rte_security_macsec_xform`` to create a MACsec session using +``rte_security_session_create``. + + Device Features and Capabilities ---------------------------------
@@ -519,6 +568,35 @@ protocol. RTE_CRYPTODEV_END_OF_CAPABILITIES_LIST() }; +Below is the example PMD capability for MACsec + +.. code-block:: c + + static const struct rte_security_capability pmd_security_capabilities[] = { + { + .action = RTE_SECURITY_ACTION_TYPE_INLINE_PROTOCOL, + .protocol = RTE_SECURITY_PROTOCOL_MACSEC, + .macsec = { + .mtu = 1500, + .alg = RTE_SECURITY_MACSEC_ALG_GCM_128, + .max_nb_sc = 64, + .max_nb_sa = 128, + .max_nb_sess = 64, + .replay_win_sz = 4096, + .relative_sectag_insert = 1, + .fixed_sectag_insert = 1, + .icv_include_da_sa = 1, + .ctrl_port_enable = 1, + .preserve_sectag = 1, + .preserve_icv = 1, + .validate_frames = 1, + .re_key = 1, + .anti_replay = 1, + }, + .crypto_capabilities = NULL, + }, + }; + Capabilities Discovery ~~~~~~~~~~~~~~~~~~~~~~
@@ -658,6 +736,8 @@ which will be updated in the future. IPsec related configuration parameters are defined in ``rte_security_ipsec_xform`` +MACsec related configuration parameters are defined in ``rte_security_macsec_xform`` + PDCP related configuration parameters are defined in ``rte_security_pdcp_xform`` DOCSIS related configuration parameters are defined in ``rte_security_docsis_xform``
@@ -679,7 +759,7 @@ The ingress/egress flow attribute should match that specified in the security session if the security session supports the definition of the direction. Multiple flows can be configured to use the same security session. For -example if the security session specifies an egress IPsec SA, then multiple +example if the security session specifies an egress IPsec/MACsec SA, then multiple flows can be specified to that SA. In the case of an ingress IPsec SA then it is only valid to have a single flow to map to that security session.
@@ -689,8 +769,8 @@ it is only valid to have a single flow to map to that security session. | +--------|--------+ | Add/Remove | - | IPsec SA | <------ Build security flow action of - | | | ipsec transform + | IPsec/MACsec SA | <------ Build security flow action of + | | | IPsec/MACsec transform |--------|--------| | +--------V--------+
@@ -709,9 +789,9 @@ it is only valid to have a single flow to map to that security session. | | +--------|--------+ -* Add/Delete SA flow: +* Add/Delete IPsec SA flow: To add a new inline SA construct a rte_flow_item for Ethernet + IP + ESP - using the SA selectors and the ``rte_crypto_ipsec_xform`` as the ``rte_flow_action``. + using the SA selectors and the ``rte_security_ipsec_xform`` as the ``rte_flow_action``. Note that any rte_flow_items may be empty, which means it is not checked. .. code-block:: console
@@ -726,6 +806,23 @@ it is only valid to have a single flow to map to that security session. | Eth | -> ... -> | ESP | -> | END | +-------+ +--------+ +-----+ +* Add/Delete MACsec SA flow: + To add a new inline SA construct a rte_flow_item for Ethernet + SecTAG + using the SA selectors and the ``rte_security_macsec_xform`` as the ``rte_flow_action``. + Note that any rte_flow_items may be empty, which means it is not checked. + +.. code-block:: console + + In its most basic form, MACsec flow specification is as follows: + +-------+ +----------+ +-----+ + | Eth | -> | SecTag | -> | END | + +-------+ +----------+ +-----+ + + However, the API can represent, MACsec offload with any encapsulation: + +-------+ +--------+ +-----+ + | Eth | -> ... -> | SecTag | -> | END | + +-------+ +--------+ +-----+ + Telemetry support -----------------
doc/guides/rel_notes/deprecation.rst +0 -5
@@ -151,11 +151,6 @@ Deprecation Notices pointer for the private data to the application which can be attached to the packet while enqueuing. -* security: MACsec support is planned to be added in DPDK 22.11, - which would result in updates to structures ``rte_security_macsec_xform``, - ``rte_security_macsec_stats`` and security capability structure - ``rte_security_capability`` to accommodate MACsec capabilities. - * eventdev: The function ``rte_event_crypto_adapter_queue_pair_add`` will accept configuration of type ``rte_event_crypto_adapter_queue_conf`` instead of ``rte_event``, similar to ``rte_event_eth_rx_adapter_queue_add`` signature.
doc/guides/rel_notes/release_22_11.rst +10 -0
@@ -72,6 +72,11 @@ New Features * Added AES-CCM support in lookaside protocol (IPsec) for CN9K & CN10K. * Added AES & DES DOCSIS algorithm support in lookaside crypto for CN9K. +* **Added support for MACsec in rte_security.** + + * Added MACsec transform for rte_security session and added new APIs to configure + security associations (SA) and secure channels (SC). + * **Added eventdev adapter instance get API.** * Added ``rte_event_eth_rx_adapter_instance_get`` to get Rx adapter
@@ -209,6 +214,11 @@ API Changes * ethdev: Promoted ``rte_flow_pick_transfer_proxy()`` from experimental to stable. +* security: MACsec support is added which resulted in updates to + structures ``rte_security_macsec_xform``, ``rte_security_macsec_stats`` + and security capability structure ``rte_security_capability`` to + accommodate MACsec capabilities. + * telemetry: The allowed characters in names for dictionary values are now limited to alphanumeric characters and a small subset of additional printable characters.
lib/security/rte_security.c +86 -0
92 lines not on this page · raw message
lib/security/rte_security.h +362 -8
422 lines not on this page · raw message
lib/security/rte_security_driver.h +86 -0
104 lines not on this page · raw message
lib/security/version.map +6 -0
@@ -15,6 +15,12 @@ EXPERIMENTAL { __rte_security_set_pkt_metadata; rte_security_dynfield_offset; + rte_security_macsec_sa_create; + rte_security_macsec_sa_destroy; + rte_security_macsec_sa_stats_get; + rte_security_macsec_sc_create; + rte_security_macsec_sc_destroy; + rte_security_macsec_sc_stats_get; rte_security_session_stats_get; rte_security_session_update; };
Signature · 1 line
2.25.1
Quoted 4 lines
Akhil Goyal (3):
net: add MACsec header
ethdev: add MACsec flow item
security: support MACsec
Applied with some formatting changes, thanks.