* Re: [Patch 3/3] net: reserve ports for applications using fixed port numbers
From: Cong Wang @ 2010-04-13 8:48 UTC (permalink / raw)
To: Tetsuo Handa
Cc: opurdila, eric.dumazet, netdev, nhorman, davem, ebiederm,
linux-kernel
In-Reply-To: <4BC41994.7030707@redhat.com>
Cong Wang wrote:
> Tetsuo Handa wrote:
>> Hello.
>>
>>> --- linux-2.6.orig/drivers/infiniband/core/cma.c
>>> +++ linux-2.6/drivers/infiniband/core/cma.c
>>> @@ -1980,6 +1980,8 @@ retry:
>>> /* FIXME: add proper port randomization per like inet_csk_get_port */
>>> do {
>>> ret = idr_get_new_above(ps, bind_list, next_port, &port);
>>> + if (!ret && inet_is_reserved_local_port(port))
>>> + ret = -EAGAIN;
>>> } while ((ret == -EAGAIN) && idr_pre_get(ps, GFP_KERNEL));
>>>
>>> if (ret)
>>>
>> I think above part is wrong. Below program
> ...
>> This result suggests that above loop will continue until idr_pre_get() fails
>> due to out of memory if all ports were reserved.
>>
>> Also, if idr_get_new_above() returned 0, bind_list (which is a kmalloc()ed
>> pointer) is already installed into a free slot (see comment on
>> idr_get_new_above_int()). Thus, simply calling idr_get_new_above() again will
>> install the same pointer into multiple slots. I guess it will malfunction later.
>
> Thanks for testing!
>
> How about:
>
> + if (!ret && inet_is_reserved_local_port(port))
> + ret = -EBUSY;
>
> ? So that it will break the loop and return error.
>
Or use the similar trick:
int tries = 10;
...
if(!ret && inet_is_reserved_local_port(port)) {
if (tries--)
ret = -EAGAIN;
else
ret = -EBUSY;
}
Any comments?
^ permalink raw reply
* Re: [PATCH v4] rfs: Receive Flow Steering
From: Eric Dumazet @ 2010-04-13 8:45 UTC (permalink / raw)
To: Tom Herbert; +Cc: davem, netdev
In-Reply-To: <alpine.DEB.1.00.1004121651460.31468@pokey.mtv.corp.google.com>
Le lundi 12 avril 2010 à 17:03 -0700, Tom Herbert a écrit :
> Version 4 of RFS:
> - Use a mutex in rps_sock_flow_sysctl for mutual exclusion between
> concurrent writers and allows calling vmalloc.
> - Removed extra space before "rc = sock_queue_rcv_skb(sk, skb);"
> - Make changelog < 70 chars
> - Ensure calls to smp_processor_id in netif_rx are called in
> non-preemptable region
> ---
> This patch implements receive flow steering (RFS). RFS steers
> received packets for layer 3 and 4 processing to the CPU where
> the application for the corresponding flow is running. RFS is an
> extension of Receive Packet Steering (RPS).
>
> The basic idea of RFS is that when an application calls recvmsg
> (or sendmsg) the application's running CPU is stored in a hash
> table that is indexed by the connection's rxhash which is stored in
> the socket structure. The rxhash is passed in skb's received on
> the connection from netif_receive_skb. For each received packet,
> the associated rxhash is used to look up the CPU in the hash table,
> if a valid CPU is set then the packet is steered to that CPU using
> the RPS mechanisms.
>
> The convolution of the simple approach is that it would potentially
> allow OOO packets. If threads are thrashing around CPUs or multiple
> threads are trying to read from the same sockets, a quickly changing
> CPU value in the hash table could cause rampant OOO packets--
> we consider this a non-starter.
>
> To avoid OOO packets, this solution implements two types of hash
> tables: rps_sock_flow_table and rps_dev_flow_table.
>
> rps_sock_table is a global hash table. Each entry is just a CPU
> number and it is populated in recvmsg and sendmsg as described above.
> This table contains the "desired" CPUs for flows.
>
> rps_dev_flow_table is specific to each device queue. Each entry
> contains a CPU and a tail queue counter. The CPU is the "current"
> CPU for a matching flow. The tail queue counter holds the value
> of a tail queue counter for the associated CPU's backlog queue at
> the time of last enqueue for a flow matching the entry.
>
> Each backlog queue has a queue head counter which is incremented
> on dequeue, and so a queue tail counter is computed as queue head
> count + queue length. When a packet is enqueued on a backlog queue,
> the current value of the queue tail counter is saved in the hash
> entry of the rps_dev_flow_table.
>
> And now the trick: when selecting the CPU for RPS (get_rps_cpu)
> the rps_sock_flow table and the rps_dev_flow table for the RX queue
> are consulted. When the desired CPU for the flow (found in the
> rps_sock_flow table) does not match the current CPU (found in the
> rps_dev_flow table), the current CPU is changed to the desired CPU
> if one of the following is true:
>
> - The current CPU is unset (equal to RPS_NO_CPU)
> - Current CPU is offline
> - The current CPU's queue head counter >= queue tail counter in the
> rps_dev_flow table. This checks if the queue tail has advanced
> beyond the last packet that was enqueued using this table entry.
> This guarantees that all packets queued using this entry have been
> dequeued, thus preserving in order delivery.
>
> Making each queue have its own rps_dev_flow table has two advantages:
> 1) the tail queue counters will be written on each receive, so
> keeping the table local to interrupting CPU s good for locality. 2)
> this allows lockless access to the table-- the CPU number and queue
> tail counter need to be accessed together under mutual exclusion
> from netif_receive_skb, we assume that this is only called from
> device napi_poll which is non-reentrant.
>
> This patch implements RFS for TCP and connected UDP sockets.
> It should be usable for other flow oriented protocols.
>
> There are two configuration parameters for RFS. The
> "rps_flow_entries" kernel init parameter sets the number of
> entries in the rps_sock_flow_table, the per rxqueue sysfs entry
> "rps_flow_cnt" contains the number of entries in the rps_dev_flow
> table for the rxqueue. Both are rounded to power of two.
>
> The obvious benefit of RFS (over just RPS) is that it achieves
> CPU locality between the receive processing for a flow and the
> applications processing; this can result in increased performance
> (higher pps, lower latency).
>
> The benefits of RFS are dependent on cache hierarchy, application
> load, and other factors. On simple benchmarks, we don't necessarily
> see improvement and sometimes see degradation. However, for more
> complex benchmarks and for applications where cache pressure is
> much higher this technique seems to perform very well.
>
> Below are some benchmark results which show the potential benfit of
> this patch. The netperf test has 500 instances of netperf TCP_RR
> test with 1 byte req. and resp. The RPC test is an request/response
> test similar in structure to netperf RR test ith 100 threads on
> each host, but does more work in userspace that netperf.
>
> e1000e on 8 core Intel
> No RFS or RPS 104K tps at 30% CPU
> No RFS (best RPS config): 290K tps at 63% CPU
> RFS 303K tps at 61% CPU
>
> RPC test tps CPU% 50/90/99% usec latency Latency StdDev
> No RFS/RPS 103K 48% 757/900/3185 4472.35
> RPS only: 174K 73% 415/993/2468 491.66
> RFS 223K 73% 379/651/1382 315.61
>
> Signed-off-by: Tom Herbert <therbert@google.com> ---
> diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
> index d1a21b5..573e775 100644
> --- a/include/linux/netdevice.h
> +++ b/include/linux/netdevice.h
> @@ -530,14 +530,77 @@ struct rps_map {
> };
> #define RPS_MAP_SIZE(_num) (sizeof(struct rps_map) + (_num * sizeof(u16)))
>
> +/*
> + * The rps_dev_flow structure contains the mapping of a flow to a CPU and the
> + * tail pointer for that CPU's input queue at the time of last enqueue.
> + */
> +struct rps_dev_flow {
> + u16 cpu;
> + u16 fill;
> + unsigned int last_qtail;
> +};
> +
> +/*
> + * The rps_dev_flow_table structure contains a table of flow mappings.
> + */
> +struct rps_dev_flow_table {
> + unsigned int mask;
> + struct rcu_head rcu;
> + struct work_struct free_work;
> + struct rps_dev_flow flows[0];
> +};
> +#define RPS_DEV_FLOW_TABLE_SIZE(_num) (sizeof(struct rps_dev_flow_table) + \
> + (_num * sizeof(struct rps_dev_flow)))
> +
> +/*
> + * The rps_sock_flow_table contains mappings of flows to the last CPU
> + * on which they were processed by the application (set in recvmsg).
> + */
> +struct rps_sock_flow_table {
> + unsigned int mask;
> + u16 ents[0];
> +};
> +#define RPS_SOCK_FLOW_TABLE_SIZE(_num) (sizeof(struct rps_sock_flow_table) + \
> + (_num * sizeof(u16)))
> +
> +extern int rps_sock_flow_sysctl(ctl_table *table, int write,
> + void __user *buffer, size_t *lenp,
> + loff_t *ppos);
Hmm... ctl_table is not available in all contexts here.
CC fs/lockd/host.o
In file included from include/linux/icmpv6.h:173,
from include/linux/ipv6.h:216,
from include/net/ipv6.h:16,
from include/linux/sunrpc/clnt.h:25,
from fs/lockd/host.c:15:
include/linux/netdevice.h:566: error: expected ‘)’ before ‘*’ token
make[2]: *** [fs/lockd/host.o] Erreur 1
make[1]: *** [fs/lockd] Erreur 2
make: *** [fs] Erreur 2
Maybe rps_sock_flow_sysctl could be static in
net/core/sysctl_net_core.c ?
> +
> +#define RPS_NO_CPU 0xffff
> +
> +static inline void rps_record_sock_flow(struct rps_sock_flow_table *table,
> + u32 hash)
> +{
> + if (table && hash) {
> + unsigned int cpu, index = hash & table->mask;
> +
> + /* We only give a hint, preemption can change cpu under us */
> + cpu = raw_smp_processor_id();
> +
> + if (table->ents[index] != cpu)
> + table->ents[index] = cpu;
> + }
> +}
> +
> +static inline void rps_reset_sock_flow(struct rps_sock_flow_table *table,
> + u32 hash)
> +{
> + if (table && hash)
> + table->ents[hash & table->mask] = RPS_NO_CPU;
> +}
> +
> +extern struct rps_sock_flow_table *rps_sock_flow_table;
> +
> /* This structure contains an instance of an RX queue. */
> struct netdev_rx_queue {
> struct rps_map *rps_map;
> + struct rps_dev_flow_table *rps_flow_table;
> struct kobject kobj;
> struct netdev_rx_queue *first;
> atomic_t count;
> } ____cacheline_aligned_in_smp;
> -#endif
> +#endif /* CONFIG_RPS */
>
> /*
> * This structure defines the management hooks for network devices.
> @@ -1331,13 +1394,21 @@ struct softnet_data {
> struct sk_buff *completion_queue;
>
> /* Elements below can be accessed between CPUs for RPS */
> -#ifdef CONFIG_SMP
> +#ifdef CONFIG_RPS
> struct call_single_data csd ____cacheline_aligned_in_smp;
> + unsigned int input_queue_head;
> #endif
> struct sk_buff_head input_pkt_queue;
> struct napi_struct backlog;
> };
>
> +static inline void incr_input_queue_head(struct softnet_data *queue)
> +{
> +#ifdef CONFIG_RPS
> + queue->input_queue_head++;
> +#endif
> +}
> +
> DECLARE_PER_CPU_ALIGNED(struct softnet_data, softnet_data);
>
> #define HAVE_NETIF_QUEUE
> diff --git a/include/net/inet_sock.h b/include/net/inet_sock.h
> index 83fd344..b487bc1 100644
> --- a/include/net/inet_sock.h
> +++ b/include/net/inet_sock.h
> @@ -21,6 +21,7 @@
> #include <linux/string.h>
> #include <linux/types.h>
> #include <linux/jhash.h>
> +#include <linux/netdevice.h>
>
> #include <net/flow.h>
> #include <net/sock.h>
> @@ -101,6 +102,7 @@ struct rtable;
> * @uc_ttl - Unicast TTL
> * @inet_sport - Source port
> * @inet_id - ID counter for DF pkts
> + * @rxhash - flow hash received from netif layer
> * @tos - TOS
> * @mc_ttl - Multicasting TTL
> * @is_icsk - is this an inet_connection_sock?
> @@ -124,6 +126,9 @@ struct inet_sock {
> __u16 cmsg_flags;
> __be16 inet_sport;
> __u16 inet_id;
> +#ifdef CONFIG_RPS
> + __u32 rxhash;
> +#endif
>
> struct ip_options *opt;
> __u8 tos;
> @@ -219,4 +224,37 @@ static inline __u8 inet_sk_flowi_flags(const struct sock *sk)
> return inet_sk(sk)->transparent ? FLOWI_FLAG_ANYSRC : 0;
> }
>
> +static inline void inet_rps_record_flow(const struct sock *sk)
> +{
> +#ifdef CONFIG_RPS
> + struct rps_sock_flow_table *sock_flow_table;
> +
> + rcu_read_lock();
> + sock_flow_table = rcu_dereference(rps_sock_flow_table);
> + rps_record_sock_flow(sock_flow_table, inet_sk(sk)->rxhash);
> + rcu_read_unlock();
> +#endif
> +}
> +
> +static inline void inet_rps_reset_flow(const struct sock *sk)
> +{
> +#ifdef CONFIG_RPS
> + struct rps_sock_flow_table *sock_flow_table;
> +
> + rcu_read_lock();
> + sock_flow_table = rcu_dereference(rps_sock_flow_table);
> + rps_reset_sock_flow(sock_flow_table, inet_sk(sk)->rxhash);
> + rcu_read_unlock();
> +#endif
> +}
> +
> +static inline void inet_rps_save_rxhash(const struct sock *sk, u32 rxhash)
> +{
> +#ifdef CONFIG_RPS
> + if (unlikely(inet_sk(sk)->rxhash != rxhash)) {
> + inet_rps_reset_flow(sk);
> + inet_sk(sk)->rxhash = rxhash;
> + }
> +#endif
> +}
> #endif /* _INET_SOCK_H */
> diff --git a/net/core/dev.c b/net/core/dev.c
> index a10a216..7dbe64e 100644
> --- a/net/core/dev.c
> +++ b/net/core/dev.c
> @@ -2203,22 +2203,81 @@ int weight_p __read_mostly = 64; /* old backlog weight */
> DEFINE_PER_CPU(struct netif_rx_stats, netdev_rx_stat) = { 0, };
>
> #ifdef CONFIG_RPS
> +/* One global table that all flow-based protocols share. */
> +struct rps_sock_flow_table *rps_sock_flow_table;
> +EXPORT_SYMBOL(rps_sock_flow_table);
> +
> +int rps_sock_flow_sysctl(ctl_table *table, int write, void __user *buffer,
> + size_t *lenp, loff_t *ppos)
> +{
> + unsigned int orig_size, size;
> + int ret, i;
> + ctl_table tmp = {
> + .data = &size,
> + .maxlen = sizeof(size),
> + .mode = table->mode
> + };
> + struct rps_sock_flow_table *orig_sock_table, *sock_table;
> + static DEFINE_MUTEX(sock_flow_mutex);
> +
> + mutex_lock(&sock_flow_mutex);
> +
> + orig_sock_table = rps_sock_flow_table;
> + size = orig_size = orig_sock_table ? orig_sock_table->mask + 1 : 0;
> +
> + ret = proc_dointvec(&tmp, write, buffer, lenp, ppos);
> +
> + if (write) {
> + if (size) {
> + size = roundup_pow_of_two(size);
> + if (size != orig_size) {
> + sock_table =
> + vmalloc(RPS_SOCK_FLOW_TABLE_SIZE(size));
Please take a look at overflows in this macro
On a 32 bit machine, what happens if someone does
echo 2147483648 >/proc/sys/net/core/rps_sock_flow_entries
(I bet for a crash :( )
> + if (!sock_table) {
> + mutex_unlock(&sock_flow_mutex);
> + return -ENOMEM;
> + }
> +
> + sock_table->mask = size - 1;
> + } else
> + sock_table = orig_sock_table;
> +
> + for (i = 0; i < size; i++)
> + sock_table->ents[i] = RPS_NO_CPU;
> + } else
> + sock_table = NULL;
> +
> + if (sock_table != orig_sock_table) {
> + rcu_assign_pointer(rps_sock_flow_table, sock_table);
> + synchronize_rcu();
> + vfree(orig_sock_table);
> + }
> + }
> +
> + mutex_unlock(&sock_flow_mutex);
> +
> + return ret;
> +}
> +
> /*
> * get_rps_cpu is called from netif_receive_skb and returns the target
> * CPU from the RPS map of the receiving queue for a given skb.
> + * rcu_read_lock must be held on entry.
> */
> -static int get_rps_cpu(struct net_device *dev, struct sk_buff *skb)
> +static int get_rps_cpu(struct net_device *dev, struct sk_buff *skb,
> + struct rps_dev_flow **rflowp)
> {
> struct ipv6hdr *ip6;
> struct iphdr *ip;
> struct netdev_rx_queue *rxqueue;
> struct rps_map *map;
> + struct rps_dev_flow_table *flow_table;
> + struct rps_sock_flow_table *sock_flow_table;
> int cpu = -1;
> u8 ip_proto;
> + u16 tcpu;
> u32 addr1, addr2, ports, ihl;
>
> - rcu_read_lock();
> -
> if (skb_rx_queue_recorded(skb)) {
> u16 index = skb_get_rx_queue(skb);
> if (unlikely(index >= dev->num_rx_queues)) {
> @@ -2233,7 +2292,7 @@ static int get_rps_cpu(struct net_device *dev, struct sk_buff *skb)
> } else
> rxqueue = dev->_rx;
>
> - if (!rxqueue->rps_map)
> + if (!rxqueue->rps_map && !rxqueue->rps_flow_table)
> goto done;
>
> if (skb->rxhash)
> @@ -2285,9 +2344,48 @@ static int get_rps_cpu(struct net_device *dev, struct sk_buff *skb)
> skb->rxhash = 1;
>
> got_hash:
> + flow_table = rcu_dereference(rxqueue->rps_flow_table);
> + sock_flow_table = rcu_dereference(rps_sock_flow_table);
> + if (flow_table && sock_flow_table) {
> + u16 next_cpu;
> + struct rps_dev_flow *rflow;
> +
> + rflow = &flow_table->flows[skb->rxhash & flow_table->mask];
> + tcpu = rflow->cpu;
> +
> + next_cpu = sock_flow_table->ents[skb->rxhash &
> + sock_flow_table->mask];
> +
> + /*
> + * If the desired CPU (where last recvmsg was done) is
> + * different from current CPU (one in the rx-queue flow
> + * table entry), switch if one of the following holds:
> + * - Current CPU is unset (equal to RPS_NO_CPU).
> + * - Current CPU is offline.
> + * - The current CPU's queue tail has advanced beyond the
> + * last packet that was enqueued using this table entry.
> + * This guarantees that all previous packets for the flow
> + * have been dequeued, thus preserving in order delivery.
> + */
> + if (unlikely(tcpu != next_cpu) &&
> + (tcpu == RPS_NO_CPU || !cpu_online(tcpu) ||
> + ((int)(per_cpu(softnet_data, tcpu).input_queue_head -
> + rflow->last_qtail)) >= 0)) {
> + tcpu = rflow->cpu = next_cpu;
> + if (tcpu != RPS_NO_CPU)
> + rflow->last_qtail = per_cpu(softnet_data,
> + tcpu).input_queue_head;
> + }
> + if (tcpu != RPS_NO_CPU && cpu_online(tcpu)) {
> + *rflowp = rflow;
> + cpu = tcpu;
> + goto done;
> + }
> + }
> +
> map = rcu_dereference(rxqueue->rps_map);
> if (map) {
> - u16 tcpu = map->cpus[((u64) skb->rxhash * map->len) >> 32];
> + tcpu = map->cpus[((u64) skb->rxhash * map->len) >> 32];
>
> if (cpu_online(tcpu)) {
> cpu = tcpu;
> @@ -2296,7 +2394,6 @@ got_hash:
> }
>
> done:
> - rcu_read_unlock();
> return cpu;
> }
>
> @@ -2322,13 +2419,14 @@ static void trigger_softirq(void *data)
> __napi_schedule(&queue->backlog);
> __get_cpu_var(netdev_rx_stat).received_rps++;
> }
> -#endif /* CONFIG_SMP */
> +#endif /* CONFIG_RPS */
>
> /*
> * enqueue_to_backlog is called to queue an skb to a per CPU backlog
> * queue (may be a remote CPU queue).
> */
> -static int enqueue_to_backlog(struct sk_buff *skb, int cpu)
> +static int enqueue_to_backlog(struct sk_buff *skb, int cpu,
> + unsigned int *qtail)
> {
> struct softnet_data *queue;
> unsigned long flags;
> @@ -2343,6 +2441,10 @@ static int enqueue_to_backlog(struct sk_buff *skb, int cpu)
> if (queue->input_pkt_queue.qlen) {
> enqueue:
> __skb_queue_tail(&queue->input_pkt_queue, skb);
> +#ifdef CONFIG_RPS
> + *qtail = queue->input_queue_head +
> + queue->input_pkt_queue.qlen;
> +#endif
> rps_unlock(queue);
> local_irq_restore(flags);
> return NET_RX_SUCCESS;
> @@ -2357,11 +2459,10 @@ enqueue:
>
> cpu_set(cpu, rcpus->mask[rcpus->select]);
> __raise_softirq_irqoff(NET_RX_SOFTIRQ);
> - } else
> - __napi_schedule(&queue->backlog);
> -#else
> - __napi_schedule(&queue->backlog);
> + goto enqueue;
> + }
> #endif
> + __napi_schedule(&queue->backlog);
> }
> goto enqueue;
> }
> @@ -2392,7 +2493,8 @@ enqueue:
>
> int netif_rx(struct sk_buff *skb)
> {
> - int cpu;
> + unsigned int qtail;
> + int err;
>
> /* if netpoll wants it, pretend we never saw it */
> if (netpoll_rx(skb))
> @@ -2402,14 +2504,26 @@ int netif_rx(struct sk_buff *skb)
> net_timestamp(skb);
>
> #ifdef CONFIG_RPS
> - cpu = get_rps_cpu(skb->dev, skb);
> - if (cpu < 0)
> - cpu = smp_processor_id();
> + {
> + struct rps_dev_flow voidflow, *rflow = &voidflow;
> + int cpu;
> +
> + rcu_read_lock();
> +
> + cpu = get_rps_cpu(skb->dev, skb, &rflow);
> + if (cpu < 0)
> + cpu = smp_processor_id();
> +
> + err = enqueue_to_backlog(skb, cpu, &rflow->last_qtail);
> +
> + rcu_read_unlock();
> + }
> #else
> - cpu = smp_processor_id();
> + preempt_disable();
> + err = enqueue_to_backlog(skb, smp_processor_id(), &qtail);
> + preempt_enable();
> #endif
> -
> - return enqueue_to_backlog(skb, cpu);
> + return err;
> }
> EXPORT_SYMBOL(netif_rx);
>
> @@ -2776,17 +2890,22 @@ out:
> int netif_receive_skb(struct sk_buff *skb)
> {
> #ifdef CONFIG_RPS
> - int cpu;
> + struct rps_dev_flow voidflow, *rflow = &voidflow;
> + int cpu, err;
> +
> + rcu_read_lock();
>
> - cpu = get_rps_cpu(skb->dev, skb);
> + cpu = get_rps_cpu(skb->dev, skb, &rflow);
>
> - if (cpu < 0)
> - return __netif_receive_skb(skb);
> - else
> - return enqueue_to_backlog(skb, cpu);
> -#else
> - return __netif_receive_skb(skb);
> + if (cpu >= 0) {
> + err = enqueue_to_backlog(skb, cpu, &rflow->last_qtail);
> + rcu_read_unlock();
> + return err;
> + }
> +
> + rcu_read_unlock();
> #endif
> + return __netif_receive_skb(skb);
> }
> EXPORT_SYMBOL(netif_receive_skb);
>
> @@ -2802,6 +2921,7 @@ static void flush_backlog(void *arg)
> if (skb->dev == dev) {
> __skb_unlink(skb, &queue->input_pkt_queue);
> kfree_skb(skb);
> + incr_input_queue_head(queue);
> }
> rps_unlock(queue);
> }
> @@ -3125,6 +3245,7 @@ static int process_backlog(struct napi_struct *napi, int quota)
> local_irq_enable();
> break;
> }
> + incr_input_queue_head(queue);
> rps_unlock(queue);
> local_irq_enable();
>
> @@ -5488,8 +5609,10 @@ static int dev_cpu_callback(struct notifier_block *nfb,
> local_irq_enable();
>
> /* Process offline CPU's input_pkt_queue */
> - while ((skb = __skb_dequeue(&oldsd->input_pkt_queue)))
> + while ((skb = __skb_dequeue(&oldsd->input_pkt_queue))) {
> netif_rx(skb);
> + incr_input_queue_head(oldsd);
> + }
>
> return NOTIFY_OK;
> }
> diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c
> index 96ed690..e518bee 100644
> --- a/net/core/net-sysfs.c
> +++ b/net/core/net-sysfs.c
> @@ -601,22 +601,105 @@ ssize_t store_rps_map(struct netdev_rx_queue *queue,
> return len;
> }
>
> +static ssize_t show_rps_dev_flow_table_cnt(struct netdev_rx_queue *queue,
> + struct rx_queue_attribute *attr,
> + char *buf)
> +{
> + struct rps_dev_flow_table *flow_table;
> + unsigned int val = 0;
> +
> + rcu_read_lock();
> + flow_table = rcu_dereference(queue->rps_flow_table);
> + if (flow_table)
> + val = flow_table->mask + 1;
> + rcu_read_unlock();
> +
> + return sprintf(buf, "%u\n", val);
> +}
> +
> +static void rps_dev_flow_table_release_work(struct work_struct *work)
> +{
> + struct rps_dev_flow_table *table = container_of(work,
> + struct rps_dev_flow_table, free_work);
> +
> + vfree(table);
> +}
> +
> +static void rps_dev_flow_table_release(struct rcu_head *rcu)
> +{
> + struct rps_dev_flow_table *table = container_of(rcu,
> + struct rps_dev_flow_table, rcu);
> +
> + INIT_WORK(&table->free_work, rps_dev_flow_table_release_work);
> + schedule_work(&table->free_work);
> +}
> +
> +ssize_t store_rps_dev_flow_table_cnt(struct netdev_rx_queue *queue,
> + struct rx_queue_attribute *attr,
> + const char *buf, size_t len)
> +{
> + unsigned int count;
> + char *endp;
> + struct rps_dev_flow_table *table, *old_table;
> + static DEFINE_SPINLOCK(rps_dev_flow_lock);
> +
> + if (!capable(CAP_NET_ADMIN))
> + return -EPERM;
> +
> + count = simple_strtoul(buf, &endp, 0);
> + if (endp == buf)
> + return -EINVAL;
> +
> + if (count) {
> + int i;
> +
> + count = roundup_pow_of_two(count);
> + table = vmalloc(RPS_DEV_FLOW_TABLE_SIZE(count));
Same overflow problem here
> + if (!table)
> + return -ENOMEM;
> +
> + table->mask = count - 1;
> + for (i = 0; i < count; i++)
> + table->flows[i].cpu = RPS_NO_CPU;
> + } else
> + table = NULL;
> +
> + spin_lock(&rps_dev_flow_lock);
> + old_table = queue->rps_flow_table;
> + rcu_assign_pointer(queue->rps_flow_table, table);
> + spin_unlock(&rps_dev_flow_lock);
> +
> + if (old_table)
> + call_rcu(&old_table->rcu, rps_dev_flow_table_release);
> +
> + return len;
> +}
> +
> static struct rx_queue_attribute rps_cpus_attribute =
> __ATTR(rps_cpus, S_IRUGO | S_IWUSR, show_rps_map, store_rps_map);
>
> +
> +static struct rx_queue_attribute rps_dev_flow_table_cnt_attribute =
> + __ATTR(rps_flow_cnt, S_IRUGO | S_IWUSR,
> + show_rps_dev_flow_table_cnt, store_rps_dev_flow_table_cnt);
> +
> static struct attribute *rx_queue_default_attrs[] = {
> &rps_cpus_attribute.attr,
> + &rps_dev_flow_table_cnt_attribute.attr,
> NULL
> };
>
> static void rx_queue_release(struct kobject *kobj)
> {
> struct netdev_rx_queue *queue = to_rx_queue(kobj);
> - struct rps_map *map = queue->rps_map;
> struct netdev_rx_queue *first = queue->first;
>
> - if (map)
> - call_rcu(&map->rcu, rps_map_release);
> + if (queue->rps_map)
> + call_rcu(&queue->rps_map->rcu, rps_map_release);
> +
> + if (queue->rps_flow_table)
> + call_rcu(&queue->rps_flow_table->rcu,
> + rps_dev_flow_table_release);
>
> if (atomic_dec_and_test(&first->count))
> kfree(first);
> diff --git a/net/core/sysctl_net_core.c b/net/core/sysctl_net_core.c
> index b7b6b82..9eb2f67 100644
> --- a/net/core/sysctl_net_core.c
> +++ b/net/core/sysctl_net_core.c
> @@ -82,6 +82,14 @@ static struct ctl_table net_core_table[] = {
> .mode = 0644,
> .proc_handler = proc_dointvec
> },
> +#ifdef CONFIG_RPS
> + {
> + .procname = "rps_sock_flow_entries",
> + .maxlen = sizeof(int),
> + .mode = 0644,
> + .proc_handler = rps_sock_flow_sysctl
> + },
> +#endif
> #endif /* CONFIG_NET */
> {
> .procname = "netdev_budget",
> diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
> index a0beb32..3703b5e 100644
> --- a/net/ipv4/af_inet.c
> +++ b/net/ipv4/af_inet.c
> @@ -419,6 +419,8 @@ int inet_release(struct socket *sock)
> if (sk) {
> long timeout;
>
> + inet_rps_reset_flow(sk);
> +
> /* Applications forget to leave groups before exiting */
> ip_mc_drop_socket(sk);
>
> @@ -720,6 +722,8 @@ int inet_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *msg,
> {
> struct sock *sk = sock->sk;
>
> + inet_rps_record_flow(sk);
> +
> /* We may need to bind the socket. */
> if (!inet_sk(sk)->inet_num && inet_autobind(sk))
> return -EAGAIN;
> @@ -728,12 +732,13 @@ int inet_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *msg,
> }
> EXPORT_SYMBOL(inet_sendmsg);
>
> -
> static ssize_t inet_sendpage(struct socket *sock, struct page *page, int offset,
> size_t size, int flags)
> {
> struct sock *sk = sock->sk;
>
> + inet_rps_record_flow(sk);
> +
> /* We may need to bind the socket. */
> if (!inet_sk(sk)->inet_num && inet_autobind(sk))
> return -EAGAIN;
> @@ -743,6 +748,22 @@ static ssize_t inet_sendpage(struct socket *sock, struct page *page, int offset,
> return sock_no_sendpage(sock, page, offset, size, flags);
> }
>
> +int inet_recvmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *msg,
> + size_t size, int flags)
> +{
> + struct sock *sk = sock->sk;
> + int addr_len = 0;
> + int err;
> +
> + inet_rps_record_flow(sk);
> +
> + err = sk->sk_prot->recvmsg(iocb, sk, msg, size, flags & MSG_DONTWAIT,
> + flags & ~MSG_DONTWAIT, &addr_len);
> + if (err >= 0)
> + msg->msg_namelen = addr_len;
> + return err;
> +}
> +EXPORT_SYMBOL(inet_recvmsg);
>
> int inet_shutdown(struct socket *sock, int how)
> {
> @@ -872,7 +893,7 @@ const struct proto_ops inet_stream_ops = {
> .setsockopt = sock_common_setsockopt,
> .getsockopt = sock_common_getsockopt,
> .sendmsg = tcp_sendmsg,
> - .recvmsg = sock_common_recvmsg,
> + .recvmsg = inet_recvmsg,
> .mmap = sock_no_mmap,
> .sendpage = tcp_sendpage,
> .splice_read = tcp_splice_read,
> @@ -899,7 +920,7 @@ const struct proto_ops inet_dgram_ops = {
> .setsockopt = sock_common_setsockopt,
> .getsockopt = sock_common_getsockopt,
> .sendmsg = inet_sendmsg,
> - .recvmsg = sock_common_recvmsg,
> + .recvmsg = inet_recvmsg,
> .mmap = sock_no_mmap,
> .sendpage = inet_sendpage,
> #ifdef CONFIG_COMPAT
> @@ -929,7 +950,7 @@ static const struct proto_ops inet_sockraw_ops = {
> .setsockopt = sock_common_setsockopt,
> .getsockopt = sock_common_getsockopt,
> .sendmsg = inet_sendmsg,
> - .recvmsg = sock_common_recvmsg,
> + .recvmsg = inet_recvmsg,
> .mmap = sock_no_mmap,
> .sendpage = inet_sendpage,
> #ifdef CONFIG_COMPAT
> diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
> index a24995c..ad08392 100644
> --- a/net/ipv4/tcp_ipv4.c
> +++ b/net/ipv4/tcp_ipv4.c
> @@ -1672,6 +1672,8 @@ process:
>
> skb->dev = NULL;
>
> + inet_rps_save_rxhash(sk, skb->rxhash);
> +
> bh_lock_sock_nested(sk);
> ret = 0;
> if (!sock_owned_by_user(sk)) {
> diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
> index 8fef859..666b963 100644
> --- a/net/ipv4/udp.c
> +++ b/net/ipv4/udp.c
> @@ -1217,6 +1217,7 @@ int udp_disconnect(struct sock *sk, int flags)
> sk->sk_state = TCP_CLOSE;
> inet->inet_daddr = 0;
> inet->inet_dport = 0;
> + inet_rps_save_rxhash(sk, 0);
> sk->sk_bound_dev_if = 0;
> if (!(sk->sk_userlocks & SOCK_BINDADDR_LOCK))
> inet_reset_saddr(sk);
> @@ -1258,8 +1259,12 @@ EXPORT_SYMBOL(udp_lib_unhash);
>
> static int __udp_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
> {
> - int rc = sock_queue_rcv_skb(sk, skb);
> + int rc;
> +
> + if (inet_sk(sk)->inet_daddr)
> + inet_rps_save_rxhash(sk, skb->rxhash);
>
> + rc = sock_queue_rcv_skb(sk, skb);
> if (rc < 0) {
> int is_udplite = IS_UDPLITE(sk);
>
^ permalink raw reply
* Re: [PATCH net-next-2.6] net: Dont use netdev_warn()
From: David Miller @ 2010-04-13 8:52 UTC (permalink / raw)
To: eric.dumazet; +Cc: netdev, therbert, joe
In-Reply-To: <1270797973.2623.28.camel@edumazet-laptop>
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Fri, 09 Apr 2010 09:26:13 +0200
> Dont use netdev_warn() in dev_cap_txqueue() and get_rps_cpu() so that we
> can catch following warnings without crash.
>
> bond0.2240 received packet on queue 6, but number of RX queues is 1
> bond0.2240 received packet on queue 11, but number of RX queues is 1
>
> Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Applied to net-next-2.6, thanks Eric.
^ permalink raw reply
* Re: [PATCH net-next-2.6] net: sk_dst_cache RCUification
From: David Miller @ 2010-04-13 8:52 UTC (permalink / raw)
To: eric.dumazet; +Cc: netdev, paulmck
In-Reply-To: <1270803809.2623.69.camel@edumazet-laptop>
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Fri, 09 Apr 2010 11:03:29 +0200
> With latest CONFIG_PROVE_RCU stuff, I felt more comfortable to make this
> work.
>
> sk->sk_dst_cache is currently protected by a rwlock (sk_dst_lock)
>
> This rwlock is readlocked for a very small amount of time, and dst
> entries are already freed after RCU grace period. This calls for RCU
> again :)
>
> This patch converts sk_dst_lock to a spinlock, and use RCU for readers.
>
> __sk_dst_get() is supposed to be called with rcu_read_lock() or if
> socket locked by user, so use appropriate rcu_dereference_check()
> condition (rcu_read_lock_held() || sock_owned_by_user(sk))
>
> This patch avoids two atomic ops per tx packet on UDP connected sockets,
> for example, and permits sk_dst_lock to be much less dirtied.
>
> Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Applied, thanks for doing this work Eric.
^ permalink raw reply
* Re: [PATCH v2 net-next 1/2] gianfar: Add hardware RX timestamping support
From: David Miller @ 2010-04-13 8:52 UTC (permalink / raw)
To: Manfred.Rudigier; +Cc: netdev, linuxppc-dev, sandeep.kumar, scottwood
In-Reply-To: <95DC1AA8EC908B48939B72CF375AA5E311B26A77@alice.at.omicron.at>
From: Manfred Rudigier <Manfred.Rudigier@omicron.at>
Date: Fri, 9 Apr 2010 11:10:03 +0200
> The device is configured to insert hardware timestamps into all
> received packets. The RX timestamps are extracted from the padding
> alingment bytes during the clean_rx_ring operation and copied into the
> skb_shared_hwtstamps struct of the skb. This extraction only happens if
> the rx_filter was set to something else than HWTSTAMP_FILTER_NONE with
> the SIOCSHWTSTAMP ioctl command.
>
> Hardware timestamping is only supported for eTSEC devices. To indicate
> device support the new FSL_GIANFAR_DEV_HAS_TIMER flag was introduced.
>
> Signed-off-by: Manfred Rudigier <manfred.rudigier@omicron.at>
Applied to net-next-2.6
^ permalink raw reply
* Re: [PATCH v2 net-next 2/2] gianfar: Add hardware TX timestamping support
From: David Miller @ 2010-04-13 8:52 UTC (permalink / raw)
To: Manfred.Rudigier; +Cc: netdev, linuxppc-dev, sandeep.kumar, scottwood
In-Reply-To: <95DC1AA8EC908B48939B72CF375AA5E311B26A78@alice.at.omicron.at>
From: Manfred Rudigier <Manfred.Rudigier@omicron.at>
Date: Fri, 9 Apr 2010 11:10:35 +0200
> If a packet has the skb_shared_tx->hardware flag set the device is
> instructed to generate a TX timestamp and write it back to memory after
> the frame is transmitted. During the clean_tx_ring operation the
> timestamp will be extracted and copied into the skb_shared_hwtstamps
> struct of the skb.
>
> TX timestamping is enabled by setting the tx_type to something else
> than HWTSTAMP_TX_OFF with the SIOCSHWTSTAMP ioctl command. It is only
> supported by eTSEC devices.
>
> Signed-off-by: Manfred Rudigier <manfred.rudigier@omicron.at>
Applied to net-next-2.6
^ permalink raw reply
* Re: [PATCH] (net-2.6) stmmac update - Apr 2010
From: David Miller @ 2010-04-13 8:53 UTC (permalink / raw)
To: peppe.cavallaro; +Cc: netdev
In-Reply-To: <1270808662-7115-1-git-send-email-peppe.cavallaro@st.com>
From: Giuseppe CAVALLARO <peppe.cavallaro@st.com>
Date: Fri, 9 Apr 2010 12:24:15 +0200
> Hello,
> this is another subset of patches to make the driver more generic.
>
> This patches splits the dma and core code for the mac 10/100 device
> (as already done for the gmac) and reorganizes the descriptor
> structures.
> In the first version of the driver, the mac10/100 could only use
> normal descriptors and the gmac could only use the enhanced ones.
> This limit has been removed and this kind of information comes
> from the platform.
Please:
1) respin your patches against net-next-2.6
2) Add numbers to your patch posting subject lines so there
is no confusion about what order your patches should be
applied.
3) Make sure the driver compiles successfully at each step
of applying your patches, not just after all the changes
are applied.
Thanks.
^ permalink raw reply
* Re: [Bonding-devel] [v3 Patch 2/3] bridge: make bridge support netpoll
From: Cong Wang @ 2010-04-13 8:57 UTC (permalink / raw)
To: Stephen Hemminger
Cc: Eric Dumazet, Jay Vosburgh, Neil Horman, netdev, Matt Mackall,
bridge, linux-kernel, David Miller, Jeff Moyer, Andy Gospodarek,
bonding-devel
In-Reply-To: <20100412083842.26d71bda@nehalam>
Stephen Hemminger wrote:
> On Mon, 12 Apr 2010 12:38:57 +0200
> Eric Dumazet <eric.dumazet@gmail.com> wrote:
>
>> Le lundi 12 avril 2010 à 18:37 +0800, Cong Wang a écrit :
>>> Stephen Hemminger wrote:
>>>> There is no protection on dev->priv_flags for SMP access.
>>>> It would better bit value in dev->state if you are using it as control flag.
>>>>
>>>> Then you could use
>>>> if (unlikely(test_and_clear_bit(__IN_NETPOLL, &skb->dev->state)))
>>>> netpoll_send_skb(...)
>>>>
>>>>
>>> Hmm, I think we can't use ->state here, it is not for this kind of purpose,
>>> according to its comments.
>>>
>>> Also, I find other usages of IFF_XXX flags of ->priv_flags are also using
>>> &, | to set or clear the flags. So there must be some other things preventing
>>> the race...
>> Yes, its RTNL that protects priv_flags changes, hopefully...
>>
>
> The patch was not protecting priv_flags with RTNL.
> For example..
>
>
> @@ -308,7 +312,9 @@ static void netpoll_send_skb(struct netp
> tries > 0; --tries) {
> if (__netif_tx_trylock(txq)) {
> if (!netif_tx_queue_stopped(txq)) {
> + dev->priv_flags |= IFF_IN_NETPOLL;
> status = ops->ndo_start_xmit(skb, dev);
> + dev->priv_flags &= ~IFF_IN_NETPOLL;
> if (status == NETDEV_TX_OK)
> txq_trans_update(txq);
Hmm, but I checked the bonding case (IFF_BONDING), it doesn't
hold rtnl_lock. Strange.
^ permalink raw reply
* Re: [net-2.6 PATCH] ixgbe: fix bug with vlan strip in promsic mode
From: David Miller @ 2010-04-13 8:57 UTC (permalink / raw)
To: jeffrey.t.kirsher; +Cc: netdev, gospo, jesse.brandeburg
In-Reply-To: <1271108409.23823.0.camel@localhost>
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Mon, 12 Apr 2010 14:40:09 -0700
> On Fri, 2010-03-26 at 22:00 -0600, David Miller wrote:
>> Doesn't apply.
>>
>> It depends upon the mc_list traversal conversions which are
>> absolutely not appropriate for net-2.6, and thus I only
>> applied to net-next-2.6
>
> I am not seeing this patch in your net-next tree.
Even stranger I can't even find it in patchwork either.
> Do you want me to re-submit the patch against net-next?
Please resubmit, thanks Jeff.
Sorry for this.
^ permalink raw reply
* Re: [PATCH] xtables: make XT_ALIGN() usable in exported headers by exporting __ALIGN_KERNEL()
From: Patrick McHardy @ 2010-04-13 9:22 UTC (permalink / raw)
To: Alexey Dobriyan
Cc: linux-kernel, netdev, shemminger, bhutchings, andreas, hadi,
hideaki
In-Reply-To: <20100407162245.GA4557@x200>
Alexey Dobriyan wrote:
> XT_ALIGN() was rewritten through ALIGN() by commit 42107f5009da223daa800d6da6904d77297ae829
> "netfilter: xtables: symmetric COMPAT_XT_ALIGN definition".
> ALIGN() is not exported in userspace headers, which created compile problem for tc(8)
> and will create problem for iptables(8).
>
> We can't export generic looking name ALIGN() but we can export less generic
> __ALIGN_KERNEL() (suggested by Ben Hutchings).
> Google knows nothing about __ALIGN_KERNEL().
>
> COMPAT_XT_ALIGN() changed for symmetry.
Since there haven't been any objections, I've applied your patch.
Thanks.
^ permalink raw reply
* Re: [PATCH net-next 0/8] tg3 updates
From: David Miller @ 2010-04-13 9:26 UTC (permalink / raw)
To: mcarlson; +Cc: netdev, andy
In-Reply-To: <1271091511-11173-1-git-send-email-mcarlson@broadcom.com>
From: "Matt Carlson" <mcarlson@broadcom.com>
Date: Mon, 12 Apr 2010 09:58:23 -0700
> This patchset adds code to support the 57765 OTP ROM bootcode, fixes
> bug related to VLANs and adds some minor improvements.
These all look good, applied to net-next-2.6
Thanks!
^ permalink raw reply
* Re: [PATCH 0/4] IPv6 addrconf related fixes
From: David Miller @ 2010-04-13 9:29 UTC (permalink / raw)
To: shemminger; +Cc: netdev
In-Reply-To: <20100412154130.397252857@vyatta.com>
From: Stephen Hemminger <shemminger@vyatta.com>
Date: Mon, 12 Apr 2010 08:41:30 -0700
> These apply to net-next, the problems do not exist in earlier kernels.
> The problems started when I added changes to retain IPv6 addresses
> when link goes down.
All aplied, thanks for fixing these bugs Stephen.
^ permalink raw reply
* Re: Flooded with bonding: bond0: doing slave updates when interface is down.
From: gopala krishnan @ 2010-04-13 7:55 UTC (permalink / raw)
To: netdev
In-Reply-To: <87mxzj6eyx.fsf@tac.ki.iif.hu>
Hi I have a question,
Before adding a slave to a bond, is it we require to mave the slave interface
down and add the slave to the bond and make the slave up.
Then the traffic will be disruptive when adding a slave to the bond.
^ permalink raw reply
* Re: [PATCH v2] net: batch skb dequeueing from softnet input_pkt_queue
From: Changli Gao @ 2010-04-13 9:50 UTC (permalink / raw)
To: Eric Dumazet; +Cc: David S. Miller, netdev
In-Reply-To: <1271146112.16881.213.camel@edumazet-laptop>
On Tue, Apr 13, 2010 at 4:08 PM, Eric Dumazet <eric.dumazet@gmail.com> wrote:
>
> Probably not necessary.
>
>> + volatile bool flush_processing_queue;
>
> Use of 'volatile' is strongly discouraged, I would say, forbidden.
>
volatile is used to avoid compiler optimization.
> Its usually a sign of 'I dont exactly what memory ordering I need, so I
> throw a volatile just in case'. We live in a world full of RCU, read ,
> write, full barriers. And these apis are well documented.
>
There isn't memory accessing order problem.
>> @@ -2803,6 +2808,7 @@ static void flush_backlog(void *arg)
>> __skb_unlink(skb, &queue->input_pkt_queue);
>> kfree_skb(skb);
>> }
>> + queue->flush_processing_queue = true;
>
> Probably not necessary
>
If flush_backlog() is called when there are still packets in
processing_queue, there maybe some packets refer to the netdev gone,
if we remove this line.
>> rps_unlock(queue);
>> }
>>
>> @@ -3112,14 +3118,23 @@ static int process_backlog(struct napi_struct *napi, int quota)
>> struct softnet_data *queue = &__get_cpu_var(softnet_data);
>> unsigned long start_time = jiffies;
>>
>> + if (queue->flush_processing_queue) {
>
> Really... this is bloat IMHO
Any better idea?
>
>>
>
> I advise to keep it simple.
>
> My suggestion would be to limit this patch only to process_backlog().
>
> Really if you touch other areas, there is too much risk.
>
> Perform sort of skb_queue_splice_tail_init() into a local (stack) queue,
> but the trick is to not touch input_pkt_queue.qlen, so that we dont slow
> down enqueue_to_backlog().
>
> Process at most 'quota' skbs (or jiffies limit).
>
> relock queue.
> input_pkt_queue.qlen -= number_of_handled_skbs;
>
Oh no, in order to let latter packets in as soon as possible, we have
to update qlen immediately.
--
Regards，
Changli Gao(xiaosuo@gmail.com)
^ permalink raw reply
* Re: [PATCH] Fix some #includes in CAN drivers
From: Hans J. Koch @ 2010-04-13 9:51 UTC (permalink / raw)
To: David Miller
Cc: haas-zsNKPWJ8Piak0Ce0JJ2bFg, celston-Bm0nJX+W7e9BDgjK7y7TUQ,
netdev-u79uwXL29TY76Z2rM5mHXA,
socketcan-core-0fE9KPoRgkgATYTw5x5z8w,
per.dalen-Re5JQEeQqe8AvxtiuMwx3w,
oliver.hartkopp-l29pVbxQd1IUtdQbppsyvg,
kernel-bIcnvbaLZ9MEGnE8C9+IrQ, wg-5Yr1BZd7O62+XT7JhA+gdA,
chripell-LERDrqjqfvZg9hUCZPvPmw
In-Reply-To: <20100413.013614.200995710.davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org>
On Tue, Apr 13, 2010 at 01:36:14AM -0700, David Miller wrote:
> From: "Hans J. Koch" <hjk-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org>
> Date: Thu, 8 Apr 2010 21:25:45 +0200
>
> > In the current implementation, CAN drivers need to #include <linux/can.h>
> > _before_ they #include <linux/can/dev.h>, which is both ugly and
> > unnecessary.
> >
> > Fix this by including <linux/can.h> in <linux/can/dev.h> and remove the
> > #include <linux/can.h> lines from drivers.
> >
> > Signed-off-by: Hans J. Koch <hjk-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org>
>
> This doesn't apply cleanly to net-next-2.6, please respin your patch
> and resubmit.
Ooops, sorry. Will resubmit immediately.
Thanks,
Hans
^ permalink raw reply
* Re: [PATCH] tg3: use the DMA state API instead of the pci equivalents
From: David Miller @ 2010-04-13 9:54 UTC (permalink / raw)
To: fujita.tomonori; +Cc: netdev, mcarlson, mchan
In-Reply-To: <1271118734-28353-1-git-send-email-fujita.tomonori@lab.ntt.co.jp>
From: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Date: Tue, 13 Apr 2010 09:32:09 +0900
> This replace the PCI DMA state API (include/linux/pci-dma.h) with the
> DMA equivalents since the PCI DMA state API will be obsolete.
>
> No functional change.
>
> For further information about the background:
>
> http://marc.info/?l=linux-netdev&m=127037540020276&w=2
>
> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Applied.
^ permalink raw reply
* Re: [PATCH] qla3xxx: use the DMA state API instead of the pci equivalents
From: David Miller @ 2010-04-13 9:54 UTC (permalink / raw)
To: fujita.tomonori; +Cc: netdev, ron.mercer
In-Reply-To: <1271118734-28353-5-git-send-email-fujita.tomonori@lab.ntt.co.jp>
From: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Date: Tue, 13 Apr 2010 09:32:13 +0900
> This replace the PCI DMA state API (include/linux/pci-dma.h) with the
> DMA equivalents since the PCI DMA state API will be obsolete.
>
> No functional change.
>
> For further information about the background:
>
> http://marc.info/?l=linux-netdev&m=127037540020276&w=2
>
> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Applied.
^ permalink raw reply
* Re: [PATCH] chelsio: use the DMA state API instead of the pci equivalents
From: David Miller @ 2010-04-13 9:54 UTC (permalink / raw)
To: fujita.tomonori; +Cc: netdev, divy
In-Reply-To: <1271118734-28353-3-git-send-email-fujita.tomonori@lab.ntt.co.jp>
From: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Date: Tue, 13 Apr 2010 09:32:11 +0900
> This replace the PCI DMA state API (include/linux/pci-dma.h) with the
> DMA equivalents since the PCI DMA state API will be obsolete.
>
> No functional change.
>
> For further information about the background:
>
> http://marc.info/?l=linux-netdev&m=127037540020276&w=2
>
> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Applied.
^ permalink raw reply
* Re: [PATCH] cxgb3: use the DMA state API instead of the pci equivalents
From: David Miller @ 2010-04-13 9:54 UTC (permalink / raw)
To: fujita.tomonori; +Cc: netdev, divy
In-Reply-To: <1271118734-28353-4-git-send-email-fujita.tomonori@lab.ntt.co.jp>
From: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Date: Tue, 13 Apr 2010 09:32:12 +0900
> This replace the PCI DMA state API (include/linux/pci-dma.h) with the
> DMA equivalents since the PCI DMA state API will be obsolete.
>
> No functional change.
>
> For further information about the background:
>
> http://marc.info/?l=linux-netdev&m=127037540020276&w=2
>
> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Applied.
^ permalink raw reply
* Re: [PATCH] qlge: use the DMA state API instead of the pci equivalents
From: David Miller @ 2010-04-13 9:54 UTC (permalink / raw)
To: fujita.tomonori; +Cc: netdev, ron.mercer
In-Reply-To: <1271118734-28353-6-git-send-email-fujita.tomonori@lab.ntt.co.jp>
From: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Date: Tue, 13 Apr 2010 09:32:14 +0900
> This replace the PCI DMA state API (include/linux/pci-dma.h) with the
> DMA equivalents since the PCI DMA state API will be obsolete.
>
> No functional change.
>
> For further information about the background:
>
> http://marc.info/?l=linux-netdev&m=127037540020276&w=2
>
> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Applied.
^ permalink raw reply
* Re: [PATCH] myri10ge: use the DMA state API instead of the pci equivalents
From: David Miller @ 2010-04-13 9:54 UTC (permalink / raw)
To: fujita.tomonori; +Cc: netdev, gallatin, brice
In-Reply-To: <1271118734-28353-2-git-send-email-fujita.tomonori@lab.ntt.co.jp>
From: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Date: Tue, 13 Apr 2010 09:32:10 +0900
> This replace the PCI DMA state API (include/linux/pci-dma.h) with the
> DMA equivalents since the PCI DMA state API will be obsolete.
>
> No functional change.
>
> For further information about the background:
>
> http://marc.info/?l=linux-netdev&m=127037540020276&w=2
>
> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Applied.
^ permalink raw reply
* Re: [net-next-2.6 PATCH] igb: add support for reporting 5GT/s during probe on PCIe Gen2
From: David Miller @ 2010-04-13 9:58 UTC (permalink / raw)
To: bhutchings; +Cc: jeffrey.t.kirsher, netdev, gospo, alexander.h.duyck
In-Reply-To: <1270857256.2176.37.camel@localhost>
From: Ben Hutchings <bhutchings@solarflare.com>
Date: Sat, 10 Apr 2010 00:54:16 +0100
> On Fri, 2010-04-09 at 12:52 -0700, Jeff Kirsher wrote:
>> From: Alexander Duyck <alexander.h.duyck@intel.com>
>>
>> This change corrects the fact that we were not reporting Gen2 link speeds
>> when we were in fact connected at Gen2 rates.
>>
>> Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
>> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>> ---
>>
>> drivers/net/igb/e1000_defines.h | 3 +++
>> drivers/net/igb/e1000_mac.c | 19 ++++++++++++++++---
>> drivers/net/igb/igb_main.c | 1 +
>> 3 files changed, 20 insertions(+), 3 deletions(-)
>>
>> diff --git a/drivers/net/igb/e1000_defines.h b/drivers/net/igb/e1000_defines.h
>> index 31d24e0..8e440e8 100644
>> --- a/drivers/net/igb/e1000_defines.h
>> +++ b/drivers/net/igb/e1000_defines.h
>> @@ -615,6 +615,9 @@
>>
>> #define PCIE_LINK_WIDTH_MASK 0x3F0
>> #define PCIE_LINK_WIDTH_SHIFT 4
>> +#define PCIE_LINK_SPEED_MASK 0x0F
>> +#define PCIE_LINK_SPEED_2500 0x01
>> +#define PCIE_LINK_SPEED_5000 0x02
>> #define PCIE_DEVICE_CONTROL2_16ms 0x0005
> [...]
>
> These generic definitions belong in <linux/pci_regs.h>; in fact some of
> it is already there.
Agreed, please put these in the PCI header file.
^ permalink raw reply
* Re: [net-next-2.6 PATCH] igb: modify register test for i350 to reflect read only bits in RDLEN/TDLEN
From: David Miller @ 2010-04-13 9:59 UTC (permalink / raw)
To: jeffrey.t.kirsher; +Cc: netdev, gospo, alexander.h.duyck
In-Reply-To: <20100409195306.30654.19260.stgit@localhost.localdomain>
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Fri, 09 Apr 2010 12:53:08 -0700
> From: Alexander Duyck <alexander.h.duyck@intel.com>
>
> The registers for RDLEN/TDLEN on i350 have the first 7 bits as read only.
> This is a change from previous hardware in which it was only the first 4
> bits that were read only.
>
> Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Applied.
^ permalink raw reply
* Re: [net-next-2.6 PATCH] skbuff: remove unused dev_consume_skb macro definition
From: David Miller @ 2010-04-13 9:59 UTC (permalink / raw)
To: jeffrey.t.kirsher; +Cc: netdev, gospo, alexander.h.duyck
In-Reply-To: <20100409200116.31057.29639.stgit@localhost.localdomain>
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Fri, 09 Apr 2010 13:01:37 -0700
> From: Alexander Duyck <alexander.h.duyck@intel.com>
>
> dev_consume_skb and kfree_skb_clean have no users and in the case of
> kfree_skb_clean could cause potential build issues since I cannot find
> where it is defined. Based on the patch in which it was introduced it
> appears to have been a bit of leftover code from an earlier version of the
> patch in which kfree_skb_clean was dropped in favor of consume_skb.
>
> Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Applied.
^ permalink raw reply
* Re: [net-next-2.6 PATCH] e1000e: use static params to save stack space
From: David Miller @ 2010-04-13 9:59 UTC (permalink / raw)
To: jeffrey.t.kirsher; +Cc: netdev, gospo, jesse.brandeburg
In-Reply-To: <20100409205044.32158.23239.stgit@localhost.localdomain>
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Fri, 09 Apr 2010 13:51:09 -0700
> From: Jesse Brandeburg <jesse.brandeburg@intel.com>
>
> used a modified checkstack to get the 56 number
> (normally checkstack wouldn't show this low a value)
>
> checkstack before:
> 0x0000012f e1000e_check_options [e1000e]: 272
>
> after:
> 0x0000012f e1000e_check_options [e1000e]: 56
>
>
> Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Applied.
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox