linux.git/net/can, branch v4.13

networking: introduce and use skb_put_data()

2017-06-16T15:48:37+00:00

A common pattern with skb_put() is to just want to memcpy()
some data into the new space, introduce skb_put_data() for
this.

An spatch similar to the one for skb_put_zero() converts many
of the places using it:

    @@
    identifier p, p2;
    expression len, skb, data;
    type t, t2;
    @@
    (
    -p = skb_put(skb, len);
    +p = skb_put_data(skb, data, len);
    |
    -p = (t)skb_put(skb, len);
    +p = skb_put_data(skb, data, len);
    )
    (
    p2 = (t2)p;
    -memcpy(p2, data, len);
    |
    -memcpy(p, data, len);
    )

    @@
    type t, t2;
    identifier p, p2;
    expression skb, data;
    @@
    t *p;
    ...
    (
    -p = skb_put(skb, sizeof(t));
    +p = skb_put_data(skb, data, sizeof(t));
    |
    -p = (t *)skb_put(skb, sizeof(t));
    +p = skb_put_data(skb, data, sizeof(t));
    )
    (
    p2 = (t2)p;
    -memcpy(p2, data, sizeof(*p));
    |
    -memcpy(p, data, sizeof(*p));
    )

    @@
    expression skb, len, data;
    @@
    -memcpy(skb_put(skb, len), data, len);
    +skb_put_data(skb, data, len);

(again, manually post-processed to retain some comments)

Reviewed-by: Stephen Hemminger 
Signed-off-by: Johannes Berg 
Signed-off-by: David S. Miller

can: af_can: namespace support: fix lockdep splat: properly initialize spin_lock

2017-06-09T09:39:23+00:00

This patch uses spin_lock_init() instead of __SPIN_LOCK_UNLOCKED() to
initialize the per namespace net->can.can_rcvlists_lock lock to fix this
lockdep warning:

| INFO: trying to register non-static key.
| the code is fine but needs lockdep annotation.
| turning off the locking correctness validator.
| CPU: 0 PID: 186 Comm: candump Not tainted 4.12.0-rc3+ #47
| Hardware name: Marvell Kirkwood (Flattened Device Tree)
| [] (unwind_backtrace) from [] (show_stack+0x18/0x1c)
| [] (show_stack) from [] (register_lock_class+0x1e4/0x55c)
| [] (register_lock_class) from [] (__lock_acquire+0x148/0x1990)
| [] (__lock_acquire) from [] (lock_acquire+0x174/0x210)
| [] (lock_acquire) from [] (_raw_spin_lock+0x50/0x88)
| [] (_raw_spin_lock) from [] (can_rx_register+0x94/0x15c [can])
| [] (can_rx_register [can]) from [] (raw_enable_filters+0x60/0xc0 [can_raw])
| [] (raw_enable_filters [can_raw]) from [] (raw_enable_allfilters+0x2c/0xa0 [can_raw])
| [] (raw_enable_allfilters [can_raw]) from [] (raw_bind+0xb0/0x250 [can_raw])
| [] (raw_bind [can_raw]) from [] (SyS_bind+0x70/0xac)
| [] (SyS_bind) from [] (ret_fast_syscall+0x0/0x1c)

Cc: Mario Kicherer 
Acked-by: Oliver Hartkopp 
Signed-off-by: Marc Kleine-Budde

can: fix CAN BCM build with CONFIG_PROC_FS disabled

2017-04-27T07:34:13+00:00

The introduced namespace support moved the BCM variables for procfs into a
per-net data structure. This leads to a build failure with disabled procfs:

on x86_64:

when CONFIG_PROC_FS is not enabled:

../net/can/bcm.c:1541:14: error: 'struct netns_can' has no member named 'bcmproc_dir'
../net/can/bcm.c:1601:14: error: 'struct netns_can' has no member named 'bcmproc_dir'
../net/can/bcm.c:1696:11: error: 'struct netns_can' has no member named 'bcmproc_dir'
../net/can/bcm.c:1707:15: error: 'struct netns_can' has no member named 'bcmproc_dir'

http://marc.info/?l=linux-can&m=149321842526524&w=2

Reported-by: Randy Dunlap 
Signed-off-by: Oliver Hartkopp 
Signed-off-by: Marc Kleine-Budde

can: network namespace support for CAN gateway

2017-04-25T07:04:30+00:00

The CAN gateway was not implemented as per-net in the initial network
namespace support by Mario Kicherer (8e8cda6d737d).
This patch enables the CAN gateway to be used in different namespaces.

Signed-off-by: Oliver Hartkopp 
Signed-off-by: Marc Kleine-Budde

can: network namespace support for CAN_BCM protocol

2017-04-25T07:04:29+00:00

The CAN_BCM protocol and its procfs entries were not implemented as per-net
in the initial network namespace support by Mario Kicherer (8e8cda6d737d).
This patch adds the missing per-net functionality for the CAN BCM.

Signed-off-by: Oliver Hartkopp 
Signed-off-by: Marc Kleine-Budde

can: complete initial namespace support

2017-04-25T07:04:29+00:00

The statistics and its proc output was not implemented as per-net in the
initial network namespace support by Mario Kicherer (8e8cda6d737d).
This patch adds the missing per-net statistics for the CAN subsystem.

Signed-off-by: Oliver Hartkopp 
Signed-off-by: Marc Kleine-Budde

can: remove obsolete definitions

2017-04-25T07:04:28+00:00

can_rx_alldev_list is a per-net data structure now. Remove it's definition
here and can_rx_dev_list too.

Signed-off-by: Oliver Hartkopp 
Signed-off-by: Marc Kleine-Budde

can: remove obsolete pernet_operations definitions

2017-04-25T07:04:28+00:00

The namespace support for the CAN subsystem does not need any additional
memory. So when ".size = 0" there's no extra memory allocated by the system.
And therefore ".id" is obsolete too.

Signed-off-by: Oliver Hartkopp 
Signed-off-by: Marc Kleine-Budde

can: fix memory leak in initial namespace support

2017-04-25T07:04:27+00:00

The can_rx_alldev_list is a per-net data structure now and allocated in
can_pernet_init(). Make sure the memory is free'd in can_pernet_exit() too.

Signed-off-by: Oliver Hartkopp 
Signed-off-by: Marc Kleine-Budde

net: rtnetlink: plumb extended ack to doit function

2017-04-17T19:35:38+00:00

Add netlink_ext_ack arg to rtnl_doit_func. Pass extack arg to nlmsg_parse
for doit functions that call it directly.

This is the first step to using extended error reporting in rtnetlink.
>From here individual subsystems can be updated to set netlink_ext_ack as
needed.

Signed-off-by: David Ahern 
Signed-off-by: David S. Miller