[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20190527235649.45274-2-edumazet@google.com>
Date: Mon, 27 May 2019 16:56:47 -0700
From: Eric Dumazet <edumazet@...gle.com>
To: "David S . Miller" <davem@...emloft.net>
Cc: netdev <netdev@...r.kernel.org>,
Eric Dumazet <edumazet@...gle.com>,
Eric Dumazet <eric.dumazet@...il.com>
Subject: [PATCH net-next 1/3] inet: frags: uninline fqdir_init()
fqdir_init() is not fast path and is getting bigger.
Signed-off-by: Eric Dumazet <edumazet@...gle.com>
---
include/net/inet_frag.h | 20 +-------------------
net/ipv4/inet_fragment.c | 19 +++++++++++++++++++
2 files changed, 20 insertions(+), 19 deletions(-)
diff --git a/include/net/inet_frag.h b/include/net/inet_frag.h
index 002f23c1a1a7126e146f596300aee0e52b6cafc6..94092b1ef22e9729d99d56323a77faf1ea4c92a6 100644
--- a/include/net/inet_frag.h
+++ b/include/net/inet_frag.h
@@ -109,25 +109,7 @@ struct inet_frags {
int inet_frags_init(struct inet_frags *);
void inet_frags_fini(struct inet_frags *);
-static inline int fqdir_init(struct fqdir **fqdirp, struct inet_frags *f,
- struct net *net)
-{
- struct fqdir *fqdir = kzalloc(sizeof(*fqdir), GFP_KERNEL);
- int res;
-
- if (!fqdir)
- return -ENOMEM;
- fqdir->f = f;
- fqdir->net = net;
- res = rhashtable_init(&fqdir->rhashtable, &fqdir->f->rhash_params);
- if (res < 0) {
- kfree(fqdir);
- return res;
- }
- *fqdirp = fqdir;
- return 0;
-}
-
+int fqdir_init(struct fqdir **fqdirp, struct inet_frags *f, struct net *net);
void fqdir_exit(struct fqdir *fqdir);
void inet_frag_kill(struct inet_frag_queue *q);
diff --git a/net/ipv4/inet_fragment.c b/net/ipv4/inet_fragment.c
index 6ca9523374dab03737cd073a1aa990130c4a87ca..7c07aae969e6c84d4f0345b5c4852b2e37d088f6 100644
--- a/net/ipv4/inet_fragment.c
+++ b/net/ipv4/inet_fragment.c
@@ -154,6 +154,25 @@ static void fqdir_rwork_fn(struct work_struct *work)
kfree(fqdir);
}
+int fqdir_init(struct fqdir **fqdirp, struct inet_frags *f, struct net *net)
+{
+ struct fqdir *fqdir = kzalloc(sizeof(*fqdir), GFP_KERNEL);
+ int res;
+
+ if (!fqdir)
+ return -ENOMEM;
+ fqdir->f = f;
+ fqdir->net = net;
+ res = rhashtable_init(&fqdir->rhashtable, &fqdir->f->rhash_params);
+ if (res < 0) {
+ kfree(fqdir);
+ return res;
+ }
+ *fqdirp = fqdir;
+ return 0;
+}
+EXPORT_SYMBOL(fqdir_init);
+
void fqdir_exit(struct fqdir *fqdir)
{
fqdir->high_thresh = 0; /* prevent creation of new frags */
--
2.22.0.rc1.257.g3120a18244-goog
Powered by blists - more mailing lists