Linux 4.9.32
Greg KH
maintainerI'm announcing the release of the 4.9.32 kernel.
All users of the 4.9 kernel series must upgrade.
The updated 4.9.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.9.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
------------
Makefile | 2 arch/arm/kernel/setup.c | 10 + arch/arm/kvm/init.S | 5 arch/arm/kvm/mmu.c | 3 arch/arm/mm/mmu.c | 69 ++++-------- arch/arm/mm/nommu.c | 8 - arch/arm64/include/asm/asm-uaccess.h | 13 ++ arch/arm64/include/asm/sysreg.h | 4 arch/arm64/include/asm/uaccess.h | 6 - arch/arm64/kernel/entry.S | 6 - arch/arm64/kernel/hw_breakpoint.c | 3 arch/arm64/kernel/traps.c | 4 arch/arm64/kvm/hyp-init.S | 11 +- arch/powerpc/include/asm/topology.h | 14 ++ arch/powerpc/kernel/process.c | 3 arch/powerpc/kernel/setup_64.c | 4 arch/powerpc/platforms/pseries/hotplug-memory.c | 2 arch/powerpc/sysdev/simple_gpio.c | 3 arch/sparc/Kconfig | 4 arch/sparc/include/asm/mmu_64.h | 2 arch/sparc/include/asm/mmu_context_64.h | 32 ----- arch/sparc/include/asm/pil.h | 1 arch/sparc/include/asm/vio.h | 1 arch/sparc/kernel/irq_64.c | 17 ++- arch/sparc/kernel/kernel.h | 1 arch/sparc/kernel/smp_64.c | 31 ----- arch/sparc/kernel/tsb.S | 11 +- arch/sparc/kernel/ttable_64.S | 2 arch/sparc/kernel/vio.c | 68 +++++++++++- arch/sparc/lib/Makefile | 1 arch/sparc/lib/multi3.S | 35 ++++++ arch/sparc/mm/init_64.c | 86 ++++++++++----- arch/sparc/mm/tsb.c | 7 - arch/sparc/mm/ultra.S | 5 arch/x86/kernel/kvm.c | 2 arch/x86/kvm/cpuid.c | 20 ++- arch/x86/kvm/mmu.c | 7 - arch/x86/kvm/mmu.h | 1 arch/x86/kvm/x86.c | 3 arch/x86/platform/efi/quirks.c | 3 block/cfq-iosched.c | 17 ++- crypto/asymmetric_keys/public_key.c | 2 crypto/drbg.c | 5 crypto/gcm.c | 6 - drivers/ata/ahci.c | 38 ++++++ drivers/char/mem.c | 2 drivers/cpufreq/cpufreq.c | 1 drivers/dma/ep93xx_dma.c | 39 ++++++- drivers/dma/mv_xor_v2.c | 109 ++++++++------------ drivers/dma/sh/usb-dmac.c | 2 drivers/gpu/drm/amd/amdgpu/ci_dpm.c | 6 + drivers/gpu/drm/drm_drv.c | 7 + drivers/gpu/drm/i915/i915_drv.c | 4 drivers/gpu/drm/i915/i915_drv.h | 2 drivers/gpu/drm/i915/intel_bios.c | 46 +++++--- drivers/gpu/drm/msm/msm_drv.c | 1 drivers/gpu/drm/msm/msm_drv.h | 1 drivers/gpu/drm/msm/msm_gem_prime.c | 7 + drivers/gpu/drm/nouveau/include/nvkm/subdev/timer.h | 1 drivers/gpu/drm/nouveau/nvkm/subdev/timer/base.c | 7 - drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c | 2 drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 21 ++- drivers/iio/adc/bcm_iproc_adc.c | 8 - drivers/iio/light/ltr501.c | 4 drivers/iio/proximity/as3935.c | 8 - drivers/input/mouse/elantech.c | 16 ++ drivers/misc/cxl/file.c | 7 - drivers/misc/cxl/native.c | 14 ++ drivers/misc/mei/bus.c | 4 drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 2 drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 4 drivers/net/ethernet/ethoc.c | 3 drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 2 drivers/net/vxlan.c | 39 +++++-- drivers/scsi/qla2xxx/qla_bsg.c | 9 - drivers/scsi/qla2xxx/qla_dbg.c | 4 drivers/scsi/qla2xxx/qla_mbx.c | 4 drivers/scsi/qla2xxx/qla_os.c | 8 - drivers/scsi/qla2xxx/qla_tmpl.c | 2 drivers/staging/lustre/lustre/lov/lov_pack.c | 9 - drivers/target/target_core_transport.c | 23 +++- drivers/tty/serial/ifx6x60.c | 2 drivers/tty/serial/sh-sci.c | 10 + drivers/usb/chipidea/debug.c | 3 drivers/usb/chipidea/udc.c | 8 + drivers/usb/gadget/function/f_mass_storage.c | 13 ++ drivers/xen/privcmd.c | 4 fs/block_dev.c | 2 fs/btrfs/extent-tree.c | 1 fs/btrfs/file.c | 2 fs/btrfs/inode.c | 4 fs/buffer.c | 12 +- fs/ceph/addr.c | 2 fs/direct-io.c | 2 fs/ext4/extents.c | 85 +++++++-------- fs/ext4/file.c | 50 ++------- fs/ext4/inode.c | 15 +- fs/ext4/mballoc.c | 2 fs/ext4/move_extent.c | 2 fs/iomap.c | 4 fs/jfs/super.c | 4 fs/mpage.c | 2 fs/nfsd/blocklayout.c | 6 - fs/nfsd/nfs4proc.c | 13 +- fs/nfsd/nfs4xdr.c | 13 +- fs/nilfs2/btnode.c | 2 fs/nilfs2/inode.c | 4 fs/nilfs2/mdt.c | 4 fs/nilfs2/segment.c | 2 fs/ocfs2/aops.c | 2 fs/ocfs2/file.c | 2 fs/orangefs/orangefs-utils.c | 4 fs/reiserfs/file.c | 2 fs/reiserfs/inode.c | 2 fs/stat.c | 3 fs/udf/inode.c | 2 fs/ufs/balloc.c | 26 ++++ fs/ufs/inode.c | 9 + fs/ufs/super.c | 18 +++ fs/ufs/util.h | 10 + fs/xfs/xfs_aops.c | 16 +- fs/xfs/xfs_file.c | 4 include/linux/cgroup-defs.h | 1 include/linux/cgroup.h | 20 +++ include/linux/fs.h | 5 include/linux/ptrace.h | 7 - include/net/ipv6.h | 1 kernel/cgroup.c | 5 kernel/cpu.c | 4 kernel/cpuset.c | 4 kernel/events/core.c | 21 +++ kernel/ptrace.c | 20 ++- kernel/sched/cpufreq_schedutil.c | 28 ++--- lib/test_user_copy.c | 20 +++ mm/truncate.c | 2 net/bridge/br_stp_if.c | 3 net/ipv4/af_inet.c | 2 net/ipv4/tcp_cong.c | 1 net/ipv6/calipso.c | 6 - net/ipv6/ip6_offload.c | 4 net/ipv6/ping.c | 2 net/ipv6/raw.c | 2 net/ipv6/xfrm6_mode_ro.c | 2 net/ipv6/xfrm6_mode_transport.c | 2 net/netfilter/nft_set_rbtree.c | 22 ++-- security/keys/encrypted-keys/encrypted.c | 17 +-- security/keys/key.c | 5 security/keys/keyctl.c | 4 sound/core/timer.c | 7 - sound/soc/soc-core.c | 5 virt/kvm/arm/vgic/vgic-v2.c | 7 + virt/kvm/arm/vgic/vgic-v3.c | 7 + 152 files changed, 1026 insertions(+), 589 deletions(-)
Al Viro (6):
ufs: restore proper tail allocation
fix ufs_isblockset()
ufs: restore maintaining ->i_blocks
ufs: set correct ->s_maxsize
ufs_extend_tail(): fix the braino in calling conventions of ufs_new_fragments()
ufs_getfrag_block(): we only grab ->truncate_mutex on block creation pathAlex Deucher (1):
drm/amdgpu/ci: disable mclk switching for high refresh rates (v2)
Alexander Sverdlin (2):
dmaengine: ep93xx: Always start from BASE0
dmaengine: ep93xx: Don't drain the transfers in terminate_all()
Ben Hutchings (1):
ipv6: xfrm: Handle errors reported by xfrm6_find_1stfragopt()
Ben Skeggs (1):
drm/nouveau/tmr: fully separate alarm execution/pending lists
Breno Leitao (2):
powerpc/kernel: Fix FP and vector register restoration powerpc/kernel: Initialize load_tm on task creation
Christophe Leroy (1):
powerpc/sysdev/simple_gpio: Fix oops in gpio save_regs function
Dan Carpenter (1):
drm/vmwgfx: Handle vmalloc() failure in vmw_local_fifo_reserve()
David Arcari (1):
cpufreq: cpufreq_register_driver() should return -ENODEV if init fails
David S. Miller (2):
ipv6: Fix leak in ipv6_gso_segment().
sparc64: Add __multi3 for gcc 7.x and later.
David Sterba (1):
btrfs: use correct types for page indices in btrfs_page_exists_in_range
Eric Anholt (1):
drm/msm: Expose our reservation object when exporting a dmabuf.
Eric Biggers (3):
KEYS: fix dereferencing NULL payload with nonzero length
KEYS: fix freeing uninitialized memory in key_update()
KEYS: encrypted: avoid encrypting/decrypting stack buffers
Eric Dumazet (1):
net: ping: do not abuse udp_poll()
Eric W. Biederman (1):
ptrace: Properly initialize ptracer_cred on fork
Fabian Frederick (1):
fs: add i_blocksize()
Franziska Naepelt (1):
iio: light: ltr501 Fix interchanged als/ps register field
Frederic Barrat (1):
cxl: Fix error path on bad ioctl
Ganesh Goudar (1):
cxgb4: avoid enabling napi twice to the same queue
Gilad Ben-Yossef (3):
crypto: asymmetric_keys - handle EBUSY due to backlog correctly
crypto: drbg - wait for crypto op not signal safe
crypto: gcm - wait for crypto op not signal safe
Greg Kroah-Hartman (1):
Linux 4.9.32
Hanna Hawa (1):
dmaengine: mv_xor_v2: enable XOR engine after its configuration
Hans de Goede (1):
drm: Fix oops + Xserver hang when unplugging USB drm devices
Hiroyuki Yokoyama (1):
dmaengine: usb-dmac: Fix DMAOR AE bit definition
Hou Tao (1):
cfq-iosched: fix the delay of cfq_group's vdisktime under iops mode
J. Bruce Fields (1):
nfsd4: fix null dereference on replay
James Clarke (1):
sparc: Machine description indices can vary
Jan Kara (3):
ext4: fix SEEK_HOLE
ext4: fix data corruption with EXT4_GET_BLOCKS_ZERO
ext4: fix fdatasync(2) after extent manipulation operations
Jane Chu (1):
arch/sparc: support NR_CPUS = 4096
Jani Nikula (2):
drm/i915/vbt: don't propagate errors from intel_bios_init() drm/i915/vbt: split out defaults that are set when there is no VBT
Jeff Mahoney (1):
btrfs: fix memory leak in update_space_info failure path
Jin Yao (1):
perf/core: Drop kernel samples even though :u is specified
Jisheng Zhang (1):
usb: chipidea: udc: fix NULL pointer dereference if udc_start failed
Joe Carnuccio (3):
scsi: qla2xxx: Modify T262 FW dump template to specify same start/end to debug customer issues
scsi: qla2xxx: Set bit 15 for DIAG_ECHO_TEST MBC
scsi: qla2xxx: Fix mailbox pointer error in fwdump capture
Johan Hovold (1):
serial: ifx6x60: fix use-after-free on module unload
Johannes Thumshirn (1):
scsi: qla2xxx: don't disable a not previously enabled PCI device
Juergen Gross (1):
efi: Don't issue error message when booted under Xen
Julien Grall (1):
xen/privcmd: Support correctly 64KB page granularity when mapping memory
Julius Werner (1):
drivers: char: mem: Fix wraparound check to allow mappings up to the end
Kees Cook (1):
usercopy: Adjust tests to deal with SMAP/PAN
Konstantin Khlebnikov (1):
ext4: keep existing extra fields when inode expands
Kristina Martsenko (3):
arm64: traps: fix userspace cache maintenance emulation on a tagged pointer
arm64: hw_breakpoint: fix watchpoint matching for tagged pointers
arm64: entry: improve data abort handling of tagged pointers
Lance Richardson (1):
vxlan: eliminate cached dst leak
Laura Abbott (2):
ARM: 8636/1: Cleanup sanity_check_meminfo
ARM: 8637/1: Adjust memory boundaries after reservations
Marc Zyngier (6):
arm64: KVM: Preserve RES1 bits in SCTLR_EL2
arm64: KVM: Allow unaligned accesses at EL2
arm: KVM: Allow unaligned accesses at HYP
KVM: arm/arm64: vgic-v3: Do not use Active+Pending state for a HW interrupt
KVM: arm/arm64: vgic-v2: Do not use Active+Pending state for a HW interrupt
KVM: arm/arm64: Handle possible NULL stage2 pud when ageing pages
Mark Bloch (1):
vxlan: fix use-after-free on deletion
Matt Ranostay (2):
iio: proximity: as3935: fix AS3935_INT mask
iio: proximity: as3935: fix iio_trigger_poll issue
Max Filippov (1):
net: ethoc: enable NAPI before poll may be scheduled
Michael Bringmann (1):
powerpc/hotplug-mem: Fix missing endian conversion of aa_index
Michael Ellerman (1):
powerpc/numa: Fix percpu allocations to be NUMA aware
Michael Thalmeier (1):
usb: chipidea: debug: check before accessing ci_role
Mike Kravetz (1):
sparc64: mm: fix copy_tsb to correctly copy huge page TSBs
Mintz, Yuval (1):
bnx2x: Fix Multi-Cos
Nicholas Bellinger (1):
target: Re-add check to reject control WRITEs with overflow data
Niklas Cassel (1):
net: stmmac: fix completely hung TX when using TSO
Nikolay Aleksandrov (1):
net: bridge: start hello timer only if device is up
Oleg Drokin (1):
staging/lustre/lov: remove set_fs() call from lov_getstripe()
Pablo Neira Ayuso (1):
netfilter: nft_set_rbtree: handle element re-addition after deletion
Paolo Bonzini (1):
kvm: async_pf: fix rcu_irq_enter() with irqs enabled
Pavel Tatashin (6):
sparc64: reset mm cpumask after wrap
sparc64: combine activate_mm and switch_mm
sparc64: redefine first version
sparc64: add per-cpu mm of secondary contexts
sparc64: new context wrap
sparc64: delete old wrap code
Pratyush Anand (1):
mei: make sysfs modalias format similar as uevent modalias
Rafael J. Wysocki (1):
cpufreq: schedutil: Fix per-CPU structure initialization in sugov_start()
Raveendra Padasalagi (1):
iio: adc: bcm_iproc_adc: swap primary and secondary isr handler's
Richard Haines (1):
net/ipv6: Fix CALIPSO causing GPF with datagram support
Sebastian Andrzej Siewior (1):
cpu/hotplug: Drop the device lock on error
Sinclair Yeh (1):
drm/vmwgfx: Make sure backup_handle is always valid
Sui Chen (1):
ahci: Acer SA5-271 SSD Not Detected Fix
Takashi Iwai (3):
ALSA: timer: Fix race between read and ioctl
ALSA: timer: Fix missing queue indices reset at SNDRV_TIMER_IOCTL_SELECT
ASoC: Fix use-after-free at card unregistration
Takatoshi Akiyama (1):
serial: sh-sci: Fix panic when serial console and DMA are enabled
Tejun Heo (1):
cpuset: consider dying css as offline
Thinh Nguyen (1):
usb: gadget: f_mass_storage: Serialize wake and sleep execution
Thomas Petazzoni (6):
dmaengine: mv_xor_v2: handle mv_xor_v2_prep_sw_desc() error properly
dmaengine: mv_xor_v2: properly handle wrapping in the array of HW descriptors
dmaengine: mv_xor_v2: do not use descriptors not acked by async_tx
dmaengine: mv_xor_v2: fix tx_submit() implementation
dmaengine: mv_xor_v2: remove interrupt coalescing
dmaengine: mv_xor_v2: set DMA mask to 40 bits
Trond Myklebust (1):
nfsd: Fix up the "supattr_exclcreat" attributes
Ulrik De Bie (1):
Input: elantech - add Fujitsu Lifebook E546/E557 to force crc_enabled
Vaibhav Jain (1):
cxl: Avoid double free_irq() for psl,slice interrupts
Viresh Kumar (1):
cpufreq: schedutil: move cached_raw_freq to struct sugov_policy
Vladis Dronov (1):
drm/vmwgfx: limit the number of mip levels in vmw_gb_surface_define_ioctl()
Waiman Long (1):
cgroup: Prevent kill_css() from being called more than once
Wanpeng Li (2):
KVM: cpuid: Fix read/write out-of-bounds vulnerability in cpuid emulation
KVM: async_pf: avoid async pf injection when in guest mode
Yuchung Cheng (1):
tcp: disallow cwnd undo when switching congestion control
Greg KH
maintainerMakefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 4 PATCHLEVEL = 9 -SUBLEVEL = 31 +SUBLEVEL = 32 EXTRAVERSION = NAME = Roaring Lionus
arch/arm/kernel/setup.c +8 -2
@@ -81,7 +81,7 @@ __setup("fpe=", fpe_setup);extern void init_default_cache_policy (unsigned long );extern void paging_init (const struct machine_desc *desc);extern void early_paging_init (const struct machine_desc *); -extern void sanity_check_meminfo (void ); +extern void adjust_lowmem_bounds (void );extern enum reboot_mode reboot_mode;extern void setup_dma_zone (const struct machine_desc *desc);
@@ -1093,8 +1093,14 @@ void __init setup_arch(char **cmdline_p)setup_dma_zone (mdesc);xen_early_init ();efi_init (); -sanity_check_meminfo (); +/* +* Make sure the calculation for lowmem/highmem is set appropriately +* before reserving/allocating any mmeory +*/ +adjust_lowmem_bounds ();arm_memblock_init (mdesc); +/* Memory may have been removed so recalculate the bounds. */ +adjust_lowmem_bounds ();early_ioremap_reset ();
arch/arm/kvm/init.S +2 -3
@@ -95,7 +95,6 @@ __do_hyp_init: @ - Write permission implies XN: disabled @ - Instruction cache: enabled @ - Data/Unified cache: enabled - @ - Memory alignment checks: enabled @ - MMU: enabled (this code must be run from an identity mapping) mrc p15, 4, r0, c1, c0, 0 @ HSCR ldr r2, =HSCTLR_MASK
@@ -103,8 +102,8 @@ __do_hyp_init: mrc p15, 0, r1, c1, c0, 0 @ SCTLR ldr r2, =(HSCTLR_EE | HSCTLR_FI | HSCTLR_I | HSCTLR_C) and r1, r1, r2 - ARM( ldr r2, =(HSCTLR_M | HSCTLR_A) ) - THUMB( ldr r2, =(HSCTLR_M | HSCTLR_A | HSCTLR_TE) ) + ARM( ldr r2, =(HSCTLR_M) ) + THUMB( ldr r2, =(HSCTLR_M | HSCTLR_TE) ) orr r1, r1, r2 orr r0, r0, r1 mcr p15, 4, r0, c1, c0, 0 @ HSCR
arch/arm/kvm/mmu.c +3 -0
@@ -872,6 +872,9 @@ static pmd_t *stage2_get_pmd(struct kvm *kvm, struct kvm_mmu_memory_cache *cachepmd_t *pmd; pud =stage2_get_pud (kvm, cache, addr); +if (!pud) +return NULL ; +if (stage2_pud_none (*pud)) {if (!cache)return NULL ;
arch/arm/mm/mmu.c +27 -42
103 lines not on this page · raw message
arch/arm/mm/nommu.c +4 -4
@@ -85,7 +85,7 @@ static unsigned long irbar_read(void) }/* MPU initialisation functions */ -void __init sanity_check_meminfo_mpu (void ) +void __init adjust_lowmem_bounds_mpu (void ) {phys_addr_t phys_offset =PHYS_OFFSET ;phys_addr_t aligned_region_size, specified_mem_size, rounded_mem_size;
@@ -274,7 +274,7 @@ void __init mpu_setup(void) } }#else -static void sanity_check_meminfo_mpu (void ) {} +static void adjust_lowmem_bounds_mpu (void ) {}static void __init mpu_setup (void ) {}#endif /* CONFIG_ARM_MPU */
@@ -295,10 +295,10 @@ void __init arm_mm_memblock_reserve(void)#endif } -void __init sanity_check_meminfo (void ) +void __init adjust_lowmem_bounds (void ) {phys_addr_t end; -sanity_check_meminfo_mpu (); +adjust_lowmem_bounds_mpu (); end =memblock_end_of_DRAM (); high_memory =__va (end -1 ) +1 ;memblock_set_current_limit (end);
arch/arm64/include/asm/asm-uaccess.h new file +13 -0
@@ -0,0 +1,13 @@ +#ifndef __ASM_ASM_UACCESS_H +#define __ASM_ASM_UACCESS_H + +/* +* Remove the address tag from a virtual address, if present. +*/ + .macro clear_address_tag, dst, addr + tst \addr, #(1 << 55) + bic \dst, \addr, #(0xff << 56) + csel \dst, \dst, \addr, eq + .endm + +#endif
arch/arm64/include/asm/sysreg.h +4 -0
@@ -94,6 +94,10 @@#define SCTLR_ELx_A (1 << 1)#define SCTLR_ELx_M 1 +#define SCTLR_EL2_RES1 ((1 << 4) | (1 << 5) | (1 << 11) | (1 << 16) | \ + (1 << 16) | (1 << 18) | (1 << 22) | (1 << 23) | \ + (1 << 28) | (1 << 29)) +#define SCTLR_ELx_FLAGS (SCTLR_ELx_M | SCTLR_ELx_A | SCTLR_ELx_C | \ SCTLR_ELx_SA | SCTLR_ELx_I)
arch/arm64/include/asm/uaccess.h +3 -3
@@ -105,9 +105,9 @@ static inline void set_fs(mm_segment_t fs) })/* -* When dealing with data aborts or instruction traps we may end up with -* a tagged userland pointer. Clear the tag to get a sane pointer to pass -* on to access_ok(), for instance. +* When dealing with data aborts, watchpoints, or instruction traps we may end +* up with a tagged userland pointer. Clear the tag to get a sane pointer to +* pass on to access_ok(), for instance. */ #define untagged_addr (addr) sign_extend64(addr, 55)
arch/arm64/kernel/entry.S +4 -2
@@ -30,6 +30,7 @@ #include <asm/irq.h> #include <asm/memory.h> #include <asm/thread_info.h> +#include <asm/asm-uaccess.h> #include <asm/unistd.h> /*
@@ -369,12 +370,13 @@ el1_da: /* * Data abort handling */ - mrs x0, far_el1 + mrs x3, far_el1 enable_dbg // re-enable interrupts if they were enabled in the aborted context tbnz x23, #7, 1f // PSR_I_BIT enable_irq 1: + clear_address_tag x0, x3 mov x2, sp // struct pt_regs bl do_mem_abort
@@ -535,7 +537,7 @@ el0_da: // enable interrupts before calling the main handler enable_dbg_and_irq ct_user_exit - bic x0, x26, #(0xff << 56) + clear_address_tag x0, x26 mov x1, x25 mov x2, sp bl do_mem_abort
arch/arm64/kernel/hw_breakpoint.c +2 -1
@@ -36,6 +36,7 @@#include <asm/traps.h> #include <asm/cputype.h> #include <asm/system_misc.h> +#include <asm/uaccess.h> /* Breakpoint currently in use for each BRP. */ static DEFINE_PER_CPU(struct perf_event *, bp_on_reg[ARM_MAX_BRP]);
@@ -696,7 +697,7 @@ static int watchpoint_handler(unsigned long addr, unsigned int esr,/* Check if the watchpoint value matches. */ val =read_wb_reg (AARCH64_DBG_REG_WVR , i); -if (val != (addr & ~alignment_mask)) +if (val != (untagged_addr (addr) & ~alignment_mask)) goto unlock;/* Possible match, check the byte address select to confirm. */
arch/arm64/kernel/traps.c +2 -2
@@ -435,7 +435,7 @@ int cpu_enable_cache_maint_trap(void *__unused) }#define __user_cache_maint (insn, address, res) \ - if (untagged_addr(address) >= user_addr_max()) \ + if (address >= user_addr_max()) \ res = -EFAULT; \ else \ asm volatile ( \
@@ -458,7 +458,7 @@ static void user_cache_maint_handler(unsigned int esr, struct pt_regs *regs)int crm = (esr & ESR_ELx_SYS64_ISS_CRM_MASK) >> ESR_ELx_SYS64_ISS_CRM_SHIFT;int ret =0 ; - address = (rt ==31 ) ?0 : regs->regs[rt]; + address = (rt ==31 ) ?0 :untagged_addr (regs->regs[rt]);switch (crm) {case ESR_ELx_SYS64_ISS_CRM_DC_CVAU:/* DC CVAU, gets promoted */
arch/arm64/kvm/hyp-init.S +7 -4
@@ -102,10 +102,13 @@ __do_hyp_init: tlbi alle2 dsb sy - mrs x4, sctlr_el2 - and x4, x4, #SCTLR_ELx_EE // preserve endianness of EL2 - ldr x5, =SCTLR_ELx_FLAGS - orr x4, x4, x5 + /* + * Preserve all the RES1 bits while setting the default flags, + * as well as the EE bit on BE. Drop the A flag since the compiler + * is allowed to generate unaligned accesses. + */ + ldr x4, =(SCTLR_EL2_RES1 | (SCTLR_ELx_FLAGS & ~SCTLR_ELx_A)) +CPU_BE( orr x4, x4, #SCTLR_ELx_EE) msr sctlr_el2, x4 isb
arch/powerpc/include/asm/topology.h +14 -0
@@ -44,8 +44,22 @@ extern void __init dump_numa_cpu_topology(void);extern int sysfs_add_device_to_node (struct device *dev,int nid);extern void sysfs_remove_device_from_node (struct device *dev,int nid); +static inline int early_cpu_to_node (int cpu) +{ +int nid; + + nid = numa_cpu_lookup_table[cpu]; + +/* +* Fall back to node 0 if nid is unset (it should be, except bugs). +* This allows callers to safely do NODE_DATA(early_cpu_to_node(cpu)). +*/ +return (nid <0 ) ?0 : nid; +}#else +static inline int early_cpu_to_node (int cpu) {return 0 ; } +static inline void dump_numa_cpu_topology (void ) {}static inline int sysfs_add_device_to_node (struct device *dev,int nid)
arch/powerpc/kernel/process.c +3 -0
@@ -1659,6 +1659,7 @@ void start_thread(struct pt_regs *regs, unsigned long start, unsigned long sp)#ifdef CONFIG_VSX current->thread.used_vsr =0 ;#endif + current->thread.load_fp =0 ;memset (¤t->thread.fp_state,0 ,sizeof (current->thread.fp_state)); current->thread.fp_save_area =NULL ;#ifdef CONFIG_ALTIVEC
@@ -1667,6 +1668,7 @@ void start_thread(struct pt_regs *regs, unsigned long start, unsigned long sp) current->thread.vr_save_area =NULL ; current->thread.vrsave =0 ; current->thread.used_vr =0 ; + current->thread.load_vec =0 ;#endif /* CONFIG_ALTIVEC */ #ifdef CONFIG_SPE memset (current->thread.evr,0 ,sizeof (current->thread.evr));
@@ -1678,6 +1680,7 @@ void start_thread(struct pt_regs *regs, unsigned long start, unsigned long sp) current->thread.tm_tfhar =0 ; current->thread.tm_texasr =0 ; current->thread.tm_tfiar =0 ; + current->thread.load_tm =0 ;#endif /* CONFIG_PPC_TRANSACTIONAL_MEM */ }EXPORT_SYMBOL (start_thread);
arch/powerpc/kernel/setup_64.c +2 -2
@@ -595,7 +595,7 @@ void __init emergency_stack_init(void)static void *__init pcpu_fc_alloc (unsigned int cpu,size_t size,size_t align) { -return __alloc_bootmem_node (NODE_DATA (cpu_to_node (cpu)), size, align, +return __alloc_bootmem_node (NODE_DATA (early_cpu_to_node (cpu)), size, align,__pa (MAX_DMA_ADDRESS )); }
@@ -606,7 +606,7 @@ static void __init pcpu_fc_free(void *ptr, size_t size)static int pcpu_cpu_distance (unsigned int from,unsigned int to) { -if (cpu_to_node (from) ==cpu_to_node (to)) +if (early_cpu_to_node (from) ==early_cpu_to_node (to))return LOCAL_DISTANCE ;else return REMOTE_DISTANCE ;
arch/powerpc/platforms/pseries/hotplug-memory.c +2 -0
@@ -124,6 +124,7 @@ static struct property *dlpar_clone_drconf_property(struct device_node *dn)for (i =0 ; i < num_lmbs; i++) { lmbs[i].base_addr =be64_to_cpu (lmbs[i].base_addr); lmbs[i].drc_index =be32_to_cpu (lmbs[i].drc_index); + lmbs[i].aa_index =be32_to_cpu (lmbs[i].aa_index); lmbs[i].flags =be32_to_cpu (lmbs[i].flags); }
@@ -147,6 +148,7 @@ static void dlpar_update_drconf_property(struct device_node *dn,for (i =0 ; i < num_lmbs; i++) { lmbs[i].base_addr =cpu_to_be64 (lmbs[i].base_addr); lmbs[i].drc_index =cpu_to_be32 (lmbs[i].drc_index); + lmbs[i].aa_index =cpu_to_be32 (lmbs[i].aa_index); lmbs[i].flags =cpu_to_be32 (lmbs[i].flags); }
arch/powerpc/sysdev/simple_gpio.c +2 -1
@@ -75,7 +75,8 @@ static int u8_gpio_dir_out(struct gpio_chip *gc, unsigned int gpio, int val)static void u8_gpio_save_regs (struct of_mm_gpio_chip *mm_gc) { -struct u8_gpio_chip *u8_gc =gpiochip_get_data (&mm_gc->gc); +struct u8_gpio_chip *u8_gc = + container_of(mm_gc, struct u8_gpio_chip, mm_gc); u8_gc->data =in_8 (mm_gc->regs); }
arch/sparc/Kconfig +2 -2
@@ -187,9 +187,9 @@ config NR_CPUS int "Maximum number of CPUs" depends on SMP range 2 32 if SPARC32 - range 2 1024 if SPARC64 + range 2 4096 if SPARC64 default 32 if SPARC32 - default 64 if SPARC64 + default 4096 if SPARC64 source kernel/Kconfig.hz
arch/sparc/include/asm/mmu_64.h +1 -1
@@ -52,7 +52,7 @@#define CTX_NR_MASK TAG_CONTEXT_BITS#define CTX_HW_MASK (CTX_NR_MASK | CTX_PGSZ_MASK) -#define CTX_FIRST_VERSION ((_AC(1,UL) << CTX_VERSION_SHIFT) + _AC(1,UL)) +#define CTX_FIRST_VERSION BIT(CTX_VERSION_SHIFT)#define CTX_VALID (__ctx) \ (!(((__ctx.sparc64_ctx_val) ^ tlb_context_cache) & CTX_VERSION_MASK))#define CTX_HWBITS (__ctx) ((__ctx.sparc64_ctx_val) & CTX_HW_MASK)
arch/sparc/include/asm/mmu_context_64.h +4 -28
@@ -17,13 +17,8 @@ extern spinlock_t ctx_alloc_lock;extern unsigned long tlb_context_cache;extern unsigned long mmu_context_bmap[]; +DECLARE_PER_CPU(struct mm_struct *, per_cpu_secondary_mm);void get_new_mmu_context (struct mm_struct *mm); -#ifdef CONFIG_SMP -void smp_new_mmu_context_version (void ); -#else -#define smp_new_mmu_context_version () do { } while (0) -#endif -int init_new_context (struct task_struct *tsk,struct mm_struct *mm);void destroy_context (struct mm_struct *mm);
@@ -74,8 +69,9 @@ void __flush_tlb_mm(unsigned long, unsigned long);static inline void switch_mm (struct mm_struct *old_mm,struct mm_struct *mm,struct task_struct *tsk) {unsigned long ctx_valid, flags; -int cpu; +int cpu =smp_processor_id (); +per_cpu (per_cpu_secondary_mm, cpu) = mm;if (unlikely (mm == &init_mm))return ;
@@ -121,7 +117,6 @@ static inline void switch_mm(struct mm_struct *old_mm, struct mm_struct *mm, str* for the first time, we must flush that context out of the * local TLB. */ - cpu =smp_processor_id ();if (!ctx_valid || !cpumask_test_cpu (cpu,mm_cpumask (mm))) {cpumask_set_cpu (cpu,mm_cpumask (mm)); __flush_tlb_mm(CTX_HWBITS(mm->context),
@@ -131,26 +126,7 @@ static inline void switch_mm(struct mm_struct *old_mm, struct mm_struct *mm, str }#define deactivate_mm (tsk,mm) do { } while (0) - -/* Activate a new MM instance for the current task. */ -static inline void activate_mm (struct mm_struct *active_mm,struct mm_struct *mm) -{ -unsigned long flags; -int cpu; - -spin_lock_irqsave (&mm->context.lock, flags); -if (!CTX_VALID (mm->context)) -get_new_mmu_context (mm); - cpu =smp_processor_id (); -if (!cpumask_test_cpu (cpu,mm_cpumask (mm))) -cpumask_set_cpu (cpu,mm_cpumask (mm)); - -load_secondary_context (mm); -__flush_tlb_mm (CTX_HWBITS (mm->context),SECONDARY_CONTEXT ); -tsb_context_switch (mm); -spin_unlock_irqrestore (&mm->context.lock, flags); -} - +#define activate_mm (active_mm, mm) switch_mm(active_mm, mm, NULL)#endif /* !(__ASSEMBLY__) */ #endif /* !(__SPARC64_MMU_CONTEXT_H) */
arch/sparc/include/asm/pil.h +0 -1
@@ -20,7 +20,6 @@#define PIL_SMP_CALL_FUNC 1#define PIL_SMP_RECEIVE_SIGNAL 2#define PIL_SMP_CAPTURE 3 -#define PIL_SMP_CTX_NEW_VERSION 4#define PIL_DEVICE_IRQ 5#define PIL_SMP_CALL_FUNC_SNGL 6#define PIL_DEFERRED_PCR_WORK 7
arch/sparc/include/asm/vio.h +1 -0
@@ -327,6 +327,7 @@ struct vio_dev {int compat_len;u64 dev_no; +u64 id;unsigned long channel_id;
arch/sparc/kernel/irq_64.c +13 -4
@@ -1034,17 +1034,26 @@ static void __init init_cpu_send_mondo_info(struct trap_per_cpu *tb) {#ifdef CONFIG_SMP unsigned long page; +void *mondo, *p; -BUILD_BUG_ON ((NR_CPUS *sizeof (u16)) > (PAGE_SIZE -64 )); +BUILD_BUG_ON ((NR_CPUS *sizeof (u16)) >PAGE_SIZE ); + +/* Make sure mondo block is 64byte aligned */ + p =kzalloc (127 ,GFP_KERNEL ); +if (!p) { +prom_printf ("SUN4V: Error, cannot allocate mondo block.\n" ); +prom_halt (); + } + mondo = (void *)(((unsigned long )p +63 ) & ~0x3f ); + tb->cpu_mondo_block_pa =__pa (mondo); page =get_zeroed_page (GFP_KERNEL );if (!page) { -prom_printf ("SUN4V: Error, cannot allocate cpu mondo page.\n" ); +prom_printf ("SUN4V: Error, cannot allocate cpu list page.\n" );prom_halt (); } - tb->cpu_mondo_block_pa =__pa (page); - tb->cpu_list_pa =__pa (page +64 ); + tb->cpu_list_pa =__pa (page);#endif }
arch/sparc/kernel/kernel.h +0 -1
@@ -37,7 +37,6 @@ void handle_stdfmna(struct pt_regs *regs, unsigned long sfar, unsigned long sfsr/* smp_64.c */ void __irq_entry smp_call_function_client(int irq, struct pt_regs *regs); void __irq_entry smp_call_function_single_client(int irq, struct pt_regs *regs); -void __irq_entry smp_new_mmu_context_version_client(int irq, struct pt_regs *regs); void __irq_entry smp_penguin_jailcell(int irq, struct pt_regs *regs); void __irq_entry smp_receive_signal_client(int irq, struct pt_regs *regs);
arch/sparc/kernel/smp_64.c +0 -31
@@ -963,37 +963,6 @@ void flush_dcache_page_all(struct mm_struct *mm, struct page *page)preempt_enable (); } -void __irq_entry smp_new_mmu_context_version_client(int irq, struct pt_regs *regs) -{ -struct mm_struct *mm; -unsigned long flags; - -clear_softint (1 << irq); - -/* See if we need to allocate a new TLB context because -* the version of the one we are using is now out of date. -*/ - mm = current->active_mm; -if (unlikely (!mm || (mm == &init_mm))) -return ; - -spin_lock_irqsave (&mm->context.lock, flags); - -if (unlikely (!CTX_VALID (mm->context))) -get_new_mmu_context (mm); - -spin_unlock_irqrestore (&mm->context.lock, flags); - -load_secondary_context (mm); -__flush_tlb_mm (CTX_HWBITS (mm->context), -SECONDARY_CONTEXT ); -} - -void smp_new_mmu_context_version (void ) -{ -smp_cross_call (&xcall_new_mmu_context_version,0 ,0 ,0 ); -} -#ifdef CONFIG_KGDB void kgdb_roundup_cpus (unsigned long flags) {
arch/sparc/kernel/tsb.S +7 -4
@@ -470,13 +470,16 @@ __tsb_context_switch: .type copy_tsb,#function copy_tsb: /* %o0=old_tsb_base, %o1=old_tsb_size * %o2=new_tsb_base, %o3=new_tsb_size + * %o4=page_size_shift */ sethi %uhi(TSB_PASS_BITS), %g7 srlx %o3, 4, %o3 - add %o0, %o1, %g1 /* end of old tsb */ + add %o0, %o1, %o1 /* end of old tsb */ sllx %g7, 32, %g7 sub %o3, 1, %o3 /* %o3 == new tsb hash mask */ + mov %o4, %g1 /* page_size_shift */ + 661: prefetcha [%o0] ASI_N, #one_read .section .tsb_phys_patch, "ax" .word 661b
@@ -501,9 +504,9 @@ copy_tsb: /* %o0=old_tsb_base, %o1=old_tsb_size /* This can definitely be computed faster... */ srlx %o0, 4, %o5 /* Build index */ and %o5, 511, %o5 /* Mask index */ - sllx %o5, PAGE_SHIFT, %o5 /* Put into vaddr position */ + sllx %o5, %g1, %o5 /* Put into vaddr position */ or %o4, %o5, %o4 /* Full VADDR. */ - srlx %o4, PAGE_SHIFT, %o4 /* Shift down to create index */ + srlx %o4, %g1, %o4 /* Shift down to create index */ and %o4, %o3, %o4 /* Mask with new_tsb_nents-1 */ sllx %o4, 4, %o4 /* Shift back up into tsb ent offset */ TSB_STORE(%o2 + %o4, %g2) /* Store TAG */
@@ -511,7 +514,7 @@ copy_tsb: /* %o0=old_tsb_base, %o1=old_tsb_size TSB_STORE(%o2 + %o4, %g3) /* Store TTE */ 80: add %o0, 16, %o0 - cmp %o0, %g1 + cmp %o0, %o1 bne,pt %xcc, 90b nop
arch/sparc/kernel/ttable_64.S +1 -1
@@ -50,7 +50,7 @@ tl0_resv03e: BTRAP(0x3e) BTRAP(0x3f) BTRAP(0x40) tl0_irq1: TRAP_IRQ(smp_call_function_client, 1) tl0_irq2: TRAP_IRQ(smp_receive_signal_client, 2) tl0_irq3: TRAP_IRQ(smp_penguin_jailcell, 3) -tl0_irq4: TRAP_IRQ(smp_new_mmu_context_version_client, 4) +tl0_irq4: BTRAP(0x44) #else tl0_irq1: BTRAP(0x41) tl0_irq2: BTRAP(0x42)
arch/sparc/kernel/vio.c +64 -4
104 lines not on this page · raw message
arch/sparc/lib/Makefile +1 -0
@@ -15,6 +15,7 @@ lib-$(CONFIG_SPARC32) += copy_user.o locks.o lib-$(CONFIG_SPARC64) += atomic_64.o lib-$(CONFIG_SPARC32) += lshrdi3.o ashldi3.o lib-$(CONFIG_SPARC32) += muldi3.o bitext.o cmpdi2.o +lib-$(CONFIG_SPARC64) += multi3.o lib-$(CONFIG_SPARC64) += copy_page.o clear_page.o bzero.o lib-$(CONFIG_SPARC64) += csum_copy.o csum_copy_from_user.o csum_copy_to_user.o
arch/sparc/lib/multi3.S new file +35 -0
@@ -0,0 +1,35 @@ +#include <linux/linkage.h> +#include <asm/export.h> + + .text + .align 4 +ENTRY(__multi3) /* %o0 = u, %o1 = v */ + mov %o1, %g1 + srl %o3, 0, %g4 + mulx %g4, %g1, %o1 + srlx %g1, 0x20, %g3 + mulx %g3, %g4, %g5 + sllx %g5, 0x20, %o5 + srl %g1, 0, %g4 + sub %o1, %o5, %o5 + srlx %o5, 0x20, %o5 + addcc %g5, %o5, %g5 + srlx %o3, 0x20, %o5 + mulx %g4, %o5, %g4 + mulx %g3, %o5, %o5 + sethi %hi(0x80000000), %g3 + addcc %g5, %g4, %g5 + srlx %g5, 0x20, %g5 + add %g3, %g3, %g3 + movcc %xcc, %g0, %g3 + addcc %o5, %g5, %o5 + sllx %g4, 0x20, %g4 + add %o1, %g4, %o1 + add %o5, %g3, %g2 + mulx %g1, %o2, %g1 + add %g1, %g2, %g1 + mulx %o0, %o3, %o0 + retl + add %g1, %o0, %o0 +ENDPROC(__multi3) +EXPORT_SYMBOL(__multi3)
arch/sparc/mm/init_64.c +58 -28
116 lines not on this page · raw message
arch/sparc/mm/tsb.c +5 -2
@@ -451,7 +451,8 @@ void tsb_grow(struct mm_struct *mm, unsigned long tsb_index, unsigned long rss)extern void copy_tsb (unsigned long old_tsb_base,unsigned long old_tsb_size,unsigned long new_tsb_base, -unsigned long new_tsb_size); +unsigned long new_tsb_size, +unsigned long page_size_shift);unsigned long old_tsb_base = (unsigned long ) old_tsb;unsigned long new_tsb_base = (unsigned long ) new_tsb;
@@ -459,7 +460,9 @@ void tsb_grow(struct mm_struct *mm, unsigned long tsb_index, unsigned long rss) old_tsb_base =__pa (old_tsb_base); new_tsb_base =__pa (new_tsb_base); } -copy_tsb (old_tsb_base, old_size, new_tsb_base, new_size); +copy_tsb (old_tsb_base, old_size, new_tsb_base, new_size, + tsb_index ==MM_TSB_BASE ? +PAGE_SHIFT :REAL_HPAGE_SHIFT ); } mm->context.tsb_block[tsb_index].tsb = new_tsb;
arch/sparc/mm/ultra.S +0 -5
@@ -971,11 +971,6 @@ xcall_capture: wr %g0, (1 << PIL_SMP_CAPTURE), %set_softint retry - .globl xcall_new_mmu_context_version -xcall_new_mmu_context_version: - wr %g0, (1 << PIL_SMP_CTX_NEW_VERSION), %set_softint - retry - #ifdef CONFIG_KGDB .globl xcall_kgdb_capture xcall_kgdb_capture:
arch/x86/kernel/kvm.c +1 -1
@@ -162,8 +162,8 @@ void kvm_async_pf_task_wait(u32 token)*/ rcu_irq_exit ();native_safe_halt (); -rcu_irq_enter ();local_irq_disable (); +rcu_irq_enter (); } }if (!n.halted)
arch/x86/kvm/cpuid.c +11 -9
@@ -765,18 +765,20 @@ int kvm_dev_ioctl_get_cpuid(struct kvm_cpuid2 *cpuid,static int move_to_next_stateful_cpuid_entry (struct kvm_vcpu *vcpu,int i) {struct kvm_cpuid_entry2 *e = &vcpu->arch.cpuid_entries[i]; -int j, nent = vcpu->arch.cpuid_nent; +struct kvm_cpuid_entry2 *ej; +int j = i; +int nent = vcpu->arch.cpuid_nent; e->flags &= ~KVM_CPUID_FLAG_STATE_READ_NEXT ;/* when no next entry is found, the current entry[i] is reselected */ -for (j = i +1 ; ; j = (j +1 ) % nent) { -struct kvm_cpuid_entry2 *ej = &vcpu->arch.cpuid_entries[j]; -if (ej->function == e->function) { - ej->flags |=KVM_CPUID_FLAG_STATE_READ_NEXT ; -return j; - } - } -return 0 ;/* silence gcc, even though control never reaches here */ +do { + j = (j +1 ) % nent; + ej = &vcpu->arch.cpuid_entries[j]; + }while (ej->function != e->function); + + ej->flags |=KVM_CPUID_FLAG_STATE_READ_NEXT ; + +return j; }/* find an entry with matching function, matching index (if needed), and that
arch/x86/kvm/mmu.c +5 -2
@@ -3489,12 +3489,15 @@ static int kvm_arch_setup_async_pf(struct kvm_vcpu *vcpu, gva_t gva, gfn_t gfn)return kvm_setup_async_pf (vcpu, gva,kvm_vcpu_gfn_to_hva (vcpu, gfn), &arch); } -static bool can_do_async_pf (struct kvm_vcpu *vcpu) +bool kvm_can_do_async_pf (struct kvm_vcpu *vcpu) {if (unlikely (!lapic_in_kernel (vcpu) ||kvm_event_needs_reinjection (vcpu)))return false; +if (is_guest_mode (vcpu)) +return false; +return kvm_x86_ops->interrupt_allowed (vcpu); }
@@ -3510,7 +3513,7 @@ static bool try_async_pf(struct kvm_vcpu *vcpu, bool prefault, gfn_t gfn,if (!async)return false;/* *pfn has correct page already */ -if (!prefault &&can_do_async_pf (vcpu)) { +if (!prefault &&kvm_can_do_async_pf (vcpu)) {trace_kvm_try_async_get_page (gva, gfn);if (kvm_find_async_pf_gfn (vcpu, gfn)) {trace_kvm_async_pf_doublefault (gva, gfn);
arch/x86/kvm/mmu.h +1 -0
@@ -75,6 +75,7 @@ enum {int handle_mmio_page_fault (struct kvm_vcpu *vcpu,u64 addr,bool direct);void kvm_init_shadow_mmu (struct kvm_vcpu *vcpu);void kvm_init_shadow_ept_mmu (struct kvm_vcpu *vcpu,bool execonly); +bool kvm_can_do_async_pf (struct kvm_vcpu *vcpu);static inline unsigned int kvm_mmu_available_pages (struct kvm *kvm) {
arch/x86/kvm/x86.c +1 -2
@@ -8444,8 +8444,7 @@ bool kvm_arch_can_inject_async_page_present(struct kvm_vcpu *vcpu)if (!(vcpu->arch.apf.msr_val &KVM_ASYNC_PF_ENABLED ))return true;else -return !kvm_event_needs_reinjection (vcpu) && - kvm_x86_ops->interrupt_allowed (vcpu); +return kvm_can_do_async_pf (vcpu); }void kvm_arch_start_assignment (struct kvm *kvm)
arch/x86/platform/efi/quirks.c +3 -0
@@ -358,6 +358,9 @@ void __init efi_free_boot_services(void)free_bootmem_late (start, size); } +if (!num_entries) +return ; + new_size = efi.memmap.desc_size * num_entries; new_phys =efi_memmap_alloc (num_entries);if (!new_phys) {
block/cfq-iosched.c +15 -2
@@ -36,9 +36,13 @@ static const u64 cfq_target_latency = (u64)NSEC_PER_SEC * 3/10; /* 300 ms */static const int cfq_hist_divisor =4 ;/* -* offset from end of service tree +* offset from end of queue service tree for idle class */ #define CFQ_IDLE_DELAY (NSEC_PER_SEC / 5) +/* offset from end of group service tree under time slice mode */ +#define CFQ_SLICE_MODE_GROUP_DELAY (NSEC_PER_SEC / 5) +/* offset from end of group service under IOPS mode */ +#define CFQ_IOPS_MODE_GROUP_DELAY (HZ / 5)/* * below this threshold, we consider thinktime immediate
@@ -1370,6 +1374,14 @@ cfq_group_service_tree_add(struct cfq_rb_root *st, struct cfq_group *cfqg) cfqg->vfraction =max_t (unsigned, vfr,1 ); } +static inline u64 cfq_get_cfqg_vdisktime_delay (struct cfq_data *cfqd) +{ +if (!iops_mode (cfqd)) +return CFQ_SLICE_MODE_GROUP_DELAY ; +else +return CFQ_IOPS_MODE_GROUP_DELAY ; +} +static void cfq_group_notify_queue_add (struct cfq_data *cfqd,struct cfq_group *cfqg) {
@@ -1389,7 +1401,8 @@ cfq_group_notify_queue_add(struct cfq_data *cfqd, struct cfq_group *cfqg) n =rb_last (&st->rb);if (n) { __cfqg =rb_entry_cfqg (n); - cfqg->vdisktime = __cfqg->vdisktime +CFQ_IDLE_DELAY ; + cfqg->vdisktime = __cfqg->vdisktime + +cfq_get_cfqg_vdisktime_delay (cfqd); }else cfqg->vdisktime = st->min_vdisktime;cfq_group_service_tree_add (st, cfqg);
crypto/asymmetric_keys/public_key.c +1 -1
@@ -140,7 +140,7 @@ int public_key_verify_signature(const struct public_key *pkey,* signature and returns that to us. */ ret =crypto_akcipher_verify (req); -if (ret == -EINPROGRESS ) { +if ((ret == -EINPROGRESS ) || (ret == -EBUSY )) {wait_for_completion (&compl.completion); ret = compl.err; }
crypto/drbg.c +2 -3
@@ -1768,9 +1768,8 @@ static int drbg_kcapi_sym_ctr(struct drbg_state *drbg,break ;case -EINPROGRESS :case -EBUSY : - ret =wait_for_completion_interruptible ( - &drbg->ctr_completion); -if (!ret && !drbg->ctr_async_err) { +wait_for_completion (&drbg->ctr_completion); +if (!drbg->ctr_async_err) {reinit_completion (&drbg->ctr_completion);break ; }
crypto/gcm.c +2 -4
@@ -152,10 +152,8 @@ static int crypto_gcm_setkey(struct crypto_aead *aead, const u8 *key, err =crypto_skcipher_encrypt (&data->req);if (err == -EINPROGRESS || err == -EBUSY ) { - err =wait_for_completion_interruptible ( - &data->result.completion); -if (!err) - err = data->result.err; +wait_for_completion (&data->result.completion); + err = data->result.err; }if (err)
drivers/ata/ahci.c +38 -0
@@ -1362,6 +1362,40 @@ static inline void ahci_gtf_filter_workaround(struct ata_host *host) {}#endif +/* +* On the Acer Aspire Switch Alpha 12, sometimes all SATA ports are detected +* as DUMMY, or detected but eventually get a "link down" and never get up +* again. When this happens, CAP.NP may hold a value of 0x00 or 0x01, and the +* port_map may hold a value of 0x00. +* +* Overriding CAP.NP to 0x02 and the port_map to 0x7 will reveal all 3 ports +* and can significantly reduce the occurrence of the problem. +* +* https://bugzilla.kernel.org/show_bug.cgi?id=189471 +*/ +static void acer_sa5_271_workaround (struct ahci_host_priv *hpriv, +struct pci_dev *pdev) +{ +static const struct dmi_system_id sysids[] = { + { + .ident ="Acer Switch Alpha 12" , + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Acer" ), +DMI_MATCH (DMI_PRODUCT_NAME ,"Switch SA5-271" ) + }, + }, + { } + }; + +if (dmi_check_system (sysids)) { +dev_info (&pdev->dev,"enabling Acer Switch Alpha 12 workaround\n" ); +if ((hpriv->saved_cap &0xC734FF00 ) ==0xC734FF00 ) { + hpriv->port_map =0x7 ; + hpriv->cap =0xC734FF02 ; + } + } +} +#ifdef CONFIG_ARM64 /* * Due to ERRATA#22536, ThunderX needs to handle HOST_IRQ_STAT differently.
@@ -1597,6 +1631,10 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) "online status unreliable, applying workaround\n"); } + +/* Acer SA5-271 workaround modifies private_data */ +acer_sa5_271_workaround (hpriv, pdev); +/* CAP.NP sometimes indicate the index of the last enabled * port, at other times, that of the last possible port, so * determining the maximum port number requires looking at
drivers/char/mem.c +1 -1
@@ -343,7 +343,7 @@ static int mmap_mem(struct file *file, struct vm_area_struct *vma)phys_addr_t offset = (phys_addr_t )vma->vm_pgoff <<PAGE_SHIFT ;/* It's illegal to wrap around the end of the physical address space. */ -if (offset + (phys_addr_t )size < offset) +if (offset + (phys_addr_t )size -1 < offset)return -EINVAL ;if (!valid_mmap_phys_addr_range (vma->vm_pgoff, size))
drivers/cpufreq/cpufreq.c +1 -0
@@ -2474,6 +2474,7 @@ int cpufreq_register_driver(struct cpufreq_driver *driver_data)if (!(cpufreq_driver->flags &CPUFREQ_STICKY ) &&list_empty (&cpufreq_policy_list)) {/* if all ->init() calls failed, unregister */ + ret = -ENODEV ;pr_debug ("%s: No CPU initialized for driver %s\n" , __func__, driver_data->name); goto err_if_unreg;
drivers/dma/ep93xx_dma.c +35 -4
@@ -201,6 +201,7 @@ struct ep93xx_dma_engine {struct dma_device dma_dev;bool m2m;int (*hw_setup)(struct ep93xx_dma_chan *); +void (*hw_synchronize)(struct ep93xx_dma_chan *);void (*hw_shutdown)(struct ep93xx_dma_chan *);void (*hw_submit)(struct ep93xx_dma_chan *);int (*hw_interrupt)(struct ep93xx_dma_chan *);
@@ -323,6 +324,8 @@ static int m2p_hw_setup(struct ep93xx_dma_chan *edmac) | M2P_CONTROL_ENABLE;m2p_set_control (edmac, control); + edmac->buffer =0 ; +return 0 ; }
@@ -331,21 +334,27 @@ static inline u32 m2p_channel_state(struct ep93xx_dma_chan *edmac)return (readl (edmac->regs +M2P_STATUS ) >>4 ) &0x3 ; } -static void m2p_hw_shutdown (struct ep93xx_dma_chan *edmac) +static void m2p_hw_synchronize (struct ep93xx_dma_chan *edmac) { +unsigned long flags;u32 control; +spin_lock_irqsave (&edmac->lock, flags); control =readl (edmac->regs +M2P_CONTROL ); control &= ~(M2P_CONTROL_STALLINT |M2P_CONTROL_NFBINT );m2p_set_control (edmac, control); +spin_unlock_irqrestore (&edmac->lock, flags);while (m2p_channel_state (edmac) >=M2P_STATE_ON ) -cpu_relax (); +schedule (); +} +static void m2p_hw_shutdown (struct ep93xx_dma_chan *edmac) +{m2p_set_control (edmac,0 ); -while (m2p_channel_state (edmac) ==M2P_STATE_STALL ) -cpu_relax (); +while (m2p_channel_state (edmac) !=M2P_STATE_IDLE ) +dev_warn (chan2dev (edmac),"M2P: Not yet IDLE\n" ); }static void m2p_fill_desc (struct ep93xx_dma_chan *edmac)
@@ -1161,6 +1170,26 @@ ep93xx_dma_prep_dma_cyclic(struct dma_chan *chan, dma_addr_t dma_addr, }/** +* ep93xx_dma_synchronize - Synchronizes the termination of transfers to the +* current context. +* @chan: channel +* +* Synchronizes the DMA channel termination to the current context. When this +* function returns it is guaranteed that all transfers for previously issued +* descriptors have stopped and and it is safe to free the memory associated +* with them. Furthermore it is guaranteed that all complete callback functions +* for a previously submitted descriptor have finished running and it is safe to +* free resources accessed from within the complete callbacks. +*/ +static void ep93xx_dma_synchronize (struct dma_chan *chan) +{ +struct ep93xx_dma_chan *edmac =to_ep93xx_dma_chan (chan); + +if (edmac->edma->hw_synchronize) + edmac->edma->hw_synchronize (edmac); +} + +/** * ep93xx_dma_terminate_all - terminate all transactions * @chan: channel *
@@ -1323,6 +1352,7 @@ static int __init ep93xx_dma_probe(struct platform_device *pdev) dma_dev->device_prep_slave_sg = ep93xx_dma_prep_slave_sg; dma_dev->device_prep_dma_cyclic = ep93xx_dma_prep_dma_cyclic; dma_dev->device_config = ep93xx_dma_slave_config; + dma_dev->device_synchronize = ep93xx_dma_synchronize; dma_dev->device_terminate_all = ep93xx_dma_terminate_all; dma_dev->device_issue_pending = ep93xx_dma_issue_pending; dma_dev->device_tx_status = ep93xx_dma_tx_status;
@@ -1340,6 +1370,7 @@ static int __init ep93xx_dma_probe(struct platform_device *pdev) }else {dma_cap_set (DMA_PRIVATE , dma_dev->cap_mask); + edma->hw_synchronize = m2p_hw_synchronize; edma->hw_setup = m2p_hw_setup; edma->hw_shutdown = m2p_hw_shutdown; edma->hw_submit = m2p_hw_submit;
drivers/dma/mv_xor_v2.c +44 -65
235 lines not on this page · raw message
drivers/dma/sh/usb-dmac.c +1 -1
@@ -117,7 +117,7 @@ struct usb_dmac {#define USB_DMASWR 0x0008#define USB_DMASWR_SWR (1 << 0)#define USB_DMAOR 0x0060 -#define USB_DMAOR_AE (1 << 2) +#define USB_DMAOR_AE (1 << 1)#define USB_DMAOR_DME (1 << 0)#define USB_DMASAR 0x0000
drivers/gpu/drm/amd/amdgpu/ci_dpm.c +6 -0
@@ -900,6 +900,12 @@ static bool ci_dpm_vblank_too_short(struct amdgpu_device *adev)u32 vblank_time =amdgpu_dpm_get_vblank_time (adev);u32 switch_limit = adev->mc.vram_type ==AMDGPU_VRAM_TYPE_GDDR5 ?450 :300 ; +/* disable mclk switching if the refresh is >120Hz, even if the +* blanking period would allow it +*/ +if (amdgpu_dpm_get_vrefresh (adev) >120 ) +return true; +if (vblank_time < switch_limit)return true;else
drivers/gpu/drm/drm_drv.c +6 -1
@@ -379,7 +379,12 @@ EXPORT_SYMBOL(drm_put_dev);void drm_unplug_dev (struct drm_device *dev) {/* for a USB device */ -drm_dev_unregister (dev); +if (drm_core_check_feature (dev,DRIVER_MODESET )) +drm_modeset_unregister_all (dev); + +drm_minor_unregister (dev,DRM_MINOR_PRIMARY ); +drm_minor_unregister (dev,DRM_MINOR_RENDER ); +drm_minor_unregister (dev,DRM_MINOR_CONTROL );mutex_lock (&drm_global_mutex);
drivers/gpu/drm/i915/i915_drv.c +1 -3
@@ -573,9 +573,7 @@ static int i915_load_modeset_init(struct drm_device *dev)if (i915_inject_load_failure ())return -ENODEV ; - ret =intel_bios_init (dev_priv); -if (ret) -DRM_INFO ("failed to find VBIOS tables\n" ); +intel_bios_init (dev_priv);/* If we have > 1 VGA cards, then we need to arbitrate access * to the common VGA resources.
drivers/gpu/drm/i915/i915_drv.h +1 -1
@@ -3584,7 +3584,7 @@ static inline bool intel_gmbus_is_forced_bit(struct i2c_adapter *adapter)extern void intel_i2c_reset (struct drm_device *dev);/* intel_bios.c */ -int intel_bios_init (struct drm_i915_private *dev_priv); +void intel_bios_init (struct drm_i915_private *dev_priv);bool intel_bios_is_valid_vbt (const void *buf,size_t size);bool intel_bios_is_tv_present (struct drm_i915_private *dev_priv);bool intel_bios_is_lvds_present (struct drm_i915_private *dev_priv,u8 *i2c_pin);
drivers/gpu/drm/i915/intel_bios.c +31 -15
89 lines not on this page · raw message
drivers/gpu/drm/msm/msm_drv.c +1 -0
@@ -801,6 +801,7 @@ static struct drm_driver msm_driver = { .prime_fd_to_handle = drm_gem_prime_fd_to_handle, .gem_prime_export = drm_gem_prime_export, .gem_prime_import = drm_gem_prime_import, + .gem_prime_res_obj = msm_gem_prime_res_obj, .gem_prime_pin = msm_gem_prime_pin, .gem_prime_unpin = msm_gem_prime_unpin, .gem_prime_get_sg_table = msm_gem_prime_get_sg_table,
drivers/gpu/drm/msm/msm_drv.h +1 -0
@@ -203,6 +203,7 @@ struct sg_table *msm_gem_prime_get_sg_table(struct drm_gem_object *obj);void *msm_gem_prime_vmap (struct drm_gem_object *obj);void msm_gem_prime_vunmap (struct drm_gem_object *obj,void *vaddr);int msm_gem_prime_mmap (struct drm_gem_object *obj,struct vm_area_struct *vma); +struct reservation_object *msm_gem_prime_res_obj (struct drm_gem_object *obj);struct drm_gem_object *msm_gem_prime_import_sg_table (struct drm_device *dev,struct dma_buf_attachment *attach,struct sg_table *sg);int msm_gem_prime_pin (struct drm_gem_object *obj);
drivers/gpu/drm/msm/msm_gem_prime.c +7 -0
@@ -70,3 +70,10 @@ void msm_gem_prime_unpin(struct drm_gem_object *obj)if (!obj->import_attach)msm_gem_put_pages (obj); } + +struct reservation_object *msm_gem_prime_res_obj (struct drm_gem_object *obj) +{ +struct msm_gem_object *msm_obj =to_msm_bo (obj); + +return msm_obj->resv; +}
drivers/gpu/drm/nouveau/include/nvkm/subdev/timer.h +1 -0
@@ -4,6 +4,7 @@struct nvkm_alarm {struct list_head head; +struct list_head exec;u64 timestamp;void (*func)(struct nvkm_alarm *); };
drivers/gpu/drm/nouveau/nvkm/subdev/timer/base.c +4 -3
@@ -50,7 +50,8 @@ nvkm_timer_alarm_trigger(struct nvkm_timer *tmr)/* Move to completed list. We'll drop the lock before * executing the callback so it can reschedule itself. */ -list_move_tail (&alarm->head, &exec); +list_del_init (&alarm->head); +list_add (&alarm->exec, &exec); }/* Shut down interrupt if no more pending alarms. */
@@ -59,8 +60,8 @@ nvkm_timer_alarm_trigger(struct nvkm_timer *tmr)spin_unlock_irqrestore (&tmr->lock, flags);/* Execute completed callbacks. */ -list_for_each_entry_safe (alarm, atemp, &exec, head) { -list_del_init (&alarm->head); +list_for_each_entry_safe (alarm, atemp, &exec, exec) { +list_del (&alarm->exec); alarm->func (alarm); } }
drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c +2 -0
@@ -368,6 +368,8 @@ static void *vmw_local_fifo_reserve(struct vmw_private *dev_priv,return fifo_state->static_buffer; else { fifo_state->dynamic_buffer =vmalloc (bytes); +if (!fifo_state->dynamic_buffer) + goto out_err;return fifo_state->dynamic_buffer; } }
drivers/gpu/drm/vmwgfx/vmwgfx_surface.c +14 -7
@@ -1275,11 +1275,14 @@ int vmw_gb_surface_define_ioctl(struct drm_device *dev, void *data,struct ttm_object_file *tfile =vmw_fpriv (file_priv)->tfile;int ret;uint32_t size; -uint32_t backup_handle; +uint32_t backup_handle =0 ;if (req->multisample_count !=0 )return -EINVAL ; +if (req->mip_levels >DRM_VMW_MAX_MIP_LEVELS ) +return -EINVAL ; +if (unlikely (vmw_user_surface_size ==0 )) vmw_user_surface_size =ttm_round_pot (sizeof (*user_srf)) +128 ;
@@ -1315,12 +1318,16 @@ int vmw_gb_surface_define_ioctl(struct drm_device *dev, void *data, ret =vmw_user_dmabuf_lookup (tfile, req->buffer_handle, &res->backup, &user_srf->backup_base); -if (ret ==0 && res->backup->base.num_pages *PAGE_SIZE < - res->backup_size) { -DRM_ERROR ("Surface backup buffer is too small.\n" ); -vmw_dmabuf_unreference (&res->backup); - ret = -EINVAL ; - goto out_unlock; +if (ret ==0 ) { +if (res->backup->base.num_pages *PAGE_SIZE < + res->backup_size) { +DRM_ERROR ("Surface backup buffer is too small.\n" ); +vmw_dmabuf_unreference (&res->backup); + ret = -EINVAL ; + goto out_unlock; + }else { + backup_handle = req->buffer_handle; + } } }else if (req->drm_surface_flags & drm_vmw_surface_flag_create_buffer) ret = vmw_user_dmabuf_alloc(dev_priv, tfile,
drivers/iio/adc/bcm_iproc_adc.c +4 -4
@@ -143,7 +143,7 @@ static void iproc_adc_reg_dump(struct iio_dev *indio_dev)iproc_adc_dbg_reg (dev, adc_priv,IPROC_SOFT_BYPASS_DATA ); } -static irqreturn_t iproc_adc_interrupt_handler (int irq,void *data) +static irqreturn_t iproc_adc_interrupt_thread (int irq,void *data) {u32 channel_intr_status;u32 intr_status;
@@ -167,7 +167,7 @@ static irqreturn_t iproc_adc_interrupt_handler(int irq, void *data)return IRQ_NONE ; } -static irqreturn_t iproc_adc_interrupt_thread (int irq,void *data) +static irqreturn_t iproc_adc_interrupt_handler (int irq,void *data) {irqreturn_t retval =IRQ_NONE ;struct iproc_adc_priv *adc_priv;
@@ -181,7 +181,7 @@ static irqreturn_t iproc_adc_interrupt_thread(int irq, void *data) adc_priv =iio_priv (indio_dev);regmap_read (adc_priv->regmap,IPROC_INTERRUPT_STATUS , &intr_status); -dev_dbg (&indio_dev->dev,"iproc_adc_interrupt_thread(),INTRPT_STS:%x\n" , +dev_dbg (&indio_dev->dev,"iproc_adc_interrupt_handler(),INTRPT_STS:%x\n" , intr_status); intr_channels = (intr_status &IPROC_ADC_INTR_MASK ) >>IPROC_ADC_INTR ;
@@ -566,8 +566,8 @@ static int iproc_adc_probe(struct platform_device *pdev) } ret =devm_request_threaded_irq (&pdev->dev, adc_priv->irqno, - iproc_adc_interrupt_thread, iproc_adc_interrupt_handler, + iproc_adc_interrupt_thread,IRQF_SHARED ,"iproc-adc" , indio_dev);if (ret) {dev_err (&pdev->dev,"request_irq error %d\n" , ret);
drivers/iio/light/ltr501.c +2 -2
@@ -74,9 +74,9 @@ static const int int_time_mapping[] = {100000, 50000, 200000, 400000};static const struct reg_field reg_field_it =REG_FIELD (LTR501_ALS_MEAS_RATE ,3 ,4 );static const struct reg_field reg_field_als_intr = -REG_FIELD (LTR501_INTR ,0 ,0 ); -static const struct reg_field reg_field_ps_intr =REG_FIELD (LTR501_INTR ,1 ,1 ); +static const struct reg_field reg_field_ps_intr = +REG_FIELD (LTR501_INTR ,0 ,0 );static const struct reg_field reg_field_als_rate =REG_FIELD (LTR501_ALS_MEAS_RATE ,0 ,2 ); static const struct reg_field reg_field_ps_rate =
drivers/iio/proximity/as3935.c +4 -4
@@ -40,9 +40,9 @@#define AS3935_AFE_PWR_BIT BIT(0)#define AS3935_INT 0x03 -#define AS3935_INT_MASK 0x07 +#define AS3935_INT_MASK 0x0f#define AS3935_EVENT_INT BIT(3) -#define AS3935_NOISE_INT BIT(1) +#define AS3935_NOISE_INT BIT(0)#define AS3935_DATA 0x07#define AS3935_DATA_MASK 0x3F
@@ -215,7 +215,7 @@ static irqreturn_t as3935_trigger_handler(int irq, void *private) st->buffer[0 ] = val &AS3935_DATA_MASK ;iio_push_to_buffers_with_timestamp (indio_dev, &st->buffer, - pf->timestamp); +iio_get_time_ns (indio_dev)); err_read:iio_trigger_notify_done (indio_dev->trig);
@@ -244,7 +244,7 @@ static void as3935_event_work(struct work_struct *work)switch (val) {case AS3935_EVENT_INT : -iio_trigger_poll (st->trig); +iio_trigger_poll_chained (st->trig);break ;case AS3935_NOISE_INT :dev_warn (&st->spi->dev,"noise level is too high\n" );
drivers/input/mouse/elantech.c +16 -0
@@ -1118,8 +1118,10 @@ static int elantech_get_resolution_v4(struct psmouse *psmouse,* Asus UX32VD 0x361f02 00, 15, 0e clickpad * Avatar AVIU-145A2 0x361f00 ? clickpad * Fujitsu LIFEBOOK E544 0x470f00 d0, 12, 09 2 hw buttons +* Fujitsu LIFEBOOK E546 0x470f00 50, 12, 09 2 hw buttons * Fujitsu LIFEBOOK E547 0x470f00 50, 12, 09 2 hw buttons * Fujitsu LIFEBOOK E554 0x570f01 40, 14, 0c 2 hw buttons +* Fujitsu LIFEBOOK E557 0x570f01 40, 14, 0c 2 hw buttons * Fujitsu T725 0x470f01 05, 12, 09 2 hw buttons * Fujitsu H730 0x570f00 c0, 14, 0c 3 hw buttons (**) * Gigabyte U2442 0x450f01 58, 17, 0c 2 hw buttons
@@ -1525,6 +1527,13 @@ static const struct dmi_system_id elantech_dmi_force_crc_enabled[] = { }, }, { +/* Fujitsu LIFEBOOK E546 does not work with crc_enabled == 0 */ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"FUJITSU" ), + DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK E546"), + }, + }, + {/* Fujitsu LIFEBOOK E547 does not work with crc_enabled == 0 */ .matches = { DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"),
@@ -1546,6 +1555,13 @@ static const struct dmi_system_id elantech_dmi_force_crc_enabled[] = { }, }, { +/* Fujitsu LIFEBOOK E557 does not work with crc_enabled == 0 */ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"FUJITSU" ), + DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK E557"), + }, + }, + {/* Fujitsu LIFEBOOK U745 does not work with crc_enabled == 0 */ .matches = { DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"),
drivers/misc/cxl/file.c +2 -5
@@ -155,11 +155,8 @@ static long afu_ioctl_start_work(struct cxl_context *ctx,/* Do this outside the status_mutex to avoid a circular dependency with * the locking in cxl_mmap_fault() */ -if (copy_from_user (&work, uwork, -sizeof (struct cxl_ioctl_start_work ))) { - rc = -EFAULT ; - goto out; - } +if (copy_from_user (&work, uwork,sizeof (work))) +return -EFAULT ;mutex_lock (&ctx->status_mutex);if (ctx->status !=OPENED ) {
drivers/misc/cxl/native.c +11 -3
@@ -1066,13 +1066,16 @@ int cxl_native_register_psl_err_irq(struct cxl *adapter)void cxl_native_release_psl_err_irq (struct cxl *adapter) { -if (adapter->native->err_virq !=irq_find_mapping (NULL , adapter->native->err_hwirq)) +if (adapter->native->err_virq ==0 || + adapter->native->err_virq != +irq_find_mapping (NULL , adapter->native->err_hwirq))return ;cxl_p1_write (adapter, CXL_PSL_ErrIVTE,0x0000000000000000 );cxl_unmap_irq (adapter->native->err_virq, adapter); cxl_ops->release_one_irq (adapter, adapter->native->err_hwirq);kfree (adapter->irq_name); + adapter->native->err_virq =0 ; }int cxl_native_register_serr_irq (struct cxl_afu *afu)
@@ -1102,13 +1105,15 @@ int cxl_native_register_serr_irq(struct cxl_afu *afu)void cxl_native_release_serr_irq (struct cxl_afu *afu) { -if (afu->serr_virq !=irq_find_mapping (NULL , afu->serr_hwirq)) +if (afu->serr_virq ==0 || + afu->serr_virq !=irq_find_mapping (NULL , afu->serr_hwirq))return ;cxl_p1n_write (afu, CXL_PSL_SERR_An,0x0000000000000000 );cxl_unmap_irq (afu->serr_virq, afu); cxl_ops->release_one_irq (afu->adapter, afu->serr_hwirq);kfree (afu->err_irq_name); + afu->serr_virq =0 ; }int cxl_native_register_psl_irq (struct cxl_afu *afu)
@@ -1131,12 +1136,15 @@ int cxl_native_register_psl_irq(struct cxl_afu *afu)void cxl_native_release_psl_irq (struct cxl_afu *afu) { -if (afu->native->psl_virq !=irq_find_mapping (NULL , afu->native->psl_hwirq)) +if (afu->native->psl_virq ==0 || + afu->native->psl_virq != +irq_find_mapping (NULL , afu->native->psl_hwirq))return ;cxl_unmap_irq (afu->native->psl_virq, afu); cxl_ops->release_one_irq (afu->adapter, afu->native->psl_hwirq);kfree (afu->psl_irq_name); + afu->native->psl_virq =0 ; }static void recover_psl_err (struct cxl_afu *afu,u64 errstat)
drivers/misc/mei/bus.c +3 -1
@@ -678,8 +678,10 @@ static ssize_t modalias_show(struct device *dev, struct device_attribute *a, {struct mei_cl_device *cldev =to_mei_cl_device (dev);const uuid_le *uuid =mei_me_cl_uuid (cldev->me_cl); +u8 version =mei_me_cl_ver (cldev->me_cl); -return scnprintf (buf,PAGE_SIZE ,"mei:%s:%pUl:" , cldev->name, uuid); +return scnprintf (buf,PAGE_SIZE ,"mei:%s:%pUl:%02X:" , + cldev->name, uuid, version); }static DEVICE_ATTR_RO (modalias);
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c +1 -1
@@ -1931,7 +1931,7 @@ u16 bnx2x_select_queue(struct net_device *dev, struct sk_buff *skb, }/* select a non-FCoE queue */ -return fallback (dev, skb) %BNX2X_NUM_ETH_QUEUES (bp); +return fallback (dev, skb) % (BNX2X_NUM_ETH_QUEUES (bp) * bp->max_cos); }void bnx2x_set_num_queues (struct bnx2x *bp)
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +4 -0
@@ -2226,10 +2226,14 @@ static int cxgb_up(struct adapter *adap)if (err) goto irq_err; } + +mutex_lock (&uld_mutex);enable_rx (adap);t4_sge_start (adap);t4_intr_enable (adap); adap->flags |=FULL_INIT_DONE ; +mutex_unlock (&uld_mutex); +notify_ulds (adap,CXGB4_STATE_UP );#if IS_ENABLED (CONFIG_IPV6 )update_clip (adap);
drivers/net/ethernet/ethoc.c +2 -1
@@ -710,6 +710,8 @@ static int ethoc_open(struct net_device *dev)if (ret)return ret; +napi_enable (&priv->napi); +ethoc_init_ring (priv, dev->mem_start);ethoc_reset (priv);
@@ -722,7 +724,6 @@ static int ethoc_open(struct net_device *dev) }phy_start (dev->phydev); -napi_enable (&priv->napi);if (netif_msg_ifup (priv)) { dev_info(&dev->dev, "I/O: %08lx Memory: %08lx-%08lx\n",
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +1 -1
@@ -1953,7 +1953,7 @@ static void stmmac_tso_allocator(struct stmmac_priv *priv, unsigned int des, priv->hw->desc->prepare_tso_tx_desc (desc,0 , buff_size,0 ,1 , - (last_segment) && (buff_size <TSO_MAX_BUFF_SIZE ), + (last_segment) && (tmp_len <=TSO_MAX_BUFF_SIZE ),0 ,0 ); tmp_len -=TSO_MAX_BUFF_SIZE ;
drivers/net/vxlan.c +30 -9
@@ -59,6 +59,8 @@ static const u8 all_zeros_mac[ETH_ALEN + 2];static int vxlan_sock_add (struct vxlan_dev *vxlan); +static void vxlan_vs_del_dev (struct vxlan_dev *vxlan); +/* per-network namespace private data for this module */ struct vxlan_net {struct list_head vxlan_list;
@@ -717,6 +719,22 @@ static void vxlan_fdb_destroy(struct vxlan_dev *vxlan, struct vxlan_fdb *f)call_rcu (&f->rcu, vxlan_fdb_free); } +static void vxlan_dst_free (struct rcu_head *head) +{ + struct vxlan_rdst *rd = container_of(head, struct vxlan_rdst, rcu); + +dst_cache_destroy (&rd->dst_cache); +kfree (rd); +} + +static void vxlan_fdb_dst_destroy (struct vxlan_dev *vxlan,struct vxlan_fdb *f, +struct vxlan_rdst *rd) +{ +list_del_rcu (&rd->list); +vxlan_fdb_notify (vxlan, f, rd,RTM_DELNEIGH ); +call_rcu (&rd->rcu, vxlan_dst_free); +} +static int vxlan_fdb_parse (struct nlattr *tb[],struct vxlan_dev *vxlan,union vxlan_addr *ip,__be16 *port,__be32 *vni,u32 *ifindex)
@@ -847,9 +865,7 @@ static int vxlan_fdb_delete(struct ndmsg *ndm, struct nlattr *tb[],* otherwise destroy the fdb entry */ if (rd && !list_is_singular (&f->remotes)) { -list_del_rcu (&rd->list); -vxlan_fdb_notify (vxlan, f, rd,RTM_DELNEIGH ); -kfree_rcu (rd, rcu); +vxlan_fdb_dst_destroy (vxlan, f, rd); goto out; }
@@ -1026,6 +1042,8 @@ static void vxlan_sock_release(struct vxlan_dev *vxlan)rcu_assign_pointer (vxlan->vn4_sock,NULL );synchronize_net (); +vxlan_vs_del_dev (vxlan); +if (__vxlan_sock_release_prep (sock4)) {udp_tunnel_sock_release (sock4->sock);kfree (sock4);
@@ -2286,6 +2304,15 @@ static void vxlan_cleanup(unsigned long arg)mod_timer (&vxlan->age_timer, next_timer); } +static void vxlan_vs_del_dev (struct vxlan_dev *vxlan) +{ +struct vxlan_net *vn =net_generic (vxlan->net, vxlan_net_id); + +spin_lock (&vn->sock_lock); +hlist_del_init_rcu (&vxlan->hlist); +spin_unlock (&vn->sock_lock); +} +static void vxlan_vs_add_dev (struct vxlan_sock *vs,struct vxlan_dev *vxlan) {struct vxlan_net *vn =net_generic (vxlan->net, vxlan_net_id);
@@ -3056,12 +3083,6 @@ static int vxlan_newlink(struct net *src_net, struct net_device *dev,static void vxlan_dellink (struct net_device *dev,struct list_head *head) {struct vxlan_dev *vxlan =netdev_priv (dev); -struct vxlan_net *vn =net_generic (vxlan->net, vxlan_net_id); - -spin_lock (&vn->sock_lock); -if (!hlist_unhashed (&vxlan->hlist)) -hlist_del_rcu (&vxlan->hlist); -spin_unlock (&vn->sock_lock);gro_cells_destroy (&vxlan->gro_cells);list_del (&vxlan->next);
drivers/scsi/qla2xxx/qla_bsg.c +5 -4
@@ -721,6 +721,8 @@ qla2x00_process_loopback(struct fc_bsg_job *bsg_job)return -EIO ; } +memset (&elreq,0 ,sizeof (elreq)); + elreq.req_sg_cnt =dma_map_sg (&ha->pdev->dev, bsg_job->request_payload.sg_list, bsg_job->request_payload.sg_cnt,DMA_TO_DEVICE );
@@ -786,10 +788,9 @@ qla2x00_process_loopback(struct fc_bsg_job *bsg_job)if (atomic_read (&vha->loop_state) ==LOOP_READY && (ha->current_topology ==ISP_CFG_F || - ((IS_QLA81XX (ha) ||IS_QLA8031 (ha) ||IS_QLA8044 (ha)) && -le32_to_cpu (*(uint32_t *)req_data) ==ELS_OPCODE_BYTE - && req_data_len ==MAX_ELS_FRAME_PAYLOAD )) && - elreq.options ==EXTERNAL_LOOPBACK ) { + (le32_to_cpu (*(uint32_t *)req_data) ==ELS_OPCODE_BYTE && + req_data_len ==MAX_ELS_FRAME_PAYLOAD )) && + elreq.options ==EXTERNAL_LOOPBACK ) { type ="FC_BSG_HST_VENDOR_ECHO_DIAG" ;ql_dbg (ql_dbg_user, vha,0x701e ,"BSG request type: %s.\n" , type);
drivers/scsi/qla2xxx/qla_dbg.c +2 -2
@@ -1131,7 +1131,7 @@ qla24xx_fw_dump(scsi_qla_host_t *vha, int hardware_locked)/* Mailbox registers. */ mbx_reg = ®->mailbox0; -for (cnt =0 ; cnt <sizeof (fw->mailbox_reg) /2 ; cnt++, dmp_reg++) +for (cnt =0 ; cnt <sizeof (fw->mailbox_reg) /2 ; cnt++, mbx_reg++) fw->mailbox_reg[cnt] =htons (RD_REG_WORD (mbx_reg));/* Transfer sequence registers. */
@@ -2090,7 +2090,7 @@ qla83xx_fw_dump(scsi_qla_host_t *vha, int hardware_locked)/* Mailbox registers. */ mbx_reg = ®->mailbox0; -for (cnt =0 ; cnt <sizeof (fw->mailbox_reg) /2 ; cnt++, dmp_reg++) +for (cnt =0 ; cnt <sizeof (fw->mailbox_reg) /2 ; cnt++, mbx_reg++) fw->mailbox_reg[cnt] =htons (RD_REG_WORD (mbx_reg));/* Transfer sequence registers. */
drivers/scsi/qla2xxx/qla_mbx.c +2 -2
@@ -4783,9 +4783,9 @@ qla2x00_echo_test(scsi_qla_host_t *vha, struct msg_echo_lb *mreq,memset (mcp->mb,0 ,sizeof (mcp->mb)); mcp->mb[0 ] =MBC_DIAGNOSTIC_ECHO ; - mcp->mb[1 ] = mreq->options |BIT_6 ;/* BIT_6 specifies 64bit address */ +/* BIT_6 specifies 64bit address */ + mcp->mb[1 ] = mreq->options |BIT_15 |BIT_6 ;if (IS_CNA_CAPABLE (ha)) { - mcp->mb[1 ] |=BIT_15 ; mcp->mb[2 ] = vha->fcoe_fcf_idx; } mcp->mb[16 ] =LSW (mreq->rcv_dma);
drivers/scsi/qla2xxx/qla_os.c +4 -4
@@ -2420,10 +2420,10 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)if (mem_only) {if (pci_enable_device_mem (pdev)) - goto probe_out; +return ret; }else {if (pci_enable_device (pdev)) - goto probe_out; +return ret; }/* This may fail but that's ok */
@@ -2433,7 +2433,7 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)if (!ha) {ql_log_pci (ql_log_fatal, pdev,0x0009 ,"Unable to allocate memory for ha.\n" ); - goto probe_out; + goto disable_device; }ql_dbg_pci (ql_dbg_init, pdev,0x000a ,"Memory allocated for ha=%p.\n" , ha);
@@ -3039,7 +3039,7 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)kfree (ha); ha =NULL ; -probe_out: +disable_device:pci_disable_device (pdev);return ret; }
drivers/scsi/qla2xxx/qla_tmpl.c +1 -1
@@ -371,7 +371,7 @@ qla27xx_fwdt_entry_t262(struct scsi_qla_host *vha, goto done; } -if (end <= start || start ==0 || end ==0 ) { +if (end < start || start ==0 || end ==0 ) {ql_dbg (ql_dbg_misc, vha,0xd023 ,"%s: unusable range (start=%x end=%x)\n" , __func__, ent->t262.end_addr, ent->t262.start_addr);
drivers/staging/lustre/lustre/lov/lov_pack.c +0 -9
@@ -387,18 +387,10 @@ int lov_getstripe(struct lov_object *obj, struct lov_stripe_md *lsm,struct lov_mds_md *lmmk =NULL ;int rc, lmmk_size, lmm_size;int lum_size; -mm_segment_t seg;if (!lsm)return -ENODATA ; -/* -* "Switch to kernel segment" to allow copying from kernel space by -* copy_{to,from}_user(). -*/ - seg =get_fs (); -set_fs (KERNEL_DS ); -/* we only need the header part from user space to get lmm_magic and * lmm_stripe_count, (the header part is common to v1 and v3) */
@@ -478,6 +470,5 @@ int lov_getstripe(struct lov_object *obj, struct lov_stripe_md *lsm, out_free:kfree (lmmk); out: -set_fs (seg);return rc; }
drivers/target/target_core_transport.c +18 -5
@@ -1182,15 +1182,28 @@ target_cmd_size_check(struct se_cmd *cmd, unsigned int size)if (cmd->unknown_data_length) { cmd->data_length = size; }else if (size != cmd->data_length) { -pr_warn ("TARGET_CORE[%s]: Expected Transfer Length:" +pr_warn_ratelimited ("TARGET_CORE[%s]: Expected Transfer Length:" " %u does not match SCSI CDB Length: %u for SAM Opcode:" " 0x%02x\n" , cmd->se_tfo->get_fabric_name (), cmd->data_length, size, cmd->t_task_cdb[0 ]); -if (cmd->data_direction ==DMA_TO_DEVICE && - cmd->se_cmd_flags &SCF_SCSI_DATA_CDB ) { -pr_err ("Rejecting underflow/overflow WRITE data\n" ); -return TCM_INVALID_CDB_FIELD ; +if (cmd->data_direction ==DMA_TO_DEVICE ) { +if (cmd->se_cmd_flags &SCF_SCSI_DATA_CDB ) { +pr_err_ratelimited ("Rejecting underflow/overflow" +" for WRITE data CDB\n" ); +return TCM_INVALID_CDB_FIELD ; + } +/* +* Some fabric drivers like iscsi-target still expect to +* always reject overflow writes. Reject this case until +* full fabric driver level support for overflow writes +* is introduced tree-wide. +*/ +if (size > cmd->data_length) { +pr_err_ratelimited ("Rejecting overflow for" +" WRITE control CDB\n" ); +return TCM_INVALID_CDB_FIELD ; + } }/* * Reject READ_* or WRITE_* with overflow/underflow for
drivers/tty/serial/ifx6x60.c +1 -1
@@ -1381,9 +1381,9 @@ static struct spi_driver ifx_spi_driver = { static void __exit ifx_spi_exit(void) {/* unregister */ +spi_unregister_driver (&ifx_spi_driver);tty_unregister_driver (tty_drv);put_tty_driver (tty_drv); -spi_unregister_driver (&ifx_spi_driver);unregister_reboot_notifier (&ifx_modem_reboot_notifier_block); }
drivers/tty/serial/sh-sci.c +6 -4
@@ -1976,11 +1976,13 @@ static int sci_startup(struct uart_port *port)dev_dbg (port->dev,"%s(%d)\n" , __func__, port->line); +sci_request_dma (port); + ret =sci_request_irq (s); -if (unlikely (ret <0 )) +if (unlikely (ret <0 )) { +sci_free_dma (port);return ret; - -sci_request_dma (port); + }return 0 ; }
@@ -2012,8 +2014,8 @@ static void sci_shutdown(struct uart_port *port) }#endif -sci_free_dma (port);sci_free_irq (s); +sci_free_dma (port); } static int sci_sck_calc(struct sci_port *s, unsigned int bps,
drivers/usb/chipidea/debug.c +2 -1
@@ -294,7 +294,8 @@ static int ci_role_show(struct seq_file *s, void *data) {struct ci_hdrc *ci = s->private; -seq_printf (s,"%s\n" ,ci_role (ci)->name); +if (ci->role !=CI_ROLE_END ) +seq_printf (s,"%s\n" ,ci_role (ci)->name);return 0 ; }
drivers/usb/chipidea/udc.c +6 -2
@@ -1987,6 +1987,7 @@ static void udc_id_switch_for_host(struct ci_hdrc *ci)int ci_hdrc_gadget_init (struct ci_hdrc *ci) {struct ci_role_driver *rdrv; +int ret;if (!hw_read (ci,CAP_DCCPARAMS ,DCCPARAMS_DC ))return -ENXIO ;
@@ -1999,7 +2000,10 @@ int ci_hdrc_gadget_init(struct ci_hdrc *ci) rdrv->stop = udc_id_switch_for_host; rdrv->irq = udc_irq; rdrv->name ="gadget" ; - ci->roles[CI_ROLE_GADGET ] = rdrv; -return udc_start (ci); + ret =udc_start (ci); +if (!ret) + ci->roles[CI_ROLE_GADGET ] = rdrv; + +return ret; }
drivers/usb/gadget/function/f_mass_storage.c +11 -2
@@ -395,7 +395,11 @@ static int fsg_set_halt(struct fsg_dev *fsg, struct usb_ep *ep)/* Caller must hold fsg->lock */ static void wakeup_thread (struct fsg_common *common) { -smp_wmb ();/* ensure the write of bh->state is complete */ +/* +* Ensure the reading of thread_wakeup_needed +* and the writing of bh->state are completed +*/ +smp_mb ();/* Tell the main thread that something has happened */ common->thread_wakeup_needed =1 ;if (common->thread_task)
@@ -626,7 +630,12 @@ static int sleep_thread(struct fsg_common *common, bool can_freeze) }__set_current_state (TASK_RUNNING ); common->thread_wakeup_needed =0 ; -smp_rmb ();/* ensure the latest bh->state is visible */ + +/* +* Ensure the writing of thread_wakeup_needed +* and the reading of bh->state are completed +*/ +smp_mb ();return rc; }
drivers/xen/privcmd.c +2 -2
@@ -335,8 +335,8 @@ static int mmap_batch_fn(void *data, int nr, void *state) st->global_error =1 ; } } - st->va +=PAGE_SIZE * nr; - st->index += nr; + st->va +=XEN_PAGE_SIZE * nr; + st->index += nr /XEN_PFN_PER_PAGE ;return 0 ; }
fs/block_dev.c +1 -1
@@ -713,7 +713,7 @@ struct block_device *bdget(dev_t dev) bdev->bd_contains =NULL ; bdev->bd_super =NULL ; bdev->bd_inode = inode; - bdev->bd_block_size = (1 << inode->i_blkbits); + bdev->bd_block_size =i_blocksize (inode); bdev->bd_part_count =0 ; bdev->bd_invalidated =0 ; inode->i_mode =S_IFBLK ;
fs/btrfs/extent-tree.c +1 -0
@@ -3984,6 +3984,7 @@ static int update_space_info(struct btrfs_fs_info *info, u64 flags, info->space_info_kobj,"%s" , alloc_name(found->flags));if (ret) { +percpu_counter_destroy (&found->total_bytes_pinned);kfree (found);return ret; }
fs/btrfs/file.c +1 -1
@@ -2842,7 +2842,7 @@ static long btrfs_fallocate(struct file *file, int mode,if (!ret) ret =btrfs_prealloc_file_range (inode, mode, range->start, - range->len,1 << inode->i_blkbits, + range->len,i_blocksize (inode), offset + len, &alloc_hint);else btrfs_free_reserved_data_space(inode, range->start,
fs/btrfs/inode.c +2 -2
@@ -7435,8 +7435,8 @@ bool btrfs_page_exists_in_range(struct inode *inode, loff_t start, loff_t end)int found = false;void **pagep =NULL ;struct page *page =NULL ; -int start_idx; -int end_idx; +unsigned long start_idx; +unsigned long end_idx; start_idx = start >>PAGE_SHIFT ;
fs/buffer.c +6 -6
@@ -2353,7 +2353,7 @@ static int cont_expand_zero(struct file *file, struct address_space *mapping, loff_t pos, loff_t *bytes) { struct inode *inode = mapping->host; -unsigned blocksize =1 << inode->i_blkbits; +unsigned int blocksize =i_blocksize (inode);struct page *page;void *fsdata;pgoff_t index, curidx;
@@ -2433,8 +2433,8 @@ int cont_write_begin(struct file *file, struct address_space *mapping, get_block_t *get_block, loff_t *bytes) {struct inode *inode = mapping->host; -unsigned blocksize =1 << inode->i_blkbits; -unsigned zerofrom; +unsigned int blocksize =i_blocksize (inode); +unsigned int zerofrom;int err; err =cont_expand_zero (file, mapping, pos, bytes);
@@ -2796,7 +2796,7 @@ int nobh_truncate_page(struct address_space *mapping,struct buffer_head map_bh;int err; - blocksize =1 << inode->i_blkbits; + blocksize =i_blocksize (inode); length = offset & (blocksize -1 );/* Block boundary? Nothing to do */
@@ -2874,7 +2874,7 @@ int block_truncate_page(struct address_space *mapping,struct buffer_head *bh;int err; - blocksize =1 << inode->i_blkbits; + blocksize =i_blocksize (inode); length = offset & (blocksize -1 );/* Block boundary? Nothing to do */
@@ -2986,7 +2986,7 @@ sector_t generic_block_bmap(struct address_space *mapping, sector_t block,struct inode *inode = mapping->host; tmp.b_state =0 ; tmp.b_blocknr =0 ; - tmp.b_size =1 << inode->i_blkbits; + tmp.b_size =i_blocksize (inode);get_block (inode, block, &tmp,0 );return tmp.b_blocknr; }
fs/ceph/addr.c +1 -1
@@ -745,7 +745,7 @@ static int ceph_writepages_start(struct address_space *mapping,struct pagevec pvec;int done =0 ;int rc =0 ; -unsigned wsize =1 << inode->i_blkbits; +unsigned int wsize =i_blocksize (inode);struct ceph_osd_request *req =NULL ;int do_sync =0 ;loff_t snap_size, i_size;
fs/direct-io.c +1 -1
@@ -587,7 +587,7 @@ static int dio_set_defer_completion(struct dio *dio)/* * Call into the fs to map some more disk blocks. We record the current number * of available blocks at sdio->blocks_available. These are in units of the -* fs blocksize, (1 << inode->i_blkbits). +* fs blocksize, i_blocksize(inode). * * The fs is allowed to map lots of blocks at once. If it wants to do that, * it uses the passed inode-relative block number as the file offset, as usual.
fs/ext4/extents.c +42 -43
150 lines not on this page · raw message
fs/ext4/file.c +14 -36
81 lines not on this page · raw message
fs/ext4/inode.c +9 -6
@@ -2205,7 +2205,7 @@ static int mpage_process_page_bufs(struct mpage_da_data *mpd, {struct inode *inode = mpd->inode;int err; -ext4_lblk_t blocks = (i_size_read (inode) + (1 << inode->i_blkbits) -1 ) +ext4_lblk_t blocks = (i_size_read (inode) +i_blocksize (inode) -1 ) >> inode->i_blkbits; do {
@@ -3454,14 +3454,14 @@ static ssize_t ext4_direct_IO_write(struct kiocb *iocb, struct iov_iter *iter)* writes need zeroing either because they can race with page * faults or because they use partial blocks. */ -if (round_down (offset,1 <<inode->i_blkbits) >= inode->i_size && +if (round_down (offset,i_blocksize (inode)) >= inode->i_size &&ext4_aligned_io (inode, offset, count)) get_block_func = ext4_dio_get_block;else get_block_func = ext4_dax_get_block; dio_flags =DIO_LOCKING ; }else if (!ext4_test_inode_flag (inode,EXT4_INODE_EXTENTS ) || -round_down (offset,1 << inode->i_blkbits) >= inode->i_size) { +round_down (offset,i_blocksize (inode)) >= inode->i_size) { get_block_func = ext4_dio_get_block; dio_flags =DIO_LOCKING |DIO_SKIP_HOLES ; }else if (is_sync_kiocb (iocb)) {
@@ -4044,6 +4044,8 @@ int ext4_punch_hole(struct inode *inode, loff_t offset, loff_t length) inode->i_mtime = inode->i_ctime =ext4_current_time (inode);ext4_mark_inode_dirty (handle, inode); +if (ret >=0 ) +ext4_update_inode_fsync_trans (handle, inode,1 ); out_stop:ext4_journal_stop (handle); out_dio:
@@ -5046,7 +5048,7 @@ static void ext4_wait_for_tail_page_commit(struct inode *inode)* do. We do the check mainly to optimize the common PAGE_SIZE == * blocksize case */ -if (offset >PAGE_SIZE - (1 << inode->i_blkbits)) +if (offset >PAGE_SIZE -i_blocksize (inode))return ;while (1 ) { page = find_lock_page(inode->i_mapping,
@@ -5441,8 +5443,9 @@ static int ext4_expand_extra_isize(struct inode *inode,/* No extended attributes present */ if (!ext4_test_inode_state (inode,EXT4_STATE_XATTR ) || header->h_magic !=cpu_to_le32 (EXT4_XATTR_MAGIC )) { -memset ((void *)raw_inode +EXT4_GOOD_OLD_INODE_SIZE ,0 , - new_extra_isize); +memset ((void *)raw_inode +EXT4_GOOD_OLD_INODE_SIZE + +EXT4_I (inode)->i_extra_isize,0 , + new_extra_isize -EXT4_I (inode)->i_extra_isize);EXT4_I (inode)->i_extra_isize = new_extra_isize;return 0 ; }
fs/ext4/mballoc.c +1 -1
@@ -838,7 +838,7 @@ static int ext4_mb_init_cache(struct page *page, char *incore, gfp_t gfp) inode = page->mapping->host; sb = inode->i_sb; ngroups =ext4_get_groups_count (sb); - blocksize =1 << inode->i_blkbits; + blocksize =i_blocksize (inode); blocks_per_page =PAGE_SIZE / blocksize; groups_per_page = blocks_per_page >>1 ;
fs/ext4/move_extent.c +1 -1
@@ -187,7 +187,7 @@ mext_page_mkuptodate(struct page *page, unsigned from, unsigned to)if (PageUptodate (page))return 0 ; - blocksize =1 << inode->i_blkbits; + blocksize =i_blocksize (inode);if (!page_has_buffers (page))create_empty_buffers (page, blocksize,0 );
fs/iomap.c +2 -2
@@ -419,8 +419,8 @@ int iomap_truncate_page(struct inode *inode, loff_t pos, bool *did_zero, struct iomap_ops *ops) { - unsigned blocksize = (1 << inode->i_blkbits); -unsigned off = pos & (blocksize -1 ); + unsigned int blocksize = i_blocksize(inode); +unsigned int off = pos & (blocksize -1 );/* Block boundary? Nothing to do */ if (!off)
fs/jfs/super.c +2 -2
@@ -758,7 +758,7 @@ static ssize_t jfs_quota_read(struct super_block *sb, int type, char *data, sb->s_blocksize - offset : toread; tmp_bh.b_state =0 ; - tmp_bh.b_size =1 << inode->i_blkbits; + tmp_bh.b_size =i_blocksize (inode); err =jfs_get_block (inode, blk, &tmp_bh,0 );if (err)return err;
@@ -798,7 +798,7 @@ static ssize_t jfs_quota_write(struct super_block *sb, int type, sb->s_blocksize - offset : towrite; tmp_bh.b_state =0 ; - tmp_bh.b_size =1 << inode->i_blkbits; + tmp_bh.b_size =i_blocksize (inode); err =jfs_get_block (inode, blk, &tmp_bh,1 );if (err) goto out;
fs/mpage.c +1 -1
@@ -115,7 +115,7 @@ map_buffer_to_page(struct page *page, struct buffer_head *bh, int page_block)SetPageUptodate (page);return ; } -create_empty_buffers (page,1 << inode->i_blkbits,0 ); +create_empty_buffers (page,i_blocksize (inode),0 ); } head =page_buffers (page); page_bh = head;
fs/nfsd/blocklayout.c +3 -3
@@ -23,7 +23,7 @@ nfsd4_block_proc_layoutget(struct inode *inode, const struct svc_fh *fhp, {struct nfsd4_layout_seg *seg = &args->lg_seg;struct super_block *sb = inode->i_sb; -u32 block_size = (1 << inode->i_blkbits); +u32 block_size =i_blocksize (inode);struct pnfs_block_extent *bex;struct iomap iomap;u32 device_generation =0 ;
@@ -180,7 +180,7 @@ nfsd4_block_proc_layoutcommit(struct inode *inode,int nr_iomaps; nr_iomaps =nfsd4_block_decode_layoutupdate (lcp->lc_up_layout, - lcp->lc_up_len, &iomaps,1 << inode->i_blkbits); + lcp->lc_up_len, &iomaps,i_blocksize (inode));if (nr_iomaps <0 )return nfserrno (nr_iomaps);
@@ -372,7 +372,7 @@ nfsd4_scsi_proc_layoutcommit(struct inode *inode,int nr_iomaps; nr_iomaps =nfsd4_scsi_decode_layoutupdate (lcp->lc_up_layout, - lcp->lc_up_len, &iomaps,1 << inode->i_blkbits); + lcp->lc_up_len, &iomaps,i_blocksize (inode));if (nr_iomaps <0 )return nfserrno (nr_iomaps);
fs/nfsd/nfs4proc.c +6 -7
@@ -1783,6 +1783,12 @@ nfsd4_proc_compound(struct svc_rqst *rqstp, opdesc->op_get_currentstateid (cstate, &op->u); op->status = opdesc->op_func (rqstp, cstate, &op->u); +/* Only from SEQUENCE */ +if (cstate->status == nfserr_replay_cache) { +dprintk ("%s NFS4.1 replay from cache\n" , __func__); + status = op->status; + goto out; + }if (!op->status) {if (opdesc->op_set_currentstateid) opdesc->op_set_currentstateid (cstate, &op->u);
@@ -1793,14 +1799,7 @@ nfsd4_proc_compound(struct svc_rqst *rqstp,if (need_wrongsec_check (rqstp)) op->status =check_nfsd_access (current_fh->fh_export, rqstp); } - encode_op: -/* Only from SEQUENCE */ -if (cstate->status == nfserr_replay_cache) { -dprintk ("%s NFS4.1 replay from cache\n" , __func__); - status = op->status; - goto out; - }if (op->status == nfserr_replay_me) { op->replay = &cstate->replay_owner->so_replay;nfsd4_encode_replay (&resp->xdr, op);
fs/nfsd/nfs4xdr.c +10 -3
@@ -2793,9 +2793,16 @@ nfsd4_encode_fattr(struct xdr_stream *xdr, struct svc_fh *fhp, }#endif /* CONFIG_NFSD_PNFS */ if (bmval2 &FATTR4_WORD2_SUPPATTR_EXCLCREAT ) { - status =nfsd4_encode_bitmap (xdr,NFSD_SUPPATTR_EXCLCREAT_WORD0 , -NFSD_SUPPATTR_EXCLCREAT_WORD1 , -NFSD_SUPPATTR_EXCLCREAT_WORD2 ); +u32 supp[3 ]; + + supp[0 ] =nfsd_suppattrs0 (minorversion); + supp[1 ] =nfsd_suppattrs1 (minorversion); + supp[2 ] =nfsd_suppattrs2 (minorversion); + supp[0 ] &=NFSD_SUPPATTR_EXCLCREAT_WORD0 ; + supp[1 ] &=NFSD_SUPPATTR_EXCLCREAT_WORD1 ; + supp[2 ] &=NFSD_SUPPATTR_EXCLCREAT_WORD2 ; + + status =nfsd4_encode_bitmap (xdr, supp[0 ], supp[1 ], supp[2 ]);if (status) goto out; }
fs/nilfs2/btnode.c +1 -1
@@ -50,7 +50,7 @@ nilfs_btnode_create_block(struct address_space *btnc, __u64 blocknr)brelse (bh);BUG (); } -memset (bh->b_data,0 ,1 << inode->i_blkbits); +memset (bh->b_data,0 ,i_blocksize (inode)); bh->b_bdev = inode->i_sb->s_bdev; bh->b_blocknr = blocknr;set_buffer_mapped (bh);
fs/nilfs2/inode.c +2 -2
@@ -51,7 +51,7 @@ void nilfs_inode_add_blocks(struct inode *inode, int n) {struct nilfs_root *root =NILFS_I (inode)->i_root; -inode_add_bytes (inode, (1 << inode->i_blkbits) * n); +inode_add_bytes (inode,i_blocksize (inode) * n);if (root)atomic64_add (n, &root->blocks_count); }
@@ -60,7 +60,7 @@ void nilfs_inode_sub_blocks(struct inode *inode, int n) {struct nilfs_root *root =NILFS_I (inode)->i_root; -inode_sub_bytes (inode, (1 << inode->i_blkbits) * n); +inode_sub_bytes (inode,i_blocksize (inode) * n);if (root)atomic64_sub (n, &root->blocks_count); }
fs/nilfs2/mdt.c +2 -2
@@ -57,7 +57,7 @@ nilfs_mdt_insert_new_block(struct inode *inode, unsigned long block,set_buffer_mapped (bh); kaddr =kmap_atomic (bh->b_page); -memset (kaddr +bh_offset (bh),0 ,1 << inode->i_blkbits); +memset (kaddr +bh_offset (bh),0 ,i_blocksize (inode));if (init_block)init_block (inode, bh, kaddr);flush_dcache_page (bh->b_page);
@@ -501,7 +501,7 @@ void nilfs_mdt_set_entry_size(struct inode *inode, unsigned int entry_size,struct nilfs_mdt_info *mi =NILFS_MDT (inode); mi->mi_entry_size = entry_size; - mi->mi_entries_per_block = (1 << inode->i_blkbits) / entry_size; + mi->mi_entries_per_block =i_blocksize (inode) / entry_size; mi->mi_first_entry_offset =DIV_ROUND_UP (header_size, entry_size); }
fs/nilfs2/segment.c +1 -1
@@ -723,7 +723,7 @@ static size_t nilfs_lookup_dirty_data_buffers(struct inode *inode,lock_page (page);if (!page_has_buffers (page)) -create_empty_buffers (page,1 << inode->i_blkbits,0 ); +create_empty_buffers (page,i_blocksize (inode),0 );unlock_page (page); bh = head =page_buffers (page);
fs/ocfs2/aops.c +1 -1
@@ -599,7 +599,7 @@ int ocfs2_map_page_blocks(struct page *page, u64 *p_blkno,int ret =0 ;struct buffer_head *head, *bh, *wait[2 ], **wait_bh = wait;unsigned int block_end, block_start; -unsigned int bsize =1 << inode->i_blkbits; +unsigned int bsize =i_blocksize (inode);if (!page_has_buffers (page))create_empty_buffers (page, bsize,0 );
fs/ocfs2/file.c +1 -1
@@ -808,7 +808,7 @@ static int ocfs2_write_zero_page(struct inode *inode, u64 abs_from,/* We know that zero_from is block aligned */ for (block_start = zero_from; block_start < zero_to; block_start = block_end) { - block_end = block_start + (1 << inode->i_blkbits); + block_end = block_start +i_blocksize (inode);/* * block_start is block-aligned. Bump it by one to force
fs/orangefs/orangefs-utils.c +2 -2
@@ -306,7 +306,7 @@ int orangefs_inode_getattr(struct inode *inode, int new, int bypass)break ;case S_IFDIR : inode->i_size =PAGE_SIZE ; - orangefs_inode->blksize = (1 << inode->i_blkbits); + orangefs_inode->blksize =i_blocksize (inode);spin_lock (&inode->i_lock);inode_set_bytes (inode, inode->i_size);spin_unlock (&inode->i_lock);
@@ -316,7 +316,7 @@ int orangefs_inode_getattr(struct inode *inode, int new, int bypass)if (new) { inode->i_size = (loff_t )strlen (new_op-> downcall.resp.getattr.link_target); - orangefs_inode->blksize = (1 << inode->i_blkbits); + orangefs_inode->blksize =i_blocksize (inode); ret =strscpy (orangefs_inode->link_target, new_op->downcall.resp.getattr.link_target,ORANGEFS_NAME_MAX );
fs/reiserfs/file.c +1 -1
@@ -189,7 +189,7 @@ int reiserfs_commit_page(struct inode *inode, struct page *page,int ret =0 ; th.t_trans_id =0 ; - blocksize =1 << inode->i_blkbits; + blocksize =i_blocksize (inode);if (logit) {reiserfs_write_lock (s);
fs/reiserfs/inode.c +1 -1
@@ -524,7 +524,7 @@ static int reiserfs_get_blocks_direct_io(struct inode *inode,* referenced in convert_tail_for_hole() that may be called from * reiserfs_get_block() */ - bh_result->b_size = (1 << inode->i_blkbits); + bh_result->b_size =i_blocksize (inode); ret =reiserfs_get_block (inode, iblock, bh_result, create |GET_BLOCK_NO_DANGLE );
fs/stat.c +2 -1
@@ -31,7 +31,7 @@ void generic_fillattr(struct inode *inode, struct kstat *stat) stat->atime = inode->i_atime; stat->mtime = inode->i_mtime; stat->ctime = inode->i_ctime; - stat->blksize = (1 << inode->i_blkbits); + stat->blksize =i_blocksize (inode); stat->blocks = inode->i_blocks; }
@@ -454,6 +454,7 @@ void __inode_add_bytes(struct inode *inode, loff_t bytes) inode->i_bytes -=512 ; } } +EXPORT_SYMBOL (__inode_add_bytes);void inode_add_bytes (struct inode *inode,loff_t bytes) {
fs/udf/inode.c +1 -1
@@ -1214,7 +1214,7 @@ int udf_setsize(struct inode *inode, loff_t newsize) {int err;struct udf_inode_info *iinfo; -int bsize =1 << inode->i_blkbits; +int bsize =i_blocksize (inode);if (!(S_ISREG (inode->i_mode) ||S_ISDIR (inode->i_mode) ||S_ISLNK (inode->i_mode)))
fs/ufs/balloc.c +25 -1
@@ -81,7 +81,8 @@ void ufs_free_fragments(struct inode *inode, u64 fragment, unsigned count)ufs_error (sb,"ufs_free_fragments" ,"bit already cleared for fragment %u" , i); } - + +inode_sub_bytes (inode, count << uspi->s_fshift);fs32_add (sb, &ucg->cg_cs.cs_nffree, count); uspi->cs_total.cs_nffree += count;fs32_add (sb, &UFS_SB (sb)->fs_cs (cgno).cs_nffree, count);
@@ -183,6 +184,7 @@ void ufs_free_blocks(struct inode *inode, u64 fragment, unsigned count)ufs_error (sb,"ufs_free_blocks" ,"freeing free fragment" ); }ubh_setblock (UCPI_UBH (ucpi), ucpi->c_freeoff, blkno); +inode_sub_bytes (inode, uspi->s_fpb << uspi->s_fshift);if ((UFS_SB (sb)->s_flags &UFS_CG_MASK ) ==UFS_CG_44BSD )ufs_clusteracct (sb, ucpi, blkno,1 );
@@ -494,6 +496,20 @@ u64 ufs_new_fragments(struct inode *inode, void *p, u64 fragment,return 0 ; } +static bool try_add_frags (struct inode *inode,unsigned frags) +{ +unsigned size = frags *i_blocksize (inode); +spin_lock (&inode->i_lock); +__inode_add_bytes (inode, size); +if (unlikely ((u32 )inode->i_blocks != inode->i_blocks)) { +__inode_sub_bytes (inode, size); +spin_unlock (&inode->i_lock); +return false; + } +spin_unlock (&inode->i_lock); +return true; +} +static u64 ufs_add_fragments (struct inode *inode,u64 fragment,unsigned oldcount,unsigned newcount) {
@@ -530,6 +546,9 @@ static u64 ufs_add_fragments(struct inode *inode, u64 fragment,for (i = oldcount; i < newcount; i++)if (ubh_isclr (UCPI_UBH (ucpi), ucpi->c_freeoff, fragno + i))return 0 ; + +if (!try_add_frags (inode, count)) +return 0 ;/* * Block can be extended */
@@ -647,6 +666,7 @@ static u64 ufs_alloc_fragments(struct inode *inode, unsigned cgno,ubh_setbit (UCPI_UBH (ucpi), ucpi->c_freeoff, goal + i); i = uspi->s_fpb - count; +inode_sub_bytes (inode, i << uspi->s_fshift);fs32_add (sb, &ucg->cg_cs.cs_nffree, i); uspi->cs_total.cs_nffree += i;fs32_add (sb, &UFS_SB (sb)->fs_cs (cgno).cs_nffree, i);
@@ -657,6 +677,8 @@ static u64 ufs_alloc_fragments(struct inode *inode, unsigned cgno, result =ufs_bitmap_search (sb, ucpi, goal, allocsize);if (result ==INVBLOCK )return 0 ; +if (!try_add_frags (inode, count)) +return 0 ;for (i =0 ; i < count; i++)ubh_clrbit (UCPI_UBH (ucpi), ucpi->c_freeoff, result + i);
@@ -716,6 +738,8 @@ static u64 ufs_alloccg_block(struct inode *inode,return INVBLOCK ; ucpi->c_rotor = result; gotit: +if (!try_add_frags (inode, uspi->s_fpb)) +return 0 ; blkno =ufs_fragstoblks (result);ubh_clrblock (UCPI_UBH (ucpi), ucpi->c_freeoff, blkno);if ((UFS_SB (sb)->s_flags &UFS_CG_MASK ) ==UFS_CG_44BSD )
fs/ufs/inode.c +6 -3
@@ -235,7 +235,8 @@ ufs_extend_tail(struct inode *inode, u64 writes_to, p =ufs_get_direct_data_ptr (uspi, ufsi, block); tmp =ufs_new_fragments (inode, p, lastfrag,ufs_data_ptr_to_cpu (sb, p), - new_size, err, locked_page); + new_size - (lastfrag & uspi->s_fpbmask), err, + locked_page);return tmp !=0 ; }
@@ -284,7 +285,7 @@ ufs_inode_getfrag(struct inode *inode, unsigned index, goal += uspi->s_fpb; } tmp =ufs_new_fragments (inode, p,ufs_blknum (new_fragment), - goal, uspi->s_fpb, err, locked_page); + goal, nfrags, err, locked_page);if (!tmp) { *err = -ENOSPC ;
@@ -402,7 +403,9 @@ static int ufs_getfrag_block(struct inode *inode, sector_t fragment, struct buffif (!create) { phys64 =ufs_frag_map (inode, offsets, depth); - goto out; +if (phys64) +map_bh (bh_result, sb, phys64 + frag); +return 0 ; }/* This code entered only while writing ....? */
fs/ufs/super.c +18 -0
@@ -746,6 +746,23 @@ static void ufs_put_super(struct super_block *sb)return ; } +static u64 ufs_max_bytes (struct super_block *sb) +{ +struct ufs_sb_private_info *uspi =UFS_SB (sb)->s_uspi; +int bits = uspi->s_apbshift; +u64 res; + +if (bits >21 ) + res = ~0ULL ; +else + res =UFS_NDADDR + (1LL << bits) + (1LL << (2 *bits)) + + (1LL << (3 *bits)); + +if (res >= (MAX_LFS_FILESIZE >> uspi->s_bshift)) +return MAX_LFS_FILESIZE ; +return res << uspi->s_bshift; +} +static int ufs_fill_super (struct super_block *sb,void *data,int silent) {struct ufs_sb_info * sbi;
@@ -1211,6 +1228,7 @@ static int ufs_fill_super(struct super_block *sb, void *data, int silent) "fast symlink size (%u)\n", uspi->s_maxsymlinklen); uspi->s_maxsymlinklen = maxsymlen; } + sb->s_maxbytes =ufs_max_bytes (sb); sb->s_max_links =UFS_LINK_MAX ; inode =ufs_iget (sb,UFS_ROOTINO );
fs/ufs/util.h +7 -3
@@ -473,15 +473,19 @@ static inline unsigned _ubh_find_last_zero_bit_(static inline int _ubh_isblockset_ (struct ufs_sb_private_info * uspi,struct ufs_buffer_head * ubh,unsigned begin,unsigned block) { +u8 mask;switch (uspi->s_fpb) {case 8 :return (*ubh_get_addr (ubh, begin + block) ==0xff );case 4 : -return (*ubh_get_addr (ubh, begin + (block >>1 )) == (0x0f << ((block &0x01 ) <<2 ))); + mask =0x0f << ((block &0x01 ) <<2 ); +return (*ubh_get_addr (ubh, begin + (block >>1 )) & mask) == mask;case 2 : -return (*ubh_get_addr (ubh, begin + (block >>2 )) == (0x03 << ((block &0x03 ) <<1 ))); + mask =0x03 << ((block &0x03 ) <<1 ); +return (*ubh_get_addr (ubh, begin + (block >>2 )) & mask) == mask;case 1 : -return (*ubh_get_addr (ubh, begin + (block >>3 )) == (0x01 << (block &0x07 ))); + mask =0x01 << (block &0x07 ); +return (*ubh_get_addr (ubh, begin + (block >>3 )) & mask) == mask; }return 0 ; }
fs/xfs/xfs_aops.c +8 -8
@@ -108,9 +108,9 @@ xfs_finish_page_writeback(unsigned int bsize;ASSERT (bvec->bv_offset <PAGE_SIZE ); -ASSERT ((bvec->bv_offset & ((1 << inode->i_blkbits) -1 )) ==0 ); +ASSERT ((bvec->bv_offset & (i_blocksize (inode) -1 )) ==0 );ASSERT (end <PAGE_SIZE ); -ASSERT ((bvec->bv_len & ((1 << inode->i_blkbits) -1 )) ==0 ); +ASSERT ((bvec->bv_len & (i_blocksize (inode) -1 )) ==0 ); bh = head =page_buffers (bvec->bv_page);
@@ -349,7 +349,7 @@ xfs_map_blocks( {struct xfs_inode *ip =XFS_I (inode);struct xfs_mount *mp = ip->i_mount; -ssize_t count =1 << inode->i_blkbits; +ssize_t count =i_blocksize (inode);xfs_fileoff_t offset_fsb, end_fsb;int error =0 ;int bmapi_flags =XFS_BMAPI_ENTIRE ;
@@ -759,7 +759,7 @@ xfs_aops_discard_page(break ; } next_buffer: - offset +=1 << inode->i_blkbits; + offset +=i_blocksize (inode); }while ((bh = bh->b_this_page) != head);
@@ -847,7 +847,7 @@ xfs_writepage_map(LIST_HEAD (submit_list);struct xfs_ioend *ioend, *next;struct buffer_head *bh, *head; -ssize_t len =1 << inode->i_blkbits; +ssize_t len =i_blocksize (inode);int error =0 ;int count =0 ;int uptodate =1 ;
@@ -1250,7 +1250,7 @@ xfs_map_trim_size( offset + mapping_size >= i_size_read(inode)) {/* limit mapping to block that spans EOF */ mapping_size =roundup_64 (i_size_read (inode) - offset, -1 << inode->i_blkbits); +i_blocksize (inode)); }if (mapping_size >LONG_MAX ) mapping_size =LONG_MAX ;
@@ -1286,7 +1286,7 @@ __xfs_get_blocks(return -EIO ;
Lines of this file are not shown. View the raw message.
security/keys/encrypted-keys/encrypted.c +9 -8
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.