From nobody Wed Jan 15 17:55:46 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4E1F2CE7A8A for ; Sun, 24 Sep 2023 15:18:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229795AbjIXPSM (ORCPT ); Sun, 24 Sep 2023 11:18:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59070 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230241AbjIXPRu (ORCPT ); Sun, 24 Sep 2023 11:17:50 -0400 Received: from out30-98.freemail.mail.aliyun.com (out30-98.freemail.mail.aliyun.com [115.124.30.98]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D5999E69; Sun, 24 Sep 2023 08:17:29 -0700 (PDT) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R181e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018046049;MF=guwen@linux.alibaba.com;NM=1;PH=DS;RN=18;SR=0;TI=SMTPD_---0VsinOdJ_1695568645; Received: from localhost(mailfrom:guwen@linux.alibaba.com fp:SMTPD_---0VsinOdJ_1695568645) by smtp.aliyun-inc.com; Sun, 24 Sep 2023 23:17:26 +0800 From: Wen Gu To: kgraul@linux.ibm.com, wenjia@linux.ibm.com, jaka@linux.ibm.com, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com Cc: wintera@linux.ibm.com, schnelle@linux.ibm.com, gbayer@linux.ibm.com, pasic@linux.ibm.com, alibuda@linux.alibaba.com, tonylu@linux.alibaba.com, dust.li@linux.alibaba.com, guwen@linux.alibaba.com, linux-s390@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next v4 12/18] net/smc: implement DMB-related operations of loopback Date: Sun, 24 Sep 2023 23:16:47 +0800 Message-Id: <1695568613-125057-13-git-send-email-guwen@linux.alibaba.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1695568613-125057-1-git-send-email-guwen@linux.alibaba.com> References: <1695568613-125057-1-git-send-email-guwen@linux.alibaba.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This patch implements DMB registration, unregistration and data move operations of SMC-D loopback. Signed-off-by: Wen Gu --- net/smc/smc_cdc.c | 6 +++ net/smc/smc_cdc.h | 1 + net/smc/smc_loopback.c | 127 +++++++++++++++++++++++++++++++++++++++++++++= ++-- net/smc/smc_loopback.h | 13 +++++ 4 files changed, 144 insertions(+), 3 deletions(-) diff --git a/net/smc/smc_cdc.c b/net/smc/smc_cdc.c index 89105e9..2641800 100644 --- a/net/smc/smc_cdc.c +++ b/net/smc/smc_cdc.c @@ -411,6 +411,12 @@ static void smc_cdc_msg_recv(struct smc_sock *smc, str= uct smc_cdc_msg *cdc) static void smcd_cdc_rx_tsklet(struct tasklet_struct *t) { struct smc_connection *conn =3D from_tasklet(conn, t, rx_tsklet); + + smcd_cdc_rx_handler(conn); +} + +void smcd_cdc_rx_handler(struct smc_connection *conn) +{ struct smcd_cdc_msg *data_cdc; struct smcd_cdc_msg cdc; struct smc_sock *smc; diff --git a/net/smc/smc_cdc.h b/net/smc/smc_cdc.h index 696cc11..11559d4 100644 --- a/net/smc/smc_cdc.h +++ b/net/smc/smc_cdc.h @@ -301,5 +301,6 @@ int smcr_cdc_msg_send_validation(struct smc_connection = *conn, struct smc_wr_buf *wr_buf); int smc_cdc_init(void) __init; void smcd_cdc_rx_init(struct smc_connection *conn); +void smcd_cdc_rx_handler(struct smc_connection *conn); =20 #endif /* SMC_CDC_H */ diff --git a/net/smc/smc_loopback.c b/net/smc/smc_loopback.c index 4341803..eb13291 100644 --- a/net/smc/smc_loopback.c +++ b/net/smc/smc_loopback.c @@ -16,11 +16,13 @@ #include #include =20 +#include "smc_cdc.h" #include "smc_ism.h" #include "smc_loopback.h" =20 #if IS_ENABLED(CONFIG_SMC_LO) #define SMC_LO_SUPPORTS_V2 0x1 /* SMC-D loopback supports SMC-Dv2 */ +#define SMC_DMA_ADDR_INVALID (~(dma_addr_t)0) =20 static const char smc_lo_dev_name[] =3D "smc_lo"; static struct smcd_seid SMC_LO_SEID =3D { @@ -75,6 +77,91 @@ static int smc_lo_query_rgid(struct smcd_dev *smcd, stru= ct smcd_gid *rgid, return 0; } =20 +static int smc_lo_register_dmb(struct smcd_dev *smcd, struct smcd_dmb *dmb, + void *client_priv) +{ + struct smc_lo_dmb_node *dmb_node, *tmp_node; + struct smc_lo_dev *ldev =3D smcd->priv; + int sba_idx, rc; + + /* check space for new dmb */ + for_each_clear_bit(sba_idx, ldev->sba_idx_mask, SMC_LODEV_MAX_DMBS) { + if (!test_and_set_bit(sba_idx, ldev->sba_idx_mask)) + break; + } + if (sba_idx =3D=3D SMC_LODEV_MAX_DMBS) + return -ENOSPC; + + dmb_node =3D kzalloc(sizeof(*dmb_node), GFP_KERNEL); + if (!dmb_node) { + rc =3D -ENOMEM; + goto err_bit; + } + + dmb_node->sba_idx =3D sba_idx; + dmb_node->cpu_addr =3D vzalloc(dmb->dmb_len); + if (!dmb_node->cpu_addr) { + rc =3D -ENOMEM; + goto err_node; + } + dmb_node->len =3D dmb->dmb_len; + dmb_node->dma_addr =3D SMC_DMA_ADDR_INVALID; + +again: + /* add new dmb into hash table */ + get_random_bytes(&dmb_node->token, sizeof(dmb_node->token)); + write_lock(&ldev->dmb_ht_lock); + hash_for_each_possible(ldev->dmb_ht, tmp_node, list, dmb_node->token) { + if (tmp_node->token =3D=3D dmb_node->token) { + write_unlock(&ldev->dmb_ht_lock); + goto again; + } + } + hash_add(ldev->dmb_ht, &dmb_node->list, dmb_node->token); + write_unlock(&ldev->dmb_ht_lock); + + dmb->sba_idx =3D dmb_node->sba_idx; + dmb->dmb_tok =3D dmb_node->token; + dmb->cpu_addr =3D dmb_node->cpu_addr; + dmb->dma_addr =3D dmb_node->dma_addr; + dmb->dmb_len =3D dmb_node->len; + + return 0; + +err_node: + kfree(dmb_node); +err_bit: + clear_bit(sba_idx, ldev->sba_idx_mask); + return rc; +} + +static int smc_lo_unregister_dmb(struct smcd_dev *smcd, struct smcd_dmb *d= mb) +{ + struct smc_lo_dmb_node *dmb_node =3D NULL, *tmp_node; + struct smc_lo_dev *ldev =3D smcd->priv; + + /* remove dmb from hash table */ + write_lock(&ldev->dmb_ht_lock); + hash_for_each_possible(ldev->dmb_ht, tmp_node, list, dmb->dmb_tok) { + if (tmp_node->token =3D=3D dmb->dmb_tok) { + dmb_node =3D tmp_node; + break; + } + } + if (!dmb_node) { + write_unlock(&ldev->dmb_ht_lock); + return -EINVAL; + } + hash_del(&dmb_node->list); + write_unlock(&ldev->dmb_ht_lock); + + clear_bit(dmb_node->sba_idx, ldev->sba_idx_mask); + vfree(dmb_node->cpu_addr); + kfree(dmb_node); + + return 0; +} + static int smc_lo_add_vlan_id(struct smcd_dev *smcd, u64 vlan_id) { return -EOPNOTSUPP; @@ -101,6 +188,38 @@ static int smc_lo_signal_event(struct smcd_dev *dev, s= truct smcd_gid *rgid, return 0; } =20 +static int smc_lo_move_data(struct smcd_dev *smcd, u64 dmb_tok, unsigned i= nt idx, + bool sf, unsigned int offset, void *data, + unsigned int size) +{ + struct smc_lo_dmb_node *rmb_node =3D NULL, *tmp_node; + struct smc_lo_dev *ldev =3D smcd->priv; + + read_lock(&ldev->dmb_ht_lock); + hash_for_each_possible(ldev->dmb_ht, tmp_node, list, dmb_tok) { + if (tmp_node->token =3D=3D dmb_tok) { + rmb_node =3D tmp_node; + break; + } + } + if (!rmb_node) { + read_unlock(&ldev->dmb_ht_lock); + return -EINVAL; + } + read_unlock(&ldev->dmb_ht_lock); + + memcpy((char *)rmb_node->cpu_addr + offset, data, size); + + if (sf) { + struct smc_connection *conn =3D + smcd->conn[rmb_node->sba_idx]; + + if (conn && !conn->killed) + smcd_cdc_rx_handler(conn); + } + return 0; +} + static int smc_lo_supports_v2(void) { return SMC_LO_SUPPORTS_V2; @@ -132,14 +251,14 @@ static struct device *smc_lo_get_dev(struct smcd_dev = *smcd) =20 static const struct smcd_ops lo_ops =3D { .query_remote_gid =3D smc_lo_query_rgid, - .register_dmb =3D NULL, - .unregister_dmb =3D NULL, + .register_dmb =3D smc_lo_register_dmb, + .unregister_dmb =3D smc_lo_unregister_dmb, .add_vlan_id =3D smc_lo_add_vlan_id, .del_vlan_id =3D smc_lo_del_vlan_id, .set_vlan_required =3D smc_lo_set_vlan_required, .reset_vlan_required =3D smc_lo_reset_vlan_required, .signal_event =3D smc_lo_signal_event, - .move_data =3D NULL, + .move_data =3D smc_lo_move_data, .supports_v2 =3D smc_lo_supports_v2, .get_system_eid =3D smc_lo_get_system_eid, .get_local_gid =3D smc_lo_get_local_gid, @@ -213,6 +332,8 @@ static void smc_lo_dev_release(struct device *dev) static int smc_lo_dev_init(struct smc_lo_dev *ldev) { smc_lo_generate_id(ldev); + rwlock_init(&ldev->dmb_ht_lock); + hash_init(ldev->dmb_ht); =20 return smcd_lo_register_dev(ldev); } diff --git a/net/smc/smc_loopback.h b/net/smc/smc_loopback.h index 71a52da..a5b501b 100644 --- a/net/smc/smc_loopback.h +++ b/net/smc/smc_loopback.h @@ -21,12 +21,25 @@ #if IS_ENABLED(CONFIG_SMC_LO) #define SMC_LO_CHID 0xFFFF #define SMC_LODEV_MAX_DMBS 5000 +#define SMC_LODEV_DMBS_HASH_BITS 12 + +struct smc_lo_dmb_node { + struct hlist_node list; + u64 token; + u32 len; + u32 sba_idx; + void *cpu_addr; + dma_addr_t dma_addr; +}; =20 struct smc_lo_dev { struct smcd_dev *smcd; struct device dev; u16 chid; struct smcd_gid local_gid; + DECLARE_BITMAP(sba_idx_mask, SMC_LODEV_MAX_DMBS); + rwlock_t dmb_ht_lock; + DECLARE_HASHTABLE(dmb_ht, SMC_LODEV_DMBS_HASH_BITS); }; #endif =20 --=20 1.8.3.1