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 B6E00C61DA4 for ; Wed, 22 Feb 2023 22:53:55 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4E6666B0075; Wed, 22 Feb 2023 17:53:55 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 46F576B0078; Wed, 22 Feb 2023 17:53:55 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2E9056B007B; Wed, 22 Feb 2023 17:53:55 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 1B0E16B0075 for ; Wed, 22 Feb 2023 17:53:55 -0500 (EST) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id D2852407D0 for ; Wed, 22 Feb 2023 22:53:54 +0000 (UTC) X-FDA: 80496431988.22.7E9E6A7 Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com [209.85.216.47]) by imf21.hostedemail.com (Postfix) with ESMTP id 26BCA1C0014 for ; Wed, 22 Feb 2023 22:53:51 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=lTEvWjjr; spf=pass (imf21.hostedemail.com: domain of shy828301@gmail.com designates 209.85.216.47 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=1677106432; 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=qBffIwTztrqMjd4SIOIwzjYt81ApPf0fN0mbs28jX0w=; b=Tw/bjGLff6Kt8zF2Qk/Bd/exczTI/tZQZqhz4v61A6xDHF7eIebAfZBVpqgQIHFf7eLGoA Mb1tzjmAdx9UNkGVRHxoBsU9tpPGOMzKfAHJ+In1UcCevQhRigO+4+ihLeevVUHgwEnVTW BztTYx6uBPkM0wfpRqY11uMaPUFRSqY= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=lTEvWjjr; spf=pass (imf21.hostedemail.com: domain of shy828301@gmail.com designates 209.85.216.47 as permitted sender) smtp.mailfrom=shy828301@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1677106432; a=rsa-sha256; cv=none; b=TAxU2uHVBBBM9tG7qNUJJyKBXzGp0HMxpcSErEciE+nvUsz6SI6lANcxGQy2eiahSTY53o hnbWw/LqQotwZN94UCy9L5SkdXTfBYxcGDP4zgCd/fN/vhrY+LZle2alz73Aa+rrMcARmz VPwxzwGED8UVrTt+/HtORwjz8XTudWI= Received: by mail-pj1-f47.google.com with SMTP id pt11so11425959pjb.1 for ; Wed, 22 Feb 2023 14:53:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=qBffIwTztrqMjd4SIOIwzjYt81ApPf0fN0mbs28jX0w=; b=lTEvWjjrAo2cie3FcwaWfr/xo0w2p4esTYomQUcFUA7VRBODHb4nv5M7BpaJAts/UK MXGew0uVlAwNQUdWGBgxPkHqO7gvQExZQV0gkccHh3HFVgA8NsBjn9HwzFRJiRbd/1kr kGdUnU8ED2Il7d+ozO6mgkFyEnlPlAyJVrLfXy7Dhkg3u6p5Tw5DSTsNpKzGQw8Wz0fF vfCT0wCabZR4fOW/PrHPHxxsa6aG7RYotxk6LL7TU0EE2xrTL0JylLKHpFMDQGnCJ1sT sD7tBfD3zoSagHNcaXcecNNPNJqc0CFYqOWDcU/lSZn4sbMbZCyjqhhXUZJoIoh4DJCw 0vFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=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=qBffIwTztrqMjd4SIOIwzjYt81ApPf0fN0mbs28jX0w=; b=2ighBZ1ws6o1r6iDjss+m8uJj7/xRB0wv3kZD5Yk06L0KNO6t4V8DSHFkdBWGaUHwC 77ZAUhDh4mmu2kF9b0BCT6HQFSnkQuu8JPaaZ/7OPV4VPe24e2IBaDBNeSBAaw3MVCTd pT87eBw+DAg5ak5/CXxmMVzuQb5EuIzPgYWekbjZNaa6SVaZS+LMTtf7Hr0HNpPpe/Ld 4gblbyEva1mowPFT6msN4GMAS+4gPdS+NF1GaSIk6/Bbz0GHhef5uH3LKXOrcvPyhQMA xubsYOeaHNJeeU5kI6gUhxIcbrh5ZCQDRYRYLx0InnQw3nLjy/1GfNMYyOiqcBxmSnWU 157g== X-Gm-Message-State: AO0yUKUtVTRjscAaIWBbe9SFnRhkEWhqfjWTwQzeq5JyFO853mStj1qy r6/0F8W9745KFzoPq2SE8n1IqdbwcyqMJbtlB/sQaOAv X-Google-Smtp-Source: AK7set+TgmUpyzwff8XB0hFcAB2olWd+Wrp0IvgJpKiiNRUlhtNd/fCTqTg14BGwS54Q8rKlmYTMqDMCZGCaG2O/QPA= X-Received: by 2002:a17:902:f80c:b0:19a:a411:92ba with SMTP id ix12-20020a170902f80c00b0019aa41192bamr1387502plb.8.1677106431012; Wed, 22 Feb 2023 14:53:51 -0800 (PST) MIME-Version: 1.0 References: <20230222195247.791227-1-peterx@redhat.com> In-Reply-To: <20230222195247.791227-1-peterx@redhat.com> From: Yang Shi Date: Wed, 22 Feb 2023 14:53:39 -0800 Message-ID: Subject: Re: [PATCH v2] mm/khugepaged: alloc_charge_hpage() take care of mem charge errors To: Peter Xu Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, Andrew Morton , David Stevens , Johannes Weiner Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 26BCA1C0014 X-Stat-Signature: eeu6kbzoowm6wszteei4s7g5hqn4pji8 X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1677106431-786029 X-HE-Meta: U2FsdGVkX1/NHoAm3q3ACHrBb1NOdPGnwe2R5X9qib8SGfRQNOIUp9OhByACdtfNTUQ9QI4WOYNQ3xXgTVtKXC/JItvEPqVu4h+EY/E6JserMM3dW1jUKZcYdM3jjSxrJkP8bZZLXYj74O5dVcLZbnXs80yMMMZ5JGDecnP6cnZYfICI4x+2c7saSyw5vVcmbtfw2wojV05RNrVRghwWIJ8lWcYJpZ24P2wT6vCeFH1q2hMrwSCEC6/aGrEvaoLdVuHnskuuGPRR5TJ6OI7G9nuA00+NiUMrEUrqZLiDqiogrJLV4PPfPnlsQauP6F/RVw2kY6guSuOCQqSk+ZRHe5Wp3iFstgpcO91v0PR3qVuMMCKPCFhf53MLXXfwz01er6K2fRxz5M65cil2r6AAPEObQn6tvAuHTpk9XZug8uxSa5qc0VJLUWcMf+xGQ7qAqhIv2nEz8HskYniKCIYcIglOE/7D0OhX1GwH+goOR3KnE7jsHjF6aUr9YU/Zd5q5A0j5e9C6Pt9OCFEhJ8ohrq5ZQ12d7bCZegLc7tmtrATRLRyJINn4kUoAXeCQLyaJWJxGPd7HOT5p7S3OdaQIcXRY+4XHuEQaYbdk0jgSJCGbfpq5chOZRmVIwFkWOAOedPMyxavavbINtuwyA59XeyCGIC0cjCwiwrp82XkJ68iVCbTJPj/j4dFEz+W3jvoXXU3i/NvV9g+TL3+rZVauZih1WxCT/kmoBf4bmSIffj2XDr+JJ8GbQMXJxo+aky5uQvwRX604H2vhklE0mXDjEELXQ8Wb+z+CmdVc9JIdZMLM+lWcNnh2NP1mkNBK9x2EBw5eDx0aGBgPvkLJEwxugNp+l9oK1KpwJwlFH6EBsKutC4utevb1d4K32zvQbSFD059aFr4AA42viz/yYpgfzcBoCBuxV8KrmT8mFglOMtU/v85NqlZMHvvZizlzwQwAQxGJqm1cYaccfQewl83 JfqPw/1O daM4cTAd9nAzjlyLEhqCHZpIMBPLA3ehl+pMfrFvPUhQPpp8t1bAgkijSm6uqONgPUcYjQ52x9HRL4R2bwM9UDhVsdhSQq+DWJt80XmVNeu6WHVxjlVetCj0qgiRJ66nLDW4D4xavV82+gRDQzI4fEQ9a4TjSLT37BJDnZ7+WNY6gSlpw+eFLpKVUR3a+TWCZpOcAUeKGuS58hBUAO3zGattUq1flvtLkIQ9cLh075SSrZEUmNBkQZYNYGs6xwNV3ReMRFfyoqU+CbkKSYpekQsNkQSNpBinSZd63nq56ltAUaxHHPGie4VrtYxKG2hMU4K2BCshHE8GyF2GJUoKWWlgvhaPxyGDJWiBDDVA2GCdBK3ZKi26KLsIBMpeqjaOmbaqCqpGAZWKdqRayhyrEEP0hNluLuC4P6Lb6H+plyuWo+4HLD4WrNWbKrdlbf8hg9ozrpCRhj5G59AnGknQXrXkx0R38NIj0cROf170tgf1uNPfOMpeQEmkLh3N91Dp7oHZIMvnjWVMbEMTNeyuJJ3AkNOiV14kL0NsL1sLRvQqSTArWh0jMGhc0NT4ddGvcK3q2t0/pz6oBZeE= 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, Feb 22, 2023 at 11:52 AM Peter Xu wrote: > > If memory charge failed, instead of returning the hpage but with an error, > allow the function to cleanup the folio properly, which is normally what a > function should do in this case - either return successfully, or return > with no side effect of partial runs with an indicated error. > > This will also avoid the caller calling mem_cgroup_uncharge() unnecessarily > with either anon or shmem path (even if it's safe to do so). Thanks for the cleanup. Reviewed-by: Yang Shi > > Cc: Yang Shi > Reviewed-by: David Stevens > Acked-by: Johannes Weiner > Signed-off-by: Peter Xu > --- > v1->v2: > - Enhance commit message, drop "Fixes:" and "Cc: stable" tag, add R-bs. > --- > mm/khugepaged.c | 9 ++++++++- > 1 file changed, 8 insertions(+), 1 deletion(-) > > diff --git a/mm/khugepaged.c b/mm/khugepaged.c > index 8dbc39896811..941d1c7ea910 100644 > --- a/mm/khugepaged.c > +++ b/mm/khugepaged.c > @@ -1063,12 +1063,19 @@ static int alloc_charge_hpage(struct page **hpage, struct mm_struct *mm, > gfp_t gfp = (cc->is_khugepaged ? alloc_hugepage_khugepaged_gfpmask() : > GFP_TRANSHUGE); > int node = hpage_collapse_find_target_node(cc); > + struct folio *folio; > > if (!hpage_collapse_alloc_page(hpage, gfp, node, &cc->alloc_nmask)) > return SCAN_ALLOC_HUGE_PAGE_FAIL; > - if (unlikely(mem_cgroup_charge(page_folio(*hpage), mm, gfp))) > + > + folio = page_folio(*hpage); > + if (unlikely(mem_cgroup_charge(folio, mm, gfp))) { > + folio_put(folio); > + *hpage = NULL; > return SCAN_CGROUP_CHARGE_FAIL; > + } > count_memcg_page_event(*hpage, THP_COLLAPSE_ALLOC); > + > return SCAN_SUCCEED; > } > > -- > 2.39.1 >