From nobody Tue Feb 10 00:22:28 2026 Received: from mail-pl1-f201.google.com (mail-pl1-f201.google.com [209.85.214.201]) (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 186651DE2C0 for ; Mon, 27 Jan 2025 23:23:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738020182; cv=none; b=MvGQa38JOGiob/ujd2lbv0IU+Q4kWjDBjW/mvDXZ/FdQz0om40pY4NgfLI2BhVYRqPGrQr2yIpb8iVH+3rQ14H5hCwl/2UwXwqQyOCF0xwYCotjOINoKdt+lEcIQ/H9NL3piif0MrhfCnrtVy098ZXwUbxekKiX/NkZXHkJM8h8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738020182; c=relaxed/simple; bh=e9gcPXdEKMQOaZ4BAN5jmlRUQwrnpHABQaew3lZnJtU=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=jT0dXndLxCQ6ZYsM+5CKwuxgUMbkK0xPm2Jqk/WUtLkeitbW1xCBp1LnSO3EYIW+LdcBF394YW+1FPtXJqOaMf7/BRgC+0OpynNm0TzYggZSu6FVW7dMaw2ahUmaahVtxx77+g4QMjZGKuNjf1PizYDbazkeR20fTM7+wBRyH5Q= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--fvdl.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=16nuar8J; arc=none smtp.client-ip=209.85.214.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--fvdl.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="16nuar8J" Received: by mail-pl1-f201.google.com with SMTP id d9443c01a7336-2163c2f32fdso157947715ad.2 for ; Mon, 27 Jan 2025 15:23:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1738020180; x=1738624980; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=hCniTRl/lA/PuLQ+BNMwksXzOFV25yjBBKkil3bBQiY=; b=16nuar8JxnHBBRc/yH5W93xT0WC0/DF5VgGw1PwmptDhm2BuP9TM8Zki2cZZFamLjb upeg5FOJKcuHrvXez0QCpboYFQ+JyV6ND9Hbn2pHcesod/g8q9QH6lYotwct/FEQipEP 4L38IF/u10SqCbKNPLLjJb8ILRm8OZPGoiyuzP5JxYBNjUOh8Qy5UtqJgzMJNsvKRVve sJAGLlj09yMxNgjsd2t9jgBC2lJGqYC7Hxff3ftgy2341G7xpoEC5YZPUULfqsNjhnSs mGc0lkZ4ylSBc+Z+oerJ60PMnVR2C7znumzH/fDetmbmU6tRcEcQmGY2EXD5VcJgmqkj svFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738020180; x=1738624980; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=hCniTRl/lA/PuLQ+BNMwksXzOFV25yjBBKkil3bBQiY=; b=whnZDsp+XG/jlwxLszCWyTO4yNNQ/uVN7YHiWECTeZmasAJKec8cd9UL9e97/pRnn5 1278zWh764rg+NfOPcMZyuVT4mUG+/XrkBJEi2dAlpAHvBywApHTNn8PKomPdkJLE02Z QrVVClMBwiewpz0+c6eRSU0ektwJdemK586k2DcVV8Hha1oG7+ft5YdBfM4KTTl8G7p2 6tMaZw/6EVSAniJB/HVeU2KSsQXXnwaK2qbRaCsMG/D4q1eODXAUW6iiaNxVU65hFaD4 2PjXgOBEVwvvypkBHKAYaS/NvhWvBoalOpdgkDJpVbZK+9APhCA1IngvQvMhRFHi4q78 g3yg== X-Forwarded-Encrypted: i=1; AJvYcCXpw9yXojcnthNOliZy1GLaPpw3K6+zZr5irZZoK8iRVf3NkU4zf3uMgOTE1gCQdkru5ItqfUbKcJvLCh4=@vger.kernel.org X-Gm-Message-State: AOJu0YyiRCDTe0WZkpiKHw8fDGWk1cvyZglItFlF7OAHT/BaQlFvyNSf 1kZq6KyNrOKZ6F+P1UNJpKJzKWLRD8Ilmqh4HsLAq4rbT1UecnDyJ4W6O1iAMGF7iv4Stw== X-Google-Smtp-Source: AGHT+IHzO0EISgReM0dLIWHi2YCB+4i3HiviP+HCYttMVTZD0GYiJiyEaV9yehlN7QlnVFYvPUvUBi+s X-Received: from pfxa31.prod.google.com ([2002:a05:6a00:1d1f:b0:726:d6e6:a38]) (user=fvdl job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a21:78a1:b0:1e1:becc:1c91 with SMTP id adf61e73a8af0-1eb2157fbddmr69783403637.28.1738020180426; Mon, 27 Jan 2025 15:23:00 -0800 (PST) Date: Mon, 27 Jan 2025 23:22:03 +0000 In-Reply-To: <20250127232207.3888640-1-fvdl@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250127232207.3888640-1-fvdl@google.com> X-Mailer: git-send-email 2.48.1.262.g85cc9f2d1e-goog Message-ID: <20250127232207.3888640-24-fvdl@google.com> Subject: [PATCH 23/27] mm/cma: simplify zone intersection check From: Frank van der Linden To: akpm@linux-foundation.org, muchun.song@linux.dev, linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: yuzhao@google.com, usama.arif@bytedance.com, joao.m.martins@oracle.com, roman.gushchin@linux.dev, Frank van der Linden Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" cma_activate_area walks all pages in the area, checking their zone individually to see if the area resides in more than one zone. Make this a little more efficient by using the recently introduced pfn_range_intersects_zones() function. Store the NUMA node id (if any) in the cma structure to facilitate this. Signed-off-by: Frank van der Linden --- mm/cma.c | 13 ++++++------- mm/cma.h | 2 ++ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/mm/cma.c b/mm/cma.c index 1704d5be6a07..6ad631c9fdca 100644 --- a/mm/cma.c +++ b/mm/cma.c @@ -103,7 +103,6 @@ static void __init cma_activate_area(struct cma *cma) { unsigned long pfn, base_pfn; int allocrange, r; - struct zone *zone; struct cma_memrange *cmr; =20 for (allocrange =3D 0; allocrange < cma->nranges; allocrange++) { @@ -124,12 +123,8 @@ static void __init cma_activate_area(struct cma *cma) * CMA resv range to be in the same zone. */ WARN_ON_ONCE(!pfn_valid(base_pfn)); - zone =3D page_zone(pfn_to_page(base_pfn)); - for (pfn =3D base_pfn + 1; pfn < base_pfn + cmr->count; pfn++) { - WARN_ON_ONCE(!pfn_valid(pfn)); - if (page_zone(pfn_to_page(pfn)) !=3D zone) - goto cleanup; - } + if (pfn_range_intersects_zones(cma->nid, base_pfn, cmr->count)) + goto cleanup; =20 for (pfn =3D base_pfn; pfn < base_pfn + cmr->count; pfn +=3D pageblock_nr_pages) @@ -261,6 +256,7 @@ int __init cma_init_reserved_mem(phys_addr_t base, phys= _addr_t size, cma->ranges[0].base_pfn =3D PFN_DOWN(base); cma->ranges[0].count =3D cma->count; cma->nranges =3D 1; + cma->nid =3D NUMA_NO_NODE; =20 *res_cma =3D cma; =20 @@ -497,6 +493,7 @@ int __init cma_declare_contiguous_multi(phys_addr_t tot= al_size, } =20 cma->nranges =3D nr; + cma->nid =3D nid; *res_cma =3D cma; =20 out: @@ -684,6 +681,8 @@ static int __init __cma_declare_contiguous_nid(phys_add= r_t base, if (ret) memblock_phys_free(base, size); =20 + (*res_cma)->nid =3D nid; + return ret; } =20 diff --git a/mm/cma.h b/mm/cma.h index 601af7cdb495..b70a6c763f7d 100644 --- a/mm/cma.h +++ b/mm/cma.h @@ -48,6 +48,8 @@ struct cma { struct cma_kobject *cma_kobj; #endif bool reserve_pages_on_error; + /* NUMA node (NUMA_NO_NODE if unspecified) */ + int nid; }; =20 extern struct cma cma_areas[MAX_CMA_AREAS]; --=20 2.48.1.262.g85cc9f2d1e-goog