* [PATCH 0/7 um: IRQ handling cleanups
@ 2020-11-23 19:56 Johannes Berg
2020-11-23 19:56 ` [PATCH 1/7] um: support dynamic IRQ allocation Johannes Berg
` (8 more replies)
0 siblings, 9 replies; 42+ messages in thread
From: Johannes Berg @ 2020-11-23 19:56 UTC (permalink / raw)
To: linux-um
The IRQ code seems very confusing, but now that I've had to dig
through it, I've come up with a number of cleanups. Really what
I wanted was suspend/resume support (next series), but this is
all necessary for that, in particular for virtio resume support
(still WIP).
johannes
_______________________________________________
linux-um mailing list
linux-um@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-um
^ permalink raw reply [flat|nested] 42+ messages in thread
* [PATCH 1/7] um: support dynamic IRQ allocation
2020-11-23 19:56 [PATCH 0/7 um: IRQ handling cleanups Johannes Berg
@ 2020-11-23 19:56 ` Johannes Berg
2020-11-30 11:26 ` Anton Ivanov
2020-11-23 19:56 ` [PATCH 2/7] um: virtio: use " Johannes Berg
` (7 subsequent siblings)
8 siblings, 1 reply; 42+ messages in thread
From: Johannes Berg @ 2020-11-23 19:56 UTC (permalink / raw)
To: linux-um; +Cc: Johannes Berg
From: Johannes Berg <johannes.berg@intel.com>
It's cumbersome and error-prone to keep adding fixed IRQ numbers,
and for proper device wakeup support for the virtio/vhost-user
support we need to have different IRQs for each device. Even if
in theory two IRQs (with and without wake) might be sufficient,
it's much easier to reason about it when we have dynamic number
assignment. It also makes it easier to add new devices that may
dynamically exist or depending on the configuration, etc.
Add support for this, up to 64 IRQs (the same limit as epoll FDs
we have right now). Since it's not easy to port all the existing
places to dynamic allocation (some data is statically initialized)
keep the low numbers are reserved for the existing hard-coded IRQ
numbers.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
arch/um/drivers/line.c | 18 ++++++++++-----
arch/um/drivers/mconsole_kern.c | 2 +-
arch/um/drivers/net_kern.c | 2 +-
arch/um/drivers/port_kern.c | 4 ++--
arch/um/drivers/random.c | 2 +-
arch/um/drivers/ubd_kern.c | 2 +-
arch/um/drivers/vector_kern.c | 4 ++--
arch/um/drivers/virtio_uml.c | 4 ++--
arch/um/drivers/xterm_kern.c | 2 +-
arch/um/include/asm/irq.h | 6 ++---
arch/um/include/shared/irq_kern.h | 12 +++++-----
arch/um/kernel/irq.c | 37 ++++++++++++++++++++++++++-----
arch/um/kernel/sigio.c | 2 +-
13 files changed, 65 insertions(+), 32 deletions(-)
diff --git a/arch/um/drivers/line.c b/arch/um/drivers/line.c
index 14ad9f495fe6..2d68f58ac54b 100644
--- a/arch/um/drivers/line.c
+++ b/arch/um/drivers/line.c
@@ -262,19 +262,25 @@ static irqreturn_t line_write_interrupt(int irq, void *data)
int line_setup_irq(int fd, int input, int output, struct line *line, void *data)
{
const struct line_driver *driver = line->driver;
- int err = 0;
+ int err;
- if (input)
+ if (input) {
err = um_request_irq(driver->read_irq, fd, IRQ_READ,
line_interrupt, IRQF_SHARED,
driver->read_irq_name, data);
- if (err)
- return err;
- if (output)
+ if (err < 0)
+ return err;
+ }
+
+ if (output) {
err = um_request_irq(driver->write_irq, fd, IRQ_WRITE,
line_write_interrupt, IRQF_SHARED,
driver->write_irq_name, data);
- return err;
+ if (err < 0)
+ return err;
+ }
+
+ return 0;
}
static int line_activate(struct tty_port *port, struct tty_struct *tty)
diff --git a/arch/um/drivers/mconsole_kern.c b/arch/um/drivers/mconsole_kern.c
index a2e680f7d39f..6d00af25ec6b 100644
--- a/arch/um/drivers/mconsole_kern.c
+++ b/arch/um/drivers/mconsole_kern.c
@@ -738,7 +738,7 @@ static int __init mconsole_init(void)
err = um_request_irq(MCONSOLE_IRQ, sock, IRQ_READ, mconsole_interrupt,
IRQF_SHARED, "mconsole", (void *)sock);
- if (err) {
+ if (err < 0) {
printk(KERN_ERR "Failed to get IRQ for management console\n");
goto out;
}
diff --git a/arch/um/drivers/net_kern.c b/arch/um/drivers/net_kern.c
index 1802cf4ef5a5..2fc0b038ff8a 100644
--- a/arch/um/drivers/net_kern.c
+++ b/arch/um/drivers/net_kern.c
@@ -160,7 +160,7 @@ static int uml_net_open(struct net_device *dev)
err = um_request_irq(dev->irq, lp->fd, IRQ_READ, uml_net_interrupt,
IRQF_SHARED, dev->name, dev);
- if (err != 0) {
+ if (err < 0) {
printk(KERN_ERR "uml_net_open: failed to get irq(%d)\n", err);
err = -ENETUNREACH;
goto out_close;
diff --git a/arch/um/drivers/port_kern.c b/arch/um/drivers/port_kern.c
index a47ca5376d9d..efa8b7304090 100644
--- a/arch/um/drivers/port_kern.c
+++ b/arch/um/drivers/port_kern.c
@@ -100,7 +100,7 @@ static int port_accept(struct port_list *port)
.port = port });
if (um_request_irq(TELNETD_IRQ, socket[0], IRQ_READ, pipe_interrupt,
- IRQF_SHARED, "telnetd", conn)) {
+ IRQF_SHARED, "telnetd", conn) < 0) {
printk(KERN_ERR "port_accept : failed to get IRQ for "
"telnetd\n");
goto out_free;
@@ -182,7 +182,7 @@ void *port_data(int port_num)
}
if (um_request_irq(ACCEPT_IRQ, fd, IRQ_READ, port_interrupt,
- IRQF_SHARED, "port", port)) {
+ IRQF_SHARED, "port", port) < 0) {
printk(KERN_ERR "Failed to get IRQ for port %d\n", port_num);
goto out_close;
}
diff --git a/arch/um/drivers/random.c b/arch/um/drivers/random.c
index ce115fce52f0..385cb08d7ec2 100644
--- a/arch/um/drivers/random.c
+++ b/arch/um/drivers/random.c
@@ -129,7 +129,7 @@ static int __init rng_init (void)
err = um_request_irq(RANDOM_IRQ, random_fd, IRQ_READ, random_interrupt,
0, "random", NULL);
- if (err)
+ if (err < 0)
goto err_out_cleanup_hw;
sigio_broken(random_fd, 1);
diff --git a/arch/um/drivers/ubd_kern.c b/arch/um/drivers/ubd_kern.c
index eae8c83364f7..d4c39e595c72 100644
--- a/arch/um/drivers/ubd_kern.c
+++ b/arch/um/drivers/ubd_kern.c
@@ -1204,7 +1204,7 @@ static int __init ubd_driver_init(void){
}
err = um_request_irq(UBD_IRQ, thread_fd, IRQ_READ, ubd_intr,
0, "ubd", ubd_devs);
- if(err != 0)
+ if(err < 0)
printk(KERN_ERR "um_request_irq failed - errno = %d\n", -err);
return 0;
}
diff --git a/arch/um/drivers/vector_kern.c b/arch/um/drivers/vector_kern.c
index 555203e3e7b4..e78a54ea72a4 100644
--- a/arch/um/drivers/vector_kern.c
+++ b/arch/um/drivers/vector_kern.c
@@ -1271,7 +1271,7 @@ static int vector_net_open(struct net_device *dev)
irq_rr + VECTOR_BASE_IRQ, vp->fds->rx_fd,
IRQ_READ, vector_rx_interrupt,
IRQF_SHARED, dev->name, dev);
- if (err != 0) {
+ if (err < 0) {
netdev_err(dev, "vector_open: failed to get rx irq(%d)\n", err);
err = -ENETUNREACH;
goto out_close;
@@ -1286,7 +1286,7 @@ static int vector_net_open(struct net_device *dev)
irq_rr + VECTOR_BASE_IRQ, vp->fds->tx_fd,
IRQ_WRITE, vector_tx_interrupt,
IRQF_SHARED, dev->name, dev);
- if (err != 0) {
+ if (err < 0) {
netdev_err(dev,
"vector_open: failed to get tx irq(%d)\n", err);
err = -ENETUNREACH;
diff --git a/arch/um/drivers/virtio_uml.c b/arch/um/drivers/virtio_uml.c
index a6c4bb6c2c01..f76b8da28d20 100644
--- a/arch/um/drivers/virtio_uml.c
+++ b/arch/um/drivers/virtio_uml.c
@@ -412,7 +412,7 @@ static int vhost_user_init_slave_req(struct virtio_uml_device *vu_dev)
rc = um_request_irq(VIRTIO_IRQ, vu_dev->req_fd, IRQ_READ,
vu_req_interrupt, IRQF_SHARED,
vu_dev->pdev->name, vu_dev);
- if (rc)
+ if (rc < 0)
goto err_close;
rc = vhost_user_send_no_payload_fd(vu_dev, VHOST_USER_SET_SLAVE_REQ_FD,
@@ -854,7 +854,7 @@ static int vu_setup_vq_call_fd(struct virtio_uml_device *vu_dev,
info->call_fd = call_fds[0];
rc = um_request_irq(VIRTIO_IRQ, info->call_fd, IRQ_READ,
vu_interrupt, IRQF_SHARED, info->name, vq);
- if (rc)
+ if (rc < 0)
goto close_both;
rc = vhost_user_set_vring_call(vu_dev, vq->index, call_fds[1]);
diff --git a/arch/um/drivers/xterm_kern.c b/arch/um/drivers/xterm_kern.c
index d64ef6d0d463..50f11b7b4774 100644
--- a/arch/um/drivers/xterm_kern.c
+++ b/arch/um/drivers/xterm_kern.c
@@ -51,7 +51,7 @@ int xterm_fd(int socket, int *pid_out)
err = um_request_irq(XTERM_IRQ, socket, IRQ_READ, xterm_interrupt,
IRQF_SHARED, "xterm", data);
- if (err) {
+ if (err < 0) {
printk(KERN_ERR "xterm_fd : failed to get IRQ for xterm, "
"err = %d\n", err);
ret = err;
diff --git a/arch/um/include/asm/irq.h b/arch/um/include/asm/irq.h
index 42c6205e2dc4..b6fa6301c75b 100644
--- a/arch/um/include/asm/irq.h
+++ b/arch/um/include/asm/irq.h
@@ -24,14 +24,14 @@
#define VECTOR_BASE_IRQ (VIRTIO_IRQ + 1)
#define VECTOR_IRQ_SPACE 8
-#define LAST_IRQ (VECTOR_IRQ_SPACE + VECTOR_BASE_IRQ - 1)
+#define UM_FIRST_DYN_IRQ (VECTOR_IRQ_SPACE + VECTOR_BASE_IRQ)
#else
-#define LAST_IRQ VIRTIO_IRQ
+#define UM_FIRST_DYN_IRQ (VIRTIO_IRQ + 1)
#endif
-#define NR_IRQS (LAST_IRQ + 1)
+#define NR_IRQS 64
#endif
diff --git a/arch/um/include/shared/irq_kern.h b/arch/um/include/shared/irq_kern.h
index 7cd1a10c6244..7c04a0fd3a27 100644
--- a/arch/um/include/shared/irq_kern.h
+++ b/arch/um/include/shared/irq_kern.h
@@ -9,10 +9,10 @@
#include <linux/interrupt.h>
#include <asm/ptrace.h>
-extern int um_request_irq(unsigned int irq, int fd, int type,
- irq_handler_t handler,
- unsigned long irqflags, const char * devname,
- void *dev_id);
-void um_free_irq(unsigned int irq, void *dev);
-#endif
+#define UM_IRQ_ALLOC -1
+int um_request_irq(int irq, int fd, int type, irq_handler_t handler,
+ unsigned long irqflags, const char * devname,
+ void *dev_id);
+void um_free_irq(int irq, void *dev_id);
+#endif
diff --git a/arch/um/kernel/irq.c b/arch/um/kernel/irq.c
index 3577118bb4a5..b94c72f56617 100644
--- a/arch/um/kernel/irq.c
+++ b/arch/um/kernel/irq.c
@@ -19,6 +19,7 @@
#include <kern_util.h>
#include <os.h>
#include <irq_user.h>
+#include <irq_kern.h>
extern void free_irqs(void);
@@ -38,6 +39,7 @@ struct irq_entry {
static struct irq_entry *active_fds;
static DEFINE_SPINLOCK(irq_lock);
+static DECLARE_BITMAP(irqs_allocated, NR_IRQS);
static void irq_io_loop(struct irq_fd *irq, struct uml_pt_regs *regs)
{
@@ -421,27 +423,52 @@ unsigned int do_IRQ(int irq, struct uml_pt_regs *regs)
return 1;
}
-void um_free_irq(unsigned int irq, void *dev)
+void um_free_irq(int irq, void *dev)
{
+ if (WARN(irq < 0 || irq > NR_IRQS, "freeing invalid irq %d", irq))
+ return;
+
free_irq_by_irq_and_dev(irq, dev);
free_irq(irq, dev);
+ clear_bit(irq, irqs_allocated);
}
EXPORT_SYMBOL(um_free_irq);
-int um_request_irq(unsigned int irq, int fd, int type,
+int um_request_irq(int irq, int fd, int type,
irq_handler_t handler,
unsigned long irqflags, const char * devname,
void *dev_id)
{
int err;
+ if (irq == UM_IRQ_ALLOC) {
+ int i;
+
+ for (i = UM_FIRST_DYN_IRQ; i < NR_IRQS; i++) {
+ if (!test_and_set_bit(i, irqs_allocated)) {
+ irq = i;
+ break;
+ }
+ }
+ }
+
+ if (irq < 0)
+ return -ENOSPC;
+
if (fd != -1) {
err = activate_fd(irq, fd, type, dev_id);
if (err)
- return err;
+ goto error;
}
- return request_irq(irq, handler, irqflags, devname, dev_id);
+ err = request_irq(irq, handler, irqflags, devname, dev_id);
+ if (err < 0)
+ goto error;
+
+ return irq;
+error:
+ clear_bit(irq, irqs_allocated);
+ return err;
}
EXPORT_SYMBOL(um_request_irq);
@@ -480,7 +507,7 @@ void __init init_IRQ(void)
irq_set_chip_and_handler(TIMER_IRQ, &SIGVTALRM_irq_type, handle_edge_irq);
- for (i = 1; i <= LAST_IRQ; i++)
+ for (i = 1; i < NR_IRQS; i++)
irq_set_chip_and_handler(i, &normal_irq_type, handle_edge_irq);
/* Initialize EPOLL Loop */
os_setup_epoll();
diff --git a/arch/um/kernel/sigio.c b/arch/um/kernel/sigio.c
index d1cffc2a7f21..5085a50c3b8c 100644
--- a/arch/um/kernel/sigio.c
+++ b/arch/um/kernel/sigio.c
@@ -25,7 +25,7 @@ int write_sigio_irq(int fd)
err = um_request_irq(SIGIO_WRITE_IRQ, fd, IRQ_READ, sigio_interrupt,
0, "write sigio", NULL);
- if (err) {
+ if (err < 0) {
printk(KERN_ERR "write_sigio_irq : um_request_irq failed, "
"err = %d\n", err);
return -1;
--
2.26.2
_______________________________________________
linux-um mailing list
linux-um@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-um
^ permalink raw reply related [flat|nested] 42+ messages in thread
* [PATCH 2/7] um: virtio: use dynamic IRQ allocation
2020-11-23 19:56 [PATCH 0/7 um: IRQ handling cleanups Johannes Berg
2020-11-23 19:56 ` [PATCH 1/7] um: support dynamic IRQ allocation Johannes Berg
@ 2020-11-23 19:56 ` Johannes Berg
2020-11-30 13:45 ` Anton Ivanov
2020-11-23 19:56 ` [PATCH 3/7] um: clean up alarm IRQ chip name Johannes Berg
` (6 subsequent siblings)
8 siblings, 1 reply; 42+ messages in thread
From: Johannes Berg @ 2020-11-23 19:56 UTC (permalink / raw)
To: linux-um; +Cc: Johannes Berg
From: Johannes Berg <johannes.berg@intel.com>
This separates the devices, which is better for debug and for
later suspend/resume and wakeup support, since there we'll
have to separate which IRQs can wake up the system and which
cannot.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
arch/um/drivers/virtio_uml.c | 22 ++++++++++++++--------
arch/um/include/asm/irq.h | 5 ++---
2 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/arch/um/drivers/virtio_uml.c b/arch/um/drivers/virtio_uml.c
index f76b8da28d20..94b112749d5b 100644
--- a/arch/um/drivers/virtio_uml.c
+++ b/arch/um/drivers/virtio_uml.c
@@ -55,7 +55,7 @@ struct virtio_uml_device {
struct platform_device *pdev;
spinlock_t sock_lock;
- int sock, req_fd;
+ int sock, req_fd, irq;
u64 features;
u64 protocol_features;
u8 status;
@@ -409,12 +409,14 @@ static int vhost_user_init_slave_req(struct virtio_uml_device *vu_dev)
return rc;
vu_dev->req_fd = req_fds[0];
- rc = um_request_irq(VIRTIO_IRQ, vu_dev->req_fd, IRQ_READ,
+ rc = um_request_irq(UM_IRQ_ALLOC, vu_dev->req_fd, IRQ_READ,
vu_req_interrupt, IRQF_SHARED,
vu_dev->pdev->name, vu_dev);
if (rc < 0)
goto err_close;
+ vu_dev->irq = rc;
+
rc = vhost_user_send_no_payload_fd(vu_dev, VHOST_USER_SET_SLAVE_REQ_FD,
req_fds[1]);
if (rc)
@@ -423,7 +425,7 @@ static int vhost_user_init_slave_req(struct virtio_uml_device *vu_dev)
goto out;
err_free_irq:
- um_free_irq(VIRTIO_IRQ, vu_dev);
+ um_free_irq(vu_dev->irq, vu_dev);
err_close:
os_close_file(req_fds[0]);
out:
@@ -802,7 +804,11 @@ static void vu_del_vq(struct virtqueue *vq)
struct virtio_uml_vq_info *info = vq->priv;
if (info->call_fd >= 0) {
- um_free_irq(VIRTIO_IRQ, vq);
+ struct virtio_uml_device *vu_dev;
+
+ vu_dev = to_virtio_uml_device(vq->vdev);
+
+ um_free_irq(vu_dev->irq, vq);
os_close_file(info->call_fd);
}
@@ -852,7 +858,7 @@ static int vu_setup_vq_call_fd(struct virtio_uml_device *vu_dev,
return rc;
info->call_fd = call_fds[0];
- rc = um_request_irq(VIRTIO_IRQ, info->call_fd, IRQ_READ,
+ rc = um_request_irq(vu_dev->irq, info->call_fd, IRQ_READ,
vu_interrupt, IRQF_SHARED, info->name, vq);
if (rc < 0)
goto close_both;
@@ -864,7 +870,7 @@ static int vu_setup_vq_call_fd(struct virtio_uml_device *vu_dev,
goto out;
release_irq:
- um_free_irq(VIRTIO_IRQ, vq);
+ um_free_irq(vu_dev->irq, vq);
close_both:
os_close_file(call_fds[0]);
out:
@@ -969,7 +975,7 @@ static struct virtqueue *vu_setup_vq(struct virtio_device *vdev,
error_setup:
if (info->call_fd >= 0) {
- um_free_irq(VIRTIO_IRQ, vq);
+ um_free_irq(vu_dev->irq, vq);
os_close_file(info->call_fd);
}
error_call:
@@ -1078,7 +1084,7 @@ static void virtio_uml_release_dev(struct device *d)
/* might not have been opened due to not negotiating the feature */
if (vu_dev->req_fd >= 0) {
- um_free_irq(VIRTIO_IRQ, vu_dev);
+ um_free_irq(vu_dev->irq, vu_dev);
os_close_file(vu_dev->req_fd);
}
diff --git a/arch/um/include/asm/irq.h b/arch/um/include/asm/irq.h
index b6fa6301c75b..547bff7b3a89 100644
--- a/arch/um/include/asm/irq.h
+++ b/arch/um/include/asm/irq.h
@@ -17,18 +17,17 @@
#define TELNETD_IRQ 12
#define XTERM_IRQ 13
#define RANDOM_IRQ 14
-#define VIRTIO_IRQ 15
#ifdef CONFIG_UML_NET_VECTOR
-#define VECTOR_BASE_IRQ (VIRTIO_IRQ + 1)
+#define VECTOR_BASE_IRQ (RANDOM_IRQ + 1)
#define VECTOR_IRQ_SPACE 8
#define UM_FIRST_DYN_IRQ (VECTOR_IRQ_SPACE + VECTOR_BASE_IRQ)
#else
-#define UM_FIRST_DYN_IRQ (VIRTIO_IRQ + 1)
+#define UM_FIRST_DYN_IRQ (RANDOM_IRQ + 1)
#endif
--
2.26.2
_______________________________________________
linux-um mailing list
linux-um@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-um
^ permalink raw reply related [flat|nested] 42+ messages in thread
* [PATCH 3/7] um: clean up alarm IRQ chip name
2020-11-23 19:56 [PATCH 0/7 um: IRQ handling cleanups Johannes Berg
2020-11-23 19:56 ` [PATCH 1/7] um: support dynamic IRQ allocation Johannes Berg
2020-11-23 19:56 ` [PATCH 2/7] um: virtio: use " Johannes Berg
@ 2020-11-23 19:56 ` Johannes Berg
2020-11-30 13:54 ` Anton Ivanov
2020-11-23 19:56 ` [PATCH 4/7] um: irq: clean up and rename struct irq_fd Johannes Berg
` (5 subsequent siblings)
8 siblings, 1 reply; 42+ messages in thread
From: Johannes Berg @ 2020-11-23 19:56 UTC (permalink / raw)
To: linux-um; +Cc: Johannes Berg
From: Johannes Berg <johannes.berg@intel.com>
We don't use "SIGVTALRM", it's just SIGALRM. Clean up the naming.
While at it, fix the comment's grammar.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
arch/um/kernel/irq.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/arch/um/kernel/irq.c b/arch/um/kernel/irq.c
index b94c72f56617..97ff77c297c8 100644
--- a/arch/um/kernel/irq.c
+++ b/arch/um/kernel/irq.c
@@ -481,7 +481,7 @@ static void dummy(struct irq_data *d)
{
}
-/* This is used for everything else than the timer. */
+/* This is used for everything other than the timer. */
static struct irq_chip normal_irq_type = {
.name = "SIGIO",
.irq_disable = dummy,
@@ -491,8 +491,8 @@ static struct irq_chip normal_irq_type = {
.irq_unmask = dummy,
};
-static struct irq_chip SIGVTALRM_irq_type = {
- .name = "SIGVTALRM",
+static struct irq_chip alarm_irq_type = {
+ .name = "SIGALRM",
.irq_disable = dummy,
.irq_enable = dummy,
.irq_ack = dummy,
@@ -504,8 +504,7 @@ void __init init_IRQ(void)
{
int i;
- irq_set_chip_and_handler(TIMER_IRQ, &SIGVTALRM_irq_type, handle_edge_irq);
-
+ irq_set_chip_and_handler(TIMER_IRQ, &alarm_irq_type, handle_edge_irq);
for (i = 1; i < NR_IRQS; i++)
irq_set_chip_and_handler(i, &normal_irq_type, handle_edge_irq);
--
2.26.2
_______________________________________________
linux-um mailing list
linux-um@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-um
^ permalink raw reply related [flat|nested] 42+ messages in thread
* [PATCH 4/7] um: irq: clean up and rename struct irq_fd
2020-11-23 19:56 [PATCH 0/7 um: IRQ handling cleanups Johannes Berg
` (2 preceding siblings ...)
2020-11-23 19:56 ` [PATCH 3/7] um: clean up alarm IRQ chip name Johannes Berg
@ 2020-11-23 19:56 ` Johannes Berg
2020-11-30 14:01 ` Anton Ivanov
2020-11-23 19:56 ` [PATCH 5/7] um: irq: reduce irq_reg allocation Johannes Berg
` (4 subsequent siblings)
8 siblings, 1 reply; 42+ messages in thread
From: Johannes Berg @ 2020-11-23 19:56 UTC (permalink / raw)
To: linux-um; +Cc: Johannes Berg
From: Johannes Berg <johannes.berg@intel.com>
This really shouldn't be called "irq_fd" since it doesn't
carry an fd. Well, it used to, apparently, but that struct
member is unused.
Rename it to "irq_reg" since it more accurately reflects a
registered interrupt, and remove the unused 'next' and 'fd'
members from the struct as well.
While at it, also move it to the implementation, it's not
used anywhere else, and the header file is shared with the
userspace components.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
arch/um/include/shared/irq_user.h | 14 -------------
arch/um/kernel/irq.c | 34 ++++++++++++++++++++-----------
2 files changed, 22 insertions(+), 26 deletions(-)
diff --git a/arch/um/include/shared/irq_user.h b/arch/um/include/shared/irq_user.h
index 107751dce153..2dd5fd7d9443 100644
--- a/arch/um/include/shared/irq_user.h
+++ b/arch/um/include/shared/irq_user.h
@@ -9,25 +9,11 @@
#include <sysdep/ptrace.h>
#include <stdbool.h>
-struct irq_fd {
- struct irq_fd *next;
- void *id;
- int fd;
- int type;
- int irq;
- int events;
- bool active;
- bool pending;
- bool purge;
-};
-
#define IRQ_READ 0
#define IRQ_WRITE 1
#define IRQ_NONE 2
#define MAX_IRQ_TYPE (IRQ_NONE + 1)
-
-
struct siginfo;
extern void sigio_handler(int sig, struct siginfo *unused_si, struct uml_pt_regs *regs);
extern void free_irq_by_fd(int fd);
diff --git a/arch/um/kernel/irq.c b/arch/um/kernel/irq.c
index 97ff77c297c8..923a80c9808a 100644
--- a/arch/um/kernel/irq.c
+++ b/arch/um/kernel/irq.c
@@ -26,14 +26,24 @@ extern void free_irqs(void);
/* When epoll triggers we do not know why it did so
* we can also have different IRQs for read and write.
- * This is why we keep a small irq_fd array for each fd -
+ * This is why we keep a small irq_reg array for each fd -
* one entry per IRQ type
*/
+struct irq_reg {
+ void *id;
+ int type;
+ int irq;
+ int events;
+ bool active;
+ bool pending;
+ bool purge;
+};
+
struct irq_entry {
struct irq_entry *next;
int fd;
- struct irq_fd *irq_array[MAX_IRQ_TYPE + 1];
+ struct irq_reg *irq_array[MAX_IRQ_TYPE + 1];
};
static struct irq_entry *active_fds;
@@ -41,7 +51,7 @@ static struct irq_entry *active_fds;
static DEFINE_SPINLOCK(irq_lock);
static DECLARE_BITMAP(irqs_allocated, NR_IRQS);
-static void irq_io_loop(struct irq_fd *irq, struct uml_pt_regs *regs)
+static void irq_io_loop(struct irq_reg *irq, struct uml_pt_regs *regs)
{
/*
* irq->active guards against reentry
@@ -65,7 +75,7 @@ static void irq_io_loop(struct irq_fd *irq, struct uml_pt_regs *regs)
void sigio_handler(int sig, struct siginfo *unused_si, struct uml_pt_regs *regs)
{
struct irq_entry *irq_entry;
- struct irq_fd *irq;
+ struct irq_reg *irq;
int n, i, j;
@@ -86,7 +96,7 @@ void sigio_handler(int sig, struct siginfo *unused_si, struct uml_pt_regs *regs)
}
for (i = 0; i < n ; i++) {
- /* Epoll back reference is the entry with 3 irq_fd
+ /* Epoll back reference is the entry with 3 irq_reg
* leaves - one for each irq type.
*/
irq_entry = (struct irq_entry *)
@@ -112,7 +122,7 @@ static int assign_epoll_events_to_irq(struct irq_entry *irq_entry)
{
int i;
int events = 0;
- struct irq_fd *irq;
+ struct irq_reg *irq;
for (i = 0; i < MAX_IRQ_TYPE ; i++) {
irq = irq_entry->irq_array[i];
@@ -131,7 +141,7 @@ static int assign_epoll_events_to_irq(struct irq_entry *irq_entry)
static int activate_fd(int irq, int fd, int type, void *dev_id)
{
- struct irq_fd *new_fd;
+ struct irq_reg *new_fd;
struct irq_entry *irq_entry;
int i, err, events;
unsigned long flags;
@@ -182,13 +192,13 @@ static int activate_fd(int irq, int fd, int type, void *dev_id)
/* New entry for this fd */
err = -ENOMEM;
- new_fd = kmalloc(sizeof(struct irq_fd), GFP_ATOMIC);
+ new_fd = kmalloc(sizeof(struct irq_reg), GFP_ATOMIC);
if (new_fd == NULL)
goto out_unlock;
events = os_event_mask(type);
- *new_fd = ((struct irq_fd) {
+ *new_fd = ((struct irq_reg) {
.id = dev_id,
.irq = irq,
.type = type,
@@ -273,8 +283,8 @@ static struct irq_entry *get_irq_entry_by_fd(int fd)
/*
* Walk the IRQ list and dispose of an entry for a specific
- * device, fd and number. Note - if sharing an IRQ for read
- * and writefor the same FD it will be disposed in either case.
+ * device and number. Note - if sharing an IRQ for read
+ * and write for the same FD it will be disposed in either case.
* If this behaviour is undesirable use different IRQ ids.
*/
@@ -289,7 +299,7 @@ static void do_free_by_irq_and_dev(
)
{
int i;
- struct irq_fd *to_free;
+ struct irq_reg *to_free;
for (i = 0; i < MAX_IRQ_TYPE ; i++) {
if (irq_entry->irq_array[i] != NULL) {
--
2.26.2
_______________________________________________
linux-um mailing list
linux-um@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-um
^ permalink raw reply related [flat|nested] 42+ messages in thread
* [PATCH 5/7] um: irq: reduce irq_reg allocation
2020-11-23 19:56 [PATCH 0/7 um: IRQ handling cleanups Johannes Berg
` (3 preceding siblings ...)
2020-11-23 19:56 ` [PATCH 4/7] um: irq: clean up and rename struct irq_fd Johannes Berg
@ 2020-11-23 19:56 ` Johannes Berg
2020-11-23 19:56 ` [PATCH 6/7] um: remove IRQ_NONE type Johannes Berg
` (3 subsequent siblings)
8 siblings, 0 replies; 42+ messages in thread
From: Johannes Berg @ 2020-11-23 19:56 UTC (permalink / raw)
To: linux-um; +Cc: Johannes Berg
From: Johannes Berg <johannes.berg@intel.com>
We don't need an array of 4 entries to capture three and the
name 'MAX_IRQ_TYPE' really gets confusing as well. Remove it
and add a correct NUM_IRQ_TYPES, and use that correctly.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
arch/um/include/shared/irq_user.h | 2 +-
arch/um/kernel/irq.c | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/arch/um/include/shared/irq_user.h b/arch/um/include/shared/irq_user.h
index 2dd5fd7d9443..5e975a9e8354 100644
--- a/arch/um/include/shared/irq_user.h
+++ b/arch/um/include/shared/irq_user.h
@@ -12,7 +12,7 @@
#define IRQ_READ 0
#define IRQ_WRITE 1
#define IRQ_NONE 2
-#define MAX_IRQ_TYPE (IRQ_NONE + 1)
+#define NUM_IRQ_TYPES (IRQ_NONE + 1)
struct siginfo;
extern void sigio_handler(int sig, struct siginfo *unused_si, struct uml_pt_regs *regs);
diff --git a/arch/um/kernel/irq.c b/arch/um/kernel/irq.c
index 923a80c9808a..93eb742ecafe 100644
--- a/arch/um/kernel/irq.c
+++ b/arch/um/kernel/irq.c
@@ -43,7 +43,7 @@ struct irq_reg {
struct irq_entry {
struct irq_entry *next;
int fd;
- struct irq_reg *irq_array[MAX_IRQ_TYPE + 1];
+ struct irq_reg *irq_array[NUM_IRQ_TYPES];
};
static struct irq_entry *active_fds;
@@ -101,7 +101,7 @@ void sigio_handler(int sig, struct siginfo *unused_si, struct uml_pt_regs *regs)
*/
irq_entry = (struct irq_entry *)
os_epoll_get_data_pointer(i);
- for (j = 0; j < MAX_IRQ_TYPE ; j++) {
+ for (j = 0; j < NUM_IRQ_TYPES ; j++) {
irq = irq_entry->irq_array[j];
if (irq == NULL)
continue;
@@ -124,7 +124,7 @@ static int assign_epoll_events_to_irq(struct irq_entry *irq_entry)
int events = 0;
struct irq_reg *irq;
- for (i = 0; i < MAX_IRQ_TYPE ; i++) {
+ for (i = 0; i < NUM_IRQ_TYPES ; i++) {
irq = irq_entry->irq_array[i];
if (irq != NULL)
events = irq->events | events;
@@ -172,7 +172,7 @@ static int activate_fd(int irq, int fd, int type, void *dev_id)
goto out_unlock;
}
irq_entry->fd = fd;
- for (i = 0; i < MAX_IRQ_TYPE; i++)
+ for (i = 0; i < NUM_IRQ_TYPES; i++)
irq_entry->irq_array[i] = NULL;
irq_entry->next = active_fds;
active_fds = irq_entry;
@@ -244,7 +244,7 @@ static void garbage_collect_irq_entries(void)
walk = active_fds;
while (walk != NULL) {
reap = true;
- for (i = 0; i < MAX_IRQ_TYPE ; i++) {
+ for (i = 0; i < NUM_IRQ_TYPES ; i++) {
if (walk->irq_array[i] != NULL) {
reap = false;
break;
@@ -301,7 +301,7 @@ static void do_free_by_irq_and_dev(
int i;
struct irq_reg *to_free;
- for (i = 0; i < MAX_IRQ_TYPE ; i++) {
+ for (i = 0; i < NUM_IRQ_TYPES ; i++) {
if (irq_entry->irq_array[i] != NULL) {
if (
((flags & IGNORE_IRQ) ||
--
2.26.2
_______________________________________________
linux-um mailing list
linux-um@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-um
^ permalink raw reply related [flat|nested] 42+ messages in thread
* [PATCH 6/7] um: remove IRQ_NONE type
2020-11-23 19:56 [PATCH 0/7 um: IRQ handling cleanups Johannes Berg
` (4 preceding siblings ...)
2020-11-23 19:56 ` [PATCH 5/7] um: irq: reduce irq_reg allocation Johannes Berg
@ 2020-11-23 19:56 ` Johannes Berg
2020-11-30 14:31 ` Anton Ivanov
2020-11-23 19:56 ` [PATCH 7/7] um: simplify IRQ handling code Johannes Berg
` (2 subsequent siblings)
8 siblings, 1 reply; 42+ messages in thread
From: Johannes Berg @ 2020-11-23 19:56 UTC (permalink / raw)
To: linux-um; +Cc: Johannes Berg
From: Johannes Berg <johannes.berg@intel.com>
We don't actually use this in um_request_irq(), so it can
never be assigned. It's also not clear what that would be
useful for, so just remove it.
This results in quite a number of cleanups, all the way to
removing the "SIGIO on close" startup check, since the data
it assigns (pty_close_sigio) is not used anymore.
While at it, also make this an enum so we get a minimum of
type checking, and remove the IRQ_NONE hack in virtio since
we now no longer have the name twice.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
arch/um/drivers/random.c | 2 +-
arch/um/drivers/virtio_uml.c | 5 -----
arch/um/include/shared/irq_kern.h | 7 ++++---
arch/um/include/shared/irq_user.h | 9 +++++----
arch/um/include/shared/os.h | 6 +++---
arch/um/kernel/irq.c | 15 +++++++--------
arch/um/os-Linux/irq.c | 2 +-
arch/um/os-Linux/sigio.c | 25 +++++--------------------
8 files changed, 26 insertions(+), 45 deletions(-)
diff --git a/arch/um/drivers/random.c b/arch/um/drivers/random.c
index 385cb08d7ec2..efbf88ec48ac 100644
--- a/arch/um/drivers/random.c
+++ b/arch/um/drivers/random.c
@@ -132,7 +132,7 @@ static int __init rng_init (void)
if (err < 0)
goto err_out_cleanup_hw;
- sigio_broken(random_fd, 1);
+ sigio_broken(random_fd);
err = misc_register (&rng_miscdev);
if (err) {
diff --git a/arch/um/drivers/virtio_uml.c b/arch/um/drivers/virtio_uml.c
index 94b112749d5b..27e92d3881ff 100644
--- a/arch/um/drivers/virtio_uml.c
+++ b/arch/um/drivers/virtio_uml.c
@@ -33,11 +33,6 @@
#include <os.h>
#include "vhost_user.h"
-/* Workaround due to a conflict between irq_user.h and irqreturn.h */
-#ifdef IRQ_NONE
-#undef IRQ_NONE
-#endif
-
#define MAX_SUPPORTED_QUEUE_SIZE 256
#define to_virtio_uml_device(_vdev) \
diff --git a/arch/um/include/shared/irq_kern.h b/arch/um/include/shared/irq_kern.h
index 7c04a0fd3a27..7807de593bda 100644
--- a/arch/um/include/shared/irq_kern.h
+++ b/arch/um/include/shared/irq_kern.h
@@ -8,11 +8,12 @@
#include <linux/interrupt.h>
#include <asm/ptrace.h>
+#include "irq_user.h"
#define UM_IRQ_ALLOC -1
-int um_request_irq(int irq, int fd, int type, irq_handler_t handler,
- unsigned long irqflags, const char * devname,
- void *dev_id);
+int um_request_irq(int irq, int fd, enum um_irq_type type,
+ irq_handler_t handler, unsigned long irqflags,
+ const char *devname, void *dev_id);
void um_free_irq(int irq, void *dev_id);
#endif
diff --git a/arch/um/include/shared/irq_user.h b/arch/um/include/shared/irq_user.h
index 5e975a9e8354..07239e801a5b 100644
--- a/arch/um/include/shared/irq_user.h
+++ b/arch/um/include/shared/irq_user.h
@@ -9,10 +9,11 @@
#include <sysdep/ptrace.h>
#include <stdbool.h>
-#define IRQ_READ 0
-#define IRQ_WRITE 1
-#define IRQ_NONE 2
-#define NUM_IRQ_TYPES (IRQ_NONE + 1)
+enum um_irq_type {
+ IRQ_READ,
+ IRQ_WRITE,
+ NUM_IRQ_TYPES,
+};
struct siginfo;
extern void sigio_handler(int sig, struct siginfo *unused_si, struct uml_pt_regs *regs);
diff --git a/arch/um/include/shared/os.h b/arch/um/include/shared/os.h
index f467d28fc0b4..e2bb7e488d59 100644
--- a/arch/um/include/shared/os.h
+++ b/arch/um/include/shared/os.h
@@ -299,7 +299,7 @@ extern void reboot_skas(void);
extern int os_waiting_for_events_epoll(void);
extern void *os_epoll_get_data_pointer(int index);
extern int os_epoll_triggered(int index, int events);
-extern int os_event_mask(int irq_type);
+extern int os_event_mask(enum um_irq_type irq_type);
extern int os_setup_epoll(void);
extern int os_add_epoll_fd(int events, int fd, void *data);
extern int os_mod_epoll_fd(int events, int fd, void *data);
@@ -310,8 +310,8 @@ extern void os_close_epoll_fd(void);
/* sigio.c */
extern int add_sigio_fd(int fd);
extern int ignore_sigio_fd(int fd);
-extern void maybe_sigio_broken(int fd, int read);
-extern void sigio_broken(int fd, int read);
+extern void maybe_sigio_broken(int fd);
+extern void sigio_broken(int fd);
/* prctl.c */
extern int os_arch_prctl(int pid, int option, unsigned long *arg2);
diff --git a/arch/um/kernel/irq.c b/arch/um/kernel/irq.c
index 93eb742ecafe..9e8f776bb43a 100644
--- a/arch/um/kernel/irq.c
+++ b/arch/um/kernel/irq.c
@@ -32,7 +32,7 @@ extern void free_irqs(void);
struct irq_reg {
void *id;
- int type;
+ enum um_irq_type type;
int irq;
int events;
bool active;
@@ -96,7 +96,7 @@ void sigio_handler(int sig, struct siginfo *unused_si, struct uml_pt_regs *regs)
}
for (i = 0; i < n ; i++) {
- /* Epoll back reference is the entry with 3 irq_reg
+ /* Epoll back reference is the entry with 2 irq_reg
* leaves - one for each irq type.
*/
irq_entry = (struct irq_entry *)
@@ -139,7 +139,7 @@ static int assign_epoll_events_to_irq(struct irq_entry *irq_entry)
-static int activate_fd(int irq, int fd, int type, void *dev_id)
+static int activate_fd(int irq, int fd, enum um_irq_type type, void *dev_id)
{
struct irq_reg *new_fd;
struct irq_entry *irq_entry;
@@ -217,7 +217,7 @@ static int activate_fd(int irq, int fd, int type, void *dev_id)
/* Turn back IO on with the correct (new) IO event mask */
assign_epoll_events_to_irq(irq_entry);
spin_unlock_irqrestore(&irq_lock, flags);
- maybe_sigio_broken(fd, (type != IRQ_NONE));
+ maybe_sigio_broken(fd);
return 0;
out_unlock:
@@ -444,10 +444,9 @@ void um_free_irq(int irq, void *dev)
}
EXPORT_SYMBOL(um_free_irq);
-int um_request_irq(int irq, int fd, int type,
- irq_handler_t handler,
- unsigned long irqflags, const char * devname,
- void *dev_id)
+int um_request_irq(int irq, int fd, enum um_irq_type type,
+ irq_handler_t handler, unsigned long irqflags,
+ const char *devname, void *dev_id)
{
int err;
diff --git a/arch/um/os-Linux/irq.c b/arch/um/os-Linux/irq.c
index d508310ee5e1..aa90a05b3d78 100644
--- a/arch/um/os-Linux/irq.c
+++ b/arch/um/os-Linux/irq.c
@@ -45,7 +45,7 @@ int os_epoll_triggered(int index, int events)
* access to the right includes/defines for EPOLL constants.
*/
-int os_event_mask(int irq_type)
+int os_event_mask(enum um_irq_type irq_type)
{
if (irq_type == IRQ_READ)
return EPOLLIN | EPOLLPRI;
diff --git a/arch/um/os-Linux/sigio.c b/arch/um/os-Linux/sigio.c
index 75558080d0bf..233b2b2212f1 100644
--- a/arch/um/os-Linux/sigio.c
+++ b/arch/um/os-Linux/sigio.c
@@ -336,7 +336,7 @@ static void write_sigio_workaround(void)
close(l_write_sigio_fds[1]);
}
-void sigio_broken(int fd, int read)
+void sigio_broken(int fd)
{
int err;
@@ -352,7 +352,7 @@ void sigio_broken(int fd, int read)
all_sigio_fds.poll[all_sigio_fds.used++] =
((struct pollfd) { .fd = fd,
- .events = read ? POLLIN : POLLOUT,
+ .events = POLLIN,
.revents = 0 });
out:
sigio_unlock();
@@ -360,17 +360,16 @@ void sigio_broken(int fd, int read)
/* Changed during early boot */
static int pty_output_sigio;
-static int pty_close_sigio;
-void maybe_sigio_broken(int fd, int read)
+void maybe_sigio_broken(int fd)
{
if (!isatty(fd))
return;
- if ((read || pty_output_sigio) && (!read || pty_close_sigio))
+ if (pty_output_sigio)
return;
- sigio_broken(fd, read);
+ sigio_broken(fd);
}
static void sigio_cleanup(void)
@@ -514,19 +513,6 @@ static void tty_output(int master, int slave)
printk(UM_KERN_CONT "tty_output : read failed, err = %d\n", n);
}
-static void tty_close(int master, int slave)
-{
- printk(UM_KERN_INFO "Checking that host ptys support SIGIO on "
- "close...");
-
- close(slave);
- if (got_sigio) {
- printk(UM_KERN_CONT "Yes\n");
- pty_close_sigio = 1;
- } else
- printk(UM_KERN_CONT "No, enabling workaround\n");
-}
-
static void __init check_sigio(void)
{
if ((access("/dev/ptmx", R_OK) < 0) &&
@@ -536,7 +522,6 @@ static void __init check_sigio(void)
return;
}
check_one_sigio(tty_output);
- check_one_sigio(tty_close);
}
/* Here because it only does the SIGIO testing for now */
--
2.26.2
_______________________________________________
linux-um mailing list
linux-um@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-um
^ permalink raw reply related [flat|nested] 42+ messages in thread
* [PATCH 7/7] um: simplify IRQ handling code
2020-11-23 19:56 [PATCH 0/7 um: IRQ handling cleanups Johannes Berg
` (5 preceding siblings ...)
2020-11-23 19:56 ` [PATCH 6/7] um: remove IRQ_NONE type Johannes Berg
@ 2020-11-23 19:56 ` Johannes Berg
2020-11-24 21:50 ` Anton Ivanov
` (2 more replies)
2020-11-24 8:14 ` [PATCH 0/7 um: IRQ handling cleanups Anton Ivanov
2020-11-24 21:11 ` Johannes Berg
8 siblings, 3 replies; 42+ messages in thread
From: Johannes Berg @ 2020-11-23 19:56 UTC (permalink / raw)
To: linux-um; +Cc: Johannes Berg
From: Johannes Berg <johannes.berg@intel.com>
Reduce dynamic allocations (and thereby cache misses) by simply
embedding the registration data for IRQs in the irq_entry, we
never supported these being really dynamic anyway as only one
was ever allowed ("Trying to reregister ...").
Lockless behaviour is preserved by removing the FD from the poll
set appropriately, but we use reg->events to indicate whether or
not this entry is used, rather than dynamically allocating them.
Also port the list of IRQ entries to list_head instead of the
current open-coded singly-linked list implementation, just for
sanity.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
arch/um/kernel/irq.c | 369 +++++++++++++++----------------------------
1 file changed, 127 insertions(+), 242 deletions(-)
diff --git a/arch/um/kernel/irq.c b/arch/um/kernel/irq.c
index 9e8f776bb43a..bbf5a466b44c 100644
--- a/arch/um/kernel/irq.c
+++ b/arch/um/kernel/irq.c
@@ -29,26 +29,23 @@ extern void free_irqs(void);
* This is why we keep a small irq_reg array for each fd -
* one entry per IRQ type
*/
-
struct irq_reg {
void *id;
- enum um_irq_type type;
int irq;
+ /* it's cheaper to store this than to query it */
int events;
bool active;
bool pending;
- bool purge;
};
struct irq_entry {
- struct irq_entry *next;
+ struct list_head list;
int fd;
- struct irq_reg *irq_array[NUM_IRQ_TYPES];
+ struct irq_reg reg[NUM_IRQ_TYPES];
};
-static struct irq_entry *active_fds;
-
static DEFINE_SPINLOCK(irq_lock);
+static LIST_HEAD(active_fds);
static DECLARE_BITMAP(irqs_allocated, NR_IRQS);
static void irq_io_loop(struct irq_reg *irq, struct uml_pt_regs *regs)
@@ -61,12 +58,13 @@ static void irq_io_loop(struct irq_reg *irq, struct uml_pt_regs *regs)
*/
if (irq->active) {
irq->active = false;
+
do {
irq->pending = false;
do_IRQ(irq->irq, regs);
- } while (irq->pending && (!irq->purge));
- if (!irq->purge)
- irq->active = true;
+ } while (irq->pending);
+
+ irq->active = true;
} else {
irq->pending = true;
}
@@ -75,9 +73,7 @@ static void irq_io_loop(struct irq_reg *irq, struct uml_pt_regs *regs)
void sigio_handler(int sig, struct siginfo *unused_si, struct uml_pt_regs *regs)
{
struct irq_entry *irq_entry;
- struct irq_reg *irq;
-
- int n, i, j;
+ int n, i;
while (1) {
/* This is now lockless - epoll keeps back-referencesto the irqs
@@ -96,21 +92,18 @@ void sigio_handler(int sig, struct siginfo *unused_si, struct uml_pt_regs *regs)
}
for (i = 0; i < n ; i++) {
- /* Epoll back reference is the entry with 2 irq_reg
- * leaves - one for each irq type.
- */
- irq_entry = (struct irq_entry *)
- os_epoll_get_data_pointer(i);
- for (j = 0; j < NUM_IRQ_TYPES ; j++) {
- irq = irq_entry->irq_array[j];
- if (irq == NULL)
+ enum um_irq_type t;
+
+ irq_entry = os_epoll_get_data_pointer(i);
+
+ for (t = 0; t < NUM_IRQ_TYPES; t++) {
+ int events = irq_entry->reg[t].events;
+
+ if (!events)
continue;
- if (os_epoll_triggered(i, irq->events) > 0)
- irq_io_loop(irq, regs);
- if (irq->purge) {
- irq_entry->irq_array[j] = NULL;
- kfree(irq);
- }
+
+ if (os_epoll_triggered(i, events) > 0)
+ irq_io_loop(&irq_entry->reg[t], regs);
}
}
}
@@ -118,32 +111,59 @@ void sigio_handler(int sig, struct siginfo *unused_si, struct uml_pt_regs *regs)
free_irqs();
}
-static int assign_epoll_events_to_irq(struct irq_entry *irq_entry)
+static struct irq_entry *get_irq_entry_by_fd(int fd)
{
- int i;
- int events = 0;
- struct irq_reg *irq;
+ struct irq_entry *walk;
- for (i = 0; i < NUM_IRQ_TYPES ; i++) {
- irq = irq_entry->irq_array[i];
- if (irq != NULL)
- events = irq->events | events;
- }
- if (events > 0) {
- /* os_add_epoll will call os_mod_epoll if this already exists */
- return os_add_epoll_fd(events, irq_entry->fd, irq_entry);
+ lockdep_assert_held(&irq_lock);
+
+ list_for_each_entry(walk, &active_fds, list) {
+ if (walk->fd == fd)
+ return walk;
}
- /* No events - delete */
- return os_del_epoll_fd(irq_entry->fd);
+
+ return NULL;
+}
+
+static void free_irq_entry(struct irq_entry *to_free, bool remove)
+{
+ if (!to_free)
+ return;
+
+ if (remove)
+ os_del_epoll_fd(to_free->fd);
+ list_del(&to_free->list);
+ kfree(to_free);
}
+static bool update_irq_entry(struct irq_entry *entry)
+{
+ enum um_irq_type i;
+ int events = 0;
+
+ for (i = 0; i < NUM_IRQ_TYPES; i++)
+ events |= entry->reg[i].events;
+ if (events) {
+ /* will modify (instead of add) if needed */
+ os_add_epoll_fd(events, entry->fd, entry);
+ return true;
+ }
+
+ os_del_epoll_fd(entry->fd);
+ return false;
+}
+
+static void update_or_free_irq_entry(struct irq_entry *entry)
+{
+ if (!update_irq_entry(entry))
+ free_irq_entry(entry, false);
+}
static int activate_fd(int irq, int fd, enum um_irq_type type, void *dev_id)
{
- struct irq_reg *new_fd;
struct irq_entry *irq_entry;
- int i, err, events;
+ int err, events = os_event_mask(type);
unsigned long flags;
err = os_set_fd_async(fd);
@@ -151,73 +171,33 @@ static int activate_fd(int irq, int fd, enum um_irq_type type, void *dev_id)
goto out;
spin_lock_irqsave(&irq_lock, flags);
-
- /* Check if we have an entry for this fd */
-
- err = -EBUSY;
- for (irq_entry = active_fds;
- irq_entry != NULL; irq_entry = irq_entry->next) {
- if (irq_entry->fd == fd)
- break;
- }
-
- if (irq_entry == NULL) {
- /* This needs to be atomic as it may be called from an
- * IRQ context.
- */
- irq_entry = kmalloc(sizeof(struct irq_entry), GFP_ATOMIC);
- if (irq_entry == NULL) {
- printk(KERN_ERR
- "Failed to allocate new IRQ entry\n");
+ irq_entry = get_irq_entry_by_fd(fd);
+ if (irq_entry) {
+ /* cannot register the same FD twice with the same type */
+ if (WARN_ON(irq_entry->reg[type].events)) {
+ err = -EALREADY;
goto out_unlock;
}
- irq_entry->fd = fd;
- for (i = 0; i < NUM_IRQ_TYPES; i++)
- irq_entry->irq_array[i] = NULL;
- irq_entry->next = active_fds;
- active_fds = irq_entry;
- }
-
- /* Check if we are trying to re-register an interrupt for a
- * particular fd
- */
- if (irq_entry->irq_array[type] != NULL) {
- printk(KERN_ERR
- "Trying to reregister IRQ %d FD %d TYPE %d ID %p\n",
- irq, fd, type, dev_id
- );
- goto out_unlock;
+ /* temporarily disable to avoid IRQ-side locking */
+ os_del_epoll_fd(fd);
} else {
- /* New entry for this fd */
-
- err = -ENOMEM;
- new_fd = kmalloc(sizeof(struct irq_reg), GFP_ATOMIC);
- if (new_fd == NULL)
+ irq_entry = kzalloc(sizeof(*irq_entry), GFP_ATOMIC);
+ if (!irq_entry) {
+ err = -ENOMEM;
goto out_unlock;
-
- events = os_event_mask(type);
-
- *new_fd = ((struct irq_reg) {
- .id = dev_id,
- .irq = irq,
- .type = type,
- .events = events,
- .active = true,
- .pending = false,
- .purge = false
- });
- /* Turn off any IO on this fd - allows us to
- * avoid locking the IRQ loop
- */
- os_del_epoll_fd(irq_entry->fd);
- irq_entry->irq_array[type] = new_fd;
+ }
+ irq_entry->fd = fd;
+ list_add_tail(&irq_entry->list, &active_fds);
+ maybe_sigio_broken(fd);
}
- /* Turn back IO on with the correct (new) IO event mask */
- assign_epoll_events_to_irq(irq_entry);
+ irq_entry->reg[type].irq = irq;
+ irq_entry->reg[type].active = true;
+ irq_entry->reg[type].events = events;
+
+ WARN_ON(!update_irq_entry(irq_entry));
spin_unlock_irqrestore(&irq_lock, flags);
- maybe_sigio_broken(fd);
return 0;
out_unlock:
@@ -227,104 +207,10 @@ static int activate_fd(int irq, int fd, enum um_irq_type type, void *dev_id)
}
/*
- * Walk the IRQ list and dispose of any unused entries.
- * Should be done under irq_lock.
+ * Remove the entry or entries for a specific FD, if you
+ * don't want to remove all the possible entries then use
+ * um_free_irq() or deactivate_fd() instead.
*/
-
-static void garbage_collect_irq_entries(void)
-{
- int i;
- bool reap;
- struct irq_entry *walk;
- struct irq_entry *previous = NULL;
- struct irq_entry *to_free;
-
- if (active_fds == NULL)
- return;
- walk = active_fds;
- while (walk != NULL) {
- reap = true;
- for (i = 0; i < NUM_IRQ_TYPES ; i++) {
- if (walk->irq_array[i] != NULL) {
- reap = false;
- break;
- }
- }
- if (reap) {
- if (previous == NULL)
- active_fds = walk->next;
- else
- previous->next = walk->next;
- to_free = walk;
- } else {
- to_free = NULL;
- }
- walk = walk->next;
- kfree(to_free);
- }
-}
-
-/*
- * Walk the IRQ list and get the descriptor for our FD
- */
-
-static struct irq_entry *get_irq_entry_by_fd(int fd)
-{
- struct irq_entry *walk = active_fds;
-
- while (walk != NULL) {
- if (walk->fd == fd)
- return walk;
- walk = walk->next;
- }
- return NULL;
-}
-
-
-/*
- * Walk the IRQ list and dispose of an entry for a specific
- * device and number. Note - if sharing an IRQ for read
- * and write for the same FD it will be disposed in either case.
- * If this behaviour is undesirable use different IRQ ids.
- */
-
-#define IGNORE_IRQ 1
-#define IGNORE_DEV (1<<1)
-
-static void do_free_by_irq_and_dev(
- struct irq_entry *irq_entry,
- unsigned int irq,
- void *dev,
- int flags
-)
-{
- int i;
- struct irq_reg *to_free;
-
- for (i = 0; i < NUM_IRQ_TYPES ; i++) {
- if (irq_entry->irq_array[i] != NULL) {
- if (
- ((flags & IGNORE_IRQ) ||
- (irq_entry->irq_array[i]->irq == irq)) &&
- ((flags & IGNORE_DEV) ||
- (irq_entry->irq_array[i]->id == dev))
- ) {
- /* Turn off any IO on this fd - allows us to
- * avoid locking the IRQ loop
- */
- os_del_epoll_fd(irq_entry->fd);
- to_free = irq_entry->irq_array[i];
- irq_entry->irq_array[i] = NULL;
- assign_epoll_events_to_irq(irq_entry);
- if (to_free->active)
- to_free->purge = true;
- else
- kfree(to_free);
- }
- }
- }
-}
-
void free_irq_by_fd(int fd)
{
struct irq_entry *to_free;
@@ -332,58 +218,64 @@ void free_irq_by_fd(int fd)
spin_lock_irqsave(&irq_lock, flags);
to_free = get_irq_entry_by_fd(fd);
- if (to_free != NULL) {
- do_free_by_irq_and_dev(
- to_free,
- -1,
- NULL,
- IGNORE_IRQ | IGNORE_DEV
- );
- }
- garbage_collect_irq_entries();
+ free_irq_entry(to_free, true);
spin_unlock_irqrestore(&irq_lock, flags);
}
EXPORT_SYMBOL(free_irq_by_fd);
static void free_irq_by_irq_and_dev(unsigned int irq, void *dev)
{
- struct irq_entry *to_free;
+ struct irq_entry *entry;
unsigned long flags;
spin_lock_irqsave(&irq_lock, flags);
- to_free = active_fds;
- while (to_free != NULL) {
- do_free_by_irq_and_dev(
- to_free,
- irq,
- dev,
- 0
- );
- to_free = to_free->next;
+ list_for_each_entry(entry, &active_fds, list) {
+ enum um_irq_type i;
+
+ for (i = 0; i < NUM_IRQ_TYPES; i++) {
+ struct irq_reg *reg = &entry->reg[i];
+
+ if (!reg->events)
+ continue;
+ if (reg->irq != irq)
+ continue;
+ if (reg->id != dev)
+ continue;
+
+ os_del_epoll_fd(entry->fd);
+ reg->events = 0;
+ update_or_free_irq_entry(entry);
+ goto out;
+ }
}
- garbage_collect_irq_entries();
+out:
spin_unlock_irqrestore(&irq_lock, flags);
}
-
void deactivate_fd(int fd, int irqnum)
{
- struct irq_entry *to_free;
+ struct irq_entry *entry;
unsigned long flags;
+ enum um_irq_type i;
os_del_epoll_fd(fd);
+
spin_lock_irqsave(&irq_lock, flags);
- to_free = get_irq_entry_by_fd(fd);
- if (to_free != NULL) {
- do_free_by_irq_and_dev(
- to_free,
- irqnum,
- NULL,
- IGNORE_DEV
- );
+ entry = get_irq_entry_by_fd(fd);
+ if (!entry)
+ goto out;
+
+ for (i = 0; i < NUM_IRQ_TYPES; i++) {
+ if (!entry->reg[i].events)
+ continue;
+ if (entry->reg[i].irq == irqnum)
+ entry->reg[i].events = 0;
}
- garbage_collect_irq_entries();
+
+ update_or_free_irq_entry(entry);
+out:
spin_unlock_irqrestore(&irq_lock, flags);
+
ignore_sigio_fd(fd);
}
EXPORT_SYMBOL(deactivate_fd);
@@ -396,24 +288,17 @@ EXPORT_SYMBOL(deactivate_fd);
*/
int deactivate_all_fds(void)
{
- struct irq_entry *to_free;
+ struct irq_entry *entry;
/* Stop IO. The IRQ loop has no lock so this is our
* only way of making sure we are safe to dispose
* of all IRQ handlers
*/
os_set_ioignore();
- to_free = active_fds;
- while (to_free != NULL) {
- do_free_by_irq_and_dev(
- to_free,
- -1,
- NULL,
- IGNORE_IRQ | IGNORE_DEV
- );
- to_free = to_free->next;
- }
- /* don't garbage collect - we can no longer call kfree() here */
+
+ /* we can no longer call kfree() here so just deactivate */
+ list_for_each_entry(entry, &active_fds, list)
+ os_del_epoll_fd(entry->fd);
os_close_epoll_fd();
return 0;
}
--
2.26.2
_______________________________________________
linux-um mailing list
linux-um@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-um
^ permalink raw reply related [flat|nested] 42+ messages in thread
* Re: [PATCH 0/7 um: IRQ handling cleanups
2020-11-23 19:56 [PATCH 0/7 um: IRQ handling cleanups Johannes Berg
` (6 preceding siblings ...)
2020-11-23 19:56 ` [PATCH 7/7] um: simplify IRQ handling code Johannes Berg
@ 2020-11-24 8:14 ` Anton Ivanov
2020-11-24 8:55 ` Johannes Berg
2020-11-24 21:11 ` Johannes Berg
8 siblings, 1 reply; 42+ messages in thread
From: Anton Ivanov @ 2020-11-24 8:14 UTC (permalink / raw)
To: Johannes Berg, linux-um
On 23/11/2020 19:56, Johannes Berg wrote:
> The IRQ code seems very confusing,
Tell me about it :)
> but now that I've had to dig
> through it, I've come up with a number of cleanups. Really what
> I wanted was suspend/resume support (next series), but this is
> all necessary for that, in particular for virtio resume support
> (still WIP).
Excellent. I will try to find some time to review it before the end of the day.
I have tried some of what you did when working on timers/epoll - namely turning off the HZ-like nanosleep in time.c. I could not get it to work at the time. So I dropped it from the final version of the patches.
>
> johannes
>
>
>
> _______________________________________________
> linux-um mailing list
> linux-um@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-um
>
--
Anton R. Ivanov
https://www.kot-begemot.co.uk/
_______________________________________________
linux-um mailing list
linux-um@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-um
^ permalink raw reply [flat|nested] 42+ messages in thread
* Re: [PATCH 0/7 um: IRQ handling cleanups
2020-11-24 8:14 ` [PATCH 0/7 um: IRQ handling cleanups Anton Ivanov
@ 2020-11-24 8:55 ` Johannes Berg
2020-11-24 8:58 ` Johannes Berg
0 siblings, 1 reply; 42+ messages in thread
From: Johannes Berg @ 2020-11-24 8:55 UTC (permalink / raw)
To: Anton Ivanov, linux-um
On Tue, 2020-11-24 at 08:14 +0000, Anton Ivanov wrote:
>
> On 23/11/2020 19:56, Johannes Berg wrote:
> > The IRQ code seems very confusing,
>
> Tell me about it :)
:)
> > but now that I've had to dig
> > through it, I've come up with a number of cleanups. Really what
> > I wanted was suspend/resume support (next series), but this is
> > all necessary for that, in particular for virtio resume support
> > (still WIP).
>
> Excellent. I will try to find some time to review it before the end of the day.
Oh, nice, thanks :)
> I have tried some of what you did when working on timers/epoll -
> namely turning off the HZ-like nanosleep in time.c. I could not get it
> to work at the time. So I dropped it from the final version of the
> patches.
That one's just weird ... and unnecessary. I can't see why it could
possibly matter.
Now, I'm not entirely sure that select(0, NULL, NULL, NULL, NULL) really
is the best thing to do.
johannes
_______________________________________________
linux-um mailing list
linux-um@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-um
^ permalink raw reply [flat|nested] 42+ messages in thread
* Re: [PATCH 0/7 um: IRQ handling cleanups
2020-11-24 8:55 ` Johannes Berg
@ 2020-11-24 8:58 ` Johannes Berg
2020-11-24 9:06 ` Anton Ivanov
0 siblings, 1 reply; 42+ messages in thread
From: Johannes Berg @ 2020-11-24 8:58 UTC (permalink / raw)
To: Anton Ivanov, linux-um
On Tue, 2020-11-24 at 09:55 +0100, Johannes Berg wrote:
>
> > I have tried some of what you did when working on timers/epoll -
> > namely turning off the HZ-like nanosleep in time.c. I could not get it
> > to work at the time. So I dropped it from the final version of the
> > patches.
>
> That one's just weird ... and unnecessary. I can't see why it could
> possibly matter.
Or actually ... wait? I thought you were referring to "um: simplify
os_idle_sleep() and sleep longer" but that's not in this set now...
Anyway, if you were indeed referring to that patch, it's not strictly
needed - removing it would just mean I couldn't call os_idle_sleep() for
suspend but would have to add os_suspend() or something. OTOH, it didn't
break anything for me (neither time-travel nor normal mode), and I can't
see how it was necessary since if clock_nanosleep() (or now select())
was interrupted by a signal and returned, the signal handler ran too...
johannes
_______________________________________________
linux-um mailing list
linux-um@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-um
^ permalink raw reply [flat|nested] 42+ messages in thread
* Re: [PATCH 0/7 um: IRQ handling cleanups
2020-11-24 8:58 ` Johannes Berg
@ 2020-11-24 9:06 ` Anton Ivanov
2020-11-24 16:34 ` Anton Ivanov
0 siblings, 1 reply; 42+ messages in thread
From: Anton Ivanov @ 2020-11-24 9:06 UTC (permalink / raw)
To: Johannes Berg, linux-um
On 24/11/2020 08:58, Johannes Berg wrote:
> On Tue, 2020-11-24 at 09:55 +0100, Johannes Berg wrote:
>>
>>> I have tried some of what you did when working on timers/epoll -
>>> namely turning off the HZ-like nanosleep in time.c. I could not get it
>>> to work at the time. So I dropped it from the final version of the
>>> patches.
>>
>> That one's just weird ... and unnecessary. I can't see why it could
>> possibly matter.
>
> Or actually ... wait? I thought you were referring to "um: simplify
> os_idle_sleep() and sleep longer" but that's not in this set now...
>
> Anyway, if you were indeed referring to that patch, it's not strictly
> needed - removing it would just mean I couldn't call os_idle_sleep() for
> suspend but would have to add os_suspend() or something. OTOH, it didn't
> break anything for me (neither time-travel nor normal mode), and I can't
> see how it was necessary since if clock_nanosleep() (or now select())
> was interrupted by a signal and returned, the signal handler ran too...
The early version of the timer patches were fairly fragile.
There is quite a bit of belt-n-braces leftovers from that, it will be good to clean it up.
>
> johannes
>
>
> _______________________________________________
> linux-um mailing list
> linux-um@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-um
>
--
Anton R. Ivanov
https://www.kot-begemot.co.uk/
_______________________________________________
linux-um mailing list
linux-um@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-um
^ permalink raw reply [flat|nested] 42+ messages in thread
* Re: [PATCH 0/7 um: IRQ handling cleanups
2020-11-24 9:06 ` Anton Ivanov
@ 2020-11-24 16:34 ` Anton Ivanov
2020-11-24 16:39 ` Johannes Berg
0 siblings, 1 reply; 42+ messages in thread
From: Anton Ivanov @ 2020-11-24 16:34 UTC (permalink / raw)
To: Johannes Berg, linux-um
On 24/11/2020 09:06, Anton Ivanov wrote:
>
>
> On 24/11/2020 08:58, Johannes Berg wrote:
>> On Tue, 2020-11-24 at 09:55 +0100, Johannes Berg wrote:
>>>
>>>> I have tried some of what you did when working on timers/epoll -
>>>> namely turning off the HZ-like nanosleep in time.c. I could not get it
>>>> to work at the time. So I dropped it from the final version of the
>>>> patches.
>>>
>>> That one's just weird ... and unnecessary. I can't see why it could
>>> possibly matter.
>>
>> Or actually ... wait? I thought you were referring to "um: simplify
>> os_idle_sleep() and sleep longer" but that's not in this set now...
>>
>> Anyway, if you were indeed referring to that patch, it's not strictly
>> needed - removing it would just mean I couldn't call os_idle_sleep() for
>> suspend but would have to add os_suspend() or something. OTOH, it didn't
>> break anything for me (neither time-travel nor normal mode), and I can't
>> see how it was necessary since if clock_nanosleep() (or now select())
>> was interrupted by a signal and returned, the signal handler ran too...
>
> The early version of the timer patches were fairly fragile.
>
> There is quite a bit of belt-n-braces leftovers from that, it will be good to clean it up.
I need to double-check the IRQ delete code. While I made most of it lockless and reentrant, I never finished cleaning all of it at the end.
That is where ->purge was coming from.
There were a couple of places in the serial code which could (and did) try to delete an IRQ out of the IRQ handler. I am not sure that is still the case as that also got rewritten to implement write IRQs instead of IRQ_NONE.
A.
>
>>
>> johannes
>>
>>
>> _______________________________________________
>> linux-um mailing list
>> linux-um@lists.infradead.org
>> http://lists.infradead.org/mailman/listinfo/linux-um
>>
>
--
Anton R. Ivanov
https://www.kot-begemot.co.uk/
_______________________________________________
linux-um mailing list
linux-um@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-um
^ permalink raw reply [flat|nested] 42+ messages in thread
* Re: [PATCH 0/7 um: IRQ handling cleanups
2020-11-24 16:34 ` Anton Ivanov
@ 2020-11-24 16:39 ` Johannes Berg
2020-11-24 16:42 ` Anton Ivanov
2020-11-24 16:45 ` Anton Ivanov
0 siblings, 2 replies; 42+ messages in thread
From: Johannes Berg @ 2020-11-24 16:39 UTC (permalink / raw)
To: Anton Ivanov, linux-um
On Tue, 2020-11-24 at 16:34 +0000, Anton Ivanov wrote:
> On 24/11/2020 09:06, Anton Ivanov wrote:
> >
> > On 24/11/2020 08:58, Johannes Berg wrote:
> > > On Tue, 2020-11-24 at 09:55 +0100, Johannes Berg wrote:
> > > > > I have tried some of what you did when working on timers/epoll -
> > > > > namely turning off the HZ-like nanosleep in time.c. I could not get it
> > > > > to work at the time. So I dropped it from the final version of the
> > > > > patches.
> > > >
> > > > That one's just weird ... and unnecessary. I can't see why it could
> > > > possibly matter.
> > >
> > > Or actually ... wait? I thought you were referring to "um: simplify
> > > os_idle_sleep() and sleep longer" but that's not in this set now...
> > >
> > > Anyway, if you were indeed referring to that patch, it's not strictly
> > > needed - removing it would just mean I couldn't call os_idle_sleep() for
> > > suspend but would have to add os_suspend() or something. OTOH, it didn't
> > > break anything for me (neither time-travel nor normal mode), and I can't
> > > see how it was necessary since if clock_nanosleep() (or now select())
> > > was interrupted by a signal and returned, the signal handler ran too...
> >
> > The early version of the timer patches were fairly fragile.
> >
> > There is quite a bit of belt-n-braces leftovers from that, it will be good to clean it up.
>
> I need to double-check the IRQ delete code. While I made most of it
> lockless and reentrant, I never finished cleaning all of it at the
> end.
>
> That is where ->purge was coming from.
I have no idea what ->purge is? :)
> There were a couple of places in the serial code which could (and did)
> try to delete an IRQ out of the IRQ handler. I am not sure that is
> still the case as that also got rewritten to implement write IRQs
> instead of IRQ_NONE.
Hmm. OK, but nothing used IRQ_NONE?
johannes
_______________________________________________
linux-um mailing list
linux-um@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-um
^ permalink raw reply [flat|nested] 42+ messages in thread
* Re: [PATCH 0/7 um: IRQ handling cleanups
2020-11-24 16:39 ` Johannes Berg
@ 2020-11-24 16:42 ` Anton Ivanov
2020-11-24 16:45 ` Anton Ivanov
1 sibling, 0 replies; 42+ messages in thread
From: Anton Ivanov @ 2020-11-24 16:42 UTC (permalink / raw)
To: Johannes Berg, linux-um
On 24/11/2020 16:39, Johannes Berg wrote:
> On Tue, 2020-11-24 at 16:34 +0000, Anton Ivanov wrote:
>> On 24/11/2020 09:06, Anton Ivanov wrote:
>>>
>>> On 24/11/2020 08:58, Johannes Berg wrote:
>>>> On Tue, 2020-11-24 at 09:55 +0100, Johannes Berg wrote:
>>>>>> I have tried some of what you did when working on timers/epoll -
>>>>>> namely turning off the HZ-like nanosleep in time.c. I could not get it
>>>>>> to work at the time. So I dropped it from the final version of the
>>>>>> patches.
>>>>>
>>>>> That one's just weird ... and unnecessary. I can't see why it could
>>>>> possibly matter.
>>>>
>>>> Or actually ... wait? I thought you were referring to "um: simplify
>>>> os_idle_sleep() and sleep longer" but that's not in this set now...
>>>>
>>>> Anyway, if you were indeed referring to that patch, it's not strictly
>>>> needed - removing it would just mean I couldn't call os_idle_sleep() for
>>>> suspend but would have to add os_suspend() or something. OTOH, it didn't
>>>> break anything for me (neither time-travel nor normal mode), and I can't
>>>> see how it was necessary since if clock_nanosleep() (or now select())
>>>> was interrupted by a signal and returned, the signal handler ran too...
>>>
>>> The early version of the timer patches were fairly fragile.
>>>
>>> There is quite a bit of belt-n-braces leftovers from that, it will be good to clean it up.
>>
>> I need to double-check the IRQ delete code. While I made most of it
>> lockless and reentrant, I never finished cleaning all of it at the
>> end.
>>
>> That is where ->purge was coming from.
>
> I have no idea what ->purge is? :)
>
>> There were a couple of places in the serial code which could (and did)
>> try to delete an IRQ out of the IRQ handler. I am not sure that is
>> still the case as that also got rewritten to implement write IRQs
>> instead of IRQ_NONE.
>
> Hmm. OK, but nothing used IRQ_NONE?
Not any more. All of the serial code used it till recently for write :)
>
> johannes
>
>
> _______________________________________________
> linux-um mailing list
> linux-um@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-um
>
--
Anton R. Ivanov
https://www.kot-begemot.co.uk/
_______________________________________________
linux-um mailing list
linux-um@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-um
^ permalink raw reply [flat|nested] 42+ messages in thread
* Re: [PATCH 0/7 um: IRQ handling cleanups
2020-11-24 16:39 ` Johannes Berg
2020-11-24 16:42 ` Anton Ivanov
@ 2020-11-24 16:45 ` Anton Ivanov
2020-11-24 16:46 ` Johannes Berg
1 sibling, 1 reply; 42+ messages in thread
From: Anton Ivanov @ 2020-11-24 16:45 UTC (permalink / raw)
To: Johannes Berg, linux-um
On 24/11/2020 16:39, Johannes Berg wrote:
> On Tue, 2020-11-24 at 16:34 +0000, Anton Ivanov wrote:
>> On 24/11/2020 09:06, Anton Ivanov wrote:
>>> On 24/11/2020 08:58, Johannes Berg wrote:
>>>> On Tue, 2020-11-24 at 09:55 +0100, Johannes Berg wrote:
>>>>>> I have tried some of what you did when working on timers/epoll -
>>>>>> namely turning off the HZ-like nanosleep in time.c. I could not get it
>>>>>> to work at the time. So I dropped it from the final version of the
>>>>>> patches.
>>>>> That one's just weird ... and unnecessary. I can't see why it could
>>>>> possibly matter.
>>>> Or actually ... wait? I thought you were referring to "um: simplify
>>>> os_idle_sleep() and sleep longer" but that's not in this set now...
>>>>
>>>> Anyway, if you were indeed referring to that patch, it's not strictly
>>>> needed - removing it would just mean I couldn't call os_idle_sleep() for
>>>> suspend but would have to add os_suspend() or something. OTOH, it didn't
>>>> break anything for me (neither time-travel nor normal mode), and I can't
>>>> see how it was necessary since if clock_nanosleep() (or now select())
>>>> was interrupted by a signal and returned, the signal handler ran too...
>>> The early version of the timer patches were fairly fragile.
>>>
>>> There is quite a bit of belt-n-braces leftovers from that, it will be good to clean it up.
>> I need to double-check the IRQ delete code. While I made most of it
>> lockless and reentrant, I never finished cleaning all of it at the
>> end.
>>
>> That is where ->purge was coming from.
> I have no idea what ->purge is? :)
One of the flags on the IRQ info structure.
You killed that in c0b17c371b43bddcd2fbfe643ce6a6c84347c013 "simplify IRQ handling code"
>
>> There were a couple of places in the serial code which could (and did)
>> try to delete an IRQ out of the IRQ handler. I am not sure that is
>> still the case as that also got rewritten to implement write IRQs
>> instead of IRQ_NONE.
> Hmm. OK, but nothing used IRQ_NONE?
>
> johannes
>
>
> _______________________________________________
> linux-um mailing list
> linux-um@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-um
>
--
Anton R. Ivanov
https://www.kot-begemot.co.uk/
_______________________________________________
linux-um mailing list
linux-um@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-um
^ permalink raw reply [flat|nested] 42+ messages in thread
* Re: [PATCH 0/7 um: IRQ handling cleanups
2020-11-24 16:45 ` Anton Ivanov
@ 2020-11-24 16:46 ` Johannes Berg
2020-11-24 17:07 ` Anton Ivanov
0 siblings, 1 reply; 42+ messages in thread
From: Johannes Berg @ 2020-11-24 16:46 UTC (permalink / raw)
To: Anton Ivanov, linux-um
On Tue, 2020-11-24 at 16:45 +0000, Anton Ivanov wrote:
>
> > > That is where ->purge was coming from.
> > I have no idea what ->purge is? :)
>
> One of the flags on the IRQ info structure.
>
> You killed that in c0b17c371b43bddcd2fbfe643ce6a6c84347c013 "simplify IRQ handling code"
And didn't even remember, oops. I'll check.
johannes
_______________________________________________
linux-um mailing list
linux-um@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-um
^ permalink raw reply [flat|nested] 42+ messages in thread
* Re: [PATCH 0/7 um: IRQ handling cleanups
2020-11-24 16:46 ` Johannes Berg
@ 2020-11-24 17:07 ` Anton Ivanov
2020-11-24 18:32 ` Johannes Berg
0 siblings, 1 reply; 42+ messages in thread
From: Anton Ivanov @ 2020-11-24 17:07 UTC (permalink / raw)
To: Johannes Berg, linux-um
On 24/11/2020 16:46, Johannes Berg wrote:
> On Tue, 2020-11-24 at 16:45 +0000, Anton Ivanov wrote:
>>
>>>> That is where ->purge was coming from.
>>> I have no idea what ->purge is? :)
>>
>> One of the flags on the IRQ info structure.
>>
>> You killed that in c0b17c371b43bddcd2fbfe643ce6a6c84347c013 "simplify IRQ handling code"
>
> And didn't even remember, oops. I'll check.
>
> johannes
>
>
> _______________________________________________
> linux-um mailing list
> linux-um@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-um
>
Looks like chan_kern.c handles it now. It schedules delayed work itself instead of trying to kill the IRQ out of IRQ context.
So the ->purge in irq.c and everything dealing with it should not be necessary any more.
--
Anton R. Ivanov
https://www.kot-begemot.co.uk/
_______________________________________________
linux-um mailing list
linux-um@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-um
^ permalink raw reply [flat|nested] 42+ messages in thread
* Re: [PATCH 0/7 um: IRQ handling cleanups
2020-11-24 17:07 ` Anton Ivanov
@ 2020-11-24 18:32 ` Johannes Berg
0 siblings, 0 replies; 42+ messages in thread
From: Johannes Berg @ 2020-11-24 18:32 UTC (permalink / raw)
To: Anton Ivanov, linux-um
On Tue, 2020-11-24 at 17:07 +0000, Anton Ivanov wrote:
>
> Looks like chan_kern.c handles it now. It schedules delayed work
> itself instead of trying to kill the IRQ out of IRQ context.
>
> So the ->purge in irq.c and everything dealing with it should not be
> necessary any more.
Aha, ok, great :)
Looking at the commit, I don't think I even had to care about ->purge
because it's basically just there to avoid possible use-after-free? And
then even if you did remove it from IRQ context, we'd not be freeing the
data anyway, we'd only be setting some data?
And actually, wouldn't it have been broken before, because
garbage_collect_entries() was still called in free_irq_by_irq_and_dev()?
So it's not like it wouldn't have been freed in the interrupt handler if
you were going to call that from within the interrupt handler? Or did I
misunderstand?
I guess what I'm trying to say is that since I removed the dynamic
allocation of what was previously "struct irq_fd", and
garbage_collect_entries() was called in the relevant places and would
free it, I didn't really see how that was any different?
do_free_by_irq_and_dev() previously marked as purge,
but garbage_collect_irq_entries() was immediately called ...
johannes
_______________________________________________
linux-um mailing list
linux-um@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-um
^ permalink raw reply [flat|nested] 42+ messages in thread
* Re: [PATCH 0/7 um: IRQ handling cleanups
2020-11-23 19:56 [PATCH 0/7 um: IRQ handling cleanups Johannes Berg
` (7 preceding siblings ...)
2020-11-24 8:14 ` [PATCH 0/7 um: IRQ handling cleanups Anton Ivanov
@ 2020-11-24 21:11 ` Johannes Berg
8 siblings, 0 replies; 42+ messages in thread
From: Johannes Berg @ 2020-11-24 21:11 UTC (permalink / raw)
To: linux-um
On Mon, 2020-11-23 at 20:56 +0100, Johannes Berg wrote:
> The IRQ code seems very confusing, but now that I've had to dig
> through it, I've come up with a number of cleanups. Really what
> I wanted was suspend/resume support (next series), but this is
> all necessary for that, in particular for virtio resume support
> (still WIP).
Btw.
It seems to me that we really ought to implement IRQ masking and
unmasking correctly. I've run into a number of scenarios now where we
can never return from sigio_handler() because an FD is readable (or
writeable) and thus we got SIGIO, but then it doesn't *stop* being
readable (writeable) because the actual interrupt handler isn't run. I
hit this in suspend, but perhaps there are other reasons why we might
never get to the interrupt handler (irq_may_run())?
In any case, I did solve these issues by just doing the restore of
interrupts late enough for now, and probably always munging the epoll
mask is too expensive ... but it's definitely a caveat here.
johannes
_______________________________________________
linux-um mailing list
linux-um@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-um
^ permalink raw reply [flat|nested] 42+ messages in thread
* Re: [PATCH 7/7] um: simplify IRQ handling code
2020-11-23 19:56 ` [PATCH 7/7] um: simplify IRQ handling code Johannes Berg
@ 2020-11-24 21:50 ` Anton Ivanov
2020-11-24 21:58 ` Johannes Berg
2020-11-30 16:30 ` Anton Ivanov
2020-12-02 11:54 ` Johannes Berg
2 siblings, 1 reply; 42+ messages in thread
From: Anton Ivanov @ 2020-11-24 21:50 UTC (permalink / raw)
To: Johannes Berg, linux-um; +Cc: Johannes Berg
On 23/11/2020 19:56, Johannes Berg wrote:
> From: Johannes Berg <johannes.berg@intel.com>
>
> Reduce dynamic allocations (and thereby cache misses) by simply
> embedding the registration data for IRQs in the irq_entry, we
> never supported these being really dynamic anyway as only one
> was ever allowed ("Trying to reregister ...").
>
> Lockless behaviour is preserved by removing the FD from the poll
> set appropriately, but we use reg->events to indicate whether or
> not this entry is used, rather than dynamically allocating them.
>
> Also port the list of IRQ entries to list_head instead of the
> current open-coded singly-linked list implementation, just for
> sanity.
>
> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
> ---
> arch/um/kernel/irq.c | 369 +++++++++++++++----------------------------
> 1 file changed, 127 insertions(+), 242 deletions(-)
>
> diff --git a/arch/um/kernel/irq.c b/arch/um/kernel/irq.c
> index 9e8f776bb43a..bbf5a466b44c 100644
> --- a/arch/um/kernel/irq.c
> +++ b/arch/um/kernel/irq.c
> @@ -29,26 +29,23 @@ extern void free_irqs(void);
> * This is why we keep a small irq_reg array for each fd -
> * one entry per IRQ type
> */
> -
> struct irq_reg {
> void *id;
> - enum um_irq_type type;
> int irq;
> + /* it's cheaper to store this than to query it */
> int events;
> bool active;
> bool pending;
> - bool purge;
> };
>
> struct irq_entry {
> - struct irq_entry *next;
> + struct list_head list;
> int fd;
> - struct irq_reg *irq_array[NUM_IRQ_TYPES];
> + struct irq_reg reg[NUM_IRQ_TYPES];
> };
>
> -static struct irq_entry *active_fds;
> -
> static DEFINE_SPINLOCK(irq_lock);
> +static LIST_HEAD(active_fds);
> static DECLARE_BITMAP(irqs_allocated, NR_IRQS);
>
> static void irq_io_loop(struct irq_reg *irq, struct uml_pt_regs *regs)
> @@ -61,12 +58,13 @@ static void irq_io_loop(struct irq_reg *irq, struct uml_pt_regs *regs)
> */
> if (irq->active) {
> irq->active = false;
> +
> do {
> irq->pending = false;
> do_IRQ(irq->irq, regs);
> - } while (irq->pending && (!irq->purge));
> - if (!irq->purge)
> - irq->active = true;
> + } while (irq->pending);
> +
> + irq->active = true;
> } else {
> irq->pending = true;
> }
> @@ -75,9 +73,7 @@ static void irq_io_loop(struct irq_reg *irq, struct uml_pt_regs *regs)
> void sigio_handler(int sig, struct siginfo *unused_si, struct uml_pt_regs *regs)
> {
> struct irq_entry *irq_entry;
> - struct irq_reg *irq;
> -
> - int n, i, j;
> + int n, i;
>
> while (1) {
> /* This is now lockless - epoll keeps back-referencesto the irqs
> @@ -96,21 +92,18 @@ void sigio_handler(int sig, struct siginfo *unused_si, struct uml_pt_regs *regs)
> }
>
> for (i = 0; i < n ; i++) {
> - /* Epoll back reference is the entry with 2 irq_reg
> - * leaves - one for each irq type.
> - */
> - irq_entry = (struct irq_entry *)
> - os_epoll_get_data_pointer(i);
> - for (j = 0; j < NUM_IRQ_TYPES ; j++) {
> - irq = irq_entry->irq_array[j];
> - if (irq == NULL)
> + enum um_irq_type t;
> +
> + irq_entry = os_epoll_get_data_pointer(i);
> +
> + for (t = 0; t < NUM_IRQ_TYPES; t++) {
> + int events = irq_entry->reg[t].events;
> +
> + if (!events)
> continue;
> - if (os_epoll_triggered(i, irq->events) > 0)
> - irq_io_loop(irq, regs);
> - if (irq->purge) {
> - irq_entry->irq_array[j] = NULL;
> - kfree(irq);
> - }
> +
> + if (os_epoll_triggered(i, events) > 0)
> + irq_io_loop(&irq_entry->reg[t], regs);
> }
> }
> }
> @@ -118,32 +111,59 @@ void sigio_handler(int sig, struct siginfo *unused_si, struct uml_pt_regs *regs)
> free_irqs();
> }
>
> -static int assign_epoll_events_to_irq(struct irq_entry *irq_entry)
> +static struct irq_entry *get_irq_entry_by_fd(int fd)
> {
> - int i;
> - int events = 0;
> - struct irq_reg *irq;
> + struct irq_entry *walk;
>
> - for (i = 0; i < NUM_IRQ_TYPES ; i++) {
> - irq = irq_entry->irq_array[i];
> - if (irq != NULL)
> - events = irq->events | events;
> - }
> - if (events > 0) {
> - /* os_add_epoll will call os_mod_epoll if this already exists */
> - return os_add_epoll_fd(events, irq_entry->fd, irq_entry);
> + lockdep_assert_held(&irq_lock);
> +
> + list_for_each_entry(walk, &active_fds, list) {
> + if (walk->fd == fd)
> + return walk;
> }
> - /* No events - delete */
> - return os_del_epoll_fd(irq_entry->fd);
> +
> + return NULL;
> +}
> +
> +static void free_irq_entry(struct irq_entry *to_free, bool remove)
> +{
> + if (!to_free)
> + return;
> +
> + if (remove)
> + os_del_epoll_fd(to_free->fd);
> + list_del(&to_free->list);
> + kfree(to_free);
> }
>
> +static bool update_irq_entry(struct irq_entry *entry)
> +{
> + enum um_irq_type i;
> + int events = 0;
> +
> + for (i = 0; i < NUM_IRQ_TYPES; i++)
> + events |= entry->reg[i].events;
>
> + if (events) {
> + /* will modify (instead of add) if needed */
> + os_add_epoll_fd(events, entry->fd, entry);
> + return true;
> + }
> +
> + os_del_epoll_fd(entry->fd);
> + return false;
> +}
> +
> +static void update_or_free_irq_entry(struct irq_entry *entry)
> +{
> + if (!update_irq_entry(entry))
> + free_irq_entry(entry, false);
> +}
>
> static int activate_fd(int irq, int fd, enum um_irq_type type, void *dev_id)
> {
> - struct irq_reg *new_fd;
> struct irq_entry *irq_entry;
> - int i, err, events;
> + int err, events = os_event_mask(type);
> unsigned long flags;
>
> err = os_set_fd_async(fd);
> @@ -151,73 +171,33 @@ static int activate_fd(int irq, int fd, enum um_irq_type type, void *dev_id)
> goto out;
>
> spin_lock_irqsave(&irq_lock, flags);
> -
> - /* Check if we have an entry for this fd */
> -
> - err = -EBUSY;
> - for (irq_entry = active_fds;
> - irq_entry != NULL; irq_entry = irq_entry->next) {
> - if (irq_entry->fd == fd)
> - break;
> - }
> -
> - if (irq_entry == NULL) {
> - /* This needs to be atomic as it may be called from an
> - * IRQ context.
> - */
> - irq_entry = kmalloc(sizeof(struct irq_entry), GFP_ATOMIC);
> - if (irq_entry == NULL) {
> - printk(KERN_ERR
> - "Failed to allocate new IRQ entry\n");
> + irq_entry = get_irq_entry_by_fd(fd);
> + if (irq_entry) {
This is not right.
You can re-register the same IRQ/fd, but with a different mask - f.e.
turn on/off write or read on the same fd. F.E. - you have registered a
read IRQ, you after that register same IRQ for write and you can alter
the mask.
Though I have managed to get rid of most of the code which does that
(f.e. serials now have separate irqs for read and write), there may be
cases where it will be needed.
> + /* cannot register the same FD twice with the same type */
> + if (WARN_ON(irq_entry->reg[type].events)) {
> + err = -EALREADY;
> goto out_unlock;
> }
> - irq_entry->fd = fd;
> - for (i = 0; i < NUM_IRQ_TYPES; i++)
> - irq_entry->irq_array[i] = NULL;
> - irq_entry->next = active_fds;
> - active_fds = irq_entry;
> - }
> -
> - /* Check if we are trying to re-register an interrupt for a
> - * particular fd
> - */
>
> - if (irq_entry->irq_array[type] != NULL) {
> - printk(KERN_ERR
> - "Trying to reregister IRQ %d FD %d TYPE %d ID %p\n",
> - irq, fd, type, dev_id
> - );
> - goto out_unlock;
> + /* temporarily disable to avoid IRQ-side locking */
> + os_del_epoll_fd(fd);
> } else {
> - /* New entry for this fd */
> -
> - err = -ENOMEM;
> - new_fd = kmalloc(sizeof(struct irq_reg), GFP_ATOMIC);
> - if (new_fd == NULL)
> + irq_entry = kzalloc(sizeof(*irq_entry), GFP_ATOMIC);
> + if (!irq_entry) {
> + err = -ENOMEM;
> goto out_unlock;
> -
> - events = os_event_mask(type);
> -
> - *new_fd = ((struct irq_reg) {
> - .id = dev_id,
> - .irq = irq,
> - .type = type,
> - .events = events,
> - .active = true,
> - .pending = false,
> - .purge = false
> - });
> - /* Turn off any IO on this fd - allows us to
> - * avoid locking the IRQ loop
> - */
> - os_del_epoll_fd(irq_entry->fd);
> - irq_entry->irq_array[type] = new_fd;
> + }
> + irq_entry->fd = fd;
> + list_add_tail(&irq_entry->list, &active_fds);
> + maybe_sigio_broken(fd);
> }
>
> - /* Turn back IO on with the correct (new) IO event mask */
> - assign_epoll_events_to_irq(irq_entry);
> + irq_entry->reg[type].irq = irq;
> + irq_entry->reg[type].active = true;
> + irq_entry->reg[type].events = events;
> +
> + WARN_ON(!update_irq_entry(irq_entry));
> spin_unlock_irqrestore(&irq_lock, flags);
> - maybe_sigio_broken(fd);
>
> return 0;
> out_unlock:
> @@ -227,104 +207,10 @@ static int activate_fd(int irq, int fd, enum um_irq_type type, void *dev_id)
> }
>
> /*
> - * Walk the IRQ list and dispose of any unused entries.
> - * Should be done under irq_lock.
> + * Remove the entry or entries for a specific FD, if you
> + * don't want to remove all the possible entries then use
> + * um_free_irq() or deactivate_fd() instead.
> */
> -
> -static void garbage_collect_irq_entries(void)
> -{
> - int i;
> - bool reap;
> - struct irq_entry *walk;
> - struct irq_entry *previous = NULL;
> - struct irq_entry *to_free;
> -
> - if (active_fds == NULL)
> - return;
> - walk = active_fds;
> - while (walk != NULL) {
> - reap = true;
> - for (i = 0; i < NUM_IRQ_TYPES ; i++) {
> - if (walk->irq_array[i] != NULL) {
> - reap = false;
> - break;
> - }
> - }
> - if (reap) {
> - if (previous == NULL)
> - active_fds = walk->next;
> - else
> - previous->next = walk->next;
> - to_free = walk;
> - } else {
> - to_free = NULL;
> - }
> - walk = walk->next;
> - kfree(to_free);
> - }
> -}
> -
> -/*
> - * Walk the IRQ list and get the descriptor for our FD
> - */
> -
> -static struct irq_entry *get_irq_entry_by_fd(int fd)
> -{
> - struct irq_entry *walk = active_fds;
> -
> - while (walk != NULL) {
> - if (walk->fd == fd)
> - return walk;
> - walk = walk->next;
> - }
> - return NULL;
> -}
> -
> -
> -/*
> - * Walk the IRQ list and dispose of an entry for a specific
> - * device and number. Note - if sharing an IRQ for read
> - * and write for the same FD it will be disposed in either case.
> - * If this behaviour is undesirable use different IRQ ids.
> - */
> -
> -#define IGNORE_IRQ 1
> -#define IGNORE_DEV (1<<1)
> -
> -static void do_free_by_irq_and_dev(
> - struct irq_entry *irq_entry,
> - unsigned int irq,
> - void *dev,
> - int flags
> -)
> -{
> - int i;
> - struct irq_reg *to_free;
> -
> - for (i = 0; i < NUM_IRQ_TYPES ; i++) {
> - if (irq_entry->irq_array[i] != NULL) {
> - if (
> - ((flags & IGNORE_IRQ) ||
> - (irq_entry->irq_array[i]->irq == irq)) &&
> - ((flags & IGNORE_DEV) ||
> - (irq_entry->irq_array[i]->id == dev))
> - ) {
> - /* Turn off any IO on this fd - allows us to
> - * avoid locking the IRQ loop
> - */
> - os_del_epoll_fd(irq_entry->fd);
> - to_free = irq_entry->irq_array[i];
> - irq_entry->irq_array[i] = NULL;
> - assign_epoll_events_to_irq(irq_entry);
> - if (to_free->active)
> - to_free->purge = true;
> - else
> - kfree(to_free);
> - }
> - }
> - }
> -}
> -
> void free_irq_by_fd(int fd)
> {
> struct irq_entry *to_free;
> @@ -332,58 +218,64 @@ void free_irq_by_fd(int fd)
>
> spin_lock_irqsave(&irq_lock, flags);
> to_free = get_irq_entry_by_fd(fd);
> - if (to_free != NULL) {
> - do_free_by_irq_and_dev(
> - to_free,
> - -1,
> - NULL,
> - IGNORE_IRQ | IGNORE_DEV
> - );
> - }
> - garbage_collect_irq_entries();
> + free_irq_entry(to_free, true);
> spin_unlock_irqrestore(&irq_lock, flags);
> }
> EXPORT_SYMBOL(free_irq_by_fd);
>
> static void free_irq_by_irq_and_dev(unsigned int irq, void *dev)
> {
> - struct irq_entry *to_free;
> + struct irq_entry *entry;
> unsigned long flags;
>
> spin_lock_irqsave(&irq_lock, flags);
> - to_free = active_fds;
> - while (to_free != NULL) {
> - do_free_by_irq_and_dev(
> - to_free,
> - irq,
> - dev,
> - 0
> - );
> - to_free = to_free->next;
> + list_for_each_entry(entry, &active_fds, list) {
> + enum um_irq_type i;
> +
> + for (i = 0; i < NUM_IRQ_TYPES; i++) {
> + struct irq_reg *reg = &entry->reg[i];
> +
> + if (!reg->events)
> + continue;
> + if (reg->irq != irq)
> + continue;
> + if (reg->id != dev)
> + continue;
> +
> + os_del_epoll_fd(entry->fd);
> + reg->events = 0;
> + update_or_free_irq_entry(entry);
> + goto out;
> + }
> }
> - garbage_collect_irq_entries();
> +out:
> spin_unlock_irqrestore(&irq_lock, flags);
> }
>
> -
> void deactivate_fd(int fd, int irqnum)
> {
> - struct irq_entry *to_free;
> + struct irq_entry *entry;
> unsigned long flags;
> + enum um_irq_type i;
>
> os_del_epoll_fd(fd);
> +
> spin_lock_irqsave(&irq_lock, flags);
> - to_free = get_irq_entry_by_fd(fd);
> - if (to_free != NULL) {
> - do_free_by_irq_and_dev(
> - to_free,
> - irqnum,
> - NULL,
> - IGNORE_DEV
> - );
> + entry = get_irq_entry_by_fd(fd);
> + if (!entry)
> + goto out;
> +
> + for (i = 0; i < NUM_IRQ_TYPES; i++) {
> + if (!entry->reg[i].events)
> + continue;
> + if (entry->reg[i].irq == irqnum)
> + entry->reg[i].events = 0;
> }
> - garbage_collect_irq_entries();
> +
> + update_or_free_irq_entry(entry);
> +out:
> spin_unlock_irqrestore(&irq_lock, flags);
> +
> ignore_sigio_fd(fd);
> }
> EXPORT_SYMBOL(deactivate_fd);
> @@ -396,24 +288,17 @@ EXPORT_SYMBOL(deactivate_fd);
> */
> int deactivate_all_fds(void)
> {
> - struct irq_entry *to_free;
> + struct irq_entry *entry;
>
> /* Stop IO. The IRQ loop has no lock so this is our
> * only way of making sure we are safe to dispose
> * of all IRQ handlers
> */
> os_set_ioignore();
> - to_free = active_fds;
> - while (to_free != NULL) {
> - do_free_by_irq_and_dev(
> - to_free,
> - -1,
> - NULL,
> - IGNORE_IRQ | IGNORE_DEV
> - );
> - to_free = to_free->next;
> - }
> - /* don't garbage collect - we can no longer call kfree() here */
> +
> + /* we can no longer call kfree() here so just deactivate */
> + list_for_each_entry(entry, &active_fds, list)
> + os_del_epoll_fd(entry->fd);
> os_close_epoll_fd();
> return 0;
> }
--
Anton R. Ivanov
https://www.kot-begemot.co.uk/
_______________________________________________
linux-um mailing list
linux-um@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-um
^ permalink raw reply [flat|nested] 42+ messages in thread
* Re: [PATCH 7/7] um: simplify IRQ handling code
2020-11-24 21:50 ` Anton Ivanov
@ 2020-11-24 21:58 ` Johannes Berg
2020-11-24 22:36 ` Anton Ivanov
0 siblings, 1 reply; 42+ messages in thread
From: Johannes Berg @ 2020-11-24 21:58 UTC (permalink / raw)
To: Anton Ivanov, linux-um
On Tue, 2020-11-24 at 21:50 +0000, Anton Ivanov wrote:
>
> > static int activate_fd(int irq, int fd, enum um_irq_type type, void *dev_id)
> > {
> > - struct irq_reg *new_fd;
> > struct irq_entry *irq_entry;
> > - int i, err, events;
> > + int err, events = os_event_mask(type);
> > unsigned long flags;
> >
> > err = os_set_fd_async(fd);
> > @@ -151,73 +171,33 @@ static int activate_fd(int irq, int fd, enum um_irq_type type, void *dev_id)
> > goto out;
> >
> > spin_lock_irqsave(&irq_lock, flags);
> > -
> > - /* Check if we have an entry for this fd */
> > -
> > - err = -EBUSY;
> > - for (irq_entry = active_fds;
> > - irq_entry != NULL; irq_entry = irq_entry->next) {
> > - if (irq_entry->fd == fd)
> > - break;
> > - }
> > -
> > - if (irq_entry == NULL) {
> > - /* This needs to be atomic as it may be called from an
> > - * IRQ context.
> > - */
> > - irq_entry = kmalloc(sizeof(struct irq_entry), GFP_ATOMIC);
> > - if (irq_entry == NULL) {
> > - printk(KERN_ERR
> > - "Failed to allocate new IRQ entry\n");
> > + irq_entry = get_irq_entry_by_fd(fd);
> > + if (irq_entry) {
>
> This is not right.
>
> You can re-register the same IRQ/fd, but with a different mask - f.e.
> turn on/off write or read on the same fd. F.E. - you have registered a
> read IRQ, you after that register same IRQ for write and you can alter
> the mask.
Hmm. You snipped some code, and it continued like this:
irq_entry = get_irq_entry_by_fd(fd);
if (irq_entry) {
/* cannot register the same FD twice with the same type */
if (WARN_ON(irq_entry->reg[type].events)) {
// basically return -EALREADY
I'm not sure I see this is different from what it was before? If the
irq_entry was found before (by fd, so that's equivalent to
get_irq_entry_by_fd(), was just open-coded), then previously it would
have gone into
- if (irq_entry->irq_array[type] != NULL) {
- printk(KERN_ERR
- "Trying to reregister IRQ %d FD %d TYPE %d ID %p\n",
- irq, fd, type, dev_id
- );
- goto out_unlock;
which was a failure?
But you meant a *different* type (IRQ_READ vs. IRQ_WRITE), and then in
my new code we also accept that:
irq_entry = get_irq_entry_by_fd(fd);
if (irq_entry) {
/* cannot register the same FD twice with the same type */
if (WARN_ON(irq_entry->reg[type].events)) {
err = -EALREADY;
goto out_unlock;
}
/* temporarily disable to avoid IRQ-side locking */
os_del_epoll_fd(fd);
} else {
[...]
}
irq_entry->reg[type].irq = irq;
irq_entry->reg[type].active = true;
irq_entry->reg[type].events = events;
So not sure I see the difference wrt. this?
You can't really *alter* the mask, even in the old code, you can just
register a new IRQ (or even the same) for the other type (read/write),
and then unregister the old type or such.
Ok ... what am I missing?
johannes
_______________________________________________
linux-um mailing list
linux-um@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-um
^ permalink raw reply [flat|nested] 42+ messages in thread
* Re: [PATCH 7/7] um: simplify IRQ handling code
2020-11-24 21:58 ` Johannes Berg
@ 2020-11-24 22:36 ` Anton Ivanov
2020-11-30 12:00 ` Johannes Berg
0 siblings, 1 reply; 42+ messages in thread
From: Anton Ivanov @ 2020-11-24 22:36 UTC (permalink / raw)
To: Johannes Berg, linux-um
On 24/11/2020 21:58, Johannes Berg wrote:
> On Tue, 2020-11-24 at 21:50 +0000, Anton Ivanov wrote:
>>
>>> static int activate_fd(int irq, int fd, enum um_irq_type type, void *dev_id)
>>> {
>>> - struct irq_reg *new_fd;
>>> struct irq_entry *irq_entry;
>>> - int i, err, events;
>>> + int err, events = os_event_mask(type);
>>> unsigned long flags;
>>>
>>> err = os_set_fd_async(fd);
>>> @@ -151,73 +171,33 @@ static int activate_fd(int irq, int fd, enum um_irq_type type, void *dev_id)
>>> goto out;
>>>
>>> spin_lock_irqsave(&irq_lock, flags);
>>> -
>>> - /* Check if we have an entry for this fd */
>>> -
>>> - err = -EBUSY;
>>> - for (irq_entry = active_fds;
>>> - irq_entry != NULL; irq_entry = irq_entry->next) {
>>> - if (irq_entry->fd == fd)
>>> - break;
>>> - }
>>> -
>>> - if (irq_entry == NULL) {
>>> - /* This needs to be atomic as it may be called from an
>>> - * IRQ context.
>>> - */
>>> - irq_entry = kmalloc(sizeof(struct irq_entry), GFP_ATOMIC);
>>> - if (irq_entry == NULL) {
>>> - printk(KERN_ERR
>>> - "Failed to allocate new IRQ entry\n");
>>> + irq_entry = get_irq_entry_by_fd(fd);
>>> + if (irq_entry) {
>>
>> This is not right.
>>
>> You can re-register the same IRQ/fd, but with a different mask - f.e.
>> turn on/off write or read on the same fd. F.E. - you have registered a
>> read IRQ, you after that register same IRQ for write and you can alter
>> the mask.
>
> Hmm. You snipped some code, and it continued like this:
>
> irq_entry = get_irq_entry_by_fd(fd);
> if (irq_entry) {
> /* cannot register the same FD twice with the same type */
> if (WARN_ON(irq_entry->reg[type].events)) {
> // basically return -EALREADY
>
>
> I'm not sure I see this is different from what it was before? If the
The original intention was to be able to do it :)
If there is no code to use that and/or if it was not working properly
anyway we may abandon that for the time being.
A.
> irq_entry was found before (by fd, so that's equivalent to
> get_irq_entry_by_fd(), was just open-coded), then previously it would
> have gone into
>
> - if (irq_entry->irq_array[type] != NULL) {
> - printk(KERN_ERR
> - "Trying to reregister IRQ %d FD %d TYPE %d ID %p\n",
> - irq, fd, type, dev_id
> - );
> - goto out_unlock;
>
> which was a failure?
>
> But you meant a *different* type (IRQ_READ vs. IRQ_WRITE), and then in
> my new code we also accept that:
>
> irq_entry = get_irq_entry_by_fd(fd);
> if (irq_entry) {
> /* cannot register the same FD twice with the same type */
> if (WARN_ON(irq_entry->reg[type].events)) {
> err = -EALREADY;
> goto out_unlock;
> }
>
> /* temporarily disable to avoid IRQ-side locking */
> os_del_epoll_fd(fd);
> } else {
> [...]
> }
>
> irq_entry->reg[type].irq = irq;
> irq_entry->reg[type].active = true;
> irq_entry->reg[type].events = events;
>
>
> So not sure I see the difference wrt. this?
>
>
> You can't really *alter* the mask, even in the old code, you can just
> register a new IRQ (or even the same) for the other type (read/write),
> and then unregister the old type or such.
>
> Ok ... what am I missing?
>
> johannes
>
>
> _______________________________________________
> linux-um mailing list
> linux-um@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-um
>
--
Anton R. Ivanov
https://www.kot-begemot.co.uk/
_______________________________________________
linux-um mailing list
linux-um@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-um
^ permalink raw reply [flat|nested] 42+ messages in thread
* Re: [PATCH 1/7] um: support dynamic IRQ allocation
2020-11-23 19:56 ` [PATCH 1/7] um: support dynamic IRQ allocation Johannes Berg
@ 2020-11-30 11:26 ` Anton Ivanov
0 siblings, 0 replies; 42+ messages in thread
From: Anton Ivanov @ 2020-11-30 11:26 UTC (permalink / raw)
To: Johannes Berg, linux-um; +Cc: Johannes Berg
On 23/11/2020 19:56, Johannes Berg wrote:
> From: Johannes Berg <johannes.berg@intel.com>
>
> It's cumbersome and error-prone to keep adding fixed IRQ numbers,
> and for proper device wakeup support for the virtio/vhost-user
> support we need to have different IRQs for each device. Even if
> in theory two IRQs (with and without wake) might be sufficient,
> it's much easier to reason about it when we have dynamic number
> assignment. It also makes it easier to add new devices that may
> dynamically exist or depending on the configuration, etc.
>
> Add support for this, up to 64 IRQs (the same limit as epoll FDs
> we have right now). Since it's not easy to port all the existing
> places to dynamic allocation (some data is statically initialized)
> keep the low numbers are reserved for the existing hard-coded IRQ
> numbers.
>
> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
> ---
> arch/um/drivers/line.c | 18 ++++++++++-----
> arch/um/drivers/mconsole_kern.c | 2 +-
> arch/um/drivers/net_kern.c | 2 +-
> arch/um/drivers/port_kern.c | 4 ++--
> arch/um/drivers/random.c | 2 +-
> arch/um/drivers/ubd_kern.c | 2 +-
> arch/um/drivers/vector_kern.c | 4 ++--
> arch/um/drivers/virtio_uml.c | 4 ++--
> arch/um/drivers/xterm_kern.c | 2 +-
> arch/um/include/asm/irq.h | 6 ++---
> arch/um/include/shared/irq_kern.h | 12 +++++-----
> arch/um/kernel/irq.c | 37 ++++++++++++++++++++++++++-----
> arch/um/kernel/sigio.c | 2 +-
> 13 files changed, 65 insertions(+), 32 deletions(-)
>
> diff --git a/arch/um/drivers/line.c b/arch/um/drivers/line.c
> index 14ad9f495fe6..2d68f58ac54b 100644
> --- a/arch/um/drivers/line.c
> +++ b/arch/um/drivers/line.c
> @@ -262,19 +262,25 @@ static irqreturn_t line_write_interrupt(int irq, void *data)
> int line_setup_irq(int fd, int input, int output, struct line *line, void *data)
> {
> const struct line_driver *driver = line->driver;
> - int err = 0;
> + int err;
>
> - if (input)
> + if (input) {
> err = um_request_irq(driver->read_irq, fd, IRQ_READ,
> line_interrupt, IRQF_SHARED,
> driver->read_irq_name, data);
> - if (err)
> - return err;
> - if (output)
> + if (err < 0)
> + return err;
> + }
> +
> + if (output) {
> err = um_request_irq(driver->write_irq, fd, IRQ_WRITE,
> line_write_interrupt, IRQF_SHARED,
> driver->write_irq_name, data);
> - return err;
> + if (err < 0)
> + return err;
> + }
> +
> + return 0;
> }
>
> static int line_activate(struct tty_port *port, struct tty_struct *tty)
> diff --git a/arch/um/drivers/mconsole_kern.c b/arch/um/drivers/mconsole_kern.c
> index a2e680f7d39f..6d00af25ec6b 100644
> --- a/arch/um/drivers/mconsole_kern.c
> +++ b/arch/um/drivers/mconsole_kern.c
> @@ -738,7 +738,7 @@ static int __init mconsole_init(void)
>
> err = um_request_irq(MCONSOLE_IRQ, sock, IRQ_READ, mconsole_interrupt,
> IRQF_SHARED, "mconsole", (void *)sock);
> - if (err) {
> + if (err < 0) {
> printk(KERN_ERR "Failed to get IRQ for management console\n");
> goto out;
> }
> diff --git a/arch/um/drivers/net_kern.c b/arch/um/drivers/net_kern.c
> index 1802cf4ef5a5..2fc0b038ff8a 100644
> --- a/arch/um/drivers/net_kern.c
> +++ b/arch/um/drivers/net_kern.c
> @@ -160,7 +160,7 @@ static int uml_net_open(struct net_device *dev)
>
> err = um_request_irq(dev->irq, lp->fd, IRQ_READ, uml_net_interrupt,
> IRQF_SHARED, dev->name, dev);
> - if (err != 0) {
> + if (err < 0) {
> printk(KERN_ERR "uml_net_open: failed to get irq(%d)\n", err);
> err = -ENETUNREACH;
> goto out_close;
> diff --git a/arch/um/drivers/port_kern.c b/arch/um/drivers/port_kern.c
> index a47ca5376d9d..efa8b7304090 100644
> --- a/arch/um/drivers/port_kern.c
> +++ b/arch/um/drivers/port_kern.c
> @@ -100,7 +100,7 @@ static int port_accept(struct port_list *port)
> .port = port });
>
> if (um_request_irq(TELNETD_IRQ, socket[0], IRQ_READ, pipe_interrupt,
> - IRQF_SHARED, "telnetd", conn)) {
> + IRQF_SHARED, "telnetd", conn) < 0) {
> printk(KERN_ERR "port_accept : failed to get IRQ for "
> "telnetd\n");
> goto out_free;
> @@ -182,7 +182,7 @@ void *port_data(int port_num)
> }
>
> if (um_request_irq(ACCEPT_IRQ, fd, IRQ_READ, port_interrupt,
> - IRQF_SHARED, "port", port)) {
> + IRQF_SHARED, "port", port) < 0) {
> printk(KERN_ERR "Failed to get IRQ for port %d\n", port_num);
> goto out_close;
> }
> diff --git a/arch/um/drivers/random.c b/arch/um/drivers/random.c
> index ce115fce52f0..385cb08d7ec2 100644
> --- a/arch/um/drivers/random.c
> +++ b/arch/um/drivers/random.c
> @@ -129,7 +129,7 @@ static int __init rng_init (void)
>
> err = um_request_irq(RANDOM_IRQ, random_fd, IRQ_READ, random_interrupt,
> 0, "random", NULL);
> - if (err)
> + if (err < 0)
> goto err_out_cleanup_hw;
>
> sigio_broken(random_fd, 1);
> diff --git a/arch/um/drivers/ubd_kern.c b/arch/um/drivers/ubd_kern.c
> index eae8c83364f7..d4c39e595c72 100644
> --- a/arch/um/drivers/ubd_kern.c
> +++ b/arch/um/drivers/ubd_kern.c
> @@ -1204,7 +1204,7 @@ static int __init ubd_driver_init(void){
> }
> err = um_request_irq(UBD_IRQ, thread_fd, IRQ_READ, ubd_intr,
> 0, "ubd", ubd_devs);
> - if(err != 0)
> + if(err < 0)
> printk(KERN_ERR "um_request_irq failed - errno = %d\n", -err);
> return 0;
> }
> diff --git a/arch/um/drivers/vector_kern.c b/arch/um/drivers/vector_kern.c
> index 555203e3e7b4..e78a54ea72a4 100644
> --- a/arch/um/drivers/vector_kern.c
> +++ b/arch/um/drivers/vector_kern.c
> @@ -1271,7 +1271,7 @@ static int vector_net_open(struct net_device *dev)
> irq_rr + VECTOR_BASE_IRQ, vp->fds->rx_fd,
> IRQ_READ, vector_rx_interrupt,
> IRQF_SHARED, dev->name, dev);
> - if (err != 0) {
> + if (err < 0) {
> netdev_err(dev, "vector_open: failed to get rx irq(%d)\n", err);
> err = -ENETUNREACH;
> goto out_close;
> @@ -1286,7 +1286,7 @@ static int vector_net_open(struct net_device *dev)
> irq_rr + VECTOR_BASE_IRQ, vp->fds->tx_fd,
> IRQ_WRITE, vector_tx_interrupt,
> IRQF_SHARED, dev->name, dev);
> - if (err != 0) {
> + if (err < 0) {
> netdev_err(dev,
> "vector_open: failed to get tx irq(%d)\n", err);
> err = -ENETUNREACH;
> diff --git a/arch/um/drivers/virtio_uml.c b/arch/um/drivers/virtio_uml.c
> index a6c4bb6c2c01..f76b8da28d20 100644
> --- a/arch/um/drivers/virtio_uml.c
> +++ b/arch/um/drivers/virtio_uml.c
> @@ -412,7 +412,7 @@ static int vhost_user_init_slave_req(struct virtio_uml_device *vu_dev)
> rc = um_request_irq(VIRTIO_IRQ, vu_dev->req_fd, IRQ_READ,
> vu_req_interrupt, IRQF_SHARED,
> vu_dev->pdev->name, vu_dev);
> - if (rc)
> + if (rc < 0)
> goto err_close;
>
> rc = vhost_user_send_no_payload_fd(vu_dev, VHOST_USER_SET_SLAVE_REQ_FD,
> @@ -854,7 +854,7 @@ static int vu_setup_vq_call_fd(struct virtio_uml_device *vu_dev,
> info->call_fd = call_fds[0];
> rc = um_request_irq(VIRTIO_IRQ, info->call_fd, IRQ_READ,
> vu_interrupt, IRQF_SHARED, info->name, vq);
> - if (rc)
> + if (rc < 0)
> goto close_both;
>
> rc = vhost_user_set_vring_call(vu_dev, vq->index, call_fds[1]);
> diff --git a/arch/um/drivers/xterm_kern.c b/arch/um/drivers/xterm_kern.c
> index d64ef6d0d463..50f11b7b4774 100644
> --- a/arch/um/drivers/xterm_kern.c
> +++ b/arch/um/drivers/xterm_kern.c
> @@ -51,7 +51,7 @@ int xterm_fd(int socket, int *pid_out)
>
> err = um_request_irq(XTERM_IRQ, socket, IRQ_READ, xterm_interrupt,
> IRQF_SHARED, "xterm", data);
> - if (err) {
> + if (err < 0) {
> printk(KERN_ERR "xterm_fd : failed to get IRQ for xterm, "
> "err = %d\n", err);
> ret = err;
> diff --git a/arch/um/include/asm/irq.h b/arch/um/include/asm/irq.h
> index 42c6205e2dc4..b6fa6301c75b 100644
> --- a/arch/um/include/asm/irq.h
> +++ b/arch/um/include/asm/irq.h
> @@ -24,14 +24,14 @@
> #define VECTOR_BASE_IRQ (VIRTIO_IRQ + 1)
> #define VECTOR_IRQ_SPACE 8
>
> -#define LAST_IRQ (VECTOR_IRQ_SPACE + VECTOR_BASE_IRQ - 1)
> +#define UM_FIRST_DYN_IRQ (VECTOR_IRQ_SPACE + VECTOR_BASE_IRQ)
>
> #else
>
> -#define LAST_IRQ VIRTIO_IRQ
> +#define UM_FIRST_DYN_IRQ (VIRTIO_IRQ + 1)
>
> #endif
>
> -#define NR_IRQS (LAST_IRQ + 1)
> +#define NR_IRQS 64
>
> #endif
> diff --git a/arch/um/include/shared/irq_kern.h b/arch/um/include/shared/irq_kern.h
> index 7cd1a10c6244..7c04a0fd3a27 100644
> --- a/arch/um/include/shared/irq_kern.h
> +++ b/arch/um/include/shared/irq_kern.h
> @@ -9,10 +9,10 @@
> #include <linux/interrupt.h>
> #include <asm/ptrace.h>
>
> -extern int um_request_irq(unsigned int irq, int fd, int type,
> - irq_handler_t handler,
> - unsigned long irqflags, const char * devname,
> - void *dev_id);
> -void um_free_irq(unsigned int irq, void *dev);
> -#endif
> +#define UM_IRQ_ALLOC -1
>
> +int um_request_irq(int irq, int fd, int type, irq_handler_t handler,
> + unsigned long irqflags, const char * devname,
> + void *dev_id);
> +void um_free_irq(int irq, void *dev_id);
> +#endif
> diff --git a/arch/um/kernel/irq.c b/arch/um/kernel/irq.c
> index 3577118bb4a5..b94c72f56617 100644
> --- a/arch/um/kernel/irq.c
> +++ b/arch/um/kernel/irq.c
> @@ -19,6 +19,7 @@
> #include <kern_util.h>
> #include <os.h>
> #include <irq_user.h>
> +#include <irq_kern.h>
>
>
> extern void free_irqs(void);
> @@ -38,6 +39,7 @@ struct irq_entry {
> static struct irq_entry *active_fds;
>
> static DEFINE_SPINLOCK(irq_lock);
> +static DECLARE_BITMAP(irqs_allocated, NR_IRQS);
>
> static void irq_io_loop(struct irq_fd *irq, struct uml_pt_regs *regs)
> {
> @@ -421,27 +423,52 @@ unsigned int do_IRQ(int irq, struct uml_pt_regs *regs)
> return 1;
> }
>
> -void um_free_irq(unsigned int irq, void *dev)
> +void um_free_irq(int irq, void *dev)
> {
> + if (WARN(irq < 0 || irq > NR_IRQS, "freeing invalid irq %d", irq))
> + return;
> +
> free_irq_by_irq_and_dev(irq, dev);
> free_irq(irq, dev);
> + clear_bit(irq, irqs_allocated);
> }
> EXPORT_SYMBOL(um_free_irq);
>
> -int um_request_irq(unsigned int irq, int fd, int type,
> +int um_request_irq(int irq, int fd, int type,
> irq_handler_t handler,
> unsigned long irqflags, const char * devname,
> void *dev_id)
> {
> int err;
>
> + if (irq == UM_IRQ_ALLOC) {
> + int i;
> +
> + for (i = UM_FIRST_DYN_IRQ; i < NR_IRQS; i++) {
> + if (!test_and_set_bit(i, irqs_allocated)) {
> + irq = i;
> + break;
> + }
> + }
> + }
> +
> + if (irq < 0)
> + return -ENOSPC;
> +
> if (fd != -1) {
> err = activate_fd(irq, fd, type, dev_id);
> if (err)
> - return err;
> + goto error;
> }
>
> - return request_irq(irq, handler, irqflags, devname, dev_id);
> + err = request_irq(irq, handler, irqflags, devname, dev_id);
> + if (err < 0)
> + goto error;
> +
> + return irq;
> +error:
> + clear_bit(irq, irqs_allocated);
> + return err;
> }
>
> EXPORT_SYMBOL(um_request_irq);
> @@ -480,7 +507,7 @@ void __init init_IRQ(void)
> irq_set_chip_and_handler(TIMER_IRQ, &SIGVTALRM_irq_type, handle_edge_irq);
>
>
> - for (i = 1; i <= LAST_IRQ; i++)
> + for (i = 1; i < NR_IRQS; i++)
> irq_set_chip_and_handler(i, &normal_irq_type, handle_edge_irq);
> /* Initialize EPOLL Loop */
> os_setup_epoll();
> diff --git a/arch/um/kernel/sigio.c b/arch/um/kernel/sigio.c
> index d1cffc2a7f21..5085a50c3b8c 100644
> --- a/arch/um/kernel/sigio.c
> +++ b/arch/um/kernel/sigio.c
> @@ -25,7 +25,7 @@ int write_sigio_irq(int fd)
>
> err = um_request_irq(SIGIO_WRITE_IRQ, fd, IRQ_READ, sigio_interrupt,
> 0, "write sigio", NULL);
> - if (err) {
> + if (err < 0) {
> printk(KERN_ERR "write_sigio_irq : um_request_irq failed, "
> "err = %d\n", err);
> return -1;
>
Acked-By: Anton Ivanov <anton.ivanov@cambridgegreys.com>
--
Anton R. Ivanov
https://www.kot-begemot.co.uk/
_______________________________________________
linux-um mailing list
linux-um@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-um
^ permalink raw reply [flat|nested] 42+ messages in thread
* Re: [PATCH 7/7] um: simplify IRQ handling code
2020-11-24 22:36 ` Anton Ivanov
@ 2020-11-30 12:00 ` Johannes Berg
2020-11-30 13:40 ` Anton Ivanov
0 siblings, 1 reply; 42+ messages in thread
From: Johannes Berg @ 2020-11-30 12:00 UTC (permalink / raw)
To: Anton Ivanov, linux-um
Sorry, looks like I forgot to reply to this earlier.
On Tue, 2020-11-24 at 22:36 +0000, Anton Ivanov wrote:
> > > > @@ -151,73 +171,33 @@ static int activate_fd(int irq, int fd, enum um_irq_type type, void *dev_id)
> > > > goto out;
> > > >
> > > > spin_lock_irqsave(&irq_lock, flags);
> > > > -
> > > > - /* Check if we have an entry for this fd */
> > > > -
> > > > - err = -EBUSY;
> > > > - for (irq_entry = active_fds;
> > > > - irq_entry != NULL; irq_entry = irq_entry->next) {
> > > > - if (irq_entry->fd == fd)
> > > > - break;
> > > > - }
> > > > -
> > > > - if (irq_entry == NULL) {
> > > > - /* This needs to be atomic as it may be called from an
> > > > - * IRQ context.
> > > > - */
> > > > - irq_entry = kmalloc(sizeof(struct irq_entry), GFP_ATOMIC);
> > > > - if (irq_entry == NULL) {
> > > > - printk(KERN_ERR
> > > > - "Failed to allocate new IRQ entry\n");
> > > > + irq_entry = get_irq_entry_by_fd(fd);
> > > > + if (irq_entry) {
> > >
> > > This is not right.
> > >
> > > You can re-register the same IRQ/fd, but with a different mask - f.e.
> > > turn on/off write or read on the same fd. F.E. - you have registered a
> > > read IRQ, you after that register same IRQ for write and you can alter
> > > the mask.
> >
> > Hmm. You snipped some code, and it continued like this:
> >
> > irq_entry = get_irq_entry_by_fd(fd);
> > if (irq_entry) {
> > /* cannot register the same FD twice with the same type */
> > if (WARN_ON(irq_entry->reg[type].events)) {
> > // basically return -EALREADY
> >
> >
> > I'm not sure I see this is different from what it was before? If the
>
> The original intention was to be able to do it :)
To do _what_ exactly? You said to re-register the same FD, but you could
do that before by unregistering?
And read/write are completely separate entries anyway. You cannot do
both at the same time (they're not bitmasks, just enum values.)
In fact, you *can* still use the same FD for both, with and without this
patch. We find the irq_entry here (by FD), and then check if this type
of event is already used. That means you cannot register for READ for
the same FD twice, but using the other event (WRITE) is still fine.
johannes
_______________________________________________
linux-um mailing list
linux-um@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-um
^ permalink raw reply [flat|nested] 42+ messages in thread
* Re: [PATCH 7/7] um: simplify IRQ handling code
2020-11-30 12:00 ` Johannes Berg
@ 2020-11-30 13:40 ` Anton Ivanov
0 siblings, 0 replies; 42+ messages in thread
From: Anton Ivanov @ 2020-11-30 13:40 UTC (permalink / raw)
To: Johannes Berg, linux-um
On 30/11/2020 12:00, Johannes Berg wrote:
> Sorry, looks like I forgot to reply to this earlier.
>
> On Tue, 2020-11-24 at 22:36 +0000, Anton Ivanov wrote:
>
>>>>> @@ -151,73 +171,33 @@ static int activate_fd(int irq, int fd, enum um_irq_type type, void *dev_id)
>>>>> goto out;
>>>>>
>>>>> spin_lock_irqsave(&irq_lock, flags);
>>>>> -
>>>>> - /* Check if we have an entry for this fd */
>>>>> -
>>>>> - err = -EBUSY;
>>>>> - for (irq_entry = active_fds;
>>>>> - irq_entry != NULL; irq_entry = irq_entry->next) {
>>>>> - if (irq_entry->fd == fd)
>>>>> - break;
>>>>> - }
>>>>> -
>>>>> - if (irq_entry == NULL) {
>>>>> - /* This needs to be atomic as it may be called from an
>>>>> - * IRQ context.
>>>>> - */
>>>>> - irq_entry = kmalloc(sizeof(struct irq_entry), GFP_ATOMIC);
>>>>> - if (irq_entry == NULL) {
>>>>> - printk(KERN_ERR
>>>>> - "Failed to allocate new IRQ entry\n");
>>>>> + irq_entry = get_irq_entry_by_fd(fd);
>>>>> + if (irq_entry) {
>>>> This is not right.
>>>>
>>>> You can re-register the same IRQ/fd, but with a different mask - f.e.
>>>> turn on/off write or read on the same fd. F.E. - you have registered a
>>>> read IRQ, you after that register same IRQ for write and you can alter
>>>> the mask.
>>> Hmm. You snipped some code, and it continued like this:
>>>
>>> irq_entry = get_irq_entry_by_fd(fd);
>>> if (irq_entry) {
>>> /* cannot register the same FD twice with the same type */
>>> if (WARN_ON(irq_entry->reg[type].events)) {
>>> // basically return -EALREADY
>>>
>>>
>>> I'm not sure I see this is different from what it was before? If the
>> The original intention was to be able to do it :)
> To do _what_ exactly? You said to re-register the same FD, but you could
> do that before by unregistering?
I need to remember what I though in 2011 when I wrote the first version :)
>
> And read/write are completely separate entries anyway. You cannot do
> both at the same time (they're not bitmasks, just enum values.)
Yeah, we reached that point over time anyway. I forgot exactly why I dropped the idea of sharing read and write IRQs, but I dropped it :)
>
> In fact, you *can* still use the same FD for both, with and without this
> patch. We find the irq_entry here (by FD), and then check if this type
> of event is already used. That means you cannot register for READ for
> the same FD twice, but using the other event (WRITE) is still fine.
I am going through the patchset. As I said - we ended up with a design where the original idea was dropped. Probably it was dropped for good too. It was making things overly complicated.
If it is dropped for good and not used anywhere, we might as well simplify the code.
Brgds,
>
> johannes
>
>
--
Anton R. Ivanov
https://www.kot-begemot.co.uk/
_______________________________________________
linux-um mailing list
linux-um@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-um
^ permalink raw reply [flat|nested] 42+ messages in thread
* Re: [PATCH 2/7] um: virtio: use dynamic IRQ allocation
2020-11-23 19:56 ` [PATCH 2/7] um: virtio: use " Johannes Berg
@ 2020-11-30 13:45 ` Anton Ivanov
0 siblings, 0 replies; 42+ messages in thread
From: Anton Ivanov @ 2020-11-30 13:45 UTC (permalink / raw)
To: Johannes Berg, linux-um; +Cc: Johannes Berg
On 23/11/2020 19:56, Johannes Berg wrote:
> From: Johannes Berg <johannes.berg@intel.com>
>
> This separates the devices, which is better for debug and for
> later suspend/resume and wakeup support, since there we'll
> have to separate which IRQs can wake up the system and which
> cannot.
>
> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
> ---
> arch/um/drivers/virtio_uml.c | 22 ++++++++++++++--------
> arch/um/include/asm/irq.h | 5 ++---
> 2 files changed, 16 insertions(+), 11 deletions(-)
>
> diff --git a/arch/um/drivers/virtio_uml.c b/arch/um/drivers/virtio_uml.c
> index f76b8da28d20..94b112749d5b 100644
> --- a/arch/um/drivers/virtio_uml.c
> +++ b/arch/um/drivers/virtio_uml.c
> @@ -55,7 +55,7 @@ struct virtio_uml_device {
> struct platform_device *pdev;
>
> spinlock_t sock_lock;
> - int sock, req_fd;
> + int sock, req_fd, irq;
> u64 features;
> u64 protocol_features;
> u8 status;
> @@ -409,12 +409,14 @@ static int vhost_user_init_slave_req(struct virtio_uml_device *vu_dev)
> return rc;
> vu_dev->req_fd = req_fds[0];
>
> - rc = um_request_irq(VIRTIO_IRQ, vu_dev->req_fd, IRQ_READ,
> + rc = um_request_irq(UM_IRQ_ALLOC, vu_dev->req_fd, IRQ_READ,
> vu_req_interrupt, IRQF_SHARED,
> vu_dev->pdev->name, vu_dev);
> if (rc < 0)
> goto err_close;
>
> + vu_dev->irq = rc;
> +
> rc = vhost_user_send_no_payload_fd(vu_dev, VHOST_USER_SET_SLAVE_REQ_FD,
> req_fds[1]);
> if (rc)
> @@ -423,7 +425,7 @@ static int vhost_user_init_slave_req(struct virtio_uml_device *vu_dev)
> goto out;
>
> err_free_irq:
> - um_free_irq(VIRTIO_IRQ, vu_dev);
> + um_free_irq(vu_dev->irq, vu_dev);
> err_close:
> os_close_file(req_fds[0]);
> out:
> @@ -802,7 +804,11 @@ static void vu_del_vq(struct virtqueue *vq)
> struct virtio_uml_vq_info *info = vq->priv;
>
> if (info->call_fd >= 0) {
> - um_free_irq(VIRTIO_IRQ, vq);
> + struct virtio_uml_device *vu_dev;
> +
> + vu_dev = to_virtio_uml_device(vq->vdev);
> +
> + um_free_irq(vu_dev->irq, vq);
> os_close_file(info->call_fd);
> }
>
> @@ -852,7 +858,7 @@ static int vu_setup_vq_call_fd(struct virtio_uml_device *vu_dev,
> return rc;
>
> info->call_fd = call_fds[0];
> - rc = um_request_irq(VIRTIO_IRQ, info->call_fd, IRQ_READ,
> + rc = um_request_irq(vu_dev->irq, info->call_fd, IRQ_READ,
> vu_interrupt, IRQF_SHARED, info->name, vq);
> if (rc < 0)
> goto close_both;
> @@ -864,7 +870,7 @@ static int vu_setup_vq_call_fd(struct virtio_uml_device *vu_dev,
> goto out;
>
> release_irq:
> - um_free_irq(VIRTIO_IRQ, vq);
> + um_free_irq(vu_dev->irq, vq);
> close_both:
> os_close_file(call_fds[0]);
> out:
> @@ -969,7 +975,7 @@ static struct virtqueue *vu_setup_vq(struct virtio_device *vdev,
>
> error_setup:
> if (info->call_fd >= 0) {
> - um_free_irq(VIRTIO_IRQ, vq);
> + um_free_irq(vu_dev->irq, vq);
> os_close_file(info->call_fd);
> }
> error_call:
> @@ -1078,7 +1084,7 @@ static void virtio_uml_release_dev(struct device *d)
>
> /* might not have been opened due to not negotiating the feature */
> if (vu_dev->req_fd >= 0) {
> - um_free_irq(VIRTIO_IRQ, vu_dev);
> + um_free_irq(vu_dev->irq, vu_dev);
> os_close_file(vu_dev->req_fd);
> }
>
> diff --git a/arch/um/include/asm/irq.h b/arch/um/include/asm/irq.h
> index b6fa6301c75b..547bff7b3a89 100644
> --- a/arch/um/include/asm/irq.h
> +++ b/arch/um/include/asm/irq.h
> @@ -17,18 +17,17 @@
> #define TELNETD_IRQ 12
> #define XTERM_IRQ 13
> #define RANDOM_IRQ 14
> -#define VIRTIO_IRQ 15
>
> #ifdef CONFIG_UML_NET_VECTOR
>
> -#define VECTOR_BASE_IRQ (VIRTIO_IRQ + 1)
> +#define VECTOR_BASE_IRQ (RANDOM_IRQ + 1)
> #define VECTOR_IRQ_SPACE 8
>
> #define UM_FIRST_DYN_IRQ (VECTOR_IRQ_SPACE + VECTOR_BASE_IRQ)
>
> #else
>
> -#define UM_FIRST_DYN_IRQ (VIRTIO_IRQ + 1)
> +#define UM_FIRST_DYN_IRQ (RANDOM_IRQ + 1)
>
> #endif
>
>
Acked-By: Anton Ivanov <anton.ivanov@cambridgegreys.com>
--
Anton R. Ivanov
https://www.kot-begemot.co.uk/
_______________________________________________
linux-um mailing list
linux-um@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-um
^ permalink raw reply [flat|nested] 42+ messages in thread
* Re: [PATCH 3/7] um: clean up alarm IRQ chip name
2020-11-23 19:56 ` [PATCH 3/7] um: clean up alarm IRQ chip name Johannes Berg
@ 2020-11-30 13:54 ` Anton Ivanov
0 siblings, 0 replies; 42+ messages in thread
From: Anton Ivanov @ 2020-11-30 13:54 UTC (permalink / raw)
To: Johannes Berg, linux-um; +Cc: Johannes Berg
On 23/11/2020 19:56, Johannes Berg wrote:
> From: Johannes Berg <johannes.berg@intel.com>
>
> We don't use "SIGVTALRM", it's just SIGALRM. Clean up the naming.
> While at it, fix the comment's grammar.
>
> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
> ---
> arch/um/kernel/irq.c | 9 ++++-----
> 1 file changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/arch/um/kernel/irq.c b/arch/um/kernel/irq.c
> index b94c72f56617..97ff77c297c8 100644
> --- a/arch/um/kernel/irq.c
> +++ b/arch/um/kernel/irq.c
> @@ -481,7 +481,7 @@ static void dummy(struct irq_data *d)
> {
> }
>
> -/* This is used for everything else than the timer. */
> +/* This is used for everything other than the timer. */
> static struct irq_chip normal_irq_type = {
> .name = "SIGIO",
> .irq_disable = dummy,
> @@ -491,8 +491,8 @@ static struct irq_chip normal_irq_type = {
> .irq_unmask = dummy,
> };
>
> -static struct irq_chip SIGVTALRM_irq_type = {
> - .name = "SIGVTALRM",
> +static struct irq_chip alarm_irq_type = {
> + .name = "SIGALRM",
> .irq_disable = dummy,
> .irq_enable = dummy,
> .irq_ack = dummy,
> @@ -504,8 +504,7 @@ void __init init_IRQ(void)
> {
> int i;
>
> - irq_set_chip_and_handler(TIMER_IRQ, &SIGVTALRM_irq_type, handle_edge_irq);
> -
> + irq_set_chip_and_handler(TIMER_IRQ, &alarm_irq_type, handle_edge_irq);
>
> for (i = 1; i < NR_IRQS; i++)
> irq_set_chip_and_handler(i, &normal_irq_type, handle_edge_irq);
>
Acked-By: Anton Ivanov <anton.ivanov@cambridgegreys.com>
--
Anton R. Ivanov
https://www.kot-begemot.co.uk/
_______________________________________________
linux-um mailing list
linux-um@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-um
^ permalink raw reply [flat|nested] 42+ messages in thread
* Re: [PATCH 4/7] um: irq: clean up and rename struct irq_fd
2020-11-23 19:56 ` [PATCH 4/7] um: irq: clean up and rename struct irq_fd Johannes Berg
@ 2020-11-30 14:01 ` Anton Ivanov
0 siblings, 0 replies; 42+ messages in thread
From: Anton Ivanov @ 2020-11-30 14:01 UTC (permalink / raw)
To: Johannes Berg, linux-um; +Cc: Johannes Berg
On 23/11/2020 19:56, Johannes Berg wrote:
> From: Johannes Berg <johannes.berg@intel.com>
>
> This really shouldn't be called "irq_fd" since it doesn't
> carry an fd. Well, it used to, apparently, but that struct
> member is unused.
>
> Rename it to "irq_reg" since it more accurately reflects a
> registered interrupt, and remove the unused 'next' and 'fd'
> members from the struct as well.
>
> While at it, also move it to the implementation, it's not
> used anywhere else, and the header file is shared with the
> userspace components.
>
> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
> ---
> arch/um/include/shared/irq_user.h | 14 -------------
> arch/um/kernel/irq.c | 34 ++++++++++++++++++++-----------
> 2 files changed, 22 insertions(+), 26 deletions(-)
>
> diff --git a/arch/um/include/shared/irq_user.h b/arch/um/include/shared/irq_user.h
> index 107751dce153..2dd5fd7d9443 100644
> --- a/arch/um/include/shared/irq_user.h
> +++ b/arch/um/include/shared/irq_user.h
> @@ -9,25 +9,11 @@
> #include <sysdep/ptrace.h>
> #include <stdbool.h>
>
> -struct irq_fd {
> - struct irq_fd *next;
> - void *id;
> - int fd;
> - int type;
> - int irq;
> - int events;
> - bool active;
> - bool pending;
> - bool purge;
> -};
> -
> #define IRQ_READ 0
> #define IRQ_WRITE 1
> #define IRQ_NONE 2
> #define MAX_IRQ_TYPE (IRQ_NONE + 1)
>
> -
> -
> struct siginfo;
> extern void sigio_handler(int sig, struct siginfo *unused_si, struct uml_pt_regs *regs);
> extern void free_irq_by_fd(int fd);
> diff --git a/arch/um/kernel/irq.c b/arch/um/kernel/irq.c
> index 97ff77c297c8..923a80c9808a 100644
> --- a/arch/um/kernel/irq.c
> +++ b/arch/um/kernel/irq.c
> @@ -26,14 +26,24 @@ extern void free_irqs(void);
>
> /* When epoll triggers we do not know why it did so
> * we can also have different IRQs for read and write.
> - * This is why we keep a small irq_fd array for each fd -
> + * This is why we keep a small irq_reg array for each fd -
> * one entry per IRQ type
> */
>
> +struct irq_reg {
> + void *id;
> + int type;
> + int irq;
> + int events;
> + bool active;
> + bool pending;
> + bool purge;
> +};
> +
> struct irq_entry {
> struct irq_entry *next;
> int fd;
> - struct irq_fd *irq_array[MAX_IRQ_TYPE + 1];
> + struct irq_reg *irq_array[MAX_IRQ_TYPE + 1];
> };
>
> static struct irq_entry *active_fds;
> @@ -41,7 +51,7 @@ static struct irq_entry *active_fds;
> static DEFINE_SPINLOCK(irq_lock);
> static DECLARE_BITMAP(irqs_allocated, NR_IRQS);
>
> -static void irq_io_loop(struct irq_fd *irq, struct uml_pt_regs *regs)
> +static void irq_io_loop(struct irq_reg *irq, struct uml_pt_regs *regs)
> {
> /*
> * irq->active guards against reentry
> @@ -65,7 +75,7 @@ static void irq_io_loop(struct irq_fd *irq, struct uml_pt_regs *regs)
> void sigio_handler(int sig, struct siginfo *unused_si, struct uml_pt_regs *regs)
> {
> struct irq_entry *irq_entry;
> - struct irq_fd *irq;
> + struct irq_reg *irq;
>
> int n, i, j;
>
> @@ -86,7 +96,7 @@ void sigio_handler(int sig, struct siginfo *unused_si, struct uml_pt_regs *regs)
> }
>
> for (i = 0; i < n ; i++) {
> - /* Epoll back reference is the entry with 3 irq_fd
> + /* Epoll back reference is the entry with 3 irq_reg
> * leaves - one for each irq type.
> */
> irq_entry = (struct irq_entry *)
> @@ -112,7 +122,7 @@ static int assign_epoll_events_to_irq(struct irq_entry *irq_entry)
> {
> int i;
> int events = 0;
> - struct irq_fd *irq;
> + struct irq_reg *irq;
>
> for (i = 0; i < MAX_IRQ_TYPE ; i++) {
> irq = irq_entry->irq_array[i];
> @@ -131,7 +141,7 @@ static int assign_epoll_events_to_irq(struct irq_entry *irq_entry)
>
> static int activate_fd(int irq, int fd, int type, void *dev_id)
> {
> - struct irq_fd *new_fd;
> + struct irq_reg *new_fd;
> struct irq_entry *irq_entry;
> int i, err, events;
> unsigned long flags;
> @@ -182,13 +192,13 @@ static int activate_fd(int irq, int fd, int type, void *dev_id)
> /* New entry for this fd */
>
> err = -ENOMEM;
> - new_fd = kmalloc(sizeof(struct irq_fd), GFP_ATOMIC);
> + new_fd = kmalloc(sizeof(struct irq_reg), GFP_ATOMIC);
> if (new_fd == NULL)
> goto out_unlock;
>
> events = os_event_mask(type);
>
> - *new_fd = ((struct irq_fd) {
> + *new_fd = ((struct irq_reg) {
> .id = dev_id,
> .irq = irq,
> .type = type,
> @@ -273,8 +283,8 @@ static struct irq_entry *get_irq_entry_by_fd(int fd)
>
> /*
> * Walk the IRQ list and dispose of an entry for a specific
> - * device, fd and number. Note - if sharing an IRQ for read
> - * and writefor the same FD it will be disposed in either case.
> + * device and number. Note - if sharing an IRQ for read
> + * and write for the same FD it will be disposed in either case.
> * If this behaviour is undesirable use different IRQ ids.
> */
>
> @@ -289,7 +299,7 @@ static void do_free_by_irq_and_dev(
> )
> {
> int i;
> - struct irq_fd *to_free;
> + struct irq_reg *to_free;
>
> for (i = 0; i < MAX_IRQ_TYPE ; i++) {
> if (irq_entry->irq_array[i] != NULL) {
>
Acked-By: Anton Ivanov <anton.ivanov@cambridgegreys.com>
--
Anton R. Ivanov
https://www.kot-begemot.co.uk/
_______________________________________________
linux-um mailing list
linux-um@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-um
^ permalink raw reply [flat|nested] 42+ messages in thread
* Re: [PATCH 6/7] um: remove IRQ_NONE type
2020-11-23 19:56 ` [PATCH 6/7] um: remove IRQ_NONE type Johannes Berg
@ 2020-11-30 14:31 ` Anton Ivanov
0 siblings, 0 replies; 42+ messages in thread
From: Anton Ivanov @ 2020-11-30 14:31 UTC (permalink / raw)
To: Johannes Berg, linux-um; +Cc: Johannes Berg
On 23/11/2020 19:56, Johannes Berg wrote:
> From: Johannes Berg <johannes.berg@intel.com>
>
> We don't actually use this in um_request_irq(), so it can
> never be assigned. It's also not clear what that would be
> useful for, so just remove it.
>
> This results in quite a number of cleanups, all the way to
> removing the "SIGIO on close" startup check, since the data
> it assigns (pty_close_sigio) is not used anymore.
>
> While at it, also make this an enum so we get a minimum of
> type checking, and remove the IRQ_NONE hack in virtio since
> we now no longer have the name twice.
>
> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
> ---
> arch/um/drivers/random.c | 2 +-
> arch/um/drivers/virtio_uml.c | 5 -----
> arch/um/include/shared/irq_kern.h | 7 ++++---
> arch/um/include/shared/irq_user.h | 9 +++++----
> arch/um/include/shared/os.h | 6 +++---
> arch/um/kernel/irq.c | 15 +++++++--------
> arch/um/os-Linux/irq.c | 2 +-
> arch/um/os-Linux/sigio.c | 25 +++++--------------------
> 8 files changed, 26 insertions(+), 45 deletions(-)
>
> diff --git a/arch/um/drivers/random.c b/arch/um/drivers/random.c
> index 385cb08d7ec2..efbf88ec48ac 100644
> --- a/arch/um/drivers/random.c
> +++ b/arch/um/drivers/random.c
> @@ -132,7 +132,7 @@ static int __init rng_init (void)
> if (err < 0)
> goto err_out_cleanup_hw;
>
> - sigio_broken(random_fd, 1);
> + sigio_broken(random_fd);
>
> err = misc_register (&rng_miscdev);
> if (err) {
> diff --git a/arch/um/drivers/virtio_uml.c b/arch/um/drivers/virtio_uml.c
> index 94b112749d5b..27e92d3881ff 100644
> --- a/arch/um/drivers/virtio_uml.c
> +++ b/arch/um/drivers/virtio_uml.c
> @@ -33,11 +33,6 @@
> #include <os.h>
> #include "vhost_user.h"
>
> -/* Workaround due to a conflict between irq_user.h and irqreturn.h */
> -#ifdef IRQ_NONE
> -#undef IRQ_NONE
> -#endif
> -
> #define MAX_SUPPORTED_QUEUE_SIZE 256
>
> #define to_virtio_uml_device(_vdev) \
> diff --git a/arch/um/include/shared/irq_kern.h b/arch/um/include/shared/irq_kern.h
> index 7c04a0fd3a27..7807de593bda 100644
> --- a/arch/um/include/shared/irq_kern.h
> +++ b/arch/um/include/shared/irq_kern.h
> @@ -8,11 +8,12 @@
>
> #include <linux/interrupt.h>
> #include <asm/ptrace.h>
> +#include "irq_user.h"
>
> #define UM_IRQ_ALLOC -1
>
> -int um_request_irq(int irq, int fd, int type, irq_handler_t handler,
> - unsigned long irqflags, const char * devname,
> - void *dev_id);
> +int um_request_irq(int irq, int fd, enum um_irq_type type,
> + irq_handler_t handler, unsigned long irqflags,
> + const char *devname, void *dev_id);
> void um_free_irq(int irq, void *dev_id);
> #endif
> diff --git a/arch/um/include/shared/irq_user.h b/arch/um/include/shared/irq_user.h
> index 5e975a9e8354..07239e801a5b 100644
> --- a/arch/um/include/shared/irq_user.h
> +++ b/arch/um/include/shared/irq_user.h
> @@ -9,10 +9,11 @@
> #include <sysdep/ptrace.h>
> #include <stdbool.h>
>
> -#define IRQ_READ 0
> -#define IRQ_WRITE 1
> -#define IRQ_NONE 2
> -#define NUM_IRQ_TYPES (IRQ_NONE + 1)
> +enum um_irq_type {
> + IRQ_READ,
> + IRQ_WRITE,
> + NUM_IRQ_TYPES,
> +};
>
> struct siginfo;
> extern void sigio_handler(int sig, struct siginfo *unused_si, struct uml_pt_regs *regs);
> diff --git a/arch/um/include/shared/os.h b/arch/um/include/shared/os.h
> index f467d28fc0b4..e2bb7e488d59 100644
> --- a/arch/um/include/shared/os.h
> +++ b/arch/um/include/shared/os.h
> @@ -299,7 +299,7 @@ extern void reboot_skas(void);
> extern int os_waiting_for_events_epoll(void);
> extern void *os_epoll_get_data_pointer(int index);
> extern int os_epoll_triggered(int index, int events);
> -extern int os_event_mask(int irq_type);
> +extern int os_event_mask(enum um_irq_type irq_type);
> extern int os_setup_epoll(void);
> extern int os_add_epoll_fd(int events, int fd, void *data);
> extern int os_mod_epoll_fd(int events, int fd, void *data);
> @@ -310,8 +310,8 @@ extern void os_close_epoll_fd(void);
> /* sigio.c */
> extern int add_sigio_fd(int fd);
> extern int ignore_sigio_fd(int fd);
> -extern void maybe_sigio_broken(int fd, int read);
> -extern void sigio_broken(int fd, int read);
> +extern void maybe_sigio_broken(int fd);
> +extern void sigio_broken(int fd);
>
> /* prctl.c */
> extern int os_arch_prctl(int pid, int option, unsigned long *arg2);
> diff --git a/arch/um/kernel/irq.c b/arch/um/kernel/irq.c
> index 93eb742ecafe..9e8f776bb43a 100644
> --- a/arch/um/kernel/irq.c
> +++ b/arch/um/kernel/irq.c
> @@ -32,7 +32,7 @@ extern void free_irqs(void);
>
> struct irq_reg {
> void *id;
> - int type;
> + enum um_irq_type type;
> int irq;
> int events;
> bool active;
> @@ -96,7 +96,7 @@ void sigio_handler(int sig, struct siginfo *unused_si, struct uml_pt_regs *regs)
> }
>
> for (i = 0; i < n ; i++) {
> - /* Epoll back reference is the entry with 3 irq_reg
> + /* Epoll back reference is the entry with 2 irq_reg
> * leaves - one for each irq type.
> */
> irq_entry = (struct irq_entry *)
> @@ -139,7 +139,7 @@ static int assign_epoll_events_to_irq(struct irq_entry *irq_entry)
>
>
>
> -static int activate_fd(int irq, int fd, int type, void *dev_id)
> +static int activate_fd(int irq, int fd, enum um_irq_type type, void *dev_id)
> {
> struct irq_reg *new_fd;
> struct irq_entry *irq_entry;
> @@ -217,7 +217,7 @@ static int activate_fd(int irq, int fd, int type, void *dev_id)
> /* Turn back IO on with the correct (new) IO event mask */
> assign_epoll_events_to_irq(irq_entry);
> spin_unlock_irqrestore(&irq_lock, flags);
> - maybe_sigio_broken(fd, (type != IRQ_NONE));
> + maybe_sigio_broken(fd);
>
> return 0;
> out_unlock:
> @@ -444,10 +444,9 @@ void um_free_irq(int irq, void *dev)
> }
> EXPORT_SYMBOL(um_free_irq);
>
> -int um_request_irq(int irq, int fd, int type,
> - irq_handler_t handler,
> - unsigned long irqflags, const char * devname,
> - void *dev_id)
> +int um_request_irq(int irq, int fd, enum um_irq_type type,
> + irq_handler_t handler, unsigned long irqflags,
> + const char *devname, void *dev_id)
> {
> int err;
>
> diff --git a/arch/um/os-Linux/irq.c b/arch/um/os-Linux/irq.c
> index d508310ee5e1..aa90a05b3d78 100644
> --- a/arch/um/os-Linux/irq.c
> +++ b/arch/um/os-Linux/irq.c
> @@ -45,7 +45,7 @@ int os_epoll_triggered(int index, int events)
> * access to the right includes/defines for EPOLL constants.
> */
>
> -int os_event_mask(int irq_type)
> +int os_event_mask(enum um_irq_type irq_type)
> {
> if (irq_type == IRQ_READ)
> return EPOLLIN | EPOLLPRI;
> diff --git a/arch/um/os-Linux/sigio.c b/arch/um/os-Linux/sigio.c
> index 75558080d0bf..233b2b2212f1 100644
> --- a/arch/um/os-Linux/sigio.c
> +++ b/arch/um/os-Linux/sigio.c
> @@ -336,7 +336,7 @@ static void write_sigio_workaround(void)
> close(l_write_sigio_fds[1]);
> }
>
> -void sigio_broken(int fd, int read)
> +void sigio_broken(int fd)
> {
> int err;
>
> @@ -352,7 +352,7 @@ void sigio_broken(int fd, int read)
>
> all_sigio_fds.poll[all_sigio_fds.used++] =
> ((struct pollfd) { .fd = fd,
> - .events = read ? POLLIN : POLLOUT,
> + .events = POLLIN,
> .revents = 0 });
> out:
> sigio_unlock();
> @@ -360,17 +360,16 @@ void sigio_broken(int fd, int read)
>
> /* Changed during early boot */
> static int pty_output_sigio;
> -static int pty_close_sigio;
>
> -void maybe_sigio_broken(int fd, int read)
> +void maybe_sigio_broken(int fd)
> {
> if (!isatty(fd))
> return;
>
> - if ((read || pty_output_sigio) && (!read || pty_close_sigio))
> + if (pty_output_sigio)
> return;
>
> - sigio_broken(fd, read);
> + sigio_broken(fd);
> }
>
> static void sigio_cleanup(void)
> @@ -514,19 +513,6 @@ static void tty_output(int master, int slave)
> printk(UM_KERN_CONT "tty_output : read failed, err = %d\n", n);
> }
>
> -static void tty_close(int master, int slave)
> -{
> - printk(UM_KERN_INFO "Checking that host ptys support SIGIO on "
> - "close...");
> -
> - close(slave);
> - if (got_sigio) {
> - printk(UM_KERN_CONT "Yes\n");
> - pty_close_sigio = 1;
> - } else
> - printk(UM_KERN_CONT "No, enabling workaround\n");
> -}
> -
> static void __init check_sigio(void)
> {
> if ((access("/dev/ptmx", R_OK) < 0) &&
> @@ -536,7 +522,6 @@ static void __init check_sigio(void)
> return;
> }
> check_one_sigio(tty_output);
> - check_one_sigio(tty_close);
> }
>
> /* Here because it only does the SIGIO testing for now */
>
Acked-By: Anton Ivanov <anton.ivanov@cambridgegreys.com>
--
Anton R. Ivanov
https://www.kot-begemot.co.uk/
_______________________________________________
linux-um mailing list
linux-um@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-um
^ permalink raw reply [flat|nested] 42+ messages in thread
* Re: [PATCH 7/7] um: simplify IRQ handling code
2020-11-23 19:56 ` [PATCH 7/7] um: simplify IRQ handling code Johannes Berg
2020-11-24 21:50 ` Anton Ivanov
@ 2020-11-30 16:30 ` Anton Ivanov
2020-12-01 20:15 ` Johannes Berg
2020-12-02 11:49 ` Johannes Berg
2020-12-02 11:54 ` Johannes Berg
2 siblings, 2 replies; 42+ messages in thread
From: Anton Ivanov @ 2020-11-30 16:30 UTC (permalink / raw)
To: Johannes Berg, linux-um; +Cc: Johannes Berg
On 23/11/2020 19:56, Johannes Berg wrote:
> From: Johannes Berg <johannes.berg@intel.com>
>
> Reduce dynamic allocations (and thereby cache misses) by simply
> embedding the registration data for IRQs in the irq_entry, we
> never supported these being really dynamic anyway as only one
> was ever allowed ("Trying to reregister ...").
>
> Lockless behaviour is preserved by removing the FD from the poll
> set appropriately, but we use reg->events to indicate whether or
> not this entry is used, rather than dynamically allocating them.
>
> Also port the list of IRQ entries to list_head instead of the
> current open-coded singly-linked list implementation, just for
> sanity.
This one is broken. I will look exactly where. It is somewhere in the IRQ delete/re-request logic.
How to test
run iperf -s in the UML with a vector network driver.
run iperf -c to the UML instance from the host in a loop
Try to ifup/ifdown the vecX interface inside the UML.
With master it works fine. With this patch it fails.
A.
> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
> ---
> arch/um/kernel/irq.c | 369 +++++++++++++++----------------------------
> 1 file changed, 127 insertions(+), 242 deletions(-)
>
> diff --git a/arch/um/kernel/irq.c b/arch/um/kernel/irq.c
> index 9e8f776bb43a..bbf5a466b44c 100644
> --- a/arch/um/kernel/irq.c
> +++ b/arch/um/kernel/irq.c
> @@ -29,26 +29,23 @@ extern void free_irqs(void);
> * This is why we keep a small irq_reg array for each fd -
> * one entry per IRQ type
> */
> -
> struct irq_reg {
> void *id;
> - enum um_irq_type type;
> int irq;
> + /* it's cheaper to store this than to query it */
> int events;
> bool active;
> bool pending;
> - bool purge;
> };
>
> struct irq_entry {
> - struct irq_entry *next;
> + struct list_head list;
> int fd;
> - struct irq_reg *irq_array[NUM_IRQ_TYPES];
> + struct irq_reg reg[NUM_IRQ_TYPES];
> };
>
> -static struct irq_entry *active_fds;
> -
> static DEFINE_SPINLOCK(irq_lock);
> +static LIST_HEAD(active_fds);
> static DECLARE_BITMAP(irqs_allocated, NR_IRQS);
>
> static void irq_io_loop(struct irq_reg *irq, struct uml_pt_regs *regs)
> @@ -61,12 +58,13 @@ static void irq_io_loop(struct irq_reg *irq, struct uml_pt_regs *regs)
> */
> if (irq->active) {
> irq->active = false;
> +
> do {
> irq->pending = false;
> do_IRQ(irq->irq, regs);
> - } while (irq->pending && (!irq->purge));
> - if (!irq->purge)
> - irq->active = true;
> + } while (irq->pending);
> +
> + irq->active = true;
> } else {
> irq->pending = true;
> }
> @@ -75,9 +73,7 @@ static void irq_io_loop(struct irq_reg *irq, struct uml_pt_regs *regs)
> void sigio_handler(int sig, struct siginfo *unused_si, struct uml_pt_regs *regs)
> {
> struct irq_entry *irq_entry;
> - struct irq_reg *irq;
> -
> - int n, i, j;
> + int n, i;
>
> while (1) {
> /* This is now lockless - epoll keeps back-referencesto the irqs
> @@ -96,21 +92,18 @@ void sigio_handler(int sig, struct siginfo *unused_si, struct uml_pt_regs *regs)
> }
>
> for (i = 0; i < n ; i++) {
> - /* Epoll back reference is the entry with 2 irq_reg
> - * leaves - one for each irq type.
> - */
> - irq_entry = (struct irq_entry *)
> - os_epoll_get_data_pointer(i);
> - for (j = 0; j < NUM_IRQ_TYPES ; j++) {
> - irq = irq_entry->irq_array[j];
> - if (irq == NULL)
> + enum um_irq_type t;
> +
> + irq_entry = os_epoll_get_data_pointer(i);
> +
> + for (t = 0; t < NUM_IRQ_TYPES; t++) {
> + int events = irq_entry->reg[t].events;
> +
> + if (!events)
> continue;
> - if (os_epoll_triggered(i, irq->events) > 0)
> - irq_io_loop(irq, regs);
> - if (irq->purge) {
> - irq_entry->irq_array[j] = NULL;
> - kfree(irq);
> - }
> +
> + if (os_epoll_triggered(i, events) > 0)
> + irq_io_loop(&irq_entry->reg[t], regs);
> }
> }
> }
> @@ -118,32 +111,59 @@ void sigio_handler(int sig, struct siginfo *unused_si, struct uml_pt_regs *regs)
> free_irqs();
> }
>
> -static int assign_epoll_events_to_irq(struct irq_entry *irq_entry)
> +static struct irq_entry *get_irq_entry_by_fd(int fd)
> {
> - int i;
> - int events = 0;
> - struct irq_reg *irq;
> + struct irq_entry *walk;
>
> - for (i = 0; i < NUM_IRQ_TYPES ; i++) {
> - irq = irq_entry->irq_array[i];
> - if (irq != NULL)
> - events = irq->events | events;
> - }
> - if (events > 0) {
> - /* os_add_epoll will call os_mod_epoll if this already exists */
> - return os_add_epoll_fd(events, irq_entry->fd, irq_entry);
> + lockdep_assert_held(&irq_lock);
> +
> + list_for_each_entry(walk, &active_fds, list) {
> + if (walk->fd == fd)
> + return walk;
> }
> - /* No events - delete */
> - return os_del_epoll_fd(irq_entry->fd);
> +
> + return NULL;
> +}
> +
> +static void free_irq_entry(struct irq_entry *to_free, bool remove)
> +{
> + if (!to_free)
> + return;
> +
> + if (remove)
> + os_del_epoll_fd(to_free->fd);
> + list_del(&to_free->list);
> + kfree(to_free);
> }
>
> +static bool update_irq_entry(struct irq_entry *entry)
> +{
> + enum um_irq_type i;
> + int events = 0;
> +
> + for (i = 0; i < NUM_IRQ_TYPES; i++)
> + events |= entry->reg[i].events;
>
> + if (events) {
> + /* will modify (instead of add) if needed */
> + os_add_epoll_fd(events, entry->fd, entry);
> + return true;
> + }
> +
> + os_del_epoll_fd(entry->fd);
> + return false;
> +}
> +
> +static void update_or_free_irq_entry(struct irq_entry *entry)
> +{
> + if (!update_irq_entry(entry))
> + free_irq_entry(entry, false);
> +}
>
> static int activate_fd(int irq, int fd, enum um_irq_type type, void *dev_id)
> {
> - struct irq_reg *new_fd;
> struct irq_entry *irq_entry;
> - int i, err, events;
> + int err, events = os_event_mask(type);
> unsigned long flags;
>
> err = os_set_fd_async(fd);
> @@ -151,73 +171,33 @@ static int activate_fd(int irq, int fd, enum um_irq_type type, void *dev_id)
> goto out;
>
> spin_lock_irqsave(&irq_lock, flags);
> -
> - /* Check if we have an entry for this fd */
> -
> - err = -EBUSY;
> - for (irq_entry = active_fds;
> - irq_entry != NULL; irq_entry = irq_entry->next) {
> - if (irq_entry->fd == fd)
> - break;
> - }
> -
> - if (irq_entry == NULL) {
> - /* This needs to be atomic as it may be called from an
> - * IRQ context.
> - */
> - irq_entry = kmalloc(sizeof(struct irq_entry), GFP_ATOMIC);
> - if (irq_entry == NULL) {
> - printk(KERN_ERR
> - "Failed to allocate new IRQ entry\n");
> + irq_entry = get_irq_entry_by_fd(fd);
> + if (irq_entry) {
> + /* cannot register the same FD twice with the same type */
> + if (WARN_ON(irq_entry->reg[type].events)) {
> + err = -EALREADY;
> goto out_unlock;
> }
> - irq_entry->fd = fd;
> - for (i = 0; i < NUM_IRQ_TYPES; i++)
> - irq_entry->irq_array[i] = NULL;
> - irq_entry->next = active_fds;
> - active_fds = irq_entry;
> - }
> -
> - /* Check if we are trying to re-register an interrupt for a
> - * particular fd
> - */
>
> - if (irq_entry->irq_array[type] != NULL) {
> - printk(KERN_ERR
> - "Trying to reregister IRQ %d FD %d TYPE %d ID %p\n",
> - irq, fd, type, dev_id
> - );
> - goto out_unlock;
> + /* temporarily disable to avoid IRQ-side locking */
> + os_del_epoll_fd(fd);
> } else {
> - /* New entry for this fd */
> -
> - err = -ENOMEM;
> - new_fd = kmalloc(sizeof(struct irq_reg), GFP_ATOMIC);
> - if (new_fd == NULL)
> + irq_entry = kzalloc(sizeof(*irq_entry), GFP_ATOMIC);
> + if (!irq_entry) {
> + err = -ENOMEM;
> goto out_unlock;
> -
> - events = os_event_mask(type);
> -
> - *new_fd = ((struct irq_reg) {
> - .id = dev_id,
> - .irq = irq,
> - .type = type,
> - .events = events,
> - .active = true,
> - .pending = false,
> - .purge = false
> - });
> - /* Turn off any IO on this fd - allows us to
> - * avoid locking the IRQ loop
> - */
> - os_del_epoll_fd(irq_entry->fd);
> - irq_entry->irq_array[type] = new_fd;
> + }
> + irq_entry->fd = fd;
> + list_add_tail(&irq_entry->list, &active_fds);
> + maybe_sigio_broken(fd);
> }
>
> - /* Turn back IO on with the correct (new) IO event mask */
> - assign_epoll_events_to_irq(irq_entry);
> + irq_entry->reg[type].irq = irq;
> + irq_entry->reg[type].active = true;
> + irq_entry->reg[type].events = events;
> +
> + WARN_ON(!update_irq_entry(irq_entry));
> spin_unlock_irqrestore(&irq_lock, flags);
> - maybe_sigio_broken(fd);
>
> return 0;
> out_unlock:
> @@ -227,104 +207,10 @@ static int activate_fd(int irq, int fd, enum um_irq_type type, void *dev_id)
> }
>
> /*
> - * Walk the IRQ list and dispose of any unused entries.
> - * Should be done under irq_lock.
> + * Remove the entry or entries for a specific FD, if you
> + * don't want to remove all the possible entries then use
> + * um_free_irq() or deactivate_fd() instead.
> */
> -
> -static void garbage_collect_irq_entries(void)
> -{
> - int i;
> - bool reap;
> - struct irq_entry *walk;
> - struct irq_entry *previous = NULL;
> - struct irq_entry *to_free;
> -
> - if (active_fds == NULL)
> - return;
> - walk = active_fds;
> - while (walk != NULL) {
> - reap = true;
> - for (i = 0; i < NUM_IRQ_TYPES ; i++) {
> - if (walk->irq_array[i] != NULL) {
> - reap = false;
> - break;
> - }
> - }
> - if (reap) {
> - if (previous == NULL)
> - active_fds = walk->next;
> - else
> - previous->next = walk->next;
> - to_free = walk;
> - } else {
> - to_free = NULL;
> - }
> - walk = walk->next;
> - kfree(to_free);
> - }
> -}
> -
> -/*
> - * Walk the IRQ list and get the descriptor for our FD
> - */
> -
> -static struct irq_entry *get_irq_entry_by_fd(int fd)
> -{
> - struct irq_entry *walk = active_fds;
> -
> - while (walk != NULL) {
> - if (walk->fd == fd)
> - return walk;
> - walk = walk->next;
> - }
> - return NULL;
> -}
> -
> -
> -/*
> - * Walk the IRQ list and dispose of an entry for a specific
> - * device and number. Note - if sharing an IRQ for read
> - * and write for the same FD it will be disposed in either case.
> - * If this behaviour is undesirable use different IRQ ids.
> - */
> -
> -#define IGNORE_IRQ 1
> -#define IGNORE_DEV (1<<1)
> -
> -static void do_free_by_irq_and_dev(
> - struct irq_entry *irq_entry,
> - unsigned int irq,
> - void *dev,
> - int flags
> -)
> -{
> - int i;
> - struct irq_reg *to_free;
> -
> - for (i = 0; i < NUM_IRQ_TYPES ; i++) {
> - if (irq_entry->irq_array[i] != NULL) {
> - if (
> - ((flags & IGNORE_IRQ) ||
> - (irq_entry->irq_array[i]->irq == irq)) &&
> - ((flags & IGNORE_DEV) ||
> - (irq_entry->irq_array[i]->id == dev))
> - ) {
> - /* Turn off any IO on this fd - allows us to
> - * avoid locking the IRQ loop
> - */
> - os_del_epoll_fd(irq_entry->fd);
> - to_free = irq_entry->irq_array[i];
> - irq_entry->irq_array[i] = NULL;
> - assign_epoll_events_to_irq(irq_entry);
> - if (to_free->active)
> - to_free->purge = true;
> - else
> - kfree(to_free);
> - }
> - }
> - }
> -}
> -
> void free_irq_by_fd(int fd)
> {
> struct irq_entry *to_free;
> @@ -332,58 +218,64 @@ void free_irq_by_fd(int fd)
>
> spin_lock_irqsave(&irq_lock, flags);
> to_free = get_irq_entry_by_fd(fd);
> - if (to_free != NULL) {
> - do_free_by_irq_and_dev(
> - to_free,
> - -1,
> - NULL,
> - IGNORE_IRQ | IGNORE_DEV
> - );
> - }
> - garbage_collect_irq_entries();
> + free_irq_entry(to_free, true);
> spin_unlock_irqrestore(&irq_lock, flags);
> }
> EXPORT_SYMBOL(free_irq_by_fd);
>
> static void free_irq_by_irq_and_dev(unsigned int irq, void *dev)
> {
> - struct irq_entry *to_free;
> + struct irq_entry *entry;
> unsigned long flags;
>
> spin_lock_irqsave(&irq_lock, flags);
> - to_free = active_fds;
> - while (to_free != NULL) {
> - do_free_by_irq_and_dev(
> - to_free,
> - irq,
> - dev,
> - 0
> - );
> - to_free = to_free->next;
> + list_for_each_entry(entry, &active_fds, list) {
> + enum um_irq_type i;
> +
> + for (i = 0; i < NUM_IRQ_TYPES; i++) {
> + struct irq_reg *reg = &entry->reg[i];
> +
> + if (!reg->events)
> + continue;
> + if (reg->irq != irq)
> + continue;
> + if (reg->id != dev)
> + continue;
> +
> + os_del_epoll_fd(entry->fd);
> + reg->events = 0;
> + update_or_free_irq_entry(entry);
> + goto out;
> + }
> }
> - garbage_collect_irq_entries();
> +out:
> spin_unlock_irqrestore(&irq_lock, flags);
> }
>
> -
> void deactivate_fd(int fd, int irqnum)
> {
> - struct irq_entry *to_free;
> + struct irq_entry *entry;
> unsigned long flags;
> + enum um_irq_type i;
>
> os_del_epoll_fd(fd);
> +
> spin_lock_irqsave(&irq_lock, flags);
> - to_free = get_irq_entry_by_fd(fd);
> - if (to_free != NULL) {
> - do_free_by_irq_and_dev(
> - to_free,
> - irqnum,
> - NULL,
> - IGNORE_DEV
> - );
> + entry = get_irq_entry_by_fd(fd);
> + if (!entry)
> + goto out;
> +
> + for (i = 0; i < NUM_IRQ_TYPES; i++) {
> + if (!entry->reg[i].events)
> + continue;
> + if (entry->reg[i].irq == irqnum)
> + entry->reg[i].events = 0;
> }
> - garbage_collect_irq_entries();
> +
> + update_or_free_irq_entry(entry);
> +out:
> spin_unlock_irqrestore(&irq_lock, flags);
> +
> ignore_sigio_fd(fd);
> }
> EXPORT_SYMBOL(deactivate_fd);
> @@ -396,24 +288,17 @@ EXPORT_SYMBOL(deactivate_fd);
> */
> int deactivate_all_fds(void)
> {
> - struct irq_entry *to_free;
> + struct irq_entry *entry;
>
> /* Stop IO. The IRQ loop has no lock so this is our
> * only way of making sure we are safe to dispose
> * of all IRQ handlers
> */
> os_set_ioignore();
> - to_free = active_fds;
> - while (to_free != NULL) {
> - do_free_by_irq_and_dev(
> - to_free,
> - -1,
> - NULL,
> - IGNORE_IRQ | IGNORE_DEV
> - );
> - to_free = to_free->next;
> - }
> - /* don't garbage collect - we can no longer call kfree() here */
> +
> + /* we can no longer call kfree() here so just deactivate */
> + list_for_each_entry(entry, &active_fds, list)
> + os_del_epoll_fd(entry->fd);
> os_close_epoll_fd();
> return 0;
> }
--
Anton R. Ivanov
https://www.kot-begemot.co.uk/
_______________________________________________
linux-um mailing list
linux-um@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-um
^ permalink raw reply [flat|nested] 42+ messages in thread
* Re: [PATCH 7/7] um: simplify IRQ handling code
2020-11-30 16:30 ` Anton Ivanov
@ 2020-12-01 20:15 ` Johannes Berg
2020-12-02 9:03 ` Anton Ivanov
2020-12-02 11:49 ` Johannes Berg
1 sibling, 1 reply; 42+ messages in thread
From: Johannes Berg @ 2020-12-01 20:15 UTC (permalink / raw)
To: Anton Ivanov, linux-um
On Mon, 2020-11-30 at 16:30 +0000, Anton Ivanov wrote:
> On 23/11/2020 19:56, Johannes Berg wrote:
> > From: Johannes Berg <johannes.berg@intel.com>
> >
> > Reduce dynamic allocations (and thereby cache misses) by simply
> > embedding the registration data for IRQs in the irq_entry, we
> > never supported these being really dynamic anyway as only one
> > was ever allowed ("Trying to reregister ...").
> >
> > Lockless behaviour is preserved by removing the FD from the poll
> > set appropriately, but we use reg->events to indicate whether or
> > not this entry is used, rather than dynamically allocating them.
> >
> > Also port the list of IRQ entries to list_head instead of the
> > current open-coded singly-linked list implementation, just for
> > sanity.
>
> This one is broken. I will look exactly where. It is somewhere in the IRQ delete/re-request logic.
>
> How to test
>
> run iperf -s in the UML with a vector network driver.
>
> run iperf -c to the UML instance from the host in a loop
How do you usually use it? tap device?
> Try to ifup/ifdown the vecX interface inside the UML.
>
> With master it works fine. With this patch it fails.
How does it fail?
johannes
_______________________________________________
linux-um mailing list
linux-um@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-um
^ permalink raw reply [flat|nested] 42+ messages in thread
* Re: [PATCH 7/7] um: simplify IRQ handling code
2020-12-01 20:15 ` Johannes Berg
@ 2020-12-02 9:03 ` Anton Ivanov
2020-12-02 11:29 ` Johannes Berg
0 siblings, 1 reply; 42+ messages in thread
From: Anton Ivanov @ 2020-12-02 9:03 UTC (permalink / raw)
To: Johannes Berg, linux-um
On 01/12/2020 20:15, Johannes Berg wrote:
> On Mon, 2020-11-30 at 16:30 +0000, Anton Ivanov wrote:
>> On 23/11/2020 19:56, Johannes Berg wrote:
>>> From: Johannes Berg <johannes.berg@intel.com>
>>>
>>> Reduce dynamic allocations (and thereby cache misses) by simply
>>> embedding the registration data for IRQs in the irq_entry, we
>>> never supported these being really dynamic anyway as only one
>>> was ever allowed ("Trying to reregister ...").
>>>
>>> Lockless behaviour is preserved by removing the FD from the poll
>>> set appropriately, but we use reg->events to indicate whether or
>>> not this entry is used, rather than dynamically allocating them.
>>>
>>> Also port the list of IRQ entries to list_head instead of the
>>> current open-coded singly-linked list implementation, just for
>>> sanity.
>> This one is broken. I will look exactly where. It is somewhere in the IRQ delete/re-request logic.
>>
>> How to test
>>
>> run iperf -s in the UML with a vector network driver.
>>
>> run iperf -c to the UML instance from the host in a loop
> How do you usually use it? tap device?
raw sockets on a vEth pair.
I avoid tap as it does not exercise the full vector IO code for now. One day I will find a way to extract from the kernel the underlying socket which tap uses internally and it will become 100% equivalent to the other transports.
>
>> Try to ifup/ifdown the vecX interface inside the UML.
>>
>> With master it works fine. With this patch it fails.
> How does it fail?
------------[ cut here ]------------
WARNING: CPU: 0 PID: 401 at arch/um/kernel/irq.c:177 um_request_irq+0xff/0x22e
Modules linked in:
CPU: 0 PID: 401 Comm: ip Tainted: G W 5.10.0-rc6-00007-g6a51713e7f43 #377
Stack:
60312019 00000000 65bc31d0 60312019
00000009 00000000 00000000 ffffff8e
65bc31e0 60313228 65bc3220 6003e2d2
Call Trace:
[<60312019>] ? printk+0x0/0x94
[<6001f34b>] show_stack+0x13e/0x14d
[<60312019>] ? printk+0x0/0x94
[<60312019>] ? printk+0x0/0x94
[<60313228>] dump_stack+0x34/0x36
[<6003e2d2>] __warn+0xf0/0x137
[<60035374>] ? set_signals+0x0/0x36
[<60311606>] warn_slowpath_fmt+0xd1/0xdf
[<60028624>] ? uml_raw_enable_vnet_headers+0x0/0x5d
[<60227c06>] ? strlen+0x0/0x11
[<60314bb7>] ? netdev_info+0xad/0xaf
[<60311535>] ? warn_slowpath_fmt+0x0/0xdf
[<600353a4>] ? set_signals+0x30/0x36
[<600353a4>] ? set_signals+0x30/0x36
[<6001d7e1>] um_request_irq+0xff/0x22e
[<60027f05>] ? vector_rx_interrupt+0x0/0x2a
[<60026288>] ? get_depth+0x0/0x4b
[<6001d6e2>] ? um_request_irq+0x0/0x22e
[<60027cd8>] vector_net_open+0x1e9/0x416
[<60272059>] __dev_open+0x100/0x15a
[<60271f20>] ? dev_set_rx_mode+0x0/0x39
[<602723d7>] __dev_change_flags+0x125/0x1cc
[<602724a8>] dev_change_flags+0x2a/0x67
[<60282502>] do_setlink+0x375/0xe90
[<6021c4e5>] ? __nla_validate_parse+0x6d/0x8cf
[<6021cd88>] ? __nla_parse+0x2b/0x2d
[<602836db>] __rtnl_newlink+0x3f2/0x81f
[<600353a4>] ? set_signals+0x30/0x36
[<6027c23f>] ? __nlmsg_parse+0x58/0x60
[<600cf37a>] ? get_page_from_freelist+0x0/0x973
[<600cd71b>] ? first_zones_zonelist+0x0/0x20
[<600d0393>] ? __alloc_pages_nodemask+0x128/0x81c
[<600377fe>] ? wait_stub_done+0x40/0x10c
[<60283b63>] rtnl_newlink+0x5b/0x7b
[<6029af9a>] ? __netlink_ns_capable+0x25/0x53
[<6027bc5b>] ? rtnl_get_link+0x0/0x2b
[<6027e0ae>] rtnetlink_rcv_msg+0x229/0x25a
[<6002135c>] ? copy_chunk_from_user+0x0/0x2e
[<6002135c>] ? copy_chunk_from_user+0x0/0x2e
[<60021644>] ? buffer_op+0x4a/0xdb
[<6027de85>] ? rtnetlink_rcv_msg+0x0/0x25a
[<6029f289>] netlink_rcv_skb+0x67/0xcb
[<6025c08d>] ? kfree_skb+0x0/0x2c
[<6027c66a>] rtnetlink_rcv+0x1a/0x1c
[<6029eace>] netlink_unicast+0x139/0x1df
[<6029eec9>] netlink_sendmsg+0x355/0x37a
[<602156b4>] ? __import_iovec+0xe1/0x104
[<60250913>] ? sock_sendmsg_nosec+0x0/0x65
[<60250925>] sock_sendmsg_nosec+0x12/0x65
[<60250b65>] ____sys_sendmsg+0x10b/0x16b
[<60252966>] ___sys_sendmsg+0x79/0xa8
[<60037179>] ? do_syscall_stub+0xff/0x22f
[<60037347>] ? run_syscall_stub+0x9e/0xa0
[<60037441>] ? map+0x4a/0x4c
[<600f9ed7>] ? __fget_light+0x36/0x63
[<600f9f19>] ? __fdget+0x15/0x17
[<602503fb>] ? fdget+0x10/0x1c
[<60252a18>] __sys_sendmsg+0x54/0x82
[<60252a5b>] sys_sendmsg+0x15/0x17
[<6002132e>] handle_syscall+0x79/0xa7
[<60037f0e>] userspace+0x483/0x510
[<6001e166>] fork_handler+0x94/0x96
---[ end trace 95ba15d7fc338465 ]---
uml-vector uml-vector.0 vec0: vector_open: failed to get rx irq(-114)
>
> johannes
>
>
--
Anton R. Ivanov
https://www.kot-begemot.co.uk/
_______________________________________________
linux-um mailing list
linux-um@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-um
^ permalink raw reply [flat|nested] 42+ messages in thread
* Re: [PATCH 7/7] um: simplify IRQ handling code
2020-12-02 9:03 ` Anton Ivanov
@ 2020-12-02 11:29 ` Johannes Berg
2020-12-02 11:31 ` Anton Ivanov
2020-12-02 11:43 ` Johannes Berg
0 siblings, 2 replies; 42+ messages in thread
From: Johannes Berg @ 2020-12-02 11:29 UTC (permalink / raw)
To: Anton Ivanov, linux-um
On Wed, 2020-12-02 at 09:03 +0000, Anton Ivanov wrote:
>
> raw sockets on a vEth pair.
>
> I avoid tap as it does not exercise the full vector IO code for now.
> One day I will find a way to extract from the kernel the underlying
> socket which tap uses internally and it will become 100% equivalent to
> the other transports.
OK, thanks.
> > > Try to ifup/ifdown the vecX interface inside the UML.
> > >
> > > With master it works fine. With this patch it fails.
> > How does it fail?
>
> ------------[ cut here ]------------
> WARNING: CPU: 0 PID: 401 at arch/um/kernel/irq.c:177 um_request_irq+0xff/0x22e
Hm, interesting. So that means the IRQ was still busy after
vector_net_close()?
I'm still digging and trying to build a test case, but if you have a
test case at hand .. I wonder if IRQ aliasing happened - if you remove
the "goto out;" in free_irq_by_irq_and_dev(), does that help?
johannes
_______________________________________________
linux-um mailing list
linux-um@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-um
^ permalink raw reply [flat|nested] 42+ messages in thread
* Re: [PATCH 7/7] um: simplify IRQ handling code
2020-12-02 11:29 ` Johannes Berg
@ 2020-12-02 11:31 ` Anton Ivanov
2020-12-02 11:32 ` Johannes Berg
2020-12-02 11:43 ` Johannes Berg
1 sibling, 1 reply; 42+ messages in thread
From: Anton Ivanov @ 2020-12-02 11:31 UTC (permalink / raw)
To: Johannes Berg, linux-um
On 02/12/2020 11:29, Johannes Berg wrote:
> On Wed, 2020-12-02 at 09:03 +0000, Anton Ivanov wrote:
>>
>> raw sockets on a vEth pair.
>>
>> I avoid tap as it does not exercise the full vector IO code for now.
>> One day I will find a way to extract from the kernel the underlying
>> socket which tap uses internally and it will become 100% equivalent to
>> the other transports.
>
> OK, thanks.
>
>>>> Try to ifup/ifdown the vecX interface inside the UML.
>>>>
>>>> With master it works fine. With this patch it fails.
>>> How does it fail?
>>
>> ------------[ cut here ]------------
>> WARNING: CPU: 0 PID: 401 at arch/um/kernel/irq.c:177 um_request_irq+0xff/0x22e
>
> Hm, interesting. So that means the IRQ was still busy after
> vector_net_close()?
>
> I'm still digging and trying to build a test case, but if you have a
> test case at hand .. I wonder if IRQ aliasing happened - if you remove
> the "goto out;" in free_irq_by_irq_and_dev(), does that help?
>
>
> johannes
>
>
I think we should just handle EPOLLHUP and do an IRQ + fd disable if it HUPS.
This way a close will always be handled correctly regardless of where and how it closed.
I am about to try a patch on top of your 7 which does that.
--
Anton R. Ivanov
https://www.kot-begemot.co.uk/
_______________________________________________
linux-um mailing list
linux-um@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-um
^ permalink raw reply [flat|nested] 42+ messages in thread
* Re: [PATCH 7/7] um: simplify IRQ handling code
2020-12-02 11:31 ` Anton Ivanov
@ 2020-12-02 11:32 ` Johannes Berg
2020-12-02 11:56 ` Anton Ivanov
0 siblings, 1 reply; 42+ messages in thread
From: Johannes Berg @ 2020-12-02 11:32 UTC (permalink / raw)
To: Anton Ivanov, linux-um
On Wed, 2020-12-02 at 11:31 +0000, Anton Ivanov wrote:
>
> I think we should just handle EPOLLHUP and do an IRQ + fd disable if it HUPS.
>
> This way a close will always be handled correctly regardless of where and how it closed.
Yes, but that's sort of a separate thing?
Also, we probably should disable SIGIO if the IRQ is freed, otherwise
the FD can keep interrupting us but we don't find anything in the epoll
set ... But again, a separate cleanup?
johannes
_______________________________________________
linux-um mailing list
linux-um@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-um
^ permalink raw reply [flat|nested] 42+ messages in thread
* Re: [PATCH 7/7] um: simplify IRQ handling code
2020-12-02 11:29 ` Johannes Berg
2020-12-02 11:31 ` Anton Ivanov
@ 2020-12-02 11:43 ` Johannes Berg
1 sibling, 0 replies; 42+ messages in thread
From: Johannes Berg @ 2020-12-02 11:43 UTC (permalink / raw)
To: Anton Ivanov, linux-um
On Wed, 2020-12-02 at 12:29 +0100, Johannes Berg wrote:
>
> I'm still digging and trying to build a test case, but if you have a
> test case at hand .. I wonder if IRQ aliasing happened - if you remove
> the "goto out;" in free_irq_by_irq_and_dev(), does that help?
That wasn't it, but I can reproduce now.
johannes
_______________________________________________
linux-um mailing list
linux-um@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-um
^ permalink raw reply [flat|nested] 42+ messages in thread
* Re: [PATCH 7/7] um: simplify IRQ handling code
2020-11-30 16:30 ` Anton Ivanov
2020-12-01 20:15 ` Johannes Berg
@ 2020-12-02 11:49 ` Johannes Berg
1 sibling, 0 replies; 42+ messages in thread
From: Johannes Berg @ 2020-12-02 11:49 UTC (permalink / raw)
To: Anton Ivanov, linux-um
> run iperf -s in the UML with a vector network driver.
Btw, 'ip link set vec0 up' reports a lockdep issue.
Looks sort of legitimate, though we're not SMP, so ...
======================================================
WARNING: possible circular locking dependency detected
5.10.0-rc4-00392-gedc4ff2eb69b-dirty #147 Not tainted
------------------------------------------------------
swapper/0 is trying to acquire lock:
0000000063701138 (&result->tail_lock){+.-.}-{2:2}, at: vector_send.isra.0+0x1ba/0x280
but task is already holding lock:
00000000637010f0 (&result->head_lock){+.-.}-{2:2}, at: vector_send.isra.0+0x30/0x280
which lock already depends on the new lock.
the existing dependency chain (in reverse order) is:
-> #1 (&result->head_lock){+.-.}-{2:2}:
save_stack_trace+0x2e/0x30
stack_trace_save+0x34/0x39
save_trace+0x8c/0x261
__lock_acquire+0x1480/0x16b8
lock_acquire+0x335/0x414
_raw_spin_lock+0x31/0x85
vector_net_start_xmit+0x164/0x340
netdev_start_xmit+0x1f/0x47
dev_hard_start_xmit+0x14b/0x230
sch_direct_xmit+0xb0/0x248
__qdisc_run+0x4f3/0x532
qdisc_run+0x3d/0x51
__dev_queue_xmit+0x2e0/0x6e8
dev_queue_xmit+0x12/0x14
neigh_resolve_output+0x13f/0x162
ip6_finish_output2+0x642/0x713
__ip6_finish_output+0xac/0xb5
ip6_output+0xcf/0x113
dst_output+0x72/0x7b
NF_HOOK.constprop.0+0x115/0x124
mld_sendpack+0x20e/0x2ba
mld_ifc_timer_expire+0x259/0x2ab
call_timer_fn+0x116/0x243
__run_timers+0x207/0x246
run_timer_softirq+0x1c/0x2c
__do_softirq+0x1b9/0x43e
irq_exit+0xc1/0x113
do_IRQ+0x45/0x54
timer_handler+0xce/0xed
timer_real_alarm_handler+0x5c/0x5e
unblock_signals+0x9c/0xd7
arch_cpu_idle+0x5b/0x62
default_idle_call+0x52/0x5e
do_idle+0xd8/0x14b
cpu_startup_entry+0x1e/0x20
rest_init+0x135/0x141
0x600016d2
0x60001dfe
0x60003845
new_thread_handler+0x81/0xb2
uml_finishsetup+0x54/0x59
-> #0 (&result->tail_lock){+.-.}-{2:2}:
save_stack_trace+0x2e/0x30
stack_trace_save+0x34/0x39
save_trace+0x8c/0x261
print_circular_bug+0x64/0x24b
check_noncircular+0xd3/0xe3
__lock_acquire+0x12ca/0x16b8
lock_acquire+0x335/0x414
_raw_spin_lock+0x31/0x85
vector_send.isra.0+0x1ba/0x280
vector_net_start_xmit+0x32b/0x340
netdev_start_xmit+0x1f/0x47
dev_hard_start_xmit+0x14b/0x230
sch_direct_xmit+0xb0/0x248
__qdisc_run+0x4f3/0x532
qdisc_run+0x3d/0x51
__dev_queue_xmit+0x2e0/0x6e8
dev_queue_xmit+0x12/0x14
neigh_resolve_output+0x13f/0x162
ip6_finish_output2+0x642/0x713
__ip6_finish_output+0xac/0xb5
ip6_output+0xcf/0x113
dst_output+0x72/0x7b
NF_HOOK.constprop.0+0x115/0x124
mld_sendpack+0x20e/0x2ba
mld_ifc_timer_expire+0x259/0x2ab
call_timer_fn+0x116/0x243
__run_timers+0x207/0x246
run_timer_softirq+0x1c/0x2c
__do_softirq+0x1b9/0x43e
irq_exit+0xc1/0x113
do_IRQ+0x45/0x54
timer_handler+0xce/0xed
timer_real_alarm_handler+0x5c/0x5e
unblock_signals+0x9c/0xd7
arch_cpu_idle+0x5b/0x62
default_idle_call+0x52/0x5e
do_idle+0xd8/0x14b
cpu_startup_entry+0x1e/0x20
rest_init+0x135/0x141
0x600016d2
0x60001dfe
0x60003845
new_thread_handler+0x81/0xb2
uml_finishsetup+0x54/0x59
other info that might help us debug this:
Possible unsafe locking scenario:
CPU0 CPU1
---- ----
lock(&result->head_lock);
lock(&result->tail_lock);
lock(&result->head_lock);
lock(&result->tail_lock);
*** DEADLOCK ***
8 locks held by swapper/0:
#0: 0000000060687050 ((&idev->mc_ifc_timer)){+.-.}-{0:0}, at: call_timer_fn+0x0/0x243
#1: 0000000060887e40 (rcu_read_lock){....}-{1:2}, at: rcu_lock_acquire.constprop.0+0x0/0x39
#2: 0000000060887e00 (rcu_read_lock_bh){....}-{1:2}, at: rcu_lock_acquire+0x0/0x2f
#3: 0000000060887e00 (rcu_read_lock_bh){....}-{1:2}, at: rcu_lock_acquire+0x0/0x2f
#4: 0000000063fa9258 (&sch->seqlock){+...}-{2:2}, at: qdisc_run_begin+0x22/0x76
#5: 0000000063fa9140 (dev->qdisc_running_key ?: &qdisc_running_key){+...}-{0:0}, at: qdisc_run+0x16/0x51
#6: 0000000063636e88 (_xmit_ETHER#2){+.-.}-{2:2}, at: sch_direct_xmit+0x84/0x248
#7: 00000000637010f0 (&result->head_lock){+.-.}-{2:2}, at: vector_send.isra.0+0x30/0x280
stack backtrace:
CPU: 0 PID: 0 Comm: swapper Not tainted 5.10.0-rc4-00392-gedc4ff2eb69b-dirty #147
Stack:
605d20dd 60c14280 60686830 604765ed
60475ac7 60c14280 60c14180 60c14280
60686840 60477bcd 606868a0 6007f8e4
Call Trace:
[<604765ed>] ? printk+0x0/0x94
[<60025c1b>] show_stack+0x13e/0x14d
[<604765ed>] ? printk+0x0/0x94
[<60475ac7>] ? __print_lock_name+0x0/0x90
[<60477bcd>] dump_stack+0x34/0x36
[<6007f8e4>] print_circular_bug+0x23c/0x24b
[<6007d8de>] ? save_trace+0x8c/0x261
[<6007f9c6>] check_noncircular+0xd3/0xe3
[<6007dda1>] ? hlock_class+0x1e/0x9e
[<60080880>] ? mark_lock.part.0+0x0/0x410
[<6007dd83>] ? hlock_class+0x0/0x9e
[<6008304e>] __lock_acquire+0x12ca/0x16b8
[<6003b4b5>] ? set_signals+0x37/0x3f
[<6007dd83>] ? hlock_class+0x0/0x9e
[<60081515>] lock_acquire+0x335/0x414
[<6002db48>] ? vector_send.isra.0+0x1ba/0x280
[<6047a506>] ? debug_lockdep_rcu_enabled+0x0/0x3b
[<6047f337>] _raw_spin_lock+0x31/0x85
[<6002db48>] ? vector_send.isra.0+0x1ba/0x280
[<6047f306>] ? _raw_spin_lock+0x0/0x85
[<6002db48>] vector_send.isra.0+0x1ba/0x280
[<6047f7cb>] ? _raw_spin_unlock+0x0/0x32
[<6002e06d>] vector_net_start_xmit+0x32b/0x340
[<6032845a>] netdev_start_xmit+0x1f/0x47
[<60479fa2>] ? match_held_lock+0x0/0x1de
[<6047a506>] ? debug_lockdep_rcu_enabled+0x0/0x3b
[<60330d44>] dev_hard_start_xmit+0x14b/0x230
[<6047a506>] ? debug_lockdep_rcu_enabled+0x0/0x3b
[<60367250>] sch_direct_xmit+0xb0/0x248
[<60365ee5>] ? qdisc_qstats_cpu_qlen_dec+0x2a/0x2e
[<60365ebb>] ? qdisc_qstats_cpu_qlen_dec+0x0/0x2e
[<603678db>] __qdisc_run+0x4f3/0x532
[<6047a506>] ? debug_lockdep_rcu_enabled+0x0/0x3b
[<6032d233>] qdisc_run+0x3d/0x51
[<603311af>] __dev_queue_xmit+0x2e0/0x6e8
[<6047a506>] ? debug_lockdep_rcu_enabled+0x0/0x3b
[<60338c91>] ? read_seqbegin+0x0/0xc9
[<603315c9>] dev_queue_xmit+0x12/0x14
[<6033d0d9>] neigh_resolve_output+0x13f/0x162
[<6047a506>] ? debug_lockdep_rcu_enabled+0x0/0x3b
[<603f8e94>] ip6_finish_output2+0x642/0x713
[<603fa9ef>] __ip6_finish_output+0xac/0xb5
[<603faad9>] ip6_output+0xcf/0x113
[<60424cac>] ? dst_output+0x0/0x7b
[<60424d1e>] dst_output+0x72/0x7b
[<6042571a>] NF_HOOK.constprop.0+0x115/0x124
[<6041058a>] ? icmp6_dst_alloc+0xea/0x103
[<6003b47e>] ? set_signals+0x0/0x3f
[<60425937>] mld_sendpack+0x20e/0x2ba
[<60427902>] ? add_grec+0x0/0x3d0
[<6047f493>] ? _raw_spin_lock_bh+0x0/0x9b
[<60428340>] mld_ifc_timer_expire+0x259/0x2ab
[<604280e7>] ? mld_ifc_timer_expire+0x0/0x2ab
[<6047a506>] ? debug_lockdep_rcu_enabled+0x0/0x3b
[<6009a795>] call_timer_fn+0x116/0x243
[<6009a67f>] ? call_timer_fn+0x0/0x243
[<6009b02e>] __run_timers+0x207/0x246
[<604280e7>] ? mld_ifc_timer_expire+0x0/0x2ab
[<6047f52e>] ? _raw_spin_lock_irq+0x0/0xb2
[<6003b4a7>] ? set_signals+0x29/0x3f
[<6047a4f4>] ? lock_is_held_type+0x135/0x147
[<6047a362>] ? lockdep_hardirqs_on+0x1e2/0x23f
[<6009ae27>] ? __run_timers+0x0/0x246
[<6009b089>] run_timer_softirq+0x1c/0x2c
[<60480331>] __do_softirq+0x1b9/0x43e
[<600953e3>] ? unmask_irq+0x0/0x37
[<6047f7cb>] ? _raw_spin_unlock+0x0/0x32
[<60022c6b>] ? rcu_lock_acquire.constprop.0+0x0/0x39
[<600492c8>] irq_exit+0xc1/0x113
[<60049205>] ? irq_enter+0x10/0x12
[<60024138>] do_IRQ+0x45/0x54
[<6003b47e>] ? set_signals+0x0/0x3f
[<60026ba5>] timer_handler+0xce/0xed
[<600838e7>] ? lock_release+0x0/0x36c
[<60061e0a>] ? find_task_by_pid_ns+0x0/0x97
[<6003b03a>] timer_real_alarm_handler+0x5c/0x5e
[<6003b439>] unblock_signals+0x9c/0xd7
[<60024dac>] arch_cpu_idle+0x5b/0x62
[<60097200>] ? rcu_read_lock_sched_held+0x2d/0x34
[<600709f6>] ? trace_cpu_idle.constprop.0+0x0/0xa1
[<6047f2aa>] default_idle_call+0x52/0x5e
[<600838e7>] ? lock_release+0x0/0x36c
[<60061e0a>] ? find_task_by_pid_ns+0x0/0x97
[<6003b474>] ? get_signals+0x0/0xa
[<60070c21>] do_idle+0xd8/0x14b
[<6047ba87>] ? schedule+0x95/0xd6
[<60070b49>] ? do_idle+0x0/0x14b
[<6007101f>] cpu_startup_entry+0x1e/0x20
[<60071001>] ? cpu_startup_entry+0x0/0x20
[<6047a506>] ? debug_lockdep_rcu_enabled+0x0/0x3b
[<6047a6c5>] rest_init+0x135/0x141
[<6047a590>] ? rest_init+0x0/0x141
[<6003b474>] ? get_signals+0x0/0xa
[<604765ed>] ? printk+0x0/0x94
[<602b569e>] ? strlen+0x0/0x11
[<600016d2>] 0x600016d2
[<60001dfe>] 0x60001dfe
[<6003b38c>] ? block_signals+0x0/0x11
[<60003845>] 0x60003845
[<60024816>] new_thread_handler+0x81/0xb2
[<600037fa>] ? 0x600037fa
[<600284b7>] uml_finishsetup+0x54/0x59
johannes
_______________________________________________
linux-um mailing list
linux-um@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-um
^ permalink raw reply [flat|nested] 42+ messages in thread
* Re: [PATCH 7/7] um: simplify IRQ handling code
2020-11-23 19:56 ` [PATCH 7/7] um: simplify IRQ handling code Johannes Berg
2020-11-24 21:50 ` Anton Ivanov
2020-11-30 16:30 ` Anton Ivanov
@ 2020-12-02 11:54 ` Johannes Berg
2020-12-02 11:58 ` Anton Ivanov
2 siblings, 1 reply; 42+ messages in thread
From: Johannes Berg @ 2020-12-02 11:54 UTC (permalink / raw)
To: linux-um; +Cc: Anton Ivanov
Oh, I found the bug ...
> static int activate_fd(int irq, int fd, enum um_irq_type type, void *dev_id)
> {
[...]
> + irq_entry->reg[type].irq = irq;
> + irq_entry->reg[type].active = true;
> + irq_entry->reg[type].events = events;
Obviously, here we need
irq_entry->reg[type].id = dev_id;
:-)
johannes
_______________________________________________
linux-um mailing list
linux-um@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-um
^ permalink raw reply [flat|nested] 42+ messages in thread
* Re: [PATCH 7/7] um: simplify IRQ handling code
2020-12-02 11:32 ` Johannes Berg
@ 2020-12-02 11:56 ` Anton Ivanov
2020-12-02 11:58 ` Johannes Berg
0 siblings, 1 reply; 42+ messages in thread
From: Anton Ivanov @ 2020-12-02 11:56 UTC (permalink / raw)
To: Johannes Berg, linux-um
On 02/12/2020 11:32, Johannes Berg wrote:
> On Wed, 2020-12-02 at 11:31 +0000, Anton Ivanov wrote:
>> I think we should just handle EPOLLHUP and do an IRQ + fd disable if it HUPS.
>>
>> This way a close will always be handled correctly regardless of where and how it closed.
> Yes, but that's sort of a separate thing?
Yep it is. Parking it for later as it will allow to remove the "free_irqs" cludge.
>
> Also, we probably should disable SIGIO if the IRQ is freed, otherwise
> the FD can keep interrupting us but we don't find anything in the epoll
> set ... But again, a separate cleanup?
I think that deleting the fd from the set should stop that.
Let me think on it. It was clearly being held together by duck tape and baling wire and it needs fixing. You got most of it which is grand, we just need to finish it.
>
> johannes
>
>
> _______________________________________________
> linux-um mailing list
> linux-um@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-um
>
--
Anton R. Ivanov
https://www.kot-begemot.co.uk/
_______________________________________________
linux-um mailing list
linux-um@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-um
^ permalink raw reply [flat|nested] 42+ messages in thread
* Re: [PATCH 7/7] um: simplify IRQ handling code
2020-12-02 11:54 ` Johannes Berg
@ 2020-12-02 11:58 ` Anton Ivanov
0 siblings, 0 replies; 42+ messages in thread
From: Anton Ivanov @ 2020-12-02 11:58 UTC (permalink / raw)
To: Johannes Berg, linux-um
On 02/12/2020 11:54, Johannes Berg wrote:
> Oh, I found the bug ...
>
>
>> static int activate_fd(int irq, int fd, enum um_irq_type type, void *dev_id)
>> {
> [...]
>
>> + irq_entry->reg[type].irq = irq;
>> + irq_entry->reg[type].active = true;
>> + irq_entry->reg[type].events = events;
> Obviously, here we need
>
> irq_entry->reg[type].id = dev_id;
>
> :-)
OK. Cool. I am waiting for the respin.
I will look at adding proper "close" handing and getting rid of the free_irqs kludge later.
>
> johannes
>
>
> _______________________________________________
> linux-um mailing list
> linux-um@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-um
>
--
Anton R. Ivanov
https://www.kot-begemot.co.uk/
_______________________________________________
linux-um mailing list
linux-um@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-um
^ permalink raw reply [flat|nested] 42+ messages in thread
* Re: [PATCH 7/7] um: simplify IRQ handling code
2020-12-02 11:56 ` Anton Ivanov
@ 2020-12-02 11:58 ` Johannes Berg
0 siblings, 0 replies; 42+ messages in thread
From: Johannes Berg @ 2020-12-02 11:58 UTC (permalink / raw)
To: Anton Ivanov, linux-um
On Wed, 2020-12-02 at 11:56 +0000, Anton Ivanov wrote:
>
> > Also, we probably should disable SIGIO if the IRQ is freed, otherwise
> > the FD can keep interrupting us but we don't find anything in the epoll
> > set ... But again, a separate cleanup?
>
> I think that deleting the fd from the set should stop that.
It doesn't. We'd have to separately call ignore_sigio_fd(), but we only
do that in deactivate_fd(), not in any of the other code paths ...
> Let me think on it. It was clearly being held together by duck tape
> and baling wire and it needs fixing. You got most of it which is
> grand, we just need to finish it.
Indeed.
Will send out this set again with the fix in a few minutes.
johannes
_______________________________________________
linux-um mailing list
linux-um@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-um
^ permalink raw reply [flat|nested] 42+ messages in thread
end of thread, other threads:[~2020-12-02 11:58 UTC | newest]
Thread overview: 42+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-23 19:56 [PATCH 0/7 um: IRQ handling cleanups Johannes Berg
2020-11-23 19:56 ` [PATCH 1/7] um: support dynamic IRQ allocation Johannes Berg
2020-11-30 11:26 ` Anton Ivanov
2020-11-23 19:56 ` [PATCH 2/7] um: virtio: use " Johannes Berg
2020-11-30 13:45 ` Anton Ivanov
2020-11-23 19:56 ` [PATCH 3/7] um: clean up alarm IRQ chip name Johannes Berg
2020-11-30 13:54 ` Anton Ivanov
2020-11-23 19:56 ` [PATCH 4/7] um: irq: clean up and rename struct irq_fd Johannes Berg
2020-11-30 14:01 ` Anton Ivanov
2020-11-23 19:56 ` [PATCH 5/7] um: irq: reduce irq_reg allocation Johannes Berg
2020-11-23 19:56 ` [PATCH 6/7] um: remove IRQ_NONE type Johannes Berg
2020-11-30 14:31 ` Anton Ivanov
2020-11-23 19:56 ` [PATCH 7/7] um: simplify IRQ handling code Johannes Berg
2020-11-24 21:50 ` Anton Ivanov
2020-11-24 21:58 ` Johannes Berg
2020-11-24 22:36 ` Anton Ivanov
2020-11-30 12:00 ` Johannes Berg
2020-11-30 13:40 ` Anton Ivanov
2020-11-30 16:30 ` Anton Ivanov
2020-12-01 20:15 ` Johannes Berg
2020-12-02 9:03 ` Anton Ivanov
2020-12-02 11:29 ` Johannes Berg
2020-12-02 11:31 ` Anton Ivanov
2020-12-02 11:32 ` Johannes Berg
2020-12-02 11:56 ` Anton Ivanov
2020-12-02 11:58 ` Johannes Berg
2020-12-02 11:43 ` Johannes Berg
2020-12-02 11:49 ` Johannes Berg
2020-12-02 11:54 ` Johannes Berg
2020-12-02 11:58 ` Anton Ivanov
2020-11-24 8:14 ` [PATCH 0/7 um: IRQ handling cleanups Anton Ivanov
2020-11-24 8:55 ` Johannes Berg
2020-11-24 8:58 ` Johannes Berg
2020-11-24 9:06 ` Anton Ivanov
2020-11-24 16:34 ` Anton Ivanov
2020-11-24 16:39 ` Johannes Berg
2020-11-24 16:42 ` Anton Ivanov
2020-11-24 16:45 ` Anton Ivanov
2020-11-24 16:46 ` Johannes Berg
2020-11-24 17:07 ` Anton Ivanov
2020-11-24 18:32 ` Johannes Berg
2020-11-24 21:11 ` Johannes Berg
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.