Linux CIFS filesystem development
 help / color / mirror / Atom feed
From: chenxiaosong.chenxiaosong@linux.dev
To: smfrench@gmail.com, linkinjeon@kernel.org, pc@manguebit.org,
	ronniesahlberg@gmail.com, sprasad@microsoft.com, tom@talpey.com,
	bharathsm@microsoft.com, senozhatsky@chromium.org,
	dhowells@redhat.com
Cc: linux-cifs@vger.kernel.org, ChenXiaoSong <chenxiaosong@kylinos.cn>
Subject: [PATCH v8 4/5] smb/client: use bsearch() to find target in smb2_error_map_table
Date: Tue,  6 Jan 2026 15:15:06 +0800	[thread overview]
Message-ID: <20260106071507.1420900-5-chenxiaosong.chenxiaosong@linux.dev> (raw)
In-Reply-To: <20260106071507.1420900-1-chenxiaosong.chenxiaosong@linux.dev>

From: ChenXiaoSong <chenxiaosong@kylinos.cn>

The smb2_error_map_table array currently has 1740 elements. When searching
for the last element, the original loop-based search method requires 1740
comparisons, while binary search algorithm requires only 10 comparisons.

Suggested-by: David Howells <dhowells@redhat.com>
Signed-off-by: ChenXiaoSong <chenxiaosong@kylinos.cn>
---
 fs/smb/client/smb2maperror.c | 46 ++++++++++++++++++++++++++----------
 1 file changed, 34 insertions(+), 12 deletions(-)

diff --git a/fs/smb/client/smb2maperror.c b/fs/smb/client/smb2maperror.c
index c36cfe707bf1..090bbd10623d 100644
--- a/fs/smb/client/smb2maperror.c
+++ b/fs/smb/client/smb2maperror.c
@@ -30,13 +30,36 @@ static const struct status_to_posix_error smb2_error_map_table[] = {
 #include "smb2_mapping_table.c"
 };
 
+static __always_inline int cmp_smb2_status(const void *_key, const void *_pivot)
+{
+	__u32 key = *(__u32 *)_key;
+	const struct status_to_posix_error *pivot = _pivot;
+
+	if (key < pivot->smb2_status)
+		return -1;
+	if (key > pivot->smb2_status)
+		return 1;
+	return 0;
+}
+
+static const struct status_to_posix_error *smb2_get_err_map(__u32 smb2_status)
+{
+	const struct status_to_posix_error *err_map;
+
+	err_map = __inline_bsearch(&smb2_status, smb2_error_map_table,
+				   ARRAY_SIZE(smb2_error_map_table),
+				   sizeof(struct status_to_posix_error),
+				   cmp_smb2_status);
+	return err_map;
+}
+
 int
 map_smb2_to_linux_error(char *buf, bool log_err)
 {
 	struct smb2_hdr *shdr = (struct smb2_hdr *)buf;
-	unsigned int i;
 	int rc = -EIO;
 	__le32 smb2err = shdr->Status;
+	const struct status_to_posix_error *err_map;
 
 	if (smb2err == 0) {
 		trace_smb3_cmd_done(le32_to_cpu(shdr->Id.SyncId.TreeId),
@@ -50,21 +73,20 @@ map_smb2_to_linux_error(char *buf, bool log_err)
 		   (smb2err != STATUS_END_OF_FILE)) ||
 		  (cifsFYI & CIFS_RC);
 
-	for (i = 0; i < sizeof(smb2_error_map_table) /
-			sizeof(struct status_to_posix_error); i++) {
-		if (smb2_error_map_table[i].smb2_status == smb2err) {
-			if (log_err)
-				pr_notice("Status code returned 0x%08x %s\n", smb2err,
-					  smb2_error_map_table[i].status_string);
-			rc = smb2_error_map_table[i].posix_error;
-			break;
-		}
-	}
+	err_map = smb2_get_err_map(le32_to_cpu(smb2err));
+	if (!err_map)
+		goto out;
+
+	rc = err_map->posix_error;
+	if (log_err)
+		pr_notice("Status code returned 0x%08x %s\n",
+			  err_map->smb2_status, err_map->status_string);
 
+out:
 	/* on error mapping not found  - return EIO */
 
 	cifs_dbg(FYI, "Mapping SMB2 status code 0x%08x to POSIX err %d\n",
-		 __le32_to_cpu(smb2err), rc);
+		 le32_to_cpu(smb2err), rc);
 
 	trace_smb3_cmd_err(le32_to_cpu(shdr->Id.SyncId.TreeId),
 			   le64_to_cpu(shdr->SessionId),
-- 
2.43.0


  parent reply	other threads:[~2026-01-06  7:16 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-01-06  7:15 [PATCH v8 0/5] smb: improve search speed of SMB2 maperror chenxiaosong.chenxiaosong
2026-01-06  7:15 ` [PATCH v8 1/5] cifs: Label SMB2 statuses with errors chenxiaosong.chenxiaosong
2026-01-06  7:15 ` [PATCH v8 2/5] cifs: Autogenerate SMB2 error mapping table chenxiaosong.chenxiaosong
2026-01-16  8:14   ` ChenXiaoSong
2026-01-16 13:48   ` Aurélien Aptel
2026-01-16 14:30     ` ChenXiaoSong
2026-01-16 14:51     ` ChenXiaoSong
2026-01-06  7:15 ` [PATCH v8 3/5] smb/client: check whether smb2_error_map_table is sorted in ascending order chenxiaosong.chenxiaosong
2026-01-06  7:15 ` chenxiaosong.chenxiaosong [this message]
2026-01-06  7:15 ` [PATCH v8 5/5] smb/client: introduce KUnit test to check search result of smb2_error_map_table chenxiaosong.chenxiaosong
2026-01-06  9:34 ` [PATCH v8 0/5] smb: improve search speed of SMB2 maperror David Howells

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=20260106071507.1420900-5-chenxiaosong.chenxiaosong@linux.dev \
    --to=chenxiaosong.chenxiaosong@linux.dev \
    --cc=bharathsm@microsoft.com \
    --cc=chenxiaosong@kylinos.cn \
    --cc=dhowells@redhat.com \
    --cc=linkinjeon@kernel.org \
    --cc=linux-cifs@vger.kernel.org \
    --cc=pc@manguebit.org \
    --cc=ronniesahlberg@gmail.com \
    --cc=senozhatsky@chromium.org \
    --cc=smfrench@gmail.com \
    --cc=sprasad@microsoft.com \
    --cc=tom@talpey.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