| Message ID | 1356046697.21834.3606.camel@edumazet-glaptop |
|---|---|
| State | RFC, archived |
| Delegated to: | David Miller |
| Headers | show |
On Thu, 20 Dec 2012 15:38:17 -0800 Eric Dumazet <eric.dumazet@gmail.com> wrote: > On Thu, 2012-12-20 at 18:16 -0500, Paul Moore wrote: > > [CC'ing netdev in case this is a known problem I just missed ...] > > > > Hi Jason, > > > > I started doing some more testing with the multiqueue TUN changes and I ran > > into a problem when running tunctl: running it once w/o arguments works as > > expected, but running it a second time results in failure and a > > kmem_cache_sanity_check() failure. The problem appears to be very repeatable > > on my test VM and happens independent of the LSM/SELinux fixup patches. > > > > Have you seen this before? > > > > Obviously code in tun_flow_init() is wrong... > > static int tun_flow_init(struct tun_struct *tun) > { > int i; > > tun->flow_cache = kmem_cache_create("tun_flow_cache", > sizeof(struct tun_flow_entry), 0, 0, > NULL); > if (!tun->flow_cache) > return -ENOMEM; > ... > } > > > I have no idea why we would need a kmem_cache per tun_struct, > and why we even need a kmem_cache. Normally flow malloc/free should be good enough. It might make sense to use private kmem_cache if doing hlist_nulls. Acked-by: Stephen Hemminger <shemminger@vyatta.com> -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 12/21/2012 07:50 AM, Stephen Hemminger wrote: > On Thu, 20 Dec 2012 15:38:17 -0800 > Eric Dumazet <eric.dumazet@gmail.com> wrote: > >> On Thu, 2012-12-20 at 18:16 -0500, Paul Moore wrote: >>> [CC'ing netdev in case this is a known problem I just missed ...] >>> >>> Hi Jason, >>> >>> I started doing some more testing with the multiqueue TUN changes and I ran >>> into a problem when running tunctl: running it once w/o arguments works as >>> expected, but running it a second time results in failure and a >>> kmem_cache_sanity_check() failure. The problem appears to be very repeatable >>> on my test VM and happens independent of the LSM/SELinux fixup patches. >>> >>> Have you seen this before? >>> >> Obviously code in tun_flow_init() is wrong... >> >> static int tun_flow_init(struct tun_struct *tun) >> { >> int i; >> >> tun->flow_cache = kmem_cache_create("tun_flow_cache", >> sizeof(struct tun_flow_entry), 0, 0, >> NULL); >> if (!tun->flow_cache) >> return -ENOMEM; >> ... >> } >> >> >> I have no idea why we would need a kmem_cache per tun_struct, >> and why we even need a kmem_cache. > Normally flow malloc/free should be good enough. > It might make sense to use private kmem_cache if doing hlist_nulls. > > > Acked-by: Stephen Hemminger <shemminger@vyatta.com> Should be at least a global cache, I thought I can get some speed-up by using kmem_cache. Acked-by: Jason Wang <jasowang@redhat.com> > -- > To unsubscribe from this list: send the line "unsubscribe netdev" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, 2012-12-21 at 11:32 +0800, Jason Wang wrote: > On 12/21/2012 07:50 AM, Stephen Hemminger wrote: > > On Thu, 20 Dec 2012 15:38:17 -0800 > > Eric Dumazet <eric.dumazet@gmail.com> wrote: > > > >> On Thu, 2012-12-20 at 18:16 -0500, Paul Moore wrote: > >>> [CC'ing netdev in case this is a known problem I just missed ...] > >>> > >>> Hi Jason, > >>> > >>> I started doing some more testing with the multiqueue TUN changes and I ran > >>> into a problem when running tunctl: running it once w/o arguments works as > >>> expected, but running it a second time results in failure and a > >>> kmem_cache_sanity_check() failure. The problem appears to be very repeatable > >>> on my test VM and happens independent of the LSM/SELinux fixup patches. > >>> > >>> Have you seen this before? > >>> > >> Obviously code in tun_flow_init() is wrong... > >> > >> static int tun_flow_init(struct tun_struct *tun) > >> { > >> int i; > >> > >> tun->flow_cache = kmem_cache_create("tun_flow_cache", > >> sizeof(struct tun_flow_entry), 0, 0, > >> NULL); > >> if (!tun->flow_cache) > >> return -ENOMEM; > >> ... > >> } > >> > >> > >> I have no idea why we would need a kmem_cache per tun_struct, > >> and why we even need a kmem_cache. > > Normally flow malloc/free should be good enough. > > It might make sense to use private kmem_cache if doing hlist_nulls. > > > > > > Acked-by: Stephen Hemminger <shemminger@vyatta.com> > > Should be at least a global cache, I thought I can get some speed-up by > using kmem_cache. > > Acked-by: Jason Wang <jasowang@redhat.com> Was it with SLUB or SLAB ? Using generic kmalloc-64 is better than a dedicated kmem_cache of 48 bytes per object, as we guarantee each object is on a single cache line. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 12/21/2012 11:39 AM, Eric Dumazet wrote: > On Fri, 2012-12-21 at 11:32 +0800, Jason Wang wrote: >> On 12/21/2012 07:50 AM, Stephen Hemminger wrote: >>> On Thu, 20 Dec 2012 15:38:17 -0800 >>> Eric Dumazet <eric.dumazet@gmail.com> wrote: >>> >>>> On Thu, 2012-12-20 at 18:16 -0500, Paul Moore wrote: >>>>> [CC'ing netdev in case this is a known problem I just missed ...] >>>>> >>>>> Hi Jason, >>>>> >>>>> I started doing some more testing with the multiqueue TUN changes and I ran >>>>> into a problem when running tunctl: running it once w/o arguments works as >>>>> expected, but running it a second time results in failure and a >>>>> kmem_cache_sanity_check() failure. The problem appears to be very repeatable >>>>> on my test VM and happens independent of the LSM/SELinux fixup patches. >>>>> >>>>> Have you seen this before? >>>>> >>>> Obviously code in tun_flow_init() is wrong... >>>> >>>> static int tun_flow_init(struct tun_struct *tun) >>>> { >>>> int i; >>>> >>>> tun->flow_cache = kmem_cache_create("tun_flow_cache", >>>> sizeof(struct tun_flow_entry), 0, 0, >>>> NULL); >>>> if (!tun->flow_cache) >>>> return -ENOMEM; >>>> ... >>>> } >>>> >>>> >>>> I have no idea why we would need a kmem_cache per tun_struct, >>>> and why we even need a kmem_cache. >>> Normally flow malloc/free should be good enough. >>> It might make sense to use private kmem_cache if doing hlist_nulls. >>> >>> >>> Acked-by: Stephen Hemminger <shemminger@vyatta.com> >> Should be at least a global cache, I thought I can get some speed-up by >> using kmem_cache. >> >> Acked-by: Jason Wang <jasowang@redhat.com> > Was it with SLUB or SLAB ? > > Using generic kmalloc-64 is better than a dedicated kmem_cache of 48 > bytes per object, as we guarantee each object is on a single cache line. > > Right, thanks for the explanation. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thursday, December 20, 2012 03:38:17 PM Eric Dumazet wrote: > On Thu, 2012-12-20 at 18:16 -0500, Paul Moore wrote: > > [CC'ing netdev in case this is a known problem I just missed ...] > > > > Hi Jason, > > > > I started doing some more testing with the multiqueue TUN changes and I > > ran > > into a problem when running tunctl: running it once w/o arguments works as > > expected, but running it a second time results in failure and a > > kmem_cache_sanity_check() failure. The problem appears to be very > > repeatable on my test VM and happens independent of the LSM/SELinux fixup > > patches. > > > > Have you seen this before? > > Obviously code in tun_flow_init() is wrong... > > static int tun_flow_init(struct tun_struct *tun) > { > int i; > > tun->flow_cache = kmem_cache_create("tun_flow_cache", > sizeof(struct tun_flow_entry), > 0, 0, NULL); > if (!tun->flow_cache) > return -ENOMEM; > ... > } > > > I have no idea why we would need a kmem_cache per tun_struct, > and why we even need a kmem_cache. > > > I would try following patch : > > drivers/net/tun.c | 24 +++--------------------- > 1 file changed, 3 insertions(+), 21 deletions(-) Thanks, that solved my problem. Also, in case you were still curious, I was using SLUB.
From: Jason Wang <jasowang@redhat.com> Date: Fri, 21 Dec 2012 11:32:43 +0800 > On 12/21/2012 07:50 AM, Stephen Hemminger wrote: >> On Thu, 20 Dec 2012 15:38:17 -0800 >> Eric Dumazet <eric.dumazet@gmail.com> wrote: >> >>> On Thu, 2012-12-20 at 18:16 -0500, Paul Moore wrote: >>>> [CC'ing netdev in case this is a known problem I just missed ...] >>>> >>>> Hi Jason, >>>> >>>> I started doing some more testing with the multiqueue TUN changes and I ran >>>> into a problem when running tunctl: running it once w/o arguments works as >>>> expected, but running it a second time results in failure and a >>>> kmem_cache_sanity_check() failure. The problem appears to be very repeatable >>>> on my test VM and happens independent of the LSM/SELinux fixup patches. >>>> >>>> Have you seen this before? >>>> >>> Obviously code in tun_flow_init() is wrong... >>> >>> static int tun_flow_init(struct tun_struct *tun) >>> { >>> int i; >>> >>> tun->flow_cache = kmem_cache_create("tun_flow_cache", >>> sizeof(struct tun_flow_entry), 0, 0, >>> NULL); >>> if (!tun->flow_cache) >>> return -ENOMEM; >>> ... >>> } >>> >>> >>> I have no idea why we would need a kmem_cache per tun_struct, >>> and why we even need a kmem_cache. >> Normally flow malloc/free should be good enough. >> It might make sense to use private kmem_cache if doing hlist_nulls. >> >> >> Acked-by: Stephen Hemminger <shemminger@vyatta.com> > > Should be at least a global cache, I thought I can get some speed-up by > using kmem_cache. > > Acked-by: Jason Wang <jasowang@redhat.com> Applied. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, 21 Dec 2012 12:26:56 +0800 Jason Wang <jasowang@redhat.com> wrote: > On 12/21/2012 11:39 AM, Eric Dumazet wrote: > > On Fri, 2012-12-21 at 11:32 +0800, Jason Wang wrote: > >> On 12/21/2012 07:50 AM, Stephen Hemminger wrote: > >>> On Thu, 20 Dec 2012 15:38:17 -0800 > >>> Eric Dumazet <eric.dumazet@gmail.com> wrote: > >>> > >>>> On Thu, 2012-12-20 at 18:16 -0500, Paul Moore wrote: > >>>>> [CC'ing netdev in case this is a known problem I just missed ...] > >>>>> > >>>>> Hi Jason, > >>>>> > >>>>> I started doing some more testing with the multiqueue TUN changes and I ran > >>>>> into a problem when running tunctl: running it once w/o arguments works as > >>>>> expected, but running it a second time results in failure and a > >>>>> kmem_cache_sanity_check() failure. The problem appears to be very repeatable > >>>>> on my test VM and happens independent of the LSM/SELinux fixup patches. > >>>>> > >>>>> Have you seen this before? > >>>>> > >>>> Obviously code in tun_flow_init() is wrong... > >>>> > >>>> static int tun_flow_init(struct tun_struct *tun) > >>>> { > >>>> int i; > >>>> > >>>> tun->flow_cache = kmem_cache_create("tun_flow_cache", > >>>> sizeof(struct tun_flow_entry), 0, 0, > >>>> NULL); > >>>> if (!tun->flow_cache) > >>>> return -ENOMEM; > >>>> ... > >>>> } > >>>> > >>>> > >>>> I have no idea why we would need a kmem_cache per tun_struct, > >>>> and why we even need a kmem_cache. > >>> Normally flow malloc/free should be good enough. > >>> It might make sense to use private kmem_cache if doing hlist_nulls. > >>> > >>> > >>> Acked-by: Stephen Hemminger <shemminger@vyatta.com> > >> Should be at least a global cache, I thought I can get some speed-up by > >> using kmem_cache. > >> > >> Acked-by: Jason Wang <jasowang@redhat.com> > > Was it with SLUB or SLAB ? > > > > Using generic kmalloc-64 is better than a dedicated kmem_cache of 48 > > bytes per object, as we guarantee each object is on a single cache line. > > > > > > Right, thanks for the explanation. > I wonder if TUN would be better if it used a array to translate receive hash to receive queue. This is how real hardware works with the indirection table, and it would allow RFS acceleration. The current flow cache stuff is prone to DoS attack and scaling problems with lots of short lived flows. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 12/28/2012 08:41 AM, Stephen Hemminger wrote: > On Fri, 21 Dec 2012 12:26:56 +0800 > Jason Wang <jasowang@redhat.com> wrote: > >> On 12/21/2012 11:39 AM, Eric Dumazet wrote: >>> On Fri, 2012-12-21 at 11:32 +0800, Jason Wang wrote: >>>> On 12/21/2012 07:50 AM, Stephen Hemminger wrote: >>>>> On Thu, 20 Dec 2012 15:38:17 -0800 >>>>> Eric Dumazet <eric.dumazet@gmail.com> wrote: >>>>> >>>>>> On Thu, 2012-12-20 at 18:16 -0500, Paul Moore wrote: >>>>>>> [CC'ing netdev in case this is a known problem I just missed ...] >>>>>>> >>>>>>> Hi Jason, >>>>>>> >>>>>>> I started doing some more testing with the multiqueue TUN changes and I ran >>>>>>> into a problem when running tunctl: running it once w/o arguments works as >>>>>>> expected, but running it a second time results in failure and a >>>>>>> kmem_cache_sanity_check() failure. The problem appears to be very repeatable >>>>>>> on my test VM and happens independent of the LSM/SELinux fixup patches. >>>>>>> >>>>>>> Have you seen this before? >>>>>>> >>>>>> Obviously code in tun_flow_init() is wrong... >>>>>> >>>>>> static int tun_flow_init(struct tun_struct *tun) >>>>>> { >>>>>> int i; >>>>>> >>>>>> tun->flow_cache = kmem_cache_create("tun_flow_cache", >>>>>> sizeof(struct tun_flow_entry), 0, 0, >>>>>> NULL); >>>>>> if (!tun->flow_cache) >>>>>> return -ENOMEM; >>>>>> ... >>>>>> } >>>>>> >>>>>> >>>>>> I have no idea why we would need a kmem_cache per tun_struct, >>>>>> and why we even need a kmem_cache. >>>>> Normally flow malloc/free should be good enough. >>>>> It might make sense to use private kmem_cache if doing hlist_nulls. >>>>> >>>>> >>>>> Acked-by: Stephen Hemminger <shemminger@vyatta.com> >>>> Should be at least a global cache, I thought I can get some speed-up by >>>> using kmem_cache. >>>> >>>> Acked-by: Jason Wang <jasowang@redhat.com> >>> Was it with SLUB or SLAB ? >>> >>> Using generic kmalloc-64 is better than a dedicated kmem_cache of 48 >>> bytes per object, as we guarantee each object is on a single cache line. >>> >>> >> Right, thanks for the explanation. >> > I wonder if TUN would be better if it used a array to translate > receive hash to receive queue. This is how real hardware works with the > indirection table, and it would allow RFS acceleration. The current flow > cache stuff is prone to DoS attack and scaling problems with lots of > short lived flows. The problem of indirection table is hash collision which may even happen when few flows existed. For the RFS, we can open a API/ioctl for userspace to add or remove a flow cache. For the DoS/scaling issue, I have an idea of: - limit the total number of flow entries in tun/tap - only update the flow entry every N (say 20 like ixgbe) packets or the the tcp packet has sync flag - I'm not sure skb_get_rxhash() is lightweight enough, or change to more lightweight one? Any suggestions? Thanks -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, 28 Dec 2012 13:43:54 +0800 Jason Wang <jasowang@redhat.com> wrote: > On 12/28/2012 08:41 AM, Stephen Hemminger wrote: > > On Fri, 21 Dec 2012 12:26:56 +0800 > > Jason Wang <jasowang@redhat.com> wrote: > > > >> On 12/21/2012 11:39 AM, Eric Dumazet wrote: > >>> On Fri, 2012-12-21 at 11:32 +0800, Jason Wang wrote: > >>>> On 12/21/2012 07:50 AM, Stephen Hemminger wrote: > >>>>> On Thu, 20 Dec 2012 15:38:17 -0800 > >>>>> Eric Dumazet <eric.dumazet@gmail.com> wrote: > >>>>> > >>>>>> On Thu, 2012-12-20 at 18:16 -0500, Paul Moore wrote: > >>>>>>> [CC'ing netdev in case this is a known problem I just missed ...] > >>>>>>> > >>>>>>> Hi Jason, > >>>>>>> > >>>>>>> I started doing some more testing with the multiqueue TUN changes and I ran > >>>>>>> into a problem when running tunctl: running it once w/o arguments works as > >>>>>>> expected, but running it a second time results in failure and a > >>>>>>> kmem_cache_sanity_check() failure. The problem appears to be very repeatable > >>>>>>> on my test VM and happens independent of the LSM/SELinux fixup patches. > >>>>>>> > >>>>>>> Have you seen this before? > >>>>>>> > >>>>>> Obviously code in tun_flow_init() is wrong... > >>>>>> > >>>>>> static int tun_flow_init(struct tun_struct *tun) > >>>>>> { > >>>>>> int i; > >>>>>> > >>>>>> tun->flow_cache = kmem_cache_create("tun_flow_cache", > >>>>>> sizeof(struct tun_flow_entry), 0, 0, > >>>>>> NULL); > >>>>>> if (!tun->flow_cache) > >>>>>> return -ENOMEM; > >>>>>> ... > >>>>>> } > >>>>>> > >>>>>> > >>>>>> I have no idea why we would need a kmem_cache per tun_struct, > >>>>>> and why we even need a kmem_cache. > >>>>> Normally flow malloc/free should be good enough. > >>>>> It might make sense to use private kmem_cache if doing hlist_nulls. > >>>>> > >>>>> > >>>>> Acked-by: Stephen Hemminger <shemminger@vyatta.com> > >>>> Should be at least a global cache, I thought I can get some speed-up by > >>>> using kmem_cache. > >>>> > >>>> Acked-by: Jason Wang <jasowang@redhat.com> > >>> Was it with SLUB or SLAB ? > >>> > >>> Using generic kmalloc-64 is better than a dedicated kmem_cache of 48 > >>> bytes per object, as we guarantee each object is on a single cache line. > >>> > >>> > >> Right, thanks for the explanation. > >> > > I wonder if TUN would be better if it used a array to translate > > receive hash to receive queue. This is how real hardware works with the > > indirection table, and it would allow RFS acceleration. The current flow > > cache stuff is prone to DoS attack and scaling problems with lots of > > short lived flows. > > The problem of indirection table is hash collision which may even happen > when few flows existed. Hash collision is fine, as long as the the statistical average of hash across queue's is approximately equal it will be faster. A simple array indirection is much faster than walking a hash table. > For the RFS, we can open a API/ioctl for userspace to add or remove a > flow cache. RFS acceleration relies on programming the table. It is easier if TUN looks more like hardware. > For the DoS/scaling issue, I have an idea of: > - limit the total number of flow entries in tun/tap > - only update the flow entry every N (say 20 like ixgbe) packets or the > the tcp packet has sync flag > - I'm not sure skb_get_rxhash() is lightweight enough, or change to more > lightweight one? Ideally the hash should be programmable L2 vs L3, but that is splitting hairs at this point. Flow tables are scaling problem, especially on highly loaded servers where they are most needed. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 12/28/2012 02:25 PM, Stephen Hemminger wrote: > On Fri, 28 Dec 2012 13:43:54 +0800 > Jason Wang <jasowang@redhat.com> wrote: > >> On 12/28/2012 08:41 AM, Stephen Hemminger wrote: >>> On Fri, 21 Dec 2012 12:26:56 +0800 >>> Jason Wang <jasowang@redhat.com> wrote: >>> >>>> On 12/21/2012 11:39 AM, Eric Dumazet wrote: >>>>> On Fri, 2012-12-21 at 11:32 +0800, Jason Wang wrote: >>>>>> On 12/21/2012 07:50 AM, Stephen Hemminger wrote: >>>>>>> On Thu, 20 Dec 2012 15:38:17 -0800 >>>>>>> Eric Dumazet <eric.dumazet@gmail.com> wrote: >>>>>>> >>>>>>>> On Thu, 2012-12-20 at 18:16 -0500, Paul Moore wrote: >>>>>>>>> [CC'ing netdev in case this is a known problem I just missed ...] >>>>>>>>> >>>>>>>>> Hi Jason, >>>>>>>>> >>>>>>>>> I started doing some more testing with the multiqueue TUN changes and I ran >>>>>>>>> into a problem when running tunctl: running it once w/o arguments works as >>>>>>>>> expected, but running it a second time results in failure and a >>>>>>>>> kmem_cache_sanity_check() failure. The problem appears to be very repeatable >>>>>>>>> on my test VM and happens independent of the LSM/SELinux fixup patches. >>>>>>>>> >>>>>>>>> Have you seen this before? >>>>>>>>> >>>>>>>> Obviously code in tun_flow_init() is wrong... >>>>>>>> >>>>>>>> static int tun_flow_init(struct tun_struct *tun) >>>>>>>> { >>>>>>>> int i; >>>>>>>> >>>>>>>> tun->flow_cache = kmem_cache_create("tun_flow_cache", >>>>>>>> sizeof(struct tun_flow_entry), 0, 0, >>>>>>>> NULL); >>>>>>>> if (!tun->flow_cache) >>>>>>>> return -ENOMEM; >>>>>>>> ... >>>>>>>> } >>>>>>>> >>>>>>>> >>>>>>>> I have no idea why we would need a kmem_cache per tun_struct, >>>>>>>> and why we even need a kmem_cache. >>>>>>> Normally flow malloc/free should be good enough. >>>>>>> It might make sense to use private kmem_cache if doing hlist_nulls. >>>>>>> >>>>>>> >>>>>>> Acked-by: Stephen Hemminger <shemminger@vyatta.com> >>>>>> Should be at least a global cache, I thought I can get some speed-up by >>>>>> using kmem_cache. >>>>>> >>>>>> Acked-by: Jason Wang <jasowang@redhat.com> >>>>> Was it with SLUB or SLAB ? >>>>> >>>>> Using generic kmalloc-64 is better than a dedicated kmem_cache of 48 >>>>> bytes per object, as we guarantee each object is on a single cache line. >>>>> >>>>> >>>> Right, thanks for the explanation. >>>> >>> I wonder if TUN would be better if it used a array to translate >>> receive hash to receive queue. This is how real hardware works with the >>> indirection table, and it would allow RFS acceleration. The current flow >>> cache stuff is prone to DoS attack and scaling problems with lots of >>> short lived flows. >> The problem of indirection table is hash collision which may even happen >> when few flows existed. > Hash collision is fine, as long as the the statistical average of > hash across queue's is approximately equal it will be faster. A simple > array indirection is much faster than walking a hash table. True, but hash collision may cause some negative effects such as losing the flow affinity and packet re-ordering in guest which does not exist in a perfect filter. Maybe we can implement them both and let user to choose. > >> For the RFS, we can open a API/ioctl for userspace to add or remove a >> flow cache. > RFS acceleration relies on programming the table. It is easier if > TUN looks more like hardware. > >> For the DoS/scaling issue, I have an idea of: >> - limit the total number of flow entries in tun/tap >> - only update the flow entry every N (say 20 like ixgbe) packets or the >> the tcp packet has sync flag >> - I'm not sure skb_get_rxhash() is lightweight enough, or change to more >> lightweight one? > Ideally the hash should be programmable L2 vs L3, but that is splitting > hairs at this point. > > Flow tables are scaling problem, especially on highly loaded servers where > they are most needed. > > -- > To unsubscribe from this list: send the line "unsubscribe netdev" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/tun.c b/drivers/net/tun.c index 504f7f1..fbd106e 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -180,7 +180,6 @@ struct tun_struct { int debug; #endif spinlock_t lock; - struct kmem_cache *flow_cache; struct hlist_head flows[TUN_NUM_FLOW_ENTRIES]; struct timer_list flow_gc_timer; unsigned long ageing_time; @@ -209,8 +208,8 @@ static struct tun_flow_entry *tun_flow_create(struct tun_struct *tun, struct hlist_head *head, u32 rxhash, u16 queue_index) { - struct tun_flow_entry *e = kmem_cache_alloc(tun->flow_cache, - GFP_ATOMIC); + struct tun_flow_entry *e = kmalloc(sizeof(*e), GFP_ATOMIC); + if (e) { tun_debug(KERN_INFO, tun, "create flow: hash %u index %u\n", rxhash, queue_index); @@ -223,19 +222,12 @@ static struct tun_flow_entry *tun_flow_create(struct tun_struct *tun, return e; } -static void tun_flow_free(struct rcu_head *head) -{ - struct tun_flow_entry *e - = container_of(head, struct tun_flow_entry, rcu); - kmem_cache_free(e->tun->flow_cache, e); -} - static void tun_flow_delete(struct tun_struct *tun, struct tun_flow_entry *e) { tun_debug(KERN_INFO, tun, "delete flow: hash %u index %u\n", e->rxhash, e->queue_index); hlist_del_rcu(&e->hash_link); - call_rcu(&e->rcu, tun_flow_free); + kfree_rcu(e, rcu); } static void tun_flow_flush(struct tun_struct *tun) @@ -833,12 +825,6 @@ static int tun_flow_init(struct tun_struct *tun) { int i; - tun->flow_cache = kmem_cache_create("tun_flow_cache", - sizeof(struct tun_flow_entry), 0, 0, - NULL); - if (!tun->flow_cache) - return -ENOMEM; - for (i = 0; i < TUN_NUM_FLOW_ENTRIES; i++) INIT_HLIST_HEAD(&tun->flows[i]); @@ -854,10 +840,6 @@ static void tun_flow_uninit(struct tun_struct *tun) { del_timer_sync(&tun->flow_gc_timer); tun_flow_flush(tun); - - /* Wait for completion of call_rcu()'s */ - rcu_barrier(); - kmem_cache_destroy(tun->flow_cache); } /* Initialize net device. */