From b5e153a5c8eefb9fe9f6e1ea592898cac9f8cf13 Mon Sep 17 00:00:00 2001 From: Sabrina Dubroca Date: Thu, 1 Oct 2026 09:57:27 +0200 Subject: [PATCH] net: strparser: remove strp_process() It's unused. Then we can revert the changes that commit bbb03029a899 ("strparser: Generalize strparser") did to extract __strp_recv(). Signed-off-by: Sabrina Dubroca Link: https://patch.msgid.link/04c57c1e928ec2a94a71413b49b6bec68a71c39d.1790702233.git.sd@queasysnail.net Signed-off-by: Jakub Kicinski --- include/net/strparser.h | 3 --- net/strparser/strparser.c | 30 ++++-------------------------- 2 files changed, 4 insertions(+), 29 deletions(-) diff --git a/include/net/strparser.h b/include/net/strparser.h index 78e8e3e12ed3..a72dff8e6a3f 100644 --- a/include/net/strparser.h +++ b/include/net/strparser.h @@ -160,8 +160,5 @@ void strp_check_rcv(struct strparser *strp); int strp_init(struct strparser *strp, struct sock *sk, const struct strp_callbacks *cb); void strp_data_ready(struct strparser *strp); -int strp_process(struct strparser *strp, struct sk_buff *orig_skb, - unsigned int orig_offset, size_t orig_len, - size_t max_msg_size, long timeo); #endif /* __NET_STRPARSER_H_ */ diff --git a/net/strparser/strparser.c b/net/strparser/strparser.c index 6cdbd12f41e0..80f7555f9670 100644 --- a/net/strparser/strparser.c +++ b/net/strparser/strparser.c @@ -84,11 +84,11 @@ static inline int strp_peek_len(struct strparser *strp) } /* Lower socket lock held */ -static int __strp_recv(read_descriptor_t *desc, struct sk_buff *orig_skb, - unsigned int orig_offset, size_t orig_len, - size_t max_msg_size, long timeo) +static int strp_recv(read_descriptor_t *desc, struct sk_buff *orig_skb, + unsigned int orig_offset, size_t orig_len) { struct strparser *strp = (struct strparser *)desc->arg.data; + long timeo = READ_ONCE(strp->sk->sk_rcvtimeo); struct _strp_msg *stm; struct sk_buff *head, *skb; size_t eaten = 0, cand_len; @@ -230,7 +230,7 @@ static int __strp_recv(read_descriptor_t *desc, struct sk_buff *orig_skb, } strp_parser_err(strp, len, desc); break; - } else if (len > max_msg_size) { + } else if (len > strp->sk->sk_rcvbuf) { /* Message length exceeds maximum allowed */ STRP_STATS_INCR(strp->stats.msg_too_big); strp_parser_err(strp, -EMSGSIZE, desc); @@ -312,28 +312,6 @@ static int __strp_recv(read_descriptor_t *desc, struct sk_buff *orig_skb, return eaten; } -int strp_process(struct strparser *strp, struct sk_buff *orig_skb, - unsigned int orig_offset, size_t orig_len, - size_t max_msg_size, long timeo) -{ - read_descriptor_t desc; /* Dummy arg to strp_recv */ - - desc.arg.data = strp; - - return __strp_recv(&desc, orig_skb, orig_offset, orig_len, - max_msg_size, timeo); -} -EXPORT_SYMBOL_GPL(strp_process); - -static int strp_recv(read_descriptor_t *desc, struct sk_buff *orig_skb, - unsigned int orig_offset, size_t orig_len) -{ - struct strparser *strp = (struct strparser *)desc->arg.data; - - return __strp_recv(desc, orig_skb, orig_offset, orig_len, - strp->sk->sk_rcvbuf, READ_ONCE(strp->sk->sk_rcvtimeo)); -} - static int default_read_sock_done(struct strparser *strp, int err) { return err;