Skip to content

Commit 2c2ade8

Browse files
thejhdavem330
authored andcommitted
mm: page_alloc: fix ref bias in page_frag_alloc() for 1-byte allocs
The basic idea behind ->pagecnt_bias is: If we pre-allocate the maximum number of references that we might need to create in the fastpath later, the bump-allocation fastpath only has to modify the non-atomic bias value that tracks the number of extra references we hold instead of the atomic refcount. The maximum number of allocations we can serve (under the assumption that no allocation is made with size 0) is nc->size, so that's the bias used. However, even when all memory in the allocation has been given away, a reference to the page is still held; and in the `offset < 0` slowpath, the page may be reused if everyone else has dropped their references. This means that the necessary number of references is actually `nc->size+1`. Luckily, from a quick grep, it looks like the only path that can call page_frag_alloc(fragsz=1) is TAP with the IFF_NAPI_FRAGS flag, which requires CAP_NET_ADMIN in the init namespace and is only intended to be used for kernel testing and fuzzing. To test for this issue, put a `WARN_ON(page_ref_count(page) == 0)` in the `offset < 0` path, below the virt_to_page() call, and then repeatedly call writev() on a TAP device with IFF_TAP|IFF_NO_PI|IFF_NAPI_FRAGS|IFF_NAPI, with a vector consisting of 15 elements containing 1 byte each. Signed-off-by: Jann Horn <jannh@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent 61c4c0b commit 2c2ade8

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

mm/page_alloc.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4675,11 +4675,11 @@ void *page_frag_alloc(struct page_frag_cache *nc,
46754675
/* Even if we own the page, we do not use atomic_set().
46764676
* This would break get_page_unless_zero() users.
46774677
*/
4678-
page_ref_add(page, size - 1);
4678+
page_ref_add(page, size);
46794679

46804680
/* reset page count bias and offset to start of new frag */
46814681
nc->pfmemalloc = page_is_pfmemalloc(page);
4682-
nc->pagecnt_bias = size;
4682+
nc->pagecnt_bias = size + 1;
46834683
nc->offset = size;
46844684
}
46854685

@@ -4695,10 +4695,10 @@ void *page_frag_alloc(struct page_frag_cache *nc,
46954695
size = nc->size;
46964696
#endif
46974697
/* OK, page count is 0, we can safely set it */
4698-
set_page_count(page, size);
4698+
set_page_count(page, size + 1);
46994699

47004700
/* reset page count bias and offset to start of new frag */
4701-
nc->pagecnt_bias = size;
4701+
nc->pagecnt_bias = size + 1;
47024702
offset = size - fragsz;
47034703
}
47044704

0 commit comments

Comments
 (0)