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 C8982C4345F for ; Fri, 19 Apr 2024 15:22:08 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5A01C6B009A; Fri, 19 Apr 2024 11:22:08 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 550576B009B; Fri, 19 Apr 2024 11:22:08 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3F2586B009C; Fri, 19 Apr 2024 11:22:08 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 2045A6B009A for ; Fri, 19 Apr 2024 11:22:08 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 9EABB141402 for ; Fri, 19 Apr 2024 15:22:07 +0000 (UTC) X-FDA: 82026647094.04.355124B Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf26.hostedemail.com (Postfix) with ESMTP id 8CE14140027 for ; Fri, 19 Apr 2024 15:22:05 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=DNBNLnNJ; spf=pass (imf26.hostedemail.com: domain of peterx@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=peterx@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1713540125; 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=XYoEcbDndyhCownGWpj006Efk7M0aOxnlzP6C0Hoi1o=; b=j9PAXSPMWcUvENbXFHg96Fy2+jgmBV47Z8IFDo/w4l5u/Rxtd4PRxGR8B2gwmkLZB5eiqp FkEs5Fhd2Mek3AsR83kO6EJMkEjIyiBewhTbJNEpas7GMD8VQH1ZWQoGMDWfJW/Dsuv5q2 G8RZIepS4KmcVDliTC0czXtGIy2G6Bo= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1713540125; a=rsa-sha256; cv=none; b=h+ljxe96f8GQXMIQeaDLkFJ9o2KNBSf55iLlY2EosFJTk+ssZbJrWnAAP2KnEFAisaFF8M 0RlXCiI+oQmYZQak8c0ogfYngX8n1oGtir65yyQGrTBhiEwz3NhJGRbEssFK2H4GskHp/C uyvCwFr6HfEzijg3x2y+oxB1+ASDnOg= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=DNBNLnNJ; spf=pass (imf26.hostedemail.com: domain of peterx@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=peterx@redhat.com; dmarc=pass (policy=none) header.from=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1713540124; h=from:from: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; bh=XYoEcbDndyhCownGWpj006Efk7M0aOxnlzP6C0Hoi1o=; b=DNBNLnNJ2WsuW62Gg6Z0SCL60iQdO3GWCWbyNHoIfX4tj8QhWUTmF07WFH2OVJn/X2rBqT XkZDNUSLOe4YqYNx6BDeSUbYGTs82te8N6ghIjxYdQR2VJiWjYN7lfP1AvXlRZfxduZNM5 X4SWYQ+3ASOpyGP6pJLiqkRa6NRTXoU= Received: from mail-ot1-f69.google.com (mail-ot1-f69.google.com [209.85.210.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-314-CY1gX9JhMjKQsDK91NkWVw-1; Fri, 19 Apr 2024 11:22:01 -0400 X-MC-Unique: CY1gX9JhMjKQsDK91NkWVw-1 Received: by mail-ot1-f69.google.com with SMTP id 46e09a7af769-6ebc82e112bso552142a34.1 for ; Fri, 19 Apr 2024 08:22:01 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713540121; x=1714144921; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=XYoEcbDndyhCownGWpj006Efk7M0aOxnlzP6C0Hoi1o=; b=p1/iM0q1sv1Y6Yck2nvG9S3xl/xGtdA/E5Hnplbe0INA6b5qLOXKqsusdfZ3nYkjFt eA18kEEL4WD92wL/CY0Y9/QLs/NVIOHa0IbNhiozBdBPQo6Je8HR15my7Jpq0tXxAN+X +xi3Nr/ENy2y/XnlMaUG2k4Dv7xCdGdloZW+o3Ro3CvKeoeOAiU3Xx0Z8jtR44nW7TfW OVyNDhKLEbHLZK4M5AHAJxvXHgPQjOnET1TJO64qC8u/KXknsJDmjjNh0ehM4OmtxLJL JmtR6PFZIAfgaLyb4mtMfngE0HD67gn864n7cLsgDOigOzI7ZV2x6DCN6cN8UvqxcL/s SLCw== X-Gm-Message-State: AOJu0Yz+mNf1JpdyDJmwLfoCjPs2lXkDV2+Kd6KSYmrFDVNHEFUiRTWw OYoGfJFDMQhHJuOGdzRGRU150De4Ack7qgnYTPl0xHPCfl/9NUcZSK2p9cyg2rFkMzAM2anYhTu 7biFeCJ9aeS+uPt0OxhnqYwh9cM9LbBRdJ+LSBeleHaIZUzSx X-Received: by 2002:a05:6830:1005:b0:6eb:d466:aaf5 with SMTP id a5-20020a056830100500b006ebd466aaf5mr2052443otp.0.1713540120744; Fri, 19 Apr 2024 08:22:00 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHY2wIQBnATGA2C+bt/ZQ3xgZjYZvLmZNmXi8KS8LWrW44TJf7aT5W27ju6eUf2PBuAp5a4bw== X-Received: by 2002:a05:6830:1005:b0:6eb:d466:aaf5 with SMTP id a5-20020a056830100500b006ebd466aaf5mr2052412otp.0.1713540120236; Fri, 19 Apr 2024 08:22:00 -0700 (PDT) Received: from x1n (pool-99-254-121-117.cpe.net.cable.rogers.com. [99.254.121.117]) by smtp.gmail.com with ESMTPSA id wk17-20020a05620a579100b0078f1c03f06csm497608qkn.113.2024.04.19.08.21.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Apr 2024 08:21:59 -0700 (PDT) Date: Fri, 19 Apr 2024 11:21:58 -0400 From: Peter Xu To: Mina Almasry Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, David Hildenbrand , Andrew Morton , Muchun Song , David Rientjes Subject: Re: [PATCH 3/3] mm/hugetlb: Assert hugetlb_lock in __hugetlb_cgroup_commit_charge Message-ID: References: <20240417211836.2742593-1-peterx@redhat.com> <20240417211836.2742593-4-peterx@redhat.com> MIME-Version: 1.0 In-Reply-To: X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 8CE14140027 X-Stat-Signature: n8bw11cb9enkn5orfsoz1bcb81t1f1mi X-HE-Tag: 1713540125-466573 X-HE-Meta: U2FsdGVkX18RV4FtkcFk8GLjj8QwbhbwW8/aFIb7fKwzHNtyN8FlMnFkoTZKQUx22V9k8vVty59hUoEc1/aoMPUiF4Qdd0RGJPkEfJNkirSVci3ddolvzbFY45ARFF9KwKTP9erX0qqDNZf94zvmUb7Ucz+ZbmMvT7ReAadLfes8Q8mZRV5SYSBFPOdqRsRNtE5vFTPoIrnNvwTd8IVIzEWFHTdEnDmbthWNlHp5qFXr3ZdEs1X1qsz8rb2Q+06D4eSE22D64CPBizm7saJxHv5toShUyreHfeRuUds3ZU+ZFmCr1VouhYZBWkvrgBGV0XzPqT0j7wHnt7Jkt2X8fDKeItEQ3+g0ajg69JJz2FMWE+I9e0aUt55lbmAa2j3s8CMBRWnbHh9v2xnSXdJlw5gTj3GmFYjdvWVpFhaJRux5d4CyZWwkaDQhbK0dxzjKFOorfEwiPEC9OURBdLZ0petynbvyC8ieoE6rua1SK5mU/GSJnZ3+URqZdDSI1VV8V+HiESpeWhy1pEr9WVG4TeI8WT98z/on+1HiS29RbyWXq2d/BMOx0XCkC+tPWRpl2y5cyctp+4/YQ6BScwzS7JZJ7Lau98GGvzOsvQprZfx/FF1NNwalKmgKquHr+wVND9epjYE6rheNutHxEuGG/Js5xdLp8lM1SrdMsHDg3R2QnA9XqdApPcr30NewqcGMnjDuIxSfgF/Y6sSMRUa1irciQBPYdFrVrfUCLIEoowoHzYKg8g8X9Y01BWQRSDZrzfIb1OGpn5z4J9V4SgxKTfhKihtWXt7C0pLtOIYfrDHpSzV17W+3oC7u1e+h7ZMf5QNqdSj+oPrcagtJlqCfd3aAPy3U685fGH5Ognxg0Ag1gHDrX6XavC3/OB5MdnOHEx+q4+5lBBanU2XUCrMbUh6oOG1coPNQ3eifFaMOzY00Q/BSxk7JbzOwR7T3RyBGFIEDNFnp6LTSyRjBQam mcuanFQo LqVgX034ru/98toAL4PZNwFA8wtfc/XpR5ZVFQZNvJTr6LupvgeqoMoCTLO9arPVR+iKxS4iAFRSGPPU6EhJjtEBakAwX2tj6Qpnk//ox63gmKOujvz/pvTsLPP+5bCE+p2GpUQNLyKBksJK0lkBHoD2KQN4BuuA+7jh0gh4P38cpWzihlRsWyULZALcm3ghnI7QYZThNXCwpaT0aQKTXi6PODzMt4RJcG6xfTZCbMRAsXo1SwQuVOIfdCW86b75ONUrWcqMNtvd8tHpF6QZpoAkDMuUCyYKrpjv1HxwXDoknp82cnTASh8kGBYYe3wkORr/u4Km6mLjgPrl5lXU4mmEjJ90fvU2u/NYm4BsKrIlqlEstqqxeEOZG5tqBfScPU/lyqkLUU77ByhLcfMQvJW4UKmd26YIxGrlAGgYuadfo2qX1UAGg8mg18zuitxN0Wfak+Yh3i53mzFB++UqzYZSiuRe55YoYDMQB 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: List-Subscribe: List-Unsubscribe: On Fri, Apr 19, 2024 at 08:03:08AM -0700, Mina Almasry wrote: > On Wed, Apr 17, 2024 at 2:18 PM Peter Xu wrote: > > > > This is similar to __hugetlb_cgroup_uncharge_folio() where it relies on > > holding hugetlb_lock. Add the similar assertion like the other one, since > > it looks like such things may help some day. > > > > Signed-off-by: Peter Xu > > Reviewed-by: Mina Almasry Thanks. > > > --- > > mm/hugetlb_cgroup.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/mm/hugetlb_cgroup.c b/mm/hugetlb_cgroup.c > > index aa4486bd3904..e20339a346b9 100644 > > --- a/mm/hugetlb_cgroup.c > > +++ b/mm/hugetlb_cgroup.c > > @@ -308,7 +308,7 @@ static void __hugetlb_cgroup_commit_charge(int idx, unsigned long nr_pages, > > { > > if (hugetlb_cgroup_disabled() || !h_cg) > > return; > > - > > + lockdep_assert_held(&hugetlb_lock); > > Maybe also remove the comment on the top of the function: > > /* Should be called with hugetlb_lock held */ > > Now that the function asserts, the comment seems redundant, but up to you. IMHO there's no harm to be verbose in this case, so I'll just keep it simple to be as-is. Thanks, -- Peter Xu