/** * debugfs.c - Designware USB2 DRD controller debugfs * * Copyright (C) 2015 Intel Corporation * Mian Yousaf Kaukab * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 of * the License as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. */ #include #include #include #include #include "core.h" #include "debug.h" #if IS_ENABLED(CONFIG_USB_DWC2_PERIPHERAL) || \ IS_ENABLED(CONFIG_USB_DWC2_DUAL_ROLE) /** * testmode_write - debugfs: change usb test mode * @seq: The seq file to write to. * @v: Unused parameter. * * This debugfs entry modify the current usb test mode. */ static ssize_t testmode_write(struct file *file, const char __user *ubuf, size_t count, loff_t *ppos) { struct seq_file *s = file->private_data; struct dwc2_hsotg *hsotg = s->private; unsigned long flags; u32 testmode = 0; char buf[32]; if (copy_from_user(&buf, ubuf, min_t(size_t, sizeof(buf) - 1, count))) return -EFAULT; if (!strncmp(buf, "test_j", 6)) testmode = TEST_J; else if (!strncmp(buf, "test_k", 6)) testmode = TEST_K; else if (!strncmp(buf, "test_se0_nak", 12)) testmode = TEST_SE0_NAK; else if (!strncmp(buf, "test_packet", 11)) testmode = TEST_PACKET; else if (!strncmp(buf, "test_force_enable", 17)) testmode = TEST_FORCE_EN; else testmode = 0; spin_lock_irqsave(&hsotg->lock, flags); dwc2_hsotg_set_test_mode(hsotg, testmode); spin_unlock_irqrestore(&hsotg->lock, flags); return count; } /** * testmode_show - debugfs: show usb test mode state * @seq: The seq file to write to. * @v: Unused parameter. * * This debugfs entry shows which usb test mode is currently enabled. */ static int testmode_show(struct seq_file *s, void *unused) { struct dwc2_hsotg *hsotg = s->private; unsigned long flags; int dctl; spin_lock_irqsave(&hsotg->lock, flags); dctl = dwc2_readl(hsotg->regs + DCTL); dctl &= DCTL_TSTCTL_MASK; dctl >>= DCTL_TSTCTL_SHIFT; spin_unlock_irqrestore(&hsotg->lock, flags); switch (dctl) { case 0: seq_puts(s, "no test\n"); break; case TEST_J: seq_puts(s, "test_j\n"); break; case TEST_K: seq_puts(s, "test_k\n"); break; case TEST_SE0_NAK: seq_puts(s, "test_se0_nak\n"); break; case TEST_PACKET: seq_puts(s, "test_packet\n"); break; case TEST_FORCE_EN: seq_puts(s, "test_force_enable\n"); break; default: seq_printf(s, "UNKNOWN %d\n", dctl); } return 0; } static int testmode_open(struct inode *inode, struct file *file) { return single_open(file, testmode_show, inode->i_private); } static const struct file_operations testmode_fops = { .owner = THIS_MODULE, .open = testmode_open, .write = testmode_write, .read = seq_read, .llseek = seq_lseek, .release = single_release, }; /** * state_show - debugfs: show overall driver and device state. * @seq: The seq file to write to. * @v: Unused parameter. * * This debugfs entry shows the overall state of the hardware and * some general information about each of the endpoints available * to the system. */ static int state_show(struct seq_file *seq, void *v) { struct dwc2_hsotg *hsotg = seq->private; void __iomem *regs = hsotg->regs; int idx; seq_printf(seq, "DCFG=0x%08x, DCTL=0x%08x, DSTS=0x%08x\n", dwc2_readl(regs + DCFG), dwc2_readl(regs + DCTL), dwc2_readl(regs + DSTS)); seq_printf(seq, "DIEPMSK=0x%08x, DOEPMASK=0x%08x\n", dwc2_readl(regs + DIEPMSK), dwc2_readl(regs + DOEPMSK)); seq_printf(seq, "GINTMSK=0x%08x, GINTSTS=0x%08x\n", dwc2_readl(regs + GINTMSK), dwc2_readl(regs + GINTSTS)); seq_printf(seq, "DAINTMSK=0x%08x, DAINT=0x%08x\n", dwc2_readl(regs + DAINTMSK), dwc2_readl(regs + DAINT)); seq_printf(seq, "GNPTXSTS=0x%08x, GRXSTSR=%08x\n", dwc2_readl(regs + GNPTXSTS), dwc2_readl(regs + GRXSTSR)); seq_puts(seq, "\nEndpoint status:\n"); for (idx = 0; idx < hsotg->num_of_eps; idx++) { u32 in, out; in = dwc2_readl(regs + DIEPCTL(idx)); out = dwc2_readl(regs + DOEPCTL(idx)); seq_printf(seq, "ep%d: DIEPCTL=0x%08x, DOEPCTL=0x%08x", idx, in, out); in = dwc2_readl(regs + DIEPTSIZ(idx)); out = dwc2_readl(regs + DOEPTSIZ(idx)); seq_printf(seq, ", DIEPTSIZ=0x%08x, DOEPTSIZ=0x%08x", in, out); seq_puts(seq, "\n"); } return 0; } static int state_open(struct inode *inode, struct file *file) { return single_open(file, state_show, inode->i_private); } static const struct file_operations state_fops = { .owner = THIS_MODULE, .open = state_open, .read = seq_read, .llseek = seq_lseek, .release = single_release, }; /** * fifo_show - debugfs: show the fifo information * @seq: The seq_file to write data to. * @v: Unused parameter. * * Show the FIFO information for the overall fifo and all the * periodic transmission FIFOs. */ static int fifo_show(struct seq_file *seq, void *v) { struct dwc2_hsotg *hsotg = seq->private; void __iomem *regs = hsotg->regs; u32 val; int idx; seq_puts(seq, "Non-periodic FIFOs:\n"); seq_printf(seq, "RXFIFO: Size %d\n", dwc2_readl(regs + GRXFSIZ)); val = dwc2_readl(regs + GNPTXFSIZ); seq_printf(seq, "NPTXFIFO: Size %d, Start 0x%08x\n", val >> FIFOSIZE_DEPTH_SHIFT, val & FIFOSIZE_STARTADDR_MASK); seq_puts(seq, "\nPeriodic TXFIFOs:\n"); for (idx = 1; idx < hsotg->num_of_eps; idx++) { val = dwc2_readl(regs + DPTXFSIZN(idx)); seq_printf(seq, "\tDPTXFIFO%2d: Size %d, Start 0x%08x\n", idx, val >> FIFOSIZE_DEPTH_SHIFT, val & FIFOSIZE_STARTADDR_MASK); } return 0; } static int fifo_open(struct inode *inode, struct file *file) { return single_open(file, fifo_show, inode->i_private); } static const struct file_operations fifo_fops = { .owner = THIS_MODULE, .open = fifo_open, .read = seq_read, .llseek = seq_lseek, .release = single_release, }; static const char *decode_direction(int is_in) { return is_in ? "in" : "out"; } /** * ep_show - debugfs: show the state of an endpoint. * @seq: The seq_file to write data to. * @v: Unused parameter. * * This debugfs entry shows the state of the given endpoint (one is * registered for each available). */ static int ep_show(struct seq_file *seq, void *v) { struct dwc2_hsotg_ep *ep = seq->private; struct dwc2_hsotg *hsotg = ep->parent; struct dwc2_hsotg_req *req; void __iomem *regs = hsotg->regs; int index = ep->index; int show_limit = 15; unsigned long flags; seq_printf(seq, "Endpoint index %d, named %s, dir %s:\n", ep->index, ep->ep.name, decode_direction(ep->dir_in)); /* first show the register state */ seq_printf(seq, "\tDIEPCTL=0x%08x, DOEPCTL=0x%08x\n", dwc2_readl(regs + DIEPCTL(index)), dwc2_readl(regs + DOEPCTL(index))); seq_printf(seq, "\tDIEPDMA=0x%08x, DOEPDMA=0x%08x\n", dwc2_readl(regs + DIEPDMA(index)), dwc2_readl(regs + DOEPDMA(index))); seq_printf(seq, "\tDIEPINT=0x%08x, DOEPINT=0x%08x\n", dwc2_readl(regs + DIEPINT(index)), dwc2_readl(regs + DOEPINT(index))); seq_printf(seq, "\tDIEPTSIZ=0x%08x, DOEPTSIZ=0x%08x\n", dwc2_readl(regs + DIEPTSIZ(index)), dwc2_readl(regs + DOEPTSIZ(index))); seq_puts(seq, "\n"); seq_printf(seq, "mps %d\n", ep->ep.maxpacket); seq_printf(seq, "total_data=%ld\n", ep->total_data); seq_printf(seq, "request list (%p,%p):\n", ep->queue.next, ep->queue.prev); spin_lock_irqsave(&hsotg->lock, flags); list_for_each_entry(req, &ep->queue, queue) { if (--show_limit < 0) { seq_puts(seq, "not showing more requests...\n"); break; } seq_printf(seq, "%c req %p: %d bytes @%p, ", req == ep->req ? '*' : ' ', req, req->req.length, req->req.buf); seq_printf(seq, "%d done, res %d\n", req->req.actual, req->req.status); } spin_unlock_irqrestore(&hsotg->lock, flags); return 0; } static int ep_open(struct inode *inode, struct file *file) { return single_open(file, ep_show, inode->i_private); } static const struct file_operations ep_fops = { .owner = THIS_MODULE, .open = ep_open, .read = seq_read, .llseek = seq_lseek, .release = single_release, }; /** * dwc2_hsotg_create_debug - create debugfs directory and files * @hsotg: The driver state * * Create the debugfs files to allow the user to get information * about the state of the system. The directory name is created * with the same name as the device itself, in case we end up * with multiple blocks in future systems. */ static void dwc2_hsotg_create_debug(struct dwc2_hsotg *hsotg) { struct dentry *root; struct dentry *file; unsigned epidx; root = hsotg->debug_root; /* create general state file */ file = debugfs_create_file("state", S_IRUGO, root, hsotg, &state_fops); if (IS_ERR(file)) dev_err(hsotg->dev, "%s: failed to create state\n", __func__); file = debugfs_create_file("testmode", S_IRUGO | S_IWUSR, root, hsotg, &testmode_fops); if (IS_ERR(file)) dev_err(hsotg->dev, "%s: failed to create testmode\n", __func__); file = debugfs_create_file("fifo", S_IRUGO, root, hsotg, &fifo_fops); if (IS_ERR(file)) dev_err(hsotg->dev, "%s: failed to create fifo\n", __func__); /* Create one file for each out endpoint */ for (epidx = 0; epidx < hsotg->num_of_eps; epidx++) { struct dwc2_hsotg_ep *ep; ep = hsotg->eps_out[epidx]; if (ep) { file = debugfs_create_file(ep->name, S_IRUGO, root, ep, &ep_fops); if (IS_ERR(file)) dev_err(hsotg->dev, "failed to create %s debug file\n", ep->name); } } /* Create one file for each in endpoint. EP0 is handled with out eps */ for (epidx = 1; epidx < hsotg->num_of_eps; epidx++) { struct dwc2_hsotg_ep *ep; ep = hsotg->eps_in[epidx]; if (ep) { file = debugfs_create_file(ep->name, S_IRUGO, root, ep, &ep_fops); if (IS_ERR(file)) dev_err(hsotg->dev, "failed to create %s debug file\n", ep->name); } } } #else static inline void dwc2_hsotg_create_debug(struct dwc2_hsotg *hsotg) {} #endif /* dwc2_hsotg_delete_debug is removed as cleanup in done in dwc2_debugfs_exit */ #define dump_register(nm) \ { \ .name = #nm, \ .offset = nm, \ } static const struct debugfs_reg32 dwc2_regs[] = { /* * Accessing registers like this can trigger mode mismatch interrupt. * However, according to dwc2 databook, the register access, in this * case, is completed on the processor bus but is ignored by the core * and does not affect its operation. */ dump_register(GOTGCTL), dump_register(GOTGINT), dump_register(GAHBCFG), dump_register(GUSBCFG), dump_register(GRSTCTL), dump_register(GINTSTS), dump_register(GINTMSK), dump_register(GRXSTSR), dump_register(GRXSTSP), dump_register(GRXFSIZ), dump_register(GNPTXFSIZ), dump_register(GNPTXSTS), dump_register(GI2CCTL), dump_register(GPVNDCTL), dump_register(GGPIO), dump_register(GUID), dump_register(GSNPSID), dump_register(GHWCFG1), dump_register(GHWCFG2), dump_register(GHWCFG3), dump_register(GHWCFG4), dump_register(GLPMCFG), dump_register(GPWRDN), dump_register(GDFIFOCFG), dump_register(ADPCTL), dump_register(HPTXFSIZ), dump_register(DPTXFSIZN(1)), dump_register(DPTXFSIZN(2)), dump_register(DPTXFSIZN(3)), dump_register(DPTXFSIZN(4)), dump_register(DPTXFSIZN(5)), dump_register(DPTXFSIZN(6)), dump_register(DPTXFSIZN(7)), dump_register(DPTXFSIZN(8)), dump_register(DPTXFSIZN(9)), dump_register(DPTXFSIZN(10)), dump_register(DPTXFSIZN(11)), dump_register(DPTXFSIZN(12)), dump_register(DPTXFSIZN(13)), dump_register(DPTXFSIZN(14)), dump_register(DPTXFSIZN(15)), dump_register(DCFG), dump_register(DCTL), dump_register(DSTS), dump_register(DIEPMSK), dump_register(DOEPMSK), dump_register(DAINT), dump_register(DAINTMSK), dump_register(DTKNQR1), dump_register(DTKNQR2), dump_register(DTKNQR3), dump_register(DTKNQR4), dump_register(DVBUSDIS), dump_register(DVBUSPULSE), dump_register(DIEPCTL(0)), dump_register(DIEPCTL(1)), dump_register(DIEPCTL(2)), dump_register(DIEPCTL(3)), dump_register(DIEPCTL(4)), dump_register(DIEPCTL(5)), dump_register(DIEPCTL(6)), dump_register(DIEPCTL(7)), dump_register(DIEPCTL(8)), dump_register(DIEPCTL(9)), dump_register(DIEPCTL(10)), dump_register(DIEPCTL(11)), dump_register(DIEPCTL(12)), dump_register(DIEPCTL(13)), dump_register(DIEPCTL(14)), dump_register(DIEPCTL(15)), dump_register(DOEPCTL(0)), dump_register(DOEPCTL(1)), dump_register(DOEPCTL(2)), dump_register(DOEPCTL(3)), dump_register(DOEPCTL(4)), dump_register(DOEPCTL(5)), dump_register(DOEPCTL(6)), dump_register(DOEPCTL(7)), dump_register(DOEPCTL(8)), dump_register(DOEPCTL(9)), dump_register(DOEPCTL(10)), dump_register(DOEPCTL(11)), dump_register(DOEPCTL(12)), dump_register(DOEPCTL(13)), dump_register(DOEPCTL(14)), dump_register(DOEPCTL(15)), dump_register(DIEPINT(0)), dump_register(DIEPINT(1)), dump_register(DIEPINT(2)), dump_register(DIEPINT(3)), dump_register(DIEPINT(4)), dump_register(DIEPINT(5)), dump_register(DIEPINT(6)), dump_register(DIEPINT(7)), dump_register(DIEPINT(8)), dump_register(DIEPINT(9)), dump_register(DIEPINT(10)), dump_register(DIEPINT(11)), dump_register(DIEPINT(12)), dump_register(DIEPINT(13)), dump_register(DIEPINT(14)), dump_register(DIEPINT(15)), dump_register(DOEPINT(0)), dump_register(DOEPINT(1)), dump_register(DOEPINT(2)), dump_register(DOEPINT(3)), dump_register(DOEPINT(4)), dump_register(DOEPINT(5)), dump_register(DOEPINT(6)), dump_register(DOEPINT(7)), dump_register(DOEPINT(8)), dump_register(DOEPINT(9)), dump_register(DOEPINT(10)), dump_register(DOEPINT(11)), dump_register(DOEPINT(12)), dump_register(DOEPINT(13)), dump_register(DOEPINT(14)), dump_register(DOEPINT(15)), dump_register(DIEPTSIZ(0)), dump_register(DIEPTSIZ(1)), dump_register(DIEPTSIZ(2)), dump_register(DIEPTSIZ(3)), dump_register(DIEPTSIZ(4)), dump_register(DIEPTSIZ(5)), dump_register(DIEPTSIZ(6)), dump_register(DIEPTSIZ(7)), dump_register(DIEPTSIZ(8)), dump_register(DIEPTSIZ(9)), dump_register(DIEPTSIZ(10)), dump_register(DIEPTSIZ(11)), dump_register(DIEPTSIZ(12)), dump_register(DIEPTSIZ(13)), dump_register(DIEPTSIZ(14)), dump_register(DIEPTSIZ(15)), dump_register(DOEPTSIZ(0)), dump_register(DOEPTSIZ(1)), dump_register(DOEPTSIZ(2)), dump_register(DOEPTSIZ(3)), dump_register(DOEPTSIZ(4)), dump_register(DOEPTSIZ(5)), dump_register(DOEPTSIZ(6)), dump_register(DOEPTSIZ(7)), dump_register(DOEPTSIZ(8)), dump_register(DOEPTSIZ(9)), dump_register(DOEPTSIZ(10)), dump_register(DOEPTSIZ(11)), dump_register(DOEPTSIZ(12)), dump_register(DOEPTSIZ(13)), dump_register(DOEPTSIZ(14)), dump_register(DOEPTSIZ(15)), dump_register(DIEPDMA(0)), dump_register(DIEPDMA(1)), dump_register(DIEPDMA(2)), dump_register(DIEPDMA(3)), dump_register(DIEPDMA(4)), dump_register(DIEPDMA(5)), dump_register(DIEPDMA(6)), dump_register(DIEPDMA(7)), dump_register(DIEPDMA(8)), dump_register(DIEPDMA(9)), dump_register(DIEPDMA(10)), dump_register(DIEPDMA(11)), dump_register(DIEPDMA(12)), dump_register(DIEPDMA(13)), dump_register(DIEPDMA(14)), dump_register(DIEPDMA(15)), dump_register(DOEPDMA(0)), dump_register(DOEPDMA(1)), dump_register(DOEPDMA(2)), dump_register(DOEPDMA(3)), dump_register(DOEPDMA(4)), dump_register(DOEPDMA(5)), dump_register(DOEPDMA(6)), dump_register(DOEPDMA(7)), dump_register(DOEPDMA(8)), dump_register(DOEPDMA(9)), dump_register(DOEPDMA(10)), dump_register(DOEPDMA(11)), dump_register(DOEPDMA(12)), dump_register(DOEPDMA(13)), dump_register(DOEPDMA(14)), dump_register(DOEPDMA(15)), dump_register(DTXFSTS(0)), dump_register(DTXFSTS(1)), dump_register(DTXFSTS(2)), dump_register(DTXFSTS(3)), dump_register(DTXFSTS(4)), dump_register(DTXFSTS(5)), dump_register(DTXFSTS(6)), dump_register(DTXFSTS(7)), dump_register(DTXFSTS(8)), dump_register(DTXFSTS(9)), dump_register(DTXFSTS(10)), dump_register(DTXFSTS(11)), dump_register(DTXFSTS(12)), dump_register(DTXFSTS(13)), dump_register(DTXFSTS(14)), dump_register(DTXFSTS(15)), dump_register(PCGCTL), dump_register(HCFG), dump_register(HFIR), dump_register(HFNUM), dump_register(HPTXSTS), dump_register(HAINT), dump_register(HAINTMSK), dump_register(HFLBADDR), dump_register(HPRT0), dump_register(HCCHAR(0)), dump_register(HCCHAR(1)), dump_register(HCCHAR(2)), dump_register(HCCHAR(3)), dump_register(HCCHAR(4)), dump_register(HCCHAR(5)), dump_register(HCCHAR(6)), dump_register(HCCHAR(7)), dump_register(HCCHAR(8)), dump_register(HCCHAR(9)), dump_register(HCCHAR(10)), dump_register(HCCHAR(11)), dump_register(HCCHAR(12)), dump_register(HCCHAR(13)), dump_register(HCCHAR(14)), dump_register(HCCHAR(15)), dump_register(HCSPLT(0)), dump_register(HCSPLT(1)), dump_register(HCSPLT(2)), dump_register(HCSPLT(3)), dump_register(HCSPLT(4)), dump_register(HCSPLT(5)), dump_register(HCSPLT(6)), dump_register(HCSPLT(7)), dump_register(HCSPLT(8)), dump_register(HCSPLT(9)), dump_register(HCSPLT(10)), dump_register(HCSPLT(11)), dump_register(HCSPLT(12)), dump_register(HCSPLT(13)), dump_register(HCSPLT(14)), dump_register(HCSPLT(15)), dump_register(HCINT(0)), dump_register(HCINT(1)), dump_register(HCINT(2)), dump_register(HCINT(3)), dump_register(HCINT(4)), dump_register(HCINT(5)), dump_register(HCINT(6)), dump_register(HCINT(7)), dump_register(HCINT(8)), dump_register(HCINT(9)), dump_register(HCINT(10)), dump_register(HCINT(11)), dump_register(HCINT(12)), dump_register(HCINT(13)), dump_register(HCINT(14)), dump_register(HCINT(15)), dump_register(HCINTMSK(0)), dump_register(HCINTMSK(1)), dump_register(HCINTMSK(2)), dump_register(HCINTMSK(3)), dump_register(HCINTMSK(4)), dump_register(HCINTMSK(5)), dump_register(HCINTMSK(6)), dump_register(HCINTMSK(7)), dump_register(HCINTMSK(8)), dump_register(HCINTMSK(9)), dump_register(HCINTMSK(10)), dump_register(HCINTMSK(11)), dump_register(HCINTMSK(12)), dump_register(HCINTMSK(13)), dump_register(HCINTMSK(14)), dump_register(HCINTMSK(15)), dump_register(HCTSIZ(0)), dump_register(HCTSIZ(1)), dump_register(HCTSIZ(2)), dump_register(HCTSIZ(3)), dump_register(HCTSIZ(4)), dump_register(HCTSIZ(5)), dump_register(HCTSIZ(6)), dump_register(HCTSIZ(7)), dump_register(HCTSIZ(8)), dump_register(HCTSIZ(9)), dump_register(HCTSIZ(10)), dump_register(HCTSIZ(11)), dump_register(HCTSIZ(12)), dump_register(HCTSIZ(13)), dump_register(HCTSIZ(14)), dump_register(HCTSIZ(15)), dump_register(HCDMA(0)), dump_register(HCDMA(1)), dump_register(HCDMA(2)), dump_register(HCDMA(3)), dump_register(HCDMA(4)), dump_register(HCDMA(5)), dump_register(HCDMA(6)), dump_register(HCDMA(7)), dump_register(HCDMA(8)), dump_register(HCDMA(9)), dump_register(HCDMA(10)), dump_register(HCDMA(11)), dump_register(HCDMA(12)), dump_register(HCDMA(13)), dump_register(HCDMA(14)), dump_register(HCDMA(15)), dump_register(HCDMAB(0)), dump_register(HCDMAB(1)), dump_register(HCDMAB(2)), dump_register(HCDMAB(3)), dump_register(HCDMAB(4)), dump_register(HCDMAB(5)), dump_register(HCDMAB(6)), dump_register(HCDMAB(7)), dump_register(HCDMAB(8)), dump_register(HCDMAB(9)), dump_register(HCDMAB(10)), dump_register(HCDMAB(11)), dump_register(HCDMAB(12)), dump_register(HCDMAB(13)), dump_register(HCDMAB(14)), dump_register(HCDMAB(15)), }; int dwc2_debugfs_init(struct dwc2_hsotg *hsotg) { int ret; struct dentry *file; hsotg->debug_root = debugfs_create_dir(dev_name(hsotg->dev), NULL); if (!hsotg->debug_root) { ret = -ENOMEM; goto err0; } /* Add gadget debugfs nodes */ dwc2_hsotg_create_debug(hsotg); hsotg->regset = devm_kzalloc(hsotg->dev, sizeof(*hsotg->regset), GFP_KERNEL); if (!hsotg->regset) { ret = -ENOMEM; goto err1; } hsotg->regset->regs = dwc2_regs; hsotg->regset->nregs = ARRAY_SIZE(dwc2_regs); hsotg->regset->base = hsotg->regs; file = debugfs_create_regset32("regdump", S_IRUGO, hsotg->debug_root, hsotg->regset); if (!file) { ret = -ENOMEM; goto err1; } return 0; err1: debugfs_remove_recursive(hsotg->debug_root); err0: return ret; } void dwc2_debugfs_exit(struct dwc2_hsotg *hsotg) { debugfs_remove_recursive(hsotg->debug_root); hsotg->debug_root = NULL; } ge to default COLLECT_METADATA behaviour. These changes only apply to COLLECT_METADATA when used with the bridging use-case with a special dst_metadata tunnel info flag (eg: where vxlan device is part of a bridge). For all this to work, the vxlan driver will need to now support a single fdb table hashed by mac + vni. This series essentially makes this happen. use-case and workflow: vxlan collect metadata device participates in bridging vlan to vn-segments. Bridge driver above the vxlan device, sends the vni corresponding to the vlan in the dst_metadata. vxlan driver will lookup forwarding database with (mac + vni) for the required remote destination information to forward the packet. Changes introduced by this patch: - allow learning and forwarding database state in vxlan netdev in COLLECT_METADATA mode. Current behaviour is not changed by default. tunnel info flag IP_TUNNEL_INFO_BRIDGE is used to support the new bridge friendly mode. - A single fdb table hashed by (mac, vni) to allow fdb entries with multiple vnis in the same fdb table - rx path already has the vni - tx path expects a vni in the packet with dst_metadata - prior to this series, fdb remote_dsts carried remote vni and the vxlan device carrying the fdb table represented the source vni. With the vxlan device now representing multiple vnis, this patch adds a src vni attribute to the fdb entry. The remote vni already uses NDA_VNI attribute. This patch introduces NDA_SRC_VNI netlink attribute to represent the src vni in a multi vni fdb table. iproute2 example (patched and pruned iproute2 output to just show relevant fdb entries): example shows same host mac learnt on two vni's. before (netdev per vni): $bridge fdb show | grep "00:02:00:00:00:03" 00:02:00:00:00:03 dev vxlan1001 dst 12.0.0.8 self 00:02:00:00:00:03 dev vxlan1000 dst 12.0.0.8 self after this patch with collect metadata in bridged mode (single netdev): $bridge fdb show | grep "00:02:00:00:00:03" 00:02:00:00:00:03 dev vxlan0 src_vni 1001 dst 12.0.0.8 self 00:02:00:00:00:03 dev vxlan0 src_vni 1000 dst 12.0.0.8 self Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com> Signed-off-by: David S. Miller <davem@davemloft.net> 2017-02-03ip_tunnels: new IP_TUNNEL_INFO_BRIDGE flag for ip_tunnel_info modeRoopa Prabhu1-0/+1 New ip_tunnel_info flag to represent bridged tunnel metadata. Used by bridge driver later in the series to pass per vlan dst metadata to bridge ports. Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com> Signed-off-by: David S. Miller <davem@davemloft.net> 2017-02-03net/sched: act_ife: Change to use ife moduleYotam Gigi2-10/+1 Use the encode/decode functionality from the ife module instead of using implementation inside the act_ife. Reviewed-by: Jiri Pirko <jiri@mellanox.com> Signed-off-by: Yotam Gigi <yotamg@mellanox.com> Signed-off-by: Jamal Hadi Salim <jhs@mojatatu.com> Signed-off-by: Roman Mashak <mrv@mojatatu.com> Signed-off-by: David S. Miller <davem@davemloft.net> 2017-02-03net: Introduce ife encapsulation moduleYotam Gigi3-0/+70 This module is responsible for the ife encapsulation protocol encode/decode logics. That module can: - ife_encode: encode skb and reserve space for the ife meta header - ife_decode: decode skb and extract the meta header size - ife_tlv_meta_encode - encodes one tlv entry into the reserved ife header space. - ife_tlv_meta_decode - decodes one tlv entry from the packet - ife_tlv_meta_next - advance to the next tlv Reviewed-by: Jiri Pirko <jiri@mellanox.com> Signed-off-by: Yotam Gigi <yotamg@mellanox.com> Signed-off-by: Jamal Hadi Salim <jhs@mojatatu.com> Signed-off-by: Roman Mashak <mrv@mojatatu.com> Signed-off-by: David S. Miller <davem@davemloft.net> 2017-02-03net/sched: act_ife: Unexport ife_tlv_meta_encodeYotam Gigi1-2/+0 As the function ife_tlv_meta_encode is not used by any other module, unexport it and make it static for the act_ife module. Signed-off-by: Yotam Gigi <yotamg@mellanox.com> Signed-off-by: Jamal Hadi Salim <jhs@mojatatu.com> Signed-off-by: Roman Mashak <mrv@mojatatu.com> Signed-off-by: David S. Miller <davem@davemloft.net> 2017-02-03tcp: add tcp_mss_clamp() helperEric Dumazet1-0/+9 Small cleanup factorizing code doing the TCP_MAXSEG clamping. Signed-off-by: Eric Dumazet <edumazet@google.com> Signed-off-by: David S. Miller <davem@davemloft.net> 2017-02-02net: add LINUX_MIB_PFMEMALLOCDROP counterEric Dumazet1-0/+1 Debugging issues caused by pfmemalloc is often tedious. Add a new SNMP counter to more easily diagnose these problems. Signed-off-by: Eric Dumazet <edumazet@google.com> Cc: Josef Bacik <jbacik@fb.com> Acked-by: Josef Bacik <jbacik@fb.com> Signed-off-by: David S. Miller <davem@davemloft.net> 2017-02-02net: phy: marvell: Add support for 88e1545 PHYAndrew Lunn1-0/+1 The 88e1545 PHYs are discrete Marvell PHYs, found in a quad package on the zii-devel-b board. Add support for it to the Marvell PHY driver. Signed-off-by: Andrew Lunn <andrew@lunn.ch> Reviewed-by: Florian Fainelli <f.fainelli@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net> 2017-02-02unix: add ioctl to open a unix socket file with O_PATHAndrey Vagin1-0/+2 This ioctl opens a file to which a socket is bound and returns a file descriptor. The caller has to have CAP_NET_ADMIN in the socket network namespace. Currently it is impossible to get a path and a mount point for a socket file. socket_diag reports address, device ID and inode number for unix sockets. An address can contain a relative path or a file may be moved somewhere. And these properties say nothing about a mount namespace and a mount point of a socket file. With the introduced ioctl, we can get a path by reading /proc/self/fd/X and get mnt_id from /proc/self/fdinfo/X. In CRIU we are going to use this ioctl to dump and restore unix socket. Here is an example how it can be used: $ strace -e socket,bind,ioctl ./test /tmp/test_sock socket(AF_UNIX, SOCK_STREAM, 0) = 3 bind(3, {sa_family=AF_UNIX, sun_path="test_sock"}, 11) = 0 ioctl(3, SIOCUNIXFILE, 0) = 4 ^Z $ ss -a | grep test_sock u_str LISTEN 0 1 test_sock 17798 * 0 $ ls -l /proc/760/fd/{3,4} lrwx------ 1 root root 64 Feb 1 09:41 3 -> 'socket:[17798]' l--------- 1 root root 64 Feb 1 09:41 4 -> /tmp/test_sock $ cat /proc/760/fdinfo/4 pos: 0 flags: 012000000 mnt_id: 40 $ cat /proc/self/mountinfo | grep "^40\s" 40 19 0:37 / /tmp rw shared:23 - tmpfs tmpfs rw Signed-off-by: Andrei Vagin <avagin@openvz.org> Signed-off-by: David S. Miller <davem@davemloft.net> 2017-02-02net: phy: Marvell: Add mv88e6390 internal PHYAndrew Lunn1-0/+6 The mv88e6390 Ethernet switch has internal PHYs. These PHYs don't have an model ID in the ID2 register. So the MDIO driver in the switch intercepts reads to this register, and returns the switch family ID. Extend the Marvell PHY driver by including this ID, and treat the PHY as a 88E1540. Signed-off-by: Andrew Lunn <andrew@lunn.ch> Reviewed-by: Florian Fainelli <f.fainelli@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net> 2017-02-02Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller9-30/+40 All merge conflicts were simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net> 2017-02-02netfilter: allow logging from non-init namespacesMichal Kubeček1-0/+3 Commit 69b34fb996b2 ("netfilter: xt_LOG: add net namespace support for xt_LOG") disabled logging packets using the LOG target from non-init namespaces. The motivation was to prevent containers from flooding kernel log of the host. The plan was to keep it that way until syslog namespace implementation allows containers to log in a safe way. However, the work on syslog namespace seems to have hit a dead end somewhere in 2013 and there are users who want to use xt_LOG in all network namespaces. This patch allows to do so by setting /proc/sys/net/netfilter/nf_log_all_netns to a nonzero value. This sysctl is only accessible from init_net so that one cannot switch the behaviour from inside a container. Signed-off-by: Michal Kubecek <mkubecek@suse.cz> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> 2017-02-02ipvs: free ip_vs_dest structs when refcnt=0David Windsor1-1/+1 Currently, the ip_vs_dest cache frees ip_vs_dest objects when their reference count becomes < 0. Aside from not being semantically sound, this is problematic for the new type refcount_t, which will be introduced shortly in a separate patch. refcount_t is the new kernel type for holding reference counts, and provides overflow protection and a constrained interface relative to atomic_t (the type currently being used for kernel reference counts). Per Julian Anastasov: "The problem is that dest_trash currently holds deleted dests (unlinked from RCU lists) with refcnt=0." Changing dest_trash to hold dest with refcnt=1 will allow us to free ip_vs_dest structs when their refcnt=0, in ip_vs_dest_put_and_free(). Signed-off-by: David Windsor <dwindsor@gmail.com> Signed-off-by: Julian Anastasov <ja@ssi.bg> Signed-off-by: Simon Horman <horms@verge.net.au> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> 2017-02-02netfilter: merge ctinfo into nfct pointer storage areaFlorian Westphal2-17/+15 After this change conntrack operations (lookup, creation, matching from ruleset) only access one instead of two sk_buff cache lines. This works for normal conntracks because those are allocated from a slab that guarantees hw cacheline or 8byte alignment (whatever is larger) so the 3 bits needed for ctinfo won't overlap with nf_conn addresses. Template allocation now does manual address alignment (see previous change) on arches that don't have sufficent kmalloc min alignment. Some spots intentionally use skb->_nfct instead of skb_nfct() helpers, this is to avoid undoing the skb_nfct() use when we remove untracked conntrack object in the future. Signed-off-by: Florian Westphal <fw@strlen.de> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> 2017-02-02netfilter: guarantee 8 byte minalign for template addressesFlorian Westphal1-0/+2 The next change will merge skb->nfct pointer and skb->nfctinfo status bits into single skb->_nfct (unsigned long) area. For this to work nf_conn addresses must always be aligned at least on an 8 byte boundary since we will need the lower 3bits to store nfctinfo. Conntrack templates are allocated via kmalloc. kbuild test robot reported BUILD_BUG_ON failed: NFCT_INFOMASK >= ARCH_KMALLOC_MINALIGN on v1 of this patchset, so not all platforms meet this requirement. Do manual alignment if needed, the alignment offset is stored in the nf_conn entry protocol area. This works because templates are not handed off to L4 protocol trackers. Reported-by: kbuild test robot <fengguang.wu@intel.com> Signed-off-by: Florian Westphal <fw@strlen.de> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> 2017-02-02netfilter: add and use nf_ct_set helperFlorian Westphal2-2/+9 Add a helper to assign a nf_conn entry and the ctinfo bits to an sk_buff. This avoids changing code in followup patch that merges skb->nfct and skb->nfctinfo into skb->_nfct. Signed-off-by: Florian Westphal <fw@strlen.de> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> 2017-02-02skbuff: add and use skb_nfct helperFlorian Westphal2-4/+11 Followup patch renames skb->nfct and changes its type so add a helper to avoid intrusive rename change later. Signed-off-by: Florian Westphal <fw@strlen.de> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> 2017-02-02netfilter: reduce direct skb->nfct usageFlorian Westphal1-3/+6 Next patch makes direct skb->nfct access illegal, reduce noise in next patch by using accessors we already have. Signed-off-by: Florian Westphal <fw@strlen.de> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> 2017-02-02netfilter: conntrack: no need to pass ctinfo to error handlerFlorian Westphal1-1/+1 It is never accessed for reading and the only places that write to it are the icmp(6) handlers, which also set skb->nfct (and skb->nfctinfo). The conntrack core specifically checks for attached skb->nfct after ->error() invocation and returns early in this case. Signed-off-by: Florian Westphal <fw@strlen.de> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>