From patchwork Tue Nov 17 17:03:51 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Bottomley X-Patchwork-Id: 60738 X-Patchwork-Delegate: kyle@mcmartin.ca Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id nAHH4CIX010699 for ; Tue, 17 Nov 2009 17:04:12 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755571AbZKQREF (ORCPT ); Tue, 17 Nov 2009 12:04:05 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755583AbZKQREF (ORCPT ); Tue, 17 Nov 2009 12:04:05 -0500 Received: from cantor.suse.de ([195.135.220.2]:47472 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755571AbZKQREC (ORCPT ); Tue, 17 Nov 2009 12:04:02 -0500 Received: from relay2.suse.de (relay-ext.suse.de [195.135.221.8]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.suse.de (Postfix) with ESMTP id 294308FEA2; Tue, 17 Nov 2009 18:04:08 +0100 (CET) From: James Bottomley To: linux-arch@vger.kernel.org, linux-parisc@vger.kernel.org Cc: James Bottomley Subject: [PATCH 5/6] block: permit I/O to vmalloc/vmap kernel pages Date: Tue, 17 Nov 2009 11:03:51 -0600 Message-Id: <1258477432-2513-6-git-send-email-James.Bottomley@suse.de> X-Mailer: git-send-email 1.6.5 In-Reply-To: <1258477432-2513-5-git-send-email-James.Bottomley@suse.de> References: <1258477432-2513-1-git-send-email-James.Bottomley@suse.de> <1258477432-2513-2-git-send-email-James.Bottomley@suse.de> <1258477432-2513-3-git-send-email-James.Bottomley@suse.de> <1258477432-2513-4-git-send-email-James.Bottomley@suse.de> <1258477432-2513-5-git-send-email-James.Bottomley@suse.de> Sender: linux-parisc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-parisc@vger.kernel.org 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;