From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from out30-119.freemail.mail.aliyun.com (out30-119.freemail.mail.aliyun.com [115.124.30.119]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 51E2C15D5CB; Wed, 29 May 2024 06:14:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=115.124.30.119 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716963291; cv=none; b=FcsTLei5QZ5nwM2WmpcKxn5NVcBtwLpTBTYHKru3nYYt7thpu/oFyDZOJiyv2csaT69u/CnFHB1OGfF0OyAjhjArrfjDov7v/uYq4pm2+CZxAJLYj2FKX09zrkeilbLlZbgZGGHJKpMTwUO4BXWfgzX+iAWWhUZ/8az8maGvB2U= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716963291; c=relaxed/simple; bh=bJMJ6Epti2dWai0NaRpK4JKUFx7iBJ2mNkR45h0S66w=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=AXo7mNuH3byLfqCArNQSFFDn6oxdVySNUyM83Bh23ks7mpkWvbcquW+1LUfbfxydEfuvB/RDhKsS3YxDUph+R6k57Pm7ODipMqzMWdXwiLEEydlGK6eWXybM8CZ0sLohRyLfUKx9iyAtuanf5UURtE7KDeIQZlWTJb2uqQbV8FQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.alibaba.com; spf=pass smtp.mailfrom=linux.alibaba.com; dkim=pass (1024-bit key) header.d=linux.alibaba.com header.i=@linux.alibaba.com header.b=WnfKT0cS; arc=none smtp.client-ip=115.124.30.119 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.alibaba.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.alibaba.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.alibaba.com header.i=@linux.alibaba.com header.b="WnfKT0cS" DKIM-Signature:v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1716963279; h=Date:From:To:Subject:Message-ID:MIME-Version:Content-Type; bh=iKQ1UBWmg6fXE5kM2DVpXPJ8KpZs7Evw5A+8h2ZriCo=; b=WnfKT0cShG0aC8cb5N5/fe35O9jATMRnQ+IjG24Qsbs5eKVkO04B3NZ8dlTwXtc/ehu3In/2xOD6GJiQd7trAtOxISwdEAlxMitgWMqvjS8ApoejTgSBRiBvFucm7fXTMG3Mzb1RTcYU1YkoL/+5mdYlwg/Ee6lQbQjoGQKTCd4= X-Alimail-AntiSpam:AC=PASS;BC=-1|-1;BR=01201311R911e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=maildocker-contentspam033022160150;MF=tonylu@linux.alibaba.com;NM=1;PH=DS;RN=14;SR=0;TI=SMTPD_---0W7Rez7r_1716963278; Received: from localhost(mailfrom:tonylu@linux.alibaba.com fp:SMTPD_---0W7Rez7r_1716963278) by smtp.aliyun-inc.com; Wed, 29 May 2024 14:14:38 +0800 Date: Wed, 29 May 2024 14:14:37 +0800 From: Tony Lu To: "D. Wythe" Cc: kgraul@linux.ibm.com, wenjia@linux.ibm.com, jaka@linux.ibm.com, wintera@linux.ibm.com, guwen@linux.alibaba.com, kuba@kernel.org, davem@davemloft.net, netdev@vger.kernel.org, linux-s390@vger.kernel.org, linux-rdma@vger.kernel.org, pabeni@redhat.com, edumazet@google.com Subject: Re: [PATCH net-next v4 1/3] net/smc: refactoring initialization of smc sock Message-ID: Reply-To: Tony Lu References: <1716955147-88923-1-git-send-email-alibuda@linux.alibaba.com> <1716955147-88923-2-git-send-email-alibuda@linux.alibaba.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1716955147-88923-2-git-send-email-alibuda@linux.alibaba.com> On Wed, May 29, 2024 at 11:59:05AM +0800, D. Wythe wrote: > From: "D. Wythe" > > This patch aims to isolate the shared components of SMC socket > allocation by introducing smc_sk_init() for sock initialization > and __smc_create_clcsk() for the initialization of clcsock. > > This is in preparation for the subsequent implementation of the > AF_INET version of SMC. > > Signed-off-by: D. Wythe v4 looks good for me, thanks. Reviewed-by: Tony Lu > --- > net/smc/af_smc.c | 86 +++++++++++++++++++++++++++++++------------------------- > net/smc/smc.h | 5 ++++ > 2 files changed, 53 insertions(+), 38 deletions(-) > > diff --git a/net/smc/af_smc.c b/net/smc/af_smc.c > index e50a286..77a9d58 100644 > --- a/net/smc/af_smc.c > +++ b/net/smc/af_smc.c > @@ -361,25 +361,15 @@ static void smc_destruct(struct sock *sk) > return; > } > > -static struct sock *smc_sock_alloc(struct net *net, struct socket *sock, > - int protocol) > +void smc_sk_init(struct net *net, struct sock *sk, int protocol) > { > - struct smc_sock *smc; > - struct proto *prot; > - struct sock *sk; > - > - prot = (protocol == SMCPROTO_SMC6) ? &smc_proto6 : &smc_proto; > - sk = sk_alloc(net, PF_SMC, GFP_KERNEL, prot, 0); > - if (!sk) > - return NULL; > + struct smc_sock *smc = smc_sk(sk); > > - sock_init_data(sock, sk); /* sets sk_refcnt to 1 */ > sk->sk_state = SMC_INIT; > sk->sk_destruct = smc_destruct; > sk->sk_protocol = protocol; > WRITE_ONCE(sk->sk_sndbuf, 2 * READ_ONCE(net->smc.sysctl_wmem)); > WRITE_ONCE(sk->sk_rcvbuf, 2 * READ_ONCE(net->smc.sysctl_rmem)); > - smc = smc_sk(sk); > INIT_WORK(&smc->tcp_listen_work, smc_tcp_listen_work); > INIT_WORK(&smc->connect_work, smc_connect_work); > INIT_DELAYED_WORK(&smc->conn.tx_work, smc_tx_work); > @@ -389,6 +379,24 @@ static struct sock *smc_sock_alloc(struct net *net, struct socket *sock, > sk->sk_prot->hash(sk); > mutex_init(&smc->clcsock_release_lock); > smc_init_saved_callbacks(smc); > + smc->limit_smc_hs = net->smc.limit_smc_hs; > + smc->use_fallback = false; /* assume rdma capability first */ > + smc->fallback_rsn = 0; > +} > + > +static struct sock *smc_sock_alloc(struct net *net, struct socket *sock, > + int protocol) > +{ > + struct proto *prot; > + struct sock *sk; > + > + prot = (protocol == SMCPROTO_SMC6) ? &smc_proto6 : &smc_proto; > + sk = sk_alloc(net, PF_SMC, GFP_KERNEL, prot, 0); > + if (!sk) > + return NULL; > + > + sock_init_data(sock, sk); /* sets sk_refcnt to 1 */ > + smc_sk_init(net, sk, protocol); > > return sk; > } > @@ -3321,6 +3329,31 @@ static ssize_t smc_splice_read(struct socket *sock, loff_t *ppos, > .splice_read = smc_splice_read, > }; > > +int smc_create_clcsk(struct net *net, struct sock *sk, int family) > +{ > + struct smc_sock *smc = smc_sk(sk); > + int rc; > + > + rc = sock_create_kern(net, family, SOCK_STREAM, IPPROTO_TCP, > + &smc->clcsock); > + if (rc) { > + sk_common_release(sk); > + return rc; > + } > + > + /* smc_clcsock_release() does not wait smc->clcsock->sk's > + * destruction; its sk_state might not be TCP_CLOSE after > + * smc->sk is close()d, and TCP timers can be fired later, > + * which need net ref. > + */ > + sk = smc->clcsock->sk; > + __netns_tracker_free(net, &sk->ns_tracker, false); > + sk->sk_net_refcnt = 1; > + get_net_track(net, &sk->ns_tracker, GFP_KERNEL); > + sock_inuse_add(net, 1); > + return 0; > +} > + > static int __smc_create(struct net *net, struct socket *sock, int protocol, > int kern, struct socket *clcsock) > { > @@ -3346,35 +3379,12 @@ static int __smc_create(struct net *net, struct socket *sock, int protocol, > > /* create internal TCP socket for CLC handshake and fallback */ > smc = smc_sk(sk); > - smc->use_fallback = false; /* assume rdma capability first */ > - smc->fallback_rsn = 0; > - > - /* default behavior from limit_smc_hs in every net namespace */ > - smc->limit_smc_hs = net->smc.limit_smc_hs; > > rc = 0; > - if (!clcsock) { > - rc = sock_create_kern(net, family, SOCK_STREAM, IPPROTO_TCP, > - &smc->clcsock); > - if (rc) { > - sk_common_release(sk); > - goto out; > - } > - > - /* smc_clcsock_release() does not wait smc->clcsock->sk's > - * destruction; its sk_state might not be TCP_CLOSE after > - * smc->sk is close()d, and TCP timers can be fired later, > - * which need net ref. > - */ > - sk = smc->clcsock->sk; > - __netns_tracker_free(net, &sk->ns_tracker, false); > - sk->sk_net_refcnt = 1; > - get_net_track(net, &sk->ns_tracker, GFP_KERNEL); > - sock_inuse_add(net, 1); > - } else { > + if (clcsock) > smc->clcsock = clcsock; > - } > - > + else > + rc = smc_create_clcsk(net, sk, family); > out: > return rc; > } > diff --git a/net/smc/smc.h b/net/smc/smc.h > index 18c8b78..3edec1e 100644 > --- a/net/smc/smc.h > +++ b/net/smc/smc.h > @@ -34,6 +34,11 @@ > extern struct proto smc_proto; > extern struct proto smc_proto6; > > +/* smc sock initialization */ > +void smc_sk_init(struct net *net, struct sock *sk, int protocol); > +/* clcsock initialization */ > +int smc_create_clcsk(struct net *net, struct sock *sk, int family); > + > #ifdef ATOMIC64_INIT > #define KERNEL_HAS_ATOMIC64 > #endif > -- > 1.8.3.1