scatterlist: introduce sg_unmark_end

This is useful in places that recycle the same scatterlist multiple
times, and do not want to incur the cost of sg_init_table every
time in hot paths.

Acked-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

diff --git a/block/blk-integrity.c b/block/blk-integrity.c
index dabd221857e1b8fdf9eac1d2ead6d5a4a71efa2d..03cf7179e8ef1aac2f1698eae57377e65a94f275 100644 (file)
--- a/block/blk-integrity.c
+++ b/block/blk-integrity.c
@@ -110,7 +110,7 @@ new_segment:
                        if (!sg)
                                sg = sglist;
                        else {
-                               sg->page_link &= ~0x02;
+                               sg_unmark_end(sg);
                                sg = sg_next(sg);
                        }
 

diff --git a/block/blk-merge.c b/block/blk-merge.c
index 936a110de0b9c63ac8a3ab6d44d80d60d5533088..5f2448253797710c7d059a16ea5477e2354bcc60 100644 (file)
--- a/block/blk-merge.c
+++ b/block/blk-merge.c
@@ -143,7 +143,7 @@ new_segment:
                         * termination bit to avoid doing a full
                         * sg_init_table() in drivers for each command.
                         */
-                       (*sg)->page_link &= ~0x02;
+                       sg_unmark_end(*sg);
                        *sg = sg_next(*sg);
                }
 

diff --git a/include/linux/scatterlist.h b/include/linux/scatterlist.h
index 2d8bdaef96116517cb8c6c1862a3cb82a3a863db..bfc47e0de81c6ad52e50050dd2d2acdb6c746112 100644 (file)
--- a/include/linux/scatterlist.h
+++ b/include/linux/scatterlist.h
@@ -171,6 +171,22 @@ static inline void sg_mark_end(struct scatterlist *sg)
        sg->page_link &= ~0x01;
 }
 
+/**
+ * sg_unmark_end - Undo setting the end of the scatterlist
+ * @sg:                 SG entryScatterlist
+ *
+ * Description:
+ *   Removes the termination marker from the given entry of the scatterlist.
+ *
+ **/
+static inline void sg_unmark_end(struct scatterlist *sg)
+{
+#ifdef CONFIG_DEBUG_SG
+       BUG_ON(sg->sg_magic != SG_MAGIC);
+#endif
+       sg->page_link &= ~0x02;
+}
+
 /**
  * sg_phys - Return physical address of an sg entry
  * @sg:             SG entry