Skip to content

lkl: block: copy kernel buffers not in the linear map #639

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
clingfei wants to merge 1 commit into
base: master
Choose a base branch
from
+12 −1
Open

lkl: block: copy kernel buffers not in the linear map #639

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion block/blk-map.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -460,6 +460,17 @@ static void bio_copy_kern_endio_read(struct bio *bio)
bio_copy_kern_endio(bio);
}

static bool blk_kern_needs_copy(void *kbuf, unsigned int len)
{
#ifdef CONFIG_LKL
char *buf = kbuf;

return !virt_addr_valid(buf) || !virt_addr_valid(buf + len - 1);
#else
return false;
#endif
}

/**
* bio_copy_kern - copy kernel address into bio
* @q: the struct request_queue for the bio
Expand Down Expand Up @@ -772,7 +783,7 @@ int blk_rq_map_kern(struct request_queue *q, struct request *rq, void *kbuf,
return -EINVAL;

if (!blk_rq_aligned(q, addr, len) || object_is_on_stack(kbuf) ||
blk_queue_may_bounce(q))
blk_kern_needs_copy(kbuf, len) || blk_queue_may_bounce(q))
bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading);
else
bio = bio_map_kern(q, kbuf, len, gfp_mask);
Expand Down
Loading