Skip to content

L
linux
Commit 803fdd99 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files
Options

net: rename struct fqdir fields 

Rename the @frags fields from structs netns_ipv4, netns_ipv6,
netns_nf_frag and netns_ieee802154_lowpan to @fqdir
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 89fb9005
Hide whitespace changes
Inline Side-by-side
Showing with 92 additions and 92 deletions
include/net/netns/ieee802154_6lowpan.h
View file @ 803fdd99
......@@ -16,7 +16,7 @@ struct netns_sysctl_lowpan {
struct netns_ieee802154_lowpan {
struct netns_sysctl_lowpan sysctl;
struct fqdir frags;
struct fqdir fqdir;
};
#endif
include/net/netns/ipv4.h
View file @ 803fdd99
......@@ -72,7 +72,7 @@ struct netns_ipv4 {
struct inet_peer_base *peers;
struct sock * __percpu *tcp_sk;
struct fqdir frags;
struct fqdir fqdir;
#ifdef CONFIG_NETFILTER
struct xt_table *iptable_filter;
struct xt_table *iptable_mangle;
......
include/net/netns/ipv6.h
View file @ 803fdd99
......@@ -58,7 +58,7 @@ struct netns_ipv6 {
struct ipv6_devconf *devconf_all;
struct ipv6_devconf *devconf_dflt;
struct inet_peer_base *peers;
struct fqdir frags;
struct fqdir fqdir;
#ifdef CONFIG_NETFILTER
struct xt_table *ip6table_filter;
struct xt_table *ip6table_mangle;
......@@ -116,7 +116,7 @@ struct netns_ipv6 {
#if IS_ENABLED(CONFIG_NF_DEFRAG_IPV6)
struct netns_nf_frag {
struct fqdir frags;
struct fqdir fqdir;
};
#endif
......
net/ieee802154/6lowpan/reassembly.c
View file @ 803fdd99
......@@ -79,7 +79,7 @@ fq_find(struct net *net, const struct lowpan_802154_cb *cb,
key.src = *src;
key.dst = *dst;
q = inet_frag_find(&ieee802154_lowpan->frags, &key);
q = inet_frag_find(&ieee802154_lowpan->fqdir, &key);
if (!q)
return NULL;
......@@ -326,23 +326,23 @@ int lowpan_frag_rcv(struct sk_buff *skb, u8 frag_type)
static struct ctl_table lowpan_frags_ns_ctl_table[] = {
{
.procname = "6lowpanfrag_high_thresh",
.data = &init_net.ieee802154_lowpan.frags.high_thresh,
.data = &init_net.ieee802154_lowpan.fqdir.high_thresh,
.maxlen = sizeof(unsigned long),
.mode = 0644,
.proc_handler = proc_doulongvec_minmax,
.extra1 = &init_net.ieee802154_lowpan.frags.low_thresh
.extra1 = &init_net.ieee802154_lowpan.fqdir.low_thresh
},
{
.procname = "6lowpanfrag_low_thresh",
.data = &init_net.ieee802154_lowpan.frags.low_thresh,
.data = &init_net.ieee802154_lowpan.fqdir.low_thresh,
.maxlen = sizeof(unsigned long),
.mode = 0644,
.proc_handler = proc_doulongvec_minmax,
.extra2 = &init_net.ieee802154_lowpan.frags.high_thresh
.extra2 = &init_net.ieee802154_lowpan.fqdir.high_thresh
},
{
.procname = "6lowpanfrag_time",
.data = &init_net.ieee802154_lowpan.frags.timeout,
.data = &init_net.ieee802154_lowpan.fqdir.timeout,
.maxlen = sizeof(int),
.mode = 0644,
.proc_handler = proc_dointvec_jiffies,
......@@ -377,11 +377,11 @@ static int __net_init lowpan_frags_ns_sysctl_register(struct net *net)
if (table == NULL)
goto err_alloc;
table[0].data = &ieee802154_lowpan->frags.high_thresh;
table[0].extra1 = &ieee802154_lowpan->frags.low_thresh;
table[1].data = &ieee802154_lowpan->frags.low_thresh;
table[1].extra2 = &ieee802154_lowpan->frags.high_thresh;
table[2].data = &ieee802154_lowpan->frags.timeout;
table[0].data = &ieee802154_lowpan->fqdir.high_thresh;
table[0].extra1 = &ieee802154_lowpan->fqdir.low_thresh;
table[1].data = &ieee802154_lowpan->fqdir.low_thresh;
table[1].extra2 = &ieee802154_lowpan->fqdir.high_thresh;
table[2].data = &ieee802154_lowpan->fqdir.timeout;
/* Don't export sysctls to unprivileged users */
if (net->user_ns != &init_user_ns)
......@@ -454,17 +454,17 @@ static int __net_init lowpan_frags_init_net(struct net *net)
net_ieee802154_lowpan(net);
int res;
ieee802154_lowpan->frags.high_thresh = IPV6_FRAG_HIGH_THRESH;
ieee802154_lowpan->frags.low_thresh = IPV6_FRAG_LOW_THRESH;
ieee802154_lowpan->frags.timeout = IPV6_FRAG_TIMEOUT;
ieee802154_lowpan->frags.f = &lowpan_frags;
ieee802154_lowpan->fqdir.high_thresh = IPV6_FRAG_HIGH_THRESH;
ieee802154_lowpan->fqdir.low_thresh = IPV6_FRAG_LOW_THRESH;
ieee802154_lowpan->fqdir.timeout = IPV6_FRAG_TIMEOUT;
ieee802154_lowpan->fqdir.f = &lowpan_frags;
res = inet_frags_init_net(&ieee802154_lowpan->frags);
res = inet_frags_init_net(&ieee802154_lowpan->fqdir);
if (res < 0)
return res;
res = lowpan_frags_ns_sysctl_register(net);
if (res < 0)
fqdir_exit(&ieee802154_lowpan->frags);
fqdir_exit(&ieee802154_lowpan->fqdir);
return res;
}
......@@ -474,7 +474,7 @@ static void __net_exit lowpan_frags_exit_net(struct net *net)
net_ieee802154_lowpan(net);
lowpan_frags_ns_sysctl_unregister(net);
fqdir_exit(&ieee802154_lowpan->frags);
fqdir_exit(&ieee802154_lowpan->fqdir);
}
static struct pernet_operations lowpan_frags_ops = {
......
net/ipv4/ip_fragment.c
View file @ 803fdd99
......@@ -83,7 +83,7 @@ static void ip4_frag_init(struct inet_frag_queue *q, const void *a)
{
struct ipq *qp = container_of(q, struct ipq, q);
struct netns_ipv4 *ipv4 = container_of(q->fqdir, struct netns_ipv4,
frags);
fqdir);
struct net *net = container_of(ipv4, struct net, ipv4);
const struct frag_v4_compare_key *key = a;
......@@ -142,7 +142,7 @@ static void ip_expire(struct timer_list *t)
int err;
qp = container_of(frag, struct ipq, q);
net = container_of(qp->q.fqdir, struct net, ipv4.frags);
net = container_of(qp->q.fqdir, struct net, ipv4.fqdir);
rcu_read_lock();
spin_lock(&qp->q.lock);
......@@ -211,7 +211,7 @@ static struct ipq *ip_find(struct net *net, struct iphdr *iph,
};
struct inet_frag_queue *q;
q = inet_frag_find(&net->ipv4.frags, &key);
q = inet_frag_find(&net->ipv4.fqdir, &key);
if (!q)
return NULL;
......@@ -239,7 +239,7 @@ static int ip_frag_too_far(struct ipq *qp)
if (rc) {
struct net *net;
net = container_of(qp->q.fqdir, struct net, ipv4.frags);
net = container_of(qp->q.fqdir, struct net, ipv4.fqdir);
__IP_INC_STATS(net, IPSTATS_MIB_REASMFAILS);
}
......@@ -273,7 +273,7 @@ static int ip_frag_reinit(struct ipq *qp)
/* Add new segment to existing queue. */
static int ip_frag_queue(struct ipq *qp, struct sk_buff *skb)
{
struct net *net = container_of(qp->q.fqdir, struct net, ipv4.frags);
struct net *net = container_of(qp->q.fqdir, struct net, ipv4.fqdir);
int ihl, end, flags, offset;
struct sk_buff *prev_tail;
struct net_device *dev;
......@@ -399,7 +399,7 @@ static int ip_frag_queue(struct ipq *qp, struct sk_buff *skb)
static int ip_frag_reasm(struct ipq *qp, struct sk_buff *skb,
struct sk_buff *prev_tail, struct net_device *dev)
{
struct net *net = container_of(qp->q.fqdir, struct net, ipv4.frags);
struct net *net = container_of(qp->q.fqdir, struct net, ipv4.fqdir);
struct iphdr *iph;
void *reasm_data;
int len, err;
......@@ -544,30 +544,30 @@ static int dist_min;
static struct ctl_table ip4_frags_ns_ctl_table[] = {
{
.procname = "ipfrag_high_thresh",
.data = &init_net.ipv4.frags.high_thresh,
.data = &init_net.ipv4.fqdir.high_thresh,
.maxlen = sizeof(unsigned long),
.mode = 0644,
.proc_handler = proc_doulongvec_minmax,
.extra1 = &init_net.ipv4.frags.low_thresh
.extra1 = &init_net.ipv4.fqdir.low_thresh
},
{
.procname = "ipfrag_low_thresh",
.data = &init_net.ipv4.frags.low_thresh,
.data = &init_net.ipv4.fqdir.low_thresh,
.maxlen = sizeof(unsigned long),
.mode = 0644,
.proc_handler = proc_doulongvec_minmax,
.extra2 = &init_net.ipv4.frags.high_thresh
.extra2 = &init_net.ipv4.fqdir.high_thresh
},
{
.procname = "ipfrag_time",
.data = &init_net.ipv4.frags.timeout,
.data = &init_net.ipv4.fqdir.timeout,
.maxlen = sizeof(int),
.mode = 0644,
.proc_handler = proc_dointvec_jiffies,
},
{
.procname = "ipfrag_max_dist",
.data = &init_net.ipv4.frags.max_dist,
.data = &init_net.ipv4.fqdir.max_dist,
.maxlen = sizeof(int),
.mode = 0644,
.proc_handler = proc_dointvec_minmax,
......@@ -600,12 +600,12 @@ static int __net_init ip4_frags_ns_ctl_register(struct net *net)
if (!table)
goto err_alloc;
table[0].data = &net->ipv4.frags.high_thresh;
table[0].extra1 = &net->ipv4.frags.low_thresh;
table[1].data = &net->ipv4.frags.low_thresh;
table[1].extra2 = &net->ipv4.frags.high_thresh;
table[2].data = &net->ipv4.frags.timeout;
table[3].data = &net->ipv4.frags.max_dist;
table[0].data = &net->ipv4.fqdir.high_thresh;
table[0].extra1 = &net->ipv4.fqdir.low_thresh;
table[1].data = &net->ipv4.fqdir.low_thresh;
table[1].extra2 = &net->ipv4.fqdir.high_thresh;
table[2].data = &net->ipv4.fqdir.timeout;
table[3].data = &net->ipv4.fqdir.max_dist;
}
hdr = register_net_sysctl(net, "net/ipv4", table);
......@@ -668,31 +668,31 @@ static int __net_init ipv4_frags_init_net(struct net *net)
* we will prune down to 3MB, making room for approx 8 big 64K
* fragments 8x128k.
*/
net->ipv4.frags.high_thresh = 4 * 1024 * 1024;
net->ipv4.frags.low_thresh = 3 * 1024 * 1024;
net->ipv4.fqdir.high_thresh = 4 * 1024 * 1024;
net->ipv4.fqdir.low_thresh = 3 * 1024 * 1024;
/*
* Important NOTE! Fragment queue must be destroyed before MSL expires.
* RFC791 is wrong proposing to prolongate timer each fragment arrival
* by TTL.
*/
net->ipv4.frags.timeout = IP_FRAG_TIME;
net->ipv4.fqdir.timeout = IP_FRAG_TIME;
net->ipv4.frags.max_dist = 64;
net->ipv4.frags.f = &ip4_frags;
net->ipv4.fqdir.max_dist = 64;
net->ipv4.fqdir.f = &ip4_frags;
res = inet_frags_init_net(&net->ipv4.frags);
res = inet_frags_init_net(&net->ipv4.fqdir);
if (res < 0)
return res;
res = ip4_frags_ns_ctl_register(net);
if (res < 0)
fqdir_exit(&net->ipv4.frags);
fqdir_exit(&net->ipv4.fqdir);
return res;
}
static void __net_exit ipv4_frags_exit_net(struct net *net)
{
ip4_frags_ns_ctl_unregister(net);
fqdir_exit(&net->ipv4.frags);
fqdir_exit(&net->ipv4.fqdir);
}
static struct pernet_operations ip4_frags_ops = {
......
net/ipv4/proc.c
View file @ 803fdd99
......@@ -72,8 +72,8 @@ static int sockstat_seq_show(struct seq_file *seq, void *v)
seq_printf(seq, "RAW: inuse %d\n",
sock_prot_inuse_get(net, &raw_prot));
seq_printf(seq, "FRAG: inuse %u memory %lu\n",
atomic_read(&net->ipv4.frags.rhashtable.nelems),
frag_mem_limit(&net->ipv4.frags));
atomic_read(&net->ipv4.fqdir.rhashtable.nelems),
frag_mem_limit(&net->ipv4.fqdir));
return 0;
}
......
net/ipv6/netfilter/nf_conntrack_reasm.c
View file @ 803fdd99
......@@ -58,26 +58,26 @@ static struct inet_frags nf_frags;
static struct ctl_table nf_ct_frag6_sysctl_table[] = {
{
.procname = "nf_conntrack_frag6_timeout",
.data = &init_net.nf_frag.frags.timeout,
.data = &init_net.nf_frag.fqdir.timeout,
.maxlen = sizeof(unsigned int),
.mode = 0644,
.proc_handler = proc_dointvec_jiffies,
},
{
.procname = "nf_conntrack_frag6_low_thresh",
.data = &init_net.nf_frag.frags.low_thresh,
.data = &init_net.nf_frag.fqdir.low_thresh,
.maxlen = sizeof(unsigned long),
.mode = 0644,
.proc_handler = proc_doulongvec_minmax,
.extra2 = &init_net.nf_frag.frags.high_thresh
.extra2 = &init_net.nf_frag.fqdir.high_thresh
},
{
.procname = "nf_conntrack_frag6_high_thresh",
.data = &init_net.nf_frag.frags.high_thresh,
.data = &init_net.nf_frag.fqdir.high_thresh,
.maxlen = sizeof(unsigned long),
.mode = 0644,
.proc_handler = proc_doulongvec_minmax,
.extra1 = &init_net.nf_frag.frags.low_thresh
.extra1 = &init_net.nf_frag.fqdir.low_thresh
},
{ }
};
......@@ -94,12 +94,12 @@ static int nf_ct_frag6_sysctl_register(struct net *net)
if (table == NULL)
goto err_alloc;
table[0].data = &net->nf_frag.frags.timeout;
table[1].data = &net->nf_frag.frags.low_thresh;
table[1].extra2 = &net->nf_frag.frags.high_thresh;
table[2].data = &net->nf_frag.frags.high_thresh;
table[2].extra1 = &net->nf_frag.frags.low_thresh;
table[2].extra2 = &init_net.nf_frag.frags.high_thresh;
table[0].data = &net->nf_frag.fqdir.timeout;
table[1].data = &net->nf_frag.fqdir.low_thresh;
table[1].extra2 = &net->nf_frag.fqdir.high_thresh;
table[2].data = &net->nf_frag.fqdir.high_thresh;
table[2].extra1 = &net->nf_frag.fqdir.low_thresh;
table[2].extra2 = &init_net.nf_frag.fqdir.high_thresh;
}
hdr = register_net_sysctl(net, "net/netfilter", table);
......@@ -151,7 +151,7 @@ static void nf_ct_frag6_expire(struct timer_list *t)
struct net *net;
fq = container_of(frag, struct frag_queue, q);
net = container_of(fq->q.fqdir, struct net, nf_frag.frags);
net = container_of(fq->q.fqdir, struct net, nf_frag.fqdir);
ip6frag_expire_frag_queue(net, fq);
}
......@@ -169,7 +169,7 @@ static struct frag_queue *fq_find(struct net *net, __be32 id, u32 user,
};
struct inet_frag_queue *q;
q = inet_frag_find(&net->nf_frag.frags, &key);
q = inet_frag_find(&net->nf_frag.fqdir, &key);
if (!q)
return NULL;
......@@ -496,24 +496,24 @@ static int nf_ct_net_init(struct net *net)
{
int res;
net->nf_frag.frags.high_thresh = IPV6_FRAG_HIGH_THRESH;
net->nf_frag.frags.low_thresh = IPV6_FRAG_LOW_THRESH;
net->nf_frag.frags.timeout = IPV6_FRAG_TIMEOUT;
net->nf_frag.frags.f = &nf_frags;
net->nf_frag.fqdir.high_thresh = IPV6_FRAG_HIGH_THRESH;
net->nf_frag.fqdir.low_thresh = IPV6_FRAG_LOW_THRESH;
net->nf_frag.fqdir.timeout = IPV6_FRAG_TIMEOUT;
net->nf_frag.fqdir.f = &nf_frags;
res = inet_frags_init_net(&net->nf_frag.frags);
res = inet_frags_init_net(&net->nf_frag.fqdir);
if (res < 0)
return res;
res = nf_ct_frag6_sysctl_register(net);
if (res < 0)
fqdir_exit(&net->nf_frag.frags);
fqdir_exit(&net->nf_frag.fqdir);
return res;
}
static void nf_ct_net_exit(struct net *net)
{
nf_ct_frags6_sysctl_unregister(net);
fqdir_exit(&net->nf_frag.frags);
fqdir_exit(&net->nf_frag.fqdir);
}
static struct pernet_operations nf_ct_net_ops = {
......
net/ipv6/proc.c
View file @ 803fdd99
......@@ -48,8 +48,8 @@ static int sockstat6_seq_show(struct seq_file *seq, void *v)
seq_printf(seq, "RAW6: inuse %d\n",
sock_prot_inuse_get(net, &rawv6_prot));
seq_printf(seq, "FRAG6: inuse %u memory %lu\n",
atomic_read(&net->ipv6.frags.rhashtable.nelems),
frag_mem_limit(&net->ipv6.frags));
atomic_read(&net->ipv6.fqdir.rhashtable.nelems),
frag_mem_limit(&net->ipv6.fqdir));
return 0;
}
......
net/ipv6/reassembly.c
View file @ 803fdd99
......@@ -79,7 +79,7 @@ static void ip6_frag_expire(struct timer_list *t)
struct net *net;
fq = container_of(frag, struct frag_queue, q);
net = container_of(fq->q.fqdir, struct net, ipv6.frags);
net = container_of(fq->q.fqdir, struct net, ipv6.fqdir);
ip6frag_expire_frag_queue(net, fq);
}
......@@ -100,7 +100,7 @@ fq_find(struct net *net, __be32 id, const struct ipv6hdr *hdr, int iif)
IPV6_ADDR_LINKLOCAL)))
key.iif = 0;
q = inet_frag_find(&net->ipv6.frags, &key);
q = inet_frag_find(&net->ipv6.fqdir, &key);
if (!q)
return NULL;
......@@ -254,7 +254,7 @@ static int ip6_frag_queue(struct frag_queue *fq, struct sk_buff *skb,
static int ip6_frag_reasm(struct frag_queue *fq, struct sk_buff *skb,
struct sk_buff *prev_tail, struct net_device *dev)
{
struct net *net = container_of(fq->q.fqdir, struct net, ipv6.frags);
struct net *net = container_of(fq->q.fqdir, struct net, ipv6.fqdir);
unsigned int nhoff;
void *reasm_data;
int payload_len;
......@@ -401,23 +401,23 @@ static const struct inet6_protocol frag_protocol = {
static struct ctl_table ip6_frags_ns_ctl_table[] = {
{
.procname = "ip6frag_high_thresh",
.data = &init_net.ipv6.frags.high_thresh,
.data = &init_net.ipv6.fqdir.high_thresh,
.maxlen = sizeof(unsigned long),
.mode = 0644,
.proc_handler = proc_doulongvec_minmax,
.extra1 = &init_net.ipv6.frags.low_thresh
.extra1 = &init_net.ipv6.fqdir.low_thresh
},
{
.procname = "ip6frag_low_thresh",
.data = &init_net.ipv6.frags.low_thresh,
.data = &init_net.ipv6.fqdir.low_thresh,
.maxlen = sizeof(unsigned long),
.mode = 0644,
.proc_handler = proc_doulongvec_minmax,
.extra2 = &init_net.ipv6.frags.high_thresh
.extra2 = &init_net.ipv6.fqdir.high_thresh
},
{
.procname = "ip6frag_time",
.data = &init_net.ipv6.frags.timeout,
.data = &init_net.ipv6.fqdir.timeout,
.maxlen = sizeof(int),
.mode = 0644,
.proc_handler = proc_dointvec_jiffies,
......@@ -449,11 +449,11 @@ static int __net_init ip6_frags_ns_sysctl_register(struct net *net)
if (!table)
goto err_alloc;
table[0].data = &net->ipv6.frags.high_thresh;
table[0].extra1 = &net->ipv6.frags.low_thresh;
table[1].data = &net->ipv6.frags.low_thresh;
table[1].extra2 = &net->ipv6.frags.high_thresh;
table[2].data = &net->ipv6.frags.timeout;
table[0].data = &net->ipv6.fqdir.high_thresh;
table[0].extra1 = &net->ipv6.fqdir.low_thresh;
table[1].data = &net->ipv6.fqdir.low_thresh;
table[1].extra2 = &net->ipv6.fqdir.high_thresh;
table[2].data = &net->ipv6.fqdir.timeout;
}
hdr = register_net_sysctl(net, "net/ipv6", table);
......@@ -517,25 +517,25 @@ static int __net_init ipv6_frags_init_net(struct net *net)
{
int res;
net->ipv6.frags.high_thresh = IPV6_FRAG_HIGH_THRESH;
net->ipv6.frags.low_thresh = IPV6_FRAG_LOW_THRESH;
net->ipv6.frags.timeout = IPV6_FRAG_TIMEOUT;
net->ipv6.frags.f = &ip6_frags;
net->ipv6.fqdir.high_thresh = IPV6_FRAG_HIGH_THRESH;
net->ipv6.fqdir.low_thresh = IPV6_FRAG_LOW_THRESH;
net->ipv6.fqdir.timeout = IPV6_FRAG_TIMEOUT;
net->ipv6.fqdir.f = &ip6_frags;
res = inet_frags_init_net(&net->ipv6.frags);
res = inet_frags_init_net(&net->ipv6.fqdir);
if (res < 0)
return res;
res = ip6_frags_ns_sysctl_register(net);
if (res < 0)
fqdir_exit(&net->ipv6.frags);
fqdir_exit(&net->ipv6.fqdir);
return res;
}
static void __net_exit ipv6_frags_exit_net(struct net *net)
{
ip6_frags_ns_sysctl_unregister(net);
fqdir_exit(&net->ipv6.frags);
fqdir_exit(&net->ipv6.fqdir);
}
static struct pernet_operations ip6_frags_ops = {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7