tcp_bpf: Charge receive socket buffer in bpf_tcp_ingress()
[ Upstream commit 54f89b3178d5448dd4457afbb98fc1ab99090a65 ]
When bpf_tcp_ingress() is called, the skmsg is being redirected to the
ingress of the destination socket. Therefore, we should charge its
receive socket buffer, instead of sending socket buffer.
Because sk_rmem_schedule() tests pfmemalloc of skb, we need to
introduce a wrapper and call it for skmsg.
Fixes: 604326b41a ("bpf, sockmap: convert to generic sk_msg interface")
Signed-off-by: Cong Wang <cong.wang@bytedance.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Reviewed-by: John Fastabend <john.fastabend@gmail.com>
Link: https://lore.kernel.org/bpf/20241210012039.1669389-2-zijianzhang@bytedance.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
987cf3869d
commit
35727f4506
+8
-2
@@ -1521,7 +1521,7 @@ static inline bool sk_wmem_schedule(struct sock *sk, int size)
|
|||||||
}
|
}
|
||||||
|
|
||||||
static inline bool
|
static inline bool
|
||||||
sk_rmem_schedule(struct sock *sk, struct sk_buff *skb, int size)
|
__sk_rmem_schedule(struct sock *sk, int size, bool pfmemalloc)
|
||||||
{
|
{
|
||||||
int delta;
|
int delta;
|
||||||
|
|
||||||
@@ -1529,7 +1529,13 @@ sk_rmem_schedule(struct sock *sk, struct sk_buff *skb, int size)
|
|||||||
return true;
|
return true;
|
||||||
delta = size - sk->sk_forward_alloc;
|
delta = size - sk->sk_forward_alloc;
|
||||||
return delta <= 0 || __sk_mem_schedule(sk, delta, SK_MEM_RECV) ||
|
return delta <= 0 || __sk_mem_schedule(sk, delta, SK_MEM_RECV) ||
|
||||||
skb_pfmemalloc(skb);
|
pfmemalloc;
|
||||||
|
}
|
||||||
|
|
||||||
|
static inline bool
|
||||||
|
sk_rmem_schedule(struct sock *sk, struct sk_buff *skb, int size)
|
||||||
|
{
|
||||||
|
return __sk_rmem_schedule(sk, size, skb_pfmemalloc(skb));
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline int sk_unused_reserved_mem(const struct sock *sk)
|
static inline int sk_unused_reserved_mem(const struct sock *sk)
|
||||||
|
|||||||
+1
-1
@@ -49,7 +49,7 @@ static int bpf_tcp_ingress(struct sock *sk, struct sk_psock *psock,
|
|||||||
sge = sk_msg_elem(msg, i);
|
sge = sk_msg_elem(msg, i);
|
||||||
size = (apply && apply_bytes < sge->length) ?
|
size = (apply && apply_bytes < sge->length) ?
|
||||||
apply_bytes : sge->length;
|
apply_bytes : sge->length;
|
||||||
if (!sk_wmem_schedule(sk, size)) {
|
if (!__sk_rmem_schedule(sk, size, false)) {
|
||||||
if (!copied)
|
if (!copied)
|
||||||
ret = -ENOMEM;
|
ret = -ENOMEM;
|
||||||
break;
|
break;
|
||||||
|
|||||||
Reference in New Issue
Block a user