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 AE6BEC46467 for ; Thu, 19 Jan 2023 18:47:06 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0253E6B0075; Thu, 19 Jan 2023 13:47:06 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id EEFFA6B0078; Thu, 19 Jan 2023 13:47:05 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D6A156B007B; Thu, 19 Jan 2023 13:47:05 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id C033A6B0075 for ; Thu, 19 Jan 2023 13:47:05 -0500 (EST) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 841031C2E4F for ; Thu, 19 Jan 2023 18:47:05 +0000 (UTC) X-FDA: 80372430810.28.A531A9E Received: from mail-ej1-f46.google.com (mail-ej1-f46.google.com [209.85.218.46]) by imf06.hostedemail.com (Postfix) with ESMTP id C835218000C for ; Thu, 19 Jan 2023 18:47:03 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=jrY2XUSa; spf=pass (imf06.hostedemail.com: domain of urezki@gmail.com designates 209.85.218.46 as permitted sender) smtp.mailfrom=urezki@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1674154023; 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=EG4RdLpxwELAk/rVQDf2P7eagR56sVTgtcXiz0eiNqQ=; b=I7bm6yMzK9Op+qZ/JU6dEGESd5FmEDFZDKoPTHOoCtmdRzUasUhfhvoY4rQM1UZlXPaEmS qM/OqL3aQpN/kVKEWxhm60Wpn1p5VVlKMyMVtrMvYNk5gt4RoK0YzuWVEZziF0Vgu5m59c HA05qU4+oTOf9ak86052WTwMRiODT6M= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=jrY2XUSa; spf=pass (imf06.hostedemail.com: domain of urezki@gmail.com designates 209.85.218.46 as permitted sender) smtp.mailfrom=urezki@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1674154023; a=rsa-sha256; cv=none; b=KX5VDn9C27c0UtP6GJdE3ka9Scu569VzN/KNzG/FyG7fBUYzDEyj8cK1wyzisVPjwxP/2B iIvhJPuSzOLvB/7qJd49vnkyVehvr4zV+tiJm7/dwcurP8tPvM60yTslLZWaWi+Pp3ZoJK agmcVvXCX/B7R4l9d/mUia3NOxnlYHE= Received: by mail-ej1-f46.google.com with SMTP id ud5so8122166ejc.4 for ; Thu, 19 Jan 2023 10:47:03 -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=EG4RdLpxwELAk/rVQDf2P7eagR56sVTgtcXiz0eiNqQ=; b=jrY2XUSaQHg5hGGpf6/J8eZfQB4LTUzTgp3gcksuuHbWWz05W1F1HDzOdLhRCGAQ7M 8+AIraXGg+jJHfrsg6AWA9uRSjFN6NSBk8KuL7DbEZyKsCR3Voi9EQpGs3XWNc/GHx6I /OqVHdMlzz4gFPeiIDAtPfB9RNsWI4Eh3Jg+RE5tv/dirvYVZxwlF6/wCbAIXgAinYp0 dC6eNPkUtG51pfdr/qCicIfhH06cms/C9YvDbINk02tubQE5h/4GCOf58EldJGOUWzWd 3ATmOnrEwFN+dUJxhH6KuzINUX/Xw/rtK9Mu7HWmWvqXUFiyhbUu7a8m41g3SIIPEub3 z2DA== 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=EG4RdLpxwELAk/rVQDf2P7eagR56sVTgtcXiz0eiNqQ=; b=WXpA2Y8Lj5AAeKmEYk5EuBRM0qplZt2CPA0KWX79hcQBoCv4v/3NDqlNyoYivBWw3S clmR920jyD2huGe1bpYg4LvPTBdYVJE7wFAvDNhh9FSEFznkiknnQEcFHb9OSCKkKHaU hD0TmS06C/n+gOGe0zYSzmBqdJGwT62lAb3oxgmgIRO4/Xgk0cgSCvkI+B8RJEqWTWq/ 6deW1qzl6iiYBp2aq+2eMkjFrYAQJJhSxTex6ptjZtWezdAVe/ou+moWcVoGs+9qe3rr fwBOikd30ZfEgHPUDCu85/FAIKJ16WDDSgP50yOUBsCy/i8dWbcYN2t/qZMVlL30XNcH OpKQ== X-Gm-Message-State: AFqh2krX/comBDL391FnIbvYEXYifr9YBQDYCypjO6tWiyQv9tam63xe 2WpHhhyZTXPs9FxcqJlM+OY= X-Google-Smtp-Source: AMrXdXvoivBjgkaDpx4N6ZU6Q/saMHqUD8xkCfmU7cc5pWylV19U3L6XVKkGtQjLOTBDfLfcHFkRwQ== X-Received: by 2002:a17:906:d8ad:b0:875:54f5:740d with SMTP id qc13-20020a170906d8ad00b0087554f5740dmr9274439ejb.51.1674154022436; Thu, 19 Jan 2023 10:47:02 -0800 (PST) Received: from pc636 (host-90-235-24-47.mobileonline.telia.com. [90.235.24.47]) by smtp.gmail.com with ESMTPSA id kv16-20020a17090778d000b0087759386f77sm2979650ejc.11.2023.01.19.10.47.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Jan 2023 10:47:02 -0800 (PST) From: Uladzislau Rezki X-Google-Original-From: Uladzislau Rezki Date: Thu, 19 Jan 2023 19:47:00 +0100 To: Christoph Hellwig Cc: Andrew Morton , Uladzislau Rezki , linux-mm@kvack.org Subject: Re: [PATCH 02/10] mm: remove __vfree Message-ID: References: <20230119100226.789506-1-hch@lst.de> <20230119100226.789506-3-hch@lst.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230119100226.789506-3-hch@lst.de> X-Stat-Signature: dfgoaxow76g3ayfj1n7p8ftb7s3bemu1 X-Rspam-User: X-Rspamd-Queue-Id: C835218000C X-Rspamd-Server: rspam06 X-HE-Tag: 1674154023-877683 X-HE-Meta: U2FsdGVkX1+9khJ5LOHeYP/6m2VHblPpfD67oFh08fImp+GYlT3XEMHK6oRDdrD7TR5xaol/Aflr0w5RTDDq6NePPHuJho38UxoocunzGQOd9bZaNPM+MIup5cH9AAQVnrbq1zL2IUMnhIwwt45rp8m0jbiyv8EpZbbuoaH0BVYSNHSOkzTWgBOhpD1MRamBb8vnvxTgq+xiKEutFgXO88SqMQXEhAqFwiU2hXiiN73I7vZkrT+foFqTOHYJydPtxYVbETgDXS2G5t5yM19OAG23f6E5lMLTATIvaUKUQ8biKbFQelPndt2wv/tB4+oxaYRCqSetz1P6vgE0UYYtpwxFWWmYfPb0ZqT+HQcjr+7jfCsyjFwM9xwP/jLqSXY7S5GCbmKHXkjvUiegOtwTx0luQMALCDEb0dzx/PSYMjKqP/90utWw0geoWNcRj+Ep0nKDeuu68QNuzwewBr3v6evJbFvfTUVENwgazt4dTZg5pqOXdwj9DiFvmUafGH/OFppfNXxIuJkp0M9NaO3rmK+hP3KPtO7NPBzjC6dE08L28KwnJV1I7x1cpPiVTFEc3MzM7v9za12ZRaAqWuPR/x+532pNutz743IS/oS6I7QxU9xIV+ni/+4Y6Ayxk7IK7riSNiUbPOlNa8APs8YlJKpoB8vFrwi7qh8He5pQFoVynoMPMr/Egzp8K7NMRp0CWtkKPxPHfcy4n3GU8xUSQYc5JIIg3YlCHKDgRkvKwn7woVUVViiUaHCyoMKesYluDIl5BwLbmCyErILlV3EBqqBr+GBFDGfV4rbqKuDj+vpNIQkTnzTgcvuw61EuqCBqOwCdqNeN9GZpHZM7OaaghM9x/Z6N+3ErTGnvwZmxDrF0yMvIn0HkOj+ECXqEz6bv7qhbDLmR27BFPGBdGqpVIc3CtUsq0L3JvTksYTiMgnJiy3gIPFHSvLDcGnrtsMtuO7dQC0lfYhWB88M5SOS JozNehas m0lnVKwna0x+D8byEEuMY0LLJPpK47ancsJWU8u+ZgMslxTdzbybOHszReevaz62LvR/V2peOnSWxQT9mhH/qSaF/PVbJPILAmhGu69P35/5YNL9qPXNmlwnFhYEQXcRytQi/6nFCENjBKBI= 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:18AM +0100, Christoph Hellwig wrote: > __vfree is a subset of vfree that just skips a few checks, and which is > only used by vfree and an error cleanup path. Fold __vfree into vfree > and switch the only other caller to call vfree() instead. > > Signed-off-by: Christoph Hellwig > --- > mm/vmalloc.c | 18 ++++++------------ > 1 file changed, 6 insertions(+), 12 deletions(-) > > diff --git a/mm/vmalloc.c b/mm/vmalloc.c > index 6957d15d526e46..b989828b45109a 100644 > --- a/mm/vmalloc.c > +++ b/mm/vmalloc.c > @@ -2801,14 +2801,6 @@ void vfree_atomic(const void *addr) > __vfree_deferred(addr); > } > > -static void __vfree(const void *addr) > -{ > - if (unlikely(in_interrupt())) > - __vfree_deferred(addr); > - else > - __vunmap(addr, 1); > -} > - > /** > * vfree - Release memory allocated by vmalloc() > * @addr: Memory base address > @@ -2836,8 +2828,10 @@ void vfree(const void *addr) > > if (!addr) > return; > - > - __vfree(addr); > + if (unlikely(in_interrupt())) > + __vfree_deferred(addr); > + else > + __vunmap(addr, 1); > } > EXPORT_SYMBOL(vfree); > > @@ -3104,7 +3098,7 @@ static void *__vmalloc_area_node(struct vm_struct *area, gfp_t gfp_mask, > > /* > * If not enough pages were obtained to accomplish an > - * allocation request, free them via __vfree() if any. > + * allocation request, free them via vfree() if any. > */ > if (area->nr_pages != nr_small_pages) { > warn_alloc(gfp_mask, NULL, > @@ -3144,7 +3138,7 @@ static void *__vmalloc_area_node(struct vm_struct *area, gfp_t gfp_mask, > return area->addr; > > fail: > - __vfree(area->addr); > + vfree(area->addr); > return NULL; > } > > -- > 2.39.0 > Makes sense to me. Reviewed-by: Uladzislau Rezki (Sony) -- Uladzislau Rezki