On Thu, 2024-08-08 at 20:37 +0800, Yunsheng Lin wrote:
> Refactor common codes from __page_frag_alloc_va_align()
> to __page_frag_cache_reload(), so that the new API can
> make use of them.
>
> CC: Alexander Duyck <alexander.duyck@xxxxxxxxx>
> Signed-off-by: Yunsheng Lin <linyunsheng@xxxxxxxxxx>
> ---
> include/linux/page_frag_cache.h | 2 +-
> mm/page_frag_cache.c | 138 ++++++++++++++++++--------------
> 2 files changed, 81 insertions(+), 59 deletions(-)
>
> diff --git a/include/linux/page_frag_cache.h b/include/linux/page_frag_cache.h
> index 4ce924eaf1b1..0abffdd10a1c 100644
> --- a/include/linux/page_frag_cache.h
> +++ b/include/linux/page_frag_cache.h
> @@ -52,7 +52,7 @@ static inline void *encoded_page_address(unsigned long encoded_va)
>
> static inline void page_frag_cache_init(struct page_frag_cache *nc)
> {
> - nc->encoded_va = 0;
> + memset(nc, 0, sizeof(*nc));
> }
>
Still not a fan of this. Just setting encoded_va to 0 should be enough
as the other fields will automatically be overwritten when the new page
is allocated.
Relying on memset is problematic at best since you then introduce the
potential for issues where remaining somehow gets corrupted but
encoded_va/page is 0. I would rather have both of these being checked
as a part of allocation than just just assuming it is valid if
remaining is set.
I would prefer to keep the check for a non-0 encoded_page value and
then check remaining rather than just rely on remaining as it creates a
single point of failure. With that we can safely tear away a page and
the next caller to try to allocate will populated a new page and the
associated fields.
> static inline bool page_frag_cache_is_pfmemalloc(struct page_frag_cache *nc)
> diff --git a/mm/page_frag_cache.c b/mm/page_frag_cache.c
> index 2544b292375a..4e6b1c4684f0 100644
> --- a/mm/page_frag_cache.c
> +++ b/mm/page_frag_cache.c
> @@ -19,8 +19,27 @@
> #include <linux/page_frag_cache.h>
> #include "internal.h"
>
> -static struct page *__page_frag_cache_refill(struct page_frag_cache *nc,
> - gfp_t gfp_mask)
> +static bool __page_frag_cache_reuse(unsigned long encoded_va,
> + unsigned int pagecnt_bias)
> +{
> + struct page *page;
> +
> + page = virt_to_page((void *)encoded_va);
> + if (!page_ref_sub_and_test(page, pagecnt_bias))
> + return false;
> +
> + if (unlikely(encoded_page_pfmemalloc(encoded_va))) {
> + free_unref_page(page, encoded_page_order(encoded_va));
> + return false;
> + }
> +
> + /* OK, page count is 0, we can safely set it */
> + set_page_count(page, PAGE_FRAG_CACHE_MAX_SIZE + 1);
> + return true;
> +}
> +
> +static bool __page_frag_cache_refill(struct page_frag_cache *nc,
> + gfp_t gfp_mask)
> {
> unsigned long order = PAGE_FRAG_CACHE_MAX_ORDER;
> struct page *page = NULL;
> @@ -35,8 +54,8 @@ static struct page *__page_frag_cache_refill(struct page_frag_cache *nc,
> if (unlikely(!page)) {
> page = alloc_pages_node(NUMA_NO_NODE, gfp, 0);
> if (unlikely(!page)) {
> - nc->encoded_va = 0;
> - return NULL;
> + memset(nc, 0, sizeof(*nc));
> + return false;
> }
>
> order = 0;
> @@ -45,7 +64,33 @@ static struct page *__page_frag_cache_refill(struct page_frag_cache *nc,
> nc->encoded_va = encode_aligned_va(page_address(page), order,
> page_is_pfmemalloc(page));
>
> - return page;
> + /* Even if we own the page, we do not use atomic_set().
> + * This would break get_page_unless_zero() users.
> + */
> + page_ref_add(page, PAGE_FRAG_CACHE_MAX_SIZE);
> +
> + return true;
> +}
> +
> +/* Reload cache by reusing the old cache if it is possible, or
> + * refilling from the page allocator.
> + */
> +static bool __page_frag_cache_reload(struct page_frag_cache *nc,
> + gfp_t gfp_mask)
> +{
> + if (likely(nc->encoded_va)) {
> + if (__page_frag_cache_reuse(nc->encoded_va, nc->pagecnt_bias))
> + goto out;
> + }
> +
> + if (unlikely(!__page_frag_cache_refill(nc, gfp_mask)))
> + return false;
> +
> +out:
> + /* reset page count bias and remaining to start of new frag */
> + nc->pagecnt_bias = PAGE_FRAG_CACHE_MAX_SIZE + 1;
> + nc->remaining = page_frag_cache_page_size(nc->encoded_va);
One thought I am having is that it might be better to have the
pagecnt_bias get set at the same time as the page_ref_add or the
set_page_count call. In addition setting the remaining value at the
same time probably would make sense as in the refill case you can make
use of the "order" value directly instead of having to write/read it
out of the encoded va/page.
With that we could simplify this function and get something closer to
what we had for the original alloc_va_align code.
> + return true;
> }
>
> void page_frag_cache_drain(struct page_frag_cache *nc)
> @@ -55,7 +100,7 @@ void page_frag_cache_drain(struct page_frag_cache *nc)
>
> __page_frag_cache_drain(virt_to_head_page((void *)nc->encoded_va),
> nc->pagecnt_bias);
> - nc->encoded_va = 0;
> + memset(nc, 0, sizeof(*nc));
> }
> EXPORT_SYMBOL(page_frag_cache_drain);
>
> @@ -73,67 +118,44 @@ void *__page_frag_alloc_va_align(struct page_frag_cache *nc,
> unsigned int align_mask)
> {
> unsigned long encoded_va = nc->encoded_va;
> - unsigned int size, remaining;
> - struct page *page;
> -
> - if (unlikely(!encoded_va)) {
We should still be checking this before we even touch remaining.
Otherwise we greatly increase the risk of providing a bad virtual
address and have greatly decreased the likelihood of us catching
potential errors gracefully.
> -refill:
> - page = __page_frag_cache_refill(nc, gfp_mask);
> - if (!page)
> - return NULL;
> -
> - encoded_va = nc->encoded_va;
> - size = page_frag_cache_page_size(encoded_va);
> -
> - /* Even if we own the page, we do not use atomic_set().
> - * This would break get_page_unless_zero() users.
> - */
> - page_ref_add(page, PAGE_FRAG_CACHE_MAX_SIZE);
> -
> - /* reset page count bias and remaining to start of new frag */
> - nc->pagecnt_bias = PAGE_FRAG_CACHE_MAX_SIZE + 1;
> - nc->remaining = size;
With my suggested change above you could essentially just drop the
block starting from the comment and this function wouldn't need to
change as much as it is.
> - } else {
> - size = page_frag_cache_page_size(encoded_va);
> - }
> + unsigned int remaining;
>
> remaining = nc->remaining & align_mask;
> - if (unlikely(remaining < fragsz)) {
> - if (unlikely(fragsz > PAGE_SIZE)) {
> - /*
> - * The caller is trying to allocate a fragment
> - * with fragsz > PAGE_SIZE but the cache isn't big
> - * enough to satisfy the request, this may
> - * happen in low memory conditions.
> - * We don't release the cache page because
> - * it could make memory pressure worse
> - * so we simply return NULL here.
> - */
> - return NULL;
> - }
> -
> - page = virt_to_page((void *)encoded_va);
>
> - if (!page_ref_sub_and_test(page, nc->pagecnt_bias))
> - goto refill;
> -
> - if (unlikely(encoded_page_pfmemalloc(encoded_va))) {
> - free_unref_page(page, encoded_page_order(encoded_va));
> - goto refill;
> - }
Likewise for this block here. We can essentially just make use of the
__page_frag_cache_reuse function without the need to do a complete
rework of the code.
> + /* As we have ensured remaining is zero when initializing and draining old
> + * cache, 'remaining >= fragsz' checking is enough to indicate there is
> + * enough available space for the new fragment allocation.
> + */
> + if (likely(remaining >= fragsz)) {
> + nc->pagecnt_bias--;
> + nc->remaining = remaining - fragsz;
>
> - /* OK, page count is 0, we can safely set it */
> - set_page_count(page, PAGE_FRAG_CACHE_MAX_SIZE + 1);
> + return encoded_page_address(encoded_va) +
> + (page_frag_cache_page_size(encoded_va) - remaining);
> + }
>
> - /* reset page count bias and remaining to start of new frag */
> - nc->pagecnt_bias = PAGE_FRAG_CACHE_MAX_SIZE + 1;
> - remaining = size;
> + if (unlikely(fragsz > PAGE_SIZE)) {
> + /*
> + * The caller is trying to allocate a fragment with
> + * fragsz > PAGE_SIZE but the cache isn't big enough to satisfy
> + * the request, this may happen in low memory conditions. We don't
> + * release the cache page because it could make memory pressure
> + * worse so we simply return NULL here.
> + */
> + return NULL;
> }
>
> + if (unlikely(!__page_frag_cache_reload(nc, gfp_mask)))
> + return NULL;
> +
> + /* As the we are allocating fragment from cache by count-up way, the offset
> + * of allocated fragment from the just reloaded cache is zero, so remaining
> + * aligning and offset calculation are not needed.
> + */
> nc->pagecnt_bias--;
> - nc->remaining = remaining - fragsz;
> + nc->remaining -= fragsz;
>
> - return encoded_page_address(encoded_va) + (size - remaining);
> + return encoded_page_address(nc->encoded_va);
> }
> EXPORT_SYMBOL(__page_frag_alloc_va_align);
>
