linux-toradex.git/include, branch v3.18.13

usbnet: Fix tx_bytes statistic running backward in cdc_ncm

2015-04-27T21:13:42+00:00

[ Upstream commit 7a1e890e2168e33fb62d84528e996b8b4b478fea ]

cdc_ncm disagrees with usbnet about how much framing overhead should
be counted in the tx_bytes statistics, and tries 'fix' this by
decrementing tx_bytes on the transmit path.  But statistics must never
be decremented except due to roll-over; this will thoroughly confuse
user-space.  Also, tx_bytes is only incremented by usbnet in the
completion path.

Fix this by requiring drivers that set FLAG_MULTI_FRAME to set a
tx_bytes delta along with the tx_packets count.

Fixes: beeecd42c3b4 ("net: cdc_ncm/cdc_mbim: adding NCM protocol statistics")
Signed-off-by: Ben Hutchings 
Signed-off-by: Bjørn Mork 
Signed-off-by: Sasha Levin

usbnet: Fix tx_packets stat for FLAG_MULTI_FRAME drivers

2015-04-27T21:13:41+00:00

[ Upstream commit 1e9e39f4a29857a396ac7b669d109f697f66695e ]

Currently the usbnet core does not update the tx_packets statistic for
drivers with FLAG_MULTI_PACKET and there is no hook in the TX
completion path where they could do this.

cdc_ncm and dependent drivers are bumping tx_packets stat on the
transmit path while asix and sr9800 aren't updating it at all.

Add a packet count in struct skb_data so these drivers can fill it
in, initialise it to 1 for other drivers, and add the packet count
to the tx_packets statistic on completion.

Signed-off-by: Ben Hutchings 
Tested-by: Bjørn Mork 
Signed-off-by: David S. Miller 
Signed-off-by: Sasha Levin

vlan: introduce *vlan_hwaccel_push_inside helpers

2015-04-27T20:48:34+00:00

[ Upstream commit 5968250c868ceee680aa77395b24e6ddcae17d36 ]

Use them to push skb->vlan_tci into the payload and avoid code
duplication.

Signed-off-by: Jiri Pirko 
Acked-by: Pravin B Shelar 
Signed-off-by: David S. Miller 
Signed-off-by: Sasha Levin

vlan: rename __vlan_put_tag to vlan_insert_tag_set_proto

2015-04-27T20:48:33+00:00

[ Upstream commit 62749e2cb3c4a7da3eaa5c01a7e787aebeff8536 ]

Name fits better. Plus there's going to be introduced
__vlan_insert_tag later on.

Signed-off-by: Jiri Pirko 
Acked-by: Pravin B Shelar 
Signed-off-by: David S. Miller 
Signed-off-by: Sasha Levin

vlan: kill vlan_put_tag helper

2015-04-27T20:48:33+00:00

[ Upstream commit b4bef1b57544b18899eb15569e3bafd8d2eeeff6 ]

Since both tx and rx paths work with skb->vlan_tci, there's no need for
this function anymore. Switch users directly to __vlan_hwaccel_put_tag.

Signed-off-by: Jiri Pirko 
Signed-off-by: David S. Miller 
Signed-off-by: Sasha Levin

ipv6: protect skb->sk accesses from recursive dereference inside the stack

2015-04-27T20:48:28+00:00

[ Upstream commit f60e5990d9c1424af9dbca60a23ba2a1c7c1ce90 ]

We should not consult skb->sk for output decisions in xmit recursion
levels > 0 in the stack. Otherwise local socket settings could influence
the result of e.g. tunnel encapsulation process.

ipv6 does not conform with this in three places:

1) ip6_fragment: we do consult ipv6_npinfo for frag_size

2) sk_mc_loop in ipv6 uses skb->sk and checks if we should
   loop the packet back to the local socket

3) ip6_skb_dst_mtu could query the settings from the user socket and
   force a wrong MTU

Furthermore:
In sk_mc_loop we could potentially land in WARN_ON(1) if we use a
PF_PACKET socket ontop of an IPv6-backed vxlan device.

Reuse xmit_recursion as we are currently only interested in protecting
tunnel devices.

Cc: Jiri Pirko 
Signed-off-by: Hannes Frederic Sowa 
Signed-off-by: David S. Miller 
Signed-off-by: Sasha Levin

kernel: Change ASSIGN_ONCE(val, x) to WRITE_ONCE(x, val)

2015-04-27T20:48:19+00:00

[ Upstream commit 43239cbe79fc369f5d2160bd7f69e28b5c50a58c ]

Feedback has shown that WRITE_ONCE(x, val) is easier to use than
ASSIGN_ONCE(val,x).
There are no in-tree users yet, so lets change it for 3.19.

Signed-off-by: Christian Borntraeger 
Acked-by: Peter Zijlstra 
Acked-by: Davidlohr Bueso 
Acked-by: Paul E. McKenney 
Signed-off-by: Sasha Levin

kernel: Provide READ_ONCE and ASSIGN_ONCE

2015-04-27T03:02:56+00:00

[ Upstream commit 230fa253df6352af12ad0a16128760b5cb3f92df ]

ACCESS_ONCE does not work reliably on non-scalar types. For
example gcc 4.6 and 4.7 might remove the volatile tag for such
accesses during the SRA (scalar replacement of aggregates) step
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58145)

Let's provide READ_ONCE/ASSIGN_ONCE that will do all accesses via
scalar types as suggested by Linus Torvalds. Accesses larger than
the machines word size cannot be guaranteed to be atomic. These
macros will use memcpy and emit a build warning.

Signed-off-by: Christian Borntraeger 
Signed-off-by: Sasha Levin

cpuidle: remove state_count field from struct cpuidle_device

2015-04-24T21:13:56+00:00

[ Upstream commit d75e4af14e228bbe3f86e29bcecb8e6be98d4e04 ]

Thomas Schlichter reports the following issue on his Samsung NC20:

"The C-states C1 and C2 to the OS when connected to AC, and additionally
 provides the C3 C-state when disconnected from AC.  However, the number
 of C-states shown in sysfs is fixed to the number of C-states present
 at boot.
   If I boot with AC connected, I always only see the C-states up to C2
   even if I disconnect AC.

   The reason is commit 130a5f692425 (ACPI / cpuidle: remove dev->state_count
   setting).  It removes the update of dev->state_count, but sysfs uses
   exactly this variable to show the C-states.

   The fix is to use drv->state_count in sysfs.  As this is currently the
   last user of dev->state_count, this variable can be completely removed."

Remove dev->state_count as per the above.

Reported-by: Thomas Schlichter 
Signed-off-by: Bartlomiej Zolnierkiewicz 
Signed-off-by: Kyungmin Park 
Acked-by: Daniel Lezcano 
Cc: 3.14+  # 3.14+
[ rjw: Changelog ]
Signed-off-by: Rafael J. Wysocki 

Signed-off-by: Sasha Levin

Defer processing of REQ_PREEMPT requests for blocked devices

2015-04-24T21:13:49+00:00

[ Upstream commit bba0bdd7ad4713d82338bcd9b72d57e9335a664b ]

SCSI transport drivers and SCSI LLDs block a SCSI device if the
transport layer is not operational. This means that in this state
no requests should be processed, even if the REQ_PREEMPT flag has
been set. This patch avoids that a rescan shortly after a cable
pull sporadically triggers the following kernel oops:

BUG: unable to handle kernel paging request at ffffc9001a6bc084
IP: [] mlx4_ib_post_send+0xd2/0xb30 [mlx4_ib]
Process rescan-scsi-bus (pid: 9241, threadinfo ffff88053484a000, task ffff880534aae100)
Call Trace:
 [] srp_post_send+0x65/0x70 [ib_srp]
 [] srp_queuecommand+0x1cf/0x3e0 [ib_srp]
 [] scsi_dispatch_cmd+0x101/0x280 [scsi_mod]
 [] scsi_request_fn+0x411/0x4d0 [scsi_mod]
 [] __blk_run_queue+0x27/0x30
 [] blk_execute_rq_nowait+0x82/0x110
 [] blk_execute_rq+0x62/0xf0
 [] scsi_execute+0xe8/0x190 [scsi_mod]
 [] scsi_execute_req+0xa3/0x130 [scsi_mod]
 [] scsi_probe_lun+0x17a/0x450 [scsi_mod]
 [] scsi_probe_and_add_lun+0x156/0x480 [scsi_mod]
 [] __scsi_scan_target+0xdf/0x1f0 [scsi_mod]
 [] scsi_scan_host_selected+0x183/0x1c0 [scsi_mod]
 [] scsi_scan+0xdb/0xe0 [scsi_mod]
 [] store_scan+0x13/0x20 [scsi_mod]
 [] sysfs_write_file+0xcb/0x160
 [] vfs_write+0xce/0x140
 [] sys_write+0x53/0xa0
 [] system_call_fastpath+0x16/0x1b
 [<00007f611c9d9300>] 0x7f611c9d92ff

Reported-by: Max Gurtuvoy 
Signed-off-by: Bart Van Assche 
Reviewed-by: Mike Christie 
Cc: 
Signed-off-by: James Bottomley 
Signed-off-by: Sasha Levin