From patchwork Thu Sep 14 10:46:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilya Lesokhin X-Patchwork-Id: 813775 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xtFZm1wvMz9sP1 for ; Thu, 14 Sep 2017 20:46:40 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751913AbdINKqh (ORCPT ); Thu, 14 Sep 2017 06:46:37 -0400 Received: from mail-il-dmz.mellanox.com ([193.47.165.129]:37256 "EHLO mellanox.co.il" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751837AbdINKqf (ORCPT ); Thu, 14 Sep 2017 06:46:35 -0400 Received: from Internal Mail-Server by MTLPINE1 (envelope-from ilyal@mellanox.com) with ESMTPS (AES256-SHA encrypted); 14 Sep 2017 13:46:30 +0300 Received: from gen-l-vrt-094.mtl.labs.mlnx (gen-l-vrt-094.mtl.labs.mlnx [10.137.9.1]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id v8EAkUow020670; Thu, 14 Sep 2017 13:46:30 +0300 From: Ilya Lesokhin To: netdev@vger.kernel.org, davem@davemloft.net Cc: davejwatson@fb.com, tom@herbertland.com, hannes@stressinduktion.org, borisp@mellanox.com, ilyal@mellanox.com, aviadye@mellanox.com, liranl@mellanox.com Subject: [PATCH net-next 1/5] tls: Move release of tls_ctx into tls_sw_free_resources Date: Thu, 14 Sep 2017 13:46:24 +0300 Message-Id: <1505385988-94522-2-git-send-email-ilyal@mellanox.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1505385988-94522-1-git-send-email-ilyal@mellanox.com> References: <1505385988-94522-1-git-send-email-ilyal@mellanox.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Move release of tls_ctx into sw specific code. This is required because the device offload implementation requires this context to remain alive until there are no more in-flight SKBs. Signed-off-by: Boris Pismenny Signed-off-by: Ilya Lesokhin Signed-off-by: Aviad Yehezkel --- net/tls/tls_main.c | 5 ++--- net/tls/tls_sw.c | 1 + 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/net/tls/tls_main.c b/net/tls/tls_main.c index 60aff60..ae20ee3 100644 --- a/net/tls/tls_main.c +++ b/net/tls/tls_main.c @@ -232,12 +232,11 @@ static void tls_sk_proto_close(struct sock *sk, long timeout) sg++; } } - ctx->free_resources(sk); + kfree(ctx->rec_seq); kfree(ctx->iv); - sk_proto_close = ctx->sk_proto_close; - kfree(ctx); + ctx->free_resources(sk); release_sock(sk); sk_proto_close(sk, timeout); diff --git a/net/tls/tls_sw.c b/net/tls/tls_sw.c index fa596fa..db1e566 100644 --- a/net/tls/tls_sw.c +++ b/net/tls/tls_sw.c @@ -650,6 +650,7 @@ void tls_sw_free_resources(struct sock *sk) tls_free_both_sg(sk); kfree(ctx); + kfree(tls_ctx); } int tls_set_sw_offload(struct sock *sk, struct tls_context *ctx)