Commit 25a3cd81 authored by Jakub Kicinski's avatar Jakub Kicinski Committed by David S. Miller
Browse files

net/tls: move TOE-related structures to a separate header 



Move tls_device structure and register/unregister functions
to a new header to avoid confusion with normal, non-TOE offload.

Signed-off-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: default avatarJohn Hurley <john.hurley@netronome.com>
Reviewed-by: default avatarSimon Horman <simon.horman@netronome.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 033b2c7f

drivers/crypto/chelsio/chtls/chtls.h

+1 −0
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"

include/net/tls.h

+0 −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,
@@ -643,8 +611,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
+73 −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_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_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;

};



void tls_register_device(struct tls_device *device);

void tls_unregister_device(struct tls_device *device);

net/tls/tls_main.c

+1 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ 
#include <linux/inet_diag.h>



#include <net/tls.h>

#include <net/tls_toe.h>



MODULE_AUTHOR("Mellanox Technologies");

MODULE_DESCRIPTION("Transport Layer Security Support");