From: James Bottomley <jejb@xxxxxxxxxxxxxxx>
This updates bio_map_kern() to check for pages in the vmalloc address
range and call the new kernel flushing APIs if the are. This should
allow any kernel user to pass a vmalloc/vmap area to block.
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
---
fs/bio.c | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/fs/bio.c b/fs/bio.c
index 7673800..0cf7b79 100644
--- a/fs/bio.c
+++ b/fs/bio.c
@@ -1120,6 +1120,14 @@ void bio_unmap_user(struct bio *bio)
static void bio_map_kern_endio(struct bio *bio, int err)
{
+ void *kaddr = bio->bi_private;
+
+ if (is_vmalloc_addr(kaddr)) {
+ int i;
+
+ for (i = 0; i < bio->bi_vcnt; i++)
+ invalidate_kernel_dcache_addr(kaddr + i * PAGE_SIZE);
+ }
bio_put(bio);
}
@@ -1138,9 +1146,12 @@ static struct bio *__bio_map_kern(struct request_queue *q, void *data,
if (!bio)
return ERR_PTR(-ENOMEM);
+ bio->bi_private = data;
+
offset = offset_in_page(kaddr);
for (i = 0; i < nr_pages; i++) {
unsigned int bytes = PAGE_SIZE - offset;
+ struct page *page;
if (len <= 0)
break;
@@ -1148,8 +1159,13 @@ static struct bio *__bio_map_kern(struct request_queue *q, void *data,
if (bytes > len)
bytes = len;
- if (bio_add_pc_page(q, bio, virt_to_page(data), bytes,
- offset) < bytes)
+ if (is_vmalloc_addr(data)) {
+ flush_kernel_dcache_addr(data);
+ page = vmalloc_to_page(data);
+ } else
+ page = virt_to_page(data);
+
+ if (bio_add_pc_page(q, bio, page, bytes, offset) < bytes)
break;
data += bytes;
--
1.6.3.3
--
To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
