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 596BFC02198 for ; Mon, 10 Feb 2025 08:34:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EDF61280004; Mon, 10 Feb 2025 03:34:55 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id E6946280001; Mon, 10 Feb 2025 03:34:55 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CE28B280004; Mon, 10 Feb 2025 03:34:55 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id AC671280001 for ; Mon, 10 Feb 2025 03:34:55 -0500 (EST) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 2AA63160747 for ; Mon, 10 Feb 2025 08:34:55 +0000 (UTC) X-FDA: 83103374550.07.2F7FEA1 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf23.hostedemail.com (Postfix) with ESMTP id B77EC140009 for ; Mon, 10 Feb 2025 08:34:52 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=gU6O0BmA; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf23.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739176492; a=rsa-sha256; cv=none; b=EbvrmyYa2XBGtDEaYC6lfApmIt9bfmgFH5fK6/od6mUzlPvBdJ/eec3wgbPKjMHBPTDIWn SxZPyCTqMvc+oylcjrezLpP54d6rHZul6x2ZF+b2wxibzYG6ZzQc59evad8yjH8vBkmhRI ommWQWOoa0eevDb2tfYtHhGBhnNnQfc= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=gU6O0BmA; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf23.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1739176492; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=Bi9cBbJd2CYHdeWl6fezKOHWGpeyWheLrEO+oIR3dZY=; b=PFunL4HdfehXUxjL29lvhdO9RIhhCrkXsSAH6u9WDyoNfLAQeDYWRNgWZ11avZJx6QhhI9 B51BMeejeg1YFnZ5Rf44isfxcDOeIhqH/L4ugK7DXc4ikgfgQ8B42cQnr4KwtqlYnrEtk4 Rjdz0spkRpAPOEbFEhZ0K5GQDegSE74= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739176492; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=Bi9cBbJd2CYHdeWl6fezKOHWGpeyWheLrEO+oIR3dZY=; b=gU6O0BmApni9rOOLoELpA+i0TxEk/5BKOX7WVfKP/BCyNzsZSvqQsqwjUr6lVU8OfjBh5V KkWwzTifMPoP5jhAIgcScwCCX6dwRcyEsxgphHNJlL1J7nD9fCFM+Lv7kGKw+qHLWpg0Q2 oAJpWQTKpfZ9cjJ5KhcUEXx9NZsacrE= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-374-9N4q8HRANXiRkR1bBOu-Tg-1; Mon, 10 Feb 2025 03:34:50 -0500 X-MC-Unique: 9N4q8HRANXiRkR1bBOu-Tg-1 X-Mimecast-MFC-AGG-ID: 9N4q8HRANXiRkR1bBOu-Tg Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-38dd0265d97so1494423f8f.0 for ; Mon, 10 Feb 2025 00:34:50 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739176489; x=1739781289; h=content-transfer-encoding:in-reply-to:organization:autocrypt :content-language:from:references:cc:to:subject:user-agent :mime-version:date:message-id:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to; bh=Bi9cBbJd2CYHdeWl6fezKOHWGpeyWheLrEO+oIR3dZY=; b=FvjXs97A++GHLwPcdxXCR0WGuw9uCNlrsYGR8/Y+dZ4elCyyswZBGBBjiKnsRgfBwv muYHL71LgsZ6l5tnik1j90u38t0jw07VaxdCYlMI4oejod8txKgIur0nEDzgFbaxzBM5 N/MYO2RcDSo5Ufc+x8Xyf34k62LiF3TV5NRM+x2QgPSPXvqT0mteLtBGCEti0mfMMO3B ARlpUaEsUtvctfxWkjJvGYJS+FzKgYQFcXv4bJmYzKfohTrnw/69sYZpkobmUkdiqiuo RDKjbpMeMD53WEUgg8BbEXgyet5mtF1UDRjteX4pyiuodZ8C5b3lASvZoEGTtkTWLhi/ nGcQ== X-Gm-Message-State: AOJu0YyComLhuv1fclQQGUfP5mYbahw8ZIeCI9kqdX4lc+erDKEwBmP0 1Pwgtu5zsZP+8twScZfIa/ydl19ppRhj0AdofHqDw++O1EbFeV50BHc0YGef4SvKS5tNZedDeb+ SuNo2rCABTyugJo4T9KRAsLfIaUPTPXmEOJrQceJ+EFjtz10m X-Gm-Gg: ASbGnct1dq6M7pMEMj1J0YDk6hF5tI4V91qbKpXqN/gDmKvSuMKoROk8GywNtXtkb5L SR0ss/O37uprS2ZT+LBUHDCgmtr4l+oLeQ5nTiWl+HEFtCAVeTQ2KmnEZfFnpDBmfcDTXjm/OMw AbZ/Cq32G4pCVwJECM62z4xhXWM1gzkl1zFnLo/DnHpuCz/zgiAN7kvalPBduZKuhJ+TIDn4dZ0 vG6RBHbpnYBfmqyOvK89HyoLwLreqxHb7cAzwYvlbPMeix5QvMkIjXXisJv4GTCB9ZNRpdNO+Vf aXFaN06O3blnpNx1nUnPJWb36jQNdHChAgy/wy3YyjwSloBNz50b5Ay3QsUIwGFBw3/IZpRUcak 7p1ZBWgFi4OwKJKETRwk5AZboDLjABRlW X-Received: by 2002:a05:6000:1848:b0:38d:d3f7:74b0 with SMTP id ffacd0b85a97d-38dd3f777acmr5763433f8f.20.1739176489364; Mon, 10 Feb 2025 00:34:49 -0800 (PST) X-Google-Smtp-Source: AGHT+IEjPw6diuMoqrOoG6rFj42cR6H2IlYtHABZ92gOCnABi7uh08xnI+qrE4vxXjEvaRxSmjYFCA== X-Received: by 2002:a05:6000:1848:b0:38d:d3f7:74b0 with SMTP id ffacd0b85a97d-38dd3f777acmr5763403f8f.20.1739176488943; Mon, 10 Feb 2025 00:34:48 -0800 (PST) Received: from ?IPV6:2003:cb:c734:b800:12c4:65cd:348a:aee6? (p200300cbc734b80012c465cd348aaee6.dip0.t-ipconnect.de. [2003:cb:c734:b800:12c4:65cd:348a:aee6]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38dc565d62dsm10391540f8f.93.2025.02.10.00.34.47 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 10 Feb 2025 00:34:47 -0800 (PST) Message-ID: <51514ffd-a1ca-4eb4-90ab-c6871ab92c95@redhat.com> Date: Mon, 10 Feb 2025 09:34:46 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH V2] mm/cma: using per-CMA locks to improve concurrent allocation performance To: yangge1116@126.com, akpm@linux-foundation.org Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, 21cnbao@gmail.com, baolin.wang@linux.alibaba.com, aisheng.dong@nxp.com, liuzixing@hygon.cn References: <1739152566-744-1-git-send-email-yangge1116@126.com> From: David Hildenbrand Autocrypt: addr=david@redhat.com; keydata= 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 WNyWQQ== Organization: Red Hat In-Reply-To: <1739152566-744-1-git-send-email-yangge1116@126.com> X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: Ebw4J3xsGlDoZEUHPagptxqpPSUhZ97gOsU-xRQg4To_1739176489 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspam-User: X-Rspamd-Queue-Id: B77EC140009 X-Rspamd-Server: rspam12 X-Stat-Signature: te19xbg33cjbrfw31s7spcqp6eqhhtdw X-HE-Tag: 1739176492-736007 X-HE-Meta: U2FsdGVkX1+j3mHhjXeWfsokd5yma4WzhEX1c0XDDOV1d/XjJ8GbzYq/a6FlhUM0ggmn/A/RN7kZU6g92UK8QqQYesexQmQ7vAdbcPAflY2XfET39JBPH/8nT7K0cSmte4f7k1Bo9XCqYm9HNiSkv50CVZizuJXoXHBtuOiTceX+Zxv2eMn5Wu+Y3zmS4n9ttqX0vDQxUe9eI0BVfbKtAr1lv66+pnoVwUhi7X1dtYF2zcOoRTCE/9ex4d8qoHO0pOAIqrlRQfrk2yyDk6THPzDfpGrO5E1tE4TzpAJ3TRgiuwj79XzB8yVgaKR9zQ5fGKB2YSQAhVslgvyH4eSCfhBKZz/HjqdL/5W3XCR9h35LNQfKHbFPpJcXPPZdZeXVWGNma0BxwfK11Geoanav82XRZ4qMpxU88RPVSL3q6fab3ac60caWSRlQj9hCreEESvk5HDtmSoRP10s80+BK1/2zBVrgbz0HJO94T4gfL8L+SdD6TCt/gEXBARoW8B9SlsrzLI+Qi557g6ElnkZGtz4CtugFhiYV9JYcswci0CAz3kBZzo3VDYj3x3BNClqgHyGOSAvg0UWOIEklD5QeORXGlYcyCU8Uw34/UhWDIJjtG579zt2qaYruHYRpy54mFsEPsIoTphyWfrPjqXgnMEmhzzFzilvbhVp97S63oygp7sZ237HybwiPK3JBlP4grFhaTEHcD6BFXEycWWto+kgoMTpz3uh8VDRjyDzDDsApkShF1U91upAILWqVP45uuB+vs2SCtYgYFF+csxCDo8rZSRWgR5KQD00xC4MXvrWI/tawPz0WlY/SdznQwswaN3CRyMYp8o1D1kjDaFJI6MMoksi5f7vrlvuzSi6sBrI1/MZqCGfbX+Dh/xwlzmi5IutS9lidB3eapbPyBW6EC1wJoG/WCQGwtpbm47W0RU5V6ltAasRvnoEWi3dRXal07sVgkBpquehdtw7S9EI bXUXChzl autOwMdEa/OIhR1N4tQtl5qLPj8CompiwZPs0XJk7rcgIYp2wwwc/ICXdNI7JKwTbbVNXyp35J6EyiHEzYPung9LntOxlno1xIexyFiD4Iwg5pN0NYjHwEfCYUJ49D1WJ4kIc/dCPPigaPVr95nxoMW/uwjpKKKdjtkdp0CKYTsd3ajGmAPGD3nq9ihp53mTQCsNt/MCbyZG5OLgICndMIgEeAJcbOQpffnVFzQlQtzsXOUuyP4WSxmfe6KIOUrwlmZeN+GYLrYJTY8PoDQyp/cKluvDRTQx13gMfV2XhWm3fEZIC+tUi7YnIKjmsjgZiquVdfoYT0v4msrF9SSSVbUuEwNPQTQLCf2umZxRsosQ8rH5W1cNB+J9ka7gGoUhk9h5IEMFWOLYK2Sjyby989886SFHUyHmYBPvBa7NctxEgp0N6G4NFBCoU0QdBsYmadIVxwW4TGbS7eVrFtTbgm7RwPyf8Nzv8H+ro 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: On 10.02.25 02:56, yangge1116@126.com wrote: > From: yangge > > For different CMAs, concurrent allocation of CMA memory ideally should not > require synchronization using locks. Currently, a global cma_mutex lock is > employed to synchronize all CMA allocations, which can impact the > performance of concurrent allocations across different CMAs. > > To test the performance impact, follow these steps: > 1. Boot the kernel with the command line argument hugetlb_cma=30G to > allocate a 30GB CMA area specifically for huge page allocations. (note: > on my machine, which has 3 nodes, each node is initialized with 10G of > CMA) > 2. Use the dd command with parameters if=/dev/zero of=/dev/shm/file bs=1G > count=30 to fully utilize the CMA area by writing zeroes to a file in > /dev/shm. > 3. Open three terminals and execute the following commands simultaneously: > (Note: Each of these commands attempts to allocate 10GB [2621440 * 4KB > pages] of CMA memory.) > On Terminal 1: time echo 2621440 > /sys/kernel/debug/cma/hugetlb1/alloc > On Terminal 2: time echo 2621440 > /sys/kernel/debug/cma/hugetlb2/alloc > On Terminal 3: time echo 2621440 > /sys/kernel/debug/cma/hugetlb3/alloc > Hi, I'm curious, what is the real workload you are trying to optimize for? I assume this example here is just to have some measurement. Is concurrency within a single CMA area also a problem for your use case? > We attempt to allocate pages through the CMA debug interface and use the > time command to measure the duration of each allocation. > Performance comparison: > Without this patch With this patch > Terminal1 ~7s ~7s > Terminal2 ~14s ~8s > Terminal3 ~21s ~7s > > To slove problem above, we could use per-CMA locks to improve concurrent > allocation performance. This would allow each CMA to be managed > independently, reducing the need for a global lock and thus improving > scalability and performance. > > Signed-off-by: yangge > --- > > V2: > - update code and message suggested by Barry. > > mm/cma.c | 7 ++++--- > mm/cma.h | 1 + > 2 files changed, 5 insertions(+), 3 deletions(-) > > diff --git a/mm/cma.c b/mm/cma.c > index 34a4df2..a0d4d2f 100644 > --- a/mm/cma.c > +++ b/mm/cma.c > @@ -34,7 +34,6 @@ > > struct cma cma_areas[MAX_CMA_AREAS]; > unsigned int cma_area_count; > -static DEFINE_MUTEX(cma_mutex); > > static int __init __cma_declare_contiguous_nid(phys_addr_t base, > phys_addr_t size, phys_addr_t limit, > @@ -175,6 +174,8 @@ static void __init cma_activate_area(struct cma *cma) > > spin_lock_init(&cma->lock); > > + mutex_init(&cma->alloc_mutex); > + > #ifdef CONFIG_CMA_DEBUGFS > INIT_HLIST_HEAD(&cma->mem_head); > spin_lock_init(&cma->mem_head_lock); > @@ -813,9 +814,9 @@ static int cma_range_alloc(struct cma *cma, struct cma_memrange *cmr, > spin_unlock_irq(&cma->lock); > > pfn = cmr->base_pfn + (bitmap_no << cma->order_per_bit); > - mutex_lock(&cma_mutex); > + mutex_lock(&cma->alloc_mutex); > ret = alloc_contig_range(pfn, pfn + count, MIGRATE_CMA, gfp); > - mutex_unlock(&cma_mutex); > + mutex_unlock(&cma->alloc_mutex); As raised, a better approach might be to return -EAGAIN in case we hit an isolated pageblock and deal with that more gracefully here (e.g., try another block, or retry this one if there are not others left, ...) In any case, this change here looks like an improvement. Acked-by: David Hildenbrand -- Cheers, David / dhildenb