net-next.git - net-next plumbings

summary refs log tree commit diff

Branch	Commit message	Author	Age
emaclite-cleanup	net: xilinx: emaclite: Remove net_device pointer from struct net_local	Tobias Klauser	8 years
master	Merge tag 'docs-4.10' of git://git.lwn.net/linux	Linus Torvalds	8 years
nds-private-remove	usbnet: pegasus: Use net_device_stats from struct net_device	Tobias Klauser	8 years
packet-loop-back	net: packet: Introduce PACKET_XMIT_RECEIVE socket option	Tobias Klauser	8 years
packet-rx-pump-back	net: packet: Introduce PACKET_RX_PUMP_BACK socket option	Tobias Klauser	8 years

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-02Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller1-1/+3 All merge conflicts were simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>