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: 1P891hBb6x9O1/3WGDYYtPtTpOfbMaVNTAJhLU5rIOJBVcn/vZDm2dj6I1QL+LobYT87HpKV0i
 Aoz/YlCBjNoEWIpTw7uNbAIHGz9mk4rSGD1gusgSrewaDyO6dcSrpslrYgBZR6Iz5uRO3BPdEg
 LU93Y37riV1NqvzMLVrjgE53qabx5gB/z7FOoUB8SzjSMROiAe9c5IXA/hu7nZ5OOesXWRQrk+
 JMbbyxQjSqdGpSywmYyQrpO8maJTKle7ORABpKj3XE8i+x5ejaMuEB4gOQRcnfkO09ihlQwwWC
 gHE=
IronPort-SDR: oRlID7VbmY+mxcrY+wVzzQ/KZDSEytidsRl6/1s+u7pC0OIZAqp7VZDYjaEukeCaLrWuvw/aoe
 WZapSjss7sojXQhhI37rfKBjIHKmFtiD6nhKvxDYEXkjHhlp1xjSk48pHO8fljb1skZ++esrPL
 LaSbZq7lWU5gmlO2c6upJtwj6uT5UGo76bWSv5NczKfu+CJflbZF6YfWNT9JmwOJB21K7NgdPs
 YgoTmHG429jE592pZO6s4+W0A9ClMnvTKODHtU/0w+y4M+ggKYjgJ0OCmnTheG+5Y5eIibUrjz
 vRPwJ0qq4CUHQkR0+nbjah2N
IronPort-SDR: UZDjthIev6GusnpHicyRKLOOvWLP2fQvqt3HwRFRUC0oadg5DnlWcaGsFdEfndiB8WVfKl9IZw
 tGKxdSKGiYNLoHy1gcLpTIjhr/Iq1AKVZHnDKiTzTZkbNxXuR6xecPm8frDbDknAYt2Utzr5bk
 YOd//7/wlsnatwxsEy86yOCSjRIkiqo6UDtAvAq+HffqHSwZtcm1YO+iFrV9rFBhasi0uGV/c8
 YDiVVjL4/RyHDL8xh6/+Ya55tadiIOh9olwty8MwoYWQ0mvpUQvKXDyV5urEID58BpsvXeej24
 P/I=
From:   Alistair Francis <alistair.francis@wdc.com>
To:     linux-riscv-bounces@lists.infradead.org, arnd@arndb.de
Cc:     linux-kernel@vger.kernel.org, alistair23@gmail.com,
        Alistair Francis <alistair.francis@wdc.com>
Subject: [PATCH 2/2] riscv/include/uapi: Define a custom __SIGINFO struct for RV32
Date:   Tue,  2 Jul 2019 17:18:42 -0700
Message-Id: <20190703001842.12238-3-alistair.francis@wdc.com>
In-Reply-To: <20190703001842.12238-1-alistair.francis@wdc.com>
References: <20190703001842.12238-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