1. 04 4月, 2017 31 次提交
  2. 03 4月, 2017 7 次提交
    • D
      Merge branch 'rds-minor-bug-fixes' · d4f4b915
      David S. Miller 提交于
      Sowmini Varadhan says:
      
      ====================
      rds: tcp: couple of minor bug fixes
      
      A couple of minor bugfixes that showed up during testing
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      d4f4b915
    • S
      rds: tcp: canonical connection order for all paths with index > 0 · 087d9753
      Sowmini Varadhan 提交于
      The rds_connect_worker() has a bug in the check that enforces the
      canonical connection order described in the comments of
      rds_tcp_state_change(). The intention is to make sure that all
      the multipath connections are always initiated by the smaller IP
      address via rds_start_mprds. To achieve this, rds_connection_worker
      should check that cp_index > 0.
      Signed-off-by: NSowmini Varadhan <sowmini.varadhan@oracle.com>
      Acked-by: NSantosh Shilimkar <santosh.shilimkar@oracle.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      087d9753
    • S
      rds: tcp: allow progress of rds_conn_shutdown if the rds_connection is marked... · e97656d0
      Sowmini Varadhan 提交于
      rds: tcp: allow progress of rds_conn_shutdown if the rds_connection is marked ERROR by an intervening FIN
      
      rds_conn_shutdown() runs in workq context, and marks the rds_connection
      as DISCONNECTING before quiescing Tx/Rx paths. However, after all I/O
      has quiesced, we may still find the rds_connection state to be
      RDS_CONN_ERROR if an intervening FIN was processed in softirq context.
      
      This is not a fatal error: rds_conn_shutdown() should continue the
      shutdown, and there is no need to log noisy messages about this event.
      Signed-off-by: NSowmini Varadhan <sowmini.varadhan@oracle.com>
      Acked-by: NSantosh Shilimkar <santosh.shilimkar@oracle.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      e97656d0
    • E
      sock: correctly test SOCK_TIMESTAMP in sock_recv_ts_and_drops() · d3fbff30
      Eric Dumazet 提交于
      It seems the code does not match the intent.
      
      This broke packetdrill, and probably other programs.
      
      Fixes: 6c7c98ba ("sock: avoid dirtying sk_stamp, if possible")
      Signed-off-by: NEric Dumazet <edumazet@google.com>
      Cc: Paolo Abeni <pabeni@redhat.com>
      Acked-by: NPaolo Abeni <pabeni@redhat.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      d3fbff30
    • A
      drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c: fix build with gcc-4.4.4 · e270e966
      Andrew Morton 提交于
      drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c: In function 'mlx5e_set_rxfh':
      drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c:1067: error: unknown field 'rss' specified in initializer
      drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c:1067: warning: missing braces around initializer
      drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c:1067: warning: (near initialization for 'rrp.<anonymous>')
      drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c:1068: error: unknown field 'rss' specified in initializer
      drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c:1069: warning: excess elements in struct initializer
      drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c:1069: warning: (near initialization for 'rrp')
      
      gcc-4.4.4 has issues with anonymous union initializers.  Work around this.
      
      Cc: Saeed Mahameed <saeedm@mellanox.com>
      Cc: Tariq Toukan <tariqt@mellanox.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      e270e966
    • A
      drivers/net/ethernet/mellanox/mlx5/core/en_main.c: fix build with gcc-4.4.4 · 95632791
      Andrew Morton 提交于
      drivers/net/ethernet/mellanox/mlx5/core/en_main.c: In function 'mlx5e_redirect_rqts':
      drivers/net/ethernet/mellanox/mlx5/core/en_main.c:2210: error: unknown field 'rqn' specified in initializer
      drivers/net/ethernet/mellanox/mlx5/core/en_main.c:2211: warning: missing braces around initializer
      drivers/net/ethernet/mellanox/mlx5/core/en_main.c:2211: warning: (near initialization for 'direct_rrp.<anonymous>')
      drivers/net/ethernet/mellanox/mlx5/core/en_main.c: In function 'mlx5e_redirect_rqts_to_channels':
      drivers/net/ethernet/mellanox/mlx5/core/en_main.c:2227: error: unknown field 'rss' specified in initializer
      drivers/net/ethernet/mellanox/mlx5/core/en_main.c:2227: warning: missing braces around initializer
      drivers/net/ethernet/mellanox/mlx5/core/en_main.c:2227: warning: (near initialization for 'rrp.<anonymous>')
      drivers/net/ethernet/mellanox/mlx5/core/en_main.c:2227: warning: initialization makes integer from pointer without a cast
      drivers/net/ethernet/mellanox/mlx5/core/en_main.c:2228: error: unknown field 'rss' specified in initializer
      drivers/net/ethernet/mellanox/mlx5/core/en_main.c:2229: warning: excess elements in struct initializer
      drivers/net/ethernet/mellanox/mlx5/core/en_main.c:2229: warning: (near initialization for 'rrp')
      drivers/net/ethernet/mellanox/mlx5/core/en_main.c: In function 'mlx5e_redirect_rqts_to_drop':
      drivers/net/ethernet/mellanox/mlx5/core/en_main.c:2238: error: unknown field 'rqn' specified in initializer
      drivers/net/ethernet/mellanox/mlx5/core/en_main.c:2239: warning: missing braces around initializer
      drivers/net/ethernet/mellanox/mlx5/core/en_main.c:2239: warning: (near initialization for 'drop_rrp.<anonymous>')
      
      gcc-4.4.4 has issues with anonymous union initializers.  Work around this.
      
      Cc: Saeed Mahameed <saeedm@mellanox.com>
      Cc: Tariq Toukan <tariqt@mellanox.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      95632791
    • J
      net: stmmac: fix cbs configuration · 44781fef
      Joao Pinto 提交于
      Sending again, because forgot to include net-dev.
      
      The QoS IP does not accept AVB capabilities to default/queue 0, this way we
      guarantee 75% bandwidth for AVB. This patch assures that only queues >= 1
      gets CBS confgured. Additional info was also added to stmmac.txt.
      Reported-by: NNiklas Cassel <niklas.cassel@axis.com>
      Signed-off-by: NJoao Pinto <jpinto@synopsys.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      44781fef
  3. 02 4月, 2017 2 次提交
    • D
      Merge branch 'mpls-more-labels' · a6fc09df
      David S. Miller 提交于
      David Ahern says:
      
      ====================
      net: mpls: Allow users to configure more labels per route
      
      Increase the maximum number of new labels for MPLS routes from 2 to 30.
      
      To keep memory consumption in check, the labels array is moved to the end
      of mpls_nh and mpls_iptunnel_encap structs as a 0-sized array. Allocations
      use the maximum number of labels across all nexthops in a route for LSR
      and the number of labels configured for LWT.
      
      The mpls_route layout is changed to:
      
         +----------------------+
         | mpls_route           |
         +----------------------+
         | mpls_nh 0            |
         +----------------------+
         | alignment padding    |   4 bytes for odd number of labels; 0 for even
         +----------------------+
         | via[rt_max_alen] 0   |
         +----------------------+
         | alignment padding    |   via's aligned on sizeof(unsigned long)
         +----------------------+
         | ...                  |
      
      Meaning the via follows its mpls_nh providing better locality as the
      number of labels increases. UDP_RR tests with namespaces shows no impact
      to a modest performance increase with this layout for 1 or 2 labels and
      1 or 2 nexthops.
      
      mpls_route allocation size is limited to 4096 bytes allowing on the
      order of 30 nexthops with 30 labels (or more nexthops with fewer
      labels). LWT encap shares same maximum number of labels as mpls routing.
      
      v3
      - initialize n_labels to 0 in case RTA_NEWDST is not defined; detected
        by the kbuild test robot
      
      v2
      - updates per Eric's comments
        + added patch to ensure all reads of rt_nhn_alive and nh_flags in
          the packet path use READ_ONCE and all writes via event handlers
          use WRITE_ONCE
      
        + limit mpls_route size to 4096 (PAGE_SIZE for most arch)
      
        + mostly killed use of MAX_NEW_LABELS; it exists only for common
          limit between lwt and routing paths
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      a6fc09df
    • D
      net: mpls: Increase max number of labels for lwt encap · 1511009c
      David Ahern 提交于
      Alow users to push down more labels per MPLS encap. Similar to LSR case,
      move label array to the end of mpls_iptunnel_encap and allocate based on
      the number of labels for the route.
      
      For consistency with the LSR case, re-use the same maximum number of
      labels.
      Signed-off-by: NDavid Ahern <dsa@cumulusnetworks.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      1511009c