Implement reentrant rtas call
v6 cover Implement reentrant rtas call
Patch 2 implement rtas_call_reentrant() for reentrant rtas-calls:
"ibm,int-on", "ibm,int-off",ibm,get-xive" and "ibm,set-xive", according to LoPAPR Version 1.1 (March 24, 2016).
For that, it's necessary that every call uses a different rtas buffer (rtas_args). Paul Mackerras suggested using the PACA structure for creating a per-cpu buffer for these calls.
Patch 1 was necessary to make PACA have a 'struct rtas_args' member.
Reentrant rtas calls can be useful to avoid deadlocks in crashing, where rtas-calls are needed, but some other thread crashed holding the rtas.lock.
This is a backtrace of a deadlock from a kdump testing environment:
#0 arch_spin_lock
#1 lock_rtas () #2 rtas_call (token=8204, nargs=1, nret=1, outputs=0x0) #3 ics_rtas_mask_real_irq (hw_irq=4100) #4 machine_kexec_mask_interrupts #5 default_machine_crash_shutdown #6 machine_crash_shutdown #7 __crash_kexec #8 crash_kexec #9 oops_end
Special thanks to Nick Piggin, who have been helping me a lot with this series!
---
Changes since v5:
- Renames new paca member from reentrant_args to rtas_args_reentrant
- Compile out rtas_args_reentrant if CONFIG_PPC_RTAS=n
- new_rtas_args() is skipped (returns NULL) if CPU_FTR_HVMODE
Changes since v4:
- Insted of having the full buffer on PACA, adds only a pointer and allocate it during allocate_paca(), making sure it's in a memory range available for RTAS (32-bit). (Thanks Nick Piggin!)
Changes since v3:
- Adds protection from preemption and interruption
Changes since v2:
- Fixed build failure from ppc64e, by including spinlock_types.h on rtas-types.h
- Improved commit messages
Changes since v1:
- Moved buffer from stack to PACA (as suggested by Paul Mackerras)
- Added missing output bits
- Improve documentation following kernel-doc format (as suggested by Nathan Lynch)
Leonardo Bras (2):
powerpc/rtas: Move type/struct definitions from rtas.h into
rtas-types.h
powerpc/rtas: Implement reentrant rtas call
arch/powerpc/include/asm/paca.h | 2 + arch/powerpc/include/asm/rtas-types.h | 126 ++++++++++++++++++++++++++ arch/powerpc/include/asm/rtas.h | 119 +----------------------- arch/powerpc/kernel/rtas.c | 42 +++++++++ arch/powerpc/sysdev/xics/ics-rtas.c | 22 ++--- 5 files changed, 183 insertions(+), 128 deletions(-) create mode 100644 arch/powerpc/include/asm/rtas-types.h
Signature · 1 line
2.25.4
PATCH v6 1/2 powerpc/rtas: Move type/struct definitions from rtas.h into rtas-types.h
In order to get any rtas* struct into other headers, including rtas.h may cause a lot of errors, regarding include dependency needed for inline functions.
Create rtas-types.h and move there all type/struct definitions from rtas.h, then include rtas-types.h into rtas.h.
Also, as suggested by checkpath.pl, replace uint8_t for u8, and keep the same type pattern for the whole file, as they are the same according to powerpc/boot/types.h.
--- arch/powerpc/include/asm/rtas-types.h | 126 ++++++++++++++++++++++++++ arch/powerpc/include/asm/rtas.h | 118 +----------------------- 2 files changed, 127 insertions(+), 117 deletions(-) create mode 100644 arch/powerpc/include/asm/rtas-types.h
arch/powerpc/include/asm/rtas-types.h new file +126 -0
@@ -0,0 +1,126 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +#ifndef _POWERPC_RTAS_TYPES_H +#define _POWERPC_RTAS_TYPES_H +#ifdef __KERNEL__ + +#include <linux/spinlock_types.h> + +typedef __be32 rtas_arg_t ; + +struct rtas_args { +__be32 token; +__be32 nargs; +__be32 nret; +rtas_arg_t args[16 ]; +rtas_arg_t *rets;/* Pointer to return values in args[]. */ +}; + +struct rtas_t { +unsigned long entry;/* physical address pointer */ +unsigned long base;/* physical address pointer */ +unsigned long size; +arch_spinlock_t lock; +struct rtas_args args; +struct device_node *dev;/* virtual address pointer */ +}; + +struct rtas_suspend_me_data { +atomic_t working;/* number of cpus accessing this struct */ +atomic_t done; +int token;/* ibm,suspend-me */ +atomic_t error; +struct completion *complete;/* wait on this until working == 0 */ +}; + +struct rtas_error_log { +/* Byte 0 */ +u8 byte0;/* Architectural version */ + +/* Byte 1 */ +u8 byte1; +/* XXXXXXXX +* XXX 3: Severity level of error +* XX 2: Degree of recovery +* X 1: Extended log present? +* XX 2: Reserved +*/ + +/* Byte 2 */ +u8 byte2; +/* XXXXXXXX +* XXXX 4: Initiator of event +* XXXX 4: Target of failed operation +*/ +u8 byte3;/* General event or error*/ +__be32 extended_log_length;/* length in bytes */ +unsigned char buffer[1 ];/* Start of extended log */ +/* Variable length. */ +}; + +/* RTAS general extended event log, Version 6. The extended log starts +* from "buffer" field of struct rtas_error_log defined above. +*/ +struct rtas_ext_event_log_v6 { +/* Byte 0 */ +u8 byte0; +/* XXXXXXXX +* X 1: Log valid +* X 1: Unrecoverable error +* X 1: Recoverable (correctable or successfully retried) +* X 1: Bypassed unrecoverable error (degraded operation) +* X 1: Predictive error +* X 1: "New" log (always 1 for data returned from RTAS) +* X 1: Big Endian +* X 1: Reserved +*/ + +/* Byte 1 */ +u8 byte1;/* reserved */ + +/* Byte 2 */ +u8 byte2; +/* XXXXXXXX +* X 1: Set to 1 (indicating log is in PowerPC format) +* XXX 3: Reserved +* XXXX 4: Log format used for bytes 12-2047 +*/ + +/* Byte 3 */ +u8 byte3;/* reserved */ +/* Byte 4-11 */ +u8 reserved[8 ];/* reserved */ +/* Byte 12-15 */ +__be32 company_id;/* Company ID of the company */ +/* that defines the format for */ +/* the vendor specific log type */ +/* Byte 16-end of log */ +u8 vendor_log[1 ];/* Start of vendor specific log */ +/* Variable length. */ +}; + +/* Vendor specific Platform Event Log Format, Version 6, section header */ +struct pseries_errorlog { +__be16 id;/* 0x00 2-byte ASCII section ID */ +__be16 length;/* 0x02 Section length in bytes */ +u8 version;/* 0x04 Section version */ +u8 subtype;/* 0x05 Section subtype */ +__be16 creator_component;/* 0x06 Creator component ID */ +u8 data[];/* 0x08 Start of section data */ +}; + +/* RTAS pseries hotplug errorlog section */ +struct pseries_hp_errorlog { +u8 resource; +u8 action; +u8 id_type; +u8 reserved; +union { +__be32 drc_index; +__be32 drc_count; +struct {__be32 count, index; } ic; +char drc_name[1 ]; + } _drc_u; +}; + +#endif /* __KERNEL__ */ +#endif /* _POWERPC_RTAS_TYPES_H */
arch/powerpc/include/asm/rtas.h +1 -117
154 lines not on this page · raw message
Signature · 1 line
2.25.4
PATCH v6 2/2 powerpc/rtas: Implement reentrant rtas call
In reply to Leonardo BrasImplement rtas_call_reentrant() for reentrant rtas-calls:
"ibm,int-on", "ibm,int-off",ibm,get-xive" and "ibm,set-xive".
On LoPAPR Version 1.1 (March 24, 2016), from 7.3.10.1 to 7.3.10.4, items 2 and 3 say:
2 - For the PowerPC External Interrupt option: The * call must be reentrant to the number of processors on the platform. 3 - For the PowerPC External Interrupt option: The * argument call buffer for each simultaneous call must be physically unique.
So, these rtas-calls can be called in a lockless way, if using a different buffer for each cpu doing such rtas call.
For this, it was suggested to add the buffer (struct rtas_args) in the PACA struct, so each cpu can have it's own buffer. The PACA struct received a pointer to rtas buffer, which is allocated in the memory range available to rtas 32-bit.
Reentrant rtas calls are useful to avoid deadlocks in crashing, where rtas-calls are needed, but some other thread crashed holding the rtas.lock.
This is a backtrace of a deadlock from a kdump testing environment:
#0 arch_spin_lock
#1 lock_rtas () #2 rtas_call (token=8204, nargs=1, nret=1, outputs=0x0) #3 ics_rtas_mask_real_irq (hw_irq=4100) #4 machine_kexec_mask_interrupts #5 default_machine_crash_shutdown #6 machine_crash_shutdown #7 __crash_kexec #8 crash_kexec #9 oops_end
--- arch/powerpc/include/asm/paca.h | 4 +++ arch/powerpc/include/asm/rtas.h | 1 + arch/powerpc/kernel/paca.c | 34 +++++++++++++++++++ arch/powerpc/kernel/rtas.c | 52 +++++++++++++++++++++++++++++ arch/powerpc/sysdev/xics/ics-rtas.c | 22 ++++++------ 5 files changed, 102 insertions(+), 11 deletions(-)
arch/powerpc/include/asm/paca.h +4 -0
@@ -29,6 +29,7 @@#include <asm/hmi.h> #include <asm/cpuidle.h> #include <asm/atomic.h> +#include <asm/rtas-types.h> #include <asm-generic/mmiowb_types.h>
@@ -270,6 +271,9 @@ struct paca_struct {#ifdef CONFIG_MMIOWB struct mmiowb_state mmiowb_state;#endif +#ifdef CONFIG_PPC_RTAS +struct rtas_args *rtas_args_reentrant; +#endif /* CONFIG_PPC_RTAS */ }____cacheline_aligned ;extern void copy_mm_to_paca (struct mm_struct *mm);
arch/powerpc/include/asm/rtas.h +1 -0
@@ -236,6 +236,7 @@ extern struct rtas_t rtas;extern int rtas_token (const char *service);extern int rtas_service_present (const char *service);extern int rtas_call (int token,int ,int ,int *, ...); +int rtas_call_reentrant (int token,int nargs,int nret,int *outputs, ...);void rtas_call_unlocked (struct rtas_args *args,int token,int nargs,int nret, ...);extern void __noreturn rtas_restart (char *cmd);
arch/powerpc/kernel/paca.c +34 -0
@@ -16,6 +16,7 @@#include <asm/kexec.h> #include <asm/svm.h> #include <asm/ultravisor.h> +#include <asm/rtas.h> #include "setup.h"
@@ -164,6 +165,32 @@ static struct slb_shadow * __init new_slb_shadow(int cpu, unsigned long limit)#endif /* CONFIG_PPC_BOOK3S_64 */ +#ifdef CONFIG_PPC_RTAS + +/** +* new_rtas_args() - Allocates rtas args +* @cpu: CPU number +* @limit: Memory limit for this allocation +* +* Allocates a struct rtas_args and return it's pointer, +* if not in Hypervisor mode +* +* Return: Pointer to allocated rtas_args +* NULL if CPU in Hypervisor Mode +*/ +static struct rtas_args *__init new_rtas_args (int cpu,unsigned long limit) +{ + limit = min_t(unsigned long, limit, RTAS_INSTANTIATE_MAX); + +if (early_cpu_has_feature (CPU_FTR_HVMODE )) +return NULL ; + +return alloc_paca_data (sizeof (struct rtas_args ),L1_CACHE_BYTES , + limit, cpu); +} + +#endif /*CONFIG_PPC_RTAS*/ +/* The Paca is an array with one entry per processor. Each contains an * lppaca, which contains the information shared between the * hypervisor and Linux.
@@ -202,6 +229,10 @@ void __init __nostackprotector initialise_paca(struct paca_struct *new_paca, int/* For now -- if we have threads this will be adjusted later */ new_paca->tcd_ptr = &new_paca->tcd;#endif + +#ifdef CONFIG_PPC_RTAS + new_paca->rtas_args_reentrant =NULL ; +#endif }/* Put the paca pointer into r13 and SPRG_PACA */
@@ -273,6 +304,9 @@ void __init allocate_paca(int cpu)#endif #ifdef CONFIG_PPC_BOOK3S_64 paca->slb_shadow_ptr =new_slb_shadow (cpu, limit); +#endif +#ifdef CONFIG_PPC_RTAS + paca->rtas_args_reentrant =new_rtas_args (cpu, limit);#endif paca_struct_size +=sizeof (struct paca_struct ); }
arch/powerpc/kernel/rtas.c +52 -0
64 lines not on this page · raw message
arch/powerpc/sysdev/xics/ics-rtas.c +11 -11
@@ -50,8 +50,8 @@ static void ics_rtas_unmask_irq(struct irq_data *d) server =xics_get_irq_server (d->irq,irq_data_get_affinity_mask (d),0 ); - call_status =rtas_call (ibm_set_xive,3 ,1 ,NULL , hw_irq, server, -DEFAULT_PRIORITY ); + call_status =rtas_call_reentrant (ibm_set_xive,3 ,1 ,NULL , hw_irq, + server,DEFAULT_PRIORITY );if (call_status !=0 ) { printk(KERN_ERR "%s: ibm_set_xive irq %u server %x returned %d\n",
@@ -60,7 +60,7 @@ static void ics_rtas_unmask_irq(struct irq_data *d) }/* Now unmask the interrupt (often a no-op) */ - call_status =rtas_call (ibm_int_on,1 ,1 ,NULL , hw_irq); + call_status =rtas_call_reentrant (ibm_int_on,1 ,1 ,NULL , hw_irq);if (call_status !=0 ) {printk (KERN_ERR "%s: ibm_int_on irq=%u returned %d\n" , __func__, hw_irq, call_status);
@@ -91,7 +91,7 @@ static void ics_rtas_mask_real_irq(unsigned int hw_irq)if (hw_irq ==XICS_IPI )return ; - call_status =rtas_call (ibm_int_off,1 ,1 ,NULL , hw_irq); + call_status =rtas_call_reentrant (ibm_int_off,1 ,1 ,NULL , hw_irq);if (call_status !=0 ) {printk (KERN_ERR "%s: ibm_int_off irq=%u returned %d\n" , __func__, hw_irq, call_status);
@@ -99,8 +99,8 @@ static void ics_rtas_mask_real_irq(unsigned int hw_irq) }/* Have to set XIVE to 0xff to be able to remove a slot */ - call_status =rtas_call (ibm_set_xive,3 ,1 ,NULL , hw_irq, - xics_default_server,0xff ); + call_status =rtas_call_reentrant (ibm_set_xive,3 ,1 ,NULL , hw_irq, + xics_default_server,0xff );if (call_status !=0 ) {printk (KERN_ERR "%s: ibm_set_xive(0xff) irq=%u returned %d\n" , __func__, hw_irq, call_status);
@@ -131,7 +131,7 @@ static int ics_rtas_set_affinity(struct irq_data *d,if (hw_irq ==XICS_IPI || hw_irq ==XICS_IRQ_SPURIOUS )return -1 ; - status =rtas_call (ibm_get_xive,1 ,3 , xics_status, hw_irq); + status =rtas_call_reentrant (ibm_get_xive,1 ,3 , xics_status, hw_irq);if (status) { printk(KERN_ERR "%s: ibm,get-xive irq=%u returns %d\n",
@@ -146,8 +146,8 @@ static int ics_rtas_set_affinity(struct irq_data *d,return -1 ; } - status =rtas_call (ibm_set_xive,3 ,1 ,NULL , - hw_irq, irq_server, xics_status[1 ]); + status =rtas_call_reentrant (ibm_set_xive,3 ,1 ,NULL , + hw_irq, irq_server, xics_status[1 ]);if (status) { printk(KERN_ERR "%s: ibm,set-xive irq=%u returns %d\n",
@@ -179,7 +179,7 @@ static int ics_rtas_map(struct ics *ics, unsigned int virq)return -EINVAL ;/* Check if RTAS knows about this interrupt */ - rc =rtas_call (ibm_get_xive,1 ,3 , status, hw_irq); + rc =rtas_call_reentrant (ibm_get_xive,1 ,3 , status, hw_irq);if (rc)return -ENXIO ;
@@ -198,7 +198,7 @@ static long ics_rtas_get_server(struct ics *ics, unsigned long vec) {int rc, status[2 ]; - rc =rtas_call (ibm_get_xive,1 ,3 , status, vec); + rc =rtas_call_reentrant (ibm_get_xive,1 ,3 , status, vec);if (rc)return -1 ;return status[0 ];
Signature · 1 line
2.25.4
Michael Ellerman
AppliedQuoted 9 lines · Leonardo Bras
Patch 2 implement
rtas_call_reentrant()for reentrant rtas-calls:
"ibm,int-on", "ibm,int-off",ibm,get-xive" and "ibm,set-xive", according to LoPAPR Version 1.1 (March 24, 2016).For that, it's necessary that every call uses a different rtas buffer (
rtas_args). Paul Mackerras suggested using the PACA structure for creating a per-cpu buffer for these calls.[...]
Applied to powerpc/next.
[1/2] powerpc/rtas: Move type/struct definitions from rtas.h into rtas-types.h
https://git.kernel.org/powerpc/c/783a015b747f606e803b798eb8b50c73c548691d [2/2] powerpc/rtas: Implement reentrant rtas call https://git.kernel.org/powerpc/c/b664db8e3f976d9233cc9ea5e3f8a8c0bcabeb48
cheers