All of lore.kernel.org
 help / color / mirror / Atom feed
From: Christoph Hellwig <hch@lst.de>
To: Jens Axboe <axboe@kernel.dk>
Cc: "Ed L. Cashin" <ed.cashin@acm.org>,
	Geoff Levand <geoff@infradead.org>,
	Maxim Levitsky <maximlevitsky@gmail.com>,
	linux-block@vger.kernel.org, linuxppc-dev@lists.ozlabs.org,
	linux-mtd@lists.infradead.org, sparclinux@vger.kernel.org
Subject: [PATCH 6/7] jsflash: handle highmem pages
Date: Wed,  9 May 2018 15:59:47 +0200	[thread overview]
Message-ID: <20180509135948.20329-7-hch@lst.de> (raw)
In-Reply-To: <20180509135948.20329-1-hch@lst.de>

Just kmap the bio single page payload before processing it.

(and yes, now highmem on sparc32 anyway, but kmap_(un)map atomic are nops,
so this gives the right example)

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 drivers/sbus/char/jsflash.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/sbus/char/jsflash.c b/drivers/sbus/char/jsflash.c
index 14f377ac1280..8520587b8d09 100644
--- a/drivers/sbus/char/jsflash.c
+++ b/drivers/sbus/char/jsflash.c
@@ -215,6 +215,7 @@ static void jsfd_request(void)
 		unsigned long offset = blk_rq_pos(req) << 9;
 		size_t len = blk_rq_cur_bytes(req);
 		blk_status_t err = BLK_STS_IOERR;
+		void *p;
 
 		if ((offset + len) > jdp->dsize)
 			goto end;
@@ -229,7 +230,9 @@ static void jsfd_request(void)
 			goto end;
 		}
 
-		jsfd_read(bio_data(req->bio), jdp->dbase + offset, len);
+		p = kmap_atomic(bio_page(bio)) + bio_offset(bio);
+		jsfd_read(p, jdp->dbase + offset, len);
+		kunmap_atomic(p);
 		err = BLK_STS_OK;
 	end:
 		if (!__blk_end_request_cur(req, err))
@@ -592,7 +595,6 @@ static int jsfd_init(void)
 			put_disk(disk);
 			goto out;
 		}
-		blk_queue_bounce_limit(disk->queue, BLK_BOUNCE_HIGH);
 		jsfd_disk[i] = disk;
 	}
 
-- 
2.17.0

WARNING: multiple messages have this Message-ID (diff)
From: Christoph Hellwig <hch@lst.de>
To: Jens Axboe <axboe@kernel.dk>
Cc: "Ed L. Cashin" <ed.cashin@acm.org>,
	Geoff Levand <geoff@infradead.org>,
	Maxim Levitsky <maximlevitsky@gmail.com>,
	linux-block@vger.kernel.org, linuxppc-dev@lists.ozlabs.org,
	linux-mtd@lists.infradead.org, sparclinux@vger.kernel.org
Subject: [PATCH 6/7] jsflash: handle highmem pages
Date: Wed, 09 May 2018 13:59:47 +0000	[thread overview]
Message-ID: <20180509135948.20329-7-hch@lst.de> (raw)
In-Reply-To: <20180509135948.20329-1-hch@lst.de>

Just kmap the bio single page payload before processing it.

(and yes, now highmem on sparc32 anyway, but kmap_(un)map atomic are nops,
so this gives the right example)

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 drivers/sbus/char/jsflash.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/sbus/char/jsflash.c b/drivers/sbus/char/jsflash.c
index 14f377ac1280..8520587b8d09 100644
--- a/drivers/sbus/char/jsflash.c
+++ b/drivers/sbus/char/jsflash.c
@@ -215,6 +215,7 @@ static void jsfd_request(void)
 		unsigned long offset = blk_rq_pos(req) << 9;
 		size_t len = blk_rq_cur_bytes(req);
 		blk_status_t err = BLK_STS_IOERR;
+		void *p;
 
 		if ((offset + len) > jdp->dsize)
 			goto end;
@@ -229,7 +230,9 @@ static void jsfd_request(void)
 			goto end;
 		}
 
-		jsfd_read(bio_data(req->bio), jdp->dbase + offset, len);
+		p = kmap_atomic(bio_page(bio)) + bio_offset(bio);
+		jsfd_read(p, jdp->dbase + offset, len);
+		kunmap_atomic(p);
 		err = BLK_STS_OK;
 	end:
 		if (!__blk_end_request_cur(req, err))
@@ -592,7 +595,6 @@ static int jsfd_init(void)
 			put_disk(disk);
 			goto out;
 		}
-		blk_queue_bounce_limit(disk->queue, BLK_BOUNCE_HIGH);
 		jsfd_disk[i] = disk;
 	}
 
-- 
2.17.0


  parent reply	other threads:[~2018-05-09 13:59 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-05-09 13:59 make a few block drivers highmem safe Christoph Hellwig
2018-05-09 13:59 ` Christoph Hellwig
2018-05-09 13:59 ` [PATCH 1/7] mtip32xx: don't use block layer bounce buffers Christoph Hellwig
2018-05-09 13:59   ` Christoph Hellwig
2018-05-09 15:17   ` Johannes Thumshirn
2018-05-09 15:17     ` Johannes Thumshirn
2018-05-09 15:17     ` Johannes Thumshirn
2018-05-09 13:59 ` [PATCH 2/7] DAC960: " Christoph Hellwig
2018-05-09 13:59   ` Christoph Hellwig
2018-05-09 15:17   ` Johannes Thumshirn
2018-05-09 15:17     ` Johannes Thumshirn
2018-05-09 15:17     ` Johannes Thumshirn
2018-05-09 13:59 ` [PATCH 3/7] memstick: don't call blk_queue_bounce_limit Christoph Hellwig
2018-05-09 13:59   ` Christoph Hellwig
2018-05-09 13:59 ` [PATCH 4/7] mtd_blkdevs: handle highmem pages Christoph Hellwig
2018-05-09 13:59   ` Christoph Hellwig
2018-05-09 13:59 ` [PATCH 5/7] aoe: " Christoph Hellwig
2018-05-09 13:59   ` Christoph Hellwig
2018-05-09 13:59 ` Christoph Hellwig [this message]
2018-05-09 13:59   ` [PATCH 6/7] jsflash: " Christoph Hellwig
2018-05-09 13:59 ` [PATCH 7/7] ps3disk: " Christoph Hellwig
2018-05-09 13:59   ` Christoph Hellwig
2018-05-09 16:26 ` make a few block drivers highmem safe Jens Axboe
2018-05-09 16:26   ` Jens Axboe
2018-05-11 21:08 ` Jens Axboe
2018-05-11 21:08   ` Jens Axboe

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=20180509135948.20329-7-hch@lst.de \
    --to=hch@lst.de \
    --cc=axboe@kernel.dk \
    --cc=ed.cashin@acm.org \
    --cc=geoff@infradead.org \
    --cc=linux-block@vger.kernel.org \
    --cc=linux-mtd@lists.infradead.org \
    --cc=linuxppc-dev@lists.ozlabs.org \
    --cc=maximlevitsky@gmail.com \
    --cc=sparclinux@vger.kernel.org \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.