{"id":810849,"url":"http://patchwork.ozlabs.org/api/patches/810849/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20170907060329.32402-6-bjorn.andersson@linaro.org/","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/projects/7/?format=json","name":"Linux network development","link_name":"netdev","list_id":"netdev.vger.kernel.org","list_email":"netdev@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170907060329.32402-6-bjorn.andersson@linaro.org>","list_archive_url":null,"date":"2017-09-07T06:03:27","name":"[5/7] net: qrtr: Clean up control packet handling","commit_ref":null,"pull_url":null,"state":"deferred","archived":true,"hash":"64c3c528b6ad4695cc68dc0414b39843ad7adf34","submitter":{"id":68398,"url":"http://patchwork.ozlabs.org/api/people/68398/?format=json","name":"Bjorn Andersson","email":"bjorn.andersson@linaro.org"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/20170907060329.32402-6-bjorn.andersson@linaro.org/mbox/","series":[{"id":1911,"url":"http://patchwork.ozlabs.org/api/series/1911/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=1911","date":"2017-09-07T06:03:24","name":"net: qrtr: Fixes and support receiving version 2 packets","version":1,"mbox":"http://patchwork.ozlabs.org/series/1911/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/810849/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/810849/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"patchwork-incoming@ozlabs.org","Delivered-To":"patchwork-incoming@ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netdev-owner@vger.kernel.org;\n\treceiver=)","ozlabs.org; dkim=pass (1024-bit key;\n\tunprotected) header.d=linaro.org header.i=@linaro.org\n\theader.b=\"KL99S8ED\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xnqf41bT4z9sRV\n\tfor ;\n\tThu, 7 Sep 2017 16:04:12 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1754147AbdIGGDr (ORCPT );\n\tThu, 7 Sep 2017 02:03:47 -0400","from mail-pg0-f52.google.com ([74.125.83.52]:38659 \"EHLO\n\tmail-pg0-f52.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1753942AbdIGGDk (ORCPT\n\t); Thu, 7 Sep 2017 02:03:40 -0400","by mail-pg0-f52.google.com with SMTP id v66so19132219pgb.5\n\tfor ; Wed, 06 Sep 2017 23:03:40 -0700 (PDT)","from localhost.localdomain (ip68-111-217-79.sd.sd.cox.net.\n\t[68.111.217.79]) by smtp.gmail.com with ESMTPSA id\n\ts1sm2186650pfk.27.2017.09.06.23.03.38\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tWed, 06 Sep 2017 23:03:38 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references;\n\tbh=PArY59lIP4ZSAJXU+tDGGdjXKm4RhjsqdGDEnt3VAhk=;\n\tb=KL99S8EDl1wGZcF2OyCFdwc2e/S0mkD5wCfsVIAO39HeZbz+Zmw3MKIiGLidJl9gKi\n\tVwuOs44McIZ2t8ZoweBpVDtWzMv4hFtxHa1D3MUExFLXgw/MWvspHx7id5HOfN4S+rrZ\n\ty3I2XTSqk1zKG1rUN6lQDqF87zbN4gZYCRpkA=","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=PArY59lIP4ZSAJXU+tDGGdjXKm4RhjsqdGDEnt3VAhk=;\n\tb=YXdzuHSbOYteNA3yjyFIfHo+3WlmG2teLHay7BpP+MbuWUewfmHQ4QYUSfjaBt3Csf\n\tH9yFLeMbMzF/NOv4zFwObL81rLBC2fPZG8RUTHDNwjcD7/GDSADHZd/Taufh7o71O3YU\n\tFW/d8EOcpMJknJTYTu6VU+jSdGqihOuCWZT1fjMCipnAsPDb3uyHoSEjMWfTbabNcDWu\n\t9C49ewBSwmic6cR6gRDMQAXvDdNK0Ct9Yy3lL4K2pFW1ym/Iq+DBsYt03qRzPOKIq3nM\n\tbIOKHRpFJgBFayA4UYA+YUxOv2DBPA9MqPQR4MHHa6wfah6CrdwfCRjA6AQciTLeuMyc\n\tkucQ==","X-Gm-Message-State":"AHPjjUin2XC7PY14g7IhogHGPOec7eqFbkBtdZ+oMFYQmODKfhpMojOI\n\tDl7qKV9twi/7qOj9","X-Google-Smtp-Source":"ADKCNb4i8uxLGBJJrW12oYYHdKO5pUZNkOFquw/cyaFOLRuWBPAxHBVWXR20Yvw3/gRF2mWxGkggPQ==","X-Received":"by 10.98.208.69 with SMTP id p66mr1665105pfg.6.1504764219466;\n\tWed, 06 Sep 2017 23:03:39 -0700 (PDT)","From":"Bjorn Andersson ","To":"\"David S. Miller\" ","Cc":"netdev@vger.kernel.org, linux-kernel@vger.kernel.org,\n\tlinux-arm-msm@vger.kernel.org, Chris Lew ","Subject":"[PATCH 5/7] net: qrtr: Clean up control packet handling","Date":"Wed, 6 Sep 2017 23:03:27 -0700","Message-Id":"<20170907060329.32402-6-bjorn.andersson@linaro.org>","X-Mailer":"git-send-email 2.12.0","In-Reply-To":"<20170907060329.32402-1-bjorn.andersson@linaro.org>","References":"<20170907060329.32402-1-bjorn.andersson@linaro.org>","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"As the message header generation is deferred the internal functions for\ngenerating control packets can be simplified.\n\nThis patch modifies qrtr_alloc_ctrl_packet() to, in addition to the\nsk_buff, return a reference to a struct qrtr_ctrl_pkt, which clarifies\nand simplifies the helpers to the point that these functions can be\nfolded back into the callers.\n\nSigned-off-by: Bjorn Andersson \n---\n net/qrtr/qrtr.c | 93 ++++++++++++++++++---------------------------------------\n 1 file changed, 29 insertions(+), 64 deletions(-)","diff":"diff --git a/net/qrtr/qrtr.c b/net/qrtr/qrtr.c\nindex bcec2432b833..f28ecd7d735b 100644\n--- a/net/qrtr/qrtr.c\n+++ b/net/qrtr/qrtr.c\n@@ -255,9 +255,18 @@ int qrtr_endpoint_post(struct qrtr_endpoint *ep, const void *data, size_t len)\n }\n EXPORT_SYMBOL_GPL(qrtr_endpoint_post);\n \n-static struct sk_buff *qrtr_alloc_ctrl_packet(u32 type, size_t pkt_len,\n-\t\t\t\t\t u32 src_node, u32 dst_node)\n+/**\n+ * qrtr_alloc_ctrl_packet() - allocate control packet skb\n+ * @pkt: reference to qrtr_ctrl_pkt pointer\n+ *\n+ * Returns newly allocated sk_buff, or NULL on failure\n+ *\n+ * This function allocates a sk_buff large enough to carry a qrtr_ctrl_pkt and\n+ * on success returns a reference to the control packet in @pkt.\n+ */\n+static struct sk_buff *qrtr_alloc_ctrl_packet(struct qrtr_ctrl_pkt **pkt)\n {\n+\tconst int pkt_len = sizeof(struct qrtr_ctrl_pkt);\n \tstruct sk_buff *skb;\n \n \tskb = alloc_skb(QRTR_HDR_SIZE + pkt_len, GFP_KERNEL);\n@@ -265,64 +274,7 @@ static struct sk_buff *qrtr_alloc_ctrl_packet(u32 type, size_t pkt_len,\n \t\treturn NULL;\n \n \tskb_reserve(skb, QRTR_HDR_SIZE);\n-\n-\treturn skb;\n-}\n-\n-/* Allocate and construct a resume-tx packet. */\n-static struct sk_buff *qrtr_alloc_resume_tx(u32 src_node,\n-\t\t\t\t\t u32 dst_node, u32 port)\n-{\n-\tconst int pkt_len = 20;\n-\tstruct sk_buff *skb;\n-\t__le32 *buf;\n-\n-\tskb = qrtr_alloc_ctrl_packet(QRTR_TYPE_RESUME_TX, pkt_len,\n-\t\t\t\t src_node, dst_node);\n-\tif (!skb)\n-\t\treturn NULL;\n-\n-\tbuf = skb_put_zero(skb, pkt_len);\n-\tbuf[0] = cpu_to_le32(QRTR_TYPE_RESUME_TX);\n-\tbuf[1] = cpu_to_le32(src_node);\n-\tbuf[2] = cpu_to_le32(port);\n-\n-\treturn skb;\n-}\n-\n-/* Allocate and construct a BYE message to signal remote termination */\n-static struct sk_buff *qrtr_alloc_local_bye(u32 src_node)\n-{\n-\tconst int pkt_len = 20;\n-\tstruct sk_buff *skb;\n-\t__le32 *buf;\n-\n-\tskb = qrtr_alloc_ctrl_packet(QRTR_TYPE_BYE, pkt_len,\n-\t\t\t\t src_node, qrtr_local_nid);\n-\tif (!skb)\n-\t\treturn NULL;\n-\n-\tbuf = skb_put_zero(skb, pkt_len);\n-\tbuf[0] = cpu_to_le32(QRTR_TYPE_BYE);\n-\n-\treturn skb;\n-}\n-\n-static struct sk_buff *qrtr_alloc_del_client(struct sockaddr_qrtr *sq)\n-{\n-\tconst int pkt_len = 20;\n-\tstruct sk_buff *skb;\n-\t__le32 *buf;\n-\n-\tskb = qrtr_alloc_ctrl_packet(QRTR_TYPE_DEL_CLIENT, pkt_len,\n-\t\t\t\t sq->sq_node, QRTR_NODE_BCAST);\n-\tif (!skb)\n-\t\treturn NULL;\n-\n-\tbuf = skb_put_zero(skb, pkt_len);\n-\tbuf[0] = cpu_to_le32(QRTR_TYPE_DEL_CLIENT);\n-\tbuf[1] = cpu_to_le32(sq->sq_node);\n-\tbuf[2] = cpu_to_le32(sq->sq_port);\n+\t*pkt = skb_put_zero(skb, pkt_len);\n \n \treturn skb;\n }\n@@ -337,6 +289,7 @@ static void qrtr_port_put(struct qrtr_sock *ipc);\n static void qrtr_node_rx_work(struct work_struct *work)\n {\n \tstruct qrtr_node *node = container_of(work, struct qrtr_node, work);\n+\tstruct qrtr_ctrl_pkt *pkt;\n \tstruct sockaddr_qrtr dst;\n \tstruct sockaddr_qrtr src;\n \tstruct sk_buff *skb;\n@@ -372,10 +325,14 @@ static void qrtr_node_rx_work(struct work_struct *work)\n \t\t}\n \n \t\tif (confirm) {\n-\t\t\tskb = qrtr_alloc_resume_tx(dst_node, node->nid, dst_port);\n+\t\t\tskb = qrtr_alloc_ctrl_packet(&pkt);\n \t\t\tif (!skb)\n \t\t\t\tbreak;\n \n+\t\t\tpkt->cmd = cpu_to_le32(QRTR_TYPE_RESUME_TX);\n+\t\t\tpkt->client.node = cpu_to_le32(dst.sq_node);\n+\t\t\tpkt->client.port = cpu_to_le32(dst.sq_port);\n+\n \t\t\tif (qrtr_node_enqueue(node, skb, QRTR_TYPE_RESUME_TX,\n \t\t\t\t\t &dst, &src))\n \t\t\t\tbreak;\n@@ -429,6 +386,7 @@ void qrtr_endpoint_unregister(struct qrtr_endpoint *ep)\n \tstruct qrtr_node *node = ep->node;\n \tstruct sockaddr_qrtr src = {AF_QIPCRTR, node->nid, QRTR_PORT_CTRL};\n \tstruct sockaddr_qrtr dst = {AF_QIPCRTR, qrtr_local_nid, QRTR_PORT_CTRL};\n+\tstruct qrtr_ctrl_pkt *pkt;\n \tstruct sk_buff *skb;\n \n \tmutex_lock(&node->ep_lock);\n@@ -436,9 +394,11 @@ void qrtr_endpoint_unregister(struct qrtr_endpoint *ep)\n \tmutex_unlock(&node->ep_lock);\n \n \t/* Notify the local controller about the event */\n-\tskb = qrtr_alloc_local_bye(node->nid);\n-\tif (skb)\n+\tskb = qrtr_alloc_ctrl_packet(&pkt);\n+\tif (skb) {\n+\t\tpkt->cmd = cpu_to_le32(QRTR_TYPE_BYE);\n \t\tqrtr_local_enqueue(NULL, skb, QRTR_TYPE_BYE, &src, &dst);\n+\t}\n \n \tqrtr_node_release(node);\n \tep->node = NULL;\n@@ -474,6 +434,7 @@ static void qrtr_port_put(struct qrtr_sock *ipc)\n /* Remove port assignment. */\n static void qrtr_port_remove(struct qrtr_sock *ipc)\n {\n+\tstruct qrtr_ctrl_pkt *pkt;\n \tstruct sk_buff *skb;\n \tint port = ipc->us.sq_port;\n \tstruct sockaddr_qrtr to;\n@@ -482,8 +443,12 @@ static void qrtr_port_remove(struct qrtr_sock *ipc)\n \tto.sq_node = QRTR_NODE_BCAST;\n \tto.sq_port = QRTR_PORT_CTRL;\n \n-\tskb = qrtr_alloc_del_client(&ipc->us);\n+\tskb = qrtr_alloc_ctrl_packet(&pkt);\n \tif (skb) {\n+\t\tpkt->cmd = cpu_to_le32(QRTR_TYPE_DEL_CLIENT);\n+\t\tpkt->client.node = cpu_to_le32(ipc->us.sq_node);\n+\t\tpkt->client.port = cpu_to_le32(ipc->us.sq_port);\n+\n \t\tskb_set_owner_w(skb, &ipc->sk);\n \t\tqrtr_bcast_enqueue(NULL, skb, QRTR_TYPE_DEL_CLIENT, &ipc->us,\n \t\t\t\t &to);\n","prefixes":["5/7"]}