From: Mina Almasry <[email protected]>
To: David Wei <[email protected]>
Cc: [email protected], [email protected],
Jens Axboe <[email protected]>,
Pavel Begunkov <[email protected]>,
Jakub Kicinski <[email protected]>,
Paolo Abeni <[email protected]>,
"David S. Miller" <[email protected]>,
Eric Dumazet <[email protected]>,
Jesper Dangaard Brouer <[email protected]>,
David Ahern <[email protected]>,
Stanislav Fomichev <[email protected]>,
Joe Damato <[email protected]>,
Pedro Tammela <[email protected]>
Subject: Re: [PATCH net-next v9 05/20] net: page_pool: add mp op for netlink reporting
Date: Mon, 6 Jan 2025 13:24:00 -0800 [thread overview]
Message-ID: <CAHS8izOh3uHbmbm=pjXTNdB1szL3EQ++ycEjiUMqa82b-akHsQ@mail.gmail.com> (raw)
In-Reply-To: <[email protected]>
On Tue, Dec 17, 2024 at 4:38 PM David Wei <[email protected]> wrote:
>
> From: Pavel Begunkov <[email protected]>
>
> Add a mandatory memory provider callback that prints information about
> the provider.
>
> Signed-off-by: Pavel Begunkov <[email protected]>
> Signed-off-by: David Wei <[email protected]>
Seems like a straightforward refactor to add the op that Jakub requested:
Reviewed-by: Mina Almasry <[email protected]>
> ---
> include/net/page_pool/types.h | 1 +
> net/core/devmem.c | 9 +++++++++
> net/core/page_pool_user.c | 3 +--
> 3 files changed, 11 insertions(+), 2 deletions(-)
>
> diff --git a/include/net/page_pool/types.h b/include/net/page_pool/types.h
> index d6241e8a5106..a473ea0c48c4 100644
> --- a/include/net/page_pool/types.h
> +++ b/include/net/page_pool/types.h
> @@ -157,6 +157,7 @@ struct memory_provider_ops {
> bool (*release_netmem)(struct page_pool *pool, netmem_ref netmem);
> int (*init)(struct page_pool *pool);
> void (*destroy)(struct page_pool *pool);
> + int (*nl_report)(const struct page_pool *pool, struct sk_buff *rsp);
> };
>
> struct pp_memory_provider_params {
> diff --git a/net/core/devmem.c b/net/core/devmem.c
> index 48903b7ab215..df51a6c312db 100644
> --- a/net/core/devmem.c
> +++ b/net/core/devmem.c
> @@ -394,9 +394,18 @@ bool mp_dmabuf_devmem_release_page(struct page_pool *pool, netmem_ref netmem)
> return false;
> }
>
> +static int mp_dmabuf_devmem_nl_report(const struct page_pool *pool,
> + struct sk_buff *rsp)
> +{
> + const struct net_devmem_dmabuf_binding *binding = pool->mp_priv;
> +
> + return nla_put_u32(rsp, NETDEV_A_PAGE_POOL_DMABUF, binding->id);
> +}
> +
> static const struct memory_provider_ops dmabuf_devmem_ops = {
> .init = mp_dmabuf_devmem_init,
> .destroy = mp_dmabuf_devmem_destroy,
> .alloc_netmems = mp_dmabuf_devmem_alloc_netmems,
> .release_netmem = mp_dmabuf_devmem_release_page,
> + .nl_report = mp_dmabuf_devmem_nl_report,
> };
> diff --git a/net/core/page_pool_user.c b/net/core/page_pool_user.c
> index 8d31c71bea1a..61212f388bc8 100644
> --- a/net/core/page_pool_user.c
> +++ b/net/core/page_pool_user.c
> @@ -214,7 +214,6 @@ static int
> page_pool_nl_fill(struct sk_buff *rsp, const struct page_pool *pool,
> const struct genl_info *info)
> {
> - struct net_devmem_dmabuf_binding *binding = pool->mp_priv;
> size_t inflight, refsz;
> void *hdr;
>
> @@ -244,7 +243,7 @@ page_pool_nl_fill(struct sk_buff *rsp, const struct page_pool *pool,
> pool->user.detach_time))
> goto err_cancel;
>
> - if (binding && nla_put_u32(rsp, NETDEV_A_PAGE_POOL_DMABUF, binding->id))
> + if (pool->mp_ops && pool->mp_ops->nl_report(pool, rsp))
> goto err_cancel;
>
I thought maybe you should check nl_report exists here so that we
don't crash if we accidentally merge a memory provider that doesn't
define this, but the commit message says it's mandatory and we don't
check the existence of the other ops anyway, so this is probably fine.
--
Thanks,
Mina
next prev parent reply other threads:[~2025-01-06 21:24 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-12-18 0:37 [PATCH RESEND net-next v9 00/21] io_uring zero copy rx David Wei
2024-12-18 0:37 ` [PATCH net-next v9 01/20] net: page_pool: don't cast mp param to devmem David Wei
2024-12-20 22:04 ` Jakub Kicinski
2025-01-06 20:45 ` Mina Almasry
2024-12-18 0:37 ` [PATCH net-next v9 02/20] net: prefix devmem specific helpers David Wei
2024-12-20 22:05 ` Jakub Kicinski
2024-12-18 0:37 ` [PATCH net-next v9 03/20] net: generalise net_iov chunk owners David Wei
2024-12-20 22:14 ` Jakub Kicinski
2024-12-21 0:50 ` Pavel Begunkov
2024-12-21 2:17 ` Jakub Kicinski
2025-01-02 15:52 ` Pavel Begunkov
2025-01-06 21:05 ` Mina Almasry
2024-12-18 0:37 ` [PATCH net-next v9 04/20] net: page_pool: create hooks for custom page providers David Wei
2025-01-02 15:54 ` Pavel Begunkov
2024-12-18 0:37 ` [PATCH net-next v9 05/20] net: page_pool: add mp op for netlink reporting David Wei
2024-12-20 22:16 ` Jakub Kicinski
2025-01-06 23:21 ` David Wei
2025-01-06 21:24 ` Mina Almasry [this message]
2024-12-18 0:37 ` [PATCH net-next v9 06/20] net: page_pool: add a mp hook to unregister_netdevice* David Wei
2024-12-20 22:18 ` Jakub Kicinski
2025-01-06 21:44 ` Mina Almasry
2025-01-06 23:34 ` David Wei
2025-01-06 23:39 ` Pavel Begunkov
2024-12-18 0:37 ` [PATCH net-next v9 07/20] net: prepare for non devmem TCP memory providers David Wei
2024-12-20 22:18 ` Jakub Kicinski
2024-12-18 0:37 ` [PATCH net-next v9 08/20] net: expose page_pool_{set,clear}_pp_info David Wei
2024-12-20 22:31 ` Jakub Kicinski
2024-12-21 1:07 ` Pavel Begunkov
2024-12-21 2:23 ` Jakub Kicinski
2025-01-02 16:21 ` Pavel Begunkov
2025-01-06 22:17 ` Mina Almasry
2025-01-06 23:48 ` Pavel Begunkov
2024-12-18 0:37 ` [PATCH net-next v9 09/20] net: page_pool: introduce page_pool_mp_return_in_cache David Wei
2024-12-18 0:37 ` [PATCH net-next v9 10/20] io_uring/zcrx: add interface queue and refill queue David Wei
2024-12-18 0:37 ` [PATCH net-next v9 11/20] io_uring/zcrx: add io_zcrx_area David Wei
2025-01-06 22:46 ` Mina Almasry
2025-01-07 0:04 ` Pavel Begunkov
2024-12-18 0:37 ` [PATCH net-next v9 12/20] io_uring/zcrx: grab a net device David Wei
2024-12-18 0:37 ` [PATCH net-next v9 13/20] net: page pool: export page_pool_set_dma_addr_netmem() David Wei
2024-12-18 0:37 ` [PATCH net-next v9 14/20] io_uring/zcrx: dma-map area for the device David Wei
2024-12-20 22:38 ` Jakub Kicinski
2024-12-21 1:04 ` Pavel Begunkov
2024-12-18 0:37 ` [PATCH net-next v9 15/20] io_uring/zcrx: add io_recvzc request David Wei
2024-12-18 0:37 ` [PATCH net-next v9 16/20] io_uring/zcrx: set pp memory provider for an rx queue David Wei
2024-12-18 0:37 ` [PATCH net-next v9 17/20] io_uring/zcrx: throttle receive requests David Wei
2024-12-18 0:37 ` [PATCH net-next v9 18/20] io_uring/zcrx: add copy fallback David Wei
2024-12-18 0:37 ` [PATCH net-next v9 19/20] net: add documentation for io_uring zcrx David Wei
2024-12-18 0:37 ` [PATCH net-next v9 20/20] io_uring/zcrx: add selftest David Wei
2024-12-18 14:40 ` [PATCH RESEND net-next v9 00/21] io_uring zero copy rx Jens Axboe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAHS8izOh3uHbmbm=pjXTNdB1szL3EQ++ycEjiUMqa82b-akHsQ@mail.gmail.com' \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox