Patrick McHardy wrote: > Vasily Averin wrote: >> Patrick McHardy wrote: > -static int early_drop(struct hlist_head *chain) > +static int early_drop(unsigned int hash) > { > /* Use oldest entry, which is roughly LRU */ > struct nf_conntrack_tuple_hash *h; > struct nf_conn *ct = NULL, *tmp; > struct hlist_node *n; > - int dropped = 0; > + unsigned int i; > + int dropped = 0, cnt = NF_CT_EVICTION_RANGE; > > read_lock_bh(&nf_conntrack_lock); > - hlist_for_each_entry(h, n, chain, hnode) { > - tmp = nf_ct_tuplehash_to_ctrack(h); > - if (!test_bit(IPS_ASSURED_BIT, &tmp->status)) > - ct = tmp; > + for (i = 0; i < nf_conntrack_htable_size; i++) { > + hlist_for_each_entry(h, n, &nf_conntrack_hash[hash], hnode) { > + tmp = nf_ct_tuplehash_to_ctrack(h); > + if (!test_bit(IPS_ASSURED_BIT, &tmp->status)) > + ct = tmp; It is incorrect: you should break nested loop here too. > + if (--cnt <= 0) > + goto stop; > + } > + if (ct) > + break; > + hash = (hash + 1) & (nf_conntrack_htable_size - 1); > } > +stop: > if (ct) > atomic_inc(&ct->ct_general.use); > read_unlock_bh(&nf_conntrack_lock); - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
- Follow-Ups:
- Re: [NETFILTER] early_drop() imrovement (v4)
- From: Patrick McHardy <[email protected]>
- Re: [NETFILTER] early_drop() imrovement (v4)
- References:
- [PATCH 2.6.21-rc6] [netfilter] early_drop imrovement
- From: Vasily Averin <[email protected]>
- Re: [PATCH 2.6.21-rc6] [netfilter] early_drop imrovement
- From: Eric Dumazet <[email protected]>
- Re: [PATCH 2.6.21-rc6] [netfilter] early_drop imrovement
- From: Vasily Averin <[email protected]>
- Re: [PATCH 2.6.21-rc6] [netfilter] early_drop imrovement
- From: Patrick McHardy <[email protected]>
- [PATCH nf-2.6.22] [netfilter] early_drop imrovement
- From: Vasily Averin <[email protected]>
- Re: [PATCH nf-2.6.22] [netfilter] early_drop imrovement
- From: Eric Dumazet <[email protected]>
- Re: [PATCH nf-2.6.22] [netfilter] early_drop imrovement
- From: Vasily Averin <[email protected]>
- [NETFILTER] early_drop() imrovement (v3)
- From: Vasily Averin <[email protected]>
- Re: [NETFILTER] early_drop() imrovement (v3)
- From: Patrick McHardy <[email protected]>
- Re: [NETFILTER] early_drop() imrovement (v3)
- From: Vasily Averin <[email protected]>
- [NETFILTER] early_drop() imrovement (v4)
- From: Vasily Averin <[email protected]>
- Re: [NETFILTER] early_drop() imrovement (v4)
- From: Patrick McHardy <[email protected]>
- Re: [NETFILTER] early_drop() imrovement (v4)
- From: Patrick McHardy <[email protected]>
- Re: [NETFILTER] early_drop() imrovement (v4)
- From: Vasily Averin <[email protected]>
- Re: [NETFILTER] early_drop() imrovement (v4)
- From: Patrick McHardy <[email protected]>
- Re: [NETFILTER] early_drop() imrovement (v4)
- From: Vasily Averin <[email protected]>
- Re: [NETFILTER] early_drop() imrovement (v4)
- From: Patrick McHardy <[email protected]>
- [PATCH 2.6.21-rc6] [netfilter] early_drop imrovement
- Prev by Date: Re: [NETFILTER] early_drop() imrovement (v4)
- Next by Date: Re: [NETFILTER] early_drop() imrovement (v4)
- Previous by thread: Re: [NETFILTER] early_drop() imrovement (v4)
- Next by thread: Re: [NETFILTER] early_drop() imrovement (v4)
- Index(es):