Skip to content

Commit

Permalink
net/tls: Perform immediate device ctx cleanup when possible
Browse files Browse the repository at this point in the history
TLS context destructor can be run in atomic context. Cleanup operations
for device-offloaded contexts could require access and interaction with
the device callbacks, which might sleep. Hence, the cleanup of such
contexts must be deferred and completed inside an async work.

For all others, this is not necessary, as cleanup is atomic. Invoke
cleanup immediately for them, avoiding queueing redundant gc work.

Signed-off-by: Tariq Toukan <tariqt@nvidia.com>
Reviewed-by: Maxim Mikityanskiy <maximmi@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  • Loading branch information
Tariq Toukan authored and Jakub Kicinski committed Jul 29, 2022
1 parent 8fd1e15 commit 113671b
Showing 1 changed file with 18 additions and 8 deletions.
26 changes: 18 additions & 8 deletions net/tls/tls_device.c
Original file line number Diff line number Diff line change
Expand Up @@ -96,19 +96,29 @@ static void tls_device_gc_task(struct work_struct *work)
static void tls_device_queue_ctx_destruction(struct tls_context *ctx)
{
unsigned long flags;
bool async_cleanup;

spin_lock_irqsave(&tls_device_lock, flags);
if (unlikely(!refcount_dec_and_test(&ctx->refcount)))
goto unlock;
if (unlikely(!refcount_dec_and_test(&ctx->refcount))) {
spin_unlock_irqrestore(&tls_device_lock, flags);
return;
}

list_move_tail(&ctx->list, &tls_device_gc_list);
async_cleanup = ctx->netdev && ctx->tx_conf == TLS_HW;
if (async_cleanup) {
list_move_tail(&ctx->list, &tls_device_gc_list);

/* schedule_work inside the spinlock
* to make sure tls_device_down waits for that work.
*/
schedule_work(&tls_device_gc_work);
unlock:
/* schedule_work inside the spinlock
* to make sure tls_device_down waits for that work.
*/
schedule_work(&tls_device_gc_work);
} else {
list_del(&ctx->list);
}
spin_unlock_irqrestore(&tls_device_lock, flags);

if (!async_cleanup)
tls_device_free_ctx(ctx);
}

/* We assume that the socket is already connected */
Expand Down

0 comments on commit 113671b

Please sign in to comment.