git.osdn.net Git - uclinux-h8/linux.git/log

sock: fix kernel doc error

The symbol '__sk_reclaim' is not present in the current tree. Apparently
'__sk_reclaim' was meant to be '__sk_mem_reclaim', so fix it with the
right symbol name for the kernel doc.

Signed-off-by: Jean Sacren <sakiwit@gmail.com>
Cc: Hideo Aoki <haoki@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

commit | commitdiff | tree

Stephen Rothwell [Fri, 28 Aug 2015 00:10:03 +0000 (10:10 +1000)]

Merge remote-tracking branch 'pm/linux-next'

commit | commitdiff | tree

Stephen Rothwell [Fri, 28 Aug 2015 00:09:18 +0000 (10:09 +1000)]

Merge remote-tracking branch 'libata/for-next'

commit | commitdiff | tree

Stephen Rothwell [Fri, 28 Aug 2015 00:08:11 +0000 (10:08 +1000)]

Merge remote-tracking branch 'kbuild/for-next'

commit | commitdiff | tree

Stephen Rothwell [Thu, 27 Aug 2015 23:56:06 +0000 (09:56 +1000)]

Merge remote-tracking branch 'v4l-dvb/master'

commit | commitdiff | tree

Stephen Rothwell [Thu, 27 Aug 2015 23:55:23 +0000 (09:55 +1000)]

Merge remote-tracking branch 'hwmon-staging/hwmon-next'

commit | commitdiff | tree

Stephen Rothwell [Thu, 27 Aug 2015 23:54:40 +0000 (09:54 +1000)]

Merge branch 'jdelvare-hwmon/master'

commit | commitdiff | tree

Stephen Rothwell [Thu, 27 Aug 2015 23:51:34 +0000 (09:51 +1000)]

Merge remote-tracking branch 'i2c/i2c/for-next'

commit | commitdiff | tree

Stephen Rothwell [Thu, 27 Aug 2015 23:50:45 +0000 (09:50 +1000)]

Merge remote-tracking branch 'hid/for-next'

commit | commitdiff | tree

Stephen Rothwell [Thu, 27 Aug 2015 23:45:56 +0000 (09:45 +1000)]

Merge remote-tracking branch 'pci/next'

commit | commitdiff | tree

Carol L Soto [Thu, 27 Aug 2015 19:43:26 +0000 (14:43 -0500)]

net/mlx4_core: Fix unintialized variable used in error path

The uninitialized value name in mlx4_en_activate_cq was used in order
to print an error message. Fixing it by replacing it with cq->vector.

Signed-off-by: Matan Barak <matanb@mellanox.com>
Signed-off-by: Carol L Soto <clsoto@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

commit | commitdiff | tree

Carol L Soto [Thu, 27 Aug 2015 19:43:25 +0000 (14:43 -0500)]

net/mlx4_core: Capping number of requested MSIXs to MAX_MSIX

We currently manage IRQs in pool_bm which is a bit field
of MAX_MSIX bits. Thus, allocating more than MAX_MSIX
interrupts can't be managed in pool_bm.
Fixing this by capping number of requested MSIXs to
MAX_MSIX.

Signed-off-by: Matan Barak <matanb@mellanox.com>
Signed-off-by: Carol L Soto <clsoto@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

commit | commitdiff | tree

Nikolay Aleksandrov [Thu, 27 Aug 2015 21:19:20 +0000 (14:19 -0700)]

bridge: fdb: rearrange net_bridge_fdb_entry

While looking into fixing the local entries scalability issue I noticed
that the structure is badly arranged because vlan_id would fall in a
second cache line while keeping rcu which is used only when deleting
in the first, so re-arrange the structure and push rcu to the end so we
can get 16 bytes which can be used for other fields (by pushing rcu
fully in the second 64 byte chunk). With this change all the core
necessary information when doing fdb lookups will be available in a
single cache line.

pahole before (note vlan_id):
struct net_bridge_fdb_entry {
struct hlist_node          hlist;                /*     0    16 */
struct net_bridge_port *   dst;                  /*    16     8 */
struct callback_head       rcu;                  /*    24    16 */
long unsigned int          updated;              /*    40     8 */
long unsigned int          used;                 /*    48     8 */
mac_addr                   addr;                 /*    56     6 */
unsigned char              is_local:1;           /*    62: 7  1 */
unsigned char              is_static:1;          /*    62: 6  1 */
unsigned char              added_by_user:1;      /*    62: 5  1 */
unsigned char              added_by_external_learn:1; /*    62: 4  1 */

/* XXX 4 bits hole, try to pack */
/* XXX 1 byte hole, try to pack */

/* --- cacheline 1 boundary (64 bytes) --- */
__u16                      vlan_id;              /*    64     2 */

/* size: 72, cachelines: 2, members: 11 */
/* sum members: 65, holes: 1, sum holes: 1 */
/* bit holes: 1, sum bit holes: 4 bits */
/* padding: 6 */
/* last cacheline: 8 bytes */
}

pahole after (note vlan_id):
struct net_bridge_fdb_entry {
struct hlist_node          hlist;                /*     0    16 */
struct net_bridge_port *   dst;                  /*    16     8 */
long unsigned int          updated;              /*    24     8 */
long unsigned int          used;                 /*    32     8 */
mac_addr                   addr;                 /*    40     6 */
__u16                      vlan_id;              /*    46     2 */
unsigned char              is_local:1;           /*    48: 7  1 */
unsigned char              is_static:1;          /*    48: 6  1 */
unsigned char              added_by_user:1;      /*    48: 5  1 */
unsigned char              added_by_external_learn:1; /*    48: 4  1 */

/* XXX 4 bits hole, try to pack */
/* XXX 7 bytes hole, try to pack */

struct callback_head       rcu;                  /*    56    16 */
/* --- cacheline 1 boundary (64 bytes) was 8 bytes ago --- */

/* size: 72, cachelines: 2, members: 11 */
/* sum members: 65, holes: 1, sum holes: 7 */
/* bit holes: 1, sum bit holes: 4 bits */
/* last cacheline: 8 bytes */
}

Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

commit | commitdiff | tree

David S. Miller [Thu, 27 Aug 2015 23:35:51 +0000 (16:35 -0700)]

Merge branch 'ovs-v6-build-err'

Joe Stringer says:

====================
OPENVSWITCH && !NETFILTER build fix.

Fix issues reported by kbuild test robot:

All error/warnings (new ones prefixed by >>):

   net/openvswitch/actions.c: In function 'ovs_fragment':
>> net/openvswitch/actions.c:705:16: error: implicit declaration of
function 'nf_get_ipv6_ops' [-Werror=implicit-function-declaration]
      const struct nf_ipv6_ops *v6ops = nf_get_ipv6_ops();
                   ^
>> net/openvswitch/actions.c:705:37: warning: initialization makes
pointer from integer without a cast
      const struct nf_ipv6_ops *v6ops = nf_get_ipv6_ops();
                                        ^
>> net/openvswitch/actions.c:707:19: error: storage size of 'ovs_rt'
isn't known
      struct rt6_info ovs_rt;
                      ^
>> net/openvswitch/actions.c:724:8: error: dereferencing pointer to
incomplete type
      v6ops->fragment(skb->sk, skb, ovs_vport_output);
           ^
>> net/openvswitch/actions.c:707:19: warning: unused variable 'ovs_rt'
[-Wunused-variable]
      struct rt6_info ovs_rt;
                      ^
   cc1: some warnings being treated as errors
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

commit | commitdiff | tree

Joe Stringer [Thu, 27 Aug 2015 22:25:46 +0000 (15:25 -0700)]

openvswitch: Include ip6_fib.h.

kbuild test robot reports that certain configurations will not
automatically pick up on the "struct rt6_info" definition, so explicitly
include the header for this structure.

Fixes: 7f8a436 "openvswitch: Add conntrack action"
Signed-off-by: Joe Stringer <joestringer@nicira.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

commit | commitdiff | tree

Joe Stringer [Thu, 27 Aug 2015 22:25:45 +0000 (15:25 -0700)]

netfilter: Define v6ops in !CONFIG_NETFILTER case.

When CONFIG_OPENVSWITCH is set, and CONFIG_NETFILTER is not set, the
openvswitch IPv6 fragmentation handling cannot refer to ipv6_ops because
it isn't defined. Add a dummy version to avoid #ifdefs in source files.

Fixes: 7f8a436 "openvswitch: Add conntrack action"
Signed-off-by: Joe Stringer <joestringer@nicira.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

commit | commitdiff | tree

David S. Miller [Thu, 27 Aug 2015 23:31:17 +0000 (16:31 -0700)]

Merge branch 'mlxsw-small-updates'

Jiri Pirko says:

====================
mlxsw: small driver update

Ido Schimmel (2):
  mlxsw: Remove duplicate included header
  mlxsw: Make mailboxes 4KB aligned

Jiri Pirko (1):
  mlxsw: adjust transmit fail log message level in __mlxsw_emad_transmit
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

commit | commitdiff | tree

Ido Schimmel [Thu, 27 Aug 2015 15:59:57 +0000 (17:59 +0200)]

mlxsw: Make mailboxes 4KB aligned

The HW-SW contract requires mailboxes passed to the firmware to be 4KB
aligned. Previously, these mailboxes were mapped using streaming DMA
routines, which do not guarantee the bus addresses to be 4KB aligned.
Under certain conditions this constraint was indeed violated and errors
were observed.

By using consistent DMA mapping routines together with a mailbox size of
4KB we are guaranteed not to violate the constraint.

Signed-off-by: Ido Schimmel <idosch@mellanox.com>
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

commit | commitdiff | tree

Jiri Pirko [Thu, 27 Aug 2015 15:59:56 +0000 (17:59 +0200)]

mlxsw: adjust transmit fail log message level in __mlxsw_emad_transmit

When transmit fails, it is an error, not a warning.

Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: Ido Schimmel <idosch@mellanox.com>
Signed-off-by: Elad Raz <eladr@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

commit | commitdiff | tree

Ido Schimmel [Thu, 27 Aug 2015 15:59:55 +0000 (17:59 +0200)]

mlxsw: Remove duplicate included header

Signed-off-by: Ido Schimmel <idosch@mellanox.com>
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: Elad Raz <eladr@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

commit | commitdiff | tree

Stephen Rothwell [Thu, 27 Aug 2015 23:30:12 +0000 (09:30 +1000)]

Merge remote-tracking branch 'vfs/for-next'

commit | commitdiff | tree

Stephen Rothwell [Thu, 27 Aug 2015 23:29:18 +0000 (09:29 +1000)]

Merge remote-tracking branch 'xfs/for-next'

commit | commitdiff | tree

David S. Miller [Thu, 27 Aug 2015 23:28:35 +0000 (16:28 -0700)]

Merge branch 'rocker-master-change'

Jiri Pirko says:

====================
rocker: make master change handling nicer

Jiri Pirko (6):
  net: introduce change upper device notifier change info
  net: add netif_is_bridge_master helper
  net: add netif_is_ovs_master helper with IFF_OPENVSWITCH private flag
  net: kill long time unused bonding private flags
  rocker: use new helper to figure out master kind
  rocker: use change upper info
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

commit | commitdiff | tree

Jiri Pirko [Thu, 27 Aug 2015 07:31:23 +0000 (09:31 +0200)]

rocker: use change upper info

Since now information about changed upper is passed along, benefit from
that and use this info directly.

This also fixes possible issues that could happen when non-master device
is added (current code does not distinguish between master and non-master
upper device).

Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Acked-by: Scott Feldman <sfeldma@gmail.com
Signed-off-by: David S. Miller <davem@davemloft.net>

commit | commitdiff | tree

Jiri Pirko [Thu, 27 Aug 2015 07:31:22 +0000 (09:31 +0200)]

rocker: use new helper to figure out master kind

Looking at rtnl kind string is kind of ugly. So use new helpers to do
this in nicer way.

Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Acked-by: Scott Feldman <sfeldma@gmail.com
Signed-off-by: David S. Miller <davem@davemloft.net>

commit | commitdiff | tree

Jiri Pirko [Thu, 27 Aug 2015 07:31:21 +0000 (09:31 +0200)]

net: kill long time unused bonding private flags

We don't use them for years, just kill them now.

Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

commit | commitdiff | tree

Jiri Pirko [Thu, 27 Aug 2015 07:31:20 +0000 (09:31 +0200)]

net: add netif_is_ovs_master helper with IFF_OPENVSWITCH private flag

Add this helper so code can easily figure out if netdev is openswitch.

Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

commit | commitdiff | tree

Jiri Pirko [Thu, 27 Aug 2015 07:31:19 +0000 (09:31 +0200)]

net: add netif_is_bridge_master helper

Add this helper so code can easily figure out if netdev is a bridge.

Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

commit | commitdiff | tree

Jiri Pirko [Thu, 27 Aug 2015 07:31:18 +0000 (09:31 +0200)]

net: introduce change upper device notifier change info

Add info that is passed along with NETDEV_CHANGEUPPER event.

Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

commit | commitdiff | tree

Stephen Rothwell [Thu, 27 Aug 2015 23:28:33 +0000 (09:28 +1000)]

Merge remote-tracking branch 'ubifs/linux-next'

commit | commitdiff | tree

Stephen Rothwell [Thu, 27 Aug 2015 23:27:50 +0000 (09:27 +1000)]

Merge remote-tracking branch 'v9fs/for-next'

commit | commitdiff | tree

Stephen Rothwell [Thu, 27 Aug 2015 23:27:05 +0000 (09:27 +1000)]

Merge remote-tracking branch 'orangefs/for-next'

commit | commitdiff | tree

Stephen Rothwell [Thu, 27 Aug 2015 23:15:19 +0000 (09:15 +1000)]

Merge remote-tracking branch 'nfsd/nfsd-next'