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 CD4E9C83F01 for ; Sun, 27 Aug 2023 07:33:46 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D9B848E000A; Sun, 27 Aug 2023 03:33:45 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D4B588E0001; Sun, 27 Aug 2023 03:33:45 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C13C58E000A; Sun, 27 Aug 2023 03:33:45 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id B0BD18E0001 for ; Sun, 27 Aug 2023 03:33:45 -0400 (EDT) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 4F264140163 for ; Sun, 27 Aug 2023 07:33:45 +0000 (UTC) X-FDA: 81169070010.13.DA50021 Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by imf11.hostedemail.com (Postfix) with ESMTP id 7E6E840002 for ; Sun, 27 Aug 2023 07:33:43 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=jrn4u52w; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf11.hostedemail.com: domain of lstoakes@gmail.com designates 209.85.128.45 as permitted sender) smtp.mailfrom=lstoakes@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1693121623; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=DXqSDQRdpFVxSMWPIbkM/UGoWPvgZsuAolwIKyKIbCc=; b=m52HzYqqsfswIsRrFNqpuPeRScRH12PJ+2P758N/odkotV2xKapj3qodfTaSXVOoqfC+8L hsIw6r883gpecDuN/H+JRJv25VP32FSOQ67c3xxMEbmCGvhX9/K5qn1/6QaKU9Fz2antea zVKACyExHxVicIE2uLkyiIEXdWuPv7w= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=jrn4u52w; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf11.hostedemail.com: domain of lstoakes@gmail.com designates 209.85.128.45 as permitted sender) smtp.mailfrom=lstoakes@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1693121623; a=rsa-sha256; cv=none; b=meik9+4r1VB+6eo/mE4Wj5YNYUy4Ik2Q8PL9o8x2X6BeAPQoHF1Reoo0ylrDfFBtQAz5qU WzbjNnDbICEj11vdUBfDi4vUWmdWfOXjfsfouvbH18VqUPAhLRCWkDMrOscj6bBPVT6+pC 9TjLyi8lBoibjF2CkiZc4l9AbuSi588= Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-3ff006454fdso21971915e9.1 for ; Sun, 27 Aug 2023 00:33:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693121622; x=1693726422; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=DXqSDQRdpFVxSMWPIbkM/UGoWPvgZsuAolwIKyKIbCc=; b=jrn4u52wWLXhjFndbFcrhD0rRuHMtXN84kHStHP4IjJL8zlRDHBArSDCM0wapaIyY/ n2USwSXR0b+khTfWxa+OUScoXEQp+VmRtXmrElnrHR6p4BvsAnGNFHHkQG2La06hOH0D O5yqrcHdeFOQhHeznA2S05P561KWK67QBPntWF44cFM69LKwaVTS0zeBNgKdlLK7bqoB EsgFs/ljqpzRYVlpzq6hF36/Ot+p4LSesa+T4PKqVhkzhN/2EdhaiPXXmwu0bl69tyS+ 53IrCvnsk42Mnz7SLkQo8aC0JUCzuao901XXhmIU2vKdHbCmaUsrUZ4Fnf9RTPB/PTsf Xrtg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693121622; x=1693726422; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=DXqSDQRdpFVxSMWPIbkM/UGoWPvgZsuAolwIKyKIbCc=; b=i7wdeMLKXUy+fuo5Ls0ogBO1qXEiJvoyhxRnOiwMoqkm6gGZsvgvn82mcMDJSXJ3ng XkciQsDMklvFMJZkGKY8xJHT2mis1CMVqMnMNsD8/+8fJ6YUCRet3Pk/lt47jAu5/jwr lb1n9unQWZAruAh4CAgO75x6R3Q8gYXldKKub3dPmC2VdJERiCvIWBF3ORjg1Om3PlXT si1RMJV7HkLPDutmoIucdbSwpDJ01a0GND4xWkkLuMBlPJn9kFcxy0Db3LEA36G82JfG dNxmRkKwclHTW/Eng3WxUHsHc49h6rDwkjVOgI3syQi3FWLHoig7wtsMR0ekwTAZibc3 WGHw== X-Gm-Message-State: AOJu0YwtV2E+1ig44m44JH6CWK4qn6mrrZeRgi9JVyT5ok0DUrIW54rh aG0yUlvR+XFWi5eAsVlNenI= X-Google-Smtp-Source: AGHT+IG4iz2vp8SM8pBcVMkjpCxO51FlSyAFpz+4LhBPxhctWSt6/4ueEpGsgLpmVdzlXfz70jfC4A== X-Received: by 2002:a1c:771a:0:b0:401:bdd7:499d with SMTP id t26-20020a1c771a000000b00401bdd7499dmr2942999wmi.25.1693121621811; Sun, 27 Aug 2023 00:33:41 -0700 (PDT) Received: from localhost ([2a00:23c5:dc8c:8701:1663:9a35:5a7b:1d76]) by smtp.gmail.com with ESMTPSA id p16-20020a05600c205000b003fbdbd0a7desm7144882wmg.27.2023.08.27.00.33.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Aug 2023 00:33:40 -0700 (PDT) Date: Sun, 27 Aug 2023 08:33:39 +0100 From: Lorenzo Stoakes To: "Matthew Wilcox (Oracle)" Cc: linux-mm@kvack.org, linux-perf-users@vger.kernel.org, peterz@infradead.org, mingo@redhat.com, acme@kernel.org, urezki@gmail.com, hch@infradead.org Subject: Re: [RFC PATCH 1/4] perf: Convert perf_mmap_(alloc,free)_page to folios Message-ID: <78cc53f6-3828-4802-afc5-abb71dc59627@lucifer.local> References: <20230821202016.2910321-1-willy@infradead.org> <20230821202016.2910321-2-willy@infradead.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230821202016.2910321-2-willy@infradead.org> X-Rspamd-Queue-Id: 7E6E840002 X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: mpugykj5gmm1fwuxzp1dea3mcjewi7j7 X-HE-Tag: 1693121623-187749 X-HE-Meta: U2FsdGVkX1/IYIFu22dDD7MWeyAcm4yjvbKwadUvhhzzEO3npP7esYMK7EODB9O3PH4vo78WdwuHt7U2WjipmC3q36RGpktYqUMi/ckV9FDn07NrDcYjG4urFj4G3NhseXSNKJS5FZ4YDQwyZ5jiDwoUJgYm1BKHXaQ5t6CkSMBw5iXlEFPuGE19msKKr3LMMyJVdxBX+keMn5a70o7/nVLrBI8Vd738Uj0RM0dCsuBMjDOywTYaVjpmfiBBwUkHHAzXspb3KZjYhUdJ9ctHXx4FcLPy09P2FvMd/03ERLsjIjra6BMvgISh8NCFF4iUvBItDM2IWjiuaF/qa2icy25SwkOuFNIH7xaOkowZRzzWJ4jlHpBkiaf0SG85XBEUGR6yhxo/QQqfYGYEFe46K4xJZzpLMRGeXxj7BBuTLO4VWRGK5PKx8ZgFnL2N7hFSktgv8jnz4W/YDzSW2Pd3aClmnz8BldI6//hZKGeloRMgnhnskudcNFKkWZlAJqku8q/e90RImVesaw1GW7oQX/BXSdq+xGPI1hmPhTRR005YRjEDNonL/QqI0mULQeN1tuMzkTnOcBuA3Mb73BckcWGZYQXG7N4CkbY0nsuaIh2tKoZyroEo2VCiWaHCx5gfdDQEn2uofSjxvgoreYzmlAQBjiM8fDQEUxiZ/dRcMluzFZXvlBDjJO0Hkl78Bk3xqK7ks7nSC9MhYXbz1asdQKZppwu3duRH6f0jYkvLaLVQk92LzLTTUz7uNkseqtM7aFx0/BZTxsXJIKTSlTI/2x6d0JGQ7bNIWLgemZ50fqyqk4+DYLhIs2SK9ywgyDB2kVYMhrs3tMPFXXdyNkZDyfPcYBrSkqu/4WD9bKSHlJluQkfg49MOnJ0/yR1I66ETmxRNcwGmtj1X3zpG7LzILSmBZhSAsPqbYoB+NziQd1Rmc+LoNAtmI709/9VSn7Lyu6m8ojRkVd/k24Xxbbg vq2/rFm4 CZHntZJ44tQiRswYoaC/W4xtuBIu3o0f3BOZ62/s6aTLusXGLlnUkUA297SCIgqGQ0KCftg6JSa5+v7G54oYrawNCExZzQZZDL6EQ73Wxb+9MhbBNoxnabWK6+I5w1CqbmdUQ+6rYjd3XDbVmvWCslZJqljf4vp/4TbWG0exJqDBQeNakTia+vYJGsDD80pF91YkN2NRsZwuNul6J6uD7/WqlSpy2y4l1RMZcFP2ReyipkuU1pSZtLholwBZy2zTSVGFXXJwdLeAfNr8QeMsg25aAS/VrSzN2+uucFBBfkxIMXw2nd7tepQ4oYTZc+UQ6QFe6XTgP45KNJ6dw/J0ZQgNCpVXiDyN1h9yh6mGZ34UhgBNwfn3WBSoIj+3TghK7Q+Pt3ep5azkiw+aG6EDl7t0CL9xbLAQJmDpkz2zm0xvIZ60pD/5G7NAG2jwFqSZTYTY2B1u9DzecLtSDmDGxEikwfDcha8017zcbB/elU38FvfH9CPMMnBGiFw== 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: On Mon, Aug 21, 2023 at 09:20:13PM +0100, Matthew Wilcox (Oracle) wrote: > Use the folio API to alloc & free memory. Also pass in the node ID > instead of the CPU ID since we already did that calculation in the > caller. And call numa_mem_id() instead of leaving the node ID as > -1 and having the MM call numa_mem_id() each time. It's a bit of a nit or perhaps an aside, but with this change if you passed -1 to the newly invoked __folio_alloc_node() you will also trigger a VM_BUG_ON() :) > > Signed-off-by: Matthew Wilcox (Oracle) > --- > kernel/events/ring_buffer.c | 26 ++++++++++++-------------- > 1 file changed, 12 insertions(+), 14 deletions(-) > > diff --git a/kernel/events/ring_buffer.c b/kernel/events/ring_buffer.c > index fb1e180b5f0a..cc90d5299005 100644 > --- a/kernel/events/ring_buffer.c > +++ b/kernel/events/ring_buffer.c > @@ -770,7 +770,7 @@ void rb_free_aux(struct perf_buffer *rb) > #ifndef CONFIG_PERF_USE_VMALLOC > > /* > - * Back perf_mmap() with regular GFP_KERNEL-0 pages. > + * Back perf_mmap() with regular GFP_KERNEL pages. > */ > > static struct page * > @@ -785,25 +785,23 @@ __perf_mmap_to_page(struct perf_buffer *rb, unsigned long pgoff) > return virt_to_page(rb->data_pages[pgoff - 1]); > } > > -static void *perf_mmap_alloc_page(int cpu) > +static void *perf_mmap_alloc_page(int node) Nitty point but since we're dealing with folios here maybe rename to perf_mmap_alloc_folio()? > { > - struct page *page; > - int node; > + struct folio *folio; > > - node = (cpu == -1) ? cpu : cpu_to_node(cpu); > - page = alloc_pages_node(node, GFP_KERNEL | __GFP_ZERO, 0); > - if (!page) > + folio = __folio_alloc_node(GFP_KERNEL | __GFP_ZERO, 0, node); > + if (!folio) > return NULL; > > - return page_address(page); > + return folio_address(folio); > } > > static void perf_mmap_free_page(void *addr) Same comment re: rename -> perf_mmap_free_folio() > { > - struct page *page = virt_to_page(addr); > + struct folio *folio = virt_to_folio(addr); > > - page->mapping = NULL; > - __free_page(page); > + folio->mapping = NULL; > + folio_put(folio); > } > > struct perf_buffer *rb_alloc(int nr_pages, long watermark, int cpu, int flags) > @@ -818,17 +816,17 @@ struct perf_buffer *rb_alloc(int nr_pages, long watermark, int cpu, int flags) > if (order_base_2(size) > PAGE_SHIFT+MAX_ORDER) > goto fail; > > - node = (cpu == -1) ? cpu : cpu_to_node(cpu); > + node = (cpu == -1) ? numa_mem_id() : cpu_to_node(cpu); This is a good change in general, it's pretty yucky that this code just assumes -1 == NUMA_NO_NODE and that all invoked functions would handle this correctly. > rb = kzalloc_node(size, GFP_KERNEL, node); > if (!rb) > goto fail; > > - rb->user_page = perf_mmap_alloc_page(cpu); > + rb->user_page = perf_mmap_alloc_page(node); > if (!rb->user_page) > goto fail_user_page; > > for (i = 0; i < nr_pages; i++) { > - rb->data_pages[i] = perf_mmap_alloc_page(cpu); > + rb->data_pages[i] = perf_mmap_alloc_page(node); > if (!rb->data_pages[i]) > goto fail_data_pages; > } > -- > 2.40.1 > Reviewed-by: Lorenzo Stoakes