提交 · ec99f76d281bae0194c6060417d3465ded94f0ed · openanolis / cloud-kernel

07 12月, 2013 34 次提交

tg3: Don't add rxbds_empty to rx_over_errors · ec99f76d

由 Nithin Sujir 提交于 12月 06, 2013

rxbds_empty is an informational statistic signifying that a ring full
condition was observed. It does not mean an overflow has occurred.
Signed-off-by: NNithin Nayak Sujir <nsujir@broadcom.com>
Signed-off-by: NMichael Chan <mchan@broadcom.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>

ec99f76d

Merge branch 'of_mdio' · eb25a4e7

由 David S. Miller 提交于 12月 06, 2013

Florian Fainelli says:

====================
net: of_mdio improvements

This patchset contains a few improvements to the MDIO device tree parsing
code such as refactoring and parsing the "max-speed" property which is
defined in the ePAPR specification.
====================
Signed-off-by: NDavid S. Miller <davem@davemloft.net>

eb25a4e7

Documentation: update Ethernet PHY devices binding with 'max-speed' · 9f2b0936

由 Florian Fainelli 提交于 12月 05, 2013

The 'max-speed' property is optional but defined in the ePAPR
specification and now supported by the Linux Device Tree parsing
infrastructure.
Signed-off-by: NFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>

9f2b0936

arc_emac: remove custom "max-speed" parsing code · b0ac9564

由 Florian Fainelli 提交于 12月 05, 2013

The ARC emac driver was the only in-tree to parse a PHY device
'max-speed' property but yet failed to do it correctly because
'max-speed' is supposed to set a PHY device supported features, not the
advertising features as it was done.

Now that of_mdiobus_register() takes care of doing that, remove the
custom 'max-speed' parsing code.
Signed-off-by: NFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>

b0ac9564

net: of_mdio: parse "max-speed" property to set PHY supported features · 8fdade4b

由 Florian Fainelli 提交于 12月 05, 2013

The "max-speed" property is defined per the ePAPR specification to
express the maximum speed a PHY supports. Use that property, if present
to set the phydev->supported features which properly restricts the PHY
within the range of defined speeds.
Signed-off-by: NFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>

8fdade4b

net: phy: breakdown PHY_*_FEATURES defines · e9fbdf17

由 Florian Fainelli 提交于 12月 05, 2013

Breakdown the PHY_*_FEATURES into per speed defines such that we can
easily re-use them individually.
Signed-off-by: NFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>

e9fbdf17

net: of_mdio: do not overwrite PHY interrupt configuration · 7d976376

由 Florian Fainelli 提交于 12月 05, 2013

If irq_of_parse_and_map fails to find an interrupt line for a given PHY,
we will force the PHY interrupt to be PHY_POLL, completely overriding
the previous value that the MDIO bus may have set for us (e.g:
PHY_IGNORE_INTERRUPT). In case of failure, just restore the previous
value.
Signed-off-by: NFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>

7d976376

net: of_mdio: use PHY_MAX_ADDR constant · bed2f9ed

由 Florian Fainelli 提交于 12月 05, 2013

Use the PHY_MAX_ADDR constant for checking if a MDIO bus address is
valid instead of using a plain "32".
Signed-off-by: NFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>

bed2f9ed

net: of_mdio: factor PHY registration from of_mdiobus_register · 2e79cb30

由 Florian Fainelli 提交于 12月 05, 2013

Since commit 779d835e ("net: of_mdio: scan mdiobus for PHYs without reg
property") we have two foreach loops which do pretty much the same
thing. Factor the PHY device registration in a function helper:
of_mdiobus_register_phy() which takes care of the details and allows for
future PHY specific extensions.
Signed-off-by: NFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>

2e79cb30

sctp: fix some comments in associola.c · 9d2c881a

由 wangweidong 提交于 12月 06, 2013

fix some typos
Acked-by: NNeil Horman <nhorman@tuxdriver.com>
Signed-off-by: NWang Weidong <wangweidong1@huawei.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>

9d2c881a

sctp: convert sctp_peer_needs_update to boolean · ce4a03db

由 wangweidong 提交于 12月 06, 2013

sctp_peer_needs_update only return 0 or 1.
Acked-by: NNeil Horman <nhorman@tuxdriver.com>
Signed-off-by: NWang Weidong <wangweidong1@huawei.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>

ce4a03db

sctp: remove the else path · 8b7318d3

由 wangweidong 提交于 12月 06, 2013

Make the code more simplification.
Acked-by: NNeil Horman <nhorman@tuxdriver.com>
Suggested-by: NJoe Perches <joe@perches.com>
Signed-off-by: NWang Weidong <wangweidong1@huawei.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>

8b7318d3

sctp: remove the duplicate initialize · d1d66186

由 wangweidong 提交于 12月 06, 2013

kzalloc had initialize the allocated memroy. Therefore, remove the
initialize with 0 and the memset.
Acked-by: NNeil Horman <nhorman@tuxdriver.com>
Signed-off-by: NWang Weidong <wangweidong1@huawei.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>

d1d66186

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next · 19e1190a

由 David S. Miller 提交于 12月 06, 2013

Jeff Kirsher says:

====================
Intel Wired LAN Driver Updates

This series contains updates to i40e only.

Christopher Pau provides a patch to set pf_id based on device and
function numbers since NICs with ARI enabled can have function
numbers larger than 8.

Anjali provides 3 i40e patches to update hardware defines to keep
in sync with hardware updates.

Shannon provides the majority of i40e patches, with 7.  First patch
clears the admin queue head and tail registers during admin queue
shutdown. Then simplifies the admin queue head-tail-len setups to
use more virtual registers.  Provides several patches to cleanup
and fix driver load and reset procedures to make more robust.  Lastly,
provides an ethtool test for interrupts using the software interrupt.

Mitch provides some i40e patches which fixes up VF code in the PF
driver, specifically the number of vectors per VF are reported by the
hardware does not include vector 0, so we need to account for this
when checking.  In addition, cleans up debugging messages.

Kamil provides an i40e patch to fix the diagnostics test by restricting
the diagnostic test length.
====================
Signed-off-by: NDavid S. Miller <davem@davemloft.net>

19e1190a

Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next · f1abb346

由 David S. Miller 提交于 12月 06, 2013

John W. Linville says:

====================
Please pull this batch of updates intended for the 3.14 stream...

For the mac80211 bits, Johannes says:

"I have various improvements/cleanups/fixes all over, but the shortlog
shows that Luis's regulatory work and mesh work from the cozybit folks
are the biggest ones, along with the CSA fixes."

Along with that, we have big batches of updates to brcmfmac, rtlwifi,
and ath9k.  There are updates to wcn36xx, rt2x00, and a handful of
others as well.
====================
Signed-off-by: NDavid S. Miller <davem@davemloft.net>

f1abb346

tcp: auto corking · f54b3111

由 Eric Dumazet 提交于 12月 05, 2013

With the introduction of TCP Small Queues, TSO auto sizing, and TCP
pacing, we can implement Automatic Corking in the kernel, to help
applications doing small write()/sendmsg() to TCP sockets.

Idea is to change tcp_push() to check if the current skb payload is
under skb optimal size (a multiple of MSS bytes)

If under 'size_goal', and at least one packet is still in Qdisc or
NIC TX queues, set the TCP Small Queue Throttled bit, so that the push
will be delayed up to TX completion time.

This delay might allow the application to coalesce more bytes
in the skb in following write()/sendmsg()/sendfile() system calls.

The exact duration of the delay is depending on the dynamics
of the system, and might be zero if no packet for this flow
is actually held in Qdisc or NIC TX ring.

Using FQ/pacing is a way to increase the probability of
autocorking being triggered.

Add a new sysctl (/proc/sys/net/ipv4/tcp_autocorking) to control
this feature and default it to 1 (enabled)

Add a new SNMP counter : nstat -a | grep TcpExtTCPAutoCorking
This counter is incremented every time we detected skb was under used
and its flush was deferred.

Tested:

Interesting effects when using line buffered commands under ssh.

Excellent performance results in term of cpu usage and total throughput.

lpq83:~# echo 1 >/proc/sys/net/ipv4/tcp_autocorking
lpq83:~# perf stat ./super_netperf 4 -t TCP_STREAM -H lpq84 -- -m 128
9410.39

Performance counter stats for './super_netperf 4 -t TCP_STREAM -H lpq84 -- -m 128':

35209.439626 task-clock # 2.901 CPUs utilized
2,294 context-switches # 0.065 K/sec
101 CPU-migrations # 0.003 K/sec
4,079 page-faults # 0.116 K/sec
97,923,241,298 cycles # 2.781 GHz [83.31%]
51,832,908,236 stalled-cycles-frontend # 52.93% frontend cycles idle [83.30%]
25,697,986,603 stalled-cycles-backend # 26.24% backend cycles idle [66.70%]
102,225,978,536 instructions # 1.04 insns per cycle
# 0.51 stalled cycles per insn [83.38%]
18,657,696,819 branches # 529.906 M/sec [83.29%]
91,679,646 branch-misses # 0.49% of all branches [83.40%]

12.136204899 seconds time elapsed

lpq83:~# echo 0 >/proc/sys/net/ipv4/tcp_autocorking
lpq83:~# perf stat ./super_netperf 4 -t TCP_STREAM -H lpq84 -- -m 128
6624.89

Performance counter stats for './super_netperf 4 -t TCP_STREAM -H lpq84 -- -m 128':
40045.864494 task-clock # 3.301 CPUs utilized
171 context-switches # 0.004 K/sec
53 CPU-migrations # 0.001 K/sec
4,080 page-faults # 0.102 K/sec
111,340,458,645 cycles # 2.780 GHz [83.34%]
61,778,039,277 stalled-cycles-frontend # 55.49% frontend cycles idle [83.31%]
29,295,522,759 stalled-cycles-backend # 26.31% backend cycles idle [66.67%]
108,654,349,355 instructions # 0.98 insns per cycle
# 0.57 stalled cycles per insn [83.34%]
19,552,170,748 branches # 488.244 M/sec [83.34%]
157,875,417 branch-misses # 0.81% of all branches [83.34%]

12.130267788 seconds time elapsed
Signed-off-by: NEric Dumazet <edumazet@google.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>

f54b3111

3c59x/net: Use dev_is_pci() instead of hardcoding · d8535a0a

由 Yijing Wang 提交于 12月 06, 2013

Use PCI standard macro dev_is_pci() instead of hardcoding.
Signed-off-by: NYijing Wang <wangyijing@huawei.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>

d8535a0a

net/fddi: Replace local macro with PCI standard macro · 5349d937

由 Yijing Wang 提交于 12月 06, 2013

Replace local macro DFX_BUS_PCI() with PCI standard macro
dev_is_pci().
Acked-by: NMaciej W. Rozycki <macro@linux-mips.org>
Signed-off-by: NYijing Wang <wangyijing@huawei.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>

5349d937

tcp: optimize some skb_shinfo(skb) uses · 7b7fc97a

由 Eric Dumazet 提交于 12月 05, 2013

Compiler doesn't know skb_shinfo(skb) pointer is usually constant.

By using a temporary variable, we help generating smaller code.

For example, tcp_init_nondata_skb() is inlined after this patch.
Signed-off-by: NEric Dumazet <edumazet@google.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>

7b7fc97a

gro: small napi_get_frags() optim · 84b9cd63

由 Eric Dumazet 提交于 12月 05, 2013

Remove one useless conditional branch :
napi->skb is NULL, so nothing bad can happen.
Signed-off-by: NEric Dumazet <edumazet@google.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>

84b9cd63

ipv6: consistent use of IP6_INC_STATS_BH() in ip6_forward() · 15c77d8b

由 Eric Dumazet 提交于 12月 05, 2013

ip6_forward() runs from softirq context, we can use the SNMP macros
assuming this.

Use same indentation for all IP6_INC_STATS_BH() calls.
Signed-off-by: NEric Dumazet <edumazet@google.com>
Acked-by: NHannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>

15c77d8b

packet: use macro GET_PBDQC_FROM_RB to simplify the codes · 22781a5b

由 Duan Jiong 提交于 12月 06, 2013

Signed-off-by: NDuan Jiong <duanj.fnst@cn.fujitsu.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>

22781a5b

tun: spelling fixes · 92d4ea6e

由 stephen hemminger 提交于 12月 05, 2013

Fix spelling errors in tun driver.
Signed-off-by: NStephen Hemminger <stephen@networkplumber.org>
Acked-by: NJason Wang <jasowang@redhat.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>

92d4ea6e

net/*: Fix FSF address in file headers · c057b190