Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
IronPort-SDR: wh5FT19IPbpqFeWdKG1RDdU3c8hVyZQM2ilddF7AepHOYwAGxFSJ5qNMNNGYKNdpJo19LeGa0Q
 hqzGV0XFtIWWQvx9rCGe9NECZ1ifiJUqaObmft4shnT6MjeYsgftqmXjUuuIvNBHcTGmQaK3JT
 jn9UUBQT91bJbYDp5W0oIILekgtlKT104DSgmwEyeNIrLYhn9coBDG93SrqCilLXmYqpjC5sKm
 OROKSt1VfoyOqwypPIPOQF36cc3dPfeHoRLkS2p6lxNdu09fWAapqIvsIgxcv+kMwjjt1CgtRg
 j5o=
IronPort-SDR: R96qTjlI+HZzO4zp4OmDPPi6AmCvV0yhj+RhLlx3ufv7WFaVae3WZ3xG8TWcS3MA0PxW0yyN5f
 RwJ7Evd6FkqSJU9mImBEIDAA0gh5mLWcpqxH/dxqbX97n2Sq9HmqEq/bLzrb43KxRtldd+8l/n
 CIYD5TCbBiMwrNkgKCy7K0T9uw4Py6KXMRqEJLqydUQGJ5bJ3qu4ReVziijFkitq3c0GLat8WT
 b7ZQU0uayRWb9H3XsTyjiLGd26YU2hMS4TZ0btLI7/y05TGQujJcMIhjzQeYcSJmK064xdW5Hh
 5Jng+PQlw1smOLdGH6Al2qIF
IronPort-SDR: Vas0ZmY2WTLD4D32wsiC0idNWk2cEvWjiEvuKcoTH7iaPOOiiIfGMUfQGFBsTdaEhdnmTm6L9M
 XbHVpKx2ryuFhZ6ghamcNSTUIizdK/F4l4gDpsY8JI79LPmpikqxk9qq/7SmADCrfP4KjCIfuJ
 OTK60S9lo+MUCN++J+E+OgrPCawor07uRnS+OwkPCSb9c1Vxt9gVwOFMyiqCnZx5Z2gE4JDR7H
 dJSz3XOjIAaAMjEGAsPD1cO5dSzzHIcQp8zoMMJAHnGpddrxWh/IkSvrQwS92uc6wkCxq26qjK
 9M4=
From:   Alistair Francis <alistair.francis@wdc.com>
To:     linux-riscv@lists.infradead.org, arnd@arndb.de
Cc:     linux-kernel@vger.kernel.org, alistair23@gmail.com,
        Alistair Francis <alistair.francis@wdc.com>
Subject: [PATCH RESEND 2/2] riscv/include/uapi: Define a custom __SIGINFO struct for RV32
Date:   Tue,  2 Jul 2019 17:52:02 -0700
Message-Id: <20190703005202.7578-3-alistair.francis@wdc.com>
In-Reply-To: <20190703005202.7578-1-alistair.francis@wdc.com>
References: <20190703005202.7578-1-alistair.francis@wdc.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

The glibc implementation of siginfo_t results in an allignment of 8 bytes
for the union _sifields on RV32. The kernel has an allignment of 4 bytes
for the _sifields union. This results in information being lost when
glibc parses the siginfo_t struct.

To fix the issue add a pad variable to the struct to avoid allignment
mismatches.

Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
---
 arch/riscv/include/uapi/asm/siginfo.h | 32 +++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 arch/riscv/include/uapi/asm/siginfo.h

diff --git a/arch/riscv/include/uapi/asm/siginfo.h b/arch/riscv/include/uapi/asm/siginfo.h
new file mode 100644
index 000000000000..0854ad97bf44
--- /dev/null
+++ b/arch/riscv/include/uapi/asm/siginfo.h
@@ -0,0 +1,32 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
+#ifndef _ASM_RISCV_SIGINFO_H
+#define _ASM_RISCV_SIGINFO_H
+
+/* Add a pad element for RISC-V 32-bit. We need this as the
+ * _sifields union is 8 byte allgined in usperace.
+ */
+#if __riscv_xlen == 32
+#ifndef __ARCH_HAS_SWAPPED_SIGINFO
+#define __SIGINFO 			\
+struct {				\
+	int si_signo;			\
+	int si_errno;			\
+	int si_code;			\
+	int pad;			\
+	union __sifields _sifields;	\
+}
+#else
+#define __SIGINFO 			\
+struct {				\
+	int si_signo;			\
+	int si_code;			\
+	int si_errno;			\
+	int pad;			\
+	union __sifields _sifields;	\
+}
+#endif /* __ARCH_HAS_SWAPPED_SIGINFO */
+#endif
+
+#include <asm-generic/siginfo.h>
+
+#endif /* _ASM_RISCV_SIGINFO_H */
-- 
2.22.0