{"id":813775,"url":"http://patchwork.ozlabs.org/api/patches/813775/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/1505385988-94522-2-git-send-email-ilyal@mellanox.com/","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/projects/7/?format=json","name":"Linux network development","link_name":"netdev","list_id":"netdev.vger.kernel.org","list_email":"netdev@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<1505385988-94522-2-git-send-email-ilyal@mellanox.com>","list_archive_url":null,"date":"2017-09-14T10:46:24","name":"[net-next,1/5] tls: Move release of tls_ctx into tls_sw_free_resources","commit_ref":null,"pull_url":null,"state":"deferred","archived":true,"hash":"4369e70835d5fec60a4a5543f5c64e3447fd5755","submitter":{"id":67931,"url":"http://patchwork.ozlabs.org/api/people/67931/?format=json","name":"Ilya Lesokhin","email":"ilyal@mellanox.com"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/1505385988-94522-2-git-send-email-ilyal@mellanox.com/mbox/","series":[{"id":3066,"url":"http://patchwork.ozlabs.org/api/series/3066/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=3066","date":"2017-09-14T10:46:26","name":"tls: Add generic NIC offload infrastructure","version":1,"mbox":"http://patchwork.ozlabs.org/series/3066/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/813775/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/813775/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"patchwork-incoming@ozlabs.org","Delivered-To":"patchwork-incoming@ozlabs.org","Authentication-Results":"ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netdev-owner@vger.kernel.org;\n\treceiver=)","Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xtFZm1wvMz9sP1\n\tfor ;\n\tThu, 14 Sep 2017 20:46:40 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1751913AbdINKqh (ORCPT );\n\tThu, 14 Sep 2017 06:46:37 -0400","from mail-il-dmz.mellanox.com ([193.47.165.129]:37256 \"EHLO\n\tmellanox.co.il\" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org\n\twith ESMTP id S1751837AbdINKqf (ORCPT\n\t); Thu, 14 Sep 2017 06:46:35 -0400","from Internal Mail-Server by MTLPINE1 (envelope-from\n\tilyal@mellanox.com)\n\twith ESMTPS (AES256-SHA encrypted); 14 Sep 2017 13:46:30 +0300","from gen-l-vrt-094.mtl.labs.mlnx (gen-l-vrt-094.mtl.labs.mlnx\n\t[10.137.9.1])\n\tby labmailer.mlnx (8.13.8/8.13.8) with ESMTP id v8EAkUow020670;\n\tThu, 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,\n\thannes@stressinduktion.org, borisp@mellanox.com,\n\tilyal@mellanox.com, aviadye@mellanox.com, liranl@mellanox.com","Subject":"[PATCH net-next 1/5] tls: Move release of tls_ctx into\n\ttls_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"},"content":"Move release of tls_ctx into sw specific code.\nThis is required because the device offload implementation\nrequires this context to remain alive until there are\nno more in-flight SKBs.\n\nSigned-off-by: Boris Pismenny \nSigned-off-by: Ilya Lesokhin \nSigned-off-by: Aviad Yehezkel \n---\n net/tls/tls_main.c | 5 ++---\n net/tls/tls_sw.c | 1 +\n 2 files changed, 3 insertions(+), 3 deletions(-)","diff":"diff --git a/net/tls/tls_main.c b/net/tls/tls_main.c\nindex 60aff60..ae20ee3 100644\n--- a/net/tls/tls_main.c\n+++ b/net/tls/tls_main.c\n@@ -232,12 +232,11 @@ static void tls_sk_proto_close(struct sock *sk, long timeout)\n \t\t\tsg++;\n \t\t}\n \t}\n-\tctx->free_resources(sk);\n+\n \tkfree(ctx->rec_seq);\n \tkfree(ctx->iv);\n-\n \tsk_proto_close = ctx->sk_proto_close;\n-\tkfree(ctx);\n+\tctx->free_resources(sk);\n \n \trelease_sock(sk);\n \tsk_proto_close(sk, timeout);\ndiff --git a/net/tls/tls_sw.c b/net/tls/tls_sw.c\nindex fa596fa..db1e566 100644\n--- a/net/tls/tls_sw.c\n+++ b/net/tls/tls_sw.c\n@@ -650,6 +650,7 @@ void tls_sw_free_resources(struct sock *sk)\n \ttls_free_both_sg(sk);\n \n \tkfree(ctx);\n+\tkfree(tls_ctx);\n }\n \n int tls_set_sw_offload(struct sock *sk, struct tls_context *ctx)\n","prefixes":["net-next","1/5"]}