ksmbd stable patches for 5.16.y
Subsystems (3)
Namjae Jeon
maintainercover ksmbd stable patches for 5.16.y
These patches include 2 patches to run the recently updated ksmbd.mountd(3.4.4) and 2 other patches to fix issues to avoid out of memory issues caused by many outstanding smb2 locks. These are important patches applied to linux-5.17-rc1, but they cannot be applied to the stable kernel, so they are sent as separately backported patches.
Namjae Jeon (4):
ksmbd: add support for smb2 max credit parameter
ksmbd: move credit charge deduction under processing request
ksmbd: limits exceeding the maximum allowable outstanding requests
ksmbd: add reserved room in ipc request/response
fs/ksmbd/connection.c | 1 + fs/ksmbd/connection.h | 4 ++-- fs/ksmbd/ksmbd_netlink.h | 12 +++++++++++- fs/ksmbd/smb2misc.c | 18 ++++++++++++------ fs/ksmbd/smb2ops.c | 16 ++++++++++++---- fs/ksmbd/smb2pdu.c | 25 +++++++++++++++---------- fs/ksmbd/smb2pdu.h | 1 + fs/ksmbd/smb_common.h | 1 + fs/ksmbd/transport_ipc.c | 2 ++ 9 files changed, 57 insertions(+), 23 deletions(-)
Signature · 1 line
2.25.1
Namjae Jeon
maintainerPATCH 1/4 ksmbd: add support for smb2 max credit parameter
commit 004443b3f6d722b455cf963ed7c3edd7f4772405 upstream.
Add smb2 max credits parameter to adjust maximum credits value to limit number of outstanding requests.
--- fs/ksmbd/connection.h | 1 - fs/ksmbd/ksmbd_netlink.h | 1 + fs/ksmbd/smb2misc.c | 2 +- fs/ksmbd/smb2ops.c | 16 ++++++++++++---- fs/ksmbd/smb2pdu.c | 8 ++++---- fs/ksmbd/smb2pdu.h | 1 + fs/ksmbd/smb_common.h | 1 + fs/ksmbd/transport_ipc.c | 2 ++ 8 files changed, 22 insertions(+), 10 deletions(-)
fs/ksmbd/connection.h +0 -1
@@ -62,7 +62,6 @@ struct ksmbd_conn {/* References which are made for this Server object*/ atomic_t r_count;unsigned short total_credits; -unsigned short max_credits;spinlock_t credits_lock;wait_queue_head_t req_running_q;/* Lock to protect requests list*/
fs/ksmbd/ksmbd_netlink.h +1 -0
@@ -103,6 +103,7 @@ struct ksmbd_startup_request {* we set the SPARSE_FILES bit (0x40). */ __u32 sub_auth[3 ];/* Subauth value for Security ID */ +__u32 smb2_max_credits;/* MAX credits */ __u32 ifc_list_sz;/* interfaces list size */ __s8 ____payload[]; };
fs/ksmbd/smb2misc.c +1 -1
@@ -326,7 +326,7 @@ static int smb2_validate_credit_charge(struct ksmbd_conn *conn,ksmbd_debug (SMB ,"Insufficient credit charge, given: %d, needed: %d\n" , credit_charge, calc_credit_num);return 1 ; - }else if (credit_charge > conn->max_credits) { + }else if (credit_charge > conn->vals->max_credits) {ksmbd_debug (SMB ,"Too large credit charge: %d\n" , credit_charge);return 1 ; }
fs/ksmbd/smb2ops.c +12 -4
@@ -19,6 +19,7 @@ static struct smb_version_values smb21_server_values = { .max_read_size = SMB21_DEFAULT_IOSIZE, .max_write_size = SMB21_DEFAULT_IOSIZE, .max_trans_size = SMB21_DEFAULT_IOSIZE, + .max_credits = SMB2_MAX_CREDITS, .large_lock_type = 0, .exclusive_lock_type = SMB2_LOCKFLAG_EXCLUSIVE, .shared_lock_type = SMB2_LOCKFLAG_SHARED,
@@ -44,6 +45,7 @@ static struct smb_version_values smb30_server_values = { .max_read_size = SMB3_DEFAULT_IOSIZE, .max_write_size = SMB3_DEFAULT_IOSIZE, .max_trans_size = SMB3_DEFAULT_TRANS_SIZE, + .max_credits = SMB2_MAX_CREDITS, .large_lock_type = 0, .exclusive_lock_type = SMB2_LOCKFLAG_EXCLUSIVE, .shared_lock_type = SMB2_LOCKFLAG_SHARED,
@@ -70,6 +72,7 @@ static struct smb_version_values smb302_server_values = { .max_read_size = SMB3_DEFAULT_IOSIZE, .max_write_size = SMB3_DEFAULT_IOSIZE, .max_trans_size = SMB3_DEFAULT_TRANS_SIZE, + .max_credits = SMB2_MAX_CREDITS, .large_lock_type = 0, .exclusive_lock_type = SMB2_LOCKFLAG_EXCLUSIVE, .shared_lock_type = SMB2_LOCKFLAG_SHARED,
@@ -96,6 +99,7 @@ static struct smb_version_values smb311_server_values = { .max_read_size = SMB3_DEFAULT_IOSIZE, .max_write_size = SMB3_DEFAULT_IOSIZE, .max_trans_size = SMB3_DEFAULT_TRANS_SIZE, + .max_credits = SMB2_MAX_CREDITS, .large_lock_type = 0, .exclusive_lock_type = SMB2_LOCKFLAG_EXCLUSIVE, .shared_lock_type = SMB2_LOCKFLAG_SHARED,
@@ -197,7 +201,6 @@ void init_smb2_1_server(struct ksmbd_conn *conn) conn->ops = &smb2_0_server_ops; conn->cmds = smb2_0_server_cmds; conn->max_cmds =ARRAY_SIZE (smb2_0_server_cmds); - conn->max_credits =SMB2_MAX_CREDITS ; conn->signing_algorithm =SIGNING_ALG_HMAC_SHA256_LE ;if (server_conf.flags &KSMBD_GLOBAL_FLAG_SMB2_LEASES )
@@ -215,7 +218,6 @@ void init_smb3_0_server(struct ksmbd_conn *conn) conn->ops = &smb3_0_server_ops; conn->cmds = smb2_0_server_cmds; conn->max_cmds =ARRAY_SIZE (smb2_0_server_cmds); - conn->max_credits =SMB2_MAX_CREDITS ; conn->signing_algorithm =SIGNING_ALG_AES_CMAC_LE ;if (server_conf.flags &KSMBD_GLOBAL_FLAG_SMB2_LEASES )
@@ -240,7 +242,6 @@ void init_smb3_02_server(struct ksmbd_conn *conn) conn->ops = &smb3_0_server_ops; conn->cmds = smb2_0_server_cmds; conn->max_cmds =ARRAY_SIZE (smb2_0_server_cmds); - conn->max_credits =SMB2_MAX_CREDITS ; conn->signing_algorithm =SIGNING_ALG_AES_CMAC_LE ;if (server_conf.flags &KSMBD_GLOBAL_FLAG_SMB2_LEASES )
@@ -265,7 +266,6 @@ int init_smb3_11_server(struct ksmbd_conn *conn) conn->ops = &smb3_11_server_ops; conn->cmds = smb2_0_server_cmds; conn->max_cmds =ARRAY_SIZE (smb2_0_server_cmds); - conn->max_credits =SMB2_MAX_CREDITS ; conn->signing_algorithm =SIGNING_ALG_AES_CMAC_LE ;if (server_conf.flags &KSMBD_GLOBAL_FLAG_SMB2_LEASES )
@@ -304,3 +304,11 @@ void init_smb2_max_trans_size(unsigned int sz) smb302_server_values.max_trans_size = sz; smb311_server_values.max_trans_size = sz; } + +void init_smb2_max_credits (unsigned int sz) +{ + smb21_server_values.max_credits = sz; + smb30_server_values.max_credits = sz; + smb302_server_values.max_credits = sz; + smb311_server_values.max_credits = sz; +}
fs/ksmbd/smb2pdu.c +4 -4
@@ -308,7 +308,7 @@ int smb2_set_rsp_credits(struct ksmbd_work *work) hdr->CreditCharge = req_hdr->CreditCharge; -if (conn->total_credits > conn->max_credits) { +if (conn->total_credits > conn->vals->max_credits) { hdr->CreditRequest =0 ;pr_err ("Total credits overflow: %d\n" , conn->total_credits);return -EINVAL ;
@@ -329,12 +329,12 @@ int smb2_set_rsp_credits(struct ksmbd_work *work)if (hdr->Command ==SMB2_NEGOTIATE ) aux_max =0 ;else - aux_max = conn->max_credits - credit_charge; + aux_max = conn->vals->max_credits - credit_charge; aux_credits = min_t(unsigned short, aux_credits, aux_max); credits_granted = credit_charge + aux_credits; -if (conn->max_credits - conn->total_credits < credits_granted) - credits_granted = conn->max_credits - +if (conn->vals->max_credits - conn->total_credits < credits_granted) + credits_granted = conn->vals->max_credits - conn->total_credits; conn->total_credits += credits_granted;
fs/ksmbd/smb2pdu.h +1 -0
@@ -980,6 +980,7 @@ int init_smb3_11_server(struct ksmbd_conn *conn);void init_smb2_max_read_size (unsigned int sz);void init_smb2_max_write_size (unsigned int sz);void init_smb2_max_trans_size (unsigned int sz); +void init_smb2_max_credits (unsigned int sz);bool is_smb2_neg_cmd (struct ksmbd_work *work);bool is_smb2_rsp (struct ksmbd_work *work);
fs/ksmbd/smb_common.h +1 -0
@@ -365,6 +365,7 @@ struct smb_version_values {__u32 max_read_size;__u32 max_write_size;__u32 max_trans_size; +__u32 max_credits;__u32 large_lock_type;__u32 exclusive_lock_type;__u32 shared_lock_type;
fs/ksmbd/transport_ipc.c +2 -0
@@ -301,6 +301,8 @@ static int ipc_server_config_on_startup(struct ksmbd_startup_request *req)init_smb2_max_write_size (req->smb2_max_write);if (req->smb2_max_trans)init_smb2_max_trans_size (req->smb2_max_trans); +if (req->smb2_max_credits) +init_smb2_max_credits (req->smb2_max_credits); ret =ksmbd_set_netbios_name (req->netbios_name); ret |=ksmbd_set_server_string (req->server_string);
Signature · 1 line
2.25.1
Namjae Jeon
maintainerPATCH 2/4 ksmbd: move credit charge deduction under processing request
In reply to Namjae Jeoncommit 914d7e5709ac59ded70bea7956d408fe2acd7c3c upstream.
Moves the credit charge deduction from total_credits under the processing a request. When repeating smb2 lock request and other command request, there will be a problem that ->total_credits does not decrease.
--- fs/ksmbd/smb2misc.c | 7 ++----- fs/ksmbd/smb2pdu.c | 16 ++++++++++------ 2 files changed, 12 insertions(+), 11 deletions(-)
fs/ksmbd/smb2misc.c +2 -5
@@ -289,7 +289,7 @@ static int smb2_validate_credit_charge(struct ksmbd_conn *conn,unsigned int req_len =0 , expect_resp_len =0 , calc_credit_num, max_len;unsigned short credit_charge =le16_to_cpu (hdr->CreditCharge);void *__hdr = hdr; -int ret; +int ret =0 ;switch (hdr->Command) {case SMB2_QUERY_INFO :
@@ -332,10 +332,7 @@ static int smb2_validate_credit_charge(struct ksmbd_conn *conn, }spin_lock (&conn->credits_lock); -if (credit_charge <= conn->total_credits) { - conn->total_credits -= credit_charge; - ret =0 ; - }else { +if (credit_charge > conn->total_credits) {ksmbd_debug (SMB ,"Insufficient credits granted, given: %u, granted: %u\n" , credit_charge, conn->total_credits); ret =1 ;
fs/ksmbd/smb2pdu.c +10 -6
@@ -299,9 +299,8 @@ int smb2_set_rsp_credits(struct ksmbd_work *work)struct smb2_hdr *req_hdr =ksmbd_req_buf_next (work);struct smb2_hdr *hdr =ksmbd_resp_buf_next (work);struct ksmbd_conn *conn = work->conn; -unsigned short credits_requested; +unsigned short credits_requested, aux_max;unsigned short credit_charge, credits_granted =0 ; -unsigned short aux_max, aux_credits;if (work->send_no_response)return 0 ;
@@ -316,6 +315,13 @@ int smb2_set_rsp_credits(struct ksmbd_work *work) credit_charge = max_t(unsigned short,le16_to_cpu (req_hdr->CreditCharge),1 ); +if (credit_charge > conn->total_credits) { +ksmbd_debug (SMB ,"Insufficient credits granted, given: %u, granted: %u\n" , + credit_charge, conn->total_credits); +return -EINVAL ; + } + + conn->total_credits -= credit_charge; credits_requested = max_t(unsigned short,le16_to_cpu (req_hdr->CreditRequest),1 );
@@ -325,13 +331,11 @@ int smb2_set_rsp_credits(struct ksmbd_work *work)* TODO: Need to adjuct CreditRequest value according to * current cpu load */ - aux_credits = credits_requested -1 ;if (hdr->Command ==SMB2_NEGOTIATE ) - aux_max =0 ; + aux_max =1 ;else aux_max = conn->vals->max_credits - credit_charge; - aux_credits = min_t(unsigned short, aux_credits, aux_max); - credits_granted = credit_charge + aux_credits; + credits_granted = min_t(unsigned short, credits_requested, aux_max);if (conn->vals->max_credits - conn->total_credits < credits_granted) credits_granted = conn->vals->max_credits -
Signature · 1 line
2.25.1
Namjae Jeon
maintainerPATCH 3/4 ksmbd: limits exceeding the maximum allowable outstanding requests
In reply to Namjae Jeoncommit b589f5db6d4af8f14d70e31e1276b4c017668a26 upstream.
If the client ignores the CreditResponse received from the server and continues to send the request, ksmbd limits the requests if it exceeds smb2 max credits.
--- fs/ksmbd/connection.c | 1 + fs/ksmbd/connection.h | 3 ++- fs/ksmbd/smb2misc.c | 9 +++++++++ fs/ksmbd/smb2pdu.c | 1 + 4 files changed, 13 insertions(+), 1 deletion(-)
fs/ksmbd/connection.c +1 -0
@@ -62,6 +62,7 @@ struct ksmbd_conn *ksmbd_conn_alloc(void)atomic_set (&conn->req_running,0 );atomic_set (&conn->r_count,0 ); conn->total_credits =1 ; + conn->outstanding_credits =1 ;init_waitqueue_head (&conn->req_running_q);INIT_LIST_HEAD (&conn->conns_list);
fs/ksmbd/connection.h +2 -1
@@ -61,7 +61,8 @@ struct ksmbd_conn {atomic_t req_running;/* References which are made for this Server object*/ atomic_t r_count; -unsigned short total_credits; +unsigned int total_credits; +unsigned int outstanding_credits;spinlock_t credits_lock;wait_queue_head_t req_running_q;/* Lock to protect requests list*/
fs/ksmbd/smb2misc.c +9 -0
@@ -337,7 +337,16 @@ static int smb2_validate_credit_charge(struct ksmbd_conn *conn, credit_charge, conn->total_credits); ret =1 ; } + +if ((u64 )conn->outstanding_credits + credit_charge > conn->vals->max_credits) { +ksmbd_debug (SMB ,"Limits exceeding the maximum allowable outstanding requests, given : %u, pending : %u\n" , + credit_charge, conn->outstanding_credits); + ret =1 ; + }else + conn->outstanding_credits += credit_charge; +spin_unlock (&conn->credits_lock); +return ret; }
fs/ksmbd/smb2pdu.c +1 -0
@@ -322,6 +322,7 @@ int smb2_set_rsp_credits(struct ksmbd_work *work) } conn->total_credits -= credit_charge; + conn->outstanding_credits -= credit_charge; credits_requested = max_t(unsigned short,le16_to_cpu (req_hdr->CreditRequest),1 );
Signature · 1 line
2.25.1
Namjae Jeon
maintainerPATCH 4/4 ksmbd: add reserved room in ipc request/response
In reply to Namjae Jeoncommit 41dbda16a0902798e732abc6599de256b9dc3b27 upstream.
Whenever new parameter is added to smb configuration, It is possible to break the execution of the IPC daemon by mismatch size of request/response. This patch tries to reserve space in ipc request/response in advance to prevent that.
--- fs/ksmbd/ksmbd_netlink.h | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
fs/ksmbd/ksmbd_netlink.h +10 -1
@@ -104,6 +104,7 @@ struct ksmbd_startup_request {*/ __u32 sub_auth[3 ];/* Subauth value for Security ID */ __u32 smb2_max_credits;/* MAX credits */ +__u32 reserved[128 ];/* Reserved room */ __u32 ifc_list_sz;/* interfaces list size */ __s8 ____payload[]; };
@@ -114,7 +115,7 @@ struct ksmbd_startup_request {* IPC request to shutdown ksmbd server. */ struct ksmbd_shutdown_request { -__s32 reserved; +__s32 reserved[16 ]; };/*
@@ -123,6 +124,7 @@ struct ksmbd_shutdown_request {struct ksmbd_login_request {__u32 handle;__s8 account[KSMBD_REQ_MAX_ACCOUNT_NAME_SZ ];/* user account name */ +__u32 reserved[16 ];/* Reserved room */ };/*
@@ -136,6 +138,7 @@ struct ksmbd_login_response {__u16 status;__u16 hash_sz;/* hash size */ __s8 hash[KSMBD_REQ_MAX_HASH_SZ ];/* password hash */ +__u32 reserved[16 ];/* Reserved room */ };/*
@@ -144,6 +147,7 @@ struct ksmbd_login_response {struct ksmbd_share_config_request {__u32 handle;__s8 share_name[KSMBD_REQ_MAX_SHARE_NAME ];/* share name */ +__u32 reserved[16 ];/* Reserved room */ };/*
@@ -158,6 +162,7 @@ struct ksmbd_share_config_response {__u16 force_directory_mode;__u16 force_uid;__u16 force_gid; +__u32 reserved[128 ];/* Reserved room */ __u32 veto_list_sz;__s8 ____payload[]; };
@@ -188,6 +193,7 @@ struct ksmbd_tree_connect_request {__s8 account[KSMBD_REQ_MAX_ACCOUNT_NAME_SZ ];__s8 share[KSMBD_REQ_MAX_SHARE_NAME ];__s8 peer_addr[64 ]; +__u32 reserved[16 ];/* Reserved room */ };/*
@@ -197,6 +203,7 @@ struct ksmbd_tree_connect_response {__u32 handle;__u16 status;__u16 connection_flags; +__u32 reserved[16 ];/* Reserved room */ };/*
@@ -205,6 +212,7 @@ struct ksmbd_tree_connect_response {struct ksmbd_tree_disconnect_request {__u64 session_id;/* session id */ __u64 connect_id;/* tree connection id */ +__u32 reserved[16 ];/* Reserved room */ };/*
@@ -213,6 +221,7 @@ struct ksmbd_tree_disconnect_request {struct ksmbd_logout_request {__s8 account[KSMBD_REQ_MAX_ACCOUNT_NAME_SZ ];/* user account name */ __u32 account_flags; +__u32 reserved[16 ];/* Reserved room */ };/*
Signature · 1 line
2.25.1
Greg KH
maintainerQuoted 12 lines · Namjae Jeon
These patches include 2 patches to run the recently updated
ksmbd.mountd(3.4.4)and 2 other patches to fix issues to avoid out of memory issues caused by many outstanding smb2 locks. These are important patches applied to linux-5.17-rc1, but they cannot be applied to the stable kernel, so they are sent as separately backported patches.Namjae Jeon (4):
ksmbd: add support for smb2 max credit parameter
ksmbd: move credit charge deduction under processing request
ksmbd: limits exceeding the maximum allowable outstanding requests
ksmbd: add reserved room in ipc request/response
Quoted 14 lines
fs/ksmbd/connection.c | 1 + fs/ksmbd/connection.h | 4 ++-- fs/ksmbd/ksmbd_netlink.h | 12 +++++++++++- fs/ksmbd/smb2misc.c | 18 ++++++++++++------ fs/ksmbd/smb2ops.c | 16 ++++++++++++---- fs/ksmbd/smb2pdu.c | 25 +++++++++++++++---------- fs/ksmbd/smb2pdu.h | 1 + fs/ksmbd/smb_common.h | 1 + fs/ksmbd/transport_ipc.c | 2 ++ 9 files changed, 57 insertions(+), 23 deletions(-)Signature · 1 line
2.25.1
All now queued up, thanks.
greg k-h