lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[INET]: Move common fields from frag_queues in one place.

Browse Source 
Introduce the struct inet_frag_queue in include/net/inet_frag.h
file and place there all the common fields from three structs:

 * struct ipq in ipv4/ip_fragment.c
 * struct nf_ct_frag6_queue in nf_conntrack_reasm.c
 * struct frag_queue in ipv6/reassembly.c

After this, replace these fields on appropriate structures with
this structure instance and fix the users to use correct names
i.e. hunks like

-    atomic_dec(&fq->refcnt);
+    atomic_dec(&fq->q.refcnt);

(these occupy most of the patch)

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Pavel Emelyanov
2007-10-15 02:24:19 -07:00
committed by David S. Miller
parent 114342f2d3
commit 5ab11c98d3
4 changed files with 238 additions and 250 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
include/net/inet_frag.h Normal file
View File

@@ -0,0 +1,21 @@
#ifndef __NET_FRAG_H__
#define __NET_FRAG_H__
struct inet_frag_queue {
struct hlist_node list;
struct list_head lru_list; /* lru list member */
spinlock_t lock;
atomic_t refcnt;
struct timer_list timer; /* when will this queue expire? */
struct sk_buff *fragments; /* list of received fragments */
ktime_t stamp;
int len; /* total length of orig datagram */
int meat;
__u8 last_in; /* first/last segment arrived? */
#define COMPLETE 4
#define FIRST_IN 2
#define LAST_IN 1
};
#endif

177
net/ipv4/ip_fragment.c
View File

@@ -39,6 +39,7 @@
#include <net/icmp.h> #include <net/icmp.h>
#include <net/checksum.h> #include <net/checksum.h>
#include <net/inetpeer.h> #include <net/inetpeer.h>
#include <net/inet_frag.h>
#include <linux/tcp.h> #include <linux/tcp.h>
#include <linux/udp.h> #include <linux/udp.h>
#include <linux/inet.h> #include <linux/inet.h>
@@ -74,25 +75,13 @@ struct ipfrag_skb_cb
/* Describe an entry in the "incomplete datagrams" queue. */ /* Describe an entry in the "incomplete datagrams" queue. */
struct ipq { struct ipq {
struct hlist_node list; struct inet_frag_queue q;
struct list_head lru_list; /* lru list member */
u32 user; u32 user;
__be32 saddr; __be32 saddr;
__be32 daddr; __be32 daddr;
__be16 id; __be16 id;
u8 protocol; u8 protocol;
u8 last_in;
#define COMPLETE 4
#define FIRST_IN 2
#define LAST_IN 1
struct sk_buff *fragments; /* linked list of received fragments */
int len; /* total length of original datagram */
int meat;
spinlock_t lock;
atomic_t refcnt;
struct timer_list timer; /* when will this queue expire? */
ktime_t stamp;
int iif; int iif;
unsigned int rid; unsigned int rid;
struct inet_peer *peer; struct inet_peer *peer;
@@ -114,8 +103,8 @@ static int ip_frag_reasm(struct ipq *qp, struct sk_buff *prev,
static __inline__ void __ipq_unlink(struct ipq *qp) static __inline__ void __ipq_unlink(struct ipq *qp)
{ {
hlist_del(&qp->list); hlist_del(&qp->q.list);
list_del(&qp->lru_list); list_del(&qp->q.lru_list);
ip_frag_nqueues--; ip_frag_nqueues--;
} }
@@ -147,15 +136,15 @@ static void ipfrag_secret_rebuild(unsigned long dummy)
struct ipq *q; struct ipq *q;
struct hlist_node *p, *n; struct hlist_node *p, *n;
hlist_for_each_entry_safe(q, p, n, &ipq_hash[i], list) { hlist_for_each_entry_safe(q, p, n, &ipq_hash[i], q.list) {
unsigned int hval = ipqhashfn(q->id, q->saddr, unsigned int hval = ipqhashfn(q->id, q->saddr,
q->daddr, q->protocol); q->daddr, q->protocol);
if (hval != i) { if (hval != i) {
hlist_del(&q->list); hlist_del(&q->q.list);
/* Relink to new hash chain. */ /* Relink to new hash chain. */
hlist_add_head(&q->list, &ipq_hash[hval]); hlist_add_head(&q->q.list, &ipq_hash[hval]);
} }
} }
} }
@@ -201,14 +190,14 @@ static void ip_frag_destroy(struct ipq *qp, int *work)
{ {
struct sk_buff *fp; struct sk_buff *fp;
BUG_TRAP(qp->last_in&COMPLETE); BUG_TRAP(qp->q.last_in&COMPLETE);
BUG_TRAP(del_timer(&qp->timer) == 0); BUG_TRAP(del_timer(&qp->q.timer) == 0);
if (qp->peer) if (qp->peer)
inet_putpeer(qp->peer); inet_putpeer(qp->peer);
/* Release all fragment data. */ /* Release all fragment data. */
fp = qp->fragments; fp = qp->q.fragments;
while (fp) { while (fp) {
struct sk_buff *xp = fp->next; struct sk_buff *xp = fp->next;
@@ -222,7 +211,7 @@ static void ip_frag_destroy(struct ipq *qp, int *work)
static __inline__ void ipq_put(struct ipq *ipq, int *work) static __inline__ void ipq_put(struct ipq *ipq, int *work)
{ {
if (atomic_dec_and_test(&ipq->refcnt)) if (atomic_dec_and_test(&ipq->q.refcnt))
ip_frag_destroy(ipq, work); ip_frag_destroy(ipq, work);
} }
@@ -231,13 +220,13 @@ static __inline__ void ipq_put(struct ipq *ipq, int *work)
*/ */
static void ipq_kill(struct ipq *ipq) static void ipq_kill(struct ipq *ipq)
{ {
if (del_timer(&ipq->timer)) if (del_timer(&ipq->q.timer))
atomic_dec(&ipq->refcnt); atomic_dec(&ipq->q.refcnt);
if (!(ipq->last_in & COMPLETE)) { if (!(ipq->q.last_in & COMPLETE)) {
ipq_unlink(ipq); ipq_unlink(ipq);
atomic_dec(&ipq->refcnt); atomic_dec(&ipq->q.refcnt);
ipq->last_in |= COMPLETE; ipq->q.last_in |= COMPLETE;
} }
} }
@@ -261,14 +250,14 @@ static void ip_evictor(void)
return; return;
} }
tmp = ipq_lru_list.next; tmp = ipq_lru_list.next;
qp = list_entry(tmp, struct ipq, lru_list); qp = list_entry(tmp, struct ipq, q.lru_list);
atomic_inc(&qp->refcnt); atomic_inc(&qp->q.refcnt);
read_unlock(&ipfrag_lock); read_unlock(&ipfrag_lock);
spin_lock(&qp->lock); spin_lock(&qp->q.lock);
if (!(qp->last_in&COMPLETE)) if (!(qp->q.last_in&COMPLETE))
ipq_kill(qp); ipq_kill(qp);
spin_unlock(&qp->lock); spin_unlock(&qp->q.lock);
ipq_put(qp, &work); ipq_put(qp, &work);
IP_INC_STATS_BH(IPSTATS_MIB_REASMFAILS); IP_INC_STATS_BH(IPSTATS_MIB_REASMFAILS);
@@ -282,9 +271,9 @@ static void ip_expire(unsigned long arg)
{ {
struct ipq *qp = (struct ipq *) arg; struct ipq *qp = (struct ipq *) arg;
spin_lock(&qp->lock); spin_lock(&qp->q.lock);
if (qp->last_in & COMPLETE) if (qp->q.last_in & COMPLETE)
goto out; goto out;
ipq_kill(qp); ipq_kill(qp);
@@ -292,8 +281,8 @@ static void ip_expire(unsigned long arg)
IP_INC_STATS_BH(IPSTATS_MIB_REASMTIMEOUT); IP_INC_STATS_BH(IPSTATS_MIB_REASMTIMEOUT);
IP_INC_STATS_BH(IPSTATS_MIB_REASMFAILS); IP_INC_STATS_BH(IPSTATS_MIB_REASMFAILS);
if ((qp->last_in&FIRST_IN) && qp->fragments != NULL) { if ((qp->q.last_in&FIRST_IN) && qp->q.fragments != NULL) {
struct sk_buff *head = qp->fragments; struct sk_buff *head = qp->q.fragments;
/* Send an ICMP "Fragment Reassembly Timeout" message. */ /* Send an ICMP "Fragment Reassembly Timeout" message. */
if ((head->dev = dev_get_by_index(&init_net, qp->iif)) != NULL) { if ((head->dev = dev_get_by_index(&init_net, qp->iif)) != NULL) {
icmp_send(head, ICMP_TIME_EXCEEDED, ICMP_EXC_FRAGTIME, 0); icmp_send(head, ICMP_TIME_EXCEEDED, ICMP_EXC_FRAGTIME, 0);
@@ -301,7 +290,7 @@ static void ip_expire(unsigned long arg)
} }
} }
out: out:
spin_unlock(&qp->lock); spin_unlock(&qp->q.lock);
ipq_put(qp, NULL); ipq_put(qp, NULL);
} }
@@ -323,15 +312,15 @@ static struct ipq *ip_frag_intern(struct ipq *qp_in)
* such entry could be created on other cpu, while we * such entry could be created on other cpu, while we
* promoted read lock to write lock. * promoted read lock to write lock.
*/ */
hlist_for_each_entry(qp, n, &ipq_hash[hash], list) { hlist_for_each_entry(qp, n, &ipq_hash[hash], q.list) {
if (qp->id == qp_in->id && if (qp->id == qp_in->id &&
qp->saddr == qp_in->saddr && qp->saddr == qp_in->saddr &&
qp->daddr == qp_in->daddr && qp->daddr == qp_in->daddr &&
qp->protocol == qp_in->protocol && qp->protocol == qp_in->protocol &&
qp->user == qp_in->user) { qp->user == qp_in->user) {
atomic_inc(&qp->refcnt); atomic_inc(&qp->q.refcnt);
write_unlock(&ipfrag_lock); write_unlock(&ipfrag_lock);
qp_in->last_in |= COMPLETE; qp_in->q.last_in |= COMPLETE;
ipq_put(qp_in, NULL); ipq_put(qp_in, NULL);
return qp; return qp;
} }
@@ -339,13 +328,13 @@ static struct ipq *ip_frag_intern(struct ipq *qp_in)
#endif #endif
qp = qp_in; qp = qp_in;
if (!mod_timer(&qp->timer, jiffies + sysctl_ipfrag_time)) if (!mod_timer(&qp->q.timer, jiffies + sysctl_ipfrag_time))
atomic_inc(&qp->refcnt); atomic_inc(&qp->q.refcnt);
atomic_inc(&qp->refcnt); atomic_inc(&qp->q.refcnt);
hlist_add_head(&qp->list, &ipq_hash[hash]); hlist_add_head(&qp->q.list, &ipq_hash[hash]);
INIT_LIST_HEAD(&qp->lru_list); INIT_LIST_HEAD(&qp->q.lru_list);
list_add_tail(&qp->lru_list, &ipq_lru_list); list_add_tail(&qp->q.lru_list, &ipq_lru_list);
ip_frag_nqueues++; ip_frag_nqueues++;
write_unlock(&ipfrag_lock); write_unlock(&ipfrag_lock);
return qp; return qp;
@@ -360,23 +349,23 @@ static struct ipq *ip_frag_create(struct iphdr *iph, u32 user)
goto out_nomem; goto out_nomem;
qp->protocol = iph->protocol; qp->protocol = iph->protocol;
qp->last_in = 0; qp->q.last_in = 0;
qp->id = iph->id; qp->id = iph->id;
qp->saddr = iph->saddr; qp->saddr = iph->saddr;
qp->daddr = iph->daddr; qp->daddr = iph->daddr;
qp->user = user; qp->user = user;
qp->len = 0; qp->q.len = 0;
qp->meat = 0; qp->q.meat = 0;
qp->fragments = NULL; qp->q.fragments = NULL;
qp->iif = 0; qp->iif = 0;
qp->peer = sysctl_ipfrag_max_dist ? inet_getpeer(iph->saddr, 1) : NULL; qp->peer = sysctl_ipfrag_max_dist ? inet_getpeer(iph->saddr, 1) : NULL;
/* Initialize a timer for this entry. */ /* Initialize a timer for this entry. */
init_timer(&qp->timer); init_timer(&qp->q.timer);
qp->timer.data = (unsigned long) qp; /* pointer to queue */ qp->q.timer.data = (unsigned long) qp; /* pointer to queue */
qp->timer.function = ip_expire; /* expire function */ qp->q.timer.function = ip_expire; /* expire function */
spin_lock_init(&qp->lock); spin_lock_init(&qp->q.lock);
atomic_set(&qp->refcnt, 1); atomic_set(&qp->q.refcnt, 1);
return ip_frag_intern(qp); return ip_frag_intern(qp);
@@ -400,13 +389,13 @@ static inline struct ipq *ip_find(struct iphdr *iph, u32 user)
read_lock(&ipfrag_lock); read_lock(&ipfrag_lock);
hash = ipqhashfn(id, saddr, daddr, protocol); hash = ipqhashfn(id, saddr, daddr, protocol);
hlist_for_each_entry(qp, n, &ipq_hash[hash], list) { hlist_for_each_entry(qp, n, &ipq_hash[hash], q.list) {
if (qp->id == id && if (qp->id == id &&
qp->saddr == saddr && qp->saddr == saddr &&
qp->daddr == daddr && qp->daddr == daddr &&
qp->protocol == protocol && qp->protocol == protocol &&
qp->user == user) { qp->user == user) {
atomic_inc(&qp->refcnt); atomic_inc(&qp->q.refcnt);
read_unlock(&ipfrag_lock); read_unlock(&ipfrag_lock);
return qp; return qp;
} }
@@ -432,7 +421,7 @@ static inline int ip_frag_too_far(struct ipq *qp)
end = atomic_inc_return(&peer->rid); end = atomic_inc_return(&peer->rid);
qp->rid = end; qp->rid = end;
rc = qp->fragments && (end - start) > max; rc = qp->q.fragments && (end - start) > max;
if (rc) { if (rc) {
IP_INC_STATS_BH(IPSTATS_MIB_REASMFAILS); IP_INC_STATS_BH(IPSTATS_MIB_REASMFAILS);
@@ -445,22 +434,22 @@ static int ip_frag_reinit(struct ipq *qp)
{ {
struct sk_buff *fp; struct sk_buff *fp;
if (!mod_timer(&qp->timer, jiffies + sysctl_ipfrag_time)) { if (!mod_timer(&qp->q.timer, jiffies + sysctl_ipfrag_time)) {
atomic_inc(&qp->refcnt); atomic_inc(&qp->q.refcnt);
return -ETIMEDOUT; return -ETIMEDOUT;
} }
fp = qp->fragments; fp = qp->q.fragments;
do { do {
struct sk_buff *xp = fp->next; struct sk_buff *xp = fp->next;
frag_kfree_skb(fp, NULL); frag_kfree_skb(fp, NULL);
fp = xp; fp = xp;
} while (fp); } while (fp);
qp->last_in = 0; qp->q.last_in = 0;
qp->len = 0; qp->q.len = 0;
qp->meat = 0; qp->q.meat = 0;
qp->fragments = NULL; qp->q.fragments = NULL;
qp->iif = 0; qp->iif = 0;
return 0; return 0;
@@ -475,7 +464,7 @@ static int ip_frag_queue(struct ipq *qp, struct sk_buff *skb)
int ihl, end; int ihl, end;
int err = -ENOENT; int err = -ENOENT;
if (qp->last_in & COMPLETE) if (qp->q.last_in & COMPLETE)
goto err; goto err;
if (!(IPCB(skb)->flags & IPSKB_FRAG_COMPLETE) && if (!(IPCB(skb)->flags & IPSKB_FRAG_COMPLETE) &&
@@ -500,22 +489,22 @@ static int ip_frag_queue(struct ipq *qp, struct sk_buff *skb)
/* If we already have some bits beyond end /* If we already have some bits beyond end
* or have different end, the segment is corrrupted. * or have different end, the segment is corrrupted.
*/ */
if (end < qp->len || if (end < qp->q.len ||
((qp->last_in & LAST_IN) && end != qp->len)) ((qp->q.last_in & LAST_IN) && end != qp->q.len))
goto err; goto err;
qp->last_in |= LAST_IN; qp->q.last_in |= LAST_IN;
qp->len = end; qp->q.len = end;
} else { } else {
if (end&7) { if (end&7) {
end &= ~7; end &= ~7;
if (skb->ip_summed != CHECKSUM_UNNECESSARY) if (skb->ip_summed != CHECKSUM_UNNECESSARY)
skb->ip_summed = CHECKSUM_NONE; skb->ip_summed = CHECKSUM_NONE;
} }
if (end > qp->len) { if (end > qp->q.len) {
/* Some bits beyond end -> corruption. */ /* Some bits beyond end -> corruption. */
if (qp->last_in & LAST_IN) if (qp->q.last_in & LAST_IN)
goto err; goto err;
qp->len = end; qp->q.len = end;
} }
} }
if (end == offset) if (end == offset)
@@ -534,7 +523,7 @@ static int ip_frag_queue(struct ipq *qp, struct sk_buff *skb)
* this fragment, right? * this fragment, right?
*/ */
prev = NULL; prev = NULL;
for (next = qp->fragments; next != NULL; next = next->next) { for (next = qp->q.fragments; next != NULL; next = next->next) {
if (FRAG_CB(next)->offset >= offset) if (FRAG_CB(next)->offset >= offset)
break; /* bingo! */ break; /* bingo! */
prev = next; prev = next;
@@ -572,7 +561,7 @@ static int ip_frag_queue(struct ipq *qp, struct sk_buff *skb)
if (!pskb_pull(next, i)) if (!pskb_pull(next, i))
goto err; goto err;
FRAG_CB(next)->offset += i; FRAG_CB(next)->offset += i;
qp->meat -= i; qp->q.meat -= i;
if (next->ip_summed != CHECKSUM_UNNECESSARY) if (next->ip_summed != CHECKSUM_UNNECESSARY)
next->ip_summed = CHECKSUM_NONE; next->ip_summed = CHECKSUM_NONE;
break; break;
@@ -587,9 +576,9 @@ static int ip_frag_queue(struct ipq *qp, struct sk_buff *skb)
if (prev) if (prev)
prev->next = next; prev->next = next;
else else
qp->fragments = next; qp->q.fragments = next;
qp->meat -= free_it->len; qp->q.meat -= free_it->len;
frag_kfree_skb(free_it, NULL); frag_kfree_skb(free_it, NULL);
} }
} }
@@ -601,24 +590,24 @@ static int ip_frag_queue(struct ipq *qp, struct sk_buff *skb)
if (prev) if (prev)
prev->next = skb; prev->next = skb;
else else
qp->fragments = skb; qp->q.fragments = skb;
dev = skb->dev; dev = skb->dev;
if (dev) { if (dev) {
qp->iif = dev->ifindex; qp->iif = dev->ifindex;
skb->dev = NULL; skb->dev = NULL;
} }
qp->stamp = skb->tstamp; qp->q.stamp = skb->tstamp;
qp->meat += skb->len; qp->q.meat += skb->len;
atomic_add(skb->truesize, &ip_frag_mem); atomic_add(skb->truesize, &ip_frag_mem);
if (offset == 0) if (offset == 0)
qp->last_in |= FIRST_IN; qp->q.last_in |= FIRST_IN;
if (qp->last_in == (FIRST_IN | LAST_IN) && qp->meat == qp->len) if (qp->q.last_in == (FIRST_IN | LAST_IN) && qp->q.meat == qp->q.len)
return ip_frag_reasm(qp, prev, dev); return ip_frag_reasm(qp, prev, dev);
write_lock(&ipfrag_lock); write_lock(&ipfrag_lock);
list_move_tail(&qp->lru_list, &ipq_lru_list); list_move_tail(&qp->q.lru_list, &ipq_lru_list);
write_unlock(&ipfrag_lock); write_unlock(&ipfrag_lock);
return -EINPROGRESS; return -EINPROGRESS;
@@ -634,7 +623,7 @@ static int ip_frag_reasm(struct ipq *qp, struct sk_buff *prev,
struct net_device *dev) struct net_device *dev)
{ {
struct iphdr *iph; struct iphdr *iph;
struct sk_buff *fp, *head = qp->fragments; struct sk_buff *fp, *head = qp->q.fragments;
int len; int len;
int ihlen; int ihlen;
int err; int err;
@@ -652,11 +641,11 @@ static int ip_frag_reasm(struct ipq *qp, struct sk_buff *prev,
fp->next = head->next; fp->next = head->next;
prev->next = fp; prev->next = fp;
skb_morph(head, qp->fragments); skb_morph(head, qp->q.fragments);
head->next = qp->fragments->next; head->next = qp->q.fragments->next;
kfree_skb(qp->fragments); kfree_skb(qp->q.fragments);
qp->fragments = head; qp->q.fragments = head;
} }
BUG_TRAP(head != NULL); BUG_TRAP(head != NULL);
@@ -664,7 +653,7 @@ static int ip_frag_reasm(struct ipq *qp, struct sk_buff *prev,
/* Allocate a new buffer for the datagram. */ /* Allocate a new buffer for the datagram. */
ihlen = ip_hdrlen(head); ihlen = ip_hdrlen(head);
len = ihlen + qp->len; len = ihlen + qp->q.len;
err = -E2BIG; err = -E2BIG;
if (len > 65535) if (len > 65535)
@@ -715,13 +704,13 @@ static int ip_frag_reasm(struct ipq *qp, struct sk_buff *prev,
head->next = NULL; head->next = NULL;
head->dev = dev; head->dev = dev;
head->tstamp = qp->stamp; head->tstamp = qp->q.stamp;
iph = ip_hdr(head); iph = ip_hdr(head);
iph->frag_off = 0; iph->frag_off = 0;
iph->tot_len = htons(len); iph->tot_len = htons(len);
IP_INC_STATS_BH(IPSTATS_MIB_REASMOKS); IP_INC_STATS_BH(IPSTATS_MIB_REASMOKS);
qp->fragments = NULL; qp->q.fragments = NULL;
return 0; return 0;
out_nomem: out_nomem:
@@ -753,11 +742,11 @@ int ip_defrag(struct sk_buff *skb, u32 user)
if ((qp = ip_find(ip_hdr(skb), user)) != NULL) { if ((qp = ip_find(ip_hdr(skb), user)) != NULL) {
int ret; int ret;
spin_lock(&qp->lock); spin_lock(&qp->q.lock);
ret = ip_frag_queue(qp, skb); ret = ip_frag_queue(qp, skb);
spin_unlock(&qp->lock); spin_unlock(&qp->q.lock);
ipq_put(qp, NULL); ipq_put(qp, NULL);
return ret; return ret;
} }

137
net/ipv6/netfilter/nf_conntrack_reasm.c
View File

@@ -31,6 +31,7 @@
#include <net/sock.h> #include <net/sock.h>
#include <net/snmp.h> #include <net/snmp.h>
#include <net/inet_frag.h>
#include <net/ipv6.h> #include <net/ipv6.h>
#include <net/protocol.h> #include <net/protocol.h>
@@ -63,25 +64,13 @@ struct nf_ct_frag6_skb_cb
struct nf_ct_frag6_queue struct nf_ct_frag6_queue
{ {
struct hlist_node list; struct inet_frag_queue q;
struct list_head lru_list; /* lru list member */
__be32 id; /* fragment id */ __be32 id; /* fragment id */
struct in6_addr saddr; struct in6_addr saddr;
struct in6_addr daddr; struct in6_addr daddr;
spinlock_t lock;
atomic_t refcnt;
struct timer_list timer; /* expire timer */
struct sk_buff *fragments;
int len;
int meat;
ktime_t stamp;
unsigned int csum; unsigned int csum;
__u8 last_in; /* has first/last segment arrived? */
#define COMPLETE 4
#define FIRST_IN 2
#define LAST_IN 1
__u16 nhoffset; __u16 nhoffset;
}; };
@@ -97,8 +86,8 @@ int nf_ct_frag6_nqueues = 0;
static __inline__ void __fq_unlink(struct nf_ct_frag6_queue *fq) static __inline__ void __fq_unlink(struct nf_ct_frag6_queue *fq)
{ {
hlist_del(&fq->list); hlist_del(&fq->q.list);
list_del(&fq->lru_list); list_del(&fq->q.lru_list);
nf_ct_frag6_nqueues--; nf_ct_frag6_nqueues--;
} }
@@ -150,14 +139,14 @@ static void nf_ct_frag6_secret_rebuild(unsigned long dummy)
struct nf_ct_frag6_queue *q; struct nf_ct_frag6_queue *q;
struct hlist_node *p, *n; struct hlist_node *p, *n;
hlist_for_each_entry_safe(q, p, n, &nf_ct_frag6_hash[i], list) { hlist_for_each_entry_safe(q, p, n, &nf_ct_frag6_hash[i], q.list) {
unsigned int hval = ip6qhashfn(q->id, unsigned int hval = ip6qhashfn(q->id,
&q->saddr, &q->saddr,
&q->daddr); &q->daddr);
if (hval != i) { if (hval != i) {
hlist_del(&q->list); hlist_del(&q->q.list);
/* Relink to new hash chain. */ /* Relink to new hash chain. */
hlist_add_head(&q->list, hlist_add_head(&q->q.list,
&nf_ct_frag6_hash[hval]); &nf_ct_frag6_hash[hval]);
} }
} }
@@ -208,11 +197,11 @@ static void nf_ct_frag6_destroy(struct nf_ct_frag6_queue *fq,
{ {
struct sk_buff *fp; struct sk_buff *fp;
BUG_TRAP(fq->last_in&COMPLETE); BUG_TRAP(fq->q.last_in&COMPLETE);
BUG_TRAP(del_timer(&fq->timer) == 0); BUG_TRAP(del_timer(&fq->q.timer) == 0);
/* Release all fragment data. */ /* Release all fragment data. */
fp = fq->fragments; fp = fq->q.fragments;
while (fp) { while (fp) {
struct sk_buff *xp = fp->next; struct sk_buff *xp = fp->next;
@@ -225,7 +214,7 @@ static void nf_ct_frag6_destroy(struct nf_ct_frag6_queue *fq,
static __inline__ void fq_put(struct nf_ct_frag6_queue *fq, unsigned int *work) static __inline__ void fq_put(struct nf_ct_frag6_queue *fq, unsigned int *work)
{ {
if (atomic_dec_and_test(&fq->refcnt)) if (atomic_dec_and_test(&fq->q.refcnt))
nf_ct_frag6_destroy(fq, work); nf_ct_frag6_destroy(fq, work);
} }
@@ -234,13 +223,13 @@ static __inline__ void fq_put(struct nf_ct_frag6_queue *fq, unsigned int *work)
*/ */
static __inline__ void fq_kill(struct nf_ct_frag6_queue *fq) static __inline__ void fq_kill(struct nf_ct_frag6_queue *fq)
{ {
if (del_timer(&fq->timer)) if (del_timer(&fq->q.timer))
atomic_dec(&fq->refcnt); atomic_dec(&fq->q.refcnt);
if (!(fq->last_in & COMPLETE)) { if (!(fq->q.last_in & COMPLETE)) {
fq_unlink(fq); fq_unlink(fq);
atomic_dec(&fq->refcnt); atomic_dec(&fq->q.refcnt);
fq->last_in |= COMPLETE; fq->q.last_in |= COMPLETE;
} }
} }
@@ -263,14 +252,14 @@ static void nf_ct_frag6_evictor(void)
} }
tmp = nf_ct_frag6_lru_list.next; tmp = nf_ct_frag6_lru_list.next;
BUG_ON(tmp == NULL); BUG_ON(tmp == NULL);
fq = list_entry(tmp, struct nf_ct_frag6_queue, lru_list); fq = list_entry(tmp, struct nf_ct_frag6_queue, q.lru_list);
atomic_inc(&fq->refcnt); atomic_inc(&fq->q.refcnt);
read_unlock(&nf_ct_frag6_lock); read_unlock(&nf_ct_frag6_lock);
spin_lock(&fq->lock); spin_lock(&fq->q.lock);
if (!(fq->last_in&COMPLETE)) if (!(fq->q.last_in&COMPLETE))
fq_kill(fq); fq_kill(fq);
spin_unlock(&fq->lock); spin_unlock(&fq->q.lock);
fq_put(fq, &work); fq_put(fq, &work);
} }
@@ -280,15 +269,15 @@ static void nf_ct_frag6_expire(unsigned long data)
{ {
struct nf_ct_frag6_queue *fq = (struct nf_ct_frag6_queue *) data; struct nf_ct_frag6_queue *fq = (struct nf_ct_frag6_queue *) data;
spin_lock(&fq->lock); spin_lock(&fq->q.lock);
if (fq->last_in & COMPLETE) if (fq->q.last_in & COMPLETE)
goto out; goto out;
fq_kill(fq); fq_kill(fq);
out: out:
spin_unlock(&fq->lock); spin_unlock(&fq->q.lock);
fq_put(fq, NULL); fq_put(fq, NULL);
} }
@@ -304,13 +293,13 @@ static struct nf_ct_frag6_queue *nf_ct_frag6_intern(unsigned int hash,
write_lock(&nf_ct_frag6_lock); write_lock(&nf_ct_frag6_lock);
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
hlist_for_each_entry(fq, n, &nf_ct_frag6_hash[hash], list) { hlist_for_each_entry(fq, n, &nf_ct_frag6_hash[hash], q.list) {
if (fq->id == fq_in->id && if (fq->id == fq_in->id &&
ipv6_addr_equal(&fq_in->saddr, &fq->saddr) && ipv6_addr_equal(&fq_in->saddr, &fq->saddr) &&
ipv6_addr_equal(&fq_in->daddr, &fq->daddr)) { ipv6_addr_equal(&fq_in->daddr, &fq->daddr)) {
atomic_inc(&fq->refcnt); atomic_inc(&fq->q.refcnt);
write_unlock(&nf_ct_frag6_lock); write_unlock(&nf_ct_frag6_lock);
fq_in->last_in |= COMPLETE; fq_in->q.last_in |= COMPLETE;
fq_put(fq_in, NULL); fq_put(fq_in, NULL);
return fq; return fq;
} }
@@ -318,13 +307,13 @@ static struct nf_ct_frag6_queue *nf_ct_frag6_intern(unsigned int hash,
#endif #endif
fq = fq_in; fq = fq_in;
if (!mod_timer(&fq->timer, jiffies + nf_ct_frag6_timeout)) if (!mod_timer(&fq->q.timer, jiffies + nf_ct_frag6_timeout))
atomic_inc(&fq->refcnt); atomic_inc(&fq->q.refcnt);
atomic_inc(&fq->refcnt); atomic_inc(&fq->q.refcnt);
hlist_add_head(&fq->list, &nf_ct_frag6_hash[hash]); hlist_add_head(&fq->q.list, &nf_ct_frag6_hash[hash]);
INIT_LIST_HEAD(&fq->lru_list); INIT_LIST_HEAD(&fq->q.lru_list);
list_add_tail(&fq->lru_list, &nf_ct_frag6_lru_list); list_add_tail(&fq->q.lru_list, &nf_ct_frag6_lru_list);
nf_ct_frag6_nqueues++; nf_ct_frag6_nqueues++;
write_unlock(&nf_ct_frag6_lock); write_unlock(&nf_ct_frag6_lock);
return fq; return fq;
@@ -347,9 +336,9 @@ nf_ct_frag6_create(unsigned int hash, __be32 id, struct in6_addr *src, str
ipv6_addr_copy(&fq->saddr, src); ipv6_addr_copy(&fq->saddr, src);
ipv6_addr_copy(&fq->daddr, dst); ipv6_addr_copy(&fq->daddr, dst);
setup_timer(&fq->timer, nf_ct_frag6_expire, (unsigned long)fq); setup_timer(&fq->q.timer, nf_ct_frag6_expire, (unsigned long)fq);
spin_lock_init(&fq->lock); spin_lock_init(&fq->q.lock);
atomic_set(&fq->refcnt, 1); atomic_set(&fq->q.refcnt, 1);
return nf_ct_frag6_intern(hash, fq); return nf_ct_frag6_intern(hash, fq);
@@ -365,11 +354,11 @@ fq_find(__be32 id, struct in6_addr *src, struct in6_addr *dst)
unsigned int hash = ip6qhashfn(id, src, dst); unsigned int hash = ip6qhashfn(id, src, dst);
read_lock(&nf_ct_frag6_lock); read_lock(&nf_ct_frag6_lock);
hlist_for_each_entry(fq, n, &nf_ct_frag6_hash[hash], list) { hlist_for_each_entry(fq, n, &nf_ct_frag6_hash[hash], q.list) {
if (fq->id == id && if (fq->id == id &&
ipv6_addr_equal(src, &fq->saddr) && ipv6_addr_equal(src, &fq->saddr) &&
ipv6_addr_equal(dst, &fq->daddr)) { ipv6_addr_equal(dst, &fq->daddr)) {
atomic_inc(&fq->refcnt); atomic_inc(&fq->q.refcnt);
read_unlock(&nf_ct_frag6_lock); read_unlock(&nf_ct_frag6_lock);
return fq; return fq;
} }
@@ -386,7 +375,7 @@ static int nf_ct_frag6_queue(struct nf_ct_frag6_queue *fq, struct sk_buff *skb,
struct sk_buff *prev, *next; struct sk_buff *prev, *next;
int offset, end; int offset, end;
if (fq->last_in & COMPLETE) { if (fq->q.last_in & COMPLETE) {
pr_debug("Allready completed\n"); pr_debug("Allready completed\n");
goto err; goto err;
} }
@@ -412,13 +401,13 @@ static int nf_ct_frag6_queue(struct nf_ct_frag6_queue *fq, struct sk_buff *skb,
/* If we already have some bits beyond end /* If we already have some bits beyond end
* or have different end, the segment is corrupted. * or have different end, the segment is corrupted.
*/ */
if (end < fq->len || if (end < fq->q.len ||
((fq->last_in & LAST_IN) && end != fq->len)) { ((fq->q.last_in & LAST_IN) && end != fq->q.len)) {
pr_debug("already received last fragment\n"); pr_debug("already received last fragment\n");
goto err; goto err;
} }
fq->last_in |= LAST_IN; fq->q.last_in |= LAST_IN;
fq->len = end; fq->q.len = end;
} else { } else {
/* Check if the fragment is rounded to 8 bytes. /* Check if the fragment is rounded to 8 bytes.
* Required by the RFC. * Required by the RFC.
@@ -430,13 +419,13 @@ static int nf_ct_frag6_queue(struct nf_ct_frag6_queue *fq, struct sk_buff *skb,
pr_debug("end of fragment not rounded to 8 bytes.\n"); pr_debug("end of fragment not rounded to 8 bytes.\n");
return -1; return -1;
} }
if (end > fq->len) { if (end > fq->q.len) {
/* Some bits beyond end -> corruption. */ /* Some bits beyond end -> corruption. */
if (fq->last_in & LAST_IN) { if (fq->q.last_in & LAST_IN) {
pr_debug("last packet already reached.\n"); pr_debug("last packet already reached.\n");
goto err; goto err;
} }
fq->len = end; fq->q.len = end;
} }
} }
@@ -458,7 +447,7 @@ static int nf_ct_frag6_queue(struct nf_ct_frag6_queue *fq, struct sk_buff *skb,
* this fragment, right? * this fragment, right?
*/ */
prev = NULL; prev = NULL;
for (next = fq->fragments; next != NULL; next = next->next) { for (next = fq->q.fragments; next != NULL; next = next->next) {
if (NFCT_FRAG6_CB(next)->offset >= offset) if (NFCT_FRAG6_CB(next)->offset >= offset)
break; /* bingo! */ break; /* bingo! */
prev = next; prev = next;
@@ -503,7 +492,7 @@ static int nf_ct_frag6_queue(struct nf_ct_frag6_queue *fq, struct sk_buff *skb,
/* next fragment */ /* next fragment */
NFCT_FRAG6_CB(next)->offset += i; NFCT_FRAG6_CB(next)->offset += i;
fq->meat -= i; fq->q.meat -= i;
if (next->ip_summed != CHECKSUM_UNNECESSARY) if (next->ip_summed != CHECKSUM_UNNECESSARY)
next->ip_summed = CHECKSUM_NONE; next->ip_summed = CHECKSUM_NONE;
break; break;
@@ -518,9 +507,9 @@ static int nf_ct_frag6_queue(struct nf_ct_frag6_queue *fq, struct sk_buff *skb,
if (prev) if (prev)
prev->next = next; prev->next = next;
else else
fq->fragments = next; fq->q.fragments = next;
fq->meat -= free_it->len; fq->q.meat -= free_it->len;
frag_kfree_skb(free_it, NULL); frag_kfree_skb(free_it, NULL);
} }
} }
@@ -532,11 +521,11 @@ static int nf_ct_frag6_queue(struct nf_ct_frag6_queue *fq, struct sk_buff *skb,
if (prev) if (prev)
prev->next = skb; prev->next = skb;
else else
fq->fragments = skb; fq->q.fragments = skb;
skb->dev = NULL; skb->dev = NULL;
fq->stamp = skb->tstamp; fq->q.stamp = skb->tstamp;
fq->meat += skb->len; fq->q.meat += skb->len;
atomic_add(skb->truesize, &nf_ct_frag6_mem); atomic_add(skb->truesize, &nf_ct_frag6_mem);
/* The first fragment. /* The first fragment.
@@ -544,10 +533,10 @@ static int nf_ct_frag6_queue(struct nf_ct_frag6_queue *fq, struct sk_buff *skb,
*/ */
if (offset == 0) { if (offset == 0) {
fq->nhoffset = nhoff; fq->nhoffset = nhoff;
fq->last_in |= FIRST_IN; fq->q.last_in |= FIRST_IN;
} }
write_lock(&nf_ct_frag6_lock); write_lock(&nf_ct_frag6_lock);
list_move_tail(&fq->lru_list, &nf_ct_frag6_lru_list); list_move_tail(&fq->q.lru_list, &nf_ct_frag6_lru_list);
write_unlock(&nf_ct_frag6_lock); write_unlock(&nf_ct_frag6_lock);
return 0; return 0;
@@ -567,7 +556,7 @@ err:
static struct sk_buff * static struct sk_buff *
nf_ct_frag6_reasm(struct nf_ct_frag6_queue *fq, struct net_device *dev) nf_ct_frag6_reasm(struct nf_ct_frag6_queue *fq, struct net_device *dev)
{ {
struct sk_buff *fp, *op, *head = fq->fragments; struct sk_buff *fp, *op, *head = fq->q.fragments;
int payload_len; int payload_len;
fq_kill(fq); fq_kill(fq);
@@ -577,7 +566,7 @@ nf_ct_frag6_reasm(struct nf_ct_frag6_queue *fq, struct net_device *dev)
/* Unfragmented part is taken from the first segment. */ /* Unfragmented part is taken from the first segment. */
payload_len = ((head->data - skb_network_header(head)) - payload_len = ((head->data - skb_network_header(head)) -
sizeof(struct ipv6hdr) + fq->len - sizeof(struct ipv6hdr) + fq->q.len -
sizeof(struct frag_hdr)); sizeof(struct frag_hdr));
if (payload_len > IPV6_MAXPLEN) { if (payload_len > IPV6_MAXPLEN) {
pr_debug("payload len is too large.\n"); pr_debug("payload len is too large.\n");
@@ -643,7 +632,7 @@ nf_ct_frag6_reasm(struct nf_ct_frag6_queue *fq, struct net_device *dev)
head->next = NULL; head->next = NULL;
head->dev = dev; head->dev = dev;
head->tstamp = fq->stamp; head->tstamp = fq->q.stamp;
ipv6_hdr(head)->payload_len = htons(payload_len); ipv6_hdr(head)->payload_len = htons(payload_len);
/* Yes, and fold redundant checksum back. 8) */ /* Yes, and fold redundant checksum back. 8) */
@@ -652,7 +641,7 @@ nf_ct_frag6_reasm(struct nf_ct_frag6_queue *fq, struct net_device *dev)
skb_network_header_len(head), skb_network_header_len(head),
head->csum); head->csum);
fq->fragments = NULL; fq->q.fragments = NULL;
/* all original skbs are linked into the NFCT_FRAG6_CB(head).orig */ /* all original skbs are linked into the NFCT_FRAG6_CB(head).orig */
fp = skb_shinfo(head)->frag_list; fp = skb_shinfo(head)->frag_list;
@@ -797,21 +786,21 @@ struct sk_buff *nf_ct_frag6_gather(struct sk_buff *skb)
goto ret_orig; goto ret_orig;
} }
spin_lock(&fq->lock); spin_lock(&fq->q.lock);
if (nf_ct_frag6_queue(fq, clone, fhdr, nhoff) < 0) { if (nf_ct_frag6_queue(fq, clone, fhdr, nhoff) < 0) {
spin_unlock(&fq->lock); spin_unlock(&fq->q.lock);
pr_debug("Can't insert skb to queue\n"); pr_debug("Can't insert skb to queue\n");
fq_put(fq, NULL); fq_put(fq, NULL);
goto ret_orig; goto ret_orig;
} }
if (fq->last_in == (FIRST_IN|LAST_IN) && fq->meat == fq->len) { if (fq->q.last_in == (FIRST_IN|LAST_IN) && fq->q.meat == fq->q.len) {
ret_skb = nf_ct_frag6_reasm(fq, dev); ret_skb = nf_ct_frag6_reasm(fq, dev);
if (ret_skb == NULL) if (ret_skb == NULL)
pr_debug("Can't reassemble fragmented packets\n"); pr_debug("Can't reassemble fragmented packets\n");
} }
spin_unlock(&fq->lock); spin_unlock(&fq->q.lock);
fq_put(fq, NULL); fq_put(fq, NULL);
return ret_skb; return ret_skb;

153
net/ipv6/reassembly.c
View File

@@ -54,6 +54,7 @@
#include <net/rawv6.h> #include <net/rawv6.h>
#include <net/ndisc.h> #include <net/ndisc.h>
#include <net/addrconf.h> #include <net/addrconf.h>
#include <net/inet_frag.h>
int sysctl_ip6frag_high_thresh __read_mostly = 256*1024; int sysctl_ip6frag_high_thresh __read_mostly = 256*1024;
int sysctl_ip6frag_low_thresh __read_mostly = 192*1024; int sysctl_ip6frag_low_thresh __read_mostly = 192*1024;
@@ -75,26 +76,14 @@ struct ip6frag_skb_cb
struct frag_queue struct frag_queue
{ {
struct hlist_node list; struct inet_frag_queue q;
struct list_head lru_list; /* lru list member */
__be32 id; /* fragment id */ __be32 id; /* fragment id */
struct in6_addr saddr; struct in6_addr saddr;
struct in6_addr daddr; struct in6_addr daddr;
spinlock_t lock;
atomic_t refcnt;
struct timer_list timer; /* expire timer */
struct sk_buff *fragments;
int len;
int meat;
int iif; int iif;
ktime_t stamp;
unsigned int csum; unsigned int csum;
__u8 last_in; /* has first/last segment arrived? */
#define COMPLETE 4
#define FIRST_IN 2
#define LAST_IN 1
__u16 nhoffset; __u16 nhoffset;
}; };
@@ -113,8 +102,8 @@ static int ip6_frag_reasm(struct frag_queue *fq, struct sk_buff *prev,
static __inline__ void __fq_unlink(struct frag_queue *fq) static __inline__ void __fq_unlink(struct frag_queue *fq)
{ {
hlist_del(&fq->list); hlist_del(&fq->q.list);
list_del(&fq->lru_list); list_del(&fq->q.lru_list);
ip6_frag_nqueues--; ip6_frag_nqueues--;
} }
@@ -170,16 +159,16 @@ static void ip6_frag_secret_rebuild(unsigned long dummy)
struct frag_queue *q; struct frag_queue *q;
struct hlist_node *p, *n; struct hlist_node *p, *n;
hlist_for_each_entry_safe(q, p, n, &ip6_frag_hash[i], list) { hlist_for_each_entry_safe(q, p, n, &ip6_frag_hash[i], q.list) {
unsigned int hval = ip6qhashfn(q->id, unsigned int hval = ip6qhashfn(q->id,
&q->saddr, &q->saddr,
&q->daddr); &q->daddr);
if (hval != i) { if (hval != i) {
hlist_del(&q->list); hlist_del(&q->q.list);
/* Relink to new hash chain. */ /* Relink to new hash chain. */
hlist_add_head(&q->list, hlist_add_head(&q->q.list,
&ip6_frag_hash[hval]); &ip6_frag_hash[hval]);
} }
@@ -226,11 +215,11 @@ static void ip6_frag_destroy(struct frag_queue *fq, int *work)
{ {
struct sk_buff *fp; struct sk_buff *fp;
BUG_TRAP(fq->last_in&COMPLETE); BUG_TRAP(fq->q.last_in&COMPLETE);
BUG_TRAP(del_timer(&fq->timer) == 0); BUG_TRAP(del_timer(&fq->q.timer) == 0);
/* Release all fragment data. */ /* Release all fragment data. */
fp = fq->fragments; fp = fq->q.fragments;
while (fp) { while (fp) {
struct sk_buff *xp = fp->next; struct sk_buff *xp = fp->next;
@@ -243,7 +232,7 @@ static void ip6_frag_destroy(struct frag_queue *fq, int *work)
static __inline__ void fq_put(struct frag_queue *fq, int *work) static __inline__ void fq_put(struct frag_queue *fq, int *work)
{ {
if (atomic_dec_and_test(&fq->refcnt)) if (atomic_dec_and_test(&fq->q.refcnt))
ip6_frag_destroy(fq, work); ip6_frag_destroy(fq, work);
} }
@@ -252,13 +241,13 @@ static __inline__ void fq_put(struct frag_queue *fq, int *work)
*/ */
static __inline__ void fq_kill(struct frag_queue *fq) static __inline__ void fq_kill(struct frag_queue *fq)
{ {
if (del_timer(&fq->timer)) if (del_timer(&fq->q.timer))
atomic_dec(&fq->refcnt); atomic_dec(&fq->q.refcnt);
if (!(fq->last_in & COMPLETE)) { if (!(fq->q.last_in & COMPLETE)) {
fq_unlink(fq); fq_unlink(fq);
atomic_dec(&fq->refcnt); atomic_dec(&fq->q.refcnt);
fq->last_in |= COMPLETE; fq->q.last_in |= COMPLETE;
} }
} }
@@ -279,14 +268,14 @@ static void ip6_evictor(struct inet6_dev *idev)
return; return;
} }
tmp = ip6_frag_lru_list.next; tmp = ip6_frag_lru_list.next;
fq = list_entry(tmp, struct frag_queue, lru_list); fq = list_entry(tmp, struct frag_queue, q.lru_list);
atomic_inc(&fq->refcnt); atomic_inc(&fq->q.refcnt);
read_unlock(&ip6_frag_lock); read_unlock(&ip6_frag_lock);
spin_lock(&fq->lock); spin_lock(&fq->q.lock);
if (!(fq->last_in&COMPLETE)) if (!(fq->q.last_in&COMPLETE))
fq_kill(fq); fq_kill(fq);
spin_unlock(&fq->lock); spin_unlock(&fq->q.lock);
fq_put(fq, &work); fq_put(fq, &work);
IP6_INC_STATS_BH(idev, IPSTATS_MIB_REASMFAILS); IP6_INC_STATS_BH(idev, IPSTATS_MIB_REASMFAILS);
@@ -298,9 +287,9 @@ static void ip6_frag_expire(unsigned long data)
struct frag_queue *fq = (struct frag_queue *) data; struct frag_queue *fq = (struct frag_queue *) data;
struct net_device *dev = NULL; struct net_device *dev = NULL;
spin_lock(&fq->lock); spin_lock(&fq->q.lock);
if (fq->last_in & COMPLETE) if (fq->q.last_in & COMPLETE)
goto out; goto out;
fq_kill(fq); fq_kill(fq);
@@ -315,7 +304,7 @@ static void ip6_frag_expire(unsigned long data)
rcu_read_unlock(); rcu_read_unlock();
/* Don't send error if the first segment did not arrive. */ /* Don't send error if the first segment did not arrive. */
if (!(fq->last_in&FIRST_IN) || !fq->fragments) if (!(fq->q.last_in&FIRST_IN) || !fq->q.fragments)
goto out; goto out;
/* /*
@@ -323,12 +312,12 @@ static void ip6_frag_expire(unsigned long data)
segment was received. And do not use fq->dev segment was received. And do not use fq->dev
pointer directly, device might already disappeared. pointer directly, device might already disappeared.
*/ */
fq->fragments->dev = dev; fq->q.fragments->dev = dev;
icmpv6_send(fq->fragments, ICMPV6_TIME_EXCEED, ICMPV6_EXC_FRAGTIME, 0, dev); icmpv6_send(fq->q.fragments, ICMPV6_TIME_EXCEED, ICMPV6_EXC_FRAGTIME, 0, dev);
out: out:
if (dev) if (dev)
dev_put(dev); dev_put(dev);
spin_unlock(&fq->lock); spin_unlock(&fq->q.lock);
fq_put(fq, NULL); fq_put(fq, NULL);
} }
@@ -346,13 +335,13 @@ static struct frag_queue *ip6_frag_intern(struct frag_queue *fq_in)
write_lock(&ip6_frag_lock); write_lock(&ip6_frag_lock);
hash = ip6qhashfn(fq_in->id, &fq_in->saddr, &fq_in->daddr); hash = ip6qhashfn(fq_in->id, &fq_in->saddr, &fq_in->daddr);
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
hlist_for_each_entry(fq, n, &ip6_frag_hash[hash], list) { hlist_for_each_entry(fq, n, &ip6_frag_hash[hash], q.list) {
if (fq->id == fq_in->id && if (fq->id == fq_in->id &&
ipv6_addr_equal(&fq_in->saddr, &fq->saddr) && ipv6_addr_equal(&fq_in->saddr, &fq->saddr) &&
ipv6_addr_equal(&fq_in->daddr, &fq->daddr)) { ipv6_addr_equal(&fq_in->daddr, &fq->daddr)) {
atomic_inc(&fq->refcnt); atomic_inc(&fq->q.refcnt);
write_unlock(&ip6_frag_lock); write_unlock(&ip6_frag_lock);
fq_in->last_in |= COMPLETE; fq_in->q.last_in |= COMPLETE;
fq_put(fq_in, NULL); fq_put(fq_in, NULL);
return fq; return fq;
} }
@@ -360,13 +349,13 @@ static struct frag_queue *ip6_frag_intern(struct frag_queue *fq_in)
#endif #endif
fq = fq_in; fq = fq_in;
if (!mod_timer(&fq->timer, jiffies + sysctl_ip6frag_time)) if (!mod_timer(&fq->q.timer, jiffies + sysctl_ip6frag_time))
atomic_inc(&fq->refcnt); atomic_inc(&fq->q.refcnt);
atomic_inc(&fq->refcnt); atomic_inc(&fq->q.refcnt);
hlist_add_head(&fq->list, &ip6_frag_hash[hash]); hlist_add_head(&fq->q.list, &ip6_frag_hash[hash]);
INIT_LIST_HEAD(&fq->lru_list); INIT_LIST_HEAD(&fq->q.lru_list);
list_add_tail(&fq->lru_list, &ip6_frag_lru_list); list_add_tail(&fq->q.lru_list, &ip6_frag_lru_list);
ip6_frag_nqueues++; ip6_frag_nqueues++;
write_unlock(&ip6_frag_lock); write_unlock(&ip6_frag_lock);
return fq; return fq;
@@ -386,11 +375,11 @@ ip6_frag_create(__be32 id, struct in6_addr *src, struct in6_addr *dst,
ipv6_addr_copy(&fq->saddr, src); ipv6_addr_copy(&fq->saddr, src);
ipv6_addr_copy(&fq->daddr, dst); ipv6_addr_copy(&fq->daddr, dst);
init_timer(&fq->timer); init_timer(&fq->q.timer);
fq->timer.function = ip6_frag_expire; fq->q.timer.function = ip6_frag_expire;
fq->timer.data = (long) fq; fq->q.timer.data = (long) fq;
spin_lock_init(&fq->lock); spin_lock_init(&fq->q.lock);
atomic_set(&fq->refcnt, 1); atomic_set(&fq->q.refcnt, 1);
return ip6_frag_intern(fq); return ip6_frag_intern(fq);
@@ -409,11 +398,11 @@ fq_find(__be32 id, struct in6_addr *src, struct in6_addr *dst,
read_lock(&ip6_frag_lock); read_lock(&ip6_frag_lock);
hash = ip6qhashfn(id, src, dst); hash = ip6qhashfn(id, src, dst);
hlist_for_each_entry(fq, n, &ip6_frag_hash[hash], list) { hlist_for_each_entry(fq, n, &ip6_frag_hash[hash], q.list) {
if (fq->id == id && if (fq->id == id &&
ipv6_addr_equal(src, &fq->saddr) && ipv6_addr_equal(src, &fq->saddr) &&
ipv6_addr_equal(dst, &fq->daddr)) { ipv6_addr_equal(dst, &fq->daddr)) {
atomic_inc(&fq->refcnt); atomic_inc(&fq->q.refcnt);
read_unlock(&ip6_frag_lock); read_unlock(&ip6_frag_lock);
return fq; return fq;
} }
@@ -431,7 +420,7 @@ static int ip6_frag_queue(struct frag_queue *fq, struct sk_buff *skb,
struct net_device *dev; struct net_device *dev;
int offset, end; int offset, end;
if (fq->last_in & COMPLETE) if (fq->q.last_in & COMPLETE)
goto err; goto err;
offset = ntohs(fhdr->frag_off) & ~0x7; offset = ntohs(fhdr->frag_off) & ~0x7;
@@ -459,11 +448,11 @@ static int ip6_frag_queue(struct frag_queue *fq, struct sk_buff *skb,
/* If we already have some bits beyond end /* If we already have some bits beyond end
* or have different end, the segment is corrupted. * or have different end, the segment is corrupted.
*/ */
if (end < fq->len || if (end < fq->q.len ||
((fq->last_in & LAST_IN) && end != fq->len)) ((fq->q.last_in & LAST_IN) && end != fq->q.len))
goto err; goto err;
fq->last_in |= LAST_IN; fq->q.last_in |= LAST_IN;
fq->len = end; fq->q.len = end;
} else { } else {
/* Check if the fragment is rounded to 8 bytes. /* Check if the fragment is rounded to 8 bytes.
* Required by the RFC. * Required by the RFC.
@@ -478,11 +467,11 @@ static int ip6_frag_queue(struct frag_queue *fq, struct sk_buff *skb,
offsetof(struct ipv6hdr, payload_len)); offsetof(struct ipv6hdr, payload_len));
return -1; return -1;
} }
if (end > fq->len) { if (end > fq->q.len) {
/* Some bits beyond end -> corruption. */ /* Some bits beyond end -> corruption. */
if (fq->last_in & LAST_IN) if (fq->q.last_in & LAST_IN)
goto err; goto err;
fq->len = end; fq->q.len = end;
} }
} }
@@ -501,7 +490,7 @@ static int ip6_frag_queue(struct frag_queue *fq, struct sk_buff *skb,
* this fragment, right? * this fragment, right?
*/ */
prev = NULL; prev = NULL;
for(next = fq->fragments; next != NULL; next = next->next) { for(next = fq->q.fragments; next != NULL; next = next->next) {
if (FRAG6_CB(next)->offset >= offset) if (FRAG6_CB(next)->offset >= offset)
break; /* bingo! */ break; /* bingo! */
prev = next; prev = next;
@@ -538,7 +527,7 @@ static int ip6_frag_queue(struct frag_queue *fq, struct sk_buff *skb,
if (!pskb_pull(next, i)) if (!pskb_pull(next, i))
goto err; goto err;
FRAG6_CB(next)->offset += i; /* next fragment */ FRAG6_CB(next)->offset += i; /* next fragment */
fq->meat -= i; fq->q.meat -= i;
if (next->ip_summed != CHECKSUM_UNNECESSARY) if (next->ip_summed != CHECKSUM_UNNECESSARY)
next->ip_summed = CHECKSUM_NONE; next->ip_summed = CHECKSUM_NONE;
break; break;
@@ -553,9 +542,9 @@ static int ip6_frag_queue(struct frag_queue *fq, struct sk_buff *skb,
if (prev) if (prev)
prev->next = next; prev->next = next;
else else
fq->fragments = next; fq->q.fragments = next;
fq->meat -= free_it->len; fq->q.meat -= free_it->len;
frag_kfree_skb(free_it, NULL); frag_kfree_skb(free_it, NULL);
} }
} }
@@ -567,15 +556,15 @@ static int ip6_frag_queue(struct frag_queue *fq, struct sk_buff *skb,
if (prev) if (prev)
prev->next = skb; prev->next = skb;
else else
fq->fragments = skb; fq->q.fragments = skb;
dev = skb->dev; dev = skb->dev;
if (dev) { if (dev) {
fq->iif = dev->ifindex; fq->iif = dev->ifindex;
skb->dev = NULL; skb->dev = NULL;
} }
fq->stamp = skb->tstamp; fq->q.stamp = skb->tstamp;
fq->meat += skb->len; fq->q.meat += skb->len;
atomic_add(skb->truesize, &ip6_frag_mem); atomic_add(skb->truesize, &ip6_frag_mem);
/* The first fragment. /* The first fragment.
@@ -583,14 +572,14 @@ static int ip6_frag_queue(struct frag_queue *fq, struct sk_buff *skb,
*/ */
if (offset == 0) { if (offset == 0) {
fq->nhoffset = nhoff; fq->nhoffset = nhoff;
fq->last_in |= FIRST_IN; fq->q.last_in |= FIRST_IN;
} }
if (fq->last_in == (FIRST_IN | LAST_IN) && fq->meat == fq->len) if (fq->q.last_in == (FIRST_IN | LAST_IN) && fq->q.meat == fq->q.len)
return ip6_frag_reasm(fq, prev, dev); return ip6_frag_reasm(fq, prev, dev);
write_lock(&ip6_frag_lock); write_lock(&ip6_frag_lock);
list_move_tail(&fq->lru_list, &ip6_frag_lru_list); list_move_tail(&fq->q.lru_list, &ip6_frag_lru_list);
write_unlock(&ip6_frag_lock); write_unlock(&ip6_frag_lock);
return -1; return -1;
@@ -612,7 +601,7 @@ err:
static int ip6_frag_reasm(struct frag_queue *fq, struct sk_buff *prev, static int ip6_frag_reasm(struct frag_queue *fq, struct sk_buff *prev,
struct net_device *dev) struct net_device *dev)
{ {
struct sk_buff *fp, *head = fq->fragments; struct sk_buff *fp, *head = fq->q.fragments;
int payload_len; int payload_len;
unsigned int nhoff; unsigned int nhoff;
@@ -629,11 +618,11 @@ static int ip6_frag_reasm(struct frag_queue *fq, struct sk_buff *prev,
fp->next = head->next; fp->next = head->next;
prev->next = fp; prev->next = fp;
skb_morph(head, fq->fragments); skb_morph(head, fq->q.fragments);
head->next = fq->fragments->next; head->next = fq->q.fragments->next;
kfree_skb(fq->fragments); kfree_skb(fq->q.fragments);
fq->fragments = head; fq->q.fragments = head;
} }
BUG_TRAP(head != NULL); BUG_TRAP(head != NULL);
@@ -641,7 +630,7 @@ static int ip6_frag_reasm(struct frag_queue *fq, struct sk_buff *prev,
/* Unfragmented part is taken from the first segment. */ /* Unfragmented part is taken from the first segment. */
payload_len = ((head->data - skb_network_header(head)) - payload_len = ((head->data - skb_network_header(head)) -
sizeof(struct ipv6hdr) + fq->len - sizeof(struct ipv6hdr) + fq->q.len -
sizeof(struct frag_hdr)); sizeof(struct frag_hdr));
if (payload_len > IPV6_MAXPLEN) if (payload_len > IPV6_MAXPLEN)
goto out_oversize; goto out_oversize;
@@ -700,7 +689,7 @@ static int ip6_frag_reasm(struct frag_queue *fq, struct sk_buff *prev,
head->next = NULL; head->next = NULL;
head->dev = dev; head->dev = dev;
head->tstamp = fq->stamp; head->tstamp = fq->q.stamp;
ipv6_hdr(head)->payload_len = htons(payload_len); ipv6_hdr(head)->payload_len = htons(payload_len);
IP6CB(head)->nhoff = nhoff; IP6CB(head)->nhoff = nhoff;
@@ -713,7 +702,7 @@ static int ip6_frag_reasm(struct frag_queue *fq, struct sk_buff *prev,
rcu_read_lock(); rcu_read_lock();
IP6_INC_STATS_BH(__in6_dev_get(dev), IPSTATS_MIB_REASMOKS); IP6_INC_STATS_BH(__in6_dev_get(dev), IPSTATS_MIB_REASMOKS);
rcu_read_unlock(); rcu_read_unlock();
fq->fragments = NULL; fq->q.fragments = NULL;
return 1; return 1;
out_oversize: out_oversize:
@@ -773,11 +762,11 @@ static int ipv6_frag_rcv(struct sk_buff **skbp)
ip6_dst_idev(skb->dst))) != NULL) { ip6_dst_idev(skb->dst))) != NULL) {
int ret; int ret;
spin_lock(&fq->lock); spin_lock(&fq->q.lock);
ret = ip6_frag_queue(fq, skb, fhdr, IP6CB(skb)->nhoff); ret = ip6_frag_queue(fq, skb, fhdr, IP6CB(skb)->nhoff);
spin_unlock(&fq->lock); spin_unlock(&fq->q.lock);
fq_put(fq, NULL); fq_put(fq, NULL);
return ret; return ret;
} }