Linux 3.14.25
Greg KH
maintainerI'm announcing the release of the 3.14.25 kernel.
All users of the 3.14 kernel series must upgrade.
The updated 3.14.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-3.14.y
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Documentation/devicetree/bindings/ata/sata_rcar.txt | 3 Makefile | 2 arch/arm/boot/compressed/head.S | 20 - arch/arm/kernel/kprobes-common.c | 19 - arch/arm/kernel/kprobes-thumb.c | 21 - arch/arm/kernel/kprobes.c | 9 arch/arm/mm/Kconfig | 1 arch/arm64/kernel/insn.c | 5 arch/arm64/lib/clear_user.S | 2 arch/parisc/include/uapi/asm/shmbuf.h | 25 - arch/parisc/kernel/syscall_table.S | 8 arch/sparc/include/asm/atomic_32.h | 2 arch/sparc/include/asm/cmpxchg_32.h | 12 arch/sparc/include/asm/vio.h | 14 arch/sparc/kernel/pci_schizo.c | 6 arch/sparc/kernel/smp_64.c | 4 arch/sparc/lib/atomic32.c | 27 + arch/x86/boot/compressed/Makefile | 4 arch/x86/boot/compressed/head_32.S | 5 arch/x86/boot/compressed/head_64.S | 5 arch/x86/boot/compressed/misc.c | 13 arch/x86/boot/compressed/mkpiggy.c | 9 arch/x86/kernel/cpu/microcode/amd_early.c | 33 + arch/x86/kernel/cpu/perf_event_intel.c | 3 arch/x86/kernel/ptrace.c | 11 arch/x86/kvm/x86.c | 2 arch/x86/mm/pgtable.c | 21 - arch/x86/tools/calc_run_size.pl | 30 + arch/xtensa/include/uapi/asm/unistd.h | 3 drivers/ata/ahci.c | 19 - drivers/ata/sata_rcar.c | 10 drivers/base/regmap/regmap.c | 6 drivers/block/sunvdc.c | 176 +++++++--- drivers/block/zram/zram_drv.c | 3 drivers/char/hw_random/pseries-rng.c | 11 drivers/crypto/caam/caamhash.c | 22 - drivers/crypto/caam/key_gen.c | 29 - drivers/crypto/caam/sg_sw_sec4.h | 54 --- drivers/firewire/core-cdev.c | 3 drivers/gpu/drm/radeon/cik.c | 7 drivers/gpu/drm/radeon/evergreen.c | 4 drivers/gpu/drm/radeon/r100.c | 3 drivers/gpu/drm/radeon/rs600.c | 3 drivers/gpu/drm/radeon/rs690.c | 3 drivers/gpu/drm/radeon/rv515.c | 3 drivers/gpu/drm/radeon/si.c | 3 drivers/infiniband/core/uverbs_cmd.c | 2 drivers/input/mouse/alps.c | 28 + drivers/input/mouse/synaptics.c | 5 drivers/md/dm-bufio.c | 12 drivers/md/dm-raid.c | 11 drivers/md/dm-thin.c | 16 drivers/md/md.c | 4 drivers/md/persistent-data/dm-btree-internal.h | 6 drivers/md/persistent-data/dm-btree-spine.c | 2 drivers/md/persistent-data/dm-btree.c | 24 - drivers/media/usb/ttusb-dec/ttusbdecfe.c | 3 drivers/net/ethernet/smsc/smsc911x.c | 46 ++ drivers/net/ethernet/sun/sunvnet.c | 4 drivers/net/macvtap.c | 15 drivers/net/tun.c | 35 -- drivers/net/virtio_net.c | 24 - drivers/net/vxlan.c | 28 + drivers/net/wireless/iwlwifi/iwl-trans.h | 2 drivers/net/wireless/iwlwifi/mvm/fw-api-power.h | 35 +- drivers/net/wireless/iwlwifi/mvm/fw-api.h | 1 drivers/net/wireless/iwlwifi/mvm/fw.c | 9 drivers/net/wireless/iwlwifi/mvm/ops.c | 1 drivers/net/wireless/iwlwifi/pcie/trans.c | 16 drivers/net/wireless/mac80211_hwsim.c | 4 drivers/platform/x86/dell-wmi.c | 12 drivers/power/bq2415x_charger.c | 23 - drivers/power/charger-manager.c | 163 ++++++--- drivers/scsi/scsi_error.c | 4 fs/btrfs/compression.c | 2 fs/btrfs/file.c | 5 fs/cramfs/inode.c | 3 fs/fuse/file.c | 2 fs/gfs2/meta_io.c | 5 fs/gfs2/meta_io.h | 3 fs/gfs2/ops_fstype.c | 2 fs/ioprio.c | 14 fs/jffs2/fs.c | 2 fs/nfs/blocklayout/blocklayout.c | 2 fs/nfs/delegation.c | 25 + fs/nfs/delegation.h | 1 fs/nfs/direct.c | 1 fs/nfs/inode.c | 2 fs/nfs/nfs4proc.c | 68 ++- fs/super.c | 16 include/dt-bindings/pinctrl/dra.h | 4 include/linux/clocksource.h | 2 include/linux/compaction.h | 4 include/linux/crash_dump.h | 15 include/linux/kgdb.h | 2 include/linux/memory.h | 2 include/linux/migrate.h | 11 include/linux/mm.h | 11 include/linux/mmzone.h | 5 include/linux/nfs_xdr.h | 11 include/linux/pagemap.h | 30 - include/linux/pagevec.h | 5 include/linux/power/charger-manager.h | 3 include/linux/radix-tree.h | 5 include/linux/shmem_fs.h | 1 include/net/sctp/sctp.h | 5 include/net/sctp/sm.h | 6 include/trace/events/compaction.h | 25 + include/uapi/linux/netfilter/xt_bpf.h | 2 ipc/ipc_sysctl.c | 3 kernel/audit.c | 4 kernel/audit_tree.c | 1 kernel/events/core.c | 23 + kernel/rcu/tree.c | 22 + lib/radix-tree.c | 106 +----- mm/compaction.c | 249 ++++++++------ mm/filemap.c | 341 ++++++++++++++++---- mm/internal.h | 22 + mm/madvise.c | 2 mm/memory-failure.c | 4 mm/memory_hotplug.c | 2 mm/mempolicy.c | 4 mm/migrate.c | 56 ++- mm/mincore.c | 20 - mm/page_alloc.c | 62 +-- mm/readahead.c | 27 - mm/shmem.c | 122 +------ mm/swap.c | 51 ++ mm/truncate.c | 74 +++- mm/vmscan.c | 36 +- net/ceph/crypto.c | 169 +++++++-- net/ipv6/ip6_gre.c | 5 net/ipv6/ip6_tunnel.c | 10 net/ipv6/ip6_vti.c | 11 net/ipv6/sit.c | 15 net/mac80211/ibss.c | 2 net/mac80211/ieee80211_i.h | 3 net/mac80211/iface.c | 7 net/mac80211/mesh.c | 2 net/mac80211/mlme.c | 5 net/mac80211/rx.c | 14 net/mac80211/spectmgmt.c | 18 - net/netfilter/ipset/ip_set_core.c | 2 net/netfilter/nfnetlink_log.c | 31 - net/netfilter/nft_compat.c | 2 net/sctp/associola.c | 2 net/sctp/auth.c | 2 net/sctp/inqueue.c | 33 - net/sctp/sm_make_chunk.c | 102 +++-- net/sctp/sm_statefuns.c | 21 - sound/usb/mixer_quirks.c | 6 151 files changed, 2037 insertions(+), 1171 deletions(-)
Al Viro (1):
callers of iov_copy_from_user_atomic() don't need pagecache_disable()
Alex Deucher (2):
drm/radeon: make sure mode init is complete in bandwidth_update drm/radeon: add missing crtc unlock when setting up the MC
Allen Pais (2):
sunvdc: add cdrom and v1.1 protocol support
sunvdc: compute vdisk geometry from capacity
Andreas Larsson (1):
sparc32: Implement xchg and atomic_xchg using ATOMIC_HASH locks
Andrey Vagin (1):
ipc: always handle a new value of auto_msgmni
Andy Lutomirski (1):
x86, x32, audit: Fix x32's AUDIT_ARCH wrt audit
Arturo Borrero (1):
netfilter: nft_compat: fix wrong target lookup in nft_target_select_ops()
Ben Dooks (1):
ARM: probes: fix instruction fetch order with <asm/opcodes.h>
Bjorn Helgaas (4):
memory-hotplug: Remove "weak" from memory_block_size_bytes() declaration
vmcore: Remove "weak" from function declarations
kgdb: Remove "weak" from kgdb_arch_pc() declaration
clocksource: Remove "weak" from clocksource_default_clock() declaration
Borislav Petkov (2):
x86, microcode, AMD: Fix early ucode loading on 32-bit x86, microcode, AMD: Fix ucode patch stashing on 32-bit
Christoph Hellwig (1):
scsi: only re-lock door after EH on devices that were reset
Cristian Stoica (2):
crypto: caam - fix missing dma unmap on error path
crypto: caam - remove duplicated sg copy functions
Dan Carpenter (2):
media: ttusb-dec: buffer overflow in ioctl
netfilter: ipset: off by one in ip_set_nfnl_get_byindex()
Daniel Borkmann (5):
net: sctp: fix NULL pointer dereference in af->from_addr_param on malformed packet
net: sctp: fix memory leak in auth key management
net: sctp: fix remote memory pressure from excessive queueing
net: sctp: fix panic on duplicate ASCONF chunks
net: sctp: fix skb_over_panic when receiving malformed ASCONF chunks
Dave Chinner (1):
fs/superblock: unregister sb shrinker before ->kill_sb()
David Rientjes (5):
mm, migration: add destination page freeing callback
mm, compaction: return failed migration target pages back to freelist mm, compaction: add per-zone migration pfn cache for async compaction mm, compaction: embed migration mode in compact_control mm, compaction: terminate async compaction when rescheduling
David S. Miller (2):
sparc64: Fix crashes in schizo_pcierr_intr_other().
sparc64: Do irq_{enter,exit}() around generic_smp_call_function*().
Devesh Sharma (1):
IB/core: Clear AH attr variable to prevent garbage data
Dwight Engen (3):
sunvdc: limit each sg segment to a page
vio: fix reuse of vio_dring slot
sunvdc: don't call VD_OP_GET_VTOC
Emmanuel Grumbach (1):
iwlwifi: configure the LTR
Enric Balletbo i Serra (1):
smsc911x: power-up phydev before doing a software reset.
Fabian Frederick (1):
mm/readahead.c: inline ra_submit
Florian Westphal (2):
netfilter: nf_log: account for size of NLMSG_DONE attribute
netfilter: nfnetlink_log: fix maximum packet length logged to userspace
Greg Kroah-Hartman (2):
Revert "drivers/net: Disable UFO through virtio" Linux 3.14.25
Greg Kurz (1):
hwrng: pseries - port to new read API and fix stack corruption
Heesub Shin (1):
mm/compaction: clean up unused code lines
Heinz Mauelshagen (1):
dm raid: ensure superblock's size matches device's logical block size
Helge Deller (1):
parisc: Use compat layer for msgctl, shmat, shmctl and semtimedop syscalls
Herbert Xu (2):
tun: Fix csum_start with VLAN acceleration
macvtap: Fix csum_start when VLAN tags are present
Houcheng Lin (1):
netfilter: nf_log: release skbuff on nlmsg put failure
Hugh Dickins (1):
mm: fix direct reclaim writeback regression
Ilya Dryomov (1):
libceph: do not crash on large auth tickets
James Ralston (1):
ahci: Add Device IDs for Intel Sunrise Point PCH
Jammy Zhou (1):
drm/radeon: set correct CE ram size for CIK
Jan Kara (2):
block: Fix computation of merged request priority
nfs: Fix use of uninitialized variable in nfs_getattr()
Joe Thornber (2):
dm thin: grab a virtual cell before looking up the mapping dm btree: fix a recursion depth bug in btree walking code
Johannes Berg (2):
mac80211: properly flush delayed scan work on interface removal
mac80211: fix use-after-free in defragmentation
Johannes Weiner (5):
lib: radix-tree: add radix_tree_delete_item()
mm: shmem: save one radix tree lookup when truncating swapped pages
mm: filemap: move radix tree hole searching here
mm + fs: prepare for non-page entries in page cache radix trees
mm: madvise: fix MADV_WILLNEED on shmem swapouts
Junjie Mao (2):
mac80211_hwsim: release driver when ieee80211_register_hw fails x86, kaslr: Prevent .bss from overlaping initrd
Krzysztof Kozlowski (4):
power: charger-manager: Fix accessing invalidated power supply after fuel gauge unbind
power: charger-manager: Fix accessing invalidated power supply after charger unbind
power: bq2415x_charger: Properly handle ENODEV from power_supply_get_by_phandle
power: bq2415x_charger: Fix memory leak on DTS parsing error
Kyle McMartin (1):
arm64: __clear_user: handle exceptions on strb
Luciano Coelho (2):
mac80211: use secondary channel offset IE also beacons during CSA
mac80211: schedule the actual switch of the station before CSA count 0
Marcelo Leitner (1):
vxlan: Do not reuse sockets for a different address family
Max Filippov (1):
xtensa: re-wire umount syscall to sys_oldumount
Mel Gorman (1):
mm: vmscan: use proportional scanning during direct reclaim and full scan at DEF_PRIORITY
Miklos Szeredi (1):
audit: keep inode pinned
Mikulas Patocka (1):
dm bufio: change __GFP_IO to __GFP_FS in shrinker callbacks
Nadav Amit (1):
KVM: x86: Don't report guest userspace emulation error to userspace
Nathan Lynch (1):
ARM: 8198/1: make kuser helpers depend on MMU
NeilBrown (1):
md: Always set RECOVERY_NEEDED when clearing RECOVERY_FROZEN
Pablo Neira (1):
netfilter: xt_bpf: add mising opaque struct sk_filter definition
Pali Rohár (4):
Input: alps - ignore potential bare packets when device is out of sync
Input: alps - allow up to 2 invalid packets without resetting device
Input: alps - ignore bad data on Dell Latitudes E6440 and E7440
dell-wmi: Fix access out of memory
Paul E. McKenney (1):
rcu: Make callers awaken grace-period kthread
Pawel Moll (1):
perf: Handle compat ioctl
Peng Tao (1):
nfs: fix pnfs direct write memory leak
Pranith Kumar (1):
rcu: Use rcu_gp_kthread_wake() to wake up grace period kthreads
Quentin Casasnovas (1):
regmap: fix kernel hang on regmap_bulk_write with zero val_count.
Richard Guy Briggs (2):
audit: correct AUDIT_GET_FEATURE return message type
audit: AUDIT_FEATURE_CHANGE message format missing delimiting space
Roger Quadros (1):
pinctrl: dra: dt-bindings: Fix output pull up/down
Sasha Levin (1):
mm: remove read_cache_page_async()
Shaohua Li (1):
x86/mm: In the PTE swapout page reclaim case clear the accessed bit instead of flushing the TLB
Simon Horman (1):
ata: sata_rcar: Disable DIPM mode for r8a7790 ES1
Stefan Richter (1):
firewire: cdev: prevent kernel stack leaking into ioctl arguments
Steffen Klassert (4):
ip6_tunnel: Use ip6_tnl_dev_init as the ndo_init function.
vti6: Use vti6_dev_init as the ndo_init function.
sit: Use ipip6_tunnel_init as the ndo_init function.
gre6: Move the setting of dev->iflink into the ndo_init functions.
Steven Whitehouse (1):
GFS2: Fix address space from page function
Takashi Iwai (2):
ALSA: usb-audio: Fix memory leak in FTU quirk
Input: synaptics - add min/max quirk for Lenovo T440s
Tejun Heo (1):
ahci: disable MSI instead of NCQ on Samsung pci-e SSDs on macbooks
Tim Chen (1):
fs/superblock: avoid locking counting inodes and dentries before reclaiming them
Trond Myklebust (4):
NFSv4: Ensure that we remove NFSv4.0 delegations when state has expired
NFS: Don't try to reclaim delegation open state if recovery failed
NFSv4: Fix races between nfs_remove_bad_delegation() and delegation return NFSv4.1: nfs41_clear_delegation_stateid shouldn't trust NFS_DELEGATED_STATE
Vince Weaver (1):
perf/x86/intel: Use proper dTLB-load-misses event on IvyBridge
Vlastimil Babka (5):
mm/compaction: cleanup isolate_freepages()
mm/compaction: do not count migratepages when unnecessary mm/compaction: avoid rescanning pageblocks in isolate_freepages mm, compaction: properly signal and act upon lock and need_sched() contention mm/page_alloc: prevent MIGRATE_RESERVE pages from being misplaced
Weijie Yang (1):
zram: avoid kunmap_atomic() of a NULL pointer
Will Deacon (1):
ARM: 8191/1: decompressor: ensure I-side picks up relocated code
William Cohen (1):
Correct the race condition in aarch64_insn_patch_text_sync()
Greg KH
maintainerDocumentation/devicetree/bindings/ata/sata_rcar.txt +2 -1
@@ -3,7 +3,8 @@ Required properties: - compatible : should contain one of the following: - "renesas,sata-r8a7779" for R-Car H1 - - "renesas,sata-r8a7790" for R-Car H2 + - "renesas,sata-r8a7790-es1" for R-Car H2 ES1 + - "renesas,sata-r8a7790" for R-Car H2 other than ES1 - "renesas,sata-r8a7791" for R-Car M2 - reg : address and length of the SATA registers; - interrupts : must consist of one interrupt specifier.
Makefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 3 PATCHLEVEL = 14 -SUBLEVEL = 24 +SUBLEVEL = 25 EXTRAVERSION = NAME = Remembering Coco
arch/arm/boot/compressed/head.S +16 -4
@@ -400,8 +400,7 @@ dtb_check_done: add sp, sp, r6 #endif - tst r4, #1 - bleq cache_clean_flush + bl cache_clean_flush adr r0, BSYM(restart) add r0, r0, r6
@@ -1050,6 +1049,8 @@ cache_clean_flush: b call_cache_fn __armv4_mpu_cache_flush: + tst r4, #1 + movne pc, lr mov r2, #1 mov r3, #0 mcr p15, 0, ip, c7, c6, 0 @ invalidate D cache
@@ -1067,6 +1068,8 @@ __armv4_mpu_cache_flush: mov pc, lr __fa526_cache_flush: + tst r4, #1 + movne pc, lr mov r1, #0 mcr p15, 0, r1, c7, c14, 0 @ clean and invalidate D cache mcr p15, 0, r1, c7, c5, 0 @ flush I cache
@@ -1075,13 +1078,16 @@ __fa526_cache_flush: __armv6_mmu_cache_flush: mov r1, #0 - mcr p15, 0, r1, c7, c14, 0 @ clean+invalidate D + tst r4, #1 + mcreq p15, 0, r1, c7, c14, 0 @ clean+invalidate D mcr p15, 0, r1, c7, c5, 0 @ invalidate I+BTB - mcr p15, 0, r1, c7, c15, 0 @ clean+invalidate unified + mcreq p15, 0, r1, c7, c15, 0 @ clean+invalidate unified mcr p15, 0, r1, c7, c10, 4 @ drain WB mov pc, lr __armv7_mmu_cache_flush: + tst r4, #1 + bne iflush mrc p15, 0, r10, c0, c1, 5 @ read ID_MMFR1 tst r10, #0xf << 16 @ hierarchical cache (ARMv7) mov r10, #0
@@ -1142,6 +1148,8 @@ iflush: mov pc, lr __armv5tej_mmu_cache_flush: + tst r4, #1 + movne pc, lr 1: mrc p15, 0, r15, c7, c14, 3 @ test,clean,invalidate D cache bne 1b mcr p15, 0, r0, c7, c5, 0 @ flush I cache
@@ -1149,6 +1157,8 @@ __armv5tej_mmu_cache_flush: mov pc, lr __armv4_mmu_cache_flush: + tst r4, #1 + movne pc, lr mov r2, #64*1024 @ default: 32K dcache size (*2) mov r11, #32 @ default: 32 byte line size mrc p15, 0, r3, c0, c0, 1 @ read cache type
@@ -1182,6 +1192,8 @@ no_cache_id: __armv3_mmu_cache_flush: __armv3_mpu_cache_flush: + tst r4, #1 + movne pc, lr mov r1, #0 mcr p15, 0, r1, c7, c0, 0 @ invalidate whole cache v3 mov pc, lr
arch/arm/kernel/kprobes-common.c +11 -8
@@ -14,6 +14,7 @@#include <linux/kernel.h> #include <linux/kprobes.h> #include <asm/system_info.h> +#include <asm/opcodes.h> #include "kprobes.h"
@@ -305,7 +306,8 @@ kprobe_decode_ldmstm(kprobe_opcode_t insn, struct arch_specific_insn *asi)if (handler) {/* We can emulate the instruction in (possibly) modified form */ - asi->insn[0 ] = (insn &0xfff00000 ) | (rn <<16 ) | reglist; + asi->insn[0 ] =__opcode_to_mem_arm ((insn &0xfff00000 ) | + (rn <<16 ) | reglist); asi->insn_handler = handler;return INSN_GOOD ; }
@@ -334,13 +336,14 @@ prepare_emulated_insn(kprobe_opcode_t insn, struct arch_specific_insn *asi,#ifdef CONFIG_THUMB2_KERNEL if (thumb) {u16 *thumb_insn = (u16 *)asi->insn; - thumb_insn[1 ] =0x4770 ;/* Thumb bx lr */ - thumb_insn[2 ] =0x4770 ;/* Thumb bx lr */ +/* Thumb bx lr */ + thumb_insn[1 ] =__opcode_to_mem_thumb16 (0x4770 ); + thumb_insn[2 ] =__opcode_to_mem_thumb16 (0x4770 );return insn; } - asi->insn[1 ] =0xe12fff1e ;/* ARM bx lr */ + asi->insn[1 ] =__opcode_to_mem_arm (0xe12fff1e );/* ARM bx lr */ #else - asi->insn[1 ] =0xe1a0f00e ;/* mov pc, lr */ + asi->insn[1 ] =__opcode_to_mem_arm (0xe1a0f00e );/* mov pc, lr */ #endif /* Make an ARM instruction unconditional */ if (insn <0xe0000000 )
@@ -360,12 +363,12 @@ set_emulated_insn(kprobe_opcode_t insn, struct arch_specific_insn *asi,if (thumb) {u16 *ip = (u16 *)asi->insn;if (is_wide_instruction (insn)) - *ip++ = insn >>16 ; - *ip++ = insn; + *ip++ =__opcode_to_mem_thumb16 (insn >>16 ); + *ip++ =__opcode_to_mem_thumb16 (insn);return ; }#endif - asi->insn[0 ] = insn; + asi->insn[0 ] =__opcode_to_mem_arm (insn); }/*
arch/arm/kernel/kprobes-thumb.c +13 -8
@@ -11,6 +11,7 @@#include <linux/kernel.h> #include <linux/kprobes.h> #include <linux/module.h> +#include <asm/opcodes.h> #include "kprobes.h"
@@ -163,9 +164,9 @@ t32_decode_ldmstm(kprobe_opcode_t insn, struct arch_specific_insn *asi)enum kprobe_insn ret =kprobe_decode_ldmstm (insn, asi);/* Fixup modified instruction to have halfwords in correct order...*/ - insn = asi->insn[0 ]; - ((u16 *)asi->insn)[0 ] = insn >>16 ; - ((u16 *)asi->insn)[1 ] = insn &0xffff ; + insn =__mem_to_opcode_arm (asi->insn[0 ]); + ((u16 *)asi->insn)[0 ] =__opcode_to_mem_thumb16 (insn >>16 ); + ((u16 *)asi->insn)[1 ] =__opcode_to_mem_thumb16 (insn &0xffff );return ret; }
@@ -1153,7 +1154,7 @@ t16_decode_hiregs(kprobe_opcode_t insn, struct arch_specific_insn *asi) { insn &= ~0x00ff ; insn |=0x001 ;/* Set Rdn = R1 and Rm = R0 */ - ((u16 *)asi->insn)[0 ] = insn; + ((u16 *)asi->insn)[0 ] =__opcode_to_mem_thumb16 (insn); asi->insn_handler = t16_emulate_hiregs;return INSN_GOOD ; }
@@ -1182,8 +1183,10 @@ t16_decode_push(kprobe_opcode_t insn, struct arch_specific_insn *asi)* and call it with R9=SP and LR in the register list represented * by R8. */ - ((u16 *)asi->insn)[0 ] =0xe929 ;/* 1st half STMDB R9!,{} */ - ((u16 *)asi->insn)[1 ] = insn &0x1ff ;/* 2nd half (register list) */ +/* 1st half STMDB R9!,{} */ + ((u16 *)asi->insn)[0 ] =__opcode_to_mem_thumb16 (0xe929 ); +/* 2nd half (register list) */ + ((u16 *)asi->insn)[1 ] =__opcode_to_mem_thumb16 (insn &0x1ff ); asi->insn_handler = t16_emulate_push;return INSN_GOOD ; }
@@ -1232,8 +1235,10 @@ t16_decode_pop(kprobe_opcode_t insn, struct arch_specific_insn *asi)* and call it with R9=SP and PC in the register list represented * by R8. */ - ((u16 *)asi->insn)[0 ] =0xe8b9 ;/* 1st half LDMIA R9!,{} */ - ((u16 *)asi->insn)[1 ] = insn &0x1ff ;/* 2nd half (register list) */ +/* 1st half LDMIA R9!,{} */ + ((u16 *)asi->insn)[0 ] =__opcode_to_mem_thumb16 (0xe8b9 ); +/* 2nd half (register list) */ + ((u16 *)asi->insn)[1 ] =__opcode_to_mem_thumb16 (insn &0x1ff ); asi->insn_handler = insn &0x100 ? t16_emulate_pop_pc : t16_emulate_pop_nopc;return INSN_GOOD ;
arch/arm/kernel/kprobes.c +5 -4
@@ -26,6 +26,7 @@#include <linux/stop_machine.h> #include <linux/stringify.h> #include <asm/traps.h> +#include <asm/opcodes.h> #include <asm/cacheflush.h> #include "kprobes.h"
@@ -62,10 +63,10 @@ int __kprobes arch_prepare_kprobe(struct kprobe *p)#ifdef CONFIG_THUMB2_KERNEL thumb = true; addr &= ~1 ;/* Bit 0 would normally be set to indicate Thumb code */ - insn = ((u16 *)addr)[0 ]; + insn =__mem_to_opcode_thumb16 (((u16 *)addr)[0 ]);if (is_wide_instruction (insn)) { - insn <<=16 ; - insn |= ((u16 *)addr)[1 ]; +u16 inst2 =__mem_to_opcode_thumb16 (((u16 *)addr)[1 ]); + insn =__opcode_thumb32_compose (insn, inst2); decode_insn = thumb32_kprobe_decode_insn; }else decode_insn = thumb16_kprobe_decode_insn;
@@ -73,7 +74,7 @@ int __kprobes arch_prepare_kprobe(struct kprobe *p) thumb = false;if (addr &0x3 )return -EINVAL ; - insn = *p->addr; + insn =__mem_to_opcode_arm (*p->addr); decode_insn = arm_kprobe_decode_insn;#endif
arch/arm/mm/Kconfig +1 -0
@@ -798,6 +798,7 @@ config NEED_KUSER_HELPERS config KUSER_HELPERS bool "Enable kuser helpers in vector page" if !NEED_KUSER_HELPERS + depends on MMU default y help Warning: disabling this option may break user programs.
arch/arm64/kernel/insn.c +3 -2
@@ -156,9 +156,10 @@ static int __kprobes aarch64_insn_patch_text_cb(void *arg)* which ends with "dsb; isb" pair guaranteeing global * visibility. */ -atomic_set (&pp->cpu_count,-1 ); +/* Notify other processors with an additional increment. */ +atomic_inc (&pp->cpu_count); }else { -while (atomic_read (&pp->cpu_count) !=-1 ) +while (atomic_read (&pp->cpu_count) <=num_online_cpus ())cpu_relax ();isb (); }
arch/arm64/lib/clear_user.S +1 -1
@@ -46,7 +46,7 @@ USER(9f, strh wzr, [x0], #2 ) sub x1, x1, #2 4: adds x1, x1, #1 b.mi 5f - strb wzr, [x0] +USER(9f, strb wzr, [x0] ) 5: mov x0, #0 ret ENDPROC(__clear_user)
arch/parisc/include/uapi/asm/shmbuf.h +9 -16
@@ -36,23 +36,16 @@ struct shmid64_ds { unsigned int __unused2; }; -#ifdef CONFIG_64BIT -/* The 'unsigned int' (formerly 'unsigned long') data types below will -* ensure that a 32-bit app calling shmctl(*,IPC_INFO,*) will work on -* a wide kernel, but if some of these values are meant to contain pointers -* they may need to be 'long long' instead. -PB XXX FIXME -*/ -#endif struct shminfo64 { -unsigned int shmmax; -unsigned int shmmin; -unsigned int shmmni; -unsigned int shmseg; -unsigned int shmall; -unsigned int __unused1; -unsigned int __unused2; -unsigned int __unused3; -unsigned int __unused4; +unsigned long shmmax; +unsigned long shmmin; +unsigned long shmmni; +unsigned long shmseg; +unsigned long shmall; +unsigned long __unused1; +unsigned long __unused2; +unsigned long __unused3; +unsigned long __unused4; };#endif /* _PARISC_SHMBUF_H */
arch/parisc/kernel/syscall_table.S +4 -4
@@ -286,11 +286,11 @@ ENTRY_COMP(msgsnd) ENTRY_COMP(msgrcv) ENTRY_SAME(msgget) /* 190 */ - ENTRY_SAME(msgctl) - ENTRY_SAME(shmat) + ENTRY_COMP(msgctl) + ENTRY_COMP(shmat) ENTRY_SAME(shmdt) ENTRY_SAME(shmget) - ENTRY_SAME(shmctl) /* 195 */ + ENTRY_COMP(shmctl) /* 195 */ ENTRY_SAME(ni_syscall) /* streams1 */ ENTRY_SAME(ni_syscall) /* streams2 */ ENTRY_SAME(lstat64)
@@ -323,7 +323,7 @@ ENTRY_SAME(epoll_ctl) /* 225 */ ENTRY_SAME(epoll_wait) ENTRY_SAME(remap_file_pages) - ENTRY_SAME(semtimedop) + ENTRY_COMP(semtimedop) ENTRY_COMP(mq_open) ENTRY_SAME(mq_unlink) /* 230 */ ENTRY_COMP(mq_timedsend)
arch/sparc/include/asm/atomic_32.h +1 -1
@@ -21,7 +21,7 @@extern int __atomic_add_return (int ,atomic_t *);extern int atomic_cmpxchg (atomic_t *,int ,int ); -#define atomic_xchg (v, new) (xchg(&((v)->counter), new)) +extern int atomic_xchg (atomic_t *,int );extern int __atomic_add_unless (atomic_t *,int ,int );extern void atomic_set (atomic_t *,int );
arch/sparc/include/asm/cmpxchg_32.h +2 -10
@@ -11,22 +11,14 @@#ifndef __ARCH_SPARC_CMPXCHG__#define __ARCH_SPARC_CMPXCHG__ -static inline unsigned long xchg_u32 (__volatile__ unsigned long *m,unsigned long val) -{ - __asm__ __volatile__("swap [%2], %0" - :"=&r" (val) - :"0" (val),"r" (m) - :"memory" ); -return val; -} - +extern unsigned long __xchg_u32 (volatile u32 *m,u32 new);extern void __xchg_called_with_bad_pointer (void ); static inline unsigned long __xchg(unsigned long x, __volatile__ void * ptr, int size) {switch (size) {case 4 : -return xchg_u32 (ptr, x); +return __xchg_u32 (ptr, x); }__xchg_called_with_bad_pointer ();return x;
arch/sparc/include/asm/vio.h +10 -4
@@ -118,12 +118,18 @@ struct vio_disk_attr_info {u8 vdisk_type;#define VD_DISK_TYPE_SLICE 0x01/* Slice in block device */ #define VD_DISK_TYPE_DISK 0x02/* Entire block device */ -u16 resv1; +u8 vdisk_mtype;/* v1.1 */ +#define VD_MEDIA_TYPE_FIXED 0x01/* Fixed device */ +#define VD_MEDIA_TYPE_CD 0x02/* CD Device */ +#define VD_MEDIA_TYPE_DVD 0x03/* DVD Device */ +u8 resv1;u32 vdisk_block_size;u64 operations; -u64 vdisk_size; +u64 vdisk_size;/* v1.1 */ u64 max_xfer_size; -u64 resv2[2 ]; +u32 phys_block_size;/* v1.2 */ +u32 resv2; +u64 resv3[1 ]; };struct vio_disk_desc {
@@ -259,7 +265,7 @@ static inline u32 vio_dring_avail(struct vio_dring_state *dr, unsigned int ring_size) {return (dr->pending - - ((dr->prod - dr->cons) & (ring_size -1 ))); + ((dr->prod - dr->cons) & (ring_size -1 )) -1 ); }#define VIO_MAX_TYPE_LEN 32
arch/sparc/kernel/pci_schizo.c +3 -3
@@ -581,7 +581,7 @@ static irqreturn_t schizo_pcierr_intr_other(struct pci_pbm_info *pbm) {unsigned long csr_reg, csr, csr_error_bits;irqreturn_t ret =IRQ_NONE ; -u16 stat; +u32 stat; csr_reg = pbm->pbm_regs +SCHIZO_PCI_CTRL ; csr =upa_readq (csr_reg);
@@ -617,7 +617,7 @@ static irqreturn_t schizo_pcierr_intr_other(struct pci_pbm_info *pbm) pbm->name); ret =IRQ_HANDLED ; } -pci_read_config_word (pbm->pci_bus->self,PCI_STATUS , &stat); + pbm->pci_ops->read (pbm->pci_bus,0 ,PCI_STATUS ,2 , &stat); if (stat & (PCI_STATUS_PARITY | PCI_STATUS_SIG_TARGET_ABORT | PCI_STATUS_REC_TARGET_ABORT |
@@ -625,7 +625,7 @@ static irqreturn_t schizo_pcierr_intr_other(struct pci_pbm_info *pbm) PCI_STATUS_SIG_SYSTEM_ERROR)) {printk ("%s: PCI bus error, PCI_STATUS[%04x]\n" , pbm->name, stat); -pci_write_config_word (pbm->pci_bus->self,PCI_STATUS ,0xffff ); + pbm->pci_ops->write (pbm->pci_bus,0 ,PCI_STATUS ,2 ,0xffff ); ret =IRQ_HANDLED ; }return ret;
arch/sparc/kernel/smp_64.c +4 -0
@@ -823,13 +823,17 @@ void arch_send_call_function_single_ipi(int cpu) void __irq_entry smp_call_function_client(int irq, struct pt_regs *regs) {clear_softint (1 << irq); +irq_enter ();generic_smp_call_function_interrupt (); +irq_exit (); } void __irq_entry smp_call_function_single_client(int irq, struct pt_regs *regs) {clear_softint (1 << irq); +irq_enter ();generic_smp_call_function_single_interrupt (); +irq_exit (); }static void tsb_sync (void *info)
arch/sparc/lib/atomic32.c +27 -0
@@ -40,6 +40,19 @@ int __atomic_add_return(int i, atomic_t *v) }EXPORT_SYMBOL (__atomic_add_return); +int atomic_xchg (atomic_t *v,int new) +{ +int ret; +unsigned long flags; + +spin_lock_irqsave (ATOMIC_HASH (v), flags); + ret = v->counter; + v->counter = new; +spin_unlock_irqrestore (ATOMIC_HASH (v), flags); +return ret; +} +EXPORT_SYMBOL (atomic_xchg); +int atomic_cmpxchg (atomic_t *v,int old,int new) {int ret;
@@ -132,3 +145,17 @@ unsigned long __cmpxchg_u32(volatile u32 *ptr, u32 old, u32 new)return (unsigned long )prev; }EXPORT_SYMBOL (__cmpxchg_u32); + +unsigned long __xchg_u32 (volatile u32 *ptr,u32 new) +{ +unsigned long flags; +u32 prev; + +spin_lock_irqsave (ATOMIC_HASH (ptr), flags); + prev = *ptr; + *ptr = new; +spin_unlock_irqrestore (ATOMIC_HASH (ptr), flags); + +return (unsigned long )prev; +} +EXPORT_SYMBOL (__xchg_u32);
arch/x86/boot/compressed/Makefile +3 -1
@@ -75,8 +75,10 @@ suffix-$(CONFIG_KERNEL_XZ) := xz suffix-$(CONFIG_KERNEL_LZO) := lzo suffix-$(CONFIG_KERNEL_LZ4) := lz4 +RUN_SIZE = $(shell objdump -h vmlinux | \ + perl $(srctree)/arch/x86/tools/calc_run_size.pl) quiet_cmd_mkpiggy = MKPIGGY $@ - cmd_mkpiggy = $(obj)/mkpiggy $< > $@ || ( rm -f $@ ; false ) + cmd_mkpiggy = $(obj)/mkpiggy $< $(RUN_SIZE) > $@ || ( rm -f $@ ; false ) targets += piggy.S $(obj)/piggy.S: $(obj)/vmlinux.bin.$(suffix-y) $(obj)/mkpiggy FORCE
arch/x86/boot/compressed/head_32.S +3 -2
@@ -186,7 +186,8 @@ relocated: * Do the decompression, and jump to the new kernel.. */ /* push arguments for decompress_kernel: */ - pushl $z_output_len /* decompressed length */ + pushl $z_run_size /* size of kernel with .bss and .brk */ + pushl $z_output_len /* decompressed length, end of relocs */ leal z_extract_offset_negative(%ebx), %ebp pushl %ebp /* output address */ pushl $z_input_len /* input_len */
@@ -196,7 +197,7 @@ relocated: pushl %eax /* heap area */ pushl %esi /* real mode pointer */ call decompress_kernel /* returns kernel location in %eax */ - addl $24, %esp + addl $28, %esp /* * Jump to the decompressed kernel.
arch/x86/boot/compressed/head_64.S +4 -1
@@ -334,13 +334,16 @@ relocated: * Do the decompression, and jump to the new kernel.. */ pushq %rsi /* Save the real mode argument */ + movq $z_run_size, %r9 /* size of kernel with .bss and .brk */ + pushq %r9 movq %rsi, %rdi /* real mode address */ leaq boot_heap(%rip), %rsi /* malloc area for uncompression */ leaq input_data(%rip), %rdx /* input_data */ movl $z_input_len, %ecx /* input_len */ movq %rbp, %r8 /* output target address */ - movq $z_output_len, %r9 /* decompressed length */ + movq $z_output_len, %r9 /* decompressed length, end of relocs */ call decompress_kernel /* returns kernel location in %rax */ + popq %r9 popq %rsi /*
arch/x86/boot/compressed/misc.c +10 -3
@@ -393,7 +393,8 @@ asmlinkage void *decompress_kernel(void *rmode, memptr heap,unsigned char *input_data, unsigned long input_len, unsigned char *output, - unsigned long output_len) + unsigned long output_len, + unsigned long run_size) { real_mode = rmode;
@@ -416,8 +417,14 @@ asmlinkage void *decompress_kernel(void *rmode, memptr heap, free_mem_ptr = heap;/* Heap */ free_mem_end_ptr = heap +BOOT_HEAP_SIZE ; - output =choose_kernel_location (input_data, input_len, - output, output_len); +/* +* The memory hole needed for the kernel is the larger of either +* the entire decompressed kernel plus relocation table, or the +* entire decompressed kernel plus .bss and .brk sections. +*/ + output =choose_kernel_location (input_data, input_len, output, + output_len > run_size ? output_len + : run_size);/* Validate memory location choices. */ if ((unsigned long )output & (MIN_KERNEL_ALIGN -1 ))
arch/x86/boot/compressed/mkpiggy.c +7 -2
@@ -36,11 +36,13 @@ int main(int argc, char *argv[])uint32_t olen;long ilen;unsigned long offs; +unsigned long run_size;FILE *f =NULL ;int retval =1 ; -if (argc <2 ) { -fprintf (stderr,"Usage: %s compressed_file\n" , argv[0 ]); +if (argc <3 ) { +fprintf (stderr,"Usage: %s compressed_file run_size\n" , + argv[0 ]); goto bail; }
@@ -74,6 +76,7 @@ int main(int argc, char *argv[]) offs += olen >>12 ;/* Add 8 bytes for each 32K block */ offs +=64 *1024 +128 ;/* Add 64K + 128 bytes slack */ offs = (offs+4095 ) & ~4095 ;/* Round to a 4K boundary */ + run_size =atoi (argv[2 ]);printf (".section \".rodata..compressed\",\"a\",@progbits\n" );printf (".globl z_input_len\n" );
@@ -85,6 +88,8 @@ int main(int argc, char *argv[])/* z_extract_offset_negative allows simplification of head_32.S */ printf (".globl z_extract_offset_negative\n" );printf ("z_extract_offset_negative = -0x%lx\n" , offs); +printf (".globl z_run_size\n" ); +printf ("z_run_size = %lu\n" , run_size);printf (".globl input_data, input_data_end\n" );printf ("input_data:\n" );
arch/x86/kernel/cpu/microcode/amd_early.c +21 -12
@@ -108,12 +108,13 @@ static size_t compute_container_size(u8 *data, u32 total_size)* load_microcode_amd() to save equivalent cpu table and microcode patches in * kernel heap memory. */ -static void apply_ucode_in_initrd (void *ucode,size_t size) +static void apply_ucode_in_initrd (void *ucode,size_t size,bool save_patch) {struct equiv_cpu_entry *eq;size_t *cont_sz;u32 *header;u8 *data, **cont; +u8 (*patch)[PATCH_MAX_SIZE ];u16 eq_id =0 ;int offset, left;u32 rev, eax, ebx, ecx, edx;
@@ -123,10 +124,12 @@ static void apply_ucode_in_initrd(void *ucode, size_t size) new_rev = (u32 *)__pa_nodebug (&ucode_new_rev); cont_sz = (size_t *)__pa_nodebug (&container_size); cont = (u8 **)__pa_nodebug (&container); + patch = (u8 (*)[PATCH_MAX_SIZE ])__pa_nodebug (&amd_ucode_patch);#else new_rev = &ucode_new_rev; cont_sz = &container_size; cont = &container; + patch = &amd_ucode_patch;#endif data = ucode;
@@ -213,9 +216,9 @@ static void apply_ucode_in_initrd(void *ucode, size_t size) rev = mc->hdr.patch_id; *new_rev = rev; -/* save ucode patch */ -memcpy (amd_ucode_patch, mc, -min_t (u32, header[1 ],PATCH_MAX_SIZE )); +if (save_patch) +memcpy (patch, mc, +min_t (u32, header[1 ],PATCH_MAX_SIZE )); } }
@@ -246,7 +249,7 @@ void __init load_ucode_amd_bsp(void) *data = cp.data; *size = cp.size; -apply_ucode_in_initrd (cp.data, cp.size); +apply_ucode_in_initrd (cp.data, cp.size, true); }#ifdef CONFIG_X86_32
@@ -263,7 +266,7 @@ void load_ucode_amd_ap(void)size_t *usize;void **ucode; - mc = (struct microcode_amd *)__pa (amd_ucode_patch); + mc = (struct microcode_amd *)__pa_nodebug (amd_ucode_patch);if (mc->hdr.patch_id && mc->hdr.processor_rev_id) {__apply_microcode_amd (mc);return ;
@@ -275,7 +278,7 @@ void load_ucode_amd_ap(void)if (!*ucode || !*usize)return ; -apply_ucode_in_initrd (*ucode, *usize); +apply_ucode_in_initrd (*ucode, *usize, false); }static void __init collect_cpu_sig_on_bsp (void *arg)
@@ -339,7 +342,7 @@ void load_ucode_amd_ap(void)* AP has a different equivalence ID than BSP, looks like * mixed-steppings silicon so go through the ucode blob anew. */ - apply_ucode_in_initrd(ucode_cpio.data, ucode_cpio.size); + apply_ucode_in_initrd(ucode_cpio.data, ucode_cpio.size, false); } }#endif
@@ -347,7 +350,9 @@ void load_ucode_amd_ap(void)int __init save_microcode_in_initrd_amd (void ) {unsigned long cont; +int retval =0 ;enum ucode_state ret; +u8 *cont_va;u32 eax;if (!container)
@@ -355,13 +360,15 @@ int __init save_microcode_in_initrd_amd(void)#ifdef CONFIG_X86_32 get_bsp_sig (); - cont = (unsigned long )container; + cont = (unsigned long )container; + cont_va =__va (container);#else /* * We need the physical address of the container for both bitness since * boot_params.hdr.ramdisk_image is a physical address. */ - cont =__pa (container); + cont =__pa (container); + cont_va = container;#endif /*
@@ -372,6 +379,8 @@ int __init save_microcode_in_initrd_amd(void)if (relocated_ramdisk) container = (u8 *)(__va (relocated_ramdisk) + (cont - boot_params.hdr.ramdisk_image)); +else + container = cont_va;if (ucode_new_rev) pr_info("microcode: updated early to new patch_level=0x%08x\n",
@@ -382,7 +391,7 @@ int __init save_microcode_in_initrd_amd(void) ret =load_microcode_amd (eax, container, container_size);if (ret !=UCODE_OK ) -return -EINVAL ; + retval = -EINVAL ;/* * This will be freed any msec now, stash patches for the current
@@ -391,5 +400,5 @@ int __init save_microcode_in_initrd_amd(void) container =NULL ; container_size =0 ; -return 0 ; +return retval; }
arch/x86/kernel/cpu/perf_event_intel.c +3 -0
@@ -2475,6 +2475,9 @@ __init int intel_pmu_init(void)case 62 :/* IvyBridge EP */ memcpy (hw_cache_event_ids, snb_hw_cache_event_ids,sizeof (hw_cache_event_ids)); +/* dTLB-load-misses on IVB is different than SNB */ + hw_cache_event_ids[C (DTLB )][C (OP_READ )][C (RESULT_MISS )] =0x8108 ;/* DTLB_LOAD_MISSES.DEMAND_LD_MISS_CAUSES_A_WALK */ +memcpy (hw_cache_extra_regs, snb_hw_cache_extra_regs,sizeof (hw_cache_extra_regs));
arch/x86/kernel/ptrace.c +1 -10
@@ -1441,15 +1441,6 @@ void send_sigtrap(struct task_struct *tsk, struct pt_regs *regs,force_sig_info (SIGTRAP , &info, tsk); } - -#ifdef CONFIG_X86_32 -# define IS_IA32 1 -#elif definedCONFIG_IA32_EMULATION -# define IS_IA32 is_compat_task() -#else -# define IS_IA32 0 -#endif -/* * We must return the syscall number to actually look up in the table. * This can be -1L to skip running any syscall at all.
@@ -1487,7 +1478,7 @@ long syscall_trace_enter(struct pt_regs *regs)if (unlikely (test_thread_flag (TIF_SYSCALL_TRACEPOINT )))trace_sys_enter (regs, regs->orig_ax); -if (IS_IA32 ) +if (is_ia32_task ()) audit_syscall_entry(AUDIT_ARCH_I386, regs->orig_ax, regs->bx, regs->cx,
arch/x86/kvm/x86.c +1 -1
@@ -4911,7 +4911,7 @@ static int handle_emulation_failure(struct kvm_vcpu *vcpu) ++vcpu->stat.insn_emulation_fail;trace_kvm_emulate_insn_failed (vcpu); -if (!is_guest_mode (vcpu)) { +if (!is_guest_mode (vcpu) && kvm_x86_ops->get_cpl (vcpu) ==0 ) { vcpu->run->exit_reason =KVM_EXIT_INTERNAL_ERROR ; vcpu->run->internal.suberror =KVM_INTERNAL_ERROR_EMULATION ; vcpu->run->internal.ndata =0 ;
arch/x86/mm/pgtable.c +14 -7
@@ -399,13 +399,20 @@ int pmdp_test_and_clear_young(struct vm_area_struct *vma,int ptep_clear_flush_young (struct vm_area_struct *vma,unsigned long address,pte_t *ptep) { -int young; - - young =ptep_test_and_clear_young (vma, address, ptep); -if (young) -flush_tlb_page (vma, address); - -return young; +/* +* On x86 CPUs, clearing the accessed bit without a TLB flush +* doesn't cause data corruption. [ It could cause incorrect +* page aging and the (mistaken) reclaim of hot pages, but the +* chance of that should be relatively low. ] +* +* So as a performance optimization don't flush the TLB when +* clearing the accessed bit, it will eventually be flushed by +* a context switch or a VM operation anyway. [ In the rare +* event of it not getting flushed for a long time the delay +* shouldn't really matter because there's no real memory +* pressure for swapout to react to. ] +*/ +return ptep_test_and_clear_young (vma, address, ptep); }#ifdef CONFIG_TRANSPARENT_HUGEPAGE
arch/x86/tools/calc_run_size.pl new file +30 -0
@@ -0,0 +1,30 @@ +#!/usr/bin/perl +# +# Calculate the amount of space needed to run the kernel, including room for +# the .bss and .brk sections. +# +# Usage: +# objdump -h a.out | perl calc_run_size.pl +use strict; + +my $mem_size = 0; +my $file_offset = 0; + +my $sections=" *[0-9]+ \.(?:bss|brk) +"; +while (<>) { + if (/^$sections([0-9a-f]+) +(?:[0-9a-f]+ +){2}([0-9a-f]+)/) { + my $size = hex($1); + my $offset = hex($2); + $mem_size += $size; + if ($file_offset == 0) { + $file_offset = $offset; + } elsif ($file_offset != $offset) { + die ".bss and .brk lack common file offset\n"; + } + } +} + +if ($file_offset == 0) { + die "Never found .bss or .brk file offset\n"; +} +printf("%d\n", $mem_size + $file_offset);
arch/xtensa/include/uapi/asm/unistd.h +2 -1
@@ -384,7 +384,8 @@ __SYSCALL(174, sys_chroot, 1)#define __NR_pivot_root 175 __SYSCALL(175, sys_pivot_root, 2)#define __NR_umount 176 -__SYSCALL(176, sys_umount, 2) +__SYSCALL(176, sys_oldumount, 1) +#define __ARCH_WANT_SYS_OLDUMOUNT#define __NR_swapoff 177 __SYSCALL(177, sys_swapoff, 1)#define __NR_sync 178
drivers/ata/ahci.c +16 -3
@@ -61,6 +61,7 @@ enum board_ids {/* board IDs by feature in alphabetical order */ board_ahci, board_ahci_ign_iferr, + board_ahci_nomsi, board_ahci_noncq, board_ahci_nosntf, board_ahci_yes_fbs,
@@ -122,6 +123,13 @@ static const struct ata_port_info ahci_port_info[] = { .udma_mask = ATA_UDMA6, .port_ops = &ahci_ops, }, + [board_ahci_nomsi] = { + AHCI_HFLAGS (AHCI_HFLAG_NO_MSI), + .flags = AHCI_FLAG_COMMON, + .pio_mask = ATA_PIO4, + .udma_mask = ATA_UDMA6, + .port_ops = &ahci_ops, + }, [board_ahci_noncq] = { AHCI_HFLAGS (AHCI_HFLAG_NO_NCQ), .flags = AHCI_FLAG_COMMON,
@@ -314,6 +322,11 @@ static const struct pci_device_id ahci_pci_tbl[] = { { PCI_VDEVICE(INTEL, 0x8c87), board_ahci }, /* 9 Series RAID */ { PCI_VDEVICE(INTEL, 0x8c8e), board_ahci }, /* 9 Series RAID */ { PCI_VDEVICE(INTEL, 0x8c8f), board_ahci }, /* 9 Series RAID */ + { PCI_VDEVICE(INTEL, 0xa103), board_ahci }, /* Sunrise Point-H AHCI */ + { PCI_VDEVICE(INTEL, 0xa103), board_ahci }, /* Sunrise Point-H RAID */ + { PCI_VDEVICE(INTEL, 0xa105), board_ahci }, /* Sunrise Point-H RAID */ + { PCI_VDEVICE(INTEL, 0xa107), board_ahci }, /* Sunrise Point-H RAID */ + { PCI_VDEVICE(INTEL, 0xa10f), board_ahci }, /* Sunrise Point-H RAID *//* JMicron 360/1/3/5/6, match class to avoid IDE function */ { PCI_VENDOR_ID_JMICRON, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,
@@ -476,10 +489,10 @@ static const struct pci_device_id ahci_pci_tbl[] = { { PCI_VDEVICE(ASMEDIA, 0x0612), board_ahci }, /* ASM1062 *//* -* Samsung SSDs found on some macbooks. NCQ times out. -* https://bugzilla.kernel.org/show_bug.cgi?id=60731 +* Samsung SSDs found on some macbooks. NCQ times out if MSI is +* enabled. https://bugzilla.kernel.org/show_bug.cgi?id=60731 */ - { PCI_VDEVICE(SAMSUNG, 0x1600), board_ahci_noncq }, + { PCI_VDEVICE(SAMSUNG, 0x1600), board_ahci_nomsi },/* Enmotus */ { PCI_DEVICE(0x1c44, 0x8000), board_ahci },
drivers/ata/sata_rcar.c +10 -0
@@ -146,6 +146,7 @@enum sata_rcar_type {RCAR_GEN1_SATA ,RCAR_GEN2_SATA , +RCAR_R8A7790_ES1_SATA , };struct sata_rcar_priv {
@@ -763,6 +764,9 @@ static void sata_rcar_setup_port(struct ata_host *host) ap->udma_mask =ATA_UDMA6 ; ap->flags |=ATA_FLAG_SATA ; +if (priv->type ==RCAR_R8A7790_ES1_SATA ) + ap->flags |=ATA_FLAG_NO_DIPM ; + ioaddr->cmd_addr = base +SDATA_REG ; ioaddr->ctl_addr = base +SSDEVCON_REG ; ioaddr->scr_addr = base +SCRSSTS_REG ;
@@ -792,6 +796,7 @@ static void sata_rcar_init_controller(struct ata_host *host)sata_rcar_gen1_phy_init (priv);break ;case RCAR_GEN2_SATA : +case RCAR_R8A7790_ES1_SATA :sata_rcar_gen2_phy_init (priv);break ;default :
@@ -838,6 +843,10 @@ static struct of_device_id sata_rcar_match[] = { .data = (void *)RCAR_GEN2_SATA }, { + .compatible = "renesas,sata-r8a7790-es1", + .data = (void *)RCAR_R8A7790_ES1_SATA + }, + { .compatible = "renesas,sata-r8a7791", .data = (void *)RCAR_GEN2_SATA },
@@ -849,6 +858,7 @@ static const struct platform_device_id sata_rcar_id_table[] = { { "sata_rcar", RCAR_GEN1_SATA }, /* Deprecated by "sata-r8a7779" */ { "sata-r8a7779", RCAR_GEN1_SATA }, { "sata-r8a7790", RCAR_GEN2_SATA }, + { "sata-r8a7790-es1", RCAR_R8A7790_ES1_SATA }, { "sata-r8a7791", RCAR_GEN2_SATA }, { }, };
drivers/base/regmap/regmap.c +4 -2
@@ -1557,8 +1557,10 @@ int regmap_bulk_write(struct regmap *map, unsigned int reg, const void *val, }else {void *wval; -if (!val_count) -return -EINVAL ; +if (!val_count) { + ret = -EINVAL ; + goto out; + } wval =kmemdup (val, val_count * val_bytes,GFP_KERNEL );if (!wval) {
drivers/block/sunvdc.c +129 -47
291 lines not on this page · raw message
drivers/block/zram/zram_drv.c +2 -1
@@ -447,7 +447,8 @@ static int zram_bvec_write(struct zram *zram, struct bio_vec *bvec, u32 index, }if (page_zero_filled (uncmem)) { -kunmap_atomic (user_mem); +if (user_mem) +kunmap_atomic (user_mem);/* Free memory associated with this sector now. */ write_lock (&zram->meta->tb_lock);zram_free_page (zram, index);
drivers/char/hw_random/pseries-rng.c +7 -4
@@ -25,18 +25,21 @@#include <asm/vio.h> -static int pseries_rng_data_read (struct hwrng *rng,u32 *data) +static int pseries_rng_read (struct hwrng *rng,void *data,size_t max,bool wait) { +u64 buffer[PLPAR_HCALL_BUFSIZE ]; +size_t size = max <8 ? max :8 ;int rc; - rc =plpar_hcall (H_RANDOM , (unsigned long *)data); + rc =plpar_hcall (H_RANDOM , (unsigned long *)buffer);if (rc !=H_SUCCESS ) {pr_err_ratelimited ("H_RANDOM call failed %d\n" , rc);return -EIO ; } +memcpy (data, buffer, size);/* The hypervisor interface returns 64 bits */ -return 8 ; +return size; }/**
@@ -55,7 +58,7 @@ static unsigned long pseries_rng_get_desired_dma(struct vio_dev *vdev)static struct hwrng pseries_rng = { .name =KBUILD_MODNAME , - .data_read = pseries_rng_data_read, + .read = pseries_rng_read, }; static int __init pseries_rng_probe(struct vio_dev *dev,
drivers/crypto/caam/caamhash.c +14 -8
@@ -835,8 +835,9 @@ static int ahash_update_ctx(struct ahash_request *req) edesc->sec4_sg + sec4_sg_src_index, chained);if (*next_buflen) { -sg_copy_part (next_buf, req->src, to_hash - - *buflen, req->nbytes); +scatterwalk_map_and_copy (next_buf, req->src, + to_hash - *buflen, + *next_buflen,0 ); state->current_buf = !state->current_buf; } }else {
@@ -869,7 +870,8 @@ static int ahash_update_ctx(struct ahash_request *req)kfree (edesc); } }else if (*next_buflen) { -sg_copy (buf + *buflen, req->src, req->nbytes); +scatterwalk_map_and_copy (buf + *buflen, req->src,0 , + req->nbytes,0 ); *buflen = *next_buflen; *next_buflen = last_buflen; }
@@ -1216,8 +1218,9 @@ static int ahash_update_no_ctx(struct ahash_request *req)src_map_to_sec4_sg (jrdev, req->src, src_nents, edesc->sec4_sg +1 , chained);if (*next_buflen) { -sg_copy_part (next_buf, req->src, to_hash - *buflen, - req->nbytes); +scatterwalk_map_and_copy (next_buf, req->src, + to_hash - *buflen, + *next_buflen,0 ); state->current_buf = !state->current_buf; }
@@ -1248,7 +1251,8 @@ static int ahash_update_no_ctx(struct ahash_request *req)kfree (edesc); } }else if (*next_buflen) { -sg_copy (buf + *buflen, req->src, req->nbytes); +scatterwalk_map_and_copy (buf + *buflen, req->src,0 , + req->nbytes,0 ); *buflen = *next_buflen; *next_buflen =0 ; }
@@ -1405,7 +1409,8 @@ static int ahash_update_first(struct ahash_request *req) }if (*next_buflen) -sg_copy_part (next_buf, req->src, to_hash, req->nbytes); +scatterwalk_map_and_copy (next_buf, req->src, to_hash, + *next_buflen,0 ); sh_len =desc_len (sh_desc); desc = edesc->hw_desc;
@@ -1438,7 +1443,8 @@ static int ahash_update_first(struct ahash_request *req) state->update = ahash_update_no_ctx; state->finup = ahash_finup_no_ctx; state->final = ahash_final_no_ctx; -sg_copy (next_buf, req->src, req->nbytes); +scatterwalk_map_and_copy (next_buf, req->src,0 , + req->nbytes,0 ); }#ifdef DEBUG print_hex_dump(KERN_ERR, "next buf@"__stringify(__LINE__)": ",
drivers/crypto/caam/key_gen.c +14 -15
@@ -51,23 +51,29 @@ int gen_split_key(struct device *jrdev, u8 *key_out, int split_key_len,u32 *desc;struct split_key_result result;dma_addr_t dma_addr_in, dma_addr_out; -int ret =0 ; +int ret = -ENOMEM ; desc =kmalloc (CAAM_CMD_SZ *6 +CAAM_PTR_SZ *2 ,GFP_KERNEL |GFP_DMA );if (!desc) {dev_err (jrdev,"unable to allocate key input memory\n" ); -return -ENOMEM ; +return ret; } -init_job_desc (desc,0 ); - dma_addr_in =dma_map_single (jrdev, (void *)key_in, keylen,DMA_TO_DEVICE );if (dma_mapping_error (jrdev, dma_addr_in)) {dev_err (jrdev,"unable to map key input memory\n" ); -kfree (desc); -return -ENOMEM ; + goto out_free; } + + dma_addr_out =dma_map_single (jrdev, key_out, split_key_pad_len, +DMA_FROM_DEVICE ); +if (dma_mapping_error (jrdev, dma_addr_out)) { +dev_err (jrdev,"unable to map key output memory\n" ); + goto out_unmap_in; + } + +init_job_desc (desc,0 );append_key (desc, dma_addr_in, keylen,CLASS_2 |KEY_DEST_CLASS_REG );/* Sets MDHA up into an HMAC-INIT */
@@ -84,13 +90,6 @@ int gen_split_key(struct device *jrdev, u8 *key_out, int split_key_len,* FIFO_STORE with the explicit split-key content store * (0x26 output type) */ - dma_addr_out =dma_map_single (jrdev, key_out, split_key_pad_len, -DMA_FROM_DEVICE ); -if (dma_mapping_error (jrdev, dma_addr_out)) { -dev_err (jrdev,"unable to map key output memory\n" ); -kfree (desc); -return -ENOMEM ; - }append_fifo_store (desc, dma_addr_out, split_key_len,LDST_CLASS_2_CCB |FIFOST_TYPE_SPLIT_KEK );
@@ -118,10 +117,10 @@ int gen_split_key(struct device *jrdev, u8 *key_out, int split_key_len,dma_unmap_single (jrdev, dma_addr_out, split_key_pad_len,DMA_FROM_DEVICE ); +out_unmap_in:dma_unmap_single (jrdev, dma_addr_in, keylen,DMA_TO_DEVICE ); - +out_free:kfree (desc); -return ret; }EXPORT_SYMBOL (gen_split_key);
drivers/crypto/caam/sg_sw_sec4.h +0 -54
57 lines not on this page · raw message
drivers/firewire/core-cdev.c +1 -2
@@ -1637,8 +1637,7 @@ static int dispatch_ioctl(struct client *client, _IOC_SIZE(cmd) > sizeof(buffer))return -ENOTTY ; -if (_IOC_DIR (cmd) == _IOC_READ) -memset (&buffer,0 ,_IOC_SIZE (cmd)); +memset (&buffer,0 ,sizeof (buffer));if (_IOC_DIR (cmd) & _IOC_WRITE)if (copy_from_user (&buffer, arg,_IOC_SIZE (cmd)))
drivers/gpu/drm/radeon/cik.c +5 -2
@@ -3936,8 +3936,8 @@ static int cik_cp_gfx_start(struct radeon_device *rdev)/* init the CE partitions. CE only used for gfx on CIK */ radeon_ring_write (ring,PACKET3 (PACKET3_SET_BASE ,2 ));radeon_ring_write (ring,PACKET3_BASE_INDEX (CE_PARTITION_BASE )); -radeon_ring_write (ring,0xc000 ); -radeon_ring_write (ring,0xc000 ); +radeon_ring_write (ring,0x8000 ); +radeon_ring_write (ring,0x8000 );/* setup clear context state */ radeon_ring_write (ring,PACKET3 (PACKET3_PREAMBLE_CNTL ,0 ));
@@ -8893,6 +8893,9 @@ void dce8_bandwidth_update(struct radeon_device *rdev)u32 num_heads =0 , lb_size;int i; +if (!rdev->mode_info.mode_config_initialized) +return ; +radeon_update_display_priority (rdev);for (i =0 ; i < rdev->num_crtc; i++) {
drivers/gpu/drm/radeon/evergreen.c +4 -0
@@ -2362,6 +2362,9 @@ void evergreen_bandwidth_update(struct radeon_device *rdev)u32 num_heads =0 , lb_size;int i; +if (!rdev->mode_info.mode_config_initialized) +return ; +radeon_update_display_priority (rdev);for (i =0 ; i < rdev->num_crtc; i++) {
@@ -2570,6 +2573,7 @@ void evergreen_mc_stop(struct radeon_device *rdev, struct evergreen_mc_save *savWREG32 (EVERGREEN_CRTC_UPDATE_LOCK + crtc_offsets[i],1 ); tmp |=EVERGREEN_CRTC_BLANK_DATA_EN ;WREG32 (EVERGREEN_CRTC_BLANK_CONTROL + crtc_offsets[i], tmp); +WREG32 (EVERGREEN_CRTC_UPDATE_LOCK + crtc_offsets[i],0 ); } }else { tmp =RREG32 (EVERGREEN_CRTC_CONTROL + crtc_offsets[i]);
drivers/gpu/drm/radeon/r100.c +3 -0
@@ -3219,6 +3219,9 @@ void r100_bandwidth_update(struct radeon_device *rdev)uint32_t pixel_bytes1 =0 ;uint32_t pixel_bytes2 =0 ; +if (!rdev->mode_info.mode_config_initialized) +return ; +radeon_update_display_priority (rdev);if (rdev->mode_info.crtcs[0 ]->base.enabled) {
drivers/gpu/drm/radeon/rs600.c +3 -0
@@ -890,6 +890,9 @@ void rs600_bandwidth_update(struct radeon_device *rdev)u32 d1mode_priority_a_cnt, d2mode_priority_a_cnt;/* FIXME: implement full support */ +if (!rdev->mode_info.mode_config_initialized) +return ; +radeon_update_display_priority (rdev);if (rdev->mode_info.crtcs[0 ]->base.enabled)
drivers/gpu/drm/radeon/rs690.c +3 -0
@@ -579,6 +579,9 @@ void rs690_bandwidth_update(struct radeon_device *rdev)u32 d1mode_priority_a_cnt, d1mode_priority_b_cnt;u32 d2mode_priority_a_cnt, d2mode_priority_b_cnt; +if (!rdev->mode_info.mode_config_initialized) +return ; +radeon_update_display_priority (rdev);if (rdev->mode_info.crtcs[0 ]->base.enabled)
drivers/gpu/drm/radeon/rv515.c +3 -0
@@ -1276,6 +1276,9 @@ void rv515_bandwidth_update(struct radeon_device *rdev)struct drm_display_mode *mode0 =NULL ;struct drm_display_mode *mode1 =NULL ; +if (!rdev->mode_info.mode_config_initialized) +return ; +radeon_update_display_priority (rdev);if (rdev->mode_info.crtcs[0 ]->base.enabled)
drivers/gpu/drm/radeon/si.c +3 -0
@@ -2227,6 +2227,9 @@ void dce6_bandwidth_update(struct radeon_device *rdev)u32 num_heads =0 , lb_size;int i; +if (!rdev->mode_info.mode_config_initialized) +return ; +radeon_update_display_priority (rdev);for (i =0 ; i < rdev->num_crtc; i++) {
drivers/infiniband/core/uverbs_cmd.c +2 -0
@@ -2425,6 +2425,8 @@ ssize_t ib_uverbs_create_ah(struct ib_uverbs_file *file, attr.grh.sgid_index = cmd.attr.grh.sgid_index; attr.grh.hop_limit = cmd.attr.grh.hop_limit; attr.grh.traffic_class = cmd.attr.grh.traffic_class; + attr.vlan_id =0 ; +memset (&attr.dmac,0 ,sizeof (attr.dmac));memcpy (attr.grh.dgid.raw, cmd.attr.grh.dgid,16 ); ah =ib_create_ah (pd, &attr);
drivers/input/mouse/alps.c +26 -2
@@ -1047,7 +1047,13 @@ static psmouse_ret_t alps_process_byte(struct psmouse *psmouse) {struct alps_data *priv = psmouse->private; -if ((psmouse->packet[0 ] &0xc8 ) ==0x08 ) {/* PS/2 packet */ +/* +* Check if we are dealing with a bare PS/2 packet, presumably from +* a device connected to the external PS/2 port. Because bare PS/2 +* protocol does not have enough constant bits to self-synchronize +* properly we only do this if the device is fully synchronized. +*/ +if (!psmouse->out_of_sync_cnt && (psmouse->packet[0 ] &0xc8 ) ==0x08 ) {if (psmouse->pktcnt ==3 ) {alps_report_bare_ps2_packet (psmouse, psmouse->packet, true);
@@ -1071,12 +1077,27 @@ static psmouse_ret_t alps_process_byte(struct psmouse *psmouse) }/* Bytes 2 - pktsize should have 0 in the highest bit */ -if ((priv->proto_version <ALPS_PROTO_V5 ) && +if (priv->proto_version <ALPS_PROTO_V5 && psmouse->pktcnt >=2 && psmouse->pktcnt <= psmouse->pktsize && (psmouse->packet[psmouse->pktcnt -1 ] &0x80 )) {psmouse_dbg (psmouse,"refusing packet[%i] = %x\n" , psmouse->pktcnt -1 , psmouse->packet[psmouse->pktcnt -1 ]); + +if (priv->proto_version ==ALPS_PROTO_V3 && + psmouse->pktcnt == psmouse->pktsize) { +/* +* Some Dell boxes, such as Latitude E6440 or E7440 +* with closed lid, quite often smash last byte of +* otherwise valid packet with 0xff. Given that the +* next packet is very likely to be valid let's +* report PSMOUSE_FULL_PACKET but not process data, +* rather than reporting PSMOUSE_BAD_DATA and +* filling the logs. +*/ +return PSMOUSE_FULL_PACKET ; + } +return PSMOUSE_BAD_DATA ; }
@@ -2148,6 +2169,9 @@ int alps_init(struct psmouse *psmouse)/* We are having trouble resyncing ALPS touchpads so disable it for now */ psmouse->resync_time =0 ; +/* Allow 2 invalid packets without resetting device */ + psmouse->resetafter = psmouse->pktsize *2 ; +return 0 ; init_fail:
drivers/input/mouse/synaptics.c +3 -2
@@ -132,8 +132,8 @@ static const struct min_max_quirk min_max_pnpid_table[] = {1232 ,5710 ,1156 ,4696 }, { - (const char *const []){"LEN0034" ,"LEN0036" ,"LEN2002" , -"LEN2004" ,NULL }, + (const char *const []){"LEN0034" ,"LEN0036" ,"LEN0039" , +"LEN2002" ,"LEN2004" ,NULL },1024 ,5112 ,2024 ,4832 }, {
@@ -160,6 +160,7 @@ static const char * const topbuttonpad_pnp_ids[] = {"LEN0036" ,/* T440 */ "LEN0037" ,"LEN0038" , +"LEN0039" ,/* T440s */ "LEN0041" ,"LEN0042" ,/* Yoga */ "LEN0045",
drivers/md/dm-bufio.c +6 -6
@@ -1448,9 +1448,9 @@ static void drop_buffers(struct dm_bufio_client *c)/* * Test if the buffer is unused and too old, and commit it. -* At if noio is set, we must not do any I/O because we hold -* dm_bufio_clients_lock and we would risk deadlock if the I/O gets rerouted to -* different bufio client. +* And if GFP_NOFS is used, we must not do any I/O because we hold +* dm_bufio_clients_lock and we would risk deadlock if the I/O gets +* rerouted to different bufio client. */ static int __cleanup_old_buffer (struct dm_buffer *b,gfp_t gfp,unsigned long max_jiffies)
@@ -1458,7 +1458,7 @@ static int __cleanup_old_buffer(struct dm_buffer *b, gfp_t gfp,if (jiffies - b->last_accessed < max_jiffies)return 0 ; -if (!(gfp & __GFP_IO)) { +if (!(gfp & __GFP_FS)) {if (test_bit (B_READING , &b->state) ||test_bit (B_WRITING , &b->state) ||test_bit (B_DIRTY , &b->state))
@@ -1500,7 +1500,7 @@ dm_bufio_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)unsigned long freed; c = container_of(shrink, struct dm_bufio_client, shrinker); -if (sc->gfp_mask & __GFP_IO) +if (sc->gfp_mask & __GFP_FS)dm_bufio_lock (c);else if (!dm_bufio_trylock (c))return SHRINK_STOP ;
@@ -1517,7 +1517,7 @@ dm_bufio_shrink_count(struct shrinker *shrink, struct shrink_control *sc)unsigned long count; c = container_of(shrink, struct dm_bufio_client, shrinker); -if (sc->gfp_mask & __GFP_IO) +if (sc->gfp_mask & __GFP_FS)dm_bufio_lock (c);else if (!dm_bufio_trylock (c))return 0 ;
drivers/md/dm-raid.c +7 -4
@@ -785,8 +785,7 @@ struct dm_raid_superblock {__le32 layout;__le32 stripe_sectors; -__u8 pad[452 ];/* Round struct to 512 bytes. */ -/* Always set to 0 when writing. */ +/* Remainder of a logical block is zero-filled when writing (see super_sync()). */ } __packed;static int read_disk_sb (struct md_rdev *rdev,int size)
@@ -823,7 +822,7 @@ static void super_sync(struct mddev *mddev, struct md_rdev *rdev) test_bit(Faulty, &(rs->dev[i].rdev.flags))) failed_devices |= (1ULL << i); -memset (sb,0 ,sizeof (*sb)); +memset (sb +1 ,0 , rdev->sb_size -sizeof (*sb)); sb->magic =cpu_to_le32 (DM_RAID_MAGIC ); sb->features =cpu_to_le32 (0 );/* No features yet */
@@ -858,7 +857,11 @@ static int super_load(struct md_rdev *rdev, struct md_rdev *refdev)uint64_t events_sb, events_refsb; rdev->sb_start =0 ; - rdev->sb_size =sizeof (*sb); + rdev->sb_size =bdev_logical_block_size (rdev->meta_bdev); +if (rdev->sb_size <sizeof (*sb) || rdev->sb_size >PAGE_SIZE ) { +DMERR ("superblock size of a logical block is no longer valid" ); +return -EINVAL ; + } ret =read_disk_sb (rdev, rdev->sb_size);if (ret)
drivers/md/dm-thin.c +12 -4
@@ -1704,6 +1704,14 @@ static int thin_bio_map(struct dm_target *ti, struct bio *bio)return DM_MAPIO_SUBMITTED ; } +/* +* We must hold the virtual cell before doing the lookup, otherwise +* there's a race with discard. +*/ +build_virtual_key (tc->td, block, &key); +if (dm_bio_detain (tc->pool->prison, &key, bio, &cell1, &cell_result)) +return DM_MAPIO_SUBMITTED ; + r =dm_thin_find_block (td, block,0 , &result);/*
@@ -1727,13 +1735,10 @@ static int thin_bio_map(struct dm_target *ti, struct bio *bio)* shared flag will be set in their case. */ thin_defer_bio (tc, bio); +cell_defer_no_holder_no_free (tc, &cell1);return DM_MAPIO_SUBMITTED ; } -build_virtual_key (tc->td, block, &key); -if (dm_bio_detain (tc->pool->prison, &key, bio, &cell1, &cell_result)) -return DM_MAPIO_SUBMITTED ; -build_data_key (tc->td, result.block, &key);if (dm_bio_detain (tc->pool->prison, &key, bio, &cell2, &cell_result)) {cell_defer_no_holder_no_free (tc, &cell1);
@@ -1754,6 +1759,7 @@ static int thin_bio_map(struct dm_target *ti, struct bio *bio)* of doing so. */ handle_unserviceable_bio (tc->pool, bio); +cell_defer_no_holder_no_free (tc, &cell1);return DM_MAPIO_SUBMITTED ; }/* fall through */
@@ -1764,6 +1770,7 @@ static int thin_bio_map(struct dm_target *ti, struct bio *bio)* provide the hint to load the metadata into cache. */ thin_defer_bio (tc, bio); +cell_defer_no_holder_no_free (tc, &cell1);return DM_MAPIO_SUBMITTED ;default :
@@ -1773,6 +1780,7 @@ static int thin_bio_map(struct dm_target *ti, struct bio *bio)* pool is switched to fail-io mode. */ bio_io_error (bio); +cell_defer_no_holder_no_free (tc, &cell1);return DM_MAPIO_SUBMITTED ; } }
drivers/md/md.c +4 -0
@@ -5333,6 +5333,7 @@ static int md_set_readonly(struct mddev *mddev, struct block_device *bdev)printk ("md: %s still in use.\n" ,mdname (mddev));if (did_freeze) {clear_bit (MD_RECOVERY_FROZEN , &mddev->recovery); +set_bit (MD_RECOVERY_NEEDED , &mddev->recovery);md_wakeup_thread (mddev->thread); } err = -EBUSY ;
@@ -5347,6 +5348,8 @@ static int md_set_readonly(struct mddev *mddev, struct block_device *bdev) mddev->ro =1 ;set_disk_ro (mddev->gendisk,1 );clear_bit (MD_RECOVERY_FROZEN , &mddev->recovery); +set_bit (MD_RECOVERY_NEEDED , &mddev->recovery); +md_wakeup_thread (mddev->thread);sysfs_notify_dirent_safe (mddev->sysfs_state); err =0 ; }
@@ -5390,6 +5393,7 @@ static int do_md_stop(struct mddev * mddev, int mode,mutex_unlock (&mddev->open_mutex);if (did_freeze) {clear_bit (MD_RECOVERY_FROZEN , &mddev->recovery); +set_bit (MD_RECOVERY_NEEDED , &mddev->recovery);md_wakeup_thread (mddev->thread); }return -EBUSY ;
drivers/md/persistent-data/dm-btree-internal.h +6 -0
@@ -42,6 +42,12 @@ struct btree_node { } __packed; +/* +* Locks a block using the btree node validator. +*/ +int bn_read_lock (struct dm_btree_info *info,dm_block_t b, +struct dm_block **result); +void inc_children (struct dm_transaction_manager *tm,struct btree_node *n,struct dm_btree_value_type *vt);
drivers/md/persistent-data/dm-btree-spine.c +1 -1
@@ -92,7 +92,7 @@ struct dm_block_validator btree_node_validator = {/*----------------------------------------------------------------*/ -static int bn_read_lock (struct dm_btree_info *info,dm_block_t b, +int bn_read_lock (struct dm_btree_info *info,dm_block_t b,struct dm_block **result) {return dm_tm_read_lock (info->tm, b, &btree_node_validator, result);
drivers/md/persistent-data/dm-btree.c +10 -14
@@ -847,22 +847,26 @@ EXPORT_SYMBOL_GPL(dm_btree_find_lowest_key);* FIXME: We shouldn't use a recursive algorithm when we have limited stack * space. Also this only works for single level trees. */ -static int walk_node (struct ro_spine *s,dm_block_t block, +static int walk_node (struct dm_btree_info *info,dm_block_t block,int (*fn)(void *context,uint64_t *keys,void *leaf),void *context) {int r;unsigned i, nr; +struct dm_block *node;struct btree_node *n;uint64_t keys; - r =ro_step (s, block); - n =ro_node (s); + r =bn_read_lock (info, block, &node); +if (r) +return r; + + n =dm_block_data (node); nr =le32_to_cpu (n->header.nr_entries);for (i =0 ; i < nr; i++) {if (le32_to_cpu (n->header.flags) &INTERNAL_NODE ) { - r =walk_node (s,value64 (n, i), fn, context); + r =walk_node (info,value64 (n, i), fn, context);if (r) goto out; }else {
@@ -874,7 +878,7 @@ static int walk_node(struct ro_spine *s, dm_block_t block, } out: -ro_pop (s); +dm_tm_unlock (info->tm, node);return r; }
@@ -882,15 +886,7 @@ int dm_btree_walk(struct dm_btree_info *info, dm_block_t root,int (*fn)(void *context,uint64_t *keys,void *leaf), void *context) { - int r; -struct ro_spine spine; - BUG_ON(info->levels > 1); - -init_ro_spine (&spine, info); - r =walk_node (&spine, root, fn, context); -exit_ro_spine (&spine); - -return r; +return walk_node (info, root, fn, context); }EXPORT_SYMBOL_GPL (dm_btree_walk);
drivers/media/usb/ttusb-dec/ttusbdecfe.c +3 -0
@@ -156,6 +156,9 @@ static int ttusbdecfe_dvbs_diseqc_send_master_cmd(struct dvb_frontend* fe, struc0x00 ,0x00 ,0x00 ,0x00 , 0x00, 0x00 }; +if (cmd->msg_len >sizeof (b) -4 ) +return -EINVAL ; +memcpy (&b[4 ], cmd->msg, cmd->msg_len); state->config->send_command(fe, 0x72,
drivers/net/ethernet/smsc/smsc911x.c +46 -0
58 lines not on this page · raw message
drivers/net/ethernet/sun/sunvnet.c +2 -2
@@ -656,7 +656,7 @@ static int vnet_start_xmit(struct sk_buff *skb, struct net_device *dev)spin_lock_irqsave (&port->vio.lock, flags); dr = &port->vio.drings[VIO_DRIVER_TX_RING ]; -if (unlikely (vnet_tx_dring_avail (dr) <2 )) { +if (unlikely (vnet_tx_dring_avail (dr) <1 )) {if (!netif_queue_stopped (dev)) {netif_stop_queue (dev);
@@ -704,7 +704,7 @@ static int vnet_start_xmit(struct sk_buff *skb, struct net_device *dev) dev->stats.tx_bytes += skb->len; dr->prod = (dr->prod +1 ) & (VNET_TX_RING_SIZE -1 ); -if (unlikely (vnet_tx_dring_avail (dr) <2 )) { +if (unlikely (vnet_tx_dring_avail (dr) <1 )) {netif_stop_queue (dev);if (vnet_tx_dring_avail (dr) >VNET_TX_WAKEUP_THRESH (dr))netif_wake_queue (dev);
drivers/net/macvtap.c +10 -5
@@ -66,7 +66,7 @@ static struct cdev macvtap_cdev;static const struct proto_ops macvtap_socket_ops;#define TUN_OFFLOADS (NETIF_F_HW_CSUM | NETIF_F_TSO_ECN | NETIF_F_TSO | \ - NETIF_F_TSO6) + NETIF_F_TSO6 | NETIF_F_UFO)#define RX_OFFLOADS (NETIF_F_GRO | NETIF_F_LRO)#define TAP_FEATURES (NETIF_F_GSO | NETIF_F_SG)
@@ -570,8 +570,6 @@ static int macvtap_skb_from_vnet_hdr(struct sk_buff *skb, gso_type =SKB_GSO_TCPV6 ;break ;case VIRTIO_NET_HDR_GSO_UDP : -pr_warn_once ("macvtap: %s: using disabled UFO feature; please fix this program\n" , - current->comm); gso_type =SKB_GSO_UDP ;if (skb->protocol ==htons (ETH_P_IPV6 ))ipv6_proxy_select_ident (skb);
@@ -619,6 +617,8 @@ static void macvtap_skb_to_vnet_hdr(const struct sk_buff *skb, vnet_hdr->gso_type =VIRTIO_NET_HDR_GSO_TCPV4 ; else if (sinfo->gso_type & SKB_GSO_TCPV6) vnet_hdr->gso_type = VIRTIO_NET_HDR_GSO_TCPV6; + else if (sinfo->gso_type & SKB_GSO_UDP) + vnet_hdr->gso_type = VIRTIO_NET_HDR_GSO_UDP; elseBUG ();if (sinfo->gso_type &SKB_GSO_TCP_ECN )
@@ -629,6 +629,8 @@ static void macvtap_skb_to_vnet_hdr(const struct sk_buff *skb,if (skb->ip_summed ==CHECKSUM_PARTIAL ) { vnet_hdr->flags =VIRTIO_NET_HDR_F_NEEDS_CSUM ; vnet_hdr->csum_start =skb_checksum_start_offset (skb); +if (vlan_tx_tag_present (skb)) + vnet_hdr->csum_start +=VLAN_HLEN ; vnet_hdr->csum_offset = skb->csum_offset; }else if (skb->ip_summed ==CHECKSUM_UNNECESSARY ) { vnet_hdr->flags =VIRTIO_NET_HDR_F_DATA_VALID ;
@@ -953,6 +955,9 @@ static int set_offload(struct macvtap_queue *q, unsigned long arg)if (arg &TUN_F_TSO6 ) feature_mask |=NETIF_F_TSO6 ; } + +if (arg &TUN_F_UFO ) + feature_mask |=NETIF_F_UFO ; }/* tun/tap driver inverts the usage for TSO offloads, where
@@ -963,7 +968,7 @@ static int set_offload(struct macvtap_queue *q, unsigned long arg)* When user space turns off TSO, we turn off GSO/LRO so that * user-space will not receive TSO frames. */ -if (feature_mask & (NETIF_F_TSO |NETIF_F_TSO6 )) +if (feature_mask & (NETIF_F_TSO |NETIF_F_TSO6 |NETIF_F_UFO )) features |=RX_OFFLOADS ;else features &= ~RX_OFFLOADS ;
@@ -1064,7 +1069,7 @@ static long macvtap_ioctl(struct file *file, unsigned int cmd,case TUNSETOFFLOAD :/* let the user check for future flags */ if (arg & ~(TUN_F_CSUM |TUN_F_TSO4 |TUN_F_TSO6 | -TUN_F_TSO_ECN )) +TUN_F_TSO_ECN |TUN_F_UFO ))return -EINVAL ;rtnl_lock ();
drivers/net/tun.c +17 -18
@@ -175,7 +175,7 @@ struct tun_struct {struct net_device *dev;netdev_features_t set_features;#define TUN_USER_FEATURES (NETIF_F_HW_CSUM|NETIF_F_TSO_ECN|NETIF_F_TSO| \ - NETIF_F_TSO6) + NETIF_F_TSO6|NETIF_F_UFO)int vnet_hdr_sz;int sndbuf;
@@ -1153,20 +1153,10 @@ static ssize_t tun_get_user(struct tun_struct *tun, struct tun_file *tfile,skb_shinfo (skb)->gso_type =SKB_GSO_TCPV6 ;break ;case VIRTIO_NET_HDR_GSO_UDP : - { -static bool warned; - -if (!warned) { - warned = true; -netdev_warn (tun->dev, -"%s: using disabled UFO feature; please fix this program\n" , - current->comm); - }skb_shinfo (skb)->gso_type =SKB_GSO_UDP ;if (skb->protocol ==htons (ETH_P_IPV6 ))ipv6_proxy_select_ident (skb);break ; - }default : tun->dev->stats.rx_frame_errors++;kfree_skb (skb);
@@ -1236,6 +1226,10 @@ static ssize_t tun_put_user(struct tun_struct *tun,struct tun_pi pi = {0 , skb->protocol };ssize_t total =0 ;int vlan_offset =0 , copied; +int vlan_hlen =0 ; + +if (vlan_tx_tag_present (skb)) + vlan_hlen =VLAN_HLEN ;if (!(tun->flags &TUN_NO_PI )) {if ((len -=sizeof (pi)) <0 )
@@ -1266,6 +1260,8 @@ static ssize_t tun_put_user(struct tun_struct *tun, gso.gso_type =VIRTIO_NET_HDR_GSO_TCPV4 ; else if (sinfo->gso_type & SKB_GSO_TCPV6) gso.gso_type = VIRTIO_NET_HDR_GSO_TCPV6; + else if (sinfo->gso_type & SKB_GSO_UDP) + gso.gso_type = VIRTIO_NET_HDR_GSO_UDP; else { pr_err("unexpected GSO type: " "0x%x, gso_size %d, hdr_len %d\n",
@@ -1285,7 +1281,8 @@ static ssize_t tun_put_user(struct tun_struct *tun,if (skb->ip_summed ==CHECKSUM_PARTIAL ) { gso.flags =VIRTIO_NET_HDR_F_NEEDS_CSUM ; - gso.csum_start =skb_checksum_start_offset (skb); + gso.csum_start =skb_checksum_start_offset (skb) + + vlan_hlen; gso.csum_offset = skb->csum_offset; }else if (skb->ip_summed ==CHECKSUM_UNNECESSARY ) { gso.flags =VIRTIO_NET_HDR_F_DATA_VALID ;
@@ -1298,10 +1295,9 @@ static ssize_t tun_put_user(struct tun_struct *tun, } copied = total; - total += skb->len; -if (!vlan_tx_tag_present (skb)) { - len =min_t (int, skb->len, len); - }else { + len =min_t (int, skb->len + vlan_hlen, len); + total += skb->len + vlan_hlen; +if (vlan_hlen) {int copy, ret;struct {__be16 h_vlan_proto;
@@ -1312,8 +1308,6 @@ static ssize_t tun_put_user(struct tun_struct *tun, veth.h_vlan_TCI =htons (vlan_tx_tag_get (skb)); vlan_offset = offsetof(struct vlan_ethhdr , h_vlan_proto); - len =min_t (int, skb->len +VLAN_HLEN , len); - total +=VLAN_HLEN ; copy =min_t (int, vlan_offset, len); ret =skb_copy_datagram_const_iovec (skb,0 , iv, copied, copy);
@@ -1795,6 +1789,11 @@ static int set_offload(struct tun_struct *tun, unsigned long arg) features |=NETIF_F_TSO6 ; arg &= ~(TUN_F_TSO4 |TUN_F_TSO6 ); } + +if (arg &TUN_F_UFO ) { + features |=NETIF_F_UFO ; + arg &= ~TUN_F_UFO ; + } }/* This gives the user a way to test for new features in future by
drivers/net/virtio_net.c +10 -14
@@ -496,17 +496,8 @@ static void receive_buf(struct receive_queue *rq, void *buf, unsigned int len)skb_shinfo (skb)->gso_type =SKB_GSO_TCPV4 ;break ;case VIRTIO_NET_HDR_GSO_UDP : - { -static bool warned; - -if (!warned) { - warned = true; -netdev_warn (dev, -"host using disabled UFO feature; please fix it\n" ); - }skb_shinfo (skb)->gso_type =SKB_GSO_UDP ;break ; - }case VIRTIO_NET_HDR_GSO_TCPV6 :skb_shinfo (skb)->gso_type =SKB_GSO_TCPV6 ;break ;
@@ -845,6 +836,8 @@ static int xmit_skb(struct send_queue *sq, struct sk_buff *skb) hdr->hdr.gso_type =VIRTIO_NET_HDR_GSO_TCPV4 ; else if (skb_shinfo(skb)->gso_type & SKB_GSO_TCPV6) hdr->hdr.gso_type = VIRTIO_NET_HDR_GSO_TCPV6; + else if (skb_shinfo(skb)->gso_type & SKB_GSO_UDP) + hdr->hdr.gso_type = VIRTIO_NET_HDR_GSO_UDP; elseBUG ();if (skb_shinfo (skb)->gso_type &SKB_GSO_TCP_ECN )
@@ -1664,7 +1657,7 @@ static int virtnet_probe(struct virtio_device *vdev) dev->features |=NETIF_F_HW_CSUM |NETIF_F_SG |NETIF_F_FRAGLIST ;if (virtio_has_feature (vdev,VIRTIO_NET_F_GSO )) { - dev->hw_features |=NETIF_F_TSO + dev->hw_features |=NETIF_F_TSO |NETIF_F_UFO |NETIF_F_TSO_ECN |NETIF_F_TSO6 ; }/* Individual feature bits: what can host handle? */
@@ -1674,9 +1667,11 @@ static int virtnet_probe(struct virtio_device *vdev) dev->hw_features |=NETIF_F_TSO6 ;if (virtio_has_feature (vdev,VIRTIO_NET_F_HOST_ECN )) dev->hw_features |=NETIF_F_TSO_ECN ; +if (virtio_has_feature (vdev,VIRTIO_NET_F_HOST_UFO )) + dev->hw_features |=NETIF_F_UFO ;if (gso) - dev->features |= dev->hw_features &NETIF_F_ALL_TSO ; + dev->features |= dev->hw_features & (NETIF_F_ALL_TSO |NETIF_F_UFO );/* (!csum && gso) case will be fixed by register_netdev() */ }if (virtio_has_feature (vdev,VIRTIO_NET_F_GUEST_CSUM ))
@@ -1716,7 +1711,8 @@ static int virtnet_probe(struct virtio_device *vdev)/* If we can receive ANY GSO packets, we must allocate large ones. */ if (virtio_has_feature (vdev,VIRTIO_NET_F_GUEST_TSO4 ) ||virtio_has_feature (vdev,VIRTIO_NET_F_GUEST_TSO6 ) || -virtio_has_feature (vdev,VIRTIO_NET_F_GUEST_ECN )) +virtio_has_feature (vdev,VIRTIO_NET_F_GUEST_ECN ) || +virtio_has_feature (vdev,VIRTIO_NET_F_GUEST_UFO )) vi->big_packets = true;if (virtio_has_feature (vdev,VIRTIO_NET_F_MRG_RXBUF ))
@@ -1907,9 +1903,9 @@ static struct virtio_device_id id_table[] = {static unsigned int features[] = {VIRTIO_NET_F_CSUM ,VIRTIO_NET_F_GUEST_CSUM ,VIRTIO_NET_F_GSO ,VIRTIO_NET_F_MAC , -VIRTIO_NET_F_HOST_TSO4 ,VIRTIO_NET_F_HOST_TSO6 , +VIRTIO_NET_F_HOST_TSO4 ,VIRTIO_NET_F_HOST_UFO ,VIRTIO_NET_F_HOST_TSO6 ,VIRTIO_NET_F_HOST_ECN ,VIRTIO_NET_F_GUEST_TSO4 ,VIRTIO_NET_F_GUEST_TSO6 , -VIRTIO_NET_F_GUEST_ECN , +VIRTIO_NET_F_GUEST_ECN ,VIRTIO_NET_F_GUEST_UFO ,VIRTIO_NET_F_MRG_RXBUF ,VIRTIO_NET_F_STATUS ,VIRTIO_NET_F_CTRL_VQ ,VIRTIO_NET_F_CTRL_RX ,VIRTIO_NET_F_CTRL_VLAN ,VIRTIO_NET_F_GUEST_ANNOUNCE ,VIRTIO_NET_F_MQ ,
drivers/net/vxlan.c +18 -10
@@ -279,13 +279,15 @@ static inline struct vxlan_rdst *first_remote_rtnl(struct vxlan_fdb *fdb) return list_first_entry(&fdb->remotes, struct vxlan_rdst, list); } -/* Find VXLAN socket based on network namespace and UDP port */ -static struct vxlan_sock *vxlan_find_sock (struct net *net,__be16 port) +/* Find VXLAN socket based on network namespace, address family and UDP port */ +static struct vxlan_sock *vxlan_find_sock (struct net *net, +sa_family_t family,__be16 port) {struct vxlan_sock *vs;hlist_for_each_entry_rcu (vs,vs_head (net, port), hlist) { -if (inet_sk (vs->sock->sk)->inet_sport == port) +if (inet_sk (vs->sock->sk)->inet_sport == port && +inet_sk (vs->sock->sk)->sk.sk_family == family)return vs; }return NULL ;
@@ -304,11 +306,12 @@ static struct vxlan_dev *vxlan_vs_find_vni(struct vxlan_sock *vs, u32 id) }/* Look up VNI in a per net namespace table */ -static struct vxlan_dev *vxlan_find_vni (struct net *net,u32 id,__be16 port) +static struct vxlan_dev *vxlan_find_vni (struct net *net,u32 id, +sa_family_t family,__be16 port) {struct vxlan_sock *vs; - vs =vxlan_find_sock (net, port); + vs =vxlan_find_sock (net, family, port);if (!vs)return NULL ;
@@ -1872,7 +1875,8 @@ static void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev,struct vxlan_dev *dst_vxlan;ip_rt_put (rt); - dst_vxlan =vxlan_find_vni (dev_net (dev), vni, dst_port); + dst_vxlan =vxlan_find_vni (dev_net (dev), vni, + dst->sa.sa_family, dst_port);if (!dst_vxlan) goto tx_error;vxlan_encap_bypass (skb, vxlan, dst_vxlan);
@@ -1925,7 +1929,8 @@ static void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev,struct vxlan_dev *dst_vxlan;dst_release (ndst); - dst_vxlan =vxlan_find_vni (dev_net (dev), vni, dst_port); + dst_vxlan =vxlan_find_vni (dev_net (dev), vni, + dst->sa.sa_family, dst_port);if (!dst_vxlan) goto tx_error;vxlan_encap_bypass (skb, vxlan, dst_vxlan);
@@ -2083,6 +2088,7 @@ static int vxlan_init(struct net_device *dev) {struct vxlan_dev *vxlan =netdev_priv (dev);struct vxlan_net *vn =net_generic (dev_net (dev), vxlan_net_id); +bool ipv6 = vxlan->flags &VXLAN_F_IPV6 ;struct vxlan_sock *vs;int i;
@@ -2098,7 +2104,8 @@ static int vxlan_init(struct net_device *dev)spin_lock (&vn->sock_lock); - vs =vxlan_find_sock (dev_net (dev), vxlan->dst_port); + vs =vxlan_find_sock (dev_net (dev), ipv6 ?AF_INET6 :AF_INET , + vxlan->dst_port);if (vs) {/* If we have a socket with same port already, reuse it */ atomic_inc (&vs->refcnt);
@@ -2566,7 +2573,7 @@ struct vxlan_sock *vxlan_sock_add(struct net *net, __be16 port,return vs;spin_lock (&vn->sock_lock); - vs =vxlan_find_sock (net, port); + vs =vxlan_find_sock (net, ipv6 ?AF_INET6 :AF_INET , port);if (vs) {if (vs->rcv == rcv)atomic_inc (&vs->refcnt);
@@ -2712,7 +2719,8 @@ static int vxlan_newlink(struct net *net, struct net_device *dev,if (data[IFLA_VXLAN_PORT ]) vxlan->dst_port =nla_get_be16 (data[IFLA_VXLAN_PORT ]); -if (vxlan_find_vni (net, vni, vxlan->dst_port)) { +if (vxlan_find_vni (net, vni, use_ipv6 ?AF_INET6 :AF_INET , + vxlan->dst_port)) {pr_info ("duplicate VNI %u\n" , vni);return -EEXIST ; }
drivers/net/wireless/iwlwifi/iwl-trans.h +2 -0
@@ -514,6 +514,7 @@ enum iwl_trans_state {* Set during transport allocation. * @hw_id_str: a string with info about HW ID. Set during transport allocation. * @pm_support: set to true in start_hw if link pm is supported +* @ltr_enabled: set to true if the LTR is enabled * @dev_cmd_pool: pool for Tx cmd allocation - for internal use only. * The user should use iwl_trans_{alloc,free}_tx_cmd. * @dev_cmd_headroom: room needed for the transport's private use before the
@@ -539,6 +540,7 @@ struct iwl_trans {u8 rx_mpdu_cmd, rx_mpdu_cmd_hdr_size;bool pm_support; +bool ltr_enabled;/* The following fields are internal only */ struct kmem_cache *dev_cmd_pool;
drivers/net/wireless/iwlwifi/mvm/fw-api-power.h +34 -1
@@ -66,13 +66,46 @@/* Power Management Commands, Responses, Notifications */ +/** +* enum iwl_ltr_config_flags - masks for LTR config command flags +* @LTR_CFG_FLAG_FEATURE_ENABLE: Feature operational status +* @LTR_CFG_FLAG_HW_DIS_ON_SHADOW_REG_ACCESS: allow LTR change on shadow +* memory access +* @LTR_CFG_FLAG_HW_EN_SHRT_WR_THROUGH: allow LTR msg send on ANY LTR +* reg change +* @LTR_CFG_FLAG_HW_DIS_ON_D0_2_D3: allow LTR msg send on transition from +* D0 to D3 +* @LTR_CFG_FLAG_SW_SET_SHORT: fixed static short LTR register +* @LTR_CFG_FLAG_SW_SET_LONG: fixed static short LONG register +* @LTR_CFG_FLAG_DENIE_C10_ON_PD: allow going into C10 on PD +*/ +enum iwl_ltr_config_flags { +LTR_CFG_FLAG_FEATURE_ENABLE =BIT (0 ), +LTR_CFG_FLAG_HW_DIS_ON_SHADOW_REG_ACCESS =BIT (1 ), +LTR_CFG_FLAG_HW_EN_SHRT_WR_THROUGH =BIT (2 ), +LTR_CFG_FLAG_HW_DIS_ON_D0_2_D3 =BIT (3 ), +LTR_CFG_FLAG_SW_SET_SHORT =BIT (4 ), +LTR_CFG_FLAG_SW_SET_LONG =BIT (5 ), +LTR_CFG_FLAG_DENIE_C10_ON_PD =BIT (6 ), +}; + +/** +* struct iwl_ltr_config_cmd - configures the LTR +* @flags: See %enum iwl_ltr_config_flags +*/ +struct iwl_ltr_config_cmd { +__le32 flags; +__le32 static_long; +__le32 static_short; +} __packed; +/* Radio LP RX Energy Threshold measured in dBm */ #define POWER_LPRX_RSSI_THRESHOLD 75#define POWER_LPRX_RSSI_THRESHOLD_MAX 94#define POWER_LPRX_RSSI_THRESHOLD_MIN 30/** -* enum iwl_scan_flags - masks for power table command flags +* enum iwl_power_flags - masks for power table command flags * @POWER_FLAGS_POWER_SAVE_ENA_MSK: '1' Allow to save power by turning off * receiver and transmitter. '0' - does not allow. * @POWER_FLAGS_POWER_MANAGEMENT_ENA_MSK: '0' Driver disables power management,
drivers/net/wireless/iwlwifi/mvm/fw-api.h +1 -0
@@ -142,6 +142,7 @@ enum {/* Power - legacy power table command */ POWER_TABLE_CMD =0x77 ,PSM_UAPSD_AP_MISBEHAVING_NOTIFICATION =0x78 , +LTR_CONFIG =0xee ,/* Thermal Throttling*/ REPLY_THERMAL_MNG_BACKOFF = 0x7e,
drivers/net/wireless/iwlwifi/mvm/fw.c +9 -0
@@ -439,6 +439,15 @@ int iwl_mvm_up(struct iwl_mvm *mvm) goto error; } +if (mvm->trans->ltr_enabled) { +struct iwl_ltr_config_cmd cmd = { + .flags =cpu_to_le32 (LTR_CFG_FLAG_FEATURE_ENABLE ), + }; + +WARN_ON (iwl_mvm_send_cmd_pdu (mvm,LTR_CONFIG ,0 , +sizeof (cmd), &cmd)); + } + ret =iwl_mvm_power_update_device_mode (mvm);if (ret) goto error;
drivers/net/wireless/iwlwifi/mvm/ops.c +1 -0
@@ -313,6 +313,7 @@ static const char *iwl_mvm_cmd_strings[REPLY_MAX] = {CMD (REPLY_BEACON_FILTERING_CMD ),CMD (REPLY_THERMAL_MNG_BACKOFF ),CMD (MAC_PM_POWER_TABLE ), +CMD (LTR_CONFIG ),CMD (BT_COEX_CI ), CMD(PSM_UAPSD_AP_MISBEHAVING_NOTIFICATION), };
drivers/net/wireless/iwlwifi/pcie/trans.c +9 -7
@@ -94,6 +94,7 @@ static void iwl_pcie_apm_config(struct iwl_trans *trans) {struct iwl_trans_pcie *trans_pcie =IWL_TRANS_GET_PCIE_TRANS (trans);u16 lctl; +u16 cap;/* * HW bug W/A for instability in PCIe bus L0S->L1 transition.
@@ -104,16 +105,17 @@ static void iwl_pcie_apm_config(struct iwl_trans *trans)* power savings, even without L1. */ pcie_capability_read_word (trans_pcie->pci_dev,PCI_EXP_LNKCTL , &lctl); -if (lctl &PCI_EXP_LNKCTL_ASPM_L1 ) { -/* L1-ASPM enabled; disable(!) L0S */ +if (lctl &PCI_EXP_LNKCTL_ASPM_L1 )iwl_set_bit (trans,CSR_GIO_REG ,CSR_GIO_REG_VAL_L0S_ENABLED ); -dev_info (trans->dev,"L1 Enabled; Disabling L0S\n" ); - }else { -/* L1-ASPM disabled; enable(!) L0S */ +else iwl_clear_bit (trans,CSR_GIO_REG ,CSR_GIO_REG_VAL_L0S_ENABLED ); -dev_info (trans->dev,"L1 Disabled; Enabling L0S\n" ); - } trans->pm_support = !(lctl &PCI_EXP_LNKCTL_ASPM_L0S ); + +pcie_capability_read_word (trans_pcie->pci_dev,PCI_EXP_DEVCTL2 , &cap); + trans->ltr_enabled = cap &PCI_EXP_DEVCTL2_LTR_EN ; +dev_info (trans->dev,"L1 %sabled - LTR %sabled\n" , + (lctl &PCI_EXP_LNKCTL_ASPM_L1 ) ?"En" :"Dis" , + trans->ltr_enabled ?"En" :"Dis" ); }/*
drivers/net/wireless/mac80211_hwsim.c +3 -1
@@ -1974,7 +1974,7 @@ static int mac80211_hwsim_create_radio(int channels, const char *reg_alpha2,if (err !=0 ) {printk (KERN_DEBUG "mac80211_hwsim: device_bind_driver failed (%d)\n" , err); - goto failed_hw; + goto failed_bind; }skb_queue_head_init (&data->pending);
@@ -2157,6 +2157,8 @@ static int mac80211_hwsim_create_radio(int channels, const char *reg_alpha2,return idx; failed_hw: +device_release_driver (data->dev); +failed_bind:device_unregister (data->dev); failed_drvdata:ieee80211_free_hw (hw);
drivers/platform/x86/dell-wmi.c +9 -3
@@ -163,18 +163,24 @@ static void dell_wmi_notify(u32 value, void *context)const struct key_entry *key;int reported_key;u16 *buffer_entry = (u16 *)obj->buffer.pointer; +int buffer_size = obj->buffer.length/2 ; -if (dell_new_hk_type && (buffer_entry[1 ] !=0x10 )) { +if (buffer_size >=2 && dell_new_hk_type && buffer_entry[1 ] !=0x10 ) {pr_info ("Received unknown WMI event (0x%x)\n" , buffer_entry[1 ]);kfree (obj);return ; } -if (dell_new_hk_type || buffer_entry[1 ] ==0x0 ) +if (buffer_size >=3 && (dell_new_hk_type || buffer_entry[1 ] ==0x0 )) reported_key = (int )buffer_entry[2 ]; -else +else if (buffer_size >=2 ) reported_key = (int )buffer_entry[1 ] &0xffff ; +else { +pr_info ("Received unknown WMI event\n" ); +kfree (obj); +return ; + } key =sparse_keymap_entry_from_scancode (dell_wmi_input_dev, reported_key);
drivers/power/bq2415x_charger.c +15 -8
@@ -1579,8 +1579,15 @@ static int bq2415x_probe(struct i2c_client *client,if (np) { bq->notify_psy =power_supply_get_by_phandle (np,"ti,usb-charger-detection" ); -if (!bq->notify_psy) -return -EPROBE_DEFER ; +if (IS_ERR (bq->notify_psy)) { +dev_info (&client->dev, +"no 'ti,usb-charger-detection' property (err=%ld)\n" , +PTR_ERR (bq->notify_psy)); + bq->notify_psy =NULL ; + }else if (!bq->notify_psy) { + ret = -EPROBE_DEFER ; + goto error_2; + } }else if (pdata->notify_device) bq->notify_psy =power_supply_get_by_name (pdata->notify_device);
@@ -1602,27 +1609,27 @@ static int bq2415x_probe(struct i2c_client *client, ret =of_property_read_u32 (np,"ti,current-limit" , &bq->init_data.current_limit);if (ret) -return ret; + goto error_2; ret =of_property_read_u32 (np,"ti,weak-battery-voltage" , &bq->init_data.weak_battery_voltage);if (ret) -return ret; + goto error_2; ret =of_property_read_u32 (np,"ti,battery-regulation-voltage" , &bq->init_data.battery_regulation_voltage);if (ret) -return ret; + goto error_2; ret =of_property_read_u32 (np,"ti,charge-current" , &bq->init_data.charge_current);if (ret) -return ret; + goto error_2; ret =of_property_read_u32 (np,"ti,termination-current" , &bq->init_data.termination_current);if (ret) -return ret; + goto error_2; ret =of_property_read_u32 (np,"ti,resistor-sense" , &bq->init_data.resistor_sense);if (ret) -return ret; + goto error_2; }else {memcpy (&bq->init_data, pdata,sizeof (bq->init_data)); }
drivers/power/charger-manager.c +110 -53
351 lines not on this page · raw message
drivers/scsi/scsi_error.c +3 -1
@@ -1984,8 +1984,10 @@ static void scsi_restart_operations(struct Scsi_Host *shost)* is no point trying to lock the door of an off-line device. */ shost_for_each_device (sdev, shost) { -if (scsi_device_online (sdev) && sdev->locked) +if (scsi_device_online (sdev) && sdev->was_reset && sdev->locked) {scsi_eh_lock_door (sdev); + sdev->was_reset =0 ; + } }/*
fs/btrfs/compression.c +1 -1
@@ -472,7 +472,7 @@ static noinline int add_ra_bio_pages(struct inode *inode,rcu_read_lock (); page =radix_tree_lookup (&mapping->page_tree, pg_index);rcu_read_unlock (); -if (page) { +if (page && !radix_tree_exceptional_entry (page)) { misses++;if (misses >4 )break ;
fs/btrfs/file.c +0 -5
@@ -425,13 +425,8 @@ static noinline int btrfs_copy_from_user(loff_t pos, int num_pages,struct page *page = prepared_pages[pg];/* * Copy data from userspace to the current page -* -* Disable pagefault to avoid recursive lock since -* the pages are already locked */ -pagefault_disable (); copied =iov_iter_copy_from_user_atomic (page, i, offset, count); -pagefault_enable ();/* Flush processor's dcache for this page */ flush_dcache_page (page);
fs/cramfs/inode.c +1 -2
@@ -195,8 +195,7 @@ static void *cramfs_read(struct super_block *sb, unsigned int offset, unsigned istruct page *page =NULL ;if (blocknr + i < devsize) { - page =read_mapping_page_async (mapping, blocknr + i, -NULL ); + page =read_mapping_page (mapping, blocknr + i,NULL );/* synchronous error? */ if (IS_ERR (page)) page =NULL ;
fs/fuse/file.c +0 -2
@@ -1003,9 +1003,7 @@ static ssize_t fuse_fill_write_pages(struct fuse_req *req,if (mapping_writably_mapped (mapping))flush_dcache_page (page); -pagefault_disable (); tmp =iov_iter_copy_from_user_atomic (page, ii, offset, bytes); -pagefault_enable ();flush_dcache_page (page);mark_page_accessed (page);
fs/gfs2/meta_io.c +5 -0
@@ -97,6 +97,11 @@ const struct address_space_operations gfs2_meta_aops = { .releasepage = gfs2_releasepage, }; +const struct address_space_operations gfs2_rgrp_aops = { + .writepage = gfs2_aspace_writepage, + .releasepage = gfs2_releasepage, +}; +/** * gfs2_getbuf - Get a buffer with a given address space * @gl: the glock
fs/gfs2/meta_io.h +3 -0
@@ -38,12 +38,15 @@ static inline void gfs2_buffer_copy_tail(struct buffer_head *to_bh, }extern const struct address_space_operations gfs2_meta_aops; +extern const struct address_space_operations gfs2_rgrp_aops;static inline struct gfs2_sbd *gfs2_mapping2sbd (struct address_space *mapping) {struct inode *inode = mapping->host;if (mapping->a_ops == &gfs2_meta_aops)return (((struct gfs2_glock *)mapping) -1 )->gl_sbd; +else if (mapping->a_ops == &gfs2_rgrp_aops) + return container_of(mapping, struct gfs2_sbd, sd_aspace);else return inode->i_sb->s_fs_info; }
fs/gfs2/ops_fstype.c +1 -1
@@ -104,7 +104,7 @@ static struct gfs2_sbd *init_sbd(struct super_block *sb) mapping = &sdp->sd_aspace;address_space_init_once (mapping); - mapping->a_ops = &gfs2_meta_aops; + mapping->a_ops = &gfs2_rgrp_aops; mapping->host = sb->s_bdev->bd_inode; mapping->flags =0 ;mapping_set_gfp_mask (mapping,GFP_NOFS );
fs/ioprio.c +8 -6
@@ -157,14 +157,16 @@ out:int ioprio_best (unsigned short aprio,unsigned short bprio) { -unsigned short aclass =IOPRIO_PRIO_CLASS (aprio); -unsigned short bclass =IOPRIO_PRIO_CLASS (bprio); +unsigned short aclass; +unsigned short bclass; -if (aclass ==IOPRIO_CLASS_NONE ) - aclass =IOPRIO_CLASS_BE ; -if (bclass ==IOPRIO_CLASS_NONE ) - bclass =IOPRIO_CLASS_BE ; +if (!ioprio_valid (aprio)) + aprio =IOPRIO_PRIO_VALUE (IOPRIO_CLASS_BE ,IOPRIO_NORM ); +if (!ioprio_valid (bprio)) + bprio =IOPRIO_PRIO_VALUE (IOPRIO_CLASS_BE ,IOPRIO_NORM ); + aclass =IOPRIO_PRIO_CLASS (aprio); + bclass =IOPRIO_PRIO_CLASS (bprio);if (aclass == bclass)return min (aprio, bprio);if (aclass > bclass)
fs/jffs2/fs.c +1 -1
@@ -687,7 +687,7 @@ unsigned char *jffs2_gc_fetch_page(struct jffs2_sb_info *c,struct inode *inode =OFNI_EDONI_2SFFJ (f);struct page *pg; - pg =read_cache_page_async (inode->i_mapping, offset >>PAGE_CACHE_SHIFT , + pg =read_cache_page (inode->i_mapping, offset >>PAGE_CACHE_SHIFT , (void *)jffs2_do_readpage_unlock, inode);if (IS_ERR (pg))return (void *)pg;
fs/nfs/blocklayout/blocklayout.c +1 -1
@@ -1213,7 +1213,7 @@ static u64 pnfs_num_cont_bytes(struct inode *inode, pgoff_t idx) end =DIV_ROUND_UP (i_size_read (inode),PAGE_CACHE_SIZE );if (end !=NFS_I (inode)->npages) {rcu_read_lock (); - end =radix_tree_next_hole (&mapping->page_tree, idx +1 ,ULONG_MAX ); + end =page_cache_next_hole (mapping, idx +1 ,ULONG_MAX );rcu_read_unlock (); }
fs/nfs/delegation.c +23 -2
@@ -109,6 +109,8 @@ again:continue ;if (!test_bit (NFS_DELEGATED_STATE , &state->flags))continue ; +if (!nfs4_valid_open_stateid (state)) +continue ;if (!nfs4_stateid_match (&state->stateid, stateid))continue ;get_nfs_open_context (ctx);
@@ -177,7 +179,11 @@ static int nfs_do_return_delegation(struct inode *inode, struct nfs_delegation * {int res =0 ; - res =nfs4_proc_delegreturn (inode, delegation->cred, &delegation->stateid, issync); +if (!test_bit (NFS_DELEGATION_REVOKED , &delegation->flags)) + res =nfs4_proc_delegreturn (inode, + delegation->cred, + &delegation->stateid, + issync);nfs_free_delegation (delegation);return res; }
@@ -364,11 +370,13 @@ static int nfs_end_delegation_return(struct inode *inode, struct nfs_delegation {struct nfs_client *clp =NFS_SERVER (inode)->nfs_client;struct nfs_inode *nfsi =NFS_I (inode); -int err; +int err =0 ;if (delegation ==NULL )return 0 ; do { + if (test_bit(NFS_DELEGATION_REVOKED, &delegation->flags)) + break; err = nfs_delegation_claim_opens(inode, &delegation->stateid); if (!issync || err != -EAGAIN) break;
@@ -589,10 +597,23 @@ static void nfs_client_mark_return_unused_delegation_types(struct nfs_client *clrcu_read_unlock (); } +static void nfs_revoke_delegation (struct inode *inode) +{ +struct nfs_delegation *delegation; +rcu_read_lock (); + delegation =rcu_dereference (NFS_I (inode)->delegation); +if (delegation !=NULL ) { +set_bit (NFS_DELEGATION_REVOKED , &delegation->flags); +nfs_mark_return_delegation (NFS_SERVER (inode), delegation); + } +rcu_read_unlock (); +} +void nfs_remove_bad_delegation (struct inode *inode) {struct nfs_delegation *delegation; +nfs_revoke_delegation (inode); delegation =nfs_inode_detach_delegation (inode);if (delegation) {nfs_inode_find_state_and_recover (inode, &delegation->stateid);
fs/nfs/delegation.h +1 -0
@@ -31,6 +31,7 @@ enum {NFS_DELEGATION_RETURN_IF_CLOSED ,NFS_DELEGATION_REFERENCED ,NFS_DELEGATION_RETURNING , + NFS_DELEGATION_REVOKED, };int nfs_inode_set_delegation (struct inode *inode,struct rpc_cred *cred,struct nfs_openres *res);
fs/nfs/direct.c +1 -0
@@ -178,6 +178,7 @@ static void nfs_direct_req_free(struct kref *kref) { struct nfs_direct_req *dreq = container_of(kref, struct nfs_direct_req, kref); +nfs_free_pnfs_ds_cinfo (&dreq->ds_cinfo);if (dreq->l_ctx !=NULL )nfs_put_lock_context (dreq->l_ctx);if (dreq->ctx !=NULL )
fs/nfs/inode.c +1 -1
@@ -592,7 +592,7 @@ int nfs_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat) {struct inode *inode = dentry->d_inode;int need_atime =NFS_I (inode)->cache_validity &NFS_INO_INVALID_ATIME ; -int err; +int err =0 ;trace_nfs_getattr_enter (inode);/* Flush out writes to the server in order to update c/mtime. */
fs/nfs/nfs4proc.c +41 -27
108 lines not on this page · raw message
fs/super.c +9 -7
@@ -114,9 +114,14 @@ static unsigned long super_cache_count(struct shrinker *shrink, sb = container_of(shrink, struct super_block, s_shrink); -if (!grab_super_passive (sb)) -return 0 ; - +/* +* Don't call grab_super_passive as it is a potential +* scalability bottleneck. The counts could get updated +* between super_cache_count and super_cache_scan anyway. +* Call to super_cache_count with shrinker_rwsem held +* ensures the safety of call to list_lru_count_node() and +* s_op->nr_cached_objects(). +*/ if (sb->s_op && sb->s_op->nr_cached_objects) total_objects = sb->s_op->nr_cached_objects (sb, sc->nid);
@@ -127,7 +132,6 @@ static unsigned long super_cache_count(struct shrinker *shrink, sc->nid);
Lines of this file are not shown. View the raw message.
lib/radix-tree.c +27 -79
106 lines not on this page · raw message
mm/compaction.c +138 -111
249 lines not on this page · raw message
mm/filemap.c +275 -66
341 lines not on this page · raw message
mm/migrate.c +40 -16
56 lines not on this page · raw message
mm/page_alloc.c +30 -32
62 lines not on this page · raw message
mm/shmem.c +31 -91
122 lines not on this page · raw message
mm/swap.c +51 -0
51 lines not on this page · raw message
mm/truncate.c +61 -13
74 lines not on this page · raw message
net/ceph/crypto.c +132 -37
169 lines not on this page · raw message
net/sctp/sm_make_chunk.c +58 -44
102 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.