Merge ~vicamo/ubuntu/+source/backport-iwlwifi-dkms/+git/backport-iwlwifi-dkms:bug-1855825/address-interface-change-in-linux-skbuff.h/eoan into ~vicamo/ubuntu/+source/backport-iwlwifi-dkms/+git/backport-iwlwifi-dkms:ubuntu/eoan

[You-Sheng Yang]

[You-Sheng Yang (vicamo)]

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 565258d..577b3f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+backport-iwlwifi-dkms (7906-0ubuntu3) eoan; urgency=critical
+
+  * debian/patches/0006-backport-address-interface-change-in-linux-skbuff.h-.patch
+    - Fix system hang on connecting to WiFi base station. (LP: #1855825)
+
+ -- You-Sheng Yang <[e-mail]>  Wed, 11 Dec 2019 16:20:39 +0800
+
 backport-iwlwifi-dkms (7906-0ubuntu2~19.10.1) eoan; urgency=low
 
   * debian/patches/0006-NOUPSTREAM-backport-rename-ktime_get_boot_ns-for-v5..patch
diff --git a/debian/patches/0006-backport-address-interface-change-in-linux-skbuff.h-.patch b/debian/patches/0006-backport-address-interface-change-in-linux-skbuff.h-.patch
new file mode 100644
index 0000000..a3427d4
--- /dev/null
+++ b/debian/patches/0006-backport-address-interface-change-in-linux-skbuff.h-.patch
@@ -0,0 +1,103 @@
+From b13b11f8c71e4ca320a38185dbfba59bfc08e15e Mon Sep 17 00:00:00 2001
+From: You-Sheng Yang <[e-mail]>
+Date: Tue, 10 Dec 2019 17:35:29 +0800
+Subject: [PATCH] backport: address interface change in linux/skbuff.h since
+ 5.3.10
+
+Commit 9d0b402125a6 ("net/flow_dissector: switch to siphash") introduces
+interface changes for skb_get_hash_perturb() and struct
+fq_codel_sched_data. Since this DKMS package carries its own version of
+backported definitions of aforementioned data types, it results in
+abnormal behavior and in some cases it simply hang the whole system
+while connecting to WiFi base stations.
+
+This change synchronizes changed data types while maintaining the
+compatibility to previous releases.
+
+Closes: vicamo/backport-iwlwifi-dkms#7
+Signed-off-by: You-Sheng Yang <[e-mail]>
+---
+ include/net/fq.h      | 15 +++++++++++++++
+ include/net/fq_impl.h | 30 ++++++++++++++++++++++++++++++
+ 2 files changed, 45 insertions(+)
+
+diff --git a/include/net/fq.h b/include/net/fq.h
+index ac944a686..76e4446be 100644
+--- a/include/net/fq.h
++++ b/include/net/fq.h
+@@ -70,7 +70,22 @@ struct fq {
+ 	struct list_head backlogs;
+ 	spinlock_t lock;
+ 	u32 flows_cnt;
++#if LINUX_VERSION_IS_GEQ(5,3,10) || \
++	LINUX_VERSION_IN_RANGE(4,19,83,5,0,0) || \
++	LINUX_VERSION_IN_RANGE(4,14,153,4,15,0) || \
++	LINUX_VERSION_IN_RANGE(4,9,200,4,10,0) || \
++	LINUX_VERSION_IN_RANGE(4,4,200,4,5,0) || \
++	(UTS_UBUNTU_RELEASE_ABI && \
++		(((LINUX_VERSION_CODE == KERNEL_VERSION(5,0,21)) && \
++		  (((UTS_UBUNTU_RELEASE_ABI >= 38) && (UTS_UBUNTU_RELEASE_ABI < 1000)) || \
++		   (UTS_UBUNTU_RELEASE_ABI >= 1032))) || \
++		 ((LINUX_VERSION_CODE == KERNEL_VERSION(4,15,18)) && \
++		  (((UTS_UBUNTU_RELEASE_ABI >= 73) && (UTS_UBUNTU_RELEASE_ABI < 1000)) || \
++		   (UTS_UBUNTU_RELEASE_ABI >= 1066)))))
++	siphash_key_t perturbation;
++#else
+ 	u32 perturbation;
++#endif
+ 	u32 limit;
+ 	u32 memory_limit;
+ 	u32 memory_usage;
+diff --git a/include/net/fq_impl.h b/include/net/fq_impl.h
+index be7c0fab3..3d4e8f45b 100644
+--- a/include/net/fq_impl.h
++++ b/include/net/fq_impl.h
+@@ -118,7 +118,22 @@ static struct fq_flow *fq_flow_classify(struct fq *fq,
+ 
+ 	lockdep_assert_held(&fq->lock);
+ 
++#if LINUX_VERSION_IS_GEQ(5,3,10) || \
++	LINUX_VERSION_IN_RANGE(4,19,83,5,0,0) || \
++	LINUX_VERSION_IN_RANGE(4,14,153,4,15,0) || \
++	LINUX_VERSION_IN_RANGE(4,9,200,4,10,0) || \
++	LINUX_VERSION_IN_RANGE(4,4,200,4,5,0) || \
++	(UTS_UBUNTU_RELEASE_ABI && \
++		(((LINUX_VERSION_CODE == KERNEL_VERSION(5,0,21)) && \
++		  (((UTS_UBUNTU_RELEASE_ABI >= 38) && (UTS_UBUNTU_RELEASE_ABI < 1000)) || \
++		   (UTS_UBUNTU_RELEASE_ABI >= 1032))) || \
++		 ((LINUX_VERSION_CODE == KERNEL_VERSION(4,15,18)) && \
++		  (((UTS_UBUNTU_RELEASE_ABI >= 73) && (UTS_UBUNTU_RELEASE_ABI < 1000)) || \
++		   (UTS_UBUNTU_RELEASE_ABI >= 1066)))))
++	hash = skb_get_hash_perturb(skb, &fq->perturbation);
++#else
+ 	hash = skb_get_hash_perturb(skb, fq->perturbation);
++#endif
+ 	idx = reciprocal_scale(hash, fq->flows_cnt);
+ 	flow = &fq->flows[idx];
+ 
+@@ -307,7 +322,22 @@ static int fq_init(struct fq *fq, int flows_cnt)
+ 	INIT_LIST_HEAD(&fq->backlogs);
+ 	spin_lock_init(&fq->lock);
+ 	fq->flows_cnt = max_t(u32, flows_cnt, 1);
++#if LINUX_VERSION_IS_GEQ(5,3,10) || \
++	LINUX_VERSION_IN_RANGE(4,19,83,5,0,0) || \
++	LINUX_VERSION_IN_RANGE(4,14,153,4,15,0) || \
++	LINUX_VERSION_IN_RANGE(4,9,200,4,10,0) || \
++	LINUX_VERSION_IN_RANGE(4,4,200,4,5,0) || \
++	(UTS_UBUNTU_RELEASE_ABI && \
++		(((LINUX_VERSION_CODE == KERNEL_VERSION(5,0,21)) && \
++		  (((UTS_UBUNTU_RELEASE_ABI >= 38) && (UTS_UBUNTU_RELEASE_ABI < 1000)) || \
++		   (UTS_UBUNTU_RELEASE_ABI >= 1032))) || \
++		 ((LINUX_VERSION_CODE == KERNEL_VERSION(4,15,18)) && \
++		  (((UTS_UBUNTU_RELEASE_ABI >= 73) && (UTS_UBUNTU_RELEASE_ABI < 1000)) || \
++		   (UTS_UBUNTU_RELEASE_ABI >= 1066)))))
++	get_random_bytes(&fq->perturbation, sizeof(fq->perturbation));
++#else
+ 	fq->perturbation = prandom_u32();
++#endif
+ 	fq->quantum = 300;
+ 	fq->limit = 8192;
+ 	fq->memory_limit = 16 << 20; /* 16 MBytes */
+-- 
+2.24.0
+
diff --git a/debian/patches/series b/debian/patches/series
index c03ca2f..7d5bfad 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
 0004-backport-fix-build-for-v5.2-kernel.patch
 0005-Makefile.kernel-pass-fno-stack-clash-protection-and-.patch
 0006-NOUPSTREAM-backport-rename-ktime_get_boot_ns-for-v5..patch
+0006-backport-address-interface-change-in-linux-skbuff.h-.patch