Linux 4.4.104
Greg KH
maintainerI'm announcing the release of the 4.4.104 kernel.
All users of the 4.4 kernel series must upgrade.
The updated 4.4.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.4.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/boot/dts/logicpd-torpedo-37xx-devkit.dts | 2 arch/x86/include/asm/efi.h | 26 ++++ arch/x86/kvm/svm.c | 2 arch/x86/kvm/vmx.c | 2 arch/x86/kvm/x86.c | 5 arch/x86/mm/pageattr.c | 17 -- arch/x86/platform/efi/efi-bgrt.c | 39 ++---- arch/x86/platform/efi/efi.c | 39 ++---- arch/x86/platform/efi/efi_32.c | 5 arch/x86/platform/efi/efi_64.c | 137 ++++++++++++++++------ arch/x86/platform/efi/efi_stub_64.S | 43 ------ drivers/firmware/efi/efi.c | 32 ----- drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 38 ++---- drivers/gpu/drm/i915/intel_i2c.c | 4 drivers/gpu/drm/panel/panel-simple.c | 2 drivers/gpu/drm/radeon/atombios_dp.c | 38 ++---- drivers/gpu/drm/radeon/radeon_fb.c | 1 drivers/md/bcache/alloc.c | 2 drivers/md/bcache/extents.c | 2 drivers/md/bcache/journal.c | 2 drivers/misc/eeprom/at24.c | 6 drivers/mmc/core/bus.c | 3 drivers/mtd/nand/nand_base.c | 9 - fs/btrfs/extent-tree.c | 14 +- fs/nfs/dir.c | 3 fs/nfsd/nfs4state.c | 114 ++++++++++++------ include/linux/netlink.h | 2 include/net/genetlink.h | 2 include/uapi/linux/bcache.h | 2 mm/huge_memory.c | 14 -- mm/madvise.c | 4 net/netlink/af_netlink.c | 4 net/netlink/genetlink.c | 16 ++ net/xfrm/xfrm_user.c | 25 ++-- 35 files changed, 372 insertions(+), 286 deletions(-)
Adam Ford (1):
ARM: dts: omap3: logicpd-torpedo-37xx-devkit: Fix MMC1 cd-gpio
Adrian Hunter (1):
mmc: core: Do not leave the block driver in a suspended state
Alex Deucher (1):
Revert "drm/radeon: dont switch vt on suspend"
Brent Taylor (1):
mtd: nand: Fix writing mtdoops to nand flash.
Greg Kroah-Hartman (1):
Linux 4.4.104
Heiner Kallweit (1):
eeprom: at24: check at24_read/write arguments
Herbert Xu (1):
ipsec: Fix aborted xfrm policy dump crash
Huacai Chen (1):
bcache: Fix building error on MIPS
Jonathan Liu (1):
drm/panel: simple: Add missing panel_simple_unprepare() calls
Josef Bacik (1):
btrfs: clear space cache inode generation always
Kirill A. Shutemov (1):
mm, thp: Do not make page table dirty unconditionally in touch_p[mu]d()
Liran Alon (2):
KVM: x86: pvclock: Handle first-time write to pvclock-page contains random junk
KVM: x86: Exit to user-mode on #UD intercept when emulator requires
Matt Fleming (4):
x86/mm/pat: Ensure cpa->pfn only contains page frame numbers x86/efi: Hoist page table switching code into efi_call_virt() x86/efi: Build our own page table structures x86/efi-bgrt: Replace early_memremap() with memremap()
NeilBrown (1):
NFS: revalidate "." etc correctly on "open".
Oleg Drokin (1):
nfsd: Make init_open_stateid() a bit more whole
Paolo Bonzini (1):
KVM: x86: inject exceptions produced by x86_decode_insn
Roman Kapl (1):
drm/radeon: fix atombios on big endian
Sai Praneeth (1):
x86/efi-bgrt: Fix kernel panic when mapping BGRT data
Tom Herbert (1):
netlink: add a start callback for starting a netlink dump
Trond Myklebust (2):
nfsd: Fix stateid races between OPEN and CLOSE
nfsd: Fix another OPEN stateid race
Ville Syrjälä (2):
drm/i915: Don't try indexed reads to alternate slave addresses drm/i915: Prevent zero length "index" write
chenjie (1):
mm/madvise.c: fix madvise() infinite loop under special circumstances
Greg KH
maintainerMakefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 4 PATCHLEVEL = 4 -SUBLEVEL = 103 +SUBLEVEL = 104 EXTRAVERSION = NAME = Blurry Fish Butt
arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts +1 -1
@@ -88,7 +88,7 @@ interrupts-extended = <&intc 83 &omap3_pmx_core 0x11a>; pinctrl-names = "default"; pinctrl-0 = <&mmc1_pins &mmc1_cd>; - cd-gpios = <&gpio4 31 IRQ_TYPE_LEVEL_LOW>; /* gpio127 */ + cd-gpios = <&gpio4 31 GPIO_ACTIVE_LOW>; /* gpio127 */ vmmc-supply = <&vmmc1>; bus-width = <4>; cap-power-off-card;
arch/x86/include/asm/efi.h +26 -0
@@ -3,6 +3,7 @@#include <asm/fpu/api.h> #include <asm/pgtable.h> +#include <asm/tlb.h> /* * We map the EFI regions needed for runtime services non-contiguously,
@@ -64,6 +65,17 @@ extern u64 asmlinkage efi_call(void *fp, ...); #define efi_call_phys(f, args...) efi_call((f), args) +/* +* Scratch space used for switching the pagetable in the EFI stub +*/ +struct efi_scratch { +u64 r15; +u64 prev_cr3; +pgd_t *efi_pgt; +bool use_pgd; +u64 phys_stack; +} __packed; +#define efi_call_virt (f, ...) \ ({ \ efi_status_t __s; \
@@ -71,7 +83,20 @@ extern u64 asmlinkage efi_call(void *fp, ...);efi_sync_low_kernel_mappings (); \preempt_disable (); \__kernel_fpu_begin (); \ + \ +if (efi_scratch.use_pgd) { \ + efi_scratch.prev_cr3 =read_cr3 (); \ +write_cr3 ((unsigned long )efi_scratch.efi_pgt); \ +__flush_tlb_all (); \ + } \ + \ __s =efi_call ((void *)efi.systab->runtime->f, __VA_ARGS__); \ + \ +if (efi_scratch.use_pgd) { \ +write_cr3 (efi_scratch.prev_cr3); \ +__flush_tlb_all (); \ + } \ + \__kernel_fpu_end (); \preempt_enable (); \ __s; \
@@ -111,6 +136,7 @@ extern void __init efi_memory_uc(u64 addr, unsigned long size);extern void __init efi_map_region (efi_memory_desc_t *md);extern void __init efi_map_region_fixed (efi_memory_desc_t *md);extern void efi_sync_low_kernel_mappings (void ); +extern int __init efi_alloc_page_tables (void );extern int __init efi_setup_page_tables (unsigned long pa_memmap,unsigned num_pages);extern void __init efi_cleanup_page_tables (unsigned long pa_memmap,unsigned num_pages);extern void __init old_map_region (efi_memory_desc_t *md);
arch/x86/kvm/svm.c +2 -0
@@ -1696,6 +1696,8 @@ static int ud_interception(struct vcpu_svm *svm)int er; er =emulate_instruction (&svm->vcpu,EMULTYPE_TRAP_UD ); +if (er ==EMULATE_USER_EXIT ) +return 0 ;if (er !=EMULATE_DONE )kvm_queue_exception (&svm->vcpu,UD_VECTOR );return 1 ;
arch/x86/kvm/vmx.c +2 -0
@@ -5267,6 +5267,8 @@ static int handle_exception(struct kvm_vcpu *vcpu)return 1 ; } er =emulate_instruction (vcpu,EMULTYPE_TRAP_UD ); +if (er ==EMULATE_USER_EXIT ) +return 0 ;if (er !=EMULATE_DONE )kvm_queue_exception (vcpu,UD_VECTOR );return 1 ;
arch/x86/kvm/x86.c +5 -0
@@ -1812,6 +1812,9 @@ static int kvm_guest_time_update(struct kvm_vcpu *v)*/ BUILD_BUG_ON (offsetof(struct pvclock_vcpu_time_info , version) !=0 ); +if (guest_hv_clock.version &1 ) + ++guest_hv_clock.version;/* first time write, random junk */ + vcpu->hv_clock.version = guest_hv_clock.version +1 ; kvm_write_guest_cached(v->kvm, &vcpu->pv_time, &vcpu->hv_clock,
@@ -5426,6 +5429,8 @@ int x86_emulate_instruction(struct kvm_vcpu *vcpu,if (reexecute_instruction (vcpu, cr2, write_fault_to_spt, emulation_type))return EMULATE_DONE ; +if (ctxt->have_exception &&inject_emulated_exception (vcpu)) +return EMULATE_DONE ;if (emulation_type &EMULTYPE_SKIP )return EMULATE_FAIL ;return handle_emulation_failure (vcpu);
arch/x86/mm/pageattr.c +6 -11
@@ -911,15 +911,10 @@ static void populate_pte(struct cpa_data *cpa, pte =pte_offset_kernel (pmd, start);while (num_pages-- && start < end) { - -/* deal with the NX bit */ -if (!(pgprot_val (pgprot) & _PAGE_NX)) - cpa->pfn &= ~_PAGE_NX; - -set_pte (pte,pfn_pte (cpa->pfn >>PAGE_SHIFT , pgprot)); +set_pte (pte,pfn_pte (cpa->pfn, pgprot)); start +=PAGE_SIZE ; - cpa->pfn +=PAGE_SIZE ; + cpa->pfn++; pte++; } }
@@ -975,11 +970,11 @@ static int populate_pmd(struct cpa_data *cpa, pmd =pmd_offset (pud, start); -set_pmd (pmd,__pmd (cpa->pfn | _PAGE_PSE | +set_pmd (pmd,__pmd (cpa->pfn <<PAGE_SHIFT | _PAGE_PSE |massage_pgprot (pmd_pgprot))); start +=PMD_SIZE ; - cpa->pfn +=PMD_SIZE ; + cpa->pfn +=PMD_SIZE >>PAGE_SHIFT ; cur_pages +=PMD_SIZE >>PAGE_SHIFT ; }
@@ -1048,11 +1043,11 @@ static int populate_pud(struct cpa_data *cpa, unsigned long start, pgd_t *pgd,* Map everything starting from the Gb boundary, possibly with 1G pages */ while (end - start >=PUD_SIZE ) { -set_pud (pud,__pud (cpa->pfn | _PAGE_PSE | +set_pud (pud,__pud (cpa->pfn <<PAGE_SHIFT | _PAGE_PSE |massage_pgprot (pud_pgprot))); start +=PUD_SIZE ; - cpa->pfn +=PUD_SIZE ; + cpa->pfn +=PUD_SIZE >>PAGE_SHIFT ; cur_pages +=PUD_SIZE >>PAGE_SHIFT ; pud++; }
arch/x86/platform/efi/efi-bgrt.c +14 -25
@@ -28,8 +28,7 @@ struct bmp_header {void __init efi_bgrt_init (void ) {acpi_status status; -void __iomem *image; -bool ioremapped = false; +void *image;struct bmp_header bmp_header;if (acpi_disabled)
@@ -70,20 +69,14 @@ void __init efi_bgrt_init(void)return ; } - image =efi_lookup_mapped_addr (bgrt_tab->image_address); + image =memremap (bgrt_tab->image_address,sizeof (bmp_header),MEMREMAP_WB );if (!image) { - image =early_ioremap (bgrt_tab->image_address, -sizeof (bmp_header)); - ioremapped = true; -if (!image) { -pr_err ("Ignoring BGRT: failed to map image header memory\n" ); -return ; - } +pr_err ("Ignoring BGRT: failed to map image header memory\n" ); +return ; } -memcpy_fromio (&bmp_header, image,sizeof (bmp_header)); -if (ioremapped) -early_iounmap (image,sizeof (bmp_header)); +memcpy (&bmp_header, image,sizeof (bmp_header)); +memunmap (image); bgrt_image_size = bmp_header.size; bgrt_image =kmalloc (bgrt_image_size,GFP_KERNEL | __GFP_NOWARN);
@@ -93,18 +86,14 @@ void __init efi_bgrt_init(void)return ; } -if (ioremapped) { - image =early_ioremap (bgrt_tab->image_address, - bmp_header.size); -if (!image) { -pr_err ("Ignoring BGRT: failed to map image memory\n" ); -kfree (bgrt_image); - bgrt_image =NULL ; -return ; - } + image =memremap (bgrt_tab->image_address, bmp_header.size,MEMREMAP_WB ); +if (!image) { +pr_err ("Ignoring BGRT: failed to map image memory\n" ); +kfree (bgrt_image); + bgrt_image =NULL ; +return ; } -memcpy_fromio (bgrt_image, image, bgrt_image_size); -if (ioremapped) -early_iounmap (image, bmp_header.size); +memcpy (bgrt_image, image, bgrt_image_size); +memunmap (image); }
arch/x86/platform/efi/efi.c +14 -25
@@ -869,7 +869,7 @@ static void __init kexec_enter_virtual_mode(void)* This function will switch the EFI runtime services to virtual mode. * Essentially, we look through the EFI memmap and map every region that * has the runtime attribute bit set in its memory descriptor into the -* ->trampoline_pgd page table using a top-down VA allocation scheme. +* efi_pgd page table. * * The old method which used to update that memory descriptor with the * virtual address obtained from ioremap() is still supported when the
@@ -879,8 +879,8 @@ static void __init kexec_enter_virtual_mode(void)* * The new method does a pagetable switch in a preemption-safe manner * so that we're in a different address space when calling a runtime -* function. For function arguments passing we do copy the PGDs of the -* kernel page table into ->trampoline_pgd prior to each call. +* function. For function arguments passing we do copy the PUDs of the +* kernel page table into efi_pgd prior to each call. * * Specially for kexec boot, efi runtime maps in previous kernel should * be passed in via setup_data. In that case runtime ranges will be mapped
@@ -895,6 +895,12 @@ static void __init __efi_enter_virtual_mode(void) efi.systab =NULL ; +if (efi_alloc_page_tables ()) { +pr_err ("Failed to allocate EFI page tables\n" ); +clear_bit (EFI_RUNTIME_SERVICES , &efi.flags); +return ; + } +efi_merge_regions (); new_memmap =efi_map_regions (&count, &pg_shift);if (!new_memmap) {
@@ -954,28 +960,11 @@ static void __init __efi_enter_virtual_mode(void)efi_runtime_mkexec ();/* -* We mapped the descriptor array into the EFI pagetable above but we're -* not unmapping it here. Here's why: -* -* We're copying select PGDs from the kernel page table to the EFI page -* table and when we do so and make changes to those PGDs like unmapping -* stuff from them, those changes appear in the kernel page table and we -* go boom. -* -* From setup_real_mode(): -* -* ... -* trampoline_pgd[0] = init_level4_pgt[pgd_index(__PAGE_OFFSET)].pgd; -* -* In this particular case, our allocation is in PGD 0 of the EFI page -* table but we've copied that PGD from PGD[272] of the EFI page table: -* -* pgd_index(__PAGE_OFFSET = 0xffff880000000000) = 272 -* -* where the direct memory mapping in kernel space is. -* -* new_memmap's VA comes from that direct mapping and thus clearing it, -* it would get cleared in the kernel page table too. +* We mapped the descriptor array into the EFI pagetable above +* but we're not unmapping it here because if we're running in +* EFI mixed mode we need all of memory to be accessible when +* we pass parameters to the EFI runtime services in the +* thunking code. * * efi_cleanup_page_tables(__pa(new_memmap), 1 << pg_shift); */
arch/x86/platform/efi/efi_32.c +5 -0
@@ -38,6 +38,11 @@* say 0 - 3G. */ +int __init efi_alloc_page_tables (void ) +{ +return 0 ; +} +void efi_sync_low_kernel_mappings (void ) {}void __init efi_dump_pagetable (void ) {}int __init efi_setup_page_tables (unsigned long pa_memmap,unsigned num_pages)
arch/x86/platform/efi/efi_64.c +103 -34
226 lines not on this page · raw message
arch/x86/platform/efi/efi_stub_64.S +0 -43
57 lines not on this page · raw message
drivers/firmware/efi/efi.c +0 -32
@@ -325,38 +325,6 @@ u64 __init efi_mem_desc_end(efi_memory_desc_t *md)return end; } -/* -* We can't ioremap data in EFI boot services RAM, because we've already mapped -* it as RAM. So, look it up in the existing EFI memory map instead. Only -* callable after efi_enter_virtual_mode and before efi_free_boot_services. -*/ -void __iomem *efi_lookup_mapped_addr (u64 phys_addr) -{ -struct efi_memory_map *map; -void *p; - map = efi.memmap; -if (!map) -return NULL ; -if (WARN_ON (!map->map)) -return NULL ; -for (p = map->map; p < map->map_end; p += map->desc_size) { -efi_memory_desc_t *md = p; -u64 size = md->num_pages <<EFI_PAGE_SHIFT ; -u64 end = md->phys_addr + size; -if (!(md->attribute &EFI_MEMORY_RUNTIME ) && - md->type !=EFI_BOOT_SERVICES_CODE && - md->type !=EFI_BOOT_SERVICES_DATA ) -continue ; -if (!md->virt_addr) -continue ; -if (phys_addr >= md->phys_addr && phys_addr < end) { - phys_addr += md->virt_addr - md->phys_addr; -return (__force void __iomem *)(unsigned long )phys_addr; - } - } -return NULL ; -} -static __initdata efi_config_table_type_t common_tables[] = { {ACPI_20_TABLE_GUID ,"ACPI 2.0" , &efi.acpi20}, {ACPI_TABLE_GUID ,"ACPI" , &efi.acpi},
drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c +18 -20
@@ -1575,34 +1575,32 @@ void amdgpu_atombios_scratch_regs_restore(struct amdgpu_device *adev)WREG32 (mmBIOS_SCRATCH_0 + i, adev->bios_scratch[i]); } -/* Atom needs data in little endian format -* so swap as appropriate when copying data to -* or from atom. Note that atom operates on -* dw units. +/* Atom needs data in little endian format so swap as appropriate when copying +* data to or from atom. Note that atom operates on dw units. +* +* Use to_le=true when sending data to atom and provide at least +* ALIGN(num_bytes,4) bytes in the dst buffer. +* +* Use to_le=false when receiving data from atom and provide ALIGN(num_bytes,4) +* byes in the src buffer. */ void amdgpu_atombios_copy_swap (u8 *dst,u8 *src,u8 num_bytes,bool to_le) {#ifdef __BIG_ENDIAN -u8 src_tmp[20 ], dst_tmp[20 ];/* used for byteswapping */ -u32 *dst32, *src32; +u32 src_tmp[5 ], dst_tmp[5 ];int i; +u8 align_num_bytes =ALIGN (num_bytes,4 ); -memcpy (src_tmp, src, num_bytes); - src32 = (u32 *)src_tmp; - dst32 = (u32 *)dst_tmp;if (to_le) { -for (i =0 ; i < ((num_bytes +3 ) /4 ); i++) - dst32[i] =cpu_to_le32 (src32[i]); -memcpy (dst, dst_tmp, num_bytes); +memcpy (src_tmp, src, num_bytes); +for (i =0 ; i < align_num_bytes /4 ; i++) + dst_tmp[i] =cpu_to_le32 (src_tmp[i]); +memcpy (dst, dst_tmp, align_num_bytes); }else { -u8 dws = num_bytes & ~3 ; -for (i =0 ; i < ((num_bytes +3 ) /4 ); i++) - dst32[i] =le32_to_cpu (src32[i]); -memcpy (dst, dst_tmp, dws); -if (num_bytes %4 ) { -for (i =0 ; i < (num_bytes %4 ); i++) - dst[dws+i] = dst_tmp[dws+i]; - } +memcpy (src_tmp, src, align_num_bytes); +for (i =0 ; i < align_num_bytes /4 ; i++) + dst_tmp[i] =le32_to_cpu (src_tmp[i]); +memcpy (dst, dst_tmp, num_bytes); }#else memcpy (dst, src, num_bytes);
drivers/gpu/drm/i915/intel_i2c.c +3 -1
@@ -440,7 +440,9 @@ static bool gmbus_is_index_read(struct i2c_msg *msgs, int i, int num) { return (i + 1 < num && - !(msgs[i].flags & I2C_M_RD) && msgs[i].len <= 2 && + msgs[i].addr == msgs[i + 1].addr && + !(msgs[i].flags & I2C_M_RD) && + (msgs[i].len == 1 || msgs[i].len == 2) && (msgs[i + 1].flags & I2C_M_RD)); }
drivers/gpu/drm/panel/panel-simple.c +2 -0
@@ -352,6 +352,7 @@ static int panel_simple_remove(struct device *dev)drm_panel_remove (&panel->base);panel_simple_disable (&panel->base); +panel_simple_unprepare (&panel->base);if (panel->ddc)put_device (&panel->ddc->dev);
@@ -367,6 +368,7 @@ static void panel_simple_shutdown(struct device *dev)struct panel_simple *panel =dev_get_drvdata (dev);panel_simple_disable (&panel->base); +panel_simple_unprepare (&panel->base); }static const struct drm_display_mode ampire_am800480r3tmqwa1h_mode = {
drivers/gpu/drm/radeon/atombios_dp.c +18 -20
@@ -45,34 +45,32 @@ static char *pre_emph_names[] = {/***** radeon AUX functions *****/ -/* Atom needs data in little endian format -* so swap as appropriate when copying data to -* or from atom. Note that atom operates on -* dw units. +/* Atom needs data in little endian format so swap as appropriate when copying +* data to or from atom. Note that atom operates on dw units. +* +* Use to_le=true when sending data to atom and provide at least +* ALIGN(num_bytes,4) bytes in the dst buffer. +* +* Use to_le=false when receiving data from atom and provide ALIGN(num_bytes,4) +* byes in the src buffer. */ void radeon_atom_copy_swap (u8 *dst,u8 *src,u8 num_bytes,bool to_le) {#ifdef __BIG_ENDIAN -u8 src_tmp[20 ], dst_tmp[20 ];/* used for byteswapping */ -u32 *dst32, *src32; +u32 src_tmp[5 ], dst_tmp[5 ];int i; +u8 align_num_bytes =ALIGN (num_bytes,4 ); -memcpy (src_tmp, src, num_bytes); - src32 = (u32 *)src_tmp; - dst32 = (u32 *)dst_tmp;if (to_le) { -for (i =0 ; i < ((num_bytes +3 ) /4 ); i++) - dst32[i] =cpu_to_le32 (src32[i]); -memcpy (dst, dst_tmp, num_bytes); +memcpy (src_tmp, src, num_bytes); +for (i =0 ; i < align_num_bytes /4 ; i++) + dst_tmp[i] =cpu_to_le32 (src_tmp[i]); +memcpy (dst, dst_tmp, align_num_bytes); }else { -u8 dws = num_bytes & ~3 ; -for (i =0 ; i < ((num_bytes +3 ) /4 ); i++) - dst32[i] =le32_to_cpu (src32[i]); -memcpy (dst, dst_tmp, dws); -if (num_bytes %4 ) { -for (i =0 ; i < (num_bytes %4 ); i++) - dst[dws+i] = dst_tmp[dws+i]; - } +memcpy (src_tmp, src, align_num_bytes); +for (i =0 ; i < align_num_bytes /4 ; i++) + dst_tmp[i] =le32_to_cpu (src_tmp[i]); +memcpy (dst, dst_tmp, num_bytes); }#else memcpy (dst, src, num_bytes);
drivers/gpu/drm/radeon/radeon_fb.c +0 -1
@@ -226,7 +226,6 @@ static int radeonfb_create(struct drm_fb_helper *helper, } info->par = rfbdev; - info->skip_vt_switch = true; ret =radeon_framebuffer_init (rdev->ddev, &rfbdev->rfb, &mode_cmd, gobj);if (ret) {
drivers/md/bcache/alloc.c +1 -1
@@ -479,7 +479,7 @@ int __bch_bucket_alloc_set(struct cache_set *c, unsigned reserve,if (b ==-1 ) goto err; - k->ptr[i] =PTR (ca->buckets[b].gen, + k->ptr[i] =MAKE_PTR (ca->buckets[b].gen,bucket_to_sector (c, b), ca->sb.nr_this_dev);
drivers/md/bcache/extents.c +1 -1
@@ -584,7 +584,7 @@ static bool bch_extent_merge(struct btree_keys *bk, struct bkey *l, struct bkeyreturn false;for (i =0 ; i <KEY_PTRS (l); i++) -if (l->ptr[i] +PTR (0 ,KEY_SIZE (l),0 ) != r->ptr[i] || +if (l->ptr[i] +MAKE_PTR (0 ,KEY_SIZE (l),0 ) != r->ptr[i] ||PTR_BUCKET_NR (b->c, l, i) !=PTR_BUCKET_NR (b->c, r, i))return false;
drivers/md/bcache/journal.c +1 -1
@@ -508,7 +508,7 @@ static void journal_reclaim(struct cache_set *c)continue ; ja->cur_idx = next; - k->ptr[n++] =PTR (0 , + k->ptr[n++] =MAKE_PTR (0 ,bucket_to_sector (c, ca->sb.d[ja->cur_idx]), ca->sb.nr_this_dev); }
drivers/misc/eeprom/at24.c +6 -0
@@ -257,6 +257,9 @@ static ssize_t at24_read(struct at24_data *at24,if (unlikely (!count))return count; +if (off + count > at24->chip.byte_len) +return -EINVAL ; +/* * Read data from chip, protecting against concurrent updates * from this host, but not from other I2C masters.
@@ -311,6 +314,9 @@ static ssize_t at24_eeprom_write(struct at24_data *at24, const char *buf,unsigned long timeout, write_time;unsigned next_page; +if (offset + count > at24->chip.byte_len) +return -EINVAL ; +/* Get corresponding I2C address and adjust offset */ client =at24_translate_offset (at24, &offset);
drivers/mmc/core/bus.c +3 -0
@@ -155,6 +155,9 @@ static int mmc_bus_suspend(struct device *dev)return ret; ret = host->bus_ops->suspend (host); +if (ret) +pm_generic_resume (dev); +return ret; }
drivers/mtd/nand/nand_base.c +6 -3
@@ -2663,15 +2663,18 @@ static int panic_nand_write(struct mtd_info *mtd, loff_t to, size_t len, size_t *retlen, const uint8_t *buf) { struct nand_chip *chip = mtd->priv; +int chipnr = (int )(to >> chip->chip_shift);struct mtd_oob_ops ops;int ret; -/* Wait for the device to get ready */ -panic_nand_wait (mtd, chip,400 ); -/* Grab the device */ panic_nand_get_device (chip, mtd,FL_WRITING ); + chip->select_chip (mtd, chipnr); + +/* Wait for the device to get ready */ +panic_nand_wait (mtd, chip,400 ); +memset (&ops,0 ,sizeof (ops)); ops.len = len; ops.datbuf = (uint8_t *)buf;
fs/btrfs/extent-tree.c +7 -7
@@ -3361,13 +3361,6 @@ again: goto again; } -/* We've already setup this transaction, go ahead and exit */ -if (block_group->cache_generation == trans->transid && -i_size_read (inode)) { - dcs =BTRFS_DC_SETUP ; - goto out_put; - } -/* * We want to set the generation to 0, that way if anything goes wrong * from here on out we know not to trust this cache when we load up next
@@ -3391,6 +3384,13 @@ again: }WARN_ON (ret); +/* We've already setup this transaction, go ahead and exit */ +if (block_group->cache_generation == trans->transid && +i_size_read (inode)) { + dcs =BTRFS_DC_SETUP ; + goto out_put; + } +if (i_size_read (inode) >0 ) { ret =btrfs_check_trunc_cache_free_space (root, &root->fs_info->global_block_rsv);
fs/nfs/dir.c +2 -1
@@ -1260,7 +1260,7 @@ static int nfs_weak_revalidate(struct dentry *dentry, unsigned int flags)return 0 ; } - error =nfs_revalidate_inode (NFS_SERVER (inode), inode); + error =nfs_lookup_verify_inode (inode, flags);dfprintk (LOOKUPCACHE ,"NFS: %s: inode %lu is %s\n" , __func__, inode->i_ino, error ?"invalid" :"valid" );return !error;
@@ -1420,6 +1420,7 @@ static int nfs4_lookup_revalidate(struct dentry *, unsigned int);const struct dentry_operations nfs4_dentry_operations = { .d_revalidate = nfs4_lookup_revalidate, + .d_weak_revalidate = nfs_weak_revalidate, .d_delete = nfs_dentry_delete, .d_iput = nfs_dentry_iput, .d_automount = nfs_d_automount,
fs/nfsd/nfs4state.c +80 -34
210 lines not on this page · raw message
include/linux/netlink.h +2 -0
@@ -131,6 +131,7 @@ netlink_skb_clone(struct sk_buff *skb, gfp_t gfp_mask)struct netlink_callback {struct sk_buff *skb;const struct nlmsghdr *nlh; +int (*start)(struct netlink_callback *);int (*dump)(struct sk_buff * skb,struct netlink_callback *cb);int (*done)(struct netlink_callback *cb);
@@ -153,6 +154,7 @@ struct nlmsghdr * __nlmsg_put(struct sk_buff *skb, u32 portid, u32 seq, int type, int len, int flags);struct netlink_dump_control { +int (*start)(struct netlink_callback *);int (*dump)(struct sk_buff *skb,struct netlink_callback *);int (*done)(struct netlink_callback *);void *data;
include/net/genetlink.h +2 -0
@@ -114,6 +114,7 @@ static inline void genl_info_net_set(struct genl_info *info, struct net *net)* @flags: flags * @policy: attribute validation policy * @doit: standard command callback +* @start: start callback for dumps * @dumpit: callback for dumpers * @done: completion callback for dumps * @ops_list: operations list
@@ -122,6 +123,7 @@ struct genl_ops {const struct nla_policy *policy;int (*doit)(struct sk_buff *skb,struct genl_info *info); +int (*start)(struct netlink_callback *cb);int (*dumpit)(struct sk_buff *skb,struct netlink_callback *cb);int (*done)(struct netlink_callback *cb);
include/uapi/linux/bcache.h +1 -1
@@ -90,7 +90,7 @@ PTR_FIELD(PTR_GEN, 0, 8)#define PTR_CHECK_DEV ((1 << PTR_DEV_BITS) - 1) -#define PTR (gen, offset, dev) \ +#define MAKE_PTR (gen, offset, dev) \ ((((__u64) dev) << 51) | ((__u64) offset) << 8 | gen)/* Bkey utility code */
mm/huge_memory.c +4 -10
@@ -1304,17 +1304,11 @@ struct page *follow_trans_huge_pmd(struct vm_area_struct *vma,VM_BUG_ON_PAGE (!PageHead (page), page);if (flags &FOLL_TOUCH ) {pmd_t _pmd; -/* -* We should set the dirty bit only for FOLL_WRITE but -* for now the dirty bit in the pmd is meaningless. -* And if the dirty bit will become meaningful and -* we'll only set it with FOLL_WRITE, an atomic -* set_bit will be required on the pmd to set the -* young bit, instead of the current set_pmd_at. -*/ - _pmd =pmd_mkyoung (pmd_mkdirty (*pmd)); + _pmd =pmd_mkyoung (*pmd); +if (flags &FOLL_WRITE ) + _pmd =pmd_mkdirty (_pmd);if (pmdp_set_access_flags (vma, addr &HPAGE_PMD_MASK , - pmd, _pmd,1 )) + pmd, _pmd, flags &FOLL_WRITE ))update_mmu_cache_pmd (vma, addr, pmd); }if ((flags &FOLL_MLOCK ) && (vma->vm_flags &VM_LOCKED )) {
mm/madvise.c +1 -3
@@ -223,15 +223,14 @@ static long madvise_willneed(struct vm_area_struct *vma, {struct file *file = vma->vm_file; + *prev = vma;#ifdef CONFIG_SWAP if (!file) { - *prev = vma;force_swapin_readahead (vma, start, end);return 0 ; }if (shmem_mapping (file->f_mapping)) { - *prev = vma;force_shm_swapin_readahead (vma, start, end, file->f_mapping);return 0 ;
@@ -246,7 +245,6 @@ static long madvise_willneed(struct vm_area_struct *vma,return 0 ; } - *prev = vma; start = ((start - vma->vm_start) >>PAGE_SHIFT ) + vma->vm_pgoff;if (end > vma->vm_end) end = vma->vm_end;
net/netlink/af_netlink.c +4 -0
@@ -2203,6 +2203,7 @@ int __netlink_dump_start(struct sock *ssk, struct sk_buff *skb, cb = &nlk->cb;memset (cb,0 ,sizeof (*cb)); + cb->start = control->start; cb->dump = control->dump; cb->done = control->done; cb->nlh = nlh;
@@ -2216,6 +2217,9 @@ int __netlink_dump_start(struct sock *ssk, struct sk_buff *skb,mutex_unlock (nlk->cb_mutex); +if (cb->start) + cb->start (cb); + ret =netlink_dump (sk);sock_put (sk);
net/netlink/genetlink.c +16 -0
@@ -513,6 +513,20 @@ void *genlmsg_put(struct sk_buff *skb, u32 portid, u32 seq, }EXPORT_SYMBOL (genlmsg_put); +static int genl_lock_start (struct netlink_callback *cb) +{ +/* our ops are always const - netlink API doesn't propagate that */ +const struct genl_ops *ops = cb->data; +int rc =0 ; + +if (ops->start) { +genl_lock (); + rc = ops->start (cb); +genl_unlock (); + } +return rc; +} +static int genl_lock_dumpit (struct sk_buff *skb,struct netlink_callback *cb) {/* our ops are always const - netlink API doesn't propagate that */
@@ -577,6 +591,7 @@ static int genl_family_rcv_msg(struct genl_family *family, .module = family->module, /* we have const, but the netlink API doesn't */ .data = (void *)ops, + .start = genl_lock_start, .dump = genl_lock_dumpit, .done = genl_lock_done, };
@@ -588,6 +603,7 @@ static int genl_family_rcv_msg(struct genl_family *family, }else {struct netlink_dump_control c = { .module = family->module, + .start = ops->start, .dump = ops->dumpit, .done = ops->done, };
net/xfrm/xfrm_user.c +15 -10
@@ -1652,32 +1652,34 @@ static int dump_one_policy(struct xfrm_policy *xp, int dir, int count, void *ptrstatic int xfrm_dump_policy_done (struct netlink_callback *cb) { -struct xfrm_policy_walk *walk = (struct xfrm_policy_walk *) &cb->args[1 ]; +struct xfrm_policy_walk *walk = (struct xfrm_policy_walk *)cb->args;struct net *net =sock_net (cb->skb->sk);xfrm_policy_walk_done (walk, net);return 0 ; } +static int xfrm_dump_policy_start (struct netlink_callback *cb) +{ +struct xfrm_policy_walk *walk = (struct xfrm_policy_walk *)cb->args; + +BUILD_BUG_ON (sizeof (*walk) >sizeof (cb->args)); + +xfrm_policy_walk_init (walk,XFRM_POLICY_TYPE_ANY ); +return 0 ; +} +static int xfrm_dump_policy (struct sk_buff *skb,struct netlink_callback *cb) {struct net *net =sock_net (skb->sk); -struct xfrm_policy_walk *walk = (struct xfrm_policy_walk *) &cb->args[1 ]; +struct xfrm_policy_walk *walk = (struct xfrm_policy_walk *)cb->args;struct xfrm_dump_info info; -BUILD_BUG_ON (sizeof (struct xfrm_policy_walk ) > -sizeof (cb->args) -sizeof (cb->args[0 ])); - info.in_skb = cb->skb; info.out_skb = skb; info.nlmsg_seq = cb->nlh->nlmsg_seq; info.nlmsg_flags =NLM_F_MULTI ; -if (!cb->args[0 ]) { - cb->args[0 ] =1 ; -xfrm_policy_walk_init (walk,XFRM_POLICY_TYPE_ANY ); - } - (void )xfrm_policy_walk (net, walk, dump_one_policy, &info);return skb->len;
@@ -2415,6 +2417,7 @@ static const struct nla_policy xfrma_spd_policy[XFRMA_SPD_MAX+1] = { static const struct xfrm_link { int (*doit)(struct sk_buff *, struct nlmsghdr *, struct nlattr **); + int (*start)(struct netlink_callback *); int (*dump)(struct sk_buff *, struct netlink_callback *); int (*done)(struct netlink_callback *); const struct nla_policy *nla_pol;
@@ -2428,6 +2431,7 @@ static const struct xfrm_link { [XFRM_MSG_NEWPOLICY - XFRM_MSG_BASE] = { .doit = xfrm_add_policy }, [XFRM_MSG_DELPOLICY - XFRM_MSG_BASE] = { .doit = xfrm_get_policy }, [XFRM_MSG_GETPOLICY - XFRM_MSG_BASE] = { .doit = xfrm_get_policy, + .start = xfrm_dump_policy_start, .dump = xfrm_dump_policy, .done = xfrm_dump_policy_done }, [XFRM_MSG_ALLOCSPI - XFRM_MSG_BASE] = { .doit = xfrm_alloc_userspi },
@@ -2479,6 +2483,7 @@ static int xfrm_user_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh) {struct netlink_dump_control c = { + .start = link->start, .dump = link->dump, .done = link->done, };