Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Mike Kravetz <mike.kravetz@oracle.com>
To:     linux-mm@kvack.org, linux-kernel@vger.kernel.org
Cc:     David Hildenbrand <david@redhat.com>,
        Michal Hocko <mhocko@suse.com>,
        Oscar Salvador <osalvador@suse.de>, Zi Yan <ziy@nvidia.com>,
        Muchun Song <songmuchun@bytedance.com>,
        Naoya Horiguchi <naoya.horiguchi@linux.dev>,
        David Rientjes <rientjes@google.com>,
        "Aneesh Kumar K . V" <aneesh.kumar@linux.ibm.com>,
        Nghia Le <nghialm78@gmail.com>,
        Andrew Morton <akpm@linux-foundation.org>,
        Mike Kravetz <mike.kravetz@oracle.com>
Subject: [PATCH v4 2/5] mm/cma: add cma_pages_valid to determine if pages are in CMA
Date:   Thu,  7 Oct 2021 11:19:15 -0700
Message-Id: <20211007181918.136982-3-mike.kravetz@oracle.com>
In-Reply-To: <20211007181918.136982-1-mike.kravetz@oracle.com>
References: <20211007181918.136982-1-mike.kravetz@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?plesN2WI2FBg2Wi7JdwkRzo+9eCaxiAMoM4kvp5dlkqgK4GDlsgEB/lb9yD6?=
 =?us-ascii?Q?EjhgSZxYea6fF3hxCFH2k+yDhJMgzgRVPWRoCh4djtHl/sfc4EOuraz563iI?=
 =?us-ascii?Q?SFbmfgo4xms9WJmyXqKl4WIXAtLYtVn7bHWclhig7iJZov8L85Mt0lcHCU/P?=
 =?us-ascii?Q?pvcWlMDQ1aEejcWoDLatZ4qD7lpVh250zcWqj9Ir0/Kh0SFAjLiJMplGFKsK?=
 =?us-ascii?Q?uQsBElJwygwnID+NohJtxFU01IXJ52CQ8bDfgTGfGPTCQCQCro0Z4gCYuTRM?=
 =?us-ascii?Q?JVMEmDh8ur8uKoIjdtYpggsDJfhEqhAJYbGTQqYqWALWgVIqEz4UlG9OaY/W?=
 =?us-ascii?Q?UY9EkxKXGVtpq6fTgjBW32N+NKiBpGYMHpzQs/KCTHEIcCzE6mP+r3wRgdoj?=
 =?us-ascii?Q?3rgrCJAZ5bt39YrONOas5LwTIaTLNb3QctUiWztncnX1pchd+KAiRjCL6A+B?=
 =?us-ascii?Q?m+E3iTSB+L5htRUDS3O8QjRWQ3ir4cjH5lyGFjsaefhqb8rcSELKPR3YrMvH?=
 =?us-ascii?Q?1ExOxkfXFTI1cnroagetDpoWc6//RTGHyVdx48vuhbMXOvnE5KPMLs35dV6o?=
 =?us-ascii?Q?MGnbRP2lm2TB5GrDyuKMmgr41t577EPwjDO9IM1sshX+31jPdh82woMPnV2K?=
 =?us-ascii?Q?faCqIAYNJ8b2S+PaGrw3rcIkCrPuyV4OLVO/b1PhJ8lZTll3voZLX4ZBdqxS?=
 =?us-ascii?Q?uNeDqn2zur6AfOEqWUzKQyZ0LgDex5ofbHnvIyogWy/EmYXL99pj4WNtzxiq?=
 =?us-ascii?Q?+OxCga3FzApwEgW8HSv9b8x4YEpIAEaopvxXx44oXQYVi2Z3PDQ8Q8pv0QL5?=
 =?us-ascii?Q?MtNWpvSMaILkrRSvp7Dl5Czl2vv+vr6MMTxK9C720U1HLU+5KHG3Vs+SHbgL?=
 =?us-ascii?Q?/rGDVYFpWg3Me8Or3tWJtzkd9i9lyMBOYpjWcef0OG+vCHGDHGvrrEXE++05?=
 =?us-ascii?Q?Kzid2TTnmUrVdT0XAE9BaNV3x3oUw//DkXUW07rARV11aNgJ6d59tWxXkeqN?=
 =?us-ascii?Q?lXPk5W0RUP30nvkJbSnU2dQMvXACZRuuYkDIsvO01qZKC8t3K8XpQ9CB8AnV?=
 =?us-ascii?Q?WQ7CGqkRv7M4zYLS+P2bFCSUVXzu3buE/TDqQBEk7uiHW2Dwf/l6FLwR9vg2?=
 =?us-ascii?Q?WNHm7nqx2foOws7MHKi++uIemNZW9s2CYzQlgCp8iHykJUyV0YR7s2B+DjCR?=
 =?us-ascii?Q?lXt4QUMHF/3/A7AHcjiJcrydlVeHvcYl+bBOEUjw/wrIbK+Od2y8gxZ016+G?=
 =?us-ascii?Q?H/bE/c9Sm4XUZaK0D826XTCjY0ps8p78VvTvWng8fn1d1CjYc6q3BRLrUKKd?=
 =?us-ascii?Q?TWnCsRvJIft7zzDTLHbv8IlN?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 07e5530b-df52-4dab-39d8-08d989bf05c2
X-MS-Exchange-CrossTenant-AuthSource: BY5PR10MB4196.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Oct 2021 18:19:37.8895
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: RWMJXJM4Vmx+jpmr1SneTFfQUIH9DvwvELkJQk4eTVDN5ttakF0PLUgQV/UJT3N5xd+1CPHYbq2Rjl3KzM//VA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR10MB2552
X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10130 signatures=668683
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 mlxlogscore=999 adultscore=0
 bulkscore=0 suspectscore=0 malwarescore=0 spamscore=0 phishscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2109230001
 definitions=main-2110070118
X-Proofpoint-ORIG-GUID: I_sqvM63uolDTOObbGsKPwvXGi6X6JGA
X-Proofpoint-GUID: I_sqvM63uolDTOObbGsKPwvXGi6X6JGA
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Add new interface cma_pages_valid() which indicates if the specified
pages are part of a CMA region.  This interface will be used in a
subsequent patch by hugetlb code.

In order to keep the same amount of DEBUG information, a pr_debug() call
was added to cma_pages_valid().  In the case where the page passed to
cma_release is not in cma region, the debug message will be printed from
cma_pages_valid as opposed to cma_release.

Signed-off-by: Mike Kravetz <mike.kravetz@oracle.com>
Acked-by: David Hildenbrand <david@redhat.com>
---
 include/linux/cma.h |  1 +
 mm/cma.c            | 24 ++++++++++++++++++++----
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/include/linux/cma.h b/include/linux/cma.h
index 53fd8c3cdbd0..bd801023504b 100644
--- a/include/linux/cma.h
+++ b/include/linux/cma.h
@@ -46,6 +46,7 @@ extern int cma_init_reserved_mem(phys_addr_t base, phys_addr_t size,
 					struct cma **res_cma);
 extern struct page *cma_alloc(struct cma *cma, unsigned long count, unsigned int align,
 			      bool no_warn);
+extern bool cma_pages_valid(struct cma *cma, const struct page *pages, unsigned long count);
 extern bool cma_release(struct cma *cma, const struct page *pages, unsigned long count);
 
 extern int cma_for_each_area(int (*it)(struct cma *cma, void *data), void *data);
diff --git a/mm/cma.c b/mm/cma.c
index 995e15480937..11152c3fb23c 100644
--- a/mm/cma.c
+++ b/mm/cma.c
@@ -524,6 +524,25 @@ struct page *cma_alloc(struct cma *cma, unsigned long count,
 	return page;
 }
 
+bool cma_pages_valid(struct cma *cma, const struct page *pages,
+		     unsigned long count)
+{
+	unsigned long pfn;
+
+	if (!cma || !pages)
+		return false;
+
+	pfn = page_to_pfn(pages);
+
+	if (pfn < cma->base_pfn || pfn >= cma->base_pfn + cma->count) {
+		pr_debug("%s(page %p, count %lu)\n", __func__,
+						(void *)pages, count);
+		return false;
+	}
+
+	return true;
+}
+
 /**
  * cma_release() - release allocated pages
  * @cma:   Contiguous memory region for which the allocation is performed.
@@ -539,16 +558,13 @@ bool cma_release(struct cma *cma, const struct page *pages,
 {
 	unsigned long pfn;
 
-	if (!cma || !pages)
+	if (!cma_pages_valid(cma, pages, count))
 		return false;
 
 	pr_debug("%s(page %p, count %lu)\n", __func__, (void *)pages, count);
 
 	pfn = page_to_pfn(pages);
 
-	if (pfn < cma->base_pfn || pfn >= cma->base_pfn + cma->count)
-		return false;
-
 	VM_BUG_ON(pfn + count > cma->base_pfn + cma->count);
 
 	free_contig_range(pfn, count);
-- 
2.31.1