3.0.34-stable review
Subsystems (29)
Greg KH
maintainercover 3.0.34-stable review
This is the start of the stable review cycle for the 3.0.34 release. There are 48 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 me know.
Responses should be made by Sat Jun 9 04:13:55 UTC 2012. 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/v3.0/stable-review/patch-3.0.34-rc1.gz
and the diffstat can be found below.
thanks,
greg k-h
-------------
Makefile | 4 +- arch/parisc/kernel/entry.S | 30 ++++++++------ arch/parisc/kernel/vmlinux.lds.S | 6 ++- arch/x86/include/asm/pgtable-3level.h | 50 +++++++++++++++++++++++ drivers/acpi/battery.c | 10 ++++- drivers/atm/solos-pci.c | 4 +- drivers/bluetooth/ath3k.c | 6 +++ drivers/bluetooth/btusb.c | 16 +++++++- drivers/gpu/drm/i915/intel_sdvo.c | 12 ++++-- drivers/gpu/drm/i915/intel_sdvo_regs.h | 5 +++ drivers/gpu/drm/i915/intel_tv.c | 5 +++ drivers/gpu/drm/radeon/evergreen.c | 9 +++- drivers/gpu/drm/radeon/evergreend.h | 1 + drivers/gpu/drm/radeon/radeon_atombios.c | 4 +- drivers/gpu/drm/radeon/rv770.c | 2 + drivers/gpu/drm/radeon/rv770d.h | 1 + drivers/gpu/drm/ttm/ttm_bo.c | 1 + drivers/mtd/nand/nand_bbt.c | 1 + drivers/net/macvlan.c | 2 +- drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 1 + drivers/net/wireless/wl1251/sdio.c | 2 +- drivers/net/wireless/wl1251/spi.c | 3 +- drivers/scsi/scsi_lib.c | 11 +++-- drivers/scsi/scsi_wait_scan.c | 2 +- fs/cifs/cifsglob.h | 1 + fs/cifs/file.c | 57 +++++++++++++++----------- fs/ext4/ioctl.c | 12 ++++-- fs/ext4/mballoc.c | 6 ++- fs/ext4/super.c | 4 +- fs/namespace.c | 3 +- fs/nfs/nfs4proc.c | 2 + include/asm-generic/pgtable.h | 22 +++++++++- include/drm/drm_pciids.h | 2 + include/linux/netdevice.h | 9 ---- include/linux/skbuff.h | 2 - include/net/dst.h | 1 + include/net/sctp/sctp.h | 13 ++++++ mm/vmscan.c | 2 +- net/8021q/vlan_dev.c | 2 +- net/core/dev.c | 36 +++------------- net/core/pktgen.c | 10 ++++- net/ipv4/esp4.c | 24 ++++------- net/ipv4/fib_semantics.c | 20 +++++---- net/ipv4/fib_trie.c | 2 + net/ipv6/esp6.c | 18 ++++---- net/ipv6/ip6_output.c | 68 +++++++++++++++++++++++-------- net/l2tp/l2tp_ip.c | 30 +++++++++++--- net/mac80211/util.c | 12 +++--- net/sctp/output.c | 4 +- net/sctp/transport.c | 17 -------- net/xfrm/xfrm_policy.c | 3 ++ sound/usb/pcm.c | 3 ++ 52 files changed, 375 insertions(+), 198 deletions(-)
Greg KH
maintainerPATCH 1/47 SCSI: fix scsi_wait_scan
3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: James Bottomley <[email protected]>
commit 1ff2f40305772b159a91c19590ee159d3a504afc upstream.
Commit c751085943362143f84346d274e0011419c84202
Author: Rafael J. Wysocki <[email protected]> Date: Sun Apr 12 20:06:56 2009 +0200
PM/Hibernate: Wait for SCSI devices scan to complete during resume
Broke the scsi_wait_scan module in 2.6.30. Apparently debian still uses it so fix it and backport to stable before removing it in 3.6.
The breakage is caused because the function template in include/scsi/scsi_scan.h is defined to be a nop unless SCSI is built in. That means that in the modular case (which is every distro), the scsi_wait_scan module does a simple async_synchronize_full() instead of waiting for scans.
--- drivers/scsi/scsi_wait_scan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/scsi_wait_scan.c +1 -1
@@ -12,7 +12,7 @@#include <linux/module.h> #include <linux/device.h> -#include <scsi/scsi_scan.h> +#include "scsi_priv.h" static int __init wait_scan_init (void ) {
Greg KH
maintainerPATCH 2/47 SCSI: Fix dm-multipath starvation when scsi host is busy
In reply to Greg KH3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jun'ichi Nomura <[email protected]>
commit b7e94a1686c5daef4f649f7f4f839cc294f07710 upstream.
block congestion control doesn't have any concept of fairness across multiple queues. This means that if SCSI reports the host as busy in the queue congestion control it can result in an unfair starvation situation in dm-mp if there are multiple multipath devices on the same host. For example:
http://www.redhat.com/archives/dm-devel/2012-May/msg00123.html
The fix for this is to report only the sdev busy state (and ignore the host busy state) in the block congestion control call back. The host is still congested, but the SCSI subsystem will sort out the congestion in a fair way because it knows the relation between the queues and the host.
--- drivers/scsi/scsi_lib.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
drivers/scsi/scsi_lib.c +7 -4
@@ -1380,16 +1380,19 @@ static int scsi_lld_busy(struct request_ {struct scsi_device *sdev = q->queuedata;struct Scsi_Host *shost; -struct scsi_target *starget;if (!sdev)return 0 ; shost = sdev->host; - starget =scsi_target (sdev); -if (scsi_host_in_recovery (shost) ||scsi_host_is_busy (shost) || -scsi_target_is_busy (starget) ||scsi_device_is_busy (sdev)) +/* +* Ignore host/starget busy state. +* Since block layer does not have a concept of fairness across +* multiple queues, congestion of host/starget needs to be handled +* in SCSI layer. +*/ +if (scsi_host_in_recovery (shost) ||scsi_device_is_busy (sdev))return 1 ;return 0 ;
Greg KH
maintainerPATCH 3/47 mm: consider all swapped back pages in used-once logic
In reply to Greg KH3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michal Hocko <[email protected]>
commit e48982734ea0500d1eba4f9d96195acc5406cad6 upstream.
Commit 645747462435 ("vmscan: detect mapped file pages used only once") made mapped pages have another round in inactive list because they might be just short lived and so we could consider them again next time. This heuristic helps to reduce pressure on the active list with a streaming IO worklods.
This patch fixes a regression introduced by this commit for heavy shmem based workloads because unlike Anon pages, which are excluded from this heuristic because they are usually long lived, shmem pages are handled as a regular page cache.
This doesn't work quite well, unfortunately, if the workload is mostly backed by shmem (in memory database sitting on 80% of memory) with a streaming IO in the background (backup - up to 20% of memory). Anon inactive list is full of (dirty) shmem pages when watermarks are hit. Shmem pages are kept in the inactive list (they are referenced) in the first round and it is hard to reclaim anything else so we reach lower scanning priorities very quickly which leads to an excessive swap out.
Let's fix this by excluding all swap backed pages (they tend to be long lived wrt. the regular page cache anyway) from used-once heuristic and rather activate them if they are referenced.
The customer's workload is shmem backed database (80% of RAM) and they are measuring transactions/s with an IO in the background (20%). Transactions touch more or less random rows in the table. The transaction rate fell by a factor of 3 (in the worst case) because of commit 64574746. This patch restores the previous numbers.
--- mm/vmscan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
mm/vmscan.c +1 -1
@@ -665,7 +665,7 @@ static enum page_references page_check_rreturn PAGEREF_RECLAIM ;if (referenced_ptes) { -if (PageAnon (page)) +if (PageSwapBacked (page))return PAGEREF_ACTIVATE ;/* * All mapped pages start out with page table
Greg KH
maintainerPATCH 4/47 mm: pmd_read_atomic: fix 32bit PAE pmd walk vs pmd_populate SMP race condition
In reply to Greg KH3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andrea Arcangeli <[email protected]>
commit 26c191788f18129af0eb32a358cdaea0c7479626 upstream.
When holding the mmap_sem for reading, pmd_offset_map_lock should only run on a pmd_t that has been read atomically from the pmdp pointer, otherwise we may read only half of it leading to this crash.
PID: 11679 TASK: f06e8000 CPU: 3 COMMAND: "do_race_2_panic"
#0 [f06a9dd8] crash_kexec at c049b5ec
#1 [f06a9e2c] oops_end at c083d1c2
#2 [f06a9e40] no_context at c0433ded
#3 [f06a9e64] bad_area_nosemaphore at c043401a #4 [f06a9e6c] __do_page_fault at c0434493
#5 [f06a9eec] do_page_fault at c083eb45
#6 [f06a9f04] error_code (via page_fault) at c083c5d5
EAX: 01fb470c EBX: fff35000 ECX: 00000003 EDX: 00000100 EBP:
00000000
DS: 007b ESI: 9e201000 ES: 007b EDI: 01fb4700 GS: 00e0
CS: 0060 EIP: c083bc14 ERR: ffffffff EFLAGS: 00010246
#7 [f06a9f38] _spin_lock at c083bc14
#8 [f06a9f44] sys_mincore at c0507b7d
#9 [f06a9fb0] system_call at c083becd
start len
EAX: ffffffda EBX: 9e200000 ECX: 00001000 EDX: 6228537f
DS: 007b ESI: 00000000 ES: 007b EDI: 003d0f00
SS: 007b ESP: 62285354 EBP: 62285388 GS: 0033
CS: 0073 EIP: 00291416 ERR: 000000da EFLAGS: 00000286This should be a longstanding bug affecting x86 32bit PAE without THP. Only archs with 64bit large pmd_t and 32bit unsigned long should be affected.
With THP enabled the barrier() in pmd_none_or_trans_huge_or_clear_bad() would partly hide the bug when the pmd transition from none to stable, by forcing a re-read of the *pmd in pmd_offset_map_lock, but when THP is enabled a new set of problem arises by the fact could then transition freely in any of the none, pmd_trans_huge or pmd_trans_stable states. So making the barrier in pmd_none_or_trans_huge_or_clear_bad() unconditional isn't good idea and it would be a flakey solution.
This should be fully fixed by introducing a pmd_read_atomic that reads the pmd in order with THP disabled, or by reading the pmd atomically with cmpxchg8b with THP enabled.
Luckily this new race condition only triggers in the places that must already be covered by pmd_none_or_trans_huge_or_clear_bad() so the fix is localized there but this bug is not related to THP.
NOTE: this can trigger on x86 32bit systems with PAE enabled with more than 4G of ram, otherwise the high part of the pmd will never risk to be truncated because it would be zero at all times, in turn so hiding the SMP race.
This bug was discovered and fully debugged by Ulrich, quote:
----
[..]pmd_none_or_trans_huge_or_clear_bad() loads the content of edx and eax.
496 static inline int pmd_none_or_trans_huge_or_clear_bad(pmd_t
*pmd)
497 {
498 /* depend on compiler for an atomic pmd read */
499 pmd_t pmdval = *pmd;
// edi = pmd pointer
0xc0507a74 <sys_mincore+548>: mov 0x8(%esp),%edi
...
// edx = PTE page table high address
0xc0507a84 <sys_mincore+564>: mov 0x4(%edi),%edx
...
// eax = PTE page table low address0xc0507a8e <sys_mincore+574>: mov (%edi),%eax
[..]
Please note that the PMD is not read atomically. These are two "mov" instructions where the high order bits of the PMD entry are fetched first. Hence, the above machine code is prone to the following race.
- The PMD entry {high|low} is 0x0000000000000000. The "mov" at 0xc0507a84 loads 0x00000000 into edx.
- A page fault (on another CPU) sneaks in between the two "mov" instructions and instantiates the PMD.
- The PMD entry {high|low} is now 0x00000003fda38067. The "mov" at 0xc0507a8e loads 0xfda38067 into eax.
----
--- arch/x86/include/asm/pgtable-3level.h | 50 ++++++++++++++++++++++++++++++++++ include/asm-generic/pgtable.h | 22 +++++++++++++- 2 files changed, 70 insertions(+), 2 deletions(-)
arch/x86/include/asm/pgtable-3level.h +50 -0
@@ -31,6 +31,56 @@ static inline void native_set_pte(pte_t ptep->pte_low = pte.pte_low; } +#define pmd_read_atomic pmd_read_atomic +/* +* pte_offset_map_lock on 32bit PAE kernels was reading the pmd_t with +* a "*pmdp" dereference done by gcc. Problem is, in certain places +* where pte_offset_map_lock is called, concurrent page faults are +* allowed, if the mmap_sem is hold for reading. An example is mincore +* vs page faults vs MADV_DONTNEED. On the page fault side +* pmd_populate rightfully does a set_64bit, but if we're reading the +* pmd_t with a "*pmdp" on the mincore side, a SMP race can happen +* because gcc will not read the 64bit of the pmd atomically. To fix +* this all places running pmd_offset_map_lock() while holding the +* mmap_sem in read mode, shall read the pmdp pointer using this +* function to know if the pmd is null nor not, and in turn to know if +* they can run pmd_offset_map_lock or pmd_trans_huge or other pmd +* operations. +* +* Without THP if the mmap_sem is hold for reading, the +* pmd can only transition from null to not null while pmd_read_atomic runs. +* So there's no need of literally reading it atomically. +* +* With THP if the mmap_sem is hold for reading, the pmd can become +* THP or null or point to a pte (and in turn become "stable") at any +* time under pmd_read_atomic, so it's mandatory to read it atomically +* with cmpxchg8b. +*/ +#ifndef CONFIG_TRANSPARENT_HUGEPAGE +static inline pmd_t pmd_read_atomic (pmd_t *pmdp) +{ +pmdval_t ret; +u32 *tmp = (u32 *)pmdp; + + ret = (pmdval_t) (*tmp); +if (ret) { +/* +* If the low part is null, we must not read the high part +* or we can end up with a partial pmd. +*/ +smp_rmb (); + ret |= ((pmdval_t)*(tmp +1 )) <<32 ; + } + +return (pmd_t ) { ret }; +} +#else /* CONFIG_TRANSPARENT_HUGEPAGE */ +static inline pmd_t pmd_read_atomic (pmd_t *pmdp) +{ +return (pmd_t ) {atomic64_read ((atomic64_t *)pmdp) }; +} +#endif /* CONFIG_TRANSPARENT_HUGEPAGE */ +static inline void native_set_pte_atomic (pte_t *ptep,pte_t pte) {set_64bit ((unsigned long long *)(ptep),native_pte_val (pte));
include/asm-generic/pgtable.h +20 -2
@@ -445,6 +445,18 @@ static inline int pmd_write(pmd_t pmd)#endif /* __HAVE_ARCH_PMD_WRITE */ #endif /* CONFIG_TRANSPARENT_HUGEPAGE */ +#ifndef pmd_read_atomic +static inline pmd_t pmd_read_atomic (pmd_t *pmdp) +{ +/* +* Depend on compiler for an atomic pmd read. NOTE: this is +* only going to work, if the pmdval_t isn't larger than +* an unsigned long. +*/ +return *pmdp; +} +#endif +/* * This function is meant to be used by sites walking pagetables with * the mmap_sem hold in read mode to protect against MADV_DONTNEED and
@@ -458,11 +470,17 @@ static inline int pmd_write(pmd_t pmd)* undefined so behaving like if the pmd was none is safe (because it * can return none anyway). The compiler level barrier() is critically * important to compute the two checks atomically on the same pmdval. +* +* For 32bit kernels with a 64bit large pmd_t this automatically takes +* care of reading the pmd atomically to avoid SMP race conditions +* against pmd_populate() when the mmap_sem is hold for reading by the +* caller (a special atomic read not done by "gcc" as in the generic +* version above, is also needed when THP is disabled because the page +* fault can populate the pmd from under us). */ static inline int pmd_none_or_trans_huge_or_clear_bad (pmd_t *pmd) { -/* depend on compiler for an atomic pmd read */ -pmd_t pmdval = *pmd; +pmd_t pmdval =pmd_read_atomic (pmd);/* * The barrier will stabilize the pmdval in a register or on * the stack so that it will stop changing under the code.
Greg KH
maintainerPATCH 5/47 iwlwifi: update BT traffic load states correctly
In reply to Greg KH3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Meenakshi Venkataraman <[email protected]>
commit 882dde8eb0d49ce0f853f8f4084dde56a21fe55f upstream.
When BT traffic load changes from its
previous state, a new LQ command needs to be
sent down to the firmware. This needs to
be done only once per change. The state
variable that keeps track of this change islast_bt_traffic_load. However, it was not
being updated when the change had been
handled. Not updating this variable was
causing a flood of advanced BT config
commands to be sent to the firmware. Fix
this.
--- drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/wireless/iwlwifi/iwl-agn-rs.c +1 -0
@@ -878,6 +878,7 @@ static void rs_bt_update_lq(struct iwl_pif ((priv->bt_traffic_load != priv->last_bt_traffic_load) || (priv->bt_full_concurrent != full_concurrent)) { priv->bt_full_concurrent = full_concurrent; + priv->last_bt_traffic_load = priv->bt_traffic_load;/* Update uCode's rate table. */ tbl = &(lq_sta->lq_info[lq_sta->active_tbl]);
Greg KH
maintainerPATCH 6/47 cifs: fix oops while traversing open file list (try #4)
In reply to Greg KH3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shirish Pargaonkar <[email protected]>
commit 2c0c2a08bed7a3b791f88d09d16ace56acb3dd98 upstream.
While traversing the linked list of open file handles, if the identfied file handle is invalid, a reopen is attempted and if it fails, we resume traversing where we stopped and cifs can oops while accessing invalid next element, for list might have changed.
So mark the invalid file handle and attempt reopen if no valid file handle is found in rest of the list.
If reopen fails, move the invalid file handle to the end of the list and start traversing the list again from the begining. Repeat this four times before giving up and returning an error if file reopen keeps failing.
--- fs/cifs/cifsglob.h | 1 fs/cifs/file.c | 57 ++++++++++++++++++++++++++++++----------------------- 2 files changed, 34 insertions(+), 24 deletions(-)
fs/cifs/cifsglob.h +1 -0
@@ -43,6 +43,7 @@#define CIFS_MIN_RCV_POOL 4 +#define MAX_REOPEN_ATT 5/* these many maximum attempts to reopen a file */ /* * default attribute cache timeout (jiffies) */
fs/cifs/file.c +33 -24
90 lines not on this page · raw message
Greg KH
maintainerPATCH 7/47 PARISC: fix boot failure on 32-bit systems caused by branch stubs placed before .text
In reply to Greg KH3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: John David Anglin <[email protected]>
commit ed5fb2471b7060767957fb964eb1aaec71533ab1 upstream.
In certain configurations, the resulting kernel becomes too large to boot because the linker places the long branch stubs for the merged .text section at the very start of the image. As a result, the initial transfer of control jumps to an unexpected location. Fix this by placing the head text in a separate section so the stubs for .text are not at the start of the image.
--- arch/parisc/kernel/vmlinux.lds.S | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
arch/parisc/kernel/vmlinux.lds.S +4 -2
@@ -50,8 +50,10 @@ SECTIONS . = KERNEL_BINARY_TEXT_START; _text = .; /* Text and read-only data */ - .text ALIGN(16) : { + .head ALIGN(16) : { HEAD_TEXT + } = 0 + .text ALIGN(16) : { TEXT_TEXT SCHED_TEXT LOCK_TEXT
@@ -65,7 +67,7 @@ SECTIONS *(.fixup) *(.lock.text) /* out-of-line lock text */ *(.gnu.warning) - } = 0 + } /* End of text section */ _etext = .;
Greg KH
maintainerPATCH 8/47 PARISC: fix TLB fault path on PA2.0 narrow systems
In reply to Greg KH3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: James Bottomley <[email protected]>
commit 2f649c1f6f0fef445ce79a19b79e5ce8fe9d7f19 upstream.
commit 5e185581d7c46ddd33cd9c01106d1fc86efb9376
Author: James Bottomley <[email protected]>
[PARISC] fix PA1.1 oops on boot
Didn't quite fix the crash on boot. It moved it from PA1.1 processors to PA2.0 narrow kernels. The final fix is to make sure the [id]tlb_miss_20 paths also work. Even on narrow systems, these paths require using the wide instructions becuase the tlb insertion format is wide. Fix this by conditioning the dep[wd],z on whether we're being called from _11 or _20[w] paths.
--- arch/parisc/kernel/entry.S | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-)
arch/parisc/kernel/entry.S +17 -13
@@ -552,7 +552,7 @@ * entry (identifying the physical page) and %r23 up with * the from tlb entry (or nothing if only a to entry---for * clear_user_page_asm) */ - .macro do_alias spc,tmp,tmp1,va,pte,prot,fault + .macro do_alias spc,tmp,tmp1,va,pte,prot,fault,patype cmpib,COND(<>),n 0,\spc,\fault ldil L%(TMPALIAS_MAP_START),\tmp #if defined(CONFIG_64BIT) && (TMPALIAS_MAP_START >= 0x80000000)
@@ -581,11 +581,15 @@ */ cmpiclr,= 0x01,\tmp,%r0 ldi (_PAGE_DIRTY|_PAGE_READ|_PAGE_WRITE),\prot -#ifdef CONFIG_64BIT +.ifc \patype,20 depd,z \prot,8,7,\prot -#else +.else +.ifc \patype,11 depw,z \prot,8,7,\prot -#endif +.else + .error "undefined PA type to do_alias" +.endif +.endif /* * OK, it is in the temp alias region, check whether "from" or "to". * Check "subtle" note in pacache.S re: r23/r26.
@@ -1189,7 +1193,7 @@ dtlb_miss_20w: nop dtlb_check_alias_20w: - do_alias spc,t0,t1,va,pte,prot,dtlb_fault + do_alias spc,t0,t1,va,pte,prot,dtlb_fault,20 idtlbt pte,prot
@@ -1213,7 +1217,7 @@ nadtlb_miss_20w: nop nadtlb_check_alias_20w: - do_alias spc,t0,t1,va,pte,prot,nadtlb_emulate + do_alias spc,t0,t1,va,pte,prot,nadtlb_emulate,20 idtlbt pte,prot
@@ -1245,7 +1249,7 @@ dtlb_miss_11: nop dtlb_check_alias_11: - do_alias spc,t0,t1,va,pte,prot,dtlb_fault + do_alias spc,t0,t1,va,pte,prot,dtlb_fault,11 idtlba pte,(va) idtlbp prot,(va)
@@ -1277,7 +1281,7 @@ nadtlb_miss_11: nop nadtlb_check_alias_11: - do_alias spc,t0,t1,va,pte,prot,nadtlb_emulate + do_alias spc,t0,t1,va,pte,prot,nadtlb_emulate,11 idtlba pte,(va) idtlbp prot,(va)
@@ -1304,7 +1308,7 @@ dtlb_miss_20: nop dtlb_check_alias_20: - do_alias spc,t0,t1,va,pte,prot,dtlb_fault + do_alias spc,t0,t1,va,pte,prot,dtlb_fault,20 idtlbt pte,prot
@@ -1330,7 +1334,7 @@ nadtlb_miss_20: nop nadtlb_check_alias_20: - do_alias spc,t0,t1,va,pte,prot,nadtlb_emulate + do_alias spc,t0,t1,va,pte,prot,nadtlb_emulate,20 idtlbt pte,prot
@@ -1457,7 +1461,7 @@ naitlb_miss_20w: nop naitlb_check_alias_20w: - do_alias spc,t0,t1,va,pte,prot,naitlb_fault + do_alias spc,t0,t1,va,pte,prot,naitlb_fault,20 iitlbt pte,prot
@@ -1511,7 +1515,7 @@ naitlb_miss_11: nop naitlb_check_alias_11: - do_alias spc,t0,t1,va,pte,prot,itlb_fault + do_alias spc,t0,t1,va,pte,prot,itlb_fault,11 iitlba pte,(%sr0, va) iitlbp prot,(%sr0, va)
@@ -1557,7 +1561,7 @@ naitlb_miss_20: nop naitlb_check_alias_20: - do_alias spc,t0,t1,va,pte,prot,naitlb_fault + do_alias spc,t0,t1,va,pte,prot,naitlb_fault,20 iitlbt pte,prot
Greg KH
maintainerPATCH 9/47 solos-pci: Fix DMA support
In reply to Greg KH3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Woodhouse <[email protected]>
commit b4bd8ad9bb311e8536f726f7a633620ccd358cde upstream.
DMA support has finally made its way to the top of the TODO list, having realised that a Geode using MMIO can't keep up with two ADSL2+ lines each running at 21Mb/s.
This patch fixes a couple of bugs in the DMA support in the driver, so once the corresponding FPGA update is complete and tested everything should work properly.
We weren't storing the currently-transmitting skb, so we were never unmapping it and never freeing/popping it when the TX was done. And the addition of pci_set_master() is fairly self-explanatory.
--- drivers/atm/solos-pci.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/atm/solos-pci.c +3 -1
@@ -984,6 +984,7 @@ static uint32_t fpga_tx(struct solos_car }else if (skb && card->using_dma) {SKB_CB (skb)->dma_addr =pci_map_single (card->dev, skb->data, skb->len,PCI_DMA_TODEVICE ); + card->tx_skb[port] = skb;iowrite32 (SKB_CB (skb)->dma_addr, card->config_regs +TX_DMA_ADDR (port)); }
@@ -1152,7 +1153,8 @@ static int fpga_probe(struct pci_dev *de db_fpga_upgrade = db_firmware_upgrade =0 ; } -if (card->fpga_version >=DMA_SUPPORTED ){ +if (card->fpga_version >=DMA_SUPPORTED ) { +pci_set_master (dev); card->using_dma =1 ; }else { card->using_dma =0 ;
Greg KH
maintainerPATCH 10/47 mac80211: fix ADDBA declined after suspend with wowlan
In reply to Greg KH3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eyal Shapira <[email protected]>
commit 7b21aea04d084916ac4e0e8852dcc9cd60ec0d1d upstream.
WLAN_STA_BLOCK_BA is set while suspending but doesn't get cleared when resuming in case of wowlan. This causes further ADDBA requests received to be rejected. Fix it by clearing it in the wowlan path as well.
--- net/mac80211/util.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
net/mac80211/util.c +6 -6
@@ -1254,6 +1254,12 @@ int ieee80211_reconfig(struct ieee80211_ } } +/* add back keys */ +list_for_each_entry (sdata, &local->interfaces, list) +if (ieee80211_sdata_running (sdata)) +ieee80211_enable_keys (sdata); + + wake_up:/* * Clear the WLAN_STA_BLOCK_BA flag so new aggregation * sessions can be established after a resume.
@@ -1275,12 +1281,6 @@ int ieee80211_reconfig(struct ieee80211_mutex_unlock (&local->sta_mtx); } -/* add back keys */ -list_for_each_entry (sdata, &local->interfaces, list) -if (ieee80211_sdata_running (sdata)) -ieee80211_enable_keys (sdata); - - wake_up:ieee80211_wake_queues_by_reason (hw,IEEE80211_QUEUE_STOP_REASON_SUSPEND );
Greg KH
maintainerPATCH 11/47 NFSv4: Map NFS4ERR_SHARE_DENIED into an EACCES error instead of EIO
In reply to Greg KH3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Trond Myklebust <[email protected]>
commit fb13bfa7e1bcfdcfdece47c24b62f1a1cad957e9 upstream.
If a file OPEN is denied due to a share lock, the resulting NFS4ERR_SHARE_DENIED is currently mapped to the default EIO. This patch adds a more appropriate mapping, and brings Linux into line with what Solaris 10 does.
See https://bugzilla.kernel.org/show_bug.cgi?id=43286
--- fs/nfs/nfs4proc.c | 2 ++ 1 file changed, 2 insertions(+)
fs/nfs/nfs4proc.c +2 -0
@@ -94,6 +94,8 @@ static int nfs4_map_errors(int err)case -NFS4ERR_BADOWNER :case -NFS4ERR_BADNAME :return -EINVAL ; +case -NFS4ERR_SHARE_DENIED : +return -EACCES ;default :dprintk ("%s could not handle NFSv4 error %d\n" , __func__, -err);
Greg KH
maintainerPATCH 12/47 drm/radeon: fix XFX quirk
In reply to Greg KH3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alex Deucher <[email protected]>
commit 1ebf169ad4dc68f18cc0dab35163b0f324fc6c41 upstream.
Only override the ddc bus if the connector doesn't have a valid one. The existing code overrode the ddc bus for all connectors even if it had ddc bus.
Fixes ddc on another XFX card with the same pci ids that was broken by the quirk overwriting the correct ddc bus.
--- drivers/gpu/drm/radeon/radeon_atombios.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/radeon/radeon_atombios.c +3 -1
@@ -480,7 +480,9 @@ static bool radeon_atom_apply_quirks(str*/ if ((dev->pdev->device ==0x9498 ) && (dev->pdev->subsystem_vendor ==0x1682 ) && - (dev->pdev->subsystem_device ==0x2452 )) { + (dev->pdev->subsystem_device ==0x2452 ) && + (i2c_bus->valid == false) && + !(supported_device & (ATOM_DEVICE_TV_SUPPORT |ATOM_DEVICE_CV_SUPPORT ))) {struct radeon_device *rdev = dev->dev_private; *i2c_bus =radeon_lookup_i2c_gpio (rdev,0x93 ); }
Greg KH
maintainerPATCH 13/47 drm/i915: properly handle interlaced bit for sdvo dtd conversion
In reply to Greg KH3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniel Vetter <[email protected]>
commit 59d92bfa5f0cdf57f82f5181b0ad6af75c3fdf41 upstream.
We've simply ignored this, which isn't too great. With this, interlaced 1080i works on my HDMI screen connected through sdvo. For no apparent reason anything else still doesn't work as it should.
While at it, give these magic numbers in the dtd proper names and add a comment that they match with EDID detailed timings.
v2: Actually use the right bit for interlaced.
--- drivers/gpu/drm/i915/intel_sdvo.c | 12 ++++++++---- drivers/gpu/drm/i915/intel_sdvo_regs.h | 5 +++++ 2 files changed, 13 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/intel_sdvo.c +8 -4
@@ -762,10 +762,12 @@ static void intel_sdvo_get_dtd_from_mode ((v_sync_len &0x30 ) >>4 ); dtd->part2.dtd_flags =0x18 ; +if (mode->flags &DRM_MODE_FLAG_INTERLACE ) + dtd->part2.dtd_flags |=DTD_FLAG_INTERLACE ;if (mode->flags &DRM_MODE_FLAG_PHSYNC ) - dtd->part2.dtd_flags |=0x2 ; + dtd->part2.dtd_flags |=DTD_FLAG_HSYNC_POSITIVE ;if (mode->flags &DRM_MODE_FLAG_PVSYNC ) - dtd->part2.dtd_flags |=0x4 ; + dtd->part2.dtd_flags |=DTD_FLAG_VSYNC_POSITIVE ; dtd->part2.sdvo_flags =0 ; dtd->part2.v_sync_off_high = v_sync_offset &0xc0 ;
@@ -799,9 +801,11 @@ static void intel_sdvo_get_mode_from_dtd mode->clock = dtd->part1.clock *10 ; mode->flags &= ~(DRM_MODE_FLAG_PHSYNC |DRM_MODE_FLAG_PVSYNC ); -if (dtd->part2.dtd_flags &0x2 ) +if (dtd->part2.dtd_flags &DTD_FLAG_INTERLACE ) + mode->flags |=DRM_MODE_FLAG_INTERLACE ; +if (dtd->part2.dtd_flags &DTD_FLAG_HSYNC_POSITIVE ) mode->flags |=DRM_MODE_FLAG_PHSYNC ; -if (dtd->part2.dtd_flags &0x4 ) +if (dtd->part2.dtd_flags &DTD_FLAG_VSYNC_POSITIVE ) mode->flags |=DRM_MODE_FLAG_PVSYNC ; }
drivers/gpu/drm/i915/intel_sdvo_regs.h +5 -0
@@ -61,6 +61,11 @@ struct intel_sdvo_caps {u16 output_flags; } __attribute__((packed)); +/* Note: SDVO detailed timing flags match EDID misc flags. */ +#define DTD_FLAG_HSYNC_POSITIVE (1 << 1) +#define DTD_FLAG_VSYNC_POSITIVE (1 << 2) +#define DTD_FLAG_INTERLACE (1 << 7) +/** This matches the EDID DTD structure, more or less */ struct intel_sdvo_dtd { struct {
Greg KH
maintainerPATCH 14/47 drm/i915: wait for a vblank to pass after tv detect
In reply to Greg KH3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniel Vetter <[email protected]>
commit bf2125e2f7e931b50a6c76ba0435ba001409ccbf upstream.
Otherwise the hw will get confused and result in a black screen.
This regression has been most likely introduce in
commit 974b93315b2213b74a42a87e8a9d4fc8c0dbe90c
Author: Chris Wilson <[email protected]> Date: Sun Sep 5 00:44:20 2010 +0100
drm/i915/tv: Poll for DAC state change
That commit replace the first msleep(20) with a busy-loop, but failed to keep the 2nd msleep around. Later on we've replaced all these msleep(20) by proper vblanks.
For reference also see the commit in xf86-video-intel:
commit 1142be53eb8d2ee8a9b60ace5d49f0ba27332275
Author: Jesse Barnes <[email protected]> Date: Mon Jun 9 08:52:59 2008 -0700
Fix TV programming: add vblank wait after TV_CTL writes
Fxies FDO bug #14000; we need to wait for vblank after
writing TV_CTL or following "DPMS on" calls may not actually enable the output.
v2: As suggested by Chris Wilson, add a small comment to ensure that no one accidentally removes this vblank wait again - there really seems to be no sane explanation for why we need it, but it is required.
Launchpad: https://bugs.launchpad.net/ubuntu/+source/xserver-xorg-video-intel/+bug/763688
--- drivers/gpu/drm/i915/intel_tv.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/gpu/drm/i915/intel_tv.c +5 -0
@@ -1301,6 +1301,11 @@ intel_tv_detect_type (struct intel_tv *iI915_WRITE (TV_DAC , save_tv_dac & ~TVDAC_STATE_CHG_EN );I915_WRITE (TV_CTL , save_tv_ctl); +POSTING_READ (TV_CTL ); + +/* For unknown reasons the hw barfs if we don't do this vblank wait. */ +intel_wait_for_vblank (intel_tv->base.base.dev, +to_intel_crtc (intel_tv->base.base.crtc)->pipe);/* Restore interrupt config */ if (connector->polled &DRM_CONNECTOR_POLL_HPD ) {
Greg KH
maintainerPATCH 15/47 Bluetooth: Add support for Broadcom BCM20702A0
In reply to Greg KH3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wen-chien Jesse Sung <[email protected]>
commit d13431ca3eb2a2c14314f04813cdc11cd869f150 upstream.
Since this device declares itself as vendor specific, must add a new entry to device ID table to support it.
usb-device output of this device:
T: Bus=01 Lev=02 Prnt=02 Port=03 Cnt=01 Dev#= 3 Spd=12 MxCh= 0 D: Ver= 2.00 Cls=ff(vend.) Sub=01 Prot=01 MxPS=64 #Cfgs= 1 P: Vendor=413c ProdID=8197 Rev=01.12 S: Manufacturer=Broadcom Corp S: Product=BCM20702A0 S: SerialNumber=D0DF9AA9C9F1 C: #Ifs= 4 Cfg#= 1 Atr=e0 MxPwr=0mA I: If#= 0 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=01 Prot=01 Driver=(none) I: If#= 1 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=01 Prot=01 Driver=(none) I: If#= 2 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none) I: If#= 3 Alt= 0 #EPs= 0 Cls=fe(app. ) Sub=01 Prot=01 Driver=(none)
--- drivers/bluetooth/btusb.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/bluetooth/btusb.c +3 -0
@@ -100,6 +100,9 @@ static struct usb_device_id btusb_table[/* Canyon CN-BTU1 with HID interfaces */ { USB_DEVICE(0x0c10, 0x0000) }, +/* Broadcom BCM20702A0 */ + { USB_DEVICE(0x413c, 0x8197) }, + { } /* Terminating entry */ };
Greg KH
maintainerPATCH 16/47 Bluetooth: Add support for BCM20702A0 [0a5c:21e3]
In reply to Greg KH3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jesse Sung <[email protected]>
commit c0190925dacd976a67044f4382d4effbed568dce upstream.
Add another vendor specific ID for BCM20702A0.
output of usb-devices:
T: Bus=06 Lev=01 Prnt=01 Port=00 Cnt=01 Dev#= 4 Spd=12 MxCh= 0
D: Ver= 2.00 Cls=ff(vend.) Sub=01 Prot=01 MxPS=64 #Cfgs= 1
P: Vendor=0a5c ProdID=21e3 Rev=01.12
S: Manufacturer=Broadcom Corp
S: Product=BCM20702A0
S: SerialNumber=9439E5CBF66C
C: #Ifs= 4 Cfg#= 1 Atr=e0 MxPwr=0mA
I: If#= 0 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=01 Prot=01 Driver=(none)
I: If#= 1 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=01 Prot=01 Driver=(none)
I: If#= 2 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none)
I: If#= 3 Alt= 0 #EPs= 0 Cls=fe(app. ) Sub=01 Prot=01 Driver=(none)
--- drivers/bluetooth/btusb.c | 1 + 1 file changed, 1 insertion(+)
drivers/bluetooth/btusb.c +1 -0
@@ -101,6 +101,7 @@ static struct usb_device_id btusb_table[ { USB_DEVICE(0x0c10, 0x0000) },/* Broadcom BCM20702A0 */ + { USB_DEVICE(0x0a5c, 0x21e3) }, { USB_DEVICE(0x413c, 0x8197) }, { } /* Terminating entry */
Greg KH
maintainerPATCH 17/47 Bluetooth: btusb: Add vendor specific ID (0a5c 21f3) for BCM20702A0
In reply to Greg KH3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Manoj Iyer <[email protected]>
commit 37305cf649689a4d2341dd6fd89b091c6007f9ba upstream.
T: Bus=01 Lev=02 Prnt=02 Port=03 Cnt=03 Dev#= 5 Spd=12 MxCh= 0
D: Ver= 2.00 Cls=ff(vend.) Sub=01 Prot=01 MxPS=64 #Cfgs= 1
P: Vendor=0a5c ProdID=21f3 Rev=01.12
S: Manufacturer=Broadcom Corp
S: Product=BCM20702A0
S: SerialNumber=74DE2B344A7B
C: #Ifs= 4 Cfg#= 1 Atr=e0 MxPwr=0mA
I: If#= 0 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=01 Prot=01 Driver=(none)
I: If#= 1 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=01 Prot=01 Driver=(none)
I: If#= 2 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none)
I: If#= 3 Alt= 0 #EPs= 0 Cls=fe(app. ) Sub=01 Prot=01 Driver=(none)
--- drivers/bluetooth/btusb.c | 1 + 1 file changed, 1 insertion(+)
drivers/bluetooth/btusb.c +1 -0
@@ -102,6 +102,7 @@ static struct usb_device_id btusb_table[/* Broadcom BCM20702A0 */ { USB_DEVICE(0x0a5c, 0x21e3) }, + { USB_DEVICE(0x0a5c, 0x21f3) }, { USB_DEVICE(0x413c, 0x8197) }, { } /* Terminating entry */
Greg KH
maintainerPATCH 18/47 Bluetooth: btusb: add support for BCM20702A0 [0a5c:21e6]
In reply to Greg KH3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: "James M. Leddy" <[email protected]>
commit 0a4eaeeb993658a4d6cff054a863241f32d3d2fb upstream.
Add another vendor specific ID for BCM20702A0. This has been tested and works on hardware with this device.
output of usb-devices:
T: Bus=01 Lev=02 Prnt=02 Port=03 Cnt=04 Dev#= 6 Spd=12 MxCh= 0
D: Ver= 2.00 Cls=ff(vend.) Sub=01 Prot=01 MxPS=64 #Cfgs= 1
P: Vendor=0a5c ProdID=21e6 Rev=01.12
S: Manufacturer=Broadcom Corp
S: Product=BCM20702A0
S: SerialNumber=D0DF9AFB227B
C: #Ifs= 4 Cfg#= 1 Atr=e0 MxPwr=0mA
I: If#= 0 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=01 Prot=01 Driver=(none)
I: If#= 1 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=01 Prot=01 Driver=(none)
I: If#= 2 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none)
I: If#= 3 Alt= 0 #EPs= 0 Cls=fe(app. ) Sub=01 Prot=01 Driver=(none)
--- drivers/bluetooth/btusb.c | 1 + 1 file changed, 1 insertion(+)
drivers/bluetooth/btusb.c +1 -0
@@ -102,6 +102,7 @@ static struct usb_device_id btusb_table[/* Broadcom BCM20702A0 */ { USB_DEVICE(0x0a5c, 0x21e3) }, + { USB_DEVICE(0x0a5c, 0x21e6) }, { USB_DEVICE(0x0a5c, 0x21f3) }, { USB_DEVICE(0x413c, 0x8197) },
Greg KH
maintainerPATCH 19/47 Bluetooth: btusb: Add USB device ID "0a5c 21e8"
In reply to Greg KH3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: =?UTF-8?q?Jo=C3=A3o=20Paulo=20Rechi=20Vita?= <[email protected]>
commit 6dfc326f0605fd87e4c10ccde10de0ce4280d72d upstream.
One more vendor-specific ID for BCM20702A0.
T: Bus=01 Lev=03 Prnt=05 Port=02 Cnt=01 Dev#= 9 Spd=12 MxCh= 0 D: Ver= 2.00 Cls=ff(vend.) Sub=01 Prot=01 MxPS=64 #Cfgs= 1 P: Vendor=0a5c ProdID=21e8 Rev=01.12 S: Manufacturer=Broadcom Corp S: Product=BCM20702A0 S: SerialNumber=00027221F4E2 C: #Ifs= 4 Cfg#= 1 Atr=e0 MxPwr=0mA I: If#= 0 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=01 Prot=01 Driver=(none) I: If#= 1 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=01 Prot=01 Driver=(none) I: If#= 2 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none) I: If#= 3 Alt= 0 #EPs= 0 Cls=fe(app. ) Sub=01 Prot=01 Driver=(none)
--- drivers/bluetooth/btusb.c | 1 + 1 file changed, 1 insertion(+)
drivers/bluetooth/btusb.c +1 -0
@@ -103,6 +103,7 @@ static struct usb_device_id btusb_table[/* Broadcom BCM20702A0 */ { USB_DEVICE(0x0a5c, 0x21e3) }, { USB_DEVICE(0x0a5c, 0x21e6) }, + { USB_DEVICE(0x0a5c, 0x21e8) }, { USB_DEVICE(0x0a5c, 0x21f3) }, { USB_DEVICE(0x413c, 0x8197) },
Greg KH
maintainerPATCH 20/47 Bluetooth: btusb: Add vendor specific ID (0489 e042) for BCM20702A0
In reply to Greg KH3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Manoj Iyer <[email protected]>
commit 79cd76022044f8177bb00e3fd590ec8d6b5f8c35 upstream.
T: Bus=02 Lev=02 Prnt=02 Port=04 Cnt=01 Dev#= 3 Spd=12 MxCh= 0
D: Ver= 2.00 Cls=ff(vend.) Sub=01 Prot=01 MxPS=64 #Cfgs= 1
P: Vendor=0489 ProdID=e042 Rev=01.12
S: Manufacturer=Broadcom Corp
S: Product=BCM20702A0
S: SerialNumber=E4D53DCA61B5
C: #Ifs= 4 Cfg#= 1 Atr=e0 MxPwr=0mA
I: If#= 0 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=01 Prot=01 Driver=(none)
I: If#= 1 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=01 Prot=01 Driver=(none)
I: If#= 2 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none)
I: If#= 3 Alt= 0 #EPs= 0 Cls=fe(app. ) Sub=01 Prot=01 Driver=(none)
--- drivers/bluetooth/btusb.c | 1 + 1 file changed, 1 insertion(+)
drivers/bluetooth/btusb.c +1 -0
@@ -101,6 +101,7 @@ static struct usb_device_id btusb_table[ { USB_DEVICE(0x0c10, 0x0000) },/* Broadcom BCM20702A0 */ + { USB_DEVICE(0x0489, 0xe042) }, { USB_DEVICE(0x0a5c, 0x21e3) }, { USB_DEVICE(0x0a5c, 0x21e6) }, { USB_DEVICE(0x0a5c, 0x21e8) },
Greg KH
maintainerPATCH 21/47 Bluetooth: btusb: typo in Broadcom SoftSailing id
In reply to Greg KH3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Don Zickus <[email protected]>
commit 2e8b506310f6433d5558387fd568d4bfb1d6a799 upstream.
I was trying to backport the following commit to RHEL-6
From 0cea73465cd22373c5cd43a3edd25fbd4bb532ef Mon Sep 17 00:00:00 2001
From: Oliver Neukum <[email protected]>
Date: Wed, 21 Sep 2011 11:37:15 +0200
Subject: [PATCH] btusb: add device entry for Broadcom SoftSailing
and noticed it wasn't working on an HP Elitebook. Looking into the patch I noticed a very subtle typo in the ids. The patch has '0x05ac' instead of '0x0a5c'. A snippet of the lsusb -v output also shows this:
Bus 002 Device 003: ID 0a5c:21e1 Broadcom Corp.
Device Descriptor:
bLength 18
bDescriptorType 1
bcdUSB 2.00
bDeviceClass 255 Vendor Specific Class
bDeviceSubClass 1
bDeviceProtocol 1
bMaxPacketSize0 64
idVendor 0x0a5c Broadcom Corp.
idProduct 0x21e1
bcdDevice 1.12
iManufacturer 1 Broadcom Corp iProduct 2 BCM20702A0 iSerial 3 60D819F0338C bNumConfigurations 1
Looking at other Broadcom ids, the fix matches them whereas the original patch matches Apple's ids.
Tested on an HP Elitebook 8760w. The btusb binds and the userspace stuff loads correctly.
--- drivers/bluetooth/btusb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/bluetooth/btusb.c +1 -1
@@ -61,7 +61,7 @@ static struct usb_device_id btusb_table[ { USB_DEVICE_INFO(0xe0, 0x01, 0x01) },/* Broadcom SoftSailing reporting vendor specific */ - { USB_DEVICE(0x05ac, 0x21e1) }, + { USB_DEVICE(0x0a5c, 0x21e1) },/* Apple MacBookPro 7,1 */ { USB_DEVICE(0x05ac, 0x8213) },
Greg KH
maintainerPATCH 22/47 Add Foxconn / Hon Hai IDs for btusb module
In reply to Greg KH3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Steven Harms <[email protected]>
commit 985140369be1e886754d8ac0375dd64e4f727311 upstream.
This change adds 0x0489:0xe033 to the btusb module.
This bluetooth usb device is integrated in the Acer TimelineX AS4830TG-6808 notebook.
Output from /sys/kernel/debug/usb/devices:
T: Bus=01 Lev=02 Prnt=02 Port=05 Cnt=02 Dev#= 4 Spd=12 MxCh= 0 D: Ver= 2.00 Cls=ff(vend.) Sub=01 Prot=01 MxPS=64 #Cfgs= 1 P: Vendor=0489 ProdID=e033 Rev= 2.29 S: Manufacturer=Broadcom Corp S: Product=Acer Module S: SerialNumber=60D819F74101 C:* #Ifs= 4 Cfg#= 1 Atr=e0 MxPwr= 0mA I:* If#= 0 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=01 Prot=01 Driver=btusb E: Ad=81(I) Atr=03(Int.) MxPS= 16 Ivl=1ms E: Ad=82(I) Atr=02(Bulk) MxPS= 64 Ivl=0ms E: Ad=02(O) Atr=02(Bulk) MxPS= 64 Ivl=0ms I:* If#= 1 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=01 Prot=01 Driver=btusb E: Ad=83(I) Atr=01(Isoc) MxPS= 0 Ivl=1ms E: Ad=03(O) Atr=01(Isoc) MxPS= 0 Ivl=1ms I: If#= 1 Alt= 1 #EPs= 2 Cls=ff(vend.) Sub=01 Prot=01 Driver=btusb E: Ad=83(I) Atr=01(Isoc) MxPS= 9 Ivl=1ms E: Ad=03(O) Atr=01(Isoc) MxPS= 9 Ivl=1ms I: If#= 1 Alt= 2 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=83(I) Atr=01(Isoc) MxPS= 17 Ivl=1ms E: Ad=03(O) Atr=01(Isoc) MxPS= 17 Ivl=1ms I: If#= 1 Alt= 3 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=83(I) Atr=01(Isoc) MxPS= 32 Ivl=1ms E: Ad=03(O) Atr=01(Isoc) MxPS= 32 Ivl=1ms I: If#= 1 Alt= 4 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=83(I) Atr=01(Isoc) MxPS= 64 Ivl=1ms E: Ad=03(O) Atr=01(Isoc) MxPS= 64 Ivl=1ms I: If#= 1 Alt= 5 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=83(I) Atr=01(Isoc) MxPS= 64 Ivl=1ms E: Ad=03(O) Atr=01(Isoc) MxPS= 64 Ivl=1ms I:* If#= 2 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none) E: Ad=84(I) Atr=02(Bulk) MxPS= 32 Ivl=0ms E: Ad=04(O) Atr=02(Bulk) MxPS= 32 Ivl=0ms
I:* If#= 3 Alt= 0 #EPs= 0 Cls=fe(app. ) Sub=01 Prot=01 Driver=(none)
--- drivers/bluetooth/btusb.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/bluetooth/btusb.c +3 -0
@@ -108,6 +108,9 @@ static struct usb_device_id btusb_table[ { USB_DEVICE(0x0a5c, 0x21f3) }, { USB_DEVICE(0x413c, 0x8197) }, +/* Foxconn - Hon Hai */ + { USB_DEVICE(0x0489, 0xe033) }, + { } /* Terminating entry */ };
Greg KH
maintainerPATCH 23/47 Bluetooth: Add support for Foxconn/Hon Hai AR5BBU22 0489:E03C
In reply to Greg KH3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michael Gruetzner <[email protected]>
commit 85d59726c5c66016a507f1f4a60db8e374dd284d upstream.
Add Foxconn/Hon Hai AR5BBU22 Bluetooth Module( 0x489:0xE03C) to the blacklist of btusb module and add it to the ath3k module to properly load the firmware in Kernel 3.3.4
The device is integrated in e.g. some Acer Aspire 7750G.
Output from /sys/kernel/debug/usb/devices:
T: Bus=01 Lev=02 Prnt=02 Port=05 Cnt=02 Dev#= 6 Spd=12 MxCh= 0 D: Ver= 2.00 Cls=e0(wlcon) Sub=01 Prot=01 MxPS=64 #Cfgs= 1 P: Vendor=0489 ProdID=e03c Rev= 0.02 S: Manufacturer=Atheros Communications S: Product=Bluetooth USB Host Controller S: SerialNumber=Alaska Day 2006 C:* #Ifs= 2 Cfg#= 1 Atr=e0 MxPwr=100mA I:* If#= 0 Alt= 0 #EPs= 3 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=81(I) Atr=03(Int.) MxPS= 16 Ivl=1ms E: Ad=82(I) Atr=02(Bulk) MxPS= 64 Ivl=0ms E: Ad=02(O) Atr=02(Bulk) MxPS= 64 Ivl=0ms I:* If#= 1 Alt= 0 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=83(I) Atr=01(Isoc) MxPS= 0 Ivl=1ms E: Ad=03(O) Atr=01(Isoc) MxPS= 0 Ivl=1ms I: If#= 1 Alt= 1 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=83(I) Atr=01(Isoc) MxPS= 9 Ivl=1ms E: Ad=03(O) Atr=01(Isoc) MxPS= 9 Ivl=1ms I: If#= 1 Alt= 2 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=83(I) Atr=01(Isoc) MxPS= 17 Ivl=1ms E: Ad=03(O) Atr=01(Isoc) MxPS= 17 Ivl=1ms I: If#= 1 Alt= 3 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=83(I) Atr=01(Isoc) MxPS= 25 Ivl=1ms E: Ad=03(O) Atr=01(Isoc) MxPS= 25 Ivl=1ms I: If#= 1 Alt= 4 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=83(I) Atr=01(Isoc) MxPS= 33 Ivl=1ms E: Ad=03(O) Atr=01(Isoc) MxPS= 33 Ivl=1ms I: If#= 1 Alt= 5 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=83(I) Atr=01(Isoc) MxPS= 49 Ivl=1ms E: Ad=03(O) Atr=01(Isoc) MxPS= 49 Ivl=1ms
--- drivers/bluetooth/ath3k.c | 6 ++++++ drivers/bluetooth/btusb.c | 3 +++ 2 files changed, 9 insertions(+)
drivers/bluetooth/ath3k.c +6 -0
@@ -78,6 +78,9 @@ static struct usb_device_id ath3k_table[/* Atheros AR5BBU12 with sflash firmware */ { USB_DEVICE(0x0489, 0xE02C) }, +/* Atheros AR5BBU22 with sflash firmware */ + { USB_DEVICE(0x0489, 0xE03C) }, + { } /* Terminating entry */ };
@@ -94,6 +97,9 @@ static struct usb_device_id ath3k_blist_ { USB_DEVICE(0x13d3, 0x3375), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x04ca, 0x3005), .driver_info = BTUSB_ATH3012 }, + /* Atheros AR5BBU22 with sflash firmware */ + { USB_DEVICE(0x0489, 0xE03C), .driver_info = BTUSB_ATH3012 }, + { } /* Terminating entry */ };
drivers/bluetooth/btusb.c +3 -0
@@ -141,6 +141,9 @@ static struct usb_device_id blacklist_ta/* Atheros AR5BBU12 with sflash firmware */ { USB_DEVICE(0x0489, 0xe02c), .driver_info = BTUSB_IGNORE }, + /* Atheros AR5BBU12 with sflash firmware */ + { USB_DEVICE(0x0489, 0xe03c), .driver_info = BTUSB_ATH3012 }, + /* Broadcom BCM2035 */ { USB_DEVICE(0x0a5c, 0x2035), .driver_info = BTUSB_WRONG_SCO_MTU }, { USB_DEVICE(0x0a5c, 0x200a), .driver_info = BTUSB_WRONG_SCO_MTU },
Greg KH
maintainerPATCH 24/47 ALSA: usb-audio: fix rate_list memory leak
In reply to Greg KH3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Clemens Ladisch <[email protected]>
commit 5cd5d7c44990658df6ab49f6253c39617c53b03d upstream.
The array of sample rates is reallocated every time when opening the PCM device, but was freed only once when unplugging the device.
--- sound/usb/pcm.c | 3 +++ 1 file changed, 3 insertions(+)
sound/usb/pcm.c +3 -0
@@ -670,6 +670,9 @@ static int snd_usb_pcm_check_knot(structint count =0 , needs_knot =0 ;int err; +kfree (subs->rate_list.list); + subs->rate_list.list =NULL ; +list_for_each_entry (fp, &subs->fmt_list, list) {if (fp->rates &SNDRV_PCM_RATE_CONTINUOUS )return 0 ;
Greg KH
maintainerPATCH 25/47 vfs: umount_tree() might be called on subtree that had never made it
In reply to Greg KH3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Al Viro <[email protected]>
commit 63d37a84ab6004c235314ffd7a76c5eb28c2fae0 upstream.
__mnt_make_shortterm() in there undoes the effect of __mnt_make_longterm() we'd done back when we set ->mnt_ns non-NULL; it should not be done to vfsmounts that had never gone through commit_tree() and friends. Kudos to lczerner for catching that one...
--- fs/namespace.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fs/namespace.c +2 -1
@@ -1244,8 +1244,9 @@ void umount_tree(struct vfsmount *mnt, ilist_del_init (&p->mnt_expire);list_del_init (&p->mnt_list);__touch_mnt_namespace (p->mnt_ns); +if (p->mnt_ns) +__mnt_make_shortterm (p); p->mnt_ns =NULL ; -__mnt_make_shortterm (p);list_del_init (&p->mnt_child);if (p->mnt_parent != p) { p->mnt_parent->mnt_ghosts++;
Greg KH
maintainerPATCH 26/47 mtd: nand: fix scan_read_raw_oob
In reply to Greg KH3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Maluka <[email protected]>
commit 34a5704d91d6f8376a4c0a0143a1dd3eb3ccb37e upstream.
It seems there is a bug in scan_read_raw_oob() in nand_bbt.c which should cause wrong functioning of NAND_BBT_SCANALLPAGES option.
Artem: the patch did not apply and I had to amend it a bit.
--- drivers/mtd/nand/nand_bbt.c | 1 + 1 file changed, 1 insertion(+)
drivers/mtd/nand/nand_bbt.c +1 -0
@@ -360,6 +360,7 @@ static int scan_read_raw_oob(struct mtd_ buf += mtd->oobsize + mtd->writesize; len -= mtd->writesize; + offs += mtd->writesize; }return 0 ; }
Greg KH
maintainerPATCH 27/47 drm/radeon: properly program gart on rv740, juniper, cypress, barts, hemlock
In reply to Greg KH3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alex Deucher <[email protected]>
commit 0b8c30bc4943137a4a36b9cb059b1cc684f5d702 upstream.
Need to program an additional VM register. This doesn't not currently cause any problems, but allows us to program the proper backend map in a subsequent patch which should improve performance on these asics.
--- drivers/gpu/drm/radeon/evergreen.c | 5 +++++ drivers/gpu/drm/radeon/evergreend.h | 1 + drivers/gpu/drm/radeon/rv770.c | 2 ++ drivers/gpu/drm/radeon/rv770d.h | 1 + 4 files changed, 9 insertions(+)
drivers/gpu/drm/radeon/evergreen.c +5 -0
@@ -926,6 +926,11 @@ int evergreen_pcie_gart_enable(struct raWREG32 (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->family ==CHIP_JUNIPER ) || + (rdev->family ==CHIP_CYPRESS ) || + (rdev->family ==CHIP_HEMLOCK ) || + (rdev->family ==CHIP_BARTS )) +WREG32 (MC_VM_MD_L1_TLB3_CNTL , tmp); }WREG32 (MC_VM_MB_L1_TLB0_CNTL , tmp);WREG32 (MC_VM_MB_L1_TLB1_CNTL , tmp);
drivers/gpu/drm/radeon/evergreend.h +1 -0
@@ -230,6 +230,7 @@#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 MC_VM_MD_L1_TLB3_CNTL 0x2698#define FUS_MC_VM_MD_L1_TLB0_CNTL 0x265C#define FUS_MC_VM_MD_L1_TLB1_CNTL 0x2660
drivers/gpu/drm/radeon/rv770.c +2 -0
@@ -151,6 +151,8 @@ int rv770_pcie_gart_enable(struct radeonWREG32 (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->family ==CHIP_RV740 ) +WREG32 (MC_VM_MD_L1_TLB3_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);
drivers/gpu/drm/radeon/rv770d.h +1 -0
@@ -174,6 +174,7 @@#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 MC_VM_MD_L1_TLB3_CNTL 0x2698#define MC_VM_SYSTEM_APERTURE_DEFAULT_ADDR 0x203C#define MC_VM_SYSTEM_APERTURE_HIGH_ADDR 0x2038#define MC_VM_SYSTEM_APERTURE_LOW_ADDR 0x2034
Greg KH
maintainerPATCH 28/47 drm/radeon: fix HD6790, HD6570 backend programming
In reply to Greg KH3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jerome Glisse <[email protected]>
commit 95c4b23ec4e2fa5604df229ddf134e31d7b3b378 upstream.
Without this bit sets we get broken rendering and lockups.
fglrx sets this bit.
Bugs that should be fixed by this patch :
https://bugs.freedesktop.org/show_bug.cgi?id=49792
https://bugzilla.kernel.org/show_bug.cgi?id=43207
https://bugs.freedesktop.org/show_bug.cgi?id=39282
--- drivers/gpu/drm/radeon/evergreen.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/radeon/evergreen.c +2 -2
@@ -2069,9 +2069,9 @@ static void evergreen_gpu_init(struct raWREG32 (CC_SYS_RB_BACKEND_DISABLE , rb);WREG32 (GC_USER_RB_BACKEND_DISABLE , rb);WREG32 (CC_GC_SHADER_PIPE_CONFIG , sp); - } + } - grbm_gfx_index |=SE_BROADCAST_WRITES ; + grbm_gfx_index =INSTANCE_BROADCAST_WRITES |SE_BROADCAST_WRITES ;WREG32 (GRBM_GFX_INDEX , grbm_gfx_index);WREG32 (RLC_GFX_INDEX , grbm_gfx_index);
Greg KH
maintainerPATCH 29/47 drm/ttm: Fix spinlock imbalance
In reply to Greg KH3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Hellstrom <[email protected]>
commit a8ff3ee211fccf708e1911bbc096625453ebf759 upstream.
This imbalance may cause hangs when TTM is trying to swap out a buffer that is already on the delayed delete list.
--- drivers/gpu/drm/ttm/ttm_bo.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/ttm/ttm_bo.c +1 -0
@@ -1809,6 +1809,7 @@ static int ttm_bo_swapout(struct ttm_memspin_unlock (&glob->lru_lock); (void )ttm_bo_cleanup_refs (bo, false, false, false);kref_put (&bo->list_kref, ttm_bo_release_list); +spin_lock (&glob->lru_lock);continue ; }
Greg KH
maintainerPATCH 30/47 ipv4: Do not use dead fib_info entries.
In reply to Greg KH3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: "David S. Miller" <[email protected]>
[ Upstream commit dccd9ecc374462e5d6a5b8f8110415a86c2213d8 ]
Due to RCU lookups and RCU based release, fib_info objects can be found during lookup which have fi->fib_dead set.
We must ignore these entries, otherwise we risk dereferencing the parts of the entry which are being torn down.
--- net/ipv4/fib_trie.c | 2 ++ 1 file changed, 2 insertions(+)
net/ipv4/fib_trie.c +2 -0
@@ -1371,6 +1371,8 @@ static int check_leaf(struct fib_table *if (fa->fa_tos && fa->fa_tos != flp->flowi4_tos)continue ; +if (fi->fib_dead) +continue ;if (fa->fa_info->fib_scope < flp->flowi4_scope)continue ;fib_alias_accessed (fa);
Greg KH
maintainerPATCH 31/47 ipv4: fix the rcu race between free_fib_info and ip_route_output_slow
In reply to Greg KH3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yanmin Zhang <[email protected]>
[ Upstream commit e49cc0da7283088c5e03d475ffe2fdcb24a6d5b1 ]
We hit a kernel OOPS.
<3>[23898.789643] BUG: sleeping function called from invalid context at /data/buildbot/workdir/ics/hardware/intel/linux-2.6/arch/x86/mm/fault.c:1103 <3>[23898.862215] in_atomic(): 0, irqs_disabled(): 0, pid: 10526, name: Thread-6683 <4>[23898.967805] HSU serial 0000:00:05.1: 0000:00:05.2:HSU serial prevented me to suspend... <4>[23899.258526] Pid: 10526, comm: Thread-6683 Tainted: G W 3.0.8-137685-ge7742f9 #1 <4>[23899.357404] HSU serial 0000:00:05.1: 0000:00:05.2:HSU serial prevented me to suspend... <4>[23899.904225] Call Trace: <4>[23899.989209] [<c1227f50>] ? pgtable_bad+0x130/0x130 <4>[23900.000416] [<c1238c2a>] __might_sleep+0x10a/0x110 <4>[23900.007357] [<c1228021>] do_page_fault+0xd1/0x3c0 <4>[23900.013764] [<c18e9ba9>] ? restore_all+0xf/0xf <4>[23900.024024] [<c17c007b>] ? napi_complete+0x8b/0x690 <4>[23900.029297] [<c1227f50>] ? pgtable_bad+0x130/0x130 <4>[23900.123739] [<c1227f50>] ? pgtable_bad+0x130/0x130 <4>[23900.128955] [<c18ea0c3>] error_code+0x5f/0x64 <4>[23900.133466] [<c1227f50>] ? pgtable_bad+0x130/0x130 <4>[23900.138450] [<c17f6298>] ? __ip_route_output_key+0x698/0x7c0 <4>[23900.144312] [<c17f5f8d>] ? __ip_route_output_key+0x38d/0x7c0 <4>[23900.150730] [<c17f63df>] ip_route_output_flow+0x1f/0x60 <4>[23900.156261] [<c181de58>] ip4_datagram_connect+0x188/0x2b0 <4>[23900.161960] [<c18e981f>] ? _raw_spin_unlock_bh+0x1f/0x30 <4>[23900.167834] [<c18298d6>] inet_dgram_connect+0x36/0x80 <4>[23900.173224] [<c14f9e88>] ? _copy_from_user+0x48/0x140 <4>[23900.178817] [<c17ab9da>] sys_connect+0x9a/0xd0 <4>[23900.183538] [<c132e93c>] ? alloc_file+0xdc/0x240 <4>[23900.189111] [<c123925d>] ? sub_preempt_count+0x3d/0x50
Function free_fib_info resets nexthop_nh->nh_dev to NULL before releasing fi. Other cpu might be accessing fi. Fixing it by delaying the releasing.
With the patch, we ran MTBF testing on Android mobile for 12 hours and didn't trigger the issue.
Thank Eric for very detailed review/checking the issue.
--- net/ipv4/fib_semantics.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-)
net/ipv4/fib_semantics.c +13 -7
@@ -142,6 +142,18 @@ const struct fib_prop fib_props[RTN_MAX };/* Release a nexthop info record */ +static void free_fib_info_rcu (struct rcu_head *head) +{ + struct fib_info *fi = container_of(head, struct fib_info, rcu); + +change_nexthops (fi) { +if (nexthop_nh->nh_dev) +dev_put (nexthop_nh->nh_dev); + }endfor_nexthops (fi); + +release_net (fi->fib_net); +kfree (fi); +}void free_fib_info (struct fib_info *fi) {
@@ -149,14 +161,8 @@ void free_fib_info(struct fib_info *fi)pr_warning ("Freeing alive fib_info %p\n" , fi);return ; } -change_nexthops (fi) { -if (nexthop_nh->nh_dev) -dev_put (nexthop_nh->nh_dev); - nexthop_nh->nh_dev =NULL ; - }endfor_nexthops (fi); fib_info_cnt--; -release_net (fi->fib_net); -kfree_rcu (fi, rcu); +call_rcu (&fi->rcu, free_fib_info_rcu); }void fib_release_info (struct fib_info *fi)
Greg KH
maintainerPATCH 32/47 ipv6: fix incorrect ipsec fragment
In reply to Greg KH3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gao feng <[email protected]>
[ Upstream commit 0c1833797a5a6ec23ea9261d979aa18078720b74 ]
Since commit ad0081e43a
"ipv6: Fragment locally generated tunnel-mode IPSec6 packets as needed" the fragment of packets is incorrect.
because tunnel mode needs IPsec headers and trailer for all fragments, while on transport mode it is sufficient to add the headers to the first fragment and the trailer to the last.
so modify mtu and maxfraglen base on ipsec mode and if fragment is first or last.
with my test,it work well(every fragment's size is the mtu) and does not trigger slow fragment path.
Changes from v1:
though optimization, mtu_prev and maxfraglen_prev can be delete. replace xfrm mode codes with dst_entry's new frag DST_XFRM_TUNNEL. add fuction ip6_append_data_mtu to make codes clearer.
--- include/net/dst.h | 1 net/ipv6/ip6_output.c | 68 ++++++++++++++++++++++++++++++++++++------------- net/xfrm/xfrm_policy.c | 3 ++ 3 files changed, 54 insertions(+), 18 deletions(-)
include/net/dst.h +1 -0
@@ -78,6 +78,7 @@ struct dst_entry {#define DST_NOHASH 0x0008#define DST_NOCACHE 0x0010#define DST_NOCOUNT 0x0020 +#define DST_XFRM_TUNNEL 0x0100union {struct dst_entry *next;struct rtable __rcu *rt_next;
net/ipv6/ip6_output.c +50 -18
109 lines not on this page · raw message
net/xfrm/xfrm_policy.c +3 -0
@@ -1917,6 +1917,9 @@ no_transform: } ok:xfrm_pols_put (pols, drop_pols); +if (dst && dst->xfrm && + dst->xfrm->props.mode ==XFRM_MODE_TUNNEL ) + dst->flags |=DST_XFRM_TUNNEL ;return dst; nopol:
Greg KH
maintainerPATCH 33/47 l2tp: fix oops in L2TP IP sockets for connect() AF_UNSPEC case
In reply to Greg KH3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: James Chapman <[email protected]>
[ Upstream commit c51ce49735c183ef2592db70f918ee698716276b ]
An application may call connect() to disconnect a socket using an address with family AF_UNSPEC. The L2TP IP sockets were not handling this case when the socket is not bound and an attempt to connect() using AF_UNSPEC in such cases would result in an oops. This patch addresses the problem by protecting the sk_prot->disconnect() call against trying to unhash the socket before it is bound.
The patch also adds more checks that the sockaddr supplied to bind() and connect() calls is valid.
RIP: 0010:[<ffffffff82e133b0>] [<ffffffff82e133b0>] inet_unhash+0x50/0xd0 RSP: 0018:ffff88001989be28 EFLAGS: 00010293 Stack: ffff8800407a8000 0000000000000000 ffff88001989be78 ffffffff82e3a249 ffffffff82e3a050 ffff88001989bec8 ffff88001989be88 ffff8800407a8000 0000000000000010 ffff88001989bec8 ffff88001989bea8 ffffffff82e42639 Call Trace: [<ffffffff82e3a249>] udp_disconnect+0x1f9/0x290 [<ffffffff82e42639>] inet_dgram_connect+0x29/0x80 [<ffffffff82d012fc>] sys_connect+0x9c/0x100
--- net/l2tp/l2tp_ip.c | 30 ++++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-)
net/l2tp/l2tp_ip.c +24 -6
@@ -251,9 +251,16 @@ static int l2tp_ip_bind(struct sock *sk, {struct inet_sock *inet =inet_sk (sk);struct sockaddr_l2tpip *addr = (struct sockaddr_l2tpip *) uaddr; -int ret = -EINVAL ; +int ret;int chk_addr_ret; +if (!sock_flag (sk,SOCK_ZAPPED )) +return -EINVAL ; +if (addr_len <sizeof (struct sockaddr_l2tpip )) +return -EINVAL ; +if (addr->l2tp_family !=AF_INET ) +return -EINVAL ; + ret = -EADDRINUSE ;read_lock_bh (&l2tp_ip_lock);if (__l2tp_ip_bind_lookup (&init_net, addr->l2tp_addr.s_addr, sk->sk_bound_dev_if, addr->l2tp_conn_id))
@@ -283,6 +290,8 @@ static int l2tp_ip_bind(struct sock *sk,sk_del_node_init (sk);write_unlock_bh (&l2tp_ip_lock); ret =0 ; +sock_reset_flag (sk,SOCK_ZAPPED ); + out:release_sock (sk);
@@ -303,13 +312,14 @@ static int l2tp_ip_connect(struct sock *__be32 saddr;int oif, rc; - rc = -EINVAL ; +if (sock_flag (sk,SOCK_ZAPPED ))/* Must bind first - autobinding does not work */ +return -EINVAL ; +if (addr_len <sizeof (*lsa)) - goto out; +return -EINVAL ; - rc = -EAFNOSUPPORT ;if (lsa->l2tp_family !=AF_INET ) - goto out; +return -EAFNOSUPPORT ;lock_sock (sk);
@@ -363,6 +373,14 @@ out:return rc; } +static int l2tp_ip_disconnect (struct sock *sk,int flags) +{ +if (sock_flag (sk,SOCK_ZAPPED )) +return 0 ; + +return udp_disconnect (sk, flags); +} +static int l2tp_ip_getname (struct socket *sock,struct sockaddr *uaddr,int *uaddr_len,int peer) {
@@ -591,7 +609,7 @@ static struct proto l2tp_ip_prot = { .close = l2tp_ip_close, .bind = l2tp_ip_bind, .connect = l2tp_ip_connect, - .disconnect = udp_disconnect, + .disconnect = l2tp_ip_disconnect, .ioctl = udp_ioctl, .destroy = l2tp_ip_destroy_sock, .setsockopt = ip_setsockopt,
Greg KH
maintainerPATCH 34/47 pktgen: fix crash at module unload
In reply to Greg KH3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit c57b54684060c8aced64a5b78ff69ff289af97b9 ]
commit 7d3d43dab4e9 (net: In unregister_netdevice_notifier unregister the netdevices.) makes pktgen crashing at module unload.
[ 296.820578] BUG: spinlock bad magic on CPU#6, rmmod/3267 [ 296.820719] lock: ffff880310c38000, .magic: ffff8803, .owner: <none>/-1, .owner_cpu: -1 [ 296.820943] Pid: 3267, comm: rmmod Not tainted 3.4.0-rc5+ #254 [ 296.821079] Call Trace: [ 296.821211] [<ffffffff8168a715>] spin_dump+0x8a/0x8f [ 296.821345] [<ffffffff8168a73b>] spin_bug+0x21/0x26 [ 296.821507] [<ffffffff812b4741>] do_raw_spin_lock+0x131/0x140 [ 296.821648] [<ffffffff8169188e>] _raw_spin_lock+0x1e/0x20 [ 296.821786] [<ffffffffa00cc0fd>] __pktgen_NN_threads+0x4d/0x140 [pktgen] [ 296.821928] [<ffffffffa00ccf8d>] pktgen_device_event+0x10d/0x1e0 [pktgen] [ 296.822073] [<ffffffff8154ed4f>] unregister_netdevice_notifier+0x7f/0x100 [ 296.822216] [<ffffffffa00d2a0b>] pg_cleanup+0x48/0x73 [pktgen] [ 296.822357] [<ffffffff8109528e>] sys_delete_module+0x17e/0x2a0 [ 296.822502] [<ffffffff81699652>] system_call_fastpath+0x16/0x1b
Hold the pktgen_thread_lock while splicing pktgen_threads, and test pktgen_exiting in pktgen_device_event() to make unload faster.
--- net/core/pktgen.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
net/core/pktgen.c +8 -2
@@ -1932,7 +1932,7 @@ static int pktgen_device_event(struct no {struct net_device *dev = ptr; -if (!net_eq (dev_net (dev), &init_net)) +if (!net_eq (dev_net (dev), &init_net) || pktgen_exiting)return NOTIFY_DONE ;/* It is OK that we do not hold the group lock right now,
@@ -3755,12 +3755,18 @@ static void __exit pg_cleanup(void) {struct pktgen_thread *t;struct list_head *q, *n; +struct list_head list;/* Stop all interfaces & threads */ pktgen_exiting = true; -list_for_each_safe (q, n, &pktgen_threads) { +mutex_lock (&pktgen_thread_lock); +list_splice (&list, &pktgen_threads); +mutex_unlock (&pktgen_thread_lock); + +list_for_each_safe (q, n, &list) { t = list_entry(q, struct pktgen_thread, th_list); +list_del (&t->th_list);kthread_stop (t->tsk);kfree (t); }
Greg KH
maintainerPATCH 35/47 pktgen: fix module unload for good
In reply to Greg KH3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit d4b1133558e0d417342d5d2c49e4c35b428ff20d ]
commit c57b5468406 (pktgen: fix crash at module unload) did a very poor job with list primitives.
1) list_splice() arguments were in the wrong order
2) list_splice(list, head) has undefined behavior if head is not initialized.
3) We should use the list_splice_init() variant to clear pktgen_threads list.
--- net/core/pktgen.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/core/pktgen.c +2 -2
@@ -3755,13 +3755,13 @@ static void __exit pg_cleanup(void) {struct pktgen_thread *t;struct list_head *q, *n; -struct list_head list; +LIST_HEAD (list);/* Stop all interfaces & threads */ pktgen_exiting = true;mutex_lock (&pktgen_thread_lock); -list_splice (&list, &pktgen_threads); +list_splice_init (&pktgen_threads, &list);mutex_unlock (&pktgen_thread_lock);list_for_each_safe (q, n, &list) {
Greg KH
maintainerPATCH 36/47 Revert "net: maintain namespace isolation between vlan and real device"
In reply to Greg KH3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: "David S. Miller" <[email protected]>
[ Upstream commit 59b9997baba5242997ddc7bd96b1391f5275a5a4 ]
This reverts commit 8a83a00b0735190384a348156837918271034144.
It causes regressions for S390 devices, because it does an unconditional DST drop on SKBs for vlans and the QETH device needs the neighbour entry hung off the DST for certain things on transmit.
Arnd can't remember exactly why he even needed this change.
Conflicts:
drivers/net/macvlan.c net/8021q/vlan_dev.c net/core/dev.c
--- drivers/net/macvlan.c | 2 +- include/linux/netdevice.h | 9 --------- net/8021q/vlan_dev.c | 2 +- net/core/dev.c | 36 +++++------------------------------- 4 files changed, 7 insertions(+), 42 deletions(-)
drivers/net/macvlan.c +1 -1
@@ -247,7 +247,7 @@ static int macvlan_queue_xmit(struct sk_ xmit_world: skb->ip_summed = ip_summed; -skb_set_dev (skb, vlan->lowerdev); + skb->dev = vlan->lowerdev;return dev_queue_xmit (skb); }
include/linux/netdevice.h +0 -9
@@ -1453,15 +1453,6 @@ static inline bool netdev_uses_dsa_tags(return 0 ; } -#ifndef CONFIG_NET_NS -static inline void skb_set_dev (struct sk_buff *skb,struct net_device *dev) -{ - skb->dev = dev; -} -#else /* CONFIG_NET_NS */ -void skb_set_dev (struct sk_buff *skb,struct net_device *dev); -#endif -static inline bool netdev_uses_trailer_tags (struct net_device *dev) {#ifdef CONFIG_NET_DSA_TAG_TRAILER
net/8021q/vlan_dev.c +1 -1
@@ -154,7 +154,7 @@ static netdev_tx_t vlan_dev_hard_start_x skb =__vlan_hwaccel_put_tag (skb, vlan_tci); } -skb_set_dev (skb,vlan_dev_info (dev)->real_dev); + skb->dev =vlan_dev_info (dev)->real_dev; len = skb->len; ret =dev_queue_xmit (skb);
net/core/dev.c +5 -31
@@ -1533,10 +1533,14 @@ int dev_forward_skb(struct net_device *dkfree_skb (skb);return NET_RX_DROP ; } -skb_set_dev (skb, dev); + skb->dev = dev; +skb_dst_drop (skb); skb->tstamp.tv64 =0 ; skb->pkt_type =PACKET_HOST ; skb->protocol =eth_type_trans (skb, dev); + skb->mark =0 ; +secpath_reset (skb); +nf_reset (skb);return netif_rx (skb); }EXPORT_SYMBOL_GPL (dev_forward_skb);
@@ -1791,36 +1795,6 @@ void netif_device_attach(struct net_devi }EXPORT_SYMBOL (netif_device_attach); -/** -* skb_dev_set -- assign a new device to a buffer -* @skb: buffer for the new device -* @dev: network device -* -* If an skb is owned by a device already, we have to reset -* all data private to the namespace a device belongs to -* before assigning it a new device. -*/ -#ifdef CONFIG_NET_NS -void skb_set_dev (struct sk_buff *skb,struct net_device *dev) -{ -skb_dst_drop (skb); -if (skb->dev && !net_eq (dev_net (skb->dev),dev_net (dev))) { -secpath_reset (skb); -nf_reset (skb); -skb_init_secmark (skb); - skb->mark =0 ; - skb->priority =0 ; - skb->nf_trace =0 ; - skb->ipvs_property =0 ; -#ifdef CONFIG_NET_SCHED - skb->tc_index =0 ; -#endif - } - skb->dev = dev; -} -EXPORT_SYMBOL (skb_set_dev); -#endif /* CONFIG_NET_NS */ -/* * Invalidate hardware checksum when packet is to be mangled, and * complete checksum manually on outgoing path.
Greg KH
maintainerPATCH 37/47 sctp: check cached dst before using it
In reply to Greg KH3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nicolas Dichtel <[email protected]>
[ Upstream commit e0268868ba064980488fc8c194db3d8e9fb2959c ]
dst_check() will take care of SA (and obsolete field), hence IPsec rekeying scenario is taken into account.
--- include/net/sctp/sctp.h | 13 +++++++++++++ net/sctp/output.c | 4 +--- net/sctp/transport.c | 17 ----------------- 3 files changed, 14 insertions(+), 20 deletions(-)
include/net/sctp/sctp.h +13 -0
@@ -700,4 +700,17 @@ static inline void sctp_v4_map_v6(union addr->v6.sin6_addr.s6_addr32[2] = htonl(0x0000ffff); } +/* The cookie is always 0 since this is how it's used in the +* pmtu code. +*/ +static inline struct dst_entry *sctp_transport_dst_check (struct sctp_transport *t) +{ +if (t->dst && !dst_check (t->dst,0 )) { +dst_release (t->dst); + t->dst =NULL ; + } + +return t->dst; +} +#endif /* __net_sctp_h__ */
net/sctp/output.c +1 -3
@@ -377,9 +377,7 @@ int sctp_packet_transmit(struct sctp_pac*/ skb_set_owner_w (nskb, sk); -/* The 'obsolete' field of dst is set to 2 when a dst is freed. */ -if (!dst || (dst->obsolete >1 )) { -dst_release (dst); +if (!sctp_transport_dst_check (tp)) {sctp_transport_route (tp,NULL ,sctp_sk (sk));if (asoc && (asoc->param_flags &SPP_PMTUD_ENABLE )) {sctp_assoc_sync_pmtu (asoc);
net/sctp/transport.c +0 -17
@@ -226,23 +226,6 @@ void sctp_transport_pmtu(struct sctp_tra transport->pathmtu =SCTP_DEFAULT_MAXSEGMENT ; } -/* this is a complete rip-off from __sk_dst_check -* the cookie is always 0 since this is how it's used in the -* pmtu code -*/ -static struct dst_entry *sctp_transport_dst_check (struct sctp_transport *t) -{ -struct dst_entry *dst = t->dst; - -if (dst && dst->obsolete && dst->ops->check (dst,0 ) ==NULL ) { -dst_release (t->dst); - t->dst =NULL ; -return NULL ; - } - -return dst; -} -void sctp_transport_update_pmtu (struct sctp_transport *t,u32 pmtu) {struct dst_entry *dst;
Greg KH
maintainerPATCH 38/47 skb: avoid unnecessary reallocations in __skb_cow
In reply to Greg KH3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Felix Fietkau <[email protected]>
[ Upstream commit 617c8c11236716dcbda877e764b7bf37c6fd8063 ]
At the beginning of __skb_cow, headroom gets set to a minimum of NET_SKB_PAD. This causes unnecessary reallocations if the buffer was not cloned and the headroom is just below NET_SKB_PAD, but still more than the amount requested by the caller.
This was showing up frequently in my tests on VLAN tx, where vlan_insert_tag calls skb_cow_head(skb, VLAN_HLEN).
Locally generated packets should have enough headroom, and for forward paths, we already have NET_SKB_PAD bytes of headroom, so we don't need to add any extra space here.
--- include/linux/skbuff.h | 2 -- 1 file changed, 2 deletions(-)
include/linux/skbuff.h +0 -2
@@ -1633,8 +1633,6 @@ static inline int __skb_cow(struct sk_bu {int delta =0 ; -if (headroom <NET_SKB_PAD ) - headroom =NET_SKB_PAD ;if (headroom >skb_headroom (skb)) delta = headroom -skb_headroom (skb);
Greg KH
maintainerPATCH 39/47 xfrm: take net hdr len into account for esp payload size calculation
In reply to Greg KH3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Benjamin Poirier <[email protected]>
[ Upstream commit 91657eafb64b4cb53ec3a2fbc4afc3497f735788 ]
Corrects the function that determines the esp payload size. The calculations done in esp{4,6}_get_mtu() lead to overlength frames in transport mode for certain mtu values and suboptimal frames for others.
According to what is done, mainly in esp{,6}_output() and tcp_mtu_to_mss(), net_header_len must be taken into account before doing the alignment calculation.
--- net/ipv4/esp4.c | 24 +++++++++--------------- net/ipv6/esp6.c | 18 +++++++----------- 2 files changed, 16 insertions(+), 26 deletions(-)
net/ipv4/esp4.c +9 -15
@@ -457,28 +457,22 @@ static u32 esp4_get_mtu(struct xfrm_statstruct esp_data *esp = x->data;u32 blksize =ALIGN (crypto_aead_blocksize (esp->aead),4 );u32 align =max_t (u32, blksize, esp->padlen); -u32 rem; - - mtu -= x->props.header_len +crypto_aead_authsize (esp->aead); - rem = mtu & (align -1 ); - mtu &= ~(align -1 ); +unsigned int net_adj;switch (x->props.mode) { -case XFRM_MODE_TUNNEL : -break ; -default :case XFRM_MODE_TRANSPORT : -/* The worst case */ - mtu -= blksize -4 ; - mtu +=min_t (u32, blksize -4 , rem); -break ;case XFRM_MODE_BEET : -/* The worst case. */ - mtu +=min_t (u32,IPV4_BEET_PHMAXLEN , rem); + net_adj =sizeof (struct iphdr ); +break ; +case XFRM_MODE_TUNNEL : + net_adj =0 ;break ; +default : +BUG (); } -return mtu -2 ; +return ((mtu - x->props.header_len -crypto_aead_authsize (esp->aead) - + net_adj) & ~(align -1 )) + (net_adj -2 ); }static void esp4_err (struct sk_buff *skb,u32 info)
net/ipv6/esp6.c +7 -11
@@ -411,19 +411,15 @@ static u32 esp6_get_mtu(struct xfrm_statstruct esp_data *esp = x->data;u32 blksize =ALIGN (crypto_aead_blocksize (esp->aead),4 );u32 align =max_t (u32, blksize, esp->padlen); -u32 rem; +unsigned int net_adj; - mtu -= x->props.header_len +crypto_aead_authsize (esp->aead); - rem = mtu & (align -1 ); - mtu &= ~(align -1 ); +if (x->props.mode !=XFRM_MODE_TUNNEL ) + net_adj =sizeof (struct ipv6hdr ); +else + net_adj =0 ; -if (x->props.mode !=XFRM_MODE_TUNNEL ) { -u32 padsize = ((blksize -1 ) &7 ) +1 ; - mtu -= blksize - padsize; - mtu +=min_t (u32, blksize - padsize, rem); - } - -return mtu -2 ; +return ((mtu - x->props.header_len -crypto_aead_authsize (esp->aead) - + net_adj) & ~(align -1 )) + (net_adj -2 ); } static void esp6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
Greg KH
maintainerPATCH 40/47 ext4: force ro mount if ext4_setup_super() fails
In reply to Greg KH3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Sandeen <[email protected]>
commit 7e84b6216467b84cd332c8e567bf5aa113fd2f38 upstream.
If ext4_setup_super() fails i.e. due to a too-high revision, the error is logged in dmesg but the fs is not mounted RO as indicated.
Tested by:
# mkfs.ext4 -r 4 /dev/sdb6 # mount /dev/sdb6 /mnt/test # dmesg | grep "too high" [164919.759248] EXT4-fs (sdb6): revision level too high, forcing read-only mode # grep sdb6 /proc/mounts /dev/sdb6 /mnt/test2 ext4 rw,seclabel,relatime,data=ordered 0 0
--- fs/ext4/super.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fs/ext4/super.c +2 -1
@@ -3618,7 +3618,8 @@ no_journal: goto failed_mount4; } -ext4_setup_super (sb, es, sb->s_flags &MS_RDONLY ); +if (ext4_setup_super (sb, es, sb->s_flags &MS_RDONLY )) + sb->s_flags |=MS_RDONLY ;/* determine the minimum size of new large inodes, if present */ if (sbi->s_inode_size >EXT4_GOOD_OLD_INODE_SIZE ) {
Greg KH
maintainerPATCH 41/47 ext4: add missing save_error_info() to ext4_error()
In reply to Greg KH3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Theodore Ts'o <[email protected]>
commit f3fc0210c0fc91900766c995f089c39170e68305 upstream.
The ext4_error() function is missing a call to save_error_info(). Since this is the function which marks the file system as containing an error, this oversight (which was introduced in 2.6.36) is quite significant, and should be backported to older stable kernels with high urgency.
--- fs/ext4/super.c | 1 + 1 file changed, 1 insertion(+)
fs/ext4/super.c +1 -0
@@ -433,6 +433,7 @@ void __ext4_error(struct super_block *sbprintk (KERN_CRIT "EXT4-fs error (device %s): %s:%d: comm %s: %pV\n" , sb->s_id, function, line, current->comm, &vaf);va_end (args); +save_error_info (sb, function, line);ext4_handle_error (sb); }
Greg KH
maintainerPATCH 42/47 ext4: dont trash state flags in EXT4_IOC_SETFLAGS
In reply to Greg KH3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Theodore Ts'o <[email protected]>
commit 79906964a187c405db72a3abc60eb9b50d804fbc upstream.
In commit 353eb83c we removed i_state_flags with 64-bit longs, But when handling the EXT4_IOC_SETFLAGS ioctl, we replace i_flags directly, which trashes the state flags which are stored in the high 32-bits of i_flags on 64-bit platforms. So use the the ext4_{set,clear}_inode_flags() functions which use atomic bit manipulation functions instead.
--- fs/ext4/ioctl.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
fs/ext4/ioctl.c +9 -3
@@ -35,7 +35,7 @@ long ext4_ioctl(struct file *filp, unsighandle_t *handle =NULL ;int err, migrate =0 ;struct ext4_iloc iloc; -unsigned int oldflags; +unsigned int oldflags, mask, i;unsigned int jflag;if (!inode_owner_or_capable (inode))
@@ -112,8 +112,14 @@ long ext4_ioctl(struct file *filp, unsigif (err) goto flags_err; - flags = flags &EXT4_FL_USER_MODIFIABLE ; - flags |= oldflags & ~EXT4_FL_USER_MODIFIABLE ; +for (i =0 , mask =1 ; i <32 ; i++, mask <<=1 ) { +if (!(mask &EXT4_FL_USER_MODIFIABLE )) +continue ; +if (mask & flags) +ext4_set_inode_flag (inode, i); +else +ext4_clear_inode_flag (inode, i); + } ei->i_flags = flags;ext4_set_inode_flags (inode);
Greg KH
maintainerPATCH 43/47 ext4: add ext4_mb_unload_buddy in the error path
In reply to Greg KH3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Salman Qazi <[email protected]>
commit 02b7831019ea4e7994968c84b5826fa8b248ffc8 upstream.
ext4_free_blocks fails to pair an ext4_mb_load_buddy with a matching ext4_mb_unload_buddy when it fails a memory allocation.
--- fs/ext4/mballoc.c | 1 + 1 file changed, 1 insertion(+)
fs/ext4/mballoc.c +1 -0
@@ -4583,6 +4583,7 @@ do_more:*/ new_entry =kmem_cache_alloc (ext4_free_ext_cachep,GFP_NOFS );if (!new_entry) { +ext4_mb_unload_buddy (&e4b); err = -ENOMEM ; goto error_return; }
Greg KH
maintainerPATCH 44/47 ext4: remove mb_groups before tearing down the buddy_cache
In reply to Greg KH3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Salman Qazi <[email protected]>
commit 95599968d19db175829fb580baa6b68939b320fb upstream.
We can't have references held on pages in the s_buddy_cache while we are trying to truncate its pages and put the inode. All the pages must be gone before we reach clear_inode. This can only be gauranteed if we can prevent new users from grabbing references to s_buddy_cache's pages.
The original bug can be reproduced and the bug fix can be verified by:
while true; do mount -t ext4 /dev/ram0 /export/hda3/ram0; \
umount /export/hda3/ram0; done &
while true; do cat /proc/fs/ext4/ram0/mb_groups; done
--- fs/ext4/mballoc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
fs/ext4/mballoc.c +3 -2
@@ -2528,6 +2528,9 @@ int ext4_mb_release(struct super_block *struct ext4_sb_info *sbi =EXT4_SB (sb);struct kmem_cache *cachep =get_groupinfo_cache (sb->s_blocksize_bits); +if (sbi->s_proc) +remove_proc_entry ("mb_groups" , sbi->s_proc); +if (sbi->s_group_info) {for (i =0 ; i < ngroups; i++) { grinfo =ext4_get_group_info (sb, i);
@@ -2575,8 +2578,6 @@ int ext4_mb_release(struct super_block * }free_percpu (sbi->s_locality_groups); -if (sbi->s_proc) -remove_proc_entry ("mb_groups" , sbi->s_proc);return 0 ; }
Greg KH
maintainerPATCH 45/47 drm/radeon/kms: add new BTC PCI ids
In reply to Greg KH3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alex Deucher <[email protected]>
commit a2bef8ce826dd1e787fd8ad9b6e0566ba59dab43 upstream.
--- include/drm/drm_pciids.h | 2 ++ 1 file changed, 2 insertions(+)
include/drm/drm_pciids.h +2 -0
@@ -181,6 +181,7 @@ {0x1002, 0x6747, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TURKS|RADEON_NEW_MEMMAP}, \ {0x1002, 0x6748, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TURKS|RADEON_NEW_MEMMAP}, \ {0x1002, 0x6749, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TURKS|RADEON_NEW_MEMMAP}, \ + {0x1002, 0x674A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TURKS|RADEON_NEW_MEMMAP}, \ {0x1002, 0x6750, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TURKS|RADEON_NEW_MEMMAP}, \ {0x1002, 0x6751, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TURKS|RADEON_NEW_MEMMAP}, \ {0x1002, 0x6758, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TURKS|RADEON_NEW_MEMMAP}, \
@@ -198,6 +199,7 @@ {0x1002, 0x6767, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CAICOS|RADEON_NEW_MEMMAP}, \ {0x1002, 0x6768, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CAICOS|RADEON_NEW_MEMMAP}, \ {0x1002, 0x6770, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CAICOS|RADEON_NEW_MEMMAP}, \ + {0x1002, 0x6771, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CAICOS|RADEON_NEW_MEMMAP}, \ {0x1002, 0x6772, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CAICOS|RADEON_NEW_MEMMAP}, \ {0x1002, 0x6778, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CAICOS|RADEON_NEW_MEMMAP}, \ {0x1002, 0x6779, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CAICOS|RADEON_NEW_MEMMAP}, \
Greg KH
maintainerPATCH 46/47 ACPI battery: only refresh the sysfs files when pertinent information changes
In reply to Greg KH3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andy Whitcroft <[email protected]>
commit c5971456964290da7e98222892797b71ef793e62 upstream.
We only need to regenerate the sysfs files when the capacity units change, avoid the update otherwise.
The origin of this issue is dates way back to 2.6.38:da8aeb92d4853f37e281f11fddf61f9c7d84c3cd
(ACPI / Battery: Update information on info notification and resume)
--- drivers/acpi/battery.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
drivers/acpi/battery.c +9 -1
@@ -635,11 +635,19 @@ static int acpi_battery_update(struct acstatic void acpi_battery_refresh (struct acpi_battery *battery) { +int power_unit; +if (!battery->bat.dev)return ; + power_unit = battery->power_unit; +acpi_battery_get_info (battery); -/* The battery may have changed its reporting units. */ + +if (power_unit == battery->power_unit) +return ; + +/* The battery has changed its reporting units. */ sysfs_remove_battery (battery);sysfs_add_battery (battery); }
Greg KH
maintainerPATCH 47/47 wl1251: fix oops on early interrupt
In reply to Greg KH3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Grazvydas Ignotas <[email protected]>
commit f380f2c4a12e913356bd49f8790ec1063c4fe9f8 upstream.
This driver disables interrupt just after requesting it and enables it later, after interface is up. However currently there is a time window between request_irq() and disable_irq() where if interrupt arrives, the driver oopses because it's not yet ready to process it. This can be reproduced by inserting the module, associating and removing the module multiple times.
Eliminate this race by setting IRQF_NOAUTOEN flag before request_irq().
--- drivers/net/wireless/wl1251/sdio.c | 2 +- drivers/net/wireless/wl1251/spi.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-)
drivers/net/wireless/wl1251/sdio.c +1 -1
@@ -259,6 +259,7 @@ static int wl1251_sdio_probe(struct sdio }if (wl->irq) { +irq_set_status_flags (wl->irq,IRQ_NOAUTOEN ); ret =request_irq (wl->irq, wl1251_line_irq,0 ,"wl1251" , wl);if (ret <0 ) {wl1251_error ("request_irq() failed: %d" , ret);
@@ -266,7 +267,6 @@ static int wl1251_sdio_probe(struct sdio }irq_set_irq_type (wl->irq,IRQ_TYPE_EDGE_RISING ); -disable_irq (wl->irq); wl1251_sdio_ops.enable_irq = wl1251_enable_line_irq; wl1251_sdio_ops.disable_irq = wl1251_disable_line_irq;
drivers/net/wireless/wl1251/spi.c +1 -2
@@ -280,6 +280,7 @@ static int __devinit wl1251_spi_probe(st wl->use_eeprom = pdata->use_eeprom; +irq_set_status_flags (wl->irq,IRQ_NOAUTOEN ); ret =request_irq (wl->irq, wl1251_irq,0 ,DRIVER_NAME , wl);if (ret <0 ) {wl1251_error ("request_irq() failed: %d" , ret);
@@ -288,8 +289,6 @@ static int __devinit wl1251_spi_probe(stirq_set_irq_type (wl->irq,IRQ_TYPE_EDGE_RISING ); -disable_irq (wl->irq); - ret =wl1251_init_ieee80211 (wl);if (ret) goto out_irq;