#compdef curvetun # # curvetun.zsh -- zsh completion function for curvetun # # Copyright (C) 2013 Hideo Hattori # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 as # published by the Free Software Foundation. typeset -A opt_args _interfaces () { _wanted interfaces expl 'network interface' \ _net_interfaces _values "Pseudo-device that captures on all interfaces" "any" } _arguments -s -S \ "(-k --keygen)"{-k,--keygen}"[Generate public/private keypair]" \ "(-x --export)"{-x,--export}"[Export your public data for remote servers]" \ "(-C --dumpc)"{-C,--dumpc}"[Dump parsed clients]" \ "(-S --dumps)"{-S,--dumps}"[Dump parsed servers]" \ "(-D --nofork)"{-D,--nofork}"[Do not daemonize]" \ "(-d --dev)"{-d,--dev}"[Networking tunnel device, e.g. tun0]:device:_interfaces" \ {-v,--version}"[Print version]:" \ {-h,--help}"[Print this help]:" \ "(-s --server -N --no-logging -p --port -t --stun -u --udp -4 --ipv4 -6 --ipv6 -c --client)"{-c,--client}"[Client mode, server alias optional]:client:_gnu_generic" \ "(-c --client -s --server)"{-s,--server}"[Server mode]" \ "(-c --client -N --no-logging)"{-N,--no-logging}"[Disable server logging (for better anonymity)]" \ "(-c --client -p --port)"{-p,--port}"[Port number (mandatory)]:port:_gnu_generic" \ "(-c --client -t --stun)"{-t,--stun}"[Show public IP/Port mapping via STUN]:stun:_gnu_generic" \ "(-c --client -u --udp)"{-u,--udp}"[Use UDP as carrier instead of TCP]" \ "(-c --client -4 --ipv4)"{-4,--ipv4}"[Tunnel devices are IPv4]" \ "(-c --client -6 --ipv6)"{-6,--ipv6}"[Tunnel devices are IPv6 (default: same as carrier protocol)]" \ "*::args:_gnu_generic" e' href='/cgit.cgi/linux/net-next.git/commit/?id=658922e57b847bb7112aa67f6441b6bbc6554412'>commitdiff
diff options
context:
space:
mode:
authorDan Williams <dan.j.williams@intel.com>2016-04-30 13:07:06 -0700
committerDan Williams <dan.j.williams@intel.com>2016-04-30 13:07:06 -0700
commit658922e57b847bb7112aa67f6441b6bbc6554412 (patch)
treedcf60a9e207c8e070fddaf11c8979cf6843c13be
parent02da2d72174c61988eb4456b53f405e3ebdebce4 (diff)
libnvdimm, pfn: fix memmap reservation sizing
When configuring a pfn-device instance to allocate the memmap array it needs to account for the fact that vmemmap_populate_hugepages() allocates struct page blocks in HPAGE_SIZE chunks. We need to align the reserved area size to 2MB otherwise arch_add_memory() runs out of memory while establishing the memmap: WARNING: CPU: 0 PID: 496 at arch/x86/mm/init_64.c:704 arch_add_memory+0xe7/0xf0 [..] Call Trace: [<ffffffff8148bdb3>] dump_stack+0x85/0xc2 [<ffffffff810a749b>] __warn+0xcb/0xf0 [<ffffffff810a75cd>] warn_slowpath_null+0x1d/0x20 [<ffffffff8106a497>] arch_add_memory+0xe7/0xf0 [<ffffffff811d2097>] devm_memremap_pages+0x287/0x450 [<ffffffff811d1ffa>] ? devm_memremap_pages+0x1ea/0x450 [<ffffffffa0000298>] __wrap_devm_memremap_pages+0x58/0x70 [nfit_test_iomap] [<ffffffffa0047a58>] pmem_attach_disk+0x318/0x420 [nd_pmem] [<ffffffffa0047bcf>] nd_pmem_probe+0x6f/0x90 [nd_pmem] [<ffffffffa0009469>] nvdimm_bus_probe+0x69/0x110 [libnvdimm] [..] ndbus0: nd_pmem.probe(pfn3.0) = -12 nd_pmem: probe of pfn3.0 failed with error -12 libndctl: ndctl_pfn_enable: pfn3.0: failed to enable Reported-by: Namratha Kothapalli <namratha.n.kothapalli@intel.com> Cc: <stable@vger.kernel.org> Signed-off-by: Dan Williams <dan.j.williams@intel.com>