This patch implements DMB registration, unregistration and data move
operations of SMC-D loopback.
Signed-off-by: Wen Gu <guwen@linux.alibaba.com>
---
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, struct smc_cdc_msg *cdc)
static void smcd_cdc_rx_tsklet(struct tasklet_struct *t)
{
struct smc_connection *conn = 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);
#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 <linux/smc.h>
#include <net/smc.h>
+#include "smc_cdc.h"
#include "smc_ism.h"
#include "smc_loopback.h"
#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)
static const char smc_lo_dev_name[] = "smc_lo";
static struct smcd_seid SMC_LO_SEID = {
@@ -75,6 +77,91 @@ static int smc_lo_query_rgid(struct smcd_dev *smcd, struct smcd_gid *rgid,
return 0;
}
+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 = 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 == SMC_LODEV_MAX_DMBS)
+ return -ENOSPC;
+
+ dmb_node = kzalloc(sizeof(*dmb_node), GFP_KERNEL);
+ if (!dmb_node) {
+ rc = -ENOMEM;
+ goto err_bit;
+ }
+
+ dmb_node->sba_idx = sba_idx;
+ dmb_node->cpu_addr = vzalloc(dmb->dmb_len);
+ if (!dmb_node->cpu_addr) {
+ rc = -ENOMEM;
+ goto err_node;
+ }
+ dmb_node->len = dmb->dmb_len;
+ dmb_node->dma_addr = 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 == 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 = dmb_node->sba_idx;
+ dmb->dmb_tok = dmb_node->token;
+ dmb->cpu_addr = dmb_node->cpu_addr;
+ dmb->dma_addr = dmb_node->dma_addr;
+ dmb->dmb_len = 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 *dmb)
+{
+ struct smc_lo_dmb_node *dmb_node = NULL, *tmp_node;
+ struct smc_lo_dev *ldev = 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 == dmb->dmb_tok) {
+ dmb_node = 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, struct smcd_gid *rgid,
return 0;
}
+static int smc_lo_move_data(struct smcd_dev *smcd, u64 dmb_tok, unsigned int idx,
+ bool sf, unsigned int offset, void *data,
+ unsigned int size)
+{
+ struct smc_lo_dmb_node *rmb_node = NULL, *tmp_node;
+ struct smc_lo_dev *ldev = smcd->priv;
+
+ read_lock(&ldev->dmb_ht_lock);
+ hash_for_each_possible(ldev->dmb_ht, tmp_node, list, dmb_tok) {
+ if (tmp_node->token == dmb_tok) {
+ rmb_node = 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 =
+ 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)
static const struct smcd_ops lo_ops = {
.query_remote_gid = smc_lo_query_rgid,
- .register_dmb = NULL,
- .unregister_dmb = NULL,
+ .register_dmb = smc_lo_register_dmb,
+ .unregister_dmb = smc_lo_unregister_dmb,
.add_vlan_id = smc_lo_add_vlan_id,
.del_vlan_id = smc_lo_del_vlan_id,
.set_vlan_required = smc_lo_set_vlan_required,
.reset_vlan_required = smc_lo_reset_vlan_required,
.signal_event = smc_lo_signal_event,
- .move_data = NULL,
+ .move_data = smc_lo_move_data,
.supports_v2 = smc_lo_supports_v2,
.get_system_eid = smc_lo_get_system_eid,
.get_local_gid = 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);
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;
+};
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
--
1.8.3.1Hi Wen,
kernel test robot noticed the following build errors:
[auto build test ERROR on net-next/main]
url: https://github.com/intel-lab-lkp/linux/commits/Wen-Gu/net-smc-decouple-ism_dev-from-SMC-D-device-dump/20230924-231933
base: net-next/main
patch link: https://lore.kernel.org/r/1695568613-125057-13-git-send-email-guwen%40linux.alibaba.com
patch subject: [PATCH net-next v4 12/18] net/smc: implement DMB-related operations of loopback
config: mips-allmodconfig (https://download.01.org/0day-ci/archive/20230925/202309250749.LB7ZUUGJ-lkp@intel.com/config)
compiler: mips-linux-gcc (GCC) 13.2.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20230925/202309250749.LB7ZUUGJ-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202309250749.LB7ZUUGJ-lkp@intel.com/
All error/warnings (new ones prefixed by >>):
net/smc/smc_loopback.c: In function 'smc_lo_register_dmb':
>> net/smc/smc_loopback.c:102:30: error: implicit declaration of function 'vzalloc'; did you mean 'kvzalloc'? [-Werror=implicit-function-declaration]
102 | dmb_node->cpu_addr = vzalloc(dmb->dmb_len);
| ^~~~~~~
| kvzalloc
>> net/smc/smc_loopback.c:102:28: warning: assignment to 'void *' from 'int' makes pointer from integer without a cast [-Wint-conversion]
102 | dmb_node->cpu_addr = vzalloc(dmb->dmb_len);
| ^
net/smc/smc_loopback.c: In function 'smc_lo_unregister_dmb':
>> net/smc/smc_loopback.c:159:9: error: implicit declaration of function 'vfree'; did you mean 'kvfree'? [-Werror=implicit-function-declaration]
159 | vfree(dmb_node->cpu_addr);
| ^~~~~
| kvfree
cc1: some warnings being treated as errors
vim +102 net/smc/smc_loopback.c
79
80 static int smc_lo_register_dmb(struct smcd_dev *smcd, struct smcd_dmb *dmb,
81 void *client_priv)
82 {
83 struct smc_lo_dmb_node *dmb_node, *tmp_node;
84 struct smc_lo_dev *ldev = smcd->priv;
85 int sba_idx, rc;
86
87 /* check space for new dmb */
88 for_each_clear_bit(sba_idx, ldev->sba_idx_mask, SMC_LODEV_MAX_DMBS) {
89 if (!test_and_set_bit(sba_idx, ldev->sba_idx_mask))
90 break;
91 }
92 if (sba_idx == SMC_LODEV_MAX_DMBS)
93 return -ENOSPC;
94
95 dmb_node = kzalloc(sizeof(*dmb_node), GFP_KERNEL);
96 if (!dmb_node) {
97 rc = -ENOMEM;
98 goto err_bit;
99 }
100
101 dmb_node->sba_idx = sba_idx;
> 102 dmb_node->cpu_addr = vzalloc(dmb->dmb_len);
103 if (!dmb_node->cpu_addr) {
104 rc = -ENOMEM;
105 goto err_node;
106 }
107 dmb_node->len = dmb->dmb_len;
108 dmb_node->dma_addr = SMC_DMA_ADDR_INVALID;
109
110 again:
111 /* add new dmb into hash table */
112 get_random_bytes(&dmb_node->token, sizeof(dmb_node->token));
113 write_lock(&ldev->dmb_ht_lock);
114 hash_for_each_possible(ldev->dmb_ht, tmp_node, list, dmb_node->token) {
115 if (tmp_node->token == dmb_node->token) {
116 write_unlock(&ldev->dmb_ht_lock);
117 goto again;
118 }
119 }
120 hash_add(ldev->dmb_ht, &dmb_node->list, dmb_node->token);
121 write_unlock(&ldev->dmb_ht_lock);
122
123 dmb->sba_idx = dmb_node->sba_idx;
124 dmb->dmb_tok = dmb_node->token;
125 dmb->cpu_addr = dmb_node->cpu_addr;
126 dmb->dma_addr = dmb_node->dma_addr;
127 dmb->dmb_len = dmb_node->len;
128
129 return 0;
130
131 err_node:
132 kfree(dmb_node);
133 err_bit:
134 clear_bit(sba_idx, ldev->sba_idx_mask);
135 return rc;
136 }
137
138 static int smc_lo_unregister_dmb(struct smcd_dev *smcd, struct smcd_dmb *dmb)
139 {
140 struct smc_lo_dmb_node *dmb_node = NULL, *tmp_node;
141 struct smc_lo_dev *ldev = smcd->priv;
142
143 /* remove dmb from hash table */
144 write_lock(&ldev->dmb_ht_lock);
145 hash_for_each_possible(ldev->dmb_ht, tmp_node, list, dmb->dmb_tok) {
146 if (tmp_node->token == dmb->dmb_tok) {
147 dmb_node = tmp_node;
148 break;
149 }
150 }
151 if (!dmb_node) {
152 write_unlock(&ldev->dmb_ht_lock);
153 return -EINVAL;
154 }
155 hash_del(&dmb_node->list);
156 write_unlock(&ldev->dmb_ht_lock);
157
158 clear_bit(dmb_node->sba_idx, ldev->sba_idx_mask);
> 159 vfree(dmb_node->cpu_addr);
160 kfree(dmb_node);
161
162 return 0;
163 }
164
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
On 2023/9/25 07:29, kernel test robot wrote:
> Hi Wen,
>
> kernel test robot noticed the following build errors:
>
> [auto build test ERROR on net-next/main]
>
> url: https://github.com/intel-lab-lkp/linux/commits/Wen-Gu/net-smc-decouple-ism_dev-from-SMC-D-device-dump/20230924-231933
> base: net-next/main
> patch link: https://lore.kernel.org/r/1695568613-125057-13-git-send-email-guwen%40linux.alibaba.com
> patch subject: [PATCH net-next v4 12/18] net/smc: implement DMB-related operations of loopback
> config: mips-allmodconfig (https://download.01.org/0day-ci/archive/20230925/202309250749.LB7ZUUGJ-lkp@intel.com/config)
> compiler: mips-linux-gcc (GCC) 13.2.0
> reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20230925/202309250749.LB7ZUUGJ-lkp@intel.com/reproduce)
>
> If you fix the issue in a separate patch/commit (i.e. not just a new version of
> the same patch/commit), kindly add following tags
> | Reported-by: kernel test robot <lkp@intel.com>
> | Closes: https://lore.kernel.org/oe-kbuild-all/202309250749.LB7ZUUGJ-lkp@intel.com/
>
> All error/warnings (new ones prefixed by >>):
>
> net/smc/smc_loopback.c: In function 'smc_lo_register_dmb':
>>> net/smc/smc_loopback.c:102:30: error: implicit declaration of function 'vzalloc'; did you mean 'kvzalloc'? [-Werror=implicit-function-declaration]
> 102 | dmb_node->cpu_addr = vzalloc(dmb->dmb_len);
> | ^~~~~~~
> | kvzalloc
>>> net/smc/smc_loopback.c:102:28: warning: assignment to 'void *' from 'int' makes pointer from integer without a cast [-Wint-conversion]
> 102 | dmb_node->cpu_addr = vzalloc(dmb->dmb_len);
> | ^
> net/smc/smc_loopback.c: In function 'smc_lo_unregister_dmb':
>>> net/smc/smc_loopback.c:159:9: error: implicit declaration of function 'vfree'; did you mean 'kvfree'? [-Werror=implicit-function-declaration]
> 159 | vfree(dmb_node->cpu_addr);
> | ^~~~~
> | kvfree
> cc1: some warnings being treated as errors
>
It can be fixed by including corresponding header file:
#include <linux/vmalloc.h>
Continue to wait for other review comments and will fix this in the next version.
Thanks.
>
> vim +102 net/smc/smc_loopback.c
>
> 79
> 80 static int smc_lo_register_dmb(struct smcd_dev *smcd, struct smcd_dmb *dmb,
> 81 void *client_priv)
> 82 {
> 83 struct smc_lo_dmb_node *dmb_node, *tmp_node;
> 84 struct smc_lo_dev *ldev = smcd->priv;
> 85 int sba_idx, rc;
> 86
> 87 /* check space for new dmb */
> 88 for_each_clear_bit(sba_idx, ldev->sba_idx_mask, SMC_LODEV_MAX_DMBS) {
> 89 if (!test_and_set_bit(sba_idx, ldev->sba_idx_mask))
> 90 break;
> 91 }
> 92 if (sba_idx == SMC_LODEV_MAX_DMBS)
> 93 return -ENOSPC;
> 94
> 95 dmb_node = kzalloc(sizeof(*dmb_node), GFP_KERNEL);
> 96 if (!dmb_node) {
> 97 rc = -ENOMEM;
> 98 goto err_bit;
> 99 }
> 100
> 101 dmb_node->sba_idx = sba_idx;
> > 102 dmb_node->cpu_addr = vzalloc(dmb->dmb_len);
> 103 if (!dmb_node->cpu_addr) {
> 104 rc = -ENOMEM;
> 105 goto err_node;
> 106 }
> 107 dmb_node->len = dmb->dmb_len;
> 108 dmb_node->dma_addr = SMC_DMA_ADDR_INVALID;
> 109
> 110 again:
> 111 /* add new dmb into hash table */
> 112 get_random_bytes(&dmb_node->token, sizeof(dmb_node->token));
> 113 write_lock(&ldev->dmb_ht_lock);
> 114 hash_for_each_possible(ldev->dmb_ht, tmp_node, list, dmb_node->token) {
> 115 if (tmp_node->token == dmb_node->token) {
> 116 write_unlock(&ldev->dmb_ht_lock);
> 117 goto again;
> 118 }
> 119 }
> 120 hash_add(ldev->dmb_ht, &dmb_node->list, dmb_node->token);
> 121 write_unlock(&ldev->dmb_ht_lock);
> 122
> 123 dmb->sba_idx = dmb_node->sba_idx;
> 124 dmb->dmb_tok = dmb_node->token;
> 125 dmb->cpu_addr = dmb_node->cpu_addr;
> 126 dmb->dma_addr = dmb_node->dma_addr;
> 127 dmb->dmb_len = dmb_node->len;
> 128
> 129 return 0;
> 130
> 131 err_node:
> 132 kfree(dmb_node);
> 133 err_bit:
> 134 clear_bit(sba_idx, ldev->sba_idx_mask);
> 135 return rc;
> 136 }
> 137
> 138 static int smc_lo_unregister_dmb(struct smcd_dev *smcd, struct smcd_dmb *dmb)
> 139 {
> 140 struct smc_lo_dmb_node *dmb_node = NULL, *tmp_node;
> 141 struct smc_lo_dev *ldev = smcd->priv;
> 142
> 143 /* remove dmb from hash table */
> 144 write_lock(&ldev->dmb_ht_lock);
> 145 hash_for_each_possible(ldev->dmb_ht, tmp_node, list, dmb->dmb_tok) {
> 146 if (tmp_node->token == dmb->dmb_tok) {
> 147 dmb_node = tmp_node;
> 148 break;
> 149 }
> 150 }
> 151 if (!dmb_node) {
> 152 write_unlock(&ldev->dmb_ht_lock);
> 153 return -EINVAL;
> 154 }
> 155 hash_del(&dmb_node->list);
> 156 write_unlock(&ldev->dmb_ht_lock);
> 157
> 158 clear_bit(dmb_node->sba_idx, ldev->sba_idx_mask);
> > 159 vfree(dmb_node->cpu_addr);
> 160 kfree(dmb_node);
> 161
> 162 return 0;
> 163 }
> 164
>
© 2016 - 2026 Red Hat, Inc.