From: Greg Kroah-Hartman Date: Sat, 28 Feb 2015 22:48:08 +0000 (-0800) Subject: 3.10-stable patches X-Git-Tag: v3.10.71~44 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8fe5693e3c3ad64344f269e67c58ddd8897e3895;p=thirdparty%2Fkernel%2Fstable-queue.git 3.10-stable patches added patches: mips-kvm-deliver-guest-interrupts-after-local_irq_disable.patch mmc-sdhci-pxav3-fix-setting-of-pdata-clk_delay_cycles.patch nfs-don-t-call-blocking-operations-while-task_running.patch --- diff --git a/queue-3.10/mips-kvm-deliver-guest-interrupts-after-local_irq_disable.patch b/queue-3.10/mips-kvm-deliver-guest-interrupts-after-local_irq_disable.patch new file mode 100644 index 00000000000..d46745c6bdc --- /dev/null +++ b/queue-3.10/mips-kvm-deliver-guest-interrupts-after-local_irq_disable.patch @@ -0,0 +1,43 @@ +From 044f0f03eca0110e1835b2ea038a484b93950328 Mon Sep 17 00:00:00 2001 +From: James Hogan +Date: Thu, 29 May 2014 10:16:32 +0100 +Subject: MIPS: KVM: Deliver guest interrupts after local_irq_disable() + +From: James Hogan + +commit 044f0f03eca0110e1835b2ea038a484b93950328 upstream. + +When about to run the guest, deliver guest interrupts after disabling +host interrupts. This should prevent an hrtimer interrupt from being +handled after delivering guest interrupts, and therefore not delivering +the guest timer interrupt until after the next guest exit. + +Signed-off-by: James Hogan +Cc: Paolo Bonzini +Cc: Gleb Natapov +Cc: kvm@vger.kernel.org +Cc: Ralf Baechle +Cc: linux-mips@linux-mips.org +Cc: Sanjay Lal +Signed-off-by: Paolo Bonzini +Signed-off-by: Greg Kroah-Hartman + +--- + arch/mips/kvm/kvm_mips.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/arch/mips/kvm/kvm_mips.c ++++ b/arch/mips/kvm/kvm_mips.c +@@ -413,11 +413,11 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_v + vcpu->mmio_needed = 0; + } + ++ local_irq_disable(); + /* Check if we have any exceptions/interrupts pending */ + kvm_mips_deliver_interrupts(vcpu, + kvm_read_c0_guest_cause(vcpu->arch.cop0)); + +- local_irq_disable(); + kvm_guest_enter(); + + r = __kvm_mips_vcpu_run(run, vcpu); diff --git a/queue-3.10/mmc-sdhci-pxav3-fix-setting-of-pdata-clk_delay_cycles.patch b/queue-3.10/mmc-sdhci-pxav3-fix-setting-of-pdata-clk_delay_cycles.patch new file mode 100644 index 00000000000..e39feed8587 --- /dev/null +++ b/queue-3.10/mmc-sdhci-pxav3-fix-setting-of-pdata-clk_delay_cycles.patch @@ -0,0 +1,39 @@ +From 14460dbaf7a5a0488963fdb8232ad5c8a8cca7b7 Mon Sep 17 00:00:00 2001 +From: Jisheng Zhang +Date: Wed, 28 Jan 2015 19:54:12 +0800 +Subject: mmc: sdhci-pxav3: fix setting of pdata->clk_delay_cycles + +From: Jisheng Zhang + +commit 14460dbaf7a5a0488963fdb8232ad5c8a8cca7b7 upstream. + +Current code checks "clk_delay_cycles > 0" to know whether the optional +"mrvl,clk_delay_cycles" is set or not. But of_property_read_u32() doesn't +touch clk_delay_cycles if the property is not set. And type of +clk_delay_cycles is u32, so we may always set pdata->clk_delay_cycles as a +random value. + +This patch fix this problem by check the return value of of_property_read_u32() +to know whether the optional clk-delay-cycles is set or not. + +Signed-off-by: Jisheng Zhang +Signed-off-by: Ulf Hansson +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/mmc/host/sdhci-pxav3.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/drivers/mmc/host/sdhci-pxav3.c ++++ b/drivers/mmc/host/sdhci-pxav3.c +@@ -201,8 +201,8 @@ static struct sdhci_pxa_platdata *pxav3_ + if (!pdata) + return NULL; + +- of_property_read_u32(np, "mrvl,clk-delay-cycles", &clk_delay_cycles); +- if (clk_delay_cycles > 0) ++ if (!of_property_read_u32(np, "mrvl,clk-delay-cycles", ++ &clk_delay_cycles)) + pdata->clk_delay_cycles = clk_delay_cycles; + + return pdata; diff --git a/queue-3.10/nfs-don-t-call-blocking-operations-while-task_running.patch b/queue-3.10/nfs-don-t-call-blocking-operations-while-task_running.patch new file mode 100644 index 00000000000..b0c29ea138a --- /dev/null +++ b/queue-3.10/nfs-don-t-call-blocking-operations-while-task_running.patch @@ -0,0 +1,92 @@ +From 6ffa30d3f734d4f6b478081dfc09592021028f90 Mon Sep 17 00:00:00 2001 +From: Jeff Layton +Date: Wed, 14 Jan 2015 13:08:57 -0500 +Subject: nfs: don't call blocking operations while !TASK_RUNNING + +From: Jeff Layton + +commit 6ffa30d3f734d4f6b478081dfc09592021028f90 upstream. + +Bruce reported seeing this warning pop when mounting using v4.1: + + ------------[ cut here ]------------ + WARNING: CPU: 1 PID: 1121 at kernel/sched/core.c:7300 __might_sleep+0xbd/0xd0() + do not call blocking ops when !TASK_RUNNING; state=1 set at [] prepare_to_wait+0x2f/0x90 + Modules linked in: rpcsec_gss_krb5 auth_rpcgss nfsv4 dns_resolver nfs lockd grace sunrpc fscache ip6t_rpfilter ip6t_REJECT nf_reject_ipv6 xt_conntrack ebtable_nat ebtable_broute bridge stp llc ebtable_filter ebtables ip6table_nat nf_conntrack_ipv6 nf_defrag_ipv6 nf_nat_ipv6 ip6table_mangle ip6table_security ip6table_raw ip6table_filter ip6_tables iptable_nat nf_conntrack_ipv4 nf_defrag_ipv4 nf_nat_ipv4 nf_nat nf_conntrack iptable_mangle iptable_security iptable_raw snd_hda_codec_generic snd_hda_intel snd_hda_controller snd_hda_codec snd_hwdep snd_pcm snd_timer ppdev joydev snd virtio_console virtio_balloon pcspkr serio_raw parport_pc parport pvpanic floppy soundcore i2c_piix4 virtio_blk virtio_net qxl drm_kms_helper ttm drm virtio_pci virtio_ring ata_generic virtio pata_acpi + CPU: 1 PID: 1121 Comm: nfsv4.1-svc Not tainted 3.19.0-rc4+ #25 + Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.7.5-20140709_153950- 04/01/2014 + 0000000000000000 000000004e5e3f73 ffff8800b998fb48 ffffffff8186ac78 + 0000000000000000 ffff8800b998fba0 ffff8800b998fb88 ffffffff810ac9da + ffff8800b998fb68 ffffffff81c923e7 00000000000004d9 0000000000000000 + Call Trace: + [] dump_stack+0x4c/0x65 + [] warn_slowpath_common+0x8a/0xc0 + [] warn_slowpath_fmt+0x55/0x70 + [] ? prepare_to_wait+0x2f/0x90 + [] ? prepare_to_wait+0x2f/0x90 + [] __might_sleep+0xbd/0xd0 + [] kmem_cache_alloc_trace+0x243/0x430 + [] ? groups_alloc+0x3e/0x130 + [] groups_alloc+0x3e/0x130 + [] svcauth_unix_accept+0x16e/0x290 [sunrpc] + [] svc_authenticate+0xe1/0xf0 [sunrpc] + [] svc_process_common+0x244/0x6a0 [sunrpc] + [] bc_svc_process+0x1c4/0x260 [sunrpc] + [] nfs41_callback_svc+0x128/0x1f0 [nfsv4] + [] ? wait_woken+0xc0/0xc0 + [] ? nfs4_callback_svc+0x60/0x60 [nfsv4] + [] kthread+0x11f/0x140 + [] ? local_clock+0x15/0x30 + [] ? kthread_create_on_node+0x250/0x250 + [] ret_from_fork+0x7c/0xb0 + [] ? kthread_create_on_node+0x250/0x250 + ---[ end trace 675220a11e30f4f2 ]--- + +nfs41_callback_svc does most of its work while in TASK_INTERRUPTIBLE, +which is just wrong. Fix that by finishing the wait immediately if we've +found that the list has something on it. + +Also, we don't expect this kthread to accept signals, so we should be +using a TASK_UNINTERRUPTIBLE sleep instead. That however, opens us up +hung task warnings from the watchdog, so have the schedule_timeout +wake up every 60s if there's no callback activity. + +Reported-by: "J. Bruce Fields" +Signed-off-by: Jeff Layton +Signed-off-by: Trond Myklebust +Signed-off-by: Greg Kroah-Hartman + +--- + fs/nfs/callback.c | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +--- a/fs/nfs/callback.c ++++ b/fs/nfs/callback.c +@@ -128,22 +128,24 @@ nfs41_callback_svc(void *vrqstp) + if (try_to_freeze()) + continue; + +- prepare_to_wait(&serv->sv_cb_waitq, &wq, TASK_INTERRUPTIBLE); ++ prepare_to_wait(&serv->sv_cb_waitq, &wq, TASK_UNINTERRUPTIBLE); + spin_lock_bh(&serv->sv_cb_lock); + if (!list_empty(&serv->sv_cb_list)) { + req = list_first_entry(&serv->sv_cb_list, + struct rpc_rqst, rq_bc_list); + list_del(&req->rq_bc_list); + spin_unlock_bh(&serv->sv_cb_lock); ++ finish_wait(&serv->sv_cb_waitq, &wq); + dprintk("Invoking bc_svc_process()\n"); + error = bc_svc_process(serv, req, rqstp); + dprintk("bc_svc_process() returned w/ error code= %d\n", + error); + } else { + spin_unlock_bh(&serv->sv_cb_lock); +- schedule(); ++ /* schedule_timeout to game the hung task watchdog */ ++ schedule_timeout(60 * HZ); ++ finish_wait(&serv->sv_cb_waitq, &wq); + } +- finish_wait(&serv->sv_cb_waitq, &wq); + } + return 0; + } diff --git a/queue-3.10/series b/queue-3.10/series index 0cbf23259d4..159794579bb 100644 --- a/queue-3.10/series +++ b/queue-3.10/series @@ -15,3 +15,6 @@ lmedm04-fix-usb_submit_urb-bogus-urb-xfer-pipe-1-type-3-in-interrupt-urb.patch alsa-off-by-one-bug-in-snd_riptide_joystick_probe.patch alsa-hdspm-constrain-periods-to-2-on-older-cards.patch power_supply-88pm860x-fix-leaked-power-supply-on-probe-fail.patch +mmc-sdhci-pxav3-fix-setting-of-pdata-clk_delay_cycles.patch +nfs-don-t-call-blocking-operations-while-task_running.patch +mips-kvm-deliver-guest-interrupts-after-local_irq_disable.patch