Linux 3.4.96
Greg KH
maintainerI'm announcing the release of the 3.4.96 kernel.
All users of the 3.4 kernel series must upgrade.
The updated 3.4.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-3.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/kernel/stacktrace.c | 18 ++- arch/s390/include/asm/lowcore.h | 11 +- arch/x86/kernel/entry_32.S | 15 +-- arch/x86/syscalls/syscall_64.tbl | 6 - drivers/acpi/bus.c | 7 + drivers/char/applicom.c | 1 drivers/hid/hid-core.c | 12 ++ drivers/net/can/sja1000/peak_pci.c | 14 +-- drivers/staging/tidspbridge/core/dsp-clock.c | 4 drivers/target/target_core_rd.c | 2 drivers/usb/dwc3/gadget.c | 4 drivers/usb/gadget/inode.c | 2 drivers/usb/host/pci-quirks.c | 19 +++- drivers/usb/misc/usbtest.c | 40 +++++++- drivers/usb/serial/option.c | 15 ++- drivers/usb/serial/sierra.c | 54 +++++++++-- drivers/usb/serial/usb_wwan.c | 123 ++++++++++++++------------- drivers/video/matrox/matroxfb_base.h | 2 fs/btrfs/backref.c | 2 fs/btrfs/extent_io.c | 3 fs/btrfs/volumes.c | 5 - fs/ext4/mballoc.c | 2 include/linux/irqdesc.h | 4 include/linux/skbuff.h | 16 +++ kernel/irq/manage.c | 4 kernel/irq/spurious.c | 106 ++++++++++++++++++++++- mm/memory-failure.c | 25 +++-- mm/rmap.c | 8 + mm/vmscan.c | 3 net/core/skbuff.c | 5 - 31 files changed, 399 insertions(+), 135 deletions(-)
Alan Stern (2):
USB: usbtest: add a timeout for scatter-gather tests
USB: EHCI: avoid BIOS handover on the HASEE E200
Andy Lutomirski (1):
x86_32, entry: Do syscall exit work on badsys (CVE-2014-4508)
Chris Mason (1):
Btrfs: fix double free in find_lock_delalloc_range
Christian Borntraeger (1):
s390/lowcore: reserve 96 bytes for IRB in lowcore
Dan Carpenter (1):
applicom: dereferencing NULL on error path
Eric Sandeen (1):
btrfs: fix use of uninit "ret" in end_extent_writepage()
Felipe Balbi (1):
usb: dwc3: gadget: clear stall when disabling endpoint
Greg Kroah-Hartman (1):
Linux 3.4.96
H. Peter Anvin (1):
x86-32, espfix: Remove filter for espfix32 due to race
Huang Rui (1):
usb: usbtest: fix unlink write error with pattern 1
Hugh Dickins (1):
mm: fix sleeping function warning from __put_anon_vma
Johan Hovold (10):
USB: option: fix runtime PM handling
USB: usb_wwan: fix write and suspend race
USB: usb_wwan: fix urb leak at shutdown
USB: usb_wwan: fix potential NULL-deref at resume
USB: usb_wwan: fix potential blocked I/O after resume
USB: sierra: fix AA deadlock in open error path
USB: sierra: fix use after free at suspend/resume
USB: sierra: fix urb and memory leak in resume error path
USB: sierra: fix urb and memory leak on disconnect
USB: sierra: fix remote wakeup
Johannes Weiner (1):
mm: vmscan: clear kswapd's special reclaim powers before exiting
Kees Cook (1):
HID: core: fix validation of report id 0
Liu Bo (1):
Btrfs: use right type to get real comparison
Lv Zheng (1):
ACPI: Fix conflict between customized DSDT and DSDT local copy
Maurizio Lombardi (1):
ext4: fix wrong assert in ext4_mb_normalize_request()
Michael S. Tsirkin (3):
skbuff: add an api to orphan frags
skbuff: export skb_copy_ubufs
skbuff: skb_segment: orphan frags before copying
Mike Frysinger (1):
x86, x32: Use compat shims for io_{setup,submit}Mikulas Patocka (1):
matroxfb: perform a dummy read of M_STATUS
Nicholas A. Bellinger (1):
target: Explicitly clear ramdisk_mcp backend pages
Paul Bolle (2):
staging: tidspbridge: check for CONFIG_SND_OMAP_SOC_MCBSP
usb: gadget: rename CONFIG_USB_GADGET_PXA25X
Rickard Strandqvist (1):
fs: btrfs: volumes.c: Fix for possible null pointer dereference
Roger Quadros (1):
usb: usbtest: Add timetout to simple_io()
Russell King (1):
ARM: stacktrace: avoid listing stacktrace functions in stacktrace
Stephane Grosjean (1):
can: peak_pci: prevent use after free at netdev removal
Thomas Gleixner (1):
genirq: Sanitize spurious interrupt detection of threaded irqs
Tony Luck (2):
mm/memory-failure.c-failure: send right signal code to correct thread mm/memory-failure.c: don't let collect_procs() skip over processes for MF_ACTION_REQUIRED
xiao jin (2):
USB: usb_wwan: fix urb leak in write error path
USB: usb_wwan: fix race between write and resume
Greg KH
maintainerMakefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 3 PATCHLEVEL = 4 -SUBLEVEL = 95 +SUBLEVEL = 96 EXTRAVERSION = NAME = Saber-toothed Squirrel
arch/arm/kernel/stacktrace.c +13 -5
@@ -83,13 +83,16 @@ static int save_trace(struct stackframe *frame, void *d)return trace->nr_entries >= trace->max_entries; } -void save_stack_trace_tsk (struct task_struct *tsk,struct stack_trace *trace) +/* This must be noinline to so that our skip calculation works correctly */ +static noinline void __save_stack_trace(struct task_struct *tsk, +struct stack_trace *trace,unsigned int nosched) {struct stack_trace_data data;struct stackframe frame; data.trace = trace; data.skip = trace->skip; + data.no_sched_functions = nosched;if (tsk != current) {#ifdef CONFIG_SMP
@@ -102,7 +105,6 @@ void save_stack_trace_tsk(struct task_struct *tsk, struct stack_trace *trace) trace->entries[trace->nr_entries++] =ULONG_MAX ;return ;#else - data.no_sched_functions =1 ; frame.fp =thread_saved_fp (tsk); frame.sp =thread_saved_sp (tsk); frame.lr =0 ;/* recovered from the stack */
@@ -111,11 +113,12 @@ void save_stack_trace_tsk(struct task_struct *tsk, struct stack_trace *trace) }else { registerunsigned long current_sp asm ("sp" ); - data.no_sched_functions =0 ; +/* We don't want this function nor the caller */ + data.skip +=2 ; frame.fp = (unsigned long )__builtin_frame_address (0 ); frame.sp = current_sp; frame.lr = (unsigned long )__builtin_return_address (0 ); - frame.pc = (unsigned long )save_stack_trace_tsk; + frame.pc = (unsigned long )__save_stack_trace; }walk_stackframe (&frame, save_trace, &data);
@@ -123,9 +126,14 @@ void save_stack_trace_tsk(struct task_struct *tsk, struct stack_trace *trace) trace->entries[trace->nr_entries++] = ULONG_MAX; } +void save_stack_trace_tsk (struct task_struct *tsk,struct stack_trace *trace) +{ +__save_stack_trace (tsk, trace,1 ); +} +void save_stack_trace (struct stack_trace *trace) { -save_stack_trace_tsk (current, trace); +__save_stack_trace (current, trace,0 ); }EXPORT_SYMBOL_GPL (save_stack_trace);#endif
arch/s390/include/asm/lowcore.h +6 -5
@@ -142,9 +142,9 @@ struct _lowcore {__u8 pad_0x02fc[0x0300 -0x02fc ];/* 0x02fc */ /* Interrupt response block */ -__u8 irb[64 ];/* 0x0300 */ +__u8 irb[96 ];/* 0x0300 */ -__u8 pad_0x0340[0x0e00 -0x0340 ];/* 0x0340 */ +__u8 pad_0x0360[0x0e00 -0x0360 ];/* 0x0360 */ /* * 0xe00 contains the address of the IPL Parameter Information
@@ -288,12 +288,13 @@ struct _lowcore {__u8 pad_0x03a0[0x0400 -0x03a0 ];/* 0x03a0 */ /* Interrupt response block. */ -__u8 irb[64 ];/* 0x0400 */ +__u8 irb[96 ];/* 0x0400 */ +__u8 pad_0x0460[0x0480 -0x0460 ];/* 0x0460 */ /* Per cpu primary space access list */ -__u32 paste[16 ];/* 0x0440 */ +__u32 paste[16 ];/* 0x0480 */ -__u8 pad_0x0480[0x0e00 -0x0480 ];/* 0x0480 */ +__u8 pad_0x04c0[0x0e00 -0x04c0 ];/* 0x04c0 */ /* * 0xe00 contains the address of the IPL Parameter Information
arch/x86/kernel/entry_32.S +8 -7
@@ -426,9 +426,10 @@ sysenter_past_esp: jnz sysenter_audit sysenter_do_call: cmpl $(NR_syscalls), %eax - jae syscall_badsys + jae sysenter_badsys call *sys_call_table(,%eax,4) movl %eax,PT_EAX(%esp) +sysenter_after_call: LOCKDEP_SYS_EXIT DISABLE_INTERRUPTS(CLBR_ANY) TRACE_IRQS_OFF
@@ -550,11 +551,6 @@ ENTRY(iret_exc) CFI_RESTORE_STATE ldt_ss: - larl PT_OLDSS(%esp), %eax - jnz restore_nocheck - testl $0x00400000, %eax # returning to 32bit stack? - jnz restore_nocheck # allright, normal return - #ifdef CONFIG_PARAVIRT /* * The kernel can't run on a non-flat stack if paravirt mode
@@ -683,7 +679,12 @@ END(syscall_fault) syscall_badsys: movl $-ENOSYS,PT_EAX(%esp) - jmp resume_userspace + jmp syscall_exit +END(syscall_badsys) + +sysenter_badsys: + movl $-ENOSYS,PT_EAX(%esp) + jmp sysenter_after_call END(syscall_badsys) CFI_ENDPROC /*
arch/x86/syscalls/syscall_64.tbl +4 -2
@@ -212,10 +212,10 @@ 203 common sched_setaffinity sys_sched_setaffinity 204 common sched_getaffinity sys_sched_getaffinity 205 64 set_thread_area -206 common io_setup sys_io_setup +206 64 io_setup sys_io_setup 207 common io_destroy sys_io_destroy 208 common io_getevents sys_io_getevents -209 common io_submit sys_io_submit +209 64 io_submit sys_io_submit 210 common io_cancel sys_io_cancel 211 64 get_thread_area 212 common lookup_dcookie sys_lookup_dcookie
@@ -353,3 +353,5 @@ 540 x32 process_vm_writev compat_sys_process_vm_writev 541 x32 setsockopt compat_sys_setsockopt 542 x32 getsockopt compat_sys_getsockopt +543 x32 io_setup compat_sys_io_setup +544 x32 io_submit compat_sys_io_submit
drivers/acpi/bus.c +7 -0
@@ -57,6 +57,12 @@ EXPORT_SYMBOL(acpi_root_dir); #ifdef CONFIG_X86 +#ifdef CONFIG_ACPI_CUSTOM_DSDT +static inline int set_copy_dsdt(const struct dmi_system_id *id) +{ + return 0; +} +#else static int set_copy_dsdt(const struct dmi_system_id *id) { printk(KERN_NOTICE "%s detected - "
@@ -64,6 +70,7 @@ static int set_copy_dsdt(const struct dmi_system_id *id) acpi_gbl_copy_dsdt_locally =1 ;return 0 ; } +#endif static struct dmi_system_id dsdt_dmi_table[]__initdata = {/*
drivers/char/applicom.c +0 -1
@@ -345,7 +345,6 @@ out:free_irq (apbs[i].irq, &dummy);iounmap (apbs[i].RamIO); } -pci_disable_device (dev);return ret; }
drivers/hid/hid-core.c +11 -1
@@ -861,7 +861,17 @@ struct hid_report *hid_validate_values(struct hid_device *hid,* ->numbered being checked, which may not always be the case when * drivers go to access report values. */ - report = hid->report_enum[type].report_id_hash[id]; +if (id ==0 ) { +/* +* Validating on id 0 means we should examine the first +* report in the list. +*/ + report =list_entry ( + hid->report_enum[type].report_list.next, + struct hid_report, list); + }else { + report = hid->report_enum[type].report_id_hash[id]; + }if (!report) {hid_err (hid,"missing %s %u\n" , hid_report_names[type], id);return NULL ;
drivers/net/can/sja1000/peak_pci.c +9 -5
@@ -547,7 +547,7 @@ static int __devinit peak_pci_probe(struct pci_dev *pdev, {struct sja1000_priv *priv;struct peak_pci_chan *chan; -struct net_device *dev; +struct net_device *dev, *prev_dev;void __iomem *cfg_base, *reg_base;u16 sub_sys_id, icr;int i, err, channels;
@@ -681,11 +681,13 @@ failure_remove_channels:writew (0x0 , cfg_base +PITA_ICR +2 ); chan =NULL ; -for (dev =pci_get_drvdata (pdev); dev; dev = chan->prev_dev) { -unregister_sja1000dev (dev); -free_sja1000dev (dev); +for (dev =pci_get_drvdata (pdev); dev; dev = prev_dev) { priv =netdev_priv (dev); chan = priv->priv; + prev_dev = chan->prev_dev; + +unregister_sja1000dev (dev); +free_sja1000dev (dev); }/* free any PCIeC resources too */
@@ -719,10 +721,12 @@ static void __devexit peak_pci_remove(struct pci_dev *pdev)/* Loop over all registered devices */ while (1 ) { +struct net_device *prev_dev = chan->prev_dev; +dev_info (&pdev->dev,"removing device %s\n" , dev->name);unregister_sja1000dev (dev);free_sja1000dev (dev); - dev = chan->prev_dev; + dev = prev_dev;if (!dev) {/* do that only for first channel */
drivers/staging/tidspbridge/core/dsp-clock.c +2 -2
@@ -213,7 +213,7 @@ int dsp_clk_enable(enum dsp_clk_id clk_id)case GPT_CLK : status =omap_dm_timer_start (timer[clk_id -1 ]);break ; -#ifdef CONFIG_OMAP_MCBSP +#ifdef CONFIG_SND_OMAP_SOC_MCBSP case MCBSP_CLK :omap_mcbsp_request (MCBSP_ID (clk_id));omap2_mcbsp_set_clks_src (MCBSP_ID (clk_id),MCBSP_CLKS_PAD_SRC );
@@ -289,7 +289,7 @@ int dsp_clk_disable(enum dsp_clk_id clk_id)case GPT_CLK : status =omap_dm_timer_stop (timer[clk_id -1 ]);break ; -#ifdef CONFIG_OMAP_MCBSP +#ifdef CONFIG_SND_OMAP_SOC_MCBSP case MCBSP_CLK :omap2_mcbsp_set_clks_src (MCBSP_ID (clk_id),MCBSP_CLKS_PRCM_SRC );omap_mcbsp_free (MCBSP_ID (clk_id));
drivers/target/target_core_rd.c +1 -1
@@ -177,7 +177,7 @@ static int rd_build_device_space(struct rd_dev *rd_dev) -1 ;for (j =0 ; j < sg_per_table; j++) { - pg =alloc_pages (GFP_KERNEL ,0 ); + pg =alloc_pages (GFP_KERNEL | __GFP_ZERO,0 );if (!pg) {pr_err ("Unable to allocate scatterlist" " pages for struct rd_dev_sg_table\n" );
drivers/usb/dwc3/gadget.c +4 -0
@@ -531,6 +531,10 @@ static int __dwc3_gadget_ep_disable(struct dwc3_ep *dep)dwc3_remove_requests (dwc, dep); +/* make sure HW endpoint isn't stalled */ +if (dep->flags &DWC3_EP_STALL ) +__dwc3_gadget_ep_set_halt (dep,0 ); + reg =dwc3_readl (dwc->regs,DWC3_DALEPENA ); reg &= ~DWC3_DALEPENA_EP (dep->number);dwc3_writel (dwc->regs,DWC3_DALEPENA , reg);
drivers/usb/gadget/inode.c +1 -1
@@ -1499,7 +1499,7 @@ gadgetfs_setup (struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl) }break ; -#ifndef CONFIG_USB_GADGET_PXA25X +#ifndef CONFIG_USB_PXA25X /* PXA automagically handles this request too */ case USB_REQ_GET_CONFIGURATION :if (ctrl->bRequestType !=0x80 )
drivers/usb/host/pci-quirks.c +16 -3
@@ -555,6 +555,14 @@ static const struct dmi_system_id __devinitconst ehci_dmi_nohandoff_table[] = { DMI_MATCH(DMI_BIOS_VERSION, "Lucid-"), }, }, + { + /* HASEE E200 */ + .matches = { + DMI_MATCH(DMI_BOARD_VENDOR, "HASEE"), + DMI_MATCH(DMI_BOARD_NAME, "E210"), + DMI_MATCH(DMI_BIOS_VERSION, "6.00"), + }, + }, { } };
@@ -564,9 +572,14 @@ static void __devinit ehci_bios_handoff(struct pci_dev *pdev, {int try_handoff =1 , tried_handoff =0 ; -/* The Pegatron Lucid tablet sporadically waits for 98 seconds trying -* the handoff on its unused controller. Skip it. */ -if (pdev->vendor ==0x8086 && pdev->device ==0x283a ) { +/* +* The Pegatron Lucid tablet sporadically waits for 98 seconds trying +* the handoff on its unused controller. Skip it. +* +* The HASEE E200 hangs when the semaphore is set (bugzilla #77021). +*/ +if (pdev->vendor ==0x8086 && (pdev->device ==0x283a || + pdev->device ==0x27cc )) {if (dmi_check_system (ehci_dmi_nohandoff_table)) try_handoff =0 ; }
drivers/usb/misc/usbtest.c +36 -4
@@ -7,9 +7,10 @@#include <linux/moduleparam.h> #include <linux/scatterlist.h> #include <linux/mutex.h> - +#include <linux/timer.h> #include <linux/usb.h> +#define SIMPLE_IO_TIMEOUT 10000/* in milliseconds */ /*-------------------------------------------------------------------------*/
@@ -355,6 +356,7 @@ static int simple_io(int max = urb->transfer_buffer_length;struct completion completion;int retval =0 ; +unsigned long expire; urb->context = &completion;while (retval ==0 && iterations-- >0 ) {
@@ -367,9 +369,15 @@ static int simple_io(if (retval !=0 )break ; -/* NOTE: no timeouts; can't be broken out of by interrupt */ -wait_for_completion (&completion); - retval = urb->status; + expire =msecs_to_jiffies (SIMPLE_IO_TIMEOUT ); +if (!wait_for_completion_timeout (&completion, expire)) { +usb_kill_urb (urb); + retval = (urb->status == -ENOENT ? + -ETIMEDOUT : urb->status); + }else { + retval = urb->status; + } + urb->dev = udev;if (retval ==0 &&usb_pipein (urb->pipe)) retval =simple_check_buf (tdev, urb);
@@ -462,6 +470,14 @@ alloc_sglist(int nents, int max, int vary)return sg; } +static void sg_timeout (unsigned long _req) +{ +struct usb_sg_request *req = (struct usb_sg_request *) _req; + + req->status = -ETIMEDOUT ; +usb_sg_cancel (req); +} + static int perform_sglist( struct usbtest_dev *tdev, unsigned iterations,
@@ -473,6 +489,9 @@ static int perform_sglist( {struct usb_device *udev =testdev_to_usbdev (tdev);int retval =0 ; +struct timer_list sg_timer; + +setup_timer_on_stack (&sg_timer, sg_timeout, (unsigned long ) req);while (retval ==0 && iterations-- >0 ) { retval = usb_sg_init(req, udev, pipe,
@@ -483,7 +502,10 @@ static int perform_sglist(if (retval)break ; +mod_timer (&sg_timer, jiffies + +msecs_to_jiffies (SIMPLE_IO_TIMEOUT ));usb_sg_wait (req); +del_timer_sync (&sg_timer); retval = req->status;/* FIXME check resulting data pattern */
@@ -1135,6 +1157,11 @@ static int unlink1(struct usbtest_dev *dev, int pipe, int size, int async) urb->context = &completion; urb->complete = unlink1_callback; +if (usb_pipeout (urb->pipe)) { +simple_fill_buf (urb); + urb->transfer_flags |=URB_ZERO_PACKET ; + } +/* keep the endpoint busy. there are lots of hc/hcd-internal * states, and testing should get to all of them over time. *
@@ -1265,6 +1292,11 @@ static int unlink_queued(struct usbtest_dev *dev, int pipe, unsigned num, unlink_queued_callback, &ctx); ctx.urbs[i]->transfer_dma = buf_dma; ctx.urbs[i]->transfer_flags =URB_NO_TRANSFER_DMA_MAP ; + +if (usb_pipeout (ctx.urbs[i]->pipe)) { +simple_fill_buf (ctx.urbs[i]); + ctx.urbs[i]->transfer_flags |=URB_ZERO_PACKET ; + } }/* Submit all the URBs and then unlink URBs num - 4 and num - 2. */
drivers/usb/serial/option.c +12 -3
@@ -1930,6 +1930,7 @@ static int option_send_setup(struct usb_serial_port *port)struct usb_wwan_port_private *portdata;int ifNum = serial->interface->cur_altsetting->desc.bInterfaceNumber;int val =0 ; +int res;dbg ("%s" , __func__); if (is_blacklisted(ifNum, OPTION_BLACKLIST_SENDSETUP,
@@ -1945,9 +1946,17 @@ static int option_send_setup(struct usb_serial_port *port)if (portdata->rts_state) val |=0x02 ; -return usb_control_msg (serial->dev, -usb_rcvctrlpipe (serial->dev,0 ), -0x22 ,0x21 , val, ifNum,NULL ,0 ,USB_CTRL_SET_TIMEOUT ); + res =usb_autopm_get_interface (serial->interface); +if (res) +return res; + + res =usb_control_msg (serial->dev,usb_rcvctrlpipe (serial->dev,0 ), +0x22 ,0x21 , val, ifNum,NULL , +0 ,USB_CTRL_SET_TIMEOUT ); + +usb_autopm_put_interface (serial->interface); + +return res; }MODULE_AUTHOR (DRIVER_AUTHOR );
drivers/usb/serial/sierra.c +42 -12
118 lines not on this page · raw message
drivers/usb/serial/usb_wwan.c +68 -55
230 lines not on this page · raw message
drivers/video/matrox/matroxfb_base.h +1 -1
@@ -698,7 +698,7 @@ void matroxfb_unregister_driver(struct matroxfb_driver* drv);#define mga_fifo (n) do {} while ((mga_inl(M_FIFOSTATUS) & 0xFF) < (n)) -#define WaitTillIdle () do {} while (mga_inl(M_STATUS) & 0x10000) +#define WaitTillIdle () do { mga_inl(M_STATUS); do {} while (mga_inl(M_STATUS) & 0x10000); } while (0)/* code speedup */ #ifdef CONFIG_FB_MATROX_MILLENIUM
fs/btrfs/backref.c +1 -1
@@ -1033,7 +1033,7 @@ static int __get_extent_inline_ref(unsigned long *ptr, struct extent_buffer *eb, *out_eiref = (struct btrfs_extent_inline_ref *)(ei +1 ); } *ptr = (unsigned long )*out_eiref; -if ((void *)*ptr >= (void *)ei + item_size) +if ((unsigned long )(*ptr) >= (unsigned long )ei + item_size)return -ENOENT ; }
fs/btrfs/extent_io.c +2 -1
@@ -1551,6 +1551,7 @@ again:* shortening the size of the delalloc range we're searching */ free_extent_state (cached_state); + cached_state =NULL ;if (!loops) {unsigned long offset = (*start) & (PAGE_CACHE_SIZE -1 ); max_bytes =PAGE_CACHE_SIZE - offset;
@@ -2244,7 +2245,7 @@ int end_extent_writepage(struct page *page, int err, u64 start, u64 end) {int uptodate = (err ==0 );struct extent_io_tree *tree; -int ret; +int ret =0 ; tree = &BTRFS_I (page->mapping->host)->io_tree;
fs/btrfs/volumes.c +3 -2
@@ -1446,11 +1446,12 @@ int btrfs_rm_device(struct btrfs_root *root, char *device_path)struct btrfs_fs_devices *fs_devices; fs_devices = root->fs_info->fs_devices;while (fs_devices) { -if (fs_devices->seed == cur_devices) +if (fs_devices->seed == cur_devices) { + fs_devices->seed = cur_devices->seed;break ; + } fs_devices = fs_devices->seed; } - fs_devices->seed = cur_devices->seed; cur_devices->seed =NULL ;lock_chunks (root);__btrfs_close_devices (cur_devices);
fs/ext4/mballoc.c +1 -1
@@ -3015,7 +3015,7 @@ ext4_mb_normalize_request(struct ext4_allocation_context *ac, }BUG_ON (start + size <= ac->ac_o_ex.fe_logical && start > ac->ac_o_ex.fe_logical); -BUG_ON (size <=0 || size >EXT4_CLUSTERS_PER_GROUP (ac->ac_sb)); +BUG_ON (size <=0 || size >EXT4_BLOCKS_PER_GROUP (ac->ac_sb));/* now prepare goal request */
include/linux/irqdesc.h +4 -0
@@ -27,6 +27,8 @@ struct module;* @irq_count: stats field to detect stalled irqs * @last_unhandled: aging timer for unhandled count * @irqs_unhandled: stats field for spurious unhandled interrupts +* @threads_handled: stats field for deferred spurious detection of threaded handlers +* @threads_handled_last: comparator field for deferred spurious detection of theraded handlers * @lock: locking for SMP * @affinity_hint: hint to user space for preferred irq affinity * @affinity_notify: context for notification of affinity changes
@@ -52,6 +54,8 @@ struct irq_desc {unsigned int irq_count;/* For detecting broken IRQs */ unsigned long last_unhandled;/* Aging timer for unhandled count */ unsigned int irqs_unhandled; +atomic_t threads_handled; +int threads_handled_last;raw_spinlock_t lock;struct cpumask *percpu_enabled;#ifdef CONFIG_SMP
include/linux/skbuff.h +16 -0
@@ -1674,6 +1674,22 @@ static inline void skb_orphan(struct sk_buff *skb) }/** +* skb_orphan_frags - orphan the frags contained in a buffer +* @skb: buffer to orphan frags from +* @gfp_mask: allocation mask for replacement pages +* +* For each frag in the SKB which needs a destructor (i.e. has an +* owner) create a copy of that frag and release the original +* page by calling the destructor. +*/ +static inline int skb_orphan_frags (struct sk_buff *skb,gfp_t gfp_mask) +{ +if (likely (!(skb_shinfo (skb)->tx_flags &SKBTX_DEV_ZEROCOPY ))) +return 0 ; +return skb_copy_ubufs (skb, gfp_mask); +} + +/** * __skb_queue_purge - empty a list * @list: list to empty *
kernel/irq/manage.c +2 -2
@@ -809,8 +809,8 @@ static int irq_thread(void *data)irq_thread_check_affinity (desc, action); action_ret =handler_fn (desc, action); -if (!noirqdebug) -note_interrupt (action->irq, desc, action_ret); +if (action_ret ==IRQ_HANDLED ) +atomic_inc (&desc->threads_handled);wake_threads_waitq (desc); }
kernel/irq/spurious.c +102 -4
123 lines not on this page · raw message
mm/memory-failure.c +14 -11
@@ -208,9 +208,9 @@ static int kill_proc(struct task_struct *t, unsigned long addr, int trapno,#endif si.si_addr_lsb =compound_trans_order (compound_head (page)) +PAGE_SHIFT ; -if ((flags &MF_ACTION_REQUIRED ) && t == current) { +if ((flags &MF_ACTION_REQUIRED ) && t->mm == current->mm) { si.si_code =BUS_MCEERR_AR ; - ret =force_sig_info (SIGBUS , &si, t); + ret =force_sig_info (SIGBUS , &si, current); }else {/* * Don't use force here, it's convenient if the signal
@@ -382,10 +382,12 @@ static void kill_procs(struct list_head *to_kill, int forcekill, int trapno, } } -static int task_early_kill (struct task_struct *tsk) +static int task_early_kill (struct task_struct *tsk,int force_early) {if (!tsk->mm)return 0 ; +if (force_early) +return 1 ;if (tsk->flags &PF_MCE_PROCESS )return !!(tsk->flags &PF_MCE_EARLY );return sysctl_memory_failure_early_kill;
@@ -395,7 +397,7 @@ static int task_early_kill(struct task_struct *tsk)* Collect processes when the error hit an anonymous page. */ static void collect_procs_anon (struct page *page,struct list_head *to_kill, -struct to_kill **tkc) +struct to_kill **tkc,int force_early) {struct vm_area_struct *vma;struct task_struct *tsk;
@@ -409,7 +411,7 @@ static void collect_procs_anon(struct page *page, struct list_head *to_kill,for_each_process (tsk) {struct anon_vma_chain *vmac; -if (!task_early_kill (tsk)) +if (!task_early_kill (tsk, force_early))continue ;list_for_each_entry (vmac, &av->head, same_anon_vma) { vma = vmac->vma;
@@ -427,7 +429,7 @@ static void collect_procs_anon(struct page *page, struct list_head *to_kill,* Collect processes when the error hit a file mapped page. */ static void collect_procs_file (struct page *page,struct list_head *to_kill, -struct to_kill **tkc) +struct to_kill **tkc,int force_early) {struct vm_area_struct *vma;struct task_struct *tsk;
@@ -439,7 +441,7 @@ static void collect_procs_file(struct page *page, struct list_head *to_kill,for_each_process (tsk) {pgoff_t pgoff = page->index << (PAGE_CACHE_SHIFT -PAGE_SHIFT ); -if (!task_early_kill (tsk)) +if (!task_early_kill (tsk, force_early))continue ; vma_prio_tree_foreach(vma, &iter, &mapping->i_mmap, pgoff,
@@ -465,7 +467,8 @@ static void collect_procs_file(struct page *page, struct list_head *to_kill,* First preallocate one tokill structure outside the spin locks, * so that we can kill at least one process reasonably reliable. */ -static void collect_procs (struct page *page,struct list_head *tokill) +static void collect_procs (struct page *page,struct list_head *tokill, +int force_early) {struct to_kill *tk;
@@ -476,9 +479,9 @@ static void collect_procs(struct page *page, struct list_head *tokill)if (!tk)return ;if (PageAnon (page)) -collect_procs_anon (page, tokill, &tk); +collect_procs_anon (page, tokill, &tk, force_early);else -collect_procs_file (page, tokill, &tk); +collect_procs_file (page, tokill, &tk, force_early);kfree (tk); }
@@ -948,7 +951,7 @@ static int hwpoison_user_mappings(struct page *p, unsigned long pfn,* there's nothing that can be done. */ if (kill) -collect_procs (ppage, &tokill); +collect_procs (ppage, &tokill, flags &MF_ACTION_REQUIRED );if (hpage != ppage)lock_page (ppage);
mm/rmap.c +5 -3
@@ -103,6 +103,7 @@ static inline void anon_vma_free(struct anon_vma *anon_vma)* LOCK should suffice since the actual taking of the lock must * happen _before_ what follows. */ +might_sleep ();if (mutex_is_locked (&anon_vma->root->mutex)) {anon_vma_lock (anon_vma);anon_vma_unlock (anon_vma);
@@ -476,8 +477,9 @@ struct anon_vma *page_get_anon_vma(struct page *page)* above cannot corrupt). */ if (!page_mapped (page)) { +rcu_read_unlock ();put_anon_vma (anon_vma); - anon_vma =NULL ; +return NULL ; } out:rcu_read_unlock ();
@@ -527,9 +529,9 @@ struct anon_vma *page_lock_anon_vma(struct page *page) }if (!page_mapped (page)) { +rcu_read_unlock ();put_anon_vma (anon_vma); - anon_vma =NULL ; - goto out; +return NULL ; }/* we pinned the anon_vma, its safe to sleep */
mm/vmscan.c +3 -0
@@ -3138,7 +3138,10 @@ static int kswapd(void *p) } } + tsk->flags &= ~(PF_MEMALLOC |PF_SWAPWRITE |PF_KSWAPD ); current->reclaim_state =NULL ; +lockdep_clear_current_reclaim_state (); +return 0 ; }
net/core/skbuff.c +4 -1
@@ -733,7 +733,7 @@ int skb_copy_ubufs(struct sk_buff *skb, gfp_t gfp_mask)skb_shinfo (skb)->tx_flags &= ~SKBTX_DEV_ZEROCOPY ;return 0 ; } - +EXPORT_SYMBOL_GPL (skb_copy_ubufs);/** * skb_clone - duplicate an sk_buff
@@ -2777,6 +2777,9 @@ struct sk_buff *skb_segment(struct sk_buff *skb, netdev_features_t features) skb_put(nskb, hsize), hsize);while (pos < offset + len && i < nfrags) { +if (unlikely (skb_orphan_frags (skb,GFP_ATOMIC ))) + goto err; + *frag =skb_shinfo (skb)->frags[i];__skb_frag_ref (frag); size =skb_frag_size (frag);