Re: [PATCH 1/2] arch/irq: Make irq_ack_none() mandatory

["Oleksii K." <oleksii.kurochko@xxxxxxxxx>]

On Thu, 2024-05-30 at 19:40 +0100, Andrew Cooper wrote:
> Any non-stub implementation of these is going to have to do something
> here.
> 
> irq_end_none() is more complicated and has arch-specific interactions
> with
> irq_ack_none(), so make it optional.
> 
> For PPC, introduce a stub irq_ack_none().
> 
> For ARM and x86, export the existing {ack,end}_none() helpers,
> gaining an irq_
> prefix for consisntency with everything else in no_irq_type.
> 
> No functional change.
> 
> Signed-off-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
LGTM: Reviewed-by: Oleksii Kurochko <oleksii.kurochko@xxxxxxxxx>

~ Oleksii
> ---
> CC: Jan Beulich <JBeulich@xxxxxxxx>
> CC: Roger Pau Monné <roger.pau@xxxxxxxxxx>
> CC: Stefano Stabellini <sstabellini@xxxxxxxxxx>
> CC: Julien Grall <julien@xxxxxxx>
> CC: Volodymyr Babchuk <Volodymyr_Babchuk@xxxxxxxx>
> CC: Bertrand Marquis <bertrand.marquis@xxxxxxx>
> CC: Oleksii Kurochko <oleksii.kurochko@xxxxxxxxx>
> CC: Shawn Anastasio <sanastasio@xxxxxxxxxxxxxxxxxxxxx>
> ---
>  xen/arch/arm/include/asm/irq.h | 3 +++
>  xen/arch/arm/irq.c             | 8 ++++----
>  xen/arch/ppc/stubs.c           | 6 ++++++
>  xen/arch/x86/irq.c             | 4 ++--
>  xen/include/xen/irq.h          | 6 ++++++
>  5 files changed, 21 insertions(+), 6 deletions(-)
> 
> diff --git a/xen/arch/arm/include/asm/irq.h
> b/xen/arch/arm/include/asm/irq.h
> index 1bae5388878e..ec437add0971 100644
> --- a/xen/arch/arm/include/asm/irq.h
> +++ b/xen/arch/arm/include/asm/irq.h
> @@ -98,6 +98,9 @@ void irq_set_affinity(struct irq_desc *desc, const
> cpumask_t *mask);
>   */
>  bool irq_type_set_by_domain(const struct domain *d);
>  
> +void irq_end_none(struct irq_desc *irq);
> +#define irq_end_none irq_end_none
> +
>  #endif /* _ASM_HW_IRQ_H */
>  /*
>   * Local variables:
> diff --git a/xen/arch/arm/irq.c b/xen/arch/arm/irq.c
> index bcce80a4d624..7138f9e7c283 100644
> --- a/xen/arch/arm/irq.c
> +++ b/xen/arch/arm/irq.c
> @@ -31,12 +31,12 @@ struct irq_guest
>      unsigned int virq;
>  };
>  
> -static void ack_none(struct irq_desc *irq)
> +void irq_ack_none(struct irq_desc *irq)
>  {
>      printk("unexpected IRQ trap at irq %02x\n", irq->irq);
>  }
>  
> -static void end_none(struct irq_desc *irq)
> +void irq_end_none(struct irq_desc *irq)
>  {
>      /*
>       * Still allow a CPU to end an interrupt if we receive a
> spurious
> @@ -51,8 +51,8 @@ hw_irq_controller no_irq_type = {
>      .shutdown = irq_shutdown_none,
>      .enable = irq_enable_none,
>      .disable = irq_disable_none,
> -    .ack = ack_none,
> -    .end = end_none
> +    .ack = irq_ack_none,
> +    .end = irq_end_none
>  };
>  
>  static irq_desc_t irq_desc[NR_IRQS];
> diff --git a/xen/arch/ppc/stubs.c b/xen/arch/ppc/stubs.c
> index da193839bd09..4e03428e071a 100644
> --- a/xen/arch/ppc/stubs.c
> +++ b/xen/arch/ppc/stubs.c
> @@ -134,12 +134,18 @@ void pirq_set_affinity(struct domain *d, int
> pirq, const cpumask_t *mask)
>      BUG_ON("unimplemented");
>  }
>  
> +void irq_ack_none(struct irq_desc *desc)
> +{
> +    BUG_ON("unimplemented");
> +}
> +
>  hw_irq_controller no_irq_type = {
>      .typename = "none",
>      .startup = irq_startup_none,
>      .shutdown = irq_shutdown_none,
>      .enable = irq_enable_none,
>      .disable = irq_disable_none,
> +    .ack = irq_ack_none,
>  };
>  
>  int arch_init_one_irq_desc(struct irq_desc *desc)
> diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c
> index c16205a9beb6..cfd7a08479d2 100644
> --- a/xen/arch/x86/irq.c
> +++ b/xen/arch/x86/irq.c
> @@ -467,7 +467,7 @@ int __init init_irq_data(void)
>      return 0;
>  }
>  
> -static void cf_check ack_none(struct irq_desc *desc)
> +void cf_check irq_ack_none(struct irq_desc *desc)
>  {
>      ack_bad_irq(desc->irq);
>  }
> @@ -478,7 +478,7 @@ hw_irq_controller no_irq_type = {
>      irq_shutdown_none,
>      irq_enable_none,
>      irq_disable_none,
> -    ack_none,
> +    irq_ack_none,
>  };
>  
>  static vmask_t *irq_get_used_vector_mask(int irq)
> diff --git a/xen/include/xen/irq.h b/xen/include/xen/irq.h
> index 89f7a8317a87..b71f65db8621 100644
> --- a/xen/include/xen/irq.h
> +++ b/xen/include/xen/irq.h
> @@ -130,6 +130,12 @@ void cf_check irq_actor_none(struct irq_desc
> *desc);
>  #define irq_disable_none irq_actor_none
>  #define irq_enable_none irq_actor_none
>  
> +/*
> + * irq_ack_none() must be provided by the architecture.
> + * irq_end_none() is optional, and opted into using a define.
> + */
> +void irq_ack_none(struct irq_desc *irq);
> +
>  /*
>   * Per-cpu interrupted context register state - the inner-most
> interrupt frame
>   * on the stack.