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 A3B69C52D6F for ; Wed, 21 Aug 2024 16:35:39 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3F4BB6B00BA; Wed, 21 Aug 2024 12:35:39 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 37FDC6B00F2; Wed, 21 Aug 2024 12:35:39 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 182D06B00D9; Wed, 21 Aug 2024 12:35:39 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id E7EE76B014D for ; Wed, 21 Aug 2024 12:35:38 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 953E380557 for ; Wed, 21 Aug 2024 16:35:38 +0000 (UTC) X-FDA: 82476803556.30.FEEFD28 Received: from mail-yw1-f174.google.com (mail-yw1-f174.google.com [209.85.128.174]) by imf11.hostedemail.com (Postfix) with ESMTP id CB9F040035 for ; Wed, 21 Aug 2024 16:35:35 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=paul-moore.com header.s=google header.b="cVHb/EtV"; spf=pass (imf11.hostedemail.com: domain of paul@paul-moore.com designates 209.85.128.174 as permitted sender) smtp.mailfrom=paul@paul-moore.com; dmarc=pass (policy=none) header.from=paul-moore.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1724258096; 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=ssKb6qw6aeMO+6QGtyvALnPcAvbpew5UWcwhrzSGCa4=; b=8qgOlThTTqPpX10+duNqVg+oy+t8tQRCgm6CNS6QnVcH4bftPLoiBlx0AkMNuQ4MOr3xot 7xKUBoNowndexpz6Cm1uv7qIGU4Zi2hacrrkZKzyVCv+rlCEESKIJDybZIJSkhDtnJ/r0N Pkvh1G0WmsO5IEelaQhINwKwhTIONoQ= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=paul-moore.com header.s=google header.b="cVHb/EtV"; spf=pass (imf11.hostedemail.com: domain of paul@paul-moore.com designates 209.85.128.174 as permitted sender) smtp.mailfrom=paul@paul-moore.com; dmarc=pass (policy=none) header.from=paul-moore.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1724258096; a=rsa-sha256; cv=none; b=L2NpTdeguB1xmkAvfB4CxBTycAfrBhI4XuHIV+NuI4Hup9MZEf6wYm1Iq6IYzhZbXzvivV ZXDguuHDmwPBuLZyKMOASjQR19qlMnmfZBqh9jGSWiDLHJ3peuzT9KTcyCVZbtdDCj5NSN ajbFDGcQ9pyxThOtMIOK0vKkgg1M8rQ= Received: by mail-yw1-f174.google.com with SMTP id 00721157ae682-6bada443ffeso8188527b3.0 for ; Wed, 21 Aug 2024 09:35:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=paul-moore.com; s=google; t=1724258135; x=1724862935; 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=ssKb6qw6aeMO+6QGtyvALnPcAvbpew5UWcwhrzSGCa4=; b=cVHb/EtVzh+x8nwKf26iTwmr16QVA5sEVXCyAUrV9o+e8XZDLb5JWJ8FDA8nEsprMI /gyRtHcvIpyfM7rA8iK9CX8lUT+Qa89iTpc+c13eSBgqtaSbobAxxlAGrC4t16r+7RML /VcacGfGxF6+UWPHBas4W/m30hH0H3WsTBbgWQVUq8lgwYGKLzDF8tHMHY6VxVbKMStL lwy1SauU/1H6NqENFuwsuhkl556/F7uiNaCa6IenwXBzzrQrp2UqDIiPyFy50olsecAN QQNh4Sk3fL2TpFOmclk/HiDu+8OdTENYbgtWsVvplKNnN7miLoH0guuwdM4KQ0I9BQyX KWug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724258135; x=1724862935; 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=ssKb6qw6aeMO+6QGtyvALnPcAvbpew5UWcwhrzSGCa4=; b=tzMIJbRn2Vw1xc7q7r39Tutr60a3LKyY7NVPIEsRnl+9CnXU5KiniWnAoWLwaKyeHh jjJLlEp2xWeDmbJiu7aY4lpe2AouwctdrfCyhtlXnoYGTlOkqMtHmbURf/HqBV7MlQeF rl/6y161DTkZIBmaTXDQSafSveCWqfCFEE9KMe7NQTE+4HjgOWtc+VZcbrDHUhD2GfPf slQdcacha+aV2lbAwG6DPUDb2yHNtGGeQlsMv9FCCqX7MmynYR1fRObKkdDEkNlu2aJF iof9THBUnCFwUVj0YatyFZdPycXb21EV+I6jOJ/8n348OJ2LvlHBicEgIDPFceePIK3Z kR5A== X-Forwarded-Encrypted: i=1; AJvYcCUqjJFwdCOFWSiZy2aIHebqlwaxFau0tB7Qjz0tYoJsMN5z6OM2UZD8/SOU6vMLvfqVwzwkPBr3Zg==@kvack.org X-Gm-Message-State: AOJu0YzvBXodH8sp1uJrfMDy0yT7rK6diSA1BnKJKb3QfvFiUAoqtYZp I0KmkEJ/+YYjri9kGY2zg6s7JRb3VArN8cSDHZyd7czm+GPRnWmrLsB07gG5bDZKXSZ34VxPOOl c3FF2aErZT3SZc+8J+NhNPE7Ob1m/ovYW059G X-Google-Smtp-Source: AGHT+IFFJJaltNCA/IDKVau9jaELlCUOp8789S+uuTRwgIUoSv9E6HoUzHZ0yFPljmsWOYHtvETnEbDBnlf6C3JyEkw= X-Received: by 2002:a05:690c:63c6:b0:630:8515:f076 with SMTP id 00721157ae682-6c303cf67bcmr2591717b3.7.1724258134800; Wed, 21 Aug 2024 09:35:34 -0700 (PDT) MIME-Version: 1.0 References: <20240820235730.2852400-1-Liam.Howlett@oracle.com> <20240820235730.2852400-18-Liam.Howlett@oracle.com> In-Reply-To: <20240820235730.2852400-18-Liam.Howlett@oracle.com> From: Paul Moore Date: Wed, 21 Aug 2024 12:35:24 -0400 Message-ID: Subject: Re: [PATCH v6 17/20] mm/mmap: Use vms accounted pages in mmap_region() To: "Liam R. Howlett" Cc: Andrew Morton , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Suren Baghdasaryan , Lorenzo Stoakes , Matthew Wilcox , Vlastimil Babka , sidhartha.kumar@oracle.com, Bert Karwatzki , Jiri Olsa , Kees Cook , "Paul E . McKenney" , linux-security-module@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Server: rspam03 X-Rspam-User: X-Rspamd-Queue-Id: CB9F040035 X-Stat-Signature: rwhte7poajd51pqfdurg8stznkrthmoy X-HE-Tag: 1724258135-543872 X-HE-Meta: U2FsdGVkX18hllMnn3ZE5+pumzrxB6qQT9ej8xNwbe5cap/912upreCUja4cMXqzW1nsD0RCqUXJojZYLEMt0p3FMXAWez5sBmMYj9eofEkGQ0w3po1qclHyEBsk88JyQ5rnQSCDGpquS6MQbI8N3ZpGbFbPfa7sJVTf1MMQats2x6dwP1fVRU1avaAKqtY/GNDQWVOYisNsWQb2Fkidc8EnEaGb7SVi2vRrRFgY3TwcXWDmeiohN7kHLv21dhpvRzsqDuZ6FVrKUbYhHqwLDbeuDZ+hgtndl6qfRCKXeCEhX+RowHaf+ZuyEOuZs7jEOHSEMYKqiCRmgODC1XsF00tQixyBXQ2wW8OmsSVFLF3Re68/isvCFy0c3EenFlnhAIfZ6fUf7heimbkFKDzvzcRw8IQH355q+y9LDdA6MshFnuz97t8lrd03uueFJWz51H83nUPOHI/4kqzdsV9e0kud6/2OIJode4yt7NNvpoR2qz/6Yjj1N72S477bF9g9NQohe88yduMjyiwUBKOW5jbcFdIyeF+9uxmOnFz98V8FTmfpSwKERCOB110MnzCUG/lAC/VPtTooJdcbyh7GA4v8sjIx7E5RfNDaiXhg+1JGmGumGVPjWPwhbJsUL8JblnkXX2b/MAVqb1BRg2CRJDuQCiMuEsC5DY8LxekU4FlCUOH3RN1+Thm0gETdnY72lIgwijU33qwTCbRCoU/6bcqezxdgiKuJy75iMHB1agtMfDdZGT+Wip1XrxLm2BpR46TGFmv32ZTTvDEqsPlknDPAGMT8iECWkfmWkEuTCQnUnB3Bi7T7RYzjjA98Z0fc1OoBOxaIcvkTDM0Ad5DhRPZUSRzyIV5EUhSvmVVg0+SpDre2WVL3ixsRuJNeTrySqIZ3WrU41I32tJYxmuF3nHnquFZDHgRH55dGXTMg3X0uvvraWHnnfk1tE0udPRUsDEwbtaXqRxbRnwORTtb nQ/3SJxj zvEZOhM1Jt21haLUhiBpGMsEhPDwHdVlosOjiOgw9fT6idt9VIrxX+YEa7KRdgI14J4daJhsHDBOIyyWn73xBStvimNIaTfRxLc2EZKLYl8qhi6rU0sIAzXstXTXAKvlebkgFnXvFBy4BO7Z1DiWn4KbYA52tpjOmwgJ1YhCULWOPpuSHISwMbw/FDaa2Bc4aqt0b6o0t4zKlYHkimq4xUaAwjlz3SrAHZg0QVA0jZiuzVaNhmyamtzGAHbS19NS32zzhM4XH/klXASP/yEX3mgafoBEUxJlrpvU0mGWSwTRjS3rHXFUS/e49qn0tL2szzxKMR7GxSy0CpZl3qCR865/tjHyWK/E1/spMTjzsbaYELv8M8te3UtVlHMjRxQCZQDLeOJ13rQhUWxU= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000933, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: On Tue, Aug 20, 2024 at 8:02=E2=80=AFPM Liam R. Howlett wrote: > > From: "Liam R. Howlett" > > Change from nr_pages variable to vms.nr_accounted for the charged pages > calculation. This is necessary for a future patch. > > This also avoids checking security_vm_enough_memory_mm() if the amount > of memory won't change. > > Signed-off-by: Liam R. Howlett > Cc: Kees Cook > Cc: linux-security-module@vger.kernel.org > Reviewed-by: Kees Cook > Reviewed-by: Lorenzo Stoakes > Reviewed-by: Suren Baghdasaryan > --- > mm/mmap.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) I'm pretty sure I already ACK'd this, but I don't see it above so here it is again: Acked-by: Paul Moore (LSM) > diff --git a/mm/mmap.c b/mm/mmap.c > index 19dac138f913..2a4f1df96f94 100644 > --- a/mm/mmap.c > +++ b/mm/mmap.c > @@ -1413,9 +1413,10 @@ unsigned long mmap_region(struct file *file, unsig= ned long addr, > */ > if (accountable_mapping(file, vm_flags)) { > charged =3D pglen; > - charged -=3D nr_accounted; > - if (security_vm_enough_memory_mm(mm, charged)) > + charged -=3D vms.nr_accounted; > + if (charged && security_vm_enough_memory_mm(mm, charged)) > goto abort_munmap; > + > vms.nr_accounted =3D 0; > vm_flags |=3D VM_ACCOUNT; > } > -- > 2.43.0 --=20 paul-moore.com