Linux 3.10.26
Greg KH
maintainerI'm announcing the release of the 3.10.26 kernel.
All users of the 3.10 kernel series must upgrade.
The updated 3.10.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-3.10.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/kernel-parameters.txt | 4 Makefile | 2 arch/arm/include/asm/arch_timer.h | 9 - arch/arm/kernel/hyp-stub.S | 2 arch/arm/kvm/interrupts_head.S | 4 arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c | 4 arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 6 arch/arm64/boot/dts/foundation-v8.dts | 2 arch/arm64/include/asm/arch_timer.h | 10 - arch/arm64/include/asm/pgtable.h | 2 arch/arm64/include/asm/spinlock.h | 3 arch/arm64/include/asm/syscall.h | 6 arch/arm64/include/asm/thread_info.h | 4 arch/arm64/include/asm/virt.h | 13 + arch/arm64/kernel/entry.S | 2 arch/arm64/kernel/fpsimd.c | 2 arch/arm64/kernel/ptrace.c | 38 ++--- arch/arm64/kernel/smp.c | 15 + arch/arm64/mm/flush.c | 30 --- arch/arm64/mm/mmu.c | 1 arch/arm64/mm/proc.S | 4 arch/powerpc/include/asm/exception-64s.h | 2 arch/powerpc/kernel/head_64.S | 1 arch/powerpc/kvm/book3s_64_mmu_hv.c | 6 arch/powerpc/kvm/book3s_hv_rm_mmu.c | 4 arch/sh/kernel/sh_ksyms_32.c | 5 arch/sh/lib/Makefile | 2 arch/sparc/include/asm/pgtable_64.h | 4 arch/x86/include/asm/pgtable.h | 11 + arch/x86/include/asm/spinlock.h | 4 arch/x86/kernel/cpu/intel.c | 3 arch/x86/kvm/lapic.c | 8 - drivers/ata/libata-core.c | 7 drivers/ata/libata-scsi.c | 21 ++ drivers/block/rbd.c | 158 +++++++++++++-------- drivers/clocksource/arm_arch_timer.c | 23 --- drivers/clocksource/dw_apb_timer_of.c | 2 drivers/cpufreq/intel_pstate.c | 5 drivers/dma/Kconfig | 1 drivers/firewire/sbp2.c | 1 drivers/gpio/gpio-msm-v2.c | 4 drivers/gpio/gpio-twl4030.c | 15 + drivers/gpu/drm/drm_edid.c | 8 + drivers/gpu/drm/i915/i915_dma.c | 10 + drivers/gpu/drm/i915/i915_gem_context.c | 2 drivers/gpu/drm/i915/intel_display.c | 7 drivers/gpu/drm/radeon/atombios_crtc.c | 4 drivers/gpu/drm/radeon/ni.c | 20 ++ drivers/gpu/drm/radeon/radeon_uvd.c | 2 drivers/gpu/drm/radeon/rs690.c | 10 + drivers/idle/intel_idle.c | 3 drivers/iio/adc/ad7887.c | 16 +- drivers/iio/imu/adis16400_core.c | 7 drivers/infiniband/ulp/isert/ib_isert.c | 16 +- drivers/input/input.c | 4 drivers/net/can/usb/peak_usb/pcan_usb_pro.c | 3 drivers/net/ethernet/broadcom/tg3.c | 2 drivers/net/usb/dm9601.c | 34 +++- drivers/net/wireless/ath/ath9k/ar9002_mac.c | 52 +++++- drivers/net/wireless/ath/ath9k/htc_drv_main.c | 25 ++- drivers/net/wireless/ath/ath9k/main.c | 5 drivers/net/wireless/rtlwifi/pci.c | 4 drivers/of/address.c | 8 - drivers/s390/char/tty3270.c | 2 drivers/staging/comedi/drivers/8255_pci.c | 15 + drivers/target/iscsi/iscsi_target.c | 26 +-- drivers/target/target_core_device.c | 5 drivers/target/target_core_file.c | 8 - drivers/target/target_core_file.h | 5 drivers/tty/serial/8250/8250_dw.c | 2 drivers/tty/serial/pmac_zilog.c | 3 drivers/usb/class/cdc-wdm.c | 8 - drivers/usb/serial/generic.c | 9 - drivers/usb/serial/option.c | 2 drivers/usb/serial/zte_ev.c | 3 fs/ceph/addr.c | 8 - fs/ceph/file.c | 47 ++---- fs/ceph/ioctl.c | 8 - fs/ceph/mds_client.c | 15 + fs/ceph/mdsmap.c | 4 fs/ceph/super.c | 2 fs/ext4/ext4.h | 10 + fs/ext4/ext4_jbd2.c | 9 + fs/ext4/extents.c | 43 +++-- fs/ext4/inode.c | 12 - fs/ext4/mballoc.c | 21 +- fs/ext4/super.c | 17 +- fs/gfs2/aops.c | 30 +++ fs/gfs2/ops_fstype.c | 12 + fs/jbd2/transaction.c | 6 include/asm-generic/pgtable.h | 2 include/clocksource/arm_arch_timer.h | 2 include/drm/drm_pciids.h | 2 include/linux/auxvec.h | 2 include/linux/ceph/osd_client.h | 3 include/linux/libata.h | 1 include/linux/mm_types.h | 49 ++++++ include/linux/spinlock.h | 14 + include/target/target_core_base.h | 1 kernel/fork.c | 1 kernel/freezer.c | 6 kernel/sched/core.c | 14 + kernel/sched/fair.c | 7 kernel/sched/rt.c | 14 + kernel/trace/ftrace.c | 2 mm/compaction.c | 4 mm/fremap.c | 8 - mm/huge_memory.c | 14 + mm/memcontrol.c | 2 mm/memory-failure.c | 10 + mm/migrate.c | 4 mm/mprotect.c | 2 mm/pgtable-generic.c | 8 - mm/rmap.c | 4 net/ceph/osd_client.c | 82 ++++++---- net/wireless/radiotap.c | 4 security/selinux/hooks.c | 53 +++++-- security/selinux/include/xfrm.h | 9 - security/selinux/xfrm.c | 53 +++++-- sound/core/pcm_lib.c | 2 sound/pci/hda/hda_intel.c | 4 sound/soc/codecs/wm5110.c | 2 sound/soc/codecs/wm8904.c | 2 sound/soc/codecs/wm_adsp.c | 10 - sound/soc/tegra/tegra20_i2s.c | 6 sound/soc/tegra/tegra20_spdif.c | 10 - sound/soc/tegra/tegra30_i2s.c | 6 tools/power/cpupower/utils/cpupower-set.c | 6 128 files changed, 995 insertions(+), 454 deletions(-)
AKASHI Takahiro (1):
arm64: check for number of arguments in syscall_get/set_arguments()
Alex Deucher (4):
drm/radeon: Fix sideport problems on certain RS690 boards drm/radeon: add missing display tiling setup for oland drm/radeon: fix asic gfx values for scrapper asics drm/radeon: 0x9649 is SUMO2 not SUMO
Alex Elder (4):
libceph: add lingering request reference when registered
rbd: flush dcache after zeroing page data
rbd: set removing flag while holding list lock
rbd: protect against concurrent unmaps
Anton Blanchard (1):
powerpc: Align p_end
Ard Biesheuvel (1):
auxvec.h: account for AT_HWCAP2 in AT_VECTOR_SIZE_BASE
Bjørn Mork (1):
usb: cdc-wdm: manage_power should always set needs_remote_wakeup
Bo Shen (1):
ASoC: wm8904: fix DSP mode B configuration
Catalin Marinas (7):
arm64: spinlock: retry trylock operation if strex fails on free lock
arm64: Only enable local interrupts after the CPU is marked online
arm64: dts: Reserve the memory used for secondary CPU release address
arm64: Remove unused cpu_name ascii in arch/arm64/mm/proc.S
arm64: Avoid cache flushing in flush_dcache_page()
arm64: Do not flush the D-cache for anonymous pages
arm64: Use Normal NonCacheable memory for writecombine
Chad Hanson (1):
selinux: fix broken peer recv check
Charles Keepax (2):
ASoC: wm_adsp: Add small delay while polling DSP RAM start
ASoC: wm5110: Correct HPOUT3 DAPM route typo
Chris Wilson (2):
drm/i915: Hold mutex across i915_gem_release drm/i915: Use the correct GMCH_CTRL register for Sandybridge+
Christian König (1):
drm/radeon: fix UVD 256MB check
Dan Carpenter (4):
ceph: cleanup types in striped_read()
libceph: fix error handling in handle_reply()
libceph: potential NULL dereference in ceph_osdc_handle_map()
libceph: create_singlethread_workqueue() doesn't return ERR_PTRs
Dan Williams (1):
net_dma: mark broken
Daniel Vetter (1):
drm/i915: don't update the dri1 breadcrumb with modesetting
David Henningsson (1):
ALSA: hda - Add enable_msi=0 workaround for four HP machines
Dinh Nguyen (1):
clocksource: dw_apb_timer_of: Fix read_sched_clock
Dmitry Kunilov (1):
usb: serial: zte_ev: move support for ZTE AC2726 from zte_ev back to option
Dmitry Torokhov (1):
Input: allocate absinfo data when setting ABS capability
Emil Goode (1):
ceph: improve error handling in ceph_mdsmap_decode
Eric Whitney (1):
ext4: fix bigalloc regression
Eryu Guan (1):
ext4: check for overlapping extents in ext4_valid_extent_entries()
Feng Kan (1):
arm64: Change kernel stack size to 16K
Geert Uytterhoeven (2):
TTY: pmac_zilog, check existence of ports in pmz_console_init()
sh: always link in helper functions extracted from libgcc
Greg Kroah-Hartman (1):
Linux 3.10.26
Ian Abbott (1):
staging: comedi: 8255_pci: fix for newer PCI-DIO48H
Jan Kara (2):
ext4: Do not reserve clusters when fs doesn't support extents
ext4: fix deadlock when writing in ENOSPC conditions
Jan Kiszka (1):
KVM: x86: Fix APIC map calculation after re-enabling
Jiang Liu (1):
arm64: fix possible invalid FPSIMD initialization state
Jianguo Wu (1):
mm/hugetlb: check for pte NULL pointer in __page_check_address()
Johan Hovold (1):
USB: serial: fix race in generic write
Johannes Berg (1):
radiotap: fix bitmap-end-finding buffer overrun
Jonathan Cameron (2):
iio:imu:adis16400 fix pressure channel scan type iio:adc:ad7887 Fix channel reported endianness from cpu to big endian
JongHo Kim (1):
ALSA: Add SNDRV_PCM_STATE_PAUSED case in wait_for_avail function
Joonsoo Kim (1):
mm/compaction: respect ignore_skip_hint in update_pageblock_skip
Josh Boyer (1):
cpupower: Fix segfault due to incorrect getopt_long arugments
Josh Durgin (8):
rbd: fix buffer size for writes to images with snapshots
rbd: fix null dereference in dout
libceph: add function to ensure notifies are complete
rbd: complete notifies before cleaning up osd_client and rbd_dev
rbd: make rbd_obj_notify_ack() synchronous
rbd: fix use-after free of rbd_dev->disk
rbd: ignore unmapped snapshots that no longer exist
rbd: fix error handling from rbd_snap_name()
Junho Ryu (1):
ext4: fix use-after-free in ext4_mb_new_blocks
Kirill Tkhai (1):
sched/rt: Fix rq's cpupri leak while enqueue/dequeue child RT entities
Larry Finger (1):
rtlwifi: pci: Fix oops on driver unload
Len Brown (1):
x86 idle: Repair large-server 50-watt idle-power regression
Li Wang (1):
ceph: Avoid data inconsistency due to d-cache aliasing in readpage()
Lukas Czerner (1):
ext4: fix FITRIM in no journal mode
Marc Kleine-Budde (1):
can: peak_usb: fix mem leak in pcan_usb_pro_init()
Marc Zyngier (1):
ARM: hyp: initialize CNTVOFF to zero
Mark Rutland (3):
arm64: virt: ensure visibility of __boot_cpu_mode
clocksource: arch_timer: use virtual counters
ARM: KVM: arch_timers: zero CNTVOFF upon return to host
Martin Schwidefsky (1):
s390/3270: fix allocation of tty3270_screen structure
Mathy Vanhoef (1):
ath9k_htc: properly set MAC address and BSSID mask
Mel Gorman (5):
sched: numa: skip inaccessible VMAs
mm: clear pmd_numa before invalidating
mm: numa: ensure anon_vma is locked to prevent parallel THP splits
mm: numa: avoid unnecessary work on the failure path
mm: numa: guarantee that tlb_flush_pending updates are visible before page table updates
Miao Xie (1):
ftrace: Initialize the ftrace profiler for each possible cpu
Michael Neuling (1):
powerpc: Fix bad stack check in exception entry
Michele Baldessari (1):
libata: add ATA_HORKAGE_BROKEN_FPDMA_AA quirk for Seagate Momentus SpinPoint M8
Mika Westerberg (1):
serial: 8250_dw: add new ACPI IDs
Naoya Horiguchi (1):
mm/memory-failure.c: transfer page count from head page to tail page after split thp
Nathaniel Yazdani (1):
ceph: fix null pointer dereference
Nicholas Bellinger (2):
iscsi-target: Fix-up all zero data-length CDBs with R/W_BIT set target/file: Update hw_max_sectors based on current block_size
Nithin Sujir (1):
tg3: Expand 4g_overflow_test workaround to skb fragments of any size.
Nobuhiro Iwamatsu (1):
sh: add EXPORT_SYMBOL(min_low_pfn) and EXPORT_SYMBOL(max_low_pfn) to sh_ksyms_32.c
Oleg Nesterov (2):
selinux: selinux_setprocattr()->ptrace_parent() needs rcu_read_lock()
sched: fix the theoretical signal_wake_up() vs schedule() race
Paul Moore (2):
selinux: look for IPsec labels on both inbound and outbound packets
selinux: process labeled IPsec TCP SYN-ACK packets properly in selinux_ip_postroute()
Peter Korsgaard (2):
dm9601: fix reception of full size ethernet frames on dm9620/dm9621a
dm9601: work around tx fifo sync issue on dm962x
Rafael J. Wysocki (1):
intel_pstate: Fail initialization if P-state information is missing
Rafał Miłecki (1):
drm/edid: add quirk for BPC in Samsung NP700G7A-S01PL notebook
Rik van Riel (2):
mm: fix TLB flush race between migration, and change_protection_range
mm: fix use-after-free in sys_remap_file_pages
Rob Herring (1):
Revert "of/address: Handle #address-cells > 2 specially"
Robin H. Johnson (1):
libata: disable a disk via libata.force params
Roger Quadros (1):
gpio: twl4030: Fix regression for twl gpio LED output
Sage Weil (1):
rbd: fix a couple warnings
Sasha Levin (1):
ceph: avoid accessing invalid memory
Stefan Richter (1):
firewire: sbp2: bring back WRITE SAME support
Stephen Boyd (1):
gpio: msm: Fix irq mask/unmask by writing bits instead of numbers
Stephen Warren (1):
ASoC: tegra: fix uninitialized variables in set_fmt
Steven Whitehouse (2):
GFS2: don't hold s_umount over blkdev_put
GFS2: Fix incorrect invalidation for DIO/buffered I/O
Sujith Manoharan (1):
ath9k: Fix interrupt handling for the AR9002 family
Suman Anna (1):
ARM: OMAP2+: hwmod_data: fix missing OMAP_INTC_START in irq data
Tejun Heo (1):
libata, freezer: avoid block device removal while system is frozen
Theodore Ts'o (3):
ext4: call ext4_error_inode() if jbd2_journal_dirty_metadata() fails
ext4: add explicit casts when masking cluster sizes
jbd2: don't BUG but return ENOSPC if a handle runs out of space
Ville Syrjälä (1):
drm/i915: Take modeset locks around intel_modeset_setup_hw_state()
Vincent Pelletier (1):
libata: Add atapi_dmadir force flag
Vladimir Davydov (1):
memcg: fix memcg_size() calculation
Wei Yongjun (1):
iser-target: fix error return code in isert_create_device_ib_res()
Will Deacon (1):
arm64: ptrace: avoid using HW_BREAKPOINT_EMPTY for disabled events
Yan, Zheng (5):
ceph: cleanup aborted requests when re-sending requests.
ceph: wake up 'safe' waiters when unregistering request
libceph: fix safe completion
libceph: fix truncate size calculation
libceph: call r_unsafe_callback when unsafe reply is received
majianpeng (4):
ceph: Free mdsc if alloc mdsc->mdsmap failed.
ceph: Add check returned value on func ceph_calc_ceph_pg.
ceph: fix bugs about handling short-read for sync read mode.
ceph: allow sync_read/write return partial successed size of read/write.
pingfan liu (1):
powerpc: kvm: fix rare but potential deadlock scene
Greg KH
maintainerDocumentation/kernel-parameters.txt +4 -0
@@ -1456,6 +1456,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted. * dump_id: dump IDENTIFY data. + * atapi_dmadir: Enable ATAPI DMADIR bridge support + + * disable: Disable this device. + If there are multiple matching configurations changing the same attribute, the last one is used.
Makefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 3 PATCHLEVEL = 10 -SUBLEVEL = 25 +SUBLEVEL = 26 EXTRAVERSION = NAME = TOSSUG Baby Fish
arch/arm/include/asm/arch_timer.h +0 -9
@@ -80,15 +80,6 @@ static inline u32 arch_timer_get_cntfrq(void)return val; } -static inline u64 arch_counter_get_cntpct (void ) -{ -u64 cval; - -isb (); - asmvolatile ("mrrc p15, 0, %Q0, %R0, c14" :"=r" (cval)); -return cval; -} -static inline u64 arch_counter_get_cntvct (void ) {u64 cval;
arch/arm/kernel/hyp-stub.S +2 -0
@@ -153,6 +153,8 @@ THUMB( orr r7, #(1 << 30) ) @ HSCTLR.TE mrc p15, 4, r7, c14, c1, 0 @ CNTHCTL orr r7, r7, #3 @ PL1PCEN | PL1PCTEN mcr p15, 4, r7, c14, c1, 0 @ CNTHCTL + mov r7, #0 + mcrr p15, 4, r7, r7, c14 @ CNTVOFF 1: #endif
arch/arm/kvm/interrupts_head.S +4 -0
@@ -503,6 +503,10 @@ vcpu .req r0 @ vcpu pointer always in r0 add r5, vcpu, r4 strd r2, r3, [r5] + @ Ensure host CNTVCT == CNTPCT + mov r2, #0 + mcrr p15, 4, r2, r2, c14 @ CNTVOFF + 1: #endif @ Allow physical timer/counter access for the host
arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c +2 -2
@@ -796,7 +796,7 @@ struct omap_hwmod omap2xxx_counter_32k_hwmod = {/* gpmc */ static struct omap_hwmod_irq_info omap2xxx_gpmc_irqs[] = { - { .irq =20 }, + { .irq =20 +OMAP_INTC_START , }, { .irq =-1 } };
@@ -841,7 +841,7 @@ static struct omap_hwmod_class omap2_rng_hwmod_class = { };static struct omap_hwmod_irq_info omap2_rng_mpu_irqs[] = { - { .irq =52 }, + { .irq =52 +OMAP_INTC_START , }, { .irq =-1 } };
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c +3 -3
@@ -2152,7 +2152,7 @@ static struct omap_hwmod_class omap3xxx_gpmc_hwmod_class = { };static struct omap_hwmod_irq_info omap3xxx_gpmc_irqs[] = { - { .irq =20 }, + { .irq =20 +OMAP_INTC_START , }, { .irq =-1 } };
@@ -2986,7 +2986,7 @@ static struct omap_mmu_dev_attr mmu_isp_dev_attr = {static struct omap_hwmod omap3xxx_mmu_isp_hwmod;static struct omap_hwmod_irq_info omap3xxx_mmu_isp_irqs[] = { - { .irq =24 }, + { .irq =24 +OMAP_INTC_START , }, { .irq =-1 } };
@@ -3028,7 +3028,7 @@ static struct omap_mmu_dev_attr mmu_iva_dev_attr = {static struct omap_hwmod omap3xxx_mmu_iva_hwmod;static struct omap_hwmod_irq_info omap3xxx_mmu_iva_irqs[] = { - { .irq =28 }, + { .irq =28 +OMAP_INTC_START , }, { .irq =-1 } };
arch/arm64/boot/dts/foundation-v8.dts +2 -0
@@ -6,6 +6,8 @@ /dts-v1/; +/memreserve/ 0x80000000 0x00010000; + / { model = "Foundation-v8A"; compatible = "arm,foundation-aarch64", "arm,vexpress";
arch/arm64/include/asm/arch_timer.h +0 -10
@@ -110,16 +110,6 @@ static inline void __cpuinit arch_counter_set_user_access(void) asmvolatile ("msr cntkctl_el1, %0" : :"r" (cntkctl)); } -static inline u64 arch_counter_get_cntpct (void ) -{ -u64 cval; - -isb (); - asmvolatile ("mrs %0, cntpct_el0" :"=r" (cval)); - -return cval; -} -static inline u64 arch_counter_get_cntvct (void ) {u64 cval;
arch/arm64/include/asm/pgtable.h +1 -1
@@ -184,7 +184,7 @@ static inline void set_pte_at(struct mm_struct *mm, unsigned long addr,#define pgprot_noncached (prot) \ __pgprot_modify(prot, PTE_ATTRINDX_MASK, PTE_ATTRINDX(MT_DEVICE_nGnRnE))#define pgprot_writecombine (prot) \ - __pgprot_modify(prot, PTE_ATTRINDX_MASK, PTE_ATTRINDX(MT_DEVICE_GRE)) + __pgprot_modify(prot, PTE_ATTRINDX_MASK, PTE_ATTRINDX(MT_NORMAL_NC))#define pgprot_dmacoherent (prot) \ __pgprot_modify(prot, PTE_ATTRINDX_MASK, PTE_ATTRINDX(MT_NORMAL_NC))#define __HAVE_PHYS_MEM_ACCESS_PROT
arch/arm64/include/asm/spinlock.h +2 -1
@@ -59,9 +59,10 @@ static inline int arch_spin_trylock(arch_spinlock_t *lock)unsigned int tmp; asmvolatile ( -" ldaxr %w0, %1\n" +"2: ldaxr %w0, %1\n" " cbnz %w0, 1f\n" " stxr %w0, %w2, %1\n" +" cbnz %w0, 2b\n" "1:\n" :"=&r" (tmp),"+Q" (lock->lock) : "r" (1)
arch/arm64/include/asm/syscall.h +6 -0
@@ -59,6 +59,9 @@ static inline void syscall_get_arguments(struct task_struct *task, unsigned int i, unsigned int n, unsigned long *args) { + if (n == 0) + return; +if (i + n >SYSCALL_MAX_ARGS ) {unsigned long *args_bad = args +SYSCALL_MAX_ARGS - i;unsigned int n_bad = n + i -SYSCALL_MAX_ARGS ;
@@ -82,6 +85,9 @@ static inline void syscall_set_arguments(struct task_struct *task, unsigned int i, unsigned int n, const unsigned long *args) { + if (n == 0) + return; +if (i + n >SYSCALL_MAX_ARGS ) {pr_warning ("%s called with max args %d, handling only %d\n" , __func__, i + n,SYSCALL_MAX_ARGS );
arch/arm64/include/asm/thread_info.h +2 -2
@@ -24,10 +24,10 @@#include <linux/compiler.h> #ifndef CONFIG_ARM64_64K_PAGES -#define THREAD_SIZE_ORDER 1 +#define THREAD_SIZE_ORDER 2#endif -#define THREAD_SIZE 8192 +#define THREAD_SIZE 16384#define THREAD_START_SP (THREAD_SIZE - 16)#ifndef __ASSEMBLY__
arch/arm64/include/asm/virt.h +13 -0
@@ -21,6 +21,7 @@#define BOOT_CPU_MODE_EL2 (0x0e12b007)#ifndef __ASSEMBLY__ +#include <asm/cacheflush.h> /* * __boot_cpu_mode records what mode CPUs were booted in.
@@ -36,9 +37,20 @@ extern u32 __boot_cpu_mode[2];void __hyp_set_vectors (phys_addr_t phys_vector_base);phys_addr_t __hyp_get_vectors (void ); +static inline void sync_boot_mode (void ) +{ +/* +* As secondaries write to __boot_cpu_mode with caches disabled, we +* must flush the corresponding cache entries to ensure the visibility +* of their writes. +*/ +__flush_dcache_area (__boot_cpu_mode,sizeof (__boot_cpu_mode)); +} +/* Reports the availability of HYP mode */ static inline bool is_hyp_mode_available (void ) { +sync_boot_mode ();return (__boot_cpu_mode[0 ] ==BOOT_CPU_MODE_EL2 && __boot_cpu_mode[1 ] ==BOOT_CPU_MODE_EL2 ); }
@@ -46,6 +58,7 @@ static inline bool is_hyp_mode_available(void)/* Check if the bootloader has booted CPUs in different modes */ static inline bool is_hyp_mode_mismatched (void ) { +sync_boot_mode ();return __boot_cpu_mode[0 ] != __boot_cpu_mode[1 ]; }
arch/arm64/kernel/entry.S +1 -1
@@ -121,7 +121,7 @@ .macro get_thread_info, rd mov \rd, sp - and \rd, \rd, #~((1 << 13) - 1) // top of 8K stack + and \rd, \rd, #~(THREAD_SIZE - 1) // top of stack .endm /*
arch/arm64/kernel/fpsimd.c +2 -0
@@ -79,8 +79,10 @@ void fpsimd_thread_switch(struct task_struct *next)void fpsimd_flush_thread (void ) { +preempt_disable ();memset (¤t->thread.fpsimd_state,0 ,sizeof (struct fpsimd_state ));fpsimd_load_state (¤t->thread.fpsimd_state); +preempt_enable (); }/*
arch/arm64/kernel/ptrace.c +18 -20
@@ -236,31 +236,29 @@ static int ptrace_hbp_fill_attr_ctrl(unsigned int note_type, {int err, len, type, disabled = !ctrl.enabled; -if (disabled) { - len =0 ; - type =HW_BREAKPOINT_EMPTY ; - }else { - err =arch_bp_generic_fields (ctrl, &len, &type); -if (err) -return err; - -switch (note_type) { -case NT_ARM_HW_BREAK : -if ((type &HW_BREAKPOINT_X ) != type) -return -EINVAL ; -break ; -case NT_ARM_HW_WATCH : -if ((type &HW_BREAKPOINT_RW ) != type) -return -EINVAL ; -break ; -default : + attr->disabled = disabled; +if (disabled) +return 0 ; + + err =arch_bp_generic_fields (ctrl, &len, &type); +if (err) +return err; + +switch (note_type) { +case NT_ARM_HW_BREAK : +if ((type &HW_BREAKPOINT_X ) != type)return -EINVAL ; - } +break ; +case NT_ARM_HW_WATCH : +if ((type &HW_BREAKPOINT_RW ) != type) +return -EINVAL ; +break ; +default : +return -EINVAL ; } attr->bp_len = len; attr->bp_type = type; - attr->disabled = disabled;return 0 ; }
arch/arm64/kernel/smp.c +8 -7
@@ -200,13 +200,6 @@ asmlinkage void __cpuinit secondary_start_kernel(void)raw_spin_unlock (&boot_lock);/* -* Enable local interrupts. -*/ -notify_cpu_starting (cpu); -local_irq_enable (); -local_fiq_enable (); - -/* * OK, now it's safe to let the boot CPU continue. Wait for * the CPU migration code to notice that the CPU is online * before we continue.
@@ -215,6 +208,14 @@ asmlinkage void __cpuinit secondary_start_kernel(void)complete (&cpu_running);/* +* Enable GIC and timers. +*/ +notify_cpu_starting (cpu); + +local_irq_enable (); +local_fiq_enable (); + +/* * OK, it's off to the idle thread for us */ cpu_startup_entry (CPUHP_ONLINE );
arch/arm64/mm/flush.c +7 -23
@@ -77,14 +77,12 @@ void __flush_dcache_page(struct page *page)void __sync_icache_dcache (pte_t pte,unsigned long addr) { -unsigned long pfn; -struct page *page; +struct page *page =pte_page (pte); - pfn =pte_pfn (pte); -if (!pfn_valid (pfn)) +/* no flushing needed for anonymous pages */ +if (!page_mapping (page))return ; - page =pfn_to_page (pfn);if (!test_and_set_bit (PG_dcache_clean, &page->flags)) {__flush_dcache_page (page);__flush_icache_all ();
@@ -94,28 +92,14 @@ void __sync_icache_dcache(pte_t pte, unsigned long addr) }/* -* Ensure cache coherency between kernel mapping and userspace mapping of this -* page. +* This function is called when a page has been modified by the kernel. Mark +* it as dirty for later flushing when mapped in user space (if executable, +* see __sync_icache_dcache). */ void flush_dcache_page (struct page *page) { -struct address_space *mapping; - -/* -* The zero page is never written to, so never has any dirty cache -* lines, and therefore never needs to be flushed. -*/ -if (page ==ZERO_PAGE (0 )) -return ; - - mapping =page_mapping (page); -if (mapping &&mapping_mapped (mapping)) { -__flush_dcache_page (page); -__flush_icache_all (); -set_bit (PG_dcache_clean, &page->flags); - }else { +if (test_bit (PG_dcache_clean, &page->flags))clear_bit (PG_dcache_clean, &page->flags); - } }EXPORT_SYMBOL (flush_dcache_page);
arch/arm64/mm/mmu.c +0 -1
@@ -339,7 +339,6 @@ void __init paging_init(void)bootmem_init (); empty_zero_page =virt_to_page (zero_page); -__flush_dcache_page (empty_zero_page);/* * TTBR0 is only used for the identity mapping at this stage. Make it
arch/arm64/mm/proc.S +0 -4
@@ -95,10 +95,6 @@ ENTRY(cpu_do_switch_mm) ret ENDPROC(cpu_do_switch_mm) -cpu_name: - .ascii "AArch64 Processor" - .align - .section ".text.init", #alloc, #execinstr /*
arch/powerpc/include/asm/exception-64s.h +1 -1
@@ -264,7 +264,7 @@ do_kvm_##n: \subi r1,r1,INT_FRAME_SIZE ;/* alloc frame on kernel stack */ \ beq-1f ; \ld r1,PACAKSAVE (r13 );/* kernel stack to use */ \ -1: cmpdi cr1,r1,0; /* check if r1 is in userspace */ \ +1: cmpdi cr1,r1,-INT_FRAME_SIZE; /* check if r1 is in userspace */ \ blt+ cr1,3f ;/* abort if it is */ \li r1,(n);/* will be reloaded later */ \sth r1,PACA_TRAP_SAVE (r13 ); \
arch/powerpc/kernel/head_64.S +1 -0
@@ -467,6 +467,7 @@ _STATIC(__after_prom_start) mtctr r8 bctr +.balign 8 p_end: .llong _end - _stext 4: /* Now copy the rest of the kernel up to _end */
arch/powerpc/kvm/book3s_64_mmu_hv.c +5 -1
@@ -473,11 +473,14 @@ static int kvmppc_mmu_book3s_64_hv_xlate(struct kvm_vcpu *vcpu, gva_t eaddr, slb_v = vcpu->kvm->arch.vrma_slb_v; } +preempt_disable ();/* Find the HPTE in the hash table */ index =kvmppc_hv_find_lock_hpte (kvm, eaddr, slb_v,HPTE_V_VALID |HPTE_V_ABSENT ); -if (index <0 ) +if (index <0 ) { +preempt_enable ();return -ENOENT ; + } hptep = (unsigned long *)(kvm->arch.hpt_virt + (index <<4 )); v = hptep[0 ] & ~HPTE_V_HVLOCK ; gr = kvm->arch.revmap[index].guest_rpte;
@@ -485,6 +488,7 @@ static int kvmppc_mmu_book3s_64_hv_xlate(struct kvm_vcpu *vcpu, gva_t eaddr,/* Unlock the HPTE */ asmvolatile ("lwsync" : : :"memory" ); hptep[0 ] = v; +preempt_enable (); gpte->eaddr = eaddr; gpte->vpage = ((v &HPTE_V_AVPN ) <<4 ) | ((eaddr >>12 ) &0xfff );
arch/powerpc/kvm/book3s_hv_rm_mmu.c +4 -0
@@ -724,6 +724,10 @@ static int slb_base_page_shift[4] = { 20, /* 1M, unsupported */ }; +/* When called from virtmode, this func should be protected by +* preempt_disable(), otherwise, the holding of HPTE_V_HVLOCK +* can trigger deadlock issue. +*/ long kvmppc_hv_find_lock_hpte (struct kvm *kvm,gva_t eaddr,unsigned long slb_v,unsigned long valid) {
arch/sh/kernel/sh_ksyms_32.c +5 -0
@@ -20,6 +20,11 @@ EXPORT_SYMBOL(csum_partial_copy_generic);EXPORT_SYMBOL (copy_page);EXPORT_SYMBOL (__clear_user);EXPORT_SYMBOL (empty_zero_page); +#ifdef CONFIG_FLATMEM +/* need in pfn_valid macro */ +EXPORT_SYMBOL (min_low_pfn); +EXPORT_SYMBOL (max_low_pfn); +#endif #define DECLARE_EXPORT (name) \ extern void name(void);EXPORT_SYMBOL(name)
arch/sh/lib/Makefile +1 -1
@@ -6,7 +6,7 @@ lib-y = delay.o memmove.o memchr.o \ checksum.o strlen.o div64.o div64-generic.o # Extracted from libgcc -lib-y += movmem.o ashldi3.o ashrdi3.o lshrdi3.o \ +obj-y += movmem.o ashldi3.o ashrdi3.o lshrdi3.o \ ashlsi3.o ashrsi3.o ashiftrt.o lshrsi3.o \ udiv_qrnnd.o
arch/sparc/include/asm/pgtable_64.h +2 -2
@@ -616,7 +616,7 @@ static inline unsigned long pte_present(pte_t pte) }#define pte_accessible pte_accessible -static inline unsigned long pte_accessible (pte_t a) +static inline unsigned long pte_accessible (struct mm_struct *mm,pte_t a) {return pte_val (a) & _PAGE_VALID; }
@@ -806,7 +806,7 @@ static inline void __set_pte_at(struct mm_struct *mm, unsigned long addr,* SUN4V NOTE: _PAGE_VALID is the same value in both the SUN4U * and SUN4V pte layout, so this inline test is fine. */ -if (likely (mm != &init_mm) &&pte_accessible (orig)) +if (likely (mm != &init_mm) &&pte_accessible (mm, orig))tlb_batch_add (mm, addr, ptep, orig, fullmm); }
arch/x86/include/asm/pgtable.h +9 -2
@@ -415,9 +415,16 @@ static inline int pte_present(pte_t a) }#define pte_accessible pte_accessible -static inline int pte_accessible (pte_t a) +static inline bool pte_accessible (struct mm_struct *mm,pte_t a) { -return pte_flags (a) & _PAGE_PRESENT; +if (pte_flags (a) & _PAGE_PRESENT) +return true; + +if ((pte_flags (a) & (_PAGE_PROTNONE | _PAGE_NUMA)) && +mm_tlb_flush_pending (mm)) +return true; + +return false; }static inline int pte_hidden (pte_t pte)
arch/x86/include/asm/spinlock.h +0 -4
@@ -233,8 +233,4 @@ static inline void arch_write_unlock(arch_rwlock_t *rw)#define arch_read_relax (lock) cpu_relax()#define arch_write_relax (lock) cpu_relax() -/* The {read|write|spin}_lock() on x86 are full memory barriers. */ -static inline void smp_mb__after_lock (void ) { } -#define ARCH_HAS_SMP_MB_AFTER_LOCK -#endif /* _ASM_X86_SPINLOCK_H */
arch/x86/kernel/cpu/intel.c +2 -1
@@ -387,7 +387,8 @@ static void __cpuinit init_intel(struct cpuinfo_x86 *c)set_cpu_cap (c,X86_FEATURE_PEBS ); } -if (c->x86 ==6 && c->x86_model ==29 && cpu_has_clflush) +if (c->x86 ==6 && cpu_has_clflush && + (c->x86_model ==29 || c->x86_model ==46 || c->x86_model ==47 ))set_cpu_cap (c,X86_FEATURE_CLFLUSH_MONITOR );#ifdef CONFIG_X86_64
arch/x86/kvm/lapic.c +4 -4
@@ -1364,6 +1364,10 @@ void kvm_lapic_set_base(struct kvm_vcpu *vcpu, u64 value)return ; } +if (!kvm_vcpu_is_bsp (apic->vcpu)) + value &= ~MSR_IA32_APICBASE_BSP ; + vcpu->arch.apic_base = value; +/* update jump label if enable bit changes */ if ((vcpu->arch.apic_base ^ value) &MSR_IA32_APICBASE_ENABLE ) {if (value &MSR_IA32_APICBASE_ENABLE )
@@ -1373,10 +1377,6 @@ void kvm_lapic_set_base(struct kvm_vcpu *vcpu, u64 value)recalculate_apic_map (vcpu->kvm); } -if (!kvm_vcpu_is_bsp (apic->vcpu)) - value &= ~MSR_IA32_APICBASE_BSP ; - - vcpu->arch.apic_base = value;if ((old_value ^ value) &X2APIC_ENABLE ) {if (value &X2APIC_ENABLE ) {u32 id =kvm_apic_id (apic);
drivers/ata/libata-core.c +6 -1
@@ -2401,7 +2401,7 @@ int ata_dev_configure(struct ata_device *dev) cdb_intr_string =", CDB intr" ; } -if (atapi_dmadir ||atapi_id_dmadir (dev->id)) { +if (atapi_dmadir || (dev->horkage &ATA_HORKAGE_ATAPI_DMADIR ) ||atapi_id_dmadir (dev->id)) { dev->flags |=ATA_DFLAG_DMADIR ; dma_dir_string =", DMADIR" ; }
@@ -4140,6 +4140,9 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = { {"ST3320[68]13AS" ,"SD1[5-9]" ,ATA_HORKAGE_NONCQ | ATA_HORKAGE_FIRMWARE_WARN }, +/* Seagate Momentus SpinPoint M8 seem to have FPMDA_AA issues */ + { "ST1000LM024 HN-M101MBB", "2AR10001", ATA_HORKAGE_BROKEN_FPDMA_AA }, +/* Blacklist entries taken from Silicon Image 3124/3132 Windows driver .inf file - also several Linux problem reports */ { "HTS541060G9SA00", "MB3OC60D", ATA_HORKAGE_NONCQ, },
@@ -6503,6 +6506,8 @@ static int __init ata_parse_force_one(char **cur, { "nosrst", .lflags = ATA_LFLAG_NO_SRST }, { "norst", .lflags = ATA_LFLAG_NO_HRST | ATA_LFLAG_NO_SRST }, { "rstonce", .lflags = ATA_LFLAG_RST_ONCE }, + { "atapi_dmadir", .horkage_on = ATA_HORKAGE_ATAPI_DMADIR }, + { "disable", .horkage_on = ATA_HORKAGE_DISABLE }, };char *start = *cur, *p = *cur;char *id, *val, *endp;
drivers/ata/libata-scsi.c +21 -0
@@ -3864,6 +3864,27 @@ void ata_scsi_hotplug(struct work_struct *work)return ; } +/* +* XXX - UGLY HACK +* +* The block layer suspend/resume path is fundamentally broken due +* to freezable kthreads and workqueue and may deadlock if a block +* device gets removed while resume is in progress. I don't know +* what the solution is short of removing freezable kthreads and +* workqueues altogether. +* +* The following is an ugly hack to avoid kicking off device +* removal while freezer is active. This is a joke but does avoid +* this particular deadlock scenario. +* +* https://bugzilla.kernel.org/show_bug.cgi?id=62801 +* http://marc.info/?l=linux-kernel&m=138695698516487 +*/ +#ifdef CONFIG_FREEZER +while (pm_freezing) +msleep (10 ); +#endif +DPRINTK ("ENTER\n" );mutex_lock (&ap->scsi_scan_mutex);
drivers/block/rbd.c +98 -60
285 lines not on this page · raw message
drivers/clocksource/arm_arch_timer.c +5 -18
@@ -186,27 +186,19 @@ u32 arch_timer_get_rate(void)return arch_timer_rate; } -/* -* Some external users of arch_timer_read_counter (e.g. sched_clock) may try to -* call it before it has been initialised. Rather than incur a performance -* penalty checking for initialisation, provide a default implementation that -* won't lead to time appearing to jump backwards. -*/ -static u64 arch_timer_read_zero (void ) +u64 arch_timer_read_counter (void ) { -return 0 ; +return arch_counter_get_cntvct (); } -u64 (*arch_timer_read_counter)(void) = arch_timer_read_zero; -static cycle_t arch_counter_read (struct clocksource *cs) { -return arch_timer_read_counter (); +return arch_counter_get_cntvct (); }static cycle_t arch_counter_read_cc (const struct cyclecounter *cc) { -return arch_timer_read_counter (); +return arch_counter_get_cntvct (); }static struct clocksource clocksource_counter = {
@@ -287,7 +279,7 @@ static int __init arch_timer_register(void) cyclecounter.mult = clocksource_counter.mult; cyclecounter.shift = clocksource_counter.shift;timecounter_init (&timecounter, &cyclecounter, -arch_counter_get_cntpct ()); +arch_counter_get_cntvct ());if (arch_timer_use_virtual) { ppi = arch_timer_ppi[VIRT_PPI ];
@@ -376,11 +368,6 @@ static void __init arch_timer_init(struct device_node *np) } } -if (arch_timer_use_virtual) - arch_timer_read_counter = arch_counter_get_cntvct; -else - arch_timer_read_counter = arch_counter_get_cntpct; -arch_timer_register ();arch_timer_arch_init (); }
drivers/clocksource/dw_apb_timer_of.c +1 -1
@@ -77,7 +77,7 @@ static void __iomem *sched_io_base;static u32 read_sched_clock (void ) { -return __raw_readl (sched_io_base); +return ~__raw_readl (sched_io_base); }static const struct of_device_id sptimer_ids[]__initconst = {
drivers/cpufreq/intel_pstate.c +5 -0
@@ -543,6 +543,11 @@ static int intel_pstate_init_cpu(unsigned int cpunum) cpu = all_cpu_data[cpunum];intel_pstate_get_cpu_pstates (cpu); +if (!cpu->pstate.current_pstate) { + all_cpu_data[cpunum] =NULL ; +kfree (cpu); +return -ENODATA ; + } cpu->cpu = cpunum; cpu->pstate_policy =
drivers/dma/Kconfig +1 -0
@@ -333,6 +333,7 @@ config NET_DMA bool "Network: TCP receive copy offload" depends on DMA_ENGINE && NET default (INTEL_IOATDMA || FSL_DMA) + depends on BROKEN help This enables the use of DMA engines in the network stack to offload receive copy-to-user operations, freeing CPU cycles.
drivers/firewire/sbp2.c +0 -1
@@ -1626,7 +1626,6 @@ static struct scsi_host_template scsi_driver_template = { .cmd_per_lun = 1, .can_queue = 1, .sdev_attrs = sbp2_scsi_sysfs_attrs, - .no_write_same = 1, };MODULE_AUTHOR ("Kristian Hoegsberg <[email protected]>" );
drivers/gpio/gpio-msm-v2.c +2 -2
@@ -248,7 +248,7 @@ static void msm_gpio_irq_mask(struct irq_data *d)spin_lock_irqsave (&tlmm_lock, irq_flags);writel (TARGET_PROC_NONE ,GPIO_INTR_CFG_SU (gpio)); -clear_gpio_bits (INTR_RAW_STATUS_EN |INTR_ENABLE ,GPIO_INTR_CFG (gpio)); +clear_gpio_bits (BIT (INTR_RAW_STATUS_EN ) |BIT (INTR_ENABLE ),GPIO_INTR_CFG (gpio));__clear_bit (gpio, msm_gpio.enabled_irqs);spin_unlock_irqrestore (&tlmm_lock, irq_flags); }
@@ -260,7 +260,7 @@ static void msm_gpio_irq_unmask(struct irq_data *d)spin_lock_irqsave (&tlmm_lock, irq_flags);__set_bit (gpio, msm_gpio.enabled_irqs); -set_gpio_bits (INTR_RAW_STATUS_EN |INTR_ENABLE ,GPIO_INTR_CFG (gpio)); +set_gpio_bits (BIT (INTR_RAW_STATUS_EN ) |BIT (INTR_ENABLE ),GPIO_INTR_CFG (gpio));writel (TARGET_PROC_SCORPION ,GPIO_INTR_CFG_SU (gpio));spin_unlock_irqrestore (&tlmm_lock, irq_flags); }
drivers/gpio/gpio-twl4030.c +12 -3
@@ -300,7 +300,7 @@ static int twl_direction_in(struct gpio_chip *chip, unsigned offset)if (offset <TWL4030_GPIO_MAX ) ret =twl4030_set_gpio_direction (offset,1 );else - ret = -EINVAL ; + ret = -EINVAL ;/* LED outputs can't be set as input */ if (!ret) priv->direction &= ~BIT (offset);
@@ -354,11 +354,20 @@ static void twl_set(struct gpio_chip *chip, unsigned offset, int value)static int twl_direction_out (struct gpio_chip *chip,unsigned offset,int value) {struct gpio_twl4030_priv *priv =to_gpio_twl4030 (chip); -int ret = -EINVAL ; +int ret =0 ;mutex_lock (&priv->mutex); -if (offset <TWL4030_GPIO_MAX ) +if (offset <TWL4030_GPIO_MAX ) { ret =twl4030_set_gpio_direction (offset,0 ); +if (ret) { +mutex_unlock (&priv->mutex); +return ret; + } + } + +/* +* LED gpios i.e. offset >= TWL4030_GPIO_MAX are always output +*/ priv->direction |=BIT (offset);mutex_unlock (&priv->mutex);
drivers/gpu/drm/drm_edid.c +8 -0
@@ -68,6 +68,8 @@#define EDID_QUIRK_DETAILED_SYNC_PP (1 << 6)/* Force reduced-blanking timings for detailed modes */ #define EDID_QUIRK_FORCE_REDUCED_BLANKING (1 << 7) +/* Force 8bpc */ +#define EDID_QUIRK_FORCE_8BPC (1 << 8)struct detailed_mode_closure {struct drm_connector *connector;
@@ -128,6 +130,9 @@ static struct edid_quirk {/* Medion MD 30217 PG */ { "MED", 0x7b8, EDID_QUIRK_PREFER_LARGE_75 }, + +/* Panel in Samsung NP700G7A-S01PL notebook reports 6bpc */ + { "SEC", 0xd033, EDID_QUIRK_FORCE_8BPC }, };/*
@@ -2955,6 +2960,9 @@ int drm_add_edid_modes(struct drm_connector *connector, struct edid *edid)drm_add_display_info (edid, &connector->display_info); +if (quirks &EDID_QUIRK_FORCE_8BPC ) + connector->display_info.bpc =8 ; +return num_modes; }EXPORT_SYMBOL (drm_add_edid_modes);
drivers/gpu/drm/i915/i915_dma.c +10 -0
@@ -84,6 +84,14 @@ void i915_update_dri1_breadcrumb(struct drm_device *dev)drm_i915_private_t *dev_priv = dev->dev_private;struct drm_i915_master_private *master_priv; +/* +* The dri breadcrumb update races against the drm master disappearing. +* Instead of trying to fix this (this is by far not the only ums issue) +* just don't do the update in kms mode. +*/ +if (drm_core_check_feature (dev,DRIVER_MODESET )) +return ; +if (dev->primary->master) { master_priv = dev->primary->master->driver_priv;if (master_priv->sarea_priv)
@@ -1847,8 +1855,10 @@ void i915_driver_lastclose(struct drm_device * dev)void i915_driver_preclose (struct drm_device * dev,struct drm_file *file_priv) { +mutex_lock (&dev->struct_mutex);i915_gem_context_close (dev, file_priv);i915_gem_release (dev, file_priv); +mutex_unlock (&dev->struct_mutex); }void i915_driver_postclose (struct drm_device *dev,struct drm_file *file)
drivers/gpu/drm/i915/i915_gem_context.c +0 -2
@@ -291,10 +291,8 @@ void i915_gem_context_close(struct drm_device *dev, struct drm_file *file) {struct drm_i915_file_private *file_priv = file->driver_priv; -mutex_lock (&dev->struct_mutex);idr_for_each (&file_priv->context_idr, context_idr_cleanup,NULL );idr_destroy (&file_priv->context_idr); -mutex_unlock (&dev->struct_mutex); } static struct i915_hw_context *
drivers/gpu/drm/i915/intel_display.c +5 -2
@@ -9456,7 +9456,9 @@ void intel_modeset_gem_init(struct drm_device *dev)intel_setup_overlay (dev); +drm_modeset_lock_all (dev);intel_modeset_setup_hw_state (dev, false); +drm_modeset_unlock_all (dev); }void intel_modeset_cleanup (struct drm_device *dev)
@@ -9530,14 +9532,15 @@ void intel_connector_attach_encoder(struct intel_connector *connector,int intel_modeset_vga_set_state (struct drm_device *dev,bool state) {struct drm_i915_private *dev_priv = dev->dev_private; +unsigned reg =INTEL_INFO (dev)->gen >=6 ?SNB_GMCH_CTRL :INTEL_GMCH_CTRL ;u16 gmch_ctrl; -pci_read_config_word (dev_priv->bridge_dev,INTEL_GMCH_CTRL , &gmch_ctrl); +pci_read_config_word (dev_priv->bridge_dev, reg, &gmch_ctrl);if (state) gmch_ctrl &= ~INTEL_GMCH_VGA_DISABLE ;else gmch_ctrl |=INTEL_GMCH_VGA_DISABLE ; -pci_write_config_word (dev_priv->bridge_dev,INTEL_GMCH_CTRL , gmch_ctrl); +pci_write_config_word (dev_priv->bridge_dev, reg, gmch_ctrl);return 0 ; }
drivers/gpu/drm/radeon/atombios_crtc.c +3 -1
@@ -1176,7 +1176,9 @@ static int dce4_crtc_do_set_base(struct drm_crtc *crtc,if ((rdev->family ==CHIP_TAHITI ) || (rdev->family ==CHIP_PITCAIRN )) fb_format |=SI_GRPH_PIPE_CONFIG (SI_ADDR_SURF_P8_32x32_8x16); -else if (rdev->family ==CHIP_VERDE ) +else if ((rdev->family ==CHIP_VERDE ) || + (rdev->family ==CHIP_OLAND ) || + (rdev->family ==CHIP_HAINAN ))/* for completeness. HAINAN has no display hw */ fb_format |=SI_GRPH_PIPE_CONFIG (SI_ADDR_SURF_P4_8x16);switch (radeon_crtc->crtc_id) {
drivers/gpu/drm/radeon/ni.c +16 -4
@@ -753,6 +753,10 @@ static void cayman_gpu_init(struct radeon_device *rdev) (rdev->pdev->device == 0x999C)) { rdev->config.cayman.max_simds_per_se =6 ; rdev->config.cayman.max_backends_per_se =2 ; + rdev->config.cayman.max_hw_contexts =8 ; + rdev->config.cayman.sx_max_export_size =256 ; + rdev->config.cayman.sx_max_export_pos_size =64 ; + rdev->config.cayman.sx_max_export_smx_size =192 ; } else if ((rdev->pdev->device == 0x9903) || (rdev->pdev->device == 0x9904) || (rdev->pdev->device == 0x990A) ||
@@ -763,6 +767,10 @@ static void cayman_gpu_init(struct radeon_device *rdev) (rdev->pdev->device == 0x999D)) { rdev->config.cayman.max_simds_per_se =4 ; rdev->config.cayman.max_backends_per_se =2 ; + rdev->config.cayman.max_hw_contexts =8 ; + rdev->config.cayman.sx_max_export_size =256 ; + rdev->config.cayman.sx_max_export_pos_size =64 ; + rdev->config.cayman.sx_max_export_smx_size =192 ; } else if ((rdev->pdev->device == 0x9919) || (rdev->pdev->device == 0x9990) || (rdev->pdev->device == 0x9991) ||
@@ -773,9 +781,17 @@ static void cayman_gpu_init(struct radeon_device *rdev) (rdev->pdev->device == 0x99A0)) { rdev->config.cayman.max_simds_per_se =3 ; rdev->config.cayman.max_backends_per_se =1 ; + rdev->config.cayman.max_hw_contexts =4 ; + rdev->config.cayman.sx_max_export_size =128 ; + rdev->config.cayman.sx_max_export_pos_size =32 ; + rdev->config.cayman.sx_max_export_smx_size =96 ; } else { rdev->config.cayman.max_simds_per_se =2 ; rdev->config.cayman.max_backends_per_se =1 ; + rdev->config.cayman.max_hw_contexts =4 ; + rdev->config.cayman.sx_max_export_size =128 ; + rdev->config.cayman.sx_max_export_pos_size =32 ; + rdev->config.cayman.sx_max_export_smx_size =96 ; } rdev->config.cayman.max_texture_channel_caches =2 ; rdev->config.cayman.max_gprs =256 ;
@@ -783,10 +799,6 @@ static void cayman_gpu_init(struct radeon_device *rdev) rdev->config.cayman.max_gs_threads =32 ; rdev->config.cayman.max_stack_entries =512 ; rdev->config.cayman.sx_num_of_sets =8 ; - rdev->config.cayman.sx_max_export_size =256 ; - rdev->config.cayman.sx_max_export_pos_size =64 ; - rdev->config.cayman.sx_max_export_smx_size =192 ; - rdev->config.cayman.max_hw_contexts =8 ; rdev->config.cayman.sq_num_cf_insts =2 ; rdev->config.cayman.sc_prim_fifo_size =0x40 ;
drivers/gpu/drm/radeon/radeon_uvd.c +1 -1
@@ -460,7 +460,7 @@ static int radeon_uvd_cs_reloc(struct radeon_cs_parser *p,return -EINVAL ; } -if ((start >>28 ) != (end >>28 )) { +if ((start >>28 ) != ((end -1 ) >>28 )) {DRM_ERROR ("reloc %LX-%LX crossing 256MB boundary!\n" , start, end);return -EINVAL ;
drivers/gpu/drm/radeon/rs690.c +10 -0
@@ -162,6 +162,16 @@ static void rs690_mc_init(struct radeon_device *rdev) base =RREG32_MC (R_000100_MCCFG_FB_LOCATION ); base =G_000100_MC_FB_START (base) <<16 ; rdev->mc.igp_sideport_enabled =radeon_atombios_sideport_present (rdev); +/* Some boards seem to be configured for 128MB of sideport memory, +* but really only have 64MB. Just skip the sideport and use +* UMA memory. +*/ +if (rdev->mc.igp_sideport_enabled && + (rdev->mc.real_vram_size == (384 *1024 *1024 ))) { + base +=128 *1024 *1024 ; + rdev->mc.real_vram_size -=128 *1024 *1024 ; + rdev->mc.mc_vram_size = rdev->mc.real_vram_size; + }/* Use K8 direct mapping for fast fb access. */ rdev->fastfb_working = false;
drivers/idle/intel_idle.c +3 -0
@@ -361,6 +361,9 @@ static int intel_idle(struct cpuidle_device *dev,if (!current_set_polling_and_test ()) { +if (this_cpu_has (X86_FEATURE_CLFLUSH_MONITOR )) +clflush ((void *)¤t_thread_info ()->flags); +__monitor ((void *)¤t_thread_info ()->flags,0 ,0 );smp_mb ();if (!need_resched ())
drivers/iio/adc/ad7887.c +14 -2
@@ -211,7 +211,13 @@ static const struct ad7887_chip_info ad7887_chip_info_tbl[] = { .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), .address = 1, .scan_index = 1, - .scan_type = IIO_ST('u', 12, 16, 0), + .scan_type = { + .sign = 'u', + .realbits = 12, + .storagebits = 16, + .shift = 0, + .endianness =IIO_BE , + }, }, .channel[1] = { .type = IIO_VOLTAGE,
@@ -221,7 +227,13 @@ static const struct ad7887_chip_info ad7887_chip_info_tbl[] = { .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), .address = 0, .scan_index = 0, - .scan_type = IIO_ST('u', 12, 16, 0), + .scan_type = { + .sign = 'u', + .realbits = 12, + .storagebits = 16, + .shift = 0, + .endianness =IIO_BE , + }, }, .channel[2] = IIO_CHAN_SOFT_TIMESTAMP(2), .int_vref_mv = 2500,
drivers/iio/imu/adis16400_core.c +6 -1
@@ -651,7 +651,12 @@ static const struct iio_chan_spec adis16448_channels[] = { .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), .address = ADIS16448_BARO_OUT, .scan_index = ADIS16400_SCAN_BARO, - .scan_type =IIO_ST ('s' ,16 ,16 ,0 ), + .scan_type = { + .sign = 's', + .realbits = 16, + .storagebits = 16, + .endianness =IIO_BE , + }, },ADIS16400_TEMP_CHAN (ADIS16448_TEMP_OUT ,12 ),IIO_CHAN_SOFT_TIMESTAMP (11 )
drivers/infiniband/ulp/isert/ib_isert.c +12 -4
@@ -242,21 +242,29 @@ isert_create_device_ib_res(struct isert_device *device) isert_cq_event_callback, (void *)&cq_desc[i], ISER_MAX_RX_CQ_LEN, i); -if (IS_ERR (device->dev_rx_cq[i])) +if (IS_ERR (device->dev_rx_cq[i])) { + ret =PTR_ERR (device->dev_rx_cq[i]); + device->dev_rx_cq[i] =NULL ; goto out_cq; + } device->dev_tx_cq[i] =ib_create_cq (device->ib_device, isert_cq_tx_callback, isert_cq_event_callback, (void *)&cq_desc[i],ISER_MAX_TX_CQ_LEN , i); -if (IS_ERR (device->dev_tx_cq[i])) +if (IS_ERR (device->dev_tx_cq[i])) { + ret =PTR_ERR (device->dev_tx_cq[i]); + device->dev_tx_cq[i] =NULL ; goto out_cq; + } -if (ib_req_notify_cq (device->dev_rx_cq[i],IB_CQ_NEXT_COMP )) + ret =ib_req_notify_cq (device->dev_rx_cq[i],IB_CQ_NEXT_COMP ); +if (ret) goto out_cq; -if (ib_req_notify_cq (device->dev_tx_cq[i],IB_CQ_NEXT_COMP )) + ret =ib_req_notify_cq (device->dev_tx_cq[i],IB_CQ_NEXT_COMP ); +if (ret) goto out_cq; }
drivers/input/input.c +4 -0
@@ -1866,6 +1866,10 @@ void input_set_capability(struct input_dev *dev, unsigned int type, unsigned intbreak ;case EV_ABS : +input_alloc_absinfo (dev); +if (!dev->absinfo) +return ; +__set_bit (code, dev->absbit);break ;
drivers/net/can/usb/peak_usb/pcan_usb_pro.c +3 -0
@@ -927,6 +927,9 @@ static int pcan_usb_pro_init(struct peak_usb_device *dev)/* set LED in default state (end of init phase) */ pcan_usb_pro_set_led (dev,0 ,1 ); +kfree (bi); +kfree (fi); +return 0 ; err_out:
drivers/net/ethernet/broadcom/tg3.c +1 -1
@@ -7482,7 +7482,7 @@ static inline int tg3_4g_overflow_test(dma_addr_t mapping, int len) {u32 base = (u32 ) mapping &0xffffffff ; -return (base >0xffffdcc0 ) && (base + len +8 < base); +return base + len +8 < base; }/* Test for TSO DMA buffers that cross into regions which are within MSS bytes
drivers/net/usb/dm9601.c +25 -9
@@ -364,7 +364,12 @@ static int dm9601_bind(struct usbnet *dev, struct usb_interface *intf) dev->net->ethtool_ops = &dm9601_ethtool_ops; dev->net->hard_header_len +=DM_TX_OVERHEAD ; dev->hard_mtu = dev->net->mtu + dev->net->hard_header_len; - dev->rx_urb_size = dev->net->mtu +ETH_HLEN +DM_RX_OVERHEAD ; + +/* dm9620/21a require room for 4 byte padding, even in dm9601 +* mode, so we need +1 to be able to receive full size +* ethernet frames. +*/ + dev->rx_urb_size = dev->net->mtu +ETH_HLEN +DM_RX_OVERHEAD +1 ; dev->mii.dev = dev->net; dev->mii.mdio_read = dm9601_mdio_read;
@@ -468,7 +473,7 @@ static int dm9601_rx_fixup(struct usbnet *dev, struct sk_buff *skb)static struct sk_buff *dm9601_tx_fixup (struct usbnet *dev,struct sk_buff *skb,gfp_t flags) { -int len; +int len, pad;/* format: b1: packet length low
@@ -476,12 +481,23 @@ static struct sk_buff *dm9601_tx_fixup(struct usbnet *dev, struct sk_buff *skb,b3..n: packet data */ - len = skb->len; + len = skb->len +DM_TX_OVERHEAD ; -if (skb_headroom (skb) <DM_TX_OVERHEAD ) { +/* workaround for dm962x errata with tx fifo getting out of +* sync if a USB bulk transfer retry happens right after a +* packet with odd / maxpacket length by adding up to 3 bytes +* padding. +*/ +while ((len &1 ) || !(len % dev->maxpacket)) + len++; + + len -=DM_TX_OVERHEAD ;/* hw header doesn't count as part of length */ + pad = len - skb->len; + +if (skb_headroom (skb) <DM_TX_OVERHEAD ||skb_tailroom (skb) < pad) {struct sk_buff *skb2; - skb2 =skb_copy_expand (skb,DM_TX_OVERHEAD ,0 , flags); + skb2 =skb_copy_expand (skb,DM_TX_OVERHEAD , pad, flags);dev_kfree_skb_any (skb); skb = skb2;if (!skb)
@@ -490,10 +506,10 @@ static struct sk_buff *dm9601_tx_fixup(struct usbnet *dev, struct sk_buff *skb,__skb_push (skb,DM_TX_OVERHEAD ); -/* usbnet adds padding if length is a multiple of packet size -if so, adjust length value in header */ -if ((skb->len % dev->maxpacket) ==0 ) - len++; +if (pad) { +memset (skb->data + skb->len,0 , pad); +__skb_put (skb, pad); + } skb->data[0 ] = len; skb->data[1 ] = len >>8 ;
drivers/net/wireless/ath/ath9k/ar9002_mac.c +43 -9
84 lines not on this page · raw message
drivers/net/wireless/ath/ath9k/htc_drv_main.c +17 -8
@@ -145,21 +145,26 @@ static void ath9k_htc_bssid_iter(void *data, u8 *mac, struct ieee80211_vif *vif)struct ath9k_vif_iter_data *iter_data = data;int i; -for (i =0 ; i <ETH_ALEN ; i++) - iter_data->mask[i] &= ~(iter_data->hw_macaddr[i] ^ mac[i]); +if (iter_data->hw_macaddr !=NULL ) { +for (i =0 ; i <ETH_ALEN ; i++) + iter_data->mask[i] &= ~(iter_data->hw_macaddr[i] ^ mac[i]); + }else { + iter_data->hw_macaddr = mac; + } } -static void ath9k_htc_set_bssid_mask (struct ath9k_htc_priv *priv, +static void ath9k_htc_set_mac_bssid_mask (struct ath9k_htc_priv *priv,struct ieee80211_vif *vif) {struct ath_common *common =ath9k_hw_common (priv->ah);struct ath9k_vif_iter_data iter_data;/* -* Use the hardware MAC address as reference, the hardware uses it -* together with the BSSID mask when matching addresses. +* Pick the MAC address of the first interface as the new hardware +* MAC address. The hardware will use it together with the BSSID mask +* when matching addresses. */ - iter_data.hw_macaddr = common->macaddr; + iter_data.hw_macaddr =NULL ;memset (&iter_data.mask,0xff ,ETH_ALEN );if (vif)
@@ -171,6 +176,10 @@ static void ath9k_htc_set_bssid_mask(struct ath9k_htc_priv *priv, ath9k_htc_bssid_iter, &iter_data);memcpy (common->bssidmask, iter_data.mask,ETH_ALEN ); + +if (iter_data.hw_macaddr) +memcpy (common->macaddr, iter_data.hw_macaddr,ETH_ALEN ); +ath_hw_setbssidmask (common); }
@@ -1076,7 +1085,7 @@ static int ath9k_htc_add_interface(struct ieee80211_hw *hw, goto out; } -ath9k_htc_set_bssid_mask (priv, vif); +ath9k_htc_set_mac_bssid_mask (priv, vif); priv->vif_slot |= (1 << avp->index); priv->nvifs++;
@@ -1139,7 +1148,7 @@ static void ath9k_htc_remove_interface(struct ieee80211_hw *hw,ath9k_htc_set_opmode (priv); -ath9k_htc_set_bssid_mask (priv, vif); +ath9k_htc_set_mac_bssid_mask (priv, vif);/* * Stop ANI only if there are no associated station interfaces.
drivers/net/wireless/ath/ath9k/main.c +3 -2
@@ -889,8 +889,9 @@ void ath9k_calculate_iter_data(struct ieee80211_hw *hw,struct ath_common *common =ath9k_hw_common (ah);/* -* Use the hardware MAC address as reference, the hardware uses it -* together with the BSSID mask when matching addresses. +* Pick the MAC address of the first interface as the new hardware +* MAC address. The hardware will use it together with the BSSID mask +* when matching addresses. */ memset (iter_data,0 ,sizeof (*iter_data));memset (&iter_data->mask,0xff ,ETH_ALEN );
drivers/net/wireless/rtlwifi/pci.c +3 -1
@@ -734,6 +734,8 @@ static void _rtl_pci_rx_interrupt(struct ieee80211_hw *hw) };int index = rtlpci->rx_ring[rx_queue_idx].idx; +if (rtlpci->driver_is_goingto_unload) +return ;/*RX NORMAL PKT */ while (count--) {/*rx descriptor */
@@ -1630,6 +1632,7 @@ static void rtl_pci_stop(struct ieee80211_hw *hw)*/ set_hal_stop (rtlhal); + rtlpci->driver_is_goingto_unload = true; rtlpriv->cfg->ops->disable_interrupt (hw);cancel_work_sync (&rtlpriv->works.lps_change_work);
@@ -1647,7 +1650,6 @@ static void rtl_pci_stop(struct ieee80211_hw *hw) ppsc->rfchange_inprogress = true;spin_unlock_irqrestore (&rtlpriv->locks.rf_ps_lock, flags); - rtlpci->driver_is_goingto_unload = true; rtlpriv->cfg->ops->hw_disable (hw);/* some things are not needed if firmware not available */ if (!rtlpriv->max_fw_size)
drivers/of/address.c +0 -8
@@ -69,14 +69,6 @@ static u64 of_bus_default_map(__be32 *addr, const __be32 *range, (unsigned long long )cp, (unsigned long long )s, (unsigned long long)da); -/* -* If the number of address cells is larger than 2 we assume the -* mapping doesn't specify a physical address. Rather, the address -* specifies an identifier that must match exactly. -*/ -if (na >2 &&memcmp (range, addr, na *4 ) !=0 ) -return OF_BAD_ADDR ; -if (da < cp || da >= (cp + s))return OF_BAD_ADDR ;return da - cp;
drivers/s390/char/tty3270.c +1 -1
@@ -942,7 +942,7 @@ static int tty3270_install(struct tty_driver *driver, struct tty_struct *tty)return rc; } - tp->screen =tty3270_alloc_screen (tp->view.cols, tp->view.rows); + tp->screen =tty3270_alloc_screen (tp->view.rows, tp->view.cols);if (IS_ERR (tp->screen)) { rc =PTR_ERR (tp->screen);raw3270_put_view (&tp->view);
drivers/staging/comedi/drivers/8255_pci.c +12 -3
@@ -66,7 +66,8 @@ enum pci_8255_boardid {BOARD_ADLINK_PCI7296 ,BOARD_CB_PCIDIO24 ,BOARD_CB_PCIDIO24H , -BOARD_CB_PCIDIO48H , +BOARD_CB_PCIDIO48H_OLD , +BOARD_CB_PCIDIO48H_NEW ,BOARD_CB_PCIDIO96H ,BOARD_NI_PCIDIO96 , BOARD_NI_PCIDIO96B,
@@ -109,11 +110,16 @@ static const struct pci_8255_boardinfo pci_8255_boards[] = { .dio_badr = 2, .n_8255 = 1, }, - [BOARD_CB_PCIDIO48H] = { + [BOARD_CB_PCIDIO48H_OLD] = { .name = "cb_pci-dio48h", .dio_badr = 1, .n_8255 = 2, }, + [BOARD_CB_PCIDIO48H_NEW] = { + .name = "cb_pci-dio48h", + .dio_badr = 2, + .n_8255 = 2, + }, [BOARD_CB_PCIDIO96H] = { .name = "cb_pci-dio96h", .dio_badr = 2,
@@ -270,7 +276,10 @@ static DEFINE_PCI_DEVICE_TABLE(pci_8255_pci_table) = { { PCI_VDEVICE(ADLINK, 0x7296), BOARD_ADLINK_PCI7296 }, { PCI_VDEVICE(CB, 0x0028), BOARD_CB_PCIDIO24 }, { PCI_VDEVICE(CB, 0x0014), BOARD_CB_PCIDIO24H }, - { PCI_VDEVICE(CB, 0x000b), BOARD_CB_PCIDIO48H }, + { PCI_DEVICE_SUB(PCI_VENDOR_ID_CB, 0x000b, 0x0000, 0x0000), + .driver_data = BOARD_CB_PCIDIO48H_OLD }, + { PCI_DEVICE_SUB(PCI_VENDOR_ID_CB, 0x000b, PCI_VENDOR_ID_CB, 0x000b), + .driver_data = BOARD_CB_PCIDIO48H_NEW }, { PCI_VDEVICE(CB, 0x0017), BOARD_CB_PCIDIO96H }, { PCI_VDEVICE(NI, 0x0160), BOARD_NI_PCIDIO96 }, { PCI_VDEVICE(NI, 0x1630), BOARD_NI_PCIDIO96B },
drivers/target/iscsi/iscsi_target.c +12 -14
@@ -838,24 +838,22 @@ int iscsit_setup_scsi_cmd(struct iscsi_conn *conn, struct iscsi_cmd *cmd,if (((hdr->flags &ISCSI_FLAG_CMD_READ ) || (hdr->flags &ISCSI_FLAG_CMD_WRITE )) && !hdr->data_length) {/* -* Vmware ESX v3.0 uses a modified Cisco Initiator (v3.4.2) -* that adds support for RESERVE/RELEASE. There is a bug -* add with this new functionality that sets R/W bits when -* neither CDB carries any READ or WRITE datapayloads. +* From RFC-3720 Section 10.3.1: +* +* "Either or both of R and W MAY be 1 when either the +* Expected Data Transfer Length and/or Bidirectional Read +* Expected Data Transfer Length are 0" +* +* For this case, go ahead and clear the unnecssary bits +* to avoid any confusion with ->data_direction. */ -if ((hdr->cdb[0 ] ==0x16 ) || (hdr->cdb[0 ] ==0x17 )) { - hdr->flags &= ~ISCSI_FLAG_CMD_READ ; - hdr->flags &= ~ISCSI_FLAG_CMD_WRITE ; - goto done; - } + hdr->flags &= ~ISCSI_FLAG_CMD_READ ; + hdr->flags &= ~ISCSI_FLAG_CMD_WRITE ; -pr_err ("ISCSI_FLAG_CMD_READ or ISCSI_FLAG_CMD_WRITE" +pr_warn ("ISCSI_FLAG_CMD_READ or ISCSI_FLAG_CMD_WRITE" " set when Expected Data Transfer Length is 0 for" -" CDB: 0x%02x. Bad iSCSI Initiator.\n" , hdr->cdb[0 ]); -return iscsit_add_reject_cmd (cmd, -ISCSI_REASON_BOOKMARK_INVALID , buf); +" CDB: 0x%02x, Fixing up flags\n" , hdr->cdb[0 ]); } -done:if (!(hdr->flags &ISCSI_FLAG_CMD_READ ) && !(hdr->flags &ISCSI_FLAG_CMD_WRITE ) && (hdr->data_length !=0 )) {
drivers/target/target_core_device.c +5 -0
@@ -1078,6 +1078,11 @@ int se_dev_set_block_size(struct se_device *dev, u32 block_size) dev->dev_attrib.block_size = block_size;pr_debug ("dev[%p]: SE Device block_size changed to %u\n" , dev, block_size); + +if (dev->dev_attrib.max_bytes_per_io) + dev->dev_attrib.hw_max_sectors = + dev->dev_attrib.max_bytes_per_io / block_size; +return 0 ; }
drivers/target/target_core_file.c +4 -4
@@ -66,9 +66,8 @@ static int fd_attach_hba(struct se_hba *hba, u32 host_id)pr_debug ("CORE_HBA[%d] - TCM FILEIO HBA Driver %s on Generic" " Target Core Stack %s\n" , hba->hba_id,FD_VERSION ,TARGET_CORE_MOD_VERSION ); -pr_debug ("CORE_HBA[%d] - Attached FILEIO HBA: %u to Generic" -" MaxSectors: %u\n" , - hba->hba_id, fd_host->fd_host_id,FD_MAX_SECTORS ); +pr_debug ("CORE_HBA[%d] - Attached FILEIO HBA: %u to Generic\n" , + hba->hba_id, fd_host->fd_host_id);return 0 ; }
@@ -220,7 +219,8 @@ static int fd_configure_device(struct se_device *dev) } dev->dev_attrib.hw_block_size = fd_dev->fd_block_size; - dev->dev_attrib.hw_max_sectors =FD_MAX_SECTORS ; + dev->dev_attrib.max_bytes_per_io =FD_MAX_BYTES ; + dev->dev_attrib.hw_max_sectors =FD_MAX_BYTES / fd_dev->fd_block_size; dev->dev_attrib.hw_queue_depth =FD_MAX_DEVICE_QUEUE_DEPTH ;if (fd_dev->fbd_flags &FDBD_HAS_BUFFERED_IO_WCE ) {
drivers/target/target_core_file.h +4 -1
@@ -7,7 +7,10 @@#define FD_DEVICE_QUEUE_DEPTH 32#define FD_MAX_DEVICE_QUEUE_DEPTH 128#define FD_BLOCKSIZE 512 -#define FD_MAX_SECTORS 2048 +/* +* Limited by the number of iovecs (2048) per vfs_[writev,readv] call +*/ +#define FD_MAX_BYTES 8388608#define RRF_EMULATE_CDB 0x01#define RRF_GOT_LBA 0x02
drivers/tty/serial/8250/8250_dw.c +2 -0
@@ -369,6 +369,8 @@ MODULE_DEVICE_TABLE(of, dw8250_of_match);static const struct acpi_device_id dw8250_acpi_match[] = { {"INT33C4" ,0 }, {"INT33C5" ,0 }, + {"INT3434" ,0 }, + {"INT3435" ,0 }, {"80860F0A" ,0 }, { }, };
drivers/tty/serial/pmac_zilog.c +3 -0
@@ -2051,6 +2051,9 @@ static int __init pmz_console_init(void)/* Probe ports */ pmz_probe (); +if (pmz_ports_count ==0 ) +return -ENODEV ; +/* TODO: Autoprobe console based on OF */ /* pmz_console.index = i; */ register_console (&pmz_console);
drivers/usb/class/cdc-wdm.c +3 -5
@@ -820,13 +820,11 @@ static int wdm_manage_power(struct usb_interface *intf, int on) {/* need autopm_get/put here to ensure the usbcore sees the new value */ int rv =usb_autopm_get_interface (intf); -if (rv <0 ) - goto err; intf->needs_remote_wakeup = on; -usb_autopm_put_interface (intf); -err: -return rv; +if (!rv) +usb_autopm_put_interface (intf); +return 0 ; }static int wdm_probe (struct usb_interface *intf,const struct usb_device_id *id)
drivers/usb/serial/generic.c +1 -8
@@ -176,14 +176,7 @@ retry:return result; } -/* Try sending off another urb, unless in irq context (in which case -* there will be no free urb). */ -if (!in_irq ()) - goto retry; - -clear_bit_unlock (USB_SERIAL_WRITE_BUSY , &port->flags); - -return 0 ; + goto retry;/* try sending off another urb */ }/**
drivers/usb/serial/option.c +2 -0
@@ -251,6 +251,7 @@ static void option_instat_callback(struct urb *urb);#define ZTE_PRODUCT_MF628 0x0015#define ZTE_PRODUCT_MF626 0x0031#define ZTE_PRODUCT_MC2718 0xffe8 +#define ZTE_PRODUCT_AC2726 0xfff1#define BENQ_VENDOR_ID 0x04a5#define BENQ_PRODUCT_H10 0x4068
@@ -1453,6 +1454,7 @@ static const struct usb_device_id option_ids[] = { { USB_VENDOR_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0xff, 0x02, 0x01) }, { USB_VENDOR_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0xff, 0x02, 0x05) }, { USB_VENDOR_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0xff, 0x86, 0x10) }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_AC2726, 0xff, 0xff, 0xff) }, { USB_DEVICE(BENQ_VENDOR_ID, BENQ_PRODUCT_H10) }, { USB_DEVICE(DLINK_VENDOR_ID, DLINK_PRODUCT_DWM_652) },
drivers/usb/serial/zte_ev.c +1 -2
@@ -281,8 +281,7 @@ static const struct usb_device_id id_table[] = { { USB_DEVICE(0x19d2, 0xfffd) }, { USB_DEVICE(0x19d2, 0xfffc) }, { USB_DEVICE(0x19d2, 0xfffb) }, -/* AC2726, AC8710_V3 */ - { USB_DEVICE_AND_INTERFACE_INFO(0x19d2, 0xfff1, 0xff, 0xff, 0xff) }, +/* AC8710_V3 */ { USB_DEVICE(0x19d2, 0xfff6) }, { USB_DEVICE(0x19d2, 0xfff7) }, { USB_DEVICE(0x19d2, 0xfff8) },
fs/ceph/addr.c +6 -2
@@ -213,9 +213,13 @@ static int readpage_nounlock(struct file *filp, struct page *page)if (err <0 ) {SetPageError (page); goto out; - }else if (err <PAGE_CACHE_SIZE ) { + }else { +if (err <PAGE_CACHE_SIZE ) {/* zero fill remainder of page */ -zero_user_segment (page, err,PAGE_CACHE_SIZE ); +zero_user_segment (page, err,PAGE_CACHE_SIZE ); + }else { +flush_dcache_page (page); + } }SetPageUptodate (page);
fs/ceph/file.c +21 -26
83 lines not on this page · raw message
fs/ceph/ioctl.c +6 -2
@@ -211,8 +211,12 @@ static long ceph_ioctl_get_dataloc(struct file *file, void __user *arg)snprintf (dl.object_name,sizeof (dl.object_name),"%llx.%08llx" ,ceph_ino (inode), dl.object_no); -ceph_calc_ceph_pg (&pgid, dl.object_name, osdc->osdmap, -ceph_file_layout_pg_pool (ci->i_layout)); + r =ceph_calc_ceph_pg (&pgid, dl.object_name, osdc->osdmap, +ceph_file_layout_pg_pool (ci->i_layout)); +if (r <0 ) { +up_read (&osdc->map_sem); +return r; + } dl.osd =ceph_calc_pg_primary (osdc->osdmap, pgid);if (dl.osd >=0 ) {
fs/ceph/mds_client.c +12 -3
@@ -414,6 +414,9 @@ static struct ceph_mds_session *register_session(struct ceph_mds_client *mdsc, {struct ceph_mds_session *s; +if (mds >= mdsc->mdsmap->m_max_mds) +return ERR_PTR (-EINVAL ); + s =kzalloc (sizeof (*s),GFP_NOFS );if (!s)return ERR_PTR (-ENOMEM );
@@ -639,6 +642,8 @@ static void __unregister_request(struct ceph_mds_client *mdsc, req->r_unsafe_dir =NULL ; } +complete_all (&req->r_safe_completion); +ceph_mdsc_put_request (req); }
@@ -1840,8 +1845,11 @@ static int __do_request(struct ceph_mds_client *mdsc,int mds =-1 ;int err = -EAGAIN ; -if (req->r_err || req->r_got_result) +if (req->r_err || req->r_got_result) { +if (req->r_aborted) +__unregister_request (mdsc, req); goto out; + }if (req->r_timeout &&time_after_eq (jiffies, req->r_started + req->r_timeout)) {
@@ -2151,7 +2159,6 @@ static void handle_reply(struct ceph_mds_session *session, struct ceph_msg *msg)if (head->safe) { req->r_got_safe = true;__unregister_request (mdsc, req); -complete_all (&req->r_safe_completion);if (req->r_got_unsafe) {/*
@@ -3040,8 +3047,10 @@ int ceph_mdsc_init(struct ceph_fs_client *fsc) fsc->mdsc = mdsc;mutex_init (&mdsc->mutex); mdsc->mdsmap =kzalloc (sizeof (*mdsc->mdsmap),GFP_NOFS ); -if (mdsc->mdsmap ==NULL ) +if (mdsc->mdsmap ==NULL ) { +kfree (mdsc);return -ENOMEM ; + }init_completion (&mdsc->safe_umount_waiters);init_waitqueue_head (&mdsc->session_close_wq);
fs/ceph/mdsmap.c +3 -1
@@ -138,6 +138,8 @@ struct ceph_mdsmap *ceph_mdsmap_decode(void **p, void *end) m->m_info[mds].export_targets =kcalloc (num_export_targets,sizeof (u32),GFP_NOFS ); +if (m->m_info[mds].export_targets ==NULL ) + goto badmem;for (j =0 ; j < num_export_targets; j++) m->m_info[mds].export_targets[j] =ceph_decode_32 (&pexport_targets);
@@ -170,7 +172,7 @@ bad:DUMP_PREFIX_OFFSET ,16 ,1 , start, end - start, true);ceph_mdsmap_destroy (m); -return ERR_PTR (-EINVAL ); +return ERR_PTR (err); }void ceph_mdsmap_destroy (struct ceph_mdsmap *m)
fs/ceph/super.c +1 -1
@@ -357,7 +357,7 @@ static int parse_mount_options(struct ceph_mount_options **pfsopt, } err = -EINVAL ; dev_name_end--;/* back up to ':' separator */ -if (*dev_name_end !=':' ) { +if (dev_name_end < dev_name || *dev_name_end !=':' ) {pr_err ("device name is missing path (no : separator in %s)\n" , dev_name); goto out;
fs/ext4/ext4.h +10 -0
@@ -280,6 +280,16 @@ struct ext4_io_submit {/* Translate # of blks to # of clusters */ #define EXT4_NUM_B2C (sbi, blks) (((blks) + (sbi)->s_cluster_ratio - 1) >> \ (sbi)->s_cluster_bits) +/* Mask out the low bits to get the starting block of the cluster */ +#define EXT4_PBLK_CMASK (s, pblk) ((pblk) & \ + ~((ext4_fsblk_t) (s)->s_cluster_ratio - 1)) +#define EXT4_LBLK_CMASK (s, lblk) ((lblk) & \ + ~((ext4_lblk_t) (s)->s_cluster_ratio - 1)) +/* Get the cluster offset */ +#define EXT4_PBLK_COFF (s, pblk) ((pblk) & \ + ((ext4_fsblk_t) (s)->s_cluster_ratio - 1)) +#define EXT4_LBLK_COFF (s, lblk) ((lblk) & \ + ((ext4_lblk_t) (s)->s_cluster_ratio - 1))/* * Structure of a blocks group descriptor
fs/ext4/ext4_jbd2.c +9 -0
@@ -223,6 +223,15 @@ int __ext4_handle_dirty_metadata(const char *where, unsigned int line,if (WARN_ON_ONCE (err)) {ext4_journal_abort_handle (where, line, __func__, bh, handle, err); +ext4_error_inode (inode, where, line, + bh->b_blocknr, +"journal_dirty_metadata failed: " +"handle type %u started at line %u, " +"credits %u/%u, errcode %d" , + handle->h_type, + handle->h_line_no, + handle->h_requested_credits, + handle->h_buffer_credits, err); } }else {if (inode)
fs/ext4/extents.c +29 -14
122 lines not on this page · raw message
fs/ext4/inode.c +0 -12
@@ -1263,7 +1263,6 @@ static int ext4_journalled_write_end(struct file *file,*/ static int ext4_da_reserve_metadata (struct inode *inode,ext4_lblk_t lblock) { -int retries =0 ;struct ext4_sb_info *sbi =EXT4_SB (inode->i_sb);struct ext4_inode_info *ei =EXT4_I (inode);unsigned int md_needed;
@@ -1275,7 +1274,6 @@ static int ext4_da_reserve_metadata(struct inode *inode, ext4_lblk_t lblock)* in order to allocate nrblocks * worse case is one extent per block */ -repeat:spin_lock (&ei->i_block_reservation_lock);/* * ext4_calc_metadata_amount() has side effects, which we have
@@ -1295,10 +1293,6 @@ repeat: ei->i_da_metadata_calc_len = save_len; ei->i_da_metadata_calc_last_lblock = save_last_lblock;spin_unlock (&ei->i_block_reservation_lock); -if (ext4_should_retry_alloc (inode->i_sb, &retries)) { -cond_resched (); - goto repeat; - }return -ENOSPC ; } ei->i_reserved_meta_blocks += md_needed;
@@ -1312,7 +1306,6 @@ repeat:*/ static int ext4_da_reserve_space (struct inode *inode,ext4_lblk_t lblock) { -int retries =0 ;struct ext4_sb_info *sbi =EXT4_SB (inode->i_sb);struct ext4_inode_info *ei =EXT4_I (inode);unsigned int md_needed;
@@ -1334,7 +1327,6 @@ static int ext4_da_reserve_space(struct inode *inode, ext4_lblk_t lblock)* in order to allocate nrblocks * worse case is one extent per block */ -repeat:spin_lock (&ei->i_block_reservation_lock);/* * ext4_calc_metadata_amount() has side effects, which we have
@@ -1354,10 +1346,6 @@ repeat: ei->i_da_metadata_calc_len = save_len; ei->i_da_metadata_calc_last_lblock = save_last_lblock;spin_unlock (&ei->i_block_reservation_lock); -if (ext4_should_retry_alloc (inode->i_sb, &retries)) { -cond_resched (); - goto repeat; - }dquot_release_reservation_block (inode,EXT4_C2B (sbi,1 ));return -ENOSPC ; }
fs/ext4/mballoc.c +13 -8
@@ -3423,6 +3423,9 @@ static void ext4_mb_pa_callback(struct rcu_head *head) {struct ext4_prealloc_space *pa; pa = container_of(head, struct ext4_prealloc_space, u.pa_rcu); + +BUG_ON (atomic_read (&pa->pa_count)); +BUG_ON (pa->pa_deleted ==0 );kmem_cache_free (ext4_pspace_cachep, pa); }
@@ -3436,11 +3439,13 @@ static void ext4_mb_put_pa(struct ext4_allocation_context *ac,ext4_group_t grp;ext4_fsblk_t grp_blk; -if (!atomic_dec_and_test (&pa->pa_count) || pa->pa_free !=0 ) -return ; -/* in this short window concurrent discard can set pa_deleted */ spin_lock (&pa->pa_lock); +if (!atomic_dec_and_test (&pa->pa_count) || pa->pa_free !=0 ) { +spin_unlock (&pa->pa_lock); +return ; + } +if (pa->pa_deleted ==1 ) {spin_unlock (&pa->pa_lock);return ;
@@ -4102,7 +4107,7 @@ ext4_mb_initialize_context(struct ext4_allocation_context *ac,ext4_get_group_no_and_offset (sb, goal, &group, &block);/* set up allocation goals */ - ac->ac_b_ex.fe_logical = ar->logical & ~(sbi->s_cluster_ratio -1 ); + ac->ac_b_ex.fe_logical =EXT4_LBLK_CMASK (sbi, ar->logical); ac->ac_status =AC_STATUS_CONTINUE ; ac->ac_sb = sb; ac->ac_inode = ar->inode;
@@ -4639,7 +4644,7 @@ void ext4_free_blocks(handle_t *handle, struct inode *inode,* blocks at the beginning or the end unless we are explicitly * requested to avoid doing so. */ - overflow = block & (sbi->s_cluster_ratio -1 ); + overflow =EXT4_PBLK_COFF (sbi, block);if (overflow) {if (flags &EXT4_FREE_BLOCKS_NOFREE_FIRST_CLUSTER ) { overflow = sbi->s_cluster_ratio - overflow;
@@ -4653,7 +4658,7 @@ void ext4_free_blocks(handle_t *handle, struct inode *inode, count += overflow; } } - overflow = count & (sbi->s_cluster_ratio -1 ); + overflow =EXT4_LBLK_COFF (sbi, count);if (overflow) {if (flags &EXT4_FREE_BLOCKS_NOFREE_LAST_CLUSTER ) {if (count > overflow)
@@ -4766,8 +4771,8 @@ do_more:" group:%d block:%d count:%lu failed" " with %d" , block_group, bit, count, err); - } - + }else +EXT4_MB_GRP_CLEAR_TRIMMED (e4b.bd_info);ext4_lock_group (sb, block_group);mb_clear_bits (bitmap_bh->b_data, bit, count_clusters);
fs/ext4/super.c +13 -4
@@ -3213,11 +3213,19 @@ int ext4_calculate_overhead(struct super_block *sb) } -static ext4_fsblk_t ext4_calculate_resv_clusters (struct ext4_sb_info *sbi) +static ext4_fsblk_t ext4_calculate_resv_clusters (struct super_block *sb) {ext4_fsblk_t resv_clusters;/* +* There's no need to reserve anything when we aren't using extents. +* The space estimates are exact, there are no unwritten extents, +* hole punching doesn't need new metadata... This is needed especially +* to keep ext2/3 backward compatibility. +*/ +if (!EXT4_HAS_INCOMPAT_FEATURE (sb,EXT4_FEATURE_INCOMPAT_EXTENTS )) +return 0 ; +/* * By default we reserve 2% or 4096 clusters, whichever is smaller. * This should cover the situations where we can not afford to run * out of space like for example punch hole, or converting
@@ -3225,7 +3233,8 @@ static ext4_fsblk_t ext4_calculate_resv_clusters(struct ext4_sb_info *sbi)* allocation would require 1, or 2 blocks, higher numbers are * very rare. */ - resv_clusters =ext4_blocks_count (sbi->s_es) >> sbi->s_cluster_bits; + resv_clusters =ext4_blocks_count (EXT4_SB (sb)->s_es) >> +EXT4_SB (sb)->s_cluster_bits;do_div (resv_clusters,50 ); resv_clusters =min_t (ext4_fsblk_t, resv_clusters,4096 );
@@ -3969,10 +3978,10 @@ no_journal: "available"); } - err =ext4_reserve_clusters (sbi,ext4_calculate_resv_clusters (sbi)); + err =ext4_reserve_clusters (sbi,ext4_calculate_resv_clusters (sb));if (err) {ext4_msg (sb,KERN_ERR ,"failed to reserve %llu clusters for " -"reserved pool" ,ext4_calculate_resv_clusters (sbi)); +"reserved pool" ,ext4_calculate_resv_clusters (sb)); goto failed_mount4a; }
fs/gfs2/aops.c +30 -0
@@ -999,6 +999,7 @@ static ssize_t gfs2_direct_IO(int rw, struct kiocb *iocb, {struct file *file = iocb->ki_filp;struct inode *inode = file->f_mapping->host; +struct address_space *mapping = inode->i_mapping;struct gfs2_inode *ip =GFS2_I (inode);struct gfs2_holder gh;int rv;
@@ -1019,6 +1020,35 @@ static ssize_t gfs2_direct_IO(int rw, struct kiocb *iocb,if (rv !=1 ) goto out;/* dio not valid, fall back to buffered i/o */ +/* +* Now since we are holding a deferred (CW) lock at this point, you +* might be wondering why this is ever needed. There is a case however +* where we've granted a deferred local lock against a cached exclusive +* glock. That is ok provided all granted local locks are deferred, but +* it also means that it is possible to encounter pages which are +* cached and possibly also mapped. So here we check for that and sort +* them out ahead of the dio. The glock state machine will take care of +* everything else. +* +* If in fact the cached glock state (gl->gl_state) is deferred (CW) in +* the first place, mapping->nr_pages will always be zero. +*/ +if (mapping->nrpages) { +loff_t lstart = offset & (PAGE_CACHE_SIZE -1 ); +loff_t len =iov_length (iov, nr_segs); +loff_t end =PAGE_ALIGN (offset + len) -1 ; + + rv =0 ; +if (len ==0 ) + goto out; +if (test_and_clear_bit (GIF_SW_PAGED , &ip->i_flags)) +unmap_shared_mapping_range (ip->i_inode.i_mapping, offset, len); + rv =filemap_write_and_wait_range (mapping, lstart, end); +if (rv) +return rv; +truncate_inode_pages_range (mapping, lstart, end); + } + rv =__blockdev_direct_IO (rw, iocb, inode, inode->i_sb->s_bdev, iov, offset, nr_segs, gfs2_get_block_direct,NULL ,NULL ,0 );
fs/gfs2/ops_fstype.c +11 -1
@@ -1317,8 +1317,18 @@ static struct dentry *gfs2_mount(struct file_system_type *fs_type, int flags,if (IS_ERR (s)) goto error_bdev; -if (s->s_root) +if (s->s_root) { +/* +* s_umount nests inside bd_mutex during +* __invalidate_device(). blkdev_put() acquires +* bd_mutex and can't be called under s_umount. Drop +* s_umount temporarily. This is safe as we're +* holding an active reference. +*/ +up_write (&s->s_umount);blkdev_put (bdev, mode); +down_write (&s->s_umount); + }memset (&args,0 ,sizeof (args)); args.ar_quota =GFS2_QUOTA_DEFAULT ;
fs/jbd2/transaction.c +4 -2
@@ -1151,7 +1151,10 @@ int jbd2_journal_dirty_metadata(handle_t *handle, struct buffer_head *bh)* once a transaction -bzzz */ jh->b_modified =1 ; -J_ASSERT_JH (jh, handle->h_buffer_credits >0 ); +if (handle->h_buffer_credits <=0 ) { + ret = -ENOSPC ; + goto out_unlock_bh; + } handle->h_buffer_credits--; }
@@ -1234,7 +1237,6 @@ out_unlock_bh:jbd2_journal_put_journal_head (jh); out:JBUFFER_TRACE (jh,"exit" ); -WARN_ON (ret);/* All errors are bugs, so dump the stack */ return ret; }
include/asm-generic/pgtable.h +1 -1
@@ -220,7 +220,7 @@ static inline int pmd_same(pmd_t pmd_a, pmd_t pmd_b)#endif #ifndef pte_accessible -# define pte_accessible (pte) ((void)(pte),1) +# define pte_accessible (mm, pte) ((void)(pte), 1)#endif #ifndef flush_tlb_fix_spurious_fault
include/clocksource/arm_arch_timer.h +1 -1
@@ -32,7 +32,7 @@#ifdef CONFIG_ARM_ARCH_TIMER extern u32 arch_timer_get_rate (void ); -extern u64 (*arch_timer_read_counter)(void ); +extern u64 arch_timer_read_counter (void );extern struct timecounter *arch_timer_get_timecounter (void );#else
include/drm/drm_pciids.h +1 -1
@@ -559,7 +559,7 @@ {0x1002, 0x9645, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_SUMO2|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ {0x1002, 0x9647, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_SUMO|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP},\ {0x1002, 0x9648, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_SUMO|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP},\ - {0x1002, 0x9649, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_SUMO|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP},\ + {0x1002, 0x9649, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_SUMO2|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP},\ {0x1002, 0x964a, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_SUMO|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ {0x1002, 0x964b, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_SUMO|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ {0x1002, 0x964c, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_SUMO|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
include/linux/auxvec.h +1 -1
@@ -3,6 +3,6 @@#include <uapi/linux/auxvec.h> -#define AT_VECTOR_SIZE_BASE 19/* NEW_AUX_ENT entries in auxiliary table */ +#define AT_VECTOR_SIZE_BASE 20/* NEW_AUX_ENT entries in auxiliary table */ /* number of "#define AT_.*" above, minus {AT_NULL, AT_IGNORE, AT_NOTELF} */ #endif /* _LINUX_AUXVEC_H */
include/linux/ceph/osd_client.h +2 -1
@@ -145,7 +145,6 @@ struct ceph_osd_request {s32 r_reply_op_result[CEPH_OSD_MAX_OP ];int r_got_reply;int r_linger; -int r_completed;struct ceph_osd_client *r_osdc;struct kref r_kref;
@@ -336,6 +335,8 @@ extern int ceph_osdc_wait_request(struct ceph_osd_client *osdc, struct ceph_osd_request *req);extern void ceph_osdc_sync (struct ceph_osd_client *osdc); +extern void ceph_osdc_flush_notifies (struct ceph_osd_client *osdc); + extern int ceph_osdc_readpages(struct ceph_osd_client *osdc, struct ceph_vino vino, struct ceph_file_layout *layout,
include/linux/libata.h +1 -0
@@ -399,6 +399,7 @@ enum {ATA_HORKAGE_BROKEN_FPDMA_AA = (1 <<15 ),/* skip AA */ ATA_HORKAGE_DUMP_ID = (1 <<16 ),/* dump IDENTIFY data */ ATA_HORKAGE_MAX_SEC_LBA48 = (1 <<17 ),/* Set max sects to 65535 */ + ATA_HORKAGE_ATAPI_DMADIR = (1 << 18), /* device requires dmadir *//* DMA mask for user DMA control: User visible values; DO NOT renumber */
include/linux/mm_types.h +49 -0
59 lines not on this page · raw message
include/linux/spinlock.h +11 -3
@@ -117,9 +117,17 @@ do { \#endif /*arch_spin_is_contended*/ #endif -/* The lock does not imply full memory barrier. */ -#ifndef ARCH_HAS_SMP_MB_AFTER_LOCK -static inline void smp_mb__after_lock (void ) {smp_mb (); } +/* +* Despite its name it doesn't necessarily has to be a full barrier. +* It should only guarantee that a STORE before the critical section +* can not be reordered with a LOAD inside this section. +* spin_lock() is the one-way barrier, this LOAD can not escape out +* of the region. So the default implementation simply ensures that +* a STORE can not move into the critical section, smp_wmb() should +* serialize it with another STORE done by spin_lock(). +*/ +#ifndef smp_mb__before_spinlock +#define smp_mb__before_spinlock () smp_wmb()#endif /**
include/target/target_core_base.h +1 -0
@@ -614,6 +614,7 @@ struct se_dev_attrib {u32 unmap_granularity;u32 unmap_granularity_alignment;u32 max_write_same_len; +u32 max_bytes_per_io;struct se_device *da_dev;struct config_group da_group; };
kernel/fork.c +1 -0
@@ -544,6 +544,7 @@ static struct mm_struct *mm_init(struct mm_struct *mm, struct task_struct *p) mm->cached_hole_size = ~0UL ;mm_init_aio (mm);mm_init_owner (mm, p); +clear_tlb_flush_pending (mm);if (likely (!mm_alloc_pgd (mm))) { mm->def_flags =0 ;
kernel/freezer.c +6 -0
@@ -19,6 +19,12 @@ EXPORT_SYMBOL(system_freezing_cnt);bool pm_freezing;bool pm_nosig_freezing; +/* +* Temporary export for the deadlock workaround in ata_scsi_hotplug(). +* Remove once the hack becomes unnecessary. +*/ +EXPORT_SYMBOL_GPL (pm_freezing); +/* protects freezing and frozen transitions */ static DEFINE_SPINLOCK (freezer_lock);
kernel/sched/core.c +13 -1
@@ -1487,7 +1487,13 @@ try_to_wake_up(struct task_struct *p, unsigned int state, int wake_flags)unsigned long flags;int cpu, success =0 ; -smp_wmb (); +/* +* If we are going to wake up a thread waiting for CONDITION we +* need to ensure that CONDITION=1 done by the caller can not be +* reordered with p->state check below. This pairs with mb() in +* set_current_state() the waiting thread does. +*/ +smp_mb__before_spinlock ();raw_spin_lock_irqsave (&p->pi_lock, flags);if (!(p->state & state)) goto out;
@@ -2966,6 +2972,12 @@ need_resched:if (sched_feat (HRTICK ))hrtick_clear (rq); +/* +* Make sure that signal_pending_state()->signal_pending() below +* can't be reordered with __set_current_state(TASK_INTERRUPTIBLE) +* done by the caller to avoid the race with signal_wake_up(). +*/ +smp_mb__before_spinlock ();raw_spin_lock_irq (&rq->lock); switch_count = &prev->nivcsw;
kernel/sched/fair.c +7 -0
@@ -936,6 +936,13 @@ void task_numa_work(struct callback_head *work)if (vma->vm_end - vma->vm_start <HPAGE_SIZE )continue ; +/* +* Skip inaccessible VMAs to avoid any confusion between +* PROT_NONE and NUMA hinting ptes +*/ +if (!(vma->vm_flags & (VM_READ |VM_EXEC |VM_WRITE ))) +continue ; + do { start = max(start, vma->vm_start); end = ALIGN(start + (pages << PAGE_SHIFT), HPAGE_SIZE);
kernel/sched/rt.c +14 -0
@@ -964,6 +964,13 @@ inc_rt_prio_smp(struct rt_rq *rt_rq, int prio, int prev_prio) {struct rq *rq =rq_of_rt_rq (rt_rq); +#ifdef CONFIG_RT_GROUP_SCHED +/* +* Change rq's cpupri only if rt_rq is the top queue. +*/ +if (&rq->rt != rt_rq) +return ; +#endif if (rq->online && prio < prev_prio)cpupri_set (&rq->rd->cpupri, rq->cpu, prio); }
@@ -973,6 +980,13 @@ dec_rt_prio_smp(struct rt_rq *rt_rq, int prio, int prev_prio) {struct rq *rq =rq_of_rt_rq (rt_rq); +#ifdef CONFIG_RT_GROUP_SCHED +/* +* Change rq's cpupri only if rt_rq is the top queue. +*/ +if (&rq->rt != rt_rq) +return ; +#endif if (rq->online && rt_rq->highest_prio.curr != prev_prio)cpupri_set (&rq->rd->cpupri, rq->cpu, rt_rq->highest_prio.curr); }
kernel/trace/ftrace.c +1 -1
@@ -750,7 +750,7 @@ static int ftrace_profile_init(void)int cpu;int ret =0 ; -for_each_online_cpu (cpu) { +for_each_possible_cpu (cpu) { ret =ftrace_profile_init_cpu (cpu);if (ret)break ;
mm/compaction.c +4 -0
@@ -134,6 +134,10 @@ static void update_pageblock_skip(struct compact_control *cc, bool migrate_scanner) {struct zone *zone = cc->zone; + +if (cc->ignore_skip_hint) +return ; +if (!page)return ;
mm/fremap.c +5 -3
@@ -203,9 +203,10 @@ get_write_lock:if (mapping_cap_account_dirty (mapping)) {unsigned long addr;struct file *file =get_file (vma->vm_file); +/* mmap_region may free vma; grab the info now */ + vm_flags = vma->vm_flags; - addr =mmap_region (file, start, size, - vma->vm_flags, pgoff); + addr =mmap_region (file, start, size, vm_flags, pgoff);fput (file);if (IS_ERR_VALUE (addr)) { err = addr;
@@ -213,7 +214,7 @@ get_write_lock:BUG_ON (addr != start); err =0 ; } - goto out; + goto out_freed; }mutex_lock (&mapping->i_mmap_mutex);flush_dcache_mmap_lock (mapping);
@@ -248,6 +249,7 @@ get_write_lock: out:if (vma) vm_flags = vma->vm_flags; +out_freed:if (likely (!has_write_lock))up_read (&mm->mmap_sem);else
mm/huge_memory.c +14 -0
@@ -1344,6 +1344,20 @@ int do_huge_pmd_numa_page(struct mm_struct *mm, struct vm_area_struct *vma, goto out_unlock; } +/* Bail if we fail to protect against THP splits for any reason */ +if (unlikely (!anon_vma)) { +put_page (page); + page_nid =-1 ; + goto clear_pmdnuma; + } + +/* +* The page_table_lock above provides a memory barrier +* with change_protection_range. +*/ +if (mm_tlb_flush_pending (mm)) +flush_tlb_range (vma, haddr, haddr +HPAGE_PMD_SIZE ); +/* * Migrate the THP to the requested node, returns with page unlocked * and pmd_numa cleared.
mm/memcontrol.c +1 -1
@@ -379,7 +379,7 @@ struct mem_cgroup {static size_t memcg_size (void ) {return sizeof (struct mem_cgroup ) + - nr_node_ids *sizeof (struct mem_cgroup_per_node ); + nr_node_ids *sizeof (struct mem_cgroup_per_node *); }/* internal only representation about the status of kmem accounting. */
mm/memory-failure.c +10 -0
@@ -936,6 +936,16 @@ static int hwpoison_user_mappings(struct page *p, unsigned long pfn,BUG_ON (!PageHWPoison (p));return SWAP_FAIL ; } +/* +* We pinned the head page for hwpoison handling, +* now we split the thp and we are interested in +* the hwpoisoned raw page, so move the refcount +* to it. +*/ +if (hpage != p) { +put_page (hpage); +get_page (p); + }/* THP is split, so ppage should be the real poisoned page. */ ppage = p; }
mm/migrate.c +3 -1
@@ -1715,7 +1715,8 @@ int migrate_misplaced_transhuge_page(struct mm_struct *mm,putback_lru_page (page);mod_zone_page_state (page_zone (page),NR_ISOLATED_ANON + page_lru, -HPAGE_PMD_NR ); - goto out_fail; + + goto out_unlock; }/*
@@ -1765,6 +1766,7 @@ out_dropref:set_pmd_at (mm, haddr, pmd, entry);update_mmu_cache_pmd (vma, address, &entry); +out_unlock:unlock_page (page);put_page (page);return 0 ;
mm/mprotect.c +2 -0
@@ -206,6 +206,7 @@ static unsigned long change_protection_range(struct vm_area_struct *vma,BUG_ON (addr >= end); pgd =pgd_offset (mm, addr);flush_cache_range (vma, addr, end); +set_tlb_flush_pending (mm); do { next = pgd_addr_end(addr, end); if (pgd_none_or_clear_bad(pgd))
@@ -217,6 +218,7 @@ static unsigned long change_protection_range(struct vm_area_struct *vma,/* Only flush the TLB if we actually modified any entries: */ if (pages)flush_tlb_range (vma, start, end); +clear_tlb_flush_pending (mm);return pages; }
mm/pgtable-generic.c +6 -2
@@ -86,9 +86,10 @@ int pmdp_clear_flush_young(struct vm_area_struct *vma,pte_t ptep_clear_flush (struct vm_area_struct *vma,unsigned long address,pte_t *ptep) { +struct mm_struct *mm = (vma)->vm_mm;pte_t pte; - pte =ptep_get_and_clear ((vma)->vm_mm, address, ptep); -if (pte_accessible (pte)) + pte =ptep_get_and_clear (mm, address, ptep); +if (pte_accessible (mm, pte))flush_tlb_page (vma, address);return pte; }
@@ -166,6 +167,9 @@ pgtable_t pgtable_trans_huge_withdraw(struct mm_struct *mm)void pmdp_invalidate (struct vm_area_struct *vma,unsigned long address,pmd_t *pmdp) { +pmd_t entry = *pmdp; +if (pmd_numa (entry)) + entry =pmd_mknonnuma (entry);set_pmd_at (vma->vm_mm, address, pmdp,pmd_mknotpresent (*pmdp));flush_tlb_range (vma, address, address +HPAGE_PMD_SIZE ); }
mm/rmap.c +4 -0
@@ -600,7 +600,11 @@ pte_t *__page_check_address(struct page *page, struct mm_struct *mm,spinlock_t *ptl;if (unlikely (PageHuge (page))) { +/* when pud is not present, pte will be NULL */ pte =huge_pte_offset (mm, address); +if (!pte) +return NULL ; + ptl = &mm->page_table_lock; goto check; }
net/ceph/osd_client.c +46 -36
191 lines not on this page · raw message
net/wireless/radiotap.c +4 -0
@@ -124,6 +124,10 @@ int ieee80211_radiotap_iterator_init(/* find payload start allowing for extended bitmap(s) */ if (iterator->_bitmap_shifter & (1 <<IEEE80211_RADIOTAP_EXT )) { +if ((unsigned long )iterator->_arg - + (unsigned long )iterator->_rtheader +sizeof (uint32_t ) > + (unsigned long )iterator->_max_length) +return -EINVAL ;while (get_unaligned_le32 (iterator->_arg) & (1 <<IEEE80211_RADIOTAP_EXT )) { iterator->_arg +=sizeof (uint32_t );
security/selinux/hooks.c +42 -11
96 lines not on this page · raw message
security/selinux/include/xfrm.h +5 -4
@@ -47,6 +47,7 @@ int selinux_xfrm_sock_rcv_skb(u32 sid, struct sk_buff *skb,int selinux_xfrm_postroute_last (u32 isec_sid,struct sk_buff *skb,struct common_audit_data *ad,u8 proto);int selinux_xfrm_decode_session (struct sk_buff *skb,u32 *sid,int ckall); +int selinux_xfrm_skb_sid (struct sk_buff *skb,u32 *sid);static inline void selinux_xfrm_notify_policyload (void ) {
@@ -80,12 +81,12 @@ static inline int selinux_xfrm_decode_session(struct sk_buff *skb, u32 *sid, intstatic inline void selinux_xfrm_notify_policyload (void ) { } -#endif -static inline void selinux_skb_xfrm_sid (struct sk_buff *skb,u32 *sid) +static inline int selinux_xfrm_skb_sid (struct sk_buff *skb,u32 *sid) { -int err =selinux_xfrm_decode_session (skb, sid,0 ); -BUG_ON (err); + *sid =SECSID_NULL ; +return 0 ; } +#endif #endif /* _SELINUX_XFRM_H_ */
security/selinux/xfrm.c +42 -11
62 lines not on this page · raw message
tools/power/cpupower/utils/cpupower-set.c +3 -3
Lines of this file are not shown. View the 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.