Hi Michael,
kernel test robot noticed the following build warnings:
[auto build test WARNING on 052d534373b7ed33712a63d5e17b2b6cdbce84fd]
url: https://github.com/intel-lab-lkp/linux/commits/Michael-Grzeschik/usb-gadget-function-9pfs/20240116-095914
base: 052d534373b7ed33712a63d5e17b2b6cdbce84fd
patch link: https://lore.kernel.org/r/20240116-ml-topic-u9p-v1-1-ad8c306f9a4e%40pengutronix.de
patch subject: [PATCH 1/3] usb: gadget: function: 9pfs
config: arm64-allyesconfig (https://download.01.org/0day-ci/archive/20240116/202401161937.9wbYLZdb-lkp@intel.com/config)
compiler: clang version 18.0.0git (https://github.com/llvm/llvm-project 9bde5becb44ea071f5e1fa1f5d4071dc8788b18c)
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240116/202401161937.9wbYLZdb-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202401161937.9wbYLZdb-lkp@intel.com/
All warnings (new ones prefixed by >>):
>> drivers/usb/gadget/function/f_9pfs.c:197:4: warning: format specifies type 'unsigned int' but the argument has type 'size_t' (aka 'unsigned long') [-Wformat]
196 | p9_debug(P9_DEBUG_TRANS, "mux %p got %u bytes\n", usb9pfs,
| ~~
| %zu
197 | rc.capacity - rc.offset);
| ^~~~~~~~~~~~~~~~~~~~~~~
include/net/9p/9p.h:55:36: note: expanded from macro 'p9_debug'
55 | _p9_debug(level, __func__, fmt, ##__VA_ARGS__)
| ~~~ ^~~~~~~~~~~
>> drivers/usb/gadget/function/f_9pfs.c:286:6: warning: no previous prototype for function 'disable_endpoints' [-Wmissing-prototypes]
286 | void disable_endpoints(struct usb_composite_dev *cdev,
| ^
drivers/usb/gadget/function/f_9pfs.c:286:1: note: declare 'static' if the function is not intended to be used outside of this translation unit
286 | void disable_endpoints(struct usb_composite_dev *cdev,
| ^
| static
>> drivers/usb/gadget/function/f_9pfs.c:825:12: warning: no previous prototype for function 'usb9pfs_modinit' [-Wmissing-prototypes]
825 | int __init usb9pfs_modinit(void)
| ^
drivers/usb/gadget/function/f_9pfs.c:825:1: note: declare 'static' if the function is not intended to be used outside of this translation unit
825 | int __init usb9pfs_modinit(void)
| ^
| static
>> drivers/usb/gadget/function/f_9pfs.c:838:13: warning: no previous prototype for function 'usb9pfs_modexit' [-Wmissing-prototypes]
838 | void __exit usb9pfs_modexit(void)
| ^
drivers/usb/gadget/function/f_9pfs.c:838:1: note: declare 'static' if the function is not intended to be used outside of this translation unit
838 | void __exit usb9pfs_modexit(void)
| ^
| static
4 warnings generated.
vim +197 drivers/usb/gadget/function/f_9pfs.c
184
185 static struct p9_req_t *usb9pfs_rx_header(struct f_usb9pfs *usb9pfs, struct usb_request *req)
186 {
187 struct p9_req_t *p9_rx_req;
188 struct p9_fcall rc;
189 int ret;
190
191 /* start by reading header */
192 rc.sdata = req->buf;
193 rc.offset = 0;
194 rc.capacity = rc.size = P9_HDRSZ;
195
196 p9_debug(P9_DEBUG_TRANS, "mux %p got %u bytes\n", usb9pfs,
> 197 rc.capacity - rc.offset);
198
199 ret = p9_parse_header(&rc, &rc.size, NULL, NULL, 0);
200 if (ret) {
201 p9_debug(P9_DEBUG_ERROR,
202 "error parsing header: %d\n", ret);
203 return NULL;
204 }
205
206 p9_debug(P9_DEBUG_TRANS,
207 "mux %p pkt: size: %d bytes tag: %d\n",
208 usb9pfs, rc.size, rc.tag);
209
210 p9_rx_req = p9_tag_lookup(usb9pfs->client, rc.tag);
211 if (!p9_rx_req || (p9_rx_req->status != REQ_STATUS_SENT)) {
212 p9_debug(P9_DEBUG_ERROR, "Unexpected packet tag %d\n", rc.tag);
213 return NULL;
214 }
215
216 if (rc.size > p9_rx_req->rc.capacity) {
217 p9_debug(P9_DEBUG_ERROR,
218 "requested packet size too big: %d for tag %d with capacity %zd\n",
219 rc.size, rc.tag, p9_rx_req->rc.capacity);
220 return NULL;
221 }
222
223 if (!p9_rx_req->rc.sdata) {
224 p9_debug(P9_DEBUG_ERROR,
225 "No recv fcall for tag %d (req %p), disconnecting!\n",
226 rc.tag, p9_rx_req);
227 p9_req_put(usb9pfs->client, p9_rx_req);
228 return NULL;
229 }
230
231 return p9_rx_req;
232 }
233
234 static void usb9pfs_rx_complete(struct usb_ep *ep, struct usb_request *req)
235 {
236 struct f_usb9pfs *usb9pfs = ep->driver_data;
237 struct usb_composite_dev *cdev = usb9pfs->function.config->cdev;
238 struct p9_req_t *p9_rx_req;
239 unsigned long flags;
240
241 switch (req->status) {
242 case 0: /* normal completion? */
243 spin_lock_irqsave(&usb9pfs->req_lock, flags);
244 p9_rx_req = usb9pfs_rx_header(usb9pfs, req);
245 if (!p9_rx_req) {
246 spin_unlock_irqrestore(&usb9pfs->req_lock, flags);
247 goto free_req;
248 }
249
250 memcpy(p9_rx_req->rc.sdata, req->buf, req->actual);
251 p9_rx_req->rc.size = req->actual;
252
253 p9_client_cb(usb9pfs->client, p9_rx_req, REQ_STATUS_RCVD);
254 p9_req_put(usb9pfs->client, p9_rx_req);
255
256 usb9pfs->p9_tx_req = NULL;
257
258 usb9pfs_transmit(usb9pfs);
259
260 spin_unlock_irqrestore(&usb9pfs->req_lock, flags);
261
262 return;
263 free_req:
264 default:
265 dev_err(&cdev->gadget->dev, "%s usb9pfs complete --> %d, %d/%d\n",
266 ep->name, req->status, req->actual, req->length);
267 usb_ep_free_request(ep == usb9pfs->in_ep ?
268 usb9pfs->out_ep : usb9pfs->in_ep,
269 req->context);
270 free_ep_req(ep, req);
271 return;
272 }
273
274 p9_client_cb(usb9pfs->client, p9_rx_req, REQ_STATUS_ERROR);
275 }
276
277 static void disable_ep(struct usb_composite_dev *cdev, struct usb_ep *ep)
278 {
279 int value;
280
281 value = usb_ep_disable(ep);
282 if (value < 0)
283 dev_info(&cdev->gadget->dev, "disable %s --> %d\n", ep->name, value);
284 }
285
> 286 void disable_endpoints(struct usb_composite_dev *cdev,
287 struct usb_ep *in, struct usb_ep *out,
288 struct usb_ep *iso_in, struct usb_ep *iso_out)
289 {
290 disable_ep(cdev, in);
291 disable_ep(cdev, out);
292 }
293
Hi Michael,
kernel test robot noticed the following build warnings:
[auto build test WARNING on 052d534373b7ed33712a63d5e17b2b6cdbce84fd]
url: https://github.com/intel-lab-lkp/linux/commits/Michael-Grzeschik/usb-gadget-function-9pfs/20240116-095914
base: 052d534373b7ed33712a63d5e17b2b6cdbce84fd
patch link: https://lore.kernel.org/r/20240116-ml-topic-u9p-v1-1-ad8c306f9a4e%40pengutronix.de
patch subject: [PATCH 1/3] usb: gadget: function: 9pfs
config: loongarch-allyesconfig (https://download.01.org/0day-ci/archive/20240116/202401161948.no61pNtO-lkp@intel.com/config)
compiler: loongarch64-linux-gcc (GCC) 13.2.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240116/202401161948.no61pNtO-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202401161948.no61pNtO-lkp@intel.com/
All warnings (new ones prefixed by >>):
In file included from drivers/usb/gadget/function/f_9pfs.c:21:
drivers/usb/gadget/function/f_9pfs.c: In function 'usb9pfs_rx_header':
>> drivers/usb/gadget/function/f_9pfs.c:196:34: warning: format '%u' expects argument of type 'unsigned int', but argument 5 has type 'size_t' {aka 'long unsigned int'} [-Wformat=]
196 | p9_debug(P9_DEBUG_TRANS, "mux %p got %u bytes\n", usb9pfs,
| ^~~~~~~~~~~~~~~~~~~~~~~
197 | rc.capacity - rc.offset);
| ~~~~~~~~~~~~~~~~~~~~~~~
| |
| size_t {aka long unsigned int}
include/net/9p/9p.h:55:36: note: in definition of macro 'p9_debug'
55 | _p9_debug(level, __func__, fmt, ##__VA_ARGS__)
| ^~~
drivers/usb/gadget/function/f_9pfs.c:196:47: note: format string is defined here
196 | p9_debug(P9_DEBUG_TRANS, "mux %p got %u bytes\n", usb9pfs,
| ~^
| |
| unsigned int
| %lu
drivers/usb/gadget/function/f_9pfs.c: At top level:
>> drivers/usb/gadget/function/f_9pfs.c:286:6: warning: no previous prototype for 'disable_endpoints' [-Wmissing-prototypes]
286 | void disable_endpoints(struct usb_composite_dev *cdev,
| ^~~~~~~~~~~~~~~~~
>> drivers/usb/gadget/function/f_9pfs.c:825:12: warning: no previous prototype for 'usb9pfs_modinit' [-Wmissing-prototypes]
825 | int __init usb9pfs_modinit(void)
| ^~~~~~~~~~~~~~~
>> drivers/usb/gadget/function/f_9pfs.c:838:13: warning: no previous prototype for 'usb9pfs_modexit' [-Wmissing-prototypes]
838 | void __exit usb9pfs_modexit(void)
| ^~~~~~~~~~~~~~~
vim +196 drivers/usb/gadget/function/f_9pfs.c
184
185 static struct p9_req_t *usb9pfs_rx_header(struct f_usb9pfs *usb9pfs, struct usb_request *req)
186 {
187 struct p9_req_t *p9_rx_req;
188 struct p9_fcall rc;
189 int ret;
190
191 /* start by reading header */
192 rc.sdata = req->buf;
193 rc.offset = 0;
194 rc.capacity = rc.size = P9_HDRSZ;
195
> 196 p9_debug(P9_DEBUG_TRANS, "mux %p got %u bytes\n", usb9pfs,
197 rc.capacity - rc.offset);
198
199 ret = p9_parse_header(&rc, &rc.size, NULL, NULL, 0);
200 if (ret) {
201 p9_debug(P9_DEBUG_ERROR,
202 "error parsing header: %d\n", ret);
203 return NULL;
204 }
205
206 p9_debug(P9_DEBUG_TRANS,
207 "mux %p pkt: size: %d bytes tag: %d\n",
208 usb9pfs, rc.size, rc.tag);
209
210 p9_rx_req = p9_tag_lookup(usb9pfs->client, rc.tag);
211 if (!p9_rx_req || (p9_rx_req->status != REQ_STATUS_SENT)) {
212 p9_debug(P9_DEBUG_ERROR, "Unexpected packet tag %d\n", rc.tag);
213 return NULL;
214 }
215
216 if (rc.size > p9_rx_req->rc.capacity) {
217 p9_debug(P9_DEBUG_ERROR,
218 "requested packet size too big: %d for tag %d with capacity %zd\n",
219 rc.size, rc.tag, p9_rx_req->rc.capacity);
220 return NULL;
221 }
222
223 if (!p9_rx_req->rc.sdata) {
224 p9_debug(P9_DEBUG_ERROR,
225 "No recv fcall for tag %d (req %p), disconnecting!\n",
226 rc.tag, p9_rx_req);
227 p9_req_put(usb9pfs->client, p9_rx_req);
228 return NULL;
229 }
230
231 return p9_rx_req;
232 }
233
234 static void usb9pfs_rx_complete(struct usb_ep *ep, struct usb_request *req)
235 {
236 struct f_usb9pfs *usb9pfs = ep->driver_data;
237 struct usb_composite_dev *cdev = usb9pfs->function.config->cdev;
238 struct p9_req_t *p9_rx_req;
239 unsigned long flags;
240
241 switch (req->status) {
242 case 0: /* normal completion? */
243 spin_lock_irqsave(&usb9pfs->req_lock, flags);
244 p9_rx_req = usb9pfs_rx_header(usb9pfs, req);
245 if (!p9_rx_req) {
246 spin_unlock_irqrestore(&usb9pfs->req_lock, flags);
247 goto free_req;
248 }
249
250 memcpy(p9_rx_req->rc.sdata, req->buf, req->actual);
251 p9_rx_req->rc.size = req->actual;
252
253 p9_client_cb(usb9pfs->client, p9_rx_req, REQ_STATUS_RCVD);
254 p9_req_put(usb9pfs->client, p9_rx_req);
255
256 usb9pfs->p9_tx_req = NULL;
257
258 usb9pfs_transmit(usb9pfs);
259
260 spin_unlock_irqrestore(&usb9pfs->req_lock, flags);
261
262 return;
263 free_req:
264 default:
265 dev_err(&cdev->gadget->dev, "%s usb9pfs complete --> %d, %d/%d\n",
266 ep->name, req->status, req->actual, req->length);
267 usb_ep_free_request(ep == usb9pfs->in_ep ?
268 usb9pfs->out_ep : usb9pfs->in_ep,
269 req->context);
270 free_ep_req(ep, req);
271 return;
272 }
273
274 p9_client_cb(usb9pfs->client, p9_rx_req, REQ_STATUS_ERROR);
275 }
276
277 static void disable_ep(struct usb_composite_dev *cdev, struct usb_ep *ep)
278 {
279 int value;
280
281 value = usb_ep_disable(ep);
282 if (value < 0)
283 dev_info(&cdev->gadget->dev, "disable %s --> %d\n", ep->name, value);
284 }
285
> 286 void disable_endpoints(struct usb_composite_dev *cdev,
287 struct usb_ep *in, struct usb_ep *out,
288 struct usb_ep *iso_in, struct usb_ep *iso_out)
289 {
290 disable_ep(cdev, in);
291 disable_ep(cdev, out);
292 }
293
@@ -53,6 +53,17 @@ mount points. Each 9P export is seen by the client as a virtio device with an
associated "mount_tag" property. Available mount tags can be
seen by reading /sys/bus/virtio/drivers/9pnet_virtio/virtio<n>/mount_tag files.
+For usb gadget file server::
+
+ mount -t 9p -o trans=usbg,aname=/path/to/fs <mount_tag> /mnt/9
+
+For usb gadget root file system::
+
+ root=<mount_tag> rootfstype=9p rootflags=trans=usbg,cache=loose,uname=root,access=0,dfltuid=0,dfltgid=0,aname=/path/to/rootfs
+
+where mount_tag is the tag associated by the usb gadget transport. The
+pattern is usb9pfs0, usb9pfs1, ...
+
Options
=======
@@ -68,6 +79,7 @@ Options
virtio connect to the next virtio channel available
(from QEMU with trans_virtio module)
rdma connect to a specified RDMA channel
+ usbg connect to a specified usb gadget channel
======== ============================================
uname=name user name to attempt mount as on the remote server. The
@@ -153,6 +153,10 @@ config USB_F_ACM
config USB_F_SS_LB
tristate
+config USB_F_9PFS
+ tristate
+ select NET_9P
+
config USB_U_SERIAL
tristate
@@ -363,6 +367,13 @@ config USB_CONFIGFS_F_LB_SS
test software, like the "usbtest" driver, to put your hardware
and its driver through a basic set of functional tests.
+config USB_CONFIGFS_F_9PFS
+ bool "9pfs over usb gadget"
+ depends on USB_CONFIGFS
+ select USB_F_9PFS
+ help
+ 9pfs support for usb gadget
+
config USB_CONFIGFS_F_FS
bool "Function filesystem (FunctionFS)"
depends on USB_CONFIGFS
@@ -11,6 +11,8 @@ usb_f_acm-y := f_acm.o
obj-$(CONFIG_USB_F_ACM) += usb_f_acm.o
usb_f_ss_lb-y := f_loopback.o f_sourcesink.o
obj-$(CONFIG_USB_F_SS_LB) += usb_f_ss_lb.o
+usb_f_9pfs-y := f_9pfs.o
+obj-$(CONFIG_USB_F_9PFS) += usb_f_9pfs.o
obj-$(CONFIG_USB_U_SERIAL) += u_serial.o
usb_f_serial-y := f_serial.o
obj-$(CONFIG_USB_F_SERIAL) += usb_f_serial.o
new file mode 100644
@@ -0,0 +1,849 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * f_9pfs.c - USB peripheral usb9pfs configuration driver and
+ * transposrt layer.
+ *
+ * Copyright (C) 2023 Michael Grzeschik <mgr@pengutronix.de>
+ */
+
+/*
+ * Gadget usb9pfs only needs two bulk endpoints, and will use the usb9pfs usb
+ * transport to mount host filesystem via usb gadget.
+ */
+
+#include <linux/slab.h>
+#include <linux/kernel.h>
+#include <linux/device.h>
+#include <linux/module.h>
+#include <linux/err.h>
+#include <linux/usb/composite.h>
+
+#include <net/9p/9p.h>
+#include <net/9p/client.h>
+#include <net/9p/transport.h>
+
+#include "u_f.h"
+
+#define DEFAULT_BUFLEN 16384
+
+struct f_usb9pfs {
+ struct p9_client *client;
+
+ struct p9_req_t *p9_tx_req;
+
+ struct list_head tx_req_list;
+
+ spinlock_t lock;
+ spinlock_t req_lock;
+
+ struct usb_request *in_req;
+ struct usb_request *out_req;
+
+ struct usb_ep *in_ep;
+ struct usb_ep *out_ep;
+
+ unsigned int buflen;
+
+ bool inuse;
+ char *tag;
+
+ int index;
+
+ struct usb_function function;
+
+ struct list_head function_list;
+};
+
+static inline struct f_usb9pfs *func_to_usb9pfs(struct usb_function *f)
+{
+ return container_of(f, struct f_usb9pfs, function);
+}
+
+struct f_usb9pfs_opts {
+ struct usb_function_instance func_inst;
+ unsigned int buflen;
+
+ /*
+ * Read/write access to configfs attributes is handled by configfs.
+ *
+ * This is to protect the data from concurrent access by read/write
+ * and create symlink/remove symlink.
+ */
+ struct mutex lock;
+ int refcnt;
+};
+
+static DEFINE_IDA(usb9pfs_ida);
+static DEFINE_MUTEX(usb9pfs_ida_lock); /* protects access do usb9pfs_ida */
+
+static DEFINE_MUTEX(usb9pfs_lock);
+static struct list_head usbg_function_list;
+
+static int usb9pfs_tx_fill(struct f_usb9pfs *usb9pfs, struct usb_request *req,
+ gfp_t gfp_flags)
+{
+ struct usb_composite_dev *cdev = usb9pfs->function.config->cdev;
+ int retval = -ENOMEM;
+
+ if (!(usb9pfs->p9_tx_req->tc.size % usb9pfs->in_ep->maxpacket))
+ req->zero = 1;
+
+ req->buf = usb9pfs->p9_tx_req->tc.sdata;
+ req->length = usb9pfs->p9_tx_req->tc.size;
+
+ dev_dbg(&cdev->gadget->dev, "%s usb9pfs send --> %d/%d, zero: %d\n",
+ usb9pfs->in_ep->name, req->actual, req->length, req->zero);
+
+ retval = usb_ep_queue(usb9pfs->in_ep, req, gfp_flags);
+
+ dev_dbg(&cdev->gadget->dev, "tx submit --> %d\n", retval);
+
+ return retval;
+}
+
+static int usb9pfs_rx_fill(struct f_usb9pfs *usb9pfs, struct usb_request *req,
+ gfp_t gfp_flags)
+{
+ struct usb_composite_dev *cdev = usb9pfs->function.config->cdev;
+ int retval = -ENOMEM;
+
+ retval = usb_ep_queue(usb9pfs->out_ep, req, gfp_flags);
+
+ dev_dbg(&cdev->gadget->dev, "rx submit --> %d\n", retval);
+
+ return retval;
+}
+
+static int usb9pfs_transmit(struct f_usb9pfs *usb9pfs)
+{
+ struct p9_req_t *p9_req = NULL;
+ unsigned long flags;
+ int ret = 0;
+
+ spin_lock_irqsave(&usb9pfs->lock, flags);
+
+ if (usb9pfs->p9_tx_req) {
+ spin_unlock_irqrestore(&usb9pfs->lock, flags);
+ return -EBUSY;
+ }
+
+ p9_req = list_first_entry_or_null(&usb9pfs->tx_req_list, struct p9_req_t, req_list);
+ if (!p9_req) {
+ spin_unlock_irqrestore(&usb9pfs->lock, flags);
+ return -ENOENT;
+ }
+
+ list_del(&p9_req->req_list);
+
+ usb9pfs->p9_tx_req = p9_req;
+
+ p9_req_get(usb9pfs->p9_tx_req);
+
+ usb9pfs_tx_fill(usb9pfs, usb9pfs->in_req, GFP_ATOMIC);
+
+ spin_unlock_irqrestore(&usb9pfs->lock, flags);
+
+ return ret;
+}
+
+static void usb9pfs_tx_complete(struct usb_ep *ep, struct usb_request *req)
+{
+ struct f_usb9pfs *usb9pfs = ep->driver_data;
+ struct usb_composite_dev *cdev = usb9pfs->function.config->cdev;
+
+ /* reset zero packages */
+ req->zero = 0;
+
+ dev_dbg(&cdev->gadget->dev, "%s usb9pfs complete --> %d, %d/%d\n",
+ ep->name, req->status, req->actual, req->length);
+
+ switch (req->status) {
+ case 0: /* normal completion? */
+ spin_lock(&usb9pfs->req_lock);
+
+ WRITE_ONCE(usb9pfs->p9_tx_req->status, REQ_STATUS_SENT);
+
+ p9_req_put(usb9pfs->client, usb9pfs->p9_tx_req);
+
+ usb9pfs_rx_fill(usb9pfs, usb9pfs->out_req, GFP_ATOMIC);
+
+ spin_unlock(&usb9pfs->req_lock);
+
+ break;
+
+ default:
+ dev_err(&cdev->gadget->dev, "%s usb9pfs complete --> %d, %d/%d\n",
+ ep->name, req->status, req->actual, req->length);
+ usb_ep_free_request(ep == usb9pfs->in_ep ?
+ usb9pfs->out_ep : usb9pfs->in_ep,
+ req->context);
+ free_ep_req(ep, req);
+ return;
+ }
+}
+
+static struct p9_req_t *usb9pfs_rx_header(struct f_usb9pfs *usb9pfs, struct usb_request *req)
+{
+ struct p9_req_t *p9_rx_req;
+ struct p9_fcall rc;
+ int ret;
+
+ /* start by reading header */
+ rc.sdata = req->buf;
+ rc.offset = 0;
+ rc.capacity = rc.size = P9_HDRSZ;
+
+ p9_debug(P9_DEBUG_TRANS, "mux %p got %u bytes\n", usb9pfs,
+ rc.capacity - rc.offset);
+
+ ret = p9_parse_header(&rc, &rc.size, NULL, NULL, 0);
+ if (ret) {
+ p9_debug(P9_DEBUG_ERROR,
+ "error parsing header: %d\n", ret);
+ return NULL;
+ }
+
+ p9_debug(P9_DEBUG_TRANS,
+ "mux %p pkt: size: %d bytes tag: %d\n",
+ usb9pfs, rc.size, rc.tag);
+
+ p9_rx_req = p9_tag_lookup(usb9pfs->client, rc.tag);
+ if (!p9_rx_req || (p9_rx_req->status != REQ_STATUS_SENT)) {
+ p9_debug(P9_DEBUG_ERROR, "Unexpected packet tag %d\n", rc.tag);
+ return NULL;
+ }
+
+ if (rc.size > p9_rx_req->rc.capacity) {
+ p9_debug(P9_DEBUG_ERROR,
+ "requested packet size too big: %d for tag %d with capacity %zd\n",
+ rc.size, rc.tag, p9_rx_req->rc.capacity);
+ return NULL;
+ }
+
+ if (!p9_rx_req->rc.sdata) {
+ p9_debug(P9_DEBUG_ERROR,
+ "No recv fcall for tag %d (req %p), disconnecting!\n",
+ rc.tag, p9_rx_req);
+ p9_req_put(usb9pfs->client, p9_rx_req);
+ return NULL;
+ }
+
+ return p9_rx_req;
+}
+
+static void usb9pfs_rx_complete(struct usb_ep *ep, struct usb_request *req)
+{
+ struct f_usb9pfs *usb9pfs = ep->driver_data;
+ struct usb_composite_dev *cdev = usb9pfs->function.config->cdev;
+ struct p9_req_t *p9_rx_req;
+ unsigned long flags;
+
+ switch (req->status) {
+ case 0: /* normal completion? */
+ spin_lock_irqsave(&usb9pfs->req_lock, flags);
+ p9_rx_req = usb9pfs_rx_header(usb9pfs, req);
+ if (!p9_rx_req) {
+ spin_unlock_irqrestore(&usb9pfs->req_lock, flags);
+ goto free_req;
+ }
+
+ memcpy(p9_rx_req->rc.sdata, req->buf, req->actual);
+ p9_rx_req->rc.size = req->actual;
+
+ p9_client_cb(usb9pfs->client, p9_rx_req, REQ_STATUS_RCVD);
+ p9_req_put(usb9pfs->client, p9_rx_req);
+
+ usb9pfs->p9_tx_req = NULL;
+
+ usb9pfs_transmit(usb9pfs);
+
+ spin_unlock_irqrestore(&usb9pfs->req_lock, flags);
+
+ return;
+free_req:
+ default:
+ dev_err(&cdev->gadget->dev, "%s usb9pfs complete --> %d, %d/%d\n",
+ ep->name, req->status, req->actual, req->length);
+ usb_ep_free_request(ep == usb9pfs->in_ep ?
+ usb9pfs->out_ep : usb9pfs->in_ep,
+ req->context);
+ free_ep_req(ep, req);
+ return;
+ }
+
+ p9_client_cb(usb9pfs->client, p9_rx_req, REQ_STATUS_ERROR);
+}
+
+static void disable_ep(struct usb_composite_dev *cdev, struct usb_ep *ep)
+{
+ int value;
+
+ value = usb_ep_disable(ep);
+ if (value < 0)
+ dev_info(&cdev->gadget->dev, "disable %s --> %d\n", ep->name, value);
+}
+
+void disable_endpoints(struct usb_composite_dev *cdev,
+ struct usb_ep *in, struct usb_ep *out,
+ struct usb_ep *iso_in, struct usb_ep *iso_out)
+{
+ disable_ep(cdev, in);
+ disable_ep(cdev, out);
+}
+
+static void disable_usb9pfs(struct f_usb9pfs *usb9pfs)
+{
+ struct usb_composite_dev *cdev;
+
+ cdev = usb9pfs->function.config->cdev;
+ disable_endpoints(cdev, usb9pfs->in_ep, usb9pfs->out_ep, NULL, NULL);
+ dev_dbg(&cdev->gadget->dev, "%s disabled\n", usb9pfs->function.name);
+}
+
+static inline struct usb_request *usb9pfs_alloc_ep_req(struct usb_ep *ep, int len)
+{
+ return alloc_ep_req(ep, len);
+}
+
+static int alloc_requests(struct usb_composite_dev *cdev,
+ struct f_usb9pfs *usb9pfs)
+{
+ int result = 0;
+
+ usb9pfs->in_req = usb_ep_alloc_request(usb9pfs->in_ep, GFP_ATOMIC);
+ if (!usb9pfs->in_req)
+ goto fail;
+
+ usb9pfs->out_req = usb9pfs_alloc_ep_req(usb9pfs->out_ep, usb9pfs->buflen);
+ if (!usb9pfs->out_req)
+ goto fail_in;
+
+ usb9pfs->in_req->complete = usb9pfs_tx_complete;
+ usb9pfs->out_req->complete = usb9pfs_rx_complete;
+
+ /* length will be set in complete routine */
+ usb9pfs->in_req->context = usb9pfs->out_req->context = usb9pfs;
+
+ return 0;
+
+fail_in:
+ usb_ep_free_request(usb9pfs->in_ep, usb9pfs->in_req);
+fail:
+ return result;
+}
+
+static int enable_endpoint(struct usb_composite_dev *cdev,
+ struct f_usb9pfs *usb9pfs, struct usb_ep *ep)
+{
+ int result;
+
+ result = config_ep_by_speed(cdev->gadget, &(usb9pfs->function), ep);
+ if (result)
+ goto out;
+
+ result = usb_ep_enable(ep);
+ if (result < 0)
+ goto out;
+
+ ep->driver_data = usb9pfs;
+
+ result = 0;
+
+out:
+ return result;
+}
+
+static int
+enable_usb9pfs(struct usb_composite_dev *cdev, struct f_usb9pfs *usb9pfs)
+{
+ int result = 0;
+
+ result = enable_endpoint(cdev, usb9pfs, usb9pfs->in_ep);
+ if (result)
+ goto out;
+
+ result = enable_endpoint(cdev, usb9pfs, usb9pfs->out_ep);
+ if (result)
+ goto disable_in;
+
+ result = alloc_requests(cdev, usb9pfs);
+ if (result)
+ goto disable_out;
+
+ dev_dbg(&cdev->gadget->dev, "%s enabled\n", usb9pfs->function.name);
+ return 0;
+
+disable_out:
+ usb_ep_disable(usb9pfs->out_ep);
+disable_in:
+ usb_ep_disable(usb9pfs->in_ep);
+out:
+ return result;
+}
+
+static int p9_usbg_create(struct p9_client *client, const char *devname, char *args)
+{
+ struct usb_composite_dev *cdev;
+ struct f_usb9pfs *usb9pfs;
+ struct f_usb9pfs *tmp;
+ struct usb_function *f;
+ int ret = -ENOENT;
+ int found = 0;
+
+ if (devname == NULL)
+ return -EINVAL;
+
+ mutex_lock(&usb9pfs_lock);
+ list_for_each_entry_safe(usb9pfs, tmp, &usbg_function_list, function_list) {
+ if (usb9pfs->tag == NULL)
+ continue;
+ if (!strncmp(devname, usb9pfs->tag, strlen(devname))) {
+ if (!usb9pfs->inuse) {
+ usb9pfs->inuse = true;
+ found = 1;
+ break;
+ }
+ ret = -EBUSY;
+ break;
+ }
+ }
+ mutex_unlock(&usb9pfs_lock);
+
+ if (!found) {
+ pr_err("no channels available for device %s\n", devname);
+ return ret;
+ }
+
+ INIT_LIST_HEAD(&usb9pfs->tx_req_list);
+
+ spin_lock_init(&usb9pfs->lock);
+ spin_lock_init(&usb9pfs->req_lock);
+
+ f = &usb9pfs->function;
+ cdev = f->config->cdev;
+
+ client->trans = (void *)usb9pfs;
+ client->status = Connected;
+ usb9pfs->client = client;
+
+ client->trans_mod->maxsize = usb9pfs->buflen;
+
+ disable_usb9pfs(usb9pfs);
+
+ return enable_usb9pfs(cdev, usb9pfs);
+}
+
+static void p9_usbg_close(struct p9_client *client)
+{
+ struct f_usb9pfs *usb9pfs = client->trans;
+
+ disable_usb9pfs(usb9pfs);
+}
+
+static int p9_usbg_request(struct p9_client *client, struct p9_req_t *p9_req)
+{
+ struct f_usb9pfs *usb9pfs = client->trans;
+ unsigned long flags;
+
+ spin_lock_irqsave(&usb9pfs->lock, flags);
+ list_add_tail(&p9_req->req_list, &usb9pfs->tx_req_list);
+ spin_unlock_irqrestore(&usb9pfs->lock, flags);
+
+ spin_lock_irqsave(&usb9pfs->req_lock, flags);
+ usb9pfs_transmit(usb9pfs);
+ spin_unlock_irqrestore(&usb9pfs->req_lock, flags);
+
+ return 0;
+}
+
+/* We don't currently allow canceling of requests */
+static int p9_usbg_cancel(struct p9_client *client, struct p9_req_t *req)
+{
+ return 1;
+}
+
+static struct p9_trans_module p9_usbg_trans = {
+ .name = "usbg",
+ .create = p9_usbg_create,
+ .close = p9_usbg_close,
+ .request = p9_usbg_request,
+ .cancel = p9_usbg_cancel,
+ .owner = THIS_MODULE,
+};
+
+/*-------------------------------------------------------------------------*/
+
+#define USB_PROTOCOL_9PFS 0x09
+
+static struct usb_interface_descriptor usb9pfs_intf = {
+ .bLength = sizeof(usb9pfs_intf),
+ .bDescriptorType = USB_DT_INTERFACE,
+
+ .bNumEndpoints = 2,
+ .bInterfaceClass = USB_CLASS_VENDOR_SPEC,
+ .bInterfaceSubClass = USB_SUBCLASS_VENDOR_SPEC,
+ .bInterfaceProtocol = USB_PROTOCOL_9PFS,
+
+ /* .iInterface = DYNAMIC */
+};
+
+/* full speed support: */
+
+static struct usb_endpoint_descriptor fs_usb9pfs_source_desc = {
+ .bLength = USB_DT_ENDPOINT_SIZE,
+ .bDescriptorType = USB_DT_ENDPOINT,
+
+ .bEndpointAddress = USB_DIR_IN,
+ .bmAttributes = USB_ENDPOINT_XFER_BULK,
+};
+
+static struct usb_endpoint_descriptor fs_usb9pfs_sink_desc = {
+ .bLength = USB_DT_ENDPOINT_SIZE,
+ .bDescriptorType = USB_DT_ENDPOINT,
+
+ .bEndpointAddress = USB_DIR_OUT,
+ .bmAttributes = USB_ENDPOINT_XFER_BULK,
+};
+
+static struct usb_descriptor_header *fs_usb9pfs_descs[] = {
+ (struct usb_descriptor_header *) &usb9pfs_intf,
+ (struct usb_descriptor_header *) &fs_usb9pfs_sink_desc,
+ (struct usb_descriptor_header *) &fs_usb9pfs_source_desc,
+ NULL,
+};
+
+/* high speed support: */
+
+static struct usb_endpoint_descriptor hs_usb9pfs_source_desc = {
+ .bLength = USB_DT_ENDPOINT_SIZE,
+ .bDescriptorType = USB_DT_ENDPOINT,
+
+ .bmAttributes = USB_ENDPOINT_XFER_BULK,
+ .wMaxPacketSize = cpu_to_le16(512),
+};
+
+static struct usb_endpoint_descriptor hs_usb9pfs_sink_desc = {
+ .bLength = USB_DT_ENDPOINT_SIZE,
+ .bDescriptorType = USB_DT_ENDPOINT,
+
+ .bmAttributes = USB_ENDPOINT_XFER_BULK,
+ .wMaxPacketSize = cpu_to_le16(512),
+};
+
+static struct usb_descriptor_header *hs_usb9pfs_descs[] = {
+ (struct usb_descriptor_header *) &usb9pfs_intf,
+ (struct usb_descriptor_header *) &hs_usb9pfs_source_desc,
+ (struct usb_descriptor_header *) &hs_usb9pfs_sink_desc,
+ NULL,
+};
+
+/* super speed support: */
+
+static struct usb_endpoint_descriptor ss_usb9pfs_source_desc = {
+ .bLength = USB_DT_ENDPOINT_SIZE,
+ .bDescriptorType = USB_DT_ENDPOINT,
+
+ .bmAttributes = USB_ENDPOINT_XFER_BULK,
+ .wMaxPacketSize = cpu_to_le16(1024),
+};
+
+static struct usb_ss_ep_comp_descriptor ss_usb9pfs_source_comp_desc = {
+ .bLength = USB_DT_SS_EP_COMP_SIZE,
+ .bDescriptorType = USB_DT_SS_ENDPOINT_COMP,
+ .bMaxBurst = 0,
+ .bmAttributes = 0,
+ .wBytesPerInterval = 0,
+};
+
+static struct usb_endpoint_descriptor ss_usb9pfs_sink_desc = {
+ .bLength = USB_DT_ENDPOINT_SIZE,
+ .bDescriptorType = USB_DT_ENDPOINT,
+
+ .bmAttributes = USB_ENDPOINT_XFER_BULK,
+ .wMaxPacketSize = cpu_to_le16(1024),
+};
+
+static struct usb_ss_ep_comp_descriptor ss_usb9pfs_sink_comp_desc = {
+ .bLength = USB_DT_SS_EP_COMP_SIZE,
+ .bDescriptorType = USB_DT_SS_ENDPOINT_COMP,
+ .bMaxBurst = 0,
+ .bmAttributes = 0,
+ .wBytesPerInterval = 0,
+};
+
+static struct usb_descriptor_header *ss_usb9pfs_descs[] = {
+ (struct usb_descriptor_header *) &usb9pfs_intf,
+ (struct usb_descriptor_header *) &ss_usb9pfs_source_desc,
+ (struct usb_descriptor_header *) &ss_usb9pfs_source_comp_desc,
+ (struct usb_descriptor_header *) &ss_usb9pfs_sink_desc,
+ (struct usb_descriptor_header *) &ss_usb9pfs_sink_comp_desc,
+ NULL,
+};
+
+/* function-specific strings: */
+static struct usb_string strings_usb9pfs[] = {
+ [0].s = "usb9pfs input to output",
+ { } /* end of list */
+};
+
+static struct usb_gadget_strings stringtab_usb9pfs = {
+ .language = 0x0409, /* en-us */
+ .strings = strings_usb9pfs,
+};
+
+static struct usb_gadget_strings *usb9pfs_strings[] = {
+ &stringtab_usb9pfs,
+ NULL,
+};
+
+/*-------------------------------------------------------------------------*/
+
+static int usb9pfs_func_bind(struct usb_configuration *c, struct usb_function *f)
+{
+ struct f_usb9pfs *usb9pfs = func_to_usb9pfs(f);
+ struct usb_composite_dev *cdev = c->cdev;
+ int ret;
+ int id;
+
+ /* allocate interface ID(s) */
+ id = usb_interface_id(c, f);
+ if (id < 0)
+ return id;
+ usb9pfs_intf.bInterfaceNumber = id;
+
+ id = usb_string_id(cdev);
+ if (id < 0)
+ return id;
+ strings_usb9pfs[0].id = id;
+ usb9pfs_intf.iInterface = id;
+
+ /* allocate endpoints */
+ usb9pfs->in_ep = usb_ep_autoconfig(cdev->gadget, &fs_usb9pfs_source_desc);
+ if (!usb9pfs->in_ep)
+ goto autoconf_fail;
+
+ usb9pfs->out_ep = usb_ep_autoconfig(cdev->gadget, &fs_usb9pfs_sink_desc);
+ if (!usb9pfs->out_ep)
+ goto autoconf_fail;
+
+ /* support high speed hardware */
+ hs_usb9pfs_source_desc.bEndpointAddress =
+ fs_usb9pfs_source_desc.bEndpointAddress;
+ hs_usb9pfs_sink_desc.bEndpointAddress = fs_usb9pfs_sink_desc.bEndpointAddress;
+
+ /* support super speed hardware */
+ ss_usb9pfs_source_desc.bEndpointAddress =
+ fs_usb9pfs_source_desc.bEndpointAddress;
+ ss_usb9pfs_sink_desc.bEndpointAddress = fs_usb9pfs_sink_desc.bEndpointAddress;
+
+ ret = usb_assign_descriptors(f, fs_usb9pfs_descs, hs_usb9pfs_descs,
+ ss_usb9pfs_descs, ss_usb9pfs_descs);
+ if (ret)
+ return ret;
+
+ dev_dbg(&cdev->gadget->dev, "%s speed %s: IN/%s, OUT/%s\n",
+ (gadget_is_superspeed(c->cdev->gadget) ? "super" :
+ (gadget_is_dualspeed(c->cdev->gadget) ? "dual" : "full")),
+ f->name, usb9pfs->in_ep->name, usb9pfs->out_ep->name);
+ return 0;
+
+autoconf_fail:
+ ERROR(cdev, "%s: can't autoconfigure on %s\n",
+ f->name, cdev->gadget->name);
+ return -ENODEV;
+}
+
+static void usb9pfs_free_func(struct usb_function *f)
+{
+ struct f_usb9pfs_opts *opts;
+
+ opts = container_of(f->fi, struct f_usb9pfs_opts, func_inst);
+
+ mutex_lock(&opts->lock);
+ opts->refcnt--;
+ mutex_unlock(&opts->lock);
+
+ usb_free_all_descriptors(f);
+ kfree(func_to_usb9pfs(f));
+}
+
+static int usb9pfs_set_alt(struct usb_function *f,
+ unsigned int intf, unsigned int alt)
+{
+ return 0;
+}
+
+static void usb9pfs_disable(struct usb_function *f)
+{
+}
+
+static struct usb_function *usb9pfs_alloc(struct usb_function_instance *fi)
+{
+ struct f_usb9pfs_opts *usb9pfs_opts;
+ struct f_usb9pfs *usb9pfs;
+
+ usb9pfs = kzalloc(sizeof(*usb9pfs), GFP_KERNEL);
+ if (!usb9pfs)
+ return ERR_PTR(-ENOMEM);
+
+ usb9pfs_opts = container_of(fi, struct f_usb9pfs_opts, func_inst);
+
+ mutex_lock(&usb9pfs_opts->lock);
+ usb9pfs_opts->refcnt++;
+ mutex_unlock(&usb9pfs_opts->lock);
+
+ usb9pfs->buflen = usb9pfs_opts->buflen;
+
+ usb9pfs->function.name = "usb9pfs";
+ usb9pfs->function.bind = usb9pfs_func_bind;
+ usb9pfs->function.set_alt = usb9pfs_set_alt;
+ usb9pfs->function.disable = usb9pfs_disable;
+ usb9pfs->function.strings = usb9pfs_strings;
+
+ usb9pfs->function.free_func = usb9pfs_free_func;
+
+ mutex_lock(&usb9pfs_ida_lock);
+
+ usb9pfs->index = ida_simple_get(&usb9pfs_ida, 0, 100, GFP_KERNEL);
+ if (usb9pfs->index < 0) {
+ struct usb_function *ret = ERR_PTR(usb9pfs->index);
+
+ kfree(usb9pfs);
+ mutex_unlock(&usb9pfs_ida_lock);
+ return ret;
+ }
+
+ mutex_unlock(&usb9pfs_ida_lock);
+
+ usb9pfs->tag = kasprintf(GFP_KERNEL, "%s%d", usb9pfs->function.name,
+ usb9pfs->index);
+
+ INIT_LIST_HEAD(&usb9pfs->function_list);
+
+ mutex_lock(&usb9pfs_lock);
+ list_add_tail(&usb9pfs->function_list, &usbg_function_list);
+ mutex_unlock(&usb9pfs_lock);
+
+ return &usb9pfs->function;
+}
+
+static inline struct f_usb9pfs_opts *to_f_usb9pfs_opts(struct config_item *item)
+{
+ return container_of(to_config_group(item), struct f_usb9pfs_opts,
+ func_inst.group);
+}
+
+static void usb9pfs_attr_release(struct config_item *item)
+{
+ struct f_usb9pfs_opts *usb9pfs_opts = to_f_usb9pfs_opts(item);
+
+ usb_put_function_instance(&usb9pfs_opts->func_inst);
+}
+
+static struct configfs_item_operations usb9pfs_item_ops = {
+ .release = usb9pfs_attr_release,
+};
+
+static ssize_t f_usb9pfs_opts_buflen_show(struct config_item *item, char *page)
+{
+ struct f_usb9pfs_opts *opts = to_f_usb9pfs_opts(item);
+ int result;
+
+ mutex_lock(&opts->lock);
+ result = sprintf(page, "%d\n", opts->buflen);
+ mutex_unlock(&opts->lock);
+
+ return result;
+}
+
+static ssize_t f_usb9pfs_opts_buflen_store(struct config_item *item,
+ const char *page, size_t len)
+{
+ struct f_usb9pfs_opts *opts = to_f_usb9pfs_opts(item);
+ int ret;
+ u32 num;
+
+ mutex_lock(&opts->lock);
+ if (opts->refcnt) {
+ ret = -EBUSY;
+ goto end;
+ }
+
+ ret = kstrtou32(page, 0, &num);
+ if (ret)
+ goto end;
+
+ opts->buflen = num;
+ ret = len;
+end:
+ mutex_unlock(&opts->lock);
+ return ret;
+}
+
+CONFIGFS_ATTR(f_usb9pfs_opts_, buflen);
+
+static struct configfs_attribute *usb9pfs_attrs[] = {
+ &f_usb9pfs_opts_attr_buflen,
+ NULL,
+};
+
+static const struct config_item_type usb9pfs_func_type = {
+ .ct_item_ops = &usb9pfs_item_ops,
+ .ct_attrs = usb9pfs_attrs,
+ .ct_owner = THIS_MODULE,
+};
+
+static void usb9pfs_free_instance(struct usb_function_instance *fi)
+{
+ struct f_usb9pfs_opts *usb9pfs_opts;
+
+ usb9pfs_opts = container_of(fi, struct f_usb9pfs_opts, func_inst);
+ kfree(usb9pfs_opts);
+}
+
+static struct usb_function_instance *usb9pfs_alloc_instance(void)
+{
+ struct f_usb9pfs_opts *usb9pfs_opts;
+
+ usb9pfs_opts = kzalloc(sizeof(*usb9pfs_opts), GFP_KERNEL);
+ if (!usb9pfs_opts)
+ return ERR_PTR(-ENOMEM);
+
+ mutex_init(&usb9pfs_opts->lock);
+
+ usb9pfs_opts->func_inst.free_func_inst = usb9pfs_free_instance;
+
+ usb9pfs_opts->buflen = DEFAULT_BUFLEN;
+
+ config_group_init_type_name(&usb9pfs_opts->func_inst.group, "",
+ &usb9pfs_func_type);
+
+ return &usb9pfs_opts->func_inst;
+}
+DECLARE_USB_FUNCTION(usb9pfs, usb9pfs_alloc_instance, usb9pfs_alloc);
+
+int __init usb9pfs_modinit(void)
+{
+ int ret;
+
+ INIT_LIST_HEAD(&usbg_function_list);
+
+ ret = usb_function_register(&usb9pfsusb_func);
+ if (!ret)
+ v9fs_register_trans(&p9_usbg_trans);
+
+ return ret;
+}
+
+void __exit usb9pfs_modexit(void)
+{
+ usb_function_unregister(&usb9pfsusb_func);
+ v9fs_unregister_trans(&p9_usbg_trans);
+}
+
+module_init(usb9pfs_modinit);
+module_exit(usb9pfs_modexit);
+
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("USB gadget 9pfs transport");
+MODULE_AUTHOR("Michael Grzeschik");