diff mbox series

[bpf] bpf, sockmap: Fix bug that strp_done cannot be called

Message ID 20230728105717.3978849-1-xukuohai@huaweicloud.com (mailing list archive)
State Changes Requested
Delegated to: BPF
Headers show
Series [bpf] bpf, sockmap: Fix bug that strp_done cannot be called | expand

Checks

Context Check Description
netdev/series_format success Single patches do not need cover letters
netdev/tree_selection success Clearly marked for bpf
netdev/fixes_present success Fixes tag present in non-next series
netdev/header_inline success No static functions without inline keyword in header files
netdev/build_32bit success Errors and warnings before: 1382 this patch: 1382
netdev/cc_maintainers success CCed 9 of 9 maintainers
netdev/build_clang success Errors and warnings before: 1365 this patch: 1365
netdev/verify_signedoff success Signed-off-by tag matches author and committer
netdev/deprecated_api success None detected
netdev/check_selftest success No net selftest shell script
netdev/verify_fixes success Fixes tag looks correct
netdev/build_allmodconfig_warn success Errors and warnings before: 1405 this patch: 1405
netdev/checkpatch success total: 0 errors, 0 warnings, 0 checks, 35 lines checked
netdev/kdoc success Errors and warnings before: 0 this patch: 0
netdev/source_inline success Was 0 now: 0
bpf/vmtest-bpf-VM_Test-1 success Logs for ShellCheck
bpf/vmtest-bpf-VM_Test-2 success Logs for build for aarch64 with gcc
bpf/vmtest-bpf-VM_Test-5 success Logs for build for x86_64 with llvm-16
bpf/vmtest-bpf-VM_Test-6 success Logs for set-matrix
bpf/vmtest-bpf-VM_Test-4 success Logs for build for x86_64 with gcc
bpf/vmtest-bpf-VM_Test-3 success Logs for build for s390x with gcc
bpf/vmtest-bpf-VM_Test-7 success Logs for test_maps on aarch64 with gcc
bpf/vmtest-bpf-VM_Test-9 success Logs for test_maps on x86_64 with gcc
bpf/vmtest-bpf-VM_Test-10 success Logs for test_maps on x86_64 with llvm-16
bpf/vmtest-bpf-VM_Test-14 success Logs for test_progs on x86_64 with llvm-16
bpf/vmtest-bpf-VM_Test-15 success Logs for test_progs_no_alu32 on aarch64 with gcc
bpf/vmtest-bpf-VM_Test-17 success Logs for test_progs_no_alu32 on x86_64 with gcc
bpf/vmtest-bpf-VM_Test-18 success Logs for test_progs_no_alu32 on x86_64 with llvm-16
bpf/vmtest-bpf-VM_Test-19 success Logs for test_progs_no_alu32_parallel on aarch64 with gcc
bpf/vmtest-bpf-VM_Test-20 success Logs for test_progs_no_alu32_parallel on x86_64 with gcc
bpf/vmtest-bpf-VM_Test-21 success Logs for test_progs_no_alu32_parallel on x86_64 with llvm-16
bpf/vmtest-bpf-VM_Test-22 success Logs for test_progs_parallel on aarch64 with gcc
bpf/vmtest-bpf-VM_Test-23 success Logs for test_progs_parallel on x86_64 with gcc
bpf/vmtest-bpf-VM_Test-24 success Logs for test_progs_parallel on x86_64 with llvm-16
bpf/vmtest-bpf-VM_Test-25 success Logs for test_verifier on aarch64 with gcc
bpf/vmtest-bpf-VM_Test-27 success Logs for test_verifier on x86_64 with gcc
bpf/vmtest-bpf-VM_Test-28 success Logs for test_verifier on x86_64 with llvm-16
bpf/vmtest-bpf-VM_Test-29 success Logs for veristat
bpf/vmtest-bpf-VM_Test-11 success Logs for test_progs on aarch64 with gcc
bpf/vmtest-bpf-VM_Test-13 success Logs for test_progs on x86_64 with gcc
bpf/vmtest-bpf-VM_Test-26 success Logs for test_verifier on s390x with gcc
bpf/vmtest-bpf-VM_Test-12 success Logs for test_progs on s390x with gcc
bpf/vmtest-bpf-VM_Test-16 success Logs for test_progs_no_alu32 on s390x with gcc
bpf/vmtest-bpf-PR success PR summary
bpf/vmtest-bpf-VM_Test-8 success Logs for test_maps on s390x with gcc

Commit Message

Xu Kuohai July 28, 2023, 10:57 a.m. UTC 
From: Xu Kuohai <xukuohai@huawei.com>

strp_done is only called when psock->progs.stream_parser is not NULL,
but stream_parser was set to NULL by sk_psock_stop_strp(), called
by sk_psock_drop() earlier. So, strp_done can never be called.

Introduce SK_PSOCK_RX_ENABLED to mark whether there is strp on psock.
Change the condition for calling strp_done from judging whether
stream_parser is set to judging whether this flag is set. This flag is
only set once when strp_init() succeeds, and will never be cleared later.

Fixes: c0d95d3380ee ("bpf, sockmap: Re-evaluate proto ops when psock is removed from sockmap")
Signed-off-by: Xu Kuohai <xukuohai@huawei.com>
---
 include/linux/skmsg.h |  1 +
 net/core/skmsg.c      | 10 ++++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

Comments

Martin KaFai Lau Aug. 1, 2023, 1:22 a.m. UTC | #1 
On 7/28/23 3:57 AM, Xu Kuohai wrote:
> strp_done is only called when psock->progs.stream_parser is not NULL,
> but stream_parser was set to NULL by sk_psock_stop_strp(), called
> by sk_psock_drop() earlier. So, strp_done can never be called.
> 
> Introduce SK_PSOCK_RX_ENABLED to mark whether there is strp on psock.
> Change the condition for calling strp_done from judging whether
> stream_parser is set to judging whether this flag is set. This flag is
> only set once when strp_init() succeeds, and will never be cleared later.

John, please help to review.
John Fastabend Aug. 1, 2023, 3:55 a.m. UTC | #2 
Xu Kuohai wrote:
> From: Xu Kuohai <xukuohai@huawei.com>
> 
> strp_done is only called when psock->progs.stream_parser is not NULL,
> but stream_parser was set to NULL by sk_psock_stop_strp(), called
> by sk_psock_drop() earlier. So, strp_done can never be called.
> 
> Introduce SK_PSOCK_RX_ENABLED to mark whether there is strp on psock.
> Change the condition for calling strp_done from judging whether
> stream_parser is set to judging whether this flag is set. This flag is
> only set once when strp_init() succeeds, and will never be cleared later.
> 
> Fixes: c0d95d3380ee ("bpf, sockmap: Re-evaluate proto ops when psock is removed from sockmap")
> Signed-off-by: Xu Kuohai <xukuohai@huawei.com>
> ---
>  include/linux/skmsg.h |  1 +
>  net/core/skmsg.c      | 10 ++++++++--
>  2 files changed, 9 insertions(+), 2 deletions(-)
> 
> diff --git a/include/linux/skmsg.h b/include/linux/skmsg.h
> index 054d7911bfc9..959c5f4c4d19 100644
> --- a/include/linux/skmsg.h
> +++ b/include/linux/skmsg.h
> @@ -62,6 +62,7 @@ struct sk_psock_progs {
>  
>  enum sk_psock_state_bits {
>  	SK_PSOCK_TX_ENABLED,
> +	SK_PSOCK_RX_ENABLED,

small nit can be make this SK_PSOCK_RX_STRP_ENABLED? That way its
explicit what we are talking about here.

Otherwise it looks good thanks nice catch.

>  };
>  
>  struct sk_psock_link {
> diff --git a/net/core/skmsg.c b/net/core/skmsg.c
> index a29508e1ff35..7c2764beeb04 100644
> --- a/net/core/skmsg.c
> +++ b/net/core/skmsg.c
> @@ -1120,13 +1120,19 @@ static void sk_psock_strp_data_ready(struct sock *sk)
>  
>  int sk_psock_init_strp(struct sock *sk, struct sk_psock *psock)
>  {
> +	int ret;
> +
>  	static const struct strp_callbacks cb = {
>  		.rcv_msg	= sk_psock_strp_read,
>  		.read_sock_done	= sk_psock_strp_read_done,
>  		.parse_msg	= sk_psock_strp_parse,
>  	};
>  
> -	return strp_init(&psock->strp, sk, &cb);
> +	ret = strp_init(&psock->strp, sk, &cb);
> +	if (!ret)
> +		sk_psock_set_state(psock, SK_PSOCK_RX_ENABLED);
> +
> +	return ret;
>  }
>  
>  void sk_psock_start_strp(struct sock *sk, struct sk_psock *psock)
> @@ -1154,7 +1160,7 @@ void sk_psock_stop_strp(struct sock *sk, struct sk_psock *psock)
>  static void sk_psock_done_strp(struct sk_psock *psock)
>  {
>  	/* Parser has been stopped */
> -	if (psock->progs.stream_parser)
> +	if (sk_psock_test_state(psock, SK_PSOCK_RX_ENABLED))
>  		strp_done(&psock->strp);
>  }
>  #else
> -- 
> 2.30.2
>
Xu Kuohai Aug. 1, 2023, 6:17 a.m. UTC | #3 
On 8/1/2023 11:55 AM, John Fastabend wrote:
> Xu Kuohai wrote:
>> From: Xu Kuohai <xukuohai@huawei.com>
>>
>> strp_done is only called when psock->progs.stream_parser is not NULL,
>> but stream_parser was set to NULL by sk_psock_stop_strp(), called
>> by sk_psock_drop() earlier. So, strp_done can never be called.
>>
>> Introduce SK_PSOCK_RX_ENABLED to mark whether there is strp on psock.
>> Change the condition for calling strp_done from judging whether
>> stream_parser is set to judging whether this flag is set. This flag is
>> only set once when strp_init() succeeds, and will never be cleared later.
>>
>> Fixes: c0d95d3380ee ("bpf, sockmap: Re-evaluate proto ops when psock is removed from sockmap")
>> Signed-off-by: Xu Kuohai <xukuohai@huawei.com>
>> ---
>>   include/linux/skmsg.h |  1 +
>>   net/core/skmsg.c      | 10 ++++++++--
>>   2 files changed, 9 insertions(+), 2 deletions(-)
>>
>> diff --git a/include/linux/skmsg.h b/include/linux/skmsg.h
>> index 054d7911bfc9..959c5f4c4d19 100644
>> --- a/include/linux/skmsg.h
>> +++ b/include/linux/skmsg.h
>> @@ -62,6 +62,7 @@ struct sk_psock_progs {
>>   
>>   enum sk_psock_state_bits {
>>   	SK_PSOCK_TX_ENABLED,
>> +	SK_PSOCK_RX_ENABLED,
> 
> small nit can be make this SK_PSOCK_RX_STRP_ENABLED? That way its
> explicit what we are talking about here.
>

OK, I'll rename it, thanks.

> Otherwise it looks good thanks nice catch.
> 
>>   };
>>   
>>   struct sk_psock_link {
>> diff --git a/net/core/skmsg.c b/net/core/skmsg.c
>> index a29508e1ff35..7c2764beeb04 100644
>> --- a/net/core/skmsg.c
>> +++ b/net/core/skmsg.c
>> @@ -1120,13 +1120,19 @@ static void sk_psock_strp_data_ready(struct sock *sk)
>>   
>>   int sk_psock_init_strp(struct sock *sk, struct sk_psock *psock)
>>   {
>> +	int ret;
>> +
>>   	static const struct strp_callbacks cb = {
>>   		.rcv_msg	= sk_psock_strp_read,
>>   		.read_sock_done	= sk_psock_strp_read_done,
>>   		.parse_msg	= sk_psock_strp_parse,
>>   	};
>>   
>> -	return strp_init(&psock->strp, sk, &cb);
>> +	ret = strp_init(&psock->strp, sk, &cb);
>> +	if (!ret)
>> +		sk_psock_set_state(psock, SK_PSOCK_RX_ENABLED);
>> +
>> +	return ret;
>>   }
>>   
>>   void sk_psock_start_strp(struct sock *sk, struct sk_psock *psock)
>> @@ -1154,7 +1160,7 @@ void sk_psock_stop_strp(struct sock *sk, struct sk_psock *psock)
>>   static void sk_psock_done_strp(struct sk_psock *psock)
>>   {
>>   	/* Parser has been stopped */
>> -	if (psock->progs.stream_parser)
>> +	if (sk_psock_test_state(psock, SK_PSOCK_RX_ENABLED))
>>   		strp_done(&psock->strp);
>>   }
>>   #else
>> -- 
>> 2.30.2
>>
diff mbox series

Patch

diff --git a/include/linux/skmsg.h b/include/linux/skmsg.h
index 054d7911bfc9..959c5f4c4d19 100644
--- a/include/linux/skmsg.h
+++ b/include/linux/skmsg.h
@@ -62,6 +62,7 @@  struct sk_psock_progs {
 
 enum sk_psock_state_bits {
 	SK_PSOCK_TX_ENABLED,
+	SK_PSOCK_RX_ENABLED,
 };
 
 struct sk_psock_link {
diff --git a/net/core/skmsg.c b/net/core/skmsg.c
index a29508e1ff35..7c2764beeb04 100644
--- a/net/core/skmsg.c
+++ b/net/core/skmsg.c
@@ -1120,13 +1120,19 @@  static void sk_psock_strp_data_ready(struct sock *sk)
 
 int sk_psock_init_strp(struct sock *sk, struct sk_psock *psock)
 {
+	int ret;
+
 	static const struct strp_callbacks cb = {
 		.rcv_msg	= sk_psock_strp_read,
 		.read_sock_done	= sk_psock_strp_read_done,
 		.parse_msg	= sk_psock_strp_parse,
 	};
 
-	return strp_init(&psock->strp, sk, &cb);
+	ret = strp_init(&psock->strp, sk, &cb);
+	if (!ret)
+		sk_psock_set_state(psock, SK_PSOCK_RX_ENABLED);
+
+	return ret;
 }
 
 void sk_psock_start_strp(struct sock *sk, struct sk_psock *psock)
@@ -1154,7 +1160,7 @@  void sk_psock_stop_strp(struct sock *sk, struct sk_psock *psock)
 static void sk_psock_done_strp(struct sk_psock *psock)
 {
 	/* Parser has been stopped */
-	if (psock->progs.stream_parser)
+	if (sk_psock_test_state(psock, SK_PSOCK_RX_ENABLED))
 		strp_done(&psock->strp);
 }
 #else