[net-next,RESEND,v3,2/2] net/smc: support ipv4 mapped ipv6 addr client for smc-r v2

Commit Message

Guangguan Wang Dec. 11, 2024, 2:30 a.m. UTC

AF_INET6 is not supported for smc-r v2 client before, even if the
ipv6 addr is ipv4 mapped. Thus, when using AF_INET6, smc-r connection
will fallback to tcp, especially for java applications running smc-r.
This patch support ipv4 mapped ipv6 addr client for smc-r v2. Clients
using real global ipv6 addr is still not supported yet.

Signed-off-by: Guangguan Wang <[e-mail]>
Reviewed-by: Wen Gu <[e-mail]>
Reviewed-by: Dust Li <[e-mail]>
Reviewed-by: D. Wythe <[e-mail]>
Reviewed-by: Wenjia Zhang <[e-mail]>
Reviewed-by: Halil Pasic <[e-mail]>
---
 net/smc/af_smc.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

Comments

Halil Pasic Dec. 11, 2024, 6:54 p.m. UTC | #1

On Wed, 11 Dec 2024 10:30:55 +0800
Guangguan Wang <[e-mail]> wrote:

> AF_INET6 is not supported for smc-r v2 client before, even if the
> ipv6 addr is ipv4 mapped. Thus, when using AF_INET6, smc-r connection
> will fallback to tcp, especially for java applications running smc-r.
> This patch support ipv4 mapped ipv6 addr client for smc-r v2. Clients
> using real global ipv6 addr is still not supported yet.
> 
> Signed-off-by: Guangguan Wang <[e-mail]>
> Reviewed-by: Wen Gu <[e-mail]>
> Reviewed-by: Dust Li <[e-mail]>
> Reviewed-by: D. Wythe <[e-mail]>
> Reviewed-by: Wenjia Zhang <[e-mail]>
> Reviewed-by: Halil Pasic <[e-mail]>

Sorry for the late remark, but does this need a Fixes tag? I mean
my gut feeling is that this is a bugfix -- i.e. should have been
working from the get go -- and not a mere enhancement. No strong
opinions here.

Halil

Paolo Abeni Dec. 12, 2024, 12:49 p.m. UTC | #2

On 12/11/24 19:54, Halil Pasic wrote:
> On Wed, 11 Dec 2024 10:30:55 +0800
> Guangguan Wang <[e-mail]> wrote:
> 
>> AF_INET6 is not supported for smc-r v2 client before, even if the
>> ipv6 addr is ipv4 mapped. Thus, when using AF_INET6, smc-r connection
>> will fallback to tcp, especially for java applications running smc-r.
>> This patch support ipv4 mapped ipv6 addr client for smc-r v2. Clients
>> using real global ipv6 addr is still not supported yet.
>>
>> Signed-off-by: Guangguan Wang <[e-mail]>
>> Reviewed-by: Wen Gu <[e-mail]>
>> Reviewed-by: Dust Li <[e-mail]>
>> Reviewed-by: D. Wythe <[e-mail]>
>> Reviewed-by: Wenjia Zhang <[e-mail]>
>> Reviewed-by: Halil Pasic <[e-mail]>
> 
> Sorry for the late remark, but does this need a Fixes tag? I mean
> my gut feeling is that this is a bugfix -- i.e. should have been
> working from the get go -- and not a mere enhancement. No strong
> opinions here.

FTR: my take is this is really a new feature, as the ipv6 support for
missing from the smc-r v2 introduction and sub-system maintainers
already implicitly agreed on that via RB tags.

Cheers,

/P

Guangguan Wang Dec. 12, 2024, 1:13 p.m. UTC | #3

On 2024/12/12 20:49, Paolo Abeni wrote:
> On 12/11/24 19:54, Halil Pasic wrote:
>> On Wed, 11 Dec 2024 10:30:55 +0800
>> Guangguan Wang <[e-mail]> wrote:
>>
>>> AF_INET6 is not supported for smc-r v2 client before, even if the
>>> ipv6 addr is ipv4 mapped. Thus, when using AF_INET6, smc-r connection
>>> will fallback to tcp, especially for java applications running smc-r.
>>> This patch support ipv4 mapped ipv6 addr client for smc-r v2. Clients
>>> using real global ipv6 addr is still not supported yet.
>>>
>>> Signed-off-by: Guangguan Wang <[e-mail]>
>>> Reviewed-by: Wen Gu <[e-mail]>
>>> Reviewed-by: Dust Li <[e-mail]>
>>> Reviewed-by: D. Wythe <[e-mail]>
>>> Reviewed-by: Wenjia Zhang <[e-mail]>
>>> Reviewed-by: Halil Pasic <[e-mail]>
>>
>> Sorry for the late remark, but does this need a Fixes tag? I mean
>> my gut feeling is that this is a bugfix -- i.e. should have been
>> working from the get go -- and not a mere enhancement. No strong
>> opinions here.
> 
> FTR: my take is this is really a new feature, as the ipv6 support for
> missing from the smc-r v2 introduction and sub-system maintainers
> already implicitly agreed on that via RB tags.
> 
> Cheers,
> 
> /P

Agree.
This patch enlarges the scope of using SMCRv2, so I think it is a new feature.

Thanks,
Guangguan Wang

Halil Pasic Dec. 12, 2024, 10:29 p.m. UTC | #4

On Thu, 12 Dec 2024 13:49:29 +0100
Paolo Abeni <[e-mail]> wrote:

> > Sorry for the late remark, but does this need a Fixes tag? I mean
> > my gut feeling is that this is a bugfix -- i.e. should have been
> > working from the get go -- and not a mere enhancement. No strong
> > opinions here.  
> 
> FTR: my take is this is really a new feature, as the ipv6 support for
> missing from the smc-r v2 introduction and sub-system maintainers
> already implicitly agreed on that via RB tags.

Works with me! Thanks!

Regards,
Halil

Patch

diff --git a/net/smc/af_smc.c b/net/smc/af_smc.c
index 9d76e902fd77..c3f9c0457418 100644
--- a/net/smc/af_smc.c
+++ b/net/smc/af_smc.c
@@ -1116,7 +1116,10 @@  static int smc_find_proposal_devices(struct smc_sock *smc,
 	ini->check_smcrv2 = true;
 	ini->smcrv2.saddr = smc->clcsock->sk->sk_rcv_saddr;
 	if (!(ini->smcr_version & SMC_V2) ||
-	    smc->clcsock->sk->sk_family != AF_INET ||
+#if IS_ENABLED(CONFIG_IPV6)
+	    (smc->clcsock->sk->sk_family == AF_INET6 &&
+	     !ipv6_addr_v4mapped(&smc->clcsock->sk->sk_v6_rcv_saddr)) ||
+#endif
 	    !smc_clc_ueid_count() ||
 	    smc_find_rdma_device(smc, ini))
 		ini->smcr_version &= ~SMC_V2;