* [PATCH net-next 1/2] sched: introduce nr_running_this_cpu()
From: Jason Wang @ 2014-08-21 8:05 UTC (permalink / raw)
To: davem, netdev, linux-kernel; +Cc: mst, Jason Wang, Ingo Molnar, Peter Zijlstra
This patch introduces a helper nr_running_this_cpu() to return the
number of runnable processes in current cpu.
The first user will be net rx busy polling. It will use this to exit
the busy loop when it finds more than one processes is runnable in
current cpu. This can give us better performance of busy polling under
heavy load.
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
include/linux/sched.h | 1 +
kernel/sched/core.c | 6 ++++++
2 files changed, 7 insertions(+)
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 5c2c885..e34020a 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -167,6 +167,7 @@ extern int nr_threads;
DECLARE_PER_CPU(unsigned long, process_counts);
extern int nr_processes(void);
extern unsigned long nr_running(void);
+extern unsigned long nr_running_this_cpu(void);
extern unsigned long nr_iowait(void);
extern unsigned long nr_iowait_cpu(int cpu);
extern void get_iowait_load(unsigned long *nr_waiters, unsigned long *load);
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index ec1a286..87fa7b5 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -2366,6 +2366,12 @@ unsigned long nr_running(void)
return sum;
}
+unsigned long nr_running_this_cpu(void)
+{
+ return this_rq()->nr_running;
+}
+EXPORT_SYMBOL(nr_running_this_cpu);
+
unsigned long long nr_context_switches(void)
{
int i;
--
1.8.3.1
^ permalink raw reply related
* Re: [PATCH v4 1/1] net: fec: ptp: avoid register access when ipg clock is disabled
From: Richard Cochran @ 2014-08-21 7:02 UTC (permalink / raw)
To: Fugang Duan; +Cc: davem, netdev, shawn.guo
In-Reply-To: <1408418453-28012-2-git-send-email-b38611@freescale.com>
On Tue, Aug 19, 2014 at 11:20:53AM +0800, Fugang Duan wrote:
> The current kernel hang on i.MX6SX with rootfs mount from MMC.
> The root cause is ptp rise up period timer to access enet register
s/ptp rise up period/that ptp uses a periodic/
> even if ipg clock is disabled.
...
> diff --git a/drivers/net/ethernet/freescale/fec_ptp.c b/drivers/net/ethernet/freescale/fec_ptp.c
> index 82386b2..6d65555 100644
> --- a/drivers/net/ethernet/freescale/fec_ptp.c
> +++ b/drivers/net/ethernet/freescale/fec_ptp.c
> @@ -245,12 +245,18 @@ static int fec_ptp_settime(struct ptp_clock_info *ptp,
> u64 ns;
> unsigned long flags;
>
> + mutex_lock(&fep->ptp_clk_mutex);
> + /* Check the ptp clock */
> + if (!fep->ptp_clk_on)
> + return -EINVAL;
You are still holding the mutex here.
> +
> ns = ts->tv_sec * 1000000000ULL;
> ns += ts->tv_nsec;
>
> spin_lock_irqsave(&fep->tmreg_lock, flags);
> timecounter_init(&fep->tc, &fep->cc, ns);
> spin_unlock_irqrestore(&fep->tmreg_lock, flags);
> + mutex_unlock(&fep->ptp_clk_mutex);
> return 0;
> }
Thanks,
Richard
^ permalink raw reply
* Re: [PATCH net-next v2 2/2] xfrm: configure policy hash table thresholds by netlink
From: Steffen Klassert @ 2014-08-21 6:09 UTC (permalink / raw)
To: Christophe Gouault; +Cc: David S. Miller, netdev
In-Reply-To: <1406884348-12423-3-git-send-email-christophe.gouault@6wind.com>
On Fri, Aug 01, 2014 at 11:12:28AM +0200, Christophe Gouault wrote:
> diff --git a/include/net/netns/xfrm.h b/include/net/netns/xfrm.h
> index 41902a8..9da7982 100644
> --- a/include/net/netns/xfrm.h
> +++ b/include/net/netns/xfrm.h
> @@ -19,6 +19,15 @@ struct xfrm_policy_hash {
> u8 sbits6;
> };
>
> +struct xfrm_policy_hthresh {
> + struct work_struct work;
> + seqlock_t lock;
This newly introduced lock is not initialized. It triggers an
inconsistent lock state warning when acquired for the first time.
>
> +static void xfrm_hash_rebuild(struct work_struct *work)
> +{
> + struct net *net = container_of(work, struct net,
> + xfrm.policy_hthresh.work);
> + unsigned int hmask;
> + struct xfrm_policy *pol;
> + struct xfrm_policy *policy;
> + struct hlist_head *chain;
> + struct hlist_head *odst;
> + struct hlist_node *newpos;
> + int i;
> + int dir;
> + unsigned seq;
> + u8 lbits4, rbits4, lbits6, rbits6;
> +
> + mutex_lock(&hash_resize_mutex);
> +
> + /* read selector prefixlen thresholds */
> + do {
> + seq = read_seqbegin(&net->xfrm.policy_hthresh.lock);
> +
> + lbits4 = net->xfrm.policy_hthresh.lbits4;
> + rbits4 = net->xfrm.policy_hthresh.rbits4;
> + lbits6 = net->xfrm.policy_hthresh.lbits6;
> + rbits6 = net->xfrm.policy_hthresh.rbits6;
> + } while (read_seqretry(&net->xfrm.policy_hthresh.lock, seq));
> +
> + write_lock_bh(&net->xfrm.xfrm_policy_lock);
> +
> + pr_info("rebuilding SPD hash table: thresholds (%u,%u)(%u,%u)\n",
> + lbits4, rbits4, lbits6, rbits6);
Do we really need to print this?
> +
> + /* reset the bydst and inexact table in all directions */
> + for (dir = 0; dir < XFRM_POLICY_MAX * 2; dir++) {
> + INIT_HLIST_HEAD(&net->xfrm.policy_inexact[dir]);
> + hmask = net->xfrm.policy_bydst[dir].hmask;
> + odst = net->xfrm.policy_bydst[dir].table;
> + for (i = hmask; i >= 0; i--)
> + INIT_HLIST_HEAD(odst + i);
> + if ((dir & XFRM_POLICY_MASK) == XFRM_POLICY_OUT) {
> + /* dir out => dst = remote, src = local */
> + net->xfrm.policy_bydst[dir].dbits4 = rbits4;
> + net->xfrm.policy_bydst[dir].sbits4 = lbits4;
> + net->xfrm.policy_bydst[dir].dbits6 = rbits6;
> + net->xfrm.policy_bydst[dir].sbits6 = lbits6;
> + } else {
> + /* dir in/fwd => dst = local, src = remote */
> + net->xfrm.policy_bydst[dir].dbits4 = lbits4;
> + net->xfrm.policy_bydst[dir].sbits4 = rbits4;
> + net->xfrm.policy_bydst[dir].dbits6 = lbits6;
> + net->xfrm.policy_bydst[dir].sbits6 = rbits6;
> + }
> + }
> +
> + /* re-insert all policies by order of creation */
> + list_for_each_entry_reverse(policy, &net->xfrm.policy_all, walk.all) {
> + newpos = NULL;
> + chain = policy_hash_bysel(net, &policy->selector,
> + policy->family,
> + xfrm_policy_id2dir(policy->index));
> + hlist_for_each_entry(pol, chain, bydst) {
> + if (policy->priority >= pol->priority)
> + newpos = &pol->bydst;
> + else
> + break;
> + }
> + if (newpos)
> + hlist_add_after(newpos, &policy->bydst);
hlist_add_after() does not exist any more, it was replaced by
hlist_add_behind() recently.
>
> +static int xfrm_set_spdinfo(struct sk_buff *skb, struct nlmsghdr *nlh,
> + struct nlattr **attrs)
> +{
> + struct net *net = sock_net(skb->sk);
> + struct sk_buff *r_skb;
> + u32 *flags = nlmsg_data(nlh);
> + u32 sportid = NETLINK_CB(skb).portid;
> + u32 seq = nlh->nlmsg_seq;
> + struct xfrmu_spdhthresh *thresh4 = NULL;
> + struct xfrmu_spdhthresh *thresh6 = NULL;
> +
> + /* selector prefixlen thresholds to hash policies */
> + if (attrs[XFRMA_SPD_IPV4_HTHRESH]) {
> + struct nlattr *rta = attrs[XFRMA_SPD_IPV4_HTHRESH];
> +
> + if (nla_len(rta) < sizeof(*thresh4))
> + return -EINVAL;
> + thresh4 = nla_data(rta);
> + if (thresh4->lbits > 32 || thresh4->rbits > 32)
> + return -EINVAL;
> + }
> + if (attrs[XFRMA_SPD_IPV6_HTHRESH]) {
> + struct nlattr *rta = attrs[XFRMA_SPD_IPV6_HTHRESH];
> +
> + if (nla_len(rta) < sizeof(*thresh6))
> + return -EINVAL;
> + thresh6 = nla_data(rta);
> + if (thresh6->lbits > 128 || thresh6->rbits > 128)
> + return -EINVAL;
> + }
> +
> + if (thresh4 || thresh6) {
> + write_seqlock(&net->xfrm.policy_hthresh.lock);
> + if (thresh4) {
> + net->xfrm.policy_hthresh.lbits4 = thresh4->lbits;
> + net->xfrm.policy_hthresh.rbits4 = thresh4->rbits;
> + }
> + if (thresh6) {
> + net->xfrm.policy_hthresh.lbits6 = thresh6->lbits;
> + net->xfrm.policy_hthresh.rbits6 = thresh6->rbits;
> + }
> + write_sequnlock(&net->xfrm.policy_hthresh.lock);
> +
> + xfrm_policy_hash_rebuild(net);
> + }
> +
> + r_skb = nlmsg_new(xfrm_spdinfo_msgsize(), GFP_ATOMIC);
> + if (r_skb == NULL)
> + return -ENOMEM;
> +
> + if (build_spdinfo(r_skb, net, sportid, seq, *flags) < 0)
> + BUG();
> +
> + return nlmsg_unicast(net->xfrm.nlsk, r_skb, sportid);
Why do you send these informations to userspace? This is a set
operation, not get.
The rest looks quite good, thanks!
^ permalink raw reply
* Re: [RFC 2/4] tuntap: Publish tuntap maximum number of queues as module_param
From: Jason Wang @ 2014-08-21 4:30 UTC (permalink / raw)
To: Michael S. Tsirkin, Jiri Pirko
Cc: Pankaj Gupta, linux-kernel, netdev, davem, dgibson, vfalico,
edumazet, vyasevic, hkchu, wuzhy, xemul, therbert, bhutchings,
xii, stephen
In-Reply-To: <20140820111724.GE17371@redhat.com>
On 08/20/2014 07:17 PM, Michael S. Tsirkin wrote:
> On Wed, Aug 20, 2014 at 12:58:17PM +0200, Jiri Pirko wrote:
>> > Mon, Aug 18, 2014 at 03:37:18PM CEST, pagupta@redhat.com wrote:
>>> > > This patch publishes maximum number of tun/tap queues allocated as a
>>> > > read_only module parameter which a user space application like libvirt
>>> > > can make use of to limit maximum number of queues. Value of read_only
>>> > > module parameter can be writable only at module load time. If no value is set
>>> > > at module load time a default value 256 is used which is equal to maximum number
>>> > > of vCPUS allowed by KVM.
>>> > >
>>> > > Administrator can specify maximum number of queues only at the driver
>>> > > module load time.
>>> > >
>>> > >Signed-off-by: Pankaj Gupta <pagupta@redhat.com>
>>> > >---
>>> > > drivers/net/tun.c | 13 +++++++++++--
>>> > > 1 files changed, 11 insertions(+), 2 deletions(-)
>>> > >
>>> > >diff --git a/drivers/net/tun.c b/drivers/net/tun.c
>>> > >index acaaf67..1f518e2 100644
>>> > >--- a/drivers/net/tun.c
>>> > >+++ b/drivers/net/tun.c
>>> > >@@ -119,6 +119,9 @@ struct tap_filter {
>>> > >
>>> > > #define TUN_FLOW_EXPIRE (3 * HZ)
>>> > >
>>> > >+static int max_tap_queues = MAX_TAP_QUEUES;
>>> > >+module_param(max_tap_queues, int, S_IRUGO);
>> >
>> > Please do not introduce new module paramaters. Please other ways to
>> > interchange values with userspace.
> I suggested this initially, but thinking more about it, I agree.
>
> It's a global limit (necessary to limit memory utilization by
> userspace), but it should be possible to change it
> after module load.
How about pass this limit through ifr during TUNSETIFF, then
alloc_netdev_mq() can use this limit.
^ permalink raw reply
* Re: [PATCH 8/8] staging: et131x: Implement NAPI support
From: Stephen Hemminger @ 2014-08-21 3:25 UTC (permalink / raw)
To: Mark Einon; +Cc: gregkh, devel, linux-kernel, netdev
In-Reply-To: <1408573078-9320-9-git-send-email-mark.einon@gmail.com>
On Wed, 20 Aug 2014 23:17:58 +0100
Mark Einon <mark.einon@gmail.com> wrote:
> - bool done = true;
> + int count = 0;
> + int limit = budget;
> + bool not_done = false;
Don't use negative variables. Better to keep the original done variable.
^ permalink raw reply
* Re: [PATCH 8/8] staging: et131x: Implement NAPI support
From: Stephen Hemminger @ 2014-08-21 3:25 UTC (permalink / raw)
To: Mark Einon; +Cc: gregkh, devel, linux-kernel, netdev
In-Reply-To: <1408573078-9320-9-git-send-email-mark.einon@gmail.com>
On Wed, 20 Aug 2014 23:17:58 +0100
Mark Einon <mark.einon@gmail.com> wrote:
>
> + if (budget > MAX_PACKETS_HANDLED)
> + limit = MAX_PACKETS_HANDLED;
Why this artificial restriction?
^ permalink raw reply
* Re: [PATCH V2 0/1] ipv4: net namespace does not inherit network configurations
From: Stephen Hemminger @ 2014-08-21 3:18 UTC (permalink / raw)
To: Zhu Yanjun
Cc: linux-kernel, netdev, Yue.Tao, alexandre.dietsch, davem, honkiko,
cwang, Zhu Yanjun
In-Reply-To: <1408588321-13537-1-git-send-email-Yanjun.Zhu@windriver.com>
On Thu, 21 Aug 2014 10:32:00 +0800
Zhu Yanjun <zyjzyj2000@gmail.com> wrote:
> V2: Following the advice from Cong Wang, I submit a patch as normal.
>
> Hi,all
>
> I did a test on kernel3.16 rc6:
>
> root@qemu1:~# echo 1 > /proc/sys/net/ipv6/conf/all/forwarding
> root@qemu1:~# echo 1 > /proc/sys/net/ipv4/conf/all/forwarding
> root@qemu1:~# ip netns list
> root@qemu1:~# ip netns add fib1
> root@qemu1:~# ip netns exec fib1 bash
> root@qemu1:~# cat /proc/sys/net/ipv6/conf/all/forwarding
> 0
> root@qemu1:~# cat /proc/sys/net/ipv4/conf/all/forwarding
> 1
>
> The behavior of ipv4 and ipv6 is very inconsistent. I checked
> the kernel source code. I found that from this patch
> [ipv6: fix bad free of addrconf_init_net], the above difference
> appeared.
>
> Since a net namespace is independent to another. That is, there
> is no any relationship between the net namespaces. So the behavior
> of ipv4 is not correct.
>
> Based on this patch [ipv6: fix bad free of addrconf_init_net], I made
> a new patch to fix this problem on ipv4.
>
> Any reply is appreciated.
>
> Zhu Yanjun (1):
> ipv4: net namespace does not inherit network configurations
>
> net/ipv4/devinet.c | 29 ++++++++++++-----------------
> 1 file changed, 12 insertions(+), 17 deletions(-)
>
This a semantic change to network namespaces and therefore is
likely to break existing applications using network namespaces.
^ permalink raw reply
* Re: pktgen and tos
From: Cong Wang @ 2014-08-21 3:05 UTC (permalink / raw)
To: Ben Greear; +Cc: netdev@vger.kernel.org
In-Reply-To: <53F51880.5060704@candelatech.com>
On Wed, Aug 20, 2014 at 2:52 PM, Ben Greear <greearb@candelatech.com> wrote:
> Here's a half-arsed bug report, in case someone is bored.
>
> At least in my hacked up pktgen, you cannot set a one-digit tos,
> because the parser fails if length is not 2 digits.
>
> echo tos 4 > /proc/net/pktgen/rddVR2 && cat /proc/net/pktgen/rddVR2
>
> ...
> Result: ERROR: tos must be 00-ff
>
> If you use '04' instead, it works. In my case, it will be easier to hack
> user-space
> to deal with this than fix pktgen, but I thought someone might want to fix
> it proper.
>
> Also, could be that upstream code doesn't have this limitation...
We need something like this:
diff --git a/net/core/pktgen.c b/net/core/pktgen.c
index 8b849dd..f8cb428 100644
--- a/net/core/pktgen.c
+++ b/net/core/pktgen.c
@@ -1674,7 +1674,7 @@ static ssize_t pktgen_if_write(struct file *file,
return len;
i += len;
- if (len == 2) {
+ if (len <= 2) {
pkt_dev->tos = tmp_value;
sprintf(pg_result, "OK: tos=0x%02x", pkt_dev->tos);
} else {
^ permalink raw reply related
* [PATCH 1/1] netfilter/jump_label: use HAVE_JUMP_LABEL?
From: Zhouyi Zhou @ 2014-08-21 2:52 UTC (permalink / raw)
To: pablo, kaber, kadlec, davem, netfilter-devel, coreteam, netdev,
linux-kernel, jbaron
Cc: Zhouyi Zhou
CONFIG_JUMP_LABEL doesn't ensure HAVE_JUMP_LABEL, if it
is not the case use maintainers's own mutex to guard
the modification of global values.
Signed-off-by: Zhouyi Zhou <yizhouzhou@ict.ac.cn>
---
include/linux/netfilter.h | 5 +++--
net/netfilter/core.c | 6 +++---
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h
index 2077489..83a1952 100644
--- a/include/linux/netfilter.h
+++ b/include/linux/netfilter.h
@@ -9,6 +9,7 @@
#include <linux/in6.h>
#include <linux/wait.h>
#include <linux/list.h>
+#include <linux/static_key.h>
#include <uapi/linux/netfilter.h>
#ifdef CONFIG_NETFILTER
static inline int NF_DROP_GETERR(int verdict)
@@ -99,8 +100,8 @@ void nf_unregister_sockopt(struct nf_sockopt_ops *reg);
extern struct list_head nf_hooks[NFPROTO_NUMPROTO][NF_MAX_HOOKS];
-#if defined(CONFIG_JUMP_LABEL)
-#include <linux/static_key.h>
+#ifdef HAVE_JUMP_LABEL
+
extern struct static_key nf_hooks_needed[NFPROTO_NUMPROTO][NF_MAX_HOOKS];
static inline bool nf_hooks_active(u_int8_t pf, unsigned int hook)
{
diff --git a/net/netfilter/core.c b/net/netfilter/core.c
index a93c97f..024a2e2 100644
--- a/net/netfilter/core.c
+++ b/net/netfilter/core.c
@@ -54,7 +54,7 @@ EXPORT_SYMBOL_GPL(nf_unregister_afinfo);
struct list_head nf_hooks[NFPROTO_NUMPROTO][NF_MAX_HOOKS] __read_mostly;
EXPORT_SYMBOL(nf_hooks);
-#if defined(CONFIG_JUMP_LABEL)
+#ifdef HAVE_JUMP_LABEL
struct static_key nf_hooks_needed[NFPROTO_NUMPROTO][NF_MAX_HOOKS];
EXPORT_SYMBOL(nf_hooks_needed);
#endif
@@ -72,7 +72,7 @@ int nf_register_hook(struct nf_hook_ops *reg)
}
list_add_rcu(®->list, elem->list.prev);
mutex_unlock(&nf_hook_mutex);
-#if defined(CONFIG_JUMP_LABEL)
+#ifdef HAVE_JUMP_LABEL
static_key_slow_inc(&nf_hooks_needed[reg->pf][reg->hooknum]);
#endif
return 0;
@@ -84,7 +84,7 @@ void nf_unregister_hook(struct nf_hook_ops *reg)
mutex_lock(&nf_hook_mutex);
list_del_rcu(®->list);
mutex_unlock(&nf_hook_mutex);
-#if defined(CONFIG_JUMP_LABEL)
+#ifdef HAVE_JUMP_LABEL
static_key_slow_dec(&nf_hooks_needed[reg->pf][reg->hooknum]);
#endif
synchronize_net();
--
1.7.10.4
^ permalink raw reply related
* [PATCH 1/1] ipv4: net namespace does not inherit network configurations
From: Zhu Yanjun @ 2014-08-21 2:32 UTC (permalink / raw)
To: linux-kernel, netdev, zyjzyj2000, Yue.Tao, alexandre.dietsch,
davem, honkiko, cwang
Cc: Zhu Yanjun
In-Reply-To: <1408588321-13537-1-git-send-email-Yanjun.Zhu@windriver.com>
Ipv4 net namespace requires a similar logic change as commit c900a800
[ipv6: fix bad free of addrconf_init_net] introduces for newer kernels.
Since a net namespace is independent to another. That is, there
is no any relationship between the net namespaces. So a new net
namespace should not inherit network configurations from another
net namespace including the host.
CC: Hong Zhiguo <honkiko@gmail.com>
CC: David S. Miller <davem@davemloft.net>
Suggested-by: Cong Wang <cwang@twopensource.com>
Signed-off-by: Zhu Yanjun <Yanjun.Zhu@windriver.com>
---
net/ipv4/devinet.c | 29 ++++++++++++-----------------
1 file changed, 12 insertions(+), 17 deletions(-)
diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
index e944937..a16aa39 100644
--- a/net/ipv4/devinet.c
+++ b/net/ipv4/devinet.c
@@ -2220,28 +2220,23 @@ static __net_init int devinet_init_net(struct net *net)
#endif
err = -ENOMEM;
- all = &ipv4_devconf;
- dflt = &ipv4_devconf_dflt;
- if (!net_eq(net, &init_net)) {
- all = kmemdup(all, sizeof(ipv4_devconf), GFP_KERNEL);
- if (all == NULL)
- goto err_alloc_all;
-
- dflt = kmemdup(dflt, sizeof(ipv4_devconf_dflt), GFP_KERNEL);
- if (dflt == NULL)
- goto err_alloc_dflt;
+ all = kmemdup(&ipv4_devconf, sizeof(ipv4_devconf), GFP_KERNEL);
+ if (all == NULL)
+ goto err_alloc_all;
+ dflt = kmemdup(&ipv4_devconf_dflt, sizeof(ipv4_devconf_dflt), GFP_KERNEL);
+ if (dflt == NULL)
+ goto err_alloc_dflt;
#ifdef CONFIG_SYSCTL
- tbl = kmemdup(tbl, sizeof(ctl_forward_entry), GFP_KERNEL);
- if (tbl == NULL)
- goto err_alloc_ctl;
+ tbl = kmemdup(tbl, sizeof(ctl_forward_entry), GFP_KERNEL);
+ if (tbl == NULL)
+ goto err_alloc_ctl;
- tbl[0].data = &all->data[IPV4_DEVCONF_FORWARDING - 1];
- tbl[0].extra1 = all;
- tbl[0].extra2 = net;
+ tbl[0].data = &all->data[IPV4_DEVCONF_FORWARDING - 1];
+ tbl[0].extra1 = all;
+ tbl[0].extra2 = net;
#endif
- }
#ifdef CONFIG_SYSCTL
err = __devinet_sysctl_register(net, "all", all);
--
1.9.1
^ permalink raw reply related
* [PATCH V2 0/1] ipv4: net namespace does not inherit network configurations
From: Zhu Yanjun @ 2014-08-21 2:32 UTC (permalink / raw)
To: linux-kernel, netdev, zyjzyj2000, Yue.Tao, alexandre.dietsch,
davem, honkiko, cwang
Cc: Zhu Yanjun
V2: Following the advice from Cong Wang, I submit a patch as normal.
Hi,all
I did a test on kernel3.16 rc6:
root@qemu1:~# echo 1 > /proc/sys/net/ipv6/conf/all/forwarding
root@qemu1:~# echo 1 > /proc/sys/net/ipv4/conf/all/forwarding
root@qemu1:~# ip netns list
root@qemu1:~# ip netns add fib1
root@qemu1:~# ip netns exec fib1 bash
root@qemu1:~# cat /proc/sys/net/ipv6/conf/all/forwarding
0
root@qemu1:~# cat /proc/sys/net/ipv4/conf/all/forwarding
1
The behavior of ipv4 and ipv6 is very inconsistent. I checked
the kernel source code. I found that from this patch
[ipv6: fix bad free of addrconf_init_net], the above difference
appeared.
Since a net namespace is independent to another. That is, there
is no any relationship between the net namespaces. So the behavior
of ipv4 is not correct.
Based on this patch [ipv6: fix bad free of addrconf_init_net], I made
a new patch to fix this problem on ipv4.
Any reply is appreciated.
Zhu Yanjun (1):
ipv4: net namespace does not inherit network configurations
net/ipv4/devinet.c | 29 ++++++++++++-----------------
1 file changed, 12 insertions(+), 17 deletions(-)
--
1.9.1
^ permalink raw reply
* RE: [PATCH net-next 3/4] r8152: remove clear_bp function
From: Hayes Wang @ 2014-08-21 2:12 UTC (permalink / raw)
To: Sergei Shtylyov, netdev@vger.kernel.org
Cc: nic_swsd, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org
In-Reply-To: <201408210131.s7L1VuAJ031162@rtits1.realtek.com>
: Sergei Shtylyov [mailto:sergei.shtylyov@cogentembedded.com]
> Sent: Wednesday, August 20, 2014 8:01 PM
> To: Hayes Wang; netdev@vger.kernel.org
> Cc: nic_swsd; linux-kernel@vger.kernel.org; linux-usb@vger.kernel.org
> Subject: Re: [PATCH net-next 3/4] r8152: remove clear_bp function
[...]
> > r8152b_disable_aldps(tp);
> >
> > - rtl_clear_bp(tp);
> >
>
> Why leave 2 empty lines? One is enough.
The next patch would use another fucntion at the
same location. I skip removing the empty line and
re-adding it again. Is that better to do so? I would
resend the patches if the answer is yes.
Best Regards,
Hayes
^ permalink raw reply
* Re: [PATCH 1/1] sctp: not send SCTP_PEER_ADDR_CHANGE notifications with failed probe
From: Vlad Yasevich @ 2014-08-21 2:06 UTC (permalink / raw)
To: Zhu Yanjun, dborkman, linux-kernel, netdev, tuexen,
khandelwal.deepak.1987, Yue.Tao, alexandre.dietsch, davem
Cc: Zhu Yanjun
In-Reply-To: <1408527103-22772-2-git-send-email-Yanjun.Zhu@windriver.com>
On 08/20/2014 05:31 AM, Zhu Yanjun wrote:
> Since the transport has always been in state SCTP_UNCONFIRMED, it
> therefore wasn't active before and hasn't been used before, and it
> always has been, so it is unnecessary to bug the user with a
> notification.
>
> Reported-by: Deepak Khandelwal <khandelwal.deepak.1987@gmail.com>
> Suggested-by: Vlad Yasevich <vyasevich@gmail.com>
> Suggested-by: Michael Tuexen <tuexen@fh-muenster.de>
> Suggested-by: Daniel Borkmann <dborkman@redhat.com>
> Signed-off-by: Zhu Yanjun <Yanjun.Zhu@windriver.com>
Acked-by: Vlad Yasevich <vyasevich@gmail.com>
Thanks
-vlad
> ---
> net/sctp/associola.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/net/sctp/associola.c b/net/sctp/associola.c
> index 9de23a2..2e23f6b 100644
> --- a/net/sctp/associola.c
> +++ b/net/sctp/associola.c
> @@ -813,6 +813,7 @@ void sctp_assoc_control_transport(struct sctp_association *asoc,
> else {
> dst_release(transport->dst);
> transport->dst = NULL;
> + ulp_notify = false;
> }
>
> spc_state = SCTP_ADDR_UNREACHABLE;
>
^ permalink raw reply
* Re: [PATCH 2/3] tg3: Fix tx_pending checks for tg3_tso_bug
From: Benjamin Poirier @ 2014-08-21 1:23 UTC (permalink / raw)
To: Michael Chan; +Cc: Prashant Sreedharan, netdev, linux-kernel
In-Reply-To: <1408489852.7404.60.camel@LTIRV-MCHAN1.corp.ad.broadcom.com>
On 2014/08/19 16:10, Michael Chan wrote:
> On Tue, 2014-08-19 at 11:52 -0700, Benjamin Poirier wrote:
> > @@ -7838,11 +7838,14 @@ static int tg3_tso_bug(struct tg3 *tp, struct tg3_napi *tnapi,
> > struct netdev_queue *txq, struct sk_buff *skb)
> > {
> > struct sk_buff *segs, *nskb;
> > - u32 frag_cnt_est = skb_shinfo(skb)->gso_segs * 3;
> >
> > - /* Estimate the number of fragments in the worst case */
> > - if (unlikely(tg3_tx_avail(tnapi) <= frag_cnt_est)) {
> > + if (unlikely(tg3_tx_avail(tnapi) <= skb_shinfo(skb)->gso_segs)) {
> > + trace_printk("stopping queue, %d <= %d\n",
> > + tg3_tx_avail(tnapi), skb_shinfo(skb)->gso_segs);
> > netif_tx_stop_queue(txq);
> > + trace_printk("stopped queue\n");
> > + tnapi->wakeup_thresh = skb_shinfo(skb)->gso_segs;
> > + BUG_ON(tnapi->wakeup_thresh >= tnapi->tx_pending);
> >
> > /* netif_tx_stop_queue() must be done before checking
> > * checking tx index in tg3_tx_avail() below, because in
>
> I don't quite understand this logic and I must be missing something.
> gso_segs is the number of TCP segments the large packet will be broken
> up into. If it exceeds dev->gso_max_segs, it means it exceeds
> hardware's capabilty and it will do GSO instead of TSO. But in this
> case in tg3_tso_bug(), we are doing GSO and we may not have enough DMA
> descriptors to do GSO. Each gso_seg typically requires 2 DMA
> descriptors.
You're right, I had wrongly assumed that the skbs coming out of
skb_gso_segment() were linear. I'll address that in v2 of the patch by masking
out NETIF_F_SG in tg3_tso_bug().
I noticed another issue that had not occurred to me: when tg3_tso_bug is
submitting a full gso segs sequence to tg3_start_xmit, the code at the end of
that function stops the queue before the end of the sequence because tx_avail
becomes smaller than (MAX_SKB_FRAGS + 1). The transmission actually proceeds
because tg3_tso_bug() does not honour the queue state but it seems rather
unsightly to me. I'm trying different solutions to this and will resubmit.
^ permalink raw reply
* Charity foundation
From: D.W @ 2014-08-20 22:32 UTC (permalink / raw)
Hope this message meet you well,My name is David Wilson,I write to you
because I intend to give to you a portion of my deposited funds to donate to
charity?Do you have any charity foundation in mind we can help?
Be blessed my beloved,
David Wilson
^ permalink raw reply
* Re: [PATCH 5/8] staging: et131x: Remove unnecessary i2c_wack variable
From: Fabio Estevam @ 2014-08-20 22:22 UTC (permalink / raw)
To: Mark Einon
Cc: devel, Greg Kroah-Hartman, linux-kernel, netdev@vger.kernel.org
In-Reply-To: <1408573078-9320-6-git-send-email-mark.einon@gmail.com>
On Wed, Aug 20, 2014 at 7:17 PM, Mark Einon <mark.einon@gmail.com> wrote:
> do {
> pci_read_config_dword(pdev,
> - LBCIF_DATA_REGISTER, &val);
> + LBCIF_DATA_REGISTER,
> + &val);
This seems to be an unrelated change.
^ permalink raw reply
* [PATCH 8/8] staging: et131x: Implement NAPI support
From: Mark Einon @ 2014-08-20 22:17 UTC (permalink / raw)
To: gregkh; +Cc: devel, netdev, linux-kernel, Mark Einon
In-Reply-To: <1408573078-9320-1-git-send-email-mark.einon@gmail.com>
This implements NAPI support for et131x by:
-adding a napi_struct to the private adapter struct
-changing netfif_rx_skb() call to netif_receive_skb()
-changing et131x_handle_recv_interrupt() to et131x_handle_recv_pkts()
and taking a budget allocation.
-changing et131x_handle_send_interrupt() to et131x_handle_send_pkts()
-replacing bottom half workqueue with poll function which handles
send & receive of skbs.
-adding various other necessary standard napi calls.
Also remove this item from the README TODO list.
Signed-off-by: Mark Einon <mark.einon@gmail.com>
---
drivers/staging/et131x/README | 1 -
drivers/staging/et131x/et131x.c | 116 ++++++++++++++++++----------------------
2 files changed, 52 insertions(+), 65 deletions(-)
diff --git a/drivers/staging/et131x/README b/drivers/staging/et131x/README
index 3befc45..05555a3 100644
--- a/drivers/staging/et131x/README
+++ b/drivers/staging/et131x/README
@@ -10,7 +10,6 @@ driver as they did not build properly at the time.
TODO:
- Look at reducing the number of spinlocks
- Simplify code in nic_rx_pkts(), when determining multicast_pkts_rcvd
- - Implement NAPI support
- In et131x_tx(), don't return NETDEV_TX_BUSY, just drop the packet with kfree_skb().
- Reduce the number of split lines by careful consideration of variable names etc.
diff --git a/drivers/staging/et131x/et131x.c b/drivers/staging/et131x/et131x.c
index bf9ac15..485143a 100644
--- a/drivers/staging/et131x/et131x.c
+++ b/drivers/staging/et131x/et131x.c
@@ -470,7 +470,7 @@ struct et131x_adapter {
struct pci_dev *pdev;
struct mii_bus *mii_bus;
struct phy_device *phydev;
- struct work_struct task;
+ struct napi_struct napi;
/* Flags that indicate current state of the adapter */
u32 flags;
@@ -2538,29 +2538,33 @@ static struct rfd *nic_rx_pkts(struct et131x_adapter *adapter)
skb->protocol = eth_type_trans(skb, adapter->netdev);
skb->ip_summed = CHECKSUM_NONE;
- netif_rx_ni(skb);
+ netif_receive_skb(skb);
out:
nic_return_rfd(adapter, rfd);
return rfd;
}
-/* et131x_handle_recv_interrupt - Interrupt handler for receive processing
+/* et131x_handle_recv_pkts - Interrupt handler for receive processing
*
* Assumption, Rcv spinlock has been acquired.
*/
-static void et131x_handle_recv_interrupt(struct et131x_adapter *adapter)
+static int et131x_handle_recv_pkts(struct et131x_adapter *adapter, int budget)
{
struct rfd *rfd = NULL;
- u32 count = 0;
- bool done = true;
+ int count = 0;
+ int limit = budget;
+ bool not_done = false;
struct rx_ring *rx_ring = &adapter->rx_ring;
+ if (budget > MAX_PACKETS_HANDLED)
+ limit = MAX_PACKETS_HANDLED;
+
/* Process up to available RFD's */
- while (count < MAX_PACKETS_HANDLED) {
+ while (count < limit) {
if (list_empty(&rx_ring->recv_list)) {
WARN_ON(rx_ring->num_ready_recv != 0);
- done = false;
+ not_done = true;
break;
}
@@ -2589,13 +2593,15 @@ static void et131x_handle_recv_interrupt(struct et131x_adapter *adapter)
count++;
}
- if (count == MAX_PACKETS_HANDLED || !done) {
+ if (count == limit || not_done) {
rx_ring->unfinished_receives = true;
writel(PARM_TX_TIME_INT_DEF * NANO_IN_A_MICRO,
&adapter->regs->global.watchdog_timer);
} else
/* Watchdog timer will disable itself if appropriate. */
rx_ring->unfinished_receives = false;
+
+ return count;
}
/* et131x_tx_dma_memory_alloc
@@ -3081,14 +3087,14 @@ static void et131x_free_busy_send_packets(struct et131x_adapter *adapter)
tx_ring->used = 0;
}
-/* et131x_handle_send_interrupt - Interrupt handler for sending processing
+/* et131x_handle_send_pkts - Interrupt handler for sending processing
*
* Re-claim the send resources, complete sends and get more to send from
* the send wait queue.
*
* Assumption - Send spinlock has been acquired
*/
-static void et131x_handle_send_interrupt(struct et131x_adapter *adapter)
+static void et131x_handle_send_pkts(struct et131x_adapter *adapter)
{
unsigned long flags;
u32 serviced;
@@ -3708,9 +3714,9 @@ static void et131x_pci_remove(struct pci_dev *pdev)
struct et131x_adapter *adapter = netdev_priv(netdev);
unregister_netdev(netdev);
+ netif_napi_del(&adapter->napi);
phy_disconnect(adapter->phydev);
mdiobus_unregister(adapter->mii_bus);
- cancel_work_sync(&adapter->task);
kfree(adapter->mii_bus->irq);
mdiobus_free(adapter->mii_bus);
@@ -3790,6 +3796,7 @@ static irqreturn_t et131x_isr(int irq, void *dev_id)
bool handled = true;
struct net_device *netdev = (struct net_device *)dev_id;
struct et131x_adapter *adapter = netdev_priv(netdev);
+ struct address_map __iomem *iomem = adapter->regs;
struct rx_ring *rx_ring = &adapter->rx_ring;
struct tx_ring *tx_ring = &adapter->tx_ring;
u32 status;
@@ -3826,7 +3833,6 @@ static irqreturn_t et131x_isr(int irq, void *dev_id)
}
/* This is our interrupt, so process accordingly */
-
if (status & ET_INTR_WATCHDOG) {
struct tcb *tcb = tx_ring->send_head;
@@ -3842,54 +3848,8 @@ static irqreturn_t et131x_isr(int irq, void *dev_id)
status &= ~ET_INTR_WATCHDOG;
}
- if (!status) {
- /* This interrupt has in some way been "handled" by
- * the ISR. Either it was a spurious Rx interrupt, or
- * it was a Tx interrupt that has been filtered by
- * the ISR.
- */
- et131x_enable_interrupts(adapter);
- goto out;
- }
-
- /* We need to save the interrupt status value for use in our
- * DPC. We will clear the software copy of that in that
- * routine.
- */
- adapter->stats.interrupt_status = status;
-
- /* Schedule the ISR handler as a bottom-half task in the
- * kernel's tq_immediate queue, and mark the queue for
- * execution
- */
- schedule_work(&adapter->task);
-out:
- return IRQ_RETVAL(handled);
-}
-
-/* et131x_isr_handler - The ISR handler
- *
- * scheduled to run in a deferred context by the ISR. This is where the ISR's
- * work actually gets done.
- */
-static void et131x_isr_handler(struct work_struct *work)
-{
- struct et131x_adapter *adapter =
- container_of(work, struct et131x_adapter, task);
- u32 status = adapter->stats.interrupt_status;
- struct address_map __iomem *iomem = adapter->regs;
-
- /* These first two are by far the most common. Once handled, we clear
- * their two bits in the status word. If the word is now zero, we
- * exit.
- */
- /* Handle all the completed Transmit interrupts */
- if (status & ET_INTR_TXDMA_ISR)
- et131x_handle_send_interrupt(adapter);
-
- /* Handle all the completed Receives interrupts */
- if (status & ET_INTR_RXDMA_XFR_DONE)
- et131x_handle_recv_interrupt(adapter);
+ if (status & (ET_INTR_RXDMA_XFR_DONE | ET_INTR_TXDMA_ISR))
+ napi_schedule(&adapter->napi);
status &= ~(ET_INTR_TXDMA_ISR | ET_INTR_RXDMA_XFR_DONE);
@@ -4041,8 +4001,34 @@ static void et131x_isr_handler(struct work_struct *work)
* addressed module is in a power-down state and can't respond.
*/
}
+
+ if (!status) {
+ /* This interrupt has in some way been "handled" by
+ * the ISR. Either it was a spurious Rx interrupt, or
+ * it was a Tx interrupt that has been filtered by
+ * the ISR.
+ */
+ et131x_enable_interrupts(adapter);
+ }
+
out:
- et131x_enable_interrupts(adapter);
+ return IRQ_RETVAL(handled);
+}
+
+static int et131x_poll(struct napi_struct *napi, int budget)
+{
+ struct et131x_adapter *adapter =
+ container_of(napi, struct et131x_adapter, napi);
+ int work_done = et131x_handle_recv_pkts(adapter, budget);
+
+ et131x_handle_send_pkts(adapter);
+
+ if (work_done < budget) {
+ napi_complete(&adapter->napi);
+ et131x_enable_interrupts(adapter);
+ }
+
+ return work_done;
}
/* et131x_stats - Return the current device statistics */
@@ -4111,6 +4097,8 @@ static int et131x_open(struct net_device *netdev)
adapter->flags |= FMP_ADAPTER_INTERRUPT_IN_USE;
+ napi_enable(&adapter->napi);
+
et131x_up(netdev);
return result;
@@ -4122,6 +4110,7 @@ static int et131x_close(struct net_device *netdev)
struct et131x_adapter *adapter = netdev_priv(netdev);
et131x_down(netdev);
+ napi_disable(&adapter->napi);
adapter->flags &= ~FMP_ADAPTER_INTERRUPT_IN_USE;
free_irq(adapter->pdev->irq, netdev);
@@ -4502,8 +4491,7 @@ static int et131x_pci_setup(struct pci_dev *pdev,
/* Init send data structures */
et131x_init_send(adapter);
- /* Set up the task structure for the ISR's deferred handler */
- INIT_WORK(&adapter->task, et131x_isr_handler);
+ netif_napi_add(netdev, &adapter->napi, et131x_poll, 64);
/* Copy address into the net_device struct */
memcpy(netdev->dev_addr, adapter->addr, ETH_ALEN);
--
2.1.0
^ permalink raw reply related
* [PATCH 7/8] staging: et131x: Fix ET_INTR_TXDMA_ISR register name typo
From: Mark Einon @ 2014-08-20 22:17 UTC (permalink / raw)
To: gregkh; +Cc: devel, netdev, linux-kernel, Mark Einon
In-Reply-To: <1408573078-9320-1-git-send-email-mark.einon@gmail.com>
We actually mean to clear the ET_INTR_TXDMA_ISR reg after handling
a completed transfer, not the ET_INTR_TXDMA_ERR reg, which should
get handled immediately after.
Signed-off-by: Mark Einon <mark.einon@gmail.com>
---
drivers/staging/et131x/et131x.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/et131x/et131x.c b/drivers/staging/et131x/et131x.c
index df83ea3..bf9ac15 100644
--- a/drivers/staging/et131x/et131x.c
+++ b/drivers/staging/et131x/et131x.c
@@ -3891,7 +3891,7 @@ static void et131x_isr_handler(struct work_struct *work)
if (status & ET_INTR_RXDMA_XFR_DONE)
et131x_handle_recv_interrupt(adapter);
- status &= ~(ET_INTR_TXDMA_ERR | ET_INTR_RXDMA_XFR_DONE);
+ status &= ~(ET_INTR_TXDMA_ISR | ET_INTR_RXDMA_XFR_DONE);
if (!status)
goto out;
--
2.1.0
^ permalink raw reply related
* [PATCH 6/8] staging: et131x: Rename NUM_PACKETS_HANDLED to MAX_PACKETS_HANDLED
From: Mark Einon @ 2014-08-20 22:17 UTC (permalink / raw)
To: gregkh; +Cc: devel, netdev, linux-kernel, Mark Einon
In-Reply-To: <1408573078-9320-1-git-send-email-mark.einon@gmail.com>
To better describe it's use as a hard limit.
Signed-off-by: Mark Einon <mark.einon@gmail.com>
---
drivers/staging/et131x/et131x.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/et131x/et131x.c b/drivers/staging/et131x/et131x.c
index 551b250..df83ea3 100644
--- a/drivers/staging/et131x/et131x.c
+++ b/drivers/staging/et131x/et131x.c
@@ -179,7 +179,7 @@ MODULE_DESCRIPTION("10/100/1000 Base-T Ethernet Driver for the ET1310 by Agere S
#define NIC_DEFAULT_NUM_RFD 1024
#define NUM_FBRS 2
-#define NUM_PACKETS_HANDLED 256
+#define MAX_PACKETS_HANDLED 256
#define ALCATEL_MULTICAST_PKT 0x01000000
#define ALCATEL_BROADCAST_PKT 0x02000000
@@ -2557,7 +2557,7 @@ static void et131x_handle_recv_interrupt(struct et131x_adapter *adapter)
struct rx_ring *rx_ring = &adapter->rx_ring;
/* Process up to available RFD's */
- while (count < NUM_PACKETS_HANDLED) {
+ while (count < MAX_PACKETS_HANDLED) {
if (list_empty(&rx_ring->recv_list)) {
WARN_ON(rx_ring->num_ready_recv != 0);
done = false;
@@ -2589,7 +2589,7 @@ static void et131x_handle_recv_interrupt(struct et131x_adapter *adapter)
count++;
}
- if (count == NUM_PACKETS_HANDLED || !done) {
+ if (count == MAX_PACKETS_HANDLED || !done) {
rx_ring->unfinished_receives = true;
writel(PARM_TX_TIME_INT_DEF * NANO_IN_A_MICRO,
&adapter->regs->global.watchdog_timer);
--
2.1.0
^ permalink raw reply related
* [PATCH 5/8] staging: et131x: Remove unnecessary i2c_wack variable
From: Mark Einon @ 2014-08-20 22:17 UTC (permalink / raw)
To: gregkh; +Cc: devel, netdev, linux-kernel, Mark Einon
In-Reply-To: <1408573078-9320-1-git-send-email-mark.einon@gmail.com>
i2c_wack is only used to implement a while(1) loop, so let's remove it.
Signed-off-by: Mark Einon <mark.einon@gmail.com>
---
drivers/staging/et131x/et131x.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/et131x/et131x.c b/drivers/staging/et131x/et131x.c
index fc18e8d..551b250 100644
--- a/drivers/staging/et131x/et131x.c
+++ b/drivers/staging/et131x/et131x.c
@@ -573,7 +573,6 @@ static int eeprom_write(struct et131x_adapter *adapter, u32 addr, u8 data)
int index = 0;
int retries;
int err = 0;
- int i2c_wack = 0;
int writeok = 0;
u32 status;
u32 val = 0;
@@ -599,8 +598,6 @@ static int eeprom_write(struct et131x_adapter *adapter, u32 addr, u8 data)
LBCIF_CONTROL_LBCIF_ENABLE | LBCIF_CONTROL_I2C_WRITE))
return -EIO;
- i2c_wack = 1;
-
/* Prepare EEPROM address for Step 3 */
for (retries = 0; retries < MAX_NUM_WRITE_RETRIES; retries++) {
@@ -656,9 +653,9 @@ static int eeprom_write(struct et131x_adapter *adapter, u32 addr, u8 data)
*/
udelay(10);
- while (i2c_wack) {
+ while (1) {
if (pci_write_config_byte(pdev, LBCIF_CONTROL_REGISTER,
- LBCIF_CONTROL_LBCIF_ENABLE))
+ LBCIF_CONTROL_LBCIF_ENABLE))
writeok = 0;
/* Do read until internal ACK_ERROR goes away meaning write
@@ -670,7 +667,8 @@ static int eeprom_write(struct et131x_adapter *adapter, u32 addr, u8 data)
addr);
do {
pci_read_config_dword(pdev,
- LBCIF_DATA_REGISTER, &val);
+ LBCIF_DATA_REGISTER,
+ &val);
} while ((val & 0x00010000) == 0);
} while (val & 0x00040000);
--
2.1.0
^ permalink raw reply related
* [PATCH 4/8] staging: et131x: Use for loop to initialise contiguous macstat registers to zero
From: Mark Einon @ 2014-08-20 22:17 UTC (permalink / raw)
To: gregkh; +Cc: devel, netdev, linux-kernel, Mark Einon
In-Reply-To: <1408573078-9320-1-git-send-email-mark.einon@gmail.com>
Replace a long list of contiguous writel() calls with a for loop iterating
over the same address values.
Also remove redundant comments on the macstat registers, the variable names
are good enough.
Signed-off-by: Mark Einon <mark.einon@gmail.com>
---
drivers/staging/et131x/et131x.c | 59 +++----------------------
drivers/staging/et131x/et131x.h | 96 +----------------------------------------
2 files changed, 7 insertions(+), 148 deletions(-)
diff --git a/drivers/staging/et131x/et131x.c b/drivers/staging/et131x/et131x.c
index 44cc684..fc18e8d 100644
--- a/drivers/staging/et131x/et131x.c
+++ b/drivers/staging/et131x/et131x.c
@@ -1257,60 +1257,13 @@ static void et1310_config_txmac_regs(struct et131x_adapter *adapter)
static void et1310_config_macstat_regs(struct et131x_adapter *adapter)
{
- struct macstat_regs __iomem *macstat =
- &adapter->regs->macstat;
+ struct macstat_regs __iomem *macstat = &adapter->regs->macstat;
+ u32 *reg;
- /* Next we need to initialize all the macstat registers to zero on
- * the device.
- */
- writel(0, &macstat->txrx_0_64_byte_frames);
- writel(0, &macstat->txrx_65_127_byte_frames);
- writel(0, &macstat->txrx_128_255_byte_frames);
- writel(0, &macstat->txrx_256_511_byte_frames);
- writel(0, &macstat->txrx_512_1023_byte_frames);
- writel(0, &macstat->txrx_1024_1518_byte_frames);
- writel(0, &macstat->txrx_1519_1522_gvln_frames);
-
- writel(0, &macstat->rx_bytes);
- writel(0, &macstat->rx_packets);
- writel(0, &macstat->rx_fcs_errs);
- writel(0, &macstat->rx_multicast_packets);
- writel(0, &macstat->rx_broadcast_packets);
- writel(0, &macstat->rx_control_frames);
- writel(0, &macstat->rx_pause_frames);
- writel(0, &macstat->rx_unknown_opcodes);
- writel(0, &macstat->rx_align_errs);
- writel(0, &macstat->rx_frame_len_errs);
- writel(0, &macstat->rx_code_errs);
- writel(0, &macstat->rx_carrier_sense_errs);
- writel(0, &macstat->rx_undersize_packets);
- writel(0, &macstat->rx_oversize_packets);
- writel(0, &macstat->rx_fragment_packets);
- writel(0, &macstat->rx_jabbers);
- writel(0, &macstat->rx_drops);
-
- writel(0, &macstat->tx_bytes);
- writel(0, &macstat->tx_packets);
- writel(0, &macstat->tx_multicast_packets);
- writel(0, &macstat->tx_broadcast_packets);
- writel(0, &macstat->tx_pause_frames);
- writel(0, &macstat->tx_deferred);
- writel(0, &macstat->tx_excessive_deferred);
- writel(0, &macstat->tx_single_collisions);
- writel(0, &macstat->tx_multiple_collisions);
- writel(0, &macstat->tx_late_collisions);
- writel(0, &macstat->tx_excessive_collisions);
- writel(0, &macstat->tx_total_collisions);
- writel(0, &macstat->tx_pause_honored_frames);
- writel(0, &macstat->tx_drops);
- writel(0, &macstat->tx_jabbers);
- writel(0, &macstat->tx_fcs_errs);
- writel(0, &macstat->tx_control_frames);
- writel(0, &macstat->tx_oversize_frames);
- writel(0, &macstat->tx_undersize_frames);
- writel(0, &macstat->tx_fragments);
- writel(0, &macstat->carry_reg1);
- writel(0, &macstat->carry_reg2);
+ /* initialize all the macstat registers to zero on the device */
+ for (reg = &macstat->txrx_0_64_byte_frames;
+ reg <= &macstat->carry_reg2; reg++)
+ writel(0, reg);
/* Unmask any counters that we want to track the overflow of.
* Initially this will be all counters. It may become clear later
diff --git a/drivers/staging/et131x/et131x.h b/drivers/staging/et131x/et131x.h
index 1318439..95d6d45 100644
--- a/drivers/staging/et131x/et131x.h
+++ b/drivers/staging/et131x/et131x.h
@@ -1259,148 +1259,54 @@ struct mac_regs { /* Location: */
struct macstat_regs { /* Location: */
u32 pad[32]; /* 0x6000 - 607C */
- /* Tx/Rx 0-64 Byte Frame Counter */
+ /* counters */
u32 txrx_0_64_byte_frames; /* 0x6080 */
-
- /* Tx/Rx 65-127 Byte Frame Counter */
u32 txrx_65_127_byte_frames; /* 0x6084 */
-
- /* Tx/Rx 128-255 Byte Frame Counter */
u32 txrx_128_255_byte_frames; /* 0x6088 */
-
- /* Tx/Rx 256-511 Byte Frame Counter */
u32 txrx_256_511_byte_frames; /* 0x608C */
-
- /* Tx/Rx 512-1023 Byte Frame Counter */
u32 txrx_512_1023_byte_frames; /* 0x6090 */
-
- /* Tx/Rx 1024-1518 Byte Frame Counter */
u32 txrx_1024_1518_byte_frames; /* 0x6094 */
-
- /* Tx/Rx 1519-1522 Byte Good VLAN Frame Count */
u32 txrx_1519_1522_gvln_frames; /* 0x6098 */
-
- /* Rx Byte Counter */
u32 rx_bytes; /* 0x609C */
-
- /* Rx Packet Counter */
u32 rx_packets; /* 0x60A0 */
-
- /* Rx FCS Error Counter */
u32 rx_fcs_errs; /* 0x60A4 */
-
- /* Rx Multicast Packet Counter */
u32 rx_multicast_packets; /* 0x60A8 */
-
- /* Rx Broadcast Packet Counter */
u32 rx_broadcast_packets; /* 0x60AC */
-
- /* Rx Control Frame Packet Counter */
u32 rx_control_frames; /* 0x60B0 */
-
- /* Rx Pause Frame Packet Counter */
u32 rx_pause_frames; /* 0x60B4 */
-
- /* Rx Unknown OP Code Counter */
u32 rx_unknown_opcodes; /* 0x60B8 */
-
- /* Rx Alignment Error Counter */
u32 rx_align_errs; /* 0x60BC */
-
- /* Rx Frame Length Error Counter */
u32 rx_frame_len_errs; /* 0x60C0 */
-
- /* Rx Code Error Counter */
u32 rx_code_errs; /* 0x60C4 */
-
- /* Rx Carrier Sense Error Counter */
u32 rx_carrier_sense_errs; /* 0x60C8 */
-
- /* Rx Undersize Packet Counter */
u32 rx_undersize_packets; /* 0x60CC */
-
- /* Rx Oversize Packet Counter */
u32 rx_oversize_packets; /* 0x60D0 */
-
- /* Rx Fragment Counter */
u32 rx_fragment_packets; /* 0x60D4 */
-
- /* Rx Jabber Counter */
u32 rx_jabbers; /* 0x60D8 */
-
- /* Rx Drop */
u32 rx_drops; /* 0x60DC */
-
- /* Tx Byte Counter */
u32 tx_bytes; /* 0x60E0 */
-
- /* Tx Packet Counter */
u32 tx_packets; /* 0x60E4 */
-
- /* Tx Multicast Packet Counter */
u32 tx_multicast_packets; /* 0x60E8 */
-
- /* Tx Broadcast Packet Counter */
u32 tx_broadcast_packets; /* 0x60EC */
-
- /* Tx Pause Control Frame Counter */
u32 tx_pause_frames; /* 0x60F0 */
-
- /* Tx Deferral Packet Counter */
u32 tx_deferred; /* 0x60F4 */
-
- /* Tx Excessive Deferral Packet Counter */
u32 tx_excessive_deferred; /* 0x60F8 */
-
- /* Tx Single Collision Packet Counter */
u32 tx_single_collisions; /* 0x60FC */
-
- /* Tx Multiple Collision Packet Counter */
u32 tx_multiple_collisions; /* 0x6100 */
-
- /* Tx Late Collision Packet Counter */
u32 tx_late_collisions; /* 0x6104 */
-
- /* Tx Excessive Collision Packet Counter */
u32 tx_excessive_collisions; /* 0x6108 */
-
- /* Tx Total Collision Packet Counter */
u32 tx_total_collisions; /* 0x610C */
-
- /* Tx Pause Frame Honored Counter */
u32 tx_pause_honored_frames; /* 0x6110 */
-
- /* Tx Drop Frame Counter */
u32 tx_drops; /* 0x6114 */
-
- /* Tx Jabber Frame Counter */
u32 tx_jabbers; /* 0x6118 */
-
- /* Tx FCS Error Counter */
u32 tx_fcs_errs; /* 0x611C */
-
- /* Tx Control Frame Counter */
u32 tx_control_frames; /* 0x6120 */
-
- /* Tx Oversize Frame Counter */
u32 tx_oversize_frames; /* 0x6124 */
-
- /* Tx Undersize Frame Counter */
u32 tx_undersize_frames; /* 0x6128 */
-
- /* Tx Fragments Frame Counter */
u32 tx_fragments; /* 0x612C */
-
- /* Carry Register One Register */
u32 carry_reg1; /* 0x6130 */
-
- /* Carry Register Two Register */
u32 carry_reg2; /* 0x6134 */
-
- /* Carry Register One Mask Register */
u32 carry_reg1_mask; /* 0x6138 */
-
- /* Carry Register Two Mask Register */
u32 carry_reg2_mask; /* 0x613C */
};
--
2.1.0
^ permalink raw reply related
* [PATCH 3/8] staging: et131x: Use for loop to initialise contiguous registers to zero
From: Mark Einon @ 2014-08-20 22:17 UTC (permalink / raw)
To: gregkh; +Cc: devel, netdev, linux-kernel, Mark Einon
In-Reply-To: <1408573078-9320-1-git-send-email-mark.einon@gmail.com>
Replace a long list of contiguous writel() calls with a for loop iterating
over the same values.
Signed-off-by: Mark Einon <mark.einon@gmail.com>
---
drivers/staging/et131x/et131x.c | 27 +++------------------------
1 file changed, 3 insertions(+), 24 deletions(-)
diff --git a/drivers/staging/et131x/et131x.c b/drivers/staging/et131x/et131x.c
index fffe763..44cc684 100644
--- a/drivers/staging/et131x/et131x.c
+++ b/drivers/staging/et131x/et131x.c
@@ -1138,6 +1138,7 @@ static void et1310_config_rxmac_regs(struct et131x_adapter *adapter)
u32 sa_lo;
u32 sa_hi = 0;
u32 pf_ctrl = 0;
+ u32 *wolw;
/* Disable the MAC while it is being configured (also disable WOL) */
writel(0x8, &rxmac->ctrl);
@@ -1151,30 +1152,8 @@ static void et1310_config_rxmac_regs(struct et131x_adapter *adapter)
* its default Values of 0x00000000 because there are not WOL masks
* as of this time.
*/
- writel(0, &rxmac->mask0_word0);
- writel(0, &rxmac->mask0_word1);
- writel(0, &rxmac->mask0_word2);
- writel(0, &rxmac->mask0_word3);
-
- writel(0, &rxmac->mask1_word0);
- writel(0, &rxmac->mask1_word1);
- writel(0, &rxmac->mask1_word2);
- writel(0, &rxmac->mask1_word3);
-
- writel(0, &rxmac->mask2_word0);
- writel(0, &rxmac->mask2_word1);
- writel(0, &rxmac->mask2_word2);
- writel(0, &rxmac->mask2_word3);
-
- writel(0, &rxmac->mask3_word0);
- writel(0, &rxmac->mask3_word1);
- writel(0, &rxmac->mask3_word2);
- writel(0, &rxmac->mask3_word3);
-
- writel(0, &rxmac->mask4_word0);
- writel(0, &rxmac->mask4_word1);
- writel(0, &rxmac->mask4_word2);
- writel(0, &rxmac->mask4_word3);
+ for (wolw = &rxmac->mask0_word0; wolw <= &rxmac->mask4_word3; wolw++)
+ writel(0, wolw);
/* Lets setup the WOL Source Address */
sa_lo = (adapter->addr[2] << ET_RX_WOL_LO_SA3_SHIFT) |
--
2.1.0
^ permalink raw reply related
* [PATCH 2/8] staging: et131x: Don't handle rx/tx packets when changing mtu
From: Mark Einon @ 2014-08-20 22:17 UTC (permalink / raw)
To: gregkh; +Cc: devel, netdev, linux-kernel, Mark Einon
In-Reply-To: <1408573078-9320-1-git-send-email-mark.einon@gmail.com>
There's no need to handle any rx/tx interrupts in the middle of an mtu
change, so don't.
After this change, receive and transmit interrupts are only handled in
one place, which paves the way to using NAPI.
Signed-off-by: Mark Einon <mark.einon@gmail.com>
---
drivers/staging/et131x/et131x.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/drivers/staging/et131x/et131x.c b/drivers/staging/et131x/et131x.c
index ac6700b..fffe763 100644
--- a/drivers/staging/et131x/et131x.c
+++ b/drivers/staging/et131x/et131x.c
@@ -4434,8 +4434,6 @@ static int et131x_change_mtu(struct net_device *netdev, int new_mtu)
return -EINVAL;
et131x_disable_txrx(netdev);
- et131x_handle_send_interrupt(adapter);
- et131x_handle_recv_interrupt(adapter);
/* Set the new MTU */
netdev->mtu = new_mtu;
--
2.1.0
^ permalink raw reply related
* [PATCH 1/8] staging: et131x: Use eth_mac_addr() instead of duplicating the functionality
From: Mark Einon @ 2014-08-20 22:17 UTC (permalink / raw)
To: gregkh; +Cc: devel, netdev, linux-kernel, Mark Einon
In-Reply-To: <1408573078-9320-1-git-send-email-mark.einon@gmail.com>
There's already working code to set the mac address, so let's use it.
Signed-off-by: Mark Einon <mark.einon@gmail.com>
---
drivers/staging/et131x/et131x.c | 53 +----------------------------------------
1 file changed, 1 insertion(+), 52 deletions(-)
diff --git a/drivers/staging/et131x/et131x.c b/drivers/staging/et131x/et131x.c
index 831b7c6..ac6700b 100644
--- a/drivers/staging/et131x/et131x.c
+++ b/drivers/staging/et131x/et131x.c
@@ -4468,57 +4468,6 @@ static int et131x_change_mtu(struct net_device *netdev, int new_mtu)
return result;
}
-/* et131x_set_mac_addr - handler to change the MAC address for the device */
-static int et131x_set_mac_addr(struct net_device *netdev, void *new_mac)
-{
- int result = 0;
- struct et131x_adapter *adapter = netdev_priv(netdev);
- struct sockaddr *address = new_mac;
-
- if (adapter == NULL)
- return -ENODEV;
-
- /* Make sure the requested MAC is valid */
- if (!is_valid_ether_addr(address->sa_data))
- return -EADDRNOTAVAIL;
-
- et131x_disable_txrx(netdev);
- et131x_handle_send_interrupt(adapter);
- et131x_handle_recv_interrupt(adapter);
-
- /* Set the new MAC */
- /* netdev->set_mac_address = &new_mac; */
-
- memcpy(netdev->dev_addr, address->sa_data, netdev->addr_len);
-
- netdev_info(netdev, "Setting MAC address to %pM\n",
- netdev->dev_addr);
-
- /* Free Rx DMA memory */
- et131x_adapter_memory_free(adapter);
-
- et131x_soft_reset(adapter);
-
- /* Alloc and init Rx DMA memory */
- result = et131x_adapter_memory_alloc(adapter);
- if (result != 0) {
- dev_err(&adapter->pdev->dev,
- "Change MAC failed; couldn't re-alloc DMA memory\n");
- return result;
- }
-
- et131x_init_send(adapter);
-
- et131x_hwaddr_init(adapter);
-
- /* Init the device with the new settings */
- et131x_adapter_setup(adapter);
-
- et131x_enable_txrx(netdev);
-
- return result;
-}
-
static const struct net_device_ops et131x_netdev_ops = {
.ndo_open = et131x_open,
.ndo_stop = et131x_close,
@@ -4526,7 +4475,7 @@ static const struct net_device_ops et131x_netdev_ops = {
.ndo_set_rx_mode = et131x_multicast,
.ndo_tx_timeout = et131x_tx_timeout,
.ndo_change_mtu = et131x_change_mtu,
- .ndo_set_mac_address = et131x_set_mac_addr,
+ .ndo_set_mac_address = eth_mac_addr,
.ndo_validate_addr = eth_validate_addr,
.ndo_get_stats = et131x_stats,
.ndo_do_ioctl = et131x_ioctl,
--
2.1.0
^ permalink raw reply related
* [PATCH 0/8] Implement NAPI in et131x
From: Mark Einon @ 2014-08-20 22:17 UTC (permalink / raw)
To: gregkh; +Cc: devel, netdev, linux-kernel, Mark Einon
Let's put a NAPI on this baby...
NAPI support was identified by Dave Miller <davem@davemloft.net> as a
must to get this driver out of staging. This patchset first tidies up
the code enough to make adding NAPI easier, and the final patch mostly
adds the 'boilerplate' NAPI code as described by:
http://www.linuxfoundation.org/collaborate/workgroups/networking/napi
The code has been tested on hardware, with no issues found to date.
**GregKH** - this patchset is based upon my previous bugfix 'Fix errors
caused by phydev->addr accesses' which is currently only on your
staging-linus branch, not staging-next - so won't apply cleanly in it's
current state. Please let me know if I need to do anything about this.
Cheers,
Mark
---
Mark Einon (8):
staging: et131x: Use eth_mac_addr() instead of duplicating the
functionality
staging: et131x: Don't handle rx/tx packets when changing mtu
staging: et131x: Use for loop to initialise contiguous registers to
zero
staging: et131x: Use for loop to initialise contiguous macstat
registers to zero
staging: et131x: Remove unnecessary i2c_wack variable
staging: et131x: Rename NUM_PACKETS_HANDLED to MAX_PACKETS_HANDLED
staging: et131x: Fix ET_INTR_TXDMA_ISR register name typo
staging: et131x: Implement NAPI support
drivers/staging/et131x/README | 1 -
drivers/staging/et131x/et131x.c | 271 ++++++++++------------------------------
drivers/staging/et131x/et131x.h | 96 +-------------
3 files changed, 69 insertions(+), 299 deletions(-)
--
2.1.0
^ 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