From nobody Tue Dec 16 14:48:25 2025 Received: from mail-yx1-f41.google.com (mail-yx1-f41.google.com [74.125.224.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 037A52248A5 for ; Fri, 5 Dec 2025 23:32:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.224.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764977542; cv=none; b=oMfE2igNnSXzj+pje3+X1pg6K4CYsYOQkpSp1gms5R/4od6W1qnbjMEFitgFDwQ7XjOCfTO2MAFm3m731Z6cn/GrzZHZLWY94MqY/izy/kMC5bIY7hodiyYExkdREE51KXy+4uJw2NoPPh60wG/pvwGS+ScBa1eA4rFhCzQf9b8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764977542; c=relaxed/simple; bh=KsyL1tAa0IIhbMiJgBbcZLIMfFacJIN5WXZgweQxvgU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kFK3uQAuPSARjFEHecOmvxivk2n5jrXmkavrpHXyvk7S3ndvURIsXcd4YiRAAekCvFSy3TfTsv6W6AoN4nBYaGGtt5Z4seCnlYf1oI5hoF1ztYFjNcnCIfHP30oj4molpMn0WDaoJvkD5kMTJPi16C4xV8PVA5oKTb+Mp00cC4A= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=ITLlYHSJ; arc=none smtp.client-ip=74.125.224.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ITLlYHSJ" Received: by mail-yx1-f41.google.com with SMTP id 956f58d0204a3-640f88b8613so2801209d50.2 for ; Fri, 05 Dec 2025 15:32:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1764977540; x=1765582340; darn=vger.kernel.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=xVNIZshLyuSr21iBy7gYlmgdiF5+BHlPixcUrdxDgUM=; b=ITLlYHSJt+0E+fQQ/kPGOzRfb+mRQgKNM4KY4FYaKEqyOuCfZwnQ3HZFVUIevZU2kC 5JpwTbzMeq9ith2RMcdYF83MpBjeJtyVzFdvLV36fcqzS4P0A+zHkbmHndcLo96/shfx cjD7Rhtclp+DQcU4QGaFy4Ul3kH8l3ot06ojBUmwmW+raaiItchtatyIMJZuUhB+sQti yJA/cA4nJ7bVcjJN4I8r9PMsSqiMIad8i1KpshZKAj1ai+QUdJ/f+d4a04jDiNqFoX6d NSB3zJMMI6ObaaDBtVn8bHzECOgTobefAGRm0dBX1HyIghGdCrD4pa8iQuKSa+BPYQ8z HFAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764977540; x=1765582340; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=xVNIZshLyuSr21iBy7gYlmgdiF5+BHlPixcUrdxDgUM=; b=qZN1syvaYhJnBfxZ4rOqHlnNqW2duRbkV8ydLEMEho4tN3A/bHs1e6oMSli3jumL65 NhrEAfTg2uGJA5iuCEEeBm7h5mECkC7Loe4NfQcci3Qlq1jFumx2F1Wk8lqDVZtBjNAb MwxyQWFJ021CYnxs0G7LBvs2XO1qImll4yUmjix4eZFz3DNvjIWI7J4ooPwBKXblJYrF bUNsSPN5+wQMq+v7FlAZA9t/ad8TUmdOn501cpgKEo9CRRkjJ+i2DnqylPVQKBYuTnux nbxH5PF92TJORtHtJhUagutZmP1BTe3hY1ND2zl6dJQi5r4wPy5aWCCSUpZ3PdZ0m71T 8fqw== X-Forwarded-Encrypted: i=1; AJvYcCWtdXFVsIROEFEuQWG8MvQadNsJfupVTLsLt/nj+vtZxbH5pfEkdTmoJVCYxLLYMionfu2atmU6u9+tgiQ=@vger.kernel.org X-Gm-Message-State: AOJu0YxoIyMhTna0rTQN2LknvL8Hwki5djYRc6v2jOr8KttjI0kklEtT QDKZ4mzJjqNZ+6Vx8UYrQn1lob5lquD/t1Jq5l8d+iUc5lwFfH9hx1LA X-Gm-Gg: ASbGncsl+/GbxsQZ5/sNzpUa5sg27ge4fsgjMDjJSe5ToCHFRel+xlm2BsXdkasy9I6 Ub3pT1whKdd11Bu3tCmLYrzfaBjkIbw9IZYFEZWhY4VE9Z8MgJT+3D0Z2afnkCKMwTAA4F0WPWK 8nrLp2xk/gIKyO92rAqolrZpKz74HPaxR1ky1mpCG9t23MrwIdEP/sO1j+ptBLCeHnSSA33VeFy SsY3Be06Aquov/nnM0m09hnA80im5VbfRPZgOLjbyYTb2KQCvciKhSU8YaDsc2OHFI4FqcyCqCx AZHH3Al6ErqAEOx5ar4LL3SNt6U0JEv+GI4VxWARh4ykT5j6Gq51EkXGCl3O0yrnKr790Ot6ggC wPyQ6AD8Q10WnjVVvZg8MRdqoolVHiKhHlQ1uC3v9BoTqWsuw3wBPPU9fJV4zXgOl++6JEr6QaV KuPCu4iHbJzkFRD5gZwkesUA== X-Google-Smtp-Source: AGHT+IGQ5c7kUmmwqDGLvrjuZJ0aZLEBVHhDBqk12LjM5CR3AT6ty5CjA/zMORi2krLA1PmCDUq99w== X-Received: by 2002:a05:690e:1401:b0:644:41e5:dea1 with SMTP id 956f58d0204a3-6444e756d86mr556035d50.4.1764977539865; Fri, 05 Dec 2025 15:32:19 -0800 (PST) Received: from localhost ([2a03:2880:25ff:72::]) by smtp.gmail.com with ESMTPSA id 956f58d0204a3-6443f2b80casm2356630d50.9.2025.12.05.15.32.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Dec 2025 15:32:19 -0800 (PST) From: Joshua Hahn To: Cc: "Liam R. Howlett" , Andrew Morton , Baolin Wang , Barry Song , David Hildenbrand , Dev Jain , Lance Yang , Lorenzo Stoakes , Masami Hiramatsu , Mathieu Desnoyers , Nico Pache , Ryan Roberts , Steven Rostedt , Zi Yan , linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-trace-kernel@vger.kernel.org Subject: [RFC LPC2025 PATCH 1/4] mm/khugepaged: Remove hpage_collapse_scan_abort Date: Fri, 5 Dec 2025 15:32:12 -0800 Message-ID: <20251205233217.3344186-2-joshua.hahnjy@gmail.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251205233217.3344186-1-joshua.hahnjy@gmail.com> References: <20251205233217.3344186-1-joshua.hahnjy@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Commit 14a4e2141e24 ("mm, thp: only collapse hugepages to nodes with affinity for zone_reclaim_mode") introduced khugepaged_scan_abort, which was later renamed to hpage_collapse_scan_abort. It prevents collapsing hugepages to remote nodes when zone_reclaim_mode is enabled as to prefer reclaiming & allocating locally instead of allocating on a far away remote node (distance > RECLAIM_DISTANCE). With the zone_reclaim_mode sysctl being deprecated later in the series, remove hpage_collapse_scan_abort, its callers, and its associated values in the scan_result enum. Signed-off-by: Joshua Hahn --- include/trace/events/huge_memory.h | 1 - mm/khugepaged.c | 34 ------------------------------ 2 files changed, 35 deletions(-) diff --git a/include/trace/events/huge_memory.h b/include/trace/events/huge= _memory.h index 4cde53b45a85..1c0b146d1286 100644 --- a/include/trace/events/huge_memory.h +++ b/include/trace/events/huge_memory.h @@ -20,7 +20,6 @@ EM( SCAN_PTE_MAPPED_HUGEPAGE, "pte_mapped_hugepage") \ EM( SCAN_LACK_REFERENCED_PAGE, "lack_referenced_page") \ EM( SCAN_PAGE_NULL, "page_null") \ - EM( SCAN_SCAN_ABORT, "scan_aborted") \ EM( SCAN_PAGE_COUNT, "not_suitable_page_count") \ EM( SCAN_PAGE_LRU, "page_not_in_lru") \ EM( SCAN_PAGE_LOCK, "page_locked") \ diff --git a/mm/khugepaged.c b/mm/khugepaged.c index 97d1b2824386..a93228a53ee4 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -40,7 +40,6 @@ enum scan_result { SCAN_PTE_MAPPED_HUGEPAGE, SCAN_LACK_REFERENCED_PAGE, SCAN_PAGE_NULL, - SCAN_SCAN_ABORT, SCAN_PAGE_COUNT, SCAN_PAGE_LRU, SCAN_PAGE_LOCK, @@ -830,30 +829,6 @@ struct collapse_control khugepaged_collapse_control = =3D { .is_khugepaged =3D true, }; =20 -static bool hpage_collapse_scan_abort(int nid, struct collapse_control *cc) -{ - int i; - - /* - * If node_reclaim_mode is disabled, then no extra effort is made to - * allocate memory locally. - */ - if (!node_reclaim_enabled()) - return false; - - /* If there is a count for this node already, it must be acceptable */ - if (cc->node_load[nid]) - return false; - - for (i =3D 0; i < MAX_NUMNODES; i++) { - if (!cc->node_load[i]) - continue; - if (node_distance(nid, i) > node_reclaim_distance) - return true; - } - return false; -} - #define khugepaged_defrag() \ (transparent_hugepage_flags & \ (1<node_load[node]++; if (!folio_test_lru(folio)) { result =3D SCAN_PAGE_LRU; @@ -2342,11 +2313,6 @@ static int hpage_collapse_scan_file(struct mm_struct= *mm, unsigned long addr, } =20 node =3D folio_nid(folio); - if (hpage_collapse_scan_abort(node, cc)) { - result =3D SCAN_SCAN_ABORT; - folio_put(folio); - break; - } cc->node_load[node]++; =20 if (!folio_test_lru(folio)) { --=20 2.47.3