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 BCB21C54798 for ; Tue, 27 Feb 2024 03:51:49 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CCE1C4401E6; Mon, 26 Feb 2024 22:51:48 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id C56FB44017F; Mon, 26 Feb 2024 22:51:48 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AF7734401E6; Mon, 26 Feb 2024 22:51:48 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 9CE4D44017F for ; Mon, 26 Feb 2024 22:51:48 -0500 (EST) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 7080DC0ACA for ; Tue, 27 Feb 2024 03:51:48 +0000 (UTC) X-FDA: 81836209896.16.D76C408 Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) by imf17.hostedemail.com (Postfix) with ESMTP id A3DBA40011 for ; Tue, 27 Feb 2024 03:51:46 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=K39LRGPi; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf17.hostedemail.com: domain of ioworker0@gmail.com designates 209.85.214.177 as permitted sender) smtp.mailfrom=ioworker0@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1709005906; 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-transfer-encoding:content-transfer-encoding: in-reply-to:references:dkim-signature; bh=gs6SqwqU20wxdOxc0g113G0JKB/kw5agZtCRYieg9ro=; b=fxcDubusP9AUUk2DbKasj++2dGBG3FCP4t3qlO+8xj+hzPJ0V1kyuzK6zHIpAGIYH8x0Dm LjUKPw3iTS8STpiJN4NmF71KlJqGPNnCy8OCGorW+FSCyi83URvYYtiFFq4AhyJ5WIqJ5R Y/1T3FNg9UBOEE+fJvR02TNQzufrPKw= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=K39LRGPi; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf17.hostedemail.com: domain of ioworker0@gmail.com designates 209.85.214.177 as permitted sender) smtp.mailfrom=ioworker0@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1709005906; a=rsa-sha256; cv=none; b=0xCWH/Rm2oGHcTHjCdkcQ+8A04vcrQpD32+eXfNBnqHoY+z8rxjCNdZgegPdmt+gCuXxCm 0yTGuWLgGPE6d+oZVh2xhQ3e6jjwHfvaCnu1k/x0ScApvTbdOTTNu5THexl/u6qLWKfZcB ajfboqOnhejap87+7etKItBa0c2Jybo= Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-1d93edfa76dso32895305ad.1 for ; Mon, 26 Feb 2024 19:51:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709005905; x=1709610705; darn=kvack.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=gs6SqwqU20wxdOxc0g113G0JKB/kw5agZtCRYieg9ro=; b=K39LRGPi7J7pdG7ymT4ukhNHyZ6HYIs7w/OBbD4+hZreXOF17lKBUoam639H0yew6v tH/ba5Aq3PfBBCnFAl4xlIk8sEpJmQeC8BQHSVtwmDc93AdtGRHSqNdTxWQXXwWuw/As VWpCoIhzoUlTIGD2It1+EZjwl18oZ1Rg2jgSWOvG99of9JO9iT5fTHYhORzWqG5CS8on 5RCT2VVHPMfMVgWqDzaozZrNl3bAi8976MdkasCvKeBVGjMld234xKJwxwxpJlBH9z88 V3LSDd8OYOGygiPlGfteWSvM/8knTktYlgUfjW++gVNCxFLamhSaMC0eoOCQoSsQb01D nqOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709005905; x=1709610705; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=gs6SqwqU20wxdOxc0g113G0JKB/kw5agZtCRYieg9ro=; b=nESdxP3eMyHrpVhJP9w1KrWXYPPuq8M70mETdPqK6rqr8LFLHyeEanyLh5Y3f3JwMO 4nqEPCg4DN9083z9mnn/lcHCWtU56fKeWV5O9laMrd6mPggT3JfS/wEDEc48RvIiugC6 JRTRWXGDbCgEzgHMRjTOudgYf6rFqRG3v6sks7VHqt/mW6Qisfo1NN1OikFd6fD6ondH hsrgQ4dFmiBCJLoYpvGrv3X0epcCe5+FN9jW8W1UX1Lou0wVfMdA3gLXllUxQsm8FY9m GWttVHzpRiKkE/Vxo5vETSEhTi7iwP4zU7Lakiti+N6T+w3lAB/qRJ4wWy1BzBDdIsl1 Rscw== X-Forwarded-Encrypted: i=1; AJvYcCXfmrUUmWB/E1RffMNsdNAwpteqB/vcu5zmnd3w10Tm4sKOhHAlkWXvrSXgHs76Gn35DxsO3HSa763maZWh/xz7/Iw= X-Gm-Message-State: AOJu0YzKH4plMq88jqDGws0h9JlJD+kg8o/yMgABSSBKmjdqCrnkMBWD L7l61puU02WgbjdYKUwkvbLoO/mNjbyf3imP+HGdavaPS40QejzEHGE+ZCpdSNiYMg== X-Google-Smtp-Source: AGHT+IFUJaqZlI0Vq/9WwW8Wl/li66JCXaHzA+eLWv4EOWIFuTvi0IVAvLpFfcTvB/5Hgvo4GB8e/Q== X-Received: by 2002:a17:902:d587:b0:1dc:ae92:7e9 with SMTP id k7-20020a170902d58700b001dcae9207e9mr3507796plh.62.1709005905360; Mon, 26 Feb 2024 19:51:45 -0800 (PST) Received: from LancedeMBP.lan ([112.10.225.117]) by smtp.gmail.com with ESMTPSA id x18-20020a170902821200b001d949393c50sm433519pln.187.2024.02.26.19.51.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Feb 2024 19:51:45 -0800 (PST) From: Lance Yang To: akpm@linux-foundation.org Cc: shy828301@gmail.com, mhocko@suse.com, zokeefe@google.com, david@redhat.com, songmuchun@bytedance.com, peterx@redhat.com, minchan@kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Lance Yang Subject: [PATCH 1/1] mm/khugepaged: keep mm in mm_slot without MMF_DISABLE_THP check Date: Tue, 27 Feb 2024 11:51:35 +0800 Message-Id: <20240227035135.54593-1-ioworker0@gmail.com> X-Mailer: git-send-email 2.33.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: A3DBA40011 X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: uy1x5jkha4ko95d6gwnxq7fngpmwmw3m X-HE-Tag: 1709005906-907174 X-HE-Meta: U2FsdGVkX18f9HVdymsN8YQoWF4Tdp/VfHFQZAnLpHbqrtFWs7wFnaIHxRPJtg0v8Y45Z47/abVfzTG+akfCy4a3nO4uSUTq/NosP8xc8TS+hIQH8gGbX6GnWEWlBmk4L4oENynskPbAQJL/tRYV+q6KzdeB92EjLYDk/jU4tlQgTxy6cHQcrY20AcojBzE+BIa8fXpY0YH/1Ie3/93w+rwC6KozLR13cG6own4gfKDV6AYygR3ABMWQiWf1hJ3FTTApbFOaPUTBYTUoBRRq4BcgyzwBFWQggNQRkdDRye8xZqKARz0ZDqSG+l9uRx7SPwgtrFhHZRbrh8wflqRDzm2Pq+BCNGpfJ11DM+VqJ7Zv5UQHmqCp4q7b8wShHCmxFVM4gVIfSrUWrQV8JR0y0/Dtw2TOt45Wa0EpQxx6PR5kPsOaAIVJSKhsG/jgHxxVz6yCz7Xd6p5Y/bbxYyKL7c52FKDtWWpWNXV8khGqCUQJdP0NvTlZKOxoFEY+1sJ8WS+P9Z40fiPvXChtwJnvw0IEYV0RrcGL7qmZNb/AKJrGaeUWUTcmPPsBosv72Nf8l3Qp6em9PoZkSfEMaOVCS6W1jRfU0lMckxTYi81lAOP4Yf53DBWbOKhZlozrcGx7qxPnu9U+Q19unjuy6E5K4lQ0C6evcfEjM5lcZW38rt0YBMRx4rUnntEKiThNcvkU8JuGLkOIxi3Jd1DoqprTC9fsHsz+g37Yfj0O1EA/hnEqqHfhPD9X/8qTGMF+NjJQG/1IDRV6/FPsciWlH/kiOrWR8MdTK8abIXPKPncF0HBljXdCPnhZL8Hwu9rup6G753Oz6IpM68kalPnYSoI5JNHjOveb/6SpwKkOPb2xa+pNKJda6rjpA94iXzmN9wPNmYaXpMppyTyIMZwxVQClA0wu6QLXYeWHilNR7dsNgaoThFRnVP2c9rQu1w5UbT5wD3jtUU/7pU/LPDt6QOh HRgyOg/A HLBu0t7NIw51ZoWpIVxoWwBEyRUMcQmLO6SVxddvafDx4aVzMEsDQYtSJwy6sehraQtW2rX2+ZV6u+DctKidZG2Fsk/iZ9sLVPACsWDcKF6UU1TIdDKBfgiNHsCLksx4LhWCPhGYSShUUN+3Wy2yb+tHswYO5xC2rRdlYUWPwZvTNnu07+Q4MPtlqUTv0qj+jZ1TqVPln2UF/dZR6QYUin3yK6PHuukjh5b9tu/mY1rJZ1ZLi8hRPxV0c7Ag+nH7hIUCzfR7K2RsJb5rMObFfyP5CfJPgJP5ocYZ5lCQrjrSNuFkDQ9BfE2TR4jsO9fxEu9WoMJk7P8qp/PgXBN43tRLkHQXoE4K0e0w37kfUzzWeanizt1hQbKS9aTa1EclFzmBZQwBzou+DbG3/FmM3Loy/qcH2K+dJJwljm91c1URf+wJU3jcOxEkPeq031hFwu1CeATA1GCe7Qk7Yg4jzrqpgViZ3vYAJYaV+GDAnpCPsELI= 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: Previously, we removed the mm from mm_slot and dropped mm_count if the MMF_THP_DISABLE flag was set. However, we didn't re-add the mm back after clearing the MMF_THP_DISABLE flag. Additionally, We add a check for the MMF_THP_DISABLE flag in hugepage_vma_revalidate(). Fixes: 879c6000e191 ("mm/khugepaged: bypassing unnecessary scans with MMF_DISABLE_THP check") Signed-off-by: Lance Yang Suggested-by: Yang Shi --- mm/khugepaged.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mm/khugepaged.c b/mm/khugepaged.c index 2771fc043b3b..1c0073daad82 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -920,7 +920,7 @@ static int hugepage_vma_revalidate(struct mm_struct *mm, unsigned long address, { struct vm_area_struct *vma; - if (unlikely(hpage_collapse_test_exit(mm))) + if (unlikely(hpage_collapse_test_exit_or_disable(mm))) return SCAN_ANY_PROCESS; *vmap = vma = find_vma(mm, address); @@ -1428,7 +1428,7 @@ static void collect_mm_slot(struct khugepaged_mm_slot *mm_slot) lockdep_assert_held(&khugepaged_mm_lock); - if (hpage_collapse_test_exit_or_disable(mm)) { + if (hpage_collapse_test_exit(mm)) { /* free mm_slot */ hash_del(&slot->hash); list_del(&slot->mm_node); @@ -2456,7 +2456,7 @@ static unsigned int khugepaged_scan_mm_slot(unsigned int pages, int *result, * Release the current mm_slot if this mm is about to die, or * if we scanned all vmas of this mm. */ - if (hpage_collapse_test_exit_or_disable(mm) || !vma) { + if (hpage_collapse_test_exit(mm) || !vma) { /* * Make sure that if mm_users is reaching zero while * khugepaged runs here, khugepaged_exit will find -- 2.33.1