1. 30 8月, 2015 12 次提交
  2. 29 8月, 2015 28 次提交
    • J
      openvswitch: Fix conntrack compilation without mark. · 0d5cdef8
      Joe Stringer 提交于
      Fix build with !CONFIG_NF_CONNTRACK_MARK && CONFIG_OPENVSWITCH_CONNTRACK
      
      Fixes: 182e3042 ("openvswitch: Allow matching on conntrack mark")
      Reported-by: NSimon Horman <simon.horman@netronome.com>
      Signed-off-by: NJoe Stringer <joestringer@nicira.com>
      Tested-by: NSimon Horman <simon.horman@netronome.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      0d5cdef8
    • D
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next · 581a5f2a
      David S. Miller 提交于
      Pablo Neira Ayuso says:
      
      ====================
      Netfilter updates for net-next
      
      The following patchset contains Netfilter/IPVS updates for your net-next tree.
      In sum, patches to address fallout from the previous round plus updates from
      the IPVS folks via Simon Horman, they are:
      
      1) Add a new scheduler to IPVS: The weighted overflow scheduling algorithm
         directs network connections to the server with the highest weight that is
         currently available and overflows to the next when active connections exceed
         the node's weight. From Raducu Deaconu.
      
      2) Fix locking ordering in IPVS, always take rtnl_lock in first place. Patch
         from Julian Anastasov.
      
      3) Allow to indicate the MTU to the IPVS in-kernel state sync daemon. From
         Julian Anastasov.
      
      4) Enhance multicast configuration for the IPVS state sync daemon. Also from
         Julian.
      
      5) Resolve sparse warnings in the nf_dup modules.
      
      6) Fix a linking problem when CONFIG_NF_DUP_IPV6 is not set.
      
      7) Add ICMP codes 5 and 6 to IPv6 REJECT target, they are more informative
         subsets of code 1. From Andreas Herz.
      
      8) Revert the jumpstack size calculation from mark_source_chains due to chain
         depth miscalculations, from Florian Westphal.
      
      9) Calm down more sparse warning around the Netfilter tree, again from Florian
         Westphal.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      581a5f2a
    • D
      Merge branch 'bpf_trace_printk-percent-s' · cc7acad1
      David S. Miller 提交于
      Alexei Starovoitov says:
      
      ====================
      support for '%s' in bpf_trace_printk
      
      v2->v3:
      fix the comment to mention that strncpy_from_unsafe() returns
      the length of the string including the trailing NUL.
      
      v1->v2:
      patch 1: generalize FETCH_FUNC_NAME(memory, string) into
      strncpy_from_unsafe()
      patch 2: use it in bpf_trace_printk
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      cc7acad1
    • A
      bpf: add support for %s specifier to bpf_trace_printk() · 8d3b7dce
      Alexei Starovoitov 提交于
      %s specifier makes bpf program and kernel debugging easier.
      To make sure that trace_printk won't crash the unsafe string
      is copied into stack and unsafe pointer is substituted.
      
      The following C program:
       #include <linux/fs.h>
      int foo(struct pt_regs *ctx, struct filename *filename)
      {
        void *name = 0;
      
        bpf_probe_read(&name, sizeof(name), &filename->name);
        bpf_trace_printk("executed %s\n", name);
        return 0;
      }
      
      when attached to kprobe do_execve()
      will produce output in /sys/kernel/debug/tracing/trace_pipe :
          make-13492 [002] d..1  3250.997277: : executed /bin/sh
            sh-13493 [004] d..1  3250.998716: : executed /usr/bin/gcc
           gcc-13494 [002] d..1  3250.999822: : executed /usr/lib/gcc/x86_64-linux-gnu/4.7/cc1
           gcc-13495 [002] d..1  3251.006731: : executed /usr/bin/as
           gcc-13496 [002] d..1  3251.011831: : executed /usr/lib/gcc/x86_64-linux-gnu/4.7/collect2
      collect2-13497 [000] d..1  3251.012941: : executed /usr/bin/ld
      Suggested-by: NBrendan Gregg <brendan.d.gregg@gmail.com>
      Signed-off-by: NAlexei Starovoitov <ast@plumgrid.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      8d3b7dce
    • A
      lib: introduce strncpy_from_unsafe() · 1a6877b9
      Alexei Starovoitov 提交于
      generalize FETCH_FUNC_NAME(memory, string) into
      strncpy_from_unsafe() and fix sparse warnings that were
      present in original implementation.
      Signed-off-by: NAlexei Starovoitov <ast@plumgrid.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      1a6877b9
    • N
      netpoll: warn on netpoll_send_udp users who haven't disabled irqs · c9fd56b3
      Nikolay Aleksandrov 提交于
      Make sure we catch future netpoll_send_udp users who use it without
      disabling irqs and also as a hint for poll_controller users.
      Signed-off-by: NNikolay Aleksandrov <nikolay@cumulusnetworks.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      c9fd56b3
    • D
      Merge branch 'phylib-simplifications' · 55cc0519
      David S. Miller 提交于
      Sergei Shtylyov says:
      
      ====================
      Some phylib simplifications
      
         Here's 2 patches against DaveM's 'net-next.git' repo. We simplify a bogus
      string of type casts in the 1st patch and make the code respect some coding
      standards of the networking code in the 2nd one. I may follow with fixing of
      checkpatch.pl's complaints. if I have time..
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      55cc0519
    • S
      phylib: simplify NULL checks · ef899c07
      Sergei Shtylyov 提交于
      Fix scripts/checkpatch.pl's messages like:
      
      CHECK: Comparison to NULL could be written "!phydrv->read_mmd_indirect"
      
      BTW, it doesn't detect the reversed comparisons (which I've fixed as well).
      Signed-off-by: NSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      ef899c07
    • S
      phylib: simplify bogus phy_device_create() result · d3765f08
      Sergei Shtylyov 提交于
      Get rid of the bogus string of type casts where ERR_PTR() is enough.
      Signed-off-by: NSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      d3765f08
    • D
      net: sched: don't break line in tc_classify loop notification · c1b3b199
      Daniel Borkmann 提交于
      Just some minor noise follow-up to address some stylistic issues of
      commit 3b3ae880 ("net: sched: consolidate tc_classify{,_compat}").
      Accidentally v1 instead of v2 of that commit got applied, so this
      patch adds the relative diff.
      Suggested-by: NAlexei Starovoitov <ast@plumgrid.com>
      Signed-off-by: NDaniel Borkmann <daniel@iogearbox.net>
      Acked-by: NAlexei Starovoitov <ast@plumgrid.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      c1b3b199
    • S
      sfc: Allow driver to cope with a lower number of VIs than it needs for RSS · b0fbdae1
      Shradha Shah 提交于
      Previously, the driver would refuse to load if it couldn't secure
      enough VIs from the MC to fulfill its RSS requirements.
      This was causing probe to fail on later functions in
      configurations where we'd run out of VIs, such as having many
      VFs.
      
      This change allows the driver to load with fewer VIs, down to a
      minimum of 2. A warning will be printed saying that RSS
      requirements were not met, possibly affecting performance.
      
      efx->max_tx_channels needs to be set to avoid going down the
      failure path in efx_probe_nic() immediately in the loop after the
      probe() NIC-type function.
      Also, Set rc=ENOSPC when bombing out of efx_probe_nic due to lack
      of VIs.
      Signed-off-by: NShradha Shah <sshah@solarflare.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      b0fbdae1
    • H
      cxgb4: Force uninitialized state if FW in adapter is unsupported · a69265e9
      Hariprasad Shenai 提交于
      Forcing uninitialized state allows us to upgrade and reinitialize
      the adapter.
      
          FW_VERSION_T4 = 1.4.0.0
          FW_VERSION_T5 = 0.0.0.0
          FW_VERSION_T6 = 0.0.0.0
      At this point driver supports above and greater than above version.
      
      If FW in adapter < min FW_VERSION driver supports tries to upgrade the FW
      If FW in adapter >= FW_VERSION driver supports then it follows normal path
      Signed-off-by: NHariprasad Shenai <hariprasad@chelsio.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      a69265e9
    • D
      Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge · 8b72ca67
      David S. Miller 提交于
      Antonio Quartulli says:
      
      ====================
      Included changes:
      - code beautification
      - remove obsolete 'deleted' attribute for bat-gw node
      - increase internal version number
      - prevent potential access to netdev object after deregistration
      - set needed_head/tail_room for batman virtual interface
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      8b72ca67
    • V
      openswitch: fix typo CONFIG_NF_CONNTRACK_LABEL · 9723e6ab
      Valentin Rothberg 提交于
      Fix typo in conntrack.c
      s/CONFIG_NF_CONNTRACK_LABEL/CONFIG_NF_CONNTRACK_LABELS/
      Signed-off-by: NValentin Rothberg <valentinrothberg@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      9723e6ab
    • D
      Merge branch 'vrf-inetpeer' · fe55565e
      David S. Miller 提交于
      David Ahern says:
      
      ====================
      net: Refactor inetpeer cache and add support for VRFs
      
      Per Dave's comment on the version 1 patch adding VRF support to inetpeer
      cache by explicitly making the address + index a key. Refactored the
      inetpeer code in the process; mostly impacts the use by tcp_metrics.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      fe55565e
    • D
      net: Add support for VRFs to inetpeer cache · 192132b9
      David Ahern 提交于
      inetpeer caches based on address only, so duplicate IP addresses within
      a namespace return the same cached entry. Enhance the ipv4 address key
      to contain both the IPv4 address and VRF device index.
      Signed-off-by: NDavid Ahern <dsa@cumulusnetworks.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      192132b9
    • D
      net: Refactor inetpeer address struct · 5345c2e1
      David Ahern 提交于
      Move the inetpeer_addr_base union to inetpeer_addr and drop
      inetpeer_addr_base.
      
      Both the a6 and in6_addr overlays are not needed; drop the __be32 version
      and rename in6 to a6 for consistency with ipv4. Add a new u32 array to
      the union which removes the need for the typecast in the compare function
      and the use of a consistent arg for both ipv4 and ipv6 addresses which
      makes the compare function more readable.
      Signed-off-by: NDavid Ahern <dsa@cumulusnetworks.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      5345c2e1
    • D
      net: Add helper function to compare inetpeer addresses · d39d14ff
      David Ahern 提交于
      tcp_metrics and inetpeer both have functions to compare inetpeer
      addresses. Consolidate into 1 version.
      Signed-off-by: NDavid Ahern <dsa@cumulusnetworks.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      d39d14ff
    • D
      net: Add set,get helpers for inetpeer addresses · 3abef286
      David Ahern 提交于
      Use inetpeer set,get helpers in tcp_metrics rather than peeking into
      the inetpeer_addr struct.
      Signed-off-by: NDavid Ahern <dsa@cumulusnetworks.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      3abef286
    • D
      net: Introduce ipv4_addr_hash and use it for tcp metrics · 72afa352
      David Ahern 提交于
      Refactors a common line into helper function.
      Signed-off-by: NDavid Ahern <dsa@cumulusnetworks.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      72afa352
    • D
      net: Add ethernet header for pass through VRF device · 8f58336d
      David Ahern 提交于
      The change to use a custom dst broke tcpdump captures on the VRF device:
      
      $ tcpdump -n -i vrf10
      ...
      05:32:29.009362 IP 10.2.1.254 > 10.2.1.2: ICMP echo request, id 21989, seq 1, length 64
      05:32:29.009855 00:00:40:01:8d:36 > 45:00:00:54:d6:6f, ethertype Unknown (0x0a02), length 84:
      	0x0000:  0102 0a02 01fe 0000 9181 55e5 0001 bd11  ..........U.....
      	0x0010:  da55 0000 0000 bb5d 0700 0000 0000 1011  .U.....]........
      	0x0020:  1213 1415 1617 1819 1a1b 1c1d 1e1f 2021  ...............!
      	0x0030:  2223 2425 2627 2829 2a2b 2c2d 2e2f 3031  "#$%&'()*+,-./01
      	0x0040:  3233 3435 3637                           234567
      
      Local packets going through the VRF device are missing an ethernet header.
      Fix by adding one and then stripping it off before pushing back to the IP
      stack. With this patch you get the expected dumps:
      
      ...
      05:36:15.713944 IP 10.2.1.254 > 10.2.1.2: ICMP echo request, id 23795, seq 1, length 64
      05:36:15.714160 IP 10.2.1.2 > 10.2.1.254: ICMP echo reply, id 23795, seq 1, length 64
      ...
      Signed-off-by: NDavid Ahern <dsa@cumulusnetworks.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      8f58336d
    • C
      net/xen-netfront: only napi_synchronize() if running · 274b0455
      Chas Williams 提交于
      If an interface isn't running napi_synchronize() will hang forever.
      
      [  392.248403] rmmod           R  running task        0   359    343 0x00000000
      [  392.257671]  ffff88003760fc88 ffff880037193b40 ffff880037193160 ffff88003760fc88
      [  392.267644]  ffff880037610000 ffff88003760fcd8 0000000100014c22 ffffffff81f75c40
      [  392.277524]  0000000000bc7010 ffff88003760fca8 ffffffff81796927 ffffffff81f75c40
      [  392.287323] Call Trace:
      [  392.291599]  [<ffffffff81796927>] schedule+0x37/0x90
      [  392.298553]  [<ffffffff8179985b>] schedule_timeout+0x14b/0x280
      [  392.306421]  [<ffffffff810f91b9>] ? irq_free_descs+0x69/0x80
      [  392.314006]  [<ffffffff811084d0>] ? internal_add_timer+0xb0/0xb0
      [  392.322125]  [<ffffffff81109d07>] msleep+0x37/0x50
      [  392.329037]  [<ffffffffa00ec79a>] xennet_disconnect_backend.isra.24+0xda/0x390 [xen_netfront]
      [  392.339658]  [<ffffffffa00ecadc>] xennet_remove+0x2c/0x80 [xen_netfront]
      [  392.348516]  [<ffffffff81481c69>] xenbus_dev_remove+0x59/0xc0
      [  392.356257]  [<ffffffff814e7217>] __device_release_driver+0x87/0x120
      [  392.364645]  [<ffffffff814e7cf8>] driver_detach+0xb8/0xc0
      [  392.371989]  [<ffffffff814e6e69>] bus_remove_driver+0x59/0xe0
      [  392.379883]  [<ffffffff814e84f0>] driver_unregister+0x30/0x70
      [  392.387495]  [<ffffffff814814b2>] xenbus_unregister_driver+0x12/0x20
      [  392.395908]  [<ffffffffa00ed89b>] netif_exit+0x10/0x775 [xen_netfront]
      [  392.404877]  [<ffffffff81124e08>] SyS_delete_module+0x1d8/0x230
      [  392.412804]  [<ffffffff8179a8ee>] system_call_fastpath+0x12/0x71
      Signed-off-by: NChas Williams <3chas3@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      274b0455
    • P
      IGMP: Inhibit reports for local multicast groups · df2cf4a7
      Philip Downey 提交于
      The range of addresses between 224.0.0.0 and 224.0.0.255 inclusive, is
      reserved for the use of routing protocols and other low-level topology
      discovery or maintenance protocols, such as gateway discovery and
      group membership reporting.  Multicast routers should not forward any
      multicast datagram with destination addresses in this range,
      regardless of its TTL.
      
      Currently, IGMP reports are generated for this reserved range of
      addresses even though a router will ignore this information since it
      has no purpose.  However, the presence of reserved group addresses in
      an IGMP membership report uses up network bandwidth and can also
      obscure addresses of interest when inspecting membership reports using
      packet inspection or debug messages.
      
      Although the RFCs for the various version of IGMP (e.g.RFC 3376 for
      v3) do not specify that the reserved addresses be excluded from
      membership reports, it should do no harm in doing so.  In particular
      there should be no adverse effect in any IGMP snooping functionality
      since 224.0.0.x is specifically excluded as per RFC 4541 (IGMP and MLD
      Snooping Switches Considerations) section 2.1.2. Data Forwarding
      Rules:
      
          2) Packets with a destination IP (DIP) address in the 224.0.0.X
             range which are not IGMP must be forwarded on all ports.
      
      IGMP reports for local multicast groups can now be optionally
      inhibited by means of a system control variable (by setting the value
      to zero) e.g.:
          echo 0 > /proc/sys/net/ipv4/igmp_link_local_mcast_reports
      
      To retain backwards compatibility the previous behaviour is retained
      by default on system boot or reverted by setting the value back to
      non-zero e.g.:
          echo 1 >  /proc/sys/net/ipv4/igmp_link_local_mcast_reports
      Signed-off-by: NPhilip Downey <pdowney@brocade.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      df2cf4a7
    • C
      r8169: Add software counter for multicast packages · d7d2d89d
      Corinna Vinschen 提交于
      The multicast hardware counter on 8168/8111 chips is only 32 bit while the
      statistics in struct rtnl_link_stats64 are 64 bit.  Given that statistics
      are requested on an irregular basis, an overflow of the hardware counter
      can go unnoticed.  To count even very large numbers of multicast packets
      reliably, add a software counter and remove previously applied code to
      fill the multicast field requested by @rtl8169_get_stats64 with the values
      read from the rx_multicast hardware counter.
      Signed-off-by: NCorinna Vinschen <vinschen@redhat.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      d7d2d89d
    • F
      Bluetooth: hci_bcm: Fix crash on suspend · 917522aa
      Frederic Danis 提交于
      If bcm_suspend is called whithout device opened there is a crash as
      it tries to use bdev->hu which is NULL.
      Rename bcm_device_list_lock to bcm_device_lock as it does not only apply
      to bcm_device_list.
      Signed-off-by: NFrederic Danis <frederic.danis@linux.intel.com>
      Signed-off-by: NMarcel Holtmann <marcel@holtmann.org>
      917522aa
    • F
      netfilter: reduce sparse warnings · 851345c5
      Florian Westphal 提交于
      bridge/netfilter/ebtables.c:290:26: warning: incorrect type in assignment (different modifiers)
      -> remove __pure annotation.
      
      ipv6/netfilter/ip6t_SYNPROXY.c:240:27: warning: cast from restricted __be16
      -> switch ntohs to htons and vice versa.
      
      netfilter/core.c:391:30: warning: symbol 'nfq_ct_nat_hook' was not declared. Should it be static?
      -> delete it, got removed
      
      net/netfilter/nf_synproxy_core.c:221:48: warning: cast to restricted __be32
      -> Use __be32 instead of u32.
      
      Tested with objdiff that these changes do not affect generated code.
      Signed-off-by: NFlorian Westphal <fw@strlen.de>
      Signed-off-by: NPablo Neira Ayuso <pablo@netfilter.org>
      851345c5
    • F
      Revert "netfilter: xtables: compute exact size needed for jumpstack" · 98dbbfc3
      Florian Westphal 提交于
      This reverts commit 98d1bd80.
      
      mark_source_chains will not re-visit chains, so
      
      *filter
      :INPUT ACCEPT [365:25776]
      :FORWARD ACCEPT [0:0]
      :OUTPUT ACCEPT [217:45832]
      :t1 - [0:0]
      :t2 - [0:0]
      :t3 - [0:0]
      :t4 - [0:0]
      -A t1 -i lo -j t2
      -A t2 -i lo -j t3
      -A t3 -i lo -j t4
      # -A INPUT -j t4
      # -A INPUT -j t3
      # -A INPUT -j t2
      -A INPUT -j t1
      COMMIT
      
      Will compute a chain depth of 2 if the comments are removed.
      Revert back to counting the number of chains for the time being.
      Reported-by: NCong Wang <cwang@twopensource.com>
      Reported-by: NHannes Frederic Sowa <hannes@stressinduktion.org>
      Signed-off-by: NFlorian Westphal <fw@strlen.de>
      Signed-off-by: NPablo Neira Ayuso <pablo@netfilter.org>
      98dbbfc3
    • K
      Bluetooth: Fix SCO link type handling on connection complete · 618353b1
      Kuba Pawlak 提交于
      Synchronous connections are initially created with type eSCO.
      Link manager may reject proposed link parameters, which triggers
      connection setup retry with a different set. Link type embedded
      in responses should be disregarded until Synchronous Connect Complete
      returns Success (0x00). Current code updates link type every time
      which creates an issue when link type changes to SCO and back to eSCO
      on further attepts.
      
      Issue happens with BlackBerry 9100 and 9700 with Intel WilkinsPeak
      on third connection setup attept
      
      2015-05-18 01:27:57.332242 < HCI Command: Setup Synchronous Connection (0x01|0x0028) plen 17
          handle 256 voice setting 0x0060 ptype 0x0380
      2015-05-18 01:27:57.333604 > HCI Event: Command Status (0x0f) plen 4
          Setup Synchronous Connection (0x01|0x0028) status 0x00 ncmd 1
      2015-05-18 01:27:57.334614 > HCI Event: Synchronous Connect Complete (0x2c) plen 17
          status 0x1a handle 0 bdaddr 30:7C:30:B3:A8:86 type SCO
          Error: Unsupported Remote Feature / Unsupported LMP Feature
      2015-05-18 01:27:57.334895 < HCI Command: Setup Synchronous Connection (0x01|0x0028) plen 17
          handle 256 voice setting 0x0060 ptype 0x0380
      2015-05-18 01:27:57.335601 > HCI Event: Command Status (0x0f) plen 4
          Setup Synchronous Connection (0x01|0x0028) status 0x00 ncmd 1
      2015-05-18 01:27:57.336610 > HCI Event: Synchronous Connect Complete (0x2c) plen 17
          status 0x1a handle 0 bdaddr 30:7C:30:B3:A8:86 type SCO
          Error: Unsupported Remote Feature / Unsupported LMP Feature
      2015-05-18 01:27:57.336685 < HCI Command: Setup Synchronous Connection (0x01|0x0028) plen 17
          handle 256 voice setting 0x0060 ptype 0x03c8
      2015-05-18 01:27:57.337603 > HCI Event: Command Status (0x0f) plen 4
          Setup Synchronous Connection (0x01|0x0028) status 0x00 ncmd 1
      2015-05-18 01:27:57.342608 > HCI Event: Max Slots Change (0x1b) plen 3
          handle 256 slots 1
      2015-05-18 01:27:57.377631 > HCI Event: Synchronous Connect Complete (0x2c) plen 17
          status 0x00 handle 257 bdaddr 30:7C:30:B3:A8:86 type eSCO
          Air mode: CVSD
      Signed-off-by: NKuba Pawlak <kubax.t.pawlak@intel.com>
      Signed-off-by: NMarcel Holtmann <marcel@holtmann.org>
      618353b1