iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: simplify sk_page_frag

Browse Source 
Now that in-kernel socket users that may recurse during reclaim have benn
converted to sk_use_task_frag = false, we can have sk_page_frag() simply
check that value.

Signed-off-by: Benjamin Coddington <bcodding@redhat.com>
Reviewed-by: Guillaume Nault <gnault@redhat.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Benjamin Coddington 2022-12-16 07:45:28 -05:00 committed by Jakub Kicinski
parent 98123866fc
commit 08f65892c5
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/net/sock.h
View File

@ -2564,19 +2564,14 @@ static inline void sk_stream_moderate_sndbuf(struct sock *sk)
* Both direct reclaim and page faults can nest inside other
* socket operations and end up recursing into sk_page_frag()
* while it's already in use: explicitly avoid task page_frag
* usage if the caller is potentially doing any of them.
* This assumes that page fault handlers use the GFP_NOFS flags or
* explicitly disable sk_use_task_frag.
* when users disable sk_use_task_frag.
*
* Return: a per task page_frag if context allows that,
* otherwise a per socket one.
*/
static inline struct page_frag *sk_page_frag(struct sock *sk)
{
if (sk->sk_use_task_frag &&
(sk->sk_allocation & (__GFP_DIRECT_RECLAIM | __GFP_MEMALLOC |
__GFP_FS)) ==
(__GFP_DIRECT_RECLAIM | __GFP_FS))
if (sk->sk_use_task_frag)
return &current->task_frag;
return &sk->sk_frag;