From: Ursula Braun <ubraun@linux.ibm.com>
To: Eugene Syromiatnikov <esyr@redhat.com>
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
Subject: Re: [net-next,v2,2/4] net/smc: ipv6 support for smc_diag.c
Date: Tue, 9 Oct 2018 16:41:43 +0200 [thread overview]
Message-ID: <3cb67163-53c6-dd63-71b6-d34581918708@linux.ibm.com> (raw)
In-Reply-To: <20181007011152.GA11112@asgard.redhat.com>
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 <kgraul@linux.ibm.com>
>>
>> Update smc_diag.c to support ipv6 addresses on the diagnosis interface.
>>
>> Signed-off-by: Karsten Graul <kgraul@linux.ibm.com>
>> Signed-off-by: Ursula Braun <ubraun@linux.ibm.com>
>> ---
>> 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,
next prev parent reply other threads:[~2018-10-09 14:41 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-02 14:56 [PATCH net-next v2 0/4] net/smc: small features 2018/04/30 Ursula Braun
2018-05-02 14:56 ` [PATCH net-next v2 1/4] net/smc: periodic testlink support Ursula Braun
2018-05-02 14:56 ` [PATCH net-next v2 2/4] net/smc: ipv6 support for smc_diag.c Ursula Braun
2018-10-07 1:11 ` [net-next,v2,2/4] " Eugene Syromiatnikov
2018-10-09 14:41 ` Ursula Braun [this message]
2018-10-13 3:45 ` Eugene Syromiatnikov
2018-05-02 14:56 ` [PATCH net-next v2 3/4] net/smc: handle ioctls SIOCINQ, SIOCOUTQ, and SIOCOUTQNSD Ursula Braun
2018-05-02 14:56 ` [PATCH net-next v2 4/4] net/smc: determine vlan_id of stacked net_device Ursula Braun
2018-05-02 17:30 ` [PATCH net-next v2 0/4] net/smc: small features 2018/04/30 David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=3cb67163-53c6-dd63-71b6-d34581918708@linux.ibm.com \
--to=ubraun@linux.ibm.com \
--cc=davem@davemloft.net \
--cc=esyr@redhat.com \
--cc=heiko.carstens@de.ibm.com \
--cc=kgraul@linux.ibm.com \
--cc=linux-s390@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=raspl@linux.ibm.com \
--cc=schwidefsky@de.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox