From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CB0F07F7DD; Sun, 24 Mar 2024 22:48:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711320481; cv=none; b=Edbj5D57ZHVx/ZJ2M9mbtV6tkldDOUZT45OUxe0BrDtHpqM2kmmV7CXoUsQKOKCdV3aqK20DoN/9dD68Qhk5E1X2XvmQZp0zJiCH6yw+Ckzz/hsgF6I0G1g3D28MCd1+eNZExGoXrac9P2D24BxEAsvSbF7x75ozmlPwv7SAZKg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711320481; c=relaxed/simple; bh=TtTemqRxFkxr/MdJnK17D0OUpj5P+8iDtZPeja93eE4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=up+Y7B00D5Ag4496XXvdHKiNd/jsZWFJShZz6PSHeA3Zdw29sjFYiU5cqik/lKtx+cZEZlCx2qR8OnZV/rpRpR/xrjP3DiqTGjtf02pO/gAeF7kdO30zkTaPJdkqBFYxcXfe9NhfPZKbgEmBjK/7W/XYxcyWzBWFepWK9CMNKYA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=pnaAXBi2; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="pnaAXBi2" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 16C1BC433C7; Sun, 24 Mar 2024 22:48:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711320481; bh=TtTemqRxFkxr/MdJnK17D0OUpj5P+8iDtZPeja93eE4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pnaAXBi22vINJP3zfF/62JvGVjrot5nguXtuPVtujRdgDE9SYy9PLxn4SPN0R4bz/ ssxbZrTHH5AvCXjlMYQXFtp6chZkqqJN2M9v3gGuNnZ2b5PfbfgbtwYpJgQWZ6XGIi JaAWhLTINc59b5lm2VPg6uUkUA+HZhh1gHDjl5H34UMPbTnWhiaVEiDkolhSEc32eJ WdtA8UB1DYni4t2/c1bhW7KjzwGCl8rOAxD3i6s4che93HxEsSGz3VFM9CoG1k2MNP EMP4nJKMaDU8PMGDSDuZzGtBhD9vyhJc4y/E2xR3Sxi+whijbRLwqPVr6TMkcPd0Og j1bRIeDrK8b3w== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Mikulas Patocka , Mike Snitzer , Sasha Levin Subject: [PATCH 6.7 041/713] dm-verity, dm-crypt: align "struct bvec_iter" correctly Date: Sun, 24 Mar 2024 18:36:07 -0400 Message-ID: <20240324224720.1345309-42-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240324224720.1345309-1-sashal@kernel.org> References: <20240324224720.1345309-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit From: Mikulas Patocka [ 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 Signed-off-by: Mike Snitzer Signed-off-by: Sasha Levin --- drivers/md/dm-crypt.c | 4 ++-- drivers/md/dm-verity.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c index 4ab4e8dcfd3e2..35f50193959e0 100644 --- a/drivers/md/dm-crypt.c +++ b/drivers/md/dm-crypt.c @@ -53,11 +53,11 @@ struct convert_context { struct completion restart; struct bio *bio_in; - struct bio *bio_out; struct bvec_iter iter_in; + struct bio *bio_out; struct bvec_iter iter_out; - u64 cc_sector; atomic_t cc_pending; + u64 cc_sector; union { struct skcipher_request *req; struct aead_request *req_aead; diff --git a/drivers/md/dm-verity.h b/drivers/md/dm-verity.h index 4620a98c99561..db93a91169d5e 100644 --- a/drivers/md/dm-verity.h +++ b/drivers/md/dm-verity.h @@ -80,12 +80,12 @@ struct dm_verity_io { /* original value of bio->bi_end_io */ bio_end_io_t *orig_bi_end_io; + struct bvec_iter iter; + sector_t block; unsigned int n_blocks; bool in_tasklet; - struct bvec_iter iter; - struct work_struct work; char *recheck_buffer; -- 2.43.0