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 CE519C64EC4 for ; Fri, 3 Mar 2023 19:00:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 669EC6B0071; Fri, 3 Mar 2023 14:00:41 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 61A286B0072; Fri, 3 Mar 2023 14:00:41 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4E1D56B0078; Fri, 3 Mar 2023 14:00:41 -0500 (EST) 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 3EC676B0071 for ; Fri, 3 Mar 2023 14:00:41 -0500 (EST) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id E3008812C3 for ; Fri, 3 Mar 2023 19:00:40 +0000 (UTC) X-FDA: 80528503440.18.C7AFA36 Received: from mail-pj1-f54.google.com (mail-pj1-f54.google.com [209.85.216.54]) by imf09.hostedemail.com (Postfix) with ESMTP id 0FFE614002F for ; Fri, 3 Mar 2023 19:00:37 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=PqyptJaz; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf09.hostedemail.com: domain of shy828301@gmail.com designates 209.85.216.54 as permitted sender) smtp.mailfrom=shy828301@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1677870038; 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=X/wEZrlLSi3VOukKgvQSnAsQ/5TvalfZllKXsdyYsOA=; b=rDVh1aMts76qPi932w2+Iw38YnmggSnU/IRNIiVK+xbu3uH1pUxMoztDqTo3gITfQQE4dE opYrg5hnyvimmCnObtI54HAunEpv+7G0Tk4Qj6vMQfIjXyLhDiunaXaQ8XqQ1AlEd0yT2p InegN81ygP+I6nWoYWvex2Z4VvHnC/o= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=PqyptJaz; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf09.hostedemail.com: domain of shy828301@gmail.com designates 209.85.216.54 as permitted sender) smtp.mailfrom=shy828301@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1677870038; a=rsa-sha256; cv=none; b=8FIIEi/oseiCFcabjE6MDN2cchMEIesURObk+QwBm81TE5ZQs28mAp6GIgzPsVursrcyL3 ac/Mqtj+8+aBe16y/NIY9lM8+r+ZlUgu65yp36XoWBmATk5yr44acgiX3ljzhtPSGPg525 WdtbjDHC2HzOlOTItrPiNJhGFv1ltJ8= Received: by mail-pj1-f54.google.com with SMTP id cp7-20020a17090afb8700b0023756229427so7149541pjb.1 for ; Fri, 03 Mar 2023 11:00:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1677870037; 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=X/wEZrlLSi3VOukKgvQSnAsQ/5TvalfZllKXsdyYsOA=; b=PqyptJaz4kd3Yr8+MT2IiAzBXgf+n0QvvcaWzAO2aRNZlH08cEPV4493ifhKEFqLRL bl8OLheeNT3f/+By3Uw+mydB/3RsAmxUFiIN9o9yxJNpmiKi/yL73WZK3mfspZp5LTWs k/Cag6H0ihmOlSYqBOYhbTyjr/XQR8di6+SxUbOipX6AcPgG2MvclpHGuzHDWk0I+Q55 Mf69GR+8lKCmDxwSKnZjR8J1Ap+fKLhWrsSMud3lRoyjBv2sujDyQm0KrhZ+rF4dnYBK deMLQUwMm1oG2BzJFg7hwfcWwiZIgevRWeZ4U4ZHINmpk0jj60gLX0DmwTvHmLE9ja5C SQCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677870037; 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=X/wEZrlLSi3VOukKgvQSnAsQ/5TvalfZllKXsdyYsOA=; b=gm/IuiEkpOR+5tP8z1TMGv27wiJT2Ix6ymPgtfA5VBWnen4/BYZtfgdqchL0Bts3Nr J8P1zhpPudU21n3ukqOpJH1SICEv1xxM9PX1LaGGRN++iqsAZn16uVW1TEtpf1NmOmcu WjtfNzSMEyP7Q9jXgzsfzSrmeAPMv4sc5CjYnZ8NrAFoN4ZmHaN30CFzjOyUbrmHpnqn ASCYpHPTmv4IkSYusZs7ehNnsCc0hEpVE7I7HQofInDJ++WvlS+zyZtITUj1//zz2Ymh LJp42Bctb0aLSXqNikjLkqHZ0US58SXSHnhLJviy4ccajxVb9gbnl8rInhqebt3NQVT9 VtQA== X-Gm-Message-State: AO0yUKUXQttytkUokCyEfr0SuYUQr1KhPCymMcsd5L47CdeDekXN45vW Y4aHN11y3WfoEbtYPuzjFdywY2pfoSlfaXmeK1A= X-Google-Smtp-Source: AK7set8y3ckSn4MA4cKV+o17bRubw41y2//fbYVNA2teFE1o654FtNxfiGqdgYdoxsQ61B6Py6vTBU6PYWDEo4r4egE= X-Received: by 2002:a17:90a:14c2:b0:237:c367:edda with SMTP id k60-20020a17090a14c200b00237c367eddamr1002911pja.5.1677870036689; Fri, 03 Mar 2023 11:00:36 -0800 (PST) MIME-Version: 1.0 References: <20230303151218.311015-1-peterx@redhat.com> In-Reply-To: <20230303151218.311015-1-peterx@redhat.com> From: Yang Shi Date: Fri, 3 Mar 2023 11:00:24 -0800 Message-ID: Subject: Re: [PATCH] mm/khugepaged: Cleanup memcg uncharge for failure path To: Peter Xu Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, David Stevens , Andrew Morton , Johannes Weiner , "Zach O'Keefe" Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 0FFE614002F X-Rspamd-Server: rspam09 X-Rspam-User: X-Stat-Signature: d1y9wj4jmsdeje8uijeqdhqfcnx3qt7u X-HE-Tag: 1677870037-169032 X-HE-Meta: U2FsdGVkX19adQkZolVLc3cAJ+RfOKGr/zB8TFzWexfYsiib4zEVtr4UD2wm+JzSB8wIbPbbHznXjlZc6RlszFBIQk6AySh1T72lZgobs2r2v1jRSZQkh25SBJkqlqM/ImRO+g5hgSYiu0EA4Kt/M7/LjmyEl8RoLJASDMIiwUTgRigveMTQ8MxX3kvdsqSxnpzYQuMVq72kZI7oTWi1Abm2Wtey/0dBHI6qrag+Bdwj1TwviBPM4Yg5NNROewbBeExueohQneCew+l4seyx+tZG1DVC8y7RMOM10IljlZXr+24iokZY8pOvfVQXUoy+ME46dFlFX+GcMLy6b769Dn341HKQoswPHEzvVLDsGxY2YBpb37mntdXBy5cKhbUt0f7POrNQONVTuBAADfrba0LCq1CSSJhNydD8sGJX9ZHsnzvS6XBPD9PR7lCVPoY3FBggzJiZSZ3RygPK3A1XBnm0B1tzfAdjaAyhXQtGnSNxr/KL8LBtkVQhsZq9PtFSBuKxWDX1f3KeNxg3iYgzTYohpKdkDqi0eWzA5IKfnulMoJVk0iJeiEPhl5fkbzWlnZIhv5WIg5w4E43BXFhdZgRJvdt0EPVe782o13mnByi416OTWmAEE2+ZDkQB4RSWpWC5YkC8g8rJfcmhBnBMZeR9JnDS5f50wycpDG6alyJDIRK/Svpv317OSkIcB6e7zLRL57g10/S/XLNHnW/0styvrlcpk2RPysTEQJv3fFy6gVpgZc75XpA0+/psA5SqUDYKyS5U1Kv5tHn1TU02XNs+b3Dfc14OCSPE8o9EddTKxTUcAkIlQNORNzBagj9ThbvexVyGlfWFXzuB4TNADGhpgyzl58rSwBIKxUYFGRMOLQn9kl44M3RtTVB6bEI+L9tapMJK3TO+d4Oo9cFGXhBHnwIYjogrZdt9p2FOk1KYYgH5Pu4zdfRUYowepWd6waVLw3Gm7e5flmKiFCB H4W4QYfM +qsfP2MdtsB4KbYmIbPor87e/e4s5j20icWV/pH3SpYMK0YfWRgwgqPJjR2eGiX9pybIQ5T5MS5nQIQEit1ET9h2O5a0MsgPEwK97j5AMIEK6CYOjeDhV/Oy7zsVx7QYX8ddHsfpMx/JB5zeMB69Vpi/UXp6v3QH2i0eSPA+wwwP6fTS2OdALtrqbrSlBgdOV6fkmGEHxy9EdHXC5M42XW6xC0JqrfByNVHRbRPOwztdkE+TtJjKEbw2TwPKiK9FwFDI+93l6fZmYj8nGlves0/02JO9mUCJ1uSqZNekB4eO6ZhkXLRw9urL8sMVTL3CsOiksOZzLOjQRgnmDTdGmTF1zXXByntuKbyl+0h/D5OvZSI8TvmmQQvPpOZaeEVR1vihGL2TUuEf2HYlozQJvBadbr1D2ANn0Jp1p7nKvQEvIbVB24H16lZQbzg== 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 Fri, Mar 3, 2023 at 7:12=E2=80=AFAM Peter Xu wrote: > > Explicit memcg uncharging is not needed when the memcg accounting has the > same lifespan of the page/folio. That becomes the case for khugepaged > after Yang & Zach's recent rework so the hpage will be allocated for each > collapse rather than being cached. > > Cleanup the explicit memcg uncharge in khugepaged failure path and leave > that for put_page(). Thanks for the cleanup. Reviewed-by: Yang Shi > > Suggested-by: Zach O'Keefe > Signed-off-by: Peter Xu > --- > mm/khugepaged.c | 8 ++------ > 1 file changed, 2 insertions(+), 6 deletions(-) > > diff --git a/mm/khugepaged.c b/mm/khugepaged.c > index 941d1c7ea910..dd5a7d9bc593 100644 > --- a/mm/khugepaged.c > +++ b/mm/khugepaged.c > @@ -1230,10 +1230,8 @@ static int collapse_huge_page(struct mm_struct *mm= , unsigned long address, > out_up_write: > mmap_write_unlock(mm); > out_nolock: > - if (hpage) { > - mem_cgroup_uncharge(page_folio(hpage)); > + if (hpage) > put_page(hpage); > - } > trace_mm_collapse_huge_page(mm, result =3D=3D SCAN_SUCCEED, resul= t); > return result; > } > @@ -2250,10 +2248,8 @@ static int collapse_file(struct mm_struct *mm, uns= igned long addr, > unlock_page(hpage); > out: > VM_BUG_ON(!list_empty(&pagelist)); > - if (hpage) { > - mem_cgroup_uncharge(page_folio(hpage)); > + if (hpage) > put_page(hpage); > - } > > trace_mm_khugepaged_collapse_file(mm, hpage, index, is_shmem, add= r, file, nr, result); > return result; > -- > 2.39.1 >