* [PATCH 2/2] net: qrtr: Allow non-immediate node routing
2020-09-29 13:33 [PATCH 1/2] net: qrtr: Allow forwarded services Loic Poulain
@ 2020-09-29 13:33 ` Loic Poulain
2020-09-29 14:41 ` Bjorn Andersson
2020-09-29 15:55 ` Jakub Kicinski
2020-09-29 14:34 ` [PATCH 1/2] net: qrtr: Allow forwarded services Bjorn Andersson
2020-10-01 13:26 ` Manivannan Sadhasivam
2 siblings, 2 replies; 6+ messages in thread
From: Loic Poulain @ 2020-09-29 13:33 UTC (permalink / raw)
To: bjorn.andersson, davem; +Cc: netdev, clew, manivannan.sadhasivam, Loic Poulain
In order to reach non-immediate remote node services that are
accessed through an intermediate node, the route to the remote
node needs to be saved.
E.g for a [node1 <=> node2 <=> node3] network
- node2 forwards node3 service to node1
- node1 must save node2 as route for reaching node3
Signed-off-by: Loic Poulain <loic.poulain@linaro.org>
---
net/qrtr/qrtr.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/net/qrtr/qrtr.c b/net/qrtr/qrtr.c
index e09154b..bd9bcea 100644
--- a/net/qrtr/qrtr.c
+++ b/net/qrtr/qrtr.c
@@ -400,12 +400,13 @@ static void qrtr_node_assign(struct qrtr_node *node, unsigned int nid)
{
unsigned long flags;
- if (node->nid != QRTR_EP_NID_AUTO || nid == QRTR_EP_NID_AUTO)
+ if (nid == QRTR_EP_NID_AUTO)
return;
spin_lock_irqsave(&qrtr_nodes_lock, flags);
radix_tree_insert(&qrtr_nodes, nid, node);
- node->nid = nid;
+ if (node->nid == QRTR_EP_NID_AUTO)
+ node->nid = nid;
spin_unlock_irqrestore(&qrtr_nodes_lock, flags);
}
@@ -493,6 +494,12 @@ int qrtr_endpoint_post(struct qrtr_endpoint *ep, const void *data, size_t len)
qrtr_node_assign(node, cb->src_node);
+ if (cb->type == QRTR_TYPE_NEW_SERVER) {
+ /* Remote node endpoint can bridge other distant nodes */
+ const struct qrtr_ctrl_pkt *pkt = data + hdrlen;
+ qrtr_node_assign(node, le32_to_cpu(pkt->server.node));
+ }
+
if (cb->type == QRTR_TYPE_RESUME_TX) {
qrtr_tx_resume(node, skb);
} else {
--
2.7.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 2/2] net: qrtr: Allow non-immediate node routing
2020-09-29 13:33 ` [PATCH 2/2] net: qrtr: Allow non-immediate node routing Loic Poulain
@ 2020-09-29 14:41 ` Bjorn Andersson
2020-09-29 15:55 ` Jakub Kicinski
1 sibling, 0 replies; 6+ messages in thread
From: Bjorn Andersson @ 2020-09-29 14:41 UTC (permalink / raw)
To: Loic Poulain; +Cc: davem, netdev, clew, manivannan.sadhasivam
On Tue 29 Sep 08:33 CDT 2020, Loic Poulain wrote:
> In order to reach non-immediate remote node services that are
> accessed through an intermediate node, the route to the remote
> node needs to be saved.
>
> E.g for a [node1 <=> node2 <=> node3] network
> - node2 forwards node3 service to node1
> - node1 must save node2 as route for reaching node3
>
> Signed-off-by: Loic Poulain <loic.poulain@linaro.org>
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Regards,
Bjorn
> ---
> net/qrtr/qrtr.c | 11 +++++++++--
> 1 file changed, 9 insertions(+), 2 deletions(-)
>
> diff --git a/net/qrtr/qrtr.c b/net/qrtr/qrtr.c
> index e09154b..bd9bcea 100644
> --- a/net/qrtr/qrtr.c
> +++ b/net/qrtr/qrtr.c
> @@ -400,12 +400,13 @@ static void qrtr_node_assign(struct qrtr_node *node, unsigned int nid)
> {
> unsigned long flags;
>
> - if (node->nid != QRTR_EP_NID_AUTO || nid == QRTR_EP_NID_AUTO)
> + if (nid == QRTR_EP_NID_AUTO)
> return;
>
> spin_lock_irqsave(&qrtr_nodes_lock, flags);
> radix_tree_insert(&qrtr_nodes, nid, node);
> - node->nid = nid;
> + if (node->nid == QRTR_EP_NID_AUTO)
> + node->nid = nid;
> spin_unlock_irqrestore(&qrtr_nodes_lock, flags);
> }
>
> @@ -493,6 +494,12 @@ int qrtr_endpoint_post(struct qrtr_endpoint *ep, const void *data, size_t len)
>
> qrtr_node_assign(node, cb->src_node);
>
> + if (cb->type == QRTR_TYPE_NEW_SERVER) {
> + /* Remote node endpoint can bridge other distant nodes */
> + const struct qrtr_ctrl_pkt *pkt = data + hdrlen;
> + qrtr_node_assign(node, le32_to_cpu(pkt->server.node));
> + }
> +
> if (cb->type == QRTR_TYPE_RESUME_TX) {
> qrtr_tx_resume(node, skb);
> } else {
> --
> 2.7.4
>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH 2/2] net: qrtr: Allow non-immediate node routing
2020-09-29 13:33 ` [PATCH 2/2] net: qrtr: Allow non-immediate node routing Loic Poulain
2020-09-29 14:41 ` Bjorn Andersson
@ 2020-09-29 15:55 ` Jakub Kicinski
1 sibling, 0 replies; 6+ messages in thread
From: Jakub Kicinski @ 2020-09-29 15:55 UTC (permalink / raw)
To: Loic Poulain; +Cc: bjorn.andersson, davem, netdev, clew, manivannan.sadhasivam
On Tue, 29 Sep 2020 15:33:17 +0200 Loic Poulain wrote:
> + if (cb->type == QRTR_TYPE_NEW_SERVER) {
> + /* Remote node endpoint can bridge other distant nodes */
> + const struct qrtr_ctrl_pkt *pkt = data + hdrlen;
> + qrtr_node_assign(node, le32_to_cpu(pkt->server.node));
checkpatch says:
WARNING: Missing a blank line after declarations
#47: FILE: net/qrtr/qrtr.c:501:
+ const struct qrtr_ctrl_pkt *pkt = data + hdrlen;
+ qrtr_node_assign(node, le32_to_cpu(pkt->server.node));
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] net: qrtr: Allow forwarded services
2020-09-29 13:33 [PATCH 1/2] net: qrtr: Allow forwarded services Loic Poulain
2020-09-29 13:33 ` [PATCH 2/2] net: qrtr: Allow non-immediate node routing Loic Poulain
@ 2020-09-29 14:34 ` Bjorn Andersson
2020-10-01 13:26 ` Manivannan Sadhasivam
2 siblings, 0 replies; 6+ messages in thread
From: Bjorn Andersson @ 2020-09-29 14:34 UTC (permalink / raw)
To: Loic Poulain; +Cc: davem, netdev, clew, manivannan.sadhasivam
On Tue 29 Sep 08:33 CDT 2020, Loic Poulain wrote:
> A remote endpoint (immediate neighbor node) can forward services
> from other non-immediate nodes, in that case ctrl packet node ID
> (offering distant service) can differ from the qrtr source node
> (forwarding the packet).
>
> Signed-off-by: Loic Poulain <loic.poulain@linaro.org>
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Regards,
Bjorn
> ---
> net/qrtr/ns.c | 8 --------
> 1 file changed, 8 deletions(-)
>
> diff --git a/net/qrtr/ns.c b/net/qrtr/ns.c
> index d8252fd..d542d8f 100644
> --- a/net/qrtr/ns.c
> +++ b/net/qrtr/ns.c
> @@ -469,10 +469,6 @@ static int ctrl_cmd_new_server(struct sockaddr_qrtr *from,
> port = from->sq_port;
> }
>
> - /* Don't accept spoofed messages */
> - if (from->sq_node != node_id)
> - return -EINVAL;
> -
> srv = server_add(service, instance, node_id, port);
> if (!srv)
> return -EINVAL;
> @@ -511,10 +507,6 @@ static int ctrl_cmd_del_server(struct sockaddr_qrtr *from,
> port = from->sq_port;
> }
>
> - /* Don't accept spoofed messages */
> - if (from->sq_node != node_id)
> - return -EINVAL;
> -
> /* Local servers may only unregister themselves */
> if (from->sq_node == qrtr_ns.local_node && from->sq_port != port)
> return -EINVAL;
> --
> 2.7.4
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] net: qrtr: Allow forwarded services
2020-09-29 13:33 [PATCH 1/2] net: qrtr: Allow forwarded services Loic Poulain
2020-09-29 13:33 ` [PATCH 2/2] net: qrtr: Allow non-immediate node routing Loic Poulain
2020-09-29 14:34 ` [PATCH 1/2] net: qrtr: Allow forwarded services Bjorn Andersson
@ 2020-10-01 13:26 ` Manivannan Sadhasivam
2 siblings, 0 replies; 6+ messages in thread
From: Manivannan Sadhasivam @ 2020-10-01 13:26 UTC (permalink / raw)
To: Loic Poulain; +Cc: bjorn.andersson, davem, netdev, clew
On Tue, Sep 29, 2020 at 03:33:16PM +0200, Loic Poulain wrote:
> A remote endpoint (immediate neighbor node) can forward services
> from other non-immediate nodes, in that case ctrl packet node ID
> (offering distant service) can differ from the qrtr source node
> (forwarding the packet).
>
> Signed-off-by: Loic Poulain <loic.poulain@linaro.org>
Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Thanks,
Mani
> ---
> net/qrtr/ns.c | 8 --------
> 1 file changed, 8 deletions(-)
>
> diff --git a/net/qrtr/ns.c b/net/qrtr/ns.c
> index d8252fd..d542d8f 100644
> --- a/net/qrtr/ns.c
> +++ b/net/qrtr/ns.c
> @@ -469,10 +469,6 @@ static int ctrl_cmd_new_server(struct sockaddr_qrtr *from,
> port = from->sq_port;
> }
>
> - /* Don't accept spoofed messages */
> - if (from->sq_node != node_id)
> - return -EINVAL;
> -
> srv = server_add(service, instance, node_id, port);
> if (!srv)
> return -EINVAL;
> @@ -511,10 +507,6 @@ static int ctrl_cmd_del_server(struct sockaddr_qrtr *from,
> port = from->sq_port;
> }
>
> - /* Don't accept spoofed messages */
> - if (from->sq_node != node_id)
> - return -EINVAL;
> -
> /* Local servers may only unregister themselves */
> if (from->sq_node == qrtr_ns.local_node && from->sq_port != port)
> return -EINVAL;
> --
> 2.7.4
>
^ permalink raw reply [flat|nested] 6+ messages in thread