Linus Torvalds
3c4cfadef6
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next ...
Pull networking changes from David S Miller:
1) Remove the ipv4 routing cache. Now lookups go directly into the FIB
trie and use prebuilt routes cached there.
No more garbage collection, no more rDOS attacks on the routing
cache. Instead we now get predictable and consistent performance,
no matter what the pattern of traffic we service.
This has been almost 2 years in the making. Special thanks to
Julian Anastasov, Eric Dumazet, Steffen Klassert, and others who
have helped along the way.
I'm sure that with a change of this magnitude there will be some
kind of fallout, but such things ought the be simple to fix at this
point. Luckily I'm not European so I'll be around all of August to
fix things :-)
The major stages of this work here are each fronted by a forced
merge commit whose commit message contains a top-level description
of the motivations and implementation issues.
2) Pre-demux of established ipv4 TCP sockets, saves a route demux on
input.
3) TCP SYN/ACK performance tweaks from Eric Dumazet.
4) Add namespace support for netfilter L4 conntrack helpers, from Gao
Feng.
5) Add config mechanism for Energy Efficient Ethernet to ethtool, from
Yuval Mintz.
6) Remove quadratic behavior from /proc/net/unix, from Eric Dumazet.
7) Support for connection tracker helpers in userspace, from Pablo
Neira Ayuso.
8) Allow userspace driven TX load balancing functions in TEAM driver,
from Jiri Pirko.
9) Kill off NLMSG_PUT and RTA_PUT macros, more gross stuff with
embedded gotos.
10) TCP Small Queues, essentially minimize the amount of TCP data queued
up in the packet scheduler layer. Whereas the existing BQL (Byte
Queue Limits) limits the pkt_sched --> netdevice queuing levels,
this controls the TCP --> pkt_sched queueing levels.
From Eric Dumazet.
11) Reduce the number of get_page/put_page ops done on SKB fragments,
from Alexander Duyck.
12) Implement protection against blind resets in TCP (RFC 5961), from
Eric Dumazet.
13) Support the client side of TCP Fast Open, basically the ability to
send data in the SYN exchange, from Yuchung Cheng.
Basically, the sender queues up data with a sendmsg() call using
MSG_FASTOPEN, then they do the connect() which emits the queued up
fastopen data.
14) Avoid all the problems we get into in TCP when timers or PMTU events
hit a locked socket. The TCP Small Queues changes added a
tcp_release_cb() that allows us to queue work up to the
release_sock() caller, and that's what we use here too. From Eric
Dumazet.
15) Zero copy on TX support for TUN driver, from Michael S. Tsirkin.
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1870 commits)
genetlink: define lockdep_genl_is_held() when CONFIG_LOCKDEP
r8169: revert "add byte queue limit support".
ipv4: Change rt->rt_iif encoding.
net: Make skb->skb_iif always track skb->dev
ipv4: Prepare for change of rt->rt_iif encoding.
ipv4: Remove all RTCF_DIRECTSRC handliing.
ipv4: Really ignore ICMP address requests/replies.
decnet: Don't set RTCF_DIRECTSRC.
net/ipv4/ip_vti.c: Fix __rcu warnings detected by sparse.
ipv4: Remove redundant assignment
rds: set correct msg_namelen
openvswitch: potential NULL deref in sample()
tcp: dont drop MTU reduction indications
bnx2x: Add new 57840 device IDs
tcp: avoid oops in tcp_metrics and reset tcpm_stamp
niu: Change niu_rbr_fill() to use unlikely() to check niu_rbr_add_page() return value
niu: Fix to check for dma mapping errors.
net: Fix references to out-of-scope variables in put_cmsg_compat()
net: ethernet: davinci_emac: add pm_runtime support
net: ethernet: davinci_emac: Remove unnecessary #include
...
2012-07-24 10:01:50 -07:00
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
2012-05-25 09:31:59 -07:00
bcma: cc: update defines
2012-07-17 15:11:37 -04:00
can: mark bittiming_const pointer in struct can_priv as const
2012-07-20 12:31:05 +02:00
libceph: fix messenger retry
2012-07-17 19:35:59 -07:00
mfd: twl: remove pdata->irq_base/_end, no more users
2012-06-19 15:24:34 -07:00
MMC highlights for 3.6:
2012-07-22 16:36:08 -07:00
{NET,IB}/mlx4: Add rmap support to mlx4_assign_eq
2012-07-19 08:34:37 -07:00
mmc: sd: Fix sd current limit setting
2012-07-22 15:25:52 -04:00
- More robust parsing especially of xattr data in JFFS2
2012-06-01 16:55:42 -07:00
netfilter: nfnetlink_queue: do not allow to set unsupported flag bits
2012-07-04 19:51:50 +02:00
netfilter: remove include/linux/netfilter_ipv4/ipt_addrtype.h
2012-06-07 14:58:38 +02:00
Merge branch 'for-3.5-take-2' of git://linux-nfs.org/~bfields/linux
2012-05-31 18:18:11 -07:00
arm-soc: board specific updates
2012-07-23 17:34:48 -07:00
Merge branch 'for_3.6/pm/sr-move' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into devel-driver
2012-06-26 06:55:23 -07:00
Merge branch 'regulator-drivers' into regulator-next
2012-07-22 19:32:00 +01:00
rtc: ds1307: add trickle charger support
2012-05-29 16:22:33 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-06-28 17:37:00 -07:00
ssb: recognize ARM Cortex M3
2012-06-06 15:20:22 -04:00
nfsd4: move rq_flavor into svc_cred
2012-05-31 20:29:58 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2012-07-24 10:01:50 -07:00
aio: make kiocb->private NUll in init_sync_kiocb()
2012-07-05 01:33:59 -07:00
drivers/video/backlight/apple_bl.c: include header for exported symbol prototypes
2012-05-29 16:22:29 -07:00
block: Drop dead function blk_abort_queue()
2012-06-15 08:46:23 +02:00
mm: sparse: fix usemap allocation above node descriptor section
2012-07-11 16:04:49 -07:00
bug: introduce BUILD_BUG_ON_INVALID() macro
2012-05-29 16:22:20 -07:00
net: em_canid: Ematch rule to match CAN frames according to their identifiers
2012-07-04 13:07:05 +02:00
PM: Rename CAP_EPOLLWAKEUP to CAP_BLOCK_SUSPEND
2012-07-17 21:37:27 +02:00
clockevents: Make clockevents_config() a global symbol
2012-05-25 01:44:51 +02:00
Revert "mm: compaction: handle incorrect MIGRATE_UNMOVABLE type pageblocks"
2012-06-03 20:05:57 -07:00
aio/vfs: cleanup of rw_copy_check_uvector() and compat_rw_copy_check_uvector()
2012-05-31 17:49:32 -07:00
ftrace: Make all inline tags also include notrace
2012-06-18 09:47:00 -04:00
cpu: introduce clear_tasks_mm_cpumask() helper
2012-05-31 17:49:29 -07:00
net/rps: Protect cpu_rmap.h from double inclusion
2012-07-19 08:34:37 -07:00
Merge branch 'pm-domains'
2012-07-19 00:03:17 +02:00
cred: remove task_is_dead() from __task_cred() validation
2012-05-31 17:49:28 -07:00
stop passing nameidata * to ->d_revalidate()
2012-07-14 16:34:14 +04:00
Make wait_for_device_probe() also do scsi_complete_async_scans()
2012-07-18 18:15:46 -07:00
dma-buf: minor documentation fixes.
2012-05-25 12:46:23 +05:30
rapidio: add DMA engine support for RIO data transfers
2012-05-31 17:49:31 -07:00
ARM: socfpga: initial support for Altera's SOCFPGA platform
2012-07-19 10:39:00 +02:00
edac: Initialize the dimm label with the known information
2012-05-28 19:13:50 -03:00
vfs: retry last component if opening stale dentry
2012-06-01 12:12:01 -04:00
etherdevice: Rename random_ether_addr to eth_random_addr
2012-07-16 22:38:27 -07:00
net: added support for 40GbE link.
2012-06-27 15:42:24 -07:00
eventfd: change int to __u64 in eventfd_signal()
2012-05-31 17:49:32 -07:00
PM: Rename CAP_EPOLLWAKEUP to CAP_BLOCK_SUSPEND
2012-07-17 21:37:27 +02:00
->encode_fh() API change
2012-05-29 23:28:33 -04:00
fbdev updates for 3.5
2012-06-01 16:57:51 -07:00
switch fput to task_work_add
2012-07-22 23:57:58 +04:00
IEEE 1394 (FireWire) subsystem updates post v3.4:
2012-05-24 12:57:47 -07:00
switch dentry_open() to struct path, make it grab references itself
2012-07-23 00:01:29 +04:00
fsnotify: handle subfiles' perm events
2012-05-30 21:04:53 -04:00
tracing: Remove NR_CPUS array from trace_iterator
2012-06-28 13:52:15 -04:00
genetlink: define lockdep_genl_is_held() when CONFIG_LOCKDEP
2012-07-24 00:01:30 -07:00
gpio: fix bits conflict for gpio flags
2012-07-05 15:04:10 +02:00
timekeeping: Provide hrtimer update function
2012-07-11 23:34:39 +02:00
mm: move is_vma_temporary_stack() declaration to huge_mm.h
2012-05-29 16:22:21 -07:00
mm: add new arch_make_huge_pte() method for tile support
2012-05-25 12:48:26 -04:00
i2c: Add generic I2C multiplexer using pinctrl API
2012-06-04 16:49:43 +02:00
i2c: Split I2C_M_NOSTART support out of I2C_FUNC_PROTOCOL_MANGLING
2012-05-30 10:55:34 +02:00
wireless: 60g protocol constants
2012-07-02 15:11:12 +02:00
net: introduce new priv_flag indicating iface capable of change mac when running
2012-06-30 01:08:00 -07:00
canfd: add new data structures and constants
2012-06-19 21:39:50 +02:00
rtnl: allow to specify number of rx and tx queues on device creation
2012-07-20 11:07:00 -07:00
team: add multiqueue support
2012-07-20 11:07:00 -07:00
net/ipv4: VTI support new module for ip_vti.
2012-07-18 09:36:12 -07:00
ipv4: Add interface option to enable routing of 127.0.0.0/8
2012-06-12 15:25:46 -07:00
rcu: Use new RCU_POINTER_INITIALIZER for gcc-style initializations
2012-07-02 12:34:22 -07:00
Input: fix input.h kernel-doc warning
2012-06-11 23:57:22 -07:00
iommu/dmar: Reserve mmio space used by the IOMMU, if the BIOS forgets to
2012-06-08 12:15:43 +02:00
genirq: reimplement exit_irq_thread() hook via task_work_add()
2012-05-23 22:11:12 -04:00
powerpc: Disable /dev/port interface on systems without an ISA bridge
2012-07-11 18:22:32 +10:00
mqueue: separate mqueue default value from maximum value
2012-05-31 17:49:31 -07:00
ipv6: fix inet6_csk_xmit()
2012-07-18 08:59:58 -07:00
ipx: restore token ring define to include/linux/ipx.h
2012-05-23 13:49:23 -04:00
Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2012-07-22 12:19:36 -07:00
ext4/jbd2: add metadata checksumming to the list of supported features
2012-05-27 08:12:42 -04:00
jump label: Remove static_branch()
2012-07-06 10:53:49 +02:00
vsprintf: fix %ps on non symbols when using kallsyms
2012-05-29 16:22:32 -07:00
kexec: export kexec.h to user space
2012-05-31 17:49:30 -07:00
syscalls, x86: add __NR_kcmp syscall
2012-05-31 17:49:32 -07:00
kbuild: install kernel-page-flags.h
2012-05-29 16:22:21 -07:00
Remove SYSTEM_SUSPEND_DISK system state
2012-07-21 13:58:17 -07:00
kexec: export kexec.h to user space
2012-05-31 17:49:30 -07:00
key: Remove extraneous parentheses from rcu_assign_keypointer()
2012-07-02 12:34:23 -07:00
kmod: move call_usermodehelper_fns() to .c file and unexport all it's helpers
2012-05-31 17:49:28 -07:00
printk: Implement some unlocked kmsg_dump functions
2012-07-21 10:34:00 -07:00
net/ethernet: ks8851_mll mac address configuration support added
2012-06-04 11:43:00 -04:00
KVM: Pass kvm_irqfd to functions
2012-07-02 21:10:30 -03:00
lcd: add callbacks for early fb event blank support
2012-05-29 16:22:29 -07:00
include/linux/led-lm3530.h: comment correction about the range of brightness
2012-05-29 16:22:32 -07:00
leds: add new field to led_classdev struct to save activation state
2012-05-29 16:22:31 -07:00
brlocks/lglocks: turn into functions
2012-05-29 23:28:41 -04:00
phy: add the EEE support and the way to access to the MMD registers.
2012-07-01 03:34:50 -07:00
memblock: free allocated memblock_reserved_regions later
2012-07-11 16:04:50 -07:00
mm/memcg: apply add/del_page to lruvec
2012-05-29 16:22:28 -07:00
mm: do_migrate_pages(): rename arguments
2012-05-29 16:22:20 -07:00
phy: add the EEE support and the way to access to the MMD registers.
2012-07-01 03:34:50 -07:00
x86/mce: Fix siginfo_t->si_addr value for non-recoverable memory faults
2012-07-11 10:20:47 -07:00
mm/memcg: apply add/del_page to lruvec
2012-05-29 16:22:28 -07:00
mm: fix slab->page _count corruption when using slub
2012-06-20 14:39:35 -07:00
bug: completely remove code generated by disabled VM_BUG_ON()
2012-05-29 16:22:20 -07:00
memory hotplug: fix invalid memory access caused by stale kswapd pointer
2012-07-11 16:04:41 -07:00
module_param: stop double-calling parameters.
2012-06-08 14:58:13 +09:30
fat: introduce special inode for managing the FSINFO block
2012-05-31 17:49:27 -07:00
video: mxsfb: move mxsfb.h into include/linux
2012-07-03 13:22:37 +08:00
fs: add nd_jump_link
2012-07-14 16:35:40 +04:00
net: netprio_cgroup: rework update socket logic
2012-07-22 12:44:01 -07:00
net: honour netif_set_real_num_tx_queues() retval
2012-07-20 11:06:59 -07:00
netfilter: nfnetlink_queue: fix compilation with CONFIG_NF_NAT=m and CONFIG_NF_CT_NETLINK=y
2012-06-22 02:49:52 +02:00
netfilter: add user-space connection tracking helper infrastructure
2012-06-16 15:40:02 +02:00
netfilter: add user-space connection tracking helper infrastructure
2012-06-16 15:40:02 +02:00
netlink: add nlk->netlink_bind hook for module auto-loading
2012-06-29 16:46:06 -07:00
netpoll: move np->dev and np->dev_name init into __netpoll_setup()
2012-07-17 09:02:36 -07:00
NFC: Add ISO 14443 type B protocol
2012-07-09 16:42:24 -04:00
NFSv4.1: Add DESTROY_CLIENTID
2012-05-26 14:17:30 -04:00
NFSv4.1 add nfs_inode book keeping for mdsthreshold
2012-05-24 16:15:48 -04:00
NFSv4.1: Fix umount when filelayout DS is also the MDS
2012-06-18 08:45:16 -04:00
nfs: clean up ->create in nfs_rpc_ops
2012-07-14 16:33:08 +04:00
cfg80211: add cellular base station regulatory hint support
2012-07-17 12:16:39 +02:00
mac802154: add wpan device-class support
2012-06-26 21:06:11 -07:00
of: Improve prom_update_property() function
2012-07-11 15:26:51 +10:00
mm, oom: normalize oom scores to oom_score_adj scale only for userspace
2012-05-29 16:22:24 -07:00
pagemap.h: fix warning about possibly used before init var
2012-05-29 16:22:18 -07:00
Viresh has moved
2012-06-20 14:39:36 -07:00
PCI: EHCI: fix crash during suspend on ASUS computers
2012-07-10 09:52:05 -07:00
Merge branch 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2012-07-22 16:07:45 -07:00
perf: Introduce perf_pmu_migrate_context()
2012-06-18 12:13:21 +02:00
phylib: Support registering a bunch of drivers
2012-07-09 00:10:56 -07:00
net: sched: add ipset ematch
2012-07-12 07:54:46 -07:00
PM / Domains: Add device domain data reference counter
2012-07-05 22:12:32 +02:00
PM / QoS: Use NULL pointer instead of plain integer in pm_qos.h
2012-07-19 00:02:30 +02:00
security: Minor improvements to no_new_privs documentation
2012-07-08 00:25:48 +10:00
pstore/ram_core: Factor persistent_ram_zap() out of post_init()
2012-06-13 16:52:40 -07:00
ASoC: fix pxa-ssp compiling issue under mach-mmp
2012-06-11 12:26:15 +08:00
quota: Split dquot_quota_sync() to writeback and cache flushing part
2012-07-22 23:58:19 +04:00
quota: Split dquot_quota_sync() to writeback and cache flushing part
2012-07-22 23:58:19 +04:00
radix-tree: fix contiguous iterator
2012-06-05 10:46:40 -07:00
rcu: Fix broken strings in RCU's source code.
2012-07-06 06:01:49 -07:00
Revert "rcu: Move PREEMPT_RCU preemption to switch_to() invocation"
2012-07-02 11:39:19 -07:00
rcu: Precompute RCU_FAST_NO_HZ timer offsets
2012-06-06 20:43:28 -07:00
Merge branches 'regmap-core', 'regmap-irq' and 'regmap-page' into regmap-next
2012-07-22 19:26:07 +01:00
rescounter: remove __must_check from res_counter_charge_nofail()
2012-05-29 16:22:27 -07:00
rapidio: add DMA engine support for RIO data transfers
2012-05-31 17:49:31 -07:00
rapidio: add DMA engine support for RIO data transfers
2012-05-31 17:49:31 -07:00
mm: move is_vma_temporary_stack() declaration to huge_mm.h
2012-05-29 16:22:21 -07:00
rpmsg: make sure inflight messages don't invoke just-removed callbacks
2012-07-04 11:51:59 +03:00
rtc: add ioctl to get/clear battery low voltage status
2012-05-29 16:22:33 -07:00
rtnetlink: Remove ts/tsage args to rtnl_put_cacheinfo().
2012-07-10 22:40:13 -07:00
Merge branch 'for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2012-07-23 12:27:27 -07:00
take security_mmap_file() outside of ->mmap_sem
2012-06-01 10:37:01 -04:00
Merge branch 'delete-mca' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
2012-05-23 17:12:06 -07:00
sh: clkfwk: Use shared sh_clk_div_enable/disable().
2012-05-25 16:34:48 +09:00
sh: pfc: Rudimentary pinctrl-backed GPIO support.
2012-07-10 12:08:14 +09:00
new helper: signal_delivered()
2012-06-01 12:58:52 -04:00
skbuff: add an api to orphan frags
2012-07-22 12:39:33 -07:00
introduce SIZE_MAX
2012-05-31 17:49:26 -07:00
smp: Remove num_booting_cpus()
2012-06-05 17:32:30 +02:00
net-tcp: Fast Open client - sending SYN-data
2012-07-19 11:02:03 -07:00
net: make sock diag per-namespace
2012-07-16 22:31:34 -07:00
net-tcp: Fast Open client - sendmsg(MSG_FASTOPEN)
2012-07-19 11:02:03 -07:00
splice: fix racy pipe->buffers uses
2012-06-13 21:16:42 +02:00
PM / Sleep: Separate printing suspend times from initcall_debug
2012-07-01 13:31:23 +02:00
Frontswap provides a "transcendent memory" interface for swap pages.
2012-06-04 12:28:45 -07:00
swap: fix shmem swapping when more than 8 areas
2012-06-15 21:48:14 -07:00
syscalls, x86: add __NR_kcmp syscall
2012-05-31 17:49:32 -07:00
ipv4: Don't add deprecated new binary sysctl value.
2012-06-22 23:02:22 -07:00
merge task_work and rcu_head, get rid of separate allocation for keyring case
2012-07-22 23:57:56 +04:00
tcp: dont drop MTU reduction indications
2012-07-23 00:58:46 -07:00
set_restore_sigmask() is never called without SIGPENDING (and never should be)
2012-06-01 12:58:50 -04:00
nohz: Rename ts->idle_tick to ts->last_tick
2012-06-11 20:07:17 +02:00
clocksource: time-armada-370-xp: Marvell Armada 370/XP SoC timer driver
2012-07-10 15:47:46 +02:00
tipc: remove print_buf and deprecated log buffer code
2012-07-13 19:34:43 -04:00
Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2012-05-22 18:27:32 -07:00
trim task_work: get rid of hlist
2012-07-22 23:57:55 +04:00
tracepoint: Use static_key_false(), since static_branch() is deprecated
2012-07-06 10:53:49 +02:00
tty: Revert the tty locking series, it needs more work
2012-06-02 15:21:43 -07:00
merge task_work and rcu_head, get rid of separate allocation for keyring case
2012-07-22 23:57:56 +04:00
vga_switcheroo: Add include guard
2012-06-21 09:32:16 +01:00
[media] Fix regression in ioctl numbering
2012-06-11 15:47:21 -03:00
watchdog: Add support for dynamically allocated watchdog_device structs
2012-05-30 07:55:31 +02:00
