github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-29 17:43:52 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

dibs: Register smc as dibs_client

Browse Source 
Formally register smc as dibs client. Functionality will be moved by
follow-on patches from ism_client to dibs_client until eventually
ism_client can be removed.
As DIBS is only a shim layer without any dependencies, we can depend SMC
on DIBS without adding indirect dependencies. A follow-on patch will
remove dependency of SMC on ISM.

Signed-off-by: Alexandra Winter <wintera@linux.ibm.com>
Reviewed-by: Julian Ruess <julianr@linux.ibm.com>
Link: https://patch.msgid.link/20250918110500.1731261-5-wintera@linux.ibm.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
This commit is contained in:
Alexandra Winter 2025-09-18 13:04:50 +02:00 committed by Paolo Abeni
parent 35758b0032
commit d324a2ca3f
6 changed files with 67 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/s390/configs/debug_defconfig
View File

@ -120,6 +120,7 @@ CONFIG_UNIX=y
CONFIG_UNIX_DIAG=m
CONFIG_XFRM_USER=m
CONFIG_NET_KEY=m
CONFIG_DIBS=y
CONFIG_SMC_DIAG=m
CONFIG_SMC_LO=y
CONFIG_INET=y

1
arch/s390/configs/defconfig
View File

@ -111,6 +111,7 @@ CONFIG_UNIX=y
CONFIG_UNIX_DIAG=m
CONFIG_XFRM_USER=m
CONFIG_NET_KEY=m
CONFIG_DIBS=y
CONFIG_SMC_DIAG=m
CONFIG_SMC_LO=y
CONFIG_INET=y

35
drivers/dibs/dibs_main.c
View File

@ -20,6 +20,41 @@ MODULE_LICENSE("GPL");
/* use an array rather a list for fast mapping: */
static struct dibs_client *clients[MAX_DIBS_CLIENTS];
static u8 max_client;
static DEFINE_MUTEX(clients_lock);
int dibs_register_client(struct dibs_client *client)
{
int i, rc = -ENOSPC;
mutex_lock(&clients_lock);
for (i = 0; i < MAX_DIBS_CLIENTS; ++i) {
if (!clients[i]) {
clients[i] = client;
client->id = i;
if (i == max_client)
max_client++;
rc = 0;
break;
}
}
mutex_unlock(&clients_lock);
return rc;
}
EXPORT_SYMBOL_GPL(dibs_register_client);
int dibs_unregister_client(struct dibs_client *client)
{
int rc = 0;
mutex_lock(&clients_lock);
clients[client->id] = NULL;
if (client->id + 1 == max_client)
max_client--;
mutex_unlock(&clients_lock);
return rc;
}
EXPORT_SYMBOL_GPL(dibs_unregister_client);
static int __init dibs_init(void)
{

23
include/linux/dibs.h
View File

@ -33,10 +33,33 @@
* clients.
*/
/* DIBS client
* -----------
*/
#define MAX_DIBS_CLIENTS 8
struct dibs_client {
/* client name for logging and debugging purposes */
const char *name;
/* client index - provided and used by dibs layer */
u8 id;
};
/* Functions to be called by dibs clients:
*/
/**
* dibs_register_client() - register a client with dibs layer
* @client: this client
*
* Return: zero on success.
*/
int dibs_register_client(struct dibs_client *client);
/**
* dibs_unregister_client() - unregister a client with dibs layer
* @client: this client
*
* Return: zero on success.
*/
int dibs_unregister_client(struct dibs_client *client);
#endif /* _DIBS_H */

2
net/smc/Kconfig
View File

@ -1,7 +1,7 @@
# SPDX-License-Identifier: GPL-2.0-only
config SMC
tristate "SMC socket protocol family"
depends on INET && INFINIBAND
depends on INET && INFINIBAND && DIBS
depends on m || ISM != m
help
SMC-R provides a "sockets over RDMA" solution making use of

6
net/smc/smc_ism.c
View File

@ -18,6 +18,7 @@
#include "smc_pnet.h"
#include "smc_netlink.h"
#include "linux/ism.h"
#include "linux/dibs.h"
struct smcd_dev_list smcd_dev_list = {
.list = LIST_HEAD_INIT(smcd_dev_list.list),
@ -42,6 +43,9 @@ static struct ism_client smc_ism_client = {
.handle_irq = smcd_handle_irq,
};
#endif
static struct dibs_client smc_dibs_client = {
.name = "SMC-D",
};
static void smc_ism_create_system_eid(void)
{
@ -623,11 +627,13 @@ int smc_ism_init(void)
#if IS_ENABLED(CONFIG_ISM)
rc = ism_register_client(&smc_ism_client);
#endif
rc = dibs_register_client(&smc_dibs_client);
return rc;
}
void smc_ism_exit(void)
{
dibs_unregister_client(&smc_dibs_client);
#if IS_ENABLED(CONFIG_ISM)
ism_unregister_client(&smc_ism_client);
#endif