Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 112bc2e120a94a511858918d6866a4978f9c500e

Authored by Kirill A. Shutemov
Committed by Linus Torvalds
1 parent 69e83dad52
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

memcg: fix false positive VM_BUG on non-SMP 

Fix this:

  kernel BUG at mm/memcontrol.c:2155!
  invalid opcode: 0000 [#1]
  last sysfs file:

  Pid: 18, comm: sh Not tainted 2.6.37-rc3 #3 /Bochs
  EIP: 0060:[<c10731b2>] EFLAGS: 00000246 CPU: 0
  EIP is at mem_cgroup_move_account+0xe2/0xf0
  EAX: 00000004 EBX: c6f931d4 ECX: c681c300 EDX: c681c000
  ESI: c681c300 EDI: ffffffea EBP: c681c000 ESP: c46f3e30
   DS: 007b ES: 007b FS: 0000 GS: 0033 SS: 0068
  Process sh (pid: 18, ti=c46f2000 task=c6826e60 task.ti=c46f2000)
  Stack:
   00000155 c681c000 0805f000 c46ee180 c46f3e5c c7058820 c1074d37 00000000
   08060000 c46db9a0 c46ec080 c7058820 0805f000 08060000 c46f3e98 c1074c50
   c106c75e c46f3e98 c46ec080 08060000 0805ffff c46db9a0 c46f3e98 c46e0340
  Call Trace:
   [<c1074d37>] ? mem_cgroup_move_charge_pte_range+0xe7/0x130
   [<c1074c50>] ? mem_cgroup_move_charge_pte_range+0x0/0x130
   [<c106c75e>] ? walk_page_range+0xee/0x1d0
   [<c10725d6>] ? mem_cgroup_move_task+0x66/0x90
   [<c1074c50>] ? mem_cgroup_move_charge_pte_range+0x0/0x130
   [<c1072570>] ? mem_cgroup_move_task+0x0/0x90
   [<c1042616>] ? cgroup_attach_task+0x136/0x200
   [<c1042878>] ? cgroup_tasks_write+0x48/0xc0
   [<c1041e9e>] ? cgroup_file_write+0xde/0x220
   [<c101398d>] ? do_page_fault+0x17d/0x3f0
   [<c108a79d>] ? alloc_fd+0x2d/0xd0
   [<c1041dc0>] ? cgroup_file_write+0x0/0x220
   [<c1077ba2>] ? vfs_write+0x92/0xc0
   [<c1077c81>] ? sys_write+0x41/0x70
   [<c1140e3d>] ? syscall_call+0x7/0xb
  Code: 03 00 74 09 8b 44 24 04 e8 1c f1 ff ff 89 73 04 8d 86 b0 00 00 00 b9 01 00 00 00 89 da 31 ff e8 65 f5 ff ff e9 4d ff ff ff 0f 0b <0f> 0b 0f 0b 0f 0b 90 8d b4 26 00 00 00 00 83 ec 10 8b 0d f4 e3
  EIP: [<c10731b2>] mem_cgroup_move_account+0xe2/0xf0 SS:ESP 0068:c46f3e30
  ---[ end trace 7daa1582159b6532 ]---

lock_page_cgroup and unlock_page_cgroup are implemented using
bit_spinlock.  bit_spinlock doesn't touch the bit if we are on non-SMP
machine, so we can't use the bit to check whether the lock was taken.

Let's introduce is_page_cgroup_locked based on bit_spin_is_locked instead
of PageCgroupLocked to fix it.

[akpm@linux-foundation.org: s/is_page_cgroup_locked/page_is_cgroup_locked/]
Signed-off-by: Kirill A. Shutemov <kirill@shutemov.name>
Reviewed-by: Johannes Weiner <hannes@cmpxchg.org>
Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujtisu.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 2 changed files with 6 additions and 3 deletions Side-by-side Diff

include/linux/page_cgroup.h
Diff comments   View file @ 112bc2e
... ... @@ -59,8 +59,6 @@
59 59 static inline int TestClearPageCgroup##uname(struct page_cgroup *pc) \
60 60 { return test_and_clear_bit(PCG_##lname, &pc->flags); }
61 61  
62   -TESTPCGFLAG(Locked, LOCK)
63   -
64 62 /* Cache flag is set only once (at allocation) */
65 63 TESTPCGFLAG(Cache, CACHE)
66 64 CLEARPCGFLAG(Cache, CACHE)
... ... @@ -102,6 +100,11 @@
102 100 static inline void unlock_page_cgroup(struct page_cgroup *pc)
103 101 {
104 102 bit_spin_unlock(PCG_LOCK, &pc->flags);
  103 +}
  104 +
  105 +static inline int page_is_cgroup_locked(struct page_cgroup *pc)
  106 +{
  107 + return bit_spin_is_locked(PCG_LOCK, &pc->flags);
105 108 }
106 109  
107 110 #else /* CONFIG_CGROUP_MEM_RES_CTLR */
... ... @@ -2152,7 +2152,7 @@
2152 2152 {
2153 2153 VM_BUG_ON(from == to);
2154 2154 VM_BUG_ON(PageLRU(pc->page));
2155   - VM_BUG_ON(!PageCgroupLocked(pc));
  2155 + VM_BUG_ON(!page_is_cgroup_locked(pc));
2156 2156 VM_BUG_ON(!PageCgroupUsed(pc));
2157 2157 VM_BUG_ON(pc->mem_cgroup != from);
2158 2158