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 AC8F3C4345F for ; Fri, 19 Apr 2024 15:03:31 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EDE776B0085; Fri, 19 Apr 2024 11:03:30 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E674E6B0087; Fri, 19 Apr 2024 11:03:30 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D07D96B0089; Fri, 19 Apr 2024 11:03:30 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id AE78C6B0085 for ; Fri, 19 Apr 2024 11:03:30 -0400 (EDT) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 204FDA14F4 for ; Fri, 19 Apr 2024 15:03:30 +0000 (UTC) X-FDA: 82026600180.18.82724F5 Received: from mail-lj1-f181.google.com (mail-lj1-f181.google.com [209.85.208.181]) by imf01.hostedemail.com (Postfix) with ESMTP id A15AA40010 for ; Fri, 19 Apr 2024 15:03:22 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=xylZmHn5; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf01.hostedemail.com: domain of almasrymina@google.com designates 209.85.208.181 as permitted sender) smtp.mailfrom=almasrymina@google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1713539002; 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=2NDGRYUeyiTR1EMXmnYw7OzWCIL0q6vZIdToFz9TtIo=; b=aZEEsXIrHLhmN1wUheMYfx1zjP9Ba94TmUtfoDMfLEZdHpXAj30hRxeQN9CXd00LzfQoae j/vVEZmM/DSu766mXfjbkhz8o3aV61kMkX5muViafQwcLW1IkuncB1En3SwLRMYpuG1cVl eSKTWLmHHsUPAwSFAJVD81BX4KXjdvU= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=xylZmHn5; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf01.hostedemail.com: domain of almasrymina@google.com designates 209.85.208.181 as permitted sender) smtp.mailfrom=almasrymina@google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1713539002; a=rsa-sha256; cv=none; b=lmLo+WtIuwy0j/Hh25v40T4fX33QBs2ITaOQ2+5VIRLHGn9h/XSFz7OnWG2Z5Ck60naWg3 DpfSJe6D4BlXYhb2BlH+JGZ8TNMvnTN8wZkk6DJ9EDTkAoOrDxB0Jpv8VK1z+jSZMpBU0G oExEVYCz/ev5F4NuDExWShTxVkNWcE8= Received: by mail-lj1-f181.google.com with SMTP id 38308e7fff4ca-2db13ca0363so34795491fa.3 for ; Fri, 19 Apr 2024 08:03:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1713539000; x=1714143800; 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=2NDGRYUeyiTR1EMXmnYw7OzWCIL0q6vZIdToFz9TtIo=; b=xylZmHn5oTeqpxRw3RlcFfYqvVgwSKONyUvP77sQczXXtxKkNl1fiSmPJss18bIy5I 0M4hUXjbwBBQ/w0UoeMv5mWhXrii1V7g2YWg07NhyM7t2frW8IiFSdYx8LjcMmaicZ/K Mw4JnEg4PwulCJWwO6PW4Jqz1wda8Mf1R5Z7Ug7y9LhNwuyhA5acmYVnxyQ5vrDU3o/k r6ZcWdbdVvmqhDv0FbEfQPbbVx7RCbuNTJstBYSH6xbS+4Sm5pQg4gnhy0/xW2cwDO1J U1tQBoCPuG6fFOUIz4C0+fT2FAB2QTgOlmIdzqnVWMlAyKiQoxKlP4892O/KdbeOr7zv b0RQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713539000; x=1714143800; 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=2NDGRYUeyiTR1EMXmnYw7OzWCIL0q6vZIdToFz9TtIo=; b=mFnpAcgTzMEzUXoyNZDUl1acIyHxoFFo3JZG6f3NzQFLAqZlSL5ruBKUf3syXJE6Ua wum/VzXgcLywEcuAYrshyai6tGuiSZla6h2FgC6pyE1NzpZqvTn+Mf1hlLwauHpzoU3X rUJCbWU4EtGmAbZ7CTgXUVmp8lxwwxioHtmu7QPJjiaKEKmXRPjixUIERzB02NkXUR48 QGYlaa3gdkXMUF+3AVXBE6oFb+PmckWSM5hJu5HmwovksHXTYGYUkFpVJnonwv6DlDVm DvnIKM/09jaXRNLSzD9TbISEah/MFRHlxCDxpngMHXnvSCwxRSJReWNBKaDpAad4DfuX 9ULQ== X-Gm-Message-State: AOJu0YypClrq5rANxmxgwxtFfvmx0/1PZTQRRKtS2frSgfoWdRRmxAr7 Fm8unE8R8jQ1zuXWjwA0JO14+DgiHoEwhKSCAtUmb3g9iZ3W59D0T9+DD8j4BhRFThieqJ01XCj LyJn1EGkUIXOFMGdNaSBCPFgYSZ6T9Uvhs/U0 X-Google-Smtp-Source: AGHT+IEXSNtgPNWoEBoc3JoQJIXgarCTe4GVAdmcjouLXkIWQ/vxaHbzioyhfn2q62OMP8+k5zXoKHSL/1EHYGJZZTE= X-Received: by 2002:a05:6512:224a:b0:519:3cbf:f734 with SMTP id i10-20020a056512224a00b005193cbff734mr2234601lfu.49.1713539000038; Fri, 19 Apr 2024 08:03:20 -0700 (PDT) MIME-Version: 1.0 References: <20240417211836.2742593-1-peterx@redhat.com> <20240417211836.2742593-4-peterx@redhat.com> In-Reply-To: <20240417211836.2742593-4-peterx@redhat.com> From: Mina Almasry Date: Fri, 19 Apr 2024 08:03:08 -0700 Message-ID: Subject: Re: [PATCH 3/3] mm/hugetlb: Assert hugetlb_lock in __hugetlb_cgroup_commit_charge To: Peter Xu Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, David Hildenbrand , Andrew Morton , Muchun Song , David Rientjes Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspam-User: X-Rspamd-Server: rspam11 X-Rspamd-Queue-Id: A15AA40010 X-Stat-Signature: f7ayxe9se9dqa1msfrun69wxwjop6xu5 X-HE-Tag: 1713539002-998015 X-HE-Meta: U2FsdGVkX1+ZjQJVdjSrm9gf//6O0TG2GRsHRHykDeGOW/D+2XIir3Pqsbd3CKKMgxwroW4oN7de+dhm945CP9SXyBi6EIEoq0zaYcuHqDsDe6zE8LXsqaBJqANW1rb9T63COBy2kD8jyfKVMUgkFp3Hp8flD/VzxvYJfO6ID47V+lbJkSGr3Y53bIVszC6wJom+Vg0AAP7Gb9I73GvsOrEKVx9gEljovaDWigysXVY09XR3NkOFDqHVlBusJCv0kF7bzesbZGCQtA5tc8zlKS80AU4ML613GNQ14eDHaZCPRt22FlF9zPQzq7h/twrPZEEM/OrCU/G5SkuTZNhHpZmBeA6zt+tHqZdpinQUXee1KS3XNXcq9hVThup97DFoK28fbLhhFnCXSS46aeFexR5zATzUGTg3+qgbuc5xGTxTVMKbcenQP8GxRMaLGxnkMIST26TMMgM4/e/mbtDm1GkTqF85lWd6pbXj1Csjg7AmZF5ELuqmwoCitJ13HeKxgPQg5phGjscCi7i5rxFf0/ZlCuAz3vh5HycIG17OTF8q7F5vPOAnVboU53bz+5f9Flz04v8SGtaDMbJtIjiQY5eFTcc1qZzY+ja4WC8E0I1AIYnx4QYx26hE2p73pBBt1ydNGsWUaBhJiVtBed7H7AKy7viXP6D+1qV3UGZ3FBpiJZcdM02sj6+wERLli+aNDp/WjjPzFx7KlCYDCRdXkaZ9RvAGMj7bO1AFhyiqKiTai/WIbtzveYM2MhJQu458SgbJ1nxMzp4JwnLEliLltufdws1MeqZmMo1oWoKOlZHUW2kaoO3vIPy+FBossnmDDu4PZzqAX1EgGxF40TD+D4Yub34/xGBaNdWT37/+1yTxpH3yuVJYdJkPP18RetGAalfbGB+Tlqq3E8jhfRpnSM8Li2ALFHSi8EK8fchGcd8+rzTKJTPO9FuZNN7NA4NPKOiUh9wrFZrCHLbCIWo VmCSy8eH WAemHq7VKH2d6y4JDhlgcBQ1BM03w3NNV3qyjVDTa2zJIkdg+WiKWDOP3PQfQPNavCmnup0+v/mK9O3fMgZBiMGa/NniVH6Ksn+UCPJUAjblqhBrmjoGaLbtfbG8wLNJ9d18yexLpQEA1x12gjPXxMIan3sOSJa1BJdz+KpR3sY89ohk6grsxKHcemR1+hzDzr4aC9vx1h6VFsy4rNPIfjOk7BITM3txqcCGwUhwQlPoacNUp6ZCNzjtt+/BzbRLgufJlBhJflPalvQIo9h2WmNHgKL0ka6kuYGQjQlk6r3WcAm4iiu73Pkva5BDJ+LO0My0f X-Bogosity: Ham, tests=bogofilter, spamicity=0.000110, 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 Wed, Apr 17, 2024 at 2:18=E2=80=AFPM 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, sinc= e > it looks like such things may help some day. > > Signed-off-by: Peter Xu Reviewed-by: Mina Almasry > --- > 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, u= nsigned 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. > __set_hugetlb_cgroup(folio, h_cg, rsvd); > if (!rsvd) { > unsigned long usage =3D > -- > 2.44.0 > --=20 Thanks, Mina