powerpc/rtasd: Use struct_size() to simplify log_rtas_len()
PATCH v2 1/2 powerpc/rtasd: Use struct_size() to simplify log_rtas_len()
Now that struct rtas_error_log uses a flexible array member for the extended log buffer, use struct_size() to calculate the total RTAS error log size and avoid using the hard-coded header size of 8 bytes.
Use min() to replace the open-coded implementation while at it.
---
No changes in patch 1/2.
--- arch/powerpc/kernel/rtasd.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-)
arch/powerpc/kernel/rtasd.c +6 -13
@@ -10,6 +10,7 @@#include <linux/sched.h> #include <linux/kernel.h> #include <linux/of.h> +#include <linux/overflow.h> #include <linux/poll.h> #include <linux/proc_fs.h> #include <linux/init.h>
@@ -160,25 +161,17 @@ static void printk_log_rtas(char *buf, int len)static int log_rtas_len (char * buf) { -int len; +size_t len;struct rtas_error_log *err; -uint32_t extended_log_length; +u32 extended_log_length; -/* rtas fixed header */ - len =8 ; err = (struct rtas_error_log *)buf; - extended_log_length =rtas_error_extended_log_length (err); -if (rtas_error_extended (err) && extended_log_length) { - -/* extended header */ - len += extended_log_length; - } + extended_log_length =rtas_error_extended (err) ?rtas_error_extended_log_length (err) :0 ; + len =struct_size (err, buffer, extended_log_length);if (rtas_error_log_max ==0 ) rtas_error_log_max =rtas_get_error_log_max (); - -if (len > rtas_error_log_max) - len = rtas_error_log_max; + len =min (len, rtas_error_log_max);return len; }
base-commit: ab8bbf8024b7434e2b630965fd373fba5b89f29f
PATCH v2 2/2 powerpc/pseries/ras: Use struct_size() to simplify fwnmi_get_errinfo()
Now that struct rtas_error_log uses a flexible array member for the extended log buffer, use struct_size() to calculate the total RTAS error log size and avoid using the hard-coded header size of 8 bytes.
---
Changes in v2:
- memcpy_and_pad() cannot be used in real mode; use memset() + memcpy()
- v1: https://lore.kernel.org/r/[email protected]/
--- arch/powerpc/platforms/pseries/ras.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-)
arch/powerpc/platforms/pseries/ras.c +7 -9
@@ -7,6 +7,7 @@#include <linux/interrupt.h> #include <linux/irq.h> #include <linux/of.h> +#include <linux/overflow.h> #include <linux/fs.h> #include <linux/reboot.h> #include <linux/irq_work.h>
@@ -440,6 +441,8 @@ static __be64 *fwnmi_get_savep(struct pt_regs *regs)static struct rtas_error_log *fwnmi_get_errinfo (struct pt_regs *regs) {struct rtas_error_log *h; +u32 extended_log_length; +size_t len;__be64 *savep; savep =fwnmi_get_savep (regs);
@@ -449,17 +452,12 @@ static struct rtas_error_log *fwnmi_get_errinfo(struct pt_regs *regs) regs->gpr[3 ] =be64_to_cpu (savep[0 ]);/* restore original r3 */ h = (struct rtas_error_log *)&savep[1 ]; + extended_log_length =rtas_error_extended (h) ?rtas_error_extended_log_length (h) :0 ; + len =struct_size (h, buffer, extended_log_length); + len =min (len,RTAS_ERROR_LOG_MAX );/* Use the per cpu buffer from paca to store rtas error log */ memset (local_paca->mce_data_buf,0 ,RTAS_ERROR_LOG_MAX ); -if (!rtas_error_extended (h)) { -memcpy (local_paca->mce_data_buf, h,sizeof (__u64)); - }else { -int len, error_log_length; - - error_log_length =8 +rtas_error_extended_log_length (h); - len =min_t (int, error_log_length,RTAS_ERROR_LOG_MAX ); -memcpy (local_paca->mce_data_buf, h, len); - } +memcpy (local_paca->mce_data_buf, h, len);return (struct rtas_error_log *)local_paca->mce_data_buf; }
Quoted 8 lines · Thorsten Blum
Now that struct
rtas_error_loguses a flexible array member for the extended log buffer, usestruct_size()to calculate the total RTAS error log size and avoid using the hard-coded header size of 8 bytes.Use
min()to replace the open-coded implementation while at it.[...]
Applied to powerpc/next.
[1/2] powerpc/rtasd: Use struct_size() to simplify log_rtas_len()
https://git.kernel.org/powerpc/c/6a7f74525a9964ef3228f6e1d1af261e92964987 [2/2] powerpc/pseries/ras: Use struct_size() to simplify fwnmi_get_errinfo() https://git.kernel.org/powerpc/c/351496d6aea664f25cbd6411bf5567210328e419
cheers