From nobody Fri Dec 19 20:34:32 2025 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 F04C1179FBA; Sun, 24 Mar 2024 23:40:47 +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=1711323649; cv=none; b=GvK5XA6pyZFdJ5dKFY1iF0yyO2L4R1GPXbSIsLIg9pwu2aQ9uAeD7FBNyvdJKzVrJ8mt5rt2tY7vJD41R2Dgazcd4MQkg3g5TWsYBvt5GyLeBqgRhQdJOrpPDlPeNuDBU01E/+tzneETUay/6qIEELWrizs0eqiMbD+6vHn0wik= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711323649; c=relaxed/simple; bh=rV1Chya9Fs80M7pKnqpi+2koMxxRjn3q/NRZJ9hXBPA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ELg98MuHKge83TQSmiUV32EPvR9pAVkyKuf/r04RkPzTdHiT5sNwKoRP96U+jFHvV4FIoKiG6waMUTpixhB6t3VB5+eBIBgYnmwsBiOqKNfttqbkhFLBCBL1TjpqutioDcEr6KG2OVpRewhjc9wzEk8NXrHsbOoBahDwMaA5yTw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=i/QUK6VT; 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="i/QUK6VT" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 22F8DC43390; Sun, 24 Mar 2024 23:40:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711323647; bh=rV1Chya9Fs80M7pKnqpi+2koMxxRjn3q/NRZJ9hXBPA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=i/QUK6VTo8/QzTfceR9d4rUZkvtx233wHaRlQaaqSWO4W4KjggP8qLxfkjFfGuJgl ARFxTnp2XOwseEFeOnqaO2/JD/Ef0+n74vY06psoC/PsUTHzvYeuehKXphqVBW0ua4 uoipSZL74M7WxZFbUq4X2O3OoVeb8/DhTuoNewAtWTCRM5daAbWLKN3td1mT9QdoCQ ZkH2wr6i5+B9/kFOoAYDIJphRRxtOJAo+qGyd85dQOJ25CXuEztn7M+CCxzWUdJNrW wmEa1wXsA941lpOBi5e0I2B6ssdm4EwDUtFO6g6piEAVJeOXzXyIo3aEJa8nE/iqsA 6RmTXYBl4o9Kw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Mikulas Patocka , Mike Snitzer , Sasha Levin Subject: [PATCH 5.10 019/238] dm-verity, dm-crypt: align "struct bvec_iter" correctly Date: Sun, 24 Mar 2024 19:36:47 -0400 Message-ID: <20240324234027.1354210-20-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240324234027.1354210-1-sashal@kernel.org> References: <20240324234027.1354210-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: quoted-printable Content-Type: text/plain; charset="utf-8" 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 5edcdcee91c23..5deda6c6fa2e7 100644 --- a/drivers/md/dm-crypt.c +++ b/drivers/md/dm-crypt.c @@ -48,11 +48,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 78d1e51195ada..f61c89c79cf5b 100644 --- a/drivers/md/dm-verity.h +++ b/drivers/md/dm-verity.h @@ -74,11 +74,11 @@ struct dm_verity_io { /* original value of bio->bi_end_io */ bio_end_io_t *orig_bi_end_io; =20 + struct bvec_iter iter; + sector_t block; unsigned n_blocks; =20 - struct bvec_iter iter; - struct work_struct work; =20 /* --=20 2.43.0