Commit 6d4e4ddc authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'net-tls-separate-the-TLS-TOE-code-out' 



Jakub Kicinski says:

====================
net/tls: separate the TLS TOE code out

We have 3 modes of operation of TLS - software, crypto offload
(Mellanox, Netronome) and TCP Offload Engine-based (Chelsio).
The last one takes over the socket, like any TOE would, and
is not really compatible with how we want to do things in the
networking stack.

Confusingly the name of the crypto-only offload mode is TLS_HW,
while TOE-offload related functions use tls_hw_ as their prefix.

Engineers looking to implement offload are also be faced with
TOE artefacts like struct tls_device (while, again,
CONFIG_TLS_DEVICE actually gates the non-TOE offload).

To improve the clarity of the offload code move the TOE code
into new files, and rename the functions and structures
appropriately.

Because TOE-offload takes over the socket, and makes no use of
the TLS infrastructure in the kernel, the rest of the code
(anything beyond the ULP setup handlers) do not have to worry
about the mode == TLS_HW_RECORD case.

The increase in code size is due to duplication of the full
license boilerplate. Unfortunately original author (Dave Watson)
seems unreachable :(
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 033b2c7f 53b4414a

drivers/crypto/chelsio/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ config CHELSIO_IPSEC_INLINE 
config CRYPTO_DEV_CHELSIO_TLS

        tristate "Chelsio Crypto Inline TLS Driver"

        depends on CHELSIO_T4

        depends on TLS

        depends on TLS_TOE

        select CRYPTO_DEV_CHELSIO

        ---help---

          Support Chelsio Inline TLS with Chelsio crypto accelerator.

drivers/crypto/chelsio/chtls/chtls.h

+3 −2
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <crypto/internal/hash.h>

#include <linux/tls.h>

#include <net/tls.h>

#include <net/tls_toe.h>



#include "t4fw_api.h"

#include "t4_msg.h"
@@ -118,7 +119,7 @@ struct tls_scmd { 
};



struct chtls_dev {

	struct tls_device tlsdev;

	struct tls_toe_device tlsdev;

	struct list_head list;

	struct cxgb4_lld_info *lldi;

	struct pci_dev *pdev;
@@ -362,7 +363,7 @@ enum { 
#define TCP_PAGE(sk)   (sk->sk_frag.page)

#define TCP_OFF(sk)    (sk->sk_frag.offset)



static inline struct chtls_dev *to_chtls_dev(struct tls_device *tlsdev)

static inline struct chtls_dev *to_chtls_dev(struct tls_toe_device *tlsdev)

{

	return container_of(tlsdev, struct chtls_dev, tlsdev);

}

drivers/crypto/chelsio/chtls/chtls_main.c

+10 −10
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ static void chtls_stop_listen(struct chtls_dev *cdev, struct sock *sk) 
	mutex_unlock(&notify_mutex);

}



static int chtls_inline_feature(struct tls_device *dev)

static int chtls_inline_feature(struct tls_toe_device *dev)

{

	struct net_device *netdev;

	struct chtls_dev *cdev;
@@ -140,7 +140,7 @@ static int chtls_inline_feature(struct tls_device *dev) 
	return 0;

}



static int chtls_create_hash(struct tls_device *dev, struct sock *sk)

static int chtls_create_hash(struct tls_toe_device *dev, struct sock *sk)

{

	struct chtls_dev *cdev = to_chtls_dev(dev);
@@ -149,7 +149,7 @@ static int chtls_create_hash(struct tls_device *dev, struct sock *sk) 
	return 0;

}



static void chtls_destroy_hash(struct tls_device *dev, struct sock *sk)

static void chtls_destroy_hash(struct tls_toe_device *dev, struct sock *sk)

{

	struct chtls_dev *cdev = to_chtls_dev(dev);
@@ -161,7 +161,7 @@ static void chtls_free_uld(struct chtls_dev *cdev) 
{

	int i;



	tls_unregister_device(&cdev->tlsdev);

	tls_toe_unregister_device(&cdev->tlsdev);

	kvfree(cdev->kmap.addr);

	idr_destroy(&cdev->hwtid_idr);

	for (i = 0; i < (1 << RSPQ_HASH_BITS); i++)
@@ -173,27 +173,27 @@ static void chtls_free_uld(struct chtls_dev *cdev) 


static inline void chtls_dev_release(struct kref *kref)

{

	struct tls_toe_device *dev;

	struct chtls_dev *cdev;

	struct tls_device *dev;



	dev = container_of(kref, struct tls_device, kref);

	dev = container_of(kref, struct tls_toe_device, kref);

	cdev = to_chtls_dev(dev);

	chtls_free_uld(cdev);

}



static void chtls_register_dev(struct chtls_dev *cdev)

{

	struct tls_device *tlsdev = &cdev->tlsdev;

	struct tls_toe_device *tlsdev = &cdev->tlsdev;



	strlcpy(tlsdev->name, "chtls", TLS_DEVICE_NAME_MAX);

	strlcpy(tlsdev->name, "chtls", TLS_TOE_DEVICE_NAME_MAX);

	strlcat(tlsdev->name, cdev->lldi->ports[0]->name,

		TLS_DEVICE_NAME_MAX);

		TLS_TOE_DEVICE_NAME_MAX);

	tlsdev->feature = chtls_inline_feature;

	tlsdev->hash = chtls_create_hash;

	tlsdev->unhash = chtls_destroy_hash;

	tlsdev->release = chtls_dev_release;

	kref_init(&tlsdev->kref);

	tls_register_device(tlsdev);

	tls_toe_register_device(tlsdev);

	cdev->cdev_state = CHTLS_CDEV_STATE_UP;

}

include/net/tls.h

+3 −34
Original line number Diff line number Diff line
@@ -60,7 +60,6 @@ 
#define TLS_RECORD_TYPE_DATA		0x17



#define TLS_AAD_SPACE_SIZE		13

#define TLS_DEVICE_NAME_MAX		32



#define MAX_IV_SIZE			16

#define TLS_MAX_REC_SEQ_SIZE		8
@@ -74,37 +73,6 @@ 
 */

#define TLS_AES_CCM_IV_B0_BYTE		2



/*

 * This structure defines the routines for Inline TLS driver.

 * The following routines are optional and filled with a

 * null pointer if not defined.

 *

 * @name: Its the name of registered Inline tls device

 * @dev_list: Inline tls device list

 * int (*feature)(struct tls_device *device);

 *     Called to return Inline TLS driver capability

 *

 * int (*hash)(struct tls_device *device, struct sock *sk);

 *     This function sets Inline driver for listen and program

 *     device specific functioanlity as required

 *

 * void (*unhash)(struct tls_device *device, struct sock *sk);

 *     This function cleans listen state set by Inline TLS driver

 *

 * void (*release)(struct kref *kref);

 *     Release the registered device and allocated resources

 * @kref: Number of reference to tls_device

 */

struct tls_device {

	char name[TLS_DEVICE_NAME_MAX];

	struct list_head dev_list;

	int  (*feature)(struct tls_device *device);

	int  (*hash)(struct tls_device *device, struct sock *sk);

	void (*unhash)(struct tls_device *device, struct sock *sk);

	void (*release)(struct kref *kref);

	struct kref kref;

};



enum {

	TLS_BASE,

	TLS_SW,
@@ -340,7 +308,10 @@ struct tls_offload_context_rx { 
#define TLS_OFFLOAD_CONTEXT_SIZE_RX					\

	(sizeof(struct tls_offload_context_rx) + TLS_DRIVER_STATE_SIZE_RX)



struct tls_context *tls_ctx_create(struct sock *sk);

void tls_ctx_free(struct sock *sk, struct tls_context *ctx);

void update_sk_prot(struct sock *sk, struct tls_context *ctx);



int wait_on_pending_writer(struct sock *sk, long *timeo);

int tls_sk_query(struct sock *sk, int optname, char __user *optval,

		int __user *optlen);
@@ -643,8 +614,6 @@ static inline bool tls_offload_tx_resync_pending(struct sock *sk) 


int tls_proccess_cmsg(struct sock *sk, struct msghdr *msg,

		      unsigned char *record_type);

void tls_register_device(struct tls_device *device);

void tls_unregister_device(struct tls_device *device);

int decrypt_skb(struct sock *sk, struct sk_buff *skb,

		struct scatterlist *sgout);

struct sk_buff *tls_encrypt_skb(struct sk_buff *skb);

include/net/tls_toe.h

0 → 100644
+77 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2016-2017, Mellanox Technologies. All rights reserved.

 * Copyright (c) 2016-2017, Dave Watson <davejwatson@fb.com>. All rights reserved.

 *

 * This software is available to you under a choice of one of two

 * licenses.  You may choose to be licensed under the terms of the GNU

 * General Public License (GPL) Version 2, available from the file

 * COPYING in the main directory of this source tree, or the

 * OpenIB.org BSD license below:

 *

 *     Redistribution and use in source and binary forms, with or

 *     without modification, are permitted provided that the following

 *     conditions are met:

 *

 *      - Redistributions of source code must retain the above

 *        copyright notice, this list of conditions and the following

 *        disclaimer.

 *

 *      - Redistributions in binary form must reproduce the above

 *        copyright notice, this list of conditions and the following

 *        disclaimer in the documentation and/or other materials

 *        provided with the distribution.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

 * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

 * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

 * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS

 * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN

 * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

 * SOFTWARE.

 */



#include <linux/kref.h>

#include <linux/list.h>



struct sock;



#define TLS_TOE_DEVICE_NAME_MAX		32



/*

 * This structure defines the routines for Inline TLS driver.

 * The following routines are optional and filled with a

 * null pointer if not defined.

 *

 * @name: Its the name of registered Inline tls device

 * @dev_list: Inline tls device list

 * int (*feature)(struct tls_toe_device *device);

 *     Called to return Inline TLS driver capability

 *

 * int (*hash)(struct tls_toe_device *device, struct sock *sk);

 *     This function sets Inline driver for listen and program

 *     device specific functioanlity as required

 *

 * void (*unhash)(struct tls_toe_device *device, struct sock *sk);

 *     This function cleans listen state set by Inline TLS driver

 *

 * void (*release)(struct kref *kref);

 *     Release the registered device and allocated resources

 * @kref: Number of reference to tls_toe_device

 */

struct tls_toe_device {

	char name[TLS_TOE_DEVICE_NAME_MAX];

	struct list_head dev_list;

	int  (*feature)(struct tls_toe_device *device);

	int  (*hash)(struct tls_toe_device *device, struct sock *sk);

	void (*unhash)(struct tls_toe_device *device, struct sock *sk);

	void (*release)(struct kref *kref);

	struct kref kref;

};



int tls_toe_bypass(struct sock *sk);

int tls_toe_hash(struct sock *sk);

void tls_toe_unhash(struct sock *sk);



void tls_toe_register_device(struct tls_toe_device *device);

void tls_toe_unregister_device(struct tls_toe_device *device);

CRA Git | Maintained and supported by SUSTech CRA and CCSE