From: Sergei Trofimovich <slyfox@gentoo.org> To: "Martin K. Petersen" <martin.petersen@oracle.com>, Arnd Bergmann <arnd@kernel.org>, John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>, Don Brace <don.brace@microchip.com>, linux-ia64@vger.kernel.org, storagedev@microchip.com, linux-scsi <linux-scsi@vger.kernel.org>, jszczype@redhat.com, Scott Benesh <scott.benesh@microchip.com>, Scott Teel <scott.teel@microchip.com>, thenzl@redhat.com Cc: linux-kernel@vger.kernel.org, Sergei Trofimovich <slyfox@gentoo.org> Subject: [PATCH v2 3/3] hpsa: add an assert to prevent from __packed reintroduction Date: Tue, 30 Mar 2021 08:19:58 +0100 [thread overview] Message-ID: <20210330071958.3788214-3-slyfox@gentoo.org> (raw) In-Reply-To: <20210330071958.3788214-1-slyfox@gentoo.org> CC: linux-ia64@vger.kernel.org CC: storagedev@microchip.com CC: linux-scsi@vger.kernel.org CC: Joe Szczypek <jszczype@redhat.com> CC: Scott Benesh <scott.benesh@microchip.com> CC: Scott Teel <scott.teel@microchip.com> CC: Tomas Henzl <thenzl@redhat.com> CC: "Martin K. Petersen" <martin.petersen@oracle.com> CC: Don Brace <don.brace@microchip.com> Reported-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de> Suggested-by: Don Brace <don.brace@microchip.com> Fixes: f749d8b7a "scsi: hpsa: Correct dev cmds outstanding for retried cmds" Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org> --- drivers/scsi/hpsa_cmd.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/drivers/scsi/hpsa_cmd.h b/drivers/scsi/hpsa_cmd.h index 885b1f1fb20a..ba6a3aa8d954 100644 --- a/drivers/scsi/hpsa_cmd.h +++ b/drivers/scsi/hpsa_cmd.h @@ -22,6 +22,9 @@ #include <linux/compiler.h> +#include <linux/build_bug.h> /* static_assert */ +#include <linux/stddef.h> /* offsetof */ + /* general boundary defintions */ #define SENSEINFOBYTES 32 /* may vary between hbas */ #define SG_ENTRIES_IN_CMD 32 /* Max SG entries excluding chain blocks */ @@ -454,6 +457,15 @@ struct CommandList { atomic_t refcount; /* Must be last to avoid memset in hpsa_cmd_init() */ } __aligned(COMMANDLIST_ALIGNMENT); +/* + * Make sure our embedded atomic variable is aligned. Otherwise we break atomic + * operations on architectures that don't support unaligned atomics like IA64. + * + * The assert guards against reintroductin against unwanted __packed to + * the struct CommandList. + */ +static_assert(offsetof(struct CommandList, refcount) % __alignof__(atomic_t) == 0); + /* Max S/G elements in I/O accelerator command */ #define IOACCEL1_MAXSGENTRIES 24 #define IOACCEL2_MAXSGENTRIES 28 -- 2.31.1
WARNING: multiple messages have this Message-ID (diff)
From: Sergei Trofimovich <slyfox@gentoo.org> To: "Martin K. Petersen" <martin.petersen@oracle.com>, Arnd Bergmann <arnd@kernel.org>, John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>, Don Brace <don.brace@microchip.com>, linux-ia64@vger.kernel.org, storagedev@microchip.com, linux-scsi <linux-scsi@vger.kernel.org>, jszczype@redhat.com, Scott Benesh <scott.benesh@microchip.com>, Scott Teel <scott.teel@microchip.com>, thenzl@redhat.com Cc: linux-kernel@vger.kernel.org, Sergei Trofimovich <slyfox@gentoo.org> Subject: [PATCH v2 3/3] hpsa: add an assert to prevent from __packed reintroduction Date: Tue, 30 Mar 2021 07:19:58 +0000 [thread overview] Message-ID: <20210330071958.3788214-3-slyfox@gentoo.org> (raw) In-Reply-To: <20210330071958.3788214-1-slyfox@gentoo.org> CC: linux-ia64@vger.kernel.org CC: storagedev@microchip.com CC: linux-scsi@vger.kernel.org CC: Joe Szczypek <jszczype@redhat.com> CC: Scott Benesh <scott.benesh@microchip.com> CC: Scott Teel <scott.teel@microchip.com> CC: Tomas Henzl <thenzl@redhat.com> CC: "Martin K. Petersen" <martin.petersen@oracle.com> CC: Don Brace <don.brace@microchip.com> Reported-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de> Suggested-by: Don Brace <don.brace@microchip.com> Fixes: f749d8b7a "scsi: hpsa: Correct dev cmds outstanding for retried cmds" Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org> --- drivers/scsi/hpsa_cmd.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/drivers/scsi/hpsa_cmd.h b/drivers/scsi/hpsa_cmd.h index 885b1f1fb20a..ba6a3aa8d954 100644 --- a/drivers/scsi/hpsa_cmd.h +++ b/drivers/scsi/hpsa_cmd.h @@ -22,6 +22,9 @@ #include <linux/compiler.h> +#include <linux/build_bug.h> /* static_assert */ +#include <linux/stddef.h> /* offsetof */ + /* general boundary defintions */ #define SENSEINFOBYTES 32 /* may vary between hbas */ #define SG_ENTRIES_IN_CMD 32 /* Max SG entries excluding chain blocks */ @@ -454,6 +457,15 @@ struct CommandList { atomic_t refcount; /* Must be last to avoid memset in hpsa_cmd_init() */ } __aligned(COMMANDLIST_ALIGNMENT); +/* + * Make sure our embedded atomic variable is aligned. Otherwise we break atomic + * operations on architectures that don't support unaligned atomics like IA64. + * + * The assert guards against reintroductin against unwanted __packed to + * the struct CommandList. + */ +static_assert(offsetof(struct CommandList, refcount) % __alignof__(atomic_t) = 0); + /* Max S/G elements in I/O accelerator command */ #define IOACCEL1_MAXSGENTRIES 24 #define IOACCEL2_MAXSGENTRIES 28 -- 2.31.1
next prev parent reply other threads:[~2021-03-30 7:21 UTC|newest] Thread overview: 89+ messages / expand[flat|nested] mbox.gz Atom feed top [not found] <20210222230519.73f3e239@sf> 2021-02-22 23:34 ` 5.11 regression: "ia64: add support for TIF_NOTIFY_SIGNAL" breaks ia64 boot Jens Axboe 2021-02-22 23:34 ` Jens Axboe 2021-02-22 23:55 ` John Paul Adrian Glaubitz 2021-02-22 23:55 ` John Paul Adrian Glaubitz [not found] ` <20210223083507.43b5a6dd@sf> 2021-02-23 9:13 ` John Paul Adrian Glaubitz 2021-02-23 12:36 ` John Paul Adrian Glaubitz 2021-02-23 12:36 ` John Paul Adrian Glaubitz [not found] ` <20210223192743.0198d4a9@sf> [not found] ` <20210302222630.5056f243@sf> 2021-03-02 22:31 ` John Paul Adrian Glaubitz 2021-03-02 22:31 ` John Paul Adrian Glaubitz 2021-03-03 0:22 ` [bisected] 5.12-rc1 hpsa regression: "scsi: hpsa: Correct dev cmds outstanding for retried cmds" breaks hpsa P600 Sergei Trofimovich 2021-03-03 0:22 ` [bisected] 5.12-rc1 hpsa regression: "scsi: hpsa: Correct dev cmds outstanding for retried cmds" bre Sergei Trofimovich 2021-03-03 8:55 ` [bisected] 5.12-rc1 hpsa regression: "scsi: hpsa: Correct dev cmds outstanding for retried cmds" breaks hpsa P600 Sergei Trofimovich 2021-03-03 8:55 ` [bisected] 5.12-rc1 hpsa regression: "scsi: hpsa: Correct dev cmds outstanding for retried cmds" Sergei Trofimovich 2021-03-03 17:33 ` [bisected] 5.12-rc1 hpsa regression: "scsi: hpsa: Correct dev cmds outstanding for retried cmds" breaks hpsa P600 Don.Brace 2021-03-03 17:33 ` [bisected] 5.12-rc1 hpsa regression: "scsi: hpsa: Correct dev cmds outstanding for retried cmds" Don.Brace [not found] ` <20210303220401.501449e5@sf> 2021-03-04 17:00 ` [bisected] 5.12-rc1 hpsa regression: "scsi: hpsa: Correct dev cmds outstanding for retried cmds" breaks hpsa P600 Don.Brace 2021-03-04 17:00 ` [bisected] 5.12-rc1 hpsa regression: "scsi: hpsa: Correct dev cmds outstanding for retried cmds" Don.Brace 2021-03-05 13:26 ` [bisected] 5.12-rc1 hpsa regression: "scsi: hpsa: Correct dev cmds outstanding for retried cmds" breaks hpsa P600 Tomas Henzl 2021-03-05 13:26 ` [bisected] 5.12-rc1 hpsa regression: "scsi: hpsa: Correct dev cmds outstanding for retried cmds" Tomas Henzl 2021-03-12 22:27 ` [PATCH] hpsa: fix boot on ia64 (atomic_t alignment) Sergei Trofimovich 2021-03-12 22:27 ` Sergei Trofimovich 2021-03-16 16:30 ` Don.Brace 2021-03-16 16:30 ` Don.Brace 2021-03-16 18:28 ` Arnd Bergmann 2021-03-16 18:28 ` Arnd Bergmann 2021-03-17 2:25 ` Martin K. Petersen 2021-03-17 2:25 ` Martin K. Petersen 2021-03-17 13:19 ` David Laight 2021-03-17 19:06 ` Don.Brace 2021-03-17 19:06 ` Don.Brace 2021-03-17 17:28 ` John Paul Adrian Glaubitz 2021-03-17 17:28 ` John Paul Adrian Glaubitz 2021-03-27 10:24 ` Sergei Trofimovich 2021-03-24 7:08 ` John Paul Adrian Glaubitz 2021-03-24 7:08 ` John Paul Adrian Glaubitz 2021-03-24 18:37 ` Don.Brace 2021-03-24 18:37 ` Don.Brace 2021-03-29 11:25 ` John Paul Adrian Glaubitz 2021-03-29 11:25 ` John Paul Adrian Glaubitz 2021-03-29 14:22 ` Arnd Bergmann 2021-03-29 14:22 ` Arnd Bergmann 2021-03-30 3:02 ` Martin K. Petersen 2021-03-30 3:02 ` Martin K. Petersen 2021-03-30 7:19 ` [PATCH v2 1/3] hpsa: use __packed on individual structs, not header-wide Sergei Trofimovich 2021-03-30 7:19 ` Sergei Trofimovich 2021-03-30 7:19 ` [PATCH v2 2/3] hpsa: fix boot on ia64 (atomic_t alignment) Sergei Trofimovich 2021-03-30 7:19 ` Sergei Trofimovich 2021-03-30 7:19 ` Sergei Trofimovich [this message] 2021-03-30 7:19 ` [PATCH v2 3/3] hpsa: add an assert to prevent from __packed reintroduction Sergei Trofimovich 2021-03-30 7:34 ` Arnd Bergmann 2021-03-30 7:34 ` Arnd Bergmann 2021-04-02 14:40 ` Elliott, Robert (Servers) 2021-04-02 14:40 ` Elliott, Robert (Servers) 2021-04-03 14:51 ` Sergei Trofimovich 2021-04-03 14:51 ` Sergei Trofimovich 2021-03-30 7:30 ` [PATCH v2 1/3] hpsa: use __packed on individual structs, not header-wide Arnd Bergmann 2021-03-30 7:30 ` Arnd Bergmann 2021-03-30 7:43 ` Arnd Bergmann 2021-03-30 7:43 ` Arnd Bergmann 2021-04-02 3:54 ` Martin K. Petersen 2021-04-02 3:54 ` Martin K. Petersen 2021-04-15 18:41 ` Don.Brace 2021-04-15 18:41 ` Don.Brace 2021-03-05 9:22 ` [bisected] 5.12-rc1 hpsa regression: "scsi: hpsa: Correct dev cmds outstanding for retried cmds" breaks hpsa P600 Geert Uytterhoeven 2021-03-05 9:22 ` [bisected] 5.12-rc1 hpsa regression: "scsi: hpsa: Correct dev cmds outstanding for retried cmds" Geert Uytterhoeven 2021-03-05 13:31 ` [bisected] 5.12-rc1 hpsa regression: "scsi: hpsa: Correct dev cmds outstanding for retried cmds" breaks hpsa P600 Arnd Bergmann 2021-03-05 13:31 ` [bisected] 5.12-rc1 hpsa regression: "scsi: hpsa: Correct dev cmds outstanding for retried cmds" Arnd Bergmann 2021-03-05 20:45 ` [bisected] 5.12-rc1 hpsa regression: "scsi: hpsa: Correct dev cmds outstanding for retried cmds" breaks hpsa P600 Don.Brace 2021-03-05 20:45 ` [bisected] 5.12-rc1 hpsa regression: "scsi: hpsa: Correct dev cmds outstanding for retried cmds" Don.Brace 2021-03-03 15:42 ` [bisected] 5.12-rc1 hpsa regression: "scsi: hpsa: Correct dev cmds outstanding for retried cmds" breaks hpsa P600 Don.Brace 2021-03-03 15:42 ` [bisected] 5.12-rc1 hpsa regression: "scsi: hpsa: Correct dev cmds outstanding for retried cmds" Don.Brace 2021-03-17 17:42 ` 5.11 regression: "ia64: add support for TIF_NOTIFY_SIGNAL" breaks ia64 boot John Paul Adrian Glaubitz 2021-03-17 17:42 ` John Paul Adrian Glaubitz 2021-03-17 17:53 ` John Paul Adrian Glaubitz 2021-03-17 17:53 ` John Paul Adrian Glaubitz [not found] ` <20210222235359.75d1a912@sf> 2021-02-23 0:34 ` Jens Axboe 2021-02-23 0:34 ` Jens Axboe 2021-02-23 0:41 ` Jens Axboe 2021-02-23 0:41 ` Jens Axboe 2021-02-23 0:43 ` Jens Axboe 2021-02-23 0:43 ` Jens Axboe [not found] ` <20210223080830.23bccdbf@sf> 2021-03-02 22:07 ` Sergei Trofimovich 2021-03-02 22:07 ` Sergei Trofimovich 2021-03-02 22:31 ` Jens Axboe 2021-03-02 22:31 ` Jens Axboe [not found] ` <20210302232716.353ed49b@sf> 2021-03-03 0:34 ` Jens Axboe 2021-03-03 0:34 ` Jens Axboe 2021-03-03 3:51 ` Jens Axboe 2021-03-03 3:51 ` Jens Axboe
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210330071958.3788214-3-slyfox@gentoo.org \ --to=slyfox@gentoo.org \ --cc=arnd@kernel.org \ --cc=don.brace@microchip.com \ --cc=glaubitz@physik.fu-berlin.de \ --cc=jszczype@redhat.com \ --cc=linux-ia64@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-scsi@vger.kernel.org \ --cc=martin.petersen@oracle.com \ --cc=scott.benesh@microchip.com \ --cc=scott.teel@microchip.com \ --cc=storagedev@microchip.com \ --cc=thenzl@redhat.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.