[PATCH] fs: btrfs: Add missing cache aligned allocation

[PATCH] fs: btrfs: Add missing cache aligned allocation

[Marek Vasut]

The superblock buffer must be cache aligned, since it might be used
in DMA context, allocate it using ALLOC_CACHE_ALIGN_BUFFER() just
like it was done in btrfs_read_superblock() and read_tree_node().

This fixes this output on boot and non-working btrfs on iMX53:
CACHE: Misaligned operation at range [ced299d0, ced2a9d0]

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Marek Beh?n <marek.behun@nic.cz>
Cc: Qu Wenruo <wqu@suse.com>
---
 fs/btrfs/disk-io.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index c6fdec95c16..349411c3ccd 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -291,7 +291,7 @@ error_out:
 int btrfs_read_dev_super(struct blk_desc *desc, struct disk_partition *part,
 			 struct btrfs_super_block *sb)
 {
-	char tmp[BTRFS_SUPER_INFO_SIZE];
+	ALLOC_CACHE_ALIGN_BUFFER(char, tmp, BTRFS_SUPER_INFO_SIZE);
 	struct btrfs_super_block *buf = (struct btrfs_super_block *)tmp;
 	int ret;
 
-- 
2.30.2

[PATCH] fs: btrfs: Add missing cache aligned allocation

[Marek Behun]

On Tue, 18 May 2021 00:39:39 +0200
Marek Vasut <marex@denx.de> wrote:

> The superblock buffer must be cache aligned, since it might be used
> in DMA context, allocate it using ALLOC_CACHE_ALIGN_BUFFER() just
> like it was done in btrfs_read_superblock() and read_tree_node().
> 
> This fixes this output on boot and non-working btrfs on iMX53:
> CACHE: Misaligned operation at range [ced299d0, ced2a9d0]
> 
> Signed-off-by: Marek Vasut <marex@denx.de>
> Cc: Marek Beh?n <marek.behun@nic.cz>
> Cc: Qu Wenruo <wqu@suse.com>
> ---

Reviewed-by: Marek Beh?n <marek.behun@nic.cz>

Re: [PATCH] fs: btrfs: Add missing cache aligned allocation

[Tom Rini]

[-- Attachment #1: Type: text/plain, Size: 624 bytes --]

On Tue, May 18, 2021 at 12:39:39AM +0200, Marek Vasut wrote:

> The superblock buffer must be cache aligned, since it might be used
> in DMA context, allocate it using ALLOC_CACHE_ALIGN_BUFFER() just
> like it was done in btrfs_read_superblock() and read_tree_node().
> 
> This fixes this output on boot and non-working btrfs on iMX53:
> CACHE: Misaligned operation at range [ced299d0, ced2a9d0]
> 
> Signed-off-by: Marek Vasut <marex@denx.de>
> Cc: Marek Behún <marek.behun@nic.cz>
> Cc: Qu Wenruo <wqu@suse.com>
> Reviewed-by: Marek Behún <marek.behun@nic.cz>

Applied to u-boot/master, thanks!

-- 
Tom

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]