On 3/5/25 09:20, Hannes Reinecke wrote:

quoted

On 3/4/25 20:44, Vlastimil Babka wrote:

quoted

On 3/4/25 20:39, Hannes Reinecke wrote:

[ .. ]

quoted

quoted

Good news and bad news ...
Good news: TLS works again!
Bad news: no errors.

Wait, did you add a WARN_ON_ONCE() to the put_page() as I suggested? If yes
and there was no error, it would have to be leaking the page. Or the path
uses folio_put() and we'd need to put the warning there.

That triggers:

...

quoted

Not surprisingly, though, as the original code did a get_page(), so
there had to be a corresponding put_page() somewhere.

Is is this one? If there's no more warning afterwards, that should be it.

diff --git a/net/core/skmsg.c b/net/core/skmsg.c
index 61f3f3d4e528..b37d99cec069 100644
--- a/net/core/skmsg.c
+++ b/net/core/skmsg.c

@@ -182,9 +182,14 @@ static int sk_msg_free_elem(struct sock *sk, struct sk_msg *msg, u32 i,
  
         /* When the skb owns the memory we free it from consume_skb path. */
         if (!msg->skb) {
+               struct folio *folio;
+
                 if (charge)
                         sk_mem_uncharge(sk, len);
-               put_page(sg_page(sge));
+
+               folio = page_folio(sg_page(sge));
+               if (!folio_test_slab(folio))
+                       folio_put(folio);
         }
         memset(sge, 0, sizeof(*sge));
         return len;