netdev - Re: [PATCH v2 19/24] xdp: Convert to netmem

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:   Tue, 10 Jan 2023 13:50:44 +0200
From:   Ilias Apalodimas <ilias.apalodimas@...aro.org>
To:     "Matthew Wilcox (Oracle)" <willy@...radead.org>
Cc:     Jesper Dangaard Brouer <hawk@...nel.org>, netdev@...r.kernel.org,
        linux-mm@...ck.org, Shakeel Butt <shakeelb@...gle.com>
Subject: Re: [PATCH v2 19/24] xdp: Convert to netmem

On Thu, Jan 05, 2023 at 09:46:26PM +0000, Matthew Wilcox (Oracle) wrote:
> We dereference the 'pp' member of struct page, so we must use a netmem
> here.
>
> Signed-off-by: Matthew Wilcox (Oracle) <willy@...radead.org>
> ---
>  net/core/xdp.c | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/net/core/xdp.c b/net/core/xdp.c
> index 844c9d99dc0e..7520c3b27356 100644
> --- a/net/core/xdp.c
> +++ b/net/core/xdp.c
> @@ -375,17 +375,18 @@ EXPORT_SYMBOL_GPL(xdp_rxq_info_reg_mem_model);
>  void __xdp_return(void *data, struct xdp_mem_info *mem, bool napi_direct,
>  		  struct xdp_buff *xdp)
>  {
> +	struct netmem *nmem;
>  	struct page *page;
>
>  	switch (mem->type) {
>  	case MEM_TYPE_PAGE_POOL:
> -		page = virt_to_head_page(data);
> +		nmem = virt_to_netmem(data);
>  		if (napi_direct && xdp_return_frame_no_direct())
>  			napi_direct = false;
> -		/* No need to check ((page->pp_magic & ~0x3UL) == PP_SIGNATURE)
> +		/* No need to check ((nmem->pp_magic & ~0x3UL) == PP_SIGNATURE)
>  		 * as mem->type knows this a page_pool page
>  		 */
> -		page_pool_put_full_page(page->pp, page, napi_direct);
> +		page_pool_put_full_netmem(nmem->pp, nmem, napi_direct);
>  		break;
>  	case MEM_TYPE_PAGE_SHARED:
>  		page_frag_free(data);
> --
> 2.35.1
>

Reviewed-by: Ilias Apalodimas <ilias.apalodimas@...aro.org>