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 ADDF5C54798 for ; Tue, 27 Feb 2024 19:13:35 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2BB64280002; Tue, 27 Feb 2024 14:13:35 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 26BF5280001; Tue, 27 Feb 2024 14:13:35 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 10CB3280002; Tue, 27 Feb 2024 14:13:35 -0500 (EST) 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 F2117280001 for ; Tue, 27 Feb 2024 14:13:34 -0500 (EST) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id B5F60140962 for ; Tue, 27 Feb 2024 19:13:34 +0000 (UTC) X-FDA: 81838532748.12.A1018D7 Received: from mail-pg1-f172.google.com (mail-pg1-f172.google.com [209.85.215.172]) by imf20.hostedemail.com (Postfix) with ESMTP id E9D8A1C0006 for ; Tue, 27 Feb 2024 19:13:32 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=hQSVEK+1; spf=pass (imf20.hostedemail.com: domain of shy828301@gmail.com designates 209.85.215.172 as permitted sender) smtp.mailfrom=shy828301@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1709061213; 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=iBJKbsd4wIdKds37USwOrWAAhA255FzoeAt9UUCRGXc=; b=1uXfNl7brZhS+LHwWeLG57fNhaDWjbTk7QGIN3r7NzJ9rotqKS+UM6ENGAv7y2GpXMT1zp efnn8cMPKkL4UUwykm7Pq2B6j86G9YXC7LBaT8omf1+OHsezfp9ijs1201Z5V8diYgmnLN 3wNNxM1udWBFACmEtisPYzESUVK4jus= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1709061213; a=rsa-sha256; cv=none; b=NfAU2PG+Ej55eT54cOFV9iYo+dOoVS1VoqIwBWZ2+6wYLZjdMGJzi4rR/DE76/4BT0wN6S eu+7l16KCIRuo/cyaIh9JdjiUwuz++pMP2vw5OKcO6uB+ICDhDpFDfpRnRMa9+C8qqtZLc LTXcFeGypITX3oOvFtmb13tdagHxSdk= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=hQSVEK+1; spf=pass (imf20.hostedemail.com: domain of shy828301@gmail.com designates 209.85.215.172 as permitted sender) smtp.mailfrom=shy828301@gmail.com; dmarc=pass (policy=none) header.from=gmail.com Received: by mail-pg1-f172.google.com with SMTP id 41be03b00d2f7-5d3907ff128so4088535a12.3 for ; Tue, 27 Feb 2024 11:13:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709061212; x=1709666012; 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=iBJKbsd4wIdKds37USwOrWAAhA255FzoeAt9UUCRGXc=; b=hQSVEK+1eAzmPKrcBV8cxzmCgIqI9X4xPg3XGOWCFysnkUnZJs5QR+EpVyeHvQXLzE nzgU1D9uUX1c2rtHev4t4e1wPSxcCGmJs5nqJW0Dnl7GyMnZxdTPh9Dyy9ilb54bvusp cSJyITOQe0dioibL6QM+gThWWbtOLkRYaIp8J28aKj7FkVEF2EfgS99Pn5r0KtPrhScx mvdmSkgpksKLRtM/qHQ1Y7W6haYfJItGwblkbozyTvzCfIhGa0pzZDwADf9lSak/JXR1 oeFev2Av1f6KUs76mjl9ayVlMaCSf7KHB8Bu1yrcG2nrKHJxrDPOQ5MzvE/Rmiw+/YaQ Y/Ew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709061212; x=1709666012; 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=iBJKbsd4wIdKds37USwOrWAAhA255FzoeAt9UUCRGXc=; b=VVQfIKnAPemfrig2tlPlSn0rVh1ouIroLCSuRvwxCopR6OJRQPvG67jt3FbHu+JcSC PqJXHi3hV32kHPoLgmPx32VFcXgqL7YrzmrcK4diycxB8CBmY+6kqbAz77vG4D18DcUl 9BwFqtv2/Lf7KFZtExwflGIcASumAkAJrNgohoQcd8OYsjDbfpCkPLXC7597tV+6Bint /lwIrX0gNcb+mEYmNkbHIu1BkU3+J01UlVQhCqZPMByhmQbcR8TtqevD0ozvxfxc1csu lalLAsXrYFc6Y7znkZfl7JNH/ennt/css9NpmgH1vs7tx5KhqhXJOa+kEkVJshYka8p6 8fzQ== X-Forwarded-Encrypted: i=1; AJvYcCWNVWQen9DaZUtLLYQI5eb8vd8LstLw/WlH9NCj+anAPDSgX0lRf5zc/tnSyXxp75MFj8yK35/36L6TquWz/qC9mw0= X-Gm-Message-State: AOJu0YxemR7BCjdBwZjIMB1A4ZfOwlIrR3Ie3E1vFQ6hX9QbMPMuDWmH Hl3edm4lxr0bbWWT9hLDOVIJMyZScU/ySzopwsowujSBhY8R78ffEDZxeEOfWFWESMv6otyhWzf AJjZbK2XoLbxcaJLm76EvfbyxYR8= X-Google-Smtp-Source: AGHT+IHSN5qjnCnPdtOApqmCnCgsyXU11KA4GxFAczsdYUf2buDmdN+hfpvM8/FpiV81mxo6JYdi3Zbs+sl4LCVi710= X-Received: by 2002:a17:90a:bf0a:b0:29a:68ad:b77e with SMTP id c10-20020a17090abf0a00b0029a68adb77emr8525394pjs.19.1709061211735; Tue, 27 Feb 2024 11:13:31 -0800 (PST) MIME-Version: 1.0 References: <20240227035135.54593-1-ioworker0@gmail.com> In-Reply-To: <20240227035135.54593-1-ioworker0@gmail.com> From: Yang Shi Date: Tue, 27 Feb 2024 11:13:19 -0800 Message-ID: Subject: Re: [PATCH 1/1] mm/khugepaged: keep mm in mm_slot without MMF_DISABLE_THP check To: Lance Yang Cc: akpm@linux-foundation.org, 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 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Stat-Signature: c3oe4i1cu51mk7uinfpw5pwcxtsch6ge X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: E9D8A1C0006 X-Rspam-User: X-HE-Tag: 1709061212-347093 X-HE-Meta: U2FsdGVkX1+kcxkabWnDy4HzQRII8TPYlX147KMg6v/0K3E9YcoJi3dBxYka/EVCEXpPRDq8z0Gkw6nyZo7K0/rg+y25/RE8EHWz0ZF3P4TGx3tMBG9Kd4AfDVvp1enME1w+bAj+4nswxa8FqdYFLjz8D0DYyI76IqQy5RfR32Imu7+QkJPqz81pAL45UhXRiZrhiKDqoUglntw/1BNnFJF4QMx04xhft2U84iQeM1s6ZXVcWIwbX/a76Be2a9NmFlZWRZhYzXo+KVs/dsQRDBLMwN6h0XjuVc8oLfkGh9P1/Gz7TjddIWNDmXq17toIoBsL184iARM1fy3Lw95qTa5TKXOTwNWLL+8ImGhzFotFtrIAGAxiQYBNePiq9RGhIc8ysCVghyqqnDIWNkSazn3DjHDT6xU6XVD6RgHXA2sFrSX0WDdLxMTVYnGLHETihjrLZpTmz9T7BcLgeP/23S8OdGfxxv2XTEFS7BOjF+7g6QP4cdq6wbyfcl9/SqwE3G5ugvNNDqJKqBqXYy33zIxXfQFNRJT2QjoLDfMdnYGnhuW0mT6RpnkRy0uCkJvmUINRjQ99+0DtkU9PoPS/HUPrtfLYoqk+7LExo1wrGzN1zvqmqnFo28KF762JAHCTLoZLsXsF9mkHfDpQ2dX7KZkGxGnWZM7v8TbkwUudnOIp2Bod7eXn97cS1iwjxUHqH8wPRDRJzPkHW2BgnTyyjjgv81HCNVrwuxRQP6usiX1z+iFDXsRj6+PIfiniy4VNqnhD3a9COZETkb+iVIWU6NKC3p6rzqXxcRnxIGhEYkMcIHmo1mLFonjw1eEE2vZ9p3eXLUazpqhn0H3JWiCPlWoqU2BSCLBWsh7ZoBUJ+pXa+YwaTeToL3zZpNtVAMzFhu7p+kqDBP+/+zz5kFfG9q7X3BOd0y4xugR7RX9v2/xkJjw8XSegP1hAbZAFd7cIebHasWM7WZNB8moR6mW YrayfpAV 0QwWGGYCcbp/Gu+Mxnu10zrATvu7tPtl0+HM3Cz7BPn3ClZbYo1bmpeWc4/SzT/sFYszRskt3o/g/T0go/Ur4sIBjS4RxgEdCxivUio+0xAobXWHFrSuFBdytj3NzKbwLQIhS3DfN2z/Zf9nXrGF3PIp5as7Ym49HWcwMhlU/Y14f3qwLOKHa5DPrE1kLicmvJyeFO2ZpdXsfEN8EgIlD7ii6R+J56j7vu4JhGERBaA7VC4YC28391bpmiQ21AIBWi8VrJUC65P4ecC7POy8B3UL/LMpgEXgvV7yw+5rRY/bC6NYKP2UtGkLC5+TyhzAUWlVxTPsm+mVN9mlQYNKNTxH5z3rs2p/YjRAZCmF5zx3hfsNJ20kO6UJI+0IqMwvsao2055ldrOkElgGR/2VJ64q66JQ7SipVOHfcJzXUAGkY2Z70MvlrLTiuG7FYtA/YvOcFjP09kNh1ASs= 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 Mon, Feb 26, 2024 at 7:51=E2=80=AFPM Lance Yang wr= ote: > > 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") I think Andrew will fold this fix into your original patch. > > Signed-off-by: Lance Yang > Suggested-by: Yang Shi Reviewed-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 =3D vma =3D find_vma(mm, address); > @@ -1428,7 +1428,7 @@ static void collect_mm_slot(struct khugepaged_mm_sl= ot *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(unsigne= d 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 >