smb: improve search speed of SMB1 maperror
Get series with b4
b4 am [email protected]Versions newest first · linked by author and title
- v3 Latest13 patches 1 replyIn review
- v212 patches 1 replySuperseded
Changes in v3 from the cover letter
- All test cases passed for v3, please see ChenXiaoSong's blog: https://chenxiaosong.com/en/smb1maperror-test.html
- Patch #01: Correct the SMB1 mapping NT_STATUS_OBJECT_NAME_INVALID
- Patch #02 #10: gen_smb1_mapping: Enhance regex robustness to cover mixed-case prefixes (e.g., ErrNotALink), and match exact filenames to prevent mapping outputs to incorrect files.
- Patch #06: Add __init to DEFINE_CHECK_SORT_FUNC
- Patch #07: Use KUNIT_ASSERT_NOT_NULL
- Add patch #08: Move ERRnetlogonNotStarted to DOS error class
Patches in v3 No applies recorded yet
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/13 | smb/client: annotate nterr.h with DOS error codesfs/ | +534 | 1 reply | |
| 2/13 | smb/client: autogenerate SMB1 NT status to DOS error mappingfs/ fs/ fs/ +2 more | +116 | 0 replies | |
| 3/13 | smb/client: replace nt_errs with ntstatus_to_dos_mapfs/ fs/ fs/ +1 more | +12 | 0 replies | |
| 4/13 | smb/client: refactor ntstatus_to_dos() to return mapping entryfs/ | +19 | 0 replies | |
| 5/13 | smb/client: use binary search for NT status to DOS mappingfs/ | +19 | 0 replies | |
| 6/13 | smb/client: check if ntstatus_to_dos_map is sortedfs/ fs/ fs/ | +39 | 0 replies | |
| 7/13 | smb/client: introduce KUnit test to check ntstatus_to_dos_map searchfs/ fs/ fs/ +2 more | +96 | 0 replies | |
| 8/13 | smb/client: move ERRnetlogonNotStarted to DOS error classfs/ | +1 | 0 replies | |
| 9/13 | smb/client: annotate smberr.h with POSIX error codesfs/ | +256 | 0 replies | |
| 10/13 | smb/client: autogenerate SMB1 DOS/SRV to POSIX error mappingfs/ fs/ fs/ +2 more | +57 | 0 replies | |
| 11/13 | smb/client: use binary search for SMB1 DOS/SRV error mappingfs/ | +37 | 0 replies | |
| 12/13 | smb/client: check if SMB1 DOS/SRV error mapping arrays are sortedfs/ | +12 | 0 replies | |
| 13/13 | smb/client: introduce KUnit tests to check DOS/SRV err mapping searchfs/ fs/ fs/ +1 more | +59 | 0 replies |
Reviews trailers per patch
All 13 patches have a Reviewed-by or Acked-by.
| Patch | ChenXiaoSong |
|---|---|
| 1/13 | R-b |
| 2/13 | R-b |
| 3/13 | R-b |
| 4/13 | R-b |
| 5/13 | R-b |
| 6/13 | R-b |
| 7/13 | R-b |
| 8/13 | R-b |
| 9/13 | R-b |
| 10/13 | R-b |
| 11/13 | R-b |
| 12/13 | R-b |
| 13/13 | R-b |
Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.
Cover letter [PATCH v3 00/13] smb: improve search speed of SMB1 maperror
From: Huiwen He <[email protected]>
v2->v3:
- All test cases passed for v3, please see ChenXiaoSong's blog: https://chenxiaosong.com/en/smb1maperror-test.html
- Patch #01: Correct the SMB1 mapping NT_STATUS_OBJECT_NAME_INVALID
- Patch #02 #10: gen_smb1_mapping: Enhance regex robustness to cover mixed-case prefixes (e.g., ErrNotALink), and match exact filenames to prevent mapping outputs to incorrect files.
- Patch #06: Add __init to DEFINE_CHECK_SORT_FUNC
- Patch #07: Use KUNIT_ASSERT_NOT_NULL
- Add patch #08: Move ERRnetlogonNotStarted to DOS error class
v2: https://lore.kernel.org/linux-cifs/[email protected]/
When searching for the last element, the comparison counts are shown in the table below:
+--------------------+--------+--------+ | |Before |After | | |Patchset|Patchset| +--------------------+--------+--------+ | ntstatus_to_dos_map| 533 | 9 | +--------------------+--------+--------+ |mapping_table_ERRDOS| 34 | 5 | +--------------------+--------+--------+ |mapping_table_ERRSRV| 37 | 5 | +--------------------+--------+--------+
The following patches from v1 have already been merged into the mainline:
- a71a4aab4834 smb/client: add parentheses to NT error code definitions containing bitwise OR operator
- a9adafd40165 smb/client: add 4 NT error code definitions
- 98def4eb0244 smb/server: remove unused nterr.h
- 9f99caa8950a smb/client: fix NT_STATUS_UNABLE_TO_FREE_VM value
- b2b50fca34da smb/client: fix NT_STATUS_DEVICE_DOOR_OPEN value
- a1237c203f17 smb/client: fix NT_STATUS_NO_DATA_DETECTED value
Huiwen He (9):
smb/client: annotate nterr.h with DOS error codes smb/client: autogenerate SMB1 NT status to DOS error mapping smb/client: replace nt_errs with ntstatus_to_dos_map smb/client: refactor ntstatus_to_dos() to return mapping entry smb/client: use binary search for NT status to DOS mapping smb/client: move ERRnetlogonNotStarted to DOS error class smb/client: annotate smberr.h with POSIX error codes smb/client: autogenerate SMB1 DOS/SRV to POSIX error mapping smb/client: use binary search for SMB1 DOS/SRV error mapping
Youling Tang (4):
smb/client: check if ntstatus_to_dos_map is sorted smb/client: introduce KUnit test to check ntstatus_to_dos_map search smb/client: check if SMB1 DOS/SRV error mapping arrays are sorted smb/client: introduce KUnit tests to check DOS/SRV err mapping search
fs/smb/client/.gitignore | 3 + fs/smb/client/Kconfig | 11 + fs/smb/client/Makefile | 25 +- fs/smb/client/cifsfs.c | 6 + fs/smb/client/gen_smb1_mapping | 112 +++ fs/smb/client/nterr.c | 704 ------------------- fs/smb/client/nterr.h | 1082 +++++++++++++++-------------- fs/smb/client/smb1maperror.c | 873 +++++------------------ fs/smb/client/smb1maperror_test.c | 83 +++ fs/smb/client/smb1proto.h | 9 + fs/smb/client/smberr.h | 415 +++++++---- 11 files changed, 1235 insertions(+), 2088 deletions(-) create mode 100644 fs/smb/client/gen_smb1_mapping delete mode 100644 fs/smb/client/nterr.c create mode 100644 fs/smb/client/smb1maperror_test.c
Signature · 1 line
2.53.0