xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dm-verity, dm-crypt: align "struct bvec_iter" correctly

Browse Source 
[ Upstream commit 787f1b2800464aa277236a66eb3c279535edd460 ]

"struct bvec_iter" is defined with the __packed attribute, so it is
aligned on a single byte. On X86 (and on other architectures that support
unaligned addresses in hardware), "struct bvec_iter" is accessed using the
8-byte and 4-byte memory instructions, however these instructions are less
efficient if they operate on unaligned addresses.

(on RISC machines that don't have unaligned access in hardware, GCC
generates byte-by-byte accesses that are very inefficient - see [1])

This commit reorders the entries in "struct dm_verity_io" and "struct
convert_context", so that "struct bvec_iter" is aligned on 8 bytes.

[1] https://lore.kernel.org/all/ZcLuWUNRZadJr0tQ@fedora/T/

Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
Signed-off-by: Mike Snitzer <snitzer@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Mikulas Patocka
2024-02-20 19:11:51 +01:00
committed by Sasha Levin
parent 87221877ed
commit e30b8525e1
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/md/dm-crypt.c
View File

@@ -48,11 +48,11 @@
struct convert_context { struct convert_context {
struct completion restart; struct completion restart;
struct bio *bio_in; struct bio *bio_in;
struct bio *bio_out;
struct bvec_iter iter_in; struct bvec_iter iter_in;
struct bio *bio_out;
struct bvec_iter iter_out; struct bvec_iter iter_out;
u64 cc_sector;
atomic_t cc_pending; atomic_t cc_pending;
u64 cc_sector;
union { union {
struct skcipher_request *req; struct skcipher_request *req;
struct aead_request *req_aead; struct aead_request *req_aead;

4
drivers/md/dm-verity.h
View File

@@ -74,11 +74,11 @@ struct dm_verity_io {
/* original value of bio->bi_end_io */ /* original value of bio->bi_end_io */
bio_end_io_t *orig_bi_end_io; bio_end_io_t *orig_bi_end_io;
struct bvec_iter iter;
sector_t block; sector_t block;
unsigned n_blocks; unsigned n_blocks;
struct bvec_iter iter;
struct work_struct work; struct work_struct work;
/* /*