013-backport-dev_coredumpm-function.patch 4.7 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156
  1. From ec8549e611465558bdf1bb5e9d308f39e5e248cd Mon Sep 17 00:00:00 2001
  2. From: Hauke Mehrtens <[email protected]>
  3. Date: Sun, 17 Sep 2017 14:41:48 +0200
  4. Subject: backport dev_coredumpm() function
  5. This is copied from a more recent backports version to add the
  6. dev_coredumpm() function when the internal core devdump is not used.
  7. ---
  8. compat/Makefile | 1 +
  9. compat/backport-4.7.c | 82 ++++++++++++++++++++++++++++++++++++++++++
  10. include/linux/bp-devcoredump.h | 32 +++++++++++++++++
  11. include/linux/devcoredump.h | 1 +
  12. 4 files changed, 116 insertions(+)
  13. create mode 100644 compat/backport-4.7.c
  14. create mode 100644 include/linux/bp-devcoredump.h
  15. --- a/compat/Makefile
  16. +++ b/compat/Makefile
  17. @@ -32,6 +32,7 @@ compat-$(CPTCFG_KERNEL_4_3) += backport-
  18. compat-$(CPTCFG_KERNEL_4_4) += backport-4.4.o
  19. compat-$(CPTCFG_KERNEL_4_5) += backport-4.5.o
  20. compat-$(CPTCFG_KERNEL_4_6) += backport-4.6.o
  21. +compat-$(CPTCFG_KERNEL_4_6) += backport-4.7.o
  22. compat-$(CPTCFG_BPAUTO_BUILD_CRYPTO_CCM) += crypto-ccm.o
  23. compat-$(CPTCFG_BPAUTO_CRYPTO_SKCIPHER) += crypto-skcipher.o
  24. --- /dev/null
  25. +++ b/compat/backport-4.7.c
  26. @@ -0,0 +1,82 @@
  27. +/*
  28. + * Copyright(c) 2016 Hauke Mehrtens <[email protected]>
  29. + *
  30. + * Backport functionality introduced in Linux 4.7.
  31. + *
  32. + * This program is free software; you can redistribute it and/or modify
  33. + * it under the terms of the GNU General Public License version 2 as
  34. + * published by the Free Software Foundation.
  35. + */
  36. +
  37. +#include <linux/export.h>
  38. +#include <linux/list.h>
  39. +#include <linux/rcupdate.h>
  40. +#include <linux/slab.h>
  41. +#include <linux/spinlock.h>
  42. +#include <linux/skbuff.h>
  43. +#include <net/netlink.h>
  44. +
  45. +/*
  46. + * Below 3.18 or if the kernel has devcoredump disabled, we copied the
  47. + * entire devcoredump, so no need to define these functions.
  48. + */
  49. +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0) && \
  50. + !defined(CPTCFG_BPAUTO_BUILD_WANT_DEV_COREDUMP)
  51. +#include <linux/devcoredump.h>
  52. +#include <linux/scatterlist.h>
  53. +
  54. +static void devcd_free_sgtable(void *data)
  55. +{
  56. + struct scatterlist *table = data;
  57. + int i;
  58. + struct page *page;
  59. + struct scatterlist *iter;
  60. + struct scatterlist *delete_iter;
  61. +
  62. + /* free pages */
  63. + iter = table;
  64. + for_each_sg(table, iter, sg_nents(table), i) {
  65. + page = sg_page(iter);
  66. + if (page)
  67. + __free_page(page);
  68. + }
  69. +
  70. + /* then free all chained tables */
  71. + iter = table;
  72. + delete_iter = table; /* always points on a head of a table */
  73. + while (!sg_is_last(iter)) {
  74. + iter++;
  75. + if (sg_is_chain(iter)) {
  76. + iter = sg_chain_ptr(iter);
  77. + kfree(delete_iter);
  78. + delete_iter = iter;
  79. + }
  80. + }
  81. +
  82. + /* free the last table */
  83. + kfree(delete_iter);
  84. +}
  85. +
  86. +static ssize_t devcd_read_from_sgtable(char *buffer, loff_t offset,
  87. + size_t buf_len, void *data,
  88. + size_t data_len)
  89. +{
  90. + struct scatterlist *table = data;
  91. +
  92. + if (offset > data_len)
  93. + return -EINVAL;
  94. +
  95. + if (offset + buf_len > data_len)
  96. + buf_len = data_len - offset;
  97. + return sg_pcopy_to_buffer(table, sg_nents(table), buffer, buf_len,
  98. + offset);
  99. +}
  100. +
  101. +void dev_coredumpsg(struct device *dev, struct scatterlist *table,
  102. + size_t datalen, gfp_t gfp)
  103. +{
  104. + dev_coredumpm(dev, THIS_MODULE, table, datalen, gfp,
  105. + devcd_read_from_sgtable, devcd_free_sgtable);
  106. +}
  107. +EXPORT_SYMBOL_GPL(dev_coredumpsg);
  108. +#endif /* >= 3.18.0 */
  109. --- /dev/null
  110. +++ b/include/linux/bp-devcoredump.h
  111. @@ -0,0 +1,32 @@
  112. +#ifndef __BACKPORT_LINUX_DEVCOREDUMP_H
  113. +#define __BACKPORT_LINUX_DEVCOREDUMP_H
  114. +#include <linux/version.h>
  115. +#include <linux/scatterlist.h>
  116. +
  117. +/* We only need to add our wrapper inside the range from 3.18 until
  118. + * 4.6, outside that we can let our BPAUTO mechanism handle it.
  119. + */
  120. +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0) && \
  121. + LINUX_VERSION_CODE < KERNEL_VERSION(4,7,0))
  122. +static inline
  123. +void backport_dev_coredumpm(struct device *dev, struct module *owner,
  124. + void *data, size_t datalen, gfp_t gfp,
  125. + ssize_t (*read_fn)(char *buffer, loff_t offset,
  126. + size_t count, void *data,
  127. + size_t datalen),
  128. + void (*free_fn)(void *data))
  129. +{
  130. + return dev_coredumpm(dev, owner, (const void *)data, datalen, gfp,
  131. + (void *)read_fn, (void *)free_fn);
  132. +}
  133. +
  134. +#define dev_coredumpm LINUX_BACKPORT(dev_coredumpm)
  135. +
  136. +#define dev_coredumpsg LINUX_BACKPORT(dev_coredumpsg)
  137. +void dev_coredumpsg(struct device *dev, struct scatterlist *table,
  138. + size_t datalen, gfp_t gfp);
  139. +
  140. +#endif /* (LINUX_VERSION_IS_GEQ(3,18,0) && \
  141. + LINUX_VERSION_IS_LESS(4,7,0)) */
  142. +
  143. +#endif /* __BACKPORT_LINUX_DEVCOREDUMP_H */
  144. --- a/include/linux/devcoredump.h
  145. +++ b/include/linux/devcoredump.h
  146. @@ -1,6 +1,7 @@
  147. /* Automatically created during backport process */
  148. #ifndef CPTCFG_BPAUTO_BUILD_WANT_DEV_COREDUMP
  149. #include_next <linux/devcoredump.h>
  150. +#include <linux/bp-devcoredump.h>
  151. #else
  152. #undef dev_coredumpv
  153. #define dev_coredumpv LINUX_BACKPORT(dev_coredumpv)