rebase patches on top of Ubuntu-4.15.0-52.56
(generated with debian/scripts/import-upstream-tag) Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
		
							parent
							
								
									1f08d6d78b
								
							
						
					
					
						commit
						71090250db
					
				@ -1,8 +1,8 @@
 | 
				
			|||||||
From d3e6d6d3a4704bb590b07e54fb831d014cf77ef7 Mon Sep 17 00:00:00 2001
 | 
					From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 | 
				
			||||||
From: Mao Wenan <maowenan@huawei.com>
 | 
					From: Mao Wenan <maowenan@huawei.com>
 | 
				
			||||||
Date: Thu, 28 Mar 2019 17:10:56 +0800
 | 
					Date: Thu, 28 Mar 2019 17:10:56 +0800
 | 
				
			||||||
Subject: [PATCH 1/1] net: rds: force to destroy connection if t_sock is NULL
 | 
					Subject: [PATCH] net: rds: force to destroy connection if t_sock is NULL in
 | 
				
			||||||
 in rds_tcp_kill_sock().
 | 
					 rds_tcp_kill_sock().
 | 
				
			||||||
 | 
					
 | 
				
			||||||
When it is to cleanup net namespace, rds_tcp_exit_net() will call
 | 
					When it is to cleanup net namespace, rds_tcp_exit_net() will call
 | 
				
			||||||
rds_tcp_kill_sock(), if t_sock is NULL, it will not call
 | 
					rds_tcp_kill_sock(), if t_sock is NULL, it will not call
 | 
				
			||||||
@ -142,6 +142,3 @@ index 4df21e47d2ab..0a31fa6ef752 100644
 | 
				
			|||||||
 			continue;
 | 
					 			continue;
 | 
				
			||||||
 		if (!list_has_conn(&tmp_list, tc->t_cpath->cp_conn)) {
 | 
					 		if (!list_has_conn(&tmp_list, tc->t_cpath->cp_conn)) {
 | 
				
			||||||
 			list_move_tail(&tc->t_tcp_node, &tmp_list);
 | 
					 			list_move_tail(&tc->t_tcp_node, &tmp_list);
 | 
				
			||||||
-- 
 | 
					 | 
				
			||||||
2.20.1
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
 | 
				
			|||||||
@ -49,10 +49,10 @@ index bf348fee4bd5..38e50b40db5a 100644
 | 
				
			|||||||
        free_nested(vmx);
 | 
					        free_nested(vmx);
 | 
				
			||||||
        vcpu_put(vcpu);
 | 
					        vcpu_put(vcpu);
 | 
				
			||||||
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
 | 
					diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
 | 
				
			||||||
index ac17f53812af..c578a90f1128 100644
 | 
					index 1154795459de..3bf992a56e56 100644
 | 
				
			||||||
--- a/arch/x86/kvm/x86.c
 | 
					--- a/arch/x86/kvm/x86.c
 | 
				
			||||||
+++ b/arch/x86/kvm/x86.c
 | 
					+++ b/arch/x86/kvm/x86.c
 | 
				
			||||||
@@ -7949,16 +7949,12 @@ struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm,
 | 
					@@ -7951,16 +7951,12 @@ struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm,
 | 
				
			||||||
 
 | 
					 
 | 
				
			||||||
 int kvm_arch_vcpu_setup(struct kvm_vcpu *vcpu)
 | 
					 int kvm_arch_vcpu_setup(struct kvm_vcpu *vcpu)
 | 
				
			||||||
 {
 | 
					 {
 | 
				
			||||||
@ -71,7 +71,7 @@ index ac17f53812af..c578a90f1128 100644
 | 
				
			|||||||
 }
 | 
					 }
 | 
				
			||||||
 
 | 
					 
 | 
				
			||||||
 void kvm_arch_vcpu_postcreate(struct kvm_vcpu *vcpu)
 | 
					 void kvm_arch_vcpu_postcreate(struct kvm_vcpu *vcpu)
 | 
				
			||||||
@@ -7968,13 +7964,15 @@ void kvm_arch_vcpu_postcreate(struct kvm_vcpu *vcpu)
 | 
					@@ -7970,13 +7966,15 @@ void kvm_arch_vcpu_postcreate(struct kvm_vcpu *vcpu)
 | 
				
			||||||
 
 | 
					 
 | 
				
			||||||
 	kvm_hv_vcpu_postcreate(vcpu);
 | 
					 	kvm_hv_vcpu_postcreate(vcpu);
 | 
				
			||||||
 
 | 
					 
 | 
				
			||||||
@ -88,7 +88,7 @@ index ac17f53812af..c578a90f1128 100644
 | 
				
			|||||||
 
 | 
					 
 | 
				
			||||||
 	if (!kvmclock_periodic_sync)
 | 
					 	if (!kvmclock_periodic_sync)
 | 
				
			||||||
 		return;
 | 
					 		return;
 | 
				
			||||||
@@ -7985,11 +7983,9 @@ void kvm_arch_vcpu_postcreate(struct kvm_vcpu *vcpu)
 | 
					@@ -7987,11 +7985,9 @@ void kvm_arch_vcpu_postcreate(struct kvm_vcpu *vcpu)
 | 
				
			||||||
 
 | 
					 
 | 
				
			||||||
 void kvm_arch_vcpu_destroy(struct kvm_vcpu *vcpu)
 | 
					 void kvm_arch_vcpu_destroy(struct kvm_vcpu *vcpu)
 | 
				
			||||||
 {
 | 
					 {
 | 
				
			||||||
@ -101,7 +101,7 @@ index ac17f53812af..c578a90f1128 100644
 | 
				
			|||||||
 	kvm_mmu_unload(vcpu);
 | 
					 	kvm_mmu_unload(vcpu);
 | 
				
			||||||
 	vcpu_put(vcpu);
 | 
					 	vcpu_put(vcpu);
 | 
				
			||||||
 
 | 
					 
 | 
				
			||||||
@@ -8363,9 +8359,7 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned long type)
 | 
					@@ -8365,9 +8361,7 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned long type)
 | 
				
			||||||
 
 | 
					 
 | 
				
			||||||
 static void kvm_unload_vcpu_mmu(struct kvm_vcpu *vcpu)
 | 
					 static void kvm_unload_vcpu_mmu(struct kvm_vcpu *vcpu)
 | 
				
			||||||
 {
 | 
					 {
 | 
				
			||||||
@ -126,7 +126,7 @@ index c807eab9c1d3..6684da3f197f 100644
 | 
				
			|||||||
 
 | 
					 
 | 
				
			||||||
 #ifdef __KVM_HAVE_IOAPIC
 | 
					 #ifdef __KVM_HAVE_IOAPIC
 | 
				
			||||||
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
 | 
					diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
 | 
				
			||||||
index 238ddbc127e1..0d2eddfdf785 100644
 | 
					index d7a24fd29144..9cb73320866c 100644
 | 
				
			||||||
--- a/virt/kvm/kvm_main.c
 | 
					--- a/virt/kvm/kvm_main.c
 | 
				
			||||||
+++ b/virt/kvm/kvm_main.c
 | 
					+++ b/virt/kvm/kvm_main.c
 | 
				
			||||||
@@ -151,17 +151,12 @@ bool kvm_is_reserved_pfn(kvm_pfn_t pfn)
 | 
					@@ -151,17 +151,12 @@ bool kvm_is_reserved_pfn(kvm_pfn_t pfn)
 | 
				
			||||||
 | 
				
			|||||||
@ -19,10 +19,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 | 
				
			|||||||
 1 file changed, 1 insertion(+), 1 deletion(-)
 | 
					 1 file changed, 1 insertion(+), 1 deletion(-)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
 | 
					diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
 | 
				
			||||||
index c578a90f1128..e1f16d02e44f 100644
 | 
					index 3bf992a56e56..3d3d6d6548c3 100644
 | 
				
			||||||
--- a/arch/x86/kvm/x86.c
 | 
					--- a/arch/x86/kvm/x86.c
 | 
				
			||||||
+++ b/arch/x86/kvm/x86.c
 | 
					+++ b/arch/x86/kvm/x86.c
 | 
				
			||||||
@@ -7949,6 +7949,7 @@ struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm,
 | 
					@@ -7951,6 +7951,7 @@ struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm,
 | 
				
			||||||
 
 | 
					 
 | 
				
			||||||
 int kvm_arch_vcpu_setup(struct kvm_vcpu *vcpu)
 | 
					 int kvm_arch_vcpu_setup(struct kvm_vcpu *vcpu)
 | 
				
			||||||
 {
 | 
					 {
 | 
				
			||||||
@ -30,7 +30,7 @@ index c578a90f1128..e1f16d02e44f 100644
 | 
				
			|||||||
 	kvm_vcpu_mtrr_init(vcpu);
 | 
					 	kvm_vcpu_mtrr_init(vcpu);
 | 
				
			||||||
 	vcpu_load(vcpu);
 | 
					 	vcpu_load(vcpu);
 | 
				
			||||||
 	kvm_vcpu_reset(vcpu, false);
 | 
					 	kvm_vcpu_reset(vcpu, false);
 | 
				
			||||||
@@ -8050,7 +8051,6 @@ void kvm_vcpu_reset(struct kvm_vcpu *vcpu, bool init_event)
 | 
					@@ -8052,7 +8053,6 @@ void kvm_vcpu_reset(struct kvm_vcpu *vcpu, bool init_event)
 | 
				
			||||||
 		kvm_pmu_reset(vcpu);
 | 
					 		kvm_pmu_reset(vcpu);
 | 
				
			||||||
 		vcpu->arch.smbase = 0x30000;
 | 
					 		vcpu->arch.smbase = 0x30000;
 | 
				
			||||||
 
 | 
					 
 | 
				
			||||||
 | 
				
			|||||||
@ -95,10 +95,10 @@ index 38e50b40db5a..1911ec5e26c1 100644
 | 
				
			|||||||
 
 | 
					 
 | 
				
			||||||
 	/* 22.2.1, 20.8.1 */
 | 
					 	/* 22.2.1, 20.8.1 */
 | 
				
			||||||
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
 | 
					diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
 | 
				
			||||||
index e1f16d02e44f..bf76e7cd9837 100644
 | 
					index 3d3d6d6548c3..92a8b20b7103 100644
 | 
				
			||||||
--- a/arch/x86/kvm/x86.c
 | 
					--- a/arch/x86/kvm/x86.c
 | 
				
			||||||
+++ b/arch/x86/kvm/x86.c
 | 
					+++ b/arch/x86/kvm/x86.c
 | 
				
			||||||
@@ -2246,6 +2246,11 @@ int kvm_set_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info)
 | 
					@@ -2247,6 +2247,11 @@ int kvm_set_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info)
 | 
				
			||||||
 		if (msr_info->host_initiated)
 | 
					 		if (msr_info->host_initiated)
 | 
				
			||||||
 			vcpu->arch.microcode_version = data;
 | 
					 			vcpu->arch.microcode_version = data;
 | 
				
			||||||
 		break;
 | 
					 		break;
 | 
				
			||||||
@ -110,7 +110,7 @@ index e1f16d02e44f..bf76e7cd9837 100644
 | 
				
			|||||||
 	case MSR_EFER:
 | 
					 	case MSR_EFER:
 | 
				
			||||||
 		return set_efer(vcpu, data);
 | 
					 		return set_efer(vcpu, data);
 | 
				
			||||||
 	case MSR_K7_HWCR:
 | 
					 	case MSR_K7_HWCR:
 | 
				
			||||||
@@ -2541,6 +2546,12 @@ int kvm_get_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info)
 | 
					@@ -2543,6 +2548,12 @@ int kvm_get_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info)
 | 
				
			||||||
 	case MSR_IA32_UCODE_REV:
 | 
					 	case MSR_IA32_UCODE_REV:
 | 
				
			||||||
 		msr_info->data = vcpu->arch.microcode_version;
 | 
					 		msr_info->data = vcpu->arch.microcode_version;
 | 
				
			||||||
 		break;
 | 
					 		break;
 | 
				
			||||||
@ -123,7 +123,7 @@ index e1f16d02e44f..bf76e7cd9837 100644
 | 
				
			|||||||
 	case MSR_IA32_TSC:
 | 
					 	case MSR_IA32_TSC:
 | 
				
			||||||
 		msr_info->data = kvm_scale_tsc(vcpu, rdtsc()) + vcpu->arch.tsc_offset;
 | 
					 		msr_info->data = kvm_scale_tsc(vcpu, rdtsc()) + vcpu->arch.tsc_offset;
 | 
				
			||||||
 		break;
 | 
					 		break;
 | 
				
			||||||
@@ -7949,6 +7960,7 @@ struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm,
 | 
					@@ -7951,6 +7962,7 @@ struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm,
 | 
				
			||||||
 
 | 
					 
 | 
				
			||||||
 int kvm_arch_vcpu_setup(struct kvm_vcpu *vcpu)
 | 
					 int kvm_arch_vcpu_setup(struct kvm_vcpu *vcpu)
 | 
				
			||||||
 {
 | 
					 {
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user