Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp2467882pxj; Mon, 10 May 2021 03:49:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyx4/C6XPSOmlZx4j8cB5cG77jyJ7J6V3+z/sypuAMrLlbWuHZlTnVLcRYRIq7+vur9NTus X-Received: by 2002:a05:6638:29a:: with SMTP id c26mr21069036jaq.135.1620643790665; Mon, 10 May 2021 03:49:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620643790; cv=none; d=google.com; s=arc-20160816; b=v181ZMBvM73vNWso0qW0+7AKZxuKYvC13WJJHWd8Wj9hopfdHfCFWC0rItG1Thkdg8 +pVYCt1v0XjCUSWXs2o7Pg9szaq01RyWQwdsq0gc2FCTRPGiY6gtyD6PL+g0LT28+j8v APDkSR09M5Fkc+QJdd2zC22QPO71LjlBG0+oGrhDysxNx3PZMmdy18T9qjfnTLOGJNpy CQfVWCHIIq5RBuYT4EnBQgIBR0+ue8EarZzrheyf/VfPL2zvF9iR3pzexzVV6qmx8D/d 6vRNWAgVxHWqdslPydk6VoTakmbpFOqpUcwhFfRC/eE2hSjbLpkrJlynFZnSQc04tX/C uxnQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=1Aj37FeapDUP81hqzCDaNIVRtvMlz86FgQmp1M9p6W8=; b=d4CfRyF11kJfTTyyeEkZu4Ge3wEGA6Rd0Xr0vuBBzECdd1GSligOwZv/q+tomAj9Mh VGMoQT7DDMnMnc5dNkLefQVJYy+Fuv4f4WcnPyL3cp742Jwyhev4keXvdGeLDdNsk1Ny 3yp2GmTqOvMLA5AfXdnO4qka8HT6GWLeOt4JFYUuOzbpLphNFrpuAlbKvz2BP6Hvtu+k lZfLUSbcfrUacAbwnMlSHSqvl5yY6oRWs8ulT+V0v1SSZxXIOccXGtMzsu1jcdXWRiaG 9t5ZEqXg0LGJTXQU0V7wti0y2ceyCQVZayAvJy2vzv6i9do1BpaWfe3+WyjDCJRAEPvt MmlQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=d6TLQ2tD; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id t4si18095629iom.3.2021.05.10.03.49.37; Mon, 10 May 2021 03:49:50 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=d6TLQ2tD; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231713AbhEJKsa (ORCPT + 99 others); Mon, 10 May 2021 06:48:30 -0400 Received: from mail.kernel.org ([198.145.29.99]:48980 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232753AbhEJKkA (ORCPT ); Mon, 10 May 2021 06:40:00 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id CF95F61959; Mon, 10 May 2021 10:30:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1620642652; bh=Iu+n9JsXKTp3CbzqBVUQxZ1DMRkaPClel+mrPh+YlV4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=d6TLQ2tDKJqYQwkUk1LEDMT0eCkuWi7gLhPAWRZ1eJxfZ4m6KQtyMnOXeIpIkSTWr NFpIzZEyeVmcGLGImzEaHc561L4PDy80x2FGzVGe7qm0fclU4NuDiKpZbezHmxbLZo OwITwbffDE/P5tCZebdq1SyB7yHkNS1lbjy7uYSQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Joe Thornber , Mike Snitzer Subject: [PATCH 5.4 181/184] dm persistent data: packed struct should have an aligned() attribute too Date: Mon, 10 May 2021 12:21:15 +0200 Message-Id: <20210510101956.049174862@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210510101950.200777181@linuxfoundation.org> References: <20210510101950.200777181@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Joe Thornber commit a88b2358f1da2c9f9fcc432f2e0a79617fea397c upstream. Otherwise most non-x86 architectures (e.g. riscv, arm) will resort to byte-by-byte access. Cc: stable@vger.kernel.org Signed-off-by: Joe Thornber Signed-off-by: Mike Snitzer Signed-off-by: Greg Kroah-Hartman --- drivers/md/persistent-data/dm-btree-internal.h | 4 ++-- drivers/md/persistent-data/dm-space-map-common.h | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) --- a/drivers/md/persistent-data/dm-btree-internal.h +++ b/drivers/md/persistent-data/dm-btree-internal.h @@ -34,12 +34,12 @@ struct node_header { __le32 max_entries; __le32 value_size; __le32 padding; -} __packed; +} __attribute__((packed, aligned(8))); struct btree_node { struct node_header header; __le64 keys[0]; -} __packed; +} __attribute__((packed, aligned(8))); /* --- a/drivers/md/persistent-data/dm-space-map-common.h +++ b/drivers/md/persistent-data/dm-space-map-common.h @@ -33,7 +33,7 @@ struct disk_index_entry { __le64 blocknr; __le32 nr_free; __le32 none_free_before; -} __packed; +} __attribute__ ((packed, aligned(8))); #define MAX_METADATA_BITMAPS 255 @@ -43,7 +43,7 @@ struct disk_metadata_index { __le64 blocknr; struct disk_index_entry index[MAX_METADATA_BITMAPS]; -} __packed; +} __attribute__ ((packed, aligned(8))); struct ll_disk; @@ -86,7 +86,7 @@ struct disk_sm_root { __le64 nr_allocated; __le64 bitmap_root; __le64 ref_count_root; -} __packed; +} __attribute__ ((packed, aligned(8))); #define ENTRIES_PER_BYTE 4 @@ -94,7 +94,7 @@ struct disk_bitmap_header { __le32 csum; __le32 not_used; __le64 blocknr; -} __packed; +} __attribute__ ((packed, aligned(8))); enum allocation_event { SM_NONE,