From: James Bottomley <James.Bottomley@suse.de>
To: Russell King <rmk@arm.linux.org.uk>
Cc: Parisc List <linux-parisc@vger.kernel.org>,
Linux Filesystem Mailing List <linux-fsdevel@vger.kernel.org>,
linux-arch@vger.kernel.org, Christoph Hellwig <hch@lst.de>
Subject: [PATCH 4/5] block: permit I/O to vmalloc/vmap kernel pages
Date: Tue, 08 Sep 2009 22:21:04 -0500 [thread overview]
Message-ID: <1252466464.13003.372.camel@mulgrave.site> (raw)
In-Reply-To: <1252466070.13003.365.camel@mulgrave.site>
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@suse.de>
---
fs/bio.c | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/fs/bio.c b/fs/bio.c
index 7673800..ea346b4 100644
--- a/fs/bio.c
+++ b/fs/bio.c
@@ -1120,6 +1120,13 @@ 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)) {
+ void *addr;
+ for (addr = kaddr; addr < kaddr + bio->bi_size;
+ addr += PAGE_SIZE)
+ invalidate_kernel_dcache_addr(addr);
+ }
bio_put(bio);
}
@@ -1138,9 +1145,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 +1158,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
next prev parent reply other threads:[~2009-09-09 3:21 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-09-08 18:27 xfs failure on parisc (and presumably other VI cache systems) caused by I/O to vmalloc/vmap areas James Bottomley
2009-09-08 19:00 ` Russell King
2009-09-08 19:11 ` James Bottomley
2009-09-08 20:16 ` Russell King
2009-09-08 20:39 ` James Bottomley
2009-09-08 21:39 ` Russell King
2009-09-09 3:14 ` James Bottomley
2009-09-09 3:17 ` [PATCH 1/5] mm: add coherence API for DMA " James Bottomley
2009-09-09 3:23 ` James Bottomley
2009-09-09 3:35 ` Paul Mundt
2009-09-09 14:34 ` James Bottomley
2009-09-10 0:24 ` Paul Mundt
2009-09-10 0:30 ` James Bottomley
2009-09-09 3:18 ` [PATCH 2/5] parisc: add mm " James Bottomley
2009-09-09 3:20 ` [PATCH 3/5] arm: " James Bottomley
2009-09-09 3:21 ` James Bottomley [this message]
2009-09-09 3:21 ` [PATCH 5/5] xfs: fix xfs to work with Virtually Indexed architectures James Bottomley
2009-10-13 1:40 ` xfs failure on parisc (and presumably other VI cache systems) caused by I/O to vmalloc/vmap areas Christoph Hellwig
2009-10-13 4:13 ` James Bottomley
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1252466464.13003.372.camel@mulgrave.site \
--to=james.bottomley@suse.de \
--cc=hch@lst.de \
--cc=linux-arch@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-parisc@vger.kernel.org \
--cc=rmk@arm.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).