Skip to contentSkip to conversation

Make bind_interdomain_evtchn_to_irq() public

PATCH In review [email protected] 2 participants 13 messages Aug 12, 2014 – Aug 13, 2014 Xen hypervisor interface

lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

PATCH 1/1 Make bind_interdomain_evtchn_to_irq() public

From: Juergen Gross <[email protected]>

bind_interdomain_evtchn_to_irq() is currently a private function. It is used only by bind_interdomain_evtchn_to_irqhandler() to register an irq-handler for an event channel.

By making it public it is possible to use e.g. threaded interrupts with interdomain event channels.

---
 drivers/xen/events/events_base.c | 5 +++--
 include/xen/events.h             | 2 ++
 2 files changed, 5 insertions(+), 2 deletions(-)
drivers/xen/events/events_base.c +3 -2
index c919d3d..0230aff 100644
@@ -900,8 +900,8 @@ static int bind_ipi_to_irq(unsigned int ipi, unsigned int cpu)
 	return irq;
 }
 
-static int bind_interdomain_evtchn_to_irq(unsigned int remote_domain,
-					  unsigned int remote_port)
+int bind_interdomain_evtchn_to_irq(unsigned int remote_domain,
+				   unsigned int remote_port)
 {
 	struct evtchn_bind_interdomain bind_interdomain;
 	int err;
@@ -914,6 +914,7 @@ static int bind_interdomain_evtchn_to_irq(unsigned int remote_domain,
 
 	return err ? : bind_evtchn_to_irq(bind_interdomain.local_port);
 }
+EXPORT_SYMBOL_GPL(bind_interdomain_evtchn_to_irq);
 
 static int find_virq(unsigned int virq, unsigned int cpu)
 {
include/xen/events.h +2 -0
index 8bee7a7..5321cd9 100644
@@ -28,6 +28,8 @@ int bind_ipi_to_irqhandler(enum ipi_vector ipi,
 			   unsigned long irqflags,
 			   const char *devname,
 			   void *dev_id);
+int bind_interdomain_evtchn_to_irq(unsigned int remote_domain,
+				   unsigned int remote_port);
 int bind_interdomain_evtchn_to_irqhandler(unsigned int remote_domain,
 					  unsigned int remote_port,
 					  irq_handler_t handler,
Signature · 1 line
1.8.4.5
#1 lore raw
Quoted 8 lines · On 12/08/14 14:43, [email protected] wrote:

From: Juergen Gross <[email protected]>

bind_interdomain_evtchn_to_irq() is currently a private function. It is used only by bind_interdomain_evtchn_to_irqhandler() to register an irq-handler for an event channel.

By making it public it is possible to use e.g. threaded interrupts with interdomain event channels.

Can you give an example of using this? Maybe we want a bind_interdomain_evtchn_to_threaded_irqhandler() instead? Or add a flags field to the existing function.

David

Quoted 35 lines
drivers/xen/events/events_base.c +3 -2
@@ -900,8 +900,8 @@ static int bind_ipi_to_irq(unsigned int ipi, unsigned int cpu)
 	return irq;
 }
 
-static int bind_interdomain_evtchn_to_irq(unsigned int remote_domain,
-					  unsigned int remote_port)
+int bind_interdomain_evtchn_to_irq(unsigned int remote_domain,
+				   unsigned int remote_port)
 {
 	struct evtchn_bind_interdomain bind_interdomain;
 	int err;
@@ -914,6 +914,7 @@ static int bind_interdomain_evtchn_to_irq(unsigned int remote_domain,
 
 	return err ? : bind_evtchn_to_irq(bind_interdomain.local_port);
 }
+EXPORT_SYMBOL_GPL(bind_interdomain_evtchn_to_irq);
 
 static int find_virq(unsigned int virq, unsigned int cpu)
 {
include/xen/events.h +2 -0
index 8bee7a7..5321cd9 100644
@@ -28,6 +28,8 @@ int bind_ipi_to_irqhandler(enum ipi_vector ipi,
 			   unsigned long irqflags,
 			   const char *devname,
 			   void *dev_id);
+int bind_interdomain_evtchn_to_irq(unsigned int remote_domain,
+				   unsigned int remote_port);
 int bind_interdomain_evtchn_to_irqhandler(unsigned int remote_domain,
 					  unsigned int remote_port,
 					  irq_handler_t handler,
author maintainer
#2 lore raw
Quoted 7 lines · David Vrabel
Quoted 6 lines · On 12/08/14 14:43, [email protected] wrote:

From: Juergen Gross <[email protected]>

bind_interdomain_evtchn_to_irq() is currently a private function. It is used only by bind_interdomain_evtchn_to_irqhandler() to register an irq-handler for an event channel.

Quoted 6 lines
Quoted 2 lines

By making it public it is possible to use e.g. threaded interrupts with interdomain event channels.

Can you give an example of using this? Maybe we want a bind_interdomain_evtchn_to_threaded_irqhandler() instead? Or add a flags field to the existing function.

Instead of

static int scsiback_schedule(void *data)

{
       struct vscsibk_info *info = (struct vscsibk_info *)data;

       while (!kthread_should_stop()) {
               wait_event_interruptible(info->wq,
                       info->waiting_reqs || kthread_should_stop());

               info->waiting_reqs = 0;
               smp_mb();       /* waiting_reqs used by other thread */

               switch (scsiback_do_cmd_fn(info)) {
               case 1:
                       info->waiting_reqs = 1;
               default:
                       break;
               }
               cond_resched();
       }
       return 0;
}

static void scsiback_notify_work(struct vscsibk_info *info)

{
       info->waiting_reqs = 1;
       wake_up(&info->wq);
}

static irqreturn_t scsiback_intr(int irq, void *dev_id)

{
       scsiback_notify_work((struct vscsibk_info *)dev_id);
       return IRQ_HANDLED;
}

static int scsiback_init_sring(struct vscsibk_info *info, grant_ref_t ring_ref,
evtchn_port_t evtchn)
{
...

       bind_interdomain_evtchn_to_irqhandler(
                       info->domid, evtchn,
                       scsiback_intr, 0, "vscsiif-backend", info);

...

       info->kthread = kthread_run(scsiback_schedule, info, name);

...
}

I only need the following:

static irqreturn_t scsiback_irq_fn(int irq, void *dev_id)

{
        struct vscsibk_info *info = dev_id;

        while (scsiback_do_cmd_fn(info))
                cond_resched();

        return IRQ_HANDLED;
}

static int scsiback_init_sring(struct vscsibk_info *info, grant_ref_t ring_ref,
evtchn_port_t evtchn)
{
...
irq = bind_interdomain_evtchn_to_irq(info->domid, evtchn); request_threaded_irq(irq, NULL, scsiback_irq_fn,
IRQF_ONESHOT, "vscsiif-backend", info)
...
}

So yes, it could be done via a flag, too.

Juergen

author maintainer
#3 lore raw
In reply to David Vrabel
Quoted 7 lines · David Vrabel
Quoted 6 lines · On 12/08/14 14:43, [email protected] wrote:

From: Juergen Gross <[email protected]>

bind_interdomain_evtchn_to_irq() is currently a private function. It is used only by bind_interdomain_evtchn_to_irqhandler() to register an irq-handler for an event channel.

Quoted 6 lines
Quoted 2 lines

By making it public it is possible to use e.g. threaded interrupts with interdomain event channels.

Can you give an example of using this? Maybe we want a bind_interdomain_evtchn_to_threaded_irqhandler() instead? Or add a flags field to the existing function.

Instead of

static int scsiback_schedule(void *data)

{
       struct vscsibk_info *info = (struct vscsibk_info *)data;

       while (!kthread_should_stop()) {
               wait_event_interruptible(info->wq,
                       info->waiting_reqs || kthread_should_stop());

               info->waiting_reqs = 0;
               smp_mb();       /* waiting_reqs used by other thread */

               switch (scsiback_do_cmd_fn(info)) {
               case 1:
                       info->waiting_reqs = 1;
               default:
                       break;
               }
               cond_resched();
       }
       return 0;
}

static void scsiback_notify_work(struct vscsibk_info *info)

{
       info->waiting_reqs = 1;
       wake_up(&info->wq);
}

static irqreturn_t scsiback_intr(int irq, void *dev_id)

{
       scsiback_notify_work((struct vscsibk_info *)dev_id);
       return IRQ_HANDLED;
}

static int scsiback_init_sring(struct vscsibk_info *info, grant_ref_t ring_ref,
evtchn_port_t evtchn)
{
...

       bind_interdomain_evtchn_to_irqhandler(
                       info->domid, evtchn,
                       scsiback_intr, 0, "vscsiif-backend", info);

...

       info->kthread = kthread_run(scsiback_schedule, info, name);

...
}

I only need the following:

static irqreturn_t scsiback_irq_fn(int irq, void *dev_id)

{
        struct vscsibk_info *info = dev_id;

        while (scsiback_do_cmd_fn(info))
                cond_resched();

        return IRQ_HANDLED;
}

static int scsiback_init_sring(struct vscsibk_info *info, grant_ref_t ring_ref,
evtchn_port_t evtchn)
{
...
irq = bind_interdomain_evtchn_to_irq(info->domid, evtchn); request_threaded_irq(irq, NULL, scsiback_irq_fn,
IRQF_ONESHOT, "vscsiif-backend", info)
...
}

So yes, it could be done via a flag, too.

Juergen

#4 lore raw
Quoted 10 lines · Juergen Gross

static int scsiback_init_sring(struct vscsibk_info *info, grant_ref_t ring_ref,
evtchn_port_t evtchn)
{
...
irq = bind_interdomain_evtchn_to_irq(info->domid, evtchn); request_threaded_irq(irq, NULL, scsiback_irq_fn,
IRQF_ONESHOT, "vscsiif-backend", info)
...

This usage is fine.

I assume the error checking of bind_interdomain_evtchn_to_irq() and request_threaded_irq() was omitted for clarity in this example?

David

author maintainer
#5 lore raw
Quoted 12 lines · David Vrabel
Quoted 10 lines · Juergen Gross

static int scsiback_init_sring(struct vscsibk_info *info, grant_ref_t ring_ref,
evtchn_port_t evtchn)
{
...
irq = bind_interdomain_evtchn_to_irq(info->domid, evtchn); request_threaded_irq(irq, NULL, scsiback_irq_fn,
IRQF_ONESHOT, "vscsiif-backend", info)
...

Quoted 4 lines

This usage is fine.

I assume the error checking of bind_interdomain_evtchn_to_irq() and request_threaded_irq() was omitted for clarity in this example?

Sure.

Juergen

author maintainer
#6 lore raw
In reply to David Vrabel
Quoted 12 lines · David Vrabel
Quoted 10 lines · Juergen Gross

static int scsiback_init_sring(struct vscsibk_info *info, grant_ref_t ring_ref,
evtchn_port_t evtchn)
{
...
irq = bind_interdomain_evtchn_to_irq(info->domid, evtchn); request_threaded_irq(irq, NULL, scsiback_irq_fn,
IRQF_ONESHOT, "vscsiif-backend", info)
...

Quoted 4 lines

This usage is fine.

I assume the error checking of bind_interdomain_evtchn_to_irq() and request_threaded_irq() was omitted for clarity in this example?

Sure.

Juergen

#7 lore raw
In reply to Juergen Gross
Quoted 10 lines · Juergen Gross

static int scsiback_init_sring(struct vscsibk_info *info, grant_ref_t ring_ref,
evtchn_port_t evtchn)
{
...
irq = bind_interdomain_evtchn_to_irq(info->domid, evtchn); request_threaded_irq(irq, NULL, scsiback_irq_fn,
IRQF_ONESHOT, "vscsiif-backend", info)
...

This usage is fine.

I assume the error checking of bind_interdomain_evtchn_to_irq() and request_threaded_irq() was omitted for clarity in this example?

David

#8 lore raw
In reply to [email protected]
Quoted 8 lines · On 12/08/14 14:43, [email protected] wrote:

From: Juergen Gross <[email protected]>

bind_interdomain_evtchn_to_irq() is currently a private function. It is used only by bind_interdomain_evtchn_to_irqhandler() to register an irq-handler for an event channel.

By making it public it is possible to use e.g. threaded interrupts with interdomain event channels.

Can you give an example of using this? Maybe we want a bind_interdomain_evtchn_to_threaded_irqhandler() instead? Or add a flags field to the existing function.

David

Quoted 35 lines
drivers/xen/events/events_base.c +3 -2
@@ -900,8 +900,8 @@ static int bind_ipi_to_irq(unsigned int ipi, unsigned int cpu)
 	return irq;
 }
 
-static int bind_interdomain_evtchn_to_irq(unsigned int remote_domain,
-					  unsigned int remote_port)
+int bind_interdomain_evtchn_to_irq(unsigned int remote_domain,
+				   unsigned int remote_port)
 {
 	struct evtchn_bind_interdomain bind_interdomain;
 	int err;
@@ -914,6 +914,7 @@ static int bind_interdomain_evtchn_to_irq(unsigned int remote_domain,
 
 	return err ? : bind_evtchn_to_irq(bind_interdomain.local_port);
 }
+EXPORT_SYMBOL_GPL(bind_interdomain_evtchn_to_irq);
 
 static int find_virq(unsigned int virq, unsigned int cpu)
 {
include/xen/events.h +2 -0
index 8bee7a7..5321cd9 100644
@@ -28,6 +28,8 @@ int bind_ipi_to_irqhandler(enum ipi_vector ipi,
 			   unsigned long irqflags,
 			   const char *devname,
 			   void *dev_id);
+int bind_interdomain_evtchn_to_irq(unsigned int remote_domain,
+				   unsigned int remote_port);
 int bind_interdomain_evtchn_to_irqhandler(unsigned int remote_domain,
 					  unsigned int remote_port,
 					  irq_handler_t handler,
Acked-by on v1 1/1
#9 lore raw
In reply to [email protected]
Quoted 8 lines · On 12/08/14 14:43, [email protected] wrote:

From: Juergen Gross <[email protected]>

bind_interdomain_evtchn_to_irq() is currently a private function. It is used only by bind_interdomain_evtchn_to_irqhandler() to register an irq-handler for an event channel.

By making it public it is possible to use e.g. threaded interrupts with interdomain event channels.

But can you change the subject/commit message to:

    xen/events: support threaded irqs for interdomain event channels

    Export bind_interdomain_evtchn_to_irq() so drivers can use threaded
    interrupt handlers with:

     irq = bind_interdomain_evtchn_to_irq(remote_dom, remote_port);
     if (irq < 0)
         /* error */
     ret = request_threaded_irq(...);

Since your pvscsi series depends on this you will want to add this to that series to be merged via the scsi tree.

David

author maintainer
#10 lore raw
Quoted 24 lines · David Vrabel
Quoted 8 lines · On 12/08/14 14:43, [email protected] wrote:

From: Juergen Gross <[email protected]>

bind_interdomain_evtchn_to_irq() is currently a private function. It is used only by bind_interdomain_evtchn_to_irqhandler() to register an irq-handler for an event channel.

By making it public it is possible to use e.g. threaded interrupts with interdomain event channels.

But can you change the subject/commit message to:

     xen/events: support threaded irqs for interdomain event channels

     Export bind_interdomain_evtchn_to_irq() so drivers can use threaded
     interrupt handlers with:

      irq = bind_interdomain_evtchn_to_irq(remote_dom, remote_port);
      if (irq < 0)
          /* error */
      ret = request_threaded_irq(...);
Quoted 2 lines

Since your pvscsi series depends on this you will want to add this to that series to be merged via the scsi tree.

Already done locally. :-)

Juergen

author maintainer
#11 lore raw
In reply to David Vrabel
Quoted 24 lines · David Vrabel
Quoted 8 lines · On 12/08/14 14:43, [email protected] wrote:

From: Juergen Gross <[email protected]>

bind_interdomain_evtchn_to_irq() is currently a private function. It is used only by bind_interdomain_evtchn_to_irqhandler() to register an irq-handler for an event channel.

By making it public it is possible to use e.g. threaded interrupts with interdomain event channels.

But can you change the subject/commit message to:

     xen/events: support threaded irqs for interdomain event channels

     Export bind_interdomain_evtchn_to_irq() so drivers can use threaded
     interrupt handlers with:

      irq = bind_interdomain_evtchn_to_irq(remote_dom, remote_port);
      if (irq < 0)
          /* error */
      ret = request_threaded_irq(...);
Quoted 2 lines

Since your pvscsi series depends on this you will want to add this to that series to be merged via the scsi tree.

Already done locally. :-)

Juergen

Acked-by on v1 1/1
#12 lore raw
In reply to [email protected]
Quoted 8 lines · On 12/08/14 14:43, [email protected] wrote:

From: Juergen Gross <[email protected]>

bind_interdomain_evtchn_to_irq() is currently a private function. It is used only by bind_interdomain_evtchn_to_irqhandler() to register an irq-handler for an event channel.

By making it public it is possible to use e.g. threaded interrupts with interdomain event channels.

But can you change the subject/commit message to:

    xen/events: support threaded irqs for interdomain event channels

    Export bind_interdomain_evtchn_to_irq() so drivers can use threaded
    interrupt handlers with:

     irq = bind_interdomain_evtchn_to_irq(remote_dom, remote_port);
     if (irq < 0)
         /* error */
     ret = request_threaded_irq(...);

Since your pvscsi series depends on this you will want to add this to that series to be merged via the scsi tree.

David