3.0.67-stable review
Subsystems (48)
Greg Kroah-Hartman
maintainercover 3.0.67-stable review
This is the start of the stable review cycle for the 3.0.67 release. There are 53 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 Thu Feb 28 23:55:32 UTC 2013. 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.67-rc1.gz
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 3.0.67-rc1
Josh Boyer <[email protected]>
USB: usb-storage: unusual_devs update for Super TOP SATA bridge
fangxiaozhi <[email protected]>
USB: storage: properly handle the endian issues of idProduct
Roger Quadros <[email protected]>
USB: ehci-omap: Fix autoloading of module
Bjørn Mork <[email protected]>
USB: option: add Huawei "ACM" devices using protocol = vendor
Bjørn Mork <[email protected]>
USB: option: add Yota / Megafon M100-1 4g modem
Bjørn Mork <[email protected]>
USB: option: add and update Alcatel modems
Maciej Sosnowski <[email protected]>
dca: check against empty dca_domains list before unregister provider
Eric Dumazet <[email protected]>
ipv6: use a stronger hash for tcp
Li Wei <[email protected]>
ipv4: fix a bug in ping_err().
David Vrabel <[email protected]>
xen-netback: cancel the credit timer when taking the vif down
David Vrabel <[email protected]>
xen-netback: correctly return errors from netbk_count_requests()
Stephen Hemminger <[email protected]>
bridge: set priority of STP packets
Takashi Iwai <[email protected]>
fb: Yet another band-aid for fixing lockdep mess
Alan Cox <[email protected]>
fb: rework locking to fix lock ordering on takeover
Dave Airlie <[email protected]>
fbcon: don't lose the console font across generic->chip driver switch
Jean Delvare <[email protected]>
pcmcia/vrc4171: Add missing spinlock init
John David Anglin <[email protected]>
Purge existing TLB entries in set_pte_at and ptep_set_wrprotect
Phileas Fogg <[email protected]>
powerpc/kexec: Disable hard IRQ before kexec
Igor Grinberg <[email protected]>
ARM: PXA3xx: program the CSMSADRCFG register
Malcolm Priestley <[email protected]>
staging: vt6656: Fix URB submitted while active warning.
Ian Abbott <[email protected]>
staging: comedi: disallow COMEDI_DEVCONFIG on non-board minors
Mika Kuoppala <[email protected]>
drm/i915: disable shared panel fitter for pipe
Alan Stern <[email protected]>
NLS: improve UTF8 -> UTF16 string conversion routine
Dave Airlie <[email protected]>
drm/usb: bind driver to correct device
David S. Miller <[email protected]>
sunvdc: Fix off-by-one in generic_request().
Dan Carpenter <[email protected]>
ext4: add missing kfree() on error return path in add_new_gdb()
Tao Ma <[email protected]>
ext4: Free resources in some error path in ext4_fill_super
Pawel Moll <[email protected]>
ALSA: usb: Fix Processing Unit Descriptor parsers
Clemens Ladisch <[email protected]>
ALSA: usb-audio: fix Roland A-PRO support
Tomasz Guszkowski <[email protected]>
p54usb: corrected USB ID for T-Com Sinus 154 data II
Trond Myklebust <[email protected]>
NLM: Ensure that we resend all pending blocking locks after a reclaim
Mel Gorman <[email protected]>
mm/fadvise.c: drain all pagevecs if POSIX_FADV_DONTNEED fails to discard all pages
Greg Thelen <[email protected]>
tmpfs: fix use-after-free of mempolicy object
Lars-Peter Clausen <[email protected]>
drivers/video/backlight/adp88?0_bl.c: fix resume
Junxiao Bi <[email protected]>
ocfs2: unlock super lock if lockres refresh failed
Jim Somerville <[email protected]>
inotify: remove broken mask checks causing unmount to be EINVAL
Christian Borntraeger <[email protected]>
s390/kvm: Fix store status for ACRS/FPRS
Cornelia Huck <[email protected]>
KVM: s390: Handle hosts not supporting s390-virtio.
Robin Holt <[email protected]>
mmu_notifier_unregister NULL Pointer deref and multiple ->release() callouts
Andrea Arcangeli <[email protected]>
mm: mmu_notifier: make the mmu_notifier srcu static
Sagi Grimberg <[email protected]>
mm: mmu_notifier: have mmu_notifiers use a global SRCU so they may safely schedule
Bjorn Helgaas <[email protected]>
Driver core: treat unregistered bus_types as having no devices
Stefan Bader <[email protected]>
xen: Send spinlock IPI to all waiters
Ian Campbell <[email protected]>
xen/netback: check correct frag when looking for head frag
Oleg Nesterov <[email protected]>
tty: set_termios/set_termiox should not return -EINTR
Denis Efremov <[email protected]>
ALSA: rme32.c irq enabling after spin_lock_irq
Denis Efremov <[email protected]>
ALSA: ali5451: remove irq enabling in pointer callback
Leonid Shatz <[email protected]>
hrtimer: Prevent hrtimer_enqueue_reprogram race
Stanislaw Gruszka <[email protected]>
posix-cpu-timers: Fix nanosleep task_struct leak
Thomas Gleixner <[email protected]>
genirq: Avoid deadlock in spurious handling
H. Peter Anvin <[email protected]>
timeconst.pl: Eliminate Perl warning
Linus Torvalds <[email protected]>
mm: fix pageblock bitmap allocation
H. Peter Anvin <[email protected]>
x86-32, mm: Remove reference to resume_map_numa_kva()
-------------
Diffstat:
Makefile | 4 +- arch/arm/mach-pxa/include/mach/smemc.h | 1 + arch/arm/mach-pxa/smemc.c | 15 +++- arch/parisc/include/asm/pgtable.h | 13 +++- arch/parisc/kernel/cache.c | 18 +++++ arch/powerpc/kernel/machine_kexec_64.c | 5 ++ arch/s390/kvm/kvm-s390.c | 8 ++ arch/x86/include/asm/mmzone_32.h | 6 -- arch/x86/power/hibernate_32.c | 2 - arch/x86/xen/spinlock.c | 1 - drivers/base/bus.c | 4 +- drivers/block/sunvdc.c | 2 +- drivers/dca/dca-core.c | 5 ++ drivers/gpu/drm/drm_usb.c | 2 +- drivers/gpu/drm/i915/intel_display.c | 8 ++ drivers/net/wireless/p54/p54usb.c | 2 +- drivers/net/xen-netback/interface.c | 3 +- drivers/net/xen-netback/netback.c | 10 +-- drivers/pcmcia/vrc4171_card.c | 1 + drivers/s390/kvm/kvm_virtio.c | 38 ++++++++-- drivers/staging/comedi/comedi_fops.c | 5 ++ drivers/staging/hv/hv_kvp.c | 10 ++- drivers/staging/vt6656/usbpipe.c | 28 +++++-- drivers/tty/tty_ioctl.c | 4 +- drivers/tty/vt/vt.c | 134 +++++++++++++++++++++++--------- drivers/usb/host/ehci-omap.c | 2 +- drivers/usb/serial/option.c | 16 +++- drivers/usb/storage/initializers.c | 4 +- drivers/usb/storage/unusual_cypress.h | 2 +- drivers/video/backlight/adp8860_bl.c | 2 +- drivers/video/backlight/adp8870_bl.c | 2 +- drivers/video/console/fbcon.c | 47 ++++++++++-- drivers/video/fbmem.c | 9 ++- drivers/video/fbsysfs.c | 3 + fs/ext4/resize.c | 1 + fs/ext4/super.c | 19 +++-- fs/fat/namei_vfat.c | 3 +- fs/lockd/clntproc.c | 3 + fs/nls/nls_base.c | 43 ++++++++--- fs/notify/inotify/inotify_user.c | 4 - fs/ocfs2/dlmglue.c | 5 +- include/linux/console.h | 2 + include/linux/mmu_notifier.h | 1 + include/linux/nls.h | 5 +- include/linux/usb/audio.h | 6 +- include/linux/vt_kern.h | 2 + include/net/inet6_hashtables.h | 8 +- include/net/inet_sock.h | 1 + include/net/ipv6.h | 12 +++ kernel/hrtimer.c | 36 ++++----- kernel/irq/spurious.c | 7 +- kernel/posix-cpu-timers.c | 23 +++++- kernel/timeconst.pl | 6 +- mm/fadvise.c | 18 ++++- mm/mmu_notifier.c | 147 +++++++++++++++++++++--------------- mm/page_alloc.c | 15 ++-- mm/shmem.c | 10 ++- net/bridge/br_stp_bpdu.c | 2 + net/ipv4/af_inet.c | 9 ++- net/ipv4/ping.c | 4 +- sound/pci/ali5451/ali5451.c | 2 +- sound/pci/rme32.c | 2 +- sound/usb/quirks-table.h | 2 +- 63 files changed, 573 insertions(+), 241 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 1/53 x86-32, mm: Remove reference to resume_map_numa_kva()
3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: "H. Peter Anvin" <[email protected]>
commit bb112aec5ee41427e9b9726e3d57b896709598ed upstream.
Remove reference to removed function resume_map_numa_kva().
--- arch/x86/include/asm/mmzone_32.h | 6 ------ arch/x86/power/hibernate_32.c | 2 -- 2 files changed, 8 deletions(-)
arch/x86/include/asm/mmzone_32.h +0 -6
@@ -14,12 +14,6 @@ extern struct pglist_data *node_data[];#include <asm/numaq.h> -extern void resume_map_numa_kva (pgd_t *pgd); - -#else /* !CONFIG_NUMA */ - -static inline void resume_map_numa_kva (pgd_t *pgd) {} -#endif /* CONFIG_NUMA */ #ifdef CONFIG_DISCONTIGMEM
arch/x86/power/hibernate_32.c +0 -2
@@ -130,8 +130,6 @@ static int resume_physical_mapping_init( } } -resume_map_numa_kva (pgd_base); -return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 2/53 mm: fix pageblock bitmap allocation
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Linus Torvalds <[email protected]>
commit 7c45512df987c5619db041b5c9b80d281e26d3db upstream.
Commit c060f943d092 ("mm: use aligned zone start for pfn_to_bitidx calculation") fixed out calculation of the index into the pageblock bitmap when a !SPARSEMEM zome was not aligned to pageblock_nr_pages.
However, the _allocation_ of that bitmap had never taken this alignment requirement into accout, so depending on the exact size and alignment of the zone, the use of that index could then access past the allocation, resulting in some very subtle memory corruption.
This was reported (and bisected) by Ingo Molnar: one of his random config builds would hang with certain very specific kernel command line options.
In the meantime, commit c060f943d092 has been marked for stable, so this fix needs to be back-ported to the stable kernels that backported the commit to use the right alignment.
--- mm/page_alloc.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)
mm/page_alloc.c +9 -6
@@ -4264,10 +4264,11 @@ static void __meminit calculate_node_tot* round what is now in bits to nearest long in bits, then return it in * bytes. */ -static unsigned long __init usemap_size (unsigned long zonesize) +static unsigned long __init usemap_size (unsigned long zone_start_pfn,unsigned long zonesize) {unsigned long usemapsize; + zonesize += zone_start_pfn & (pageblock_nr_pages-1 ); usemapsize =roundup (zonesize, pageblock_nr_pages); usemapsize = usemapsize >> pageblock_order; usemapsize *=NR_PAGEBLOCK_BITS ;
@@ -4277,17 +4278,19 @@ static unsigned long __init usemap_size( }static void __init setup_usemap (struct pglist_data *pgdat, -struct zone *zone,unsigned long zonesize) +struct zone *zone, +unsigned long zone_start_pfn, +unsigned long zonesize) { -unsigned long usemapsize =usemap_size (zonesize); +unsigned long usemapsize =usemap_size (zone_start_pfn, zonesize); zone->pageblock_flags =NULL ;if (usemapsize) zone->pageblock_flags =alloc_bootmem_node_nopanic (pgdat, usemapsize); }#else -static inline void setup_usemap (struct pglist_data *pgdat, -struct zone *zone,unsigned long zonesize) {} +static inline void setup_usemap (struct pglist_data *pgdat,struct zone *zone, +unsigned long zone_start_pfn,unsigned long zonesize) {}#endif /* CONFIG_SPARSEMEM */ #ifdef CONFIG_HUGETLB_PAGE_SIZE_VARIABLE
@@ -4415,7 +4418,7 @@ static void __paginginit free_area_init_continue ;set_pageblock_order (pageblock_default_order ()); -setup_usemap (pgdat, zone, size); +setup_usemap (pgdat, zone, zone_start_pfn, size); ret =init_currently_empty_zone (zone, zone_start_pfn, size,MEMMAP_EARLY );BUG_ON (ret);
Greg Kroah-Hartman
maintainerPATCH 3/53 timeconst.pl: Eliminate Perl warning
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: "H. Peter Anvin" <[email protected]>
commit 63a3f603413ffe82ad775f2d62a5afff87fd94a0 upstream.
defined(@array) is deprecated in Perl and gives off a warning. Restructure the code to remove that warning.
[ hpa: it would be interesting to revert to the timeconst.bc script.
It appears that the failures reported by akpm during testing of that script was due to a known broken version of make, not a problem with bc. The Makefile rules could probably be restructured to avoid the make bug, or it is probably old enough that it doesn't matter. ]
--- kernel/timeconst.pl | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
kernel/timeconst.pl +2 -4
@@ -369,10 +369,8 @@ if ($hz eq '--can') { die "Usage: $0 HZ\n"; } - @val = @{$canned_values{$hz}}; - if (!defined(@val)) { - @val = compute_values($hz); - } + $cv = $canned_values{$hz}; + @val = defined($cv) ? @$cv : compute_values($hz); output($hz, @val); } exit 0;
Re: [ 03/53] timeconst.pl: Eliminate Perl warning
Quoted 4 lines · Greg Kroah-Hartman
3.0-stable review patch. If anyone has any objections, please let me know.
------------------
Quoted 8 lines
From: "H. Peter Anvin" <[email protected]>
commit
63a3f603413ffe82ad775f2d62a5afff87fd94a0upstream.defined(@array) is deprecated in Perl and gives off a warning. Restructure the code to remove that warning.
[ hpa: it would be interesting to revert to the timeconst.bc script.
Or, you know, the mktimeconst.c I've posted to this list several times over the past few years as part of the perl removal series I maintain? Most recently http://lkml.indiana.edu/hypermail/linux/kernel/1212.2/00729.html but before that rather a lot of times (list at http://lkml.indiana.edu/hypermail/linux/kernel/1212.2/00734.html) and the newest version of which is always at:
http://landley.net/hg/aboriginal/file/tip/sources/patches
I just updated them for 3.8. The mktimeconst one is attached to this message.
(I'm told the balsa email program manages to break whitespace in attachments. I'm aware how sad that is. I'm writing a darn python script to send mail inline without doing that. I'll repost the series with that. My first attempt at that script is why the posts I linked to above have my name mangled. Working on it...)
Rob
From: Rob Landley <[email protected]>
Replace perl header file generator with smaller/faster/simpler C version.
Hasn't changed since last submission, which was:
Message-ID: <[email protected]>
Subject: Re: [PATCH] Use sed instead of perl to generate x86/kernel/cpu/capflags.c.
---
I ran the attached test script to compare the output of the C program with the output of the perl version for every HZ from 1 to 5000 to make sure it was producing the same constants.
kernel/Makefile | 10 - kernel/mktimeconst.c | 109 +++++++++++ kernel/timeconst.pl | 378 ----------------------------------------- 3 files changed, 115 insertions(+), 382 deletions(-)
kernel/Makefile +6 -4
@@ -133,11 +133,13 @@ $(obj)/config_data.h: $(obj)/config_data.gz FORCE $(obj)/time.o: $(obj)/timeconst.h -quiet_cmd_timeconst = TIMEC $@ - cmd_timeconst = $(PERL) $< $(CONFIG_HZ) > $@ +hostprogs-y += mktimeconst +quiet_cmd_mktimeconst = TIMEC $@ + cmd_mktimeconst = $(obj)/mktimeconst $(CONFIG_HZ) $@ || ( rm -f $@ && exit 1 ) + targets += timeconst.h -$(obj)/timeconst.h: $(src)/timeconst.pl FORCE - $(call if_changed,timeconst) +$(obj)/timeconst.h: $(obj)/mktimeconst FORCE + $(call if_changed,mktimeconst) ifeq ($(CONFIG_MODULE_SIG),y) #
kernel/mktimeconst.c new file +109 -0
109 lines not on this page · raw message
kernel/timeconst.pl deleted +0 -378
378 lines not on this page · raw message
--------------070402000802050303040701
Content-Type: application/x-sh; name="loopy.sh"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="loopy.sh"
#!/bin/bash
gcc mktimeconst.c || exit 1
X=1
while [ $X -lt 5000 ]
do
echo $X
perl ~/linux/linux/kernel/timeconst.pl $X | sed 's/KERNEL_TIMECONST/__KERNEL_TIMECONST/;/Automatically generated/d;/^$/d'> temp.txt ./a.out $X temp2.txt
sed -i '/Automatically generated/d;/^$/d' temp2.txt
diff -uw temp.txt temp2.txt || exit 1
X=$(($X+1))
done
--------------070402000802050303040701--
Greg Kroah-Hartman
maintainerPATCH 4/53 genirq: Avoid deadlock in spurious handling
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Gleixner <[email protected]>
commit e716efde75267eab919cdb2bef5b2cb77f305326 upstream.
commit 52553ddf(genirq: fix regression in irqfixup, irqpoll) introduced a potential deadlock by calling the action handler with the irq descriptor lock held.
Remove the call and let the handling code run even for an interrupt where only a single action is registered. That matches the goal of the above commit and avoids the deadlock.
Document the confusing action = desc->action reload in the handling loop while at it.
--- kernel/irq/spurious.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
kernel/irq/spurious.c +3 -4
@@ -80,13 +80,11 @@ static int try_one_irq(int irq, struct i/* * All handlers must agree on IRQF_SHARED, so we test just the -* first. Check for action->next as well. +* first. */ action = desc->action;if (!action || !(action->flags &IRQF_SHARED ) || - (action->flags & __IRQF_TIMER) || - (action->handler (irq, action->dev_id) ==IRQ_HANDLED ) || - !action->next) + (action->flags & __IRQF_TIMER)) goto out;/* Already running on another processor */
@@ -104,6 +102,7 @@ static int try_one_irq(int irq, struct ido {if (handle_irq_event (desc) ==IRQ_HANDLED ) ret =IRQ_HANDLED ; +/* Make sure that there is still a valid action */ action = desc->action; }while ((desc->istate &IRQS_PENDING ) && action); desc->istate &= ~IRQS_POLL_INPROGRESS ;
Greg Kroah-Hartman
maintainerPATCH 5/53 posix-cpu-timers: Fix nanosleep task_struct leak
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Stanislaw Gruszka <[email protected]>
commit e6c42c295e071dd74a66b5a9fcf4f44049888ed8 upstream.
The trinity fuzzer triggered a task_struct reference leak via clock_nanosleep with CPU_TIMERs. do_cpu_nanosleep() calls posic_cpu_timer_create(), but misses a corresponding posix_cpu_timer_del() which leads to the task_struct reference leak.
--- kernel/posix-cpu-timers.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-)
kernel/posix-cpu-timers.c +21 -2
@@ -1450,8 +1450,10 @@ static int do_cpu_nanosleep(const clockiwhile (!signal_pending (current)) {if (timer.it.cpu.expires.sched ==0 ) {/* -* Our timer fired and was reset. +* Our timer fired and was reset, below +* deletion can not fail. */ +posix_cpu_timer_del (&timer);spin_unlock_irq (&timer.it_lock);return 0 ; }
@@ -1469,9 +1471,26 @@ static int do_cpu_nanosleep(const clocki* We were interrupted by a signal. */ sample_to_timespec (which_clock, timer.it.cpu.expires, rqtp); -posix_cpu_timer_set (&timer,0 , &zero_it, it); + error =posix_cpu_timer_set (&timer,0 , &zero_it, it); +if (!error) { +/* +* Timer is now unarmed, deletion can not fail. +*/ +posix_cpu_timer_del (&timer); + }spin_unlock_irq (&timer.it_lock); +while (error ==TIMER_RETRY ) { +/* +* We need to handle case when timer was or is in the +* middle of firing. In other cases we already freed +* resources. +*/ +spin_lock_irq (&timer.it_lock); + error =posix_cpu_timer_del (&timer); +spin_unlock_irq (&timer.it_lock); + } +if ((it->it_value.tv_sec | it->it_value.tv_nsec) ==0 ) {/* * It actually did fire already.
Greg Kroah-Hartman
maintainerPATCH 6/53 hrtimer: Prevent hrtimer_enqueue_reprogram race
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Leonid Shatz <[email protected]>
commit b22affe0aef429d657bc6505aacb1c569340ddd2 upstream.
hrtimer_enqueue_reprogram contains a race which could result in timer.base switch during unlock/lock sequence.
hrtimer_enqueue_reprogram is releasing the lock protecting the timer base for calling raise_softirq_irqsoff() due to a lock ordering issue versus rq->lock.
If during that time another CPU calls __hrtimer_start_range_ns() on the same hrtimer, the timer base might switch, before the current CPU can lock base->lock again and therefor the unlock_timer_base() call will unlock the wrong lock.
[ tglx: Added comment and massaged changelog ]
--- kernel/hrtimer.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-)
kernel/hrtimer.c +18 -18
@@ -640,21 +640,9 @@ static inline void hrtimer_init_hres(str* and expiry check is done in the hrtimer_interrupt or in the softirq. */ static inline int hrtimer_enqueue_reprogram (struct hrtimer *timer, -struct hrtimer_clock_base *base, -int wakeup) +struct hrtimer_clock_base *base) { -if (base->cpu_base->hres_active &&hrtimer_reprogram (timer, base)) { -if (wakeup) { -raw_spin_unlock (&base->cpu_base->lock); -raise_softirq_irqoff (HRTIMER_SOFTIRQ ); -raw_spin_lock (&base->cpu_base->lock); - }else -__raise_softirq_irqoff (HRTIMER_SOFTIRQ ); - -return 1 ; - } - -return 0 ; +return base->cpu_base->hres_active &&hrtimer_reprogram (timer, base); }static inline ktime_t hrtimer_update_base (struct hrtimer_cpu_base *base)
@@ -735,8 +723,7 @@ static inline int hrtimer_switch_to_hresstatic inline void hrtimer_force_reprogram (struct hrtimer_cpu_base *base,int skip_equal) { }static inline int hrtimer_enqueue_reprogram (struct hrtimer *timer, -struct hrtimer_clock_base *base, -int wakeup) +struct hrtimer_clock_base *base) {return 0 ; }
@@ -995,8 +982,21 @@ int __hrtimer_start_range_ns(struct hrti* * XXX send_remote_softirq() ? */ -if (leftmost && new_base->cpu_base == &__get_cpu_var (hrtimer_bases)) -hrtimer_enqueue_reprogram (timer, new_base, wakeup); +if (leftmost && new_base->cpu_base == &__get_cpu_var (hrtimer_bases) + &&hrtimer_enqueue_reprogram (timer, new_base)) { +if (wakeup) { +/* +* We need to drop cpu_base->lock to avoid a +* lock ordering issue vs. rq->lock. +*/ +raw_spin_unlock (&new_base->cpu_base->lock); +raise_softirq_irqoff (HRTIMER_SOFTIRQ ); +local_irq_restore (flags); +return ret; + }else { +__raise_softirq_irqoff (HRTIMER_SOFTIRQ ); + } + }unlock_hrtimer_base (timer, &flags);
Greg Kroah-Hartman
maintainerPATCH 7/53 ALSA: ali5451: remove irq enabling in pointer callback
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Denis Efremov <[email protected]>
commit dacae5a19b4cbe1b5e3a86de23ea74cbe9ec9652 upstream.
snd_ali_pointer function is called with local interrupts disabled. However it seems very strange to reenable them in such way.
Found by Linux Driver Verification project (linuxtesting.org).
--- sound/pci/ali5451/ali5451.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/pci/ali5451/ali5451.c +1 -1
@@ -1435,7 +1435,7 @@ static snd_pcm_uframes_t snd_ali_pointerspin_lock (&codec->reg_lock);if (!pvoice->running) { -spin_unlock_irq (&codec->reg_lock); +spin_unlock (&codec->reg_lock);return 0 ; }outb (pvoice->number,ALI_REG (codec,ALI_GC_CIR ));
Greg Kroah-Hartman
maintainerPATCH 8/53 ALSA: rme32.c irq enabling after spin_lock_irq
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Denis Efremov <[email protected]>
commit f49a59c4471d81a233e09dda45187cc44fda009d upstream.
According to the other code in this driver and similar code in rme96 it seems, that spin_lock_irq in snd_rme32_capture_close function should be paired with spin_unlock_irq.
Found by Linux Driver Verification project (linuxtesting.org).
--- sound/pci/rme32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/pci/rme32.c +1 -1
@@ -1017,7 +1017,7 @@ static int snd_rme32_capture_close(strucspin_lock_irq (&rme32->lock); rme32->capture_substream =NULL ; rme32->capture_periodsize =0 ; -spin_unlock (&rme32->lock); +spin_unlock_irq (&rme32->lock);return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 9/53 tty: set_termios/set_termiox should not return -EINTR
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Oleg Nesterov <[email protected]>
commit 183d95cdd834381c594d3aa801c1f9f9c0c54fa9 upstream.
See https://bugzilla.redhat.com/show_bug.cgi?id=904907
read command causes bash to abort with double free or corruption (out).
A simple test-case from Roman:
// Compile the reproducer and send sigchld ti that process.
// EINTR occurs even if SA_RESTART flag is set.
void handler(int sig)
{
}
main()
{
struct sigaction act;
act.sa_handler = handler;
act.sa_flags = SA_RESTART;
sigaction (SIGCHLD, &act, 0);
struct termio ttp;
ioctl(0, TCGETA, &ttp);
while(1)
{
if (ioctl(0, TCSETAW, ttp) < 0)
{
if (errno == EINTR)
{
fprintf(stderr, "BUG!"); return(1);
}
}
}
}Change set_termios/set_termiox to return -ERESTARTSYS to fix this particular problem.
I didn't dare to change other EINTR's in drivers/tty/, but they look equally wrong.
--- drivers/tty/tty_ioctl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/tty/tty_ioctl.c +2 -2
@@ -617,7 +617,7 @@ static int set_termios(struct tty_structif (opt &TERMIOS_WAIT ) {tty_wait_until_sent (tty,0 );if (signal_pending (current)) -return -EINTR ; +return -ERESTARTSYS ; }tty_set_termios (tty, &tmp_termios);
@@ -684,7 +684,7 @@ static int set_termiox(struct tty_structif (opt &TERMIOS_WAIT ) {tty_wait_until_sent (tty,0 );if (signal_pending (current)) -return -EINTR ; +return -ERESTARTSYS ; }mutex_lock (&tty->termios_mutex);
Greg Kroah-Hartman
maintainerPATCH 10/53 xen/netback: check correct frag when looking for head frag
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ian Campbell <[email protected]>
When I backported 7d5145d8eb2b "xen/netback: don't leak pages on failure in xen_netbk_tx_check_gop" to 3.0 (where it became f0457844e605) I somehow picked up an extraneous hunk breaking this.
--- drivers/net/xen-netback/netback.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/xen-netback/netback.c +1 -1
@@ -990,7 +990,7 @@ static int xen_netbk_tx_check_gop(structxen_netbk_idx_release (netbk, pending_idx,XEN_NETIF_RSP_ERROR );/* Skip first skb fragment if it is on same page as header fragment. */ - start = ((unsigned long )shinfo->frags[i].page == pending_idx); + start = ((unsigned long )shinfo->frags[0 ].page == pending_idx);for (i = start; i < nr_frags; i++) {int j, newerr;
Greg Kroah-Hartman
maintainerPATCH 11/53 xen: Send spinlock IPI to all waiters
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Stefan Bader <[email protected]>
commit 76eaca031f0af2bb303e405986f637811956a422 upstream.
There is a loophole between Xen's current implementation of pv-spinlocks and the scheduler. This was triggerable through a testcase until v3.6 changed the TLB flushing code. The problem potentially is still there just not observable in the same way.
What could happen was (is):
1. CPU n tries to schedule task x away and goes into a slow wait for the runq lock of CPU n-# (must be one with a lower number).
2. CPU n-#, while processing softirqs, tries to balance domains and goes into a slow wait for its own runq lock (for updating some records). Since this is a spin_lock_irqsave in softirq context, interrupts will be re-enabled for the duration of the poll_irq hypercall used by Xen.
3. Before the runq lock of CPU n-# is unlocked, CPU n-1 receives an interrupt (e.g. endio) and when processing the interrupt, tries to wake up task x. But that is in schedule and still on_cpu, so try_to_wake_up goes into a tight loop.
4. The runq lock of CPU n-# gets unlocked, but the message only gets sent to the first waiter, which is CPU n-# and that is busily stuck.
5. CPU n-# never returns from the nested interruption to take and release the lock because the scheduler uses a busy wait. And CPU n never finishes the task migration because the unlock notification only went to CPU n-#.
To avoid this and since the unlocking code has no real sense of which waiter is best suited to grab the lock, just send the IPI to all of them. This causes the waiters to return from the hyper- call (those not interrupted at least) and do active spinlocking.
--- arch/x86/xen/spinlock.c | 1 - 1 file changed, 1 deletion(-)
arch/x86/xen/spinlock.c +0 -1
@@ -313,7 +313,6 @@ static noinline void xen_spin_unlock_sloif (per_cpu (lock_spinners, cpu) == xl) {ADD_STATS (released_slow_kicked,1 );xen_send_IPI_one (cpu,XEN_SPIN_UNLOCK_VECTOR ); -break ; } } }
Greg Kroah-Hartman
maintainerPATCH 12/53 Driver core: treat unregistered bus_types as having no devices
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bjorn Helgaas <[email protected]>
commit 4fa3e78be7e985ca814ce2aa0c09cbee404efcf7 upstream.
A bus_type has a list of devices (klist_devices), but the list and the subsys_private structure that contains it are not initialized until the bus_type is registered with bus_register().
The panic/reboot path has fixups that look up devices in pci_bus_type. If we panic before registering pci_bus_type, the bus_type exists but the list does not, so mach_reboot_fixups() trips over a null pointer and panics again:
mach_reboot_fixups
pci_get_device
..
bus_find_device(&pci_bus_type, ...)
bus->p is NULLJoonsoo reported a problem when panicking before PCI was initialized. I think this patch should be sufficient to replace the patch he posted
here: https://lkml.org/lkml/2012/12/28/75 ("[PATCH] x86, reboot: skip reboot_fixups in early boot phase")
--- drivers/base/bus.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/base/bus.c +2 -2
@@ -289,7 +289,7 @@ int bus_for_each_dev(struct bus_type *bustruct device *dev;int error =0 ; -if (!bus) +if (!bus || !bus->p)return -EINVAL ; klist_iter_init_node(&bus->p->klist_devices, &i,
@@ -323,7 +323,7 @@ struct device *bus_find_device(struct bustruct klist_iter i;struct device *dev; -if (!bus) +if (!bus || !bus->p)return NULL ; klist_iter_init_node(&bus->p->klist_devices, &i,
Greg Kroah-Hartman
maintainerPATCH 13/53 mm: mmu_notifier: have mmu_notifiers use a global SRCU so they may safely schedule
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sagi Grimberg <[email protected]>
commit 21a92735f660eaecf69a6f2e777f18463760ec32 upstream.
With an RCU based mmu_notifier implementation, any callout to mmu_notifier_invalidate_range_{start,end}() or mmu_notifier_invalidate_page() would not be allowed to call schedule() as that could potentially allow a modification to the mmu_notifier structure while it is currently being used.
Since srcu allocs 4 machine words per instance per cpu, we may end up with memory exhaustion if we use srcu per mm. So all mms share a global srcu. Note that during large mmu_notifier activity exit & unregister paths might hang for longer periods, but it is tolerable for current mmu_notifier clients.
--- include/linux/mmu_notifier.h | 1 mm/mmu_notifier.c | 73 ++++++++++++++++++++++++++++--------------- 2 files changed, 49 insertions(+), 25 deletions(-)
include/linux/mmu_notifier.h +1 -0
@@ -4,6 +4,7 @@#include <linux/list.h> #include <linux/spinlock.h> #include <linux/mm_types.h> +#include <linux/srcu.h> struct mmu_notifier ;struct mmu_notifier_ops ;
mm/mmu_notifier.c +48 -25
222 lines not on this page · raw message
Greg Kroah-Hartman
maintainerPATCH 14/53 mm: mmu_notifier: make the mmu_notifier srcu static
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andrea Arcangeli <[email protected]>
commit 70400303ce0c4ced3139499c676d5c79636b0c72 upstream.
The variable must be static especially given the variable name.
s/RCU/SRCU/ over a few comments.
--- mm/mmu_notifier.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
mm/mmu_notifier.c +3 -3
@@ -20,7 +20,7 @@#include <linux/slab.h> /* global SRCU for all MMs */ -struct srcu_struct srcu; +static struct srcu_struct srcu;/* * This function can't run concurrently against mmu_notifier_register
@@ -41,7 +41,7 @@ void __mmu_notifier_release(struct mm_stint id;/* -* RCU here will block mmu_notifier_unregister until +* SRCU here will block mmu_notifier_unregister until * ->release returns. */ id =srcu_read_lock (&srcu);
@@ -302,7 +302,7 @@ void mmu_notifier_unregister(struct mmu_if (!hlist_unhashed (&mn->hlist)) {/* -* RCU here will force exit_mmap to wait ->release to finish +* SRCU here will force exit_mmap to wait ->release to finish * before freeing the pages. */ int id;
Greg Kroah-Hartman
maintainerPATCH 15/53 mmu_notifier_unregister NULL Pointer deref and multiple ->release() callouts
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Robin Holt <[email protected]>
commit 751efd8610d3d7d67b7bdf7f62646edea7365dd7 upstream.
There is a race condition between mmu_notifier_unregister() and __mmu_notifier_release().
Assume two tasks, one calling mmu_notifier_unregister() as a result of a filp_close() ->flush() callout (task A), and the other calling mmu_notifier_release() from an mmput() (task B).
A B
t1 srcu_read_lock()
t2 if (!hlist_unhashed())
t3 srcu_read_unlock()
t4 srcu_read_lock()
t5 hlist_del_init_rcu()
t6 synchronize_srcu()
t7 srcu_read_unlock()
t8 hlist_del_rcu() <--- NULL pointer deref.
Additionally, the list traversal in __mmu_notifier_release() is not protected by the by the mmu_notifier_mm->hlist_lock which can result in callouts to the ->release() notifier from both mmu_notifier_unregister() and __mmu_notifier_release().
-stable suggestions:
The stable trees prior to 3.7.y need commits 21a92735f660 and 70400303ce0c cherry-picked in that order prior to cherry-picking this commit. The 3.7.y tree already has those two commits.
--- mm/mmu_notifier.c | 82 +++++++++++++++++++++++++++--------------------------- 1 file changed, 42 insertions(+), 40 deletions(-)
mm/mmu_notifier.c +42 -40
@@ -37,49 +37,51 @@ static struct srcu_struct srcu;void __mmu_notifier_release (struct mm_struct *mm) {struct mmu_notifier *mn; -struct hlist_node *n;int id;/* -* SRCU here will block mmu_notifier_unregister until -* ->release returns. +* srcu_read_lock() here will block synchronize_srcu() in +* mmu_notifier_unregister() until all registered +* ->release() callouts this function makes have +* returned. */ id =srcu_read_lock (&srcu); -hlist_for_each_entry_rcu (mn, n, &mm->mmu_notifier_mm->list, hlist) -/* -* if ->release runs before mmu_notifier_unregister it -* must be handled as it's the only way for the driver -* to flush all existing sptes and stop the driver -* from establishing any more sptes before all the -* pages in the mm are freed. -*/ -if (mn->ops->release) - mn->ops->release (mn, mm); -srcu_read_unlock (&srcu, id); -spin_lock (&mm->mmu_notifier_mm->lock);while (unlikely (!hlist_empty (&mm->mmu_notifier_mm->list))) { mn =hlist_entry (mm->mmu_notifier_mm->list.first, struct mmu_notifier, hlist); +/* -* We arrived before mmu_notifier_unregister so -* mmu_notifier_unregister will do nothing other than -* to wait ->release to finish and -* mmu_notifier_unregister to return. +* Unlink. This will prevent mmu_notifier_unregister() +* from also making the ->release() callout. */ hlist_del_init_rcu (&mn->hlist); +spin_unlock (&mm->mmu_notifier_mm->lock); + +/* +* Clear sptes. (see 'release' description in mmu_notifier.h) +*/ +if (mn->ops->release) + mn->ops->release (mn, mm); + +spin_lock (&mm->mmu_notifier_mm->lock); }spin_unlock (&mm->mmu_notifier_mm->lock);/* -* synchronize_srcu here prevents mmu_notifier_release to -* return to exit_mmap (which would proceed freeing all pages -* in the mm) until the ->release method returns, if it was -* invoked by mmu_notifier_unregister. -* -* The mmu_notifier_mm can't go away from under us because one -* mm_count is hold by exit_mmap. +* All callouts to ->release() which we have done are complete. +* Allow synchronize_srcu() in mmu_notifier_unregister() to complete +*/ +srcu_read_unlock (&srcu, id); + +/* +* mmu_notifier_unregister() may have unlinked a notifier and may +* still be calling out to it. Additionally, other notifiers +* may have been active via vmtruncate() et. al. Block here +* to ensure that all notifier callouts for this mm have been +* completed and the sptes are really cleaned up before returning +* to exit_mmap(). */ synchronize_srcu (&srcu); }
@@ -300,31 +302,31 @@ void mmu_notifier_unregister(struct mmu_ {BUG_ON (atomic_read (&mm->mm_count) <=0 ); +spin_lock (&mm->mmu_notifier_mm->lock);if (!hlist_unhashed (&mn->hlist)) { -/* -* SRCU here will force exit_mmap to wait ->release to finish -* before freeing the pages. -*/ int id; - id =srcu_read_lock (&srcu);/* -* exit_mmap will block in mmu_notifier_release to -* guarantee ->release is called before freeing the -* pages. +* Ensure we synchronize up with __mmu_notifier_release(). */ + id =srcu_read_lock (&srcu); + +hlist_del_rcu (&mn->hlist); +spin_unlock (&mm->mmu_notifier_mm->lock); +if (mn->ops->release) mn->ops->release (mn, mm); -srcu_read_unlock (&srcu, id); -spin_lock (&mm->mmu_notifier_mm->lock); -hlist_del_rcu (&mn->hlist); +/* +* Allow __mmu_notifier_release() to complete. +*/ +srcu_read_unlock (&srcu, id); + }else spin_unlock (&mm->mmu_notifier_mm->lock); - }/* -* Wait any running method to finish, of course including -* ->release if it was run by mmu_notifier_relase instead of us. +* Wait for any running method to finish, including ->release() if it +* was run by __mmu_notifier_release() instead of us. */ synchronize_srcu (&srcu);
Greg Kroah-Hartman
maintainerPATCH 16/53 KVM: s390: Handle hosts not supporting s390-virtio.
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Cornelia Huck <[email protected]>
commit 55c171a6d90dc0574021f9c836127cfd1a7d2e30 upstream.
Running under a kvm host does not necessarily imply the presence of a page mapped above the main memory with the virtio information; however, the code includes a hard coded access to that page.
Instead, check for the presence of the page and exit gracefully before we hit an addressing exception if it does not exist.
--- drivers/s390/kvm/kvm_virtio.c | 38 ++++++++++++++++++++++++++++++-------- 1 file changed, 30 insertions(+), 8 deletions(-)
drivers/s390/kvm/kvm_virtio.c +30 -8
@@ -413,6 +413,26 @@ static void kvm_extint_handler(unsigned }/* +* For s390-virtio, we expect a page above main storage containing +* the virtio configuration. Try to actually load from this area +* in order to figure out if the host provides this page. +*/ +static int __init test_devices_support (unsigned long addr) +{ +int ret = -EIO ; + + asmvolatile ( +"0: lura 0,%1\n" +"1: xgr %0,%0\n" +"2:\n" + EX_TABLE(0b,2b) +EX_TABLE (1b ,2b ) + : "+d" (ret) + : "a" (addr) + : "0", "cc"); + return ret; +} +/* * Init function for virtio * devices are in a single page above top of "normal" mem */
@@ -423,21 +443,23 @@ static int __init kvm_devices_init(void)if (!MACHINE_IS_KVM )return -ENODEV ; +if (test_devices_support (real_memory_size) <0 ) +return -ENODEV ; + + rc =vmem_add_mapping (real_memory_size,PAGE_SIZE ); +if (rc) +return rc; + + kvm_devices = (void *) real_memory_size; + kvm_root =root_device_register ("kvm_s390" );if (IS_ERR (kvm_root)) { rc =PTR_ERR (kvm_root);printk (KERN_ERR "Could not register kvm_s390 root device" ); +vmem_remove_mapping (real_memory_size,PAGE_SIZE );return rc; } - rc =vmem_add_mapping (real_memory_size,PAGE_SIZE ); -if (rc) { -root_device_unregister (kvm_root); -return rc; - } - - kvm_devices = (void *) real_memory_size; -INIT_WORK (&hotplug_work, hotplug_devices);service_subclass_irq_register ();
Greg Kroah-Hartman
maintainerPATCH 17/53 s390/kvm: Fix store status for ACRS/FPRS
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christian Borntraeger <[email protected]>
commit 15bc8d8457875f495c59d933b05770ba88d1eacb upstream.
On store status we need to copy the current state of registers into a save area. Currently we might save stale versions:
The sie state descriptor doesnt have fields for guest ACRS,FPRS, those registers are simply stored in the host registers. The host program must copy these away if needed. We do that in vcpu_put/load.
If we now do a store status in KVM code between vcpu_put/load, the saved values are not up-to-date. Lets collect the ACRS/FPRS before saving them.
This also fixes some strange problems with hotplug and virtio-ccw, since the low level machine check handler (on hotplug a machine check will happen) will revalidate all registers with the content of the save area.
--- arch/s390/kvm/kvm-s390.c | 8 ++++++++ 1 file changed, 8 insertions(+)
arch/s390/kvm/kvm-s390.c +8 -0
@@ -584,6 +584,14 @@ int kvm_s390_vcpu_store_status(struct kv }else prefix =0 ; +/* +* The guest FPRS and ACRS are in the host FPRS/ACRS due to the lazy +* copying in vcpu load/put. Lets update our copies before we save +* it into the save area +*/ +save_fp_regs (&vcpu->arch.guest_fpregs); +save_access_regs (vcpu->run->s.regs.acrs); +if (__guestcopy (vcpu, addr + offsetof(struct save_area , fp_regs), vcpu->arch.guest_fpregs.fprs,128 , prefix))return -EFAULT ;
Re: [ 17/53] s390/kvm: Fix store status for ACRS/FPRS
Quoted 34 lines · Greg Kroah-Hartman
3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christian Borntraeger <[email protected]>
commit
15bc8d8457875f495c59d933b05770ba88d1eacbupstream.On store status we need to copy the current state of registers into a save area. Currently we might save stale versions:
The sie state descriptor doesnt have fields for guest ACRS,FPRS, those registers are simply stored in the host registers. The host program must copy these away if needed. We do that in vcpu_put/load.If we now do a store status in KVM code between vcpu_put/load, the saved values are not up-to-date. Lets collect the ACRS/FPRS before saving them.
This also fixes some strange problems with hotplug and virtio-ccw, since the low level machine check handler (on hotplug a machine check will happen) will revalidate all registers with the content of the save area.
Signed-off-by Christian Borntraeger <[email protected]>Signed-off-by Gleb Natapov <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>--- arch/s390/kvm/kvm-s390.c | 8 ++++++++ 1 file changed, 8 insertions(+)
arch/s390/kvm/kvm-s390.c int kvm_s390_vcpu_store_status(struct kv · line 593
Quoted 10 lines
arch/s390/kvm/kvm-s390.c +7
-0@@ -584,6 +584,14 @@ int kvm_s390_vcpu_store_status(struct kv }else prefix =0 ; +/* +* The guest FPRS and ACRS are in the host FPRS/ACRS due to the lazy +* copying in vcpu load/put. Lets update our copies before we save +* it into the save area +*/ +save_fp_regs (&vcpu->arch.guest_fpregs); +save_access_regs (vcpu->run->s.regs.acrs);
kvm_run structure does not have kvm_sync_regs in it in 3.0 yet. So this fails with:arch/s390/kvm/kvm-s390.c: In function 'kvm_s390_vcpu_store_status':arch/s390/kvm/kvm-s390.c:593: error: 'struct kvm_run' has no member named 's'
I believe the fix is just to remove save_access_regs, right?
thanks,
Signature · 2 lines
js suse labs
Re: [ 17/53] s390/kvm: Fix store status for ACRS/FPRS
Quoted 52 lines · Jiri Slaby
Quoted 34 lines · Greg Kroah-Hartman
3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christian Borntraeger <[email protected]>
commit
15bc8d8457875f495c59d933b05770ba88d1eacbupstream.On store status we need to copy the current state of registers into a save area. Currently we might save stale versions:
The sie state descriptor doesnt have fields for guest ACRS,FPRS, those registers are simply stored in the host registers. The host program must copy these away if needed. We do that in vcpu_put/load.If we now do a store status in KVM code between vcpu_put/load, the saved values are not up-to-date. Lets collect the ACRS/FPRS before saving them.
This also fixes some strange problems with hotplug and virtio-ccw, since the low level machine check handler (on hotplug a machine check will happen) will revalidate all registers with the content of the save area.
Signed-off-by Christian Borntraeger <[email protected]>Signed-off-by Gleb Natapov <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>--- arch/s390/kvm/kvm-s390.c | 8 ++++++++ 1 file changed, 8 insertions(+)arch/s390/kvm/kvm-s390.c int kvm_s390_vcpu_store_status(struct kv · line 593
Quoted 10 lines
arch/s390/kvm/kvm-s390.c +7
-0@@ -584,6 +584,14 @@ int kvm_s390_vcpu_store_status(struct kv }else prefix =0 ; +/* +* The guest FPRS and ACRS are in the host FPRS/ACRS due to the lazy +* copying in vcpu load/put. Lets update our copies before we save +* it into the save area +*/ +save_fp_regs (&vcpu->arch.guest_fpregs); +save_access_regs (vcpu->run->s.regs.acrs);
kvm_runstructure does not havekvm_sync_regsin it in 3.0 yet. So this fails with:arch/s390/kvm/kvm-s390.c: In function 'kvm_s390_vcpu_store_status':arch/s390/kvm/kvm-s390.c:593: error: 'structkvm_run' has no member named 's'
Quoted 1 line
I believe the fix is just to remove
save_access_regs, right?
Before the sync reg changes, the ACRS were saved in the vcpu->arch. So the fix would look like
save_access_regs(vcpu->arch.guest_acrs);
Re: [ 17/53] s390/kvm: Fix store status for ACRS/FPRS
Quoted 53 lines · Christian Borntraeger
Quoted 52 lines · Jiri Slaby
Quoted 34 lines · Greg Kroah-Hartman
3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christian Borntraeger <[email protected]>
commit
15bc8d8457875f495c59d933b05770ba88d1eacbupstream.On store status we need to copy the current state of registers into a save area. Currently we might save stale versions:
The sie state descriptor doesnt have fields for guest ACRS,FPRS, those registers are simply stored in the host registers. The host program must copy these away if needed. We do that in vcpu_put/load.If we now do a store status in KVM code between vcpu_put/load, the saved values are not up-to-date. Lets collect the ACRS/FPRS before saving them.
This also fixes some strange problems with hotplug and virtio-ccw, since the low level machine check handler (on hotplug a machine check will happen) will revalidate all registers with the content of the save area.
Signed-off-by Christian Borntraeger <[email protected]>Signed-off-by Gleb Natapov <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>--- arch/s390/kvm/kvm-s390.c | 8 ++++++++ 1 file changed, 8 insertions(+)arch/s390/kvm/kvm-s390.c int kvm_s390_vcpu_store_status(struct kv · line 593
Quoted 10 lines
arch/s390/kvm/kvm-s390.c +7
-0@@ -584,6 +584,14 @@ int kvm_s390_vcpu_store_status(struct kv }else prefix =0 ; +/* +* The guest FPRS and ACRS are in the host FPRS/ACRS due to the lazy +* copying in vcpu load/put. Lets update our copies before we save +* it into the save area +*/ +save_fp_regs (&vcpu->arch.guest_fpregs); +save_access_regs (vcpu->run->s.regs.acrs);
kvm_runstructure does not havekvm_sync_regsin it in 3.0 yet. So this fails with:arch/s390/kvm/kvm-s390.c: In function 'kvm_s390_vcpu_store_status':arch/s390/kvm/kvm-s390.c:593: error: 'structkvm_run' has no member named 's'
Quoted 6 lines
Quoted 1 line
I believe the fix is just to remove
save_access_regs, right?Before the sync reg changes, the ACRS were saved in the
vcpu->arch. So the fix would look likesave_access_regs(vcpu->arch.guest_acrs);
Fix attached.
thanks,
Signature · 2 lines
js suse labs
From: Jiri Slaby <[email protected]>
Subject: s390/kvm: Fix store status for ACRS/FPRS fix
Patch-mainline: no, submitted on 1st Mar 2013
In 3.0.67, commit 58c9ce6fad8e00d9726447f939fe7e78e2aec891 (s390/kvm:
Fix store status for ACRS/FPRS), upstream commit 15bc8d8457875f495c59d933b05770ba88d1eacb, added a call to save_access_regs to save ACRS. But we do not have ARCS in kvm_run in 3.0 yet, so this results in:arch/s390/kvm/kvm-s390.c: In function 'kvm_s390_vcpu_store_status':arch/s390/kvm/kvm-s390.c:593: error: 'struct kvm_run' has no member named 's'
Fix it by saving guest_acrs which is where ARCS are in 3.0.
--- arch/s390/kvm/kvm-s390.c | 1 - 1 file changed, 1 deletion(-)
arch/s390/kvm/kvm-s390.c +1 -1
@@ -590,7 +590,7 @@ int kvm_s390_vcpu_store_status(struct kv* it into the save area */ save_fp_regs (&vcpu->arch.guest_fpregs); -save_access_regs (vcpu->run->s.regs.acrs); +save_access_regs (vcpu->arch.guest_acrs);if (__guestcopy (vcpu, addr + offsetof(struct save_area , fp_regs), vcpu->arch.guest_fpregs.fprs,128 , prefix))
Greg Kroah-Hartman
maintainerRe: [ 17/53] s390/kvm: Fix store status for ACRS/FPRS
Quoted 54 lines · Jiri Slaby
Quoted 53 lines · Christian Borntraeger
Quoted 52 lines · Jiri Slaby
Quoted 34 lines · Greg Kroah-Hartman
3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christian Borntraeger <[email protected]>
commit
15bc8d8457875f495c59d933b05770ba88d1eacbupstream.On store status we need to copy the current state of registers into a save area. Currently we might save stale versions:
The sie state descriptor doesnt have fields for guest ACRS,FPRS, those registers are simply stored in the host registers. The host program must copy these away if needed. We do that in vcpu_put/load.If we now do a store status in KVM code between vcpu_put/load, the saved values are not up-to-date. Lets collect the ACRS/FPRS before saving them.
This also fixes some strange problems with hotplug and virtio-ccw, since the low level machine check handler (on hotplug a machine check will happen) will revalidate all registers with the content of the save area.
Signed-off-by Christian Borntraeger <[email protected]>Signed-off-by Gleb Natapov <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>--- arch/s390/kvm/kvm-s390.c | 8 ++++++++ 1 file changed, 8 insertions(+)arch/s390/kvm/kvm-s390.c int kvm_s390_vcpu_store_status(struct kv · line 593
Quoted 10 lines
arch/s390/kvm/kvm-s390.c +7
-0@@ -584,6 +584,14 @@ int kvm_s390_vcpu_store_status(struct kv }else prefix =0 ; +/* +* The guest FPRS and ACRS are in the host FPRS/ACRS due to the lazy +* copying in vcpu load/put. Lets update our copies before we save +* it into the save area +*/ +save_fp_regs (&vcpu->arch.guest_fpregs); +save_access_regs (vcpu->run->s.regs.acrs);
kvm_runstructure does not havekvm_sync_regsin it in 3.0 yet. So this fails with:arch/s390/kvm/kvm-s390.c: In function 'kvm_s390_vcpu_store_status':arch/s390/kvm/kvm-s390.c:593: error: 'structkvm_run' has no member named 's'
Quoted 8 lines
Quoted 6 lines
Quoted 1 line
I believe the fix is just to remove
save_access_regs, right?Before the sync reg changes, the ACRS were saved in the
vcpu->arch. So the fix would look likesave_access_regs(vcpu->arch.guest_acrs);Fix attached.
Thanks, now applied.
greg k-h
Greg Kroah-Hartman
maintainerPATCH 18/53 inotify: remove broken mask checks causing unmount to be EINVAL
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jim Somerville <[email protected]>
commit 676a0675cf9200ac047fb50825f80867b3bb733b upstream.
Running the command:
inotifywait -e unmount /mnt/disk
immediately aborts with a -EINVAL return code. This is however a valid parameter. This abort occurs only if unmount is the sole event parameter. If other event parameters are supplied, then the unmount event wait will work.
The problem was introduced by commit 44b350fc23e ("inotify: Fix mask checks"). In that commit, it states:
The mask checks in inotify_update_existing_watch() and inotify_new_watch() are useless because inotify_arg_to_mask() sets FS_IN_IGNORED and FS_EVENT_ON_CHILD bits anyway.
But instead of removing the useless checks, it did this:
mask = inotify_arg_to_mask(arg); - if (unlikely(!mask)) + if (unlikely(!(mask & IN_ALL_EVENTS))) return -EINVAL;
The problem is that IN_ALL_EVENTS doesn't include IN_UNMOUNT, and other parts of the code keep IN_UNMOUNT separate from IN_ALL_EVENTS. So the check should be:
if (unlikely(!(mask & (IN_ALL_EVENTS | IN_UNMOUNT))))
But inotify_arg_to_mask(arg) always sets the IN_UNMOUNT bit in the mask anyway, so the check is always going to pass and thus should simply be removed. Also note that inotify_arg_to_mask completely controls what mask bits get set from arg, there's no way for invalid bits to get enabled there.
Lets fix it by simply removing the useless broken checks.
--- fs/notify/inotify/inotify_user.c | 4 ---- 1 file changed, 4 deletions(-)
fs/notify/inotify/inotify_user.c +0 -4
@@ -579,8 +579,6 @@ static int inotify_update_existing_watch/* don't allow invalid bits: we don't want flags set */ mask =inotify_arg_to_mask (arg); -if (unlikely (!(mask &IN_ALL_EVENTS ))) -return -EINVAL ; fsn_mark =fsnotify_find_inode_mark (group, inode);if (!fsn_mark)
@@ -632,8 +630,6 @@ static int inotify_new_watch(struct fsno/* don't allow invalid bits: we don't want flags set */ mask =inotify_arg_to_mask (arg); -if (unlikely (!(mask &IN_ALL_EVENTS ))) -return -EINVAL ; tmp_i_mark =kmem_cache_alloc (inotify_inode_mark_cachep,GFP_KERNEL );if (unlikely (!tmp_i_mark))
Greg Kroah-Hartman
maintainerPATCH 19/53 ocfs2: unlock super lock if lockres refresh failed
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Junxiao Bi <[email protected]>
commit 3278bb748d2437eb1464765f36429e5d6aa91c38 upstream.
If lockres refresh failed, the super lock will never be released which will cause some processes on other cluster nodes hung forever.
--- fs/ocfs2/dlmglue.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
fs/ocfs2/dlmglue.c +4 -1
@@ -2539,6 +2539,7 @@ int ocfs2_super_lock(struct ocfs2_super* everything is up to the caller :) */ status =ocfs2_should_refresh_lock_res (lockres);if (status <0 ) { +ocfs2_cluster_unlock (osb, lockres, level);mlog_errno (status); goto bail; }
@@ -2547,8 +2548,10 @@ int ocfs2_super_lock(struct ocfs2_superocfs2_complete_lock_res_refresh (lockres, status); -if (status <0 ) +if (status <0 ) { +ocfs2_cluster_unlock (osb, lockres, level);mlog_errno (status); + }ocfs2_track_lock_refresh (lockres); } bail:
Greg Kroah-Hartman
maintainerPATCH 20/53 drivers/video/backlight/adp88?0_bl.c: fix resume
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lars-Peter Clausen <[email protected]>
commit 5eb02c01bd1f3ef195989ab05e835e2b0711b5a9 upstream.
Clearing the NSTBY bit in the control register also automatically clears the BLEN bit. So we need to make sure to set it again during resume, otherwise the backlight will stay off.
--- drivers/video/backlight/adp8860_bl.c | 2 +- drivers/video/backlight/adp8870_bl.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/video/backlight/adp8860_bl.c +1 -1
@@ -793,7 +793,7 @@ static int adp8860_i2c_suspend(struct i2static int adp8860_i2c_resume (struct i2c_client *client) { -adp8860_set_bits (client,ADP8860_MDCR ,NSTBY ); +adp8860_set_bits (client,ADP8860_MDCR ,NSTBY |BLEN );return 0 ; }
drivers/video/backlight/adp8870_bl.c +1 -1
@@ -968,7 +968,7 @@ static int adp8870_i2c_suspend(struct i2static int adp8870_i2c_resume (struct i2c_client *client) { -adp8870_set_bits (client,ADP8870_MDCR ,NSTBY ); +adp8870_set_bits (client,ADP8870_MDCR ,NSTBY |BLEN );return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 21/53 tmpfs: fix use-after-free of mempolicy object
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Greg Thelen <[email protected]>
commit 5f00110f7273f9ff04ac69a5f85bb535a4fd0987 upstream.
The tmpfs remount logic preserves filesystem mempolicy if the mpol=M option is not specified in the remount request. A new policy can be specified if mpol=M is given.
Before this patch remounting an mpol bound tmpfs without specifying mpol= mount option in the remount request would set the filesystem's mempolicy object to a freed mempolicy object.
To reproduce the problem boot a DEBUG_PAGEALLOC kernel and run:
# mkdir /tmp/x
# mount -t tmpfs -o size=100M,mpol=interleave nodev /tmp/x
# grep /tmp/x /proc/mounts
nodev /tmp/x tmpfs rw,relatime,size=102400k,mpol=interleave:0-3 0 0# mount -o remount,size=200M nodev /tmp/x
# grep /tmp/x /proc/mounts
nodev /tmp/x tmpfs rw,relatime,size=204800k,mpol=??? 0 0
# note ? garbage in mpol=... output above # dd if=/dev/zero of=/tmp/x/f count=1
# panic herePanic:
BUG: unable to handle kernel NULL pointer dereference at (null)
IP: [< (null)>] (null)
[...]
Oops: 0010 [#1] SMP DEBUG_PAGEALLOC
Call Trace:
mpol_shared_policy_init+0xa5/0x160
shmem_get_inode+0x209/0x270
shmem_mknod+0x3e/0xf0
shmem_create+0x18/0x20
vfs_create+0xb5/0x130
do_last+0x9a1/0xea0
path_openat+0xb3/0x4d0
do_filp_open+0x42/0xa0
do_sys_open+0xfe/0x1e0
compat_sys_open+0x1b/0x20
cstar_dispatch+0x7/0x1fNon-debug kernels will not crash immediately because referencing the dangling mpol will not cause a fault. Instead the filesystem will reference a freed mempolicy object, which will cause unpredictable behavior.
The problem boils down to a dropped mpol reference below if shmem_parse_options() does not allocate a new mpol:
config = *sbinfo
shmem_parse_options(data, &config, true) mpol_put(sbinfo->mpol)
sbinfo->mpol = config.mpol /* BUG: saves unreferenced mpol */
This patch avoids the crash by not releasing the mempolicy if shmem_parse_options() doesn't create a new mpol.
How far back does this issue go? I see it in both 2.6.36 and 3.3. I did not look back further.
--- mm/shmem.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
mm/shmem.c +8 -2
@@ -2505,6 +2505,7 @@ static int shmem_remount_fs(struct superunsigned long inodes;int error = -EINVAL ; + config.mpol =NULL ;if (shmem_parse_options (data, &config, true))return error;
@@ -2530,8 +2531,13 @@ static int shmem_remount_fs(struct super sbinfo->max_inodes = config.max_inodes; sbinfo->free_inodes = config.max_inodes - inodes; -mpol_put (sbinfo->mpol); - sbinfo->mpol = config.mpol;/* transfers initial ref */ +/* +* Preserve previous mempolicy unless mpol remount option was specified. +*/ +if (config.mpol) { +mpol_put (sbinfo->mpol); + sbinfo->mpol = config.mpol;/* transfers initial ref */ + } out:spin_unlock (&sbinfo->stat_lock);return error;
Greg Kroah-Hartman
maintainerPATCH 22/53 mm/fadvise.c: drain all pagevecs if POSIX_FADV_DONTNEED fails to discard all pages
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mel Gorman <[email protected]>
commit 67d46b296a1ba1477c0df8ff3bc5e0167a0b0732 upstream.
Rob van der Heij reported the following (paraphrased) on private mail.
The scenario is that I want to avoid backups to fill up the page cache and purge stuff that is more likely to be used again (this is with s390x Linux on z/VM, so I don't give it as much memory that we don't care anymore). So I have something with LD_PRELOAD that intercepts the close() call (from tar, in this case) and issues a posix_fadvise() just before closing the file.
This mostly works, except for small files (less than 14 pages) that remains in page cache after the face.
Unfortunately Rob has not had a chance to test this exact patch but the test program below should be reproducing the problem he described.
The issue is the per-cpu pagevecs for LRU additions. If the pages are added by one CPU but fadvise() is called on another then the pages remain resident as the invalidate_mapping_pages() only drains the local pagevecs via its call to pagevec_release(). The user-visible effect is that a program that uses fadvise() properly is not obeyed.
A possible fix for this is to put the necessary smarts into invalidate_mapping_pages() to globally drain the LRU pagevecs if a pagevec page could not be discarded. The downside with this is that an inode cache shrink would send a global IPI and memory pressure potentially causing global IPI storms is very undesirable.
Instead, this patch adds a check during fadvise(POSIX_FADV_DONTNEED) to check if invalidate_mapping_pages() discarded all the requested pages. If a subset of pages are discarded it drains the LRU pagevecs and tries again. If the second attempt fails, it assumes it is due to the pages being mapped, locked or dirty and does not care. With this patch, an application using fadvise() correctly will be obeyed but there is a downside that a malicious application can force the kernel to send global IPIs and increase overhead.
If accepted, I would like this to be considered as a -stable candidate. It's not an urgent issue but it's a system call that is not working as advertised which is weak.
The following test program demonstrates the problem. It should never report that pages are still resident but will without this patch. It assumes that CPU 0 and 1 exist.
int main() {
int fd;
int pagesize = getpagesize();
ssize_t written = 0, expected;
char *buf;
unsigned char *vec;
int resident, i;
cpu_set_t set;
/* Prepare a buffer for writing */
expected = FILESIZE_PAGES * pagesize;
buf = malloc(expected + 1);
if (buf == NULL) {
printf("ENOMEM\n");
exit(EXIT_FAILURE);
}
buf[expected] = 0;
memset(buf, 'a', expected);
/* Prepare the mincore vec */
vec = malloc(FILESIZE_PAGES);
if (vec == NULL) {
printf("ENOMEM\n");
exit(EXIT_FAILURE);
}
/* Bind ourselves to CPU 0 */
CPU_ZERO(&set);
CPU_SET(0, &set);
if (sched_setaffinity(getpid(), sizeof(set), &set) == -1) {
perror("sched_setaffinity");
exit(EXIT_FAILURE);
}
/* open file, unlink and write buffer */
fd = open("fadvise-test-file", O_CREAT|O_EXCL|O_RDWR);
if (fd == -1) {
perror("open");
exit(EXIT_FAILURE);
}
unlink("fadvise-test-file");
while (written < expected) {
ssize_t this_write;
this_write = write(fd, buf + written, expected - written);
if (this_write == -1) {
perror("write");
exit(EXIT_FAILURE);
}
written += this_write;
}
free(buf);
/*
* Force ourselves to another CPU. If fadvise only flushes the local
* CPUs pagevecs then the fadvise will fail to discard all file pages
*/
CPU_ZERO(&set);
CPU_SET(1, &set);
if (sched_setaffinity(getpid(), sizeof(set), &set) == -1) {
perror("sched_setaffinity");
exit(EXIT_FAILURE);
}
/* sync and fadvise to discard the page cache */
fsync(fd);
if (posix_fadvise(fd, 0, expected, POSIX_FADV_DONTNEED) == -1) {
perror("posix_fadvise");
exit(EXIT_FAILURE);
}
/* map the file and use mincore to see which parts of it are resident */
buf = mmap(NULL, expected, PROT_READ, MAP_SHARED, fd, 0);
if (buf == NULL) {
perror("mmap");
exit(EXIT_FAILURE);
}
if (mincore(buf, expected, vec) == -1) {
perror("mincore");
exit(EXIT_FAILURE);
}
/* Check residency */
for (i = 0, resident = 0; i < FILESIZE_PAGES; i++) {
if (vec[i])
resident++;
}
if (resident != 0) {
printf("Nr unexpected pages resident: %d\n", resident);
exit(EXIT_FAILURE);
}
munmap(buf, expected);
close(fd);
free(vec);
exit(EXIT_SUCCESS);
}--- mm/fadvise.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-)
mm/fadvise.c +16 -2
@@ -17,6 +17,7 @@#include <linux/fadvise.h> #include <linux/writeback.h> #include <linux/syscalls.h> +#include <linux/swap.h> #include <asm/unistd.h>
@@ -123,9 +124,22 @@ SYSCALL_DEFINE(fadvise64_64)(int fd, lof start_index = (offset+(PAGE_CACHE_SIZE -1 )) >>PAGE_CACHE_SHIFT ; end_index = (endbyte >>PAGE_CACHE_SHIFT ); -if (end_index >= start_index) -invalidate_mapping_pages (mapping, start_index, +if (end_index >= start_index) { +unsigned long count =invalidate_mapping_pages (mapping, + start_index, end_index); + +/* +* If fewer pages were invalidated than expected then +* it is possible that some of the pages were on +* a per-cpu pagevec for a remote CPU. Drain all +* pagevecs and try again. +*/ +if (count < (end_index - start_index +1 )) { +lru_add_drain_all (); +invalidate_mapping_pages (mapping, start_index, end_index); + } + }break ;default : ret = -EINVAL ;
Greg Kroah-Hartman
maintainerPATCH 23/53 NLM: Ensure that we resend all pending blocking locks after a reclaim
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Trond Myklebust <[email protected]>
commit 666b3d803a511fbc9bc5e5ea8ce66010cf03ea13 upstream.
Currently, nlmclnt_lock will break out of the for(;;) loop when the reclaimer wakes up the blocking lock thread by setting nlm_lck_denied_grace_period. This causes the lock request to fail with an ENOLCK error.
The intention was always to ensure that we resend the lock request after the grace period has expired.
--- fs/lockd/clntproc.c | 3 +++ 1 file changed, 3 insertions(+)
fs/lockd/clntproc.c +3 -0
@@ -550,6 +550,9 @@ again: status =nlmclnt_block (block, req,NLMCLNT_POLL_TIMEOUT );if (status <0 )break ; +/* Resend the blocking lock request after a server reboot */ +if (resp->status == nlm_lck_denied_grace_period) +continue ;if (resp->status != nlm_lck_blocked)break ; }
Greg Kroah-Hartman
maintainerPATCH 24/53 p54usb: corrected USB ID for T-Com Sinus 154 data II
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tomasz Guszkowski <[email protected]>
commit 008e33f733ca51acb2dd9d88ea878693b04d1d2a upstream.
Corrected USB ID for T-Com Sinus 154 data II. ISL3887-based. The device was tested in managed mode with no security, WEP 128 bit and WPA-PSK (TKIP) with firmware 2.13.1.0.lm87.arm (md5sum:7d676323ac60d6e1a3b6d61e8c528248). It works.
--- drivers/net/wireless/p54/p54usb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/p54/p54usb.c +1 -1
@@ -83,8 +83,8 @@ static struct usb_device_id p54u_table[] {USB_DEVICE(0x06b9, 0x0121)}, /* Thomson SpeedTouch 121g */ {USB_DEVICE(0x0707, 0xee13)}, /* SMC 2862W-G version 2 */ {USB_DEVICE(0x0803, 0x4310)}, /* Zoom 4410a */ - {USB_DEVICE(0x083a, 0x4503)}, /* T-Com Sinus 154 data II */ {USB_DEVICE(0x083a, 0x4521)}, /* Siemens Gigaset USB Adapter 54 version 2 */ + {USB_DEVICE(0x083a, 0x4531)}, /* T-Com Sinus 154 data II */ {USB_DEVICE(0x083a, 0xc501)}, /* Zoom Wireless-G 4410 */ {USB_DEVICE(0x083a, 0xf503)}, /* Accton FD7050E ver 1010ec */ {USB_DEVICE(0x0846, 0x4240)}, /* Netgear WG111 (v2) */
Greg Kroah-Hartman
maintainerPATCH 25/53 ALSA: usb-audio: fix Roland A-PRO support
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Clemens Ladisch <[email protected]>
commit 7da58046482fceb17c4a0d4afefd9507ec56de7f upstream.
The quirk for the Roland/Cakewalk A-PRO keyboards accidentally used the wrong interface number, which prevented the driver from attaching to the device.
--- sound/usb/quirks-table.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/usb/quirks-table.h +1 -1
@@ -1613,7 +1613,7 @@ YAMAHA_DEVICE(0x7010, "UB99"), .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {/* .vendor_name = "Roland", */ /* .product_name = "A-PRO", */ - .ifnum =1 , + .ifnum =0 , .type =QUIRK_MIDI_FIXED_ENDPOINT , .data = & (const struct snd_usb_midi_endpoint_info ) { .out_cables =0x0003 ,
Greg Kroah-Hartman
maintainerPATCH 26/53 ALSA: usb: Fix Processing Unit Descriptor parsers
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pawel Moll <[email protected]>
commit b531f81b0d70ffbe8d70500512483227cc532608 upstream.
Commit 99fc86450c439039d2ef88d06b222fd51a779176 "ALSA: usb-mixer:
parse descriptors with structs" introduced a set of useful parsers for descriptors. Unfortunately the parses for the Processing Unit Descriptor came with a very subtle bug...
Functions uac_processing_unit_iProcessing() and uac_processing_unit_specific() were indexing the baSourceID array forgetting the fields before the iProcessing and process-specific descriptors.
The problem was observed with Sound Blaster Extigy mixer, where nNrModes in Up/Down-mix Processing Unit Descriptor was accessed at offset 10 of the descriptor (value 0) instead of offset 15 (value 7). In result the resulting control had interesting limit values:
Simple mixer control 'Channel Routing Mode Select',0
Capabilities: volume volume-joined penum Playback channels: Mono
Capture channels: Mono
Limits: 0 - -1
Mono: -1 [100%]
Fixed by starting from the bmControls, which was calculated correctly, instead of baSourceID.
Now the mentioned control is fine:
Simple mixer control 'Channel Routing Mode Select',0
Capabilities: volume volume-joined penum Playback channels: Mono
Capture channels: Mono
Limits: 0 - 6
Mono: 0 [0%]
--- include/linux/usb/audio.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
include/linux/usb/audio.h +4 -2
@@ -384,14 +384,16 @@ static inline __u8 uac_processing_unit_i int protocol) {__u8 control_size =uac_processing_unit_bControlSize (desc, protocol); -return desc->baSourceID[desc->bNrInPins + control_size]; +return *(uac_processing_unit_bmControls (desc, protocol) + + control_size); }static inline __u8 *uac_processing_unit_specific (struct uac_processing_unit_descriptor *desc,int protocol) {__u8 control_size =uac_processing_unit_bControlSize (desc, protocol); -return &desc->baSourceID[desc->bNrInPins + control_size +1 ]; +return uac_processing_unit_bmControls (desc, protocol) + + control_size +1 ; }/* 4.5.2 Class-Specific AS Interface Descriptor */
Greg Kroah-Hartman
maintainerPATCH 27/53 ext4: Free resources in some error path in ext4_fill_super
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tao Ma <[email protected]>
commit dcf2d804ed6ffe5e942b909ed5e5b74628be6ee4 upstream.
Some of the error path in ext4_fill_super don't release the resouces properly. So this patch just try to release them in the right way.
--- fs/ext4/super.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-)
fs/ext4/super.c +11 -8
@@ -3681,22 +3681,19 @@ no_journal:if (err) {ext4_msg (sb,KERN_ERR ,"failed to initialize mballoc (%d)" , err); - goto failed_mount4; + goto failed_mount5; } err =ext4_register_li_request (sb, first_not_zeroed);if (err) - goto failed_mount4; + goto failed_mount6; sbi->s_kobj.kset = ext4_kset;init_completion (&sbi->s_kobj_unregister); err =kobject_init_and_add (&sbi->s_kobj, &ext4_ktype,NULL ,"%s" , sb->s_id); -if (err) { -ext4_mb_release (sb); -ext4_ext_release (sb); - goto failed_mount4; - }; +if (err) + goto failed_mount7;EXT4_SB (sb)->s_mount_state |=EXT4_ORPHAN_FS ;ext4_orphan_cleanup (sb, es);
@@ -3730,13 +3727,19 @@ cantfind_ext4:ext4_msg (sb,KERN_ERR ,"VFS: Can't find ext4 filesystem" ); goto failed_mount; +failed_mount7: +ext4_unregister_li_request (sb); +failed_mount6: +ext4_ext_release (sb); +failed_mount5: +ext4_mb_release (sb); +ext4_release_system_zone (sb); failed_mount4:iput (root); sb->s_root =NULL ;ext4_msg (sb,KERN_ERR ,"mount failed" );destroy_workqueue (EXT4_SB (sb)->dio_unwritten_wq); failed_mount_wq: -ext4_release_system_zone (sb);if (sbi->s_journal) {jbd2_journal_destroy (sbi->s_journal); sbi->s_journal =NULL ;
Greg Kroah-Hartman
maintainerPATCH 28/53 ext4: add missing kfree() on error return path in add_new_gdb()
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dan Carpenter <[email protected]>
commit c49bafa3842751b8955a962859f42d307673d75d upstream.
We added some more error handling in b40971426a "ext4: add error checking to calls to ext4_handle_dirty_metadata()". But we need to call kfree() as well to avoid a memory leak.
--- fs/ext4/resize.c | 1 + 1 file changed, 1 insertion(+)
fs/ext4/resize.c +1 -0
@@ -499,6 +499,7 @@ static int add_new_gdb(handle_t *handle,return err; exit_inode: +kfree (n_group_desc);/* ext4_handle_release_buffer(handle, iloc.bh); */ brelse (iloc.bh); exit_dindj:
Greg Kroah-Hartman
maintainerPATCH 29/53 sunvdc: Fix off-by-one in generic_request().
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: "David S. Miller" <[email protected]>
[ Upstream commit f4d9605434c0fd4cc8639bf25cfc043418c52362 ]
The 'operations' bitmap corresponds one-for-one with the operation codes, no adjustment is necessary.
--- drivers/block/sunvdc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/block/sunvdc.c +1 -1
@@ -461,7 +461,7 @@ static int generic_request(struct vdc_point op_len, err;void *req_buf; -if (!(((u64 )1 << ((u64 )op -1 )) & port->operations)) +if (!(((u64 )1 << (u64 )op) & port->operations))return -EOPNOTSUPP ;switch (op) {
Greg Kroah-Hartman
maintainerPATCH 30/53 drm/usb: bind driver to correct device
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dave Airlie <[email protected]>
commit 9f23de52b64f7fb801fd76f3dd8651a0dc89187b upstream.
While looking at plymouth on udl I noticed that plymouth was trying to use its fb plugin not its drm one, it was trying to drmOpen a driver called usb not udl, noticed that we actually had out driver pointing at the wrong device.
--- drivers/gpu/drm/drm_usb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/drm_usb.c +1 -1
@@ -18,7 +18,7 @@ int drm_get_usb_dev(struct usb_interface usbdev =interface_to_usbdev (interface); dev->usbdev = usbdev; - dev->dev = &usbdev->dev; + dev->dev = &interface->dev;mutex_lock (&drm_global_mutex);
Greg Kroah-Hartman
maintainerPATCH 31/53 NLS: improve UTF8 -> UTF16 string conversion routine
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alan Stern <[email protected]>
commit 0720a06a7518c9d0c0125bd5d1f3b6264c55c3dd upstream.
The utf8s_to_utf16s conversion routine needs to be improved. Unlike its utf16s_to_utf8s sibling, it doesn't accept arguments specifying the maximum length of the output buffer or the endianness of its 16-bit output.
This patch (as1501) adds the two missing arguments, and adjusts the only two places in the kernel where the function is called. A follow-on patch will add a third caller that does utilize the new capabilities.
The two conversion routines are still annoyingly inconsistent in the way they handle invalid byte combinations. But that's a subject for a different patch.
--- drivers/staging/hv/hv_kvp.c | 10 ++++++---- fs/fat/namei_vfat.c | 3 ++- fs/nls/nls_base.c | 43 +++++++++++++++++++++++++++++++++---------- include/linux/nls.h | 5 +++-- 4 files changed, 44 insertions(+), 17 deletions(-)
drivers/staging/hv/hv_kvp.c +6 -4
@@ -201,11 +201,13 @@ kvp_respond_to_host(char *key, char *val* The windows host expects the key/value pair to be encoded * in utf16. */ - keylen =utf8s_to_utf16s (key_name,strlen (key_name), - (wchar_t *)kvp_data->data.key); + keylen =utf8s_to_utf16s (key_name,strlen (key_name),UTF16_HOST_ENDIAN , + (wchar_t *) kvp_data->data.key, +HV_KVP_EXCHANGE_MAX_KEY_SIZE /2 ); kvp_data->data.key_size =2 *(keylen +1 );/* utf16 encoding */ - valuelen =utf8s_to_utf16s (value,strlen (value), - (wchar_t *)kvp_data->data.value); + valuelen =utf8s_to_utf16s (value,strlen (value),UTF16_HOST_ENDIAN , + (wchar_t *) kvp_data->data.value, +HV_KVP_EXCHANGE_MAX_VALUE_SIZE /2 ); kvp_data->data.value_size =2 *(valuelen +1 );/* utf16 encoding */ kvp_data->data.value_type =REG_SZ ;/* all our values are strings */
fs/fat/namei_vfat.c +2 -1
@@ -514,7 +514,8 @@ xlate_to_uni(const unsigned char *name,int charlen;if (utf8) { - *outlen =utf8s_to_utf16s (name, len, (wchar_t *)outname); + *outlen =utf8s_to_utf16s (name, len,UTF16_HOST_ENDIAN , + (wchar_t *) outname,FAT_LFN_LEN +2 );if (*outlen <0 )return *outlen;else if (*outlen >FAT_LFN_LEN )
fs/nls/nls_base.c +33 -10
67 lines not on this page · raw message
include/linux/nls.h +3 -2
@@ -43,7 +43,7 @@ enum utf16_endian { UTF16_BIG_ENDIAN }; -/* nls.c */ +/* nls_base.c */ extern int register_nls (struct nls_table *);extern int unregister_nls (struct nls_table *);extern struct nls_table *load_nls (char *);
@@ -52,7 +52,8 @@ extern struct nls_table *load_nls_defaulextern int utf8_to_utf32 (const u8 *s,int len,unicode_t *pu);extern int utf32_to_utf8 (unicode_t u,u8 *s,int maxlen); -extern int utf8s_to_utf16s (const u8 *s,int len,wchar_t *pwcs); +extern int utf8s_to_utf16s (const u8 *s,int len, +enum utf16_endian endian,wchar_t *pwcs,int maxlen);extern int utf16s_to_utf8s (const wchar_t *pwcs,int len,enum utf16_endian endian,u8 *s,int maxlen);
Greg Kroah-Hartman
maintainerPATCH 32/53 drm/i915: disable shared panel fitter for pipe
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mika Kuoppala <[email protected]>
commit 24a1f16de97c4cf0029d9acd04be06db32208726 upstream.
If encoder is switched off by BIOS, but the panel fitter is left on, we never try to turn off the panel fitter and leave it still attached to the pipe - which can cause blurry output elsewhere.
Based on work by Chris Wilson <[email protected]>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=58867
[danvet: Remove the redundant HAS_PCH_SPLIT check and add a tiny comment.]
--- drivers/gpu/drm/i915/intel_display.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/gpu/drm/i915/intel_display.c +8 -0
@@ -2898,6 +2898,7 @@ static void i9xx_crtc_disable(struct drmstruct intel_crtc *intel_crtc =to_intel_crtc (crtc);int pipe = intel_crtc->pipe;int plane = intel_crtc->plane; +u32 pctl;if (!intel_crtc->active)return ;
@@ -2914,6 +2915,13 @@ static void i9xx_crtc_disable(struct drmintel_disable_plane (dev_priv, plane, pipe);intel_disable_pipe (dev_priv, pipe); + +/* Disable pannel fitter if it is on this pipe. */ + pctl =I915_READ (PFIT_CONTROL ); +if ((pctl &PFIT_ENABLE ) && + ((pctl &PFIT_PIPE_MASK ) >>PFIT_PIPE_SHIFT ) == pipe) +I915_WRITE (PFIT_CONTROL ,0 ); +intel_disable_pll (dev_priv, pipe); intel_crtc->active = false;
Greg Kroah-Hartman
maintainerPATCH 33/53 staging: comedi: disallow COMEDI_DEVCONFIG on non-board minors
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ian Abbott <[email protected]>
commit 754ab5c0e55dd118273ca2c217c4d95e9fbc8259 upstream.
Comedi has two sorts of minor devices:
(a) normal board minor devices in the range 0 to COMEDI_NUM_BOARD_MINORS-1 inclusive; and
(b) special subdevice minor devices in the range COMEDI_NUM_BOARD_MINORS upwards that are used to open the same underlying comedi device as the normal board minor devices, but with non-default read and write subdevices for asynchronous commands.
The special subdevice minor devices get created when a board supporting asynchronous commands is attached to a normal board minor device, and destroyed when the board is detached from the normal board minor device. One way to attach or detach a board is by using the COMEDI_DEVCONFIG ioctl. This should only be used on normal board minors as the special subdevice minors are too ephemeral. In particular, the change introduced in commit 7d3135af399e92cf4c9bbc5f86b6c140aab3b88c ("staging:
comedi: prevent auto-unconfig of manually configured devices") breaks horribly for special subdevice minor devices.
Since there's no legitimate use for the COMEDI_DEVCONFIG ioctl on a special subdevice minor device node, disallow it and return -ENOTTY.
--- drivers/staging/comedi/comedi_fops.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/staging/comedi/comedi_fops.c +5 -0
@@ -136,6 +136,11 @@ static long comedi_unlocked_ioctl(struct/* Device config is special, because it must work on * an unconfigured device. */ if (cmd ==COMEDI_DEVCONFIG ) { +if (minor >=COMEDI_NUM_BOARD_MINORS ) { +/* Device config not appropriate on non-board minors. */ + rc = -ENOTTY ; + goto done; + } rc =do_devconfig_ioctl (dev, (struct comedi_devconfig __user *)arg);if (rc ==0 )
Greg Kroah-Hartman
maintainerPATCH 34/53 staging: vt6656: Fix URB submitted while active warning.
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Malcolm Priestley <[email protected]>
commit ae5943de8c8c4438cbac5cda599ff0b88c224468 upstream.
This error happens because PIPEnsControlOut and PIPEnsControlIn unlock the spin lock for delay, letting in another thread.
The patch moves the current MP_SET_FLAG to before filling of sUsbCtlRequest for pControlURB and clears it in event of failing.
Any thread calling either function while fMP_CONTROL_READS or fMP_CONTROL_WRITES flags set will return STATUS_FAILURE.
--- drivers/staging/vt6656/usbpipe.c | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-)
drivers/staging/vt6656/usbpipe.c +20 -8
@@ -168,6 +168,11 @@ int PIPEnsControlOut(if (pDevice->Flags & fMP_CONTROL_WRITES)return STATUS_FAILURE ; +if (pDevice->Flags & fMP_CONTROL_READS) +return STATUS_FAILURE ; + +MP_SET_FLAG (pDevice, fMP_CONTROL_WRITES); + pDevice->sUsbCtlRequest.bRequestType =0x40 ; pDevice->sUsbCtlRequest.bRequest = byRequest; pDevice->sUsbCtlRequest.wValue =cpu_to_le16p (&wValue);
@@ -182,12 +187,13 @@ int PIPEnsControlOut( ntStatus =usb_submit_urb (pDevice->pControlURB,GFP_ATOMIC );if (ntStatus !=0 ) { -DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO "control send request submission failed: %d\n" , ntStatus); +DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO +"control send request submission failed: %d\n" , + ntStatus); +MP_CLEAR_FLAG (pDevice, fMP_CONTROL_WRITES);return STATUS_FAILURE ; } -else { -MP_SET_FLAG (pDevice, fMP_CONTROL_WRITES); - } +spin_unlock_irq (&pDevice->lock);for (ii =0 ; ii <=USB_CTL_WAIT ; ii ++) {
@@ -227,6 +233,11 @@ int PIPEnsControlIn(if (pDevice->Flags & fMP_CONTROL_READS)return STATUS_FAILURE ; +if (pDevice->Flags & fMP_CONTROL_WRITES) +return STATUS_FAILURE ; + +MP_SET_FLAG (pDevice, fMP_CONTROL_READS); + pDevice->sUsbCtlRequest.bRequestType =0xC0 ; pDevice->sUsbCtlRequest.bRequest = byRequest; pDevice->sUsbCtlRequest.wValue =cpu_to_le16p (&wValue);
@@ -240,10 +251,11 @@ int PIPEnsControlIn( ntStatus =usb_submit_urb (pDevice->pControlURB,GFP_ATOMIC );if (ntStatus !=0 ) { -DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO "control request submission failed: %d\n" , ntStatus); - }else { -MP_SET_FLAG (pDevice, fMP_CONTROL_READS); - } +DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO +"control request submission failed: %d\n" , ntStatus); +MP_CLEAR_FLAG (pDevice, fMP_CONTROL_READS); +return STATUS_FAILURE ; + }spin_unlock_irq (&pDevice->lock);for (ii =0 ; ii <=USB_CTL_WAIT ; ii ++) {
Greg Kroah-Hartman
maintainerPATCH 35/53 ARM: PXA3xx: program the CSMSADRCFG register
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Igor Grinberg <[email protected]>
commit d107a204154ddd79339203c2deeb7433f0cf6777 upstream.
The Chip Select Configuration Register must be programmed to 0x2 in order to achieve the correct behavior of the Static Memory Controller.
Without this patch devices wired to DFI and accessed through SMC cannot be accessed after resume from S2.
Do not rely on the boot loader to program the CSMSADRCFG register by programming it in the kernel smemc module.
--- arch/arm/mach-pxa/include/mach/smemc.h | 1 + arch/arm/mach-pxa/smemc.c | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-)
arch/arm/mach-pxa/include/mach/smemc.h +1 -0
@@ -37,6 +37,7 @@#define CSADRCFG1 (SMEMC_VIRT + 0x84)/* Address Configuration Register for CS1 */ #define CSADRCFG2 (SMEMC_VIRT + 0x88)/* Address Configuration Register for CS2 */ #define CSADRCFG3 (SMEMC_VIRT + 0x8C)/* Address Configuration Register for CS3 */ +#define CSMSADRCFG (SMEMC_VIRT + 0xA0)/* Chip Select Configuration Register */ /* * More handy macros for PCMCIA
arch/arm/mach-pxa/smemc.c +14 -1
@@ -40,6 +40,8 @@ static void pxa3xx_smemc_resume(void)__raw_writel (csadrcfg[1 ],CSADRCFG1 );__raw_writel (csadrcfg[2 ],CSADRCFG2 );__raw_writel (csadrcfg[3 ],CSADRCFG3 ); +/* CSMSADRCFG wakes up in its default state (0), so we need to set it */ +__raw_writel (0x2 ,CSMSADRCFG ); }static struct syscore_ops smemc_syscore_ops = {
@@ -49,8 +51,19 @@ static struct syscore_ops smemc_syscore_static int __init smemc_init (void ) { -if (cpu_is_pxa3xx ()) +if (cpu_is_pxa3xx ()) { +/* +* The only documentation we have on the +* Chip Select Configuration Register (CSMSADRCFG) is that +* it must be programmed to 0x2. +* Moreover, in the bit definitions, the second bit +* (CSMSADRCFG[1]) is called "SETALWAYS". +* Other bits are reserved in this register. +*/ +__raw_writel (0x2 ,CSMSADRCFG ); +register_syscore_ops (&smemc_syscore_ops); + }return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 36/53 powerpc/kexec: Disable hard IRQ before kexec
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Phileas Fogg <[email protected]>
commit 8520e443aa56cc157b015205ea53e7b9fc831291 upstream.
Disable hard IRQ before kexec a new kernel image.
Not doing it can result in corrupted data in the memory segments reserved for the new kernel.
--- arch/powerpc/kernel/machine_kexec_64.c | 5 +++++ 1 file changed, 5 insertions(+)
arch/powerpc/kernel/machine_kexec_64.c +5 -0
@@ -163,6 +163,8 @@ static int kexec_all_irq_disabled = 0;static void kexec_smp_down (void *arg) {local_irq_disable (); +hard_irq_disable (); +mb ();/* make sure our irqs are disabled before we say they are */ get_paca ()->kexec_state =KEXEC_STATE_IRQS_OFF ;while (kexec_all_irq_disabled ==0 )
@@ -245,6 +247,8 @@ static void kexec_prepare_cpus(void)wake_offline_cpus ();smp_call_function (kexec_smp_down,NULL ,/* wait */ 0 );local_irq_disable (); +hard_irq_disable (); +mb ();/* make sure IRQs are disabled before we say they are */ get_paca ()->kexec_state =KEXEC_STATE_IRQS_OFF ;
@@ -282,6 +286,7 @@ static void kexec_prepare_cpus(void)if (ppc_md.kexec_cpu_down) ppc_md.kexec_cpu_down (0 ,0 );local_irq_disable (); + hard_irq_disable(); }#endif /* SMP */
Greg Kroah-Hartman
maintainerPATCH 37/53 Purge existing TLB entries in set_pte_at and ptep_set_wrprotect
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: John David Anglin <[email protected]>
commit 7139bc1579901b53db7e898789e916ee2fb52d78 upstream.
This patch goes a long way toward fixing the minifail bug, and it significantly improves the stability of SMP machines such as the rp3440. When write protecting a page for COW, we need to purge the existing translation. Otherwise, the COW break doesn't occur as expected because the TLB may still have a stale entry which allows writes.
--- arch/parisc/include/asm/pgtable.h | 13 ++++++++++--- arch/parisc/kernel/cache.c | 18 ++++++++++++++++++ 2 files changed, 28 insertions(+), 3 deletions(-)
arch/parisc/include/asm/pgtable.h +10 -3
@@ -12,11 +12,10 @@#include <linux/bitops.h> #include <linux/spinlock.h> +#include <linux/mm_types.h> #include <asm/processor.h> #include <asm/cache.h> -struct vm_area_struct ; -/* * kern_addr_valid(ADDR) tests if ADDR is pointing to valid kernel * memory. For the return value to be meaningful, ADDR must be >=
@@ -40,7 +39,14 @@ struct vm_area_struct;do { \ *(pteptr) = (pteval); \ } while(0) -#define set_pte_at (mm,addr,ptep,pteval) set_pte(ptep,pteval) + +extern void purge_tlb_entries (struct mm_struct *,unsigned long ); + +#define set_pte_at (mm, addr, ptep, pteval) \ + do { \ + set_pte(ptep, pteval); \ + purge_tlb_entries(mm, addr); \ + } while (0)#endif /* !__ASSEMBLY__ */
@@ -464,6 +470,7 @@ static inline void ptep_set_wrprotect(st old =pte_val (*ptep); new = pte_val(pte_wrprotect(__pte (old))); }while (cmpxchg ((unsigned long *) ptep, old, new) != old); +purge_tlb_entries (mm, addr);#else pte_t old_pte = *ptep;set_pte_at (mm, addr, ptep,pte_wrprotect (old_pte));
arch/parisc/kernel/cache.c +18 -0
@@ -421,6 +421,24 @@ void kunmap_parisc(void *addr)EXPORT_SYMBOL (kunmap_parisc);#endif +void purge_tlb_entries (struct mm_struct *mm,unsigned long addr) +{ +unsigned long flags; + +/* Note: purge_tlb_entries can be called at startup with +no context. */ + +/* Disable preemption while we play with %sr1. */ +preempt_disable (); +mtsp (mm->context,1 ); +purge_tlb_start (flags); +pdtlb (addr); +pitlb (addr); +purge_tlb_end (flags); +preempt_enable (); +} +EXPORT_SYMBOL (purge_tlb_entries); +void __flush_tlb_range (unsigned long sid,unsigned long start,unsigned long end) {
Greg Kroah-Hartman
maintainerPATCH 38/53 pcmcia/vrc4171: Add missing spinlock init
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jean Delvare <[email protected]>
commit 811af9723859884f2f771f3174f3ddedab7c53b5 upstream.
It doesn't seem this spinlock was properly initialized. This bug was introduced by commit 7a410e8d4d97457c8c381e2de9cdc7bd3306badc.
--- drivers/pcmcia/vrc4171_card.c | 1 + 1 file changed, 1 insertion(+)
drivers/pcmcia/vrc4171_card.c +1 -0
@@ -246,6 +246,7 @@ static int pccard_init(struct pcmcia_soc socket = &vrc4171_sockets[slot]; socket->csc_irq =search_nonuse_irq (); socket->io_irq =search_nonuse_irq (); +spin_lock_init (&socket->lock);return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 39/53 fbcon: dont lose the console font across generic->chip driver switch
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dave Airlie <[email protected]>
commit ae1287865f5361fa138d4d3b1b6277908b54eac9 upstream.
If grub2 loads efifb/vesafb, then when systemd starts it can set the console font on that framebuffer device, however when we then load the native KMS driver, the first thing it does is tear down the generic framebuffer driver.
The thing is the generic code is doing the right thing, it frees the font because otherwise it would leak memory. However we can assume that if you are removing the generic firmware driver (vesa/efi/offb), that a new driver *should* be loading soon after, so we effectively leak the font.
However the old code left a dangling pointer in vc->vc_font.data and we can now reuse that dangling pointer to load the font into the new driver, now that we aren't freeing it.
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=892340
--- drivers/video/console/fbcon.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
drivers/video/console/fbcon.c +10 -4
@@ -991,7 +991,7 @@ static const char *fbcon_startup(void) }/* Setup default font */ -if (!p->fontdata) { +if (!p->fontdata && !vc->vc_font.data) {if (!fontname[0 ] || !(font =find_font (fontname))) font = get_default_font(info->var.xres, info->var.yres,
@@ -1001,6 +1001,8 @@ static const char *fbcon_startup(void) vc->vc_font.height = font->height; vc->vc_font.data = (void *)(p->fontdata = font->data); vc->vc_font.charcount =256 ;/* FIXME Need to support more fonts */ + }else { + p->fontdata = vc->vc_font.data; } cols =FBCON_SWAP (ops->rotate, info->var.xres, info->var.yres);
@@ -1160,9 +1162,9 @@ static void fbcon_init(struct vc_data *v ops->p = &fb_display[fg_console]; } -static void fbcon_free_font (struct display *p) +static void fbcon_free_font (struct display *p,bool freefont) { -if (p->userfont && p->fontdata && (--REFCOUNT (p->fontdata) ==0 )) +if (freefont && p->userfont && p->fontdata && (--REFCOUNT (p->fontdata) ==0 ))kfree (p->fontdata -FONT_EXTRA_WORDS *sizeof (int )); p->fontdata =NULL ; p->userfont =0 ;
@@ -1174,8 +1176,8 @@ static void fbcon_deinit(struct vc_datastruct fb_info *info;struct fbcon_ops *ops;int idx; +bool free_font = true; -fbcon_free_font (p); idx = con2fb_map[vc->vc_num];if (idx ==-1 )
@@ -1186,6 +1188,8 @@ static void fbcon_deinit(struct vc_dataif (!info) goto finished; +if (info->flags &FBINFO_MISC_FIRMWARE ) + free_font = false; ops = info->fbcon_par;if (!ops)
@@ -1197,6 +1201,8 @@ static void fbcon_deinit(struct vc_data ops->flags &= ~FBCON_FLAGS_INIT ; finished: +fbcon_free_font (p, free_font); +if (!con_is_bound (&fb_con))fbcon_exit ();
Greg Kroah-Hartman
maintainerPATCH 40/53 fb: rework locking to fix lock ordering on takeover
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alan Cox <[email protected]>
commit 50e244cc793d511b86adea24972f3a7264cae114 upstream.
Adjust the console layer to allow a take over call where the caller already holds the locks. Make the fb layer lock in order.
This is partly a band aid, the fb layer is terminally confused about the locking rules it uses for its notifiers it seems.
--- drivers/tty/vt/vt.c | 93 +++++++++++++++++++++++++++++++----------- drivers/video/console/fbcon.c | 29 ++++++++++++- drivers/video/fbmem.c | 5 -- drivers/video/fbsysfs.c | 3 + include/linux/console.h | 1 5 files changed, 104 insertions(+), 27 deletions(-)
drivers/tty/vt/vt.c +70 -23
@@ -3016,7 +3016,7 @@ int __init vty_init(const struct file_opstatic struct class *vtconsole_class; -static int bind_con_driver (const struct consw *csw,int first,int last, +static int do_bind_con_driver (const struct consw *csw,int first,int last,int deflt) {struct module *owner = csw->owner;
@@ -3027,7 +3027,7 @@ static int bind_con_driver(const structif (!try_module_get (owner))return -ENODEV ; -console_lock (); +WARN_CONSOLE_UNLOCKED ();/* check if driver is registered */ for (i =0 ; i <MAX_NR_CON_DRIVER ; i++) {
@@ -3112,11 +3112,22 @@ static int bind_con_driver(const struct retval =0 ; err: -console_unlock ();module_put (owner);return retval; }; + +static int bind_con_driver (const struct consw *csw,int first,int last, +int deflt) +{ +int ret; + +console_lock (); + ret =do_bind_con_driver (csw, first, last, deflt); +console_unlock (); +return ret; +} +#ifdef CONFIG_VT_HW_CONSOLE_BINDING static int con_is_graphics (const struct consw *csw,int first,int last) {
@@ -3228,9 +3239,9 @@ int unbind_con_driver(const struct conswif (!con_is_bound (csw)) con_driver->flag &= ~CON_DRIVER_FLAG_INIT ; -console_unlock ();/* ignore return value, binding should not fail */ -bind_con_driver (defcsw, first, last, deflt); +do_bind_con_driver (defcsw, first, last, deflt); +console_unlock (); err:module_put (owner);return retval;
@@ -3508,28 +3519,18 @@ int con_debug_leave(void) }EXPORT_SYMBOL_GPL (con_debug_leave); -/** -* register_con_driver - register console driver to console layer -* @csw: console driver -* @first: the first console to take over, minimum value is 0 -* @last: the last console to take over, maximum value is MAX_NR_CONSOLES -1 -* -* DESCRIPTION: This function registers a console driver which can later -* bind to a range of consoles specified by @first and @last. It will -* also initialize the console driver by calling con_startup(). -*/ -int register_con_driver (const struct consw *csw,int first,int last) +static int do_register_con_driver (const struct consw *csw,int first,int last) {struct module *owner = csw->owner;struct con_driver *con_driver;const char *desc;int i, retval =0 ; +WARN_CONSOLE_UNLOCKED (); +if (!try_module_get (owner))return -ENODEV ; -console_lock (); -for (i =0 ; i <MAX_NR_CON_DRIVER ; i++) { con_driver = ®istered_con_driver[i];
@@ -3582,10 +3583,29 @@ int register_con_driver(const struct con } err: -console_unlock ();module_put (owner);return retval; } + +/** +* register_con_driver - register console driver to console layer +* @csw: console driver +* @first: the first console to take over, minimum value is 0 +* @last: the last console to take over, maximum value is MAX_NR_CONSOLES -1 +* +* DESCRIPTION: This function registers a console driver which can later +* bind to a range of consoles specified by @first and @last. It will +* also initialize the console driver by calling con_startup(). +*/ +int register_con_driver (const struct consw *csw,int first,int last) +{ +int retval; + +console_lock (); + retval =do_register_con_driver (csw, first, last); +console_unlock (); +return retval; +}EXPORT_SYMBOL (register_con_driver);/**
@@ -3639,17 +3659,44 @@ EXPORT_SYMBOL(unregister_con_driver);* when a driver wants to take over some existing consoles * and become default driver for newly opened ones. * -* take_over_console is basically a register followed by unbind +* take_over_console is basically a register followed by unbind +*/ +int do_take_over_console (const struct consw *csw,int first,int last,int deflt) +{ +int err; + + err =do_register_con_driver (csw, first, last); +/* +* If we get an busy error we still want to bind the console driver +* and return success, as we may have unbound the console driver +* but not unregistered it. +*/ +if (err == -EBUSY ) + err =0 ; +if (!err) +do_bind_con_driver (csw, first, last, deflt); + +return err; +} +EXPORT_SYMBOL_GPL (do_take_over_console); + +/* +* If we support more console drivers, this function is used +* when a driver wants to take over some existing consoles +* and become default driver for newly opened ones. +* +* take_over_console is basically a register followed by unbind */ int take_over_console (const struct consw *csw,int first,int last,int deflt) {int err; err =register_con_driver (csw, first, last); -/* if we get an busy error we still want to bind the console driver +/* +* If we get an busy error we still want to bind the console driver * and return success, as we may have unbound the console driver -* but not unregistered it. -*/ +* but not unregistered it. +*/ if (err == -EBUSY ) err =0 ;if (!err)
drivers/video/console/fbcon.c +28 -1
@@ -530,6 +530,33 @@ static int search_for_mapped_con(void)return retval; } +static int do_fbcon_takeover (int show_logo) +{ +int err, i; + +if (!num_registered_fb) +return -ENODEV ; + +if (!show_logo) + logo_shown =FBCON_LOGO_DONTSHOW ; + +for (i = first_fb_vc; i <= last_fb_vc; i++) + con2fb_map[i] = info_idx; + + err =do_take_over_console (&fb_con, first_fb_vc, last_fb_vc, + fbcon_is_default); + +if (err) { +for (i = first_fb_vc; i <= last_fb_vc; i++) + con2fb_map[i] =-1 ; + info_idx =-1 ; + }else { + fbcon_has_console_bind =1 ; + } + +return err; +} +static int fbcon_takeover (int show_logo) {int err, i;
@@ -3122,7 +3149,7 @@ static int fbcon_fb_registered(struct fb }if (info_idx !=-1 ) - ret =fbcon_takeover (1 ); + ret =do_fbcon_takeover (1 ); }else {for (i = first_fb_vc; i <= last_fb_vc; i++) {if (con2fb_map_boot[i] == idx)
drivers/video/fbmem.c +2 -3
@@ -1628,7 +1628,9 @@ static int do_register_framebuffer(struc event.info = fb_info;if (!lock_fb_info (fb_info))return -ENODEV ; +console_lock ();fb_notifier_call_chain (FB_EVENT_FB_REGISTERED , &event); +console_unlock ();unlock_fb_info (fb_info);return 0 ; }
@@ -1831,11 +1833,8 @@ int fb_new_modelist(struct fb_info *info err =1 ;if (!list_empty (&info->modelist)) { -if (!lock_fb_info (info)) -return -ENODEV ; event.info = info; err =fb_notifier_call_chain (FB_EVENT_NEW_MODELIST , &event); -unlock_fb_info (info); }return err;
drivers/video/fbsysfs.c +3 -0
@@ -175,6 +175,8 @@ static ssize_t store_modes(struct deviceif (i *sizeof (struct fb_videomode ) != count)return -EINVAL ; +if (!lock_fb_info (fb_info)) +return -ENODEV ;console_lock ();list_splice (&fb_info->modelist, &old_list); fb_videomode_to_modelist((const struct fb_videomode *)buf, i,
@@ -186,6 +188,7 @@ static ssize_t store_modes(struct devicefb_destroy_modelist (&old_list);console_unlock (); +unlock_fb_info (fb_info);return 0 ; }
include/linux/console.h +1 -0
@@ -78,6 +78,7 @@ int con_is_bound(const struct consw *cswint register_con_driver (const struct consw *csw,int first,int last);int unregister_con_driver (const struct consw *csw);int take_over_console (const struct consw *sw,int first,int last,int deflt); +int do_take_over_console (const struct consw *sw,int first,int last,int deflt);void give_up_console (const struct consw *sw);#ifdef CONFIG_HW_CONSOLE int con_debug_enter (struct vc_data *vc);
Greg Kroah-Hartman
maintainerPATCH 41/53 fb: Yet another band-aid for fixing lockdep mess
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
commit e93a9a868792ad71cdd09d75e5a02d8067473c4e upstream.
I've still got lockdep warnings even after Alan's patch, and it seems that yet more band aids are required to paper over similar paths for unbind_con_driver() and unregister_con_driver(). After this hack, lockdep warnings are finally gone.
--- drivers/tty/vt/vt.c | 43 +++++++++++++++++++++++++++--------------- drivers/video/console/fbcon.c | 4 +-- drivers/video/fbmem.c | 4 +++ include/linux/console.h | 1 include/linux/vt_kern.h | 2 + 5 files changed, 37 insertions(+), 17 deletions(-)
drivers/tty/vt/vt.c +28 -15
@@ -3164,6 +3164,18 @@ static int con_is_graphics(const struct*/ int unbind_con_driver (const struct consw *csw,int first,int last,int deflt) { +int retval; + +console_lock (); + retval =do_unbind_con_driver (csw, first, last, deflt); +console_unlock (); +return retval; +} +EXPORT_SYMBOL (unbind_con_driver); + +/* unlocked version of unbind_con_driver() */ +int do_unbind_con_driver (const struct consw *csw,int first,int last,int deflt) +{struct module *owner = csw->owner;const struct consw *defcsw =NULL ;struct con_driver *con_driver =NULL , *con_back =NULL ;
@@ -3172,7 +3184,7 @@ int unbind_con_driver(const struct conswif (!try_module_get (owner))return -ENODEV ; -console_lock (); +WARN_CONSOLE_UNLOCKED ();/* check if driver is registered and if it is unbindable */ for (i =0 ; i <MAX_NR_CON_DRIVER ; i++) {
@@ -3185,10 +3197,8 @@ int unbind_con_driver(const struct consw } } -if (retval) { -console_unlock (); +if (retval) goto err; - } retval = -ENODEV ;
@@ -3204,15 +3214,11 @@ int unbind_con_driver(const struct consw } } -if (retval) { -console_unlock (); +if (retval) goto err; - } -if (!con_is_bound (csw)) { -console_unlock (); +if (!con_is_bound (csw)) goto err; - } first =max (first, con_driver->first); last =min (last, con_driver->last);
@@ -3241,13 +3247,12 @@ int unbind_con_driver(const struct consw/* ignore return value, binding should not fail */ do_bind_con_driver (defcsw, first, last, deflt); -console_unlock (); err:module_put (owner);return retval; } -EXPORT_SYMBOL (unbind_con_driver); +EXPORT_SYMBOL_GPL (do_unbind_con_driver);static int vt_bind (struct con_driver *con) {
@@ -3621,9 +3626,18 @@ EXPORT_SYMBOL(register_con_driver);*/ int unregister_con_driver (const struct consw *csw) { -int i, retval = -ENODEV ; +int retval;console_lock (); + retval =do_unregister_con_driver (csw); +console_unlock (); +return retval; +} +EXPORT_SYMBOL (unregister_con_driver); + +int do_unregister_con_driver (const struct consw *csw) +{ +int i, retval = -ENODEV ;/* cannot unregister a bound driver */ if (con_is_bound (csw))
@@ -3649,10 +3663,9 @@ int unregister_con_driver(const struct c } } err: -console_unlock ();return retval; } -EXPORT_SYMBOL (unregister_con_driver); +EXPORT_SYMBOL_GPL (do_unregister_con_driver);/* * If we support more console drivers, this function is used
drivers/video/console/fbcon.c +2 -2
@@ -3011,7 +3011,7 @@ static int fbcon_unbind(void) {int ret; - ret =unbind_con_driver (&fb_con, first_fb_vc, last_fb_vc, + ret =do_unbind_con_driver (&fb_con, first_fb_vc, last_fb_vc, fbcon_is_default);if (!ret)
@@ -3084,7 +3084,7 @@ static int fbcon_fb_unregistered(struct primary_device =-1 ;if (!num_registered_fb) -unregister_con_driver (&fb_con); +do_unregister_con_driver (&fb_con);return 0 ; }
drivers/video/fbmem.c +4 -0
@@ -1646,8 +1646,10 @@ static int do_unregister_framebuffer(strif (!lock_fb_info (fb_info))return -ENODEV ; +console_lock (); event.info = fb_info; ret =fb_notifier_call_chain (FB_EVENT_FB_UNBIND , &event); +console_unlock ();unlock_fb_info (fb_info);if (ret)
@@ -1662,7 +1664,9 @@ static int do_unregister_framebuffer(str num_registered_fb--;fb_cleanup_device (fb_info); event.info = fb_info; +console_lock ();fb_notifier_call_chain (FB_EVENT_FB_UNREGISTERED , &event); +console_unlock ();/* this may free fb info */ put_fb_info (fb_info);
include/linux/console.h +1 -0
@@ -77,6 +77,7 @@ extern const struct consw prom_con; /* Sint con_is_bound (const struct consw *csw);int register_con_driver (const struct consw *csw,int first,int last);int unregister_con_driver (const struct consw *csw); +int do_unregister_con_driver (const struct consw *csw);int take_over_console (const struct consw *sw,int first,int last,int deflt);int do_take_over_console (const struct consw *sw,int first,int last,int deflt);void give_up_console (const struct consw *sw);
include/linux/vt_kern.h +2 -0
@@ -131,6 +131,8 @@ void vt_event_post(unsigned int event, uint vt_waitactive (int n);void change_console (struct vc_data *new_vc);void reset_vc (struct vc_data *vc); +extern int do_unbind_con_driver (const struct consw *csw,int first,int last, +int deflt);extern int unbind_con_driver (const struct consw *csw,int first,int last,int deflt);int vty_init (const struct file_operations *console_fops);
Greg Kroah-Hartman
maintainerPATCH 42/53 bridge: set priority of STP packets
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Stephen Hemminger <[email protected]>
[ Upstream commit 547b4e718115eea74087e28d7fa70aec619200db ]
Spanning Tree Protocol packets should have always been marked as control packets, this causes them to get queued in the high prirority FIFO. As Radia Perlman mentioned in her LCA talk, STP dies if bridge gets overloaded and can't communicate. This is a long-standing bug back to the first versions of Linux bridge.
--- net/bridge/br_stp_bpdu.c | 2 ++ 1 file changed, 2 insertions(+)
net/bridge/br_stp_bpdu.c +2 -0
@@ -16,6 +16,7 @@#include <linux/etherdevice.h> #include <linux/llc.h> #include <linux/slab.h> +#include <linux/pkt_sched.h> #include <net/net_namespace.h> #include <net/llc.h> #include <net/llc_pdu.h>
@@ -40,6 +41,7 @@ static void br_send_bpdu(struct net_brid skb->dev = p->dev; skb->protocol =htons (ETH_P_802_2 ); + skb->priority =TC_PRIO_CONTROL ;skb_reserve (skb,LLC_RESERVE );memcpy (__skb_put (skb, length), data, length);
Greg Kroah-Hartman
maintainerPATCH 43/53 xen-netback: correctly return errors from netbk_count_requests()
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Vrabel <[email protected]>
[ Upstream commit 35876b5ffc154c357476b2c3bdab10feaf4bd8f0 ]
netbk_count_requests() could detect an error, call netbk_fatal_tx_error() but return 0. The vif may then be used afterwards (e.g., in a call to netbk_tx_error().
Since netbk_fatal_tx_error() could set vif->refcnt to 1, the vif may be freed immediately after the call to netbk_fatal_tx_error() (e.g., if the vif is also removed).
Netback thread Xenwatch thread
-------------------------------------------netbk_fatal_tx_err() netback_remove()
xenvif_disconnect()
...
free_netdev()netbk_tx_err() Oops!
--- drivers/net/xen-netback/netback.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/net/xen-netback/netback.c +4 -4
@@ -870,13 +870,13 @@ static int netbk_count_requests(struct xif (frags >= work_to_do) {netdev_err (vif->dev,"Need more frags\n" );netbk_fatal_tx_err (vif); -return -frags; +return -ENODATA ; }if (unlikely (frags >=MAX_SKB_FRAGS )) {netdev_err (vif->dev,"Too many frags\n" );netbk_fatal_tx_err (vif); -return -frags; +return -E2BIG ; } memcpy(txp, RING_GET_REQUEST(&vif->tx, cons + frags),
@@ -884,7 +884,7 @@ static int netbk_count_requests(struct xif (txp->size > first->size) {netdev_err (vif->dev,"Frag is bigger than frame.\n" );netbk_fatal_tx_err (vif); -return -frags; +return -EIO ; } first->size -= txp->size;
@@ -894,7 +894,7 @@ static int netbk_count_requests(struct xnetdev_err (vif->dev,"txp->offset: %x, size: %u\n" , txp->offset, txp->size);netbk_fatal_tx_err (vif); -return -frags; +return -EINVAL ; } }while ((txp++)->flags & XEN_NETTXF_more_data);return frags;
Greg Kroah-Hartman
maintainerPATCH 44/53 xen-netback: cancel the credit timer when taking the vif down
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Vrabel <[email protected]>
[ Upstream commit 3e55f8b306cf305832a4ac78aa82e1b40e818ece ]
If the credit timer is left armed after calling xen_netbk_remove_xenvif(), then it may fire and attempt to schedule the vif which will then oops as vif->netbk == NULL.
This may happen both in the fatal error path and during normal disconnection from the front end.
The sequencing during shutdown is critical to ensure that: a) vif->netbk doesn't become unexpectedly NULL; and b) the net device/vif is not freed.
1. Mark as unschedulable (netif_carrier_off()).
2. Synchronously cancel the timer.
3. Remove the vif from the schedule list.
4. Remove it from it netback thread group.
5. Wait for vif->refcnt to become 0.
--- drivers/net/xen-netback/interface.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/net/xen-netback/interface.c +1 -2
@@ -132,6 +132,7 @@ static void xenvif_up(struct xenvif *vifstatic void xenvif_down (struct xenvif *vif) {disable_irq (vif->irq); +del_timer_sync (&vif->credit_timeout);xen_netbk_deschedule_xenvif (vif);xen_netbk_remove_xenvif (vif); }
@@ -362,8 +363,6 @@ void xenvif_disconnect(struct xenvif *viatomic_dec (&vif->refcnt);wait_event (vif->waiting_to_free,atomic_read (&vif->refcnt) ==0 ); -del_timer_sync (&vif->credit_timeout); -if (vif->irq)unbind_from_irqhandler (vif->irq, vif);
Greg Kroah-Hartman
maintainerPATCH 45/53 ipv4: fix a bug in ping_err().
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Li Wei <[email protected]>
[ Upstream commit b531ed61a2a2a77eeb2f7c88b49aa5ec7d9880d8 ]
We should get 'type' and 'code' from the outer ICMP header.
--- net/ipv4/ping.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/ipv4/ping.c +2 -2
@@ -320,8 +320,8 @@ void ping_err(struct sk_buff *skb, u32 istruct iphdr *iph = (struct iphdr *)skb->data;struct icmphdr *icmph = (struct icmphdr *)(skb->data+(iph->ihl<<2 ));struct inet_sock *inet_sock; -int type = icmph->type; -int code = icmph->code; +int type =icmp_hdr (skb)->type; +int code =icmp_hdr (skb)->code;struct net *net =dev_net (skb->dev);struct sock *sk;int harderr;
Greg Kroah-Hartman
maintainerPATCH 46/53 ipv6: use a stronger hash for tcp
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit 08dcdbf6a7b9d14c2302c5bd0c5390ddf122f664 ]
It looks like its possible to open thousands of TCP IPv6 sessions on a server, all landing in a single slot of TCP hash table. Incoming packets have to lookup sockets in a very long list.
We should hash all bits from foreign IPv6 addresses, using a salt and hash mix, not a simple XOR.
inet6_ehashfn() can also separately use the ports, instead of xoring them.
--- include/net/inet6_hashtables.h | 8 ++++---- include/net/inet_sock.h | 1 + include/net/ipv6.h | 12 ++++++++++++ net/ipv4/af_inet.c | 9 +++++++-- 4 files changed, 24 insertions(+), 6 deletions(-)
include/net/inet6_hashtables.h +4 -4
@@ -28,16 +28,16 @@struct inet_hashinfo ; -/* I have no idea if this is a good hash for v6 or not. -DaveM */ static inline unsigned int inet6_ehashfn (struct net *net,const struct in6_addr *laddr,const u16 lport,const struct in6_addr *faddr,const __be16 fport) { -u32 ports = (lport ^ (__force u16 )fport); +u32 ports = (((u32 )lport) <<16 ) | (__force u32 )fport;return jhash_3words ((__force u32 )laddr->s6_addr32[3 ], - (__force u32 )faddr->s6_addr32[3 ], - ports, inet_ehash_secret +net_hash_mix (net)); +ipv6_addr_jhash (faddr), + ports, + inet_ehash_secret +net_hash_mix (net)); }static inline int inet6_sk_ehashfn (const struct sock *sk)
include/net/inet_sock.h +1 -0
@@ -199,6 +199,7 @@ static inline void inet_sk_copy_descendaextern int inet_sk_rebuild_header (struct sock *sk);extern u32 inet_ehash_secret; +extern u32 ipv6_hash_secret;extern void build_ehash_secret (void ); static inline unsigned int inet_ehashfn(struct net *net,
include/net/ipv6.h +12 -0
@@ -15,6 +15,7 @@#include <linux/ipv6.h> #include <linux/hardirq.h> +#include <linux/jhash.h> #include <net/if_inet6.h> #include <net/ndisc.h> #include <net/flow.h>
@@ -386,6 +387,17 @@ struct ip6_create_arg {void ip6_frag_init (struct inet_frag_queue *q,void *a);int ip6_frag_match (struct inet_frag_queue *q,void *a); +/* more secured version of ipv6_addr_hash() */ +static inline u32 ipv6_addr_jhash (const struct in6_addr *a) +{ +u32 v = (__force u32 )a->s6_addr32[0 ] ^ (__force u32 )a->s6_addr32[1 ]; + +return jhash_3words (v, + (__force u32 )a->s6_addr32[2 ], + (__force u32 )a->s6_addr32[3 ], + ipv6_hash_secret); +} +static inline int ipv6_addr_any (const struct in6_addr *a) { return (a->s6_addr32[0] | a->s6_addr32[1] |
net/ipv4/af_inet.c +7 -2
@@ -226,8 +226,12 @@ EXPORT_SYMBOL(inet_listen);u32 inet_ehash_secret__read_mostly ;EXPORT_SYMBOL (inet_ehash_secret); +u32 ipv6_hash_secret__read_mostly ; +EXPORT_SYMBOL (ipv6_hash_secret); +/* -* inet_ehash_secret must be set exactly once +* inet_ehash_secret must be set exactly once, and to a non nul value +* ipv6_hash_secret must be set exactly once. */ void build_ehash_secret (void ) {
@@ -237,7 +241,8 @@ void build_ehash_secret(void)get_random_bytes (&rnd,sizeof (rnd)); }while (rnd ==0 ); -cmpxchg (&inet_ehash_secret,0 , rnd); +if (cmpxchg (&inet_ehash_secret,0 , rnd) ==0 ) +get_random_bytes (&ipv6_hash_secret,sizeof (ipv6_hash_secret)); }EXPORT_SYMBOL (build_ehash_secret);
Greg Kroah-Hartman
maintainerPATCH 47/53 dca: check against empty dca_domains list before unregister provider
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Maciej Sosnowski <[email protected]>
commit c419fcfd071cf34ba00f9f65282583772d2655e7 upstream.
When providers get blocked unregister_dca_providers() is called ending up with dca_providers and dca_domain lists emptied. Dca should be prevented from trying to unregister any provider if dca_domain list is found empty.
--- drivers/dca/dca-core.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/dca/dca-core.c +5 -0
@@ -409,6 +409,11 @@ void unregister_dca_provider(struct dca_spin_lock_irqsave (&dca_lock, flags); +if (list_empty (&dca_domains)) { +raw_spin_unlock_irqrestore (&dca_lock, flags); +return ; + } +list_del (&dca->node); pci_rc =dca_pci_rc_from_dev (dev);
Re: [ 47/53] dca: check against empty dca_domains list before unregister provider
Quoted 25 lines · Greg Kroah-Hartman
3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Maciej Sosnowski <[email protected]>
commit
c419fcfd071cf34ba00f9f65282583772d2655e7upstream.When providers get blocked
unregister_dca_providers()is called ending up withdca_providersanddca_domainlists emptied. Dca should be prevented from trying to unregister any provider ifdca_domainlist is found empty.Reported-by Jiang Liu <[email protected]>Tested-by Gaohuai Han <[email protected]>Signed-off-by Maciej Sosnowski <[email protected]>Signed-off-by Dan Williams <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>--- drivers/dca/dca-core.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/dca/dca-core.c void unregister_dca_provider(struct dca_ · line 413
Quoted 5 lines
drivers/dca/dca-core.c +2
-0@@ -409,6 +409,11 @@ void unregister_dca_provider(struct dca_spin_lock_irqsave (&dca_lock, flags); +if (list_empty (&dca_domains)) { +raw_spin_unlock_irqrestore (&dca_lock, flags);
Hi, this is an incorrect backport. It should be spin_unlock_irqrestore obviously...
Signature · 2 lines
js suse labs
Re: [ 47/53] dca: check against empty dca_domains list before unregister provider
Quoted 27 lines · Jiri Slaby
Quoted 26 lines · Greg Kroah-Hartman
3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Maciej Sosnowski <[email protected]>
commit
c419fcfd071cf34ba00f9f65282583772d2655e7upstream.When providers get blocked
unregister_dca_providers()is called ending up withdca_providersanddca_domainlists emptied. Dca should be prevented from trying to unregister any provider ifdca_domainlist is found empty.Reported-by Jiang Liu <[email protected]>Tested-by Gaohuai Han <[email protected]>Signed-off-by Maciej Sosnowski <[email protected]>Signed-off-by Dan Williams <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>--- drivers/dca/dca-core.c | 5 +++++ 1 file changed, 5 insertions(+)drivers/dca/dca-core.c +0
-0@@ -409,6 +409,11 @@ void unregister_dca_provider(struct dca_
Quoted 7 lines
drivers/dca/dca-core.c void unregister_dca_provider(struct dca_ · line 413
Quoted 4 lines
drivers/dca/dca-core.c +2
-0spin_lock_irqsave (&dca_lock, flags); +if (list_empty (&dca_domains)) { +raw_spin_unlock_irqrestore (&dca_lock, flags);Hi, this is an incorrect backport. It should be
spin_unlock_irqrestoreobviously...
Fix attached.
Signature · 2 lines
js suse labs
From: Jiri Slaby <[email protected]>
Subject: dca: check against empty dca_domains list before unregister provider fix
Patch-mainline: no, submitted on 28th Feb 2013
In 3.0.67, commit 7a9a20ea77e7508c795dead9ab2f6c98a617762d (dca: check
against empty dca_domains list before unregister provider), upstream
commit c419fcfd071cf34ba00f9f65282583772d2655e7, added a fail path tounregister_dca_provider. It added there also a call toraw_spin_unlock_irqrestore. But in 3.0, the lock is not raw, so this
results in:drivers/dca/dca-core.c: In function 'unregister_dca_provider':drivers/dca/dca-core.c:413: warning: passing argument 1 of '_raw_spin_unlock_irqrestore' from incompatible pointer type
Fix it by calling spin_unlock_irqrestore properly.
--- drivers/dca/dca-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/dca/dca-core.c +1 -1
@@ -410,7 +410,7 @@ void unregister_dca_provider(struct dca_spin_lock_irqsave (&dca_lock, flags);if (list_empty (&dca_domains)) { -raw_spin_unlock_irqrestore (&dca_lock, flags); +spin_unlock_irqrestore (&dca_lock, flags);return ; }
Greg Kroah-Hartman
maintainerRe: [ 47/53] dca: check against empty dca_domains list before unregister provider
Quoted 30 lines · Jiri Slaby
Quoted 29 lines · Jiri Slaby
Quoted 28 lines · Greg Kroah-Hartman
3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Maciej Sosnowski <[email protected]>
commit
c419fcfd071cf34ba00f9f65282583772d2655e7upstream.When providers get blocked
unregister_dca_providers()is called ending up withdca_providersanddca_domainlists emptied. Dca should be prevented from trying to unregister any provider ifdca_domainlist is found empty.Reported-by Jiang Liu <[email protected]>Tested-by Gaohuai Han <[email protected]>Signed-off-by Maciej Sosnowski <[email protected]>Signed-off-by Dan Williams <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>--- drivers/dca/dca-core.c | 5 +++++ 1 file changed, 5 insertions(+)drivers/dca/dca-core.c +0
-0@@ -409,6 +409,11 @@ void unregister_dca_provider(struct dca_spin_lock_irqsave (&dca_lock, flags);
Quoted 7 lines
Quoted 5 lines
drivers/dca/dca-core.c void unregister_dca_provider(struct dca_ · line 413
Quoted 2 lines
drivers/dca/dca-core.c +2
-0+if (list_empty (&dca_domains)) { +raw_spin_unlock_irqrestore (&dca_lock, flags);Hi, this is an incorrect backport. It should be
spin_unlock_irqrestoreobviously...Fix attached.
Thanks, now applied.
greg k-h
Greg Kroah-Hartman
maintainerPATCH 48/53 USB: option: add and update Alcatel modems
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bjørn Mork <[email protected]>
commit f8f0302bbcbd1b14655bef29f6996a2152be559d upstream.
Adding three currently unsupported modems based on information from .inf driver files:
Diag VID_1BBB&PID_0052&MI_00
AGPS VID_1BBB&PID_0052&MI_01
VOICE VID_1BBB&PID_0052&MI_02
AT VID_1BBB&PID_0052&MI_03
Modem VID_1BBB&PID_0052&MI_05
wwan VID_1BBB&PID_0052&MI_06
Diag VID_1BBB&PID_00B6&MI_00
AT VID_1BBB&PID_00B6&MI_01
Modem VID_1BBB&PID_00B6&MI_02
wwan VID_1BBB&PID_00B6&MI_03
Diag VID_1BBB&PID_00B7&MI_00
AGPS VID_1BBB&PID_00B7&MI_01
VOICE VID_1BBB&PID_00B7&MI_02
AT VID_1BBB&PID_00B7&MI_03
Modem VID_1BBB&PID_00B7&MI_04
wwan VID_1BBB&PID_00B7&MI_05
Updating the blacklist info for the X060S_X200 and X220_X500D, reserving interfaces for a wwan driver, based on
wwan VID_1BBB&PID_0000&MI_04
wwan VID_1BBB&PID_0017&MI_06
--- drivers/usb/serial/option.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
drivers/usb/serial/option.c +9 -1
@@ -479,6 +479,7 @@ static const struct option_blacklist_infstatic const struct option_blacklist_info alcatel_x200_blacklist = { .sendsetup =BIT (0 ) |BIT (1 ), + .reserved =BIT (4 ), };static const struct option_blacklist_info zte_0037_blacklist = {
@@ -1215,7 +1216,14 @@ static const struct usb_device_id option { USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_X060S_X200), .driver_info = (kernel_ulong_t)&alcatel_x200_blacklist }, - { USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_X220_X500D) }, + { USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_X220_X500D), + .driver_info = (kernel_ulong_t)&net_intf6_blacklist }, + { USB_DEVICE(ALCATEL_VENDOR_ID, 0x0052), + .driver_info = (kernel_ulong_t)&net_intf6_blacklist }, + { USB_DEVICE(ALCATEL_VENDOR_ID, 0x00b6), + .driver_info = (kernel_ulong_t)&net_intf3_blacklist }, + { USB_DEVICE(ALCATEL_VENDOR_ID, 0x00b7), + .driver_info = (kernel_ulong_t)&net_intf5_blacklist }, { USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_L100V), .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, { USB_DEVICE(AIRPLUS_VENDOR_ID, AIRPLUS_PRODUCT_MCD650) },
Greg Kroah-Hartman
maintainerPATCH 49/53 USB: option: add Yota / Megafon M100-1 4g modem
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bjørn Mork <[email protected]>
commit cd565279e51bedee1b2988e84f9b3bef485adeb6 upstream.
Interface layout:
00 CD-ROM
01 debug COM port
02 AP control port
03 modem
04 usb-ethernet
Bus=01 Lev=02 Prnt=02 Port=01 Cnt=02 Dev#= 4 Spd=480 MxCh= 0
D: Ver= 2.00 Cls=00(>ifc ) Sub=00 Prot=00 MxPS=64 #Cfgs= 1 P: Vendor=0408 ProdID=ea42 Rev= 0.00 S: Manufacturer=Qualcomm, Incorporated S: Product=Qualcomm CDMA Technologies MSM S: SerialNumber=353568051xxxxxx C:* #Ifs= 5 Cfg#= 1 Atr=e0 MxPwr=500mA I:* If#= 0 Alt= 0 #EPs= 2 Cls=08(stor.) Sub=06 Prot=50 Driver=usb-storage E: Ad=01(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=81(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms I:* If#= 1 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none) E: Ad=82(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=02(O) Atr=02(Bulk) MxPS= 512 Ivl=4ms I:* If#= 2 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none) E: Ad=83(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=03(O) Atr=02(Bulk) MxPS= 512 Ivl=4ms I:* If#= 3 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none) E: Ad=84(I) Atr=03(Int.) MxPS= 64 Ivl=2ms E: Ad=85(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=04(O) Atr=02(Bulk) MxPS= 512 Ivl=4ms I:* If#= 4 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none) E: Ad=86(I) Atr=03(Int.) MxPS= 64 Ivl=2ms E: Ad=87(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=05(O) Atr=02(Bulk) MxPS= 512 Ivl=4ms
--- drivers/usb/serial/option.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/usb/serial/option.c +2 -0
@@ -576,6 +576,8 @@ static const struct usb_device_id option { USB_DEVICE(QUANTA_VENDOR_ID, QUANTA_PRODUCT_GLX) }, { USB_DEVICE(QUANTA_VENDOR_ID, QUANTA_PRODUCT_GKE) }, { USB_DEVICE(QUANTA_VENDOR_ID, QUANTA_PRODUCT_GLE) }, + { USB_DEVICE(QUANTA_VENDOR_ID, 0xea42), + .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E173, 0xff, 0xff, 0xff), .driver_info = (kernel_ulong_t) &net_intf1_blacklist }, { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K4505, 0xff, 0xff, 0xff),
Greg Kroah-Hartman
maintainerPATCH 50/53 USB: option: add Huawei "ACM" devices using protocol = vendor
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bjørn Mork <[email protected]>
commit 1f3f687722fd9b29a0c2a85b4844e3b2a3585c63 upstream.
The USB device descriptor of one identity presented by a few Huawei morphing devices have serial functions with class codes 02/02/ff, indicating CDC ACM with a vendor specific protocol. This combination is often used for MSFT RNDIS functions, and the CDC ACM class driver will therefore ignore such functions.
The CDC ACM class driver cannot support functions with only 2 endpoints. The underlying serial functions of these modems are also believed to be the same as for alternate device identities already supported by the option driver. Letting the same driver handle these functions independently of the current identity ensures consistent handling and user experience.
There is no need to blacklist these devices in the rndis_host driver. Huawei serial functions will either have only 2 endpoints or a CDC ACM functional descriptor with bmCapabilities != 0, making them correctly ignored as "non RNDIS" by that driver.
--- drivers/usb/serial/option.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/usb/serial/option.c +4 -0
@@ -578,8 +578,12 @@ static const struct usb_device_id option { USB_DEVICE(QUANTA_VENDOR_ID, QUANTA_PRODUCT_GLE) }, { USB_DEVICE(QUANTA_VENDOR_ID, 0xea42), .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, + { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0x1c05, USB_CLASS_COMM, 0x02, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0x1c23, USB_CLASS_COMM, 0x02, 0xff) }, { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E173, 0xff, 0xff, 0xff), .driver_info = (kernel_ulong_t) &net_intf1_blacklist }, + { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0x1441, USB_CLASS_COMM, 0x02, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0x1442, USB_CLASS_COMM, 0x02, 0xff) }, { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K4505, 0xff, 0xff, 0xff), .driver_info = (kernel_ulong_t) &huawei_cdc12_blacklist }, { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K3765, 0xff, 0xff, 0xff),
Greg Kroah-Hartman
maintainerPATCH 51/53 USB: ehci-omap: Fix autoloading of module
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Roger Quadros <[email protected]>
commit 04753523266629b1cd0518091da1658755787198 upstream.
The module alias should be "ehci-omap" and not "omap-ehci" to match the platform device name. The omap-ehci module should now autoload correctly.
--- drivers/usb/host/ehci-omap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/host/ehci-omap.c +1 -1
@@ -321,7 +321,7 @@ static const struct hc_driver ehci_omap_ .clear_tt_buffer_complete = ehci_clear_tt_buffer_complete, }; -MODULE_ALIAS ("platform:omap-ehci" ); +MODULE_ALIAS ("platform:ehci-omap" );MODULE_AUTHOR ("Texas Instruments, Inc." );MODULE_AUTHOR ("Felipe Balbi <[email protected]>" );
Greg Kroah-Hartman
maintainerPATCH 52/53 USB: storage: properly handle the endian issues of idProduct
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: fangxiaozhi <[email protected]>
commit cd060956c5e97931c3909e4a808508469c0bb9f6 upstream.
1. The idProduct is little endian, so make sure its value to be compatible with the current CPU. Make no break on big endian processors.
--- drivers/usb/storage/initializers.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/usb/storage/initializers.c +2 -2
@@ -147,7 +147,7 @@ static int usb_stor_huawei_dongles_pid(sint idProduct; idesc = &us->pusb_intf->cur_altsetting->desc; - idProduct = us->pusb_dev->descriptor.idProduct; + idProduct =le16_to_cpu (us->pusb_dev->descriptor.idProduct);/* The first port is CDROM, * means the dongle in the single port mode, * and a switch command is required to be sent. */
@@ -169,7 +169,7 @@ int usb_stor_huawei_init(struct us_dataint result =0 ;if (usb_stor_huawei_dongles_pid (us)) { -if (us->pusb_dev->descriptor.idProduct >=0x1446 ) +if (le16_to_cpu (us->pusb_dev->descriptor.idProduct) >=0x1446 ) result =usb_stor_huawei_scsi_init (us);else result =usb_stor_huawei_feature_init (us);
Greg Kroah-Hartman
maintainerPATCH 53/53 USB: usb-storage: unusual_devs update for Super TOP SATA bridge
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Josh Boyer <[email protected]>
commit 18e03310b5caa6d11c1a8c61b982c37047693fba upstream.
The current entry in unusual_cypress.h for the Super TOP SATA bridge devices seems to be causing corruption on newer revisions of this device. This has been reported in Arch Linux and Fedora. The original patch was tested on devices with bcdDevice of 1.60, whereas the newer devices report bcdDevice as 2.20. Limit the UNUSUAL_DEV entry to devices less than 2.20.
This fixes https://bugzilla.redhat.com/show_bug.cgi?id=909591
The Arch Forum post on this is here:
https://bbs.archlinux.org/viewtopic.php?id=152011
--- drivers/usb/storage/unusual_cypress.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/storage/unusual_cypress.h +1 -1
@@ -31,7 +31,7 @@ UNUSUAL_DEV( 0x04b4, 0x6831, 0x0000, 0x "Cypress ISD-300LP", USB_SC_CYP_ATACB, USB_PR_DEVICE, NULL, 0), -UNUSUAL_DEV (0x14cd ,0x6116 ,0x0000 ,0x9999 , +UNUSUAL_DEV (0x14cd ,0x6116 ,0x0000 ,0x0219 ,"Super Top" ,"USB 2.0 SATA BRIDGE" , USB_SC_CYP_ATACB, USB_PR_DEVICE, NULL, 0),
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 3.0.67 release. There are 53 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 Thu Feb 28 23:55:32 UTC 2013. Anything received after that time might be too late.
Quoted 8 lines
The whole patch series can be found in one patch at:
kernel.org/pub/linux/kernel/v3.0/stable-review/patch-3.0.67-rc1.gzand the diffstat can be found below.
thanks,
greg k-h
Patches applied cleanly to 3.0.66, 3.4.33, and 3.8.0
Compiled and booted on the following systems:
HP EliteBook 6930p Intel(R) Core(TM)2 Duo CPU T9400 @ 2.53GHz HP ProBook 6475b AMD A10-4600M APU with Radeon(tm) HD Graphics
dmesgs for all releases look good. No regressions compared to the previous dmesgs for each of these releases.
Cross-compile tests results:
alpha: defconfig passed on all
arm: defconfig passed on all
arm64: not applicable to 3.0.y, 3.4.y. defconfig passed on 3.8.y
c6x: not applicable to 3.0.y, defconfig passed on 3.4.y, and 3.8.y.
mips: defconfig passed on all
mipsel: defconfig passed on all
powerpc: wii_defconfig passed on all
sh: defconfig passed on all
sparc: defconfig passed on all
tile: tilegx_defconfig passed on all
-- Shuah
Greg Kroah-Hartman
maintainerQuoted 21 lines · Shuah Khan
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 3.0.67 release. There are 53 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 Thu Feb 28 23:55:32 UTC 2013. Anything received after that time might be too late.
Quoted 8 lines
The whole patch series can be found in one patch at:
kernel.org/pub/linux/kernel/v3.0/stable-review/patch-3.0.67-rc1.gzand the diffstat can be found below.
thanks,
greg k-h
Patches applied cleanly to 3.0.66, 3.4.33, and 3.8.0
Quoted 7 lines
Compiled and booted on the following systems:
HP EliteBook 6930p Intel(R) Core(TM)2 Duo CPU T9400 @ 2.53GHz HP ProBook 6475b AMD A10-4600M APU with Radeon(tm) HD Graphics
dmesgs for all releases look good. No regressions compared to the previous dmesgs for each of these releases.
Wonderful, thanks for testing all of these and letting us know.
greg k-h
At Tue, 26 Feb 2013 15:57:29 -0800,
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 3.0.67 release. There are 53 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 Thu Feb 28 23:55:32 UTC 2013. Anything received after that time might be too late.
This kernel can be built and boot without any problem. Building a kernel with this kernel also works fine.
- Build Machine: debian wheezy x86_64
CPU: Intel(R) Core(TM) i5-2400 CPU @ 3.10GHz x 4
memory: 8GB
- Test machine: debian wheezy x86_64(KVM guest on the Build Machine)
vCPU: x2
memory: 2GB
Thanks,
Satoru
Greg Kroah-Hartman
maintainerQuoted 8 lines · Satoru Takeuchi
At Tue, 26 Feb 2013 15:57:29 -0800,
Quoted 6 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 3.0.67 release. There are 53 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.
Quoted 5 lines
Quoted 2 lines
Responses should be made by Thu Feb 28 23:55:32 UTC 2013. Anything received after that time might be too late.
This kernel can be built and boot without any problem. Building a kernel with this kernel also works fine.
Thanks for letting me know.
greg k-h