Skip to content

Commit

Permalink
target/file: Fix 32-bit highmem breakage for SGL -> iovec mapping
Browse files Browse the repository at this point in the history
This patch changes vectored file I/O to use kmap + kunmap when mapping
incoming SGL memory -> struct iovec in order to properly support 32-bit
highmem configurations.  This is because an extra bounce buffer may be
required when processing scatterlist pages allocated with GFP_KERNEL.

Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Cc: stable@vger.kernel.org
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
  • Loading branch information
Sebastian Andrzej Siewior authored and Nicholas Bellinger committed Dec 5, 2012
1 parent 0ff8754 commit 40ff2c3
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions drivers/target/target_core_file.c
Original file line number Diff line number Diff line change
Expand Up @@ -236,14 +236,16 @@ static int fd_do_readv(struct se_cmd *cmd, struct scatterlist *sgl,

for_each_sg(sgl, sg, sgl_nents, i) {
iov[i].iov_len = sg->length;
iov[i].iov_base = sg_virt(sg);
iov[i].iov_base = kmap(sg_page(sg)) + sg->offset;
}

old_fs = get_fs();
set_fs(get_ds());
ret = vfs_readv(fd, &iov[0], sgl_nents, &pos);
set_fs(old_fs);

for_each_sg(sgl, sg, sgl_nents, i)
kunmap(sg_page(sg));
kfree(iov);
/*
* Return zeros and GOOD status even if the READ did not return
Expand Down Expand Up @@ -288,14 +290,17 @@ static int fd_do_writev(struct se_cmd *cmd, struct scatterlist *sgl,

for_each_sg(sgl, sg, sgl_nents, i) {
iov[i].iov_len = sg->length;
iov[i].iov_base = sg_virt(sg);
iov[i].iov_base = kmap(sg_page(sg)) + sg->offset;
}

old_fs = get_fs();
set_fs(get_ds());
ret = vfs_writev(fd, &iov[0], sgl_nents, &pos);
set_fs(old_fs);

for_each_sg(sgl, sg, sgl_nents, i)
kunmap(sg_page(sg));

kfree(iov);

if (ret < 0 || ret != cmd->data_length) {
Expand Down

0 comments on commit 40ff2c3

Please sign in to comment.