* [PATCH 01/10] compat: only define thermal backports if CONFIG_THERMAL is enabled
2018-02-18 13:24 [PATCH 00/10] backport: updates for v4.16 Luca Coelho
@ 2018-02-18 13:24 ` Luca Coelho
2018-02-18 13:24 ` [PATCH 02/10] backport: add pcie_find_root_port() Luca Coelho
` (10 subsequent siblings)
11 siblings, 0 replies; 18+ messages in thread
From: Luca Coelho @ 2018-02-18 13:24 UTC (permalink / raw)
To: backports; +Cc: Luca Coelho
From: Luca Coelho <luciano.coelho@intel.com>
If CONFIG_THERMAL is not enabled, we don't have to add all backports
for the thermal framework. Actually this doesn't even work because we
try to use thermal_zone_device_register/unregister and they are not
present in the outer kernel, causing undefined symbols warnings:
WARNING: "thermal_zone_device_register" [/home/luca/iwlwifi/stack-dev/compat/compat.ko] undefined!
WARNING: "thermal_zone_device_unregister" [/home/luca/iwlwifi/stack-dev/compat/compat.ko] undefined!
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
---
backport/backport-include/linux/thermal.h | 2 ++
backport/compat/backport-4.3.c | 2 ++
2 files changed, 4 insertions(+)
diff --git a/backport/backport-include/linux/thermal.h b/backport/backport-include/linux/thermal.h
index 108a8cfee44f..8874e196264d 100644
--- a/backport/backport-include/linux/thermal.h
+++ b/backport/backport-include/linux/thermal.h
@@ -3,6 +3,7 @@
#include_next <linux/thermal.h>
#include <linux/version.h>
+#ifdef CONFIG_THERMAL
#if LINUX_VERSION_IS_LESS(3,8,0)
#include <linux/errno.h>
@@ -110,5 +111,6 @@ void backport_thermal_zone_device_unregister(struct thermal_zone_device *);
#endif /* LINUX_VERSION_IS_LESS(4,3,0) */
#endif /* ! < 3.8.0 */
+#endif /* CONFIG_THERMAL */
#endif /* __BACKPORT_LINUX_THERMAL_H */
diff --git a/backport/compat/backport-4.3.c b/backport/compat/backport-4.3.c
index 2d8a5e5b19aa..88be5720209b 100644
--- a/backport/compat/backport-4.3.c
+++ b/backport/compat/backport-4.3.c
@@ -16,6 +16,7 @@
#include <linux/thermal.h>
#include <linux/slab.h>
+#ifdef CONFIG_THERMAL
#if LINUX_VERSION_IS_GEQ(3,8,0)
struct backport_thermal_ops_wrapper {
old_thermal_zone_device_ops_t ops;
@@ -171,6 +172,7 @@ void backport_thermal_zone_device_unregister(struct thermal_zone_device *dev)
EXPORT_SYMBOL_GPL(backport_thermal_zone_device_unregister);
#endif /* >= 3.8.0 */
+#endif /* CONFIG_THERMAL */
static void seq_set_overflow(struct seq_file *m)
{
--
2.15.1
--
To unsubscribe from this list: send the line "unsubscribe backports" in
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH 02/10] backport: add pcie_find_root_port()
2018-02-18 13:24 [PATCH 00/10] backport: updates for v4.16 Luca Coelho
2018-02-18 13:24 ` [PATCH 01/10] compat: only define thermal backports if CONFIG_THERMAL is enabled Luca Coelho
@ 2018-02-18 13:24 ` Luca Coelho
2018-02-18 13:24 ` [PATCH 03/10] backport: include lib/bucket_locks.c Luca Coelho
` (9 subsequent siblings)
11 siblings, 0 replies; 18+ messages in thread
From: Luca Coelho @ 2018-02-18 13:24 UTC (permalink / raw)
To: backports; +Cc: Luca Coelho
From: Luca Coelho <luciano.coelho@intel.com>
This function was introduced in v4.9 and added to 3.12.69, 4.4.37 and
4.8.13.
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
---
backport/backport-include/linux/pci.h | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/backport/backport-include/linux/pci.h b/backport/backport-include/linux/pci.h
index 81c2d57a3454..67ac40fcbf58 100644
--- a/backport/backport-include/linux/pci.h
+++ b/backport/backport-include/linux/pci.h
@@ -184,4 +184,25 @@ static inline int pci_enable_msix_exact(struct pci_dev *dev,
#endif
#endif /* CONFIG_PCI */
+#if LINUX_VERSION_IS_LESS(4,9,0) && \
+ !LINUX_VERSION_IN_RANGE(3,12,69, 3,13,0) && \
+ !LINUX_VERSION_IN_RANGE(4,4,37, 4,5,0) && \
+ !LINUX_VERSION_IN_RANGE(4,8,13, 4,9,0)
+
+static inline struct pci_dev *pcie_find_root_port(struct pci_dev *dev)
+{
+ while (1) {
+ if (!pci_is_pcie(dev))
+ break;
+ if (pci_pcie_type(dev) == PCI_EXP_TYPE_ROOT_PORT)
+ return dev;
+ if (!dev->bus->self)
+ break;
+ dev = dev->bus->self;
+ }
+ return NULL;
+}
+
+#endif/* <4.9.0 but not >= 3.12.69, 4.4.37, 4.8.13 */
+
#endif /* _BACKPORT_LINUX_PCI_H */
--
2.15.1
--
To unsubscribe from this list: send the line "unsubscribe backports" in
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH 03/10] backport: include lib/bucket_locks.c
2018-02-18 13:24 [PATCH 00/10] backport: updates for v4.16 Luca Coelho
2018-02-18 13:24 ` [PATCH 01/10] compat: only define thermal backports if CONFIG_THERMAL is enabled Luca Coelho
2018-02-18 13:24 ` [PATCH 02/10] backport: add pcie_find_root_port() Luca Coelho
@ 2018-02-18 13:24 ` Luca Coelho
2018-02-18 13:24 ` [PATCH 04/10] backport: update genl_dump_check_consistent() backport Luca Coelho
` (8 subsequent siblings)
11 siblings, 0 replies; 18+ messages in thread
From: Luca Coelho @ 2018-02-18 13:24 UTC (permalink / raw)
To: backports; +Cc: Luca Coelho
From: Luca Coelho <luciano.coelho@intel.com>
The alloc/free_bucket_spinlocks() functions were moved to a new lib
file, namely bucket_locks.c. Add an auto-backport for the
bucket_locks.c file and move the patching of the code that moved from
rhashtable to bucket_locks.c.
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
---
backport/backport-include/linux/spinlock.h | 13 +++++++++++++
backport/compat/Kconfig | 7 +++++++
patches/lib-bucket_locks.patch | 29 +++++++++++++++++++++++++++++
patches/lib-rhashtable.patch | 27 ---------------------------
4 files changed, 49 insertions(+), 27 deletions(-)
create mode 100644 backport/backport-include/linux/spinlock.h
create mode 100644 patches/lib-bucket_locks.patch
diff --git a/backport/backport-include/linux/spinlock.h b/backport/backport-include/linux/spinlock.h
new file mode 100644
index 000000000000..07daa358e25d
--- /dev/null
+++ b/backport/backport-include/linux/spinlock.h
@@ -0,0 +1,13 @@
+#ifndef __BACKPORT_SPINLOCK_H
+#define __BACKPORT_SPINLOCK_H
+#include_next <linux/spinlock.h>
+
+#if LINUX_VERSION_IS_LESS(4,16,0)
+int alloc_bucket_spinlocks(spinlock_t **locks, unsigned int *lock_mask,
+ size_t max_size, unsigned int cpu_mult,
+ gfp_t gfp);
+
+void free_bucket_spinlocks(spinlock_t *locks);
+#endif /* LINUX_VERSION_IS_LESS(4,16,0) */
+
+#endif /* __BACKPORT_SPINLOCK_H */
diff --git a/backport/compat/Kconfig b/backport/compat/Kconfig
index 492efbfc7d9f..d73e9a9e17b7 100644
--- a/backport/compat/Kconfig
+++ b/backport/compat/Kconfig
@@ -132,6 +132,13 @@ config BPAUTO_RHASHTABLE
#h-file linux/rhashtable.h
#c-file lib/rhashtable.c
+config BPAUTO_BUCKET_LOCKS
+ bool
+ # the API of bucket_locks that we need was introduced in version 4.16
+ depends on KERNEL_4_16
+ default y if BPAUTO_RHASHTABLE
+ #c-file lib/bucket_locks.c
+
config BPAUTO_BUILD_HDMI
bool
# the hdmi driver got some new apis like hdmi_infoframe_unpack() in
diff --git a/patches/lib-bucket_locks.patch b/patches/lib-bucket_locks.patch
new file mode 100644
index 000000000000..df7420de06fc
--- /dev/null
+++ b/patches/lib-bucket_locks.patch
@@ -0,0 +1,29 @@
+diff --git a/compat/lib-bucket_locks.c b/compat/lib-bucket_locks.c
+index 266a97c5708b..405b52ca5708 100644
+--- a/compat/lib-bucket_locks.c
++++ b/compat/lib-bucket_locks.c
+@@ -30,10 +30,24 @@ int alloc_bucket_spinlocks(spinlock_t **locks, unsigned int *locks_mask,
+ }
+
+ if (sizeof(spinlock_t) != 0) {
++#if LINUX_VERSION_IS_LESS(4,12,0)
++#ifdef CONFIG_NUMA
++ if (size * sizeof(spinlock_t) > PAGE_SIZE &&
++ gfp == GFP_KERNEL)
++ tlocks = vmalloc(size * sizeof(spinlock_t));
++#endif
++ if (gfp != GFP_KERNEL)
++ gfp |= __GFP_NOWARN | __GFP_NORETRY;
++
++ if (!tlocks)
++ tlocks = kmalloc_array(size, sizeof(spinlock_t),
++ gfp);
++#else
+ if (gfpflags_allow_blocking(gfp))
+ tlocks = kvmalloc(size * sizeof(spinlock_t), gfp);
+ else
+ tlocks = kmalloc_array(size, sizeof(spinlock_t), gfp);
++#endif
+ if (!tlocks)
+ return -ENOMEM;
+ for (i = 0; i < size; i++)
diff --git a/patches/lib-rhashtable.patch b/patches/lib-rhashtable.patch
index 59d870c0ef42..d29169f4570b 100644
--- a/patches/lib-rhashtable.patch
+++ b/patches/lib-rhashtable.patch
@@ -1,33 +1,6 @@
--- a/compat/lib-rhashtable.c
+++ b/compat/lib-rhashtable.c
-@@ -86,11 +86,26 @@ static int alloc_bucket_locks(struct rha
- size = min(size, 1U << tbl->nest);
-
- if (sizeof(spinlock_t) != 0) {
-+#if LINUX_VERSION_IS_LESS(4,12,0)
-+ tbl->locks = NULL;
-+#ifdef CONFIG_NUMA
-+ if (size * sizeof(spinlock_t) > PAGE_SIZE &&
-+ gfp == GFP_KERNEL)
-+ tbl->locks = vmalloc(size * sizeof(spinlock_t));
-+#endif
-+ if (gfp != GFP_KERNEL)
-+ gfp |= __GFP_NOWARN | __GFP_NORETRY;
-+
-+ if (!tbl->locks)
-+ tbl->locks = kmalloc_array(size, sizeof(spinlock_t),
-+ gfp);
-+#else
- if (gfpflags_allow_blocking(gfp))
- tbl->locks = kvmalloc(size * sizeof(spinlock_t), gfp);
- else
- tbl->locks = kmalloc_array(size, sizeof(spinlock_t),
- gfp);
-+#endif
- if (!tbl->locks)
- return -ENOMEM;
- for (i = 0; i < size; i++)
@@ -211,10 +226,11 @@ static struct bucket_table *bucket_table
int i;
--
2.15.1
--
To unsubscribe from this list: send the line "unsubscribe backports" in
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH 04/10] backport: update genl_dump_check_consistent() backport
2018-02-18 13:24 [PATCH 00/10] backport: updates for v4.16 Luca Coelho
` (2 preceding siblings ...)
2018-02-18 13:24 ` [PATCH 03/10] backport: include lib/bucket_locks.c Luca Coelho
@ 2018-02-18 13:24 ` Luca Coelho
2018-02-18 13:24 ` [PATCH 05/10] backport: remove pkcs7_verify.c patch hunk Luca Coelho
` (7 subsequent siblings)
11 siblings, 0 replies; 18+ messages in thread
From: Luca Coelho @ 2018-02-18 13:24 UTC (permalink / raw)
To: backports; +Cc: Luca Coelho
From: Luca Coelho <luciano.coelho@intel.com>
The genl_dump_check_consistent() function was changed in v4.15 to use
only two arguments. The family is not needed anymore, because we were
erroneously subtracting the header size and that was fixed in v4.15.
Since the family was only used to check the header size, we can create
a dummy with hdrsize = 0, which will allow us to call the old version
of the function. There is a good side-effect to doing this: the bug
is going to be fixed, because with hdrsize = 0 we will not subtract
anything and it will have the same effect as the fix.
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
---
backport/backport-include/net/genetlink.h | 23 ++++++++++++++++++-----
1 file changed, 18 insertions(+), 5 deletions(-)
diff --git a/backport/backport-include/net/genetlink.h b/backport/backport-include/net/genetlink.h
index f620b99da280..dfbacbf40723 100644
--- a/backport/backport-include/net/genetlink.h
+++ b/backport/backport-include/net/genetlink.h
@@ -56,9 +56,25 @@ static inline void *genl_info_userhdr(struct genl_info *info)
#endif
#if LINUX_VERSION_IS_LESS(3,1,0)
-#define genl_dump_check_consistent(cb, user_hdr, family)
+#define genl_dump_check_consistent(cb, user_hdr)
#endif
+#if LINUX_VERSION_IS_LESS(4,15,0)
+#ifndef genl_dump_check_consistent
+static inline
+void backport_genl_dump_check_consistent(struct netlink_callback *cb,
+ void *user_hdr)
+{
+ struct genl_family dummy_family = {
+ .hdrsize = 0,
+ };
+
+ genl_dump_check_consistent(cb, user_hdr, &dummy_family);
+}
+#define genl_dump_check_consistent LINUX_BACKPORT(genl_dump_check_consistent)
+#endif
+#endif /* LINUX_VERSION_IS_LESS(4,15,0) */
+
#if LINUX_VERSION_IS_LESS(3,13,0) && RHEL_RELEASE_CODE < RHEL_RELEASE_VERSION(7,0)
static inline int __real_genl_register_family(struct genl_family *family)
{
@@ -139,10 +155,7 @@ extern void genl_notify(struct sk_buff *skb, struct net *net, u32 pid,
genlmsg_put(_skb, _pid, _seq, &(_fam)->family, _flags, _cmd)
#define genlmsg_nlhdr(_hdr, _fam) \
genlmsg_nlhdr(_hdr, &(_fam)->family)
-#ifndef genl_dump_check_consistent
-#define genl_dump_check_consistent(_cb, _hdr, _fam) \
- genl_dump_check_consistent(_cb, _hdr, &(_fam)->family)
-#endif
+
#ifndef genlmsg_put_reply /* might already be there from _info override above */
#define genlmsg_put_reply(_skb, _info, _fam, _flags, _cmd) \
genlmsg_put_reply(_skb, _info, &(_fam)->family, _flags, _cmd)
--
2.15.1
--
To unsubscribe from this list: send the line "unsubscribe backports" in
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH 05/10] backport: remove pkcs7_verify.c patch hunk
2018-02-18 13:24 [PATCH 00/10] backport: updates for v4.16 Luca Coelho
` (3 preceding siblings ...)
2018-02-18 13:24 ` [PATCH 04/10] backport: update genl_dump_check_consistent() backport Luca Coelho
@ 2018-02-18 13:24 ` Luca Coelho
2018-02-18 13:24 ` [PATCH 06/10] backport: add new build_bug.h file Luca Coelho
` (6 subsequent siblings)
11 siblings, 0 replies; 18+ messages in thread
From: Luca Coelho @ 2018-02-18 13:24 UTC (permalink / raw)
To: backports; +Cc: Luca Coelho
From: Luca Coelho <luciano.coelho@intel.com>
The change that used to be patched into the pkcs7_verify.c file is now
part of newer kernels, so we don't need to patch it anymore. Remove
this hunk from verify.patch accordingly.
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
---
patches/verify.patch | 11 -----------
1 file changed, 11 deletions(-)
diff --git a/patches/verify.patch b/patches/verify.patch
index 0fda8411e43a..442f2f622351 100644
--- a/patches/verify.patch
+++ b/patches/verify.patch
@@ -62,14 +62,3 @@
struct x509_certificate {
struct x509_certificate *next;
struct x509_certificate *signer; /* Certificate that signed this one */
---- a/compat/verification/pkcs7_verify.c
-+++ b/compat/verification/pkcs7_verify.c
-@@ -150,7 +150,7 @@
- pr_devel("Sig %u: Found cert serial match X.509[%u]\n",
- sinfo->index, certix);
-
-- if (x509->pub->pkey_algo != sinfo->sig->pkey_algo) {
-+ if (strcmp(x509->pub->pkey_algo, sinfo->sig->pkey_algo)) {
- pr_warn("Sig %u: X.509 algo and PKCS#7 sig algo don't match\n",
- sinfo->index);
- continue;
--
2.15.1
--
To unsubscribe from this list: send the line "unsubscribe backports" in
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH 06/10] backport: add new build_bug.h file
2018-02-18 13:24 [PATCH 00/10] backport: updates for v4.16 Luca Coelho
` (4 preceding siblings ...)
2018-02-18 13:24 ` [PATCH 05/10] backport: remove pkcs7_verify.c patch hunk Luca Coelho
@ 2018-02-18 13:24 ` Luca Coelho
2018-02-18 13:24 ` [PATCH 07/10] backports: fix typo "TIMKEEPING" and fix gfp.h Luca Coelho
` (5 subsequent siblings)
11 siblings, 0 replies; 18+ messages in thread
From: Luca Coelho @ 2018-02-18 13:24 UTC (permalink / raw)
To: backports; +Cc: Luca Coelho
From: Luca Coelho <luciano.coelho@intel.com>
Some of the code in bug.h was moved into a new build_bug.h file. Add
a backport that includes bug.h in the case of older kernels.
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
---
backport/backport-include/linux/build_bug.h | 10 ++++++++++
1 file changed, 10 insertions(+)
create mode 100644 backport/backport-include/linux/build_bug.h
diff --git a/backport/backport-include/linux/build_bug.h b/backport/backport-include/linux/build_bug.h
new file mode 100644
index 000000000000..13ee5d6a277a
--- /dev/null
+++ b/backport/backport-include/linux/build_bug.h
@@ -0,0 +1,10 @@
+#ifndef __BP_BUILD_BUG_H
+#define __BP_BUILD_BUG_H
+
+#if LINUX_VERSION_IS_GEQ(4,13,0)
+#include_next <linux/build_bug.h>
+#else /* LINUX_VERSION_IS_GEQ(4,13,0) */
+#include <linux/bug.h>
+#endif /* LINUX_VERSION_IS_GEQ(4,13,0) */
+
+#endif /* __BP_BUILD_BUG_H */
--
2.15.1
--
To unsubscribe from this list: send the line "unsubscribe backports" in
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH 07/10] backports: fix typo "TIMKEEPING" and fix gfp.h
2018-02-18 13:24 [PATCH 00/10] backport: updates for v4.16 Luca Coelho
` (5 preceding siblings ...)
2018-02-18 13:24 ` [PATCH 06/10] backport: add new build_bug.h file Luca Coelho
@ 2018-02-18 13:24 ` Luca Coelho
2018-02-18 13:24 ` [PATCH 08/10] backport: remove stddef.h inclusions Luca Coelho
` (4 subsequent siblings)
11 siblings, 0 replies; 18+ messages in thread
From: Luca Coelho @ 2018-02-18 13:24 UTC (permalink / raw)
To: backports; +Cc: Luca Coelho
From: Luca Coelho <luciano.coelho@intel.com>
There is a typo in the timekeeping.h backport, fix that.
Additionally, fix the gfp.h file tha has a copy/paste issue where
__BACKPORT_TIMKEEPING_H is used instead of __BACKPORT_LINUX_GFP_H.
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
---
backport/backport-include/linux/gfp.h | 2 +-
backport/backport-include/linux/timekeeping.h | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/backport/backport-include/linux/gfp.h b/backport/backport-include/linux/gfp.h
index b4db7bb9066e..42f818f1fee3 100644
--- a/backport/backport-include/linux/gfp.h
+++ b/backport/backport-include/linux/gfp.h
@@ -10,4 +10,4 @@
#define __GFP_KSWAPD_RECLAIM ((__force gfp_t)___GFP_KSWAPD_RECLAIM) /* kswapd can wake */
#endif
-#endif /* __BACKPORT_TIMKEEPING_H */
+#endif /* __BACKPORT_LINUX_GFP_H */
diff --git a/backport/backport-include/linux/timekeeping.h b/backport/backport-include/linux/timekeeping.h
index b683d1298336..0b9c649a3395 100644
--- a/backport/backport-include/linux/timekeeping.h
+++ b/backport/backport-include/linux/timekeeping.h
@@ -1,5 +1,5 @@
-#ifndef __BACKPORT_TIMKEEPING_H
-#define __BACKPORT_TIMKEEPING_H
+#ifndef __BACKPORT_TIMEKEEPING_H
+#define __BACKPORT_TIMEKEEPING_H
#include <linux/version.h>
#include <linux/types.h>
@@ -35,4 +35,4 @@ static inline time64_t ktime_get_seconds(void)
}
#endif
-#endif /* __BACKPORT_TIMKEEPING_H */
+#endif /* __BACKPORT_TIMEKEEPING_H */
--
2.15.1
--
To unsubscribe from this list: send the line "unsubscribe backports" in
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH 08/10] backport: remove stddef.h inclusions
2018-02-18 13:24 [PATCH 00/10] backport: updates for v4.16 Luca Coelho
` (6 preceding siblings ...)
2018-02-18 13:24 ` [PATCH 07/10] backports: fix typo "TIMKEEPING" and fix gfp.h Luca Coelho
@ 2018-02-18 13:24 ` Luca Coelho
2018-02-18 13:24 ` [PATCH 09/10] backport: increase max stack frame size compiler check to 1280 Luca Coelho
` (3 subsequent siblings)
11 siblings, 0 replies; 18+ messages in thread
From: Luca Coelho @ 2018-02-18 13:24 UTC (permalink / raw)
To: backports; +Cc: Luca Coelho
From: Luca Coelho <luciano.coelho@intel.com>
The verification code was copied from userspace code which includes
stddef.h. In the kernel, this header should not be included, so
remove those cases.
Fixes: 988e2af4b7a0 ("backports: add signature verification code")
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
---
backport/compat/verification/mbedtls/asn1.h | 2 --
backport/compat/verification/mbedtls/md.h | 2 --
backport/compat/verification/mbedtls/oid.h | 2 --
3 files changed, 6 deletions(-)
diff --git a/backport/compat/verification/mbedtls/asn1.h b/backport/compat/verification/mbedtls/asn1.h
index bc6b48b8d9ce..46eb214be942 100644
--- a/backport/compat/verification/mbedtls/asn1.h
+++ b/backport/compat/verification/mbedtls/asn1.h
@@ -31,8 +31,6 @@
#include MBEDTLS_CONFIG_FILE
#endif
-#include <stddef.h>
-
#if defined(MBEDTLS_BIGNUM_C)
#include "bignum.h"
#endif
diff --git a/backport/compat/verification/mbedtls/md.h b/backport/compat/verification/mbedtls/md.h
index 9385116c14e5..5342e4f54f59 100644
--- a/backport/compat/verification/mbedtls/md.h
+++ b/backport/compat/verification/mbedtls/md.h
@@ -27,8 +27,6 @@
#ifndef MBEDTLS_MD_H
#define MBEDTLS_MD_H
-#include <stddef.h>
-
#define MBEDTLS_ERR_MD_FEATURE_UNAVAILABLE -0x5080 /**< The selected feature is not available. */
#define MBEDTLS_ERR_MD_BAD_INPUT_DATA -0x5100 /**< Bad input parameters to function. */
#define MBEDTLS_ERR_MD_ALLOC_FAILED -0x5180 /**< Failed to allocate memory. */
diff --git a/backport/compat/verification/mbedtls/oid.h b/backport/compat/verification/mbedtls/oid.h
index 117ee47567bf..b2ff08879aea 100644
--- a/backport/compat/verification/mbedtls/oid.h
+++ b/backport/compat/verification/mbedtls/oid.h
@@ -34,8 +34,6 @@
#include "asn1.h"
#include "pk.h"
-#include <stddef.h>
-
#if defined(MBEDTLS_CIPHER_C)
#include "cipher.h"
#endif
--
2.15.1
--
To unsubscribe from this list: send the line "unsubscribe backports" in
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH 09/10] backport: increase max stack frame size compiler check to 1280
2018-02-18 13:24 [PATCH 00/10] backport: updates for v4.16 Luca Coelho
` (7 preceding siblings ...)
2018-02-18 13:24 ` [PATCH 08/10] backport: remove stddef.h inclusions Luca Coelho
@ 2018-02-18 13:24 ` Luca Coelho
2018-02-18 13:24 ` [PATCH 10/10] backport: implement alloc_percpu_gfp() for < 3.18 Luca Coelho
` (2 subsequent siblings)
11 siblings, 0 replies; 18+ messages in thread
From: Luca Coelho @ 2018-02-18 13:24 UTC (permalink / raw)
To: backports; +Cc: Luca Coelho
From: Luca Coelho <luciano.coelho@intel.com>
The verification code has some large data variables that are allocated
in the stack. Increase the maximum stack frame size in the compiler
check slightly (from 1024 to 1280) to prevent harmless warnings.
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
---
backport/compat/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/backport/compat/Makefile b/backport/compat/Makefile
index 5c79b9b849cb..ac70aaf82fcc 100644
--- a/backport/compat/Makefile
+++ b/backport/compat/Makefile
@@ -1,4 +1,4 @@
-ccflags-y += -I$(src)
+ccflags-y += -I$(src) -Wframe-larger-than=1280
ifeq ($(CONFIG_BACKPORT_INTEGRATE),)
obj-m += compat.o
else
--
2.15.1
--
To unsubscribe from this list: send the line "unsubscribe backports" in
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH 10/10] backport: implement alloc_percpu_gfp() for < 3.18.
2018-02-18 13:24 [PATCH 00/10] backport: updates for v4.16 Luca Coelho
` (8 preceding siblings ...)
2018-02-18 13:24 ` [PATCH 09/10] backport: increase max stack frame size compiler check to 1280 Luca Coelho
@ 2018-02-18 13:24 ` Luca Coelho
2018-02-18 16:10 ` Hauke Mehrtens
2018-02-28 18:32 ` Hauke Mehrtens
2018-02-18 16:11 ` [PATCH 00/10] backport: updates for v4.16 Hauke Mehrtens
2018-02-23 11:35 ` Johannes Berg
11 siblings, 2 replies; 18+ messages in thread
From: Luca Coelho @ 2018-02-18 13:24 UTC (permalink / raw)
To: backports; +Cc: Sara Sharon, Luca Coelho
From: Sara Sharon <sara.sharon@intel.com>
mac80211 now uses the alloc_percpu_gfp() function, which doesn't exist
in kernels older than 3.18. Backport it accordingly.
Signed-off-by: Sara Sharon <sara.sharon@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
---
backport-include/linux/percpu.h | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
create mode 100644 backport-include/linux/percpu.h
diff --git a/backport-include/linux/percpu.h b/backport-include/linux/percpu.h
new file mode 100644
index 000000000000..10be03cba795
--- /dev/null
+++ b/backport-include/linux/percpu.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright (C) 2018 Intel Corporation
+ */
+#ifndef __BACKPORT_PERCPU_H
+#define __BACKPORT_PERCPU_H
+#include_next <linux/percpu.h>
+
+#if LINUX_VERSION_IS_LESS(3,18,0)
+static inline void __percpu *__alloc_gfp_warn(void)
+{
+ WARN(1, "Cannot backport alloc_percpu_gfp");
+ return NULL;
+}
+
+#define alloc_percpu_gfp(type, gfp) \
+ ({ (gfp == GFP_KERNEL) ? alloc_percpu(type) : __alloc_gfp_warn(); })
+#endif /* LINUX_VERSION_IS_LESS(3,18,0) */
+
+#endif /* __BACKPORT_PERCPU_H */
--
2.15.1
--
To unsubscribe from this list: send the line "unsubscribe backports" in
^ permalink raw reply related [flat|nested] 18+ messages in thread* Re: [PATCH 10/10] backport: implement alloc_percpu_gfp() for < 3.18.
2018-02-18 13:24 ` [PATCH 10/10] backport: implement alloc_percpu_gfp() for < 3.18 Luca Coelho
@ 2018-02-18 16:10 ` Hauke Mehrtens
2018-02-18 17:58 ` Luciano Coelho
2018-02-28 18:32 ` Hauke Mehrtens
1 sibling, 1 reply; 18+ messages in thread
From: Hauke Mehrtens @ 2018-02-18 16:10 UTC (permalink / raw)
To: Luca Coelho, backports; +Cc: Sara Sharon, Luca Coelho
On 02/18/2018 02:24 PM, Luca Coelho wrote:
> From: Sara Sharon <sara.sharon@intel.com>
>
> mac80211 now uses the alloc_percpu_gfp() function, which doesn't exist
> in kernels older than 3.18. Backport it accordingly.
>
> Signed-off-by: Sara Sharon <sara.sharon@intel.com>
> Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
> ---
> backport-include/linux/percpu.h | 19 +++++++++++++++++++
> 1 file changed, 19 insertions(+)
> create mode 100644 backport-include/linux/percpu.h
>
> diff --git a/backport-include/linux/percpu.h b/backport-include/linux/percpu.h
> new file mode 100644
> index 000000000000..10be03cba795
> --- /dev/null
> +++ b/backport-include/linux/percpu.h
> @@ -0,0 +1,19 @@
> +/*
> + * Copyright (C) 2018 Intel Corporation
> + */
> +#ifndef __BACKPORT_PERCPU_H
> +#define __BACKPORT_PERCPU_H
> +#include_next <linux/percpu.h>
> +
> +#if LINUX_VERSION_IS_LESS(3,18,0)
> +static inline void __percpu *__alloc_gfp_warn(void)
> +{
> + WARN(1, "Cannot backport alloc_percpu_gfp");
> + return NULL;
Is this only called with GFP_KERNEL for now or why is it ok to only show
an error message here?
> +}
> +
> +#define alloc_percpu_gfp(type, gfp) \
> + ({ (gfp == GFP_KERNEL) ? alloc_percpu(type) : __alloc_gfp_warn(); })
> +#endif /* LINUX_VERSION_IS_LESS(3,18,0) */
> +
> +#endif /* __BACKPORT_PERCPU_H */
>
--
To unsubscribe from this list: send the line "unsubscribe backports" in
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: [PATCH 10/10] backport: implement alloc_percpu_gfp() for < 3.18.
2018-02-18 16:10 ` Hauke Mehrtens
@ 2018-02-18 17:58 ` Luciano Coelho
0 siblings, 0 replies; 18+ messages in thread
From: Luciano Coelho @ 2018-02-18 17:58 UTC (permalink / raw)
To: Hauke Mehrtens, backports; +Cc: Sara Sharon
On Sun, 2018-02-18 at 17:10 +0100, Hauke Mehrtens wrote:
> On 02/18/2018 02:24 PM, Luca Coelho wrote:
> > From: Sara Sharon <sara.sharon@intel.com>
> >
> > mac80211 now uses the alloc_percpu_gfp() function, which doesn't
> > exist
> > in kernels older than 3.18. Backport it accordingly.
> >
> > Signed-off-by: Sara Sharon <sara.sharon@intel.com>
> > Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
> > ---
> > backport-include/linux/percpu.h | 19 +++++++++++++++++++
> > 1 file changed, 19 insertions(+)
> > create mode 100644 backport-include/linux/percpu.h
> >
> > diff --git a/backport-include/linux/percpu.h b/backport-
> > include/linux/percpu.h
> > new file mode 100644
> > index 000000000000..10be03cba795
> > --- /dev/null
> > +++ b/backport-include/linux/percpu.h
> > @@ -0,0 +1,19 @@
> > +/*
> > + * Copyright (C) 2018 Intel Corporation
> > + */
> > +#ifndef __BACKPORT_PERCPU_H
> > +#define __BACKPORT_PERCPU_H
> > +#include_next <linux/percpu.h>
> > +
> > +#if LINUX_VERSION_IS_LESS(3,18,0)
> > +static inline void __percpu *__alloc_gfp_warn(void)
> > +{
> > + WARN(1, "Cannot backport alloc_percpu_gfp");
> > + return NULL;
>
> Is this only called with GFP_KERNEL for now or why is it ok to only
> show
> an error message here?
Yes, exactly. For now we only use it with GFP_KERNEL and backporting
for the other cases would be very difficult, so I took this shortcut
here.
--
Luca.
--
To unsubscribe from this list: send the line "unsubscribe backports" in
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 10/10] backport: implement alloc_percpu_gfp() for < 3.18.
2018-02-18 13:24 ` [PATCH 10/10] backport: implement alloc_percpu_gfp() for < 3.18 Luca Coelho
2018-02-18 16:10 ` Hauke Mehrtens
@ 2018-02-28 18:32 ` Hauke Mehrtens
2018-02-28 18:48 ` Luca Coelho
1 sibling, 1 reply; 18+ messages in thread
From: Hauke Mehrtens @ 2018-02-28 18:32 UTC (permalink / raw)
To: Luca Coelho, backports; +Cc: Sara Sharon, Luca Coelho
On 02/18/2018 02:24 PM, Luca Coelho wrote:
> From: Sara Sharon <sara.sharon@intel.com>
>
> mac80211 now uses the alloc_percpu_gfp() function, which doesn't exist
> in kernels older than 3.18. Backport it accordingly.
>
> Signed-off-by: Sara Sharon <sara.sharon@intel.com>
> Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
> ---
> backport-include/linux/percpu.h | 19 +++++++++++++++++++
> 1 file changed, 19 insertions(+)
> create mode 100644 backport-include/linux/percpu.h
>
> diff --git a/backport-include/linux/percpu.h b/backport-include/linux/percpu.h
> new file mode 100644
> index 000000000000..10be03cba795
> --- /dev/null
> +++ b/backport-include/linux/percpu.h
This path is wrong, please add this to
backport/backport-include/linux/percpu.h
As this was already applied, will you send a patch to fix this please.
> @@ -0,0 +1,19 @@
> +/*
> + * Copyright (C) 2018 Intel Corporation
> + */
> +#ifndef __BACKPORT_PERCPU_H
> +#define __BACKPORT_PERCPU_H
> +#include_next <linux/percpu.h>
> +
> +#if LINUX_VERSION_IS_LESS(3,18,0)
> +static inline void __percpu *__alloc_gfp_warn(void)
> +{
> + WARN(1, "Cannot backport alloc_percpu_gfp");
> + return NULL;
> +}
> +
> +#define alloc_percpu_gfp(type, gfp) \
> + ({ (gfp == GFP_KERNEL) ? alloc_percpu(type) : __alloc_gfp_warn(); })
> +#endif /* LINUX_VERSION_IS_LESS(3,18,0) */
> +
> +#endif /* __BACKPORT_PERCPU_H */
>
--
To unsubscribe from this list: send the line "unsubscribe backports" in
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: [PATCH 10/10] backport: implement alloc_percpu_gfp() for < 3.18.
2018-02-28 18:32 ` Hauke Mehrtens
@ 2018-02-28 18:48 ` Luca Coelho
0 siblings, 0 replies; 18+ messages in thread
From: Luca Coelho @ 2018-02-28 18:48 UTC (permalink / raw)
To: Hauke Mehrtens, backports; +Cc: Sara Sharon
On Wed, 2018-02-28 at 19:32 +0100, Hauke Mehrtens wrote:
>
> On 02/18/2018 02:24 PM, Luca Coelho wrote:
> > From: Sara Sharon <sara.sharon@intel.com>
> >
> > mac80211 now uses the alloc_percpu_gfp() function, which doesn't
> > exist
> > in kernels older than 3.18. Backport it accordingly.
> >
> > Signed-off-by: Sara Sharon <sara.sharon@intel.com>
> > Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
> > ---
> > backport-include/linux/percpu.h | 19 +++++++++++++++++++
> > 1 file changed, 19 insertions(+)
> > create mode 100644 backport-include/linux/percpu.h
> >
> > diff --git a/backport-include/linux/percpu.h b/backport-
> > include/linux/percpu.h
> > new file mode 100644
> > index 000000000000..10be03cba795
> > --- /dev/null
> > +++ b/backport-include/linux/percpu.h
>
> This path is wrong, please add this to
> backport/backport-include/linux/percpu.h
>
> As this was already applied, will you send a patch to fix this
> please.
Oh, sorry. My bad. Our internal tree is a backport itself, so the
tree struct is different. Usually the patches apply nicely and go to
the correct directories automatically (git magic), but I since this is
a new file, it couldn't detect anything similar and just added it to
the wrong place.
I'll send a fix. Thanks for pointing out.
--
Cheers,
Luca.
--
To unsubscribe from this list: send the line "unsubscribe backports" in
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 00/10] backport: updates for v4.16
2018-02-18 13:24 [PATCH 00/10] backport: updates for v4.16 Luca Coelho
` (9 preceding siblings ...)
2018-02-18 13:24 ` [PATCH 10/10] backport: implement alloc_percpu_gfp() for < 3.18 Luca Coelho
@ 2018-02-18 16:11 ` Hauke Mehrtens
2018-02-19 8:08 ` Luciano Coelho
2018-02-23 11:35 ` Johannes Berg
11 siblings, 1 reply; 18+ messages in thread
From: Hauke Mehrtens @ 2018-02-18 16:11 UTC (permalink / raw)
To: Luca Coelho, backports; +Cc: Luca Coelho
On 02/18/2018 02:24 PM, Luca Coelho wrote:
> From: Luca Coelho <luciano.coelho@intel.com>
>
> Hi,
>
> Here's a bunch of patches that we had pending in our internal
> backports tree. With this series at least iwlwifi can be fully
> backported from v4.16 kernels.
Thanks for the patches they are looking good to me.
With which kernels have you tested these patches + iwlwifi?
>
> Please review.
>
> Cheers,
> Luca.
>
>
> Luca Coelho (9):
> compat: only define thermal backports if CONFIG_THERMAL is enabled
> backport: add pcie_find_root_port()
> backport: include lib/bucket_locks.c
> backport: update genl_dump_check_consistent() backport
> backport: remove pkcs7_verify.c patch hunk
> backport: add new build_bug.h file
> backports: fix typo "TIMKEEPING" and fix gfp.h
> backport: remove stddef.h inclusions
> backport: increase max stack frame size compiler check to 1280
>
> Sara Sharon (1):
> backport: implement alloc_percpu_gfp() for < 3.18.
>
> backport-include/linux/percpu.h | 19 ++++++++++++++++++
> backport/backport-include/linux/build_bug.h | 10 +++++++++
> backport/backport-include/linux/gfp.h | 2 +-
> backport/backport-include/linux/pci.h | 21 +++++++++++++++++++
> backport/backport-include/linux/spinlock.h | 13 ++++++++++++
> backport/backport-include/linux/thermal.h | 2 ++
> backport/backport-include/linux/timekeeping.h | 6 +++---
> backport/backport-include/net/genetlink.h | 23 ++++++++++++++++-----
> backport/compat/Kconfig | 7 +++++++
> backport/compat/Makefile | 2 +-
> backport/compat/backport-4.3.c | 2 ++
> backport/compat/verification/mbedtls/asn1.h | 2 --
> backport/compat/verification/mbedtls/md.h | 2 --
> backport/compat/verification/mbedtls/oid.h | 2 --
> patches/lib-bucket_locks.patch | 29 +++++++++++++++++++++++++++
> patches/lib-rhashtable.patch | 27 -------------------------
> patches/verify.patch | 11 ----------
> 17 files changed, 126 insertions(+), 54 deletions(-)
> create mode 100644 backport-include/linux/percpu.h
> create mode 100644 backport/backport-include/linux/build_bug.h
> create mode 100644 backport/backport-include/linux/spinlock.h
> create mode 100644 patches/lib-bucket_locks.patch
>
--
To unsubscribe from this list: send the line "unsubscribe backports" in
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: [PATCH 00/10] backport: updates for v4.16
2018-02-18 16:11 ` [PATCH 00/10] backport: updates for v4.16 Hauke Mehrtens
@ 2018-02-19 8:08 ` Luciano Coelho
0 siblings, 0 replies; 18+ messages in thread
From: Luciano Coelho @ 2018-02-19 8:08 UTC (permalink / raw)
To: Hauke Mehrtens, backports
On Sun, 2018-02-18 at 17:11 +0100, Hauke Mehrtens wrote:
> On 02/18/2018 02:24 PM, Luca Coelho wrote:
> > From: Luca Coelho <luciano.coelho@intel.com>
> >
> > Hi,
> >
> > Here's a bunch of patches that we had pending in our internal
> > backports tree. With this series at least iwlwifi can be fully
> > backported from v4.16 kernels.
>
> Thanks for the patches they are looking good to me.
>
> With which kernels have you tested these patches + iwlwifi?
I have compile-tested these patches with our internal iwlwifi tree
(which is essentially a backport from wireless-drivers-next and
contains iwlwifi, mac80211, cfg80211 and other small things) on 4.4,
4.14 and 4.15 (at least). And we also have automated builds that
compile-test on these kernels: 3.10, 3.16, 3.18, 4.1, 4.4, 4.6 and 4.9.
We also have an old build machine that uses 3.8. I have an extra patch
to hack the compilation on it, but I didn't send it upstream because we
agreed to support backports only on 3.10+. And my patch just comments
out some stuff to make it compile...
--
Cheers,
Luca.
--
To unsubscribe from this list: send the line "unsubscribe backports" in
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 00/10] backport: updates for v4.16
2018-02-18 13:24 [PATCH 00/10] backport: updates for v4.16 Luca Coelho
` (10 preceding siblings ...)
2018-02-18 16:11 ` [PATCH 00/10] backport: updates for v4.16 Hauke Mehrtens
@ 2018-02-23 11:35 ` Johannes Berg
11 siblings, 0 replies; 18+ messages in thread
From: Johannes Berg @ 2018-02-23 11:35 UTC (permalink / raw)
To: Luca Coelho, backports; +Cc: Luca Coelho
On Sun, 2018-02-18 at 15:24 +0200, Luca Coelho wrote:
> From: Luca Coelho <luciano.coelho@intel.com>
>
> Hi,
>
> Here's a bunch of patches that we had pending in our internal
> backports tree. With this series at least iwlwifi can be fully
> backported from v4.16 kernels.
All applied, thanks.
johannes
--
To unsubscribe from this list: send the line "unsubscribe backports" in
^ permalink raw reply [flat|nested] 18+ messages in thread