* [ANNOUNCE] ipvs and ipvs-next trees on github
From: Simon Horman @ 2011-09-26 9:10 UTC (permalink / raw)
To: lvs-devel, netdev, netfilter-devel, netfilter
Hi,
Like many others I have put some trees up on github to see me
through until kernel.org becomes operation again.
Please base any critical bug fixes for the current rc kernel on
git://github.com/horms/ipvs.git
Please base any other changes on
git://github.com/horms/ipvs-next.git
These trees are currently based on David Miller's net and net-next
trees respectively and follow the same rules for accepting changes
as those trees.
^ permalink raw reply
* Re: [PATCH 1/2] net: Disable false positive memory leak report
From: Eric Dumazet @ 2011-09-26 9:46 UTC (permalink / raw)
To: Huajun Li; +Cc: David Miller, netdev
In-Reply-To: <CA+v9cxZk_bsxrnn8zS-viH-0Wozz-T0XiFB0AE1fOOKqjcQ2ZQ@mail.gmail.com>
Le lundi 26 septembre 2011 à 16:42 +0800, Huajun Li a écrit :
> Eric, thanks for your response. :)
>
> 2011/9/26 Eric Dumazet <eric.dumazet@gmail.com>:
> > This makes no sense to me.
> >
> > per-cpu variables are taken into account by kmemleak.
> >
>
> Yes, I think so.
>
> > If not, you should report this problem to kmemleak maintainer.
> >
>
> To deal with false positives/negatives, in kmemleak document, it says:
> ...
> The false positives are objects wrongly reported as being memory leaks
> (orphan). For objects known not to be leaks, kmemleak provides the
> kmemleak_not_leak function. The kmemleak_ignore could also be used if
> the memory block is known not to contain other pointers and it will no
> longer be scanned.
> ...
>
But this interface should be only used in very specific situations, not
for transient kmemleak reports.
(When the pointer to allocated block is not stored in memory, or only
stored in the object itself : A detached area of memory)
AFAIK, its almost never used :
# git grep kmemleak_not_leak
Documentation/kmemleak.txt:kmemleak_not_leak - mark an object as not a leak
Documentation/kmemleak.txt:kmemleak_not_leak function. The kmemleak_ignore could also be used if
arch/sparc/kernel/irq_64.c: kmemleak_not_leak(bucket);
fs/block_dev.c: kmemleak_not_leak(bd_mnt);
fs/nfs/dir.c: kmemleak_not_leak(string->name);
include/linux/kmemleak.h:extern void kmemleak_not_leak(const void *ptr) __ref;
include/linux/kmemleak.h:static inline void kmemleak_not_leak(const void *ptr)
kernel/module.c: kmemleak_not_leak(ptr);
mm/kmemleak.c: * kmemleak_not_leak - mark an allocated object as false positive
mm/kmemleak.c:void __ref kmemleak_not_leak(const void *ptr)
mm/kmemleak.c:EXPORT_SYMBOL(kmemleak_not_leak);
mm/kmemleak.c: kmemleak_not_leak(log->ptr);
mm/page_cgroup.c: kmemleak_not_leak(base);
percpu variables are not specific these days, and kmemleak definitely
knows about them.
> For some scenarios, _maybe_ it's hard for kmemleak to give report
> exactly, and I think it is known issue for the maintainers, so hope
> there will be a powerful version soon. :)
> However, before the new version of kmemleak(if there is new version)
> comes, is it possible to disable this false positive report as other
> components? You know, other guys maybe also check the code once they
> meet the report again just like me.
We are not going to add patches to work around a core (kmemleak) issue,
especially without kmemleak maintainer feedback.
^ permalink raw reply
* intel 82599 multi-port performance
From: J.Hwan Kim @ 2011-09-26 10:26 UTC (permalink / raw)
To: netdev
Hi, everyone
Now, I'm testing a network card including intel 82599.
In our experiment, with the driver modified with ixgbe and multi-port
enabled,
rx performance of each port with 10Gbps of 64bytes frame is
a half than when only 1 port is used.
The pcie of our server is GEN2 (5x X 8).
Is the result reasonable?
When multi-ports are enabled and 10G stream is inserted to each port,
the maximum performance of each port is a half in our experiment.
Do you think it is a problem of our modified driver or the performance
bottleneck of 82599?
Now I cannot understand our experiment result.
Please give me an advice.
Thanks in advance.
Best Regards,
J.Hwan Kim
^ permalink raw reply
* Re: [PATCH v3 1/7] Basic kernel memory functionality for the Memory Controller
From: KAMEZAWA Hiroyuki @ 2011-09-26 10:34 UTC (permalink / raw)
To: Glauber Costa
Cc: linux-kernel, paul, lizf, ebiederm, davem, gthelen, netdev,
linux-mm, kirill
In-Reply-To: <1316393805-3005-2-git-send-email-glommer@parallels.com>
On Sun, 18 Sep 2011 21:56:39 -0300
Glauber Costa <glommer@parallels.com> wrote:
> This patch lays down the foundation for the kernel memory component
> of the Memory Controller.
>
> As of today, I am only laying down the following files:
>
> * memory.independent_kmem_limit
> * memory.kmem.limit_in_bytes (currently ignored)
> * memory.kmem.usage_in_bytes (always zero)
>
> Signed-off-by: Glauber Costa <glommer@parallels.com>
> CC: Paul Menage <paul@paulmenage.org>
> CC: Greg Thelen <gthelen@google.com>
I'm sorry that my slow review is delaying you.
> ---
> Documentation/cgroups/memory.txt | 30 +++++++++-
> init/Kconfig | 11 ++++
> mm/memcontrol.c | 115 ++++++++++++++++++++++++++++++++++++--
> 3 files changed, 148 insertions(+), 8 deletions(-)
>
> diff --git a/Documentation/cgroups/memory.txt b/Documentation/cgroups/memory.txt
> index 6f3c598..6f1954a 100644
> --- a/Documentation/cgroups/memory.txt
> +++ b/Documentation/cgroups/memory.txt
> @@ -44,8 +44,9 @@ Features:
> - oom-killer disable knob and oom-notifier
> - Root cgroup has no limit controls.
>
> - Kernel memory and Hugepages are not under control yet. We just manage
> - pages on LRU. To add more controls, we have to take care of performance.
> + Hugepages is not under control yet. We just manage pages on LRU. To add more
> + controls, we have to take care of performance. Kernel memory support is work
> + in progress, and the current version provides basically functionality.
>
> Brief summary of control files.
>
> @@ -56,8 +57,11 @@ Brief summary of control files.
> (See 5.5 for details)
> memory.memsw.usage_in_bytes # show current res_counter usage for memory+Swap
> (See 5.5 for details)
> + memory.kmem.usage_in_bytes # show current res_counter usage for kmem only.
> + (See 2.7 for details)
> memory.limit_in_bytes # set/show limit of memory usage
> memory.memsw.limit_in_bytes # set/show limit of memory+Swap usage
> + memory.kmem.limit_in_bytes # if allowed, set/show limit of kernel memory
> memory.failcnt # show the number of memory usage hits limits
> memory.memsw.failcnt # show the number of memory+Swap hits limits
> memory.max_usage_in_bytes # show max memory usage recorded
> @@ -72,6 +76,9 @@ Brief summary of control files.
> memory.oom_control # set/show oom controls.
> memory.numa_stat # show the number of memory usage per numa node
>
> + memory.independent_kmem_limit # select whether or not kernel memory limits are
> + independent of user limits
> +
> 1. History
>
> The memory controller has a long history. A request for comments for the memory
> @@ -255,6 +262,25 @@ When oom event notifier is registered, event will be delivered.
> per-zone-per-cgroup LRU (cgroup's private LRU) is just guarded by
> zone->lru_lock, it has no lock of its own.
>
> +2.7 Kernel Memory Extension (CONFIG_CGROUP_MEM_RES_CTLR_KMEM)
> +
> + With the Kernel memory extension, the Memory Controller is able to limit
> +the amount of kernel memory used by the system. Kernel memory is fundamentally
> +different than user memory, since it can't be swapped out, which makes it
> +possible to DoS the system by consuming too much of this precious resource.
> +Kernel memory limits are not imposed for the root cgroup.
> +
> +Memory limits as specified by the standard Memory Controller may or may not
> +take kernel memory into consideration. This is achieved through the file
> +memory.independent_kmem_limit. A Value different than 0 will allow for kernel
> +memory to be controlled separately.
> +
> +When kernel memory limits are not independent, the limit values set in
> +memory.kmem files are ignored.
> +
> +Currently no soft limit is implemented for kernel memory. It is future work
> +to trigger slab reclaim when those limits are reached.
> +
> 3. User Interface
>
> 0. Configuration
> diff --git a/init/Kconfig b/init/Kconfig
> index d627783..49e5839 100644
> --- a/init/Kconfig
> +++ b/init/Kconfig
> @@ -689,6 +689,17 @@ config CGROUP_MEM_RES_CTLR_SWAP_ENABLED
> For those who want to have the feature enabled by default should
> select this option (if, for some reason, they need to disable it
> then swapaccount=0 does the trick).
> +config CGROUP_MEM_RES_CTLR_KMEM
> + bool "Memory Resource Controller Kernel Memory accounting"
> + depends on CGROUP_MEM_RES_CTLR
> + default y
> + help
> + The Kernel Memory extension for Memory Resource Controller can limit
> + the amount of memory used by kernel objects in the system. Those are
> + fundamentally different from the entities handled by the standard
> + Memory Controller, which are page-based, and can be swapped. Users of
> + the kmem extension can use it to guarantee that no group of processes
> + will ever exhaust kernel resources alone.
>
> config CGROUP_PERF
> bool "Enable perf_event per-cpu per-container group (cgroup) monitoring"
> diff --git a/mm/memcontrol.c b/mm/memcontrol.c
> index ebd1e86..d32e931 100644
> --- a/mm/memcontrol.c
> +++ b/mm/memcontrol.c
> @@ -73,7 +73,11 @@ static int really_do_swap_account __initdata = 0;
> #define do_swap_account (0)
> #endif
>
> -
> +#ifdef CONFIG_CGROUP_MEM_RES_CTLR_KMEM
> +int do_kmem_account __read_mostly = 1;
> +#else
> +#define do_kmem_account 0
> +#endif
Hmm, do we really need this boot option ?
>From my experience to have swap-accounting boot option,
this scares us ;) I think config is enough.
> /*
> * Statistics for memory cgroup.
> */
> @@ -270,6 +274,10 @@ struct mem_cgroup {
> */
> struct res_counter memsw;
> /*
> + * the counter to account for kmem usage.
> + */
> + struct res_counter kmem;
> + /*
> * Per cgroup active and inactive list, similar to the
> * per zone LRU lists.
> */
> @@ -321,6 +329,11 @@ struct mem_cgroup {
> */
> unsigned long move_charge_at_immigrate;
> /*
> + * Should kernel memory limits be stabilished independently
> + * from user memory ?
> + */
> + int kmem_independent;
> + /*
> * percpu counter.
> */
> struct mem_cgroup_stat_cpu *stat;
> @@ -388,9 +401,14 @@ enum charge_type {
> };
>
> /* for encoding cft->private value on file */
> -#define _MEM (0)
> -#define _MEMSWAP (1)
> -#define _OOM_TYPE (2)
> +
> +enum mem_type {
> + _MEM = 0,
> + _MEMSWAP,
> + _OOM_TYPE,
> + _KMEM,
> +};
> +
ok, nice clean up.
> #define MEMFILE_PRIVATE(x, val) (((x) << 16) | (val))
> #define MEMFILE_TYPE(val) (((val) >> 16) & 0xffff)
> #define MEMFILE_ATTR(val) ((val) & 0xffff)
> @@ -3943,10 +3961,15 @@ static inline u64 mem_cgroup_usage(struct mem_cgroup *mem, bool swap)
> u64 val;
>
> if (!mem_cgroup_is_root(mem)) {
> + val = 0;
> + if (!mem->kmem_independent)
> + val = res_counter_read_u64(&mem->kmem, RES_USAGE);
> if (!swap)
> - return res_counter_read_u64(&mem->res, RES_USAGE);
> + val += res_counter_read_u64(&mem->res, RES_USAGE);
> else
> - return res_counter_read_u64(&mem->memsw, RES_USAGE);
> + val += res_counter_read_u64(&mem->memsw, RES_USAGE);
> +
> + return val;
> }
>
> val = mem_cgroup_recursive_stat(mem, MEM_CGROUP_STAT_CACHE);
> @@ -3979,6 +4002,10 @@ static u64 mem_cgroup_read(struct cgroup *cont, struct cftype *cft)
> else
> val = res_counter_read_u64(&mem->memsw, name);
> break;
> + case _KMEM:
> + val = res_counter_read_u64(&mem->kmem, name);
> + break;
> +
> default:
> BUG();
> break;
> @@ -4756,6 +4783,21 @@ static int mem_cgroup_reset_vmscan_stat(struct cgroup *cgrp,
> return 0;
> }
>
> +#ifdef CONFIG_CGROUP_MEM_RES_CTLR_KMEM
> +static u64 kmem_limit_independent_read(struct cgroup *cont, struct cftype *cft)
> +{
> + return mem_cgroup_from_cont(cont)->kmem_independent;
> +}
> +
> +static int kmem_limit_independent_write(struct cgroup *cont, struct cftype *cft,
> + u64 val)
> +{
> + cgroup_lock();
> + mem_cgroup_from_cont(cont)->kmem_independent = !!val;
> + cgroup_unlock();
Hm. This code allows that parent/child can have different settings.
Could you add parent-child check as..
"If parent sets use_hierarchy==1, children must have the same kmem_independent value
with parant's one."
How do you think ? I think a hierarchy must have the same config.
BTW...I don't like naming a little ;)
memory->consolidated/shared/?????_kmem_accounting ?
Or
memory->kmem_independent_accounting ?
or some better naming ?
Thanks,
-Kame
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
^ permalink raw reply
* Re: [PATCH v3 2/7] socket: initial cgroup code.
From: KAMEZAWA Hiroyuki @ 2011-09-26 10:52 UTC (permalink / raw)
To: Glauber Costa
Cc: Balbir Singh, Greg Thelen, linux-kernel, paul, lizf, ebiederm,
davem, netdev, linux-mm, kirill
In-Reply-To: <4E7DECF0.9050804@parallels.com>
On Sat, 24 Sep 2011 11:45:04 -0300
Glauber Costa <glommer@parallels.com> wrote:
> On 09/22/2011 12:09 PM, Balbir Singh wrote:
> > On Thu, Sep 22, 2011 at 11:30 AM, Greg Thelen<gthelen@google.com> wrote:
> >> On Wed, Sep 21, 2011 at 11:59 AM, Glauber Costa<glommer@parallels.com> wrote:
> >>> Right now I am working under the assumption that tasks are long lived inside
> >>> the cgroup. Migration potentially introduces some nasty locking problems in
> >>> the mem_schedule path.
> >>>
> >>> Also, unless I am missing something, the memcg already has the policy of
> >>> not carrying charges around, probably because of this very same complexity.
> >>>
> >>> True that at least it won't EBUSY you... But I think this is at least a way
> >>> to guarantee that the cgroup under our nose won't disappear in the middle of
> >>> our allocations.
> >>
> >> Here's the memcg user page behavior using the same pattern:
> >>
> >> 1. user page P is allocate by task T in memcg M1
> >> 2. T is moved to memcg M2. The P charge is left behind still charged
> >> to M1 if memory.move_charge_at_immigrate=0; or the charge is moved to
> >> M2 if memory.move_charge_at_immigrate=1.
> >> 3. rmdir M1 will try to reclaim P (if P was left in M1). If unable to
> >> reclaim, then P is recharged to parent(M1).
> >>
> >
> > We also have some magic in page_referenced() to remove pages
> > referenced from different containers. What we do is try not to
> > penalize a cgroup if another cgroup is referencing this page and the
> > page under consideration is being reclaimed from the cgroup that
> > touched it.
> >
> > Balbir Singh
> Do you guys see it as a showstopper for this series to be merged, or can
> we just TODO it ?
>
In my experience, 'I can't rmdir cgroup.' is always an important/difficult
problem. The users cannot know where the accouting is leaking other than
kmem.usage_in_bytes or memory.usage_in_bytes. and can't fix the issue.
please add EXPERIMENTAL to Kconfig until this is fixed.
> I can push a proposal for it, but it would be done in a separate patch
> anyway. Also, we may be in better conditions to fix this when the slab
> part is merged - since it will likely have the same problems...
>
Yes. considering sockets which can be shared between tasks(cgroups)
you'll finally need
- owner task of socket
- account moving callback
Or disallow task moving once accounted.
Thanks,
-Kame
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
^ permalink raw reply
* Re: [PATCH v3 4/7] per-cgroup tcp buffers control
From: KAMEZAWA Hiroyuki @ 2011-09-26 10:59 UTC (permalink / raw)
To: Glauber Costa
Cc: linux-kernel, paul, lizf, ebiederm, davem, gthelen, netdev,
linux-mm, kirill
In-Reply-To: <1316393805-3005-5-git-send-email-glommer@parallels.com>
On Sun, 18 Sep 2011 21:56:42 -0300
Glauber Costa <glommer@parallels.com> wrote:
> With all the infrastructure in place, this patch implements
> per-cgroup control for tcp memory pressure handling.
>
> Signed-off-by: Glauber Costa <glommer@parallels.com>
> CC: David S. Miller <davem@davemloft.net>
> CC: Hiroyouki Kamezawa <kamezawa.hiroyu@jp.fujitsu.com>
> CC: Eric W. Biederman <ebiederm@xmission.com>
a comment below.
> +int tcp_init_cgroup(struct proto *prot, struct cgroup *cgrp,
> + struct cgroup_subsys *ss)
> +{
> + struct mem_cgroup *cg = mem_cgroup_from_cont(cgrp);
> + unsigned long limit;
> +
> + cg->tcp_memory_pressure = 0;
> + atomic_long_set(&cg->tcp_memory_allocated, 0);
> + percpu_counter_init(&cg->tcp_sockets_allocated, 0);
> +
> + limit = nr_free_buffer_pages() / 8;
> + limit = max(limit, 128UL);
> +
> + cg->tcp_prot_mem[0] = sysctl_tcp_mem[0];
> + cg->tcp_prot_mem[1] = sysctl_tcp_mem[1];
> + cg->tcp_prot_mem[2] = sysctl_tcp_mem[2];
> +
Then, the parameter doesn't inherit parent's one ?
I think sockets_populate should pass 'parent' and
I think you should have a function
mem_cgroup_should_inherit_parent_settings(parent)
(This is because you made this feature as a part of memcg.
please provide expected behavior.)
Thanks,
-Kame
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
^ permalink raw reply
* Re: [PATCH v3 6/7] tcp buffer limitation: per-cgroup limit
From: KAMEZAWA Hiroyuki @ 2011-09-26 11:02 UTC (permalink / raw)
To: Glauber Costa
Cc: Greg Thelen, linux-kernel, paul, lizf, ebiederm, davem, netdev,
linux-mm, kirill
In-Reply-To: <4E7DDB82.3030802@parallels.com>
On Sat, 24 Sep 2011 10:30:42 -0300
Glauber Costa <glommer@parallels.com> wrote:
> On 09/22/2011 03:01 AM, Greg Thelen wrote:
> > On Sun, Sep 18, 2011 at 5:56 PM, Glauber Costa<glommer@parallels.com> wrote:
> >> +static inline bool mem_cgroup_is_root(struct mem_cgroup *mem)
> >> +{
> >> + return (mem == root_mem_cgroup);
> >> +}
> >> +
> >
> > Why are you adding a copy of mem_cgroup_is_root(). I see one already
> > in v3.0. Was it deleted in a previous patch?
>
> Already answered by another good samaritan.
>
> >> +static int tcp_write_maxmem(struct cgroup *cgrp, struct cftype *cft, u64 val)
> >> +{
> >> + struct mem_cgroup *sg = mem_cgroup_from_cont(cgrp);
> >> + struct mem_cgroup *parent = parent_mem_cgroup(sg);
> >> + struct net *net = current->nsproxy->net_ns;
> >> + int i;
> >> +
> >> + if (!cgroup_lock_live_group(cgrp))
> >> + return -ENODEV;
> >
> > Why is cgroup_lock_live_cgroup() needed here? Does it protect updates
> > to sg->tcp_prot_mem[*]?
> >
> >> +static u64 tcp_read_maxmem(struct cgroup *cgrp, struct cftype *cft)
> >> +{
> >> + struct mem_cgroup *sg = mem_cgroup_from_cont(cgrp);
> >> + u64 ret;
> >> +
> >> + if (!cgroup_lock_live_group(cgrp))
> >> + return -ENODEV;
> >
> > Why is cgroup_lock_live_cgroup() needed here? Does it protect updates
> > to sg->tcp_max_memory?
>
> No, that is not my understanding. My understanding is this lock is
> needed to protect against the cgroup just disappearing under our nose.
>
Hm. reference count of dentry for cgroup isn't enough ?
Thanks,
-Kame
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
^ permalink raw reply
* Re: [PATCH] tcp: ECN blackhole should not force quickack mode
From: jamal @ 2011-09-26 12:00 UTC (permalink / raw)
To: Eric Dumazet
Cc: David Miller, netdev, Jerry Chu, Ilpo Järvinen, Jim Gettys,
Dave Taht
In-Reply-To: <1317025614.2557.7.camel@edumazet-HP-Compaq-6005-Pro-SFF-PC>
On Mon, 2011-09-26 at 10:26 +0200, Eric Dumazet wrote:
> This refers to additions to RFC 2481 : This was refined by RFC 3168, and
> the retransmitted TCP packets requirement is part of the final RFC :
Ah, yes - thats where it went.
>
> BTW, the ECN+ proposal (RFC 5562 : Adding Explicit Congestion
> Notification (ECN) Capability to TCP's SYN/ACK Packets) would allow the
> client (receiving SYNACK message with ECT flags) to set the TCP_ECN_SEEN
> I added in my patch, allowing even the first (retransmitted) data packet
> to trigger quickack mode.
Excellent ;->
Are you going to add 5562 support?
cheers,
jamal
^ permalink raw reply
* Re: [PATCH] tcp: ECN blackhole should not force quickack mode
From: Eric Dumazet @ 2011-09-26 12:44 UTC (permalink / raw)
To: jhs
Cc: David Miller, netdev, Jerry Chu, Ilpo Järvinen, Jim Gettys,
Dave Taht
In-Reply-To: <1317038443.1865.40.camel@mojatatu>
Le lundi 26 septembre 2011 à 08:00 -0400, jamal a écrit :
> On Mon, 2011-09-26 at 10:26 +0200, Eric Dumazet wrote:
>
> > This refers to additions to RFC 2481 : This was refined by RFC 3168, and
> > the retransmitted TCP packets requirement is part of the final RFC :
>
> Ah, yes - thats where it went.
>
> >
> > BTW, the ECN+ proposal (RFC 5562 : Adding Explicit Congestion
> > Notification (ECN) Capability to TCP's SYN/ACK Packets) would allow the
> > client (receiving SYNACK message with ECT flags) to set the TCP_ECN_SEEN
> > I added in my patch, allowing even the first (retransmitted) data packet
> > to trigger quickack mode.
>
> Excellent ;->
> Are you going to add 5562 support?
I sent a private mail to Adam Langley this morning asking him if he
planned an official submission of a prior patch :
http://www.ietf.org/mail-archive/web/tcpm/current/msg03988.html
If Adam is too busy or not anymore interested, I would like to spend
some cycles on this.
Thanks
^ permalink raw reply
* re: [SCSI] cxgb3i: convert cdev->l2opt to use rcu to prevent NULL dereference (v2)
From: Dan Carpenter @ 2011-09-26 13:40 UTC (permalink / raw)
To: nhorman; +Cc: netdev, linux-scsi
Hi Neil,
c98bc57ee65b6 "[SCSI] cxgb3i: convert cdev->l2opt to use rcu to
prevent NULL dereference (v2)" from linux-next introduces a usinging
uninitialized variable bug.
struct l2t_entry *t3_l2t_get(struct t3cdev *cdev, struct neighbour *neigh,
struct net_device *dev)
{
- struct l2t_entry *e;
- struct l2t_data *d = L2DATA(cdev);
+ struct l2t_entry *e = NULL;
+ struct l2t_data *d;
u32 addr = *(u32 *) neigh->primary_key;
int ifidx = neigh->dev->ifindex;
int hash = arp_hash(addr, ifidx, d);
^
Uninitialized variable.
struct port_info *p = netdev_priv(dev);
int smt_idx = p->port_id;
+ rcu_read_lock();
+ d = L2DATA(cdev);
+ if (!d)
+ goto done_rcu;
+
regards,
dan carpenter
^ permalink raw reply
* Re: [SCSI] cxgb3i: convert cdev->l2opt to use rcu to prevent NULL dereference (v2)
From: Neil Horman @ 2011-09-26 14:20 UTC (permalink / raw)
To: Dan Carpenter; +Cc: netdev, linux-scsi
In-Reply-To: <20110926134048.GA10999@longonot.mountain>
On Mon, Sep 26, 2011 at 04:40:48PM +0300, Dan Carpenter wrote:
> Hi Neil,
>
> c98bc57ee65b6 "[SCSI] cxgb3i: convert cdev->l2opt to use rcu to
> prevent NULL dereference (v2)" from linux-next introduces a usinging
> uninitialized variable bug.
>
> struct l2t_entry *t3_l2t_get(struct t3cdev *cdev, struct neighbour *neigh,
> struct net_device *dev)
> {
> - struct l2t_entry *e;
> - struct l2t_data *d = L2DATA(cdev);
> + struct l2t_entry *e = NULL;
> + struct l2t_data *d;
> u32 addr = *(u32 *) neigh->primary_key;
> int ifidx = neigh->dev->ifindex;
> int hash = arp_hash(addr, ifidx, d);
> ^
> Uninitialized variable.
>
> struct port_info *p = netdev_priv(dev);
> int smt_idx = p->port_id;
>
> + rcu_read_lock();
> + d = L2DATA(cdev);
> + if (!d)
> + goto done_rcu;
> +
>
> regards,
> dan carpenter
>
Yup, thanks, you need this to9 fix the uninitalized var.
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Neil Horman <nhorman@tuxdriver.com>
l2t.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/net/cxgb3/l2t.c b/drivers/net/cxgb3/l2t.c
index 3808f99..4154097 100644
--- a/drivers/net/cxgb3/l2t.c
+++ b/drivers/net/cxgb3/l2t.c
@@ -302,9 +302,9 @@ struct l2t_entry *t3_l2t_get(struct t3cdev *cdev, struct neighbour *neigh,
{
struct l2t_entry *e = NULL;
struct l2t_data *d;
+ int hash;
u32 addr = *(u32 *) neigh->primary_key;
int ifidx = neigh->dev->ifindex;
- int hash = arp_hash(addr, ifidx, d);
struct port_info *p = netdev_priv(dev);
int smt_idx = p->port_id;
@@ -313,6 +313,8 @@ struct l2t_entry *t3_l2t_get(struct t3cdev *cdev, struct neighbour *neigh,
if (!d)
goto done_rcu;
+ hash = arp_hash(addr, ifidx, d);
+
write_lock_bh(&d->lock);
for (e = d->l2tab[hash].first; e; e = e->next)
if (e->addr == addr && e->ifindex == ifidx &&
^ permalink raw reply related
* Re: intel 82599 multi-port performance
From: Chris Friesen @ 2011-09-26 14:20 UTC (permalink / raw)
To: J.Hwan Kim; +Cc: netdev
In-Reply-To: <4E805359.2080600@gmail.com>
On 09/26/2011 04:26 AM, J.Hwan Kim wrote:
> Hi, everyone
>
> Now, I'm testing a network card including intel 82599.
> In our experiment, with the driver modified with ixgbe and multi-port
> enabled,
What do you mean by "modified with ixgbe and multi-port enabled"? You
shouldn't need to do anything special to use both ports.
> rx performance of each port with 10Gbps of 64bytes frame is
> a half than when only 1 port is used.
Sounds like a cpu limitation. What is your cpu usage? How are your
interrupts routed? Are you using multiple rx queues?
Chris
--
Chris Friesen
Software Developer
GENBAND
chris.friesen@genband.com
www.genband.com
^ permalink raw reply
* Re: [SCSI] cxgb3i: convert cdev->l2opt to use rcu to prevent NULL dereference (v2)
From: James Bottomley @ 2011-09-26 14:31 UTC (permalink / raw)
To: Neil Horman; +Cc: Dan Carpenter, netdev, linux-scsi
In-Reply-To: <20110926142052.GA18283@hmsreliant.think-freely.org>
On Mon, 2011-09-26 at 10:20 -0400, Neil Horman wrote:
> On Mon, Sep 26, 2011 at 04:40:48PM +0300, Dan Carpenter wrote:
> > Hi Neil,
> >
> > c98bc57ee65b6 "[SCSI] cxgb3i: convert cdev->l2opt to use rcu to
> > prevent NULL dereference (v2)" from linux-next introduces a usinging
> > uninitialized variable bug.
> >
> > struct l2t_entry *t3_l2t_get(struct t3cdev *cdev, struct neighbour *neigh,
> > struct net_device *dev)
> > {
> > - struct l2t_entry *e;
> > - struct l2t_data *d = L2DATA(cdev);
> > + struct l2t_entry *e = NULL;
> > + struct l2t_data *d;
> > u32 addr = *(u32 *) neigh->primary_key;
> > int ifidx = neigh->dev->ifindex;
> > int hash = arp_hash(addr, ifidx, d);
> > ^
> > Uninitialized variable.
> >
> > struct port_info *p = netdev_priv(dev);
> > int smt_idx = p->port_id;
> >
> > + rcu_read_lock();
> > + d = L2DATA(cdev);
> > + if (!d)
> > + goto done_rcu;
> > +
> >
> > regards,
> > dan carpenter
> >
>
> Yup, thanks, you need this to9 fix the uninitalized var.
I rolled this into the original.
James
^ permalink raw reply
* Re: [PATCH v3 4/7] per-cgroup tcp buffers control
From: Andrew Vagin @ 2011-09-26 14:39 UTC (permalink / raw)
To: Glauber Costa
Cc: linux-kernel, paul, lizf, kamezawa.hiroyu, ebiederm, davem,
gthelen, netdev, linux-mm, kirill
In-Reply-To: <1316393805-3005-5-git-send-email-glommer@parallels.com>
We can't change net.ipv4.tcp_mem if a cgroup with memory controller
isn't mounted.
[root@dhcp-10-30-20-19 ~]# sysctl -w net.ipv4.tcp_mem="3 2 3"
error: "Invalid argument" setting key "net.ipv4.tcp_mem"
It's because tcp_max_memory is initialized in mem_cgroup_populate:
mem_cgroup_populate->register_kmem_files->sockets_populate->tcp_init_cgroup
> +int sockets_populate(struct cgroup *cgrp, struct cgroup_subsys *ss)
> +{
> + struct proto *proto;
> + int ret = 0;
> +
> + read_lock(&proto_list_lock);
> + list_for_each_entry(proto,&proto_list, node) {
> + if (proto->init_cgroup)
> + ret |= proto->init_cgroup(proto, cgrp, ss);
> + }
> + if (!ret)
> + goto out;
> +
> + list_for_each_entry_continue_reverse(proto,&proto_list, node)
> + if (proto->destroy_cgroup)
> + proto->destroy_cgroup(proto, cgrp, ss);
> +
> +out:
> + read_unlock(&proto_list_lock);
> + return ret;
> +}
> @@ -198,6 +203,21 @@ static int ipv4_tcp_mem(ctl_table *ctl, int write,
> if (ret)
> return ret;
>
> +#ifdef CONFIG_CGROUP_MEM_RES_CTLR_KMEM
> + rcu_read_lock();
> + cg = mem_cgroup_from_task(current);
> + for (i = 0; i< 3; i++)
> + if (vec[i]> tcp_max_memory(cg)) {
> + rcu_read_unlock();
> + return -EINVAL;
> + }
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
^ permalink raw reply
* Re: [SCSI] cxgb3i: convert cdev->l2opt to use rcu to prevent NULL dereference (v2)
From: Neil Horman @ 2011-09-26 15:02 UTC (permalink / raw)
To: James Bottomley; +Cc: Dan Carpenter, netdev, linux-scsi
In-Reply-To: <1317047476.9560.0.camel@dabdike>
On Mon, Sep 26, 2011 at 09:31:15AM -0500, James Bottomley wrote:
> On Mon, 2011-09-26 at 10:20 -0400, Neil Horman wrote:
> > On Mon, Sep 26, 2011 at 04:40:48PM +0300, Dan Carpenter wrote:
> > > Hi Neil,
> > >
> > > c98bc57ee65b6 "[SCSI] cxgb3i: convert cdev->l2opt to use rcu to
> > > prevent NULL dereference (v2)" from linux-next introduces a usinging
> > > uninitialized variable bug.
> > >
> > > struct l2t_entry *t3_l2t_get(struct t3cdev *cdev, struct neighbour *neigh,
> > > struct net_device *dev)
> > > {
> > > - struct l2t_entry *e;
> > > - struct l2t_data *d = L2DATA(cdev);
> > > + struct l2t_entry *e = NULL;
> > > + struct l2t_data *d;
> > > u32 addr = *(u32 *) neigh->primary_key;
> > > int ifidx = neigh->dev->ifindex;
> > > int hash = arp_hash(addr, ifidx, d);
> > > ^
> > > Uninitialized variable.
> > >
> > > struct port_info *p = netdev_priv(dev);
> > > int smt_idx = p->port_id;
> > >
> > > + rcu_read_lock();
> > > + d = L2DATA(cdev);
> > > + if (!d)
> > > + goto done_rcu;
> > > +
> > >
> > > regards,
> > > dan carpenter
> > >
> >
> > Yup, thanks, you need this to9 fix the uninitalized var.
>
> I rolled this into the original.
>
Thank you!
Neil
> James
>
>
>
^ permalink raw reply
* Question about memory leak detector giving false positive report for net/core/flow.c
From: Huajun Li @ 2011-09-26 15:17 UTC (permalink / raw)
To: Catalin Marinas, linux-mm; +Cc: "Eric Dumaze"t, netdev, Huajun Li
Memory leak detector gives following memory leak report, it seems the
report is triggered by net/core/flow.c, but actually, it should be a
false positive report.
So, is there any idea from kmemleak side to fix/disable this false
positive report like this?
Yes, kmemleak_not_leak(...) could disable it, but is it suitable for this case ?
BTW, I wrote a simple test code to emulate net/core/flow.c behavior at
this stage which triggers the report, and it could also make kmemleak
give similar report, please check below test code:
kernel version:
#uname -a
Linux 3.1.0-rc7 #22 SMP Tue Sep 26 05:43:01 CST 2011 x86_64 x86_64
x86_64 GNU/Linux
memory leak report:
-------------------------------------------------------------------------------------------
unreferenced object 0xffff880073a70000 (size 8192):
comm "swapper", pid 1, jiffies 4294937832 (age 445.740s)
hex dump (first 32 bytes):
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
backtrace:
[<ffffffff8124db64>] create_object+0x144/0x360
[<ffffffff8191192e>] kmemleak_alloc+0x7e/0x110
[<ffffffff81235b26>] __kmalloc_node+0x156/0x3a0
[<ffffffff81935512>] flow_cache_cpu_prepare.clone.1+0x58/0xc0
[<ffffffff8214c361>] flow_cache_init_global+0xb6/0x1af
[<ffffffff8100225d>] do_one_initcall+0x4d/0x260
[<ffffffff820ec2e9>] kernel_init+0x161/0x23a
[<ffffffff8194ab04>] kernel_thread_helper+0x4/0x10
[<ffffffffffffffff>] 0xffffffffffffffff
unreferenced object 0xffff880073a74290 (size 8192):
comm "swapper", pid 1, jiffies 4294937832 (age 445.740s)
hex dump (first 32 bytes):
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
backtrace:
[<ffffffff8124db64>] create_object+0x144/0x360
[<ffffffff8191192e>] kmemleak_alloc+0x7e/0x110
[<ffffffff81235b26>] __kmalloc_node+0x156/0x3a0
[<ffffffff81935512>] flow_cache_cpu_prepare.clone.1+0x58/0xc0
[<ffffffff8214c361>] flow_cache_init_global+0xb6/0x1af
[<ffffffff8100225d>] do_one_initcall+0x4d/0x260
[<ffffffff820ec2e9>] kernel_init+0x161/0x23a
[<ffffffff8194ab04>] kernel_thread_helper+0x4/0x10
[<ffffffffffffffff>] 0xffffffffffffffff
Simple test code to reproduce a similar report:
-----------------------------------------------------------------------------------------
MODULE_LICENSE("GPL");
struct test {
int *pt;
};
static struct test __percpu *percpu;
static int __init test_init(void)
{
int i;
percpu = alloc_percpu(struct test);
if (!percpu)
return -ENOMEM;
for_each_online_cpu(i) {
struct test *p = per_cpu_ptr(percpu, i);
p->pt = kmalloc(sizeof(int), GFP_KERNEL);
}
return 0;
}
static void __exit test_exit(void)
{
int i;
for_each_possible_cpu(i) {
struct test *p = per_cpu_ptr(percpu, i);
if (p->pt)
kfree(p->pt);
}
if (percpu)
free_percpu(percpu);
}
module_init(test_init);
module_exit(test_exit);
^ permalink raw reply
* Re: intel 82599 multi-port performance
From: J.Hwan.Kim @ 2011-09-26 15:42 UTC (permalink / raw)
Cc: netdev
In-Reply-To: <4E808A41.8040902@genband.com>
On 2011년 09월 26일 23:20, Chris Friesen wrote:
> On 09/26/2011 04:26 AM, J.Hwan Kim wrote:
>> Hi, everyone
>>
>> Now, I'm testing a network card including intel 82599.
>> In our experiment, with the driver modified with ixgbe and multi-port
>> enabled,
>
> What do you mean by "modified with ixgbe and multi-port enabled"? You
> shouldn't need to do anything special to use both ports.
>
>> rx performance of each port with 10Gbps of 64bytes frame is
>> a half than when only 1 port is used.
>
> Sounds like a cpu limitation. What is your cpu usage? How are your
> interrupts routed? Are you using multiple rx queues?
>
Our server is XEON 2.4GHz with 8 cores.
I'm using 4 RSS queues for each port and distributed it's interrupts to
different cores respectively.
I checked the CPU utilization with TOP, I guess ,it is not cpu imitation
problem.
^ permalink raw reply
* Re: Bridge stays down until a port is added
From: Stephen Hemminger @ 2011-09-26 15:47 UTC (permalink / raw)
To: Marc Haber; +Cc: netdev
In-Reply-To: <20110925082504.GA32712@torres.zugschlus.de>
The root of this whole problem is really that IPv6 reports addresses
in a tentative state to applications that can not be passed to the bind() system call.
For most cases, this problem never happens because the tentative addresses are
resolved by Duplicate Address Detection before the application starts. But
I have seen (and fixed) this happen before this whole discussion started.
1. The problem is not unique to bridges. It happens with bridge, macvtap,
even on wireless networks where the device is available but carrier is
not asserted.
2. Any change to what the kernel does (like not reporting tentative addresses)
would break applications even worse.
3. When the bridge was always reporting carrier, it was in effect breaking
IPv6 Duplicate Address Detection. And that is bad.
^ permalink raw reply
* Re: Why not refresh ipv6 local link address of a bridge when a new interface added to the bridge?
From: Stephen Hemminger @ 2011-09-26 15:51 UTC (permalink / raw)
To: Eric Xiong; +Cc: netdev
In-Reply-To: <CA+UXGK3yQzUuZwHWooxd91G77ACvYzwTQUOoDdVc-=CCEv4POQ@mail.gmail.com>
On Tue, 20 Sep 2011 10:39:31 +0800
Eric Xiong <bottomofstack@gmail.com> wrote:
> Hi all:
> Sorry for disturb! when adding a interface to bridge, maybe the bridge
> mac address will be changed. the bridge code don't invoke
> call_netdevice_notifiers to notify ipv6 code to refresh local link
> address. I don't know why. Thanks for your help!
>
> BRs.
This change went in for v3.1
Bridge: Always send NETDEV_CHANGEADDR up on br MAC change.
This ensures the neighbor entries associated with the bridge
dev are flushed, also invalidating the associated cached L2 headers.
This means we br_add_if/br_del_if ports to implement hand-over and
not wind up with bridge packets going out with stale MAC.
This means we can also change MAC of port device and also not wind
up with bridge packets going out with stale MAC.
This builds on Stephen Hemminger's patch, also handling the br_del_if
case and the port MAC change case.
Cc: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: Andrei Warkentin <andreiw@motorola.com>
Acked-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
^ permalink raw reply
* RE: [net-next 02/10] ixgbevf: Fix broken trunk vlan
From: Rose, Gregory V @ 2011-09-26 15:57 UTC (permalink / raw)
To: Jesse Gross, Kirsher, Jeffrey T
Cc: davem@davemloft.net, netdev@vger.kernel.org, gospo@redhat.com,
Jiri Pirko
In-Reply-To: <CAEP_g=93GcR7yE7N+GtaB6dpjPuGGtCBXznEmV6Sx=BX-kSbmg@mail.gmail.com>
> -----Original Message-----
> From: Jesse Gross [mailto:jesse@nicira.com]
> Sent: Saturday, September 24, 2011 9:33 AM
> To: Kirsher, Jeffrey T
> Cc: davem@davemloft.net; Rose, Gregory V; netdev@vger.kernel.org;
> gospo@redhat.com; Jiri Pirko
> Subject: Re: [net-next 02/10] ixgbevf: Fix broken trunk vlan
>
> On Sat, Sep 24, 2011 at 2:17 AM, Jeff Kirsher
> <jeffrey.t.kirsher@intel.com> wrote:
> > From: Greg Rose <gregory.v.rose@intel.com>
> >
> > Changes to clean up the vlan rx path broke trunk vlan. Trunk vlans in
> > a VF driver are those set using:
> >
> > "ip link set <pfdev> vf <n> <vlanid>"
> >
> > Signed-off-by: Greg Rose <gregory.v.rose@intel.com>
> > CC: Jiri Pirko <jpirko@redhat.com>
> > Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> > ---
> > drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 6 ++----
> > 1 files changed, 2 insertions(+), 4 deletions(-)
> >
> > diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
> b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
> > index d72905b..4930c46 100644
> > --- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
> > +++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
> > @@ -293,12 +293,10 @@ static void ixgbevf_receive_skb(struct
> ixgbevf_q_vector *q_vector,
> > {
> > struct ixgbevf_adapter *adapter = q_vector->adapter;
> > bool is_vlan = (status & IXGBE_RXD_STAT_VP);
> > + u16 tag = le16_to_cpu(rx_desc->wb.upper.vlan);
> >
> > - if (is_vlan) {
> > - u16 tag = le16_to_cpu(rx_desc->wb.upper.vlan);
> > -
> > + if (is_vlan && test_bit(tag, adapter->active_vlans))
> > __vlan_hwaccel_put_tag(skb, tag);
> > - }
>
> What happens if you run tcpdump without configuring vlan devices?
> Shouldn't you see tagged packets for the vlans that are being trunked
> to you? I think this will strip tags in that case. The apparent
> behavior of vlan filters here is also surprising to me because on one
> hand if they're truly filtering this test shouldn't be needed and on
> the other hand they don't seem to be disabled in promiscuous mode.
I think you're not quite understanding the action the HW is taking here. In the physical function driver we have put the VF on a VLAN without it knowing that it's on a VLAN. Once that is done by the PF, the VF is not allowed to configure its own VLANs anymore. However, the descriptor still includes a bit for the VLAN tag indicating it was a packet that arrived on a VLAN. The HW is inserting and stripping the VLAN tag though without any awareness of that by the VF driver.
It's a security measure to allow an administrator to put a VF on a VLAN to provide another level of isolation for the VF.
Intel VFs don't support promiscuous mode. If you ran tcpdump you wouldn't see the VLAN tags because they've been stripped by the HW. The VF has no choice in this.
- Greg
^ permalink raw reply
* Re: intel 82599 multi-port performance
From: Alexander Duyck @ 2011-09-26 16:04 UTC (permalink / raw)
To: frog1120; +Cc: J.Hwan.Kim, netdev
In-Reply-To: <4E809D59.10103@gmail.com>
On 09/26/2011 08:42 AM, J.Hwan.Kim wrote:
> On 2011년 09월 26일 23:20, Chris Friesen wrote:
>> On 09/26/2011 04:26 AM, J.Hwan Kim wrote:
>>> Hi, everyone
>>>
>>> Now, I'm testing a network card including intel 82599.
>>> In our experiment, with the driver modified with ixgbe and multi-port
>>> enabled,
>>
>> What do you mean by "modified with ixgbe and multi-port enabled"? You
>> shouldn't need to do anything special to use both ports.
>>
>>> rx performance of each port with 10Gbps of 64bytes frame is
>>> a half than when only 1 port is used.
>>
>> Sounds like a cpu limitation. What is your cpu usage? How are your
>> interrupts routed? Are you using multiple rx queues?
>>
>
> Our server is XEON 2.4GHz with 8 cores.
> I'm using 4 RSS queues for each port and distributed it's interrupts
> to different cores respectively.
> I checked the CPU utilization with TOP, I guess ,it is not cpu
> imitation problem.
What kind of rates are you seeing on a single port versus multiple
ports? There are multiple possibilities in terms of what could be
limiting your performance.
It sounds like you are using a single card, would that be correct? If
you are running close to line rate on both ports this could be causing
you to saturate the PCIe x8 link. If you have a second card available
you may want to try installing that in a secondary Gen2 PCIe slot and
seeing if you can improve the performance by using 2 PCIe slots instead
of one.
Also could you include your kernel config? Certain features such as
Netfilter and IOMMU can have a significant impact on performance.
Thanks,
Alex
^ permalink raw reply
* RE: [net-next 05/10] if_link: Add additional parameter to IFLA_VF_INFO for spoof checking
From: Rose, Gregory V @ 2011-09-26 16:06 UTC (permalink / raw)
To: Ben Hutchings, Kirsher, Jeffrey T
Cc: davem@davemloft.net, netdev@vger.kernel.org, gospo@redhat.com
In-Reply-To: <1316882459.4122.83.camel@deadeye>
> -----Original Message-----
> From: Ben Hutchings [mailto:bhutchings@solarflare.com]
> Sent: Saturday, September 24, 2011 9:41 AM
> To: Kirsher, Jeffrey T
> Cc: davem@davemloft.net; Rose, Gregory V; netdev@vger.kernel.org;
> gospo@redhat.com
> Subject: Re: [net-next 05/10] if_link: Add additional parameter to
> IFLA_VF_INFO for spoof checking
>
> On Sat, 2011-09-24 at 02:17 -0700, Jeff Kirsher wrote:
> > From: Greg Rose <gregory.v.rose@intel.com>
> >
> > Add configuration setting for drivers to turn spoof checking on or off
> > for discrete VFs.
> >
> > Signed-off-by: Greg Rose <gregory.v.rose@intel.com>
> > Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> > ---
> > include/linux/if_link.h | 7 +++++++
> > include/linux/netdevice.h | 3 +++
> > net/core/rtnetlink.c | 25 ++++++++++++++++++++++---
> > 3 files changed, 32 insertions(+), 3 deletions(-)
> >
> > diff --git a/include/linux/if_link.h b/include/linux/if_link.h
> > index 0ee969a..8bd6d6d 100644
> > --- a/include/linux/if_link.h
> > +++ b/include/linux/if_link.h
> > @@ -279,6 +279,7 @@ enum {
> > IFLA_VF_MAC, /* Hardware queue specific attributes */
> > IFLA_VF_VLAN,
> > IFLA_VF_TX_RATE, /* TX Bandwidth Allocation */
> > + IFLA_VF_SPOOFCHK, /* Spoof Checking on/off switch */
> > __IFLA_VF_MAX,
> > };
> >
> > @@ -300,12 +301,18 @@ struct ifla_vf_tx_rate {
> > __u32 rate; /* Max TX bandwidth in Mbps, 0 disables throttling */
> > };
> >
> > +struct ifla_vf_spoofchk {
> > + __u32 vf;
> > + __u32 setting;
> > +};
> > +
> > struct ifla_vf_info {
> > __u32 vf;
> > __u8 mac[32];
> > __u32 vlan;
> > __u32 qos;
> > __u32 tx_rate;
> > + __u32 spoofchk;
> > };
>
> Not something you need to change now, but shouldn't this last struct
> definition be #ifdef __KERNEL__?
It's not done for any of the other ifla_vf_* structs in if_link.h. Which doesn't mean it shouldn't have been done but I was merely following custom. If it needs doing though then I'd be glad to do it.
>
> > /* VF ports management section
> > diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
> > index 43b3298..a2951a0 100644
> > --- a/include/linux/netdevice.h
> > +++ b/include/linux/netdevice.h
> > @@ -781,6 +781,7 @@ struct netdev_tc_txq {
> > * int (*ndo_set_vf_mac)(struct net_device *dev, int vf, u8* mac);
> > * int (*ndo_set_vf_vlan)(struct net_device *dev, int vf, u16 vlan, u8
> qos);
> > * int (*ndo_set_vf_tx_rate)(struct net_device *dev, int vf, int rate);
> > + * int (*ndo_set_vf_spoofchk)(struct net_device *dev, int vf, u8
> setting);
> > * int (*ndo_get_vf_config)(struct net_device *dev,
> > * int vf, struct ifla_vf_info *ivf);
> > * int (*ndo_set_vf_port)(struct net_device *dev, int vf,
> > @@ -900,6 +901,8 @@ struct net_device_ops {
> > int queue, u16 vlan, u8 qos);
> > int (*ndo_set_vf_tx_rate)(struct net_device *dev,
> > int vf, int rate);
> > + int (*ndo_set_vf_spoofchk)(struct net_device *dev,
> > + int vf, u8 setting);
>
> Why u8 and not bool?
I didn't see the bool type used in any of the other parameter lists for the net device ops so I hesitated to use it myself. If it's not a problem doing so then I'll go ahead and change it.
>
> > int (*ndo_get_vf_config)(struct net_device *dev,
> > int vf,
> > struct ifla_vf_info *ivf);
> > diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
> > index 39f8dd6..6535810 100644
> > --- a/net/core/rtnetlink.c
> > +++ b/net/core/rtnetlink.c
> > @@ -731,7 +731,8 @@ static inline int rtnl_vfinfo_size(const struct
> net_device *dev)
> > size += num_vfs *
> > (nla_total_size(sizeof(struct ifla_vf_mac)) +
> > nla_total_size(sizeof(struct ifla_vf_vlan)) +
> > - nla_total_size(sizeof(struct ifla_vf_tx_rate)));
> > + nla_total_size(sizeof(struct ifla_vf_tx_rate)) +
> > + nla_total_size(sizeof(struct ifla_vf_spoofchk)));
> > return size;
> > } else
> > return 0;
> > @@ -954,13 +955,19 @@ static int rtnl_fill_ifinfo(struct sk_buff *skb,
> struct net_device *dev,
> > struct ifla_vf_mac vf_mac;
> > struct ifla_vf_vlan vf_vlan;
> > struct ifla_vf_tx_rate vf_tx_rate;
> > + struct ifla_vf_spoofchk vf_spoofchk;
> > if (dev->netdev_ops->ndo_get_vf_config(dev, i, &ivi))
> > break;
> > - vf_mac.vf = vf_vlan.vf = vf_tx_rate.vf = ivi.vf;
> > + vf_mac.vf =
> > + vf_vlan.vf =
> > + vf_tx_rate.vf =
> > + vf_spoofchk.vf = ivi.vf;
> > +
> [...]
>
> The continuation lines should be indented. Or you could just write the
> assignments as multiple statements.
OK, sure. I'll do that.
Thanks,
- Greg
^ permalink raw reply
* Re: [net-next 05/10] if_link: Add additional parameter to IFLA_VF_INFO for spoof checking
From: Stephen Hemminger @ 2011-09-26 16:14 UTC (permalink / raw)
To: Ben Hutchings; +Cc: Jeff Kirsher, davem, Greg Rose, netdev, gospo
In-Reply-To: <1316981213.4122.106.camel@deadeye>
On Sun, 25 Sep 2011 21:06:49 +0100
Ben Hutchings <bhutchings@solarflare.com> wrote:
> On Sun, 2011-09-25 at 10:22 -0700, Stephen Hemminger wrote:
> > On Sat, 24 Sep 2011 02:17:38 -0700
> > Jeff Kirsher <jeffrey.t.kirsher@intel.com> wrote:
> >
> > > From: Greg Rose <gregory.v.rose@intel.com>
> > >
> > > Add configuration setting for drivers to turn spoof checking on or off
> > > for discrete VFs.
> > >
> > > Signed-off-by: Greg Rose <gregory.v.rose@intel.com>
> > > Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> > > ---
> > > include/linux/if_link.h | 7 +++++++
> > > include/linux/netdevice.h | 3 +++
> > > net/core/rtnetlink.c | 25 ++++++++++++++++++++++---
> > > 3 files changed, 32 insertions(+), 3 deletions(-)
> > >
> > > diff --git a/include/linux/if_link.h b/include/linux/if_link.h
> > > index 0ee969a..8bd6d6d 100644
> > > --- a/include/linux/if_link.h
> > > +++ b/include/linux/if_link.h
> > > @@ -279,6 +279,7 @@ enum {
> > > IFLA_VF_MAC, /* Hardware queue specific attributes */
> > > IFLA_VF_VLAN,
> > > IFLA_VF_TX_RATE, /* TX Bandwidth Allocation */
> > > + IFLA_VF_SPOOFCHK, /* Spoof Checking on/off switch */
> > > __IFLA_VF_MAX,
> > > };
> > >
> > > @@ -300,12 +301,18 @@ struct ifla_vf_tx_rate {
> > > __u32 rate; /* Max TX bandwidth in Mbps, 0 disables throttling */
> > > };
> > >
> > > +struct ifla_vf_spoofchk {
> > > + __u32 vf;
> > > + __u32 setting;
> > > +};
> > > +
> > > struct ifla_vf_info {
> > > __u32 vf;
> > > __u8 mac[32];
> > > __u32 vlan;
> > > __u32 qos;
> > > __u32 tx_rate;
> > > + __u32 spoofchk;
> > > };
> >
> > This breaks ABI compatibility, unless you add some special case code
> > to handle the case of tools sending the old ifla_vf_info. Users may have older version
> > of ip utilities that send smaller size structure.
>
> Unless I'm missing something, that structure is not sent or received by
> userland; that's why I thought it should be #ifdef __KERNEL__.
The struct ifla_vf_info is exposed to userland, it is not inside the #ifdef
and therefore exposed.
But it is probably okay to change this structure because the ifla_vf_info
is not used/supported by any released version iproute2. There may have been
some patches to use this, but they never made it into the git or released
code.
^ permalink raw reply
* RE: [net-next 05/10] if_link: Add additional parameter to IFLA_VF_INFO for spoof checking
From: Rose, Gregory V @ 2011-09-26 16:18 UTC (permalink / raw)
To: Stephen Hemminger, Kirsher, Jeffrey T
Cc: davem@davemloft.net, netdev@vger.kernel.org, gospo@redhat.com
In-Reply-To: <20110925102238.55ba72eb@s6510.linuxnetplumber.net>
> -----Original Message-----
> From: Stephen Hemminger [mailto:shemminger@vyatta.com]
> Sent: Sunday, September 25, 2011 10:23 AM
> To: Kirsher, Jeffrey T
> Cc: davem@davemloft.net; Rose, Gregory V; netdev@vger.kernel.org;
> gospo@redhat.com
> Subject: Re: [net-next 05/10] if_link: Add additional parameter to
> IFLA_VF_INFO for spoof checking
>
> On Sat, 24 Sep 2011 02:17:38 -0700
> Jeff Kirsher <jeffrey.t.kirsher@intel.com> wrote:
>
> > From: Greg Rose <gregory.v.rose@intel.com>
> >
> > Add configuration setting for drivers to turn spoof checking on or off
> > for discrete VFs.
> >
> > Signed-off-by: Greg Rose <gregory.v.rose@intel.com>
> > Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> > ---
> > include/linux/if_link.h | 7 +++++++
> > include/linux/netdevice.h | 3 +++
> > net/core/rtnetlink.c | 25 ++++++++++++++++++++++---
> > 3 files changed, 32 insertions(+), 3 deletions(-)
> >
> > diff --git a/include/linux/if_link.h b/include/linux/if_link.h
> > index 0ee969a..8bd6d6d 100644
> > --- a/include/linux/if_link.h
> > +++ b/include/linux/if_link.h
> > @@ -279,6 +279,7 @@ enum {
> > IFLA_VF_MAC, /* Hardware queue specific attributes */
> > IFLA_VF_VLAN,
> > IFLA_VF_TX_RATE, /* TX Bandwidth Allocation */
> > + IFLA_VF_SPOOFCHK, /* Spoof Checking on/off switch */
> > __IFLA_VF_MAX,
> > };
> >
> > @@ -300,12 +301,18 @@ struct ifla_vf_tx_rate {
> > __u32 rate; /* Max TX bandwidth in Mbps, 0 disables throttling */
> > };
> >
> > +struct ifla_vf_spoofchk {
> > + __u32 vf;
> > + __u32 setting;
> > +};
> > +
> > struct ifla_vf_info {
> > __u32 vf;
> > __u8 mac[32];
> > __u32 vlan;
> > __u32 qos;
> > __u32 tx_rate;
> > + __u32 spoofchk;
> > };
>
> This breaks ABI compatibility, unless you add some special case code
> to handle the case of tools sending the old ifla_vf_info. Users may have
> older version
> of ip utilities that send smaller size structure.
The structure is not sent directly to the kernel from user space. The kernel will get the information and stuff it into individual data units using NLA_PUT. If the older tool doesn't ask for the info then that's fine so far as I can tell.
The only issue I've seen is using the new ip tool on older kernels that don't supply the data. You'll get a segmentation fault and core dump. However, I was under the impression that the general rule was to use a release of the ip tool only on the kernel it was released for or on newer kernels.
- Greg
^ permalink raw reply
* Re: [net-next 05/10] if_link: Add additional parameter to IFLA_VF_INFO for spoof checking
From: Stephen Hemminger @ 2011-09-26 16:21 UTC (permalink / raw)
To: Rose, Gregory V
Cc: Kirsher, Jeffrey T, davem@davemloft.net, netdev@vger.kernel.org,
gospo@redhat.com
In-Reply-To: <43F901BD926A4E43B106BF17856F0755019C519376@orsmsx508.amr.corp.intel.com>
On Mon, 26 Sep 2011 09:18:34 -0700
"Rose, Gregory V" <gregory.v.rose@intel.com> wrote:
> > -----Original Message-----
> > From: Stephen Hemminger [mailto:shemminger@vyatta.com]
> > Sent: Sunday, September 25, 2011 10:23 AM
> > To: Kirsher, Jeffrey T
> > Cc: davem@davemloft.net; Rose, Gregory V; netdev@vger.kernel.org;
> > gospo@redhat.com
> > Subject: Re: [net-next 05/10] if_link: Add additional parameter to
> > IFLA_VF_INFO for spoof checking
> >
> > On Sat, 24 Sep 2011 02:17:38 -0700
> > Jeff Kirsher <jeffrey.t.kirsher@intel.com> wrote:
> >
> > > From: Greg Rose <gregory.v.rose@intel.com>
> > >
> > > Add configuration setting for drivers to turn spoof checking on or off
> > > for discrete VFs.
> > >
> > > Signed-off-by: Greg Rose <gregory.v.rose@intel.com>
> > > Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> > > ---
> > > include/linux/if_link.h | 7 +++++++
> > > include/linux/netdevice.h | 3 +++
> > > net/core/rtnetlink.c | 25 ++++++++++++++++++++++---
> > > 3 files changed, 32 insertions(+), 3 deletions(-)
> > >
> > > diff --git a/include/linux/if_link.h b/include/linux/if_link.h
> > > index 0ee969a..8bd6d6d 100644
> > > --- a/include/linux/if_link.h
> > > +++ b/include/linux/if_link.h
> > > @@ -279,6 +279,7 @@ enum {
> > > IFLA_VF_MAC, /* Hardware queue specific attributes */
> > > IFLA_VF_VLAN,
> > > IFLA_VF_TX_RATE, /* TX Bandwidth Allocation */
> > > + IFLA_VF_SPOOFCHK, /* Spoof Checking on/off switch */
> > > __IFLA_VF_MAX,
> > > };
> > >
> > > @@ -300,12 +301,18 @@ struct ifla_vf_tx_rate {
> > > __u32 rate; /* Max TX bandwidth in Mbps, 0 disables throttling */
> > > };
> > >
> > > +struct ifla_vf_spoofchk {
> > > + __u32 vf;
> > > + __u32 setting;
> > > +};
> > > +
> > > struct ifla_vf_info {
> > > __u32 vf;
> > > __u8 mac[32];
> > > __u32 vlan;
> > > __u32 qos;
> > > __u32 tx_rate;
> > > + __u32 spoofchk;
> > > };
> >
> > This breaks ABI compatibility, unless you add some special case code
> > to handle the case of tools sending the old ifla_vf_info. Users may have
> > older version
> > of ip utilities that send smaller size structure.
>
> The structure is not sent directly to the kernel from user space. The kernel will get the information and stuff it into individual data units using NLA_PUT. If the older tool doesn't ask for the info then that's fine so far as I can tell.
>
> The only issue I've seen is using the new ip tool on older kernels that don't supply the data. You'll get a segmentation fault and core dump. However, I was under the impression that the general rule was to use a release of the ip tool only on the kernel it was released for or on newer kernels.
>
> - Greg
The tools need to run on older kernels. Think of Debian and other distributions which want to
ship newer ip tools but run on old kernel. In this case, what is expected is:
# ip li some new option
RTNETLINK: Invalid ...
^ 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