backports: add device coredump framework

As drivers will start requiring the new framework and it has
been merged to linux/master during the 3.18 merge window, we
can include it into backports to compile if needed.

On kernels that do already have it but didn't want it built
honor that, but if building otherwise don't. This may need
to be revisited in the future.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

diff --git a/backport/compat/Kconfig b/backport/compat/Kconfig
index 7581758b1e3c5604a8a1e234fb8ab446f104d8df..49699bda251a77d0b8c80a77b94489c131b60bfd 100644 (file)
--- a/backport/compat/Kconfig
+++ b/backport/compat/Kconfig
@@ -124,3 +124,14 @@ config BACKPORT_BUILD_CRYPTO_CCM
        default n if CRYPTO_CCM
        default y if BACKPORT_CRYPTO_CCM
        #c-file crypto/ccm.c
+
+config BACKPORT_WANT_DEV_COREDUMP
+       bool
+
+config BACKPORT_BUILD_WANT_DEV_COREDUMP
+       bool
+       default n if DEV_COREDUMP
+       default n if DISABLE_DEV_COREDUMP
+       default y if BACKPORT_WANT_DEV_COREDUMP
+       #h-file linux/devcoredump.h
+       #c-file drivers/base/devcoredump.c

diff --git a/backport/compat/backports.h b/backport/compat/backports.h
index ed946b5ba1083bf80625bfada6b8bf2ab99df476..c9094ac42c1f8ada72e1eb1c50aa73ef6dc02721 100644 (file)
--- a/backport/compat/backports.h
+++ b/backport/compat/backports.h
@@ -13,4 +13,14 @@ static inline void crypto_ccm_module_exit(void)
 {}
 #endif
 
+#ifdef CPTCFG_BACKPORT_BUILD_WANT_DEV_COREDUMP
+int devcoredump_init(void);
+void devcoredump_exit(void);
+#else
+static inline int devcoredump_init(void)
+{ return 0; }
+static inline void devcoredump_exit(void)
+{}
+#endif
+
 #endif /* LINUX_BACKPORTS_PRIVATE_H */

diff --git a/backport/compat/main.c b/backport/compat/main.c
index e38eed3d56d536ce297cc938f2dae1e43744356f..d3f8944913e861809acc0522241f27e553d9ff0b 100644 (file)
--- a/backport/compat/main.c
+++ b/backport/compat/main.c
@@ -57,6 +57,12 @@ static int __init backport_init(void)
        if (ret)
                return ret;
 
+       ret = devcoredump_init();
+       if (ret) {
+               crypto_ccm_module_exit();
+               return ret;
+       }
+
        printk(KERN_INFO "Loading modules backported from " BACKPORTED_KERNEL_NAME
 #ifndef BACKPORTS_GIT_TRACKED
                " version " BACKPORTED_KERNEL_VERSION
@@ -75,5 +81,6 @@ subsys_initcall(backport_init);
 static void __exit backport_exit(void)
 {
        crypto_ccm_module_exit();
+       devcoredump_exit();
 }
 module_exit(backport_exit);

diff --git a/patches/backport-adjustments/devcoredump.patch b/patches/backport-adjustments/devcoredump.patch
new file mode 100644 (file)
index 0000000..3378884
--- /dev/null
+++ b/patches/backport-adjustments/devcoredump.patch
@@ -0,0 +1,121 @@
+diff --git a/compat/drivers-base-devcoredump.c b/compat/drivers-base-devcoredump.c
+index 96614b04544c..600af2623230 100644
+--- a/compat/drivers-base-devcoredump.c
++++ b/compat/drivers-base-devcoredump.c
+@@ -30,10 +30,15 @@
+ #include <linux/slab.h>
+ #include <linux/fs.h>
+ #include <linux/workqueue.h>
++#include "backports.h"
+ 
+ /* if data isn't read by userspace after 5 minutes then delete it */
+ #define DEVCD_TIMEOUT (HZ * 60 * 5)
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,11,0)
++static struct bin_attribute devcd_attr_data;
++#endif
++
+ struct devcd_entry {
+       struct device devcd_dev;
+       const void *data;
+@@ -63,8 +68,7 @@ static void devcd_dev_release(struct device *dev)
+        * a struct device to know when it goes away?
+        */
+       if (devcd->failing_dev->kobj.sd)
+-              sysfs_delete_link(&devcd->failing_dev->kobj, &dev->kobj,
+-                                "devcoredump");
++              sysfs_remove_link(&devcd->failing_dev->kobj, "devcoredump");
+ 
+       put_device(devcd->failing_dev);
+       kfree(devcd);
+@@ -76,6 +80,9 @@ static void devcd_del(struct work_struct *wk)
+ 
+       devcd = container_of(wk, struct devcd_entry, del_wk.work);
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,11,0)
++      device_remove_bin_file(&devcd->devcd_dev, &devcd_attr_data);
++#endif
+       device_del(&devcd->devcd_dev);
+       put_device(&devcd->devcd_dev);
+ }
+@@ -109,6 +116,7 @@ static struct bin_attribute devcd_attr_data = {
+       .write = devcd_data_write,
+ };
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0)
+ static struct bin_attribute *devcd_dev_bin_attrs[] = {
+       &devcd_attr_data, NULL,
+ };
+@@ -120,12 +128,15 @@ static const struct attribute_group devcd_dev_group = {
+ static const struct attribute_group *devcd_dev_groups[] = {
+       &devcd_dev_group, NULL,
+ };
++#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0) */
+ 
+ static struct class devcd_class = {
+       .name           = "devcoredump",
+       .owner          = THIS_MODULE,
+       .dev_release    = devcd_dev_release,
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0)
+       .dev_groups     = devcd_dev_groups,
++#endif
+ };
+ 
+ static ssize_t devcd_readv(char *buffer, loff_t offset, size_t count,
+@@ -222,6 +233,11 @@ void dev_coredumpm(struct device *dev, struct module *owner,
+       if (device_add(&devcd->devcd_dev))
+               goto put_device;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,11,0)
++      if (device_create_bin_file(&devcd->devcd_dev, &devcd_attr_data))
++              goto put_device;
++#endif
++
+       if (sysfs_create_link(&devcd->devcd_dev.kobj, &dev->kobj,
+                             "failing_device"))
+               /* nothing - symlink will be missing */;
+@@ -243,11 +259,10 @@ void dev_coredumpm(struct device *dev, struct module *owner,
+ }
+ EXPORT_SYMBOL_GPL(dev_coredumpm);
+ 
+-static int __init devcoredump_init(void)
++int __init devcoredump_init(void)
+ {
+       return class_register(&devcd_class);
+ }
+-__initcall(devcoredump_init);
+ 
+ static int devcd_free(struct device *dev, void *data)
+ {
+@@ -257,9 +272,8 @@ static int devcd_free(struct device *dev, void *data)
+       return 0;
+ }
+ 
+-static void __exit devcoredump_exit(void)
++void __exit devcoredump_exit(void)
+ {
+       class_for_each_device(&devcd_class, NULL, NULL, devcd_free);
+       class_unregister(&devcd_class);
+ }
+-__exitcall(devcoredump_exit);
+diff --git a/include/linux/backport-devcoredump.h b/include/linux/backport-devcoredump.h
+index c0a360e99f64..da20e61f6c06 100644
+--- a/include/linux/backport-devcoredump.h
++++ b/include/linux/backport-devcoredump.h
+@@ -5,7 +5,7 @@
+ #include <linux/module.h>
+ #include <linux/vmalloc.h>
+ 
+-#ifdef CONFIG_DEV_COREDUMP
++#ifdef CPTCFG_BACKPORT_BUILD_WANT_DEV_COREDUMP
+ void dev_coredumpv(struct device *dev, const void *data, size_t datalen,
+                  gfp_t gfp);
+ 
+@@ -30,6 +30,6 @@ dev_coredumpm(struct device *dev, struct module *owner,
+ {
+       free(data);
+ }
+-#endif /* CONFIG_DEV_COREDUMP */
++#endif /* CPTCFG_BACKPORT_BUILD_WANT_DEV_COREDUMP */
+ 
+ #endif /* __DEVCOREDUMP_H */