2.6.38.7-stable review
Subsystems (39)
PATCH 1/71 cifs: change bleft in decode_unicode_ssetup back to signed type
In reply to Greg KH2.6.38-stable review patch. If anyone has any objections, please let us know.
------------------
From: Jeff Layton <[email protected]>
commit bfacf2225a955bea9c41c707fc72ba16009674a0 upstream.
The buffer length checks in this function depend on this value being a signed data type, but 690c522fa converted it to an unsigned type.
Also, eliminate a problem with the null termination check in the same function. cifs_strndup_from_ucs handles that situation correctly already, and the existing check could potentially lead to a buffer overrun since it increments bleft without checking to see whether it falls off the end of the buffer.
--- fs/cifs/sess.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-)
fs/cifs/sess.c +1 -14
@@ -277,7 +277,7 @@ static void ascii_ssetup_strings(char ** }static void -decode_unicode_ssetup (char **pbcc_area,__u16 bleft,struct cifsSesInfo *ses, +decode_unicode_ssetup (char **pbcc_area,int bleft,struct cifsSesInfo *ses,const struct nls_table *nls_cp) {int len;
@@ -285,19 +285,6 @@ decode_unicode_ssetup(char **pbcc_area,cFYI (1 ,"bleft %d" , bleft); -/* -* Windows servers do not always double null terminate their final -* Unicode string. Check to see if there are an uneven number of bytes -* left. If so, then add an extra NULL pad byte to the end of the -* response. -* -* See section 2.7.2 in "Implementing CIFS" for details -*/ -if (bleft %2 ) { - data[bleft] =0 ; - ++bleft; - } -kfree (ses->serverOS); ses->serverOS =cifs_strndup_from_ucs (data, bleft, true, nls_cp);cFYI (1 ,"serverOS=%s" , ses->serverOS);
PATCH 2/71 cifs: check for bytes_remaining going to zero in CIFS_SessSetup
In reply to Greg KH2.6.38-stable review patch. If anyone has any objections, please let us know.
------------------
From: Jeff Layton <[email protected]>
commit fcda7f4578bbf9717444ca6da8a421d21489d078 upstream.
It's possible that when we go to decode the string area in the SESSION_SETUP response, that bytes_remaining will be 0. Decrementing it at that point will mean that it can go "negative" and wrap. Check for a bytes_remaining value of 0, and don't try to decode the string area if that's the case.
--- fs/cifs/sess.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
fs/cifs/sess.c +3 -1
@@ -917,7 +917,9 @@ ssetup_ntlmssp_authenticate: }/* BB check if Unicode and decode strings */ -if (smb_buf->Flags2 &SMBFLG2_UNICODE ) { +if (bytes_remaining ==0 ) { +/* no string area to decode, do nothing */ + }else if (smb_buf->Flags2 &SMBFLG2_UNICODE ) {/* unicode string area must be word-aligned */ if (((unsigned long ) bcc_ptr - (unsigned long ) smb_buf) %2 ) { ++bcc_ptr;
PATCH 4/71 cifs: refactor mid finding loop in cifs_demultiplex_thread
In reply to Greg KH2.6.38-stable review patch. If anyone has any objections, please let us know.
------------------
From: Jeff Layton <[email protected]>
commit 146f9f65bd13f56665205aed7205d531c810cb35 upstream.
...to reduce the extreme indentation. This should introduce no behavioral changes.
--- fs/cifs/connect.c | 92 +++++++++++++++++++++++++++--------------------------- 1 file changed, 46 insertions(+), 46 deletions(-)
fs/cifs/connect.c +46 -46
@@ -618,59 +618,59 @@ incomplete_rcv:list_for_each_safe (tmp, tmp2, &server->pending_mid_q) { mid_entry = list_entry(tmp, struct mid_q_entry, qhead); -if ((mid_entry->mid == smb_buffer->Mid) && - (mid_entry->midState ==MID_REQUEST_SUBMITTED ) && - (mid_entry->command == smb_buffer->Command)) { -if (length ==0 && -check2ndT2 (smb_buffer, server->maxBuf) >0 ) { -/* We have a multipart transact2 resp */ - isMultiRsp = true; -if (mid_entry->resp_buf) { -/* merge response - fix up 1st*/ -if (coalesce_t2 (smb_buffer, +if (mid_entry->mid != smb_buffer->Mid || + mid_entry->midState !=MID_REQUEST_SUBMITTED || + mid_entry->command != smb_buffer->Command) { + mid_entry =NULL ; +continue ; + } + +if (length ==0 && +check2ndT2 (smb_buffer, server->maxBuf) >0 ) { +/* We have a multipart transact2 resp */ + isMultiRsp = true; +if (mid_entry->resp_buf) { +/* merge response - fix up 1st*/ +if (coalesce_t2 (smb_buffer, mid_entry->resp_buf)) { - mid_entry->multiRsp = - true; -break ; - }else { -/* all parts received */ - mid_entry->multiEnd = - true; - goto multi_t2_fnd; - } + mid_entry->multiRsp = true; +break ; + }else { +/* all parts received */ + mid_entry->multiEnd = true; + goto multi_t2_fnd; + } + }else { +if (!isLargeBuf) { +/* +* FIXME: switch to already +* allocated largebuf? +*/ +cERROR (1 ,"1st trans2 resp " +"needs bigbuf" ); }else { -if (!isLargeBuf) { -cERROR (1 ,"1st trans2 resp needs bigbuf" ); -/* BB maybe we can fix this up, switch -to already allocated large buffer? */ - }else { -/* Have first buffer */ - mid_entry->resp_buf = - smb_buffer; - mid_entry->largeBuf = - true; - bigbuf =NULL ; - } +/* Have first buffer */ + mid_entry->resp_buf = + smb_buffer; + mid_entry->largeBuf = true; + bigbuf =NULL ; } -break ; } - mid_entry->resp_buf = smb_buffer; - mid_entry->largeBuf = isLargeBuf; +break ; + } + mid_entry->resp_buf = smb_buffer; + mid_entry->largeBuf = isLargeBuf; multi_t2_fnd: -if (length ==0 ) - mid_entry->midState = -MID_RESPONSE_RECEIVED ; -else - mid_entry->midState = -MID_RESPONSE_MALFORMED ; +if (length ==0 ) + mid_entry->midState =MID_RESPONSE_RECEIVED ; +else + mid_entry->midState =MID_RESPONSE_MALFORMED ;#ifdef CONFIG_CIFS_STATS2 - mid_entry->when_received = jiffies; + mid_entry->when_received = jiffies;#endif -list_del_init (&mid_entry->qhead); - mid_entry->callback (mid_entry); -break ; - } - mid_entry =NULL ; +list_del_init (&mid_entry->qhead); + mid_entry->callback (mid_entry); +break ; }spin_unlock (&GlobalMid_Lock);
PATCH 6/71 Validate size of EFI GUID partition entries.
In reply to Greg KH2.6.38-stable review patch. If anyone has any objections, please let us know.
------------------
From: Timo Warns <[email protected]>
commit fa039d5f6b126fbd65eefa05db2f67e44df8f121 upstream.
Otherwise corrupted EFI partition tables can cause total confusion.
--- fs/partitions/efi.c | 6 ++++++ 1 file changed, 6 insertions(+)
fs/partitions/efi.c +6 -0
@@ -348,6 +348,12 @@ static int is_gpt_valid(struct parsed_pa goto fail; } +/* Check that sizeof_partition_entry has the correct value */ +if (le32_to_cpu ((*gpt)->sizeof_partition_entry) !=sizeof (gpt_entry)) { +pr_debug ("GUID Partitition Entry Size check failed.\n" ); + goto fail; + } +if (!(*ptes =alloc_read_gpt_entries (state, *gpt))) goto fail;
PATCH 7/71 drm/radeon/kms: add pci id to acer travelmate quirk for 5730
In reply to Greg KH2.6.38-stable review patch. If anyone has any objections, please let us know.
------------------
From: Alex Deucher <[email protected]>
commit 4f87af46107499415afd238be104587b5a9d7ac3 upstream.
Fixes:
https://bugzilla.kernel.org/show_bug.cgi?id=34082
Reported by: Sampo Laaksonen <[email protected]>
--- drivers/gpu/drm/radeon/radeon_atombios.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/radeon/radeon_atombios.c +2 -2
@@ -431,7 +431,7 @@ static bool radeon_atom_apply_quirks(str } } -/* Acer laptop (Acer TravelMate 5730G) has an HDMI port +/* Acer laptop (Acer TravelMate 5730/5730G) has an HDMI port * on the laptop and a DVI port on the docking station and * both share the same encoder, hpd pin, and ddc line. * So while the bios table is technically correct,
@@ -440,7 +440,7 @@ static bool radeon_atom_apply_quirks(str* with different crtcs which isn't possible on the hardware * side and leaves no crtcs for LVDS or VGA. */ -if ((dev->pdev->device ==0x95c4 ) && +if (((dev->pdev->device ==0x95c4 ) || (dev->pdev->device ==0x9591 )) && (dev->pdev->subsystem_vendor ==0x1025 ) && (dev->pdev->subsystem_device ==0x013c )) { if ((*connector_type == DRM_MODE_CONNECTOR_DVII) &&
PATCH 10/71 ptrace: Prepare to fix racy accesses on task breakpoints
In reply to Greg KH2.6.38-stable review patch. If anyone has any objections, please let us know.
------------------
From: Frederic Weisbecker <[email protected]>
commit bf26c018490c2fce7fe9b629083b96ce0e6ad019 upstream.
When a task is traced and is in a stopped state, the tracer may execute a ptrace request to examine the tracee state and get its task struct. Right after, the tracee can be killed and thus its breakpoints released.
This can happen concurrently when the tracer is in the middle of reading or modifying these breakpoints, leading to dereferencing a freed pointer.
Hence, to prepare the fix, create a generic breakpoint reference holding API. When a reference on the breakpoints of a task is held, the breakpoints won't be released until the last reference is dropped. After that, no more ptrace request on the task's breakpoints can be serviced for the tracer.
--- include/linux/ptrace.h | 13 ++++++++++++- include/linux/sched.h | 3 +++ kernel/exit.c | 2 +- kernel/ptrace.c | 17 +++++++++++++++++ 4 files changed, 33 insertions(+), 2 deletions(-)
include/linux/ptrace.h +12 -1
@@ -189,6 +189,10 @@ static inline void ptrace_init_task(stru child->ptrace = current->ptrace;__ptrace_link (child, current->parent); } + +#ifdef CONFIG_HAVE_HW_BREAKPOINT +atomic_set (&child->ptrace_bp_refcnt,1 ); +#endif }/**
@@ -350,6 +354,13 @@ extern int task_current_syscall(struct t unsigned long args[6], unsigned int maxargs, unsigned long *sp, unsigned long *pc); -#endif +#ifdef CONFIG_HAVE_HW_BREAKPOINT +extern int ptrace_get_breakpoints (struct task_struct *tsk); +extern void ptrace_put_breakpoints (struct task_struct *tsk); +#else +static inline void ptrace_put_breakpoints (struct task_struct *tsk) { } +#endif /* CONFIG_HAVE_HW_BREAKPOINT */ + +#endif /* __KERNEL */ #endif
include/linux/sched.h +3 -0
@@ -1531,6 +1531,9 @@ struct task_struct { unsigned long memsw_bytes; /* uncharged mem+swap usage */ } memcg_batch;#endif +#ifdef CONFIG_HAVE_HW_BREAKPOINT +atomic_t ptrace_bp_refcnt; +#endif };/* Future-safe accessor for struct task_struct's cpus_allowed. */
kernel/exit.c +1 -1
@@ -1015,7 +1015,7 @@ NORET_TYPE void do_exit(long code)/* * FIXME: do that only when needed, using sched_exit tracepoint */ -flush_ptrace_hw_breakpoint (tsk); +ptrace_put_breakpoints (tsk);exit_notify (tsk, group_dead);#ifdef CONFIG_NUMA
kernel/ptrace.c +17 -0
@@ -22,6 +22,7 @@#include <linux/syscalls.h> #include <linux/uaccess.h> #include <linux/regset.h> +#include <linux/hw_breakpoint.h> /*
@@ -876,3 +877,19 @@ asmlinkage long compat_sys_ptrace(compat return ret; }#endif /* CONFIG_COMPAT */ + +#ifdef CONFIG_HAVE_HW_BREAKPOINT +int ptrace_get_breakpoints (struct task_struct *tsk) +{ +if (atomic_inc_not_zero (&tsk->ptrace_bp_refcnt)) +return 0 ; + +return -1 ; +} + +void ptrace_put_breakpoints (struct task_struct *tsk) +{ +if (atomic_dec_and_test (&tsk->ptrace_bp_refcnt)) +flush_ptrace_hw_breakpoint (tsk); +} +#endif /* CONFIG_HAVE_HW_BREAKPOINT */
PATCH 9/71 x86, hw_breakpoints: Fix racy access to ptrace breakpoints
In reply to Greg KH2.6.38-stable review patch. If anyone has any objections, please let us know.
------------------
From: Frederic Weisbecker <[email protected]>
commit 87dc669ba25777b67796d7262c569429e58b1ed4 upstream.
While the tracer accesses ptrace breakpoints, the child task may concurrently exit due to a SIGKILL and thus release its breakpoints at the same time. We can then dereference some freed pointers.
To fix this, hold a reference on the child breakpoints before manipulating them.
--- arch/x86/kernel/ptrace.c | 36 ++++++++++++++++++++++++++---------- 1 file changed, 26 insertions(+), 10 deletions(-)
arch/x86/kernel/ptrace.c +26 -10
@@ -608,6 +608,9 @@ static int ptrace_write_dr7(struct task_unsigned len, type;struct perf_event *bp; +if (ptrace_get_breakpoints (tsk) <0 ) +return -ESRCH ; + data &= ~DR_CONTROL_RESERVED ; old_dr7 =ptrace_get_dr7 (thread->ptrace_bps); restore:
@@ -655,6 +658,9 @@ restore: } goto restore; } + +ptrace_put_breakpoints (tsk); +return ((orig_ret <0 ) ? orig_ret : rc); }
@@ -668,10 +674,17 @@ static unsigned long ptrace_get_debugregif (n <HBP_NUM ) {struct perf_event *bp; + +if (ptrace_get_breakpoints (tsk) <0 ) +return -ESRCH ; + bp = thread->ptrace_bps[n];if (!bp) -return 0 ; - val = bp->hw.info.address; + val =0 ; +else + val = bp->hw.info.address; + +ptrace_put_breakpoints (tsk); }else if (n ==6 ) { val = thread->debugreg6; }else if (n ==7 ) {
@@ -686,6 +699,10 @@ static int ptrace_set_breakpoint_addr(ststruct perf_event *bp;struct thread_struct *t = &tsk->thread;struct perf_event_attr attr; +int err =0 ; + +if (ptrace_get_breakpoints (tsk) <0 ) +return -ESRCH ;if (!t->ptrace_bps[nr]) {ptrace_breakpoint_init (&attr);
@@ -709,24 +726,23 @@ static int ptrace_set_breakpoint_addr(st* writing for the user. And anyway this is the previous * behaviour. */ -if (IS_ERR (bp)) -return PTR_ERR (bp); +if (IS_ERR (bp)) { + err =PTR_ERR (bp); + goto put; + } t->ptrace_bps[nr] = bp; }else { -int err; - bp = t->ptrace_bps[nr]; attr = bp->attr; attr.bp_addr = addr; err =modify_user_hw_breakpoint (bp, &attr); -if (err) -return err; } - -return 0 ; +put: +ptrace_put_breakpoints (tsk); +return err; }/*
PATCH 11/71 hw_breakpoints, powerpc: Fix CONFIG_HAVE_HW_BREAKPOINT off-case in ptrace_set_debugreg()
In reply to Greg KH2.6.38-stable review patch. If anyone has any objections, please let us know.
------------------
From: Frederic Weisbecker <[email protected]>
commit 925f83c085e1bb08435556c5b4844a60de002e31 upstream.
We make use of ptrace_get_breakpoints() / ptrace_put_breakpoints() to protect ptrace_set_debugreg() even if CONFIG_HAVE_HW_BREAKPOINT if off. However in this case, these APIs are not implemented.
To fix this, push the protection down inside the relevant ifdef. Best would be to export the code inside CONFIG_HAVE_HW_BREAKPOINT into a standalone function to cleanup the ifdefury there and call the breakpoint ref API inside. But as it is more invasive, this should be rather made in an -rc1.
Fixes this build error:
arch/powerpc/kernel/ptrace.c:1594: error: implicit declaration of function 'ptrace_get_breakpoints' make[2]: ***
--- arch/powerpc/kernel/ptrace.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
arch/powerpc/kernel/ptrace.c +11 -1
@@ -924,12 +924,16 @@ int ptrace_set_debugreg(struct task_struif (data && !(data &DABR_TRANSLATION ))return -EIO ;#ifdef CONFIG_HAVE_HW_BREAKPOINT +if (ptrace_get_breakpoints (task) <0 ) +return -ESRCH ; + bp = thread->ptrace_bps[0 ];if ((!data) || !(data & (DABR_DATA_WRITE |DABR_DATA_READ ))) {if (bp) {unregister_hw_breakpoint (bp); thread->ptrace_bps[0 ] =NULL ; } +ptrace_put_breakpoints (task);return 0 ; }if (bp) {
@@ -939,9 +943,12 @@ int ptrace_set_debugreg(struct task_stru (DABR_DATA_WRITE |DABR_DATA_READ ), &attr.bp_type); ret =modify_user_hw_breakpoint (bp, &attr); -if (ret) +if (ret) { +ptrace_put_breakpoints (task);return ret; + } thread->ptrace_bps[0 ] = bp; +ptrace_put_breakpoints (task); thread->dabr = data;return 0 ; }
@@ -956,9 +963,12 @@ int ptrace_set_debugreg(struct task_stru ptrace_triggered, task);if (IS_ERR (bp)) { thread->ptrace_bps[0 ] =NULL ; +ptrace_put_breakpoints (task);return PTR_ERR (bp); } +ptrace_put_breakpoints (task); +#endif /* CONFIG_HAVE_HW_BREAKPOINT */ /* Move contents to the DABR register */
PATCH 13/71 drm/radeon/kms: fix gart setup on fusion parts (v2) backport
In reply to Greg KH2.6.38-stable review patch. If anyone has any objections, please let us know.
------------------
From: Alex Deucher <[email protected]>
Backport of 8aeb96f80232e9a701b5c4715504f4c9173978bd (drm/radeon/kms: fix gart setup on fusion parts (v2)) to the stable tree.
Out of the entire GART/VM subsystem, the hw designers changed the location of 3 regs.
v2: airlied: add parameter for userspace to work from.
--- drivers/gpu/drm/radeon/evergreen.c | 17 +++++++++-------- drivers/gpu/drm/radeon/evergreend.h | 5 +++++ drivers/gpu/drm/radeon/radeon_kms.c | 3 +++ include/drm/radeon_drm.h | 1 + 4 files changed, 18 insertions(+), 8 deletions(-)
drivers/gpu/drm/radeon/evergreen.c +9 -8
@@ -869,9 +869,15 @@ int evergreen_pcie_gart_enable(struct raSYSTEM_ACCESS_MODE_NOT_IN_SYS |SYSTEM_APERTURE_UNMAPPED_ACCESS_PASS_THRU |EFFECTIVE_L1_TLB_SIZE (5 ) |EFFECTIVE_L1_QUEUE_SIZE (5 ); -WREG32 (MC_VM_MD_L1_TLB0_CNTL , tmp); -WREG32 (MC_VM_MD_L1_TLB1_CNTL , tmp); -WREG32 (MC_VM_MD_L1_TLB2_CNTL , tmp); +if (rdev->flags &RADEON_IS_IGP ) { +WREG32 (FUS_MC_VM_MD_L1_TLB0_CNTL , tmp); +WREG32 (FUS_MC_VM_MD_L1_TLB1_CNTL , tmp); +WREG32 (FUS_MC_VM_MD_L1_TLB2_CNTL , tmp); + }else { +WREG32 (MC_VM_MD_L1_TLB0_CNTL , tmp); +WREG32 (MC_VM_MD_L1_TLB1_CNTL , tmp); +WREG32 (MC_VM_MD_L1_TLB2_CNTL , tmp); + }WREG32 (MC_VM_MB_L1_TLB0_CNTL , tmp);WREG32 (MC_VM_MB_L1_TLB1_CNTL , tmp);WREG32 (MC_VM_MB_L1_TLB2_CNTL , tmp);
@@ -2930,11 +2936,6 @@ static int evergreen_startup(struct rade rdev->asic->copy =NULL ;dev_warn (rdev->dev,"failed blitter (%d) falling back to memcpy\n" , r); } -/* XXX: ontario has problems blitting to gart at the moment */ -if (rdev->family ==CHIP_PALM ) { - rdev->asic->copy =NULL ; -radeon_ttm_set_active_vram_size (rdev, rdev->mc.visible_vram_size); - }/* allocate wb buffer */ r =radeon_wb_init (rdev);
drivers/gpu/drm/radeon/evergreend.h +5 -0
@@ -221,6 +221,11 @@#define MC_VM_MD_L1_TLB0_CNTL 0x2654#define MC_VM_MD_L1_TLB1_CNTL 0x2658#define MC_VM_MD_L1_TLB2_CNTL 0x265C + +#define FUS_MC_VM_MD_L1_TLB0_CNTL 0x265C +#define FUS_MC_VM_MD_L1_TLB1_CNTL 0x2660 +#define FUS_MC_VM_MD_L1_TLB2_CNTL 0x2664 +#define MC_VM_SYSTEM_APERTURE_DEFAULT_ADDR 0x203C#define MC_VM_SYSTEM_APERTURE_HIGH_ADDR 0x2038#define MC_VM_SYSTEM_APERTURE_LOW_ADDR 0x2034
drivers/gpu/drm/radeon/radeon_kms.c +3 -0
@@ -205,6 +205,9 @@ int radeon_info_ioctl(struct drm_device/* return clock value in KHz */ value = rdev->clock.spll.reference_freq *10 ;break ; +case RADEON_INFO_FUSION_GART_WORKING : + value =1 ; +break ;default :DRM_DEBUG_KMS ("Invalid request %d\n" , info->request);return -EINVAL ;
include/drm/radeon_drm.h +1 -0
@@ -908,6 +908,7 @@ struct drm_radeon_cs {#define RADEON_INFO_WANT_HYPERZ 0x07#define RADEON_INFO_WANT_CMASK 0x08/* get access to CMASK on r300 */ #define RADEON_INFO_CLOCK_CRYSTAL_FREQ 0x09/* clock crystal frequency */ +#define RADEON_INFO_FUSION_GART_WORKING 0x0c/* fusion writes to GTT were broken before this */ struct drm_radeon_info {uint32_t request;
PATCH 14/71 vm: fix vm_pgoff wrap in upward expansion
In reply to Greg KH2.6.38-stable review patch. If anyone has any objections, please let us know.
------------------
From: Hugh Dickins <[email protected]>
commit 42c36f63ac1366ab0ecc2d5717821362c259f517 upstream.
Commit a626ca6a6564 ("vm: fix vm_pgoff wrap in stack expansion") fixed the case of an expanding mapping causing vm_pgoff wrapping when you had downward stack expansion. But there was another case where IA64 and PA-RISC expand mappings: upward expansion.
This fixes that case too.
--- mm/mmap.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
mm/mmap.c +7 -4
@@ -1767,10 +1767,13 @@ int expand_upwards(struct vm_area_struct size = address - vma->vm_start; grow = (address - vma->vm_end) >>PAGE_SHIFT ; - error =acct_stack_growth (vma, size, grow); -if (!error) { - vma->vm_end = address; -perf_event_mmap (vma); + error = -ENOMEM ; +if (vma->vm_pgoff + (size >>PAGE_SHIFT ) >= vma->vm_pgoff) { + error =acct_stack_growth (vma, size, grow); +if (!error) { + vma->vm_end = address; +perf_event_mmap (vma); + } } }vma_unlock_anon_vma (vma);
PATCH 15/71 Dont lock guardpage if the stack is growing up
In reply to Greg KH2.6.38-stable review patch. If anyone has any objections, please let us know.
------------------
From: Mikulas Patocka <[email protected]>
commit a09a79f66874c905af35d5bb5e5f2fdc7b6b894d upstream.
Linux kernel excludes guard page when performing mlock on a VMA with down-growing stack. However, some architectures have up-growing stack and locking the guard page should be excluded in this case too.
This patch fixes lvm2 on PA-RISC (and possibly other architectures with up-growing stack). lvm2 calculates number of used pages when locking and when unlocking and reports an internal error if the numbers mismatch.
[ Patch changed fairly extensively to also fix /proc/<pid>/maps for the
grows-up case, and to move things around a bit to clean it all up and share the infrstructure with the /proc bits.
Tested on ia64 that has both grow-up and grow-down segments - Linus ]
--- fs/proc/task_mmu.c | 12 +++++++----- include/linux/mm.h | 24 +++++++++++++++++++++++- mm/memory.c | 16 +++++++--------- 3 files changed, 37 insertions(+), 15 deletions(-)
fs/proc/task_mmu.c +7 -5
@@ -211,7 +211,7 @@ static void show_map_vma(struct seq_fileint flags = vma->vm_flags;unsigned long ino =0 ;unsigned long long pgoff =0 ; -unsigned long start; +unsigned long start, end;dev_t dev =0 ;int len;
@@ -224,13 +224,15 @@ static void show_map_vma(struct seq_file/* We don't show the stack guard page in /proc/maps */ start = vma->vm_start; -if (vma->vm_flags &VM_GROWSDOWN ) -if (!vma_stack_continue (vma->vm_prev, vma->vm_start)) - start +=PAGE_SIZE ; +if (stack_guard_page_start (vma, start)) + start +=PAGE_SIZE ; + end = vma->vm_end; +if (stack_guard_page_end (vma, end)) + end -=PAGE_SIZE ; seq_printf(m, "%08lx-%08lx %c%c%c%c %08llx %02x:%02x %lu %n", start, - vma->vm_end, + end, flags & VM_READ ? 'r' : '-', flags & VM_WRITE ? 'w' : '-', flags & VM_EXEC ? 'x' : '-',
include/linux/mm.h +23 -1
@@ -994,11 +994,33 @@ int set_page_dirty_lock(struct page *pagint clear_page_dirty_for_io (struct page *page);/* Is the vma a continuation of the stack vma above it? */ -static inline int vma_stack_continue (struct vm_area_struct *vma,unsigned long addr) +static inline int vma_growsdown (struct vm_area_struct *vma,unsigned long addr) {return vma && (vma->vm_end == addr) && (vma->vm_flags &VM_GROWSDOWN ); } +static inline int stack_guard_page_start (struct vm_area_struct *vma, +unsigned long addr) +{ +return (vma->vm_flags &VM_GROWSDOWN ) && + (vma->vm_start == addr) && + !vma_growsdown (vma->vm_prev, addr); +} + +/* Is the vma a continuation of the stack vma below it? */ +static inline int vma_growsup (struct vm_area_struct *vma,unsigned long addr) +{ +return vma && (vma->vm_start == addr) && (vma->vm_flags &VM_GROWSUP ); +} + +static inline int stack_guard_page_end (struct vm_area_struct *vma, +unsigned long addr) +{ +return (vma->vm_flags &VM_GROWSUP ) && + (vma->vm_end == addr) && + !vma_growsup (vma->vm_next, addr); +} +extern unsigned long move_page_tables (struct vm_area_struct *vma,unsigned long old_addr,struct vm_area_struct *new_vma,unsigned long new_addr,unsigned long len);
mm/memory.c +7 -9
@@ -1412,9 +1412,8 @@ no_page_table:static inline int stack_guard_page (struct vm_area_struct *vma,unsigned long addr) { -return (vma->vm_flags &VM_GROWSDOWN ) && - (vma->vm_start == addr) && - !vma_stack_continue (vma->vm_prev, addr); +return stack_guard_page_start (vma, addr) || +stack_guard_page_end (vma, addr+PAGE_SIZE ); } int __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
@@ -1502,12 +1501,6 @@ int __get_user_pages(struct task_structcontinue ; } -/* -* For mlock, just skip the stack guard page. -*/ -if ((gup_flags &FOLL_MLOCK ) &&stack_guard_page (vma, start)) - goto next_page; - do { struct page *page; unsigned int foll_flags = gup_flags;
@@ -1524,6 +1517,11 @@ int __get_user_pages(struct task_structint ret;unsigned int fault_flags =0 ; +/* For mlock, just skip the stack guard page. */ +if (foll_flags &FOLL_MLOCK ) { +if (stack_guard_page (vma, start)) + goto next_page; + }if (foll_flags &FOLL_WRITE ) fault_flags |=FAULT_FLAG_WRITE ;if (nonblocking)
PATCH 16/71 drm/i915/dp: Be paranoid in case we disable a DP before it is attached
In reply to Greg KH2.6.38-stable review patch. If anyone has any objections, please let us know.
------------------
From: Chris Wilson <[email protected]>
commit 31acbcc408f412d1ba73765b846c38642be553c3 upstream.
Given that the hardware may be left in a random condition by the BIOS, it is conceivable that we then attempt to clear the DP_PIPEB_SELECT bit without us ever enabling/attaching the DP encoder to a pipe. Thus causing a NULL deference when we attempt to wait for a vblank on that crtc.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=36314
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=36456
--- drivers/gpu/drm/i915/intel_dp.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_dp.c +15 -2
@@ -1455,7 +1455,8 @@ intel_dp_link_down(struct intel_dp *inteif (!HAS_PCH_CPT (dev) &&I915_READ (intel_dp->output_reg) &DP_PIPEB_SELECT ) { -struct intel_crtc *intel_crtc =to_intel_crtc (intel_dp->base.base.crtc); +struct drm_crtc *crtc = intel_dp->base.base.crtc; +/* Hardware workaround: leaving our transcoder select * set to transcoder B while it's off will prevent the * corresponding HDMI output on transcoder A.
@@ -1470,7 +1471,19 @@ intel_dp_link_down(struct intel_dp *inte/* Changes to enable or select take place the vblank * after being written. */ -intel_wait_for_vblank (dev, intel_crtc->pipe); +if (crtc ==NULL ) { +/* We can arrive here never having been attached +* to a CRTC, for instance, due to inheriting +* random state from the BIOS. +* +* If the pipe is not running, play safe and +* wait for the clocks to stabilise before +* continuing. +*/ +POSTING_READ (intel_dp->output_reg); +msleep (50 ); + }else +intel_wait_for_vblank (dev,to_intel_crtc (crtc)->pipe); }I915_WRITE (intel_dp->output_reg,DP & ~DP_PORT_EN );
PATCH 20/71 CIFS: Fix memory over bound bug in cifs_parse_mount_options
In reply to Greg KH2.6.38-stable review patch. If anyone has any objections, please let us know.
------------------
From: Pavel Shilovsky <[email protected]>
commit 4906e50b37e6f6c264e7ee4237343eb2b7f8d16d upstream.
While password processing we can get out of options array bound if the next character after array is delimiter. The patch adds a check if we reach the end.
--- fs/cifs/connect.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
fs/cifs/connect.c +3 -2
@@ -822,8 +822,7 @@ static int cifs_parse_mount_options(char *options, const char *devname, struct smb_vol *vol) { -char *value; -char *data; +char *value, *data, *end;unsigned int temp_len, i, j;char separator[2 ];short int override_uid =-1 ;
@@ -866,6 +865,7 @@ cifs_parse_mount_options(char *options,if (!options)return 1 ; + end = options +strlen (options);if (strncmp (options,"sep=" ,4 ) ==0 ) {if (options[4 ] !=0 ) { separator[0 ] = options[4 ];
@@ -930,6 +930,7 @@ cifs_parse_mount_options(char *options,the only illegal character in a password is null */ if ((value[temp_len] ==0 ) && + (value + temp_len < end) && (value[temp_len+1 ] == separator[0 ])) {/* reinsert comma */ value[temp_len] = separator[0 ];
PATCH 23/71 tmpfs: fix race between umount and swapoff
In reply to Greg KH2.6.38-stable review patch. If anyone has any objections, please let us know.
------------------
From: Hugh Dickins <[email protected]>
commit 778dd893ae785c5fd505dac30b5fc40aae188bf1 upstream.
The use of igrab() in swapoff's shmem_unuse_inode() is just as vulnerable to umount as that in shmem_writepage().
Fix this instance by extending the protection of shmem_swaplist_mutex right across shmem_unuse_inode(): while it's on the list, the inode cannot be evicted (and the filesystem cannot be unmounted) without shmem_evict_inode() taking that mutex to remove it from the list.
But since shmem_writepage() might take that mutex, we should avoid making memory allocations or memcg charges while holding it: prepare them at the outer level in shmem_unuse(). When mem_cgroup_cache_charge() was originally placed, we didn't know until that point that the page from swap was actually a shmem page; but nowadays it's noted in the swap_map, so we're safe to charge upfront. For the radix_tree, do as is done in shmem_getpage(): preload upfront, but don't pin to the cpu; so we make a habit of refreshing the node pool, but might dip into GFP_NOWAIT reserves on occasion if subsequently preempted.
With the allocation and charge moved out from shmem_unuse_inode(), we can also hold index map and info->lock over from finding the entry.
--- mm/shmem.c | 88 +++++++++++++++++++++++++++++-------------------------------- 1 file changed, 43 insertions(+), 45 deletions(-)
mm/shmem.c +43 -45
@@ -852,7 +852,7 @@ static inline int shmem_find_swp(swp_entstatic int shmem_unuse_inode (struct shmem_inode_info *info,swp_entry_t entry,struct page *page) { -struct inode *inode; +struct address_space *mapping;unsigned long idx;unsigned long size;unsigned long limit;
@@ -875,8 +875,10 @@ static int shmem_unuse_inode(struct shmeif (size >SHMEM_NR_DIRECT ) size =SHMEM_NR_DIRECT ; offset =shmem_find_swp (entry, ptr, ptr+size); -if (offset >=0 ) +if (offset >=0 ) { +shmem_swp_balance_unmap (); goto found; + }if (!info->i_indirect) goto lost2;
@@ -914,11 +916,11 @@ static int shmem_unuse_inode(struct shmeif (size >ENTRIES_PER_PAGE ) size =ENTRIES_PER_PAGE ; offset =shmem_find_swp (entry, ptr, ptr+size); -shmem_swp_unmap (ptr);if (offset >=0 ) {shmem_dir_unmap (dir); goto found; } +shmem_swp_unmap (ptr); } } lost1:
@@ -928,8 +930,7 @@ lost2:return 0 ; found: idx += offset; - inode =igrab (&info->vfs_inode); -spin_unlock (&info->lock); + ptr += offset;/* * Move _head_ to start search for next from here.
@@ -940,37 +941,18 @@ found:*/ if (shmem_swaplist.next != &info->swaplist)list_move_tail (&shmem_swaplist, &info->swaplist); -mutex_unlock (&shmem_swaplist_mutex); - error =1 ; -if (!inode) - goto out;/* -* Charge page using GFP_KERNEL while we can wait. -* Charged back to the user(not to caller) when swap account is used. -* add_to_page_cache() will be called with GFP_NOWAIT. +* We rely on shmem_swaplist_mutex, not only to protect the swaplist, +* but also to hold up shmem_evict_inode(): so inode cannot be freed +* beneath us (pagelock doesn't help until the page is in pagecache). */ - error =mem_cgroup_cache_charge (page, current->mm,GFP_KERNEL ); -if (error) - goto out; - error =radix_tree_preload (GFP_KERNEL ); -if (error) { -mem_cgroup_uncharge_cache_page (page); - goto out; - } - error =1 ; - -spin_lock (&info->lock); - ptr =shmem_swp_entry (info, idx,NULL ); -if (ptr && ptr->val == entry.val) { - error =add_to_page_cache_locked (page, inode->i_mapping, - idx,GFP_NOWAIT ); -/* does mem_cgroup_uncharge_cache_page on error */ - }else /* we must compensate for our precharge above */ -mem_cgroup_uncharge_cache_page (page); + mapping = info->vfs_inode.i_mapping; + error =add_to_page_cache_locked (page, mapping, idx,GFP_NOWAIT ); +/* which does mem_cgroup_uncharge_cache_page on error */ if (error == -EEXIST ) { -struct page *filepage =find_get_page (inode->i_mapping, idx); +struct page *filepage =find_get_page (mapping, idx); error =1 ;if (filepage) {/*
@@ -990,14 +972,8 @@ found:swap_free (entry); error =1 ;/* not an error, but entry was found */ } -if (ptr) -shmem_swp_unmap (ptr); +shmem_swp_unmap (ptr);spin_unlock (&info->lock); -radix_tree_preload_end (); -out: -unlock_page (page); -page_cache_release (page); -iput (inode);/* allows for NULL */ return error; }
@@ -1009,6 +985,26 @@ int shmem_unuse(swp_entry_t entry, strucstruct list_head *p, *next;struct shmem_inode_info *info;int found =0 ; +int error; + +/* +* Charge page using GFP_KERNEL while we can wait, before taking +* the shmem_swaplist_mutex which might hold up shmem_writepage(). +* Charged back to the user (not to caller) when swap account is used. +* add_to_page_cache() will be called with GFP_NOWAIT. +*/ + error =mem_cgroup_cache_charge (page, current->mm,GFP_KERNEL ); +if (error) + goto out; +/* +* Try to preload while we can wait, to not make a habit of +* draining atomic reserves; but don't latch on to this cpu, +* it's okay if sometimes we get rescheduled after this. +*/ + error =radix_tree_preload (GFP_KERNEL ); +if (error) + goto uncharge; +radix_tree_preload_end ();mutex_lock (&shmem_swaplist_mutex);list_for_each_safe (p, next, &shmem_swaplist) {
@@ -1016,17 +1012,19 @@ int shmem_unuse(swp_entry_t entry, struc found =shmem_unuse_inode (info, entry, page);cond_resched ();if (found) - goto out; +break ; }mutex_unlock (&shmem_swaplist_mutex); -/* -* Can some race bring us here? We've been holding page lock, -* so I think not; but would rather try again later than BUG() -*/ + +uncharge: +if (!found) +mem_cgroup_uncharge_cache_page (page); +if (found <0 ) + error = found; +out:unlock_page (page);page_cache_release (page); -out: -return (found <0 ) ? found :0 ; +return error; }/*
PATCH 22/71 mm: use alloc_bootmem_node_nopanic() on really needed path
In reply to Greg KH2.6.38-stable review patch. If anyone has any objections, please let us know.
------------------
From: Yinghai Lu <[email protected]>
commit 8f389a99b652aab5b42297280bd94d95933ad12f upstream.
Stefan found nobootmem does not work on his system that has only 8M of RAM. This causes an early panic:
BIOS-provided physical RAM map:
BIOS-88: 0000000000000000 - 000000000009f000 (usable)
BIOS-88: 0000000000100000 - 0000000000840000 (usable)
bootconsole [earlyser0] enabled
Notice: NX (Execute Disable) protection missing in CPU or disabled in BIOS! DMI not present or invalid.
last_pfn = 0x840 max_arch_pfn = 0x100000
init_memory_mapping: 0000000000000000-0000000000840000
8MB LOWMEM available.
mapped low ram: 0 - 00840000
low ram: 0 - 00840000
Zone PFN ranges:
DMA 0x00000001 -> 0x00001000
Normal empty
Movable zone start PFN for each node
early_node_map[2] active PFN ranges
0: 0x00000001 -> 0x0000009f
0: 0x00000100 -> 0x00000840
BUG: Int 6: CR2 (null)
EDI c034663c ESI (null) EBP c0329f38 ESP c0329ef4
EBX c0346380 EDX 00000006 ECX ffffffff EAX fffffff4
err (null) EIP c0353191 CS c0320060 flg 00010082
Stack: (null) c030c533 000007cd (null) c030c533 00000001 (null) (null)
00000003 0000083f 00000018 00000002 00000002 c0329f6c c03534d6 (null)
(null) 00000100 00000840 (null) c0329f64 00000001 00001000 (null)
Pid: 0, comm: swapper Not tainted 2.6.36 #5
Call Trace:
[<c02e3707>] ? 0xc02e3707
[<c035e6e5>] 0xc035e6e5
[<c0353191>] ? 0xc0353191
[<c03534d6>] 0xc03534d6
[<c034f1cd>] 0xc034f1cd
[<c034a824>] 0xc034a824
[<c03513cb>] ? 0xc03513cb
[<c0349432>] 0xc0349432
[<c0349066>] 0xc0349066It turns out that we should ignore the low limit of 16M.
Use alloc_bootmem_node_nopanic() in this case.
--- include/linux/bootmem.h | 2 ++ mm/page_alloc.c | 7 ++++--- 2 files changed, 6 insertions(+), 3 deletions(-)
include/linux/bootmem.h +2 -0
@@ -115,6 +115,8 @@ extern void *__alloc_bootmem_low_node(pg __alloc_bootmem_nopanic(x, PAGE_SIZE, __pa(MAX_DMA_ADDRESS))#define alloc_bootmem_node (pgdat, x) \ __alloc_bootmem_node(pgdat, x, SMP_CACHE_BYTES, __pa(MAX_DMA_ADDRESS)) +#define alloc_bootmem_node_nopanic (pgdat, x) \ + __alloc_bootmem_node_nopanic(pgdat, x, SMP_CACHE_BYTES, __pa(MAX_DMA_ADDRESS))#define alloc_bootmem_pages_node (pgdat, x) \ __alloc_bootmem_node(pgdat, x, PAGE_SIZE, __pa(MAX_DMA_ADDRESS))#define alloc_bootmem_pages_node_nopanic (pgdat, x) \
mm/page_alloc.c +4 -3
@@ -3498,7 +3498,7 @@ int zone_wait_table_init(struct zone *zoif (!slab_is_available ()) { zone->wait_table = (wait_queue_head_t *) -alloc_bootmem_node (pgdat, alloc_size); +alloc_bootmem_node_nopanic (pgdat, alloc_size); }else {/* * This case means that a zone whose size was 0 gets new memory
@@ -4071,7 +4071,8 @@ static void __init setup_usemap(struct punsigned long usemapsize =usemap_size (zonesize); zone->pageblock_flags =NULL ;if (usemapsize) - zone->pageblock_flags =alloc_bootmem_node (pgdat, usemapsize); + zone->pageblock_flags =alloc_bootmem_node_nopanic (pgdat, + usemapsize); }#else static inline void setup_usemap(struct pglist_data *pgdat,
@@ -4237,7 +4238,7 @@ static void __init_refok alloc_node_mem_ size = (end - start) *sizeof (struct page ); map =alloc_remap (pgdat->node_id, size);if (!map) - map =alloc_bootmem_node (pgdat, size); + map =alloc_bootmem_node_nopanic (pgdat, size); pgdat->node_mem_map = map + (pgdat->node_start_pfn - start); }#ifndef CONFIG_NEED_MULTIPLE_NODES
PATCH 24/71 ARM: zImage: make sure the stack is 64-bit aligned
In reply to Greg KH2.6.38-stable review patch. If anyone has any objections, please let us know.
------------------
From: Nicolas Pitre <[email protected]>
commit 3bd2cbb95543acf44fe123eb9f038de54e655eb4 upstream.
With ARMv5+ and EABI, the compiler expects a 64-bit aligned stack so instructions like STRD and LDRD can be used. Without this, mysterious boot failures were seen semi randomly with the LZMA decompressor.
While at it, let's align .bss as well.
--- arch/arm/boot/compressed/Makefile | 2 +- arch/arm/boot/compressed/vmlinux.lds.in | 1 + 2 files changed, 2 insertions(+), 1 deletion(-)
arch/arm/boot/compressed/Makefile +1 -1
@@ -59,7 +59,7 @@ ZTEXTADDR := $(CONFIG_ZBOOT_ROM_TEXT) ZBSSADDR := $(CONFIG_ZBOOT_ROM_BSS) else ZTEXTADDR := 0 -ZBSSADDR := ALIGN(4) +ZBSSADDR := ALIGN(8) endif SEDFLAGS = s/TEXT_START/$(ZTEXTADDR)/;s/BSS_START/$(ZBSSADDR)/
arch/arm/boot/compressed/vmlinux.lds.in +1 -0
@@ -57,6 +57,7 @@ SECTIONS .bss : { *(.bss) } _end = .; + . = ALIGN(8); /* the stack must be 64-bit aligned */ .stack : { *(.stack) } .stab 0 : { *(.stab) }
PATCH 28/71 net: ip_expire() must revalidate route
In reply to Greg KH2.6.38-stable review patch. If anyone has any objections, please let us know.
------------------
From: Eric Dumazet <[email protected]>
commit 64f3b9e203bd06855072e295557dca1485a2ecba upstream.
Commit 4a94445c9a5c (net: Use ip_route_input_noref() in input path) added a bug in IP defragmentation handling, in case timeout is fired.
When a frame is defragmented, we use last skb dst field when building final skb. Its dst is valid, since we are in rcu read section.
But if a timeout occurs, we take first queued fragment to build one ICMP TIME EXCEEDED message. Problem is all queued skb have weak dst pointers, since we escaped RCU critical section after their queueing. icmp_send() might dereference a now freed (and possibly reused) part of memory.
Calling skb_dst_drop() and ip_route_input_noref() to revalidate route is the only possible choice.
--- net/ipv4/ip_fragment.c | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-)
net/ipv4/ip_fragment.c +15 -16
@@ -223,31 +223,30 @@ static void ip_expire(unsigned long arg)if ((qp->q.last_in &INET_FRAG_FIRST_IN ) && qp->q.fragments !=NULL ) {struct sk_buff *head = qp->q.fragments; +const struct iphdr *iph; +int err;rcu_read_lock (); head->dev =dev_get_by_index_rcu (net, qp->iif);if (!head->dev) goto out_rcu_unlock; +/* skb dst is stale, drop it, and perform route lookup again */ +skb_dst_drop (head); + iph =ip_hdr (head); + err =ip_route_input_noref (head, iph->daddr, iph->saddr, + iph->tos, head->dev); +if (err) + goto out_rcu_unlock; +/* -* Only search router table for the head fragment, -* when defraging timeout at PRE_ROUTING HOOK. +* Only an end host needs to send an ICMP +* "Fragment Reassembly Timeout" message, per RFC792. */ -if (qp->user ==IP_DEFRAG_CONNTRACK_IN && !skb_dst (head)) { -const struct iphdr *iph =ip_hdr (head); -int err =ip_route_input (head, iph->daddr, iph->saddr, - iph->tos, head->dev); -if (unlikely (err)) - goto out_rcu_unlock; - -/* -* Only an end host needs to send an ICMP -* "Fragment Reassembly Timeout" message, per RFC792. -*/ -if (skb_rtable (head)->rt_type !=RTN_LOCAL ) - goto out_rcu_unlock; +if (qp->user ==IP_DEFRAG_CONNTRACK_IN && +skb_rtable (head)->rt_type !=RTN_LOCAL ) + goto out_rcu_unlock; - }/* Send an ICMP "Fragment Reassembly Timeout" message. */ icmp_send (head,ICMP_TIME_EXCEEDED ,ICMP_EXC_FRAGTIME ,0 );
PATCH 30/71 ipheth: Properly distinguish length and alignment in URBs and skbs
In reply to Greg KH2.6.38-stable review patch. If anyone has any objections, please let us know.
------------------
From: Ben Hutchings <[email protected]>
commit 9c412942a0bb19ba18f7bd939d42eff1e132a901 upstream.
The USB protocol this driver implements appears to require 2 bytes of padding in front of each received packet. This used to be equal to the value of NET_IP_ALIGN on x86, so the driver abused that constant and mostly worked, but this is no longer the case. The driver also mixed up the URB and packet lengths, resulting in 2 bytes of junk at the end of the skb.
Introduce a private constant for the 2 bytes of padding; fix this confusion and check for the under-length case.
--- drivers/net/usb/ipheth.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-)
drivers/net/usb/ipheth.c +9 -5
@@ -65,6 +65,7 @@#define IPHETH_USBINTF_PROTO 1#define IPHETH_BUF_SIZE 1516 +#define IPHETH_IP_ALIGN 2/* padding at front of URB */ #define IPHETH_TX_TIMEOUT (5 * HZ)#define IPHETH_INTFNUM 2
@@ -202,18 +203,21 @@ static void ipheth_rcvbulk_callback(strureturn ; } - len = urb->actual_length; - buf = urb->transfer_buffer; +if (urb->actual_length <=IPHETH_IP_ALIGN ) { + dev->net->stats.rx_length_errors++; +return ; + } + len = urb->actual_length -IPHETH_IP_ALIGN ; + buf = urb->transfer_buffer +IPHETH_IP_ALIGN ; - skb =dev_alloc_skb (NET_IP_ALIGN + len); + skb =dev_alloc_skb (len);if (!skb) {err ("%s: dev_alloc_skb: -ENOMEM" , __func__); dev->net->stats.rx_dropped++;return ; } -skb_reserve (skb,NET_IP_ALIGN ); -memcpy (skb_put (skb, len), buf +NET_IP_ALIGN , len -NET_IP_ALIGN ); +memcpy (skb_put (skb, len), buf, len); skb->dev = dev->net; skb->protocol =eth_type_trans (skb, dev->net);
PATCH 32/71 ehea: fix wrongly reported speed and port
In reply to Greg KH2.6.38-stable review patch. If anyone has any objections, please let us know.
------------------
From: Kleber Sacilotto de Souza <[email protected]>
commit dcbe14b91a920657ff3a9ba0efb7c5b5562f956a upstream.
Currently EHEA reports to ethtool as supporting 10M, 100M, 1G and 10G and connected to FIBRE independent of the hardware configuration. However, when connected to FIBRE the only supported speed is 10G full-duplex, and the other speeds and modes are only supported when connected to twisted pair.
--- drivers/net/ehea/ehea_ethtool.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-)
drivers/net/ehea/ehea_ethtool.c +13 -8
@@ -55,15 +55,20 @@ static int ehea_get_settings(struct net_ cmd->duplex =-1 ; } - cmd->supported = (SUPPORTED_10000baseT_Full | SUPPORTED_1000baseT_Full - | SUPPORTED_100baseT_Full | SUPPORTED_100baseT_Half - | SUPPORTED_10baseT_Full | SUPPORTED_10baseT_Half - | SUPPORTED_Autoneg |SUPPORTED_FIBRE ); - - cmd->advertising = (ADVERTISED_10000baseT_Full | ADVERTISED_Autoneg - |ADVERTISED_FIBRE ); +if (cmd->speed ==SPEED_10000 ) { + cmd->supported = (SUPPORTED_10000baseT_Full |SUPPORTED_FIBRE ); + cmd->advertising = (ADVERTISED_10000baseT_Full |ADVERTISED_FIBRE ); + cmd->port =PORT_FIBRE ; + }else { + cmd->supported = (SUPPORTED_1000baseT_Full | SUPPORTED_100baseT_Full + | SUPPORTED_100baseT_Half | SUPPORTED_10baseT_Full + | SUPPORTED_10baseT_Half | SUPPORTED_Autoneg + |SUPPORTED_TP ); + cmd->advertising = (ADVERTISED_1000baseT_Full | ADVERTISED_Autoneg + |ADVERTISED_TP ); + cmd->port =PORT_TP ; + } - cmd->port =PORT_FIBRE ; cmd->autoneg = port->autoneg ==1 ?AUTONEG_ENABLE :AUTONEG_DISABLE ;return 0 ;
PATCH 31/71 vmxnet3: Consistently disable irqs when taking adapter->cmd_lock
In reply to Greg KH2.6.38-stable review patch. If anyone has any objections, please let us know.
------------------
From: Roland Dreier <[email protected]>
commit e328d410826d52e9ee348aff9064c4a207f2adb1 upstream.
Using the vmxnet3 driver produces a lockdep warning because vmxnet3_set_mc(), which is called with mc->mca_lock held, takes adapter->cmd_lock. However, there are a couple of places where adapter->cmd_lock is taken with softirqs enabled, lockdep warns that a softirq that tries to take mc->mca_lock could happen while adapter->cmd_lock is held, leading to an AB-BA deadlock.
I'm not sure if this is a real potential deadlock or not, but the simplest and best fix seems to be simply to make sure we take cmd_lock with spin_lock_irqsave() everywhere -- the places with plain spin_lock just look like oversights.
The full enormous lockdep warning is:
=========================================================
[ INFO: possible irq lock inversion dependency detected ]
2.6.39-rc6+ #1
---------------------------------------------------------
ifconfig/567 just changed the state of lock:
(&(&mc->mca_lock)->rlock){+.-...}, at: [<ffffffff81531e9f>] mld_ifc_timer_expire+0xff/0x280
but this lock took another, SOFTIRQ-unsafe lock in the past:
(&(&adapter->cmd_lock)->rlock){+.+...}
and interrupts could create inverse lock ordering between them.
other info that might help us debug this:
4 locks held by ifconfig/567:
#0: (rtnl_mutex){+.+.+.}, at: [<ffffffff8147d547>] rtnl_lock+0x17/0x20
#1: ((inetaddr_chain).rwsem){.+.+.+}, at: [<ffffffff810896cf>] __blocking_notifier_call_chain+0x5f/0xb0
#2: (&idev->mc_ifc_timer){+.-...}, at: [<ffffffff8106f21b>] run_timer_softirq+0xeb/0x3f0
#3: (&ndev->lock){++.-..}, at: [<ffffffff81531dd2>] mld_ifc_timer_expire+0x32/0x280the shortest dependencies between 2nd lock and 1st lock:
-> (&(&adapter->cmd_lock)->rlock){+.+...} ops: 11 {
HARDIRQ-ON-W at:
[<ffffffff8109ad86>] __lock_acquire+0x7f6/0x1e10
[<ffffffff8109ca4d>] lock_acquire+0x9d/0x130
[<ffffffff81571156>] _raw_spin_lock+0x36/0x70
[<ffffffffa000d212>] vmxnet3_alloc_intr_resources+0x22/0x230 [vmxnet3]
[<ffffffffa0014031>] vmxnet3_probe_device+0x5f6/0x15c5 [vmxnet3]
[<ffffffff812df67f>] local_pci_probe+0x5f/0xd0
[<ffffffff812dfde9>] pci_device_probe+0x119/0x120
[<ffffffff81373df6>] driver_probe_device+0x96/0x1c0
[<ffffffff81373fcb>] __driver_attach+0xab/0xb0
[<ffffffff81372a1e>] bus_for_each_dev+0x5e/0x90
[<ffffffff81373a2e>] driver_attach+0x1e/0x20
[<ffffffff813735b8>] bus_add_driver+0xc8/0x290
[<ffffffff813745b6>] driver_register+0x76/0x140
[<ffffffff812e0046>] __pci_register_driver+0x66/0xe0
[<ffffffffa001b03a>] serio_raw_poll+0x3a/0x60 [serio_raw]
[<ffffffff81002165>] do_one_initcall+0x45/0x190
[<ffffffff810aa76b>] sys_init_module+0xfb/0x250
[<ffffffff8157a142>] system_call_fastpath+0x16/0x1b
SOFTIRQ-ON-W at:
[<ffffffff8109adb7>] __lock_acquire+0x827/0x1e10
[<ffffffff8109ca4d>] lock_acquire+0x9d/0x130
[<ffffffff81571156>] _raw_spin_lock+0x36/0x70
[<ffffffffa000d212>] vmxnet3_alloc_intr_resources+0x22/0x230 [vmxnet3]
[<ffffffffa0014031>] vmxnet3_probe_device+0x5f6/0x15c5 [vmxnet3]
[<ffffffff812df67f>] local_pci_probe+0x5f/0xd0
[<ffffffff812dfde9>] pci_device_probe+0x119/0x120
[<ffffffff81373df6>] driver_probe_device+0x96/0x1c0
[<ffffffff81373fcb>] __driver_attach+0xab/0xb0
[<ffffffff81372a1e>] bus_for_each_dev+0x5e/0x90
[<ffffffff81373a2e>] driver_attach+0x1e/0x20
[<ffffffff813735b8>] bus_add_driver+0xc8/0x290
[<ffffffff813745b6>] driver_register+0x76/0x140
[<ffffffff812e0046>] __pci_register_driver+0x66/0xe0
[<ffffffffa001b03a>] serio_raw_poll+0x3a/0x60 [serio_raw]
[<ffffffff81002165>] do_one_initcall+0x45/0x190
[<ffffffff810aa76b>] sys_init_module+0xfb/0x250
[<ffffffff8157a142>] system_call_fastpath+0x16/0x1b
INITIAL USE at:
[<ffffffff8109a9e9>] __lock_acquire+0x459/0x1e10
[<ffffffff8109ca4d>] lock_acquire+0x9d/0x130
[<ffffffff81571156>] _raw_spin_lock+0x36/0x70
[<ffffffffa000d212>] vmxnet3_alloc_intr_resources+0x22/0x230 [vmxnet3]
[<ffffffffa0014031>] vmxnet3_probe_device+0x5f6/0x15c5 [vmxnet3]
[<ffffffff812df67f>] local_pci_probe+0x5f/0xd0
[<ffffffff812dfde9>] pci_device_probe+0x119/0x120
[<ffffffff81373df6>] driver_probe_device+0x96/0x1c0
[<ffffffff81373fcb>] __driver_attach+0xab/0xb0
[<ffffffff81372a1e>] bus_for_each_dev+0x5e/0x90
[<ffffffff81373a2e>] driver_attach+0x1e/0x20
[<ffffffff813735b8>] bus_add_driver+0xc8/0x290
[<ffffffff813745b6>] driver_register+0x76/0x140
[<ffffffff812e0046>] __pci_register_driver+0x66/0xe0
[<ffffffffa001b03a>] serio_raw_poll+0x3a/0x60 [serio_raw]
[<ffffffff81002165>] do_one_initcall+0x45/0x190
[<ffffffff810aa76b>] sys_init_module+0xfb/0x250
[<ffffffff8157a142>] system_call_fastpath+0x16/0x1b
}
... key at: [<ffffffffa0017590>] __key.42516+0x0/0xffffffffffffda70 [vmxnet3]
... acquired at:
[<ffffffff8109ca4d>] lock_acquire+0x9d/0x130
[<ffffffff81571bb5>] _raw_spin_lock_irqsave+0x55/0xa0
[<ffffffffa000de27>] vmxnet3_set_mc+0x97/0x1a0 [vmxnet3]
[<ffffffff8146ffa0>] __dev_set_rx_mode+0x40/0xb0
[<ffffffff81470040>] dev_set_rx_mode+0x30/0x50
[<ffffffff81470127>] __dev_open+0xc7/0x100
[<ffffffff814703c1>] __dev_change_flags+0xa1/0x180
[<ffffffff81470568>] dev_change_flags+0x28/0x70
[<ffffffff814da960>] devinet_ioctl+0x730/0x800
[<ffffffff814db508>] inet_ioctl+0x88/0xa0
[<ffffffff814541f0>] sock_do_ioctl+0x30/0x70
[<ffffffff814542a9>] sock_ioctl+0x79/0x2f0
[<ffffffff81188798>] do_vfs_ioctl+0x98/0x570
[<ffffffff81188d01>] sys_ioctl+0x91/0xa0
[<ffffffff8157a142>] system_call_fastpath+0x16/0x1b -> (_xmit_ETHER){+.....} ops: 6 {
HARDIRQ-ON-W at:
[<ffffffff8109ad86>] __lock_acquire+0x7f6/0x1e10
[<ffffffff8109ca4d>] lock_acquire+0x9d/0x130
[<ffffffff8157124b>] _raw_spin_lock_bh+0x3b/0x70
[<ffffffff81475618>] __dev_mc_add+0x38/0x90
[<ffffffff814756a0>] dev_mc_add+0x10/0x20
[<ffffffff81532c9e>] igmp6_group_added+0x10e/0x1b0
[<ffffffff81533f2d>] ipv6_dev_mc_inc+0x2cd/0x430
[<ffffffff81515e17>] ipv6_add_dev+0x357/0x450
[<ffffffff81519f27>] addrconf_notify+0x2f7/0xb10
[<ffffffff81575c1c>] notifier_call_chain+0x8c/0xc0
[<ffffffff81089586>] raw_notifier_call_chain+0x16/0x20
[<ffffffff814689b7>] call_netdevice_notifiers+0x37/0x70
[<ffffffff8146a944>] register_netdevice+0x244/0x2d0
[<ffffffff8146aa0f>] register_netdev+0x3f/0x60
[<ffffffffa001419b>] vmxnet3_probe_device+0x760/0x15c5 [vmxnet3]
[<ffffffff812df67f>] local_pci_probe+0x5f/0xd0
[<ffffffff812dfde9>] pci_device_probe+0x119/0x120
[<ffffffff81373df6>] driver_probe_device+0x96/0x1c0
[<ffffffff81373fcb>] __driver_attach+0xab/0xb0
[<ffffffff81372a1e>] bus_for_each_dev+0x5e/0x90
[<ffffffff81373a2e>] driver_attach+0x1e/0x20
[<ffffffff813735b8>] bus_add_driver+0xc8/0x290
[<ffffffff813745b6>] driver_register+0x76/0x140
[<ffffffff812e0046>] __pci_register_driver+0x66/0xe0
[<ffffffffa001b03a>] serio_raw_poll+0x3a/0x60 [serio_raw]
[<ffffffff81002165>] do_one_initcall+0x45/0x190
[<ffffffff810aa76b>] sys_init_module+0xfb/0x250
[<ffffffff8157a142>] system_call_fastpath+0x16/0x1b
INITIAL USE at:
[<ffffffff8109a9e9>] __lock_acquire+0x459/0x1e10
[<ffffffff8109ca4d>] lock_acquire+0x9d/0x130
[<ffffffff8157124b>] _raw_spin_lock_bh+0x3b/0x70
[<ffffffff81475618>] __dev_mc_add+0x38/0x90
[<ffffffff814756a0>] dev_mc_add+0x10/0x20
[<ffffffff81532c9e>] igmp6_group_added+0x10e/0x1b0
[<ffffffff81533f2d>] ipv6_dev_mc_inc+0x2cd/0x430
[<ffffffff81515e17>] ipv6_add_dev+0x357/0x450
[<ffffffff81519f27>] addrconf_notify+0x2f7/0xb10
[<ffffffff81575c1c>] notifier_call_chain+0x8c/0xc0
[<ffffffff81089586>] raw_notifier_call_chain+0x16/0x20
[<ffffffff814689b7>] call_netdevice_notifiers+0x37/0x70
[<ffffffff8146a944>] register_netdevice+0x244/0x2d0
[<ffffffff8146aa0f>] register_netdev+0x3f/0x60
[<ffffffffa001419b>] vmxnet3_probe_device+0x760/0x15c5 [vmxnet3]
[<ffffffff812df67f>] local_pci_probe+0x5f/0xd0
[<ffffffff812dfde9>] pci_device_probe+0x119/0x120
[<ffffffff81373df6>] driver_probe_device+0x96/0x1c0
[<ffffffff81373fcb>] __driver_attach+0xab/0xb0
[<ffffffff81372a1e>] bus_for_each_dev+0x5e/0x90
[<ffffffff81373a2e>] driver_attach+0x1e/0x20
[<ffffffff813735b8>] bus_add_driver+0xc8/0x290
[<ffffffff813745b6>] driver_register+0x76/0x140
[<ffffffff812e0046>] __pci_register_driver+0x66/0xe0
[<ffffffffa001b03a>] serio_raw_poll+0x3a/0x60 [serio_raw]
[<ffffffff81002165>] do_one_initcall+0x45/0x190
[<ffffffff810aa76b>] sys_init_module+0xfb/0x250
[<ffffffff8157a142>] system_call_fastpath+0x16/0x1b
}
... key at: [<ffffffff827fd868>] netdev_addr_lock_key+0x8/0x1e0
... acquired at:
[<ffffffff8109ca4d>] lock_acquire+0x9d/0x130
[<ffffffff8157124b>] _raw_spin_lock_bh+0x3b/0x70
[<ffffffff81475618>] __dev_mc_add+0x38/0x90
[<ffffffff814756a0>] dev_mc_add+0x10/0x20
[<ffffffff81532c9e>] igmp6_group_added+0x10e/0x1b0
[<ffffffff81533f2d>] ipv6_dev_mc_inc+0x2cd/0x430
[<ffffffff81515e17>] ipv6_add_dev+0x357/0x450
[<ffffffff81519f27>] addrconf_notify+0x2f7/0xb10
[<ffffffff81575c1c>] notifier_call_chain+0x8c/0xc0
[<ffffffff81089586>] raw_notifier_call_chain+0x16/0x20
[<ffffffff814689b7>] call_netdevice_notifiers+0x37/0x70
[<ffffffff8146a944>] register_netdevice+0x244/0x2d0
[<ffffffff8146aa0f>] register_netdev+0x3f/0x60
[<ffffffffa001419b>] vmxnet3_probe_device+0x760/0x15c5 [vmxnet3]
[<ffffffff812df67f>] local_pci_probe+0x5f/0xd0
[<ffffffff812dfde9>] pci_device_probe+0x119/0x120
[<ffffffff81373df6>] driver_probe_device+0x96/0x1c0
[<ffffffff81373fcb>] __driver_attach+0xab/0xb0
[<ffffffff81372a1e>] bus_for_each_dev+0x5e/0x90
[<ffffffff81373a2e>] driver_attach+0x1e/0x20
[<ffffffff813735b8>] bus_add_driver+0xc8/0x290
[<ffffffff813745b6>] driver_register+0x76/0x140
[<ffffffff812e0046>] __pci_register_driver+0x66/0xe0
[<ffffffffa001b03a>] serio_raw_poll+0x3a/0x60 [serio_raw]
[<ffffffff81002165>] do_one_initcall+0x45/0x190
[<ffffffff810aa76b>] sys_init_module+0xfb/0x250
[<ffffffff8157a142>] system_call_fastpath+0x16/0x1b -> (&(&mc->mca_lock)->rlock){+.-...} ops: 6 {
HARDIRQ-ON-W at:
[<ffffffff8109ad86>] __lock_acquire+0x7f6/0x1e10
[<ffffffff8109ca4d>] lock_acquire+0x9d/0x130
[<ffffffff8157124b>] _raw_spin_lock_bh+0x3b/0x70
[<ffffffff81532bd5>] igmp6_group_added+0x45/0x1b0
[<ffffffff81533f2d>] ipv6_dev_mc_inc+0x2cd/0x430
[<ffffffff81515e17>] ipv6_add_dev+0x357/0x450
[<ffffffff81ce0d16>] addrconf_init+0x4e/0x183
[<ffffffff81ce0ba1>] inet6_init+0x191/0x2a6
[<ffffffff81002165>] do_one_initcall+0x45/0x190
[<ffffffff81ca4d3f>] kernel_init+0xe3/0x168
[<ffffffff8157b2e4>] kernel_thread_helper+0x4/0x10
IN-SOFTIRQ-W at:
[<ffffffff8109ad5e>] __lock_acquire+0x7ce/0x1e10
[<ffffffff8109ca4d>] lock_acquire+0x9d/0x130
[<ffffffff8157124b>] _raw_spin_lock_bh+0x3b/0x70
[<ffffffff81531e9f>] mld_ifc_timer_expire+0xff/0x280
[<ffffffff8106f2a9>] run_timer_softirq+0x179/0x3f0
[<ffffffff810666d0>] __do_softirq+0xc0/0x210
[<ffffffff8157b3dc>] call_softirq+0x1c/0x30
[<ffffffff8100d42d>] do_softirq+0xad/0xe0
[<ffffffff81066afe>] irq_exit+0x9e/0xb0
[<ffffffff8157bd40>] smp_apic_timer_interrupt+0x70/0x9b
[<ffffffff8157ab93>] apic_timer_interrupt+0x13/0x20
[<ffffffff8149d857>] rt_do_flush+0x87/0x2a0
[<ffffffff814a16b6>] rt_cache_flush+0x46/0x60
[<ffffffff814e36e0>] fib_disable_ip+0x40/0x60
[<ffffffff814e5447>] fib_inetaddr_event+0xd7/0xe0
[<ffffffff81575c1c>] notifier_call_chain+0x8c/0xc0
[<ffffffff810896e8>] __blocking_notifier_call_chain+0x78/0xb0
[<ffffffff81089736>] blocking_notifier_call_chain+0x16/0x20
[<ffffffff814d8021>] __inet_del_ifa+0xf1/0x2e0
[<ffffffff814d8223>] inet_del_ifa+0x13/0x20
[<ffffffff814da731>] devinet_ioctl+0x501/0x800
[<ffffffff814db508>] inet_ioctl+0x88/0xa0
[<ffffffff814541f0>] sock_do_ioctl+0x30/0x70
[<ffffffff814542a9>] sock_ioctl+0x79/0x2f0
[<ffffffff81188798>] do_vfs_ioctl+0x98/0x570
[<ffffffff81188d01>] sys_ioctl+0x91/0xa0
[<ffffffff8157a142>] system_call_fastpath+0x16/0x1b
INITIAL USE at:
[<ffffffff8109a9e9>] __lock_acquire+0x459/0x1e10
[<ffffffff8109ca4d>] lock_acquire+0x9d/0x130
[<ffffffff8157124b>] _raw_spin_lock_bh+0x3b/0x70
[<ffffffff81532bd5>] igmp6_group_added+0x45/0x1b0
[<ffffffff81533f2d>] ipv6_dev_mc_inc+0x2cd/0x430
[<ffffffff81515e17>] ipv6_add_dev+0x357/0x450
[<ffffffff81ce0d16>] addrconf_init+0x4e/0x183
[<ffffffff81ce0ba1>] inet6_init+0x191/0x2a6
[<ffffffff81002165>] do_one_initcall+0x45/0x190
[<ffffffff81ca4d3f>] kernel_init+0xe3/0x168
[<ffffffff8157b2e4>] kernel_thread_helper+0x4/0x10
}
... key at: [<ffffffff82801be2>] __key.40877+0x0/0x8
... acquired at:
[<ffffffff810997bc>] check_usage_forwards+0x9c/0x110
[<ffffffff8109a32c>] mark_lock+0x19c/0x400
[<ffffffff8109ad5e>] __lock_acquire+0x7ce/0x1e10
[<ffffffff8109ca4d>] lock_acquire+0x9d/0x130
[<ffffffff8157124b>] _raw_spin_lock_bh+0x3b/0x70
[<ffffffff81531e9f>] mld_ifc_timer_expire+0xff/0x280
[<ffffffff8106f2a9>] run_timer_softirq+0x179/0x3f0
[<ffffffff810666d0>] __do_softirq+0xc0/0x210
[<ffffffff8157b3dc>] call_softirq+0x1c/0x30
[<ffffffff8100d42d>] do_softirq+0xad/0xe0
[<ffffffff81066afe>] irq_exit+0x9e/0xb0
[<ffffffff8157bd40>] smp_apic_timer_interrupt+0x70/0x9b
[<ffffffff8157ab93>] apic_timer_interrupt+0x13/0x20
[<ffffffff8149d857>] rt_do_flush+0x87/0x2a0
[<ffffffff814a16b6>] rt_cache_flush+0x46/0x60
[<ffffffff814e36e0>] fib_disable_ip+0x40/0x60
[<ffffffff814e5447>] fib_inetaddr_event+0xd7/0xe0
[<ffffffff81575c1c>] notifier_call_chain+0x8c/0xc0
[<ffffffff810896e8>] __blocking_notifier_call_chain+0x78/0xb0
[<ffffffff81089736>] blocking_notifier_call_chain+0x16/0x20
[<ffffffff814d8021>] __inet_del_ifa+0xf1/0x2e0
[<ffffffff814d8223>] inet_del_ifa+0x13/0x20
[<ffffffff814da731>] devinet_ioctl+0x501/0x800
[<ffffffff814db508>] inet_ioctl+0x88/0xa0
[<ffffffff814541f0>] sock_do_ioctl+0x30/0x70
[<ffffffff814542a9>] sock_ioctl+0x79/0x2f0
[<ffffffff81188798>] do_vfs_ioctl+0x98/0x570
[<ffffffff81188d01>] sys_ioctl+0x91/0xa0
[<ffffffff8157a142>] system_call_fastpath+0x16/0x1b
stack backtrace:
Pid: 567, comm: ifconfig Not tainted 2.6.39-rc6+ #1
Call Trace:
<IRQ> [<ffffffff810996f6>] print_irq_inversion_bug+0x146/0x170
[<ffffffff81099720>] ? print_irq_inversion_bug+0x170/0x170
[<ffffffff810997bc>] check_usage_forwards+0x9c/0x110
[<ffffffff8109a32c>] mark_lock+0x19c/0x400
[<ffffffff8109ad5e>] __lock_acquire+0x7ce/0x1e10
[<ffffffff8109a383>] ? mark_lock+0x1f3/0x400
[<ffffffff8109b497>] ? __lock_acquire+0xf07/0x1e10
[<ffffffff81012255>] ? native_sched_clock+0x15/0x70
[<ffffffff8109ca4d>] lock_acquire+0x9d/0x130
[<ffffffff81531e9f>] ? mld_ifc_timer_expire+0xff/0x280
[<ffffffff8109759d>] ? lock_release_holdtime+0x3d/0x1a0
[<ffffffff8157124b>] _raw_spin_lock_bh+0x3b/0x70
[<ffffffff81531e9f>] ? mld_ifc_timer_expire+0xff/0x280
[<ffffffff8157170b>] ? _raw_spin_unlock+0x2b/0x40
[<ffffffff81531e9f>] mld_ifc_timer_expire+0xff/0x280
[<ffffffff8106f2a9>] run_timer_softirq+0x179/0x3f0
[<ffffffff8106f21b>] ? run_timer_softirq+0xeb/0x3f0
[<ffffffff810122b9>] ? sched_clock+0x9/0x10
[<ffffffff81531da0>] ? mld_gq_timer_expire+0x30/0x30
[<ffffffff810666d0>] __do_softirq+0xc0/0x210
[<ffffffff8109455f>] ? tick_program_event+0x1f/0x30
[<ffffffff8157b3dc>] call_softirq+0x1c/0x30
[<ffffffff8100d42d>] do_softirq+0xad/0xe0
[<ffffffff81066afe>] irq_exit+0x9e/0xb0
[<ffffffff8157bd40>] smp_apic_timer_interrupt+0x70/0x9b
[<ffffffff8157ab93>] apic_timer_interrupt+0x13/0x20
<EOI> [<ffffffff81571f14>] ? retint_restore_args+0x13/0x13
[<ffffffff810974a7>] ? lock_is_held+0x17/0xd0
[<ffffffff8149d857>] rt_do_flush+0x87/0x2a0
[<ffffffff814a16b6>] rt_cache_flush+0x46/0x60
[<ffffffff814e36e0>] fib_disable_ip+0x40/0x60
[<ffffffff814e5447>] fib_inetaddr_event+0xd7/0xe0
[<ffffffff81575c1c>] notifier_call_chain+0x8c/0xc0
[<ffffffff810896e8>] __blocking_notifier_call_chain+0x78/0xb0
[<ffffffff81089736>] blocking_notifier_call_chain+0x16/0x20
[<ffffffff814d8021>] __inet_del_ifa+0xf1/0x2e0
[<ffffffff814d8223>] inet_del_ifa+0x13/0x20
[<ffffffff814da731>] devinet_ioctl+0x501/0x800
[<ffffffff8108a3af>] ? local_clock+0x6f/0x80
[<ffffffff81575898>] ? do_page_fault+0x268/0x560
[<ffffffff814db508>] inet_ioctl+0x88/0xa0
[<ffffffff814541f0>] sock_do_ioctl+0x30/0x70
[<ffffffff814542a9>] sock_ioctl+0x79/0x2f0
[<ffffffff810dfe87>] ? __call_rcu+0xa7/0x190
[<ffffffff81188798>] do_vfs_ioctl+0x98/0x570
[<ffffffff8117737e>] ? fget_light+0x33e/0x430
[<ffffffff81571ef9>] ? retint_swapgs+0x13/0x1b
[<ffffffff81188d01>] sys_ioctl+0x91/0xa0
[<ffffffff8157a142>] system_call_fastpath+0x16/0x1b--- drivers/net/vmxnet3/vmxnet3_drv.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/net/vmxnet3/vmxnet3_drv.c +6 -4
@@ -178,6 +178,7 @@ static void vmxnet3_process_events(struct vmxnet3_adapter *adapter) {int i; +unsigned long flags;u32 events =le32_to_cpu (adapter->shared->ecr);if (!events)return ;
@@ -190,10 +191,10 @@ vmxnet3_process_events(struct vmxnet3_ad/* Check if there is an error on xmit/recv queues */ if (events & (VMXNET3_ECR_TQERR |VMXNET3_ECR_RQERR )) { -spin_lock (&adapter->cmd_lock); +spin_lock_irqsave (&adapter->cmd_lock, flags);VMXNET3_WRITE_BAR1_REG (adapter,VMXNET3_REG_CMD ,VMXNET3_CMD_GET_QUEUE_STATUS ); -spin_unlock (&adapter->cmd_lock); +spin_unlock_irqrestore (&adapter->cmd_lock, flags);for (i =0 ; i < adapter->num_tx_queues; i++)if (adapter->tqd_start[i].status.stopped)
@@ -2733,13 +2734,14 @@ static void vmxnet3_alloc_intr_resources(struct vmxnet3_adapter *adapter) {u32 cfg; +unsigned long flags;/* intr settings */ -spin_lock (&adapter->cmd_lock); +spin_lock_irqsave (&adapter->cmd_lock, flags);VMXNET3_WRITE_BAR1_REG (adapter,VMXNET3_REG_CMD ,VMXNET3_CMD_GET_CONF_INTR ); cfg =VMXNET3_READ_BAR1_REG (adapter,VMXNET3_REG_CMD ); -spin_unlock (&adapter->cmd_lock); +spin_unlock_irqrestore (&adapter->cmd_lock, flags); adapter->intr.type = cfg &0x3 ; adapter->intr.mask_mode = (cfg >>2 ) &0x3 ;
PATCH 37/71 net: dev_close() should check IFF_UP
In reply to Greg KH2.6.38-stable review patch. If anyone has any objections, please let us know.
------------------
From: Eric Dumazet <[email protected]>
commit e14a599335427f81bbb0008963e59aa9c6449dce upstream.
Commit 443457242beb (factorize sync-rcu call in unregister_netdevice_many) mistakenly removed one test from dev_close()
Following actions trigger a BUG :
modprobe bonding
modprobe dummy
ifconfig bond0 up
ifenslave bond0 dummy0
rmmod dummy
dev_close() must not close a non IFF_UP device.
With help from Frank Blaschka and Einar EL Lueck
--- net/core/dev.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
net/core/dev.c +6 -4
@@ -1332,11 +1332,13 @@ int dev_close_many(struct list_head *hea*/ int dev_close (struct net_device *dev) { -LIST_HEAD (single); +if (dev->flags &IFF_UP ) { +LIST_HEAD (single); -list_add (&dev->unreg_list, &single); -dev_close_many (&single); -list_del (&single); +list_add (&dev->unreg_list, &single); +dev_close_many (&single); +list_del (&single); + }return 0 ; }EXPORT_SYMBOL (dev_close);
PATCH 39/71 ASoC: UDA134x: Remove POWER_OFF_ON_STANDBY define.
In reply to Greg KH2.6.38-stable review patch. If anyone has any objections, please let us know.
------------------
From: Marek Belisko <[email protected]>
commit bf707de21fec7bb203dace2d0a2bbd124d1b36ca upstream.
Define POWER_OFF_ON_STANDBY cause trobles when trying to get some sound from codec because code for bias setup was not compiled (define wasn't defined). This define was removed in commit:cc3202f5 but again introduced by commit: f0fba2ad1 which then completely break codec functionality so remove it again.
--- sound/soc/codecs/uda134x.c | 2 -- 1 file changed, 2 deletions(-)
sound/soc/codecs/uda134x.c +0 -2
@@ -601,9 +601,7 @@ static struct snd_soc_codec_driver soc_c .reg_cache_step = 1, .read = uda134x_read_reg_cache, .write = uda134x_write, -#ifdef POWER_OFF_ON_STANDBY .set_bias_level = uda134x_set_bias_level, -#endif };static int __devinit uda134x_codec_probe (struct platform_device *pdev)
PATCH 42/71 hydra: Fix regression caused during net_device_ops conversion
In reply to Greg KH2.6.38-stable review patch. If anyone has any objections, please let us know.
------------------
From: Geert Uytterhoeven <[email protected]>
commit 0b25e0157dfa236a0629c16c8ad6f222f633f682 upstream.
Changeset 5618f0d1193d6b051da9b59b0e32ad24397f06a4 ("hydra: convert to net_device_ops") broke hydra by adding 8390.o to the link. That meant that lib8390.c was included twice, once in hydra.c and once in 8390.c, subject to different macros. This patch reverts that by avoiding the wrappers in 8390.c.
Fix based on commits 217cbfa856dc1cbc2890781626c4032d9e3ec59f ("mac8390:
fix regression caused during net_device_ops conversion") and 4e0168fa4842e27795a75b205a510f25b62181d9 ("mac8390: fix build with NET_POLL_CONTROLLER").
--- drivers/net/Makefile | 2 +- drivers/net/hydra.c | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-)
drivers/net/Makefile +1 -1
@@ -229,7 +229,7 @@ obj-$(CONFIG_SGI_IOC3_ETH) += ioc3-eth.o obj-$(CONFIG_DECLANCE) += declance.o obj-$(CONFIG_ATARILANCE) += atarilance.o obj-$(CONFIG_A2065) += a2065.o -obj-$(CONFIG_HYDRA) += hydra.o 8390.o +obj-$(CONFIG_HYDRA) += hydra.o obj-$(CONFIG_ARIADNE) += ariadne.o obj-$(CONFIG_CS89x0) += cs89x0.o obj-$(CONFIG_MACSONIC) += macsonic.o
drivers/net/hydra.c +7 -7
@@ -98,15 +98,15 @@ static const struct net_device_ops hydra .ndo_open = hydra_open, .ndo_stop = hydra_close, - .ndo_start_xmit = ei_start_xmit, - .ndo_tx_timeout = ei_tx_timeout, - .ndo_get_stats = ei_get_stats, - .ndo_set_multicast_list = ei_set_multicast_list, + .ndo_start_xmit = __ei_start_xmit, + .ndo_tx_timeout = __ei_tx_timeout, + .ndo_get_stats = __ei_get_stats, + .ndo_set_multicast_list = __ei_set_multicast_list, .ndo_validate_addr = eth_validate_addr, - .ndo_set_mac_address = eth_mac_addr, + .ndo_set_mac_address = eth_mac_addr, .ndo_change_mtu = eth_change_mtu, #ifdef CONFIG_NET_POLL_CONTROLLER - .ndo_poll_controller = ei_poll, + .ndo_poll_controller = __ei_poll, #endif };
@@ -125,7 +125,7 @@ static int __devinit hydra_init(struct z0x10 ,0x12 ,0x14 ,0x16 ,0x18 ,0x1a ,0x1c ,0x1e , }; - dev =alloc_ei_netdev (); + dev =____alloc_ei_netdev (0 );if (!dev)return -ENOMEM ;
PATCH 41/71 ne-h8300: Fix regression caused during net_device_ops conversion
In reply to Greg KH2.6.38-stable review patch. If anyone has any objections, please let us know.
------------------
From: Geert Uytterhoeven <[email protected]>
commit 2592a7354092afd304a8c067319b15ab1e441e35 upstream.
Changeset dcd39c90290297f6e6ed8a04bb20da7ac2b043c5 ("ne-h8300: convert to net_device_ops") broke ne-h8300 by adding 8390.o to the link. That meant that lib8390.c was included twice, once in ne-h8300.c and once in 8390.c, subject to different macros. This patch reverts that by avoiding the wrappers in 8390.c.
Fix based on commits 217cbfa856dc1cbc2890781626c4032d9e3ec59f ("mac8390:
fix regression caused during net_device_ops conversion") and 4e0168fa4842e27795a75b205a510f25b62181d9 ("mac8390: fix build with NET_POLL_CONTROLLER").
--- drivers/net/Makefile | 2 +- drivers/net/ne-h8300.c | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-)
drivers/net/Makefile +1 -1
@@ -144,7 +144,7 @@ obj-$(CONFIG_NE3210) += ne3210.o 8390.o obj-$(CONFIG_SB1250_MAC) += sb1250-mac.o obj-$(CONFIG_B44) += b44.o obj-$(CONFIG_FORCEDETH) += forcedeth.o -obj-$(CONFIG_NE_H8300) += ne-h8300.o 8390.o +obj-$(CONFIG_NE_H8300) += ne-h8300.o obj-$(CONFIG_AX88796) += ax88796.o obj-$(CONFIG_BCM63XX_ENET) += bcm63xx_enet.o
drivers/net/ne-h8300.c +8 -8
@@ -167,7 +167,7 @@ static void cleanup_card(struct net_devi#ifndef MODULE struct net_device *__init ne_probe (int unit) { -struct net_device *dev =alloc_ei_netdev (); +struct net_device *dev =____alloc_ei_netdev (0 );int err;if (!dev)
@@ -197,15 +197,15 @@ static const struct net_device_ops ne_ne .ndo_open = ne_open, .ndo_stop = ne_close, - .ndo_start_xmit = ei_start_xmit, - .ndo_tx_timeout = ei_tx_timeout, - .ndo_get_stats = ei_get_stats, - .ndo_set_multicast_list = ei_set_multicast_list, + .ndo_start_xmit = __ei_start_xmit, + .ndo_tx_timeout = __ei_tx_timeout, + .ndo_get_stats = __ei_get_stats, + .ndo_set_multicast_list = __ei_set_multicast_list, .ndo_validate_addr = eth_validate_addr, - .ndo_set_mac_address = eth_mac_addr, + .ndo_set_mac_address = eth_mac_addr, .ndo_change_mtu = eth_change_mtu, #ifdef CONFIG_NET_POLL_CONTROLLER - .ndo_poll_controller = ei_poll, + .ndo_poll_controller = __ei_poll, #endif };
@@ -637,7 +637,7 @@ int init_module(void)int err;for (this_dev =0 ; this_dev <MAX_NE_CARDS ; this_dev++) { -struct net_device *dev =alloc_ei_netdev (); +struct net_device *dev =____alloc_ei_netdev (0 );if (!dev)break ;if (io[this_dev]) {
PATCH 47/71 tmpfs: fix race between swapoff and writepage
In reply to Greg KH2.6.38-stable review patch. If anyone has any objections, please let us know.
------------------
From: Hugh Dickins <[email protected]>
commit 05bf86b4ccfd0f197da61c67bd372111d15a6620 upstream.
Shame on me! Commit b1dea800ac39 "tmpfs: fix race between umount and writepage" fixed the advertized race, but introduced another: as even its comment makes clear, we cannot safely rely on a peek at list_empty() while holding no lock - until info->swapped is set, shmem_unuse_inode() may delete any formerly-swapped inode from the shmem_swaplist, which in this case would leave a swap area impossible to swapoff.
Although I don't relish taking the mutex every time, I don't care much for the alternatives either; and at least the peek at list_empty() in shmem_evict_inode() (a hotter path since most inodes would never have been swapped) remains safe, because we already truncated the whole file.
mm/shmem.c +4 -6
@@ -1037,7 +1037,6 @@ static int shmem_writepage(struct page *page, struct writeback_control *wbc)struct address_space *mapping;unsigned long index;struct inode *inode; -bool unlock_mutex = false;BUG_ON (!PageLocked (page)); mapping = page->mapping;
@@ -1072,15 +1071,14 @@ static int shmem_writepage(struct page *page, struct writeback_control *wbc)* we've taken the spinlock, because shmem_unuse_inode() will * prune a !swapped inode from the swaplist under both locks. */ -if (swap.val &&list_empty (&info->swaplist)) { +if (swap.val) {mutex_lock (&shmem_swaplist_mutex); -/* move instead of add in case we're racing */ -list_move_tail (&info->swaplist, &shmem_swaplist); - unlock_mutex = true; +if (list_empty (&info->swaplist)) +list_add_tail (&info->swaplist, &shmem_swaplist); }spin_lock (&info->lock); -if (unlock_mutex) +if (swap.val)mutex_unlock (&shmem_swaplist_mutex);if (index >= info->next_index) {
PATCH 46/71 tmpfs: fix race between umount and writepage
In reply to Greg KH2.6.38-stable review patch. If anyone has any objections, please let us know.
------------------
From: Hugh Dickins <[email protected]>
commit b1dea800ac39599301d4bb8dcf2b1d29c2558211 upstream.
Konstanin Khlebnikov reports that a dangerous race between umount and shmem_writepage can be reproduced by this script:
for i in {1..300} ; do
mkdir $i
while true ; do
mount -t tmpfs none $i
dd if=/dev/zero of=$i/test bs=1M count=$(($RANDOM % 100)) umount $i
done &
done
on a 6xCPU node with 8Gb RAM: kernel very unstable after this accident. =)
Kernel log:
VFS: Busy inodes after unmount of tmpfs.
Self-destruct in 5 seconds. Have a nice day...
WARNING: at lib/list_debug.c:53 __list_del_entry+0x8d/0x98() list_del corruption. prev->next should be ffff880222fdaac8, but was (null) Pid: 11222, comm: mount.tmpfs Not tainted 2.6.39-rc2+ #4 Call Trace: warn_slowpath_common+0x80/0x98 warn_slowpath_fmt+0x41/0x43 __list_del_entry+0x8d/0x98 evict+0x50/0x113 iput+0x138/0x141 ... BUG: unable to handle kernel paging request at ffffffffffffffff IP: shmem_free_blocks+0x18/0x4c Pid: 10422, comm: dd Tainted: G W 2.6.39-rc2+ #4 Call Trace: shmem_recalc_inode+0x61/0x66 shmem_writepage+0xba/0x1dc pageout+0x13c/0x24c shrink_page_list+0x28e/0x4be shrink_inactive_list+0x21f/0x382 ...
shmem_writepage() calls igrab() on the inode for the page which came from page reclaim, to add it later into shmem_swaplist for swapoff operation.
This igrab() can race with super-block deactivating process:
shrink_inactive_list() deactivate_super()
pageout() tmpfs_fs_type->kill_sb()
shmem_writepage() kill_litter_super()
generic_shutdown_super()
evict_inodes()
igrab()
atomic_read(&inode->i_count)
skip-inode iput()
if (!list_empty(&sb->s_inodes))
printk("VFS: Busy inodes after...
This igrap-iput pair was added in commit 1b1b32f2c6f6 "tmpfs: fix shmem_swaplist races" based on incorrect assumptions: igrab() protects the inode from concurrent eviction by deletion, but it does nothing to protect it from concurrent unmounting, which goes ahead despite the raised i_count.
So this use of igrab() was wrong all along, but the race made much worse in 2.6.37 when commit 63997e98a3be "split invalidate_inodes()" replaced two attempts at invalidate_inodes() by a single evict_inodes().
Konstantin posted a plausible patch, raising sb->s_active too: I'm unsure whether it was correct or not; but burnt once by igrab(), I am sure that we don't want to rely more deeply upon externals here.
Fix it by adding the inode to shmem_swaplist earlier, while the page lock on page in page cache still secures the inode against eviction, without artifically raising i_count. It was originally added later because shmem_unuse_inode() is liable to remove an inode from the list while it's unswapped; but we can guard against that by taking spinlock before dropping mutex.
--- mm/shmem.c | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-)
mm/shmem.c +20 -11
@@ -1037,6 +1037,7 @@ static int shmem_writepage(struct page *struct address_space *mapping;unsigned long index;struct inode *inode; +bool unlock_mutex = false;BUG_ON (!PageLocked (page)); mapping = page->mapping;
@@ -1062,7 +1063,26 @@ static int shmem_writepage(struct page *else swap.val =0 ; +/* +* Add inode to shmem_unuse()'s list of swapped-out inodes, +* if it's not already there. Do it now because we cannot take +* mutex while holding spinlock, and must do so before the page +* is moved to swap cache, when its pagelock no longer protects +* the inode from eviction. But don't unlock the mutex until +* we've taken the spinlock, because shmem_unuse_inode() will +* prune a !swapped inode from the swaplist under both locks. +*/ +if (swap.val &&list_empty (&info->swaplist)) { +mutex_lock (&shmem_swaplist_mutex); +/* move instead of add in case we're racing */ +list_move_tail (&info->swaplist, &shmem_swaplist); + unlock_mutex = true; + } +spin_lock (&info->lock); +if (unlock_mutex) +mutex_unlock (&shmem_swaplist_mutex); +if (index >= info->next_index) {BUG_ON (!(info->flags &SHMEM_TRUNCATE )); goto unlock;
@@ -1082,22 +1102,11 @@ static int shmem_writepage(struct page *remove_from_page_cache (page);shmem_swp_set (info, entry, swap.val);shmem_swp_unmap (entry); -if (list_empty (&info->swaplist)) - inode =igrab (inode); -else - inode =NULL ;spin_unlock (&info->lock);swap_shmem_alloc (swap);BUG_ON (page_mapped (page));page_cache_release (page);/* pagecache ref */ swap_writepage (page, wbc); -if (inode) { -mutex_lock (&shmem_swaplist_mutex); -/* move instead of add in case we're racing */ -list_move_tail (&info->swaplist, &shmem_swaplist); -mutex_unlock (&shmem_swaplist_mutex); -iput (inode); - }return 0 ; }
PATCH 49/71 tmpfs: fix spurious ENOSPC when racing with unswap
In reply to Greg KH2.6.38-stable review patch. If anyone has any objections, please let us know.
------------------
From: Hugh Dickins <[email protected]>
commit 59a16ead572330deb38e5848151d30ed1af754bc upstream.
Testing the shmem_swaplist replacements for igrab() revealed another bug:
writes to /dev/loop0 on a tmpfs file which fills its filesystem were sometimes failing with "Buffer I/O error"s.
These came from ENOSPC failures of shmem_getpage(), when racing with
swapoff: the same could happen when racing with another shmem_getpage(), pulling the page in from swap in between our find_lock_page() and our taking the info->lock (though not in the single-threaded loop case).
This is unacceptable, and surprising that I've not noticed it before:
it dates back many years, but (presumably) was made a lot easier to reproduce in 2.6.36, which sited a page preallocation in the race window.
Fix it by rechecking the page cache before settling on an ENOSPC error.
--- mm/shmem.c | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-)
mm/shmem.c +22 -10
@@ -1407,20 +1407,14 @@ repeat:if (sbinfo->max_blocks) {if (percpu_counter_compare (&sbinfo->used_blocks, sbinfo->max_blocks) >=0 || -shmem_acct_block (info->flags)) { -spin_unlock (&info->lock); - error = -ENOSPC ; - goto failed; - } +shmem_acct_block (info->flags)) + goto nospace;percpu_counter_inc (&sbinfo->used_blocks);spin_lock (&inode->i_lock); inode->i_blocks +=BLOCKS_PER_PAGE ;spin_unlock (&inode->i_lock); - }else if (shmem_acct_block (info->flags)) { -spin_unlock (&info->lock); - error = -ENOSPC ; - goto failed; - } + }else if (shmem_acct_block (info->flags)) + goto nospace;if (!filepage) {int ret;
@@ -1500,6 +1494,24 @@ done: error =0 ; goto out; +nospace: +/* +* Perhaps the page was brought in from swap between find_lock_page +* and taking info->lock? We allow for that at add_to_page_cache_lru, +* but must also avoid reporting a spurious ENOSPC while working on a +* full tmpfs. (When filepage has been passed in to shmem_getpage, it +* is already in page cache, which prevents this race from occurring.) +*/ +if (!filepage) { +struct page *page =find_get_page (mapping, idx); +if (page) { +spin_unlock (&info->lock); +page_cache_release (page); + goto repeat; + } + } +spin_unlock (&info->lock); + error = -ENOSPC ; failed:if (*pagep != filepage) {unlock_page (filepage);
PATCH 53/71 cifs: add fallback in is_path_accessible for old servers
In reply to Greg KH2.6.38-stable review patch. If anyone has any objections, please let us know.
------------------
From: Jeff Layton <[email protected]>
commit 221d1d797202984cb874e3ed9f1388593d34ee22 upstream.
The is_path_accessible check uses a QPathInfo call, which isn't supported by ancient win9x era servers. Fall back to an older SMBQueryInfo call if it fails with the magic error codes.
--- fs/cifs/connect.c | 5 +++++ 1 file changed, 5 insertions(+)
fs/cifs/connect.c +5 -0
@@ -2657,6 +2657,11 @@ is_path_accessible(int xid, struct cifsT0 /* not legacy */ , cifs_sb->local_nls, cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MAP_SPECIAL_CHR); + +if (rc == -EOPNOTSUPP || rc == -EINVAL ) + rc =SMBQueryInformation (xid, tcon, full_path, pfile_info, + cifs_sb->local_nls, cifs_sb->mnt_cifs_flags & +CIFS_MOUNT_MAP_SPECIAL_CHR );kfree (pfile_info);return rc; }
PATCH 55/71 Revert "x86, AMD: Fix APIC timer erratum 400 affecting K8 Rev.A-E processors"
In reply to Greg KH2.6.38-stable review patch. If anyone has any objections, please let us know.
------------------
From: Borislav Petkov <[email protected]>
commit 328935e6348c6a7cb34798a68c326f4b8372e68a upstream.
This reverts commit e20a2d205c05cef6b5783df339a7d54adeb50962, as it crashes certain boxes with specific AMD CPU models.
Moving the lower endpoint of the Erratum 400 check to accomodate earlier K8 revisions (A-E) opens a can of worms which is simply not worth to fix properly by tweaking the errata checking framework:
* missing IntPenging MSR on revisions < CG cause #GP:
http://marc.info/?l=linux-kernel&m=130541471818831
* makes earlier revisions use the LAPIC timer instead of the C1E idle routine which switches to HPET, thus not waking up in deeper C-states:
http://lkml.org/lkml/2011/4/24/20
Therefore, leave the original boundary starting with K8-revF.
--- arch/x86/kernel/cpu/amd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kernel/cpu/amd.c +1 -1
@@ -681,7 +681,7 @@ cpu_dev_register(amd_cpu_dev);*/ const int amd_erratum_400[] = -AMD_OSVW_ERRATUM (1 ,AMD_MODEL_RANGE (0x0f ,0x4 ,0x2 ,0xff ,0xf ), +AMD_OSVW_ERRATUM (1 ,AMD_MODEL_RANGE (0xf ,0x41 ,0x2 ,0xff ,0xf ),AMD_MODEL_RANGE (0x10 ,0x2 ,0x1 ,0xff ,0xf ));EXPORT_SYMBOL_GPL (amd_erratum_400);
PATCH 57/71 block: rescan partitions on invalidated devices on -ENOMEDIA too
In reply to Greg KH2.6.38-stable review patch. If anyone has any objections, please let us know.
------------------
From: Tejun Heo <[email protected]>
commit 02e352287a40bd456eb78df705bf888bc3161d3f upstream.
__blkdev_get() doesn't rescan partitions if disk->fops->open() fails, which leads to ghost partition devices lingering after medimum removal is known to both the kernel and userland. The behavior also creates a subtle inconsistency where O_NONBLOCK open, which doesn't fail even if there's no medium, clears the ghots partitions, which is exploited to work around the problem from userland.
Fix it by updating __blkdev_get() to issue partition rescan after -ENOMEDIA too.
This was reported in the following bz.
https://bugzilla.kernel.org/show_bug.cgi?id=13029
Stable: 2.6.38
--- fs/block_dev.c | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-)
fs/block_dev.c +18 -9
@@ -1099,6 +1099,7 @@ static int __blkdev_get(struct block_devif (!bdev->bd_part) goto out_clear; + ret =0 ;if (disk->fops->open) { ret = disk->fops->open (bdev, mode);if (ret == -ERESTARTSYS ) {
@@ -1114,9 +1115,18 @@ static int __blkdev_get(struct block_devmutex_unlock (&bdev->bd_mutex); goto restart; } -if (ret) - goto out_clear; } +/* +* If the device is invalidated, rescan partition +* if open succeeded or failed with -ENOMEDIUM. +* The latter is necessary to prevent ghost +* partitions on a removed medium. +*/ +if (bdev->bd_invalidated && (!ret || ret == -ENOMEDIUM )) +rescan_partitions (disk, bdev); +if (ret) + goto out_clear; +if (!bdev->bd_openers) {bd_set_size (bdev,(loff_t )get_capacity (disk)<<9 ); bdi =blk_get_backing_dev_info (bdev);
@@ -1124,8 +1134,6 @@ static int __blkdev_get(struct block_dev bdi = &default_backing_dev_info;bdev_inode_switch_bdi (bdev->bd_inode, bdi); } -if (bdev->bd_invalidated) -rescan_partitions (disk, bdev); }else {struct block_device *whole; whole =bdget_disk (disk,0 );
@@ -1152,13 +1160,14 @@ static int __blkdev_get(struct block_devput_disk (disk); disk =NULL ;if (bdev->bd_contains == bdev) { -if (bdev->bd_disk->fops->open) { + ret =0 ; +if (bdev->bd_disk->fops->open) ret = bdev->bd_disk->fops->open (bdev, mode); -if (ret) - goto out_unlock_bdev; - } -if (bdev->bd_invalidated) +/* the same as first opener case, read comment there */ +if (bdev->bd_invalidated && (!ret || ret == -ENOMEDIUM ))rescan_partitions (bdev->bd_disk, bdev); +if (ret) + goto out_unlock_bdev; } } bdev->bd_openers++;
PATCH 60/71 x86, apic: Fix spurious error interrupts triggering on all non-boot APs
In reply to Greg KH2.6.38-stable review patch. If anyone has any objections, please let us know.
------------------
From: Youquan Song <[email protected]>
commit e503f9e4b092e2349a9477a333543de8f3c7f5d9 upstream.
This patch fixes a bug reported by a customer, who found that many unreasonable error interrupts reported on all non-boot CPUs (APs) during the system boot stage.
According to Chapter 10 of Intel Software Developer Manual Volume 3A, Local APIC may signal an illegal vector error when an LVT entry is set as an illegal vector value (0~15) under FIXED delivery mode (bits 8-11 is 0), regardless of whether the mask bit is set or an interrupt actually happen. These errors are seen as error interrupts.
The initial value of thermal LVT entries on all APs always reads 0x10000 because APs are woken up by BSP issuing INIT-SIPI-SIPI sequence to them and LVT registers are reset to 0s except for the mask bits which are set to 1s when APs receive INIT IPI.
When the BIOS takes over the thermal throttling interrupt, the LVT thermal deliver mode should be SMI and it is required from the kernel to keep AP's LVT thermal monitoring register programmed as such as well.
This issue happens when BIOS does not take over thermal throttling interrupt, AP's LVT thermal monitor register will be restored to 0x10000 which means vector 0 and fixed deliver mode, so all APs will signal illegal vector error interrupts.
This patch check if interrupt delivery mode is not fixed mode before restoring AP's LVT thermal monitor register.
--- arch/x86/include/asm/apicdef.h | 1 + arch/x86/kernel/cpu/mcheck/therm_throt.c | 12 +++++++----- 2 files changed, 8 insertions(+), 5 deletions(-)
arch/x86/include/asm/apicdef.h +1 -0
@@ -78,6 +78,7 @@#define APIC_DEST_LOGICAL 0x00800#define APIC_DEST_PHYSICAL 0x00000#define APIC_DM_FIXED 0x00000 +#define APIC_DM_FIXED_MASK 0x00700#define APIC_DM_LOWEST 0x00100#define APIC_DM_SMI 0x00200#define APIC_DM_REMRD 0x00300
arch/x86/kernel/cpu/mcheck/therm_throt.c +7 -5
@@ -446,18 +446,20 @@ void intel_init_thermal(struct cpuinfo_x*/ rdmsr (MSR_IA32_MISC_ENABLE , l, h); + h = lvtthmr_init;/* * The initial value of thermal LVT entries on all APs always reads * 0x10000 because APs are woken up by BSP issuing INIT-SIPI-SIPI * sequence to them and LVT registers are reset to 0s except for * the mask bits which are set to 1s when APs receive INIT IPI. -* Always restore the value that BIOS has programmed on AP based on -* BSP's info we saved since BIOS is always setting the same value -* for all threads/cores +* If BIOS takes over the thermal interrupt and sets its interrupt +* delivery mode to SMI (not fixed), it restores the value that the +* BIOS has programmed on AP based on BSP's info we saved since BIOS +* is always setting the same value for all threads/cores. */ -apic_write (APIC_LVTTHMR , lvtthmr_init); +if ((h &APIC_DM_FIXED_MASK ) !=APIC_DM_FIXED ) +apic_write (APIC_LVTTHMR , lvtthmr_init); - h = lvtthmr_init;if ((l &MSR_IA32_MISC_ENABLE_TM1 ) && (h &APIC_DM_SMI )) { printk(KERN_DEBUG
PATCH 62/71 v4l: Release module if subdev registration fails
In reply to Greg KH2.6.38-stable review patch. If anyone has any objections, please let us know.
------------------
From: Laurent Pinchart <[email protected]>
commit b7534f002d3c81d18abfbf57179d07d3ec763bb5 upstream.
If v4l2_device_register_subdev() fails, the reference to the subdev module taken by the function isn't released. Fix this.
--- drivers/media/video/v4l2-device.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/media/video/v4l2-device.c +4 -1
@@ -131,14 +131,17 @@ int v4l2_device_register_subdev(struct v sd->v4l2_dev = v4l2_dev;if (sd->internal_ops && sd->internal_ops->registered) { err = sd->internal_ops->registered (sd); -if (err) +if (err) { +module_put (sd->owner);return err; + } }/* This just returns 0 if either of the two args is NULL */ err =v4l2_ctrl_add_handler (v4l2_dev->ctrl_handler, sd->ctrl_handler);if (err) {if (sd->internal_ops && sd->internal_ops->unregistered) sd->internal_ops->unregistered (sd); +module_put (sd->owner);return err; }spin_lock (&v4l2_dev->lock);
PATCH 67/71 vmxnet3: Fix inconsistent LRO state after initialization
In reply to Greg KH2.6.38-stable review patch. If anyone has any objections, please let us know.
------------------
From: Thomas Jarosch <[email protected]>
commit ebde6f8acba92abfc203585198a54f47e83e2cd0 upstream.
During initialization of vmxnet3, the state of LRO gets out of sync with netdev->features.
This leads to very poor TCP performance in a IP forwarding setup and is hitting many VMware users.
Simplified call sequence:
1. vmxnet3_declare_features() initializes "adapter->lro" to true.
2. The kernel automatically disables LRO if IP forwarding is enabled, so vmxnet3_set_flags() gets called. This also updates netdev->features.
3. Now vmxnet3_setup_driver_shared() is called. "adapter->lro" is still set to true and LRO gets enabled again, even though netdev->features shows it's disabled.
Fix it by updating "adapter->lro", too.
The private vmxnet3 adapter flags are scheduled for removal in net-next, see commit a0d2730c9571aeba793cb5d3009094ee1d8fda35 "net: vmxnet3: convert to hw_features".
Patch applies to 2.6.37 / 2.6.38 and 2.6.39-rc6.
Please CC: comments.
--- drivers/net/vmxnet3/vmxnet3_ethtool.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/vmxnet3/vmxnet3_ethtool.c +3 -0
@@ -311,6 +311,9 @@ vmxnet3_set_flags(struct net_device *net/* toggle the LRO feature*/ netdev->features ^=NETIF_F_LRO ; +/* Update private LRO flag */ + adapter->lro = lro_requested; +/* update harware LRO capability accordingly */ if (lro_requested) adapter->shared->devRead.misc.uptFeatures |=
PATCH 66/71 cdrom: always check_disk_change() on open
In reply to Greg KH2.6.38-stable review patch. If anyone has any objections, please let us know.
------------------
From: Tejun Heo <[email protected]>
commit bf2253a6f00e8fea5b026e471e9f0d0a1b3621f2 upstream.
cdrom_open() called check_disk_change() after the rest of open path succeeded which leads to the following bizarre behavior.
* After media change, if the device opened without O_NONBLOCK, open_for_data() naturally fails with -ENOMEDIA and check_disk_change() is never called. The media is known to be gone and the open failure makes it obvious to the userland but device invalidation never happens.
* But if the device is opened with O_NONBLOCK, all the checks are bypassed and cdrom_open() doesn't notice that the media is not there and check_disk_change() is called and invalidation happens.
There's nothing to be gained by avoiding calling check_disk_change() on open failure. Common cases end up calling check_disk_change() anyway. All we get is inconsistent behavior.
Fix it by moving check_disk_change() invocation to the top of cdrom_open() so that it always gets called regardless of how the rest of open proceeds.
Stable: 2.6.38
--- drivers/cdrom/cdrom.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/cdrom/cdrom.c +3 -3
@@ -986,6 +986,9 @@ int cdrom_open(struct cdrom_device_infocdinfo (CD_OPEN ,"entering cdrom_open\n" ); +/* open is event synchronization point, check events first */ +check_disk_change (bdev); +/* if this was a O_NONBLOCK open and we should honor the flags, * do a quick open without drive/disc integrity checks. */ cdi->use_count++;
@@ -1012,9 +1015,6 @@ int cdrom_open(struct cdrom_device_infocdinfo (CD_OPEN ,"Use count for \"/dev/%s\" now %d\n" , cdi->name, cdi->use_count); -/* Do this on open. Don't wait for mount, because they might -not be mounting, but opening with O_NONBLOCK */ -check_disk_change (bdev);return 0 ; err_release:if (CDROM_CAN (CDC_LOCK ) && cdi->options &CDO_LOCK ) {
PATCH 65/71 megaraid_sas: Sanity check user supplied length before passing it to dma_alloc_coherent()
In reply to Greg KH2.6.38-stable review patch. If anyone has any objections, please let us know.
------------------
From: =?UTF-8?q?Bj=C3=B8rn=20Mork?= <[email protected]>
commit 98cb7e4413d189cd2b54daf993a4667d9788c0bb upstream.
The ioc->sgl[i].iov_len value is supplied by the ioctl caller, and can be zero in some cases. Assume that's valid and continue without error.
Fixes (multiple individual reports of the same problem for quite a while):
http://marc.info/?l=linux-ide&m=128941801715301
http://bugs.debian.org/604627
http://www.mail-archive.com/[email protected]/msg02575.html
megasas: Failed to alloc kernel SGL buffer for IOCTL
and
[ 69.162538] ------------[ cut here ]------------ [ 69.162806] kernel BUG at /build/buildd/linux-2.6.32/lib/swiotlb.c:368! [ 69.163134] invalid opcode: 0000 [#1] SMP [ 69.163570] last sysfs file: /sys/devices/system/cpu/cpu3/cache/index2/shared_cpu_map [ 69.163975] CPU 0 [ 69.164227] Modules linked in: fbcon tileblit font bitblit softcursor vga16fb vgastate ioatdma radeon ttm drm_kms_helper shpchp drm i2c_algo_bit lp parport floppy pata_jmicron megaraid_sas igb dca [ 69.167419] Pid: 1206, comm: smartctl Tainted: G W 2.6.32-25-server #45-Ubuntu X8DTN [ 69.167843] RIP: 0010:[<ffffffff812c4dc5>] [<ffffffff812c4dc5>] map_single+0x255/0x260 [ 69.168370] RSP: 0018:ffff88081c0ebc58 EFLAGS: 00010246 [ 69.168655] RAX: 000000000003bffc RBX: 00000000ffffffff RCX: 0000000000000002 [ 69.169000] RDX: 0000000000000000 RSI: 0000000000000000 RDI: ffff88001dffe000 [ 69.169346] RBP: ffff88081c0ebcb8 R08: 0000000000000000 R09: ffff880000030840 [ 69.169691] R10: 0000000000100000 R11: 0000000000000000 R12: 0000000000000000 [ 69.170036] R13: 00000000ffffffff R14: 0000000000000001 R15: 0000000000200000 [ 69.170382] FS: 00007fb8de189720(0000) GS:ffff88001de00000(0000) knlGS:0000000000000000 [ 69.170794] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 69.171094] CR2: 00007fb8dd59237c CR3: 000000081a790000 CR4: 00000000000006f0 [ 69.171439] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 69.171784] DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400 [ 69.172130] Process smartctl (pid: 1206, threadinfo ffff88081c0ea000, task ffff88081a760000) [ 69.194513] Stack: [ 69.205788] 0000000000000034 00000002817e3390 0000000000000000 ffff88081c0ebe00 [ 69.217739] <0> 0000000000000000 000000000003bffc 0000000000000000 0000000000000000 [ 69.241250] <0> 0000000000000000 00000000ffffffff ffff88081c5b4080 ffff88081c0ebe00 [ 69.277310] Call Trace: [ 69.289278] [<ffffffff812c52ac>] swiotlb_alloc_coherent+0xec/0x130 [ 69.301118] [<ffffffff81038b31>] x86_swiotlb_alloc_coherent+0x61/0x70 [ 69.313045] [<ffffffffa002d0ce>] megasas_mgmt_fw_ioctl+0x1ae/0x690 [megaraid_sas] [ 69.336399] [<ffffffffa002d748>] megasas_mgmt_ioctl_fw+0x198/0x240 [megaraid_sas] [ 69.359346] [<ffffffffa002f695>] megasas_mgmt_ioctl+0x35/0x50 [megaraid_sas] [ 69.370902] [<ffffffff81153b12>] vfs_ioctl+0x22/0xa0 [ 69.382322] [<ffffffff8115da2a>] ? alloc_fd+0x10a/0x150 [ 69.393622] [<ffffffff81153cb1>] do_vfs_ioctl+0x81/0x410 [ 69.404696] [<ffffffff8155cc13>] ? do_page_fault+0x153/0x3b0 [ 69.415761] [<ffffffff811540c1>] sys_ioctl+0x81/0xa0 [ 69.426640] [<ffffffff810121b2>] system_call_fastpath+0x16/0x1b [ 69.437491] Code: fe ff ff 48 8b 3d 74 38 76 00 41 bf 00 00 20 00 e8 51 f5 d7 ff 83 e0 ff 48 05 ff 07 00 00 48 c1 e8 0b 48 89 45 c8 e9 13 fe ff ff <0f> 0b eb fe 0f 1f 80 00 00 00 00 55 48 89 e5 48 83 ec 20 4c 89 [ 69.478216] RIP [<ffffffff812c4dc5>] map_single+0x255/0x260 [ 69.489668] RSP <ffff88081c0ebc58> [ 69.500975] ---[ end trace 6a2181b634e2abc7 ]---
Reported by: Marc-Christian Petersen <[email protected]>
--- drivers/scsi/megaraid/megaraid_sas_base.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/scsi/megaraid/megaraid_sas_base.c +3 -0
@@ -4611,6 +4611,9 @@ megasas_mgmt_fw_ioctl(struct megasas_ins* For each user buffer, create a mirror buffer and copy in */ for (i =0 ; i < ioc->sge_count; i++) { +if (!ioc->sgl[i].iov_len) +continue ; + kbuff_arr[i] =dma_alloc_coherent (&instance->pdev->dev, ioc->sgl[i].iov_len, &buf_handle,GFP_KERNEL );
PATCH 70/71 cifs: fix cifsConvertToUCS() for the mapchars case
In reply to Greg KH2.6.38-stable review patch. If anyone has any objections, please let us know.
------------------
From: Jeff Layton <[email protected]>
commit 11379b5e33950048ad66825da7f462b0d0da9d73 upstream.
As Metze pointed out, commit 84cdf74e broke mapchars option:
Commit "cifs: fix unaligned accesses in cifsConvertToUCS" (84cdf74e8096a10dd6acbb870dd404b92f07a756) does multiple steps in just one commit (moving the function and changing it without testing).
put_unaligned_le16(temp, &target[j]); is never called for any codepoint the goes via the 'default' switch statement. As a result we put just zero (or maybe uninitialized) bytes into the target buffer.
His proposed patch looks correct, but doesn't apply to the current head of the tree. This patch should also fix it.
--- fs/cifs/cifs_unicode.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-)
fs/cifs/cifs_unicode.c +6 -8
@@ -277,6 +277,7 @@ cifsConvertToUCS(__le16 *target, const cfor (i =0 , j =0 ; i < srclen; j++) { src_char = source[i]; + charlen =1 ;switch (src_char) {case 0 :put_unaligned (0 , &target[j]);
@@ -316,16 +317,13 @@ cifsConvertToUCS(__le16 *target, const c dst_char =cpu_to_le16 (0x003f ); charlen =1 ; } -/* -* character may take more than one byte in the source -* string, but will take exactly two bytes in the -* target string -*/ - i += charlen; -continue ; } +/* +* character may take more than one byte in the source string, +* but will take exactly two bytes in the target string +*/ + i += charlen;put_unaligned (dst_char, &target[j]); - i++;/* move to next char in source string */ } ctoUCS_out:
PATCH 71/71 iwlegacy: fix IBSS mode crashes
In reply to Greg KH2.6.38-stable review patch. If anyone has any objections, please let us know.
------------------
From: Stanislaw Gruszka <[email protected]>
commit eb85de3f84868ca85703a23617b4079ce79a801e upstream.
We should not switch to non-IBSS channels when working in IBSS mode, otherwise there are microcode errors, and after some time system crashes.
This bug is only observable when software scan is used in IBSS mode, so should be considered as regression after:
commit 0263aa45293838b514b8af674a03faf040991a90
Author: Stanislaw Gruszka <[email protected]> Date: Tue Mar 29 11:24:21 2011 +0200
iwl3945: disable hw scan by default
However IBSS mode check, which this patch add again, was removed by
commit b2f30e8bdd8ef5f3b5a7ef9146509585a15347d3
Author: Johannes Berg <[email protected]> Date: Thu Jan 21 07:32:20 2010 -0800
iwlwifi: remove IBSS channel sanity check
That commit claim that mac80211 will not use non-IBSS channel in IBSS mode, what definitely is not true. Bug probably should be fixed in mac80211, but that will require more work, so better to apply that patch temporally, and provide proper mac80211 fix latter.
Resolves:
https://bugzilla.kernel.org/show_bug.cgi?id=34452
--- drivers/net/wireless/iwlwifi/iwl-legacy.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/net/wireless/iwlwifi/iwl-legacy.c +7 -0
@@ -123,6 +123,13 @@ int iwl_legacy_mac_config(struct ieee802 goto set_ch_out; } +if (priv->iw_mode ==NL80211_IFTYPE_ADHOC && + !is_channel_ibss (ch_info)) { +IWL_DEBUG_MAC80211 (priv,"leave - not IBSS channel\n" ); + ret = -EINVAL ; + goto set_ch_out; + } +spin_lock_irqsave (&priv->lock, flags);for_each_context (priv, ctx) {
PATCH 69/71 cifs: clean up various nits in unicode routines (try #2)
In reply to Greg KH2.6.38-stable review patch. If anyone has any objections, please let us know.
------------------
From: Jeff Layton <[email protected]>
commit 581ade4d1c025eb10421eda0d0c0a2f04447d7c5 upstream.
Minor revision to the original patch. Don't abuse the __le16 variable on the stack by casting it to wchar_t and handing it off to char2uni. Declare an actual wchar_t on the stack instead. This fixes a valid sparse warning.
Fix the spelling of UNI_ASTERISK. Eliminate the unneeded len_remaining variable in cifsConvertToUCS.
Also, as David Howells points out. We were better off making cifsConvertToUCS *not* use put_unaligned_le16 since it means that we can't optimize the mapped characters at compile time. Switch them instead to use cpu_to_le16, and simply use put_unaligned to set them in the string.
--- fs/cifs/cifs_unicode.c | 35 +++++++++++++++++------------------ fs/cifs/cifs_unicode.h | 2 +- 2 files changed, 18 insertions(+), 19 deletions(-)
fs/cifs/cifs_unicode.c +17 -18
@@ -90,7 +90,7 @@ cifs_mapchar(char *target, const __u16 scase UNI_COLON : *target =':' ;break ; -case UNI_ASTERIK : +case UNI_ASTERISK : *target ='*' ;break ;case UNI_QUESTION :
@@ -264,40 +264,40 @@ cifs_strndup_from_ucs(const char *src, c* names are little endian 16 bit Unicode on the wire */ int -cifsConvertToUCS (__le16 *target,const char *source,int maxlen, +cifsConvertToUCS (__le16 *target,const char *source,int srclen,const struct nls_table *cp,int mapChars) {int i, j, charlen; -int len_remaining = maxlen;char src_char; -__u16 temp; +__le16 dst_char; +wchar_t tmp;if (!mapChars)return cifs_strtoUCS (target, source,PATH_MAX , cp); -for (i =0 , j =0 ; i < maxlen; j++) { +for (i =0 , j =0 ; i < srclen; j++) { src_char = source[i];switch (src_char) {case 0 : -put_unaligned_le16 (0 , &target[j]); +put_unaligned (0 , &target[j]); goto ctoUCS_out;case ':' : - temp =UNI_COLON ; + dst_char =cpu_to_le16 (UNI_COLON );break ;case '*' : - temp =UNI_ASTERIK ; + dst_char =cpu_to_le16 (UNI_ASTERISK );break ;case '?' : - temp =UNI_QUESTION ; + dst_char =cpu_to_le16 (UNI_QUESTION );break ;case '<' : - temp =UNI_LESSTHAN ; + dst_char =cpu_to_le16 (UNI_LESSTHAN );break ;case '>' : - temp =UNI_GRTRTHAN ; + dst_char =cpu_to_le16 (UNI_GRTRTHAN );break ;case '|' : - temp =UNI_PIPE ; + dst_char =cpu_to_le16 (UNI_PIPE );break ;/* * FIXME: We can not handle remapping backslash (UNI_SLASH)
@@ -305,17 +305,17 @@ cifsConvertToUCS(__le16 *target, const c* as they use backslash as separator. */ default : - charlen = cp->char2uni (source+i, len_remaining, - &temp); + charlen = cp->char2uni (source + i, srclen - i, &tmp); + dst_char =cpu_to_le16 (tmp); +/* * if no match, use question mark, which at least in * some cases serves as wild card */ if (charlen <1 ) { - temp =0x003f ; + dst_char =cpu_to_le16 (0x003f ); charlen =1 ; } - len_remaining -= charlen;/* * character may take more than one byte in the source * string, but will take exactly two bytes in the
@@ -324,9 +324,8 @@ cifsConvertToUCS(__le16 *target, const c i += charlen;continue ; } -put_unaligned_le16 (temp, &target[j]); +put_unaligned (dst_char, &target[j]); i++;/* move to next char in source string */ - len_remaining--; } ctoUCS_out:
fs/cifs/cifs_unicode.h +1 -1
@@ -44,7 +44,7 @@* reserved symbols (along with \ and /), otherwise illegal to store * in filenames in NTFS */ -#define UNI_ASTERIK (__u16) ('*' + 0xF000) +#define UNI_ASTERISK (__u16) ('*' + 0xF000)#define UNI_QUESTION (__u16) ('?' + 0xF000)#define UNI_COLON (__u16) (':' + 0xF000)#define UNI_GRTRTHAN (__u16) ('>' + 0xF000)
PATCH 68/71 Revert "[SCSI] Retrieve the Caching mode page"
In reply to Greg KH2.6.38-stable review patch. If anyone has any objections, please let us know.
------------------
From: James Bottomley <[email protected]>
commit 3dea642afd9187728d119fce5c82a7ed9faa9b6a upstream.
This reverts commit 24d720b726c1a85f1962831ac30ad4d2ef8276b1.
Previously we thought there was little possibility that devices would crash with this, but some have been found.
--- drivers/scsi/sd.c | 63 +++++++++++++----------------------------------------- 1 file changed, 16 insertions(+), 47 deletions(-)
drivers/scsi/sd.c +16 -47
@@ -1910,14 +1910,10 @@ sd_read_cache_type(struct scsi_disk *sdkint old_rcd = sdkp->RCD;int old_dpofua = sdkp->DPOFUA; -if (sdp->skip_ms_page_8) { -if (sdp->type ==TYPE_RBC ) - goto defaults; -else { - modepage =0x3F ; - dbd =0 ; - } - }else if (sdp->type ==TYPE_RBC ) { +if (sdp->skip_ms_page_8) + goto defaults; + +if (sdp->type ==TYPE_RBC ) { modepage =6 ; dbd =8 ; }else {
@@ -1945,11 +1941,13 @@ sd_read_cache_type(struct scsi_disk *sdk*/ if (len <3 ) goto bad_sense; -else if (len >SD_BUF_SIZE ) { -sd_printk (KERN_NOTICE , sdkp,"Truncating mode parameter " -"data from %d to %d bytes\n" , len,SD_BUF_SIZE ); - len =SD_BUF_SIZE ; - } +if (len >20 ) + len =20 ; + +/* Take headers and block descriptors into account */ + len += data.header_length + data.block_descriptor_length; +if (len >SD_BUF_SIZE ) + goto bad_sense;/* Get the data */ res =sd_do_mode_sense (sdp, dbd, modepage, buffer, len, &data, &sshdr);
@@ -1957,45 +1955,16 @@ sd_read_cache_type(struct scsi_disk *sdkif (scsi_status_is_good (res)) {int offset = data.header_length + data.block_descriptor_length; -while (offset < len) { -u8 page_code = buffer[offset] &0x3F ; -u8 spf = buffer[offset] &0x40 ; - -if (page_code ==8 || page_code ==6 ) { -/* We're interested only in the first 3 bytes. -*/ -if (len - offset <=2 ) { -sd_printk (KERN_ERR , sdkp,"Incomplete " -"mode parameter data\n" ); - goto defaults; - }else { - modepage = page_code; - goto Page_found; - } - }else { -/* Go to the next page */ -if (spf && len - offset >3 ) - offset +=4 + (buffer[offset+2 ] <<8 ) + - buffer[offset+3 ]; -else if (!spf && len - offset >1 ) - offset +=2 + buffer[offset+1 ]; -else { -sd_printk (KERN_ERR , sdkp,"Incomplete " -"mode parameter data\n" ); - goto defaults; - } - } +if (offset >=SD_BUF_SIZE -2 ) { +sd_printk (KERN_ERR , sdkp,"Malformed MODE SENSE response\n" ); + goto defaults; } -if (modepage ==0x3F ) { -sd_printk (KERN_ERR , sdkp,"No Caching mode page " -"present\n" ); - goto defaults; - }else if ((buffer[offset] &0x3f ) != modepage) { +if ((buffer[offset] &0x3f ) != modepage) {sd_printk (KERN_ERR , sdkp,"Got wrong page\n" ); goto defaults; } - Page_found: +if (modepage ==8 ) { sdkp->WCE = ((buffer[offset +2 ] &0x04 ) !=0 ); sdkp->RCD = ((buffer[offset +2 ] &0x01 ) !=0 );
PATCH 64/71 x86, mce, AMD: Fix leaving freed data in a list
In reply to Greg KH2.6.38-stable review patch. If anyone has any objections, please let us know.
------------------
From: Julia Lawall <[email protected]>
commit d9a5ac9ef306eb5cc874f285185a15c303c50009 upstream.
b may be added to a list, but is not removed before being freed in the case of an error. This is done in the corresponding deallocation function, so the code here has been changed to follow that.
The sematic match that finds this problem is as follows:
(http://coccinelle.lip6.fr/)
// <smpl>
@@
expression E,E1,E2;
identifier l;
@@
*list_add(&E->l,E1);
... when != E1
when != list_del(&E->l)
when != list_del_init(&E->l)
when != E = E2*kfree(E);// </smpl>
--- arch/x86/kernel/cpu/mcheck/mce_amd.c | 1 + 1 file changed, 1 insertion(+)
arch/x86/kernel/cpu/mcheck/mce_amd.c +1 -0
@@ -509,6 +509,7 @@ recurse: out_free:if (b) {kobject_put (&b->kobj); +list_del (&b->miscj);kfree (b); }return err;
PATCH 63/71 x86: Fix UV BAU for non-consecutive nasids
In reply to Greg KH2.6.38-stable review patch. If anyone has any objections, please let us know.
------------------
From: Cliff Wickman <[email protected]>
commit 77ed23f8d995a01cd8101d84351b567bf5177a30 upstream.
This is a fix for the SGI Altix-UV Broadcast Assist Unit code, which is used for TLB flushing.
Certain hardware configurations (that customers are ordering) cause nasids (numa address space id's) to be non-consecutive. Specifically, once you have more than 4 blades in a IRU (Individual Rack Unit - or 1/2 rack) but less than the maximum of 16, the nasid numbering becomes non-consecutive. This currently results in a 'catastrophic error' (CATERR) detected by the firmware during OS boot. The BAU is generating an 'INTD' request that is targeting a non-existent nasid value. Such configurations may also occur when a blade is configured off because of hardware errors. (There is one UV hub per blade.)
This patch is required to support such configurations.
The problem with the tlb_uv.c code is that is using the consecutive hub numbers as indices to the BAU distribution bit map. These are simply the ordinal position of the hub or blade within its partition. It should be using physical node numbers (pnodes), which correspond to the physical nasid values. Use of the hub number only works as long as the nasids in the partition are consecutive and increase with a stride of 1.
This patch changes the index to be the pnode number, thus allowing nasids to be non-consecutive.
It also provides a table in local memory for each cpu to translate target cpu number to target pnode and nasid. And it improves naming to properly reflect 'node' and 'uvhub' versus 'nasid'.
--- arch/x86/include/asm/uv/uv_bau.h | 17 +++++-- arch/x86/platform/uv/tlb_uv.c | 92 ++++++++++++++++++++++++++------------- 2 files changed, 76 insertions(+), 33 deletions(-)
arch/x86/include/asm/uv/uv_bau.h +13 -4
@@ -94,6 +94,8 @@/* after this # consecutive successes, bump up the throttle if it was lowered */ #define COMPLETE_THRESHOLD 5 +#define UV_LB_SUBNODEID 0x10 +/* * number of entries in the destination side payload queue */
@@ -124,7 +126,7 @@* The distribution specification (32 bytes) is interpreted as a 256-bit * distribution vector. Adjacent bits correspond to consecutive even numbered * nodeIDs. The result of adding the index of a given bit to the 15-bit -* 'base_dest_nodeid' field of the header corresponds to the +* 'base_dest_nasid' field of the header corresponds to the * destination nodeID associated with that specified bit. */ struct bau_target_uvhubmask {
@@ -176,7 +178,7 @@ struct bau_msg_payload {struct bau_msg_header {unsigned int dest_subnodeid:6 ;/* must be 0x10, for the LB */ /* bits 5:0 */ -unsigned int base_dest_nodeid:15 ;/* nasid of the */ +unsigned int base_dest_nasid:15 ;/* nasid of the */ /* bits 20:6 */ /* first bit in uvhub map */ unsigned int command:8 ;/* message type */ /* bits 28:21 */
@@ -378,6 +380,10 @@ struct ptc_stats {unsigned long d_rcanceled;/* number of messages canceled by resets */ }; +struct hub_and_pnode { +short uvhub; +short pnode; +};/* * one per-cpu; to locate the software tables */
@@ -399,10 +405,12 @@ struct bau_control {int baudisabled;int set_bau_off;short cpu; +short osnode;short uvhub_cpu;short uvhub;short cpus_in_socket;short cpus_in_uvhub; +short partition_base_pnode;unsigned short message_number;unsigned short uvhub_quiesce;short socket_acknowledge_count[DEST_Q_SIZE ];
@@ -422,15 +430,16 @@ struct bau_control {int congested_period;cycles_t period_time;long period_requests; +struct hub_and_pnode *target_hub_and_pnode; };static inline int bau_uvhub_isset (int uvhub,struct bau_target_uvhubmask *dstp) {return constant_test_bit (uvhub, &dstp->bits[0 ]); } -static inline void bau_uvhub_set (int uvhub,struct bau_target_uvhubmask *dstp) +static inline void bau_uvhub_set (int pnode,struct bau_target_uvhubmask *dstp) { -__set_bit (uvhub, &dstp->bits[0 ]); +__set_bit (pnode, &dstp->bits[0 ]); }static inline void bau_uvhubs_clear (struct bau_target_uvhubmask *dstp,int nbits)
arch/x86/platform/uv/tlb_uv.c +63 -29
198 lines not on this page · raw message
PATCH 61/71 Fix cx88 remote control input
In reply to Greg KH2.6.38-stable review patch. If anyone has any objections, please let us know.
------------------
From: Lawrence Rust <[email protected]>
commit 2a164d02dd34c6b49a3f0995900e0f8af102b804 upstream.
In the IR interrupt handler of cx88-input.c there's a 32-bit multiply overflow which causes IR pulse durations to be incorrectly calculated.
This is a regression caused by commit 2997137be8eba.
--- drivers/media/video/cx88/cx88-input.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/video/cx88/cx88-input.c +1 -1
@@ -523,7 +523,7 @@ void cx88_ir_irq(struct cx88_core *core)for (todo =32 ; todo >0 ; todo -= bits) { ev.pulse = samples &0x80000000 ? false : true; bits =min (todo,32U -fls (ev.pulse ? samples : ~samples)); - ev.duration = (bits *NSEC_PER_SEC ) / (1000 * ir_samplerate); + ev.duration = (bits * (NSEC_PER_SEC /1000 )) / ir_samplerate;ir_raw_event_store_with_filter (ir->dev, &ev); samples <<= bits; }
PATCH 59/71 tick: Clear broadcast active bit when switching to oneshot
In reply to Greg KH2.6.38-stable review patch. If anyone has any objections, please let us know.
------------------
From: Thomas Gleixner <[email protected]>
commit 07f4beb0b5bbfaf36a64aa00d59e670ec578a95a upstream.
The first cpu which switches from periodic to oneshot mode switches also the broadcast device into oneshot mode. The broadcast device serves as a backup for per cpu timers which stop in deeper C-states. To avoid starvation of the cpus which might be in idle and depend on broadcast mode it marks the other cpus as broadcast active and sets the brodcast expiry value of those cpus to the next tick.
The oneshot mode broadcast bit for the other cpus is sticky and gets only cleared when those cpus exit idle. If a cpu was not idle while the bit got set in consequence the bit prevents that the broadcast device is armed on behalf of that cpu when it enters idle for the first time after it switched to oneshot mode.
In most cases that goes unnoticed as one of the other cpus has usually a timer pending which keeps the broadcast device armed with a short timeout. Now if the only cpu which has a short timer active has the bit set then the broadcast device will not be armed on behalf of that cpu and will fire way after the expected timer expiry. In the case of Christians bug report it took ~145 seconds which is about half of the wrap around time of HPET (the limit for that device) due to the fact that all other cpus had no timers armed which expired before the 145 seconds timeframe.
The solution is simply to clear the broadcast active bit unconditionally when a cpu switches to oneshot mode after the first cpu switched the broadcast device over. It's not idle at that point otherwise it would not be executing that code.
[ I fundamentally hate that broadcast crap. Why the heck thought some
folks that when going into deep idle it's a brilliant concept to switch off the last device which brings the cpu back from that state? ]
Thanks to Christian for providing all the valuable debug information!
--- kernel/time/tick-broadcast.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
kernel/time/tick-broadcast.c +11 -1
@@ -523,10 +523,11 @@ static void tick_broadcast_init_next_eve*/ void tick_broadcast_setup_oneshot (struct clock_event_device *bc) { +int cpu =smp_processor_id (); +/* Set it up only once ! */ if (bc->event_handler != tick_handle_oneshot_broadcast) {int was_periodic = bc->mode ==CLOCK_EVT_MODE_PERIODIC ; -int cpu =smp_processor_id (); bc->event_handler = tick_handle_oneshot_broadcast;clockevents_set_mode (bc,CLOCK_EVT_MODE_ONESHOT );
@@ -552,6 +553,15 @@ void tick_broadcast_setup_oneshot(structtick_broadcast_set_event (tick_next_period,1 ); }else bc->next_event.tv64 =KTIME_MAX ; + }else { +/* +* The first cpu which switches to oneshot mode sets +* the bit for all other cpus which are in the general +* (periodic) broadcast mask. So the bit is set and +* would prevent the first broadcast enter after this +* to program the bc device. +*/ +tick_broadcast_clear_oneshot (cpu); } }
Re: [57/71] block: rescan partitions on invalidated devices on -ENOMEDIA too
In reply to Greg KHHello, Greg.
Quoted 16 lines · Greg KH
2.6.38-stable review patch. If anyone has any objections, please let us know.
------------------
From: Tejun Heo <[email protected]>
commit
02e352287a40bd456eb78df705bf888bc3161d3fupstream.
__blkdev_get()doesn't rescan partitions ifdisk->fops->open()fails, which leads to ghost partition devices lingering after medimum removal is known to both the kernel and userland. The behavior also creates a subtle inconsistency whereO_NONBLOCKopen, which doesn't fail even if there's no medium, clears the ghots partitions, which is exploited to work around the problem from userland.
Quoted 9 lines
Fix it by updating
__blkdev_get()to issue partition rescan after-ENOMEDIAtoo.This was reported in the following bz.
https://bugzilla.kernel.org/show_bug.cgi?id=13029
Stable: 2.6.38
Can you please hold this for a while? It causes an extra warning message to be printed during device detection. It isn't harmful but still. I'll soon send a patch to resolve the issue and it would be better for them to go together.
Thank you.
--
tejun
PATCH 58/71 clocksource: Install completely before selecting
In reply to Greg KH2.6.38-stable review patch. If anyone has any objections, please let us know.
------------------
From: john stultz <[email protected]>
commit e05b2efb82596905ebfe88e8612ee81dec9b6592 upstream.
Christian Hoffmann reported that the command line clocksource override with acpi_pm timer fails:
Kernel command line: <SNIP> clocksource=acpi_pm hpet clockevent registered
Switching to clocksource hpet
Override clocksource acpi_pm is not HRT compatible. Cannot switch while in HRT/NOHZ mode.
The watchdog code is what enables CLOCK_SOURCE_VALID_FOR_HRES, but we actually end up selecting the clocksource before we enqueue it into the watchdog list, so that's why we see the warning and fail to switch to acpi_pm timer as requested. That's particularly bad when we want to debug timekeeping related problems in early boot.
Put the selection call last.
--- kernel/time/clocksource.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
kernel/time/clocksource.c +2 -2
@@ -685,8 +685,8 @@ int __clocksource_register_scale(struct/* Add clocksource to the clcoksource list */ mutex_lock (&clocksource_mutex);clocksource_enqueue (cs); -clocksource_select ();clocksource_enqueue_watchdog (cs); +clocksource_select ();mutex_unlock (&clocksource_mutex);return 0 ; }
@@ -706,8 +706,8 @@ int clocksource_register(struct clocksoumutex_lock (&clocksource_mutex);clocksource_enqueue (cs); -clocksource_select ();clocksource_enqueue_watchdog (cs); +clocksource_select ();mutex_unlock (&clocksource_mutex);return 0 ; }
PATCH 56/71 x86, AMD: Fix ARAT feature setting again
In reply to Greg KH2.6.38-stable review patch. If anyone has any objections, please let us know.
------------------
From: Borislav Petkov <[email protected]>
commit 14fb57dccb6e1defe9f89a66f548fcb24c374c1d upstream.
Trying to enable the local APIC timer on early K8 revisions uncovers a number of other issues with it, in conjunction with the C1E enter path on AMD. Fixing those causes much more churn and troubles than the benefit of using that timer brings so don't enable it on K8 at all, falling back to the original functionality the kernel had wrt to that.
--- arch/x86/kernel/cpu/amd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kernel/cpu/amd.c +1 -1
@@ -596,7 +596,7 @@ static void __cpuinit init_amd(struct cp#endif /* As a rule processors have APIC timer running in deep C states */ -if (c->x86 >=0xf && !cpu_has_amd_erratum (amd_erratum_400)) +if (c->x86 >0xf && !cpu_has_amd_erratum (amd_erratum_400))set_cpu_cap (c,X86_FEATURE_ARAT );/*
PATCH 54/71 rapidio: fix default routing initialization
In reply to Greg KH2.6.38-stable review patch. If anyone has any objections, please let us know.
------------------
From: Alexandre Bounine <[email protected]>
commit 0bf2461fdd9008290cf429e50e4f362dafab4249 upstream.
Fix switch initialization to ensure that all switches have default routing disabled. This guarantees that no unexpected RapidIO packets arrive to the default port set by reset and there is no default routing destination until it is properly configured by software.
This update also unifies handling of unmapped destinations by tsi57x, IDT Gen1 and IDT Gen2 switches.
--- drivers/rapidio/switches/idt_gen2.c | 9 +++++++++ drivers/rapidio/switches/idtcps.c | 6 ++++++ drivers/rapidio/switches/tsi57x.c | 6 ++++++ 3 files changed, 21 insertions(+)
drivers/rapidio/switches/idt_gen2.c +9 -0
@@ -95,6 +95,9 @@ idtg2_route_add_entry(struct rio_mport *else table++; +if (route_port ==RIO_INVALID_ROUTE ) + route_port =IDT_DEFAULT_ROUTE ; +rio_mport_write_config_32 (mport, destid, hopcount,LOCAL_RTE_CONF_DESTID_SEL , table);
@@ -411,6 +414,12 @@ static int idtg2_switch_init(struct rio_ rdev->rswitch->em_handle = idtg2_em_handler; rdev->rswitch->sw_sysfs = idtg2_sysfs; +if (do_enum) { +/* Ensure that default routing is disabled on startup */ +rio_write_config_32 (rdev, +RIO_STD_RTE_DEFAULT_PORT ,IDT_NO_ROUTE ); + } +return 0 ; }
drivers/rapidio/switches/idtcps.c +6 -0
@@ -26,6 +26,9 @@ idtcps_route_add_entry(struct rio_mport {u32 result; +if (route_port ==RIO_INVALID_ROUTE ) + route_port =CPS_DEFAULT_ROUTE ; +if (table ==RIO_GLOBAL_TABLE ) {rio_mport_write_config_32 (mport, destid, hopcount,RIO_STD_RTE_CONF_DESTID_SEL_CSR , route_destid);
@@ -130,6 +133,9 @@ static int idtcps_switch_init(struct rio/* set TVAL = ~50us */ rio_write_config_32 (rdev, rdev->phys_efptr +RIO_PORT_LINKTO_CTL_CSR ,0x8e <<8 ); +/* Ensure that default routing is disabled on startup */ +rio_write_config_32 (rdev, +RIO_STD_RTE_DEFAULT_PORT ,CPS_NO_ROUTE ); }return 0 ;
drivers/rapidio/switches/tsi57x.c +6 -0
@@ -303,6 +303,12 @@ static int tsi57x_switch_init(struct rio rdev->rswitch->em_init = tsi57x_em_init; rdev->rswitch->em_handle = tsi57x_em_handler; +if (do_enum) { +/* Ensure that default routing is disabled on startup */ +rio_write_config_32 (rdev,RIO_STD_RTE_DEFAULT_PORT , +RIO_INVALID_ROUTE ); + } +return 0 ; }
PATCH 52/71 Revert "mmc: fix a race between card-detect rescan and clock-gate work instances"
In reply to Greg KH2.6.38-stable review patch. If anyone has any objections, please let us know.
------------------
From: Chris Ball <[email protected]>
commit 86f315bbb2374f1f077500ad131dd9b71856e697 upstream.
This reverts commit 26fc8775b51484d8c0a671198639c6d5ae60533e, which has been reported to cause boot/resume-time crashes for some users:
https://bbs.archlinux.org/viewtopic.php?id=118751.
--- drivers/mmc/core/host.c | 9 +++++---- include/linux/mmc/host.h | 1 + 2 files changed, 6 insertions(+), 4 deletions(-)
drivers/mmc/core/host.c +5 -4
@@ -94,7 +94,7 @@ static void mmc_host_clk_gate_delayed(stspin_unlock_irqrestore (&host->clk_lock, flags);return ; } -mmc_claim_host (host); +mutex_lock (&host->clk_gate_mutex);spin_lock_irqsave (&host->clk_lock, flags);if (!host->clk_requests) {spin_unlock_irqrestore (&host->clk_lock, flags);
@@ -104,7 +104,7 @@ static void mmc_host_clk_gate_delayed(stpr_debug ("%s: gated MCI clock\n" ,mmc_hostname (host)); }spin_unlock_irqrestore (&host->clk_lock, flags); -mmc_release_host (host); +mutex_unlock (&host->clk_gate_mutex); }/*
@@ -130,7 +130,7 @@ void mmc_host_clk_ungate(struct mmc_host {unsigned long flags; -mmc_claim_host (host); +mutex_lock (&host->clk_gate_mutex);spin_lock_irqsave (&host->clk_lock, flags);if (host->clk_gated) {spin_unlock_irqrestore (&host->clk_lock, flags);
@@ -140,7 +140,7 @@ void mmc_host_clk_ungate(struct mmc_host } host->clk_requests++;spin_unlock_irqrestore (&host->clk_lock, flags); -mmc_release_host (host); +mutex_unlock (&host->clk_gate_mutex); }/**
@@ -218,6 +218,7 @@ static inline void mmc_host_clk_init(str host->clk_gated = false;INIT_WORK (&host->clk_gate_work, mmc_host_clk_gate_work);spin_lock_init (&host->clk_lock); +mutex_init (&host->clk_gate_mutex); }/**
include/linux/mmc/host.h +1 -0
@@ -183,6 +183,7 @@ struct mmc_host {struct work_struct clk_gate_work;/* delayed clock gate */ unsigned int clk_old;/* old clock value cache */ spinlock_t clk_lock;/* lock for clk fields */ +struct mutex clk_gate_mutex;/* mutex for clock gating */ #endif /* host specific block data */
PATCH 51/71 drm/radeon/kms: fix extended lvds info parsing
In reply to Greg KH2.6.38-stable review patch. If anyone has any objections, please let us know.
------------------
From: Alex Deucher <[email protected]>
commit 05fa7ea7d23980de0014417a0e0af2048a0f9fc1 upstream.
On rev <= 1.1 tables, the offset is absolute, on newer tables, it's relative.
Fixes:
https://bugzilla.redhat.com/show_bug.cgi?id=700326
--- drivers/gpu/drm/radeon/radeon_atombios.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)
drivers/gpu/drm/radeon/radeon_atombios.c +11 -3
@@ -1574,9 +1574,17 @@ struct radeon_encoder_atom_dig *radeon_aATOM_FAKE_EDID_PATCH_RECORD *fake_edid_record;ATOM_PANEL_RESOLUTION_PATCH_RECORD *panel_res_record;bool bad_record = false; -u8 *record = (u8 *)(mode_info->atom_context->bios + - data_offset + -le16_to_cpu (lvds_info->info.usModePatchTableOffset)); +u8 *record; + +if ((frev ==1 ) && (crev <2 )) +/* absolute */ + record = (u8 *)(mode_info->atom_context->bios + +le16_to_cpu (lvds_info->info.usModePatchTableOffset)); +else +/* relative */ + record = (u8 *)(mode_info->atom_context->bios + + data_offset + +le16_to_cpu (lvds_info->info.usModePatchTableOffset));while (*record !=ATOM_RECORD_END_TYPE ) {switch (*record) {case LCD_MODE_PATCH_RECORD_MODE_TYPE :
PATCH 50/71 libata: fix oops when LPM is used with PMP
In reply to Greg KH2.6.38-stable review patch. If anyone has any objections, please let us know.
------------------
From: Tejun Heo <[email protected]>
commit 5f6f12ccf3aa42cfc0c5bde9228df0c843dd63f7 upstream.
ae01b2493c (libata: Implement ATA_FLAG_NO_DIPM and apply it to mcp65) added ATA_FLAG_NO_DIPM and made ata_eh_set_lpm() check the flag. However, @ap is NULL if @link points to a PMP link and thus the unconditional @ap->flags dereference leads to the following oops.
BUG: unable to handle kernel NULL pointer dereference at 0000000000000018 IP: [<ffffffff813f98e1>] ata_eh_recover+0x9a1/0x1510 ... Pid: 295, comm: scsi_eh_4 Tainted: P 2.6.38.5-core2 #1 System76, Inc. Serval Professional/Serval Professional RIP: 0010:[<ffffffff813f98e1>] [<ffffffff813f98e1>] ata_eh_recover+0x9a1/0x1510 RSP: 0018:ffff880132defbf0 EFLAGS: 00010246 RAX: 0000000000000000 RBX: ffff880132f40000 RCX: 0000000000000000 RDX: ffff88013377c000 RSI: ffff880132f40000 RDI: 0000000000000000 RBP: ffff880132defce0 R08: ffff88013377dc58 R09: ffff880132defd98 R10: 0000000000000000 R11: 00000000ffffffff R12: 0000000000000000 R13: 0000000000000000 R14: ffff88013377c000 R15: 0000000000000000 FS: 0000000000000000(0000) GS:ffff8800bf700000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b CR2: 0000000000000018 CR3: 0000000001a03000 CR4: 00000000000406e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400 Process scsi_eh_4 (pid: 295, threadinfo ffff880132dee000, task ffff880133b416c0) Stack: 0000000000000000 ffff880132defcc0 0000000000000000 ffff880132f42738 ffffffff813ee8f0 ffffffff813eefe0 ffff880132defd98 ffff88013377f190 ffffffffa00b3e30 ffffffff813ef030 0000000032defc60 ffff880100000000 Call Trace: [<ffffffff81400867>] sata_pmp_error_handler+0x607/0xc30 [<ffffffffa00b273f>] ahci_error_handler+0x1f/0x70 [libahci] [<ffffffff813faade>] ata_scsi_error+0x5be/0x900 [<ffffffff813cf724>] scsi_error_handler+0x124/0x650 [<ffffffff810834b6>] kthread+0x96/0xa0 [<ffffffff8100cd64>] kernel_thread_helper+0x4/0x10 Code: 8b 95 70 ff ff ff b8 00 00 00 00 48 3b 9a 10 2e 00 00 48 0f 44 c2 48 89 85 70 ff ff ff 48 8b 8d 70 ff ff ff f6 83 69 02 00 00 01 <48> 8b 41 18 0f 85 48 01 00 00 48 85 c9 74 12 48 8b 51 08 48 83 RIP [<ffffffff813f98e1>] ata_eh_recover+0x9a1/0x1510 RSP <ffff880132defbf0> CR2: 0000000000000018
Fix it by testing @link->ap->flags instead.
stable: ATA_FLAG_NO_DIPM was added during 2.6.39 cycle but was
backported to 2.6.37 and 38. This is a fix for that and thus also applicable to 2.6.37 and 38.
LKML-Reference: <[email protected]>
--- drivers/ata/libata-eh.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/ata/libata-eh.c +1 -1
@@ -3276,7 +3276,7 @@ static int ata_eh_set_lpm(struct ata_linstruct ata_eh_context *ehc = &link->eh_context;struct ata_device *dev, *link_dev =NULL , *lpm_dev =NULL ;enum ata_lpm_policy old_policy = link->lpm_policy; -bool no_dipm = ap->flags &ATA_FLAG_NO_DIPM ; +bool no_dipm = link->ap->flags &ATA_FLAG_NO_DIPM ;unsigned int hints =ATA_LPM_EMPTY |ATA_LPM_HIPM ;unsigned int err_mask;int rc;
PATCH 48/71 tmpfs: fix off-by-one in max_blocks checks
In reply to Greg KH2.6.38-stable review patch. If anyone has any objections, please let us know.
------------------
From: Hugh Dickins <[email protected]>
commit fc5da22ae35d4720be59af8787a8a6d5e4da9517 upstream.
If you fill up a tmpfs, df was showing
tmpfs 460800 - - - /tmp
because of an off-by-one in the max_blocks checks. Fix it so df shows
tmpfs 460800 460800 0 100% /tmp
--- mm/shmem.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
mm/shmem.c +4 -2
@@ -422,7 +422,8 @@ static swp_entry_t *shmem_swp_alloc(stru* a waste to allocate index if we cannot allocate data. */ if (sbinfo->max_blocks) { -if (percpu_counter_compare (&sbinfo->used_blocks, (sbinfo->max_blocks -1 )) >0 ) +if (percpu_counter_compare (&sbinfo->used_blocks, + sbinfo->max_blocks -1 ) >=0 )return ERR_PTR (-ENOSPC );percpu_counter_inc (&sbinfo->used_blocks);spin_lock (&inode->i_lock);
@@ -1404,7 +1405,8 @@ repeat:shmem_swp_unmap (entry); sbinfo =SHMEM_SB (inode->i_sb);if (sbinfo->max_blocks) { -if ((percpu_counter_compare (&sbinfo->used_blocks, sbinfo->max_blocks) >0 ) || +if (percpu_counter_compare (&sbinfo->used_blocks, + sbinfo->max_blocks) >=0 ||shmem_acct_block (info->flags)) {spin_unlock (&info->lock); error = -ENOSPC ;
PATCH 45/71 zorro8390: Fix regression caused during net_device_ops conversion
In reply to Greg KH2.6.38-stable review patch. If anyone has any objections, please let us know.
------------------
From: Geert Uytterhoeven <[email protected]>
commit cf7e032fc87d59c475df26c4d40bf45d401b2adb upstream.
Changeset b6114794a1c394534659f4a17420e48cf23aa922 ("zorro8390: convert to net_device_ops") broke zorro8390 by adding 8390.o to the link. That meant that lib8390.c was included twice, once in zorro8390.c and once in 8390.c, subject to different macros. This patch reverts that by avoiding the wrappers in 8390.c.
Fix based on commits 217cbfa856dc1cbc2890781626c4032d9e3ec59f ("mac8390:
fix regression caused during net_device_ops conversion") and 4e0168fa4842e27795a75b205a510f25b62181d9 ("mac8390: fix build with NET_POLL_CONTROLLER").
--- drivers/net/Makefile | 2 +- drivers/net/zorro8390.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-)
drivers/net/Makefile +1 -1
@@ -217,7 +217,7 @@ obj-$(CONFIG_SC92031) += sc92031.o obj-$(CONFIG_LP486E) += lp486e.o obj-$(CONFIG_ETH16I) += eth16i.o -obj-$(CONFIG_ZORRO8390) += zorro8390.o 8390.o +obj-$(CONFIG_ZORRO8390) += zorro8390.o obj-$(CONFIG_HPLANCE) += hplance.o 7990.o obj-$(CONFIG_MVME147_NET) += mvme147.o 7990.o obj-$(CONFIG_EQUALIZER) += eql.o
drivers/net/zorro8390.c +6 -6
@@ -126,7 +126,7 @@ static int __devinit zorro8390_init_one( board = z->resource.start; ioaddr = board+cards[i].offset; - dev =alloc_ei_netdev (); + dev =____alloc_ei_netdev (0 );if (!dev)return -ENOMEM ;if (!request_mem_region (ioaddr,NE_IO_EXTENT *2 ,DRV_NAME )) {
@@ -146,15 +146,15 @@ static int __devinit zorro8390_init_one(static const struct net_device_ops zorro8390_netdev_ops = { .ndo_open = zorro8390_open, .ndo_stop = zorro8390_close, - .ndo_start_xmit = ei_start_xmit, - .ndo_tx_timeout = ei_tx_timeout, - .ndo_get_stats = ei_get_stats, - .ndo_set_multicast_list = ei_set_multicast_list, + .ndo_start_xmit = __ei_start_xmit, + .ndo_tx_timeout = __ei_tx_timeout, + .ndo_get_stats = __ei_get_stats, + .ndo_set_multicast_list = __ei_set_multicast_list, .ndo_validate_addr = eth_validate_addr, .ndo_set_mac_address = eth_mac_addr, .ndo_change_mtu = eth_change_mtu, #ifdef CONFIG_NET_POLL_CONTROLLER - .ndo_poll_controller = ei_poll, + .ndo_poll_controller = __ei_poll, #endif };
PATCH 44/71 libertas: fix cmdpendingq locking
In reply to Greg KH2.6.38-stable review patch. If anyone has any objections, please let us know.
------------------
From: Paul Fox <[email protected]>
commit 2ae1b8b35faba31a59b153cbad07f9c15de99740 upstream.
We occasionally see list corruption using libertas.
While we haven't been able to diagnose this precisely, we have spotted a possible cause: cmdpendingq is generally modified with driver_lock held. However, there are a couple of points where this is not the case.
Fix up those operations to execute under the lock, it seems like the correct thing to do and will hopefully improve the situation.
--- drivers/net/wireless/libertas/cmd.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/net/wireless/libertas/cmd.c +4 -2
@@ -1335,8 +1335,8 @@ int lbs_execute_next_command(struct lbs_ cpu_to_le16(PS_MODE_ACTION_EXIT_PS)) {lbs_deb_host ("EXEC_NEXT_CMD: ignore ENTER_PS cmd\n" ); -list_del (&cmdnode->list);spin_lock_irqsave (&priv->driver_lock, flags); +list_del (&cmdnode->list);lbs_complete_command (priv, cmdnode,0 );spin_unlock_irqrestore (&priv->driver_lock, flags);
@@ -1348,8 +1348,8 @@ int lbs_execute_next_command(struct lbs_ (priv->psstate == PS_STATE_PRE_SLEEP)) {lbs_deb_host ("EXEC_NEXT_CMD: ignore EXIT_PS cmd in sleep\n" ); -list_del (&cmdnode->list);spin_lock_irqsave (&priv->driver_lock, flags); +list_del (&cmdnode->list);lbs_complete_command (priv, cmdnode,0 );spin_unlock_irqrestore (&priv->driver_lock, flags); priv->needtowakeup =1 ;
@@ -1362,7 +1362,9 @@ int lbs_execute_next_command(struct lbs_ "EXEC_NEXT_CMD: sending EXIT_PS\n"); } } +spin_lock_irqsave (&priv->driver_lock, flags);list_del (&cmdnode->list); +spin_unlock_irqrestore (&priv->driver_lock, flags);lbs_deb_host ("EXEC_NEXT_CMD: sending command 0x%04x\n" ,le16_to_cpu (cmd->command));lbs_submit_command (priv, cmdnode);
PATCH 43/71 ehea: Fix memory hotplug oops
In reply to Greg KH2.6.38-stable review patch. If anyone has any objections, please let us know.
------------------
From: Anton Blanchard <[email protected]>
commit 21ccc7936dac5ca9b3e2838bbc112a60f34e18b3 upstream.
The ehea driver oopses during memory hotplug if the ports are not up. A simple testcase:
# ifconfig ethX down # echo offline > /sys/devices/system/memory/memory32/state
Oops: Kernel access of bad area, sig: 11 [#1]
last sysfs file: /sys/devices/system/memory/memory32/state
REGS: c000000709393110 TRAP: 0300 Not tainted (2.6.39-rc2-01385-g7ef73bc-dirty)
DAR: 0000000000000000, DSISR: 40000000
...
NIP [c000000000067c98] .__wake_up_common+0x48/0xf0 LR [c00000000006d034] .__wake_up+0x54/0x90
Call Trace: [c00000000006d034] .__wake_up+0x54/0x90 [d000000006bb6270] .ehea_rereg_mrs+0x140/0x730 [ehea] [d000000006bb69c4] .ehea_mem_notifier+0x164/0x170 [ehea] [c0000000006fc8a8] .notifier_call_chain+0x78/0xf0 [c0000000000b3d70] .__blocking_notifier_call_chain+0x70/0xb0 [c000000000458d78] .memory_notify+0x28/0x40 [c0000000001871d8] .remove_memory+0x208/0x6d0 [c000000000458264] .memory_section_action+0x94/0x140 [c0000000004583ec] .memory_block_change_state+0xdc/0x1d0 [c0000000004585cc] .store_mem_state+0xec/0x160 [c00000000044768c] .sysdev_store+0x3c/0x50 [c00000000020b48c] .sysfs_write_file+0xec/0x1f0 [c00000000018f86c] .vfs_write+0xec/0x1e0 [c00000000018fa88] .SyS_write+0x58/0xd0
To fix this, initialise the waitqueues during port probe instead of port open.
--- drivers/net/ehea/ehea_main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/ehea/ehea_main.c +3 -3
@@ -2688,9 +2688,6 @@ static int ehea_open(struct net_device *netif_start_queue (dev); } -init_waitqueue_head (&port->swqe_avail_wq); -init_waitqueue_head (&port->restart_wq); -mutex_unlock (&port->port_lock);return ret;
@@ -3273,6 +3270,9 @@ struct ehea_port *ehea_setup_single_portINIT_WORK (&port->reset_task, ehea_reset_port); +init_waitqueue_head (&port->swqe_avail_wq); +init_waitqueue_head (&port->restart_wq); + ret =register_netdev (dev);if (ret) {pr_err ("register_netdev failed. ret=%d\n" , ret);
PATCH 40/71 ASoC: SSM2602: Fix Mic Boost2 control
In reply to Greg KH2.6.38-stable review patch. If anyone has any objections, please let us know.
------------------
From: Lars-Peter Clausen <[email protected]>
commit 36c90ab33feabbd63da775bd92ad356e5bd5cf56 upstream.
The 'Mic Boost2' control's shift was off by one and thus was not working.
--- sound/soc/codecs/ssm2602.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/codecs/ssm2602.c +1 -1
@@ -139,7 +139,7 @@ SOC_DOUBLE_R("Capture Volume", SSM2602_LSOC_DOUBLE_R ("Capture Switch" ,SSM2602_LINVOL ,SSM2602_RINVOL ,7 ,1 ,1 ),SOC_SINGLE ("Mic Boost (+20dB)" ,SSM2602_APANA ,0 ,1 ,0 ), -SOC_SINGLE ("Mic Boost2 (+20dB)" ,SSM2602_APANA ,7 ,1 ,0 ), +SOC_SINGLE ("Mic Boost2 (+20dB)" ,SSM2602_APANA ,8 ,1 ,0 ),SOC_SINGLE ("Mic Switch" ,SSM2602_APANA ,1 ,1 ,1 ), SOC_SINGLE("Sidetone Playback Volume", SSM2602_APANA, 6, 3, 1),
PATCH 38/71 slcan: fix ldisc->open retval
In reply to Greg KH2.6.38-stable review patch. If anyone has any objections, please let us know.
------------------
From: Oliver Hartkopp <[email protected]>
commit 0d4420a90b51abdea71585f571bad6d789ff8eb7 upstream.
TTY layer expects 0 if the ldisc->open operation succeeded.
--- drivers/net/can/slcan.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/can/slcan.c +3 -1
@@ -583,7 +583,9 @@ static int slcan_open(struct tty_struct/* Done. We have linked the TTY line to a channel. */ rtnl_unlock (); tty->receive_room =65536 ;/* We don't flow control */ -return sl->dev->base_addr; + +/* TTY layer expects 0 on success */ +return 0 ; err_free_chan: sl->tty =NULL ;
PATCH 36/71 pch_gbe: support ML7223 IOH
In reply to Greg KH2.6.38-stable review patch. If anyone has any objections, please let us know.
------------------
From: Tomoya <[email protected]>
commit b0e6baf5619a6fa3eaf43b55fdb4daa362c3c916 upstream.
Support new device OKI SEMICONDUCTOR ML7223 IOH(Input/Output Hub). The ML7223 IOH is for MP(Media Phone) use.
The ML7223 is companion chip for Intel Atom E6xx series. The ML7223 is completely compatible for Intel EG20T PCH.
--- drivers/net/Kconfig | 8 +++++++- drivers/net/pch_gbe/pch_gbe_main.c | 11 +++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-)
drivers/net/Kconfig +7 -1
@@ -2533,7 +2533,7 @@ config S6GMAC source "drivers/net/stmmac/Kconfig" config PCH_GBE - tristate "PCH Gigabit Ethernet" + tristate "Intel EG20T PCH / OKI SEMICONDUCTOR ML7223 IOH GbE" depends on PCI select MII ---help---
@@ -2545,6 +2545,12 @@ config PCH_GBE to Gigabit Ethernet. This driver enables Gigabit Ethernet function. + This driver also can be used for OKI SEMICONDUCTOR IOH(Input/ + Output Hub), ML7223. + ML7223 IOH is for MP(Media Phone) use. + ML7223 is companion chip for Intel Atom E6xx series. + ML7223 is completely compatible for Intel EG20T PCH. + endif # NETDEV_1000 #
drivers/net/pch_gbe/pch_gbe_main.c +11 -0
@@ -34,6 +34,10 @@ const char pch_driver_version[] = DRV_VE#define PCH_GBE_COPYBREAK_DEFAULT 256#define PCH_GBE_PCI_BAR 1 +/* Macros for ML7223 */ +#define PCI_VENDOR_ID_ROHM 0x10db +#define PCI_DEVICE_ID_ROHM_ML7223_GBE 0x8013 +#define PCH_GBE_TX_WEIGHT 64#define PCH_GBE_RX_WEIGHT 64#define PCH_GBE_RX_BUFFER_WRITE 16
@@ -2416,6 +2420,13 @@ static DEFINE_PCI_DEVICE_TABLE(pch_gbe_p .subvendor = PCI_ANY_ID, .subdevice = PCI_ANY_ID, .class = (PCI_CLASS_NETWORK_ETHERNET << 8), + .class_mask = (0xFFFF00 ) + }, + {.vendor = PCI_VENDOR_ID_ROHM, + .device = PCI_DEVICE_ID_ROHM_ML7223_GBE, + .subvendor = PCI_ANY_ID, + .subdevice = PCI_ANY_ID, + .class = (PCI_CLASS_NETWORK_ETHERNET << 8), .class_mask = (0xFFFF00 ) },/* required last entry */
PATCH 35/71 PCH_GbE : Fixed the issue of checksum judgment
In reply to Greg KH2.6.38-stable review patch. If anyone has any objections, please let us know.
------------------
From: Toshiharu Okada <[email protected]>
commit 5d05a04d283061b586e8dc819cfa6f4b8cfd5948 upstream.
The checksum judgment was mistaken.
Judgment result
0:Correct 1:Wrong
This patch fixes the issue.
--- drivers/net/pch_gbe/pch_gbe_main.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
drivers/net/pch_gbe/pch_gbe_main.c +4 -5
@@ -1493,12 +1493,11 @@ pch_gbe_clean_rx(struct pch_gbe_adapter/* Write meta date of skb */ skb_put (skb, length); skb->protocol =eth_type_trans (skb, netdev); -if ((tcp_ip_status &PCH_GBE_RXD_ACC_STAT_TCPIPOK ) == -PCH_GBE_RXD_ACC_STAT_TCPIPOK ) { - skb->ip_summed =CHECKSUM_UNNECESSARY ; - }else { +if (tcp_ip_status &PCH_GBE_RXD_ACC_STAT_TCPIPOK ) skb->ip_summed =CHECKSUM_NONE ; - } +else + skb->ip_summed =CHECKSUM_UNNECESSARY ; +napi_gro_receive (&adapter->napi, skb); (*work_done)++; pr_debug("Receive skb->ip_summed: %d length: %d\n",
PATCH 34/71 PCH_GbE : Fixed the issue of collision detection
In reply to Greg KH2.6.38-stable review patch. If anyone has any objections, please let us know.
------------------
From: Toshiharu Okada <[email protected]>
commit ce3dad0f74e6b240f0b1dedbd8ea268a3f298d82 upstream.
The collision detection setting was invalid.
When collision occurred, because data was not resent, there was an issue to which a transmitting throughput falls.
This patch enables the collision detection.
--- drivers/net/pch_gbe/pch_gbe_main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/net/pch_gbe/pch_gbe_main.c +1 -2
@@ -43,8 +43,7 @@ const char pch_driver_version[] = DRV_VE#define PCH_GBE_MAC_RGMII_CTRL_SETTING ( \ PCH_GBE_CHIP_TYPE_INTERNAL | \ - PCH_GBE_RGMII_MODE_RGMII | \ - PCH_GBE_CRS_SEL \ + PCH_GBE_RGMII_MODE_RGMII \ )/* Ethertype field values */
Re: [57/71] block: rescan partitions on invalidated devices on -ENOMEDIA too
In reply to Tejun HeoQuoted 26 lines · Tejun Heo
Hello, Greg.
Quoted 23 lines · Greg KH
2.6.38-stable review patch. If anyone has any objections, please let us know.
------------------
From: Tejun Heo <[email protected]>
commit
02e352287a40bd456eb78df705bf888bc3161d3fupstream.
__blkdev_get()doesn't rescan partitions ifdisk->fops->open()fails, which leads to ghost partition devices lingering after medimum removal is known to both the kernel and userland. The behavior also creates a subtle inconsistency whereO_NONBLOCKopen, which doesn't fail even if there's no medium, clears the ghots partitions, which is exploited to work around the problem from userland.Fix it by updating
__blkdev_get()to issue partition rescan after-ENOMEDIAtoo.This was reported in the following bz.
Quoted 7 lines
Quoted 2 lines
Stable: 2.6.38
Can you please hold this for a while? It causes an extra warning message to be printed during device detection. It isn't harmful but still. I'll soon send a patch to resolve the issue and it would be better for them to go together.
Sure, I've dropped this one for now. Let me know when I should add it back to the next round of stable releases.
thanks,
greg k-h
PATCH 33/71 NET: slip, fix ldisc->open retval
In reply to Greg KH2.6.38-stable review patch. If anyone has any objections, please let us know.
------------------
From: Matvejchikov Ilya <[email protected]>
commit 057bef938896e6266ae24ec4266d24792d27c29a upstream.
TTY layer expects 0 if the ldisc->open operation succeeded.
--- drivers/net/slip.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/slip.c +3 -1
@@ -853,7 +853,9 @@ static int slip_open(struct tty_struct */* Done. We have linked the TTY line to a channel. */ rtnl_unlock (); tty->receive_room =65536 ;/* We don't flow control */ -return sl->dev->base_addr; + +/* TTY layer expects 0 on success */ +return 0 ; err_free_bufs:sl_free_bufs (sl);
PATCH 29/71 can: fix SJA1000 dlc for RTR packets
In reply to Greg KH2.6.38-stable review patch. If anyone has any objections, please let us know.
------------------
From: Kurt Van Dijck <[email protected]>
commit 87e9af6cc67d842cd92b52b81f3f14e665e7ab05 upstream.
RTR frames do have a valid data length code on CAN. The driver for SJA1000 did not handle that situation properly.
--- drivers/net/can/sja1000/sja1000.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/can/sja1000/sja1000.c +1 -1
@@ -346,10 +346,10 @@ static void sja1000_rx(struct net_device | (priv->read_reg(priv, REG_ID2) >> 5); } + cf->can_dlc =get_can_dlc (fi &0x0F );if (fi &FI_RTR ) { id |=CAN_RTR_FLAG ; }else { - cf->can_dlc =get_can_dlc (fi &0x0F );for (i =0 ; i < cf->can_dlc; i++) cf->data[i] = priv->read_reg (priv, dreg++); }
PATCH 27/71 PM / Hibernate: Fix ioctl SNAPSHOT_S2RAM
In reply to Greg KH2.6.38-stable review patch. If anyone has any objections, please let us know.
------------------
From: Rafael J. Wysocki <[email protected]>
commit 36cb7035ea0c11ef2c7fa2bbe0cd181b23569b29 upstream.
The SNAPSHOT_S2RAM ioctl used for implementing the feature allowing one to suspend to RAM after creating a hibernation image is currently broken, because it doesn't clear the "ready" flag in the struct snapshot_data object handled by it. As a result, the SNAPSHOT_UNFREEZE doesn't work correctly after SNAPSHOT_S2RAM has returned and the user space hibernate task cannot thaw the other processes as appropriate. Make SNAPSHOT_S2RAM clear data->ready to fix this problem.
--- kernel/power/user.c | 1 + 1 file changed, 1 insertion(+)
kernel/power/user.c +1 -0
@@ -381,6 +381,7 @@ static long snapshot_ioctl(struct file ** PM_HIBERNATION_PREPARE */ error =suspend_devices_and_enter (PM_SUSPEND_MEM ); + data->ready =0 ;break ;case SNAPSHOT_PLATFORM_SUPPORT :
PATCH 26/71 PM / Hibernate: Make snapshot_release() restore GFP mask
In reply to Greg KH2.6.38-stable review patch. If anyone has any objections, please let us know.
------------------
From: Rafael J. Wysocki <[email protected]>
commit 9744997a8a2280e67984d4bffd87221d24f3b6b1 upstream.
If the process using the hibernate user space interface closes /dev/snapshot after creating a hibernation image without thawing tasks, snapshot_release() should call pm_restore_gfp_mask() to restore the GFP mask used before the creation of the image. Make that happen.
--- kernel/power/user.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
kernel/power/user.c +3 -1
@@ -135,8 +135,10 @@ static int snapshot_release(struct inodefree_basic_memory_bitmaps (); data = filp->private_data;free_all_swap_pages (data->swap); -if (data->frozen) +if (data->frozen) { +pm_restore_gfp_mask ();thaw_processes (); + }pm_notifier_call_chain (data->mode ==O_RDONLY ?PM_POST_HIBERNATION :PM_POST_RESTORE );atomic_inc (&snapshot_device_available);
PATCH 25/71 PM: Fix warning in pm_restrict_gfp_mask() during SNAPSHOT_S2RAM ioctl
In reply to Greg KH2.6.38-stable review patch. If anyone has any objections, please let us know.
------------------
From: Rafael J. Wysocki <[email protected]>
commit 87186475a402391a1ca7d42a675c9b35a18dc348 upstream.
A warning is printed by pm_restrict_gfp_mask() while the SNAPSHOT_S2RAM ioctl is being executed after creating a hibernation image, because pm_restrict_gfp_mask() has been called once already before the image creation and suspend_devices_and_enter() calls it once again. This happens after commit 452aa6999e6703ffbddd7f6ea124d3 (mm/pm: force GFP_NOIO during suspend/hibernation and resume).
To avoid this issue, move pm_restrict_gfp_mask() and pm_restore_gfp_mask() from suspend_devices_and_enter() to its caller in kernel/power/suspend.c.
--- kernel/power/suspend.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
kernel/power/suspend.c +2 -2
@@ -209,7 +209,6 @@ int suspend_devices_and_enter(suspend_st goto Close; }suspend_console (); -pm_restrict_gfp_mask ();suspend_test_start (); error =dpm_suspend_start (PMSG_SUSPEND );if (error) {
@@ -226,7 +225,6 @@ int suspend_devices_and_enter(suspend_stsuspend_test_start ();dpm_resume_end (PMSG_RESUME );suspend_test_finish ("resume devices" ); -pm_restore_gfp_mask ();resume_console (); Close:if (suspend_ops->end)
@@ -287,7 +285,9 @@ int enter_state(suspend_state_t state) goto Finish;pr_debug ("PM: Entering %s sleep\n" , pm_states[state]); +pm_restrict_gfp_mask (); error =suspend_devices_and_enter (state); +pm_restore_gfp_mask (); Finish:pr_debug ("PM: Finishing wakeup.\n" );
PATCH 21/71 drivers/rtc/rtc-s3c.c: fixup wake support for rtc
In reply to Greg KH2.6.38-stable review patch. If anyone has any objections, please let us know.
------------------
From: Ben Dooks <[email protected]>
commit 52cd4e5c620af9e21b5298bf01844b98573505a7 upstream.
The driver is not balancing set_irq and disable_irq_wake() calls, so ensure that it keeps track of whether the wake is enabled.
The fixes the following error on S3C6410 devices:
WARNING: at kernel/irq/manage.c:382 set_irq_wake+0x84/0xec() Unbalanced IRQ 92 wake disable
--- drivers/rtc/rtc-s3c.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)
drivers/rtc/rtc-s3c.c +10 -3
@@ -46,6 +46,7 @@ static struct clk *rtc_clk;static void __iomem *s3c_rtc_base;static int s3c_rtc_alarmno =NO_IRQ ;static int s3c_rtc_tickno =NO_IRQ ; +static bool wake_en;static enum s3c_cpu_type s3c_rtc_cpu_type;static DEFINE_SPINLOCK (s3c_rtc_pie_lock);
@@ -597,8 +598,12 @@ static int s3c_rtc_suspend(struct platfo }s3c_rtc_enable (pdev,0 ); -if (device_may_wakeup (&pdev->dev)) -enable_irq_wake (s3c_rtc_alarmno); +if (device_may_wakeup (&pdev->dev) && !wake_en) { +if (enable_irq_wake (s3c_rtc_alarmno) ==0 ) + wake_en = true; +else +dev_err (&pdev->dev,"enable_irq_wake failed\n" ); + }return 0 ; }
@@ -614,8 +619,10 @@ static int s3c_rtc_resume(struct platforwritew (tmp | ticnt_en_save, s3c_rtc_base +S3C2410_RTCCON ); } -if (device_may_wakeup (&pdev->dev)) +if (device_may_wakeup (&pdev->dev) && wake_en) {disable_irq_wake (s3c_rtc_alarmno); + wake_en = false; + }return 0 ; }
PATCH 19/71 dccp: handle invalid feature options length
In reply to Greg KH2.6.38-stable review patch. If anyone has any objections, please let us know.
------------------
From: Dan Rosenberg <[email protected]>
commit a294865978b701e4d0d90135672749531b9a900d upstream.
A length of zero (after subtracting two for the type and len fields) for the DCCPO_{CHANGE,CONFIRM}_{L,R} options will cause an underflow due to the subtraction. The subsequent code may read past the end of the options value buffer when parsing. I'm unsure of what the consequences of this might be, but it's probably not good.
--- net/dccp/options.c | 2 ++ 1 file changed, 2 insertions(+)
net/dccp/options.c +2 -0
@@ -123,6 +123,8 @@ int dccp_parse_options(struct sock *sk, case DCCPO_CHANGE_L ... DCCPO_CONFIRM_R:if (pkt_type ==DCCP_PKT_DATA )/* RFC 4340, 6 */ break ; +if (len ==0 ) + goto out_invalid_option; rc =dccp_feat_parse_options (sk, dreq, mandatory, opt, *value, value +1 , len -1 );if (rc)
PATCH 18/71 drm/i915: Release object along create user fb error path
In reply to Greg KH2.6.38-stable review patch. If anyone has any objections, please let us know.
------------------
From: Chris Wilson <[email protected]>
commit 2dd251f0a294300a1cf8f4b63768145fa6153c4d upstream.
--- drivers/gpu/drm/i915/intel_display.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_display.c +3 -1
@@ -6005,8 +6005,10 @@ intel_user_framebuffer_create(struct drmreturn ERR_PTR (-ENOENT ); intel_fb =kzalloc (sizeof (*intel_fb),GFP_KERNEL ); -if (!intel_fb) +if (!intel_fb) { +drm_gem_object_unreference_unlocked (&obj->base);return ERR_PTR (-ENOMEM ); + } ret =intel_framebuffer_init (dev, intel_fb, mode_cmd, obj);if (ret) {
PATCH 17/71 drm/i915/lvds: Only act on lid notify when the device is on
In reply to Greg KH2.6.38-stable review patch. If anyone has any objections, please let us know.
------------------
From: Alex Williamson <[email protected]>
commit 2fb4e61d9471867677c97bf11dba8f1e9dfa7f7c upstream.
If we're using vga switcheroo, the device may be turned off and poking it can return random state. This provokes an OOPS fixed separately by 8ff887c847 (drm/i915/dp: Be paranoid in case we disable a DP before it is attached). Trying to use and respond to events on a device that has been turned off by the user is in principle a silly thing to do.
--- drivers/gpu/drm/i915/intel_lvds.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/i915/intel_lvds.c +3 -0
@@ -540,6 +540,9 @@ static int intel_lid_notify(struct notifstruct drm_device *dev = dev_priv->dev;struct drm_connector *connector = dev_priv->int_lvds_connector; +if (dev->switch_power_state !=DRM_SWITCH_POWER_ON ) +return NOTIFY_OK ; +/* * check and update the status of LVDS connector after receiving * the LID nofication event.
PATCH 12/71 iwlwifi: add {ack, plpc}_check module parameters
In reply to Greg KH2.6.38-stable review patch. If anyone has any objections, please let us know.
------------------
From: Stanislaw Gruszka <[email protected]>
commit b7977ffaab5187ad75edaf04ac854615cea93828 upstream.
Add module ack_check, and plcp_check parameters. Ack_check is disabled by default since is proved that check ack health can cause troubles. Plcp_check is enabled by default.
This prevent connection hangs with "low ack count detected" messages.
Resolves:
https://bugzilla.redhat.com/show_bug.cgi?id=666646
--- drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 1 + drivers/net/wireless/iwlwifi/iwl-agn.c | 6 ++++++ drivers/net/wireless/iwlwifi/iwl-core.h | 2 ++ drivers/net/wireless/iwlwifi/iwl-rx.c | 8 ++++++-- 4 files changed, 15 insertions(+), 2 deletions(-)
drivers/net/wireless/iwlwifi/iwl-agn-lib.c +1 -0
@@ -604,6 +604,7 @@ const u8 *iwlagn_eeprom_query_addr(conststruct iwl_mod_params iwlagn_mod_params = { .amsdu_size_8K =1 , .restart_fw =1 , + .plcp_check = true,/* the rest are 0 by default */ };
drivers/net/wireless/iwlwifi/iwl-agn.c +6 -0
@@ -4586,3 +4586,9 @@ MODULE_PARM_DESC(antenna_coupling,module_param_named (bt_ch_inhibition, iwlagn_bt_ch_announce, bool,S_IRUGO );MODULE_PARM_DESC (bt_ch_inhibition,"Disable BT channel inhibition (default: enable)" ); + +module_param_named (plcp_check, iwlagn_mod_params.plcp_check, bool,S_IRUGO ); +MODULE_PARM_DESC (plcp_check,"Check plcp health (default: 1 [enabled])" ); + +module_param_named (ack_check, iwlagn_mod_params.ack_check, bool,S_IRUGO ); +MODULE_PARM_DESC (ack_check,"Check ack health (default: 0 [disabled])" );
drivers/net/wireless/iwlwifi/iwl-core.h +2 -0
@@ -263,6 +263,8 @@ struct iwl_mod_params {int amsdu_size_8K;/* def: 1 = enable 8K amsdu size */ int antenna;/* def: 0 = both antennas (use diversity) */ int restart_fw;/* def: 1 = restart firmware */ +bool plcp_check;/* def: true = enable plcp health check */ +bool ack_check;/* def: false = disable ack health check */ };/*
drivers/net/wireless/iwlwifi/iwl-rx.c +6 -2
@@ -234,10 +234,13 @@ EXPORT_SYMBOL(iwl_rx_spectrum_measure_novoid iwl_recover_from_statistics (struct iwl_priv *priv,struct iwl_rx_packet *pkt) { +const struct iwl_mod_params *mod_params = priv->cfg->mod_params; +if (test_bit (STATUS_EXIT_PENDING , &priv->status))return ;if (iwl_is_any_associated (priv)) { -if (priv->cfg->ops->lib->check_ack_health) { +if (mod_params->ack_check && + priv->cfg->ops->lib->check_ack_health) {if (!priv->cfg->ops->lib->check_ack_health ( priv, pkt)) {/*
@@ -250,7 +253,8 @@ void iwl_recover_from_statistics(structreturn ; } } -if (priv->cfg->ops->lib->check_plcp_health) { +if (mod_params->plcp_check && + priv->cfg->ops->lib->check_plcp_health) {if (!priv->cfg->ops->lib->check_plcp_health ( priv, pkt)) {/*
PATCH 8/71 thinkpad-acpi: module autoloading for newer Lenovo ThinkPads.
In reply to Greg KH2.6.38-stable review patch. If anyone has any objections, please let us know.
------------------
From: Manoj Iyer <[email protected]>
commit 9fbdaeb4f4dd14a0caa9fc35c496d5440c251a3a upstream.
The newer Lenovo ThinkPads have HKEY HID of LEN0068 instead of IBM0068. Added new HID so that thinkpad_acpi module will auto load on these newer Lenovo ThinkPads.
--- drivers/platform/x86/thinkpad_acpi.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/platform/x86/thinkpad_acpi.c +4 -2
@@ -128,7 +128,8 @@ enum { };/* ACPI HIDs */ -#define TPACPI_ACPI_HKEY_HID "IBM0068" +#define TPACPI_ACPI_IBM_HKEY_HID "IBM0068" +#define TPACPI_ACPI_LENOVO_HKEY_HID "LEN0068"#define TPACPI_ACPI_EC_HID "PNP0C09"/* Input IDs */
@@ -3879,7 +3880,8 @@ errexit: }static const struct acpi_device_id ibm_htk_device_ids[] = { - {TPACPI_ACPI_HKEY_HID ,0 }, + {TPACPI_ACPI_IBM_HKEY_HID ,0 }, + {TPACPI_ACPI_LENOVO_HKEY_HID ,0 }, {"" ,0 }, };
PATCH 5/71 cifs: handle errors from coalesce_t2
In reply to Greg KH2.6.38-stable review patch. If anyone has any objections, please let us know.
------------------
From: Jeff Layton <[email protected]>
commit 16541ba11c4f04ffe94b073e301f00b749fb84a1 upstream.
cifs_demultiplex_thread calls coalesce_t2 to try and merge follow-on t2 responses into the original mid buffer. coalesce_t2 however can return errors, but the caller doesn't handle that situation properly. Fix the thread to treat such a case as it would a malformed packet. Mark the mid as being malformed and issue the callback.
--- fs/cifs/connect.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
fs/cifs/connect.c +7 -3
@@ -631,12 +631,16 @@ incomplete_rcv: isMultiRsp = true;if (mid_entry->resp_buf) {/* merge response - fix up 1st*/ -if (coalesce_t2 (smb_buffer, - mid_entry->resp_buf)) { + length =coalesce_t2 (smb_buffer, + mid_entry->resp_buf); +if (length >0 ) { + length =0 ; mid_entry->multiRsp = true;break ; }else { -/* all parts received */ +/* all parts received or +* packet is malformed +*/ mid_entry->multiEnd = true; goto multi_t2_fnd; }
cover 2.6.38.7-stable review
This is the start of the stable review cycle for the 2.6.38.7 release. There are 71 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let us know. If anyone is a maintainer of the proper subsystem, and wants to add a Signed-off-by: line to the patch, please respond with it.
Responses should be made by Sunday, May 22 2011, 18:00:00 UTC. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
kernel.org/pub/linux/kernel/v2.6/stable-review/patch-2.6.38.7-rc1.gz
and the diffstat can be found below.
thanks,
greg k-h
Makefile | 2 +- arch/arm/boot/compressed/Makefile | 2 +- arch/arm/boot/compressed/vmlinux.lds.in | 1 + arch/powerpc/kernel/ptrace.c | 12 ++- arch/x86/include/asm/apicdef.h | 1 + arch/x86/include/asm/uv/uv_bau.h | 17 +++- arch/x86/kernel/cpu/amd.c | 4 +- arch/x86/kernel/cpu/mcheck/mce_amd.c | 1 + arch/x86/kernel/cpu/mcheck/therm_throt.c | 12 ++- arch/x86/kernel/ptrace.c | 36 +++++-- arch/x86/platform/uv/tlb_uv.c | 92 +++++++++++----- drivers/ata/libata-eh.c | 2 +- drivers/cdrom/cdrom.c | 6 +- drivers/gpu/drm/i915/intel_display.c | 4 +- drivers/gpu/drm/i915/intel_dp.c | 17 +++- drivers/gpu/drm/i915/intel_lvds.c | 3 + drivers/gpu/drm/radeon/evergreen.c | 17 ++-- drivers/gpu/drm/radeon/evergreend.h | 5 + drivers/gpu/drm/radeon/radeon_atombios.c | 18 +++- drivers/gpu/drm/radeon/radeon_kms.c | 3 + drivers/media/video/cx88/cx88-input.c | 2 +- drivers/media/video/v4l2-device.c | 5 +- drivers/mmc/core/host.c | 9 +- drivers/net/Kconfig | 8 ++- drivers/net/Makefile | 6 +- drivers/net/can/sja1000/sja1000.c | 2 +- drivers/net/can/slcan.c | 4 +- drivers/net/ehea/ehea_ethtool.c | 21 +++-- drivers/net/ehea/ehea_main.c | 6 +- drivers/net/hydra.c | 14 ++-- drivers/net/ne-h8300.c | 16 ++-- drivers/net/pch_gbe/pch_gbe_main.c | 23 +++-- drivers/net/slip.c | 4 +- drivers/net/usb/ipheth.c | 14 ++- drivers/net/vmxnet3/vmxnet3_drv.c | 10 +- drivers/net/vmxnet3/vmxnet3_ethtool.c | 3 + drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 1 + drivers/net/wireless/iwlwifi/iwl-agn.c | 6 + drivers/net/wireless/iwlwifi/iwl-core.h | 2 + drivers/net/wireless/iwlwifi/iwl-legacy.c | 7 ++ drivers/net/wireless/iwlwifi/iwl-rx.c | 8 +- drivers/net/wireless/libertas/cmd.c | 6 +- drivers/net/zorro8390.c | 12 +- drivers/platform/x86/thinkpad_acpi.c | 6 +- drivers/rapidio/switches/idt_gen2.c | 9 ++ drivers/rapidio/switches/idtcps.c | 6 + drivers/rapidio/switches/tsi57x.c | 6 + drivers/rtc/rtc-s3c.c | 13 ++- drivers/scsi/megaraid/megaraid_sas_base.c | 3 + drivers/scsi/sd.c | 63 +++--------- fs/block_dev.c | 27 +++-- fs/cifs/cifs_unicode.c | 49 ++++----- fs/cifs/cifs_unicode.h | 2 +- fs/cifs/connect.c | 130 +++++++++++++---------- fs/cifs/sess.c | 19 +--- fs/partitions/efi.c | 6 + fs/proc/task_mmu.c | 12 ++- include/drm/radeon_drm.h | 1 + include/linux/bootmem.h | 2 + include/linux/mm.h | 24 ++++- include/linux/mmc/host.h | 1 + include/linux/ptrace.h | 13 ++- include/linux/sched.h | 3 + kernel/exit.c | 2 +- kernel/power/suspend.c | 4 +- kernel/power/user.c | 5 +- kernel/ptrace.c | 17 +++ kernel/time/clocksource.c | 4 +- kernel/time/tick-broadcast.c | 12 ++- mm/memory.c | 16 ++-- mm/mmap.c | 11 ++- mm/page_alloc.c | 7 +- mm/shmem.c | 155 ++++++++++++++++------------ net/core/dev.c | 10 +- net/dccp/options.c | 2 + net/ipv4/ip_fragment.c | 33 +++--- sound/soc/codecs/ssm2602.c | 2 +- sound/soc/codecs/uda134x.c | 2 - 78 files changed, 703 insertions(+), 418 deletions(-)
PATCH 3/71 cifs: sanitize length checking in coalesce_t2 (try #3)
2.6.38-stable review patch. If anyone has any objections, please let us know.
------------------
From: Jeff Layton <[email protected]>
commit 2a2047bc94d0efc316401170c3d078d9edc20dc4 upstream.
There are a couple of places in this code where these values can wrap or go negative, and that could potentially end up overflowing the buffer. Ensure that that doesn't happen. Do all of the length calculation and checks first, and only perform the memcpy after they pass.
Also, increase some stack variables to 32 bits to ensure that they don't wrap without being detected.
Finally, change the error codes to be a bit more descriptive of any problems detected. -EINVAL isn't very accurate.
--- fs/cifs/connect.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-)
fs/cifs/connect.c +16 -6
@@ -275,7 +275,8 @@ static int coalesce_t2(struct smb_hdr *pchar *data_area_of_target;char *data_area_of_buf2;int remaining; -__u16 byte_count, total_data_size, total_in_buf, total_in_buf2; +unsigned int byte_count, total_in_buf; +__u16 total_data_size, total_in_buf2; total_data_size =get_unaligned_le16 (&pSMBt->t2_rsp.TotalDataCount);
@@ -288,7 +289,7 @@ static int coalesce_t2(struct smb_hdr *p remaining = total_data_size - total_in_buf;if (remaining <0 ) -return -EINVAL ; +return -EPROTO ;if (remaining ==0 )/* nothing to do, ignore */ return 0 ;
@@ -309,20 +310,29 @@ static int coalesce_t2(struct smb_hdr *p data_area_of_target += total_in_buf;/* copy second buffer into end of first buffer */ -memcpy (data_area_of_target, data_area_of_buf2, total_in_buf2); total_in_buf += total_in_buf2; +/* is the result too big for the field? */ +if (total_in_buf >USHRT_MAX ) +return -EPROTO ;put_unaligned_le16 (total_in_buf, &pSMBt->t2_rsp.DataCount); + +/* fix up the BCC */ byte_count =get_bcc_le (pTargetSMB); byte_count += total_in_buf2; +/* is the result too big for the field? */ +if (byte_count >USHRT_MAX ) +return -EPROTO ;put_bcc_le (byte_count, pTargetSMB); byte_count = pTargetSMB->smb_buf_length; byte_count += total_in_buf2; - -/* BB also add check that we are not beyond maximum buffer size */ - +/* don't allow buffer to overflow */ +if (byte_count > CIFSMaxBufSize) +return -ENOBUFS ; pTargetSMB->smb_buf_length = byte_count; +memcpy (data_area_of_target, data_area_of_buf2, total_in_buf2); +if (remaining == total_in_buf2) {cFYI (1 ,"found the last secondary response" );return 0 ;/* we are done */
Re: [29/71] can: fix SJA1000 dlc for RTR packets
In reply to Greg KHQuoted 1 line · Greg KH
2.6.38-stable review patch. If anyone has any objections, please let us know.
IMO this patch is worth backporting to 2.6.38.
No objections :-)
Kurt
Re: [08/71] thinkpad-acpi: module autoloading for newer Lenovo ThinkPads.
In reply to Greg KHQuoted 1 line · Greg KH
2.6.38-stable review patch. If anyone has any objections, please let us know.
No objections. I am just replying to note that this patch is useful to all current stable and longterm releases.
Quoted 44 lines
------------------
From: Manoj Iyer <[email protected]>
commit
9fbdaeb4f4dd14a0caa9fc35c496d5440c251a3aupstream.The newer Lenovo ThinkPads have HKEY HID of LEN0068 instead of IBM0068. Added new HID so that
thinkpad_acpimodule will auto load on these newer Lenovo ThinkPads.Signed-off-by Manoj Iyer <[email protected]>Signed-off-by Andy Lutomirski <[email protected]>Signed-off-by Matthew Garrett <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>--- drivers/platform/x86/thinkpad_acpi.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)drivers/platform/x86/thinkpad_acpi.c +4
-2@@ -128,7 +128,8 @@ enum { };/* ACPI HIDs */ -#define TPACPI_ACPI_HKEY_HID "IBM0068" +#define TPACPI_ACPI_IBM_HKEY_HID "IBM0068" +#define TPACPI_ACPI_LENOVO_HKEY_HID "LEN0068"#define TPACPI_ACPI_EC_HID "PNP0C09"/* Input IDs */ @@ -3879,7 +3880,8 @@ errexit: }static const struct acpi_device_id ibm_htk_device_ids[] = { - {TPACPI_ACPI_HKEY_HID ,0 }, + {TPACPI_ACPI_IBM_HKEY_HID ,0 }, + {TPACPI_ACPI_LENOVO_HKEY_HID ,0 }, {"" ,0 }, };
Signature · 4 lines
"One disk to rule them all, One disk to find them. One disk to bring them all and in the darkness grind them. In the Land of Redmond where the shadows lie." -- The Silicon Valley Tarot Henrique Holschuh
Hugh Dickins
maintainerRe: [23/71] tmpfs: fix race between umount and swapoff
In reply to Greg KHQuoted 1 line · Greg KH
2.6.38-stable review patch. If anyone has any objections, please let us know.
Witold has found that I screwed up the highmem case in this patch. Please add the commit appended at the bottom - or else delay both until the next 2.6.38-stable if you prefer.
Thanks,
Hugh
Quoted 189 lines
------------------
From: Hugh Dickins <[email protected]>
commit
778dd893ae785c5fd505dac30b5fc40aae188bf1upstream.The use of
igrab()in swapoff'sshmem_unuse_inode()is just as vulnerable to umount as that inshmem_writepage().Fix this instance by extending the protection of
shmem_swaplist_mutexright acrossshmem_unuse_inode(): while it's on the list, the inode cannot be evicted (and the filesystem cannot be unmounted) withoutshmem_evict_inode()taking that mutex to remove it from the list.But since
shmem_writepage()might take that mutex, we should avoid making memory allocations or memcg charges while holding it: prepare them at the outer level inshmem_unuse(). Whenmem_cgroup_cache_charge()was originally placed, we didn't know until that point that the page from swap was actually a shmem page; but nowadays it's noted in theswap_map, so we're safe to charge upfront. For theradix_tree, do as is done inshmem_getpage(): preload upfront, but don't pin to the cpu; so we make a habit of refreshing the node pool, but might dip intoGFP_NOWAITreserves on occasion if subsequently preempted.With the allocation and charge moved out from
shmem_unuse_inode(), we can also hold index map andinfo->lockover from finding the entry.Signed-off-by Hugh Dickins <[email protected]>Cc Konstantin Khlebnikov <[email protected]>Signed-off-by Andrew Morton <[email protected]>Signed-off-by Linus Torvalds <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>--- mm/shmem.c | 88 +++++++++++++++++++++++++++++-------------------------------- 1 file changed, 43 insertions(+), 45 deletions(-)mm/shmem.c +40
-43@@ -852,7 +852,7 @@ static inline int shmem_find_swp(swp_entstatic int shmem_unuse_inode (struct shmem_inode_info *info,swp_entry_t entry,struct page *page) { -struct inode *inode; +struct address_space *mapping;unsigned long idx;unsigned long size;unsigned long limit;@@ -875,8 +875,10 @@ static int shmem_unuse_inode(struct shmeif (size >SHMEM_NR_DIRECT ) size =SHMEM_NR_DIRECT ; offset =shmem_find_swp (entry, ptr, ptr+size); -if (offset >=0 ) +if (offset >=0 ) { +shmem_swp_balance_unmap (); goto found; + }if (!info->i_indirect) goto lost2;@@ -914,11 +916,11 @@ static int shmem_unuse_inode(struct shmeif (size >ENTRIES_PER_PAGE ) size =ENTRIES_PER_PAGE ; offset =shmem_find_swp (entry, ptr, ptr+size); -shmem_swp_unmap (ptr);if (offset >=0 ) {shmem_dir_unmap (dir); goto found; } +shmem_swp_unmap (ptr); } } lost1:@@ -928,8 +930,7 @@ lost2:return 0 ; found: idx += offset; - inode =igrab (&info->vfs_inode); -spin_unlock (&info->lock); + ptr += offset;/* * Move _head_ to start search for next from here. @@ -940,37 +941,18 @@ found:*/ if (shmem_swaplist.next != &info->swaplist)list_move_tail (&shmem_swaplist, &info->swaplist); -mutex_unlock (&shmem_swaplist_mutex); - error =1 ; -if (!inode) - goto out;/* -* Charge page using GFP_KERNEL while we can wait. -* Charged back to the user(not to caller) when swap account is used. -* add_to_page_cache() will be called with GFP_NOWAIT. +* We rely on shmem_swaplist_mutex, not only to protect the swaplist, +* but also to hold up shmem_evict_inode(): so inode cannot be freed +* beneath us (pagelock doesn't help until the page is in pagecache). */ - error =mem_cgroup_cache_charge (page, current->mm,GFP_KERNEL ); -if (error) - goto out; - error =radix_tree_preload (GFP_KERNEL ); -if (error) { -mem_cgroup_uncharge_cache_page (page); - goto out; - } - error =1 ; - -spin_lock (&info->lock); - ptr =shmem_swp_entry (info, idx,NULL ); -if (ptr && ptr->val == entry.val) { - error =add_to_page_cache_locked (page, inode->i_mapping, - idx,GFP_NOWAIT ); -/* does mem_cgroup_uncharge_cache_page on error */ - }else /* we must compensate for our precharge above */ -mem_cgroup_uncharge_cache_page (page); + mapping = info->vfs_inode.i_mapping; + error =add_to_page_cache_locked (page, mapping, idx,GFP_NOWAIT ); +/* which does mem_cgroup_uncharge_cache_page on error */ if (error == -EEXIST ) { -struct page *filepage =find_get_page (inode->i_mapping, idx); +struct page *filepage =find_get_page (mapping, idx); error =1 ;if (filepage) {/* @@ -990,14 +972,8 @@ found:swap_free (entry); error =1 ;/* not an error, but entry was found */ } -if (ptr) -shmem_swp_unmap (ptr); +shmem_swp_unmap (ptr);spin_unlock (&info->lock); -radix_tree_preload_end (); -out: -unlock_page (page); -page_cache_release (page); -iput (inode);/* allows for NULL */ return error; }@@ -1009,6 +985,26 @@ int shmem_unuse(swp_entry_t entry, strucstruct list_head *p, *next;struct shmem_inode_info *info;int found =0 ; +int error; + +/* +* Charge page using GFP_KERNEL while we can wait, before taking +* the shmem_swaplist_mutex which might hold up shmem_writepage(). +* Charged back to the user (not to caller) when swap account is used. +* add_to_page_cache() will be called with GFP_NOWAIT. +*/ + error =mem_cgroup_cache_charge (page, current->mm,GFP_KERNEL ); +if (error) + goto out; +/* +* Try to preload while we can wait, to not make a habit of +* draining atomic reserves; but don't latch on to this cpu, +* it's okay if sometimes we get rescheduled after this. +*/ + error =radix_tree_preload (GFP_KERNEL ); +if (error) + goto uncharge; +radix_tree_preload_end ();mutex_lock (&shmem_swaplist_mutex);list_for_each_safe (p, next, &shmem_swaplist) {@@ -1016,17 +1012,19 @@ int shmem_unuse(swp_entry_t entry, struc found =shmem_unuse_inode (info, entry, page);cond_resched ();if (found) - goto out; +break ; }mutex_unlock (&shmem_swaplist_mutex); -/* -* Can some race bring us here? We've been holding page lock, -* so I think not; but would rather try again later than BUG() -*/ + +uncharge: +if (!found) +mem_cgroup_uncharge_cache_page (page); +if (found <0 )
mm/shmem.c int shmem_unuse(swp_entry_t entry, struc · line 1030
Quoted 10 lines
mm/shmem.c +3
-2+ error = found; +out:unlock_page (page);page_cache_release (page); -out: -return (found <0 ) ? found :0 ; +return error; }/*
commit e6c9366b2adb52cba64b359b3050200743c7568c
Author: Hugh Dickins <[email protected]> Date: Fri May 20 15:47:33 2011 -0700
tmpfs: fix highmem swapoff crash regression
Commit 778dd893ae78 ("tmpfs: fix race between umount and swapoff") forgot the new rules for strict atomic kmap nesting, causing
WARNING: at arch/x86/mm/highmem_32.c:81
from __kunmap_atomic(), then
BUG: unable to handle kernel paging request at fffb9000
from shmem_swp_set() when shmem_unuse_inode() is handling swapoff with highmem in use. My disgrace again.
See
https://bugzilla.kernel.org/show_bug.cgi?id=35352
mm/shmem.c +2 -1
@@ -916,11 +916,12 @@ static int shmem_unuse_inode(struct shmem_inode_info *info, swp_entry_t entry, sif (size >ENTRIES_PER_PAGE ) size =ENTRIES_PER_PAGE ; offset =shmem_find_swp (entry, ptr, ptr+size); +shmem_swp_unmap (ptr);if (offset >=0 ) {shmem_dir_unmap (dir); + ptr =shmem_swp_map (subdir); goto found; } -shmem_swp_unmap (ptr); } } lost1:
Re: [23/71] tmpfs: fix race between umount and swapoff
Quoted 6 lines · Hugh Dickins
Quoted 1 line · Greg KH
2.6.38-stable review patch. If anyone has any objections, please let us know.
Witold has found that I screwed up the highmem case in this patch. Please add the commit appended at the bottom - or else delay both until the next 2.6.38-stable if you prefer.
Ok, I've queued this one up as well.
thanks,
greg k-h
Re: [57/71] block: rescan partitions on invalidated devices on -ENOMEDIA too
In reply to Greg KHHello, Greg.
Quoted 8 lines · Greg KH
Quoted 4 lines · Tejun Heo
Can you please hold this for a while? It causes an extra warning message to be printed during device detection. It isn't harmful but still. I'll soon send a patch to resolve the issue and it would be better for them to go together.
Sure, I've dropped this one for now. Let me know when I should add it back to the next round of stable releases.
ff2a9941ca (block: move bd_set_size() above rescan_partitions() in __blkdev_get()) which fixes the warning is now in mainline. Please apply this and ff2a9941ca to the next -stable. I also noted it in the commit message of ff2a9941ca.
Thanks.
Signature · 1 line
tejun
Re: [stable] [57/71] block: rescan partitions on invalidated devices on -ENOMEDIA too
Quoted 9 lines · Tejun Heo
Hello, Greg.
Quoted 6 lines · Greg KH
Quoted 4 lines · Tejun Heo
Can you please hold this for a while? It causes an extra warning message to be printed during device detection. It isn't harmful but still. I'll soon send a patch to resolve the issue and it would be better for them to go together.
Quoted 7 lines
Quoted 2 lines
Sure, I've dropped this one for now. Let me know when I should add it back to the next round of stable releases.
ff2a9941ca(block: movebd_set_size()aboverescan_partitions()in__blkdev_get()) which fixes the warning is now in mainline. Please apply this andff2a9941cato the next -stable. I also noted it in the commit message offf2a9941ca.
Now done, thanks for letting me know.
greg k-h