Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

soc: apple: rtkit: Do not copy the reg state structure to the stack

The register state struct is 848 bytes, which ends up bloating the
apple_rtkit_crashlog_dump_regs stack frame beyond 1024 on some
32-bit platforms, triggering compile warnings.

This doesn't matter for 64BIT/ARM64, but there's also no good reason to
copy the structure to the stack in this case. We can use __packed to
avoid alignment issues, there are no double-read hazards, and this is a
fatal error path so performance does not matter.

Fixes: 22991d8d5725 ("soc: apple: rtkit: Add register dump decoding to crashlog")
Signed-off-by: Asahi Lina <lina@asahilina.net>
Reviewed-by: Eric Curtin <ecurtin@redhat.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

authored by

Asahi Lina and committed by
Arnd Bergmann
4ec98e6d 68907175

+13 -13
+13 -13
drivers/soc/apple/rtkit-crashlog.c
··· 57 57 u64 unk_X; 58 58 u64 esr; 59 59 u64 unk_Z; 60 - }; 60 + } __packed; 61 61 static_assert(sizeof(struct apple_rtkit_crashlog_regs) == 0x350); 62 62 63 63 static void apple_rtkit_crashlog_dump_str(struct apple_rtkit *rtk, u8 *bfr, ··· 126 126 static void apple_rtkit_crashlog_dump_regs(struct apple_rtkit *rtk, u8 *bfr, 127 127 size_t size) 128 128 { 129 - struct apple_rtkit_crashlog_regs regs; 129 + struct apple_rtkit_crashlog_regs *regs; 130 130 const char *el; 131 131 int i; 132 132 133 - if (size < sizeof(regs)) { 133 + if (size < sizeof(*regs)) { 134 134 dev_warn(rtk->dev, "RTKit: Regs section too small: 0x%zx", size); 135 135 return; 136 136 } 137 137 138 - memcpy(&regs, bfr, sizeof(regs)); 138 + regs = (struct apple_rtkit_crashlog_regs *)bfr; 139 139 140 - switch (regs.psr & PSR_MODE_MASK) { 140 + switch (regs->psr & PSR_MODE_MASK) { 141 141 case PSR_MODE_EL0t: 142 142 el = "EL0t"; 143 143 break; ··· 160 160 161 161 dev_warn(rtk->dev, "RTKit: Exception dump:"); 162 162 dev_warn(rtk->dev, " == Exception taken from %s ==", el); 163 - dev_warn(rtk->dev, " PSR = 0x%llx", regs.psr); 164 - dev_warn(rtk->dev, " PC = 0x%llx\n", regs.pc); 165 - dev_warn(rtk->dev, " ESR = 0x%llx\n", regs.esr); 166 - dev_warn(rtk->dev, " FAR = 0x%llx\n", regs.far); 167 - dev_warn(rtk->dev, " SP = 0x%llx\n", regs.sp); 163 + dev_warn(rtk->dev, " PSR = 0x%llx", regs->psr); 164 + dev_warn(rtk->dev, " PC = 0x%llx\n", regs->pc); 165 + dev_warn(rtk->dev, " ESR = 0x%llx\n", regs->esr); 166 + dev_warn(rtk->dev, " FAR = 0x%llx\n", regs->far); 167 + dev_warn(rtk->dev, " SP = 0x%llx\n", regs->sp); 168 168 dev_warn(rtk->dev, "\n"); 169 169 170 170 for (i = 0; i < 31; i += 4) { ··· 172 172 dev_warn(rtk->dev, 173 173 " x%02d-x%02d = %016llx %016llx %016llx %016llx\n", 174 174 i, i + 3, 175 - regs.regs[i], regs.regs[i + 1], 176 - regs.regs[i + 2], regs.regs[i + 3]); 175 + regs->regs[i], regs->regs[i + 1], 176 + regs->regs[i + 2], regs->regs[i + 3]); 177 177 else 178 178 dev_warn(rtk->dev, 179 179 " x%02d-x%02d = %016llx %016llx %016llx\n", i, i + 3, 180 - regs.regs[i], regs.regs[i + 1], regs.regs[i + 2]); 180 + regs->regs[i], regs->regs[i + 1], regs->regs[i + 2]); 181 181 } 182 182 183 183 dev_warn(rtk->dev, "\n");