From: Wen Gu <guwen@linux.alibaba.com>
To: wintera@linux.ibm.com, twinkler@linux.ibm.com, hca@linux.ibm.com,
gor@linux.ibm.com, agordeev@linux.ibm.com, davem@davemloft.net,
edumazet@google.com, kuba@kernel.org, pabeni@redhat.com,
wenjia@linux.ibm.com, jaka@linux.ibm.com
Cc: borntraeger@linux.ibm.com, svens@linux.ibm.com,
alibuda@linux.alibaba.com, tonylu@linux.alibaba.com,
guwen@linux.alibaba.com, linux-kernel@vger.kernel.org,
linux-s390@vger.kernel.org, netdev@vger.kernel.org
Subject: [PATCH net-next v2 07/11] net/smc: register loopback-ism into SMC-D device list
Date: Thu, 7 Mar 2024 17:55:32 +0800 [thread overview]
Message-ID: <20240307095536.29648-8-guwen@linux.alibaba.com> (raw)
In-Reply-To: <20240307095536.29648-1-guwen@linux.alibaba.com>
After loopback-ism device gets ready, add it to the SMC-D device list as
an ISMv2 device.
Signed-off-by: Wen Gu <guwen@linux.alibaba.com>
---
net/smc/smc_ism.c | 11 +++++++----
net/smc/smc_ism.h | 1 +
net/smc/smc_loopback.c | 20 +++++++++++++-------
3 files changed, 21 insertions(+), 11 deletions(-)
diff --git a/net/smc/smc_ism.c b/net/smc/smc_ism.c
index 26743a14cf27..c50910300a03 100644
--- a/net/smc/smc_ism.c
+++ b/net/smc/smc_ism.c
@@ -91,6 +91,11 @@ bool smc_ism_is_v2_capable(void)
return smc_ism_v2_capable;
}
+void smc_ism_set_v2_capable(void)
+{
+ smc_ism_v2_capable = true;
+}
+
/* Set a connection using this DMBE. */
void smc_ism_set_conn(struct smc_connection *conn)
{
@@ -454,11 +459,9 @@ static void smcd_register_dev(struct ism_dev *ism)
if (smc_pnetid_by_dev_port(&ism->pdev->dev, 0, smcd->pnetid))
smc_pnetid_by_table_smcd(smcd);
+ if (smcd->ops->supports_v2())
+ smc_ism_set_v2_capable();
mutex_lock(&smcd_dev_list.mutex);
- if (list_empty(&smcd_dev_list.list)) {
- if (smcd->ops->supports_v2())
- smc_ism_v2_capable = true;
- }
/* sort list: devices without pnetid before devices with pnetid */
if (smcd->pnetid[0])
list_add_tail(&smcd->list, &smcd_dev_list.list);
diff --git a/net/smc/smc_ism.h b/net/smc/smc_ism.h
index 165cd013404b..2ea169c1301c 100644
--- a/net/smc/smc_ism.h
+++ b/net/smc/smc_ism.h
@@ -52,6 +52,7 @@ int smc_ism_signal_shutdown(struct smc_link_group *lgr);
void smc_ism_get_system_eid(u8 **eid);
u16 smc_ism_get_chid(struct smcd_dev *dev);
bool smc_ism_is_v2_capable(void);
+void smc_ism_set_v2_capable(void);
int smc_ism_init(void);
void smc_ism_exit(void);
int smcd_nl_get_device(struct sk_buff *skb, struct netlink_callback *cb);
diff --git a/net/smc/smc_loopback.c b/net/smc/smc_loopback.c
index 39aa35bf38f5..6828e0ad3e90 100644
--- a/net/smc/smc_loopback.c
+++ b/net/smc/smc_loopback.c
@@ -275,10 +275,12 @@ static int smcd_lo_register_dev(struct smc_lo_dev *ldev)
return -ENOMEM;
ldev->smcd = smcd;
smcd->priv = ldev;
-
- /* TODO:
- * register loopback-ism to smcd_dev list.
- */
+ smc_ism_set_v2_capable();
+ mutex_lock(&smcd_dev_list.mutex);
+ list_add(&smcd->list, &smcd_dev_list.list);
+ mutex_unlock(&smcd_dev_list.mutex);
+ pr_warn_ratelimited("smc: adding smcd device %s\n",
+ smc_lo_dev_name);
return 0;
}
@@ -286,9 +288,13 @@ static void smcd_lo_unregister_dev(struct smc_lo_dev *ldev)
{
struct smcd_dev *smcd = ldev->smcd;
- /* TODO:
- * unregister loopback-ism from smcd_dev list.
- */
+ pr_warn_ratelimited("smc: removing smcd device %s\n",
+ smc_lo_dev_name);
+ smcd->going_away = 1;
+ smc_smcd_terminate_all(smcd);
+ mutex_lock(&smcd_dev_list.mutex);
+ list_del_init(&smcd->list);
+ mutex_unlock(&smcd_dev_list.mutex);
kfree(smcd->conn);
kfree(smcd);
}
--
2.32.0.3.g01195cf9f
next prev parent reply other threads:[~2024-03-07 9:56 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-07 9:55 [PATCH net-next v2 00/11] net/smc: SMC intra-OS shortcut with loopback-ism Wen Gu
2024-03-07 9:55 ` [PATCH net-next v2 01/11] net/smc: adapt SMC-D device dump for Emulated-ISM Wen Gu
2024-03-08 12:27 ` Jan Karcher
2024-03-09 6:57 ` Wen Gu
2024-03-07 9:55 ` [PATCH net-next v2 02/11] net/smc: decouple ism_client from SMC-D DMB registration Wen Gu
2024-03-07 9:55 ` [PATCH net-next v2 03/11] net/smc: introduce loopback-ism for SMC intra-OS shortcut Wen Gu
2024-03-07 9:55 ` [PATCH net-next v2 04/11] net/smc: implement ID-related operations of loopback-ism Wen Gu
2024-03-07 9:55 ` [PATCH net-next v2 05/11] net/smc: implement some unsupported " Wen Gu
2024-03-07 9:55 ` [PATCH net-next v2 06/11] net/smc: implement DMB-related " Wen Gu
2024-03-07 9:55 ` Wen Gu [this message]
2024-03-07 9:55 ` [PATCH net-next v2 08/11] net/smc: add operations to merge sndbuf with peer DMB Wen Gu
2024-03-07 9:55 ` [PATCH net-next v2 09/11] net/smc: attach or detach ghost sndbuf to " Wen Gu
2024-03-07 9:55 ` [PATCH net-next v2 10/11] net/smc: adapt cursor update when sndbuf and peer DMB are merged Wen Gu
2024-03-07 9:55 ` [PATCH net-next v2 11/11] net/smc: implement DMB-merged operations of loopback-ism Wen Gu
2024-03-12 8:06 ` Jan Karcher
2024-03-12 14:11 ` Wen Gu
2024-03-08 12:22 ` [PATCH net-next v2 00/11] net/smc: SMC intra-OS shortcut with loopback-ism Jan Karcher
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=20240307095536.29648-8-guwen@linux.alibaba.com \
--to=guwen@linux.alibaba.com \
--cc=agordeev@linux.ibm.com \
--cc=alibuda@linux.alibaba.com \
--cc=borntraeger@linux.ibm.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=gor@linux.ibm.com \
--cc=hca@linux.ibm.com \
--cc=jaka@linux.ibm.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=svens@linux.ibm.com \
--cc=tonylu@linux.alibaba.com \
--cc=twinkler@linux.ibm.com \
--cc=wenjia@linux.ibm.com \
--cc=wintera@linux.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;
as well as URLs for NNTP newsgroup(s).