linux-fsdevel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: James Bottomley <James.Bottomley@suse.de>
To: linux-arch@vger.kernel.org, linux-fsdevel@vger.kernel.org,
	linux-parisc@vger.kernel.org
Cc: Russell King <rmk@arm.linux.org.uk>,
	Christoph Hellwig <hch@lst.de>, Paul Mundt <lethal@linux-sh.org>,
	James Bottomley <James.Bottomley@suse.de>
Subject: [PATCH 5/6] block: permit I/O to vmalloc/vmap kernel pages
Date: Wed,  9 Sep 2009 10:52:15 -0500	[thread overview]
Message-ID: <1252511536-22066-6-git-send-email-James.Bottomley@suse.de> (raw)
In-Reply-To: <1252511536-22066-5-git-send-email-James.Bottomley@suse.de>

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

  reply	other threads:[~2009-09-09 15:52 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-09-09 15:52 [PATCH 0/6] fix xfs by making I/O to vmap/vmalloc areas work James Bottomley
2009-09-09 15:52 ` [PATCH 1/6] mm: add coherence API for DMA to vmalloc/vmap areas James Bottomley
2009-09-09 15:52   ` [PATCH 2/6] parisc: add mm " James Bottomley
2009-09-09 15:52     ` [PATCH 3/6] arm: " James Bottomley
2009-09-09 15:52       ` [PATCH 4/6] sh: " James Bottomley
2009-09-09 15:52         ` James Bottomley [this message]
2009-09-09 15:52           ` [PATCH 6/6] xfs: fix xfs to work with Virtually Indexed architectures James Bottomley
2009-09-09 17:55             ` Christoph Hellwig
2009-09-11 21:57             ` James Bottomley
2009-09-10  0:27         ` [PATCH 4/6] sh: add mm API for DMA to vmalloc/vmap areas Paul Mundt
2009-09-10  0:32           ` James Bottomley
2009-09-10  6:14 ` [PATCH 0/6] fix xfs by making I/O to vmap/vmalloc areas work Matt Fleming
2009-09-11 21:37   ` James Bottomley
  -- strict thread matches above, loose matches on Subject: below --
2009-09-17 23:06 James Bottomley
2009-09-17 23:06 ` [PATCH 1/6] mm: add coherence API for DMA to vmalloc/vmap areas James Bottomley
2009-09-17 23:06   ` [PATCH 2/6] parisc: add mm " James Bottomley
2009-09-17 23:06     ` [PATCH 3/6] arm: " James Bottomley
2009-09-17 23:06       ` [PATCH 4/6] sh: " James Bottomley
2009-09-17 23:07         ` [PATCH 5/6] block: permit I/O to vmalloc/vmap kernel pages 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=1252511536-22066-6-git-send-email-James.Bottomley@suse.de \
    --to=james.bottomley@suse.de \
    --cc=hch@lst.de \
    --cc=lethal@linux-sh.org \
    --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).