Add __ro_after_init labels for the variables tcp_prot_override and
tcpv6_prot_override, just like other variables adjacent to them, to
indicate that they are initialised from the init hoos and no writes
occur afterwards.

Signed-off-by: Geliang Tang <geliang.tang@suse.com>
---
 net/mptcp/subflow.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c
index d3e00a428c7e..3a71b3b05935 100644
--- a/net/mptcp/subflow.c
+++ b/net/mptcp/subflow.c
@@ -628,7 +628,7 @@ static struct request_sock_ops mptcp_subflow_v6_request_sock_ops __ro_after_init
 static struct tcp_request_sock_ops subflow_request_sock_ipv6_ops __ro_after_init;
 static struct inet_connection_sock_af_ops subflow_v6_specific __ro_after_init;
 static struct inet_connection_sock_af_ops subflow_v6m_specific __ro_after_init;
-static struct proto tcpv6_prot_override;
+static struct proto tcpv6_prot_override __ro_after_init;
 
 static int subflow_v6_conn_request(struct sock *sk, struct sk_buff *skb)
 {
@@ -926,7 +926,7 @@ static struct sock *subflow_syn_recv_sock(const struct sock *sk,
 }
 
 static struct inet_connection_sock_af_ops subflow_specific __ro_after_init;
-static struct proto tcp_prot_override;
+static struct proto tcp_prot_override __ro_after_init;
 
 enum mapping_status {
 	MAPPING_OK,
-- 
2.35.3

Hi Geliang,

On 23/02/2023 04:37, Geliang Tang wrote:
> Add __ro_after_init labels for the variables tcp_prot_override and
> tcpv6_prot_override, just like other variables adjacent to them, to
> indicate that they are initialised from the init hoos and no writes
> occur afterwards.

Thank you for the patch!

Now in our tree (fix for -net):

New patches for t/upstream-net and t/upstream:
- 14b7f49f8c61: mptcp: add ro_after_init for tcp{,v6}_prot_override
- Results: 32f1046d667c..2d0e2918d1a9 (export-net)
- Results: 7264bacd3544..e438a165544f (export)

Tests are now in progress:

https://cirrus-ci.com/github/multipath-tcp/mptcp_net-next/export-net/20230223T135546
https://cirrus-ci.com/github/multipath-tcp/mptcp_net-next/export/20230223T135546

Cheers,
Matt
-- 
Tessares | Belgium | Hybrid Access Solutions
www.tessares.net

On Thu, Feb 23, 2023 at 02:57:35PM +0100, Matthieu Baerts wrote:
> Hi Geliang,
> 
> On 23/02/2023 04:37, Geliang Tang wrote:
> > Add __ro_after_init labels for the variables tcp_prot_override and
> > tcpv6_prot_override, just like other variables adjacent to them, to
> > indicate that they are initialised from the init hoos and no writes
> > occur afterwards.
> 
> Thank you for the patch!
> 
> Now in our tree (fix for -net):
> 
> New patches for t/upstream-net and t/upstream:
> - 14b7f49f8c61: mptcp: add ro_after_init for tcp{,v6}_prot_override
> - Results: 32f1046d667c..2d0e2918d1a9 (export-net)
> - Results: 7264bacd3544..e438a165544f (export)
> 
> Tests are now in progress:
> 
> https://cirrus-ci.com/github/multipath-tcp/mptcp_net-next/export-net/20230223T135546
> https://cirrus-ci.com/github/multipath-tcp/mptcp_net-next/export/20230223T135546

Matt, you forgot to help me change 'hoos' to 'hooks' in the commit log.
:)

Thanks,
-Geliang

> 
> Cheers,
> Matt
> -- 
> Tessares | Belgium | Hybrid Access Solutions
> www.tessares.net

Hi Geliang,

On 24/02/2023 02:29, Geliang Tang wrote:
> On Thu, Feb 23, 2023 at 02:57:35PM +0100, Matthieu Baerts wrote:
>> Hi Geliang,
>>
>> On 23/02/2023 04:37, Geliang Tang wrote:
>>> Add __ro_after_init labels for the variables tcp_prot_override and
>>> tcpv6_prot_override, just like other variables adjacent to them, to
>>> indicate that they are initialised from the init hoos and no writes
>>> occur afterwards.
>>
>> Thank you for the patch!
>>
>> Now in our tree (fix for -net):
>>
>> New patches for t/upstream-net and t/upstream:
>> - 14b7f49f8c61: mptcp: add ro_after_init for tcp{,v6}_prot_override
>> - Results: 32f1046d667c..2d0e2918d1a9 (export-net)
>> - Results: 7264bacd3544..e438a165544f (export)
>>
>> Tests are now in progress:
>>
>> https://cirrus-ci.com/github/multipath-tcp/mptcp_net-next/export-net/20230223T135546
>> https://cirrus-ci.com/github/multipath-tcp/mptcp_net-next/export/20230223T135546
> 
> Matt, you forgot to help me change 'hoos' to 'hooks' in the commit log.
> :)

Good catch, I got distracted by the Fixes tags and I forgot this, my bad!

Fixed now in export/20230224T093441 and export-net/20230224T093441:

- 63df269b74e8: tg:msg: fix typo s/hoos/hooks/

Cheers,
Matt
-- 
Tessares | Belgium | Hybrid Access Solutions
www.tessares.net

Hi Geliang,

Thank you for this patch!

On 23/02/2023 04:37, Geliang Tang wrote:
> Add __ro_after_init labels for the variables tcp_prot_override and
> tcpv6_prot_override, just like other variables adjacent to them, to
> indicate that they are initialised from the init hoos and no writes

(Do you mean s/hoos/hook/?)

> occur afterwards.

Good catch!

Reviewed-by: Matthieu Baerts <matthieu.baerts@tessares.net>

Do you mind if I change the target to mptcp-net and add a Fixes tag when
applying this patch?

Fixes: b19bc2945b40 ("mptcp: implement delegated actions")

Cheers,
Matt
-- 
Tessares | Belgium | Hybrid Access Solutions
www.tessares.net

On Thu, Feb 23, 2023 at 10:10:25AM +0100, Matthieu Baerts wrote:
> Hi Geliang,
> 
> Thank you for this patch!
> 
> On 23/02/2023 04:37, Geliang Tang wrote:
> > Add __ro_after_init labels for the variables tcp_prot_override and
> > tcpv6_prot_override, just like other variables adjacent to them, to
> > indicate that they are initialised from the init hoos and no writes
> 
> (Do you mean s/hoos/hook/?)

Yes, it should be 'hooks'. Please fix this for me.

> 
> > occur afterwards.
> 
> Good catch!
> 
> Reviewed-by: Matthieu Baerts <matthieu.baerts@tessares.net>
> 
> Do you mind if I change the target to mptcp-net and add a Fixes tag when
> applying this patch?
> 
> Fixes: b19bc2945b40 ("mptcp: implement delegated actions")

Fixes: 51fa7f8ebf0e2 ("mptcp: mark ops structures as ro_after_init")
Maybe this fixes tag is better, WDYT?

Thanks,
-Geliang

> 
> Cheers,
> Matt
> -- 
> Tessares | Belgium | Hybrid Access Solutions
> www.tessares.net

On 23/02/2023 14:35, Geliang Tang wrote:
> On Thu, Feb 23, 2023 at 10:10:25AM +0100, Matthieu Baerts wrote:

(...)

>> Do you mind if I change the target to mptcp-net and add a Fixes tag when
>> applying this patch?
>>
>> Fixes: b19bc2945b40 ("mptcp: implement delegated actions")
> 
> Fixes: 51fa7f8ebf0e2 ("mptcp: mark ops structures as ro_after_init")
> Maybe this fixes tag is better, WDYT?

If you don't mind, I will add both: the one you mention has been
backported to v5.10 while the other one is only in v5.12.

Cheers,
Matt
-- 
Tessares | Belgium | Hybrid Access Solutions
www.tessares.net

On 23/02/2023 14:35, Geliang Tang wrote:
> On Thu, Feb 23, 2023 at 10:10:25AM +0100, Matthieu Baerts wrote:
>> Hi Geliang,
>>
>> Thank you for this patch!
>>
>> On 23/02/2023 04:37, Geliang Tang wrote:
>>> Add __ro_after_init labels for the variables tcp_prot_override and
>>> tcpv6_prot_override, just like other variables adjacent to them, to
>>> indicate that they are initialised from the init hoos and no writes
>>
>> (Do you mean s/hoos/hook/?)
> 
> Yes, it should be 'hooks'. Please fix this for me.

Yes, I can do that!

>>> occur afterwards.
>>
>> Good catch!
>>
>> Reviewed-by: Matthieu Baerts <matthieu.baerts@tessares.net>
>>
>> Do you mind if I change the target to mptcp-net and add a Fixes tag when
>> applying this patch?
>>
>> Fixes: b19bc2945b40 ("mptcp: implement delegated actions")
> 
> Fixes: 51fa7f8ebf0e2 ("mptcp: mark ops structures as ro_after_init")
> Maybe this fixes tag is better, WDYT?

Good idea!

When looking at 51fa7f8ebf0e2 ("mptcp: mark ops structures as
ro_after_init"), I wonder why this flag has not been added to
tcp{,v6}_prot_override. I guess we just missed it :)

Cheers,
Matt
-- 
Tessares | Belgium | Hybrid Access Solutions
www.tessares.net