From patchwork Mon Apr 23 21:46:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 134027 Delivered-To: patch@linaro.org Received: by 10.46.151.6 with SMTP id r6csp1491944lji; Mon, 23 Apr 2018 14:47:00 -0700 (PDT) X-Google-Smtp-Source: AIpwx49/m1OIm/BMDxMEaHnjAKr47VNuqyiTP0w+/8f1+dGjgehofmy/p1UYyjTw45syvTRznnMS X-Received: by 2002:a17:902:1aa:: with SMTP id b39-v6mr19169643plb.120.1524520020573; Mon, 23 Apr 2018 14:47:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524520020; cv=none; d=google.com; s=arc-20160816; b=q2KVZBr1TiOkr0yKWIQzrJDy+Vr1Fofw11xPvlWukUPWaTH+5u9awkrBheK1z5ncnz nAf8ykBZWW1YC9NJFMH9owJagFSibmJTYXtfKIlPYg7TlNo44OGbRAEsUmIaSYom/8Xl 1i9b+bGB5UEFGyJOCCafa0lqc6Myou91ufCqkWqaJtT+MpbJarwbhbyzVswd8S40B5Sl TjyxiU5GN62fhqosrxU7JfGqgPr9yzI2u41sXhY+EoRIhsAtoU9hBgq7o4EF0Rt4/zr8 9iavBOUGaJAOl5m1ZjeJpaoe5EL+kZExZHVM599xRJlcZsSc7i4TGyWOmj5x/DC/1PS4 LaDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=PohjNLG1vKS8ucKdrXA7zIz2XQ9udjNO7Zgg3j9Kxrs=; b=h5X+p6JCIakJMWLaPy93G6YuzuQYYIDrnt9ms0Och4oWaoPvjQ/Yh65zmuDmpes/WI 0CKESB0Vk+15rhOWF6dhuaCbr+eluTArS//+6z2RtpY+pPdWBBHyn46rsPG4ZUydETEu o9YtvEKofJUpi4YDjxiMQThBWOacMQ91umydzZtovyC2jOLDeCwLVHB+0L8WS0dwe7pX qXalJUa7R0C3u/VvmSptIFJY6F0OqKjR+13P+Yj0Hccn/1Va9iuBo/QYi/pm+nCWJnvy Jp4cwTDOBRILqa1mKQH0ma+Sd1yX9SKUVLFmcGpnHDBniI7MGaE9Bf85gE5OhePpETG4 44jw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=iEHhg8rc; spf=pass (google.com: best guess record for domain of linux-arm-msm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n86si12105185pfb.126.2018.04.23.14.47.00; Mon, 23 Apr 2018 14:47:00 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-arm-msm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=iEHhg8rc; spf=pass (google.com: best guess record for domain of linux-arm-msm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932291AbeDWVq7 (ORCPT + 12 others); Mon, 23 Apr 2018 17:46:59 -0400 Received: from mail-pf0-f193.google.com ([209.85.192.193]:44401 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932429AbeDWVq5 (ORCPT ); Mon, 23 Apr 2018 17:46:57 -0400 Received: by mail-pf0-f193.google.com with SMTP id p15so10405030pff.11 for ; Mon, 23 Apr 2018 14:46:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=1fREK0rkM1h3n7HiLfyXzwZngnA8fL/awMEStJFAeXg=; b=iEHhg8rcL7tdN+ZuakoDRmG/lPGKbPEtLvTKIdooz5eRsBT+r2resSS3OmBUQlUDsC NPzZHYlosOUY6/Mi35zqcGYWh36FbFMPbPVFaclfeZH1II8wy/p211ShfAWhT3h9xL+9 IG8sBncovblAx+idRslCtc4tpQQe3PpvEuEJE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=1fREK0rkM1h3n7HiLfyXzwZngnA8fL/awMEStJFAeXg=; b=UgZ78PI7rdY6UvVLqG4xs3MsWRgYMiz/PEYs4dJbzyqGMKA1Ywm4BMDfAxYQUv7Umz mI49zgcI+cmLlCGU3cNY3QkS/cSFpewb3eZBrzGMdwvIcCluUFU6G2bAyXouKCp0vEoR 10lpP+7qxPK0epXVxMC4peuqVxq2Sf2+cQ8rmoHHcESvAYn78iqdeFsH8bLGoHVH2LvX qD0UxeDqipdhLQ3ZMl3J8kEQIEWVejOy1Yz4T8okNRC56WQK+H4sTBStxbaZAWjk5qYF awg3PpKtmaqqk+pmIiU41B8Jqlxu7zBeqd04Bi+2eqcVY81Ax7QpK23nhxJmBo9Wxtx1 CAuA== X-Gm-Message-State: ALQs6tCtMtujRRmaBf26Vo7kHQ6opAFMEAPN9YXAUDcMEZLwkQp3R25X FQWY65HxU7k6+pqJvMz4CPwFbw== X-Received: by 10.101.96.205 with SMTP id r13mr6710576pgv.22.1524520017145; Mon, 23 Apr 2018 14:46:57 -0700 (PDT) Received: from localhost.localdomain (104-188-17-28.lightspeed.sndgca.sbcglobal.net. [104.188.17.28]) by smtp.gmail.com with ESMTPSA id b81sm474526pfj.176.2018.04.23.14.46.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Apr 2018 14:46:56 -0700 (PDT) From: Bjorn Andersson To: "David S. Miller" Cc: Chris Lew , linux-kernel@vger.kernel.org, netdev@vger.kernel.org, linux-arm-msm@vger.kernel.org Subject: [PATCH v2] net: qrtr: Expose tunneling endpoint to user space Date: Mon, 23 Apr 2018 14:46:53 -0700 Message-Id: <20180423214653.10016-1-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.16.2 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org This implements a misc character device named "qrtr-tun" for the purpose of allowing user space applications to implement endpoints in the qrtr network. This allows more advanced (and dynamic) testing of the qrtr code as well as opens up the ability of tunneling qrtr over a network or USB link. Signed-off-by: Bjorn Andersson --- Changes since v1: - Dropped queue lock net/qrtr/Kconfig | 7 +++ net/qrtr/Makefile | 2 + net/qrtr/tun.c | 146 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 155 insertions(+) create mode 100644 net/qrtr/tun.c -- 2.16.2 -- To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/net/qrtr/Kconfig b/net/qrtr/Kconfig index 326fd97444f5..1944834d225c 100644 --- a/net/qrtr/Kconfig +++ b/net/qrtr/Kconfig @@ -21,4 +21,11 @@ config QRTR_SMD Say Y here to support SMD based ipcrouter channels. SMD is the most common transport for IPC Router. +config QRTR_TUN + tristate "TUN device for Qualcomm IPC Router" + ---help--- + Say Y here to expose a character device that allows user space to + implement endpoints of QRTR, for purpose of tunneling data to other + hosts or testing purposes. + endif # QRTR diff --git a/net/qrtr/Makefile b/net/qrtr/Makefile index ab09e40f7c74..be012bfd3e52 100644 --- a/net/qrtr/Makefile +++ b/net/qrtr/Makefile @@ -2,3 +2,5 @@ obj-$(CONFIG_QRTR) := qrtr.o obj-$(CONFIG_QRTR_SMD) += qrtr-smd.o qrtr-smd-y := smd.o +obj-$(CONFIG_QRTR_TUN) += qrtr-tun.o +qrtr-tun-y := tun.o diff --git a/net/qrtr/tun.c b/net/qrtr/tun.c new file mode 100644 index 000000000000..48b2147c98f8 --- /dev/null +++ b/net/qrtr/tun.c @@ -0,0 +1,146 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (c) 2018, Linaro Ltd */ + +#include +#include +#include +#include + +#include "qrtr.h" + +struct qrtr_tun { + struct qrtr_endpoint ep; + + struct sk_buff_head queue; + wait_queue_head_t readq; +}; + +static int qrtr_tun_send(struct qrtr_endpoint *ep, struct sk_buff *skb) +{ + struct qrtr_tun *tun = container_of(ep, struct qrtr_tun, ep); + + skb_queue_tail(&tun->queue, skb); + + /* wake up any blocking processes, waiting for new data */ + wake_up_interruptible(&tun->readq); + + return 0; +} + +static int qrtr_tun_open(struct inode *inode, struct file *filp) +{ + struct qrtr_tun *tun; + + tun = kzalloc(sizeof(*tun), GFP_KERNEL); + if (!tun) + return -ENOMEM; + + skb_queue_head_init(&tun->queue); + init_waitqueue_head(&tun->readq); + + tun->ep.xmit = qrtr_tun_send; + + filp->private_data = tun; + + return qrtr_endpoint_register(&tun->ep, QRTR_EP_NID_AUTO); +} + +static ssize_t qrtr_tun_read_iter(struct kiocb *iocb, struct iov_iter *to) +{ + struct file *filp = iocb->ki_filp; + struct qrtr_tun *tun = filp->private_data; + struct sk_buff *skb; + int count; + + while (!(skb = skb_dequeue(&tun->queue))) { + if (filp->f_flags & O_NONBLOCK) + return -EAGAIN; + + /* Wait until we get data or the endpoint goes away */ + if (wait_event_interruptible(tun->readq, + !skb_queue_empty(&tun->queue))) + return -ERESTARTSYS; + } + + count = min_t(size_t, iov_iter_count(to), skb->len); + if (copy_to_iter(skb->data, count, to) != count) + count = -EFAULT; + + kfree_skb(skb); + + return count; +} + +static ssize_t qrtr_tun_write_iter(struct kiocb *iocb, struct iov_iter *from) +{ + struct file *filp = iocb->ki_filp; + struct qrtr_tun *tun = filp->private_data; + size_t len = iov_iter_count(from); + ssize_t ret; + void *kbuf; + + kbuf = kzalloc(len, GFP_KERNEL); + if (!kbuf) + return -ENOMEM; + + if (!copy_from_iter_full(kbuf, len, from)) + return -EFAULT; + + ret = qrtr_endpoint_post(&tun->ep, kbuf, len); + + return ret < 0 ? ret : len; +} + +static int qrtr_tun_release(struct inode *inode, struct file *filp) +{ + struct qrtr_tun *tun = filp->private_data; + struct sk_buff *skb; + + qrtr_endpoint_unregister(&tun->ep); + + /* Discard all SKBs */ + while (!skb_queue_empty(&tun->queue)) { + skb = skb_dequeue(&tun->queue); + kfree_skb(skb); + } + + kfree(tun); + + return 0; +} + +static const struct file_operations qrtr_tun_ops = { + .owner = THIS_MODULE, + .open = qrtr_tun_open, + .read_iter = qrtr_tun_read_iter, + .write_iter = qrtr_tun_write_iter, + .release = qrtr_tun_release, +}; + +static struct miscdevice qrtr_tun_miscdev = { + MISC_DYNAMIC_MINOR, + "qrtr-tun", + &qrtr_tun_ops, +}; + +static int __init qrtr_tun_init(void) +{ + int ret; + + ret = misc_register(&qrtr_tun_miscdev); + if (ret) + pr_err("failed to register Qualcomm IPC Router tun device\n"); + + return ret; +} + +static void __exit qrtr_tun_exit(void) +{ + misc_deregister(&qrtr_tun_miscdev); +} + +module_init(qrtr_tun_init); +module_exit(qrtr_tun_exit); + +MODULE_DESCRIPTION("Qualcomm IPC Router TUN device"); +MODULE_LICENSE("GPL v2");