Linux 3.10.31
Greg KH
maintainerI'm announcing the release of the 3.10.31 kernel.
All users of the 3.10 kernel series must upgrade.
The updated 3.10.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-3.10.y
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Makefile | 2 arch/arm64/include/asm/cacheflush.h | 1 arch/arm64/kernel/vdso.c | 4 - arch/arm64/kernel/vdso/Makefile | 2 arch/arm64/kernel/vdso/gettimeofday.S | 7 + arch/arm64/mm/mmu.c | 12 ++- arch/s390/crypto/aes_s390.c | 65 ++++++++++++----- arch/s390/crypto/des_s390.c | 95 ++++++++++++++++---------- arch/x86/kernel/cpu/intel.c | 2 drivers/infiniband/hw/qib/qib_user_sdma.c | 6 - drivers/irqchip/irq-armada-370-xp.c | 2 drivers/media/usb/dvb-usb-v2/af9035.c | 2 drivers/media/usb/dvb-usb-v2/mxl111sf-tuner.h | 2 drivers/pinctrl/core.c | 2 drivers/pinctrl/vt8500/pinctrl-wmt.c | 15 +++- fs/btrfs/inode.c | 2 fs/buffer.c | 6 + lib/Makefile | 1 mm/hugetlb.c | 11 ++- mm/memory-failure.c | 22 ++++-- mm/page-writeback.c | 5 - security/selinux/ss/services.c | 4 + sound/pci/hda/patch_analog.c | 1 sound/pci/hda/patch_realtek.c | 9 ++ sound/usb/Kconfig | 1 25 files changed, 201 insertions(+), 80 deletions(-)
Antti Palosaari (1):
af9035: add ID [2040:f900] Hauppauge WinTV-MiniStick 2
Catalin Marinas (1):
arm64: Invalidate the TLB when replacing pmd entries during boot
Dave Jones (1):
mxl111sf: Fix compile when CONFIG_DVB_USB_MXL111SF is unset
Greg Kroah-Hartman (1):
Linux 3.10.31
Harald Freudenberger (3):
crypto: s390 - fix concurrency issue in aes-ctr mode
crypto: s390 - fix des and des3_ede cbc concurrency issue
crypto: s390 - fix des and des3_ede ctr concurrency issue
Jan Kara (1):
IB/qib: Convert qib_user_sdma_pin_pages() to use get_user_pages_fast()
Josef Bacik (1):
Btrfs: disable snapshot aware defrag for now
KOSAKI Motohiro (2):
mm: __set_page_dirty_nobuffers() uses spin_lock_irqsave() instead of spin_lock_irq()
mm: __set_page_dirty uses spin_lock_irqsave instead of spin_lock_irq
Lior Amsalem (1):
irqchip: armada-370-xp: fix IPI race condition
Mel Gorman (1):
x86: mm: change tlb_flushall_shift for IvyBridge
Naoya Horiguchi (1):
mm/memory-failure.c: fix memory leak in successful soft offlining
Nathan Lynch (2):
arm64: vdso: update wtm fields for CLOCK_MONOTONIC_COARSE
arm64: vdso: fix coarse clock handling
Peter Oberparleiter (1):
x86, hweight: Fix BUG when booting with CONFIG_GCOV_PROFILE_ALL=y
Stanislaw Gruszka (1):
pinctrl: protect pinctrl_list add
Stephen Smalley (1):
SELinux: Fix kernel BUG on empty security contexts.
Takashi Iwai (3):
ALSA: usb-audio: Add missing kconfig dependecy
ALSA: hda - Fix missing VREF setup for Mac Pro 1,1
ALSA: hda - Add missing mixer widget for AD1983
Tony Prisk (1):
pinctrl: vt8500: Change devicetree data parsing
Vinayak Kale (1):
arm64: add DSB after icache flush in __flush_icache_all()
Will Deacon (1):
arm64: vdso: prevent ld from aligning PT_LOAD segments to 64k
Xishi Qiu (1):
mm: fix process accidentally killed by mce because of huge page migration
Greg KH
maintainerMakefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 3 PATCHLEVEL = 10 -SUBLEVEL = 30 +SUBLEVEL = 31 EXTRAVERSION = NAME = TOSSUG Baby Fish
arch/arm64/include/asm/cacheflush.h +1 -0
@@ -116,6 +116,7 @@ extern void flush_dcache_page(struct page *);static inline void __flush_icache_all (void ) { asm("ic ialluis" ); +dsb (); }#define flush_dcache_mmap_lock (mapping) \
arch/arm64/kernel/vdso.c +2 -2
@@ -235,6 +235,8 @@ void update_vsyscall(struct timekeeper *tk) vdso_data->use_syscall = use_syscall; vdso_data->xtime_coarse_sec = xtime_coarse.tv_sec; vdso_data->xtime_coarse_nsec = xtime_coarse.tv_nsec; + vdso_data->wtm_clock_sec = tk->wall_to_monotonic.tv_sec; + vdso_data->wtm_clock_nsec = tk->wall_to_monotonic.tv_nsec;if (!use_syscall) { vdso_data->cs_cycle_last = tk->clock->cycle_last;
@@ -242,8 +244,6 @@ void update_vsyscall(struct timekeeper *tk) vdso_data->xtime_clock_nsec = tk->xtime_nsec; vdso_data->cs_mult = tk->mult; vdso_data->cs_shift = tk->shift; - vdso_data->wtm_clock_sec = tk->wall_to_monotonic.tv_sec; - vdso_data->wtm_clock_nsec = tk->wall_to_monotonic.tv_nsec; }smp_wmb ();
arch/arm64/kernel/vdso/Makefile +1 -1
@@ -48,7 +48,7 @@ $(obj-vdso): %.o: %.S # Actual build commands quiet_cmd_vdsold = VDSOL $@ - cmd_vdsold = $(CC) $(c_flags) -Wl,-T $^ -o $@ + cmd_vdsold = $(CC) $(c_flags) -Wl,-n -Wl,-T $^ -o $@ quiet_cmd_vdsoas = VDSOA $@ cmd_vdsoas = $(CC) $(a_flags) -c -o $@ $<
arch/arm64/kernel/vdso/gettimeofday.S +6 -1
@@ -103,6 +103,8 @@ ENTRY(__kernel_clock_gettime) bl __do_get_tspec seqcnt_check w9, 1b + mov x30, x2 + cmp w0, #CLOCK_MONOTONIC b.ne 6f
@@ -118,6 +120,9 @@ ENTRY(__kernel_clock_gettime) ccmp w0, #CLOCK_MONOTONIC_COARSE, #0x4, ne b.ne 8f + /* xtime_coarse_nsec is already right-shifted */ + mov x12, #0 + /* Get coarse timespec. */ adr vdso_data, _vdso_data 3: seqcnt_acquire
@@ -156,7 +161,7 @@ ENTRY(__kernel_clock_gettime) lsr x11, x11, x12 stp x10, x11, [x1, #TSPEC_TV_SEC] mov x0, xzr - ret x2 + ret 7: mov x30, x2 8: /* Syscall fallback. */
arch/arm64/mm/mmu.c +10 -2
@@ -203,10 +203,18 @@ static void __init alloc_init_pmd(pud_t *pud, unsigned long addr,do { next =pmd_addr_end (addr, end);/* try section mapping first */ -if (((addr | next | phys) & ~SECTION_MASK ) ==0 ) +if (((addr | next | phys) & ~SECTION_MASK ) ==0 ) { +pmd_t old_pmd =*pmd;set_pmd (pmd,__pmd (phys | prot_sect_kernel)); -else +/* +* Check for previous table entries created during +* boot (__create_page_tables) and flush them. +*/ +if (!pmd_none (old_pmd)) +flush_tlb_all (); + }else {alloc_init_pte (pmd, addr, next,__phys_to_pfn (phys)); + } phys += next - addr; }while (pmd++, addr = next, addr != end); }
arch/s390/crypto/aes_s390.c +46 -19
115 lines not on this page · raw message
arch/s390/crypto/des_s390.c +62 -33
195 lines not on this page · raw message
arch/x86/kernel/cpu/intel.c +1 -1
@@ -628,7 +628,7 @@ static void __cpuinit intel_tlb_flushall_shift_set(struct cpuinfo_x86 *c) tlb_flushall_shift =5 ;break ;case 0x63a :/* Ivybridge */ - tlb_flushall_shift =1 ; + tlb_flushall_shift =2 ;break ;default : tlb_flushall_shift =6 ;
drivers/infiniband/hw/qib/qib_user_sdma.c +1 -5
@@ -284,8 +284,7 @@ static int qib_user_sdma_pin_pages(const struct qib_devdata *dd,int j;int ret; - ret =get_user_pages (current, current->mm, addr, - npages,0 ,1 , pages,NULL ); + ret =get_user_pages_fast (addr, npages,0 , pages);if (ret != npages) {int i;
@@ -830,10 +829,7 @@ int qib_user_sdma_writev(struct qib_ctxtdata *rcd,while (dim) {const int mxp =8 ; -down_write (¤t->mm->mmap_sem); ret =qib_user_sdma_queue_pkts (dd, pq, &list, iov, dim, mxp); -up_write (¤t->mm->mmap_sem); -if (ret <=0 ) goto done_unlock;else {
drivers/irqchip/irq-armada-370-xp.c +1 -1
@@ -229,7 +229,7 @@ armada_370_xp_handle_irq(struct pt_regs *regs) ARMADA_370_XP_IN_DRBEL_CAUSE_OFFS) &IPI_DOORBELL_MASK ; -writel (~IPI_DOORBELL_MASK , per_cpu_int_base + +writel (~ipimask, per_cpu_int_base +ARMADA_370_XP_IN_DRBEL_CAUSE_OFFS );/* Handle all pending doorbells */
drivers/media/usb/dvb-usb-v2/af9035.c +2 -0
@@ -1517,6 +1517,8 @@ static const struct usb_device_id af9035_id_table[] = { &af9035_props, "TerraTec Cinergy T Stick Dual RC (rev. 2)", NULL) }, {DVB_USB_DEVICE (USB_VID_LEADTEK ,0x6a05 , &af9035_props, "Leadtek WinFast DTV Dongle Dual", NULL) }, + { DVB_USB_DEVICE(USB_VID_HAUPPAUGE, 0xf900, + &af9035_props, "Hauppauge WinTV-MiniStick 2", NULL) }, { } };MODULE_DEVICE_TABLE (usb, af9035_id_table);
drivers/media/usb/dvb-usb-v2/mxl111sf-tuner.h +1 -1
@@ -68,7 +68,7 @@ struct dvb_frontend *mxl111sf_tuner_attach(struct dvb_frontend *fe,#else static inline struct dvb_frontend *mxl111sf_tuner_attach (struct dvb_frontend *fe, - struct mxl111sf_state *mxl_state +struct mxl111sf_state *mxl_state,struct mxl111sf_tuner_config *cfg) {printk (KERN_WARNING "%s: driver disabled by Kconfig\n" , __func__);
drivers/pinctrl/core.c +2 -0
@@ -807,7 +807,9 @@ static struct pinctrl *create_pinctrl(struct device *dev)kref_init (&p->users);/* Add the pinctrl handle to the global list */ +mutex_lock (&pinctrl_list_mutex);list_add_tail (&p->node, &pinctrl_list); +mutex_unlock (&pinctrl_list_mutex);return p; }
drivers/pinctrl/vt8500/pinctrl-wmt.c +14 -1
@@ -276,7 +276,20 @@ static int wmt_pctl_dt_node_to_map_pull(struct wmt_pinctrl_data *data,if (!configs)return -ENOMEM ; - configs[0 ] = pull; +switch (pull) { +case 0 : + configs[0 ] =PIN_CONFIG_BIAS_DISABLE ; +break ; +case 1 : + configs[0 ] =PIN_CONFIG_BIAS_PULL_DOWN ; +break ; +case 2 : + configs[0 ] =PIN_CONFIG_BIAS_PULL_UP ; +break ; +default : + configs[0 ] =PIN_CONFIG_BIAS_DISABLE ; +dev_err (data->dev,"invalid pull state %d - disabling\n" , pull); + } map->type =PIN_MAP_TYPE_CONFIGS_PIN ; map->data.configs.group_or_pin = data->groups[group];
fs/btrfs/inode.c +1 -1
@@ -2655,7 +2655,7 @@ static int btrfs_finish_ordered_io(struct btrfs_ordered_extent *ordered_extent) EXTENT_DEFRAG, 1, cached_state);if (ret) {u64 last_snapshot =btrfs_root_last_snapshot (&root->root_item); -if (last_snapshot >=BTRFS_I (inode)->generation) +if (0 && last_snapshot >=BTRFS_I (inode)->generation)/* the inode is shared */ new =record_old_file_extents (inode, ordered_extent);
fs/buffer.c +4 -2
@@ -620,14 +620,16 @@ EXPORT_SYMBOL(mark_buffer_dirty_inode);static void __set_page_dirty (struct page *page,struct address_space *mapping,int warn) { -spin_lock_irq (&mapping->tree_lock); +unsigned long flags; + +spin_lock_irqsave (&mapping->tree_lock, flags);if (page->mapping) {/* Race with truncate? */ WARN_ON_ONCE (warn && !PageUptodate (page));account_page_dirtied (page, mapping);radix_tree_tag_set (&mapping->page_tree,page_index (page),PAGECACHE_TAG_DIRTY ); } -spin_unlock_irq (&mapping->tree_lock); +spin_unlock_irqrestore (&mapping->tree_lock, flags);__mark_inode_dirty (mapping->host,I_DIRTY_PAGES ); }
lib/Makefile +1 -0
@@ -45,6 +45,7 @@ lib-$(CONFIG_RWSEM_GENERIC_SPINLOCK) += rwsem-spinlock.o lib-$(CONFIG_RWSEM_XCHGADD_ALGORITHM) += rwsem.o lib-$(CONFIG_PERCPU_RWSEM) += percpu-rwsem.o +GCOV_PROFILE_hweight.o := n CFLAGS_hweight.o = $(subst $(quote),,$(CONFIG_ARCH_HWEIGHT_CFLAGS)) obj-$(CONFIG_GENERIC_HWEIGHT) += hweight.o
mm/hugetlb.c +9 -2
@@ -21,6 +21,7 @@#include <linux/rmap.h> #include <linux/swap.h> #include <linux/swapops.h> +#include <linux/page-isolation.h> #include <asm/page.h> #include <asm/pgtable.h>
@@ -517,9 +518,15 @@ static struct page *dequeue_huge_page_node(struct hstate *h, int nid) {struct page *page; -if (list_empty (&h->hugepage_freelists[nid])) +list_for_each_entry (page, &h->hugepage_freelists[nid], lru) +if (!is_migrate_isolate_page (page)) +break ; +/* +* if 'non-isolated free hugepage' not found on the list, +* the allocation fails. +*/ +if (&h->hugepage_freelists[nid] == &page->lru)return NULL ; - page = list_entry(h->hugepage_freelists[nid].next, struct page, lru);list_move (&page->lru, &h->hugepage_activelist);set_page_refcounted (page); h->free_huge_pages--;
mm/memory-failure.c +18 -4
@@ -1421,7 +1421,8 @@ static int __get_any_page(struct page *p, unsigned long pfn, int flags)/* * Isolate the page, so that it doesn't get reallocated if it -* was free. +* was free. This flag should be kept set until the source page +* is freed and PG_hwpoison on it is set. */ set_migratetype_isolate (p, true);/*
@@ -1444,7 +1445,6 @@ static int __get_any_page(struct page *p, unsigned long pfn, int flags)/* Not a free page */ ret =1 ; } -unset_migratetype_isolate (p,MIGRATE_MOVABLE );unlock_memory_hotplug ();return ret; }
@@ -1511,7 +1511,6 @@ static int soft_offline_huge_page(struct page *page, int flags)atomic_long_inc (&num_poisoned_pages); } } -/* keep elevated page count for bad page */ return ret; }
@@ -1576,7 +1575,7 @@ int soft_offline_page(struct page *page, int flags)atomic_long_inc (&num_poisoned_pages); } } -/* keep elevated page count for bad page */ +unset_migratetype_isolate (page,MIGRATE_MOVABLE );return ret; }
@@ -1642,7 +1641,22 @@ static int __soft_offline_page(struct page *page, int flags)if (ret >0 ) ret = -EIO ; }else { +/* +* After page migration succeeds, the source page can +* be trapped in pagevec and actual freeing is delayed. +* Freeing code works differently based on PG_hwpoison, +* so there's a race. We need to make sure that the +* source page should be freed back to buddy before +* setting PG_hwpoison. +*/ +if (!is_free_buddy_page (page)) +lru_add_drain_all (); +if (!is_free_buddy_page (page)) +drain_all_pages ();SetPageHWPoison (page); +if (!is_free_buddy_page (page)) +pr_info ("soft offline: %#lx: page leaked\n" , + pfn);atomic_long_inc (&num_poisoned_pages); } }else {
mm/page-writeback.c +3 -2
@@ -2026,11 +2026,12 @@ int __set_page_dirty_nobuffers(struct page *page)if (!TestSetPageDirty (page)) {struct address_space *mapping =page_mapping (page);struct address_space *mapping2; +unsigned long flags;if (!mapping)return 1 ; -spin_lock_irq (&mapping->tree_lock); +spin_lock_irqsave (&mapping->tree_lock, flags); mapping2 =page_mapping (page);if (mapping2) {/* Race with truncate? */ BUG_ON (mapping2 != mapping);
@@ -2039,7 +2040,7 @@ int __set_page_dirty_nobuffers(struct page *page)radix_tree_tag_set (&mapping->page_tree,page_index (page),PAGECACHE_TAG_DIRTY ); } -spin_unlock_irq (&mapping->tree_lock); +spin_unlock_irqrestore (&mapping->tree_lock, flags);if (mapping->host) {/* !PageAnon && !swapper_space */ __mark_inode_dirty (mapping->host,I_DIRTY_PAGES );
security/selinux/ss/services.c +4 -0
@@ -1231,6 +1231,10 @@ static int security_context_to_sid_core(const char *scontext, u32 scontext_len,struct context context;int rc =0 ; +/* An empty security context is never valid. */ +if (!scontext_len) +return -EINVAL ; +if (!ss_initialized) {int i;
sound/pci/hda/patch_analog.c +1 -0
@@ -1680,6 +1680,7 @@ static int ad1983_parse_auto_config(struct hda_codec *codec)return err; spec = codec->spec; + spec->gen.mixer_nid =0x0e ; spec->gen.beep_nid =0x10 ;set_beep_amp (spec,0x10 ,0 ,HDA_OUTPUT ); err =ad198x_parse_auto_config (codec);
sound/pci/hda/patch_realtek.c +8 -1
@@ -1765,6 +1765,7 @@ enum {ALC889_FIXUP_IMAC91_VREF ,ALC889_FIXUP_MBA11_VREF ,ALC889_FIXUP_MBA21_VREF , +ALC889_FIXUP_MP11_VREF ,ALC882_FIXUP_INV_DMIC ,ALC882_FIXUP_NO_PRIMARY_HP , ALC887_FIXUP_ASUS_BASS,
@@ -2119,6 +2120,12 @@ static const struct hda_fixup alc882_fixups[] = { .chained = true, .chain_id = ALC889_FIXUP_MBP_VREF, }, + [ALC889_FIXUP_MP11_VREF] = { + .type = HDA_FIXUP_FUNC, + .v.func = alc889_fixup_mba11_vref, + .chained = true, + .chain_id = ALC885_FIXUP_MACPRO_GPIO, + }, [ALC882_FIXUP_INV_DMIC] = { .type = HDA_FIXUP_FUNC, .v.func = alc_fixup_inv_dmic_0x12,
@@ -2176,7 +2183,7 @@ static const struct snd_pci_quirk alc882_fixup_tbl[] = {SND_PCI_QUIRK (0x106b ,0x00a0 ,"MacBookPro 3,1" ,ALC889_FIXUP_MBP_VREF ),SND_PCI_QUIRK (0x106b ,0x00a1 ,"Macbook" ,ALC889_FIXUP_MBP_VREF ),SND_PCI_QUIRK (0x106b ,0x00a4 ,"MacbookPro 4,1" ,ALC889_FIXUP_MBP_VREF ), -SND_PCI_QUIRK (0x106b ,0x0c00 ,"Mac Pro" ,ALC885_FIXUP_MACPRO_GPIO ), +SND_PCI_QUIRK (0x106b ,0x0c00 ,"Mac Pro" ,ALC889_FIXUP_MP11_VREF ),SND_PCI_QUIRK (0x106b ,0x1000 ,"iMac 24" ,ALC885_FIXUP_MACPRO_GPIO ),SND_PCI_QUIRK (0x106b ,0x2800 ,"AppleTV" ,ALC885_FIXUP_MACPRO_GPIO ), SND_PCI_QUIRK(0x106b, 0x2c00, "MacbookPro rev3", ALC889_FIXUP_MBP_VREF),
sound/usb/Kconfig +1 -0
@@ -14,6 +14,7 @@ config SND_USB_AUDIO select SND_HWDEP select SND_RAWMIDI select SND_PCM + select BITREVERSE help Say Y here to include support for USB audio and USB MIDI devices.