ksmbd: avoid reclaiming expired durable opens by the client
Subsystems (2)
Namjae Jeon
maintainerPATCH 1/3 ksmbd: avoid reclaiming expired durable opens by the client
The expired durable opens should not be reclaimed by client. This patch add ->durable_scavenger_timeout to fp and check it in ksmbd_lookup_durable_fd().
--- fs/smb/server/vfs_cache.c | 9 ++++++++- fs/smb/server/vfs_cache.h | 1 + 2 files changed, 9 insertions(+), 1 deletion(-)
fs/smb/server/vfs_cache.c +8 -1
@@ -476,7 +476,10 @@ struct ksmbd_file *ksmbd_lookup_durable_fd(unsigned long long id)struct ksmbd_file *fp; fp =__ksmbd_lookup_fd (&global_ft, id); -if (fp && fp->conn) { +if (fp && (fp->conn || + (fp->durable_scavenger_timeout && + (fp->durable_scavenger_timeout < +jiffies_to_msecs (jiffies))))) {ksmbd_put_durable_fd (fp); fp =NULL ; }
@@ -717,6 +720,10 @@ static bool session_fd_check(struct ksmbd_tree_connect *tcon, fp->tcon =NULL ; fp->volatile_id =KSMBD_NO_FID ; +if (fp->durable_timeout) + fp->durable_scavenger_timeout = +jiffies_to_msecs (jiffies) + fp->durable_timeout; +return true; }
fs/smb/server/vfs_cache.h +1 -0
@@ -101,6 +101,7 @@ struct ksmbd_file {struct list_head lock_list;int durable_timeout; +int durable_scavenger_timeout;/* if ls is happening on directory, below is valid*/ struct ksmbd_readdir_data readdir_data;
Signature · 1 line
2.25.1
Namjae Jeon
maintainerPATCH 2/3 ksmbd: add durable scavenger timer
Launch ksmbd-durable-scavenger kernel thread to scan durable fps that have not been reclaimed by a client within the configured time.
--- fs/smb/server/mgmt/user_session.c | 2 + fs/smb/server/server.c | 1 + fs/smb/server/server.h | 1 + fs/smb/server/smb2pdu.c | 2 +- fs/smb/server/smb2pdu.h | 2 + fs/smb/server/vfs_cache.c | 165 +++++++++++++++++++++++++++++- fs/smb/server/vfs_cache.h | 2 + 7 files changed, 169 insertions(+), 6 deletions(-)
fs/smb/server/mgmt/user_session.c +2 -0
@@ -149,6 +149,7 @@ void ksmbd_session_destroy(struct ksmbd_session *sess)ksmbd_tree_conn_session_logoff (sess);ksmbd_destroy_file_table (&sess->file_table); +ksmbd_launch_ksmbd_durable_scavenger ();ksmbd_session_rpc_clear_list (sess);free_channel_list (sess);kfree (sess->Preauth_HashValue);
@@ -326,6 +327,7 @@ void destroy_previous_session(struct ksmbd_conn *conn,ksmbd_destroy_file_table (&prev_sess->file_table); prev_sess->state =SMB2_SESSION_EXPIRED ; +ksmbd_launch_ksmbd_durable_scavenger (); out:up_write (&conn->session_lock);up_write (&sessions_table_lock);
fs/smb/server/server.c +1 -0
@@ -377,6 +377,7 @@ static void server_ctrl_handle_reset(struct server_ctrl_struct *ctrl) {ksmbd_ipc_soft_reset ();ksmbd_conn_transport_destroy (); +ksmbd_stop_durable_scavenger ();server_conf_free ();server_conf_init ();WRITE_ONCE (server_conf.state,SERVER_STATE_STARTING_UP );
fs/smb/server/server.h +1 -0
@@ -44,6 +44,7 @@ struct ksmbd_server_config {unsigned int max_connections;char *conf[SERVER_CONF_WORK_GROUP +1 ]; +struct task_struct *dh_task; };extern struct ksmbd_server_config server_conf;
fs/smb/server/smb2pdu.c +1 -1
@@ -3519,7 +3519,7 @@ int smb2_open(struct ksmbd_work *work) SMB2_CREATE_GUID_SIZE);if (dh_info.timeout) fp->durable_timeout =min (dh_info.timeout, -300000 ); +DURABLE_HANDLE_MAX_TIMEOUT );else fp->durable_timeout =60 ; }
fs/smb/server/smb2pdu.h +2 -0
@@ -72,6 +72,8 @@ struct create_durable_req_v2 {__u8 CreateGuid[16 ]; } __packed; +#define DURABLE_HANDLE_MAX_TIMEOUT 300000 +struct create_durable_reconn_req {struct create_context_hdr ccontext;__u8 Name[8 ];
fs/smb/server/vfs_cache.c +160 -5
223 lines not on this page · raw message
fs/smb/server/vfs_cache.h +2 -0
@@ -153,6 +153,8 @@ struct ksmbd_file *ksmbd_lookup_fd_cguid(char *cguid);struct ksmbd_file *ksmbd_lookup_fd_inode (struct dentry *dentry);unsigned int ksmbd_open_durable_fd (struct ksmbd_file *fp);struct ksmbd_file *ksmbd_open_fd (struct ksmbd_work *work,struct file *filp); +void ksmbd_launch_ksmbd_durable_scavenger (void ); +void ksmbd_stop_durable_scavenger (void );void ksmbd_close_tree_conn_fds (struct ksmbd_work *work);void ksmbd_close_session_fds (struct ksmbd_work *work);int ksmbd_close_inode_fds (struct ksmbd_work *work,struct inode *inode);
Signature · 1 line
2.25.1
Re: [PATCH 2/3] ksmbd: add durable scavenger timer
Minor compile warning was generated by this:
/home/smfrench/smb3-kernel/fs/smb/server/vfs_cache.c:39:19: warning:
symbol 'dh_task' was not declared. Should it be static? /home/smfrench/smb3-kernel/fs/smb/server/vfs_cache.c:40:19: warning:
symbol 'dh_wq' was not declared. Should it be static?
Quoted 337 lines · Namjae Jeon
Launch ksmbd-durable-scavenger kernel thread to scan durable fps that have not been reclaimed by a client within the configured time.
Signed-off-by Namjae Jeon <[email protected]>--- fs/smb/server/mgmt/user_session.c | 2 + fs/smb/server/server.c | 1 + fs/smb/server/server.h | 1 + fs/smb/server/smb2pdu.c | 2 +- fs/smb/server/smb2pdu.h | 2 + fs/smb/server/vfs_cache.c | 165 +++++++++++++++++++++++++++++- fs/smb/server/vfs_cache.h | 2 + 7 files changed, 169 insertions(+), 6 deletions(-)fs/smb/server/mgmt/user_session.c +2
-0@@ -149,6 +149,7 @@ void ksmbd_session_destroy(struct ksmbd_session *sess)ksmbd_tree_conn_session_logoff (sess);ksmbd_destroy_file_table (&sess->file_table); +ksmbd_launch_ksmbd_durable_scavenger ();ksmbd_session_rpc_clear_list (sess);free_channel_list (sess);kfree (sess->Preauth_HashValue);@@ -326,6 +327,7 @@ void destroy_previous_session(struct ksmbd_conn *conn,ksmbd_destroy_file_table (&prev_sess->file_table); prev_sess->state =SMB2_SESSION_EXPIRED ; +ksmbd_launch_ksmbd_durable_scavenger (); out:up_write (&conn->session_lock);up_write (&sessions_table_lock);fs/smb/server/server.c +1
-0@@ -377,6 +377,7 @@ static void server_ctrl_handle_reset(struct server_ctrl_struct *ctrl) {ksmbd_ipc_soft_reset ();ksmbd_conn_transport_destroy (); +ksmbd_stop_durable_scavenger ();server_conf_free ();server_conf_init ();WRITE_ONCE (server_conf.state,SERVER_STATE_STARTING_UP );fs/smb/server/server.h +1
-0@@ -44,6 +44,7 @@ struct ksmbd_server_config {unsigned int max_connections;char *conf[SERVER_CONF_WORK_GROUP +1 ]; +struct task_struct *dh_task; };extern struct ksmbd_server_config server_conf;fs/smb/server/smb2pdu.c +1
-1@@ -3519,7 +3519,7 @@ int smb2_open(struct ksmbd_work *work) SMB2_CREATE_GUID_SIZE);if (dh_info.timeout) fp->durable_timeout =min (dh_info.timeout, -300000 ); +DURABLE_HANDLE_MAX_TIMEOUT );else fp->durable_timeout =60 ; }fs/smb/server/smb2pdu.h +2
-0@@ -72,6 +72,8 @@ struct create_durable_req_v2 {__u8 CreateGuid[16 ]; } __packed; +#define DURABLE_HANDLE_MAX_TIMEOUT 300000 +struct create_durable_reconn_req {struct create_context_hdr ccontext;__u8 Name[8 ];fs/smb/server/vfs_cache.c +160
-5@@ -8,6 +8,8 @@#include <linux/filelock.h> #include <linux/slab.h> #include <linux/vmalloc.h> +#include <linux/kthread.h> +#include <linux/freezer.h> #include "glob.h" #include "vfs_cache.h" @@ -17,6 +19,7 @@#include "mgmt/tree_connect.h" #include "mgmt/user_session.h" #include "smb_common.h" +#include "server.h" #define S_DEL_PENDING 1#define S_DEL_ON_CLS 2@@ -31,6 +34,11 @@ static struct ksmbd_file_table global_ft;static atomic_long_t fd_limit;static struct kmem_cache *filp_cache; +static bool durable_scavenger_running; +static DEFINE_MUTEX (durable_scavenger_lock); +struct task_struc *dh_task; +wait_queue_head_t dh_wq; +void ksmbd_set_fd_limit (unsigned long limit) { limit =min (limit,get_max_files ());@@ -279,9 +287,16 @@ static void __ksmbd_remove_durable_fd(struct ksmbd_file *fp)if (!has_file_id (fp->persistent_id))return ; -write_lock (&global_ft.lock);idr_remove (global_ft.idr, fp->persistent_id); +} + +static void ksmbd_remove_durable_fd (struct ksmbd_file *fp) +{ +write_lock (&global_ft.lock); +__ksmbd_remove_durable_fd (fp);write_unlock (&global_ft.lock); +if (waitqueue_active (&dh_wq)) +wake_up (&dh_wq); }static void __ksmbd_remove_fd (struct ksmbd_file_table *ft,struct ksmbd_file *fp)@@ -304,7 +319,7 @@ static void __ksmbd_close_fd(struct ksmbd_file_table *ft, struct ksmbd_file *fp)struct ksmbd_lock *smb_lock, *tmp_lock;fd_limit_close (); -__ksmbd_remove_durable_fd (fp); +ksmbd_remove_durable_fd (fp);if (ft)__ksmbd_remove_fd (ft, fp);@@ -696,6 +711,142 @@ static bool tree_conn_fd_check(struct ksmbd_tree_connect *tcon,return fp->tcon != tcon; } +static bool ksmbd_durable_scavenger_alive (void ) +{ +mutex_lock (&durable_scavenger_lock); +if (!durable_scavenger_running) { +mutex_unlock (&durable_scavenger_lock); +return false; + } +mutex_unlock (&durable_scavenger_lock); + +if (kthread_should_stop ()) +return false; + +if (idr_is_empty (global_ft.idr)) +return false; + +return true; +} + +static void ksmbd_scavenger_dispose_dh (struct list_head *head) +{ +while (!list_empty (head)) { +struct ksmbd_file *fp; + + fp = list_first_entry(head, struct ksmbd_file, node); +list_del_init (&fp->node); +__ksmbd_close_fd (NULL , fp); + } +} + +static int ksmbd_durable_scavenger (void *dummy) +{ +struct ksmbd_file *fp =NULL ; +unsigned int id; +unsigned int min_timeout =1 ; +bool found_fp_timeout; +LIST_HEAD (scavenger_list); +unsigned long remaining_jiffies; + +__module_get (THIS_MODULE ); + +set_freezable (); +while (ksmbd_durable_scavenger_alive ()) { +if (try_to_freeze ()) +continue ; + + found_fp_timeout = false; + + remaining_jiffies =wait_event_timeout (dh_wq, +ksmbd_durable_scavenger_alive () == false, +__msecs_to_jiffies (min_timeout)); +if (remaining_jiffies) + min_timeout =jiffies_to_msecs (remaining_jiffies); +else + min_timeout =DURABLE_HANDLE_MAX_TIMEOUT ; + +write_lock (&global_ft.lock); +idr_for_each_entry (global_ft.idr, fp, id) { +if (!fp->durable_timeout) +continue ; + +if (atomic_read (&fp->refcount) >1 || + fp->conn) +continue ; + + found_fp_timeout = true; +if (fp->durable_scavenger_timeout <= +jiffies_to_msecs (jiffies)) { +__ksmbd_remove_durable_fd (fp); +list_add (&fp->node, &scavenger_list); + }else { +unsigned long durable_timeout; + + durable_timeout = + fp->durable_scavenger_timeout - +jiffies_to_msecs (jiffies); + +if (min_timeout > durable_timeout) + min_timeout = durable_timeout; + } + } +write_unlock (&global_ft.lock); + +ksmbd_scavenger_dispose_dh (&scavenger_list); + +if (found_fp_timeout == false) +break ; + } + +mutex_lock (&durable_scavenger_lock); + durable_scavenger_running = false; +mutex_unlock (&durable_scavenger_lock); + +module_put (THIS_MODULE ); + +return 0 ; +} + +void ksmbd_launch_ksmbd_durable_scavenger (void ) +{ +if (!(server_conf.flags &KSMBD_GLOBAL_FLAG_DURABLE_HANDLE )) +return ; + +mutex_lock (&durable_scavenger_lock); +if (durable_scavenger_running == true) { +mutex_unlock (&durable_scavenger_lock); +return ; + } + + durable_scavenger_running = true; + + server_conf.dh_task =kthread_run (ksmbd_durable_scavenger, + (void *)NULL ,"ksmbd-durable-scavenger" ); +if (IS_ERR (server_conf.dh_task)) +pr_err ("cannot start conn thread, err : %ld\n" , +PTR_ERR (server_conf.dh_task)); +mutex_unlock (&durable_scavenger_lock); +} + +void ksmbd_stop_durable_scavenger (void ) +{ +if (!(server_conf.flags &KSMBD_GLOBAL_FLAG_DURABLE_HANDLE )) +return ; + +mutex_lock (&durable_scavenger_lock); +if (!durable_scavenger_running) { +mutex_unlock (&durable_scavenger_lock); +return ; + } + + durable_scavenger_running = false; +if (waitqueue_active (&dh_wq)) +wake_up (&dh_wq); +mutex_unlock (&durable_scavenger_lock); +kthread_stop (server_conf.dh_task); +} +static bool session_fd_check (struct ksmbd_tree_connect *tcon,struct ksmbd_file *fp) {@@ -756,11 +907,12 @@ void ksmbd_free_global_file_table(void)unsigned int id;idr_for_each_entry (global_ft.idr, fp, id) { -__ksmbd_remove_durable_fd (fp); -kmem_cache_free (filp_cache, fp); +ksmbd_remove_durable_fd (fp); +__ksmbd_close_fd (NULL , fp); } -ksmbd_destroy_file_table (&global_ft); +idr_destroy (global_ft.idr); +kfree (global_ft.idr); } int ksmbd_validate_name_reconnect(struct ksmbd_share_config *share,@@ -816,6 +968,7 @@ int ksmbd_reopen_durable_fd(struct ksmbd_work *work, struct ksmbd_file *fp) }up_write (&ci->m_lock); + fp->f_state =FP_NEW ;__open_id (&work->sess->file_table, fp,OPEN_ID_TYPE_VOLATILE_ID );if (!has_file_id (fp->volatile_id)) { fp->conn =NULL ;@@ -855,6 +1008,8 @@ int ksmbd_init_file_cache(void)if (!filp_cache) goto out; +init_waitqueue_head (&dh_wq); +return 0 ; out:fs/smb/server/vfs_cache.h +2
-1@@ -153,6 +153,8 @@ struct ksmbd_file *ksmbd_lookup_fd_cguid(char *cguid);struct ksmbd_file *ksmbd_lookup_fd_inode (struct dentry *dentry);unsigned int ksmbd_open_durable_fd (struct ksmbd_file *fp);struct ksmbd_file *ksmbd_open_fd (struct ksmbd_work *work,struct file *filp); +void ksmbd_launch_ksmbd_durable_scavenger (void ); +void ksmbd_stop_durable_scavenger (void );void ksmbd_close_tree_conn_fds (struct ksmbd_work *work);void ksmbd_close_session_fds (struct ksmbd_work *work);int ksmbd_close_inode_fds (struct ksmbd_work *work,struct inode *inode); --2.25.1
Signature · 3 lines
Thanks, Steve
Namjae Jeon
maintainerRe: [PATCH 2/3] ksmbd: add durable scavenger timer
2024년 6월 11일 (화) 오전 12:31, Steve French <[email protected]>님이 작성:
Quoted 2 lines
Minor compile warning was generated by this:
Okay, I will fix it.
Thanks for your review:)
Quoted 350 lines
/home/smfrench/smb3-kernel/fs/smb/server/vfs_cache.c:39:19: warning:
symbol 'dh_task' was not declared. Should it be static?/home/smfrench/smb3-kernel/fs/smb/server/vfs_cache.c:40:19: warning:
symbol 'dh_wq' was not declared. Should it be static?Quoted 335 lines · Namjae Jeon
Launch ksmbd-durable-scavenger kernel thread to scan durable fps that have not been reclaimed by a client within the configured time.
Signed-off-by Namjae Jeon <[email protected]>--- fs/smb/server/mgmt/user_session.c | 2 + fs/smb/server/server.c | 1 + fs/smb/server/server.h | 1 + fs/smb/server/smb2pdu.c | 2 +- fs/smb/server/smb2pdu.h | 2 + fs/smb/server/vfs_cache.c | 165 +++++++++++++++++++++++++++++- fs/smb/server/vfs_cache.h | 2 + 7 files changed, 169 insertions(+), 6 deletions(-)fs/smb/server/mgmt/user_session.c +2
-0@@ -149,6 +149,7 @@ void ksmbd_session_destroy(struct ksmbd_session *sess)ksmbd_tree_conn_session_logoff (sess);ksmbd_destroy_file_table (&sess->file_table); +ksmbd_launch_ksmbd_durable_scavenger ();ksmbd_session_rpc_clear_list (sess);free_channel_list (sess);kfree (sess->Preauth_HashValue);@@ -326,6 +327,7 @@ void destroy_previous_session(struct ksmbd_conn *conn,ksmbd_destroy_file_table (&prev_sess->file_table); prev_sess->state =SMB2_SESSION_EXPIRED ; +ksmbd_launch_ksmbd_durable_scavenger (); out:up_write (&conn->session_lock);up_write (&sessions_table_lock);fs/smb/server/server.c +1
-0@@ -377,6 +377,7 @@ static void server_ctrl_handle_reset(struct server_ctrl_struct *ctrl) {ksmbd_ipc_soft_reset ();ksmbd_conn_transport_destroy (); +ksmbd_stop_durable_scavenger ();server_conf_free ();server_conf_init ();WRITE_ONCE (server_conf.state,SERVER_STATE_STARTING_UP );fs/smb/server/server.h +1
-0@@ -44,6 +44,7 @@ struct ksmbd_server_config {unsigned int max_connections;char *conf[SERVER_CONF_WORK_GROUP +1 ]; +struct task_struct *dh_task; };extern struct ksmbd_server_config server_conf;fs/smb/server/smb2pdu.c +1
-1@@ -3519,7 +3519,7 @@ int smb2_open(struct ksmbd_work *work) SMB2_CREATE_GUID_SIZE);if (dh_info.timeout) fp->durable_timeout =min (dh_info.timeout, -300000 ); +DURABLE_HANDLE_MAX_TIMEOUT );else fp->durable_timeout =60 ; }fs/smb/server/smb2pdu.h +2
-0@@ -72,6 +72,8 @@ struct create_durable_req_v2 {__u8 CreateGuid[16 ]; } __packed; +#define DURABLE_HANDLE_MAX_TIMEOUT 300000 +struct create_durable_reconn_req {struct create_context_hdr ccontext;__u8 Name[8 ];fs/smb/server/vfs_cache.c +160
-5@@ -8,6 +8,8 @@#include <linux/filelock.h> #include <linux/slab.h> #include <linux/vmalloc.h> +#include <linux/kthread.h> +#include <linux/freezer.h> #include "glob.h" #include "vfs_cache.h" @@ -17,6 +19,7 @@#include "mgmt/tree_connect.h" #include "mgmt/user_session.h" #include "smb_common.h" +#include "server.h" #define S_DEL_PENDING 1#define S_DEL_ON_CLS 2@@ -31,6 +34,11 @@ static struct ksmbd_file_table global_ft;static atomic_long_t fd_limit;static struct kmem_cache *filp_cache; +static bool durable_scavenger_running; +static DEFINE_MUTEX (durable_scavenger_lock); +struct task_struc *dh_task; +wait_queue_head_t dh_wq; +void ksmbd_set_fd_limit (unsigned long limit) { limit =min (limit,get_max_files ());@@ -279,9 +287,16 @@ static void __ksmbd_remove_durable_fd(struct ksmbd_file *fp)if (!has_file_id (fp->persistent_id))return ; -write_lock (&global_ft.lock);idr_remove (global_ft.idr, fp->persistent_id); +} + +static void ksmbd_remove_durable_fd (struct ksmbd_file *fp) +{ +write_lock (&global_ft.lock); +__ksmbd_remove_durable_fd (fp);write_unlock (&global_ft.lock); +if (waitqueue_active (&dh_wq)) +wake_up (&dh_wq); }static void __ksmbd_remove_fd (struct ksmbd_file_table *ft,struct ksmbd_file *fp)@@ -304,7 +319,7 @@ static void __ksmbd_close_fd(struct ksmbd_file_table *ft, struct ksmbd_file *fp)struct ksmbd_lock *smb_lock, *tmp_lock;fd_limit_close (); -__ksmbd_remove_durable_fd (fp); +ksmbd_remove_durable_fd (fp);if (ft)__ksmbd_remove_fd (ft, fp);@@ -696,6 +711,142 @@ static bool tree_conn_fd_check(struct ksmbd_tree_connect *tcon,return fp->tcon != tcon; } +static bool ksmbd_durable_scavenger_alive (void ) +{ +mutex_lock (&durable_scavenger_lock); +if (!durable_scavenger_running) { +mutex_unlock (&durable_scavenger_lock); +return false; + } +mutex_unlock (&durable_scavenger_lock); + +if (kthread_should_stop ()) +return false; + +if (idr_is_empty (global_ft.idr)) +return false; + +return true; +} + +static void ksmbd_scavenger_dispose_dh (struct list_head *head) +{ +while (!list_empty (head)) { +struct ksmbd_file *fp; + + fp = list_first_entry(head, struct ksmbd_file, node); +list_del_init (&fp->node); +__ksmbd_close_fd (NULL , fp); + } +} + +static int ksmbd_durable_scavenger (void *dummy) +{ +struct ksmbd_file *fp =NULL ; +unsigned int id; +unsigned int min_timeout =1 ; +bool found_fp_timeout; +LIST_HEAD (scavenger_list); +unsigned long remaining_jiffies; + +__module_get (THIS_MODULE ); + +set_freezable (); +while (ksmbd_durable_scavenger_alive ()) { +if (try_to_freeze ()) +continue ; + + found_fp_timeout = false; + + remaining_jiffies =wait_event_timeout (dh_wq, +ksmbd_durable_scavenger_alive () == false, +__msecs_to_jiffies (min_timeout)); +if (remaining_jiffies) + min_timeout =jiffies_to_msecs (remaining_jiffies); +else + min_timeout =DURABLE_HANDLE_MAX_TIMEOUT ; + +write_lock (&global_ft.lock); +idr_for_each_entry (global_ft.idr, fp, id) { +if (!fp->durable_timeout) +continue ; + +if (atomic_read (&fp->refcount) >1 || + fp->conn) +continue ; + + found_fp_timeout = true; +if (fp->durable_scavenger_timeout <= +jiffies_to_msecs (jiffies)) { +__ksmbd_remove_durable_fd (fp); +list_add (&fp->node, &scavenger_list); + }else { +unsigned long durable_timeout; + + durable_timeout = + fp->durable_scavenger_timeout - +jiffies_to_msecs (jiffies); + +if (min_timeout > durable_timeout) + min_timeout = durable_timeout; + } + } +write_unlock (&global_ft.lock); + +ksmbd_scavenger_dispose_dh (&scavenger_list); + +if (found_fp_timeout == false) +break ; + } + +mutex_lock (&durable_scavenger_lock); + durable_scavenger_running = false; +mutex_unlock (&durable_scavenger_lock); + +module_put (THIS_MODULE ); + +return 0 ; +} + +void ksmbd_launch_ksmbd_durable_scavenger (void ) +{ +if (!(server_conf.flags &KSMBD_GLOBAL_FLAG_DURABLE_HANDLE )) +return ; + +mutex_lock (&durable_scavenger_lock); +if (durable_scavenger_running == true) { +mutex_unlock (&durable_scavenger_lock); +return ; + } + + durable_scavenger_running = true; + + server_conf.dh_task =kthread_run (ksmbd_durable_scavenger, + (void *)NULL ,"ksmbd-durable-scavenger" ); +if (IS_ERR (server_conf.dh_task)) +pr_err ("cannot start conn thread, err : %ld\n" , +PTR_ERR (server_conf.dh_task)); +mutex_unlock (&durable_scavenger_lock); +} + +void ksmbd_stop_durable_scavenger (void ) +{ +if (!(server_conf.flags &KSMBD_GLOBAL_FLAG_DURABLE_HANDLE )) +return ; + +mutex_lock (&durable_scavenger_lock); +if (!durable_scavenger_running) { +mutex_unlock (&durable_scavenger_lock); +return ; + } + + durable_scavenger_running = false; +if (waitqueue_active (&dh_wq)) +wake_up (&dh_wq); +mutex_unlock (&durable_scavenger_lock); +kthread_stop (server_conf.dh_task); +} +static bool session_fd_check (struct ksmbd_tree_connect *tcon,struct ksmbd_file *fp) {@@ -756,11 +907,12 @@ void ksmbd_free_global_file_table(void)unsigned int id;idr_for_each_entry (global_ft.idr, fp, id) { -__ksmbd_remove_durable_fd (fp); -kmem_cache_free (filp_cache, fp); +ksmbd_remove_durable_fd (fp); +__ksmbd_close_fd (NULL , fp); } -ksmbd_destroy_file_table (&global_ft); +idr_destroy (global_ft.idr); +kfree (global_ft.idr); } int ksmbd_validate_name_reconnect(struct ksmbd_share_config *share,@@ -816,6 +968,7 @@ int ksmbd_reopen_durable_fd(struct ksmbd_work *work, struct ksmbd_file *fp) }up_write (&ci->m_lock); + fp->f_state =FP_NEW ;__open_id (&work->sess->file_table, fp,OPEN_ID_TYPE_VOLATILE_ID );if (!has_file_id (fp->volatile_id)) { fp->conn =NULL ;@@ -855,6 +1008,8 @@ int ksmbd_init_file_cache(void)if (!filp_cache) goto out; +init_waitqueue_head (&dh_wq); +return 0 ; out:fs/smb/server/vfs_cache.h +2
-1@@ -153,6 +153,8 @@ struct ksmbd_file *ksmbd_lookup_fd_cguid(char *cguid);struct ksmbd_file *ksmbd_lookup_fd_inode (struct dentry *dentry);unsigned int ksmbd_open_durable_fd (struct ksmbd_file *fp);struct ksmbd_file *ksmbd_open_fd (struct ksmbd_work *work,struct file *filp); +void ksmbd_launch_ksmbd_durable_scavenger (void ); +void ksmbd_stop_durable_scavenger (void );void ksmbd_close_tree_conn_fds (struct ksmbd_work *work);void ksmbd_close_session_fds (struct ksmbd_work *work);int ksmbd_close_inode_fds (struct ksmbd_work *work,struct inode *inode); --Quoted 2 lines
2.25.1
--
Thanks,Steve
kernel test robot
build botRe: [PATCH 2/3] ksmbd: add durable scavenger timer
In reply to Namjae Jeonkernel test robot noticed the following build warnings:
Hi Namjae,
kernel test robot noticed the following build warnings:
[auto build test WARNING on linus/master]
[also build test WARNING on v6.10-rc3 next-20240613]
[If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Namjae-Jeon/ksmbd-add-durable-scavenger-timer/20240610-221647 base: linus/master patch link: https://lore.kernel.org/r/20240610141416.8039-2-linkinjeon%40kernel.org patch subject: [PATCH 2/3] ksmbd: add durable scavenger timer config: s390-randconfig-r112-20240613 (https://download.01.org/0day-ci/archive/20240613/[email protected]/config) compiler: clang version 15.0.7 (https://github.com/llvm/llvm-project 8dfdcc7b7bf66834a761bd8de445840ef68e4d1a) reproduce: (https://download.01.org/0day-ci/archive/20240613/[email protected]/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 <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
sparse warnings: (new ones prefixed by >>)
>> fs/smb/server/vfs_cache.c:40:19: sparse: sparse: symbol 'dh_wq' was not declared. Should it be static?
fs/smb/server/vfs_cache.c: note: in included file (through include/linux/wait.h, include/linux/wait_bit.h, include/linux/fs.h):
include/linux/list.h:83:21: sparse: sparse: self-comparison always evaluates to true
vim +/dh_wq +40 fs/smb/server/vfs_cache.c
36
37 static bool durable_scavenger_running;
38 static DEFINE_MUTEX(durable_scavenger_lock);
39 struct task_struc *dh_task;
> 40 wait_queue_head_t dh_wq;
41 Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki
Namjae Jeon
maintainerPATCH 3/3 ksmbd: move leading slash check to smb2_get_name()
In reply to Namjae JeonIf the directory name in the root of the share starts with character like 镜(0x955c) or Ṝ(0x1e5c), it (and anything inside) cannot be accessed. The leading slash check must be checked after converting unicode to nls string.
--- fs/smb/server/smb2pdu.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-)
fs/smb/server/smb2pdu.c +6 -9
@@ -630,6 +630,12 @@ smb2_get_name(const char *src, const int maxlen, struct nls_table *local_nls)return name; } +if (*name =='\\' ) { +pr_err ("not allow directory name included leading slash\n" ); +kfree (name); +return ERR_PTR (-EINVAL ); + } +ksmbd_conv_path_to_unix (name);ksmbd_strip_last_slash (name);return name;
@@ -2842,20 +2848,11 @@ int smb2_open(struct ksmbd_work *work) }if (req->NameLength) { -if ((req->CreateOptions &FILE_DIRECTORY_FILE_LE ) && - *(char *)req->Buffer =='\\' ) { -pr_err ("not allow directory name included leading slash\n" ); - rc = -EINVAL ; - goto err_out2; - } - name =smb2_get_name ((char *)req +le16_to_cpu (req->NameOffset),le16_to_cpu (req->NameLength), work->conn->local_nls);if (IS_ERR (name)) { rc =PTR_ERR (name); -if (rc != -ENOMEM ) - rc = -ENOENT ; name =NULL ; goto err_out2; }
Signature · 1 line
2.25.1