| Message ID | 20231016062831.20630-4-jgross@suse.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 686464514fbebb6c8de4415238319e414c3500a4 |
| Headers | show |
| Series | xen/events: do some cleanups in events_base.c | expand |
On 16.10.23 09:28, Juergen Gross wrote: Hello Juergen > get_evtchn_to_irq() has only one external user while irq_from_evtchn() > provides the same functionality and is exported for a wider user base. > Modify the only external user of get_evtchn_to_irq() to use > irq_from_evtchn() instead and make get_evtchn_to_irq() static. > > evtchn_from_irq() and irq_from_virq() have a single external user and > can easily be combined to a new helper irq_evtchn_from_virq() allowing > to drop irq_from_virq() and to make evtchn_from_irq() static. > > Signed-off-by: Juergen Gross <jgross@suse.com> Reviewed-by: Oleksandr Tyshchenko <oleksandr_tyshchenko@epam.com> Two NITs *NOT* directly related to current patch below. > --- > drivers/xen/events/events_2l.c | 8 ++++---- > drivers/xen/events/events_base.c | 13 +++++++++---- > drivers/xen/events/events_internal.h | 1 - > include/xen/events.h | 4 ++-- > 4 files changed, 15 insertions(+), 11 deletions(-) > > diff --git a/drivers/xen/events/events_2l.c b/drivers/xen/events/events_2l.c > index b8f2f971c2f0..e3585330cf98 100644 > --- a/drivers/xen/events/events_2l.c > +++ b/drivers/xen/events/events_2l.c > @@ -171,11 +171,11 @@ static void evtchn_2l_handle_events(unsigned cpu, struct evtchn_loop_ctrl *ctrl) > int i; > struct shared_info *s = HYPERVISOR_shared_info; > struct vcpu_info *vcpu_info = __this_cpu_read(xen_vcpu); > + evtchn_port_t evtchn; > > /* Timer interrupt has highest priority. */ > - irq = irq_from_virq(cpu, VIRQ_TIMER); > + irq = irq_evtchn_from_virq(cpu, VIRQ_TIMER, &evtchn); > if (irq != -1) { > - evtchn_port_t evtchn = evtchn_from_irq(irq); Most users of evtchn_from_irq() check returned evtchn via VALID_EVTCHN() as it might be 0. But this user doesn't. > word_idx = evtchn / BITS_PER_LONG; > bit_idx = evtchn % BITS_PER_LONG; > if (active_evtchns(cpu, s, word_idx) & (1ULL << bit_idx)) > @@ -328,9 +328,9 @@ irqreturn_t xen_debug_interrupt(int irq, void *dev_id) > for (i = 0; i < EVTCHN_2L_NR_CHANNELS; i++) { > if (sync_test_bit(i, BM(sh->evtchn_pending))) { > int word_idx = i / BITS_PER_EVTCHN_WORD; > - printk(" %d: event %d -> irq %d%s%s%s\n", > + printk(" %d: event %d -> irq %u%s%s%s\n", checkpatch.pl says: WARNING: printk() should include KERN_<LEVEL> facility level #37: FILE: drivers/xen/events/events_2l.c:331: + printk(" %d: event %d -> irq %u%s%s%s\n", > cpu_from_evtchn(i), i, > - get_evtchn_to_irq(i), > + irq_from_evtchn(i), > sync_test_bit(word_idx, BM(&v->evtchn_pending_sel)) > ? "" : " l2-clear", > !sync_test_bit(i, BM(sh->evtchn_mask)) > [snip]
diff --git a/drivers/xen/events/events_2l.c b/drivers/xen/events/events_2l.c index b8f2f971c2f0..e3585330cf98 100644 --- a/drivers/xen/events/events_2l.c +++ b/drivers/xen/events/events_2l.c @@ -171,11 +171,11 @@ static void evtchn_2l_handle_events(unsigned cpu, struct evtchn_loop_ctrl *ctrl) int i; struct shared_info *s = HYPERVISOR_shared_info; struct vcpu_info *vcpu_info = __this_cpu_read(xen_vcpu); + evtchn_port_t evtchn; /* Timer interrupt has highest priority. */ - irq = irq_from_virq(cpu, VIRQ_TIMER); + irq = irq_evtchn_from_virq(cpu, VIRQ_TIMER, &evtchn); if (irq != -1) { - evtchn_port_t evtchn = evtchn_from_irq(irq); word_idx = evtchn / BITS_PER_LONG; bit_idx = evtchn % BITS_PER_LONG; if (active_evtchns(cpu, s, word_idx) & (1ULL << bit_idx)) @@ -328,9 +328,9 @@ irqreturn_t xen_debug_interrupt(int irq, void *dev_id) for (i = 0; i < EVTCHN_2L_NR_CHANNELS; i++) { if (sync_test_bit(i, BM(sh->evtchn_pending))) { int word_idx = i / BITS_PER_EVTCHN_WORD; - printk(" %d: event %d -> irq %d%s%s%s\n", + printk(" %d: event %d -> irq %u%s%s%s\n", cpu_from_evtchn(i), i, - get_evtchn_to_irq(i), + irq_from_evtchn(i), sync_test_bit(word_idx, BM(&v->evtchn_pending_sel)) ? "" : " l2-clear", !sync_test_bit(i, BM(sh->evtchn_mask)) diff --git a/drivers/xen/events/events_base.c b/drivers/xen/events/events_base.c index 1d797dd85d0e..97d71c5e7c28 100644 --- a/drivers/xen/events/events_base.c +++ b/drivers/xen/events/events_base.c @@ -246,7 +246,7 @@ static int set_evtchn_to_irq(evtchn_port_t evtchn, unsigned int irq) return 0; } -int get_evtchn_to_irq(evtchn_port_t evtchn) +static int get_evtchn_to_irq(evtchn_port_t evtchn) { if (evtchn >= xen_evtchn_max_channels()) return -1; @@ -412,7 +412,7 @@ static void xen_irq_info_cleanup(struct irq_info *info) /* * Accessors for packed IRQ information. */ -evtchn_port_t evtchn_from_irq(unsigned irq) +static evtchn_port_t evtchn_from_irq(unsigned int irq) { const struct irq_info *info = NULL; @@ -430,9 +430,14 @@ unsigned int irq_from_evtchn(evtchn_port_t evtchn) } EXPORT_SYMBOL_GPL(irq_from_evtchn); -int irq_from_virq(unsigned int cpu, unsigned int virq) +int irq_evtchn_from_virq(unsigned int cpu, unsigned int virq, + evtchn_port_t *evtchn) { - return per_cpu(virq_to_irq, cpu)[virq]; + int irq = per_cpu(virq_to_irq, cpu)[virq]; + + *evtchn = evtchn_from_irq(irq); + + return irq; } static enum ipi_vector ipi_from_irq(unsigned irq) diff --git a/drivers/xen/events/events_internal.h b/drivers/xen/events/events_internal.h index 4d3398eff9cd..19ae31695edc 100644 --- a/drivers/xen/events/events_internal.h +++ b/drivers/xen/events/events_internal.h @@ -33,7 +33,6 @@ struct evtchn_ops { extern const struct evtchn_ops *evtchn_ops; -int get_evtchn_to_irq(evtchn_port_t evtchn); void handle_irq_for_port(evtchn_port_t port, struct evtchn_loop_ctrl *ctrl); unsigned int cpu_from_evtchn(evtchn_port_t evtchn); diff --git a/include/xen/events.h b/include/xen/events.h index a129cafa80ed..3b07409f8032 100644 --- a/include/xen/events.h +++ b/include/xen/events.h @@ -100,8 +100,8 @@ void xen_poll_irq_timeout(int irq, u64 timeout); /* Determine the IRQ which is bound to an event channel */ unsigned int irq_from_evtchn(evtchn_port_t evtchn); -int irq_from_virq(unsigned int cpu, unsigned int virq); -evtchn_port_t evtchn_from_irq(unsigned irq); +int irq_evtchn_from_virq(unsigned int cpu, unsigned int virq, + evtchn_port_t *evtchn); int xen_set_callback_via(uint64_t via); int xen_evtchn_do_upcall(void);
get_evtchn_to_irq() has only one external user while irq_from_evtchn() provides the same functionality and is exported for a wider user base. Modify the only external user of get_evtchn_to_irq() to use irq_from_evtchn() instead and make get_evtchn_to_irq() static. evtchn_from_irq() and irq_from_virq() have a single external user and can easily be combined to a new helper irq_evtchn_from_virq() allowing to drop irq_from_virq() and to make evtchn_from_irq() static. Signed-off-by: Juergen Gross <jgross@suse.com> --- drivers/xen/events/events_2l.c | 8 ++++---- drivers/xen/events/events_base.c | 13 +++++++++---- drivers/xen/events/events_internal.h | 1 - include/xen/events.h | 4 ++-- 4 files changed, 15 insertions(+), 11 deletions(-)