Re: [PATCH bpf v7 2/5] bpf: fix wrong copied_seq calculation

[Jiayuan Chen]

On Sat, Jan 18, 2025 at 03:50:22PM +0100, Jakub Sitnicki wrote:
> On Thu, Jan 16, 2025 at 10:05 PM +08, Jiayuan Chen wrote:
> > 'sk->copied_seq' was updated in the tcp_eat_skb() function when the
> > action of a BPF program was SK_REDIRECT. For other actions, like SK_PASS,
> > +}
> > +#endif /* CONFIG_BPF_STREAM_PARSER */
> > +
> >  int tcp_bpf_update_proto(struct sock *sk, struct sk_psock *psock, bool restore)
> >  {
> >  	int family = sk->sk_family == AF_INET6 ? TCP_BPF_IPV6 : TCP_BPF_IPV4;
> > @@ -681,6 +722,12 @@ int tcp_bpf_update_proto(struct sock *sk, struct sk_psock *psock, bool restore)
> >  
> >  	/* Pairs with lockless read in sk_clone_lock() */
> >  	sock_replace_proto(sk, &tcp_bpf_prots[family][config]);
> > +#if IS_ENABLED(CONFIG_BPF_STREAM_PARSER)
> > +	if (psock->progs.stream_parser && psock->progs.stream_verdict) {
> > +		psock->copied_seq = tcp_sk(sk)->copied_seq;
> > +		psock->read_sock = tcp_bpf_strp_read_sock;
> 
> Just directly set psock->strp.cb.read_sock to tcp_bpf_strp_read_sock.
> Then we don't need this intermediate psock->read_sock callback, which
> doesn't do anything useful.
>
Ok, I will do this.
(BTW, I intended to avoid bringing "struct strparser" into tcp_bpf.c so I
added a wrapper function instead in skmsg.c without calling it directly) 
> > +	}
> > +#endif
> >  	return 0;
> >  }
> >  EXPORT_SYMBOL_GPL(tcp_bpf_update_proto);