public inbox for linux-cifs@vger.kernel.org
 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 v6 4/5] smb/client: use bsearch() to find target in smb2_error_map_table
Date: Thu, 25 Dec 2025 10:10:34 +0800	[thread overview]
Message-ID: <20251225021035.656639-5-chenxiaosong.chenxiaosong@linux.dev> (raw)
In-Reply-To: <20251225021035.656639-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, 35 insertions(+), 11 deletions(-)

diff --git a/fs/smb/client/smb2maperror.c b/fs/smb/client/smb2maperror.c
index 3731e32c22a3..b0241e6adbb6 100644
--- a/fs/smb/client/smb2maperror.c
+++ b/fs/smb/client/smb2maperror.c
@@ -27,13 +27,38 @@ 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 *_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;
+}
+
+static struct status_to_posix_error *smb2_get_err_map(__le32 smb2_status)
+{
+	struct status_to_posix_error *err_map, key;
+
+	key = (struct status_to_posix_error) {
+		.smb2_status = smb2_status,
+	};
+	err_map = __inline_bsearch(&key, 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;
+	struct status_to_posix_error *err_map;
 
 	if (smb2err == 0) {
 		trace_smb3_cmd_done(le32_to_cpu(shdr->Id.SyncId.TreeId),
@@ -47,17 +72,16 @@ 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(smb2err);
+	if (!err_map)
+		goto out;
+
+	rc = err_map->posix_error;
+	if (log_err)
+		pr_notice("Status code returned 0x%08x %s\n", smb2err,
+			  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",
-- 
2.43.0


  parent reply	other threads:[~2025-12-25  2:11 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-12-25  2:10 [PATCH v6 0/5] smb: improve search speed of SMB2 maperror chenxiaosong.chenxiaosong
2025-12-25  2:10 ` [PATCH v6 1/5] cifs: Label SMB2 statuses with errors chenxiaosong.chenxiaosong
2025-12-25  2:10 ` [PATCH v6 2/5] cifs: Autogenerate SMB2 error mapping table chenxiaosong.chenxiaosong
2025-12-27 10:53   ` ChenXiaoSong
2025-12-27 12:00     ` David Howells
2025-12-27 15:03       ` ChenXiaoSong
2025-12-27 15:50         ` David Howells
2025-12-27 16:05           ` ChenXiaoSong
2025-12-30  9:42             ` ChenXiaoSong
2025-12-30 21:08               ` David Howells
2025-12-30 21:14               ` David Howells
2025-12-30  3:55   ` ChenXiaoSong
2025-12-30  9:07     ` David Howells
2025-12-25  2:10 ` [PATCH v6 3/5] smb/client: check whether smb2_error_map_table is sorted in ascending order chenxiaosong.chenxiaosong
2025-12-25  2:10 ` chenxiaosong.chenxiaosong [this message]
2025-12-26 11:58   ` [PATCH v6 4/5] smb/client: use bsearch() to find target in smb2_error_map_table David Howells
2025-12-26 12:06   ` David Howells
2025-12-26 15:28     ` ChenXiaoSong
2025-12-27  2:18       ` ChenXiaoSong
2025-12-27  8:56         ` David Howells
2025-12-27  9:29           ` ChenXiaoSong
2025-12-27 11:59             ` David Howells
2025-12-27  8:53       ` David Howells
2025-12-25  2:10 ` [PATCH v6 5/5] smb/client: introduce KUnit test to check search result of smb2_error_map_table chenxiaosong.chenxiaosong
2025-12-28 15:07   ` kernel test robot

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=20251225021035.656639-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