* [PATCH 5.10 0/1] qrtr: Convert qrtr_ports from IDR to XArray @ 2022-08-18 14:14 Stanislav Goriainov 2022-08-18 14:14 ` [PATCH 5.10 1/1] " Stanislav Goriainov 0 siblings, 1 reply; 7+ messages in thread From: Stanislav Goriainov @ 2022-08-18 14:14 UTC (permalink / raw) To: stable, Greg Kroah-Hartman Cc: Stanislav Goriainov, David S. Miller, Jakub Kicinski, Matthew Wilcox (Oracle), Manivannan Sadhasivam, Xiaolong Huang, netdev, linux-kernel, ldv-project Syzkaller reports using smp_processor_id() in preemptible code at radix_tree_node_alloc() in 5.10 stable releases. The problem has been fixed by the following patch which can be cleanly applied to the 5.10 branch. Found by Linux Verification Center (linuxtesting.org) with Syzkaller. ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 5.10 1/1] qrtr: Convert qrtr_ports from IDR to XArray 2022-08-18 14:14 [PATCH 5.10 0/1] qrtr: Convert qrtr_ports from IDR to XArray Stanislav Goriainov @ 2022-08-18 14:14 ` Stanislav Goriainov 2022-08-19 11:21 ` Greg Kroah-Hartman 0 siblings, 1 reply; 7+ messages in thread From: Stanislav Goriainov @ 2022-08-18 14:14 UTC (permalink / raw) To: stable, Greg Kroah-Hartman Cc: Stanislav Goriainov, David S. Miller, Jakub Kicinski, Matthew Wilcox (Oracle), Manivannan Sadhasivam, Xiaolong Huang, netdev, linux-kernel, ldv-project From: "Matthew Wilcox (Oracle)" <willy@infradead.org> commit 3403fb9adea5f5d8f9337d77ba1b31e6536ac7f1 upstream. The XArray interface is easier for this driver to use. Also fixes a bug reported by the improper use of GFP_ATOMIC. Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org> Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Stanislav Goriainov <goriainov@ispras.ru> --- net/qrtr/qrtr.c | 42 ++++++++++++++---------------------------- 1 file changed, 14 insertions(+), 28 deletions(-) diff --git a/net/qrtr/qrtr.c b/net/qrtr/qrtr.c index 56cffbfa000b..13448ca5aeff 100644 --- a/net/qrtr/qrtr.c +++ b/net/qrtr/qrtr.c @@ -20,6 +20,8 @@ /* auto-bind range */ #define QRTR_MIN_EPH_SOCKET 0x4000 #define QRTR_MAX_EPH_SOCKET 0x7fff +#define QRTR_EPH_PORT_RANGE \ + XA_LIMIT(QRTR_MIN_EPH_SOCKET, QRTR_MAX_EPH_SOCKET) /** * struct qrtr_hdr_v1 - (I|R)PCrouter packet header version 1 @@ -106,8 +108,7 @@ static LIST_HEAD(qrtr_all_nodes); static DEFINE_MUTEX(qrtr_node_lock); /* local port allocation management */ -static DEFINE_IDR(qrtr_ports); -static DEFINE_MUTEX(qrtr_port_lock); +static DEFINE_XARRAY_ALLOC(qrtr_ports); /** * struct qrtr_node - endpoint node @@ -635,7 +636,7 @@ static struct qrtr_sock *qrtr_port_lookup(int port) port = 0; rcu_read_lock(); - ipc = idr_find(&qrtr_ports, port); + ipc = xa_load(&qrtr_ports, port); if (ipc) sock_hold(&ipc->sk); rcu_read_unlock(); @@ -677,9 +678,7 @@ static void qrtr_port_remove(struct qrtr_sock *ipc) __sock_put(&ipc->sk); - mutex_lock(&qrtr_port_lock); - idr_remove(&qrtr_ports, port); - mutex_unlock(&qrtr_port_lock); + xa_erase(&qrtr_ports, port); /* Ensure that if qrtr_port_lookup() did enter the RCU read section we * wait for it to up increment the refcount */ @@ -698,29 +697,20 @@ static void qrtr_port_remove(struct qrtr_sock *ipc) */ static int qrtr_port_assign(struct qrtr_sock *ipc, int *port) { - u32 min_port; int rc; - mutex_lock(&qrtr_port_lock); if (!*port) { - min_port = QRTR_MIN_EPH_SOCKET; - rc = idr_alloc_u32(&qrtr_ports, ipc, &min_port, QRTR_MAX_EPH_SOCKET, GFP_ATOMIC); - if (!rc) - *port = min_port; + rc = xa_alloc(&qrtr_ports, port, ipc, QRTR_EPH_PORT_RANGE, + GFP_KERNEL); } else if (*port < QRTR_MIN_EPH_SOCKET && !capable(CAP_NET_ADMIN)) { rc = -EACCES; } else if (*port == QRTR_PORT_CTRL) { - min_port = 0; - rc = idr_alloc_u32(&qrtr_ports, ipc, &min_port, 0, GFP_ATOMIC); + rc = xa_insert(&qrtr_ports, 0, ipc, GFP_KERNEL); } else { - min_port = *port; - rc = idr_alloc_u32(&qrtr_ports, ipc, &min_port, *port, GFP_ATOMIC); - if (!rc) - *port = min_port; + rc = xa_insert(&qrtr_ports, *port, ipc, GFP_KERNEL); } - mutex_unlock(&qrtr_port_lock); - if (rc == -ENOSPC) + if (rc == -EBUSY) return -EADDRINUSE; else if (rc < 0) return rc; @@ -734,20 +724,16 @@ static int qrtr_port_assign(struct qrtr_sock *ipc, int *port) static void qrtr_reset_ports(void) { struct qrtr_sock *ipc; - int id; - - mutex_lock(&qrtr_port_lock); - idr_for_each_entry(&qrtr_ports, ipc, id) { - /* Don't reset control port */ - if (id == 0) - continue; + unsigned long index; + rcu_read_lock(); + xa_for_each_start(&qrtr_ports, index, ipc, 1) { sock_hold(&ipc->sk); ipc->sk.sk_err = ENETRESET; ipc->sk.sk_error_report(&ipc->sk); sock_put(&ipc->sk); } - mutex_unlock(&qrtr_port_lock); + rcu_read_unlock(); } /* Bind socket to address. -- 2.34.1 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 5.10 1/1] qrtr: Convert qrtr_ports from IDR to XArray 2022-08-18 14:14 ` [PATCH 5.10 1/1] " Stanislav Goriainov @ 2022-08-19 11:21 ` Greg Kroah-Hartman 2022-08-19 13:53 ` Matthew Wilcox 0 siblings, 1 reply; 7+ messages in thread From: Greg Kroah-Hartman @ 2022-08-19 11:21 UTC (permalink / raw) To: Stanislav Goriainov Cc: stable, David S. Miller, Jakub Kicinski, Matthew Wilcox (Oracle), Manivannan Sadhasivam, Xiaolong Huang, netdev, linux-kernel, ldv-project On Thu, Aug 18, 2022 at 05:14:01PM +0300, Stanislav Goriainov wrote: > From: "Matthew Wilcox (Oracle)" <willy@infradead.org> > > commit 3403fb9adea5f5d8f9337d77ba1b31e6536ac7f1 upstream. This is not a commit id in Linus's tree that I can find anywhere :( ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 5.10 1/1] qrtr: Convert qrtr_ports from IDR to XArray 2022-08-19 11:21 ` Greg Kroah-Hartman @ 2022-08-19 13:53 ` Matthew Wilcox 2022-08-19 14:32 ` Greg Kroah-Hartman 0 siblings, 1 reply; 7+ messages in thread From: Matthew Wilcox @ 2022-08-19 13:53 UTC (permalink / raw) To: Greg Kroah-Hartman Cc: Stanislav Goriainov, stable, David S. Miller, Jakub Kicinski, Manivannan Sadhasivam, Xiaolong Huang, netdev, linux-kernel, ldv-project On Fri, Aug 19, 2022 at 01:21:59PM +0200, Greg Kroah-Hartman wrote: > On Thu, Aug 18, 2022 at 05:14:01PM +0300, Stanislav Goriainov wrote: > > From: "Matthew Wilcox (Oracle)" <willy@infradead.org> > > > > commit 3403fb9adea5f5d8f9337d77ba1b31e6536ac7f1 upstream. > > This is not a commit id in Linus's tree that I can find anywhere :( I see it as 3cbf7530a163, fwiw. ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 5.10 1/1] qrtr: Convert qrtr_ports from IDR to XArray 2022-08-19 13:53 ` Matthew Wilcox @ 2022-08-19 14:32 ` Greg Kroah-Hartman 2022-08-19 19:47 ` goriainov 0 siblings, 1 reply; 7+ messages in thread From: Greg Kroah-Hartman @ 2022-08-19 14:32 UTC (permalink / raw) To: Matthew Wilcox Cc: Stanislav Goriainov, stable, David S. Miller, Jakub Kicinski, Manivannan Sadhasivam, Xiaolong Huang, netdev, linux-kernel, ldv-project On Fri, Aug 19, 2022 at 02:53:02PM +0100, Matthew Wilcox wrote: > On Fri, Aug 19, 2022 at 01:21:59PM +0200, Greg Kroah-Hartman wrote: > > On Thu, Aug 18, 2022 at 05:14:01PM +0300, Stanislav Goriainov wrote: > > > From: "Matthew Wilcox (Oracle)" <willy@infradead.org> > > > > > > commit 3403fb9adea5f5d8f9337d77ba1b31e6536ac7f1 upstream. > > > > This is not a commit id in Linus's tree that I can find anywhere :( > > I see it as 3cbf7530a163, fwiw. I'll wait for a resend, as obviously something went wrong on the sender's side... ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 5.10 1/1] qrtr: Convert qrtr_ports from IDR to XArray 2022-08-19 14:32 ` Greg Kroah-Hartman @ 2022-08-19 19:47 ` goriainov 0 siblings, 0 replies; 7+ messages in thread From: goriainov @ 2022-08-19 19:47 UTC (permalink / raw) To: Greg Kroah-Hartman Cc: Matthew Wilcox, stable, David S. Miller, Jakub Kicinski, Manivannan Sadhasivam, Xiaolong Huang, netdev, linux-kernel, ldv-project Greg Kroah-Hartman писал 2022-08-19 17:32: > On Fri, Aug 19, 2022 at 02:53:02PM +0100, Matthew Wilcox wrote: >> On Fri, Aug 19, 2022 at 01:21:59PM +0200, Greg Kroah-Hartman wrote: >> > On Thu, Aug 18, 2022 at 05:14:01PM +0300, Stanislav Goriainov wrote: >> > > From: "Matthew Wilcox (Oracle)" <willy@infradead.org> >> > > >> > > commit 3403fb9adea5f5d8f9337d77ba1b31e6536ac7f1 upstream. >> > >> > This is not a commit id in Linus's tree that I can find anywhere :( >> >> I see it as 3cbf7530a163, fwiw. > > I'll wait for a resend, as obviously something went wrong on the > sender's side... Yeah, my bad.. Corrected version follows up. ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 5.10 0/1] qrtr: Convert qrtr_ports from IDR to XArray @ 2022-08-19 19:47 Stanislav Goriainov 2022-08-19 19:47 ` [PATCH 5.10 1/1] " Stanislav Goriainov 0 siblings, 1 reply; 7+ messages in thread From: Stanislav Goriainov @ 2022-08-19 19:47 UTC (permalink / raw) To: stable, Greg Kroah-Hartman Cc: Stanislav Goriainov, David S. Miller, Jakub Kicinski, Matthew Wilcox (Oracle), Manivannan Sadhasivam, Xiaolong Huang, netdev, linux-kernel, ldv-project Syzkaller reports using smp_processor_id() in preemptible code at radix_tree_node_alloc() in 5.10 stable releases. The problem has been fixed by the following patch which can be cleanly applied to the 5.10 branch. Found by Linux Verification Center (linuxtesting.org) with Syzkaller. ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 5.10 1/1] qrtr: Convert qrtr_ports from IDR to XArray 2022-08-19 19:47 [PATCH 5.10 0/1] " Stanislav Goriainov @ 2022-08-19 19:47 ` Stanislav Goriainov 0 siblings, 0 replies; 7+ messages in thread From: Stanislav Goriainov @ 2022-08-19 19:47 UTC (permalink / raw) To: stable, Greg Kroah-Hartman Cc: Stanislav Goriainov, David S. Miller, Jakub Kicinski, Matthew Wilcox (Oracle), Manivannan Sadhasivam, Xiaolong Huang, netdev, linux-kernel, ldv-project From: "Matthew Wilcox (Oracle)" <willy@infradead.org> commit 3cbf7530a163d048a6376cd22fecb9cdcb23b192 upstream. The XArray interface is easier for this driver to use. Also fixes a bug reported by the improper use of GFP_ATOMIC. Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org> Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Stanislav Goriainov <goriainov@ispras.ru> --- net/qrtr/qrtr.c | 42 ++++++++++++++---------------------------- 1 file changed, 14 insertions(+), 28 deletions(-) diff --git a/net/qrtr/qrtr.c b/net/qrtr/qrtr.c index 56cffbfa000b..13448ca5aeff 100644 --- a/net/qrtr/qrtr.c +++ b/net/qrtr/qrtr.c @@ -20,6 +20,8 @@ /* auto-bind range */ #define QRTR_MIN_EPH_SOCKET 0x4000 #define QRTR_MAX_EPH_SOCKET 0x7fff +#define QRTR_EPH_PORT_RANGE \ + XA_LIMIT(QRTR_MIN_EPH_SOCKET, QRTR_MAX_EPH_SOCKET) /** * struct qrtr_hdr_v1 - (I|R)PCrouter packet header version 1 @@ -106,8 +108,7 @@ static LIST_HEAD(qrtr_all_nodes); static DEFINE_MUTEX(qrtr_node_lock); /* local port allocation management */ -static DEFINE_IDR(qrtr_ports); -static DEFINE_MUTEX(qrtr_port_lock); +static DEFINE_XARRAY_ALLOC(qrtr_ports); /** * struct qrtr_node - endpoint node @@ -635,7 +636,7 @@ static struct qrtr_sock *qrtr_port_lookup(int port) port = 0; rcu_read_lock(); - ipc = idr_find(&qrtr_ports, port); + ipc = xa_load(&qrtr_ports, port); if (ipc) sock_hold(&ipc->sk); rcu_read_unlock(); @@ -677,9 +678,7 @@ static void qrtr_port_remove(struct qrtr_sock *ipc) __sock_put(&ipc->sk); - mutex_lock(&qrtr_port_lock); - idr_remove(&qrtr_ports, port); - mutex_unlock(&qrtr_port_lock); + xa_erase(&qrtr_ports, port); /* Ensure that if qrtr_port_lookup() did enter the RCU read section we * wait for it to up increment the refcount */ @@ -698,29 +697,20 @@ static void qrtr_port_remove(struct qrtr_sock *ipc) */ static int qrtr_port_assign(struct qrtr_sock *ipc, int *port) { - u32 min_port; int rc; - mutex_lock(&qrtr_port_lock); if (!*port) { - min_port = QRTR_MIN_EPH_SOCKET; - rc = idr_alloc_u32(&qrtr_ports, ipc, &min_port, QRTR_MAX_EPH_SOCKET, GFP_ATOMIC); - if (!rc) - *port = min_port; + rc = xa_alloc(&qrtr_ports, port, ipc, QRTR_EPH_PORT_RANGE, + GFP_KERNEL); } else if (*port < QRTR_MIN_EPH_SOCKET && !capable(CAP_NET_ADMIN)) { rc = -EACCES; } else if (*port == QRTR_PORT_CTRL) { - min_port = 0; - rc = idr_alloc_u32(&qrtr_ports, ipc, &min_port, 0, GFP_ATOMIC); + rc = xa_insert(&qrtr_ports, 0, ipc, GFP_KERNEL); } else { - min_port = *port; - rc = idr_alloc_u32(&qrtr_ports, ipc, &min_port, *port, GFP_ATOMIC); - if (!rc) - *port = min_port; + rc = xa_insert(&qrtr_ports, *port, ipc, GFP_KERNEL); } - mutex_unlock(&qrtr_port_lock); - if (rc == -ENOSPC) + if (rc == -EBUSY) return -EADDRINUSE; else if (rc < 0) return rc; @@ -734,20 +724,16 @@ static int qrtr_port_assign(struct qrtr_sock *ipc, int *port) static void qrtr_reset_ports(void) { struct qrtr_sock *ipc; - int id; - - mutex_lock(&qrtr_port_lock); - idr_for_each_entry(&qrtr_ports, ipc, id) { - /* Don't reset control port */ - if (id == 0) - continue; + unsigned long index; + rcu_read_lock(); + xa_for_each_start(&qrtr_ports, index, ipc, 1) { sock_hold(&ipc->sk); ipc->sk.sk_err = ENETRESET; ipc->sk.sk_error_report(&ipc->sk); sock_put(&ipc->sk); } - mutex_unlock(&qrtr_port_lock); + rcu_read_unlock(); } /* Bind socket to address. -- 2.34.1 ^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2022-08-19 19:47 UTC | newest] Thread overview: 7+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2022-08-18 14:14 [PATCH 5.10 0/1] qrtr: Convert qrtr_ports from IDR to XArray Stanislav Goriainov 2022-08-18 14:14 ` [PATCH 5.10 1/1] " Stanislav Goriainov 2022-08-19 11:21 ` Greg Kroah-Hartman 2022-08-19 13:53 ` Matthew Wilcox 2022-08-19 14:32 ` Greg Kroah-Hartman 2022-08-19 19:47 ` goriainov -- strict thread matches above, loose matches on Subject: below -- 2022-08-19 19:47 [PATCH 5.10 0/1] " Stanislav Goriainov 2022-08-19 19:47 ` [PATCH 5.10 1/1] " Stanislav Goriainov
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).