smb: smbdirect: symbol export and header cleanups
Subsystems (3)
Stefan Metzmacher
reviewercover smb: smbdirect: symbol export and header cleanups
Hi,
as suggested by Christoph here:
https://lore.kernel.org/linux-cifs/[email protected]/
I've moved to use DEFAULT_SYMBOL_NAMESPACE and EXPORT_SYMBOL_GPL for the smbdirect symbols. This actually fixes a problem with out of tree builds.
And I've created a include/linux/smbdirect.h
which also make out of tree builds for cifs.ko
and ksmbd.ko easier.
Stefan Metzmacher (2):
smb: smbdirect: make use of DEFAULT_SYMBOL_NAMESPACE and
EXPORT_SYMBOL_GPL
smb: smbdirect: introduce and use include/linux/smbdirect.h
MAINTAINERS | 1 + fs/smb/client/smbdirect.c | 3 +- fs/smb/client/smbdirect.h | 2 +- fs/smb/server/transport_rdma.c | 3 +- fs/smb/server/transport_rdma.h | 2 +- fs/smb/smbdirect/accept.c | 2 +- fs/smb/smbdirect/connect.c | 4 +- fs/smb/smbdirect/connection.c | 16 +++--- fs/smb/smbdirect/debug.c | 2 +- fs/smb/smbdirect/devices.c | 2 +- fs/smb/smbdirect/internal.h | 4 +- fs/smb/smbdirect/listen.c | 2 +- fs/smb/smbdirect/mr.c | 6 +-- fs/smb/smbdirect/rw.c | 2 +- fs/smb/smbdirect/smbdirect.h | 52 ------------------- fs/smb/smbdirect/socket.c | 20 +++---- .../public.h => include/linux/smbdirect.h | 52 ++++++++++++++++--- 17 files changed, 82 insertions(+), 93 deletions(-) delete mode 100644 fs/smb/smbdirect/smbdirect.h rename fs/smb/smbdirect/public.h => include/linux/smbdirect.h (76%)
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH 2/2 smb: smbdirect: introduce and use include/linux/smbdirect.h
This makes it easier to rebuild cifs.ko and ksmbd.ko against a running kernel.
--- MAINTAINERS | 1 + fs/smb/client/smbdirect.c | 1 - fs/smb/client/smbdirect.h | 2 +- fs/smb/server/transport_rdma.c | 1 - fs/smb/server/transport_rdma.h | 2 +- fs/smb/smbdirect/internal.h | 3 +- fs/smb/smbdirect/smbdirect.h | 52 ------------------- .../public.h => include/linux/smbdirect.h | 50 ++++++++++++++++-- 8 files changed, 49 insertions(+), 63 deletions(-) delete mode 100644 fs/smb/smbdirect/smbdirect.h rename fs/smb/smbdirect/public.h => include/linux/smbdirect.h (76%)
MAINTAINERS +1 -0
@@ -24616,6 +24616,7 @@ S: Maintained F: fs/smb/client/smbdirect.* F: fs/smb/smbdirect/ F: fs/smb/server/transport_rdma.* +F: include/linux/smbdirect.h SMC91x ETHERNET DRIVER M: Nicolas Pitre <[email protected]>
fs/smb/client/smbdirect.c +0 -1
@@ -9,7 +9,6 @@#include "cifs_debug.h" #include "cifsproto.h" #include "smb2proto.h" -#include "../smbdirect/public.h" /* Port numbers for SMBD transport */ #define SMB_PORT 445
fs/smb/client/smbdirect.h +1 -1
@@ -12,7 +12,7 @@#include "cifsglob.h" -#include "../smbdirect/smbdirect.h" +#include <linux/smbdirect.h> extern int rdma_readwrite_threshold;extern int smbd_max_frmr_depth;
fs/smb/server/transport_rdma.c +0 -1
@@ -18,7 +18,6 @@#include "smb_common.h" #include "../common/smb2status.h" #include "transport_rdma.h" -#include "../smbdirect/public.h" #define SMB_DIRECT_PORT_IWARP 5445
fs/smb/server/transport_rdma.h +1 -1
@@ -25,6 +25,6 @@ static inline void init_smbd_max_io_size(unsigned int sz) { }static inline unsigned int get_smbd_max_read_write_size (struct ksmbd_transport *kt) {return 0 ; }#endif -#include "../smbdirect/smbdirect.h" +#include <linux/smbdirect.h> #endif /* __KSMBD_TRANSPORT_RDMA_H__ */
fs/smb/smbdirect/internal.h +1 -2
@@ -9,9 +9,8 @@#define DEFAULT_SYMBOL_NAMESPACE "SMBDIRECT"#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt -#include "smbdirect.h" +#include <linux/smbdirect.h> #include "pdu.h" -#include "public.h" #include <linux/mutex.h>
fs/smb/smbdirect/smbdirect.h deleted +0 -52
52 lines not on this page · raw message
include/linux/smbdirect.h renamed from fs/smb/smbdirect/public.h +45 -5
60 lines not on this page · raw message
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH 1/2 smb: smbdirect: make use of DEFAULT_SYMBOL_NAMESPACE and EXPORT_SYMBOL_GPL
In reply to Stefan MetzmacherThis is a better solution than EXPORT_SYMBOL_FOR_MODULES(__sym, "cifs,ksmbd") as it makes it possible to rebuild smbdirect.ko against a running kernel and then load the existing cifs.ko and ksmbd.ko from the running kernel.
--- fs/smb/client/smbdirect.c | 2 ++ fs/smb/server/transport_rdma.c | 2 ++ fs/smb/smbdirect/accept.c | 2 +- fs/smb/smbdirect/connect.c | 4 ++-- fs/smb/smbdirect/connection.c | 16 ++++++++-------- fs/smb/smbdirect/debug.c | 2 +- fs/smb/smbdirect/devices.c | 2 +- fs/smb/smbdirect/internal.h | 1 + fs/smb/smbdirect/listen.c | 2 +- fs/smb/smbdirect/mr.c | 6 +++--- fs/smb/smbdirect/public.h | 2 -- fs/smb/smbdirect/rw.c | 2 +- fs/smb/smbdirect/socket.c | 20 ++++++++++---------- 13 files changed, 33 insertions(+), 30 deletions(-)
fs/smb/client/smbdirect.c +2 -0
@@ -558,3 +558,5 @@ void smbd_debug_proc_show(struct TCP_Server_Info *server, struct seq_file *m) server->rdma_readwrite_threshold, m); } + +MODULE_IMPORT_NS ("SMBDIRECT" );
fs/smb/server/transport_rdma.c +2 -0
@@ -540,3 +540,5 @@ static const struct ksmbd_transport_ops ksmbd_smb_direct_transport_ops = { .rdma_write = smb_direct_rdma_write, .free_transport = smb_direct_free_transport, }; + +MODULE_IMPORT_NS ("SMBDIRECT" );
fs/smb/smbdirect/accept.c +1 -1
@@ -854,4 +854,4 @@ struct smbdirect_socket *smbdirect_socket_accept(struct smbdirect_socket *lsc,return nsc; } -__SMBDIRECT_EXPORT_SYMBOL__ (smbdirect_socket_accept); +EXPORT_SYMBOL_GPL (smbdirect_socket_accept);
fs/smb/smbdirect/connect.c +2 -2
@@ -60,7 +60,7 @@ int smbdirect_connect(struct smbdirect_socket *sc, const struct sockaddr *dst)*/ return 0 ; } -__SMBDIRECT_EXPORT_SYMBOL__ (smbdirect_connect); +EXPORT_SYMBOL_GPL (smbdirect_connect);static int smbdirect_connect_setup_connection (struct smbdirect_socket *sc) {
@@ -922,4 +922,4 @@ int smbdirect_connect_sync(struct smbdirect_socket *sc,return 0 ; } -__SMBDIRECT_EXPORT_SYMBOL__ (smbdirect_connect_sync); +EXPORT_SYMBOL_GPL (smbdirect_connect_sync);
fs/smb/smbdirect/connection.c +8 -8
@@ -706,7 +706,7 @@ bool smbdirect_connection_is_connected(struct smbdirect_socket *sc)return false;return true; } -__SMBDIRECT_EXPORT_SYMBOL__ (smbdirect_connection_is_connected); +EXPORT_SYMBOL_GPL (smbdirect_connection_is_connected);int smbdirect_connection_wait_for_connected (struct smbdirect_socket *sc) {
@@ -779,7 +779,7 @@ int smbdirect_connection_wait_for_connected(struct smbdirect_socket *sc)return 0 ; } -__SMBDIRECT_EXPORT_SYMBOL__ (smbdirect_connection_wait_for_connected); +EXPORT_SYMBOL_GPL (smbdirect_connection_wait_for_connected);void smbdirect_connection_idle_timer_work (struct work_struct *work) {
@@ -958,7 +958,7 @@ int smbdirect_connection_send_batch_flush(struct smbdirect_socket *sc,return ret; } -__SMBDIRECT_EXPORT_SYMBOL__ (smbdirect_connection_send_batch_flush); +EXPORT_SYMBOL_GPL (smbdirect_connection_send_batch_flush);struct smbdirect_send_batch * smbdirect_init_send_batch_storage(struct smbdirect_send_batch_storage *storage,
@@ -976,7 +976,7 @@ smbdirect_init_send_batch_storage(struct smbdirect_send_batch_storage *storage,return batch; } -__SMBDIRECT_EXPORT_SYMBOL__ (smbdirect_init_send_batch_storage); +EXPORT_SYMBOL_GPL (smbdirect_init_send_batch_storage);static int smbdirect_connection_wait_for_send_bcredit (struct smbdirect_socket *sc,struct smbdirect_send_batch *batch)
@@ -1263,7 +1263,7 @@ int smbdirect_connection_send_single_iter(struct smbdirect_socket *sc, bcredit_failed:return ret; } -__SMBDIRECT_EXPORT_SYMBOL__ (smbdirect_connection_send_single_iter); +EXPORT_SYMBOL_GPL (smbdirect_connection_send_single_iter);int smbdirect_connection_send_wait_zero_pending (struct smbdirect_socket *sc) {
@@ -1288,7 +1288,7 @@ int smbdirect_connection_send_wait_zero_pending(struct smbdirect_socket *sc)return 0 ; } -__SMBDIRECT_EXPORT_SYMBOL__ (smbdirect_connection_send_wait_zero_pending); +EXPORT_SYMBOL_GPL (smbdirect_connection_send_wait_zero_pending); int smbdirect_connection_send_iter(struct smbdirect_socket *sc, struct iov_iter *iter,
@@ -1373,7 +1373,7 @@ int smbdirect_connection_send_iter(struct smbdirect_socket *sc,return total_count; } -__SMBDIRECT_EXPORT_SYMBOL__ (smbdirect_connection_send_iter); +EXPORT_SYMBOL_GPL (smbdirect_connection_send_iter);static void smbdirect_connection_send_io_done (struct ib_cq *cq,struct ib_wc *wc) {
@@ -1937,7 +1937,7 @@ int smbdirect_connection_recvmsg(struct smbdirect_socket *sc, goto again; } -__SMBDIRECT_EXPORT_SYMBOL__ (smbdirect_connection_recvmsg); +EXPORT_SYMBOL_GPL (smbdirect_connection_recvmsg);static bool smbdirect_map_sges_single_page (struct smbdirect_map_sges *state,struct page *page,size_t off,size_t len)
fs/smb/smbdirect/debug.c +1 -1
@@ -85,4 +85,4 @@ void smbdirect_connection_legacy_debug_proc_show(struct smbdirect_socket *sc,atomic_read (&sc->mr_io.ready.count), atomic_read(&sc->mr_io.used.count)); } -__SMBDIRECT_EXPORT_SYMBOL__ (smbdirect_connection_legacy_debug_proc_show); +EXPORT_SYMBOL_GPL (smbdirect_connection_legacy_debug_proc_show);
fs/smb/smbdirect/devices.c +1 -1
@@ -238,7 +238,7 @@ u8 smbdirect_netdev_rdma_capable_node_type(struct net_device *netdev)return RDMA_NODE_UNSPECIFIED ; } -__SMBDIRECT_EXPORT_SYMBOL__ (smbdirect_netdev_rdma_capable_node_type); +EXPORT_SYMBOL_GPL (smbdirect_netdev_rdma_capable_node_type);__init int smbdirect_devices_init (void ) {
fs/smb/smbdirect/internal.h +1 -0
@@ -6,6 +6,7 @@#ifndef __FS_SMB_COMMON_SMBDIRECT_INTERNAL_H__#define __FS_SMB_COMMON_SMBDIRECT_INTERNAL_H__ +#define DEFAULT_SYMBOL_NAMESPACE "SMBDIRECT"#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt#include "smbdirect.h"
fs/smb/smbdirect/listen.c +1 -1
@@ -90,7 +90,7 @@ int smbdirect_socket_listen(struct smbdirect_socket *sc, int backlog)*/ return 0 ; } -__SMBDIRECT_EXPORT_SYMBOL__ (smbdirect_socket_listen); +EXPORT_SYMBOL_GPL (smbdirect_socket_listen);static int smbdirect_new_rdma_event_handler (struct rdma_cm_id *new_id,struct rdma_cm_event *event)
fs/smb/smbdirect/mr.c +3 -3
@@ -383,7 +383,7 @@ smbdirect_connection_register_mr_io(struct smbdirect_socket *sc,mutex_unlock (&mr->mutex);return NULL ; } -__SMBDIRECT_EXPORT_SYMBOL__ (smbdirect_connection_register_mr_io); +EXPORT_SYMBOL_GPL (smbdirect_connection_register_mr_io);void smbdirect_mr_io_fill_buffer_descriptor (struct smbdirect_mr_io *mr,struct smbdirect_buffer_descriptor_v1 *v1)
@@ -400,7 +400,7 @@ void smbdirect_mr_io_fill_buffer_descriptor(struct smbdirect_mr_io *mr, }mutex_unlock (&mr->mutex); } -__SMBDIRECT_EXPORT_SYMBOL__ (smbdirect_mr_io_fill_buffer_descriptor); +EXPORT_SYMBOL_GPL (smbdirect_mr_io_fill_buffer_descriptor);/* * Deregister a MR after I/O is done
@@ -493,4 +493,4 @@ void smbdirect_connection_deregister_mr_io(struct smbdirect_mr_io *mr)if (!kref_put (&mr->kref, smbdirect_mr_io_free_locked))mutex_unlock (&mr->mutex); } -__SMBDIRECT_EXPORT_SYMBOL__ (smbdirect_connection_deregister_mr_io); +EXPORT_SYMBOL_GPL (smbdirect_connection_deregister_mr_io);
fs/smb/smbdirect/public.h +0 -2
@@ -13,8 +13,6 @@ struct smbdirect_socket;struct smbdirect_send_batch ;struct smbdirect_mr_io ; -#define __SMBDIRECT_EXPORT_SYMBOL__ (__sym) EXPORT_SYMBOL_FOR_MODULES(__sym, "cifs,ksmbd") -#include <rdma/rw.h> u8 smbdirect_netdev_rdma_capable_node_type (struct net_device *netdev);
fs/smb/smbdirect/rw.c +1 -1
@@ -252,4 +252,4 @@ int smbdirect_connection_rdma_xmit(struct smbdirect_socket *sc,kfree (msg); goto out; } -__SMBDIRECT_EXPORT_SYMBOL__ (smbdirect_connection_rdma_xmit); +EXPORT_SYMBOL_GPL (smbdirect_connection_rdma_xmit);
fs/smb/smbdirect/socket.c +10 -10
@@ -20,7 +20,7 @@ bool smbdirect_frwr_is_supported(const struct ib_device_attr *attrs)return false;return true; } -__SMBDIRECT_EXPORT_SYMBOL__ (smbdirect_frwr_is_supported); +EXPORT_SYMBOL_GPL (smbdirect_frwr_is_supported);static void smbdirect_socket_cleanup_work (struct work_struct *work);
@@ -107,7 +107,7 @@ int smbdirect_socket_create_kern(struct net *net, struct smbdirect_socket **_sc) alloc_failed:return ret; } -__SMBDIRECT_EXPORT_SYMBOL__ (smbdirect_socket_create_kern); +EXPORT_SYMBOL_GPL (smbdirect_socket_create_kern);int smbdirect_socket_init_accepting (struct rdma_cm_id *id,struct smbdirect_socket *sc) {
@@ -148,7 +148,7 @@ int smbdirect_socket_create_accepting(struct rdma_cm_id *id, struct smbdirect_so alloc_failed:return ret; } -__SMBDIRECT_EXPORT_SYMBOL__ (smbdirect_socket_create_accepting); +EXPORT_SYMBOL_GPL (smbdirect_socket_create_accepting);int smbdirect_socket_set_initial_parameters (struct smbdirect_socket *sc,const struct smbdirect_socket_parameters *sp)
@@ -189,14 +189,14 @@ int smbdirect_socket_set_initial_parameters(struct smbdirect_socket *sc,return 0 ; } -__SMBDIRECT_EXPORT_SYMBOL__ (smbdirect_socket_set_initial_parameters); +EXPORT_SYMBOL_GPL (smbdirect_socket_set_initial_parameters);const struct smbdirect_socket_parameters *smbdirect_socket_get_current_parameters (struct smbdirect_socket *sc) {return &sc->parameters; } -__SMBDIRECT_EXPORT_SYMBOL__ (smbdirect_socket_get_current_parameters); +EXPORT_SYMBOL_GPL (smbdirect_socket_get_current_parameters); int smbdirect_socket_set_kernel_settings(struct smbdirect_socket *sc, enum ib_poll_context poll_ctx,
@@ -220,7 +220,7 @@ int smbdirect_socket_set_kernel_settings(struct smbdirect_socket *sc,return 0 ; } -__SMBDIRECT_EXPORT_SYMBOL__ (smbdirect_socket_set_kernel_settings); +EXPORT_SYMBOL_GPL (smbdirect_socket_set_kernel_settings); void smbdirect_socket_set_logging(struct smbdirect_socket *sc, void *private_ptr,
@@ -240,7 +240,7 @@ void smbdirect_socket_set_logging(struct smbdirect_socket *sc, sc->logging.needed = needed; sc->logging.vaprintf = vaprintf; } -__SMBDIRECT_EXPORT_SYMBOL__ (smbdirect_socket_set_logging); +EXPORT_SYMBOL_GPL (smbdirect_socket_set_logging);static void smbdirect_socket_wake_up_all (struct smbdirect_socket *sc) {
@@ -663,13 +663,13 @@ int smbdirect_socket_bind(struct smbdirect_socket *sc, struct sockaddr *addr)return 0 ; } -__SMBDIRECT_EXPORT_SYMBOL__ (smbdirect_socket_bind); +EXPORT_SYMBOL_GPL (smbdirect_socket_bind);void smbdirect_socket_shutdown (struct smbdirect_socket *sc) {smbdirect_socket_schedule_cleanup_lvl (sc,SMBDIRECT_LOG_INFO , -ESHUTDOWN ); } -__SMBDIRECT_EXPORT_SYMBOL__ (smbdirect_socket_shutdown); +EXPORT_SYMBOL_GPL (smbdirect_socket_shutdown);static void smbdirect_socket_release_disconnect (struct kref *kref) {
@@ -712,7 +712,7 @@ void smbdirect_socket_release(struct smbdirect_socket *sc)*/ kref_put (&sc->refs.destroy, smbdirect_socket_release_destroy); } -__SMBDIRECT_EXPORT_SYMBOL__ (smbdirect_socket_release); +EXPORT_SYMBOL_GPL (smbdirect_socket_release); int smbdirect_socket_wait_for_credits(struct smbdirect_socket *sc, enum smbdirect_socket_status expected_status,
Signature · 1 line
2.43.0
Quoted 10 lines · Stefan Metzmacher
Hi,
as suggested by Christoph here:
https://lore.kernel.org/linux-cifs/[email protected]/I've moved to use
DEFAULT_SYMBOL_NAMESPACEandEXPORT_SYMBOL_GPLfor the smbdirect symbols. This actually fixes a problem with out of tree builds.
Quoted 8 lines
And I've created a
include/linux/smbdirect.h
which also make out of tree builds for cifs.ko
and ksmbd.ko easier.Stefan Metzmacher (2):
smb: smbdirect: make use ofDEFAULT_SYMBOL_NAMESPACEand
EXPORT_SYMBOL_GPL
smb: smbdirect: introduce and useinclude/linux/smbdirect.h
Thanks!