linux-kernel - Re: [PATCH] memcg: Fix thresholds for 32b architectures.

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20151027182508.GA23297@dhcp22.suse.cz>
Date:	Tue, 27 Oct 2015 19:25:08 +0100
From:	Michal Hocko <mhocko@...nel.org>
To:	Johannes Weiner <hannes@...xchg.org>,
	Andrew Morton <akpm@...ux-foundation.org>
Cc:	Shaohua Li <shli@...com>, Ben Hutchings <ben@...adent.org.uk>,
	Vladimir Davydov <vdavydov@...allels.com>, linux-mm@...ck.org,
	LKML <linux-kernel@...r.kernel.org>, stable@...r.kernel.org
Subject: Re: [PATCH] memcg: Fix thresholds for 32b architectures.

On Tue 27-10-15 09:23:31, Johannes Weiner wrote:
[...]
> > Fixes: 424cdc141380 ("memcg: convert threshold to bytes")
> > Fixes: 3e32cb2e0a12 ("mm: memcontrol: lockless page counters")
> > CC: stable@...r.kernel.org
> > Reported-by: Ben Hutchings <ben@...adent.org.uk>
> > Signed-off-by: Michal Hocko <mhocko@...e.com>
> 
> Acked-by: Johannes Weiner <hannes@...xchg.org>

Thanks!

> 
> > +++ b/mm/memcontrol.c
> > @@ -2802,7 +2802,7 @@ static unsigned long tree_stat(struct mem_cgroup *memcg,
> >  	return val;
> >  }
> >  
> > -static inline u64 mem_cgroup_usage(struct mem_cgroup *memcg, bool swap)
> > +static inline unsigned long mem_cgroup_usage(struct mem_cgroup *memcg, bool swap)
> >  {
> >  	u64 val;
> 
> Minor nit, but this should probably be unsigned long now.

Yeah, I've missed this. Andrew, do you want me to post a new version or
you can fold a trivial update here?
---
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 2823cafc269e..f4c09c4e895f 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -2804,7 +2804,7 @@ static unsigned long tree_stat(struct mem_cgroup *memcg,
 
 static inline unsigned long mem_cgroup_usage(struct mem_cgroup *memcg, bool swap)
 {
-	u64 val;
+	unsigned long val;
 
 	if (mem_cgroup_is_root(memcg)) {
 		val = tree_stat(memcg, MEM_CGROUP_STAT_CACHE);

-- 
Michal Hocko
SUSE Labs
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/