From nobody Fri Dec 19 17:43:34 2025 Received: from mail-pl1-f202.google.com (mail-pl1-f202.google.com [209.85.214.202]) (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 DE974276051 for ; Fri, 28 Feb 2025 18:29:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740767396; cv=none; b=IyN7mhEwxZY+1YU2FXEV9DOAnwGpTNKSadR8F9JEFHlREIlsHNzHL4Mn3PJDWGSzzo/JuxQGjkn4LgjfmtGYvxLi/lZ9Sv/XCkdQGEi7LTrEG+1JL9NiqQglloJpnEQHunJKuMlLMtp3VYUnKqBZfGZlyRg1W+Dmq/IN+6EFtQE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740767396; c=relaxed/simple; bh=s0deOUnNgMIFiGIX8UNyQZNO2RKvZSA/G/yOBXDqhdk=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=PXU3hYfQK4sDsDAtryfwS7wOvHglUKkma8zJRmZmt2k4y1ouj3SdRM3Xv/qu/XfzhR6qu7S8MLJXvsMkzj2Zx8j4rhqgEjDbkUJxRUCpBxANxhajuvOu3vKrV8ntZuMeZtpGxkcQ1D3VA9opybt42BwIxbk8rA7An7k2tyOXTIo= 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=e2RVXD+v; arc=none smtp.client-ip=209.85.214.202 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="e2RVXD+v" Received: by mail-pl1-f202.google.com with SMTP id d9443c01a7336-22328fb6cbfso44745285ad.2 for ; Fri, 28 Feb 2025 10:29:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1740767394; x=1741372194; 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=cv0B4/uThibyDXPGrCU6CzEy8xZoS0FJOJ+cAKPL8G4=; b=e2RVXD+vmKeg6JaEbngDcna7T+WMYhxk0WKLlUgJD740Bw0So2cqUDsAOKVyHJqzV7 Cdg4qEG1IV+pvMzDG6XpY22z+fzOrT+Act2cXkSTyed9QLQQtkjdOzsVNRIAlqrEgRYF VLP6wrF+449Fjr3bHO1fuEHbVCQskqbhQyqjnLs7+d7AyaBvyyq2LoiiBkoWteVL/F/1 +4LUOMRwuMWiHld4Scd5jkNAoviLvmTt51fsCQC0yiQVaOna/57yAkXS3HYfXQUXxhkO DWQPS8L80zNfIV2CZDMsrFN/GvEmr7stKBwfV1iNCOEdcYuNvWeCTj28zZ+xxYCGTWUl RImw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740767394; x=1741372194; 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=cv0B4/uThibyDXPGrCU6CzEy8xZoS0FJOJ+cAKPL8G4=; b=M8ZmzPXr6hoTSAmrlfBSlKlIeIdN+EEq9b3KVRC46k2Uo0C2STO1VCWhI0hrsb3IPe VTkD7qKDN94FDjdRf0BRetFwF3lSHByYezKCCi644gM5yr8grxGqxxMH9gsZX/ph/R1p o0joXC95alyh1y2clN96lAlnMxdGJtH4ArlBvZM4bwaDYqrCrB5g7YWgFW1v6ZyUeJMr wBZ/osL5W3XfAC2x1JRoHDjdoJ+Ffzo9DGHxVioc0ahH12X273Wd/fZjF9rjVVDeH9KF 67lReh61stJRH/pTQZr+vNIohgiLYmr6gZqmEZl31r5i/ffGPNjMR8ngyL0PkZ9yj9zT Tu/w== X-Forwarded-Encrypted: i=1; AJvYcCVryUjkhCbRXrDmjVsdBIKV8xDt/JbD8wW8fgwgAGKBB4aAr17nnROT50Pfks/eMzAsGmMzv2nYctH21tI=@vger.kernel.org X-Gm-Message-State: AOJu0Yzse5PbFrvnQBKP7OWp+22+Hx5fGPNnN1GodxUCe1aB4g+NAFPg 1ZXxne4Qv/NgYniqmH6FY34QJHmdlknxeaWyxQ6TbOKFHFsDEbo6VrCeZTYsRroSiNHPXg== X-Google-Smtp-Source: AGHT+IGsUKkAmT8g+s3WZ9uk+Wed7lmB9nB51UlYclAmGf34PovRshjaGeeXtqu2JnyLABvgZzxxfd3d X-Received: from pljc15.prod.google.com ([2002:a17:903:3b8f:b0:220:bf5f:1984]) (user=fvdl job=prod-delivery.src-stubby-dispatcher) by 2002:a17:902:f693:b0:21f:9c48:254b with SMTP id d9443c01a7336-22368fa8f86mr82559765ad.24.1740767394131; Fri, 28 Feb 2025 10:29:54 -0800 (PST) Date: Fri, 28 Feb 2025 18:29:04 +0000 In-Reply-To: <20250228182928.2645936-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: <20250228182928.2645936-1-fvdl@google.com> X-Mailer: git-send-email 2.48.1.711.g2feabab25a-goog Message-ID: <20250228182928.2645936-4-fvdl@google.com> Subject: [PATCH v5 03/27] mm/cma: introduce cma_intersects function 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, usamaarif642@gmail.com, joao.m.martins@oracle.com, roman.gushchin@linux.dev, ziy@nvidia.com, david@redhat.com, Frank van der Linden , Heiko Carstens , Vasily Gorbik , Alexander Gordeev , linux-s390@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Now that CMA areas can have multiple physical ranges, code can't assume a CMA struct represents a base_pfn plus a size, as returned from cma_get_base. Most cases are ok though, since they all explicitly refer to CMA areas that were created using existing interfaces (cma_declare_contiguous_nid or cma_init_reserved_mem), which guarantees they have just one physical range. An exception is the s390 code, which walks all CMA ranges to see if they intersect with a range of memory that is about to be hotremoved. So, in the future, it might run in to multi-range areas. To keep this check working, define a cma_intersects function. This just checks if a physaddr range intersects any of the ranges. Use it in the s390 check. Cc: Heiko Carstens Cc: Vasily Gorbik Cc: Alexander Gordeev Cc: linux-s390@vger.kernel.org Acked-by: Alexander Gordeev Signed-off-by: Frank van der Linden --- arch/s390/mm/init.c | 13 +++++-------- include/linux/cma.h | 1 + mm/cma.c | 21 +++++++++++++++++++++ 3 files changed, 27 insertions(+), 8 deletions(-) diff --git a/arch/s390/mm/init.c b/arch/s390/mm/init.c index f2298f7a3f21..d88cb1c13f7d 100644 --- a/arch/s390/mm/init.c +++ b/arch/s390/mm/init.c @@ -239,16 +239,13 @@ struct s390_cma_mem_data { static int s390_cma_check_range(struct cma *cma, void *data) { struct s390_cma_mem_data *mem_data; - unsigned long start, end; =20 mem_data =3D data; - start =3D cma_get_base(cma); - end =3D start + cma_get_size(cma); - if (end < mem_data->start) - return 0; - if (start >=3D mem_data->end) - return 0; - return -EBUSY; + + if (cma_intersects(cma, mem_data->start, mem_data->end)) + return -EBUSY; + + return 0; } =20 static int s390_cma_mem_notifier(struct notifier_block *nb, diff --git a/include/linux/cma.h b/include/linux/cma.h index 863427c27dc2..03d85c100dcc 100644 --- a/include/linux/cma.h +++ b/include/linux/cma.h @@ -53,6 +53,7 @@ extern bool cma_pages_valid(struct cma *cma, const struct= page *pages, unsigned extern bool cma_release(struct cma *cma, const struct page *pages, unsigne= d long count); =20 extern int cma_for_each_area(int (*it)(struct cma *cma, void *data), void = *data); +extern bool cma_intersects(struct cma *cma, unsigned long start, unsigned = long end); =20 extern void cma_reserve_pages_on_error(struct cma *cma); =20 diff --git a/mm/cma.c b/mm/cma.c index 34caa6b29c99..8dc46bfa3819 100644 --- a/mm/cma.c +++ b/mm/cma.c @@ -978,3 +978,24 @@ int cma_for_each_area(int (*it)(struct cma *cma, void = *data), void *data) =20 return 0; } + +bool cma_intersects(struct cma *cma, unsigned long start, unsigned long en= d) +{ + int r; + struct cma_memrange *cmr; + unsigned long rstart, rend; + + for (r =3D 0; r < cma->nranges; r++) { + cmr =3D &cma->ranges[r]; + + rstart =3D PFN_PHYS(cmr->base_pfn); + rend =3D PFN_PHYS(cmr->base_pfn + cmr->count); + if (end < rstart) + continue; + if (start >=3D rend) + continue; + return true; + } + + return false; +} --=20 2.48.1.711.g2feabab25a-goog