From patchwork Tue Mar 4 07:30:36 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wang, Yalin" X-Patchwork-Id: 3759301 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id F30689F376 for ; Tue, 4 Mar 2014 07:31:45 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 08BFC20411 for ; Tue, 4 Mar 2014 07:31:45 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E04A6203E5 for ; Tue, 4 Mar 2014 07:31:43 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WKjoy-0008Cx-ST; Tue, 04 Mar 2014 07:31:25 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WKjow-0001Rz-Dx; Tue, 04 Mar 2014 07:31:22 +0000 Received: from cnbjrel02.sonyericsson.com ([219.141.167.166]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WKjot-0001Qs-2U for linux-arm-kernel@lists.infradead.org; Tue, 04 Mar 2014 07:31:20 +0000 From: "Wang, Yalin" To: "'gregkh@linuxfoundation.org'" Date: Tue, 4 Mar 2014 15:30:36 +0800 Subject: [PATCH] netfilter:Change nf_conntrack modules to use vmalloc Thread-Topic: [PATCH] netfilter:Change nf_conntrack modules to use vmalloc Thread-Index: Ac826lhIOG0DcEQkRlaCTucffUxYqQAkPpuQ Message-ID: <35FD53F367049845BC99AC72306C23D102844605F39A@CNBJMBX05.corpusers.net> References: <35FD53F367049845BC99AC72306C23D102844605F38C@CNBJMBX05.corpusers.net> <53104ECA.4010702@freescale.com> <35FD53F367049845BC99AC72306C23D102844605F38D@CNBJMBX05.corpusers.net> <20140228163304.GA15614@kroah.com> <35FD53F367049845BC99AC72306C23D102844605F38F@CNBJMBX05.corpusers.net> <20140303030821.GA16732@kroah.com> <35FD53F367049845BC99AC72306C23D102844605F390@CNBJMBX05.corpusers.net> <20140303141044.GA9139@kroah.com> In-Reply-To: <20140303141044.GA9139@kroah.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: en-US MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140304_023119_819620_A5BF179B X-CRM114-Status: UNSURE ( 9.59 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -4.2 (----) Cc: "'alsa-devel@alsa-project.org'" , "'broonie@opensource.wolfsonmicro.com'" , "'tiwai@suse.de'" , "'fweisbec@gmail.com'" , 'Will Deacon' , "'perex@perex.cz'" , "'mingo@redhat.com'" , "'linux-input@vger.kernel.org'" , "'rydberg@euromail.se'" , "'lrg@ti.com'" , "'pablo@netfilter.org'" , "'rusty@rustcorp.com.au'" , "'coreteam@netfilter.org'" , "'linux-arm-msm@vger.kernel.org'" , "'mschmidt@redhat.com'" , "'rostedt@goodmis.org'" , "'netfilter@vger.kernel.org'" , "'linux-arm-kernel@lists.infradead.org'" , "'laforge@netfilter.org'" , "'netdev@vger.kernel.org'" , "'dmitry.torokhov@gmail.com'" , "'zhaojingmin@users.sourceforge.net'" , "'linux-kernel@vger.kernel.org'" , "'balbi@ti.com'" , "'davem@davemloft.net'" , 'Huang Shijie' , "'linux-usb@vger.kernel.org'" , "'netfilter-devel@vger.kernel.org'" , "'kaber@trash.net'" X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch change some nf_conntrack modules to use vmalloc to allocate large memory instead of kmalloc, to save low memorys. Signed-off-by: Yalin Wang --- net/netfilter/nf_conntrack_ftp.c | 6 +++--- net/netfilter/nf_conntrack_h323_main.c | 8 ++++---- net/netfilter/nf_conntrack_irc.c | 6 +++--- net/netfilter/nf_conntrack_sane.c | 6 +++--- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/net/netfilter/nf_conntrack_ftp.c b/net/netfilter/nf_conntrack_ftp.c index b8a0924..aad7eca 100644 --- a/net/netfilter/nf_conntrack_ftp.c +++ b/net/netfilter/nf_conntrack_ftp.c @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include #include @@ -593,14 +593,14 @@ static void nf_conntrack_ftp_fini(void) } } - kfree(ftp_buffer); + vfree(ftp_buffer); } static int __init nf_conntrack_ftp_init(void) { int i, j = -1, ret = 0; - ftp_buffer = kmalloc(65536, GFP_KERNEL); + ftp_buffer = vmalloc(65536); if (!ftp_buffer) return -ENOMEM; diff --git a/net/netfilter/nf_conntrack_h323_main.c b/net/netfilter/nf_conntrack_h323_main.c index 70866d1..5baee1a 100644 --- a/net/netfilter/nf_conntrack_h323_main.c +++ b/net/netfilter/nf_conntrack_h323_main.c @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include #include @@ -1837,7 +1837,7 @@ static void __exit nf_conntrack_h323_fini(void) nf_conntrack_helper_unregister(&nf_conntrack_helper_q931[1]); nf_conntrack_helper_unregister(&nf_conntrack_helper_q931[0]); nf_conntrack_helper_unregister(&nf_conntrack_helper_h245); - kfree(h323_buffer); + vfree(h323_buffer); pr_debug("nf_ct_h323: fini\n"); } @@ -1846,7 +1846,7 @@ static int __init nf_conntrack_h323_init(void) { int ret; - h323_buffer = kmalloc(65536, GFP_KERNEL); + h323_buffer = vmalloc(65536); if (!h323_buffer) return -ENOMEM; ret = nf_conntrack_helper_register(&nf_conntrack_helper_h245); @@ -1876,7 +1876,7 @@ err3: err2: nf_conntrack_helper_unregister(&nf_conntrack_helper_h245); err1: - kfree(h323_buffer); + vfree(h323_buffer); return ret; } diff --git a/net/netfilter/nf_conntrack_irc.c b/net/netfilter/nf_conntrack_irc.c index 0fd2976..b57df10 100644 --- a/net/netfilter/nf_conntrack_irc.c +++ b/net/netfilter/nf_conntrack_irc.c @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include #include @@ -244,7 +244,7 @@ static int __init nf_conntrack_irc_init(void) irc_exp_policy.max_expected = max_dcc_channels; irc_exp_policy.timeout = dcc_timeout; - irc_buffer = kmalloc(65536, GFP_KERNEL); + irc_buffer = vmalloc(65536); if (!irc_buffer) return -ENOMEM; @@ -285,7 +285,7 @@ static void nf_conntrack_irc_fini(void) for (i = 0; i < ports_c; i++) nf_conntrack_helper_unregister(&irc[i]); - kfree(irc_buffer); + vfree(irc_buffer); } module_init(nf_conntrack_irc_init); diff --git a/net/netfilter/nf_conntrack_sane.c b/net/netfilter/nf_conntrack_sane.c index 4a2134f..a4c8bf3 100644 --- a/net/netfilter/nf_conntrack_sane.c +++ b/net/netfilter/nf_conntrack_sane.c @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include #include @@ -185,14 +185,14 @@ static void nf_conntrack_sane_fini(void) } } - kfree(sane_buffer); + vfree(sane_buffer); } static int __init nf_conntrack_sane_init(void) { int i, j = -1, ret = 0; - sane_buffer = kmalloc(65536, GFP_KERNEL); + sane_buffer = vmalloc(65536); if (!sane_buffer) return -ENOMEM;