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 6FE75C3DA6D for ; Mon, 19 May 2025 22:33:49 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4C8166B0083; Mon, 19 May 2025 18:33:49 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 49FF56B0085; Mon, 19 May 2025 18:33:49 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3B5186B0088; Mon, 19 May 2025 18:33:49 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 1381C6B0083 for ; Mon, 19 May 2025 18:33:49 -0400 (EDT) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id EDC1312145D for ; Mon, 19 May 2025 22:33:47 +0000 (UTC) X-FDA: 83461110894.28.9A0B127 Received: from mail-qt1-f179.google.com (mail-qt1-f179.google.com [209.85.160.179]) by imf02.hostedemail.com (Postfix) with ESMTP id 229C480004 for ; Mon, 19 May 2025 22:33:45 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=KN5aeWzD; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf02.hostedemail.com: domain of usamaarif642@gmail.com designates 209.85.160.179 as permitted sender) smtp.mailfrom=usamaarif642@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1747694026; a=rsa-sha256; cv=none; b=Y/pix7weUXcIemAoP15QlGXjZ3MWAKkEMfWQXhSxEfpfaC4VTGFm59Xluh4ZDVGo5cD4wP WEFUt9MENIcS1n+EOwXIJcrwR/cndhRatxNnDWRWDFvq76mgOV19Wda4mhaqcSeTq78JhF hNGnSM/MEt/Ue/SSBUMF2GBDS/mTmDM= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=KN5aeWzD; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf02.hostedemail.com: domain of usamaarif642@gmail.com designates 209.85.160.179 as permitted sender) smtp.mailfrom=usamaarif642@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1747694026; 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:in-reply-to:references:references:dkim-signature; bh=SZoVm58CBAxFKJ1NXNNUrIOPj0gNvc2sOGcRB/nswhY=; b=E01PEh0mRZf2bRNoBiZbvYMJWssAjrExqhVkbk+QP+1urYx7hQuQzUkjed++vN5VOHKc49 rz9QNkUSdN0AP1XiI5Qxxs79tgi0zSRAIk32UdAubxugbpazWiAy5YjyXnBcU3HfNru2it dNfAGbvlvaO4tn8/ckmUt8A0+6kjK6k= Received: by mail-qt1-f179.google.com with SMTP id d75a77b69052e-47691d82bfbso96957581cf.0 for ; Mon, 19 May 2025 15:33:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1747694025; x=1748298825; 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=SZoVm58CBAxFKJ1NXNNUrIOPj0gNvc2sOGcRB/nswhY=; b=KN5aeWzD8kWuXE30cVCqDrTtJcscukX0a834IXzKUvPLcmVUwR1CNBof3wRyFQGaD3 VWBJErEzD8085Z4VE5tYmS1CLTNqaNijCQHSJsjPUar3RcalhIvTQ7jbnRpIQf75ixi7 HxK9vDukuM7nJhKuKscqonIyLCmR8AfAiJxU7woCvqGjarLo9XV/o4VhBM5W927AnQG/ oc4uX5HsavT8JDWjpGNJXgns3oDjzfv3wRpuyImj6QTrQzbqBnZPxrr6O+vlz3aO7MTh PGz5h+tNh29sLh7gAdXcPgcB8wH3fhu2VtPhx7Zctz8EAAMH7vHYtuRRwOSkQDiyXlE/ +zlQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747694025; x=1748298825; 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=SZoVm58CBAxFKJ1NXNNUrIOPj0gNvc2sOGcRB/nswhY=; b=Byn662gpaQrklS0JPDnaqJ06qB8wdKM+eELPeSyIGq5+req37ocZ3vST+SjVqp/eJU /EmRDqt8lKDuxSEJM/vZQL1iU5qw41W8TiWtFv1XqXO5MvQvarBZx+02yeiGAc6XtlsM dZgMk6yhuv1Da20nJ+zLef9j7TQvW3y4z02IGisA8kbVumJ5JplCneSF1cIJOPkL0KSE fDv4Id13G+S4tt1HQqLJyBwnJFKN44kg/0l8pc4bUZIkKCK/VjpLqJ7ldKAWpNUyTNYk Lu9ZL0lDuou0NExSpoRi6KMo6FFbzrMqApoOuyGThcSubm7wnqdEXx0hzopeXf4y+SX5 I+yQ== X-Forwarded-Encrypted: i=1; AJvYcCWYBBpQXA5vt/z1eKq6KU322yQbX9S9NdnWG4QnSyVLzoWwj/9gXgyPS+Z6gNGvY9Ftd+zQcv0xUQ==@kvack.org X-Gm-Message-State: AOJu0Yw4CtuSeIFNHOS5FcWtjQCB5yvpNh/jQv4/KbY3X6Du7dQFu8G9 0tEqEUHJPF142tu3YdrLWhbOx5qPE2wn36yCxdX8SYiFXn4c3lZhZmxLpKwgSLtt X-Gm-Gg: ASbGncva/tul8ECRcvBxsIzoVrxDU5vvJ0bWKxhGromT0iVvyL/q9gt1PjPCE8aFsrB 9h/CfsOT9Q72UQy1/D6ppKKHTo0v4r9zaGk15kh0VOpp5cfReX6Tk7Dt6V33D0dtsIVR/e2MU8E IV5X78q90AYWbrV6Ch5RkJh1xv8bYLvPSQqZ+aQpImCU6PU9X2daXiJOl4aAIktv9eifp5Zlsaz sU0P2TJXe91Br/R8uM3y6wxRcR5D7HYEGn9aDXptQAXJbVZUxGzHF1pdEhblI51RR0N5oCbali+ OWb8G/fuCMM1HetO2DDni21OLeSviEYCaaL1e7GFlYn/dZ8T X-Google-Smtp-Source: AGHT+IFSgdGO5NmmqTJLvtd4NIb4WXRuj3aQMKYRB2sVptgzNbInCwcG2zfX8HRipunbeXTsp22ejw== X-Received: by 2002:a05:622a:5519:b0:491:286a:8606 with SMTP id d75a77b69052e-494b00e92e2mr230773771cf.0.1747694025116; Mon, 19 May 2025 15:33:45 -0700 (PDT) Received: from localhost ([2a03:2880:20ff:7::]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-494b344924fsm57559991cf.40.2025.05.19.15.33.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 May 2025 15:33:44 -0700 (PDT) From: Usama Arif To: Andrew Morton , david@redhat.com, linux-mm@kvack.org Cc: hannes@cmpxchg.org, shakeel.butt@linux.dev, riel@surriel.com, ziy@nvidia.com, laoar.shao@gmail.com, baolin.wang@linux.alibaba.com, lorenzo.stoakes@oracle.com, Liam.Howlett@oracle.com, npache@redhat.com, ryan.roberts@arm.com, vbabka@suse.cz, jannh@google.com, Arnd Bergmann , linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, kernel-team@meta.com, Usama Arif Subject: [PATCH v3 1/7] mm: khugepaged: extract vm flag setting outside of hugepage_madvise Date: Mon, 19 May 2025 23:29:53 +0100 Message-ID: <20250519223307.3601786-2-usamaarif642@gmail.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250519223307.3601786-1-usamaarif642@gmail.com> References: <20250519223307.3601786-1-usamaarif642@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Stat-Signature: iajsdcagkmc1sdhnwnfgj5a8q5zi1679 X-Rspam-User: X-Rspamd-Queue-Id: 229C480004 X-Rspamd-Server: rspam06 X-HE-Tag: 1747694025-583851 X-HE-Meta: U2FsdGVkX19mGOdCdiuseI/9GtRAfcWkCBQe3/KC0VfuJ+NxYVHc0cuDrFygt5TAevY2BdvjOmiKzKW0LUOIH69+TK75839jUF+JewwBUBiFeh18gAa4miItu7rmuvQAHSyvZfhDaxLeLnwert2fpOV/Jgf4wo3d8rtaBb2+QSy4VeZNm+drH8e5bwTyUqRCOrKUj17zV2qm9tHWPM/l1YEYvZQyPBm8JZPxJdWFlYZRuyHpmjjP7GbIbBbzDe2qj5w8y4e4m47WxM1EUbJozL/vTXNg9m+dHUPncwmnmnzwPZohxUIfuzCUpZLnSOq0SAu+fwr+PCtwU64ad9LoKIqNGbIz33g3ffR4CSRqDWu1PKIEZJbsuF/o5WEjDgfgUHCiRMYHczvHcFTx8vAuATNmBoMqiD+Nv69wlZFgu8l1AMofHAM9zYaN+PgRd3HoncjloIeH3qY/yNjWkApZv0RwCfHpj6EJvUxTX6V7NTKJLyBhJarOzaq/hNH6lJtZI3PUQyA8RVV9e4zvkt2QvvFNAHbnKKOAoiaQwhkl2NykaFS6PkbHJscSyXx4NUU7RlNVeystbsejMGhJ/c6uHXuHSKiJdNSVPKT1AqT8zNoJg68K01bT/TdzPEVUC/CENiFXi/xSpWwl/9r4ev261F4RRiTkKdHbqpkDtS+N6RlLDqKgnD6q3yLxJYGPB5FsIqi58bJ3g+ojyreyS8R+gmrLNboE+qx/gAwI5PZURtz0RC+vgxX00IxFx/h035IQC0S1OxOtDwCG+pHcdzmV9HlTbSNCffa4oDmfjXtdp/Uf9Rs/kLP232HctyQbVzZyhTQ/uQ+dbtEqK4TpxfoXKLyrf+KoApAMradKgqLM0o75t1ztW8PWGuFKs2z5Bltm6+eMGAz4Uh7CgH3nofR6UQ//YOGcvpjo30LKOYEtXw3MZjQwcuT2ey3Nmo2OXCrIxZ3mD6nlEF3UaCMihG7 um1uLxG8 vafzCyeP/WwRd6IaofJ6a/l7QPATtvq5q5iQfHdqPPGINMWpm96lA2pl3q1elNyI0G5ylLdwo7SfNdhEGLQ9jA/fdwxOVjgi6rlVTx61gsRpVjgAo+cF28+PP+5zcqwwoBu1ZEA+g6A+p/qrusDM3haQz28MiECXeWR42L/4p+KgEE0DujXRgRTQQV+9T+/4TfCFMEq97yU68wvWa+O4QKzTDcCV73e9QaUAD2lbsWTslGG5TNVF0fwyDzwFRW88zjugFrFCNR+KhjX7qziHoQUu8edo+KoHGJROUQNOksIyiUcDbuhwPYBkbT/hbv1I86YJh6XMxothZ5taPjbyx+9og3Vz5nuQBVRTlMD2MGxBCFZU6Q/1KbtEcmVuIFBnT5fhwrOfkQ2ZwF67G814sdUwT3IOoOCIVBCXk45AnYqvyoq87sv25lO+s8USk7Gv4RkGqn34ndKUpWnzqhd6bwtsYuw9YAl/egypzHilgKb/1RyFqGDraWi2+l2W+bn3EkJY05yTE+LMeY4voFBhEdU85X6kctA2V81S26QVPMVYwknK7Dr7nLsXip3lo8/9Br6h+ 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: This is so that flag setting can be resused later in other functions, to reduce code duplication (including the s390 exception). No functional change intended with this patch. Signed-off-by: Usama Arif --- include/linux/huge_mm.h | 1 + mm/khugepaged.c | 26 +++++++++++++++++--------- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h index 2f190c90192d..23580a43787c 100644 --- a/include/linux/huge_mm.h +++ b/include/linux/huge_mm.h @@ -431,6 +431,7 @@ change_huge_pud(struct mmu_gather *tlb, struct vm_area_struct *vma, __split_huge_pud(__vma, __pud, __address); \ } while (0) +int hugepage_set_vmflags(unsigned long *vm_flags, int advice); int hugepage_madvise(struct vm_area_struct *vma, unsigned long *vm_flags, int advice); int madvise_collapse(struct vm_area_struct *vma, diff --git a/mm/khugepaged.c b/mm/khugepaged.c index b04b6a770afe..ab3427c87422 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -346,8 +346,7 @@ struct attribute_group khugepaged_attr_group = { }; #endif /* CONFIG_SYSFS */ -int hugepage_madvise(struct vm_area_struct *vma, - unsigned long *vm_flags, int advice) +int hugepage_set_vmflags(unsigned long *vm_flags, int advice) { switch (advice) { case MADV_HUGEPAGE: @@ -358,16 +357,10 @@ int hugepage_madvise(struct vm_area_struct *vma, * ignore the madvise to prevent qemu from causing a SIGSEGV. */ if (mm_has_pgste(vma->vm_mm)) - return 0; + return -EPERM; #endif *vm_flags &= ~VM_NOHUGEPAGE; *vm_flags |= VM_HUGEPAGE; - /* - * If the vma become good for khugepaged to scan, - * register it here without waiting a page fault that - * may not happen any time soon. - */ - khugepaged_enter_vma(vma, *vm_flags); break; case MADV_NOHUGEPAGE: *vm_flags &= ~VM_HUGEPAGE; @@ -383,6 +376,21 @@ int hugepage_madvise(struct vm_area_struct *vma, return 0; } +int hugepage_madvise(struct vm_area_struct *vma, + unsigned long *vm_flags, int advice) +{ + if (advice == MADV_HUGEPAGE && !hugepage_set_vmflags(vm_flags, advice)) { + /* + * If the vma become good for khugepaged to scan, + * register it here without waiting a page fault that + * may not happen any time soon. + */ + khugepaged_enter_vma(vma, *vm_flags); + } + + return 0; +} + int __init khugepaged_init(void) { mm_slot_cache = KMEM_CACHE(khugepaged_mm_slot, 0); -- 2.47.1