From patchwork Tue Oct 14 11:46:04 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wang Nan X-Patchwork-Id: 38712 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f70.google.com (mail-wg0-f70.google.com [74.125.82.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 2178220549 for ; Tue, 14 Oct 2014 11:47:41 +0000 (UTC) Received: by mail-wg0-f70.google.com with SMTP id a1sf5175748wgh.5 for ; Tue, 14 Oct 2014 04:47:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:cc:subject:date:message-id :mime-version:sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe:content-type; bh=3yyonMrMOq10SKUcobxPAPee4z/WpIPQk9SLZQjkVK4=; b=GIgm7NB+c2gb5lqzj3aZ82Bm4sd2wSyZitfm8TMsua0TVEzUM5k0TKcNG3t9UB+V/0 oM3XIYcYcltBcgFHCjDKCpUXuDAFSakMLKG15RR5jD4/v5CNQ9y9OeaW3Z4oH771o+GR 4T4g8leVgQi+DqD1QDHKB8rTKFm3p/y+XF9K/c/FGh7kH3+HURKZjpmHbtkzFSiDfQ1I dJIOUd+jQGC0MkWAZbJ4sxRJ7icEqc9qbsjeRfjipZNrqSQiMmPqjEda/fO06O1e4ybC BlJy4jjSQhfXVDHfdWSej9MvCMJkfMYUjT5WDMPnJPDV93IHstyxHTLzY+2zpVE4X14v 1viA== X-Gm-Message-State: ALoCoQlQsmXb33WsB8WDV2sVyCgrJ8gSSasNli706s0hQrvT47I/UIvBTc/jQJ8TlXTwgBbSct7y X-Received: by 10.112.63.103 with SMTP id f7mr430228lbs.9.1413287260294; Tue, 14 Oct 2014 04:47:40 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.205.108 with SMTP id lf12ls98535lac.48.gmail; Tue, 14 Oct 2014 04:47:40 -0700 (PDT) X-Received: by 10.153.8.164 with SMTP id dl4mr4754682lad.29.1413287260023; Tue, 14 Oct 2014 04:47:40 -0700 (PDT) Received: from mail-la0-f54.google.com (mail-la0-f54.google.com [209.85.215.54]) by mx.google.com with ESMTPS id ri5si22957305lbb.115.2014.10.14.04.47.39 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 14 Oct 2014 04:47:39 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.54 as permitted sender) client-ip=209.85.215.54; Received: by mail-la0-f54.google.com with SMTP id gm9so8120213lab.41 for ; Tue, 14 Oct 2014 04:47:39 -0700 (PDT) X-Received: by 10.152.29.8 with SMTP id f8mr4847531lah.56.1413287259045; Tue, 14 Oct 2014 04:47:39 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.84.229 with SMTP id c5csp377993lbz; Tue, 14 Oct 2014 04:47:36 -0700 (PDT) X-Received: by 10.68.230.72 with SMTP id sw8mr1610498pbc.155.1413287255550; Tue, 14 Oct 2014 04:47:35 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id mk4si12813063pab.152.2014.10.14.04.47.34 for ; Tue, 14 Oct 2014 04:47:35 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932174AbaJNLrc (ORCPT + 27 others); Tue, 14 Oct 2014 07:47:32 -0400 Received: from szxga01-in.huawei.com ([119.145.14.64]:25651 "EHLO szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755115AbaJNLr3 (ORCPT ); Tue, 14 Oct 2014 07:47:29 -0400 Received: from 172.24.2.119 (EHLO lggeml425-hub.china.huawei.com) ([172.24.2.119]) by szxrg01-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id CCV86316; Tue, 14 Oct 2014 19:47:24 +0800 (CST) Received: from kernel-host.huawei (10.107.197.247) by lggeml425-hub.china.huawei.com (10.72.61.35) with Microsoft SMTP Server id 14.3.158.1; Tue, 14 Oct 2014 19:47:11 +0800 From: Wang Nan To: Johannes Weiner , Michal Hocko , Steven Rostedt CC: , , , Subject: [PATCH resend] cgroup/kmemleak: add kmemleak_free() for cgroup deallocations. Date: Tue, 14 Oct 2014 19:46:04 +0800 Message-ID: <1413287164-77051-1-git-send-email-wangnan0@huawei.com> X-Mailer: git-send-email 1.8.4 MIME-Version: 1.0 X-Originating-IP: [10.107.197.247] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: wangnan0@huawei.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.54 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Commit ff7ee93f4 introduces kmemleak_alloc() for alloc_page_cgroup(), but corresponding kmemleak_free() is missing, which makes kmemleak be wrongly disabled after memory offlining. Log is pasted at the end of this commit message. This patch add kmemleak_free() into free_page_cgroup(). During page offlining, this patch removes corresponding entries in kmemleak rbtree. After that, the freed memory can be allocated again by other subsystems without killing kmemleak. bash # for x in 1 2 3 4; do echo offline > /sys/devices/system/memory/memory$x/state ; sleep 1; done ; dmesg | grep leak [ 45.537934] Offlined Pages 32768 [ 46.617892] kmemleak: Cannot insert 0xffff880016969000 into the object search tree (overlaps existing) [ 46.617892] CPU: 0 PID: 412 Comm: sleep Not tainted 3.17.0-rc5+ #86 [ 46.617892] Hardware name: Bochs Bochs, BIOS Bochs 01/01/2011 [ 46.617892] ffff880016823d10 ffff880018bdfc38 ffffffff81725d2c ffff88001780e950 [ 46.617892] ffff880016969000 ffff880018bdfc88 ffffffff8117a9e6 ffff880018bdfc78 [ 46.617892] 0000000000000096 ffff880017812800 ffffffff81c2eda0 ffff880016969000 [ 46.617892] Call Trace: [ 46.617892] [] dump_stack+0x46/0x58 [ 46.617892] [] create_object+0x266/0x2c0 [ 46.617892] [] kmemleak_alloc+0x26/0x50 [ 46.617892] [] kmem_cache_alloc+0xd3/0x160 [ 46.617892] [] __sigqueue_alloc+0x49/0xd0 [ 46.617892] [] __send_signal+0xcb/0x410 [ 46.617892] [] send_signal+0x45/0x90 [ 46.617892] [] __group_send_sig_info+0x13/0x20 [ 46.617892] [] do_notify_parent+0x1bb/0x260 [ 46.617892] [] ? sched_move_task+0xaa/0x130 [ 46.617892] [] do_exit+0x767/0xa40 [ 46.617892] [] do_group_exit+0x44/0xa0 [ 46.617892] [] SyS_exit_group+0x17/0x20 [ 46.617892] [] system_call_fastpath+0x16/0x1b [ 46.617892] kmemleak: Kernel memory leak detector disabled [ 46.617892] kmemleak: Object 0xffff880016900000 (size 524288): [ 46.617892] kmemleak: comm "swapper/0", pid 0, jiffies 4294667296 [ 46.617892] kmemleak: min_count = 0 [ 46.617892] kmemleak: count = 0 [ 46.617892] kmemleak: flags = 0x1 [ 46.617892] kmemleak: checksum = 0 [ 46.617892] kmemleak: backtrace: [ 46.617892] [] log_early+0x63/0x77 [ 46.617892] [] kmemleak_alloc+0x4b/0x50 [ 46.617892] [] init_section_page_cgroup+0x7f/0xf5 [ 46.617892] [] page_cgroup_init+0xc5/0xd0 [ 46.617892] [] start_kernel+0x333/0x408 [ 46.617892] [] x86_64_start_reservations+0x2a/0x2c [ 46.617892] [] x86_64_start_kernel+0xf5/0xfc [ 46.617892] [] 0xffffffffffffffff Fixes: ff7ee93f4 (cgroup/kmemleak: Annotate alloc_page() for cgroup allocations) Cc: # v3.2+ Cc: Steven Rostedt Signed-off-by: Wang Nan Acked-by: Johannes Weiner Acked-by: Michal Hocko --- Resend with stable tag. Please refer to https://lkml.org/lkml/2014/9/17/746 --- mm/page_cgroup.c | 1 + 1 file changed, 1 insertion(+) diff --git a/mm/page_cgroup.c b/mm/page_cgroup.c index 3708264..5331c2b 100644 --- a/mm/page_cgroup.c +++ b/mm/page_cgroup.c @@ -171,6 +171,7 @@ static void free_page_cgroup(void *addr) sizeof(struct page_cgroup) * PAGES_PER_SECTION; BUG_ON(PageReserved(page)); + kmemleak_free(addr); free_pages_exact(addr, table_size); } }