3.14-stable patches

added patches:
	bcache-make-sure-to-pass-gfp_wait-to-mempool_alloc.patch
	kvm-nvmx-disable-unrestricted-mode-if-ept-0.patch

diff --git a/queue-3.14/bcache-make-sure-to-pass-gfp_wait-to-mempool_alloc.patch b/queue-3.14/bcache-make-sure-to-pass-gfp_wait-to-mempool_alloc.patch
new file mode 100644 (file)
index 0000000..4b49873
--- /dev/null
+++ b/queue-3.14/bcache-make-sure-to-pass-gfp_wait-to-mempool_alloc.patch
@@ -0,0 +1,32 @@
+From bcf090e0040e30f8409e6a535a01e6473afb096f Mon Sep 17 00:00:00 2001
+From: Kent Overstreet <kmo@daterainc.com>
+Date: Mon, 19 May 2014 08:57:55 -0700
+Subject: bcache: Make sure to pass GFP_WAIT to mempool_alloc()
+
+From: Kent Overstreet <kmo@daterainc.com>
+
+commit bcf090e0040e30f8409e6a535a01e6473afb096f upstream.
+
+this was very wrong - mempool_alloc() only guarantees success with GFP_WAIT.
+bcache uses GFP_NOWAIT in various other places where we have a fallback,
+circuits must've gotten crossed when writing this code or something.
+
+Signed-off-by: Kent Overstreet <kmo@daterainc.com>
+Cc: Gabriel de Perthuis <g2p.code@gmail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/md/bcache/btree.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/md/bcache/btree.c
++++ b/drivers/md/bcache/btree.c
+@@ -199,7 +199,7 @@ void bch_btree_node_read_done(struct btr
+       struct bset *i = btree_bset_first(b);
+       struct btree_iter *iter;
+ 
+-      iter = mempool_alloc(b->c->fill_iter, GFP_NOWAIT);
++      iter = mempool_alloc(b->c->fill_iter, GFP_NOIO);
+       iter->size = b->c->sb.bucket_size / b->c->sb.block_size;
+       iter->used = 0;
+ 

diff --git a/queue-3.14/kvm-nvmx-disable-unrestricted-mode-if-ept-0.patch b/queue-3.14/kvm-nvmx-disable-unrestricted-mode-if-ept-0.patch
new file mode 100644 (file)
index 0000000..f15b4e0
--- /dev/null
+++ b/queue-3.14/kvm-nvmx-disable-unrestricted-mode-if-ept-0.patch
@@ -0,0 +1,39 @@
+From 78051e3b7e35722ad3f31dd611f1b34770bddab8 Mon Sep 17 00:00:00 2001
+From: Bandan Das <bsd@redhat.com>
+Date: Sat, 6 Dec 2014 20:32:16 +0530
+Subject: KVM: nVMX: Disable unrestricted mode if ept=0
+
+From: Bandan Das <bsd@redhat.com>
+
+commit 78051e3b7e35722ad3f31dd611f1b34770bddab8 upstream.
+
+If L0 has disabled EPT, don't advertise unrestricted
+mode at all since it depends on EPT to run real mode code.
+
+Fixes: 92fbc7b195b824e201d9f06f2b93105f72384d65
+Reviewed-by: Jan Kiszka <jan.kiszka@siemens.com>
+Signed-off-by: Bandan Das <bsd@redhat.com>
+Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/x86/kvm/vmx.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/arch/x86/kvm/vmx.c
++++ b/arch/x86/kvm/vmx.c
+@@ -2320,12 +2320,12 @@ static __init void nested_vmx_setup_ctls
+       nested_vmx_secondary_ctls_low = 0;
+       nested_vmx_secondary_ctls_high &=
+               SECONDARY_EXEC_VIRTUALIZE_APIC_ACCESSES |
+-              SECONDARY_EXEC_UNRESTRICTED_GUEST |
+               SECONDARY_EXEC_WBINVD_EXITING;
+ 
+       if (enable_ept) {
+               /* nested EPT: emulate EPT also to L1 */
+-              nested_vmx_secondary_ctls_high |= SECONDARY_EXEC_ENABLE_EPT;
++              nested_vmx_secondary_ctls_high |= SECONDARY_EXEC_ENABLE_EPT |
++                      SECONDARY_EXEC_UNRESTRICTED_GUEST;
+               nested_vmx_ept_caps = VMX_EPT_PAGE_WALK_4_BIT |
+                        VMX_EPTP_WB_BIT | VMX_EPT_2MB_PAGE_BIT |
+                        VMX_EPT_INVEPT_BIT;

diff --git a/queue-3.14/series b/queue-3.14/series
index 29a8ce19a2e70b611c65261a28a96d3803f57ec1..833c18f54bfdb11c176163607d63c6836bce403f 100644 (file)
--- a/queue-3.14/series
+++ b/queue-3.14/series
@@ -88,3 +88,5 @@ iser-target-parallelize-cm-connection-establishment.patch
 iser-target-fix-connected_handler-teardown-flow-race.patch
 iser-target-handle-addr_change-event-for-listener-cm_id.patch
 iser-target-fix-implicit-termination-of-connections.patch
+bcache-make-sure-to-pass-gfp_wait-to-mempool_alloc.patch
+kvm-nvmx-disable-unrestricted-mode-if-ept-0.patch