diff options
| author | Ingo Molnar <mingo@kernel.org> | 2025-03-04 11:15:26 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2025-03-04 11:15:26 +0100 |
| commit | 1b4c36f9b11e4a68f6174d1b6542b50cd29cddd2 (patch) | |
| tree | 735b11a744d0acd18a1d7b7a4a5fa63fc6d23b92 /net/core/skmsg.c | |
| parent | d0ba9bcf001c7907e4755b0e498f5ff9d1a228ef (diff) | |
| parent | f6bdaab79ee4228a143ee1b4cb80416d6ffc0c63 (diff) | |
Merge branch 'x86/urgent' into x86/cpu, to pick up dependent commits
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/core/skmsg.c')
| -rw-r--r-- | net/core/skmsg.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/net/core/skmsg.c b/net/core/skmsg.c index 61f3f3d4e528..0ddc4c718833 100644 --- a/net/core/skmsg.c +++ b/net/core/skmsg.c @@ -549,6 +549,9 @@ static int sk_psock_skb_ingress_enqueue(struct sk_buff *skb, return num_sge; } +#if IS_ENABLED(CONFIG_BPF_STREAM_PARSER) + psock->ingress_bytes += len; +#endif copied = len; msg->sg.start = 0; msg->sg.size = copied; @@ -1144,6 +1147,10 @@ int sk_psock_init_strp(struct sock *sk, struct sk_psock *psock) if (!ret) sk_psock_set_state(psock, SK_PSOCK_RX_STRP_ENABLED); + if (sk_is_tcp(sk)) { + psock->strp.cb.read_sock = tcp_bpf_strp_read_sock; + psock->copied_seq = tcp_sk(sk)->copied_seq; + } return ret; } |