Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Roman Gushchin <guro@fb.com>
To:     "linux-mm@kvack.org" <linux-mm@kvack.org>
CC:     Mike Galbraith <efault@gmx.de>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        Kernel Team <Kernel-team@fb.com>,
        "Roman Gushchin" <guro@fb.com>, Michal Hocko <mhocko@kernel.org>,
        Johannes Weiner <hannes@cmpxchg.org>,
        Vladimir Davydov <vdavydov.dev@gmail.com>,
        "Andrew Morton" <akpm@linux-foundation.org>
Subject: [PATCH] mm: handle no memcg case in memcg_kmem_charge() properly
Thread-Topic: [PATCH] mm: handle no memcg case in memcg_kmem_charge() properly
Thread-Index: AQHUb9GbG27ZhPtkmkCI4HpK7bnl7w==
Date:   Mon, 29 Oct 2018 21:51:55 +0000
Message-ID: <20181029215123.17830-1-guro@fb.com>
Accept-Language: en-US
Content-Language: en-US
x-ms-exchange-messagesentrepresentingtype: 1
x-originating-ip: [2620:10d:c090:200::7:ad5c]
x-ms-publictraffictype: Email
x-microsoft-exchange-diagnostics: 1;BY2PR15MB0503;20:bmlRoVRMsAVb/Hz3Y58b3Lb76y828+jUFrnvIXeXM+ADH2UAVL89FsOG5g21kQaeRMbdp4hP7XO45SL4vWAESHLv/c2g8oJ2JEYkOi6M5Txe6/Zl26lGD9Lqt4Cq3BqBzmezMaF5TnTDGXhujiBSfPtuiKrcfJX1YNsifG6PIII=
x-ms-office365-filtering-correlation-id: 5d8dd020-436d-4119-e924-08d63de8be33
x-microsoft-antispam: BCL:0;PCL:0;RULEID:(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(2017052603328)(7153060)(7193020);SRVR:BY2PR15MB0503;
x-ms-traffictypediagnostic: BY2PR15MB0503:
x-microsoft-antispam-prvs: <BY2PR15MB0503F99CF638DED94769AE63BEF30@BY2PR15MB0503.namprd15.prod.outlook.com>
x-exchange-antispam-report-test: UriScan:(26323138287068)(67672495146484)(85827821059158);
x-ms-exchange-senderadcheck: 1
x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(823302103)(10201501046)(3002001)(93006095)(93001095)(3231382)(11241501184)(944501410)(52105095)(148016)(149066)(150057)(6041310)(20161123564045)(20161123562045)(20161123558120)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699051)(76991095);SRVR:BY2PR15MB0503;BCL:0;PCL:0;RULEID:;SRVR:BY2PR15MB0503;
x-forefront-prvs: 084080FC15
x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(366004)(39860400002)(136003)(346002)(376002)(396003)(189003)(199004)(8676002)(14444005)(97736004)(1076002)(5640700003)(6486002)(6436002)(386003)(6506007)(8936002)(53936002)(81156014)(6916009)(102836004)(2501003)(5250100002)(6512007)(39060400002)(4326008)(256004)(2906002)(54906003)(71200400001)(71190400001)(478600001)(81166006)(6116002)(316002)(25786009)(52116002)(14454004)(7736002)(5660300001)(186003)(36756003)(2616005)(46003)(486006)(2900100001)(1857600001)(305945005)(86362001)(476003)(575784001)(106356001)(2351001)(105586002)(68736007)(99286004)(42262002);DIR:OUT;SFP:1102;SCL:1;SRVR:BY2PR15MB0503;H:BY2PR15MB0167.namprd15.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A:1;
received-spf: None (protection.outlook.com: fb.com does not designate
 permitted sender hosts)
x-microsoft-antispam-message-info: 3NiTYMkL3b/2fdZbZOnqPqeq+OlWebL9HfS114qgrypoxDh1R5rEb14qGVnNxeQGD8w6GKLrTu8qhZvKyCAyLS6//uQkJX1CP7wz2YVg22SU6ft9QQ0xwLg1v6aNwCctwKAVkk6s8ZGlQ/Y7HNV72OB9oMBSpCZxM0Xwvh9gXIDLMpRXJf0/LOc43dpmB9qa9/6C8ejGiw8OiGSZTyOTIac7mAl0IoarLYOAxE2aLl3hVy3pk7Ft9e70If5IELWXdxzcVpLWKxAa2DeSI6ySk2/ScinRa9/6rx8G6ZkmuF9JnRgYLPiEBMYRnfruWbWrJIjNxa0zKx1PdMvHdzaKl7BRaTbLbSIUbmvm1UQTvC8=
spamdiagnosticoutput: 1:99
spamdiagnosticmetadata: NSPM
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: 5d8dd020-436d-4119-e924-08d63de8be33
X-MS-Exchange-CrossTenant-originalarrivaltime: 29 Oct 2018 21:51:55.7688
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 8ae927fe-1255-47a7-a2af-5f3a069daaa2
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2PR15MB0503
X-OriginatorOrg: fb.com
X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2018-10-29_13:,,
 signatures=0
X-Proofpoint-Spam-Reason: safe
X-FB-Internal: Safe
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Mike Galbraith reported a regression caused by the commit 9b6f7e163cd0
("mm: rework memcg kernel stack accounting") on a system with
"cgroup_disable=3Dmemory" boot option: the system panics with the
following stack trace:

  [0.928542] BUG: unable to handle kernel NULL pointer dereference at 00000=
000000000f8
  [0.929317] PGD 0 P4D 0
  [0.929573] Oops: 0002 [#1] PREEMPT SMP PTI
  [0.929984] CPU: 0 PID: 1 Comm: systemd Not tainted 4.19.0-preempt+ #410
  [0.930637] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS ?-=
20180531_142017-buildhw-08.phx2.fed4
  [0.931862] RIP: 0010:page_counter_try_charge+0x22/0xc0
  [0.932376] Code: 41 5d c3 c3 0f 1f 40 00 0f 1f 44 00 00 48 85 ff 0f 84 a7=
 00 00 00 41 56 48 89 f8 49 89 fe 49
  [0.934283] RSP: 0018:ffffacf68031fcb8 EFLAGS: 00010202
  [0.934826] RAX: 00000000000000f8 RBX: 0000000000000000 RCX: 0000000000000=
000
  [0.935558] RDX: ffffacf68031fd08 RSI: 0000000000000020 RDI: 0000000000000=
0f8
  [0.936288] RBP: 0000000000000001 R08: 8000000000000063 R09: ffff99ff7cd37=
a40
  [0.937021] R10: ffffacf68031fed0 R11: 0000000000200000 R12: 0000000000000=
020
  [0.937749] R13: ffffacf68031fd08 R14: 00000000000000f8 R15: ffff99ff7da1e=
c60
  [0.938486] FS:  00007fc2140bb280(0000) GS:ffff99ff7da00000(0000) knlGS:00=
00000000000000
  [0.939311] CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
  [0.939905] CR2: 00000000000000f8 CR3: 0000000012dc8002 CR4: 0000000000760=
ef0
  [0.940638] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000=
000
  [0.941366] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000=
400
  [0.942110] PKRU: 55555554
  [0.942412] Call Trace:
  [0.942673]  try_charge+0xcb/0x780
  [0.943031]  memcg_kmem_charge_memcg+0x28/0x80
  [0.943486]  ? __vmalloc_node_range+0x1e4/0x280
  [0.943971]  memcg_kmem_charge+0x8b/0x1d0
  [0.944396]  copy_process.part.41+0x1ca/0x2070
  [0.944853]  ? get_acl+0x1a/0x120
  [0.945200]  ? shmem_tmpfile+0x90/0x90
  [0.945596]  _do_fork+0xd7/0x3d0
  [0.945934]  ? trace_hardirqs_off_thunk+0x1a/0x1c
  [0.946421]  do_syscall_64+0x5a/0x180
  [0.946798]  entry_SYSCALL_64_after_hwframe+0x49/0xbe

The problem occurs because get_mem_cgroup_from_current() returns
the NULL pointer if memory controller is disabled. Let's check
if this is a case at the beginning of memcg_kmem_charge() and
just return 0 if mem_cgroup_disabled() returns true. This is how
we handle this case in many other places in the memory controller
code.

Fixes: 9b6f7e163cd0 ("mm: rework memcg kernel stack accounting")
Reported-by: Mike Galbraith <efault@gmx.de>
Signed-off-by: Roman Gushchin <guro@fb.com>
Cc: Michal Hocko <mhocko@kernel.org>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Vladimir Davydov <vdavydov.dev@gmail.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
---
 mm/memcontrol.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 54920cbc46bf..6e1469b80cb7 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -2593,7 +2593,7 @@ int memcg_kmem_charge(struct page *page, gfp_t gfp, i=
nt order)
 	struct mem_cgroup *memcg;
 	int ret =3D 0;
=20
-	if (memcg_kmem_bypass())
+	if (mem_cgroup_disabled() || memcg_kmem_bypass())
 		return 0;
=20
 	memcg =3D get_mem_cgroup_from_current();
--=20
2.17.2