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 21867D3A670 for ; Tue, 29 Oct 2024 17:13:04 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9C72F6B0096; Tue, 29 Oct 2024 13:13:03 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 94E926B0099; Tue, 29 Oct 2024 13:13:03 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7C8906B009A; Tue, 29 Oct 2024 13:13:03 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 59C066B0096 for ; Tue, 29 Oct 2024 13:13:03 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 1522F16023E for ; Tue, 29 Oct 2024 17:13:03 +0000 (UTC) X-FDA: 82727284416.15.E32080D Received: from nyc.source.kernel.org (nyc.source.kernel.org [147.75.193.91]) by imf14.hostedemail.com (Postfix) with ESMTP id B36B0100016 for ; Tue, 29 Oct 2024 17:12:33 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=bBSfyJFN; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf14.hostedemail.com: domain of rppt@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=rppt@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1730221864; a=rsa-sha256; cv=none; b=nIgRzSB3wfPCdOvWLgew1LeBgGOJllpkIQd3OebMYpbAwPsLU8Wq89sy2v7BoMl9xtjNwi s0glvr5s/8+2Z3AWhGHAkLc0SQrsJNS8klTYpsd+aLaqpHMl2syDYEhWNPEEVjaIZvm0x2 R0p0fz2kXwmK5LSsSYQvGNRczST/67Q= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=bBSfyJFN; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf14.hostedemail.com: domain of rppt@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=rppt@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1730221864; 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=CfV9UwxApftomFeMdco/806oXgOndXU7xOBRhbq1rRg=; b=ycjcaC4mlGXyaN9x1Wg+9Y5hEXCCcfZHuk44ljbYSuv+I8AQ5ky2bAzPOGWGxNydCZdv7g JUcthXH4GPpYwVUXgsfZU9V9XQCwNS9xvu9h1YSShlRgGPqkXqpO+FwOw2xcw1UaRuzavW V5HZzWBCcdt2MiwAVb01XDKm/7ONQXU= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id CF950A4090A; Tue, 29 Oct 2024 17:11:04 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 76AEFC4CECD; Tue, 29 Oct 2024 17:12:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1730221980; bh=ukyVYyM0tOiZ4iqiktPsxWYx+0OwZldJr/Cwesjm6pg=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=bBSfyJFNvOZPaZUO3GeQ52d9XADLPWJmr0uaU99VQIxN5YGzLF40b2HtmsqquEBTa U50WbY3bQJxBG0qco4frVQpbGIQeJu/FLQghFpuF4BWOqr3YzhhjzKGtTSp6ke8TVg hGhJJEFAWcLhr6IhK10zSExEywIbCC/NiK9kwIxbBXvtfO/7PyBah+5uTXJ90pa9QP ZdFhqPzRrirrbOFER6fhTyiYm3YUEnfU79E3FzfUq/OUGM6EKDCkhkmdqb9KpHUSz4 LL0Pt4xjn6625YRWekEYAJ58H5vD456b5w9nweeSIexFeGP9cgWW1kYMzhJhGcyASc yzSE8wJwTl8MA== Date: Tue, 29 Oct 2024 19:09:05 +0200 From: Mike Rapoport To: Suren Baghdasaryan Cc: akpm@linux-foundation.org, arnd@kernel.org, arnd@arndb.de, pasha.tatashin@soleen.com, mcgrof@kernel.org, song@kernel.org, mhiramat@kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, kernel test robot Subject: Re: [PATCH 1/1] alloc_tag: avoid execmem_vmap() when !MMU Message-ID: References: <20241028202935.1047017-1-surenb@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20241028202935.1047017-1-surenb@google.com> X-Rspamd-Queue-Id: B36B0100016 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: 3q77tt6qg1qpbjk87cihsnarqz1scbef X-HE-Tag: 1730221953-712974 X-HE-Meta: U2FsdGVkX19DyoJdqnGaKTWf+uQwc0pAeT94DkLyhWs1YvXsaXsELzpPDBjXVSLi9St/kpFJW4YT94Jhp4RCnWlFgOW5mrfUSpPpr2m1DwqBXdPpBZrotaVL8xahvBN+p2vpXuQvSwoWn/OXZ75FOY0mKaU/4sZ/1Uh3FaXK3WQnuE7oEx4UcVgwpJVc3KaadtFc5GpdXWC7cCossKAbfR4d9kfnOJacmCk3ijy+VGE+q0Amhlxcwt4kzOTl5hDyOvN75GHjUd5UvXDTkMgu4jcfAQS7nGLmpfxdaM7SXMpqP/DF5dDpCY2Z+MRN0EhAr4SyPkcXPqm7Gz54HWlxiMwvDwquaIh+utSw/3WWiREdZ2YUtl2zLndzZvdU6mk6/enyEfF4F48LWJko1Tz/uC0d9RVjexgSiHBHF1EqiBL5zKgWdggj+HAy19NGfBa8rpGJ1YTrI2JJ90j120uUTl9W35I/Pazh80gII7/Z9q1A+aC14D+wILvCkI/Bs4V9Q0Za9LPx3uy5TYVJ6If+4YVjo77qd8rISDom7BbTf9DcLvYCpIEAUBvoB3giDxJAGoSIF/H1xW72ffixdvO0z4Qor7NnS1Enjfcq2WADf8sRKYRjRdP8jjkL5Kt6g0UMrp7lAHbW2VX3AMtRq7CEPeiliuY+SoIHpyeXR4waqVw0Gx0/QZ9xW47XzJYPunjw63fMA1LOSVxIxhYEVwfj3qZ+V1DM4xraKKUn9UBn/MvB6t8AHyYBnNDmp0fi7o84LaKVtdtScCtVrS+AOPuTCip71VfzA5aLsb4KH1GFw0ATgCGz/DOQXvlRVJwN3W2+dMABFsKK89ZbZqIiOxgbA8JpG1BYTX7srGxO+MHrGY4sPAL61idJrWBmJ4XAP0a/Ha4l3ESEIAN9rY0RQaOlJfE1hi432gGHkCs2LrPLJIZC/sC4a1P9ZepsXKF4Ibxohpv3xmTUsMbVSXmmdEg AAIHNu7c rA3M09W8ArK8YEFDuOvWWoRZyxE/EpVorAteL1bafF85ekzMm1yyVjquBi/mDHFNeclj4fT8goefpoO4DmMXkfp9omNB+n3UNCBBqHYA8MR4sqjUptrklAoCUBTn8k2tAZU9R0ULQBAxPzhSFS/Zb3fTpg/IZ6JhB3OlFamxB1WfK7PxMoYg92ep4Is1tduoGv2ECiCl4qLkojIo4zjcCxxRPY3ymi0rW+MZQ/9rEiXREb78+tUvdNWOk4+YTKkZ9ytRkjeVLTnvFqYzZqRPNYEXtmBjtPWCgecx0hIiAjRsbB5VXkhPxu1FkLT+hB79+ibn7lSyLX4JK0xXO+ZUVI3S4jXcM97bZuW6kWCMpdLCTQe53Nua5GkWpn5fDV2xa/BxyIhkAhDU3DGNgAc52Gas+k/fybVZqtpAh 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: Hi Suren, On Mon, Oct 28, 2024 at 01:29:35PM -0700, Suren Baghdasaryan wrote: > With CONFIG_MMU=n __get_vm_area_node() is not available and memory for the > allocation tags cannot be populated as needed. For this case, populate the > required memory at initialization time. Do we care that much to have alloc_tags on !MMU configs? Your patch is great, but it would have been a lot easier to make MEM_ALLOC_PROFILING depend on MMU. > Fixes: 57bc3834fb6f ("alloc_tag: populate memory for module tags as needed") > Reported-by: kernel test robot > Closes: https://lore.kernel.org/oe-kbuild-all/202410250808.dQGyYjlk-lkp@intel.com/ > Closes: https://lore.kernel.org/oe-lkp/202410251525.9f85854d-oliver.sang@intel.com > Closes: https://lore.kernel.org/oe-kbuild-all/202410261016.IO7C6Cml-lkp@intel.com/ > Closes: https://lore.kernel.org/oe-kbuild-all/202410270919.LebQlmxD-lkp@intel.com/ > Cc: Arnd Bergmann > Cc: Mike Rapoport (Microsoft) > Signed-off-by: Suren Baghdasaryan > --- > include/linux/execmem.h | 2 ++ > lib/alloc_tag.c | 23 ++++++++++++++++++++++- > mm/execmem.c | 32 ++++++++++++++++---------------- > 3 files changed, 40 insertions(+), 17 deletions(-) > > diff --git a/include/linux/execmem.h b/include/linux/execmem.h > index 5a5e2917f870..64130ae19690 100644 > --- a/include/linux/execmem.h > +++ b/include/linux/execmem.h > @@ -139,6 +139,7 @@ void *execmem_alloc(enum execmem_type type, size_t size); > */ > void execmem_free(void *ptr); > > +#ifdef CONFIG_MMU > /** > * execmem_vmap - create virtual mapping for EXECMEM_MODULE_DATA memory > * @size: size of the virtual mapping in bytes > @@ -148,6 +149,7 @@ void execmem_free(void *ptr); > * Return: the area descriptor on success or %NULL on failure. > */ > struct vm_struct *execmem_vmap(size_t size); > +#endif > > /** > * execmem_update_copy - copy an update to executable memory > diff --git a/lib/alloc_tag.c b/lib/alloc_tag.c > index c1ddac2d29f0..1c74942e6dfd 100644 > --- a/lib/alloc_tag.c > +++ b/lib/alloc_tag.c > @@ -268,7 +268,6 @@ void __init alloc_tag_sec_init(void) > #ifdef CONFIG_MODULES > > static struct maple_tree mod_area_mt = MTREE_INIT(mod_area_mt, MT_FLAGS_ALLOC_RANGE); > -static struct vm_struct *vm_module_tags; > /* A dummy object used to indicate an unloaded module */ > static struct module unloaded_mod; > /* A dummy object used to indicate a module prepended area */ > @@ -391,6 +390,9 @@ static bool find_aligned_area(struct ma_state *mas, unsigned long section_size, > return false; > } > > +#ifdef CONFIG_MMU > +static struct vm_struct *vm_module_tags; > + > static int vm_module_tags_populate(void) > { > unsigned long phys_size = vm_module_tags->nr_pages << PAGE_SHIFT; > @@ -417,6 +419,13 @@ static int vm_module_tags_populate(void) > > return 0; > } > +#else > +static int vm_module_tags_populate(void) > +{ > + /* Memory was already allocated */ > + return 0; > +} > +#endif > > static void *reserve_module_tags(struct module *mod, unsigned long size, > unsigned int prepend, unsigned long align) > @@ -561,6 +570,7 @@ static void replace_module(struct module *mod, struct module *new_mod) > > static int __init alloc_mod_tags_mem(void) > { > +#ifdef CONFIG_MMU > /* Map space to copy allocation tags */ > vm_module_tags = execmem_vmap(MODULE_ALLOC_TAG_VMAP_SIZE); > if (!vm_module_tags) { > @@ -578,6 +588,13 @@ static int __init alloc_mod_tags_mem(void) > } > > module_tags.start_addr = (unsigned long)vm_module_tags->addr; > +#else > + /* Allocate space to copy allocation tags */ > + module_tags.start_addr = (unsigned long)execmem_alloc(EXECMEM_MODULE_DATA, > + MODULE_ALLOC_TAG_VMAP_SIZE); > + if (!module_tags.start_addr) > + return -ENOMEM; > +#endif > module_tags.end_addr = module_tags.start_addr + MODULE_ALLOC_TAG_VMAP_SIZE; > /* Ensure the base is alloc_tag aligned when required for indexing */ > module_tags.start_addr = alloc_tag_align(module_tags.start_addr); > @@ -587,6 +604,7 @@ static int __init alloc_mod_tags_mem(void) > > static void __init free_mod_tags_mem(void) > { > +#ifdef CONFIG_MMU > int i; > > module_tags.start_addr = 0; > @@ -594,6 +612,9 @@ static void __init free_mod_tags_mem(void) > __free_page(vm_module_tags->pages[i]); > kfree(vm_module_tags->pages); > free_vm_area(vm_module_tags); > +#else > + execmem_free((void *)module_tags.start_addr); > +#endif > } > > #else /* CONFIG_MODULES */ > diff --git a/mm/execmem.c b/mm/execmem.c > index 5c0f9f2d6f83..317b6a8d35be 100644 > --- a/mm/execmem.c > +++ b/mm/execmem.c > @@ -64,6 +64,22 @@ static void *execmem_vmalloc(struct execmem_range *range, size_t size, > > return p; > } > + > +struct vm_struct *execmem_vmap(size_t size) > +{ > + struct execmem_range *range = &execmem_info->ranges[EXECMEM_MODULE_DATA]; > + struct vm_struct *area; > + > + area = __get_vm_area_node(size, range->alignment, PAGE_SHIFT, VM_ALLOC, > + range->start, range->end, NUMA_NO_NODE, > + GFP_KERNEL, __builtin_return_address(0)); > + if (!area && range->fallback_start) > + area = __get_vm_area_node(size, range->alignment, PAGE_SHIFT, VM_ALLOC, > + range->fallback_start, range->fallback_end, > + NUMA_NO_NODE, GFP_KERNEL, __builtin_return_address(0)); > + > + return area; > +} > #else > static void *execmem_vmalloc(struct execmem_range *range, size_t size, > pgprot_t pgprot, unsigned long vm_flags) > @@ -368,22 +384,6 @@ void execmem_free(void *ptr) > vfree(ptr); > } > > -struct vm_struct *execmem_vmap(size_t size) > -{ > - struct execmem_range *range = &execmem_info->ranges[EXECMEM_MODULE_DATA]; > - struct vm_struct *area; > - > - area = __get_vm_area_node(size, range->alignment, PAGE_SHIFT, VM_ALLOC, > - range->start, range->end, NUMA_NO_NODE, > - GFP_KERNEL, __builtin_return_address(0)); > - if (!area && range->fallback_start) > - area = __get_vm_area_node(size, range->alignment, PAGE_SHIFT, VM_ALLOC, > - range->fallback_start, range->fallback_end, > - NUMA_NO_NODE, GFP_KERNEL, __builtin_return_address(0)); > - > - return area; > -} > - > void *execmem_update_copy(void *dst, const void *src, size_t size) > { > return text_poke_copy(dst, src, size); > > base-commit: 92409df3e00a17d6fd5bb27732fa186749725ed5 > -- > 2.47.0.163.g1226f6d8fa-goog > -- Sincerely yours, Mike.