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 B3B43CD1297 for ; Thu, 11 Apr 2024 01:47:01 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1CE686B00AC; Wed, 10 Apr 2024 21:47:01 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 17EFA6B00AD; Wed, 10 Apr 2024 21:47:01 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id F3AAC6B00AE; Wed, 10 Apr 2024 21:47:00 -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 D42596B00AC for ; Wed, 10 Apr 2024 21:47:00 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 730D3C09A5 for ; Thu, 11 Apr 2024 01:47:00 +0000 (UTC) X-FDA: 81995562600.02.F394877 Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) by imf22.hostedemail.com (Postfix) with ESMTP id 9095DC0005 for ; Thu, 11 Apr 2024 01:46:57 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=gSU8xTd7; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf22.hostedemail.com: domain of 21cnbao@gmail.com designates 209.85.210.182 as permitted sender) smtp.mailfrom=21cnbao@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1712800017; 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=SBkc5xYVwMKEG/SI/x9eG7MtNlDql2BuiF4/x6PZqbY=; b=s7a/r3Uipu9GOFl2wuPx3ortHtAEXVJY8FihplpcDUH3KlzyoS9fInIOo8EEp0SMmIRhOC g2MeAirAdpzrsqGzNXg1xKEBhHnV/s7aJ5qJ5GJGqhzI1WaZr2R9R+TBqTMtSV0Vzbo0vL dTDxnikc7kJNFuhEddtVoQdAEv/Rqfs= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=gSU8xTd7; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf22.hostedemail.com: domain of 21cnbao@gmail.com designates 209.85.210.182 as permitted sender) smtp.mailfrom=21cnbao@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1712800017; a=rsa-sha256; cv=none; b=BSZrqNejCDX4WYY5yA41TLvKL4Yr7ZkqXcPEG8GUK218EOxGY7TCyvsmMsgXpt+/TbXYOb T2sUAECfBK9n1CLDmjdVeUfXpCy8rGr8C2uDzunNPqyMkkDYrQ5U3DhXzDTyzkajjUHqeb qqMX2McGFxt140jSmVGaS1x3wGfonsU= Received: by mail-pf1-f182.google.com with SMTP id d2e1a72fcca58-6ed691fb83eso2689582b3a.1 for ; Wed, 10 Apr 2024 18:46:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1712800016; x=1713404816; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=SBkc5xYVwMKEG/SI/x9eG7MtNlDql2BuiF4/x6PZqbY=; b=gSU8xTd7xoMl1DzPKdBSnF/IrazxKOxFxG90c1DEUja42ulWdrAY3kSHbiGhIRg1Xk yifV+MCU5985HygcvhSKRu4YfS3pdfioyMMM+ffl696XAgsMdwafa1SsY+u5cTz9YmLU XKwJbnF6siwtCtK2FmK8byFq0tunzLRFSVmkE/42uU1yF1hfAMkSa29Wuvd940jx98m/ NI1MHvz1a/IxocBDnu8PariLf+66zqITVbO5ueGjkXxkJj9/coh6ntq1ZucU62I3Yfxn j5zeVb2rZxnRI2MW7nIxUUsFJgVVVkRyP6HfbtyLfN43b2yCQih38b8CaKiNdBUjZTBL Y7OA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712800016; x=1713404816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=SBkc5xYVwMKEG/SI/x9eG7MtNlDql2BuiF4/x6PZqbY=; b=wPyJA2edJy3TDPfj3yWfJzbZg6Zkdici2h65WHViBYXae8Zp3zMVbH7jZXxwH/mQRx +0bH7Pwkq8p7MSxPSlHmREy6dRc3kL84eBmYtrz0R3joNV13ZpQqaNxVB1tAB6gQPUbi uSW2HMedMTNVrOPjEDkunJDS3Z/6N19O2l5ApgBysCdrmAagyrqKr0QsQwuqTBFk6d0+ 5Q3a/O0eMhWNNqVjRUhMygUwiN1QrmoYruXQSE2l7BXryWqwStS5/+pe+wdt3f3SzS6A /SqFUHIuwYkr6Z0r1BN2unyvYdoSCvRZcTVZvH5BJYPJcM3cEMJDQn6lh2v0o2IlUk49 mBpA== X-Forwarded-Encrypted: i=1; AJvYcCX5qoyiw6P3GeXhDLtOMP4q8TBTAv5VCHxiE7NLjoGiNSsB/RNbGovwXkXccfGR8Uv5IvC7hnhiTxEJT8ao8SUnI0o= X-Gm-Message-State: AOJu0Ywo7GROFrHOoV/3uiwLLM9pvEdYNUZ0mgamsqZq7hgLGsnjcSZx f0XXx0jJZd0PfNF0dSPHANALvmMIvYR4DN19Gv0exl1mZQeAe5b8 X-Google-Smtp-Source: AGHT+IEEmEz02QQP8SKCrvx6IzhdE10K7XIaKIEQQio2L3lnH2XboM4Zvu+Ae/3Xc0aAJOJYwyO8Pw== X-Received: by 2002:a05:6a00:2d8f:b0:6ed:416d:e9a with SMTP id fb15-20020a056a002d8f00b006ed416d0e9amr4359419pfb.7.1712800016324; Wed, 10 Apr 2024 18:46:56 -0700 (PDT) Received: from localhost.localdomain ([2407:7000:8942:5500:aaa1:59ff:fe57:eb97]) by smtp.gmail.com with ESMTPSA id j16-20020a62b610000000b006ecceed26bfsm294724pff.219.2024.04.10.18.46.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Apr 2024 18:46:55 -0700 (PDT) From: Barry Song <21cnbao@gmail.com> To: sj@kernel.org Cc: 21cnbao@gmail.com, akpm@linux-foundation.org, baolin.wang@linux.alibaba.com, chrisl@kernel.org, david@redhat.com, hanchuanhua@oppo.com, hannes@cmpxchg.org, hughd@google.com, kasong@tencent.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org, ryan.roberts@arm.com, surenb@google.com, v-songbaohua@oppo.com, willy@infradead.org, xiang@kernel.org, ying.huang@intel.com, yosryahmed@google.com, yuzhao@google.com, ziy@nvidia.com Subject: Re: [PATCH v2 5/5] mm: add per-order mTHP swpin_refault counter Date: Thu, 11 Apr 2024 13:46:36 +1200 Message-Id: <20240411014636.14023-1-21cnbao@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240410231538.131175-1-sj@kernel.org> References: <20240410231538.131175-1-sj@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 9095DC0005 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: yjjp1picg814qhz8e8yx1q8yr915mqfi X-HE-Tag: 1712800017-765152 X-HE-Meta: U2FsdGVkX180MWi93PNy3szvpB6ecnSmm4bVqjfWIBLXv4YPtvYit7rV45EqhP2GwP6FV1B/7eF8DKTkWGEQkdBw3595g9XSQComBX0UEy0OCkveWucU2PdUOjwrhs4Q+1dQ5QfU9Jpy2rlpb63WxK+vpVqU8LYFHJr7a51OzkRfR18ZYBmVgmSG2uQr1Vtcn79VRV6lSmMU6eU5qqnEQYk23CQ267QTAYvvmjK266f0xmDCnZVdK+G9H7gRidEa6ZQgssLlncTzsIvyQM73gJBQf1KiV7bWPDmhAxAZx+ruOIRQYUXXhcWXX2bQl9lyGqUoXJcIuKF+jkqsoMGQ3nWFvb+IzUvtC5qHU4Y+36tOqG5fpDDbpfGRdlBR4cXwsl3AEGtQrMX/vMosrEDIyOScwDk0E9uZDseGyAuaTukbkkYu5r0wVctJvB+8G14hTQ9xFv2mIhL3uFubAHYwI2Rv6NaI/Iju53jx6yVVrAWOfKQEvGgPQw3JlLUMNf7wogrzvxSgZLZ4Bk42PMPLae/aj56dhGqnRx25kcn5N8pQHB7RDmYZYRibBGNwx/rskfZ4Fmpcrl3ieyuZvzHFKL4EPCi2Ud3bLNqI2DpiwXSZzFHvWp5vOU4ofwyHhiNd1Ky2uKO86z19vPIda4n1hr/U31yEwl4SA+kOwzFE5Xhqr8l/7qdOtlu6sX1TCiwX4/z98k4hK9+e7RWevFWsDU5a4WD9t2iY8KWTo6cziOwBn8dOwSu0auMxEqxtqfPMU4PYRhu6U0sCyGEwppNbQqTucXU1MFp57Xw2WGjI2y38ryocESGbhx/IdHfCAkQYKatJoh2+rlVd3eQByRSoZzTq97TSAsrUsw7vI584yGKOmQdjk3AK7rNyL8cQ7BdRnDawGgjsiNYeA7DHz7kYgLIKYOPF8US+OSei1HMhPUfrQqyZTNwovUkDu3i4e3c2eQyrYDNLlR089yqFvgF sge7B55R xUd6Z9ZzIG2m80bUtHf5mtHOeq2K8ineahZOgNEKKJn6RP0oX9CgtlZuxbm3k9HtVpQ5Pn9sMGyZljjflDWDteU1wESUZ8HArQdO4k+ZJD5thTKhozqs1wqjZh5Kd0Cm1t888YLhrCaCdbY1MsjwEOr6WcUFD+rd0L2ahpzFDHt6IxojytRkLDTwmEQtuUu7bafsWiw5GTVlJdIw5eMeeCVWx0pxu5vZ/gkcPYFgpVzGgmIRQ7owaFD7bzOCwtsgwHIEjfXUNxigJUbDBJ3K0ypKBJKYdzNXJ70FcsvHbwXQh7mnzGS4uW89GVib0JQ8IAzDCObmzWTHgKt77gCB/ZnfyZksbzvLQwLSPbAIbM4TdZg+g0ycuz1Q6METId+2CxeBoNbT7GIVfsXfFKX1il/zf+JEzy95qDfXHpK0o57fs0vfIrv7Yjzh8CVdOpp3o390xP82+Cp5J1yIA+iejBncT7jhgMbIpaxItEKMgt2f4sdNA81nv0u7xgpxEkPn92uVxi/N616L4PBy5F3NFGbm0fv1pYn1oQcgxOeFxZB4HicC1DbBgV0AZLkXkZLG7ekgiDLwg/ZUr+2E4U/5h7hlYf0kPgu6FaZ4ZtUBqv6FuJdc= 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: >> + count_mthp_stat(folio_order(folio), MTHP_STAT_ANON_SWPIN_REFAULT); >> } >> > From the latest mm-unstable tree, I get below kunit build failure and > 'git bisect' points this patch. > > $ ./tools/testing/kunit/kunit.py run --build_dir ../kunit.out/ > [16:07:40] Configuring KUnit Kernel ... > [16:07:40] Building KUnit Kernel ... > Populating config with: > $ make ARCH=um O=../kunit.out/ olddefconfig > Building with: > $ make ARCH=um O=../kunit.out/ --jobs=36 > ERROR:root:.../mm/memory.c: In function ‘do_swap_page’: > .../mm/memory.c:4169:17: error: implicit declaration of function ‘count_mthp_stat’ [-Werror=implicit-function-declaration] > 4169 | count_mthp_stat(folio_order(folio), MTHP_STAT_ANON_SWPIN_REFAULT); > | ^~~~~~~~~~~~~~~ > .../mm/memory.c:4169:53: error: ‘MTHP_STAT_ANON_SWPIN_REFAULT’ undeclared (first use in this function) > 4169 | count_mthp_stat(folio_order(folio), MTHP_STAT_ANON_SWPIN_REFAULT); > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ > .../mm/memory.c:4169:53: note: each undeclared identifier is reported only once for each function it appears in > cc1: some warnings being treated as errors > > My kunit build config doesn't have CONFIG_TRANSPARE_HUGEPAGE. Maybe that's the > reason and this patch, or the patch that introduced the function and the enum > need to take care of the case? Hi SeongJae, Thanks very much, can you check if the below fix the build? If yes, I will include this fix while sending v3. Subject: [PATCH] mm: fix build errors on CONFIG_TRANSPARENT_HUGEPAGE=N Signed-off-by: Barry Song --- mm/memory.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mm/memory.c b/mm/memory.c index acc023795a4d..1d587d1eb432 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -4142,6 +4142,7 @@ vm_fault_t do_swap_page(struct vm_fault *vmf) vmf->pte = pte_offset_map_lock(vma->vm_mm, vmf->pmd, vmf->address, &vmf->ptl); +#ifdef CONFIG_TRANSPARENT_HUGEPAGE /* We hit large folios in swapcache */ if (start_pte && folio_test_large(folio) && folio_test_swapcache(folio)) { int nr = folio_nr_pages(folio); @@ -4171,6 +4172,7 @@ vm_fault_t do_swap_page(struct vm_fault *vmf) } check_pte: +#endif if (unlikely(!vmf->pte || !pte_same(ptep_get(vmf->pte), vmf->orig_pte))) goto out_nomap; -- 2.34.1