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 16460D16246 for ; Mon, 14 Oct 2024 11:32:16 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 970876B0092; Mon, 14 Oct 2024 07:32:15 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 8FA706B0093; Mon, 14 Oct 2024 07:32:15 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 74BAE6B0095; Mon, 14 Oct 2024 07:32:15 -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 56AAC6B0092 for ; Mon, 14 Oct 2024 07:32:15 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 773AD160D4C for ; Mon, 14 Oct 2024 11:32:06 +0000 (UTC) X-FDA: 82671993894.20.DD3A6C2 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf16.hostedemail.com (Postfix) with ESMTP id 9BC0918000A for ; Mon, 14 Oct 2024 11:32:06 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=KJDIRUTj; spf=pass (imf16.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1728905460; a=rsa-sha256; cv=none; b=JTAlsKlx6wZegMmvgu9r+7i7Jv0ac4DYIOpLivqwI/ZtI6KxxFRlkI6ckF/ToJstrgLJnj yzv8BnsP22KcO1aQjXKjSOdWsCkz5yiTvZC6MueZODthq1nJKUjMpg/ZShPX6T1chAqMM6 93X2yBVJYgvbzHS/hsnR9Q38SZpU3vM= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=KJDIRUTj; spf=pass (imf16.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@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=1728905460; 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=buBQXTyIlVVvpYgFtaOBeNixVmerWC6gs9O9i5Q5eao=; b=vjZC9PE25ss6XsgNFPxmT8NcpaZ3eNsxomW6/iaMOnM0St864kRFhDKVm+IYVkE6ABNJky sy9y5aC5KeRqU+A9zTaSHIIeTtQ88dJXCSM6DY42thvokABmrZjV4gl5SqD7W+Zc02Zqao h49u1vAzFyZhALbPeDjkk+QznbXaqcU= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1728905532; 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:autocrypt:autocrypt; bh=buBQXTyIlVVvpYgFtaOBeNixVmerWC6gs9O9i5Q5eao=; b=KJDIRUTj2sHK9G5Ap8eBh9UPGnm6o0F9xCaC1JiND07S0CxWAB/nitQ+WMyrVdW95LCqqi jdeNQoG6lItWYwdN9OxXLzInzXL/fgkK6yML64A+yRk0ytEbqy5Qpczw+ynopAjiWMkuSZ O9CJU4H1m+HhSBjUSLGgVUD9Vvnw5Ts= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-643-FI7c4NsQNJ-d0q485RiCxg-1; Mon, 14 Oct 2024 07:32:08 -0400 X-MC-Unique: FI7c4NsQNJ-d0q485RiCxg-1 Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-431177f2bb3so20683955e9.1 for ; Mon, 14 Oct 2024 04:32:08 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728905527; x=1729510327; h=content-transfer-encoding:in-reply-to:organization:autocrypt:from :content-language:references:cc:to:subject:user-agent:mime-version :date:message-id:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=buBQXTyIlVVvpYgFtaOBeNixVmerWC6gs9O9i5Q5eao=; b=tkYQMt9A1yPTEK7F4o6OITpQvO3E9Y181ST++3/vzQKmV3gVq994T3I61CduGkGLfG D89yr6oIpiiG6LQWUMD4sD/G+uAGVzpLbwxmS7fQiTiCxMKO/p3NZ+vDtslP/8UNW6Ew aWRV3BTmnhyorANZKJIZnl0aE4s1oj5fEWIvcZOu0/wJcUvc1uWxLDFMCQO2JWKmsvKP XL+2r/LHEHmAWw6ly1CLnQe/mn5VChtj2UmUCE0QQUp/QbrJBMZ581MfCENAco3v1TWm bx8fS6Wtt6TUHwSVa3Ok71qiZ5Xh5wLN86wdTyKN/uctaFADVlaOdRw7PrAWvK5tXsNs Knnw== X-Forwarded-Encrypted: i=1; AJvYcCUpYES1gybDkbwsa6ZoXYJ0ewPYminJ/c8QVaJ6SKFT1RFi7gFc7Zn8+jx8yqshh8XDGLBFcncdKA==@kvack.org X-Gm-Message-State: AOJu0Yw9X1z2whQhGTp2DLHkDeGLRQT0TgXxKYtcboSK7idWkUjmYmjd Hw+c6VrbOHAEQ+2XcQ1oNX1F/LiZR1zdhZqDnfZyKkrBvcRG8zj1bFYQSN5Uoss2DLChJF9vPzp XcFnjdvcPhB2T8jD8Uexm+Aj+DTK9B/I2d3TSt2ktu1AxroUR4Q6swL2FEGk= X-Received: by 2002:a05:600c:190f:b0:431:251a:9dc9 with SMTP id 5b1f17b1804b1-431256099fdmr70327935e9.25.1728905527599; Mon, 14 Oct 2024 04:32:07 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG98VPwpWoEVUBpV5FZz8m/ngWDBS02ObK5d+QtEsfSlKS7gSe5WmneDcDW3Eye6TRogi1cpA== X-Received: by 2002:a05:600c:190f:b0:431:251a:9dc9 with SMTP id 5b1f17b1804b1-431256099fdmr70327725e9.25.1728905527221; Mon, 14 Oct 2024 04:32:07 -0700 (PDT) Received: from ?IPV6:2a09:80c0:192:0:5dac:bf3d:c41:c3e7? ([2a09:80c0:192:0:5dac:bf3d:c41:c3e7]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-430ccf4b1a0sm148383755e9.14.2024.10.14.04.32.06 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 14 Oct 2024 04:32:06 -0700 (PDT) Message-ID: <74467d4c-3ffc-44c0-8e9c-4d631ef9162e@redhat.com> Date: Mon, 14 Oct 2024 13:32:05 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH] mm: khugepaged: fix the incorrect statistics when collapsing large file folios To: Baolin Wang , akpm@linux-foundation.org, hughd@google.com Cc: willy@infradead.org, 21cnbao@gmail.com, ryan.roberts@arm.com, shy828301@gmail.com, ziy@nvidia.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org References: From: David Hildenbrand Autocrypt: addr=david@redhat.com; keydata= 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 WNyWQQ== Organization: Red Hat In-Reply-To: X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Stat-Signature: etp44fja85ia4njka8rrts6rhur6pmrw X-Rspamd-Queue-Id: 9BC0918000A X-Rspam-User: X-Rspamd-Server: rspam10 X-HE-Tag: 1728905526-173617 X-HE-Meta: U2FsdGVkX18tqllxyPuoksmOZqBfNJkvgk+Dxnb36YA8d/yVTs4CKOl2IutR6pwm8BY5g7wP2JSjUCX832pMsuqklIA39jXFrGNmoOGXvOcTXdvq6aCxX24CuNKwZPvmffXzH56rPlk0KwWXl6iPhHAYlXzdAcf7nKjuQ47EiWbGh+X3APhskBDqi49QeB555NXEjI7YffyaCWQTzTDde0gVFUaEVpq+YRYN05CmObBoRP40V4smMEAKoqcxLCL8vjNPCatfwPUSIW0KTATpV8we8MNf8XH0rTPriMP7V/Y+8xU7S64h7Js4JDbKZlOWcpTevNnQJ0xcgO2RcxSXry1TX2S3LKwW+pIQg8Wi0nVSSDuFZ0K8tmc2s6bD/JImJTFAsGGoDMjX3bfoPVOu4K6+jMTxp1Vszrh0JxeLGMbOjesnC8AVT2I+pyzKTFbY56JrADxp2Ae1vJxC4CW+jhJw1Ti+V1oM2wmKoDQ/s7jnB4oWPqH2hNgCRtv2AftDxydaNvDXHzKzLqGHOFDxi/Wc2r82OEturhaWHUPasBkEICmYYCT+MUdwuEb0JdHyf8wmUtBIbNm3e17US93Oe/3DU3EnvfcK5+iNWZ3iGiHscXOJhXKFbaRE+j1DE7WmlwIJFlvySkxR/1Qnmzpm9kv0eTxj8Eld4oK+OnHWUQXojvpzSAV9L2j9aF2UIJzZtE3dB8DhQotpLfkejnu833Kv4wPCH7xVKsho/vp3dlqJNR0yA/Za9vIk8VIIdQKPt3FA1D/q5r3a2g13X78kgJh+k3ww5YElY399bR3kIfSWcFEPVTQBG67SXuG0Ojgy146fCA9ewTqJ6l0yGXgiqMQ6HvAZKtzKyFEEP8F6MJDguIqzWyM2rgnJM4XjKfX6AoYF2g6Nb/nEsOo6V4pjZTut3usBO/gSk35wTVrd8og5wtBlEXntoKhpXeM0XkRSwGosBRVCw8Z2ZEAd/6K XjcQdTAw vM+qOJufMC9Jl+eznCgoh+/+HueImpLpKvOnfle+l7QWp063qDGuQsd0ZehN9AwmKu/Ql05wIx/mF2MyRcgExmP17SbRN3ViLVEU655qoL9OXIhiUqozA+pmkfy9vzmoTZyCKlcSagQNGewOhurE2iN6DXUfi10NVBOhYGKcB8XSYjS9ZhiSeNprNWdM0n/RUeO0E+oPcnF2WoZ2iUQyiSTtAZP6qgDozQh4kdVJKsL0EKDonQReLIDcLcwr7HLXY59m3X9jPHDpcRoe497UWHJotWvCdPmnDGxcb44fx/ZWUA90bTHIQ5zvVpnrP91rtCci+xsroPUIgo/Ull23y1AlohNT8thPrYo7qAZg0jjSUyg4wqJChdEyTDURc6Ev3NR16wJbjtmyILKACWtdbgy7794VyAxY8A/Ec2VMj77xD8MCfUkLgfBOVqic42DhTunUSKOHNCD8u2uJ3qhOaW+pIfg== 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 14.10.24 12:24, Baolin Wang wrote: > Khugepaged already supports collapsing file large folios (including shmem mTHP) > by commit 7de856ffd007 ("mm: khugepaged: support shmem mTHP collapse"), and the > control parameters in khugepaged: 'khugepaged_max_ptes_swap' and 'khugepaged_max_ptes_none', > still compare based on PTE granularity to determine whether a file collapse is > needed. However, the statistics for 'present' and 'swap' in hpage_collapse_scan_file() > do not take into account the large folios, which may lead to incorrect judgments > regarding the khugepaged_max_ptes_swap/none parameters, resulting in unnecessary > file collapses. > > To fix this issue, take into account the large folios' statistics for 'present' > and 'swap' variables in the hpage_collapse_scan_file(). > > Fixes: 7de856ffd007 ("mm: khugepaged: support shmem mTHP collapse") > Signed-off-by: Baolin Wang > --- > mm/khugepaged.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/mm/khugepaged.c b/mm/khugepaged.c > index ba28ba09fe89..6f8d46d107b4 100644 > --- a/mm/khugepaged.c > +++ b/mm/khugepaged.c > @@ -2267,7 +2267,7 @@ static int hpage_collapse_scan_file(struct mm_struct *mm, unsigned long addr, > continue; > > if (xa_is_value(folio)) { > - ++swap; > + swap += 1 << xas_get_order(&xas); > if (cc->is_khugepaged && > swap > khugepaged_max_ptes_swap) { > result = SCAN_EXCEED_SWAP_PTE; > @@ -2314,7 +2314,7 @@ static int hpage_collapse_scan_file(struct mm_struct *mm, unsigned long addr, > * is just too costly... > */ > > - present++; > + present += folio_nr_pages(folio); > > if (need_resched()) { > xas_pause(&xas); Looks correct to me: Acked-by: David Hildenbrand -- Cheers, David / dhildenb