kernel/include/net/flow.h, branch linux-3.0.y

ipv4: reset flowi parameters on route connect

2012-03-01T00:34:03Z

[ Upstream commit e6b45241c57a83197e5de9166b3b0d32ac562609 ] Eric Dumazet found that commit 813b3b5db83 (ipv4: Use caller's on-stack flowi as-is in output route lookups.) that comes in 3.0 added a regression. The problem appears to be that resulting flowi4_oif is used incorrectly as input parameter to some routing lookups. The result is that when connecting to local port without listener if the IP address that is used is not on a loopback interface we incorrectly assign RTN_UNICAST to the output route because no route is matched by oif=lo. The RST packet can not be sent immediately by tcp_v4_send_reset because it expects RTN_LOCAL. So, change ip_route_connect and ip_route_newports to update the flowi4 fields that are input parameters because we do not want unnecessary binding to oif. To make it clear what are the input parameters that can be modified during lookup and to show which fields of floiw4 are reused add a new function to update the flowi4 structure: flowi4_update_output. Thanks to Yurij M. Plotnikov for providing a bug report including a program to reproduce the problem. Thanks to Eric Dumazet for tracking the problem down to tcp_v4_send_reset and providing initial fix. Reported-by: Yurij M. Plotnikov Signed-off-by: Julian Anastasov Acked-by: Eric Dumazet Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman

net: Handle different key sizes between address families in flow cache

2011-11-11T17:37:17Z

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 Signed-off-by: David S. Miller Cc: Kim Phillips Signed-off-by: Greg Kroah-Hartman

net: Align AF-specific flowi structs to long

2011-11-11T17:37:17Z

commit 728871bc05afc8ff310b17dba3e57a2472792b13 upstream. AF-specific flowi structs are now passed to flow_key_compare, which must also be aligned to a long. Signed-off-by: David Ward Signed-off-by: David S. Miller Cc: Kim Phillips Signed-off-by: Greg Kroah-Hartman

net: Order ports in same order as addresses in flow objects.

2011-04-01T01:03:35Z

For consistency. Signed-off-by: David S. Miller

net: Add helper flowi4_init_output().

2011-03-31T11:52:14Z

On-stack initialization via assignment of flow structures are expensive because GCC emits a memset() to clear the entire structure out no matter what. Add a helper for ipv4 output flow key setup which we can use to avoid the memset. Signed-off-by: David S. Miller

decnet: Convert to use flowidn where applicable.

2011-03-12T23:08:55Z

Signed-off-by: David S. Miller

net: Put fl6_* macros to struct flowi6 and use them again.

2011-03-12T23:08:55Z

Signed-off-by: David S. Miller

net: Put fl4_* macros to struct flowi4 and use them again.

2011-03-12T23:08:54Z

Signed-off-by: David S. Miller

net: Add flowi6_* member helper macros.

2011-03-12T23:08:52Z

Signed-off-by: David S. Miller

ipv4: Pass ipv4 flow objects into fib_lookup() paths.

2011-03-12T23:08:47Z

To start doing these conversions, we need to add some temporary flow4_* macros which will eventually go away when all the protocol code paths are changed to work on AF specific flowi objects. Signed-off-by: David S. Miller