Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp2557146pxj; Mon, 10 May 2021 05:53:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwTbLemm6LUDSbBhDZTUyamvccoXYlarMoGxZHdNvTZYpSTt+MX/v4KicV7b/0ystVPkK/B X-Received: by 2002:a05:6402:1052:: with SMTP id e18mr11811652edu.366.1620651208839; Mon, 10 May 2021 05:53:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620651208; cv=none; d=google.com; s=arc-20160816; b=bb170xMq5KvwwVWN8NAlQ0fiAnSvq5x0eP7ZF0L4ChANEXx45cDghtV3vvIstUALZL oYUhaT5Qwb+GZm+2HFmsDPZoZdWu8Rrq+mPQvSW4APH5MMQlFxVFJJUIk154nplCB3WE DM6D6X9ojAFqH51Ep29ymbtYQgXOZJJ5cXQvYawq7zKYbmCgIwAgx4VtxDSC6I841Spy 6s+TUqwnEmf4HHso4+wMgyDkNAn0EhdCojoegtScQJPbrAc38BMKZcAZjpzLR6T9V+YK P/0zLdiNRVAPN6xCBPGjGw2UnuW5yjQTFhHKiOtwuCgrk3LmfUBuTlzTWku4ThGjPRhQ BUxw== 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=+rRvaC4cH2EqxKIUTV+uJLnMn706AQxsRsciOpYFR9k=; b=SrnHGhTu+MZ6DL6lmESX1EbTc3eYKQCNe/faw0j5u2/5mE5hfz2FbsLxrPn+eurnhf hMgpUebqx6sHTqylW6OcdQKdxPdeCxXmy5dmPTO6XwL2zoVbIABtOtLl/lTZqqj9vgg0 V33Z8H0pfA+/hvvFY90OSIjuIpC2VwyecZDPiSdrPH62po0JTkmuFGDSjziGuOLRvBuV +FCVoUnEH7qVi8PJM1d10YRl2iSvB5FqvJrWNh1xs40rUijeOhMRi78AmhzRcEMl4rOn e5R/ueviyY4MdavF0TRj08/jZ6SwK5lL3sP0tLRXD+BnugXAPYr5VjHKNxtYePgcHHjF PCuQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=vLHa3AAQ; 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 v27si13925370eja.157.2021.05.10.05.53.04; Mon, 10 May 2021 05:53:28 -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=vLHa3AAQ; 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 S1348595AbhEJMqP (ORCPT + 99 others); Mon, 10 May 2021 08:46:15 -0400 Received: from mail.kernel.org ([198.145.29.99]:35184 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238359AbhEJLR3 (ORCPT ); Mon, 10 May 2021 07:17:29 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id A117361139; Mon, 10 May 2021 11:13:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1620645196; bh=Ll8FqHKYmyisncPLSUPpnG4ut9uGKguVRFBpQkyUufk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vLHa3AAQYCzrePcYOYyP3RyarbnaAL8z4viV8dx8AX3iuQgyMG4aZ8v8XdGTYeaPa Kbs1I6NETfvqeBH+++GJLmY9Dx1x8dFbGZe9X+C+QIXv+q5WZ8sk6NOFEdVEQMHXix rrPObn7wdtKQVpGEVlkdcElEQRMXDMaFN0MmhrFA= 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.12 376/384] dm persistent data: packed struct should have an aligned() attribute too Date: Mon, 10 May 2021 12:22:45 +0200 Message-Id: <20210510102027.171009767@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210510102014.849075526@linuxfoundation.org> References: <20210510102014.849075526@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[]; -} __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,