[net-next,v3,0/3] Minor cleanups to skb frag ref/unref

Message

Mina Almasry April 1, 2024, 9:50 p.m. UTC

v3:
- Fixed patchwork build errors/warnings from patch-by-patch modallconfig
  build

v2:
- Removed RFC tag.
- Rebased on net-next after the merge window opening.
- Added 1 patch at the beginning, "net: make napi_frag_unref reuse
  skb_page_unref" because a recent patch introduced some code
  duplication that can also be improved.
- Addressed feedback from Dragos & Yunsheng.
- Added Dragos's Reviewed-by.

This series is largely motivated by a recent discussion where there was
some confusion on how to properly ref/unref pp pages vs non pp pages:

https://lore.kernel.org/netdev/[e-mail]/T/#t

There is some subtely there because pp uses page->pp_ref_count for
refcounting, while non-pp uses get_page()/put_page() for ref counting.
Getting the refcounting pairs wrong can lead to kernel crash.

Additionally currently it may not be obvious to skb users unaware of
page pool internals how to properly acquire a ref on a pp frag. It
requires checking of skb->pp_recycle & is_pp_page() to make the correct
calls and may require some handling at the call site aware of arguable pp
internals.

This series is a minor refactor with a couple of goals:

1. skb users should be able to ref/unref a frag using
   [__]skb_frag_[un]ref() functions without needing to understand pp
   concepts and pp_ref_count vs get/put_page() differences.

2. reference counting functions should have a mirror opposite. I.e. there
   should be a foo_unref() to every foo_ref() with a mirror opposite
   implementation (as much as possible).

This is RFC to collect feedback if this change is desirable, but also so
that I don't race with the fix for the issue Dragos is seeing for his
crash.

https://lore.kernel.org/lkml/[e-mail]/T/

Cc: Dragos Tatulea <[e-mail]>

Mina Almasry (3):
  net: make napi_frag_unref reuse skb_page_unref
  net: mirror skb frag ref/unref helpers
  net: remove napi_frag_unref

 .../chelsio/inline_crypto/ch_ktls/chcr_ktls.c |  2 +-
 drivers/net/ethernet/marvell/sky2.c           |  2 +-
 drivers/net/ethernet/mellanox/mlx4/en_rx.c    |  2 +-
 drivers/net/ethernet/sun/cassini.c            |  4 +-
 drivers/net/veth.c                            |  2 +-
 include/linux/skbuff.h                        | 44 +++++++-------
 net/core/skbuff.c                             | 58 ++++++-------------
 net/ipv4/esp4.c                               |  2 +-
 net/ipv6/esp6.c                               |  2 +-
 net/tls/tls_device.c                          |  2 +-
 net/tls/tls_device_fallback.c                 |  2 +-
 net/tls/tls_strp.c                            |  2 +-
 12 files changed, 54 insertions(+), 70 deletions(-)

Comments

Jakub Kicinski April 3, 2024, 2:10 a.m. UTC | #1

On Mon,  1 Apr 2024 14:50:36 -0700 Mina Almasry wrote:
> This series is largely motivated by a recent discussion where there was
> some confusion on how to properly ref/unref pp pages vs non pp pages:
> 
> https://lore.kernel.org/netdev/[e-mail]/T/#t
> 
> There is some subtely there because pp uses page->pp_ref_count for
> refcounting, while non-pp uses get_page()/put_page() for ref counting.
> Getting the refcounting pairs wrong can lead to kernel crash.
> 
> Additionally currently it may not be obvious to skb users unaware of
> page pool internals how to properly acquire a ref on a pp frag. It
> requires checking of skb->pp_recycle & is_pp_page() to make the correct
> calls and may require some handling at the call site aware of arguable pp
> internals.

I concluded that Olek's series as good to go in, so you gotta rebase.