On Mon, 14 Mar 2011, Andrea Arcangeli wrote: > > Correct! I'd suggest to fix it without duplicating the > mem_cgroup_newpage_charge. It's just one more put_page than needed > with memcg enabled and NUMA disabled (I guess most memcg testing > happened with NUMA enabled). The larger diff likely rejects with -mm > NUMA code... I'll try to diff it with a smaller -U2 (this code has > little change to be misplaced) that may allow it to apply clean > regardless of the merging order, so it may make life easier. I did try it that way at first (didn't help when I mistakenly put #ifndef instead of #ifdef around the put_page!), but was repulsed by seeing yet another #ifdef CONFIG_NUMA, so went with the duplicating version - which Linus has now taken. > > It may have been overkill to keep the NUMA case separated in order to > avoid spurious allocations for the not-NUMA case, code become more > complex and I'm not sure if it's really worthwhile. The optimization > makes sense but it's minor and it created more complexity than > strictly needed. For now we can't change it in the short term as it > has been tested this way, but if people dislike the additional > complexity that this optimization created, I'm not against dropping it > in the future. Your comment was positive about the optimization (you > said understandable) so I wanted to share my current thinking on these > ifdefs... I was certainly tempted to remove all the non-NUMA cases, but as you say, now is not the right time for that since we needed a quick bugfix. I do appreciate why you did it that way, it is nicer to be allocating on the outside, though unsuitable in the NUMA case. But given how this bug has passed unnoticed for so long, it seems like nobody has been testing non-NUMA, so yes, best to simplify and make non-NUMA do the same as NUMA in 2.6.39. Since Linus has taken my version that you didn't like, perhaps you can get even by sending him your "mm: PageBuddy cleanups" patch, the version I didn't like (for its silly branches) so was reluctant to push myself. I'd really like to see that fix in, since it's a little hard to argue for in -stable, being all about a system which is already unstable. But I think it needs a stronger title than "PageBuddy cleanups" - "fix BUG in bad_page()"? Hugh -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@xxxxxxxxxx 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@xxxxxxxxx";> email@xxxxxxxxx </a>