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 9CD5DC83F01 for ; Wed, 30 Aug 2023 15:43:30 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3B99E440155; Wed, 30 Aug 2023 11:43:30 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 369C0440009; Wed, 30 Aug 2023 11:43:30 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 25950440155; Wed, 30 Aug 2023 11:43:30 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 167A8440009 for ; Wed, 30 Aug 2023 11:43:30 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id C8C96160131 for ; Wed, 30 Aug 2023 15:43:29 +0000 (UTC) X-FDA: 81181190538.07.8DE6AC8 Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) by imf13.hostedemail.com (Postfix) with ESMTP id E357A2001D for ; Wed, 30 Aug 2023 15:43:27 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=google.com header.s=20221208 header.b=lH5a1Rvb; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf13.hostedemail.com: domain of bgeffon@google.com designates 209.85.216.44 as permitted sender) smtp.mailfrom=bgeffon@google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1693410208; 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:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=Hos3zNX5Io5VszHAL6d9NfCD5Tpud5Aief4IW0Tj/2M=; b=kkel+j9FH/PW6an09UYmBA1oIHkMYiithz1auX3fG4YvSu+OptxRpUxR4JXrEqO/NRRyAo h56N/u6KYDxjy5xGtkyDIlO/pIWaY1F4IHsHt3QM4iMDqIig5rDRJYhegmJkY8+C+JW1AZ DZOpL3tDyWG3EhTCCtBAs1fPq28Kkls= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=google.com header.s=20221208 header.b=lH5a1Rvb; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf13.hostedemail.com: domain of bgeffon@google.com designates 209.85.216.44 as permitted sender) smtp.mailfrom=bgeffon@google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1693410208; a=rsa-sha256; cv=none; b=Boq6zOusjmiJwubNuJ8v/kja5qNApAX+b3SVx5UBEmkoLoNcbfQ0IH8o7UlcxJ9d5qHjgY Isso2Y/hAzDQifu5b1QjllCeipKPodO17645XRdQGsXlWP4iUx8pDHn7aJTIPS7rRh4p/Q JFKr2to0XWt+6/pAtR93/G6a/038kxQ= Received: by mail-pj1-f44.google.com with SMTP id 98e67ed59e1d1-26d1e5f2c35so3604539a91.2 for ; Wed, 30 Aug 2023 08:43:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1693410207; x=1694015007; darn=kvack.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=Hos3zNX5Io5VszHAL6d9NfCD5Tpud5Aief4IW0Tj/2M=; b=lH5a1Rvbkrx1dOn5hQ2rswZBUEzp0ZaG/pada4KmPRGX25zXoR1WpPdtG51oaZVtFz VK2r9uDH7VN4ravjVYRwsdZAB4IgY1LnoiXbFQPa8NRRYw4QbnOTnoDdlby1dCGY3E+R AbuP//k/E5ZPPHOOYnEjuMG8BwMUDN8DbgxUoQTuRopHY2tgtNoJmvwJjl5ztGOlfOBx zWjNrkn8ky0i3+iDQP9TKCfS8+y4bf3bWV4Ye4vLgI9vVtUohyPwDKHukOzzpk7YqXKD VqvbNIfyewP8vQh+cqvArjIMh6CT1EuZ8ycgpGO+Kz+jTJo/nnLsPUqu0uJUXFO+0mZP ODzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693410207; x=1694015007; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Hos3zNX5Io5VszHAL6d9NfCD5Tpud5Aief4IW0Tj/2M=; b=YStcoFiq3YjK/FIhF9QRzY1N+ALp97cgxp7+NKIGzmb2e3xAQ8JCcNWFgBRqFEeeOB xNvTTrxDG7ys6OiVV324G5eY9PXe4kgVvYma/tdlqGystvBrJqaLTSlPu65X21xNiNOU 32TaO8xzLB5ZfPWR2iAUEvD23iQwy7NNANlzu4BL9PZz2OB7Wx+VToCuEf5sm8gNmkvh Aq2I0AnTsu+0UJkkfRtrZaM0FG/l11kFk1Cnz2qwIP0m1vzINlnS5eZeI3Hj2Nc2jRIk BR10RrGnkYH9JbV8dh7xU824YRnBnHYZC3xj/MK3fcYubRB3RkYgLv0ziI5mjDHHMcjv tKpw== X-Gm-Message-State: AOJu0YwQW1HnruLpAwWU6F8gDXlnwpeRp8cRkbsStC0Pdk0kAGoSXraa CJ69ub53qzvDZjwuivNQfgDcw7D6dcSqyXRVUk+IVw== X-Google-Smtp-Source: AGHT+IEsJ1Cl8XaoVMweojYTDPN11CHHEkD8agAJrPI6cbuCn2+rGf8ONpDPUvLR8wSaPSnOZX1qf1oGAV4C2TLEokU= X-Received: by 2002:a17:90b:3b48:b0:26d:1e2d:51a7 with SMTP id ot8-20020a17090b3b4800b0026d1e2d51a7mr2465522pjb.37.1693410206364; Wed, 30 Aug 2023 08:43:26 -0700 (PDT) MIME-Version: 1.0 References: <20230830004549.16131-1-anthony.yznaga@oracle.com> In-Reply-To: <20230830004549.16131-1-anthony.yznaga@oracle.com> From: Brian Geffon Date: Wed, 30 Aug 2023 11:42:50 -0400 Message-ID: Subject: Re: [PATCH] mm/mremap: fix unaccount of memory on vma_merge() failure To: Anthony Yznaga Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, akpm@linux-foundation.org, 0x7f454c46@gmail.com Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: E357A2001D X-Stat-Signature: d7ne5xeags7fbtu7uyeocmswnz9c33tq X-HE-Tag: 1693410207-892456 X-HE-Meta: U2FsdGVkX18baL6ULen4ca3CjHdkzP+n7pxImAkh9D/XC9U74RfuCbC3yWfaHUc5NSHOzDo9I1JkIRshzGGdX6o8+h4chkpjkKwVouvmD++kDQ4ddoaDFhLGE0ryg6G0jNpyPiPheXxKGQKf05rDz85GehsWQvuIPxEvTvsdD8OxW+zVl9yxFjNgLOD2+vsPriFVpMLR2ydbd7cwRweCx4SXNOuoJ5YIQ2BmV/qDHaEqJR7O48L4ocu2JQbUDbEa7+T498NLcT/3UlrupnadpBHc7IbDOogYaamVTM0stDVptBIZp6c4ZmjHK7kaEFYtKf8yueNXk7BoHj4H5HJMQ1e7efRb8Lu8yLiWOMsg4mwQ5Ht9X4jrsnAgyyHogGTUqobaAjOrVHf7fbv+OKMa3BvaZcH96Ya+9khypjQC5/Nd14w7WKp/iUTZZ8mo4gV0oOJTZ7iKbuZhWtTMbwii2YAnHcvf4XkCSmqk014d1J8mg1tT1GJtTsQpaUJb7XgHm/jQA2ZHLFhWmbaoEMlKOl53jDJCQrY3ETWBngBeGRVydobIFu8GHEtpRhfQ9VM30r7uALpGiJSOoOxmHjp1uKJPD+4B34NGTUGcSjvoOxUhBKruJIpMloE0ZUwARQLwZwfdl00HpmgSOAxss6nvjVmuZAVcGdYIL3ZLunSon1MyFLWlwKs9ugATTfIZXia+jZ/17WVy2NwEXfCl0y7jQ39hQaswFGvAhgMfELER0Md7igvq4xHKaQWAQy/xKv3B6jwkrGQdyhmqXHeMcE6qITqQvyFLfWm3n/L5nykCay8elvd9bjzgoI7DVltl35wunz1TSKKmPeXimQP0yqd7gjvOSPqU4KVfsMqByl2Z3ofISiahJoeRMFI+vuqTR6y+KvjQu+1L3Dv4Wy4Bercj+FiyE75fvmx0vO/rLYmSq9zBUk97bDEzHUoilXK1mUS1+TN/eFImN9XwNR9h22K m8ef+jSk tW5ZJfW7KgZ7FuKVRJQysWrujoPCpbiMK010qsbo+nBmnnF4WiPcVrU24x+5nmnrJshSryYBxS9goemAkntOkgdekRcROYSX20Fa3U535pdO2TKhLxPb8uA9HMyzhae9DEO/rXL/7SHSG5yMDrxKqcBnc9BF4ctm5Es/4wiCV5WKBM+eFovkBQXp40QcS+tAbPA6cfwwaWnFxqbGf78BUTQ7z5vgYWIaR/AFt 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 Tue, Aug 29, 2023 at 8:46=E2=80=AFPM Anthony Yznaga wrote: > > Fix mremap so that only accounted memory is unaccounted if the > mapping is expandable but vma_merge() fails. > > Fixes: fdbef6149135 ("mm/mremap: don't account pages in vma_to_resize()") > Signed-off-by: Anthony Yznaga Looks correct to me. Acked-by: Brian Geffon > --- > mm/mremap.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/mm/mremap.c b/mm/mremap.c > index 056478c106ee..07cdb04d4ab5 100644 > --- a/mm/mremap.c > +++ b/mm/mremap.c > @@ -1037,12 +1037,14 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsi= gned long, old_len, > pgoff_t extension_pgoff =3D vma->vm_pgoff + > ((extension_start - vma->vm_start) >> PAG= E_SHIFT); > VMA_ITERATOR(vmi, mm, extension_start); > + long charged =3D 0; > > if (vma->vm_flags & VM_ACCOUNT) { > if (security_vm_enough_memory_mm(mm, page= s)) { > ret =3D -ENOMEM; > goto out; > } > + charged =3D pages; > } > > /* > @@ -1058,7 +1060,7 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsign= ed long, old_len, > vma->vm_file, extension_pgoff, vma_policy= (vma), > vma->vm_userfaultfd_ctx, anon_vma_name(vm= a)); > if (!vma) { > - vm_unacct_memory(pages); > + vm_unacct_memory(charged); > ret =3D -ENOMEM; > goto out; > } > -- > 2.39.3 >