1. 07 2月, 2012 12 次提交
    • A
      tipc: Prevent loss of fragmented messages over unicast links · b76b27ca
      Allan Stephens 提交于
      Modifies unicast link endpoint logic so an incoming fragmented message
      is not lost if reassembly cannot begin because there is no buffer big
      enough to hold the entire reassembled message. The link endpoint now
      ignores the first fragment completely, which causes the sending node to
      retransmit the first fragment so that reassembly can be re-attempted.
      
      Previously, the sender would have had no reason to retransmit the 1st
      fragment, so we would never have a chance to re-try the allocation.
      Signed-off-by: NAllan Stephens <allan.stephens@windriver.com>
      b76b27ca
    • A
      tipc: Remove obsolete broadcast tag capability · 1ec2bb08
      Allan Stephens 提交于
      Eliminates support for the broadcast tag field, which is no longer
      used by broadcast link NACK messages.
      Signed-off-by: NAllan Stephens <allan.stephens@windriver.com>
      Signed-off-by: NPaul Gortmaker <paul.gortmaker@windriver.com>
      1ec2bb08
    • A
      tipc: Major redesign of broadcast link ACK/NACK algorithms · 7a54d4a9
      Allan Stephens 提交于
      Completely redesigns broadcast link ACK and NACK mechanisms to prevent
      spurious retransmit requests in dual LAN networks, and to prevent the
      broadcast link from stalling due to the failure of a receiving node to
      acknowledge receiving a broadcast message or request its retransmission.
      
      Note: These changes only impact the timing of when ACK and NACK messages
      are sent, and not the basic broadcast link protocol itself, so inter-
      operability with nodes using the "classic" algorithms is maintained.
      
      The revised algorithms are as follows:
      
      1) An explicit ACK message is still sent after receiving 16 in-sequence
      messages, and implicit ACK information continues to be carried in other
      unicast link message headers (including link state messages).  However,
      the timing of explicit ACKs is now based on the receiving node's absolute
      network address rather than its relative network address to ensure that
      the failure of another node does not delay the ACK beyond its 16 message
      target.
      
      2) A NACK message is now typically sent only when a message gap persists
      for two consecutive incoming link state messages; this ensures that a
      suspected gap is not confirmed until both LANs in a dual LAN network have
      had an opportunity to deliver the message, thereby preventing spurious NACKs.
      A NACK message can also be generated by the arrival of a single link state
      message, if the deferred queue is so big that the current message gap
      cannot be the result of "normal" mis-ordering due to the use of dual LANs
      (or one LAN using a bonded interface). Since link state messages typically
      arrive at different nodes at different times the problem of multiple nodes
      issuing identical NACKs simultaneously is inherently avoided.
      
      3) Nodes continue to "peek" at NACK messages sent by other nodes. If
      another node requests retransmission of a message gap suspected (but not
      yet confirmed) by the peeking node, the peeking node forgets about the
      gap and does not generate a duplicate retransmit request. (If the peeking
      node subsequently fails to receive the lost message, later link state
      messages will cause it to rediscover and confirm the gap and send another
      NACK.)
      
      4) Message gap "equality" is now determined by the start of the gap only.
      This is sufficient to deal with the most common cases of message loss,
      and eliminates the need for complex end of gap computations.
      
      5) A peeking node no longer tries to determine whether it should send a
      complementary NACK, since the most common cases of message loss don't
      require it to be sent. Consequently, the node no longer examines the
      "broadcast tag" field of a NACK message when peeking.
      Signed-off-by: NAllan Stephens <allan.stephens@windriver.com>
      Signed-off-by: NPaul Gortmaker <paul.gortmaker@windriver.com>
      7a54d4a9
    • A
      tipc: Add missing locks in broadcast link statistics accumulation · b98158e3
      Allan Stephens 提交于
      Ensures that all attempts to update broadcast link statistics are done
      only while holding the lock that protects the link's main data structures,
      to prevent interference by simultaneous updates caused by messages
      arriving on other interfaces.
      Signed-off-by: NAllan Stephens <allan.stephens@windriver.com>
      Signed-off-by: NPaul Gortmaker <paul.gortmaker@windriver.com>
      b98158e3
    • A
      tipc: Fix bug in broadcast link duplicate message statistics · 0232c5a5
      Allan Stephens 提交于
      Modifies broadcast link so that it increments the "received duplicate
      message" count if an incoming message cannot be added to the deferred
      message queue because it is already present in the queue. (The aligns
      broadcast link behavior with that of TIPC's unicast links.)
      Signed-off-by: NAllan Stephens <allan.stephens@windriver.com>
      Signed-off-by: NPaul Gortmaker <paul.gortmaker@windriver.com>
      0232c5a5
    • A
      tipc: Fix node lock reclamation issues in broadcast link reception · 8a275a6a
      Allan Stephens 提交于
      Fixes a pair of problems in broadcast link message reception code
      relating to the reclamation of the node lock after consuming an
      in-sequence message.
      
      1) Now retests to see if the sending node is still up after reclaiming
         the node lock, and bails out if it is non-operational.
      
      2) Now manipulates the node's deferred message queue only after
         reclaiming the node lock, rather than using queue head pointer
         information that was cached previously.
      Signed-off-by: NAllan Stephens <allan.stephens@windriver.com>
      Signed-off-by: NPaul Gortmaker <paul.gortmaker@windriver.com>
      8a275a6a
    • A
      tipc: Add missing broadcast link lock when sending NACK · 57732560
      Allan Stephens 提交于
      Ensures that any attempt to send a NACK message over TIPC's broadcast
      link has exclusive access to the link's main data structures, to prevent
      interference with a simultaneous attempt to send other broadcast link
      traffic (such as application-generated multicast messages).
      Signed-off-by: NAllan Stephens <allan.stephens@windriver.com>
      Signed-off-by: NPaul Gortmaker <paul.gortmaker@windriver.com>
      57732560
    • A
      tipc: Fix problem with broadcast link synchronization between nodes · 47361c87
      Allan Stephens 提交于
      Corrects a problem in which a link endpoint that activates as the
      result of receiving a RESET/STATE sequence of link protocol messages
      fails to properly record the broadcast link status information about
      the node to which it is now communicating with. (The problem does
      not occur with the more common RESET/ACTIVATE sequence of messages.)
      The fix ensures that the broadcast link status info is updated after
      the RESET message resets the link endpoint, rather than before, thereby
      preventing new information from being overwritten by the reset operation.
      Signed-off-by: NAllan Stephens <allan.stephens@windriver.com>
      Signed-off-by: NPaul Gortmaker <paul.gortmaker@windriver.com>
      47361c87
    • A
      tipc: Ensure broadcast link re-acquires node after link failure · 93499313
      Allan Stephens 提交于
      Fix a bug that can prevent TIPC from sending broadcast messages to a node
      if contact with the node is lost and then regained. The problem occurs if
      the broadcast link first clears the flag indicating the node is part of the
      link's distribution set (when it loses contact with the node), and later
      fails to restore the flag (when contact is regained); restoration fails
      if contact with the node is regained by implicit unicast link activation
      triggered by the arrival of a data message, rather than explicitly by the
      arrival of a link activation message.
      
      The broadcast link now uses separate fields to track whether a node is
      theoretically capable of receiving broadcast messages versus whether it is
      actually part of the link's distribution set. The former member is updated
      by the receipt of link protocol messages, which can occur at any time; the
      latter member is updated only when contact with the node is gained or lost.
      This change also permits the simplification of several conditional
      expressions since the broadcast link's "supported" field can now only be
      set if there are working links to the associated node.
      Signed-off-by: NAllan Stephens <allan.stephens@windriver.com>
      Signed-off-by: NPaul Gortmaker <paul.gortmaker@windriver.com>
      93499313
    • A
      tipc: Prevent broadcast link stalling in dual LAN environments · 4d75313c
      Allan Stephens 提交于
      Ensure that sequence number information about incoming broadcast link
      messages is initialized only by the activation of the first link to a
      given cluster node.  Previously, a race condition allowed reset and/or
      activation messages for a second link to re-initialize this sequence
      number information with obsolete values. This could trigger TIPC to
      request the retransmission of previously acknowledged broadcast link
      messages from that node, resulting in broadcast link processing becoming
      stalled if the node had already released one or more of those messages
      and was unable to perform the required retransmission.
      
      Thanks to Laser <gotolaser@gmail.com> for identifying this problem
      and assisting in the development of this fix.
      Signed-off-by: NAllan Stephens <allan.stephens@windriver.com>
      Signed-off-by: NPaul Gortmaker <paul.gortmaker@windriver.com>
      4d75313c
    • A
      tipc: Prevent transmission of outdated link protocol messages · 92d2c905
      Allan Stephens 提交于
      Ensures that a link endpoint discards any previously deferred link
      protocol message whenever it attempts to send a new one.
      
      Previously, it was possible for a link protocol message that was unsent
      due to congestion to be transmitted after newer protocol messages had
      been sent. The stale link protocol message might then cause the receiving
      link endpoint to malfunction because of its outdated conent.
      
      Thanks to Osamu Kaminuma [okaminum@avaya.com] for diagnosing the problem
      and contributing a prototype patch.
      Signed-off-by: NAllan Stephens <allan.stephens@windriver.com>
      Signed-off-by: NPaul Gortmaker <paul.gortmaker@windriver.com>
      92d2c905
    • A
      tipc: improve the link deferred queue insertion algorithm · 8809b255
      Allan Stephens 提交于
      Re-code the algorithm for inserting an out-of-sequence message into
      a unicast or broadcast link's deferred message queue.  It remains
      functionally equivalent but should be easier to understand/maintain.
      Signed-off-by: NAllan Stephens <allan.stephens@windriver.com>
      Signed-off-by: NPaul Gortmaker <paul.gortmaker@windriver.com>
      8809b255
  2. 06 2月, 2012 2 次提交
  3. 05 2月, 2012 3 次提交
  4. 03 2月, 2012 3 次提交
  5. 02 2月, 2012 10 次提交
  6. 01 2月, 2012 5 次提交
  7. 31 1月, 2012 5 次提交
    • D
      net: Deinline __nlmsg_put and genlmsg_put. -7k code on i386 defconfig. · a46621a3
      Denys Vlasenko 提交于
         text	   data	    bss	    dec	    hex	filename
      8455963	 532732	1810804	10799499 a4c98b	vmlinux.o.before
      8448899	 532732	1810804	10792435 a4adf3	vmlinux.o
      
      This change also removes commented-out copy of __nlmsg_put
      which was last touched in 2005 with "Enable once all users
      have been converted" comment on top.
      
      Changes in v2: rediffed against net-next.
      Signed-off-by: NDenys Vlasenko <vda.linux@googlemail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      a46621a3
    • E
      ipv6: fix RFC5722 comment · 5de658f8
      Eric Dumazet 提交于
      RFC5722 Section 4 was amended by Errata 3089
      
      Our implementation did the right thing anyway...
      Signed-off-by: NEric Dumazet <eric.dumazet@gmail.com>
      Cc: Nicolas Dichtel <nicolas.dichtel@6wind.com>
      Acked-by: NNicolas Dichtel <nicolas.dichtel@6wind.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      5de658f8
    • T
      net: Allow ipv6 proxies and arp proxies be shown with iproute2 · 84920c14
      Tony Zelenoff 提交于
      Add ability to return neighbour proxies list to caller if
      it sent full ndmsg structure and has NTF_PROXY flag set.
      
      Before this patch (and before iproute2 patches):
      $ ip neigh add proxy 2001::1 dev eth0
      $ ip -6 neigh show
      $
      
      After it and with applied iproute2 patches:
      $ ip neigh add proxy 2001::1 dev eth0
      $ ip -6 neigh show
      2001::1 dev eth0  proxy
      $
      
      Compatibility with old versions of iproute2 is not broken,
      kernel checks for incoming structure size and properly
      works if old structure is came.
      
      [v2]
      * changed comments style.
      * removed useless line with continue and curly bracket.
      * changed incoming message size check from equal to more or
        equal.
      
      CC: davem@davemloft.net
      CC: kuznet@ms2.inr.ac.ru
      CC: netdev@vger.kernel.org
      CC: xemul@parallels.com
      Signed-off-by: NTony Zelenoff <antonz@parallels.com>
      Acked-by: NThomas Graf <tgraf@suug.ch>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      84920c14
    • E
      af_unix: fix EPOLLET regression for stream sockets · 6f01fd6e
      Eric Dumazet 提交于
      Commit 0884d7aa (AF_UNIX: Fix poll blocking problem when reading from
      a stream socket) added a regression for epoll() in Edge Triggered mode
      (EPOLLET)
      
      Appropriate fix is to use skb_peek()/skb_unlink() instead of
      skb_dequeue(), and only call skb_unlink() when skb is fully consumed.
      
      This remove the need to requeue a partial skb into sk_receive_queue head
      and the extra sk->sk_data_ready() calls that added the regression.
      
      This is safe because once skb is given to sk_receive_queue, it is not
      modified by a writer, and readers are serialized by u->readlock mutex.
      
      This also reduce number of spinlock acquisition for small reads or
      MSG_PEEK users so should improve overall performance.
      Reported-by: NNick Mathewson <nickm@freehaven.net>
      Signed-off-by: NEric Dumazet <eric.dumazet@gmail.com>
      Cc: Alexey Moiseytsev <himeraster@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      6f01fd6e
    • N
      tcp: fix tcp_trim_head() to adjust segment count with skb MSS · 5b35e1e6
      Neal Cardwell 提交于
      This commit fixes tcp_trim_head() to recalculate the number of
      segments in the skb with the skb's existing MSS, so trimming the head
      causes the skb segment count to be monotonically non-increasing - it
      should stay the same or go down, but not increase.
      
      Previously tcp_trim_head() used the current MSS of the connection. But
      if there was a decrease in MSS between original transmission and ACK
      (e.g. due to PMTUD), this could cause tcp_trim_head() to
      counter-intuitively increase the segment count when trimming bytes off
      the head of an skb. This violated assumptions in tcp_tso_acked() that
      tcp_trim_head() only decreases the packet count, so that packets_acked
      in tcp_tso_acked() could underflow, leading tcp_clean_rtx_queue() to
      pass u32 pkts_acked values as large as 0xffffffff to
      ca_ops->pkts_acked().
      
      As an aside, if tcp_trim_head() had really wanted the skb to reflect
      the current MSS, it should have called tcp_set_skb_tso_segs()
      unconditionally, since a decrease in MSS would mean that a
      single-packet skb should now be sliced into multiple segments.
      Signed-off-by: NNeal Cardwell <ncardwell@google.com>
      Acked-by: NNandita Dukkipati <nanditad@google.com>
      Acked-by: NIlpo Järvinen <ilpo.jarvinen@helsinki.fi>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      5b35e1e6