Skip to contentSkip to conversation

net: ipa: older backports to fix page free

PATCH New Alex Elder 1 participant 3 messages Jun 6, 2022

Subsystems (3)
lore
Share & tools
lore

Alex Elder

author
#0 lore raw

cover net: ipa: older backports to fix page free

This series back-ports two bug fixes, which are now in v5.19-rc1 but do not back-port cleanly to older releases. This commit applies cleanly to v5.17.13, v5.15.45, and v5.10.120.

-Alex

Alex Elder (2):
net: ipa: fix page free in ipa_endpoint_trans_release()
net: ipa: fix page free in ipa_endpoint_replenish_one()

 drivers/net/ipa/ipa_endpoint.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Signature · 1 line
2.32.0
author
#1 lore raw

PATCH 1/2 net: ipa: fix page free in ipa_endpoint_trans_release()

commit 155c0c90bca918de6e4327275dfc1d97fd604115 upstream.

Currently the (possibly compound) page used for receive buffers are freed using __free_pages(). But according to this comment above the definition of that function, that's wrong:
If you want to use the page's reference count to decide when to free the allocation, you should allocate a compound page, and use put_page() instead of __free_pages().

Convert the call to __free_pages() in ipa_endpoint_trans_release() to use put_page() instead.

Fixes ed23f02680caa ("net: ipa: define per-endpoint receive buffer size")
Cc <[email protected]> # 5.10.x
Cc <[email protected]> # 5.15.x
Cc <[email protected]> # 5.17.x
---
 drivers/net/ipa/ipa_endpoint.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ipa/ipa_endpoint.c +1 -1
index dde55ccae9d73..51ad51ddf758a 100644
@@ -1400,7 +1400,7 @@ void ipa_endpoint_trans_release(struct ipa_endpoint *endpoint,
 		struct page *page = trans->data;
 
 		if (page)
-			__free_pages(page, get_order(IPA_RX_BUFFER_SIZE));
+			put_page(page);
 	}
 }
 
Signature · 1 line
2.32.0
author
#2 lore raw

PATCH 2/2 net: ipa: fix page free in ipa_endpoint_replenish_one()

In reply to Alex Elder

commit 70132763d5d2e94cd185e3aa92ac6a3ba89068fa upstream.

Currently the (possibly compound) pages used for receive buffers are freed using __free_pages(). But according to this comment above the definition of that function, that's wrong:
If you want to use the page's reference count to decide when to free the allocation, you should allocate a compound page, and use put_page() instead of __free_pages().

Convert the call to __free_pages() in ipa_endpoint_replenish_one() to use put_page() instead.

Fixes 6a606b90153b8 ("net: ipa: allocate transaction in replenish loop")
Cc <[email protected]> # 5.10.x
Cc <[email protected]> # 5.15.x
Cc <[email protected]> # 5.17.x
---
 drivers/net/ipa/ipa_endpoint.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ipa/ipa_endpoint.c +1 -1
index 51ad51ddf758a..3378899def346 100644
@@ -1060,7 +1060,7 @@ static int ipa_endpoint_replenish_one(struct ipa_endpoint *endpoint)
 err_trans_free:
 	gsi_trans_free(trans);
 err_free_pages:
-	__free_pages(page, get_order(IPA_RX_BUFFER_SIZE));
+	put_page(page);
 
 	return -ENOMEM;
 }
Signature · 1 line
2.32.0