1. 18 7月, 2008 13 次提交
    • D
      pkt_sched: Schedule qdiscs instead of netdev_queue. · 37437bb2
      David S. Miller 提交于
      When we have shared qdiscs, packets come out of the qdiscs
      for multiple transmit queues.
      
      Therefore it doesn't make any sense to schedule the transmit
      queue when logically we cannot know ahead of time the TX
      queue of the SKB that the qdisc->dequeue() will give us.
      
      Just for sanity I added a BUG check to make sure we never
      get into a state where the noop_qdisc is scheduled.
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      37437bb2
    • D
      pkt_sched: Add and use qdisc_root() and qdisc_root_lock(). · 7698b4fc
      David S. Miller 提交于
      When code wants to lock the qdisc tree state, the logic
      operation it's doing is locking the top-level qdisc that
      sits of the root of the netdev_queue.
      
      Add qdisc_root_lock() to represent this and convert the
      easiest cases.
      
      In order for this to work out in all cases, we have to
      hook up the noop_qdisc to a dummy netdev_queue.
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      7698b4fc
    • D
      pkt_sched: Make QDISC_RUNNING a qdisc state. · e2627c8c
      David S. Miller 提交于
      Currently it is associated with a netdev_queue, but when we have
      qdisc sharing that no longer makes any sense.
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      e2627c8c
    • D
      pkt_sched: Move gso_skb into Qdisc. · d3b753db
      David S. Miller 提交于
      We liberate any dangling gso_skb during qdisc destruction.
      
      It really only matters for the root qdisc.  But when qdiscs
      can be shared by multiple netdev_queue objects, we can't
      have the gso_skb in the netdev_queue any more.
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      d3b753db
    • D
      netdev: Kill plain netif_schedule() · 92831bc3
      David S. Miller 提交于
      No more users.
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      92831bc3
    • D
      mac80211: Reimplement WME using ->select_queue(). · 51cb6db0
      David S. Miller 提交于
      The only behavior change is that we do not drop packets under any
      circumstances.  If that is absolutely needed, we could easily add it
      back.
      
      With cleanups and help from Johannes Berg.
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      51cb6db0
    • D
      netdev: Add netdev->select_queue() method. · eae792b7
      David S. Miller 提交于
      Devices or device layers can set this to control the queue selection
      performed by dev_pick_tx().
      
      This function runs under RCU protection, which allows overriding
      functions to have some way of synchronizing with things like dynamic
      ->real_num_tx_queues adjustments.
      
      This makes the spinlock prefetch in dev_queue_xmit() a little bit
      less effective, but that's the price right now for correctness.
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      eae792b7
    • D
      netdev: netdev_priv() can now be sane again. · e3c50d5d
      David S. Miller 提交于
      The private area of a netdev is now at a fixed offset once more.
      
      Unfortunately, some assumptions that netdev_priv() == netdev->priv
      crept back into the tree.  In particular this happened in the
      loopback driver.  Make it use netdev->ml_priv.
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      e3c50d5d
    • D
      6b0fb126
    • D
      net: Use queue aware tests throughout. · fd2ea0a7
      David S. Miller 提交于
      This effectively "flips the switch" by making the core networking
      and multiqueue-aware drivers use the new TX multiqueue structures.
      
      Non-multiqueue drivers need no changes.  The interfaces they use such
      as netif_stop_queue() degenerate into an operation on TX queue zero.
      So everything "just works" for them.
      
      Code that really wants to do "X" to all TX queues now invokes a
      routine that does so, such as netif_tx_wake_all_queues(),
      netif_tx_stop_all_queues(), etc.
      
      pktgen and netpoll required a little bit more surgery than the others.
      
      In particular the pktgen changes, whilst functional, could be largely
      improved.  The initial check in pktgen_xmit() will sometimes check the
      wrong queue, which is mostly harmless.  The thing to do is probably to
      invoke fill_packet() earlier.
      
      The bulk of the netpoll changes is to make the code operate solely on
      the TX queue indicated by by the SKB queue mapping.
      
      Setting of the SKB queue mapping is entirely confined inside of
      net/core/dev.c:dev_pick_tx().  If we end up needing any kind of
      special semantics (drops, for example) it will be implemented here.
      
      Finally, we now have a "real_num_tx_queues" which is where the driver
      indicates how many TX queues are actually active.
      
      With IGB changes from Jeff Kirsher.
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      fd2ea0a7
    • D
      pkt_sched: Remove RR scheduler. · 1d8ae3fd
      David S. Miller 提交于
      This actually fixes a bug added by the RR scheduler changes.  The
      ->bands and ->prio2band parameters were being set outside of the
      sch_tree_lock() and thus could result in strange behavior and
      inconsistencies.
      
      It might be possible, in the new design (where there will be one qdisc
      per device TX queue) to allow similar functionality via a TX hash
      algorithm for RR but I really see no reason to export this aspect of
      how these multiqueue cards actually implement the scheduling of the
      the individual DMA TX rings and the single physical MAC/PHY port.
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      1d8ae3fd
    • D
      netdev: Kill NETIF_F_MULTI_QUEUE. · 09e83b5d
      David S. Miller 提交于
      There is no need for a feature bit for something that
      can be tested by simply checking the TX queue count.
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      09e83b5d
    • D
      netdev: Allocate multiple queues for TX. · e8a0464c
      David S. Miller 提交于
      alloc_netdev_mq() now allocates an array of netdev_queue
      structures for TX, based upon the queue_count argument.
      
      Furthermore, all accesses to the TX queues are now vectored
      through the netdev_get_tx_queue() and netdev_for_each_tx_queue()
      interfaces.  This makes it easy to grep the tree for all
      things that want to get to a TX queue of a net device.
      
      Problem spots which are not really multiqueue aware yet, and
      only work with one queue, can easily be spotted by grepping
      for all netdev_get_tx_queue() calls that pass in a zero index.
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      e8a0464c
  2. 17 7月, 2008 17 次提交
  3. 15 7月, 2008 10 次提交