Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9e995797 authored by Jakub Kicinski's avatar Jakub Kicinski Committed by David S. Miller
Browse files

net/tls: remove old exports of sk_destruct functions 



tls_device_sk_destruct being set on a socket used to indicate
that socket is a kTLS device one.  That is no longer true -
now we use sk_validate_xmit_skb pointer for that purpose.
Remove the export.  tls_device_attach() needs to be moved.

While at it, remove the dead declaration of tls_sk_destruct().

Signed-off-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: default avatarDirk van der Merwe <dirk.vandermerwe@netronome.com>
Reviewed-by: default avatarSimon Horman <simon.horman@netronome.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e49d268d

include/net/tls.h

+0 −2
Original line number Diff line number Diff line
@@ -317,7 +317,6 @@ int tls_set_device_offload(struct sock *sk, struct tls_context *ctx); 
int tls_device_sendmsg(struct sock *sk, struct msghdr *msg, size_t size);

int tls_device_sendpage(struct sock *sk, struct page *page,

			int offset, size_t size, int flags);

void tls_device_sk_destruct(struct sock *sk);

void tls_device_free_resources_tx(struct sock *sk);

void tls_device_init(void);

void tls_device_cleanup(void);
@@ -336,7 +335,6 @@ static inline u32 tls_record_start_seq(struct tls_record_info *rec) 
	return rec->end_seq - rec->len;

}



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

int tls_push_sg(struct sock *sk, struct tls_context *ctx,

		struct scatterlist *sg, u16 first_offset,

		int flags);

net/tls/tls_device.c

+17 −18
Original line number Diff line number Diff line
@@ -89,22 +89,6 @@ static void tls_device_gc_task(struct work_struct *work) 
	}

}



static void tls_device_attach(struct tls_context *ctx, struct sock *sk,

			      struct net_device *netdev)

{

	if (sk->sk_destruct != tls_device_sk_destruct) {

		refcount_set(&ctx->refcount, 1);

		dev_hold(netdev);

		ctx->netdev = netdev;

		spin_lock_irq(&tls_device_lock);

		list_add_tail(&ctx->list, &tls_device_list);

		spin_unlock_irq(&tls_device_lock);



		ctx->sk_destruct = sk->sk_destruct;

		sk->sk_destruct = tls_device_sk_destruct;

	}

}



static void tls_device_queue_ctx_destruction(struct tls_context *ctx)

{

	unsigned long flags;
@@ -199,7 +183,7 @@ static void tls_icsk_clean_acked(struct sock *sk, u32 acked_seq) 
 * socket and no in-flight SKBs associated with this

 * socket, so it is safe to free all the resources.

 */

void tls_device_sk_destruct(struct sock *sk)

static void tls_device_sk_destruct(struct sock *sk)

{

	struct tls_context *tls_ctx = tls_get_ctx(sk);

	struct tls_offload_context_tx *ctx = tls_offload_ctx_tx(tls_ctx);
@@ -217,7 +201,6 @@ void tls_device_sk_destruct(struct sock *sk) 
	if (refcount_dec_and_test(&tls_ctx->refcount))

		tls_device_queue_ctx_destruction(tls_ctx);

}

EXPORT_SYMBOL(tls_device_sk_destruct);



void tls_device_free_resources_tx(struct sock *sk)

{
@@ -682,6 +665,22 @@ int tls_device_decrypted(struct sock *sk, struct sk_buff *skb) 
		tls_device_reencrypt(sk, skb);

}



static void tls_device_attach(struct tls_context *ctx, struct sock *sk,

			      struct net_device *netdev)

{

	if (sk->sk_destruct != tls_device_sk_destruct) {

		refcount_set(&ctx->refcount, 1);

		dev_hold(netdev);

		ctx->netdev = netdev;

		spin_lock_irq(&tls_device_lock);

		list_add_tail(&ctx->list, &tls_device_list);

		spin_unlock_irq(&tls_device_lock);



		ctx->sk_destruct = sk->sk_destruct;

		sk->sk_destruct = tls_device_sk_destruct;

	}

}



int tls_set_device_offload(struct sock *sk, struct tls_context *ctx)

{

	u16 nonce_size, tag_size, iv_size, rec_seq_size;