From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ursula Braun Subject: Re: [net-next,v2,2/4] net/smc: ipv6 support for smc_diag.c Date: Tue, 9 Oct 2018 16:41:43 +0200 Message-ID: <3cb67163-53c6-dd63-71b6-d34581918708@linux.ibm.com> References: <20180502145647.36147-3-ubraun@linux.ibm.com> <20181007011152.GA11112@asgard.redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Cc: davem@davemloft.net, netdev@vger.kernel.org, linux-s390@vger.kernel.org, schwidefsky@de.ibm.com, heiko.carstens@de.ibm.com, raspl@linux.ibm.com, kgraul@linux.ibm.com To: Eugene Syromiatnikov Return-path: Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:44424 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726479AbeJIV7H (ORCPT ); Tue, 9 Oct 2018 17:59:07 -0400 Received: from pps.filterd (m0098404.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w99EZojB011398 for ; Tue, 9 Oct 2018 10:41:51 -0400 Received: from e06smtp01.uk.ibm.com (e06smtp01.uk.ibm.com [195.75.94.97]) by mx0a-001b2d01.pphosted.com with ESMTP id 2n0x6prcks-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 09 Oct 2018 10:41:50 -0400 Received: from localhost by e06smtp01.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 9 Oct 2018 15:41:48 +0100 In-Reply-To: <20181007011152.GA11112@asgard.redhat.com> Content-Language: en-US Sender: netdev-owner@vger.kernel.org List-ID: On 10/07/2018 03:11 AM, Eugene Syromiatnikov wrote: > On Wed, May 02, 2018 at 04:56:45PM +0200, Ursula Braun wrote: >> From: Karsten Graul >> >> Update smc_diag.c to support ipv6 addresses on the diagnosis interface. >> >> Signed-off-by: Karsten Graul >> Signed-off-by: Ursula Braun >> --- >> net/smc/smc_diag.c | 39 ++++++++++++++++++++++++++++++--------- >> 1 file changed, 30 insertions(+), 9 deletions(-) >> >> diff --git a/net/smc/smc_diag.c b/net/smc/smc_diag.c >> index 427b91c1c964..05dd7e6d314d 100644 >> --- a/net/smc/smc_diag.c >> +++ b/net/smc/smc_diag.c >> @@ -38,17 +38,27 @@ static void smc_diag_msg_common_fill(struct smc_diag_msg *r, struct sock *sk) >> { >> struct smc_sock *smc = smc_sk(sk); >> >> - r->diag_family = sk->sk_family; >> if (!smc->clcsock) >> return; >> r->id.idiag_sport = htons(smc->clcsock->sk->sk_num); >> r->id.idiag_dport = smc->clcsock->sk->sk_dport; >> r->id.idiag_if = smc->clcsock->sk->sk_bound_dev_if; >> sock_diag_save_cookie(sk, r->id.idiag_cookie); >> - memset(&r->id.idiag_src, 0, sizeof(r->id.idiag_src)); >> - memset(&r->id.idiag_dst, 0, sizeof(r->id.idiag_dst)); >> - r->id.idiag_src[0] = smc->clcsock->sk->sk_rcv_saddr; >> - r->id.idiag_dst[0] = smc->clcsock->sk->sk_daddr; >> + if (sk->sk_protocol == SMCPROTO_SMC) { >> + r->diag_family = PF_INET; >> + memset(&r->id.idiag_src, 0, sizeof(r->id.idiag_src)); >> + memset(&r->id.idiag_dst, 0, sizeof(r->id.idiag_dst)); >> + r->id.idiag_src[0] = smc->clcsock->sk->sk_rcv_saddr; >> + r->id.idiag_dst[0] = smc->clcsock->sk->sk_daddr; >> +#if IS_ENABLED(CONFIG_IPV6) >> + } else if (sk->sk_protocol == SMCPROTO_SMC6) { >> + r->diag_family = PF_INET6; >> + memcpy(&r->id.idiag_src, &smc->clcsock->sk->sk_v6_rcv_saddr, >> + sizeof(smc->clcsock->sk->sk_v6_rcv_saddr)); >> + memcpy(&r->id.idiag_dst, &smc->clcsock->sk->sk_v6_daddr, >> + sizeof(smc->clcsock->sk->sk_v6_daddr)); >> +#endif >> + } > > This change makes it impossible to distinguish an inet_sock_diag > response message from SMC sock_diag response (previously it reported > AF_SMC in diag_family which allows deciding whether that a part of > struct smc_diag_msg or struct inet_diag_msg). > Eugene, we are considering the following patch: --- net/smc/smc_diag.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/net/smc/smc_diag.c b/net/smc/smc_diag.c index dbf64a93d68a..371b4cf31fcd 100644 --- a/net/smc/smc_diag.c +++ b/net/smc/smc_diag.c @@ -38,6 +38,7 @@ static void smc_diag_msg_common_fill(struct smc_diag_msg *r, struct sock *sk) { struct smc_sock *smc = smc_sk(sk); + r->diag_family = sk->sk_family; if (!smc->clcsock) return; r->id.idiag_sport = htons(smc->clcsock->sk->sk_num); @@ -45,14 +46,12 @@ static void smc_diag_msg_common_fill(struct smc_diag_msg *r, struct sock *sk) r->id.idiag_if = smc->clcsock->sk->sk_bound_dev_if; sock_diag_save_cookie(sk, r->id.idiag_cookie); if (sk->sk_protocol == SMCPROTO_SMC) { - r->diag_family = PF_INET; memset(&r->id.idiag_src, 0, sizeof(r->id.idiag_src)); memset(&r->id.idiag_dst, 0, sizeof(r->id.idiag_dst)); r->id.idiag_src[0] = smc->clcsock->sk->sk_rcv_saddr; r->id.idiag_dst[0] = smc->clcsock->sk->sk_daddr; #if IS_ENABLED(CONFIG_IPV6) } else if (sk->sk_protocol == SMCPROTO_SMC6) { - r->diag_family = PF_INET6; memcpy(&r->id.idiag_src, &smc->clcsock->sk->sk_v6_rcv_saddr, sizeof(smc->clcsock->sk->sk_v6_rcv_saddr)); memcpy(&r->id.idiag_dst, &smc->clcsock->sk->sk_v6_daddr,