Re: [PATCH net-next v10 06/14] page_pool: convert to use netmem

On Thu, 2024-05-30 at 20:16 +0000, Mina Almasry wrote:

diff --git a/include/trace/events/page_pool.h b/include/trace/events/page_pool.h index 6834356b2d2ae..c5b6383ff2760 100644 --- a/include/trace/events/page_pool.h +++ b/include/trace/events/page_pool.h @@ -42,51 +42,52 @@ TRACE_EVENT(page_pool_release, TRACE_EVENT(page_pool_state_release, TP_PROTO(const struct page_pool *pool,

•  const struct page *page, u32 release),
  

•  netmem_ref netmem, u32 release),
  

This causes a sparse warning, as the caller is still passing a 'page' argument.

• TP_ARGS(pool, page, release),

• TP_ARGS(pool, netmem, release),

TP_STRUCT__entry( __field(const struct page_pool *, pool)

• __field(const struct page *,		page)
  

• __field(netmem_ref,			netmem)
  

  __field(u32, release) __field(unsigned long, pfn) ),

TP_fast_assign( __entry->pool = pool;

• __entry->page		= page;
  

• __entry->netmem		= netmem;
  

  __entry->release = release;

• __entry->pfn		= page_to_pfn(page);
  

• __entry->pfn		= netmem_to_pfn(netmem);
  

  ),

• TP_printk("page_pool=%p page=%p pfn=0x%lx release=%u",

•   __entry->pool, __entry->page, __entry->pfn, __entry->release)
  

• TP_printk("page_pool=%p netmem=%lu pfn=0x%lx release=%u",

•   __entry->pool, (__force unsigned long)__entry->netmem,
  

•   __entry->pfn, __entry->release)
  

); TRACE_EVENT(page_pool_state_hold, TP_PROTO(const struct page_pool *pool,

•  const struct page *page, u32 hold),
  

•  netmem_ref netmem, u32 hold),
  

Same here.

Thanks,

Paolo