linux-cifs.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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 08/30] smb/client: sort ntstatus_to_dos_map array
Date: Mon,  8 Dec 2025 14:20:38 +0800	[thread overview]
Message-ID: <20251208062100.3268777-9-chenxiaosong.chenxiaosong@linux.dev> (raw)
In-Reply-To: <20251208062100.3268777-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 NT error code.

The array is sorted only once in smb1_init_maperror() when cifs.ko
is loaded.

Signed-off-by: ChenXiaoSong <chenxiaosong@kylinos.cn>
---
 fs/smb/client/cifsfs.c    |  2 ++
 fs/smb/client/cifsproto.h |  1 +
 fs/smb/client/netmisc.c   | 20 ++++++++++++++++++--
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/fs/smb/client/cifsfs.c b/fs/smb/client/cifsfs.c
index 77d14b3dd650..3e3affce585e 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 "cifsproto.h"
 #include "smb2proto.h"
 
 /*
@@ -1909,6 +1910,7 @@ static int __init
 init_cifs(void)
 {
 	int rc = 0;
+	smb_init_maperror();
 	smb2_init_maperror();
 	cifs_proc_init();
 	INIT_LIST_HEAD(&cifs_tcp_ses_list);
diff --git a/fs/smb/client/cifsproto.h b/fs/smb/client/cifsproto.h
index 3528c365a452..675413d701b3 100644
--- a/fs/smb/client/cifsproto.h
+++ b/fs/smb/client/cifsproto.h
@@ -188,6 +188,7 @@ extern int cifs_convert_address(struct sockaddr *dst, const char *src, int len);
 extern void cifs_set_port(struct sockaddr *addr, const unsigned short int port);
 extern int map_smb_to_linux_error(char *buf, bool logErr);
 extern int map_and_check_smb_error(struct mid_q_entry *mid, bool logErr);
+extern void smb_init_maperror(void);
 extern void header_assemble(struct smb_hdr *, char /* command */ ,
 			    const struct cifs_tcon *, int /* length of
 			    fixed section (word count) in two byte units */);
diff --git a/fs/smb/client/netmisc.c b/fs/smb/client/netmisc.c
index 73c40ae91607..54ede1db2c7f 100644
--- a/fs/smb/client/netmisc.c
+++ b/fs/smb/client/netmisc.c
@@ -16,6 +16,7 @@
 #include <asm/div64.h>
 #include <asm/byteorder.h>
 #include <linux/inet.h>
+#include <linux/sort.h>
 #include "cifsfs.h"
 #include "cifspdu.h"
 #include "cifsglob.h"
@@ -216,11 +217,13 @@ cifs_set_port(struct sockaddr *addr, const unsigned short int port)
 convert a NT status code to a dos class/code
  *****************************************************************************/
 /* NT status -> dos error map */
-static const struct {
+struct ntstatus_to_dos {
 	__u8 dos_class;
 	__u16 dos_code;
 	__u32 ntstatus;
-} ntstatus_to_dos_map[] = {
+};
+
+static struct ntstatus_to_dos ntstatus_to_dos_map[] = {
 	{
 	ERRDOS, ERRgeneral, NT_STATUS_UNSUCCESSFUL}, {
 	ERRDOS, ERRbadfunc, NT_STATUS_NOT_IMPLEMENTED}, {
@@ -778,6 +781,12 @@ static const struct {
 	0, 0, 0 }
 };
 
+static unsigned int ntstatus_to_dos_num = sizeof(ntstatus_to_dos_map) /
+					  sizeof(struct ntstatus_to_dos);
+
+/* cmp_ntstatus_to_dos */
+DEFINE_CMP_FUNC(ntstatus_to_dos, ntstatus);
+
 /*****************************************************************************
  Print an error message from the status code
  *****************************************************************************/
@@ -1040,3 +1049,10 @@ struct timespec64 cnvrtDosUnixTm(__le16 le_date, __le16 le_time, int offset)
 	ts.tv_nsec = 0;
 	return ts;
 }
+
+void smb_init_maperror(void)
+{
+	/* Sort in ascending order */
+	sort(ntstatus_to_dos_map, ntstatus_to_dos_num,
+	     sizeof(struct ntstatus_to_dos), cmp_ntstatus_to_dos, NULL);
+}
-- 
2.43.0


  parent reply	other threads:[~2025-12-08  6:22 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-12-08  6:20 [PATCH 00/30] smb: improve search speed of SMB1 maperror chenxiaosong.chenxiaosong
2025-12-08  6:20 ` [PATCH 01/30] smb/client: fix NT_STATUS_NO_DATA_DETECTED value chenxiaosong.chenxiaosong
2025-12-09  0:17   ` ChenXiaoSong
2025-12-09  0:29     ` Steve French
2025-12-09  0:45       ` ChenXiaoSong
2025-12-08  6:20 ` [PATCH 02/30] smb/client: fix NT_STATUS_DEVICE_DOOR_OPEN value chenxiaosong.chenxiaosong
2025-12-08  6:20 ` [PATCH 03/30] smb/client: fix NT_STATUS_UNABLE_TO_FREE_VM value chenxiaosong.chenxiaosong
2025-12-08  6:20 ` [PATCH 04/30] smb/server: remove unused nterr.h chenxiaosong.chenxiaosong
2025-12-08  6:20 ` [PATCH 05/30] smb/client: add 4 NT error code definitions chenxiaosong.chenxiaosong
2025-12-08  6:20 ` [PATCH 06/30] smb/client: add parentheses to NT error code definitions containing bitwise OR operator chenxiaosong.chenxiaosong
2025-12-08  6:20 ` [PATCH 07/30] smb/client: introduce DEFINE_CMP_FUNC() chenxiaosong.chenxiaosong
2025-12-08  6:20 ` chenxiaosong.chenxiaosong [this message]
2025-12-08  6:20 ` [PATCH 09/30] smb/client: create netmisc_test.c and introduce DEFINE_CHECK_SORT_FUNC() chenxiaosong.chenxiaosong
2025-12-08  6:20 ` [PATCH 10/30] smb/client: introduce KUnit test to check sort result of ntstatus_to_dos_map array chenxiaosong.chenxiaosong
2025-12-08  6:20 ` [PATCH 11/30] smb/client: introduce DEFINE_SEARCH_FUNC() chenxiaosong.chenxiaosong
2025-12-08  6:20 ` [PATCH 12/30] smb/client: use bsearch() to find target in ntstatus_to_dos_map array chenxiaosong.chenxiaosong
2025-12-08  6:20 ` [PATCH 13/30] smb/client: remove useless elements from " chenxiaosong.chenxiaosong
2025-12-08  6:20 ` [PATCH 14/30] smb/client: introduce DEFINE_CHECK_SEARCH_FUNC() chenxiaosong.chenxiaosong
2025-12-08  6:20 ` [PATCH 15/30] smb/client: introduce KUnit test to check search result of ntstatus_to_dos_map array chenxiaosong.chenxiaosong
2025-12-08  6:20 ` [PATCH 16/30] smb/client: sort nt_errs array chenxiaosong.chenxiaosong
2025-12-08  6:20 ` [PATCH 17/30] smb/client: introduce KUnit test to check sort result of " chenxiaosong.chenxiaosong
2025-12-08  6:20 ` [PATCH 18/30] smb/client: use bsearch() to find target in " chenxiaosong.chenxiaosong
2025-12-08  6:20 ` [PATCH 19/30] smb/client: remove useless elements from " chenxiaosong.chenxiaosong
2025-12-08  6:20 ` [PATCH 20/30] smb/client: introduce KUnit test to check search result of " chenxiaosong.chenxiaosong
2025-12-08  6:20 ` [PATCH 21/30] smb/client: sort mapping_table_ERRDOS array chenxiaosong.chenxiaosong
2025-12-08  6:20 ` [PATCH 22/30] smb/client: introduce KUnit test to check sort result of " chenxiaosong.chenxiaosong
2025-12-08  6:20 ` [PATCH 23/30] smb/client: use bsearch() to find target in " chenxiaosong.chenxiaosong
2025-12-08  6:20 ` [PATCH 24/30] smb/client: remove useless elements from " chenxiaosong.chenxiaosong
2025-12-08  6:20 ` [PATCH 25/30] smb/client: introduce KUnit test to check search result of " chenxiaosong.chenxiaosong
2025-12-08  6:20 ` [PATCH 26/30] smb/client: sort mapping_table_ERRSRV array chenxiaosong.chenxiaosong
2025-12-08  6:20 ` [PATCH 27/30] smb/client: introduce KUnit test to check sort result of " chenxiaosong.chenxiaosong
2025-12-08  6:20 ` [PATCH 28/30] smb/client: use bsearch() to find target in " chenxiaosong.chenxiaosong
2025-12-08  6:20 ` [PATCH 29/30] smb/client: remove useless elements from " chenxiaosong.chenxiaosong
2025-12-08  6:21 ` [PATCH 30/30] smb/client: introduce KUnit test to check search result of " chenxiaosong.chenxiaosong
2025-12-09 23:41 ` [PATCH 00/30] smb: improve search speed of SMB1 maperror Steve French
2025-12-10  2:48   ` ChenXiaoSong
2025-12-10  4:32 ` 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=20251208062100.3268777-9-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).