linux.git/net/core, branch v3.7-rc2

net: add doc for in4_pton()

2012-10-12T17:56:52+00:00

It is not easy to use in4_pton() correctly without reading
its definition, so add some doc for it.

Cc: David S. Miller 
Signed-off-by: Cong Wang 
Signed-off-by: David S. Miller

net: add doc for in6_pton()

2012-10-12T17:56:52+00:00

It is not easy to use in6_pton() correctly without reading
its definition, so add some doc for it.

Cc: David S. Miller 
Signed-off-by: Cong Wang 
Signed-off-by: David S. Miller

pktgen: replace scan_ip6() with in6_pton()

2012-10-11T02:33:30+00:00

Cc: David S. Miller 
Signed-off-by: Cong Wang 
Signed-off-by: David S. Miller

pktgen: enable automatic IPv6 address setting

2012-10-11T02:33:30+00:00

Cc: David S. Miller 
Signed-off-by: Cong Wang 
Signed-off-by: David S. Miller

pktgen: display IPv4 address in human-readable format

2012-10-11T02:33:30+00:00

It is weird to display IPv4 address in %x format, what's more,
IPv6 address is disaplayed in human-readable format too. So,
make it human-readable.

Cc: David S. Miller 
Signed-off-by: Cong Wang 
Signed-off-by: David S. Miller

pktgen: set different default min_pkt_size for different protocols

2012-10-11T02:33:30+00:00

ETH_ZLEN is too small for IPv6, so this default value is not
suitable.

Cc: David S. Miller 
Signed-off-by: Cong Wang 
Signed-off-by: David S. Miller

pktgen: fix crash when generating IPv6 packets

2012-10-11T02:33:30+00:00

For IPv6, sizeof(struct ipv6hdr) = 40, thus the following
expression will result negative:

        datalen = pkt_dev->cur_pkt_size - 14 -
                  sizeof(struct ipv6hdr) - sizeof(struct udphdr) -
                  pkt_dev->pkt_overhead;

And,  the check "if (datalen < sizeof(struct pktgen_hdr))" will be
passed as "datalen" is promoted to unsigned, therefore will cause
a crash later.

This is a quick fix by checking if "datalen" is negative. The following
patch will increase the default value of 'min_pkt_size' for IPv6.

This bug should exist for a long time, so Cc -stable too.

Cc: 
Cc: David S. Miller 
Signed-off-by: Cong Wang 
Signed-off-by: David S. Miller

vlan: don't deliver frames for unknown vlans to protocols

2012-10-08T19:21:55+00:00

6a32e4f9dd9219261f8856f817e6655114cfec2f made the vlan code skip marking
vlan-tagged frames for not locally configured vlans as PACKET_OTHERHOST if
there was an rx_handler, as the rx_handler could cause the frame to be received
on a different (virtual) vlan-capable interface where that vlan might be
configured.

As rx_handlers do not necessarily return RX_HANDLER_ANOTHER, this could cause
frames for unknown vlans to be delivered to the protocol stack as if they had
been received untagged.

For example, if an ipv6 router advertisement that's tagged for a locally not
configured vlan is received on an interface with macvlan interfaces attached,
macvlan's rx_handler returns RX_HANDLER_PASS after delivering the frame to the
macvlan interfaces, which caused it to be passed to the protocol stack, leading
to ipv6 addresses for the announced prefix being configured even though those
are completely unusable on the underlying interface.

The fix moves marking as PACKET_OTHERHOST after the rx_handler so the
rx_handler, if there is one, sees the frame unchanged, but afterwards,
before the frame is delivered to the protocol stack, it gets marked whether
there is an rx_handler or not.

Signed-off-by: Florian Zumbiehl 
Signed-off-by: David S. Miller

net: gro: selective flush of packets

2012-10-08T18:51:51+00:00

Current GRO can hold packets in gro_list for almost unlimited
time, in case napi->poll() handler consumes its budget over and over.

In this case, napi_complete()/napi_gro_flush() are not called.

Another problem is that gro_list is flushed in non friendly way :
We scan the list and complete packets in the reverse order.
(youngest packets first, oldest packets last)
This defeats priorities that sender could have cooked.

Since GRO currently only store TCP packets, we dont really notice the
bug because of retransmits, but this behavior can add unexpected
latencies, particularly on mice flows clamped by elephant flows.

This patch makes sure no packet can stay more than 1 ms in queue, and
only in stress situations.

It also complete packets in the right order to minimize latencies.

Signed-off-by: Eric Dumazet 
Cc: Herbert Xu 
Cc: Jesse Gross 
Cc: Tom Herbert 
Cc: Yuchung Cheng 
Signed-off-by: David S. Miller

net: gro: fix a potential crash in skb_gro_reset_offset

2012-10-07T18:49:17+00:00

Before accessing skb first fragment, better make sure there
is one.

This is probably not needed for old kernels, since an ethernet frame
cannot contain only an ethernet header, but the recent GRO addition
to tunnels makes this patch needed.

Also skb_gro_reset_offset() can be static, it actually allows
compiler to inline it.

Signed-off-by: Eric Dumazet 
Cc: Herbert Xu 
Signed-off-by: David S. Miller