From: chenxiaosong.chenxiaosong@linux.dev
To: sfrench@samba.org, smfrench@gmail.com, linkinjeon@kernel.org,
linkinjeon@samba.org
Cc: linux-cifs@vger.kernel.org, linux-kernel@vger.kernel.org,
liuzhengyuan@kylinos.cn, huhai@kylinos.cn, liuyun01@kylinos.cn,
ChenXiaoSong <chenxiaosong@kylinos.cn>
Subject: [PATCH v4 05/10] smb/client: sort smb2_error_map_table array
Date: Sat, 6 Dec 2025 23:18:21 +0800 [thread overview]
Message-ID: <20251206151826.2932970-6-chenxiaosong.chenxiaosong@linux.dev> (raw)
In-Reply-To: <20251206151826.2932970-1-chenxiaosong.chenxiaosong@linux.dev>
From: ChenXiaoSong <chenxiaosong@kylinos.cn>
Sort the array in ascending order, and then we can use binary search
algorithm to quickly find the target status code.
Since the smb2_init_maperror() is called only once when the module is
loaded, the array is sorted just once.
Signed-off-by: ChenXiaoSong <chenxiaosong@kylinos.cn>
---
fs/smb/client/cifsfs.c | 2 ++
fs/smb/client/smb2maperror.c | 25 ++++++++++++++++++++++++-
fs/smb/client/smb2proto.h | 1 +
3 files changed, 27 insertions(+), 1 deletion(-)
diff --git a/fs/smb/client/cifsfs.c b/fs/smb/client/cifsfs.c
index 6eccb9ed9daa..77d14b3dd650 100644
--- a/fs/smb/client/cifsfs.c
+++ b/fs/smb/client/cifsfs.c
@@ -49,6 +49,7 @@
#endif
#include "fs_context.h"
#include "cached_dir.h"
+#include "smb2proto.h"
/*
* DOS dates from 1980/1/1 through 2107/12/31
@@ -1908,6 +1909,7 @@ static int __init
init_cifs(void)
{
int rc = 0;
+ smb2_init_maperror();
cifs_proc_init();
INIT_LIST_HEAD(&cifs_tcp_ses_list);
/*
diff --git a/fs/smb/client/smb2maperror.c b/fs/smb/client/smb2maperror.c
index a77467d2d81c..1bd4196386dd 100644
--- a/fs/smb/client/smb2maperror.c
+++ b/fs/smb/client/smb2maperror.c
@@ -8,6 +8,7 @@
*
*/
#include <linux/errno.h>
+#include <linux/sort.h>
#include "cifsglob.h"
#include "cifs_debug.h"
#include "smb2pdu.h"
@@ -22,7 +23,7 @@ struct status_to_posix_error {
char *status_string;
};
-static const struct status_to_posix_error smb2_error_map_table[] = {
+static struct status_to_posix_error smb2_error_map_table[] = {
{STATUS_WAIT_1, -EIO, "STATUS_WAIT_1"},
{STATUS_WAIT_2, -EIO, "STATUS_WAIT_2"},
{STATUS_WAIT_3, -EIO, "STATUS_WAIT_3"},
@@ -2418,6 +2419,20 @@ static const struct status_to_posix_error smb2_error_map_table[] = {
"STATUS_SMB_NO_PREAUTH_INTEGRITY_HASH_OVERLAP"},
};
+static unsigned int err_map_num = sizeof(smb2_error_map_table) /
+ sizeof(struct status_to_posix_error);
+
+static int cmp_smb2_status(const void *_a, const void *_b)
+{
+ const struct status_to_posix_error *a = _a, *b = _b;
+
+ if (a->smb2_status < b->smb2_status)
+ return -1;
+ if (a->smb2_status > b->smb2_status)
+ return 1;
+ return 0;
+}
+
int
map_smb2_to_linux_error(char *buf, bool log_err)
{
@@ -2461,3 +2476,11 @@ map_smb2_to_linux_error(char *buf, bool log_err)
le32_to_cpu(smb2err), rc);
return rc;
}
+
+void smb2_init_maperror(void)
+{
+ /* Sort in ascending order */
+ sort(smb2_error_map_table, err_map_num,
+ sizeof(struct status_to_posix_error),
+ cmp_smb2_status, NULL);
+}
diff --git a/fs/smb/client/smb2proto.h b/fs/smb/client/smb2proto.h
index 5241daaae543..c988f6b37a1b 100644
--- a/fs/smb/client/smb2proto.h
+++ b/fs/smb/client/smb2proto.h
@@ -21,6 +21,7 @@ struct smb_rqst;
*****************************************************************
*/
extern int map_smb2_to_linux_error(char *buf, bool log_err);
+extern void smb2_init_maperror(void);
extern int smb2_check_message(char *buf, unsigned int length,
struct TCP_Server_Info *server);
extern unsigned int smb2_calc_size(void *buf);
--
2.43.0
next prev parent reply other threads:[~2025-12-06 15:19 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-12-06 15:18 [PATCH v4 00/10] smb: improve search speed of SMB2 maperror chenxiaosong.chenxiaosong
2025-12-06 15:18 ` [PATCH v4 01/10] smb/client: reduce loop count in map_smb2_to_linux_error() by half chenxiaosong.chenxiaosong
2025-12-06 15:18 ` [PATCH v4 02/10] smb/client: remove unused elements from smb2_error_map_table array chenxiaosong.chenxiaosong
2025-12-06 15:18 ` [PATCH v4 03/10] smb: rename to STATUS_SMB_NO_PREAUTH_INTEGRITY_HASH_OVERLAP chenxiaosong.chenxiaosong
2025-12-06 15:18 ` [PATCH v4 04/10] smb/client: add two elements to smb2_error_map_table array chenxiaosong.chenxiaosong
2025-12-06 15:18 ` chenxiaosong.chenxiaosong [this message]
2025-12-06 15:18 ` [PATCH v4 06/10] smb/client: use bsearch() to find target status code chenxiaosong.chenxiaosong
2025-12-06 15:18 ` [PATCH v4 07/10] smb/client: introduce smb2_get_err_map() chenxiaosong.chenxiaosong
2025-12-06 15:18 ` [PATCH v4 08/10] smb/client: introduce smb2maperror KUnit tests chenxiaosong.chenxiaosong
2025-12-08 21:29 ` kernel test robot
2025-12-09 3:45 ` kernel test robot
2025-12-06 15:18 ` [PATCH v4 09/10] smb/client: update some SMB2 status strings chenxiaosong.chenxiaosong
2025-12-07 17:47 ` Steve French
2025-12-06 15:18 ` [PATCH v4 10/10] smb/server: rename include guard in smb_common.h chenxiaosong.chenxiaosong
2025-12-10 4:29 ` [PATCH v4 00/10] smb: improve search speed of SMB2 maperror ChenXiaoSong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20251206151826.2932970-6-chenxiaosong.chenxiaosong@linux.dev \
--to=chenxiaosong.chenxiaosong@linux.dev \
--cc=chenxiaosong@kylinos.cn \
--cc=huhai@kylinos.cn \
--cc=linkinjeon@kernel.org \
--cc=linkinjeon@samba.org \
--cc=linux-cifs@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=liuyun01@kylinos.cn \
--cc=liuzhengyuan@kylinos.cn \
--cc=sfrench@samba.org \
--cc=smfrench@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).