* [PATCH net v2] rxrpc: Also unshare DATA/RESPONSE packets when paged frags are present
@ 2026-05-08 6:42 Hyunwoo Kim
2026-05-08 7:58 ` Jiayuan Chen
0 siblings, 1 reply; 3+ messages in thread
From: Hyunwoo Kim @ 2026-05-08 6:42 UTC (permalink / raw)
To: dhowells, marc.dionne, davem, edumazet, kuba, pabeni, horms,
qingfang.deng
Cc: linux-afs, netdev, stable, imv4bel
The DATA-packet handler in rxrpc_input_call_event() and the RESPONSE
handler in rxrpc_verify_response() copy the skb to a linear one before
calling into the security ops only when skb_cloned() is true. An skb
that is not cloned but still carries paged fragments (skb->data_len != 0)
falls through to the in-place decryption path, which binds the frag
pages directly into the AEAD/skcipher SGL via skb_to_sgvec().
Extend the gate so that any skb with non-linear data is also copied,
ensuring the security handler always operates on a fully linear skb.
The OOM/trace handling already in place is reused.
Fixes: d0d5c0cd1e71 ("rxrpc: Use skb_unshare() rather than skb_cow_data()")
Cc: stable@vger.kernel.org
Signed-off-by: Hyunwoo Kim <imv4bel@gmail.com>
---
Changes in v2:
- Use skb_is_nonlinear() instead of skb->data_len
- v1: https://lore.kernel.org/all/afKV2zGR6rrelPC7@v4bel/
---
net/rxrpc/call_event.c | 2 +-
net/rxrpc/conn_event.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/rxrpc/call_event.c b/net/rxrpc/call_event.c
index fdd683261226..a6ad5ff6ec5f 100644
--- a/net/rxrpc/call_event.c
+++ b/net/rxrpc/call_event.c
@@ -334,7 +334,7 @@ bool rxrpc_input_call_event(struct rxrpc_call *call)
if (sp->hdr.type == RXRPC_PACKET_TYPE_DATA &&
sp->hdr.securityIndex != 0 &&
- skb_cloned(skb)) {
+ (skb_cloned(skb) || skb_is_nonlinear(skb))) {
/* Unshare the packet so that it can be
* modified by in-place decryption.
*/
diff --git a/net/rxrpc/conn_event.c b/net/rxrpc/conn_event.c
index a2130d25aaa9..632cbeff1f5d 100644
--- a/net/rxrpc/conn_event.c
+++ b/net/rxrpc/conn_event.c
@@ -245,7 +245,7 @@ static int rxrpc_verify_response(struct rxrpc_connection *conn,
{
int ret;
- if (skb_cloned(skb)) {
+ if (skb_cloned(skb) || skb_is_nonlinear(skb)) {
/* Copy the packet if shared so that we can do in-place
* decryption.
*/
--
2.43.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH net v2] rxrpc: Also unshare DATA/RESPONSE packets when paged frags are present
2026-05-08 6:42 [PATCH net v2] rxrpc: Also unshare DATA/RESPONSE packets when paged frags are present Hyunwoo Kim
@ 2026-05-08 7:58 ` Jiayuan Chen
2026-05-08 8:05 ` Hyunwoo Kim
0 siblings, 1 reply; 3+ messages in thread
From: Jiayuan Chen @ 2026-05-08 7:58 UTC (permalink / raw)
To: Hyunwoo Kim, dhowells, marc.dionne, davem, edumazet, kuba, pabeni,
horms, qingfang.deng
Cc: linux-afs, netdev, stable
On 5/8/26 2:42 PM, Hyunwoo Kim wrote:
> The DATA-packet handler in rxrpc_input_call_event() and the RESPONSE
> handler in rxrpc_verify_response() copy the skb to a linear one before
> calling into the security ops only when skb_cloned() is true. An skb
> that is not cloned but still carries paged fragments (skb->data_len != 0)
> falls through to the in-place decryption path, which binds the frag
> pages directly into the AEAD/skcipher SGL via skb_to_sgvec().
>
> Extend the gate so that any skb with non-linear data is also copied,
> ensuring the security handler always operates on a fully linear skb.
> The OOM/trace handling already in place is reused.
>
> Fixes: d0d5c0cd1e71 ("rxrpc: Use skb_unshare() rather than skb_cow_data()")
> Cc: stable@vger.kernel.org
> Signed-off-by: Hyunwoo Kim <imv4bel@gmail.com>
> ---
> Changes in v2:
> - Use skb_is_nonlinear() instead of skb->data_len
> - v1: https://lore.kernel.org/all/afKV2zGR6rrelPC7@v4bel/
> ---
> net/rxrpc/call_event.c | 2 +-
> net/rxrpc/conn_event.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/net/rxrpc/call_event.c b/net/rxrpc/call_event.c
> index fdd683261226..a6ad5ff6ec5f 100644
> --- a/net/rxrpc/call_event.c
> +++ b/net/rxrpc/call_event.c
> @@ -334,7 +334,7 @@ bool rxrpc_input_call_event(struct rxrpc_call *call)
>
> if (sp->hdr.type == RXRPC_PACKET_TYPE_DATA &&
> sp->hdr.securityIndex != 0 &&
> - skb_cloned(skb)) {
> + (skb_cloned(skb) || skb_is_nonlinear(skb))) {
> /* Unshare the packet so that it can be
> * modified by in-place decryption.
> */
> diff --git a/net/rxrpc/conn_event.c b/net/rxrpc/conn_event.c
> index a2130d25aaa9..632cbeff1f5d 100644
> --- a/net/rxrpc/conn_event.c
> +++ b/net/rxrpc/conn_event.c
> @@ -245,7 +245,7 @@ static int rxrpc_verify_response(struct rxrpc_connection *conn,
> {
> int ret;
>
> - if (skb_cloned(skb)) {
> + if (skb_cloned(skb) || skb_is_nonlinear(skb)) {
> /* Copy the packet if shared so that we can do in-place
> * decryption.
> */
Why not adopt the same gate as the ESP fix:
skb_cloned(skb) || skb_has_frag_list(skb) || skb_has_shared_frag(skb)
so NIC page_pool RX keeps its zero-copy path while still catching the
splice-loopback vector?
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH net v2] rxrpc: Also unshare DATA/RESPONSE packets when paged frags are present
2026-05-08 7:58 ` Jiayuan Chen
@ 2026-05-08 8:05 ` Hyunwoo Kim
0 siblings, 0 replies; 3+ messages in thread
From: Hyunwoo Kim @ 2026-05-08 8:05 UTC (permalink / raw)
To: Jiayuan Chen
Cc: dhowells, marc.dionne, davem, edumazet, kuba, pabeni, horms,
qingfang.deng, linux-afs, netdev, stable, imv4bel
On Fri, May 08, 2026 at 03:58:34PM +0800, Jiayuan Chen wrote:
>
> On 5/8/26 2:42 PM, Hyunwoo Kim wrote:
> > The DATA-packet handler in rxrpc_input_call_event() and the RESPONSE
> > handler in rxrpc_verify_response() copy the skb to a linear one before
> > calling into the security ops only when skb_cloned() is true. An skb
> > that is not cloned but still carries paged fragments (skb->data_len != 0)
> > falls through to the in-place decryption path, which binds the frag
> > pages directly into the AEAD/skcipher SGL via skb_to_sgvec().
> >
> > Extend the gate so that any skb with non-linear data is also copied,
> > ensuring the security handler always operates on a fully linear skb.
> > The OOM/trace handling already in place is reused.
> >
> > Fixes: d0d5c0cd1e71 ("rxrpc: Use skb_unshare() rather than skb_cow_data()")
> > Cc: stable@vger.kernel.org
> > Signed-off-by: Hyunwoo Kim <imv4bel@gmail.com>
> > ---
> > Changes in v2:
> > - Use skb_is_nonlinear() instead of skb->data_len
> > - v1: https://lore.kernel.org/all/afKV2zGR6rrelPC7@v4bel/
> > ---
> > net/rxrpc/call_event.c | 2 +-
> > net/rxrpc/conn_event.c | 2 +-
> > 2 files changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/net/rxrpc/call_event.c b/net/rxrpc/call_event.c
> > index fdd683261226..a6ad5ff6ec5f 100644
> > --- a/net/rxrpc/call_event.c
> > +++ b/net/rxrpc/call_event.c
> > @@ -334,7 +334,7 @@ bool rxrpc_input_call_event(struct rxrpc_call *call)
> > if (sp->hdr.type == RXRPC_PACKET_TYPE_DATA &&
> > sp->hdr.securityIndex != 0 &&
> > - skb_cloned(skb)) {
> > + (skb_cloned(skb) || skb_is_nonlinear(skb))) {
> > /* Unshare the packet so that it can be
> > * modified by in-place decryption.
> > */
> > diff --git a/net/rxrpc/conn_event.c b/net/rxrpc/conn_event.c
> > index a2130d25aaa9..632cbeff1f5d 100644
> > --- a/net/rxrpc/conn_event.c
> > +++ b/net/rxrpc/conn_event.c
> > @@ -245,7 +245,7 @@ static int rxrpc_verify_response(struct rxrpc_connection *conn,
> > {
> > int ret;
> > - if (skb_cloned(skb)) {
> > + if (skb_cloned(skb) || skb_is_nonlinear(skb)) {
> > /* Copy the packet if shared so that we can do in-place
> > * decryption.
> > */
>
>
> Why not adopt the same gate as the ESP fix:
>
>
> skb_cloned(skb) || skb_has_frag_list(skb) || skb_has_shared_frag(skb)
>
>
> so NIC page_pool RX keeps its zero-copy path while still catching the
> splice-loopback vector?
Yeah, that approach preserves the fast path. I'll test and submit v3.
Best regards,
Hyunwoo Kim
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2026-05-08 8:05 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-05-08 6:42 [PATCH net v2] rxrpc: Also unshare DATA/RESPONSE packets when paged frags are present Hyunwoo Kim
2026-05-08 7:58 ` Jiayuan Chen
2026-05-08 8:05 ` Hyunwoo Kim
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox