From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id C5DB3C43334 for ; Wed, 13 Jul 2022 19:04:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0542F94015B; Wed, 13 Jul 2022 15:04:56 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id F2077940134; Wed, 13 Jul 2022 15:04:55 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DBFB894015B; Wed, 13 Jul 2022 15:04:55 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id C58DD940134 for ; Wed, 13 Jul 2022 15:04:55 -0400 (EDT) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 81D9033D10 for ; Wed, 13 Jul 2022 19:04:55 +0000 (UTC) X-FDA: 79683003750.24.7449C8F Received: from mail-pj1-f51.google.com (mail-pj1-f51.google.com [209.85.216.51]) by imf08.hostedemail.com (Postfix) with ESMTP id 28BA216006D for ; Wed, 13 Jul 2022 19:04:55 +0000 (UTC) Received: by mail-pj1-f51.google.com with SMTP id z12-20020a17090a7b8c00b001ef84000b8bso5283825pjc.1 for ; Wed, 13 Jul 2022 12:04:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=Q1orxwhYNH5PiwyrYB0jyJkSIuY50nnqFfbHuh/ZL7I=; b=avb4PGJ1zBsFoRe1sUbNQUk/5H40v79kEO41b/cB8Y3KDaw0uoWwdHSxo8foiAqSyF c3nd6rgs1AtHaBeTbLVrqgMhuedITlxZ/3CDrPHRXwvwh+NSsPilGM3Y+i5cOA3izKlb L0pwabVVZfAIZzHmYYB/C54/gjBO6Fc5ky2l/NtJIyleXHl/8uVuSAQkQlTfFYaQ5HHq YON5CcFCNXpU9YEPjpg2K68LF3fnK9RQ0+kuSWFFb3V5gQCbQremwHcMisF6PWYI70+I Z99mJt5L5eyVzLKWRcD0DyITR6ESuePoIXny2YcZF67zmzGUisVvKou+VrewOW5NjQuI 2OGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=Q1orxwhYNH5PiwyrYB0jyJkSIuY50nnqFfbHuh/ZL7I=; b=NRtHwxhKVUujn0cCES+zt+5VQ7EQY7UxHn0PAvB5cNYLyPKEq/pQpx1q1eI8M/MUB2 HfzWloiiCU8IdzbY8kR5LfLKjIGgqdBOOS/DYwvSRhY6b3ZiHE35PSQWsNUqWTD+GgTa vYcDcq6Sitl1HIVMFi2tirnQXGgnsJacGsFKf08QfmYhfkqyX1WlbCh/pNJrr2sBbN8D MCr75a3APWgHyBSqV5IRmBSoP2hVIwQsLhkI7x0yDWHPQd9QP/DGHbTiTTMIeKjTx3f8 lNcFFSm46n9Dg7/N8n8h3NFqPayVhuHQW2S3JXn3NImp2q2Ta6BuqNhrD13O1O2emAIp 4HMQ== X-Gm-Message-State: AJIora//i8Utgwx5U7rX/XSYE9KovaDV3INLVnp2HTZNxOo68rr2bbFk dgnK8lliOyNRx/xQSj/pM8gQXRxmcO6JnIXOkj8= X-Google-Smtp-Source: AGRyM1t1jNZ022cdlgbDx+/v4pQmnO3rHve+6Eq+6Dvus6xTKagAqGsmxS1nUlYMnWRogKMt/6UHg+YFTA6fzL+U3hU= X-Received: by 2002:a17:903:2405:b0:16a:8010:1e16 with SMTP id e5-20020a170903240500b0016a80101e16mr4544761plo.87.1657739094012; Wed, 13 Jul 2022 12:04:54 -0700 (PDT) MIME-Version: 1.0 References: <202207100715.TBIYQ4fc-lkp@intel.com> In-Reply-To: From: Yang Shi Date: Wed, 13 Jul 2022 12:04:41 -0700 Message-ID: Subject: Re: [akpm-mm:mm-unstable 284/293] mm/khugepaged.c:2409 madvise_collapse() warn: possible memory leak of 'cc' To: "Zach O'Keefe" Cc: Dan Carpenter , kbuild@lists.01.org, kernel test robot , kbuild-all@lists.01.org, Linux Kernel Mailing List , Andrew Morton , Linux Memory Management List Content-Type: text/plain; charset="UTF-8" ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1657739095; a=rsa-sha256; cv=none; b=lWcBPi+ViswWMwidktZ0u5T4Opb/DjtNvmRU1SVQih3Ngv2ZTkEy20nfpx1KIR5y7ejZfG 3bsjlhyNwkhhXOc87ZMGty0pQba3lyRhMVE2p1cb3wyLLW5eBSPGDjidiMDoRlAk+7k8cN ytLWWUkHC4mE7guAwAHczKnRxnQhh+8= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=avb4PGJ1; spf=pass (imf08.hostedemail.com: domain of shy828301@gmail.com designates 209.85.216.51 as permitted sender) smtp.mailfrom=shy828301@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1657739095; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=Q1orxwhYNH5PiwyrYB0jyJkSIuY50nnqFfbHuh/ZL7I=; b=YFFQdHL2XZU8Yo2Rpjgm2wQNm/N7iwJltVZtKThJzGovEZG/4+10GSqGTgTj4A7Rro6JO+ 589H7Cvk18PDN+7NF7+esLoK2hhPiADyrd2IDTIDAopepVFNdweRrQ/sdeg0TMvEX48nlO OV7/hsPoQ/xV+DNpb5crEuOt46b/8go= X-Rspamd-Queue-Id: 28BA216006D Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=avb4PGJ1; spf=pass (imf08.hostedemail.com: domain of shy828301@gmail.com designates 209.85.216.51 as permitted sender) smtp.mailfrom=shy828301@gmail.com; dmarc=pass (policy=none) header.from=gmail.com X-Rspamd-Server: rspam02 X-Rspam-User: X-Stat-Signature: mu9yrsqsg195wf7s6rotn7ne9igjumxi X-HE-Tag: 1657739095-894497 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On Wed, Jul 13, 2022 at 7:24 AM Zach O'Keefe wrote: > > On Jul 12 10:02, Yang Shi wrote: > > On Tue, Jul 12, 2022 at 5:36 AM Dan Carpenter wrote: > > > > > > tree: https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm.git mm-unstable > > > head: 0e9f775fb0b4adf1a4ef50ea156ead09a0fc5194 > > > commit: 9f626ffb1d1c5c26b4a8e0fdffec784a5f773274 [284/293] mm/madvise: introduce MADV_COLLAPSE sync hugepage collapse > > > config: i386-randconfig-m021 (https://download.01.org/0day-ci/archive/20220710/202207100715.TBIYQ4fc-lkp@intel.com/config) > > > compiler: gcc-11 (Debian 11.3.0-3) 11.3.0 > > > > > > If you fix the issue, kindly add following tag where applicable > > > Reported-by: kernel test robot > > > Reported-by: Dan Carpenter > > > > > > smatch warnings: > > > mm/khugepaged.c:2409 madvise_collapse() warn: possible memory leak of 'cc' > > > > > > vim +/cc +2409 mm/khugepaged.c > > > > > > 9f626ffb1d1c5c Zach O'Keefe 2022-07-06 2387 int madvise_collapse(struct vm_area_struct *vma, struct vm_area_struct **prev, > > > 9f626ffb1d1c5c Zach O'Keefe 2022-07-06 2388 unsigned long start, unsigned long end) > > > 9f626ffb1d1c5c Zach O'Keefe 2022-07-06 2389 { > > > 9f626ffb1d1c5c Zach O'Keefe 2022-07-06 2390 struct collapse_control *cc; > > > 9f626ffb1d1c5c Zach O'Keefe 2022-07-06 2391 struct mm_struct *mm = vma->vm_mm; > > > 9f626ffb1d1c5c Zach O'Keefe 2022-07-06 2392 unsigned long hstart, hend, addr; > > > 9f626ffb1d1c5c Zach O'Keefe 2022-07-06 2393 int thps = 0, last_fail = SCAN_FAIL; > > > 9f626ffb1d1c5c Zach O'Keefe 2022-07-06 2394 bool mmap_locked = true; > > > 9f626ffb1d1c5c Zach O'Keefe 2022-07-06 2395 > > > 9f626ffb1d1c5c Zach O'Keefe 2022-07-06 2396 BUG_ON(vma->vm_start > start); > > > 9f626ffb1d1c5c Zach O'Keefe 2022-07-06 2397 BUG_ON(vma->vm_end < end); > > > 9f626ffb1d1c5c Zach O'Keefe 2022-07-06 2398 > > > 9f626ffb1d1c5c Zach O'Keefe 2022-07-06 2399 cc = kmalloc(sizeof(*cc), GFP_KERNEL); > > > 9f626ffb1d1c5c Zach O'Keefe 2022-07-06 2400 if (!cc) > > > 9f626ffb1d1c5c Zach O'Keefe 2022-07-06 2401 return -ENOMEM; > > > 9f626ffb1d1c5c Zach O'Keefe 2022-07-06 2402 cc->is_khugepaged = false; > > > 9f626ffb1d1c5c Zach O'Keefe 2022-07-06 2403 cc->last_target_node = NUMA_NO_NODE; > > > 9f626ffb1d1c5c Zach O'Keefe 2022-07-06 2404 > > > 9f626ffb1d1c5c Zach O'Keefe 2022-07-06 2405 *prev = vma; > > > 9f626ffb1d1c5c Zach O'Keefe 2022-07-06 2406 > > > 9f626ffb1d1c5c Zach O'Keefe 2022-07-06 2407 /* TODO: Support file/shmem */ > > > 9f626ffb1d1c5c Zach O'Keefe 2022-07-06 2408 if (!vma->anon_vma || !vma_is_anonymous(vma)) > > > 9f626ffb1d1c5c Zach O'Keefe 2022-07-06 @2409 return -EINVAL; > > > > It seems better to move the cc kmalloc after the anonymous vma check? > > > > Agreed - something I only noticed when fixing this. I've cleaned up some > ordering here, now looks like: > > ---8<--- > BUG_ON(vma->vm_start > start); > BUG_ON(vma->vm_end < end); > > *prev = vma; > > /* TODO: Support file/shmem */ > if (!vma->anon_vma || !vma_is_anonymous(vma)) > return -EINVAL; > > if (!hugepage_vma_check(vma, vma->vm_flags, false, false, false)) > return -EINVAL; > > cc = kmalloc(sizeof(*cc), GFP_KERNEL); > if (!cc) > return -ENOMEM; > cc->is_khugepaged = false; > cc->last_target_node = NUMA_NO_NODE; > > mmgrab(mm); > lru_add_drain_all(); > > hstart = (start + ~HPAGE_PMD_MASK) & HPAGE_PMD_MASK; > hend = end & HPAGE_PMD_MASK; > > for (addr = hstart; addr < hend; addr += HPAGE_PMD_SIZE) { > ---8<--- > out_nolock: > mmap_assert_locked(mm); > mmdrop(mm); > kfree(cc); > ---8<--- Looks good to me. > > > > > > > kfree(cc);? > > > > > > > > > -- > > > 0-DAY CI Kernel Test Service > > > https://01.org/lkp > > > > > >