Merge tag 'v3.18-rc4' into x86/cleanups, to refresh the tree before pulling new changes.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 19 insertions, 10 deletions

diff --git a/lib/scatterlist.c b/lib/scatterlist.c
index 3a8e8e8fb2a5..c9f2e8c6ccc9 100644
--- a/lib/scatterlist.c
+++ b/lib/scatterlist.c
@@ -73,7 +73,7 @@ EXPORT_SYMBOL(sg_nents);
  **/
 struct scatterlist *sg_last(struct scatterlist *sgl, unsigned int nents)
 {
-#ifndef ARCH_HAS_SG_CHAIN
+#ifndef CONFIG_ARCH_HAS_SG_CHAIN
         struct scatterlist *ret = &sgl[nents - 1];
 #else
         struct scatterlist *sg, *ret = NULL;
@@ -165,6 +165,7 @@ static void sg_kfree(struct scatterlist *sg, unsigned int nents)
  * __sg_free_table - Free a previously mapped sg table
  * @table:      The sg table header to use
  * @max_ents:   The maximum number of entries per single scatterlist
+ * @skip_first_chunk: don't free the (preallocated) first scatterlist chunk
  * @free_fn:    Free function
  *
  *  Description:
@@ -174,7 +175,7 @@ static void sg_kfree(struct scatterlist *sg, unsigned int nents)
  *
  **/
 void __sg_free_table(struct sg_table *table, unsigned int max_ents,
-                     sg_free_fn *free_fn)
+                     bool skip_first_chunk, sg_free_fn *free_fn)
 {
         struct scatterlist *sgl, *next;
 
@@ -202,7 +203,10 @@ void __sg_free_table(struct sg_table *table, unsigned int max_ents,
                 }
 
                 table->orig_nents -= sg_size;
-                free_fn(sgl, alloc_size);
+                if (skip_first_chunk)
+                        skip_first_chunk = false;
+                else
+                        free_fn(sgl, alloc_size);
                 sgl = next;
         }
 
@@ -217,7 +221,7 @@ EXPORT_SYMBOL(__sg_free_table);
  **/
 void sg_free_table(struct sg_table *table)
 {
-        __sg_free_table(table, SG_MAX_SINGLE_ALLOC, sg_kfree);
+        __sg_free_table(table, SG_MAX_SINGLE_ALLOC, false, sg_kfree);
 }
 EXPORT_SYMBOL(sg_free_table);
 
@@ -241,8 +245,8 @@ EXPORT_SYMBOL(sg_free_table);
  *
  **/
 int __sg_alloc_table(struct sg_table *table, unsigned int nents,
-                     unsigned int max_ents, gfp_t gfp_mask,
-                     sg_alloc_fn *alloc_fn)
+                     unsigned int max_ents, struct scatterlist *first_chunk,
+                     gfp_t gfp_mask, sg_alloc_fn *alloc_fn)
 {
         struct scatterlist *sg, *prv;
         unsigned int left;
@@ -251,7 +255,7 @@ int __sg_alloc_table(struct sg_table *table, unsigned int nents,
 
         if (nents == 0)
                 return -EINVAL;
-#ifndef ARCH_HAS_SG_CHAIN
+#ifndef CONFIG_ARCH_HAS_SG_CHAIN
         if (WARN_ON_ONCE(nents > max_ents))
                 return -EINVAL;
 #endif
@@ -269,7 +273,12 @@ int __sg_alloc_table(struct sg_table *table, unsigned int nents,
 
                 left -= sg_size;
 
-                sg = alloc_fn(alloc_size, gfp_mask);
+                if (first_chunk) {
+                        sg = first_chunk;
+                        first_chunk = NULL;
+                } else {
+                        sg = alloc_fn(alloc_size, gfp_mask);
+                }
                 if (unlikely(!sg)) {
                         /*
                          * Adjust entry count to reflect that the last
@@ -324,9 +333,9 @@ int sg_alloc_table(struct sg_table *table, unsigned int nents, gfp_t gfp_mask)
         int ret;
 
         ret = __sg_alloc_table(table, nents, SG_MAX_SINGLE_ALLOC,
-                               gfp_mask, sg_kmalloc);
+                               NULL, gfp_mask, sg_kmalloc);
         if (unlikely(ret))
-                __sg_free_table(table, SG_MAX_SINGLE_ALLOC, sg_kfree);
+                __sg_free_table(table, SG_MAX_SINGLE_ALLOC, false, sg_kfree);
 
         return ret;
 }