[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20111104212958.5d54152b38050e2a0917d575@freescale.com>
Date: Fri, 4 Nov 2011 21:29:58 -0500
From: Kim Phillips <kim.phillips@...escale.com>
To: Greg KH <greg@...ah.com>
CC: David Miller <davem@...emloft.net>, <stable@...r.kernel.org>,
<eric.dumazet@...il.com>, <zheng.z.yan@...el.com>,
<netdev@...r.kernel.org>, David Ward <david.ward@...mit.edu>
Subject: Re: [stable] net: Handle different key sizes between address
families in flow cache
On Fri, 4 Nov 2011 14:24:39 -0700
Greg KH <greg@...ah.com> wrote:
> On Fri, Nov 04, 2011 at 02:46:59PM -0500, Kim Phillips wrote:
> > commit aa1c366e4febc7f5c2b84958a2dd7cd70e28f9d0 upstream.
> >
> > With the conversion of struct flowi to a union of AF-specific structs, some
> > operations on the flow cache need to account for the exact size of the key.
> >
> > Signed-off-by: David Ward <david.ward@...mit.edu>
> > Signed-off-by: David S. Miller <davem@...emloft.net>
> > Cc: stable@...r.kernel.org # v3.0.x
> > ---
> > This patch is the result of a clean cherry-pick onto v3.0.8.
> > It restores IPSec fwding performance from ~4kpps back to ~44kpps on
> > a P2020DS board.
>
> Too bad you forgot to build this patch after you applied it:
> CC init/main.o
> In file included from include/linux/security.h:39:0,
> from init/main.c:32:
> include/net/flow.h: In function 'flow_key_size':
> include/net/flow.h:174:3: error: size of unnamed array is negative
> include/net/flow.h:177:3: error: size of unnamed array is negative
>
> Please be kind to your poor over-worked stable kernel maintainer and do
> the decent thing and TEST YOUR PATCH before you ask him to accept it.
>
> bah, I think it's time for the weekend to start a bit earlier than normal...
so sorry I hadn't tested 64-bit.
I found the problem - upstream commit aa1c366 depends on
upstream commit 728871b:
commit 728871bc05afc8ff310b17dba3e57a2472792b13
Author: David Ward <david.ward@...mit.edu>
Date: Mon Sep 5 16:47:23 2011 +0000
net: Align AF-specific flowi structs to long
AF-specific flowi structs are now passed to flow_key_compare, which must
also be aligned to a long.
Signed-off-by: David Ward <david.ward@...mit.edu>
Signed-off-by: David S. Miller <davem@...emloft.net>
so, one more time, in stable sign-off area format:
Cc: <stable@...r.kernel.org> # v3.0.x: 728871b: net: Align AF-specific flowi structs to long
Cc: <stable@...r.kernel.org> # v3.0.x
build tested on 32- and 64-bit powerpc, and ARCH=x86
{i386,x86_64}_defconfig.
Kim
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists