Skip to content

Commit

Permalink
hostfs: Replace kmap() with kmap_local_page()
Browse files Browse the repository at this point in the history
The use of kmap() is being deprecated in favor of kmap_local_page().

There are two main problems with kmap(): (1) It comes with an overhead as
the mapping space is restricted and protected by a global lock for
synchronization and (2) it also requires global TLB invalidation when the
kmap’s pool wraps and it might block when the mapping space is fully
utilized until a slot becomes available.

With kmap_local_page() the mappings are per thread, CPU local, can take
page faults, and can be called from any context (including interrupts).
It is faster than kmap() in kernels with HIGHMEM enabled. Furthermore,
the tasks can be preempted and, when they are scheduled to run again, the
kernel virtual addresses are restored and still valid.

Therefore, replace kmap() with kmap_local_page() in hostfs_kern.c, it
being the only file with kmap() call sites currently left in fs/hostfs.

Cc: "Venkataramanan, Anirudh" <[email protected]>
Suggested-by: Ira Weiny <[email protected]>
Signed-off-by: Fabio M. De Francesco <[email protected]>
Signed-off-by: Richard Weinberger <[email protected]>
  • Loading branch information
xp4ns3 authored and richardweinberger committed Feb 1, 2023
1 parent 28b2bb0 commit e082036
Showing 1 changed file with 8 additions and 7 deletions.
15 changes: 8 additions & 7 deletions fs/hostfs/hostfs_kern.c
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,7 @@ static int hostfs_writepage(struct page *page, struct writeback_control *wbc)
if (page->index >= end_index)
count = inode->i_size & (PAGE_SIZE-1);

buffer = kmap(page);
buffer = kmap_local_page(page);

err = write_file(HOSTFS_I(inode)->fd, &base, buffer, count);
if (err != count) {
Expand All @@ -428,9 +428,9 @@ static int hostfs_writepage(struct page *page, struct writeback_control *wbc)
err = 0;

out:
kunmap(page);

kunmap_local(buffer);
unlock_page(page);

return err;
}

Expand All @@ -441,7 +441,7 @@ static int hostfs_read_folio(struct file *file, struct folio *folio)
loff_t start = page_offset(page);
int bytes_read, ret = 0;

buffer = kmap(page);
buffer = kmap_local_page(page);
bytes_read = read_file(FILE_HOSTFS_I(file)->fd, &start, buffer,
PAGE_SIZE);
if (bytes_read < 0) {
Expand All @@ -458,8 +458,9 @@ static int hostfs_read_folio(struct file *file, struct folio *folio)

out:
flush_dcache_page(page);
kunmap(page);
kunmap_local(buffer);
unlock_page(page);

return ret;
}

Expand All @@ -484,9 +485,9 @@ static int hostfs_write_end(struct file *file, struct address_space *mapping,
unsigned from = pos & (PAGE_SIZE - 1);
int err;

buffer = kmap(page);
buffer = kmap_local_page(page);
err = write_file(FILE_HOSTFS_I(file)->fd, &pos, buffer + from, copied);
kunmap(page);
kunmap_local(buffer);

if (!PageUptodate(page) && err == PAGE_SIZE)
SetPageUptodate(page);
Expand Down

0 comments on commit e082036

Please sign in to comment.