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 C7359C46467 for ; Thu, 19 Jan 2023 18:48:54 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6DB846B007E; Thu, 19 Jan 2023 13:48:54 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 68A306B0080; Thu, 19 Jan 2023 13:48:54 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 552336B0081; Thu, 19 Jan 2023 13:48:54 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 41E2A6B007E for ; Thu, 19 Jan 2023 13:48:54 -0500 (EST) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id F2DC1C024D for ; Thu, 19 Jan 2023 18:48:53 +0000 (UTC) X-FDA: 80372435346.14.74D4041 Received: from mail-ej1-f48.google.com (mail-ej1-f48.google.com [209.85.218.48]) by imf07.hostedemail.com (Postfix) with ESMTP id 3C00F4001F for ; Thu, 19 Jan 2023 18:48:51 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=KyZKIgL+; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf07.hostedemail.com: domain of urezki@gmail.com designates 209.85.218.48 as permitted sender) smtp.mailfrom=urezki@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1674154132; 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=6JLhRSVAWZCD1FtkstTJaaMZjB0y1PruMT31d+YLHh0=; b=6tbMk4H2s62gouOOa5mWdQSCTxI1ZinXduwcbnQqeR96kOvSDMDXt3E5LE8d8mtu1FM4EF ftSovGnCSJ1bN5+lJBJPaVwq8VEZkvL0r5GBXv/tzy7KO0mXzv/APahzMRMDTxOjDCytLd lIozEmR6c0sN+Fvs8zYPor9eu+yV+k4= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=KyZKIgL+; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf07.hostedemail.com: domain of urezki@gmail.com designates 209.85.218.48 as permitted sender) smtp.mailfrom=urezki@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1674154132; a=rsa-sha256; cv=none; b=mN40ApVpVeCCm9uuvOPol0oa3e45kWKftZ0uFjOrB9JdzDT88PYpoZqyNWkqxu+bvvcIAs 6pjbrnfq7PYIPfMgxJk4sUgurhx8vYCS0DjjBwAI2Jt634bPHtMr48jFM/yQgEUi4pf6oP 5/8vtqWs7PjYXvOC94vxHXJp/dnPzqo= Received: by mail-ej1-f48.google.com with SMTP id mp20so8085764ejc.7 for ; Thu, 19 Jan 2023 10:48:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:date:from:from:to:cc:subject:date:message-id:reply-to; bh=6JLhRSVAWZCD1FtkstTJaaMZjB0y1PruMT31d+YLHh0=; b=KyZKIgL+H1x6sinlotcYmfxqCgzFAWl8qixJY5ZqVQvGsO2TyJy2gQf2+Zz4RwrgHZ mEncoUTj3dGUzeCzA9w+91QEznW4LXOuU6dRpTdbgp87lewro7gEaQ7Lic3m5cNxBHYq kzRjbJPV3EWfk3IUJRA7J2n2M/Eim+xM6NxaqQqld36122fWaIZuZxTsY7N9DCNu0CnD t6xWCLhM1o6MbDAuFCyg5tTcJMjAWo8GmC5uLRPFqf/PIoZVPLxiTJLHN9qzYdhLBv0S RuQi/mpWNJgVaDzclov0f3L3DEcioMNyZyqXSp/tXQeh7cB+fAvGjour21GFRe68Httf /Z1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:date:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=6JLhRSVAWZCD1FtkstTJaaMZjB0y1PruMT31d+YLHh0=; b=BEKs2tLs2W3q+TLrf7zAjpFfchHja5nJmpJbKBRDNoNChJ+ITz2y8sCaSbd+eZDNKS zXi7uPD24sypF5f9Mex7n8WtyGADaeav71XLbzYJmAJscPUflnohcjDPvyMb1maRqgvr EJoNR+W2wHjLKLaln6GH+iIm5JIn6j3937uDdhYjZgCeskJ5RHaV+0W2L804AA/TSaEA vCOmUbz+lrIP5XCT0fn87ROGChwyyhS69oFn2uSqQgPu+bmG0o/PjOV5fAeHROGPc5ol M5duE2qznVNSvRWOw9uqGG1U6dEtHqOkaaTSafOOMLbZt5zI/95h6qPUP7yLikiGlP9x QbyA== X-Gm-Message-State: AFqh2krH7Niz7X1NAMlAloZNnSvtu3HlEyInAIf40X91VfQxniYvX0kT uCjYEjviF9hzW+2QxeMYvTM= X-Google-Smtp-Source: AMrXdXvWkB64up5li5Sn9u7eljlVAYQE8jPg+uwPYTDjeP0ekDr21rJHPrL29noj5jx1/Jl8dXWHWA== X-Received: by 2002:a17:907:6d1d:b0:86d:d78d:61a4 with SMTP id sa29-20020a1709076d1d00b0086dd78d61a4mr15394005ejc.28.1674154131014; Thu, 19 Jan 2023 10:48:51 -0800 (PST) Received: from pc636 (host-90-235-24-47.mobileonline.telia.com. [90.235.24.47]) by smtp.gmail.com with ESMTPSA id d14-20020a170906304e00b0077077c62cadsm16655288ejd.31.2023.01.19.10.48.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Jan 2023 10:48:50 -0800 (PST) From: Uladzislau Rezki X-Google-Original-From: Uladzislau Rezki Date: Thu, 19 Jan 2023 19:48:48 +0100 To: Christoph Hellwig Cc: Andrew Morton , Uladzislau Rezki , linux-mm@kvack.org Subject: Re: [PATCH 06/10] mm: move __remove_vm_area out of va_remove_mappings Message-ID: References: <20230119100226.789506-1-hch@lst.de> <20230119100226.789506-7-hch@lst.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230119100226.789506-7-hch@lst.de> X-Rspamd-Queue-Id: 3C00F4001F X-Rspamd-Server: rspam09 X-Rspam-User: X-Stat-Signature: rm7qnoir83uuhbb3z6icgybupbi7wje6 X-HE-Tag: 1674154131-644611 X-HE-Meta: U2FsdGVkX1+8uiRCb6AB3QExRKcSdqBeZzNFPeMgiK4OCznY2TeSIqkY36KkTb/2WNY4JauEWbk4ExHomMqqghe8M1G/MY+FSR/yP/jiRzkxBlxTriA6VRy9FQx33NGwIsm05Wa/RbiQXT/mLfWaGlWNfDeX2sg4qTZlnkE+C7ct6h504QP0zEblPT8TkvqMSM5ZlxJW6pbGq70z2Xa+XhvzeLviI2nkd/x9wySlWh4NYTr0lC5tuV/3baLF4MDiJq7Yl2HNchOH7qoVIRv52rTUgZZdMLMueZ1EJj7beVJuz7GRz9S/LeUVe+A7g/Z9pWLAWjYJbnQ1ZMJhsmYr2WxUj22hyBCFSL1uiZRkE9bs+/LEbrSS/l6ndyk5AghtDE92gM80YBgp+U6pGyvacqxPxHNt3FRiR0ueuOT/izTc2WGdFgT6haJwRExXWGIkal2D8HgTdADF2OFyMeIBFYZsIphKGMYebANrS1jXbkFjDQOffc7XU2eEfNHREeW1MUnIny0vc1GPzsjtH1sS9o/IhWwWaIC8ia4bj6Aob0NZT+esJ4vfWR9hasLdQratglX/f7fRdRE9osvdx5M+LDbF7UW3VtoMtMDaNYaPRDXB8x2JBnFTkPd17Szm7mKkw3kaVYujvdTNDcmXjmpdF25nyBjqb6qk4PTxG3PadpC2yzlyuNkyVOBJlMneeqcM9I6CYzeToP0BZxxZNIpr7SfwBIFmKJTF14dRi6oADcCLtAENn9p5EvDQAADXF9qPo7IjPCM0ZhmK//EBc+EpE2aO+2AoW3CHUldTjYZcMdW2ZqL8/uMjmXT7eRh9NMnVuRELtILn8PfN5hrx7ZXAfKaIRh+H6WwR6srmNFAmfE1tO7skLy++yX2MnvCJmS+tLDNOQukDP5+DrGD0bcYKrw9O24ot8TQBwMISOy9ySY5invZ22NyEXG3yyKFKPkVlRfWZYNrr1Qxp74gjken o8F4yGPA 9REnE3xzPt2zuIB/ucO/eX+JLF78gjJ92q+fkI5lmSbifnjEahKKyo+hLazg3TYbW1ozY9UVLu/sbYmxuZzcrCyVTmaxVvkK4UfX6ceKaK/Sv4K8YSNO/0hPd/ZUQ325sBuwM4rC/vUp3HvE= 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 Thu, Jan 19, 2023 at 11:02:22AM +0100, Christoph Hellwig wrote: > __remove_vm_area is the only part of va_remove_mappings that requires > a vmap_area. Move the call out to the caller and only pass the vm_struct > to va_remove_mappings. > > Signed-off-by: Christoph Hellwig > --- > mm/vmalloc.c | 10 ++++------ > 1 file changed, 4 insertions(+), 6 deletions(-) > > diff --git a/mm/vmalloc.c b/mm/vmalloc.c > index 3c07520b8b821b..09c6fcfdaeb7c9 100644 > --- a/mm/vmalloc.c > +++ b/mm/vmalloc.c > @@ -2614,18 +2614,15 @@ static inline void set_area_direct_map(const struct vm_struct *area, > set_direct_map(area->pages[i]); > } > > -/* Handle removing and resetting vm mappings related to the VA's vm_struct. */ > -static void va_remove_mappings(struct vmap_area *va, int deallocate_pages) > +/* Handle removing and resetting vm mappings related to the vm_struct. */ > +static void va_remove_mappings(struct vm_struct *area, int deallocate_pages) > { > - struct vm_struct *area = va->vm; > unsigned long start = ULONG_MAX, end = 0; > unsigned int page_order = vm_area_page_order(area); > int flush_reset = area->flags & VM_FLUSH_RESET_PERMS; > int flush_dmap = 0; > int i; > > - __remove_vm_area(va); > - > /* If this is not VM_FLUSH_RESET_PERMS memory, no need for the below. */ > if (!flush_reset) > return; > @@ -2691,7 +2688,8 @@ static void __vunmap(const void *addr, int deallocate_pages) > > kasan_poison_vmalloc(area->addr, get_vm_area_size(area)); > > - va_remove_mappings(va, deallocate_pages); > + __remove_vm_area(va); > + va_remove_mappings(area, deallocate_pages); > > if (deallocate_pages) { > int i; > -- > 2.39.0 > A small nit here. IMHO, a va_remove_mappings() should be renamed back to vm_remove_mappings() since after this patch it starts deal with "struct vm_struct". OK. After checking all patches this function will be renamed anyway to vm_reset_perms(). Reviewed-by: Uladzislau Rezki (Sony) -- Uladzislau Rezki