* [RFC] tcp demux used to signal ip_route_input_noref to not cache dst
@ 2012-06-27 7:19 Eric Dumazet
2012-06-27 7:52 ` Eric Dumazet
0 siblings, 1 reply; 6+ messages in thread
From: Eric Dumazet @ 2012-06-27 7:19 UTC (permalink / raw)
To: David Miller; +Cc: netdev
In case tcp_v{4|6}_early_demux() doesnt find an ESTABLISHED socket, and
SYN flag is set, and an "atomic_t listener_under_synflood" counter is
not 0, we could :
- instruct make ip_rcv_finish() to not cache the input dst into route
cache (if dst is not found in the hash table)
This would make synflood attacks having minimal impact on route cache
(We did this for the output dst of SYN-cookie-ACK messages)
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [RFC] tcp demux used to signal ip_route_input_noref to not cache dst
2012-06-27 7:19 [RFC] tcp demux used to signal ip_route_input_noref to not cache dst Eric Dumazet
@ 2012-06-27 7:52 ` Eric Dumazet
2012-06-27 8:15 ` David Miller
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Eric Dumazet @ 2012-06-27 7:52 UTC (permalink / raw)
To: David Miller; +Cc: netdev
On Wed, 2012-06-27 at 09:19 +0200, Eric Dumazet wrote:
> In case tcp_v{4|6}_early_demux() doesnt find an ESTABLISHED socket, and
> SYN flag is set, and an "atomic_t listener_under_synflood" counter is
> not 0, we could :
>
> - instruct make ip_rcv_finish() to not cache the input dst into route
> cache (if dst is not found in the hash table)
>
> This would make synflood attacks having minimal impact on route cache
>
> (We did this for the output dst of SYN-cookie-ACK messages)
>
>
I'll test the following patch in a moment.
For the moment, set nocache to true for all frames not associated to an
ESTABLISHED socket. Not sure we want to test SYN flag after all.
include/net/protocol.h | 2 +-
include/net/route.h | 8 ++++----
include/net/tcp.h | 2 +-
net/ipv4/arp.c | 2 +-
net/ipv4/ip_fragment.c | 2 +-
net/ipv4/ip_input.c | 5 +++--
net/ipv4/route.c | 8 +++++---
net/ipv4/tcp_ipv4.c | 4 +++-
net/ipv4/xfrm4_input.c | 2 +-
9 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/include/net/protocol.h b/include/net/protocol.h
index 967b926..7cfc8f7 100644
--- a/include/net/protocol.h
+++ b/include/net/protocol.h
@@ -37,7 +37,7 @@
/* This is used to register protocols. */
struct net_protocol {
- int (*early_demux)(struct sk_buff *skb);
+ int (*early_demux)(struct sk_buff *skb, bool *nocache);
int (*handler)(struct sk_buff *skb);
void (*err_handler)(struct sk_buff *skb, u32 info);
int (*gso_send_check)(struct sk_buff *skb);
diff --git a/include/net/route.h b/include/net/route.h
index 47eb25a..6361f93 100644
--- a/include/net/route.h
+++ b/include/net/route.h
@@ -201,18 +201,18 @@ static inline struct rtable *ip_route_output_gre(struct net *net, struct flowi4
}
extern int ip_route_input_common(struct sk_buff *skb, __be32 dst, __be32 src,
- u8 tos, struct net_device *devin, bool noref);
+ u8 tos, struct net_device *devin, bool noref, bool nocache);
static inline int ip_route_input(struct sk_buff *skb, __be32 dst, __be32 src,
u8 tos, struct net_device *devin)
{
- return ip_route_input_common(skb, dst, src, tos, devin, false);
+ return ip_route_input_common(skb, dst, src, tos, devin, false, false);
}
static inline int ip_route_input_noref(struct sk_buff *skb, __be32 dst, __be32 src,
- u8 tos, struct net_device *devin)
+ u8 tos, struct net_device *devin, bool nocache)
{
- return ip_route_input_common(skb, dst, src, tos, devin, true);
+ return ip_route_input_common(skb, dst, src, tos, devin, true, nocache);
}
extern void ipv4_update_pmtu(struct sk_buff *skb, struct net *net, u32 mtu,
diff --git a/include/net/tcp.h b/include/net/tcp.h
index 6660ffc..917ed2e 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -325,7 +325,7 @@ extern void tcp_v4_err(struct sk_buff *skb, u32);
extern void tcp_shutdown (struct sock *sk, int how);
-extern int tcp_v4_early_demux(struct sk_buff *skb);
+extern int tcp_v4_early_demux(struct sk_buff *skb, bool *nocache);
extern int tcp_v4_rcv(struct sk_buff *skb);
extern struct inet_peer *tcp_v4_get_peer(struct sock *sk);
diff --git a/net/ipv4/arp.c b/net/ipv4/arp.c
index 2e560f0..6a97959 100644
--- a/net/ipv4/arp.c
+++ b/net/ipv4/arp.c
@@ -828,7 +828,7 @@ static int arp_process(struct sk_buff *skb)
}
if (arp->ar_op == htons(ARPOP_REQUEST) &&
- ip_route_input_noref(skb, tip, sip, 0, dev) == 0) {
+ ip_route_input_noref(skb, tip, sip, 0, dev, false) == 0) {
rt = skb_rtable(skb);
addr_type = rt->rt_type;
diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c
index 8d07c97..978d55f 100644
--- a/net/ipv4/ip_fragment.c
+++ b/net/ipv4/ip_fragment.c
@@ -259,7 +259,7 @@ static void ip_expire(unsigned long arg)
skb_dst_drop(head);
iph = ip_hdr(head);
err = ip_route_input_noref(head, iph->daddr, iph->saddr,
- iph->tos, head->dev);
+ iph->tos, head->dev, false);
if (err)
goto out_rcu_unlock;
diff --git a/net/ipv4/ip_input.c b/net/ipv4/ip_input.c
index 2a39204..7be54c8 100644
--- a/net/ipv4/ip_input.c
+++ b/net/ipv4/ip_input.c
@@ -326,6 +326,7 @@ static int ip_rcv_finish(struct sk_buff *skb)
*/
if (skb_dst(skb) == NULL) {
int err = -ENOENT;
+ bool nocache = false;
if (sysctl_ip_early_demux) {
const struct net_protocol *ipprot;
@@ -334,13 +335,13 @@ static int ip_rcv_finish(struct sk_buff *skb)
rcu_read_lock();
ipprot = rcu_dereference(inet_protos[protocol]);
if (ipprot && ipprot->early_demux)
- err = ipprot->early_demux(skb);
+ err = ipprot->early_demux(skb, &nocache);
rcu_read_unlock();
}
if (err) {
err = ip_route_input_noref(skb, iph->daddr, iph->saddr,
- iph->tos, skb->dev);
+ iph->tos, skb->dev, nocache);
if (unlikely(err)) {
if (err == -EXDEV)
NET_INC_STATS_BH(dev_net(skb->dev),
diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index 81533e3..fdc7900 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -2214,7 +2214,7 @@ static int ip_mkroute_input(struct sk_buff *skb,
*/
static int ip_route_input_slow(struct sk_buff *skb, __be32 daddr, __be32 saddr,
- u8 tos, struct net_device *dev)
+ u8 tos, struct net_device *dev, bool nocache)
{
struct fib_result res;
struct in_device *in_dev = __in_dev_get_rcu(dev);
@@ -2353,6 +2353,8 @@ local_input:
rth->dst.error= -err;
rth->rt_flags &= ~RTCF_LOCAL;
}
+ if (nocache)
+ rth->dst.flags |= DST_NOCACHE;
hash = rt_hash(daddr, saddr, fl4.flowi4_iif, rt_genid(net));
rth = rt_intern_hash(hash, rth, skb, fl4.flowi4_iif);
err = 0;
@@ -2395,7 +2397,7 @@ martian_source_keep_err:
}
int ip_route_input_common(struct sk_buff *skb, __be32 daddr, __be32 saddr,
- u8 tos, struct net_device *dev, bool noref)
+ u8 tos, struct net_device *dev, bool noref, bool nocache)
{
struct rtable *rth;
unsigned int hash;
@@ -2471,7 +2473,7 @@ skip_cache:
rcu_read_unlock();
return -EINVAL;
}
- res = ip_route_input_slow(skb, daddr, saddr, tos, dev);
+ res = ip_route_input_slow(skb, daddr, saddr, tos, dev, nocache);
rcu_read_unlock();
return res;
}
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index 1781dc6..33aabd4 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -1673,7 +1673,7 @@ csum_err:
}
EXPORT_SYMBOL(tcp_v4_do_rcv);
-int tcp_v4_early_demux(struct sk_buff *skb)
+int tcp_v4_early_demux(struct sk_buff *skb, bool *no_dst_cache)
{
struct net *net = dev_net(skb->dev);
const struct iphdr *iph;
@@ -1719,6 +1719,8 @@ int tcp_v4_early_demux(struct sk_buff *skb)
}
}
}
+ } else {
+ *no_dst_cache = true;
}
out_err:
diff --git a/net/ipv4/xfrm4_input.c b/net/ipv4/xfrm4_input.c
index 06814b6..eee636b 100644
--- a/net/ipv4/xfrm4_input.c
+++ b/net/ipv4/xfrm4_input.c
@@ -28,7 +28,7 @@ static inline int xfrm4_rcv_encap_finish(struct sk_buff *skb)
const struct iphdr *iph = ip_hdr(skb);
if (ip_route_input_noref(skb, iph->daddr, iph->saddr,
- iph->tos, skb->dev))
+ iph->tos, skb->dev, false))
goto drop;
}
return dst_input(skb);
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [RFC] tcp demux used to signal ip_route_input_noref to not cache dst
2012-06-27 7:52 ` Eric Dumazet
@ 2012-06-27 8:15 ` David Miller
2012-06-27 8:18 ` Eric Dumazet
2012-06-27 13:25 ` Hans Schillstrom
2 siblings, 0 replies; 6+ messages in thread
From: David Miller @ 2012-06-27 8:15 UTC (permalink / raw)
To: eric.dumazet; +Cc: netdev
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Wed, 27 Jun 2012 09:52:13 +0200
> I'll test the following patch in a moment.
>
> For the moment, set nocache to true for all frames not associated to an
> ESTABLISHED socket. Not sure we want to test SYN flag after all.
Looks good.
After this change goes in I'm going to change the calling
convention, especially since I really hate functions that
return multiple values using pass-by-reference to accomplish
this.
What I plan to do is move the early socket demux before the
skb_dst()==NULL check, then we don't need the error return.
Subsequently we can return a bool which is your new nocache
value.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [RFC] tcp demux used to signal ip_route_input_noref to not cache dst
2012-06-27 7:52 ` Eric Dumazet
2012-06-27 8:15 ` David Miller
@ 2012-06-27 8:18 ` Eric Dumazet
2012-06-27 8:19 ` David Miller
2012-06-27 13:25 ` Hans Schillstrom
2 siblings, 1 reply; 6+ messages in thread
From: Eric Dumazet @ 2012-06-27 8:18 UTC (permalink / raw)
To: David Miller; +Cc: netdev
On Wed, 2012-06-27 at 09:52 +0200, Eric Dumazet wrote:
> I'll test the following patch in a moment.
>
> For the moment, set nocache to true for all frames not associated to an
> ESTABLISHED socket. Not sure we want to test SYN flag after all.
>
> include/net/protocol.h | 2 +-
> include/net/route.h | 8 ++++----
> include/net/tcp.h | 2 +-
> net/ipv4/arp.c | 2 +-
> net/ipv4/ip_fragment.c | 2 +-
> net/ipv4/ip_input.c | 5 +++--
> net/ipv4/route.c | 8 +++++---
> net/ipv4/tcp_ipv4.c | 4 +++-
> net/ipv4/xfrm4_input.c | 2 +-
> 9 files changed, 20 insertions(+), 15 deletions(-)
Excellent results.
I am now able to resist to DDOS synflood attacks, with no route cache
pollution, and no more rt_garbage_collect() hits.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [RFC] tcp demux used to signal ip_route_input_noref to not cache dst
2012-06-27 8:18 ` Eric Dumazet
@ 2012-06-27 8:19 ` David Miller
0 siblings, 0 replies; 6+ messages in thread
From: David Miller @ 2012-06-27 8:19 UTC (permalink / raw)
To: eric.dumazet; +Cc: netdev
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Wed, 27 Jun 2012 10:18:24 +0200
> On Wed, 2012-06-27 at 09:52 +0200, Eric Dumazet wrote:
>
>> I'll test the following patch in a moment.
>>
>> For the moment, set nocache to true for all frames not associated to an
>> ESTABLISHED socket. Not sure we want to test SYN flag after all.
>>
>> include/net/protocol.h | 2 +-
>> include/net/route.h | 8 ++++----
>> include/net/tcp.h | 2 +-
>> net/ipv4/arp.c | 2 +-
>> net/ipv4/ip_fragment.c | 2 +-
>> net/ipv4/ip_input.c | 5 +++--
>> net/ipv4/route.c | 8 +++++---
>> net/ipv4/tcp_ipv4.c | 4 +++-
>> net/ipv4/xfrm4_input.c | 2 +-
>> 9 files changed, 20 insertions(+), 15 deletions(-)
>
> Excellent results.
>
> I am now able to resist to DDOS synflood attacks, with no route cache
> pollution, and no more rt_garbage_collect() hits.
Sweet.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [RFC] tcp demux used to signal ip_route_input_noref to not cache dst
2012-06-27 7:52 ` Eric Dumazet
2012-06-27 8:15 ` David Miller
2012-06-27 8:18 ` Eric Dumazet
@ 2012-06-27 13:25 ` Hans Schillstrom
2 siblings, 0 replies; 6+ messages in thread
From: Hans Schillstrom @ 2012-06-27 13:25 UTC (permalink / raw)
To: Eric Dumazet, David Miller; +Cc: netdev
On Wednesday 27 June 2012 09:52:13 Eric Dumazet wrote:
> On Wed, 2012-06-27 at 09:19 +0200, Eric Dumazet wrote:
> > In case tcp_v{4|6}_early_demux() doesnt find an ESTABLISHED socket, and
> > SYN flag is set, and an "atomic_t listener_under_synflood" counter is
> > not 0, we could :
> >
> > - instruct make ip_rcv_finish() to not cache the input dst into route
> > cache (if dst is not found in the hash table)
> >
> > This would make synflood attacks having minimal impact on route cache
> >
> > (We did this for the output dst of SYN-cookie-ACK messages)
> >
> >
>
> I'll test the following patch in a moment.
>
> For the moment, set nocache to true for all frames not associated to an
> ESTABLISHED socket. Not sure we want to test SYN flag after all.
Nice work,
I have been runing the patch for almost 4 hours now
not a single message about the routing cache !
BTW
I also use the "tcp: avoid tx starvation by SYNACK packets" patch
and jhash patch for syn cookies.
Not a packet single packet is dropped now.
I even works nice in a KVM I have never been close to this results with KVM.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-06-27 13:26 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-06-27 7:19 [RFC] tcp demux used to signal ip_route_input_noref to not cache dst Eric Dumazet
2012-06-27 7:52 ` Eric Dumazet
2012-06-27 8:15 ` David Miller
2012-06-27 8:18 ` Eric Dumazet
2012-06-27 8:19 ` David Miller
2012-06-27 13:25 ` Hans Schillstrom
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.