cxgb4/chcr: Enable ktls settings at run time
Subsystems (5)
PATCH v4 1/1 cxgb4/chcr: Enable ktls settings at run time
Current design enables ktls setting from start, which is not efficient. Now the feature will be enabled when user demands TLS offload on any interface.
v1->v2:
- taking ULD module refcount till any single connection exists.
- taking rtnl_lock() before clearing tls_devops.
v2->v3:
- cxgb4 is now registering to tlsdev_ops.
- module refcount inc/dec in chcr.
- refcount is only for connections.
- removed new code from cxgb_set_feature().
v3->v4:
- fixed warning message.
--- drivers/crypto/chelsio/chcr_core.c | 23 +++-- drivers/crypto/chelsio/chcr_core.h | 10 ++- drivers/crypto/chelsio/chcr_ktls.c | 59 ++++--------- drivers/crypto/chelsio/chcr_ktls.h | 9 +- drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 4 + .../ethernet/chelsio/cxgb4/cxgb4_debugfs.c | 2 + .../net/ethernet/chelsio/cxgb4/cxgb4_main.c | 85 ++++++++++++++++++- .../net/ethernet/chelsio/cxgb4/cxgb4_uld.c | 71 +++++++++++----- .../net/ethernet/chelsio/cxgb4/cxgb4_uld.h | 7 ++ drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h | 10 ++- 10 files changed, 195 insertions(+), 85 deletions(-)
drivers/crypto/chelsio/chcr_core.c +10 -13
@@ -33,6 +33,13 @@ static int cpl_fw6_pld_handler(struct adapter *adap, unsigned char *input);static void *chcr_uld_add (const struct cxgb4_lld_info *lld);static int chcr_uld_state_change (void *handle,enum cxgb4_state state); +#if defined(CONFIG_CHELSIO_TLS_DEVICE ) +static const struct tlsdev_ops chcr_ktls_ops = { + .tls_dev_add = chcr_ktls_dev_add, + .tls_dev_del = chcr_ktls_dev_del, +}; +#endif +#ifdef CONFIG_CHELSIO_IPSEC_INLINE static void update_netdev_features (void );#endif /* CONFIG_CHELSIO_IPSEC_INLINE */
@@ -56,6 +63,9 @@ static struct cxgb4_uld_info chcr_uld_info = {#if defined(CONFIG_CHELSIO_IPSEC_INLINE ) || defined(CONFIG_CHELSIO_TLS_DEVICE ) .tx_handler = chcr_uld_tx_handler,#endif /* CONFIG_CHELSIO_IPSEC_INLINE || CONFIG_CHELSIO_TLS_DEVICE */ +#if defined(CONFIG_CHELSIO_TLS_DEVICE ) + .tlsdev_ops = &chcr_ktls_ops, +#endif };static void detach_work_fn (struct work_struct *work)
@@ -207,11 +217,6 @@ static void *chcr_uld_add(const struct cxgb4_lld_info *lld) } u_ctx->lldi = *lld;chcr_dev_init (u_ctx); - -#ifdef CONFIG_CHELSIO_TLS_DEVICE -if (lld->ulp_crypto &ULP_CRYPTO_KTLS_INLINE ) -chcr_enable_ktls (padap (&u_ctx->dev)); -#endif out:return u_ctx; }
@@ -348,20 +353,12 @@ static void __exit chcr_crypto_exit(void)list_for_each_entry_safe (u_ctx, tmp, &drv_data.act_dev, entry) { adap =padap (&u_ctx->dev);memset (&adap->chcr_stats,0 ,sizeof (adap->chcr_stats)); -#ifdef CONFIG_CHELSIO_TLS_DEVICE -if (u_ctx->lldi.ulp_crypto &ULP_CRYPTO_KTLS_INLINE ) -chcr_disable_ktls (adap); -#endif list_del (&u_ctx->entry);kfree (u_ctx); }list_for_each_entry_safe (u_ctx, tmp, &drv_data.inact_dev, entry) { adap =padap (&u_ctx->dev);memset (&adap->chcr_stats,0 ,sizeof (adap->chcr_stats)); -#ifdef CONFIG_CHELSIO_TLS_DEVICE -if (u_ctx->lldi.ulp_crypto &ULP_CRYPTO_KTLS_INLINE ) -chcr_disable_ktls (adap); -#endif list_del (&u_ctx->entry);kfree (u_ctx); }
drivers/crypto/chelsio/chcr_core.h +8 -2
@@ -37,6 +37,7 @@#define __CHCR_CORE_H__#include <crypto/algapi.h> +#include <net/tls.h> #include "t4_hw.h" #include "cxgb4.h" #include "t4_msg.h"
@@ -223,10 +224,15 @@ int chcr_handle_resp(struct crypto_async_request *req, unsigned char *input,int chcr_ipsec_xmit (struct sk_buff *skb,struct net_device *dev);void chcr_add_xfrmops (const struct cxgb4_lld_info *lld);#ifdef CONFIG_CHELSIO_TLS_DEVICE -void chcr_enable_ktls (struct adapter *adap); -void chcr_disable_ktls (struct adapter *adap);int chcr_ktls_cpl_act_open_rpl (struct adapter *adap,unsigned char *input);int chcr_ktls_cpl_set_tcb_rpl (struct adapter *adap,unsigned char *input);int chcr_ktls_xmit (struct sk_buff *skb,struct net_device *dev); +extern int chcr_ktls_dev_add (struct net_device *netdev,struct sock *sk, +enum tls_offload_ctx_dir direction, +struct tls_crypto_info *crypto_info, +u32 start_offload_tcp_sn); +extern void chcr_ktls_dev_del (struct net_device *netdev, +struct tls_context *tls_ctx, +enum tls_offload_ctx_dir direction);#endif #endif /* __CHCR_CORE_H__ */
drivers/crypto/chelsio/chcr_ktls.c +15 -44
89 lines not on this page · raw message
drivers/crypto/chelsio/chcr_ktls.h +7 -2
@@ -89,10 +89,15 @@ static inline int chcr_get_first_rx_qid(struct adapter *adap)return u_ctx->lldi.rxq_ids[0 ]; } -void chcr_enable_ktls (struct adapter *adap); -void chcr_disable_ktls (struct adapter *adap);int chcr_ktls_cpl_act_open_rpl (struct adapter *adap,unsigned char *input);int chcr_ktls_cpl_set_tcb_rpl (struct adapter *adap,unsigned char *input);int chcr_ktls_xmit (struct sk_buff *skb,struct net_device *dev); +int chcr_ktls_dev_add (struct net_device *netdev,struct sock *sk, +enum tls_offload_ctx_dir direction, +struct tls_crypto_info *crypto_info, +u32 start_offload_tcp_sn); +void chcr_ktls_dev_del (struct net_device *netdev, +struct tls_context *tls_ctx, +enum tls_offload_ctx_dir direction);#endif /* CONFIG_CHELSIO_TLS_DEVICE */ #endif /* __CHCR_KTLS_H__ */
drivers/net/ethernet/chelsio/cxgb4/cxgb4.h +4 -0
@@ -1099,6 +1099,7 @@ struct adapter {/* TC u32 offload */ struct cxgb4_tc_u32_table *tc_u32; +struct chcr_ktls chcr_ktls;struct chcr_stats_debug chcr_stats;/* TC flower offload */
@@ -2060,4 +2061,7 @@ int cxgb_open(struct net_device *dev);int cxgb_close (struct net_device *dev);void cxgb4_enable_rx (struct adapter *adap,struct sge_rspq *q);void cxgb4_quiesce_rx (struct sge_rspq *q); +#ifdef CONFIG_CHELSIO_TLS_DEVICE +int cxgb4_set_ktls_feature (struct adapter *adap,bool enable); +#endif #endif /* __CXGB4_H__ */
drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c +2 -0
@@ -3491,6 +3491,8 @@ static int chcr_stats_show(struct seq_file *seq, void *v) atomic_read(&adap->chcr_stats.tls_key));#ifdef CONFIG_CHELSIO_TLS_DEVICE seq_puts (seq,"\nChelsio KTLS Crypto Accelerator Stats\n" ); +seq_printf (seq,"Tx TLS offload refcount: %20u\n" , +refcount_read (&adap->chcr_ktls.ktls_refcount));seq_printf (seq,"Tx HW offload contexts added: %20llu\n" ,atomic64_read (&adap->chcr_stats.ktls_tx_ctx)); seq_printf(seq, "Tx connection created: %20llu\n",
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +84 -1
103 lines not on this page · raw message
drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.c +50 -21
97 lines not on this page · raw message
drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h +7 -0
@@ -268,6 +268,10 @@ struct filter_ctx {u32 tid;/* to store tid */ }; +struct chcr_ktls { +refcount_t ktls_refcount; +}; +struct ch_filter_specification ; int cxgb4_get_free_ftid(struct net_device *dev, u8 family, bool hash_en,
@@ -464,6 +468,9 @@ struct cxgb4_uld_info { struct napi_struct *napi);void (*lro_flush)(struct t4_lro_mgr *);int (*tx_handler)(struct sk_buff *skb,struct net_device *dev); +#if IS_ENABLED (CONFIG_TLS_DEVICE ) +const struct tlsdev_ops *tlsdev_ops; +#endif };void cxgb4_uld_enable (struct adapter *adap);
drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h +8 -2
@@ -1205,7 +1205,7 @@ enum fw_caps_config_crypto {FW_CAPS_CONFIG_CRYPTO_LOOKASIDE =0x00000001 ,FW_CAPS_CONFIG_TLS_INLINE =0x00000002 ,FW_CAPS_CONFIG_IPSEC_INLINE =0x00000004 , - FW_CAPS_CONFIG_TX_TLS_HW = 0x00000008, + FW_CAPS_CONFIG_TLS_HW = 0x00000008, }; enum fw_caps_config_fcoe {
@@ -1329,7 +1329,7 @@ enum fw_params_param_dev {FW_PARAMS_PARAM_DEV_DBQ_TIMERTICK =0x2A ,FW_PARAMS_PARAM_DEV_NUM_TM_CLASS =0x2B ,FW_PARAMS_PARAM_DEV_FILTER =0x2E , - FW_PARAMS_PARAM_DEV_KTLS_TX_HW = 0x31, + FW_PARAMS_PARAM_DEV_KTLS_HW = 0x31, };/*
@@ -1412,6 +1412,12 @@ enum fw_params_param_dmaq { FW_PARAMS_PARAM_DMAQ_CONM_CTXT = 0x20, }; +enum fw_params_param_dev_ktls_hw { +FW_PARAMS_PARAM_DEV_KTLS_HW_DISABLE =0x00 , +FW_PARAMS_PARAM_DEV_KTLS_HW_ENABLE =0x01 , +FW_PARAMS_PARAM_DEV_KTLS_HW_USER_ENABLE =0x01 , +}; +enum fw_params_param_dev_phyfw {FW_PARAMS_PARAM_DEV_PHYFW_DOWNLOAD =0x00 ,FW_PARAMS_PARAM_DEV_PHYFW_VERSION =0x01 ,
Signature · 1 line
2.18.1
From: Rohit Maheshwari <[email protected]>
Date: Mon, 1 Jun 2020 13:08:29 +0530
Quoted 14 lines
Current design enables ktls setting from start, which is not efficient. Now the feature will be enabled when user demands TLS offload on any interface.
v1->v2:
- taking ULD module refcount till any single connection exists.
- takingrtnl_lock()before clearingtls_devops.
v2->v3:
- cxgb4 is now registering totlsdev_ops.
- module refcount inc/dec in chcr.
- refcount is only for connections.
- removed new code fromcxgb_set_feature().
Quoted 4 lines
v3->v4:
- fixed warning message.Signed-off-by Rohit Maheshwari <[email protected]>
Applied.