[net-next,12/18] net/smc: implement DMB-related operations of loopback
Commit Message
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 | 128 +++++++++++++++++++++++++++++++++++++++++++++++--
net/smc/smc_loopback.h | 13 +++++
4 files changed, 145 insertions(+), 3 deletions(-)
Comments
Hi Wen,
kernel test robot noticed the following build warnings:
[auto build test WARNING 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/20230920-010019
base: net-next/main
patch link: https://lore.kernel.org/r/1695134522-126655-13-git-send-email-guwen%40linux.alibaba.com
patch subject: [PATCH net-next 12/18] net/smc: implement DMB-related operations of loopback
config: arc-allmodconfig (https://download.01.org/0day-ci/archive/20230923/202309232327.nzXalNsH-lkp@intel.com/config)
compiler: arceb-elf-gcc (GCC) 13.2.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20230923/202309232327.nzXalNsH-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/202309232327.nzXalNsH-lkp@intel.com/
All warnings (new ones prefixed by >>):
net/smc/smc_loopback.c: In function 'smc_lo_register_dmb':
>> net/smc/smc_loopback.c:107:30: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
107 | dmb_node->dma_addr = (dma_addr_t)dmb_node->cpu_addr;
| ^
vim +107 net/smc/smc_loopback.c
76
77 static int smc_lo_register_dmb(struct smcd_dev *smcd, struct smcd_dmb *dmb,
78 void *client_priv)
79 {
80 struct smc_lo_dmb_node *dmb_node, *tmp_node;
81 struct smc_lo_dev *ldev = smcd->priv;
82 int sba_idx, rc;
83
84 /* check space for new dmb */
85 for_each_clear_bit(sba_idx, ldev->sba_idx_mask, SMC_LODEV_MAX_DMBS) {
86 if (!test_and_set_bit(sba_idx, ldev->sba_idx_mask))
87 break;
88 }
89 if (sba_idx == SMC_LODEV_MAX_DMBS)
90 return -ENOSPC;
91
92 dmb_node = kzalloc(sizeof(*dmb_node), GFP_KERNEL);
93 if (!dmb_node) {
94 rc = -ENOMEM;
95 goto err_bit;
96 }
97
98 dmb_node->sba_idx = sba_idx;
99 dmb_node->cpu_addr = kzalloc(dmb->dmb_len, GFP_KERNEL |
100 __GFP_NOWARN | __GFP_NORETRY |
101 __GFP_NOMEMALLOC);
102 if (!dmb_node->cpu_addr) {
103 rc = -ENOMEM;
104 goto err_node;
105 }
106 dmb_node->len = dmb->dmb_len;
> 107 dmb_node->dma_addr = (dma_addr_t)dmb_node->cpu_addr;
108
109 again:
110 /* add new dmb into hash table */
111 get_random_bytes(&dmb_node->token, sizeof(dmb_node->token));
112 write_lock(&ldev->dmb_ht_lock);
113 hash_for_each_possible(ldev->dmb_ht, tmp_node, list, dmb_node->token) {
114 if (tmp_node->token == dmb_node->token) {
115 write_unlock(&ldev->dmb_ht_lock);
116 goto again;
117 }
118 }
119 hash_add(ldev->dmb_ht, &dmb_node->list, dmb_node->token);
120 write_unlock(&ldev->dmb_ht_lock);
121
122 dmb->sba_idx = dmb_node->sba_idx;
123 dmb->dmb_tok = dmb_node->token;
124 dmb->cpu_addr = dmb_node->cpu_addr;
125 dmb->dma_addr = dmb_node->dma_addr;
126 dmb->dmb_len = dmb_node->len;
127
128 return 0;
129
130 err_node:
131 kfree(dmb_node);
132 err_bit:
133 clear_bit(sba_idx, ldev->sba_idx_mask);
134 return rc;
135 }
136
On 2023/9/23 23:24, kernel test robot wrote:
> Hi Wen,
>
> kernel test robot noticed the following build warnings:
>
> [auto build test WARNING 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/20230920-010019
> base: net-next/main
> patch link: https://lore.kernel.org/r/1695134522-126655-13-git-send-email-guwen%40linux.alibaba.com
> patch subject: [PATCH net-next 12/18] net/smc: implement DMB-related operations of loopback
> config: arc-allmodconfig (https://download.01.org/0day-ci/archive/20230923/202309232327.nzXalNsH-lkp@intel.com/config)
> compiler: arceb-elf-gcc (GCC) 13.2.0
> reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20230923/202309232327.nzXalNsH-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/202309232327.nzXalNsH-lkp@intel.com/
>
> All warnings (new ones prefixed by >>):
>
> net/smc/smc_loopback.c: In function 'smc_lo_register_dmb':
>>> net/smc/smc_loopback.c:107:30: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
> 107 | dmb_node->dma_addr = (dma_addr_t)dmb_node->cpu_addr;
> | ^
>
>
Will fix it on v4. Thanks!
> vim +107 net/smc/smc_loopback.c
>
> 76
> 77 static int smc_lo_register_dmb(struct smcd_dev *smcd, struct smcd_dmb *dmb,
> 78 void *client_priv)
> 79 {
> 80 struct smc_lo_dmb_node *dmb_node, *tmp_node;
> 81 struct smc_lo_dev *ldev = smcd->priv;
> 82 int sba_idx, rc;
> 83
> 84 /* check space for new dmb */
> 85 for_each_clear_bit(sba_idx, ldev->sba_idx_mask, SMC_LODEV_MAX_DMBS) {
> 86 if (!test_and_set_bit(sba_idx, ldev->sba_idx_mask))
> 87 break;
> 88 }
> 89 if (sba_idx == SMC_LODEV_MAX_DMBS)
> 90 return -ENOSPC;
> 91
> 92 dmb_node = kzalloc(sizeof(*dmb_node), GFP_KERNEL);
> 93 if (!dmb_node) {
> 94 rc = -ENOMEM;
> 95 goto err_bit;
> 96 }
> 97
> 98 dmb_node->sba_idx = sba_idx;
> 99 dmb_node->cpu_addr = kzalloc(dmb->dmb_len, GFP_KERNEL |
> 100 __GFP_NOWARN | __GFP_NORETRY |
> 101 __GFP_NOMEMALLOC);
> 102 if (!dmb_node->cpu_addr) {
> 103 rc = -ENOMEM;
> 104 goto err_node;
> 105 }
> 106 dmb_node->len = dmb->dmb_len;
> > 107 dmb_node->dma_addr = (dma_addr_t)dmb_node->cpu_addr;
> 108
> 109 again:
> 110 /* add new dmb into hash table */
> 111 get_random_bytes(&dmb_node->token, sizeof(dmb_node->token));
> 112 write_lock(&ldev->dmb_ht_lock);
> 113 hash_for_each_possible(ldev->dmb_ht, tmp_node, list, dmb_node->token) {
> 114 if (tmp_node->token == dmb_node->token) {
> 115 write_unlock(&ldev->dmb_ht_lock);
> 116 goto again;
> 117 }
> 118 }
> 119 hash_add(ldev->dmb_ht, &dmb_node->list, dmb_node->token);
> 120 write_unlock(&ldev->dmb_ht_lock);
> 121
> 122 dmb->sba_idx = dmb_node->sba_idx;
> 123 dmb->dmb_tok = dmb_node->token;
> 124 dmb->cpu_addr = dmb_node->cpu_addr;
> 125 dmb->dma_addr = dmb_node->dma_addr;
> 126 dmb->dmb_len = dmb_node->len;
> 127
> 128 return 0;
> 129
> 130 err_node:
> 131 kfree(dmb_node);
> 132 err_bit:
> 133 clear_bit(sba_idx, ldev->sba_idx_mask);
> 134 return rc;
> 135 }
> 136
>
@@ -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;
@@ -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 */
@@ -15,6 +15,7 @@
#include <linux/types.h>
#include <net/smc.h>
+#include "smc_cdc.h"
#include "smc_ism.h"
#include "smc_loopback.h"
@@ -73,6 +74,93 @@ 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 = kzalloc(dmb->dmb_len, GFP_KERNEL |
+ __GFP_NOWARN | __GFP_NORETRY |
+ __GFP_NOMEMALLOC);
+ if (!dmb_node->cpu_addr) {
+ rc = -ENOMEM;
+ goto err_node;
+ }
+ dmb_node->len = dmb->dmb_len;
+ dmb_node->dma_addr = (dma_addr_t)dmb_node->cpu_addr;
+
+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);
+ kfree(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;
@@ -99,6 +187,38 @@ static int smc_lo_signal_event(struct smcd_dev *dev, u64 rgid, u32 trigger_irq,
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;
@@ -130,14 +250,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,
@@ -211,6 +331,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);
}
@@ -20,12 +20,25 @@
#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);
};
int smc_loopback_init(void);