From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from out30-110.freemail.mail.aliyun.com (out30-110.freemail.mail.aliyun.com [115.124.30.110]) (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 291461FB2; Thu, 30 May 2024 02:33:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=115.124.30.110 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717036392; cv=none; b=gfj2DjA8DePBA3yrgx0NK8sHQuSPyTc8MXwZdGU6mjsxRh8WvC6EnyIrDdLWqJSNt3jkYlGSG+ZcDrrtd4uh7D9BdCFu9ET+R00SSDgsJWPxshhGVFSo7TiFZz0q4QAs3LnAw2PZUjMYSJ7Zuszeh5LXZNiFXBG15C/U2jXze/o= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717036392; c=relaxed/simple; bh=J14hMYs0L3Jzqp3xpbzDtWuk9l3YF8pCLIyJwq80O2g=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=BlgByFjfkJBHa3H3N6IDjTP4rhWi/Ar4YBNdAztLa6HiZF9MwFz9ZcR3lGeCJ3CIhXm4EPdIS7o6RmhKyntP82ziBan4y4v4qN/Snm+nERi2R7BHFIqNp4uXwR4YdjKCi+WYm87eN8/S4fzj/ZHV/Ig2jAADTtnv4eQKuP6sets= 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=XEP6+xpy; arc=none smtp.client-ip=115.124.30.110 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="XEP6+xpy" DKIM-Signature:v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1717036385; h=Message-ID:Date:MIME-Version:Subject:To:From:Content-Type; bh=FKbEiKaHOgEveTKMf5LFatnFVnDxRh++LgM/M0sERq0=; b=XEP6+xpyzJ5qg9j3myEM7HUanOnr2ziVdUL8LrcpXWj/JRe1oDLWVVWiSi2GQF4FBqnxDxDqnmcmKy5tBd2KBnhS7f2TW2A1KVsCkE0Q1xwY/SlYYjxly4RXzTpu6lRkl9VZgqc0kOCHOxflev5epabJTcZtxZlBAI21rUBPUZI= X-Alimail-AntiSpam:AC=PASS;BC=-1|-1;BR=01201311R131e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=maildocker-contentspam033045075189;MF=alibuda@linux.alibaba.com;NM=1;PH=DS;RN=14;SR=0;TI=SMTPD_---0W7VHWLQ_1717036383; Received: from 30.221.146.99(mailfrom:alibuda@linux.alibaba.com fp:SMTPD_---0W7VHWLQ_1717036383) by smtp.aliyun-inc.com; Thu, 30 May 2024 10:33:04 +0800 Message-ID: <208d87bd-3f4f-4d90-982e-fcc76dd5ed55@linux.alibaba.com> Date: Thu, 30 May 2024 10:33:03 +0800 Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH net-next v4 2/3] net/smc: expose smc proto operations To: Zhu Yanjun , kgraul@linux.ibm.com, wenjia@linux.ibm.com, jaka@linux.ibm.com, wintera@linux.ibm.com, guwen@linux.alibaba.com Cc: kuba@kernel.org, davem@davemloft.net, netdev@vger.kernel.org, linux-s390@vger.kernel.org, linux-rdma@vger.kernel.org, tonylu@linux.alibaba.com, pabeni@redhat.com, edumazet@google.com References: <1716955147-88923-1-git-send-email-alibuda@linux.alibaba.com> <1716955147-88923-3-git-send-email-alibuda@linux.alibaba.com> <136a5e67-962a-4084-bc51-c0ec9eb8e885@linux.dev> Content-Language: en-US From: "D. Wythe" In-Reply-To: <136a5e67-962a-4084-bc51-c0ec9eb8e885@linux.dev> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit On 5/30/24 1:57 AM, Zhu Yanjun wrote: > 在 2024/5/29 5:59, D. Wythe 写道: >> From: "D. Wythe" >> >> Externalize smc proto operations (smc_xxx) to allow >> access from files other that af_smc.c > > s/other that/other than ? > > Zhu Yanjun > Thanks for that. D. Wythe >> >> This is in preparation for the subsequent implementation >> of the AF_INET version of SMC. >> >> Signed-off-by: D. Wythe >> --- >>   net/smc/af_smc.c | 60 >> ++++++++++++++++++++++++++++---------------------------- >>   net/smc/smc.h    | 33 +++++++++++++++++++++++++++++++ >>   2 files changed, 63 insertions(+), 30 deletions(-) >> >> diff --git a/net/smc/af_smc.c b/net/smc/af_smc.c >> index 77a9d58..8e3ce76 100644 >> --- a/net/smc/af_smc.c >> +++ b/net/smc/af_smc.c >> @@ -170,15 +170,15 @@ static bool smc_hs_congested(const struct sock >> *sk) >>       return false; >>   } >>   -static struct smc_hashinfo smc_v4_hashinfo = { >> +struct smc_hashinfo smc_v4_hashinfo = { >>       .lock = __RW_LOCK_UNLOCKED(smc_v4_hashinfo.lock), >>   }; >>   -static struct smc_hashinfo smc_v6_hashinfo = { >> +struct smc_hashinfo smc_v6_hashinfo = { >>       .lock = __RW_LOCK_UNLOCKED(smc_v6_hashinfo.lock), >>   }; >>   -static int smc_hash_sk(struct sock *sk) >> +int smc_hash_sk(struct sock *sk) >>   { >>       struct smc_hashinfo *h = sk->sk_prot->h.smc_hash; >>       struct hlist_head *head; >> @@ -193,7 +193,7 @@ static int smc_hash_sk(struct sock *sk) >>       return 0; >>   } >>   -static void smc_unhash_sk(struct sock *sk) >> +void smc_unhash_sk(struct sock *sk) >>   { >>       struct smc_hashinfo *h = sk->sk_prot->h.smc_hash; >>   @@ -207,7 +207,7 @@ static void smc_unhash_sk(struct sock *sk) >>    * work which we didn't do because of user hold the sock_lock in the >>    * BH context >>    */ >> -static void smc_release_cb(struct sock *sk) >> +void smc_release_cb(struct sock *sk) >>   { >>       struct smc_sock *smc = smc_sk(sk); >>   @@ -307,7 +307,7 @@ static int __smc_release(struct smc_sock *smc) >>       return rc; >>   } >>   -static int smc_release(struct socket *sock) >> +int smc_release(struct socket *sock) >>   { >>       struct sock *sk = sock->sk; >>       struct smc_sock *smc; >> @@ -401,8 +401,8 @@ static struct sock *smc_sock_alloc(struct net >> *net, struct socket *sock, >>       return sk; >>   } >>   -static int smc_bind(struct socket *sock, struct sockaddr *uaddr, >> -            int addr_len) >> +int smc_bind(struct socket *sock, struct sockaddr *uaddr, >> +         int addr_len) >>   { >>       struct sockaddr_in *addr = (struct sockaddr_in *)uaddr; >>       struct sock *sk = sock->sk; >> @@ -1649,8 +1649,8 @@ static void smc_connect_work(struct work_struct >> *work) >>       release_sock(&smc->sk); >>   } >>   -static int smc_connect(struct socket *sock, struct sockaddr *addr, >> -               int alen, int flags) >> +int smc_connect(struct socket *sock, struct sockaddr *addr, >> +        int alen, int flags) >>   { >>       struct sock *sk = sock->sk; >>       struct smc_sock *smc; >> @@ -2631,7 +2631,7 @@ static void smc_clcsock_data_ready(struct sock >> *listen_clcsock) >>       read_unlock_bh(&listen_clcsock->sk_callback_lock); >>   } >>   -static int smc_listen(struct socket *sock, int backlog) >> +int smc_listen(struct socket *sock, int backlog) >>   { >>       struct sock *sk = sock->sk; >>       struct smc_sock *smc; >> @@ -2696,8 +2696,8 @@ static int smc_listen(struct socket *sock, int >> backlog) >>       return rc; >>   } >>   -static int smc_accept(struct socket *sock, struct socket *new_sock, >> -              struct proto_accept_arg *arg) >> +int smc_accept(struct socket *sock, struct socket *new_sock, >> +           struct proto_accept_arg *arg) >>   { >>       struct sock *sk = sock->sk, *nsk; >>       DECLARE_WAITQUEUE(wait, current); >> @@ -2766,8 +2766,8 @@ static int smc_accept(struct socket *sock, >> struct socket *new_sock, >>       return rc; >>   } >>   -static int smc_getname(struct socket *sock, struct sockaddr *addr, >> -               int peer) >> +int smc_getname(struct socket *sock, struct sockaddr *addr, >> +        int peer) >>   { >>       struct smc_sock *smc; >>   @@ -2780,7 +2780,7 @@ static int smc_getname(struct socket *sock, >> struct sockaddr *addr, >>       return smc->clcsock->ops->getname(smc->clcsock, addr, peer); >>   } >>   -static int smc_sendmsg(struct socket *sock, struct msghdr *msg, >> size_t len) >> +int smc_sendmsg(struct socket *sock, struct msghdr *msg, size_t len) >>   { >>       struct sock *sk = sock->sk; >>       struct smc_sock *smc; >> @@ -2818,8 +2818,8 @@ static int smc_sendmsg(struct socket *sock, >> struct msghdr *msg, size_t len) >>       return rc; >>   } >>   -static int smc_recvmsg(struct socket *sock, struct msghdr *msg, >> size_t len, >> -               int flags) >> +int smc_recvmsg(struct socket *sock, struct msghdr *msg, size_t len, >> +        int flags) >>   { >>       struct sock *sk = sock->sk; >>       struct smc_sock *smc; >> @@ -2868,8 +2868,8 @@ static __poll_t smc_accept_poll(struct sock >> *parent) >>       return mask; >>   } >>   -static __poll_t smc_poll(struct file *file, struct socket *sock, >> -                 poll_table *wait) >> +__poll_t smc_poll(struct file *file, struct socket *sock, >> +          poll_table *wait) >>   { >>       struct sock *sk = sock->sk; >>       struct smc_sock *smc; >> @@ -2921,7 +2921,7 @@ static __poll_t smc_poll(struct file *file, >> struct socket *sock, >>       return mask; >>   } >>   -static int smc_shutdown(struct socket *sock, int how) >> +int smc_shutdown(struct socket *sock, int how) >>   { >>       struct sock *sk = sock->sk; >>       bool do_shutdown = true; >> @@ -3061,8 +3061,8 @@ static int __smc_setsockopt(struct socket >> *sock, int level, int optname, >>       return rc; >>   } >>   -static int smc_setsockopt(struct socket *sock, int level, int >> optname, >> -              sockptr_t optval, unsigned int optlen) >> +int smc_setsockopt(struct socket *sock, int level, int optname, >> +           sockptr_t optval, unsigned int optlen) >>   { >>       struct sock *sk = sock->sk; >>       struct smc_sock *smc; >> @@ -3148,8 +3148,8 @@ static int smc_setsockopt(struct socket *sock, >> int level, int optname, >>       return rc; >>   } >>   -static int smc_getsockopt(struct socket *sock, int level, int >> optname, >> -              char __user *optval, int __user *optlen) >> +int smc_getsockopt(struct socket *sock, int level, int optname, >> +           char __user *optval, int __user *optlen) >>   { >>       struct smc_sock *smc; >>       int rc; >> @@ -3174,8 +3174,8 @@ static int smc_getsockopt(struct socket *sock, >> int level, int optname, >>       return rc; >>   } >>   -static int smc_ioctl(struct socket *sock, unsigned int cmd, >> -             unsigned long arg) >> +int smc_ioctl(struct socket *sock, unsigned int cmd, >> +          unsigned long arg) >>   { >>       union smc_host_cursor cons, urg; >>       struct smc_connection *conn; >> @@ -3261,9 +3261,9 @@ static int smc_ioctl(struct socket *sock, >> unsigned int cmd, >>    * Note that subsequent recv() calls have to wait till all splice() >> processing >>    * completed. >>    */ >> -static ssize_t smc_splice_read(struct socket *sock, loff_t *ppos, >> -                   struct pipe_inode_info *pipe, size_t len, >> -                   unsigned int flags) >> +ssize_t smc_splice_read(struct socket *sock, loff_t *ppos, >> +            struct pipe_inode_info *pipe, size_t len, >> +            unsigned int flags) >>   { >>       struct sock *sk = sock->sk; >>       struct smc_sock *smc; >> diff --git a/net/smc/smc.h b/net/smc/smc.h >> index 3edec1e..34b781e 100644 >> --- a/net/smc/smc.h >> +++ b/net/smc/smc.h >> @@ -34,6 +34,39 @@ >>   extern struct proto smc_proto; >>   extern struct proto smc_proto6; >>   +extern struct smc_hashinfo smc_v4_hashinfo; >> +extern struct smc_hashinfo smc_v6_hashinfo; >> + >> +int smc_hash_sk(struct sock *sk); >> +void smc_unhash_sk(struct sock *sk); >> +void smc_release_cb(struct sock *sk); >> + >> +int smc_release(struct socket *sock); >> +int smc_bind(struct socket *sock, struct sockaddr *uaddr, >> +         int addr_len); >> +int smc_connect(struct socket *sock, struct sockaddr *addr, >> +        int alen, int flags); >> +int smc_accept(struct socket *sock, struct socket *new_sock, >> +           struct proto_accept_arg *arg); >> +int smc_getname(struct socket *sock, struct sockaddr *addr, >> +        int peer); >> +__poll_t smc_poll(struct file *file, struct socket *sock, >> +          poll_table *wait); >> +int smc_ioctl(struct socket *sock, unsigned int cmd, >> +          unsigned long arg); >> +int smc_listen(struct socket *sock, int backlog); >> +int smc_shutdown(struct socket *sock, int how); >> +int smc_setsockopt(struct socket *sock, int level, int optname, >> +           sockptr_t optval, unsigned int optlen); >> +int smc_getsockopt(struct socket *sock, int level, int optname, >> +           char __user *optval, int __user *optlen); >> +int smc_sendmsg(struct socket *sock, struct msghdr *msg, size_t len); >> +int smc_recvmsg(struct socket *sock, struct msghdr *msg, size_t len, >> +        int flags); >> +ssize_t smc_splice_read(struct socket *sock, loff_t *ppos, >> +            struct pipe_inode_info *pipe, size_t len, >> +            unsigned int flags); >> + >>   /* smc sock initialization */ >>   void smc_sk_init(struct net *net, struct sock *sk, int protocol); >>   /* clcsock initialization */