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 3765AC004D4 for ; Thu, 19 Jan 2023 18:47:35 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9E8396B0074; Thu, 19 Jan 2023 13:47:34 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 971726B007B; Thu, 19 Jan 2023 13:47:34 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7EB8C6B007D; Thu, 19 Jan 2023 13:47:34 -0500 (EST) 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 6B1636B0074 for ; Thu, 19 Jan 2023 13:47:34 -0500 (EST) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 256EC1406D8 for ; Thu, 19 Jan 2023 18:47:34 +0000 (UTC) X-FDA: 80372432028.02.2E8C818 Received: from mail-ej1-f51.google.com (mail-ej1-f51.google.com [209.85.218.51]) by imf11.hostedemail.com (Postfix) with ESMTP id 56FC840009 for ; Thu, 19 Jan 2023 18:47:32 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=W39mc07p; spf=pass (imf11.hostedemail.com: domain of urezki@gmail.com designates 209.85.218.51 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=1674154052; a=rsa-sha256; cv=none; b=SLdpTHNNf+yDyAwfihET97w+zDvU5nyid9QPW+L8t1r4CsHRUQFAhNjcEQDLW+6rg6UmdB Qp/Y8ZZs80zCFoUrcdhuITN1VBOCxMhx0/OUmwaAw2Iz4CAXIfyoZPoJXHFoyQdLOjzJMh 1XqPp8s9aPt7EhgFgXojxSwcLHjR+oQ= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=W39mc07p; spf=pass (imf11.hostedemail.com: domain of urezki@gmail.com designates 209.85.218.51 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=1674154052; 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=SSr0URC20ZMNWIYsSMoQGA1nDhAf7RHi1ZflDYVfdS0=; b=pswvbrXqIJNk5Hsz1oyGBz0eYUP8tDMer2YvllziHOjjJ6p9MXcorNvGGDV3ZfTlv+nxeV 8wwOFzOcqYsxVb5s0pDpTLdhSeVEt/7oZ6LcbEFRNXEdwZlN2wDrZJEYT/sTdsDDXXjXVD 65joIsDMRCLXw/2Qg4KnLY9bXLayBmM= Received: by mail-ej1-f51.google.com with SMTP id az20so8147687ejc.1 for ; Thu, 19 Jan 2023 10:47:31 -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=SSr0URC20ZMNWIYsSMoQGA1nDhAf7RHi1ZflDYVfdS0=; b=W39mc07pJD3YkIf51650mWlmNQcrN8NCCVTivqg+uNmDCpkT/n9UFskEVrTyyKqOBp uKR1caAXuTAEQDCgD+Ni97IqDjMh8ZCF6B0Q8q5j2CpI/siMpe3YE4ScWvksRXAKEVC8 MfdAbMd+H8aCkdr2tg6TUdeUjEw4yNQq5T2gD4ookXNPZm7eEXJka3QpkAgWm2j9BamO YPCN8a5NU/zrlmOG/CF1qBn62vjk5jM5enuUmSDwSfIQFuI9VWBBu+RjOaGNbXUiErNN 9B91yZ/1LDhp3/FASq4sEbkVrtkhAcP6xWFOcsXfGLX7eUBe1c/J+mZSlJludvqoR/m/ 0gdA== 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=SSr0URC20ZMNWIYsSMoQGA1nDhAf7RHi1ZflDYVfdS0=; b=yK4S6EuhmkZjlV+sSaQ2JLLL2dmWq2KKdmGaa4BURxQRiLBZLd1mliCb0do9HMFbLK 0SZMgxBT93t838vrhbEb1XYKKX2QAVUrbgSOtkCBjHGQkWBo7IJRc0rmjARHrKWKbW4t r0PDSebF00yQI8fcHS/gWzZ5wgQqjRB6fyHChu7q9eghFwJpRfoZNCmB0wBBLx3wDAoP uyS17qIVYnA3l3fvNxGudVB6NtgcnxQIs9ixYdBhfMd+JrFNKRg/zzf/TWy/fAZbypjD JwB+bnOuCEIrKx5zdVPmwcUXnr5/XnVQroGQjn1w75GWhCbSuQbSq0KPuX4tAtNuATMS UA+A== X-Gm-Message-State: AFqh2ko7fzHfSEvh/AD+BIo1aYdbr6tjevDXw4/ESa7FEPGeveREpJeT E1ajOfhsZhlzUt/bvYND1k0= X-Google-Smtp-Source: AMrXdXvgZf51NoCLMlCHMFfncDeXW5g+YIf0vaFOd7Vn0xc46d+okxZ8jB68TrX407M6QBa0vg7/fg== X-Received: by 2002:a17:907:b9cd:b0:877:7dba:f55c with SMTP id xa13-20020a170907b9cd00b008777dbaf55cmr3002192ejc.8.1674154051113; Thu, 19 Jan 2023 10:47:31 -0800 (PST) Received: from pc636 (host-90-235-24-47.mobileonline.telia.com. [90.235.24.47]) by smtp.gmail.com with ESMTPSA id 4-20020a170906300400b007b4bc423b41sm16664264ejz.190.2023.01.19.10.47.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Jan 2023 10:47:30 -0800 (PST) From: Uladzislau Rezki X-Google-Original-From: Uladzislau Rezki Date: Thu, 19 Jan 2023 19:47:28 +0100 To: Christoph Hellwig Cc: Andrew Morton , Uladzislau Rezki , linux-mm@kvack.org Subject: Re: [PATCH 03/10] mm: remove __vfree_deferred Message-ID: References: <20230119100226.789506-1-hch@lst.de> <20230119100226.789506-4-hch@lst.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230119100226.789506-4-hch@lst.de> X-Rspam-User: X-Rspamd-Queue-Id: 56FC840009 X-Rspamd-Server: rspam01 X-Stat-Signature: f1jdt494869gd17q9oxw8ka9xdp4b4aj X-HE-Tag: 1674154052-83356 X-HE-Meta: U2FsdGVkX19hbH0Lx/5TNvykxUwwGGal5ZywIc6O6TcdPGgu2blK2NJrT8WDHBfsrg/76MoH0ecIGbmQeUPOofWizFXdYtMrraXklVQeux6u4cZ7CEi9RUH26goTDxVLwx3AtcDdMAtnWUIhjiuJkw4UyI7XZlZ7CK2Y7xE3D8xL0Y7kxeabWe0KqgkSdW82OIFtwYxufiAuc741Ug6p1VY9XTEo8HUityTk951Q/AqiqOwW+ODKYibpHZYQdFgtll2WOrhfjvyN7i+xTNux6Q9SiNl62iOlBe05Jqm8asyceF1Hb32uX01I0E3bpot5JY0d4RJQ0e+VIc7GUPVG626ngGoLBz1f0gTVhMK5hpzRx9GzLDnwbnwy7i+IMKynDlseNmIQDCnqI8ViefCwoWBaGMhLVo/ZGV1j6LdVMiFKtLC8mI4b8ItdP+gzZX/Ghh/IXlnH9il35+CuaRzR1650plz5+XZ+8Ko0F8h1uwB+NsUv3txrO7jJ0QGBqL8o0GAiF0i9jGalthfnebvXUEbSJii5zF4dNLsZaC+tCmIFDere1Qw5LdQDuPHW5FECLdgB7St6Ogn2zF4uVwCAzDHGewesM6CQIHniwiv855ZRA8rief1+9UB3lSQ9VGYAFIOJ4h1VxdduCeWxaK4TSTTugObkxRxVp/1Y8+0jYa18PUaHoBFriQgrFHGjQzymjbg/aENLHFfFJeBkY2NZy2y0UCa9uYh0JtujwaLWPaOEYnMod0KMNPQSqp/5LSz1kIRUNDIl+8X4I+Mff23XXIjoUA33ACYIlNvq8O2ZRNEKUzSsQkA3lqNntru8ZTPuA+r7d6qvF8IyvwN00hIEFFoiFouCPOPf/9QNRv2q9sOVHGDj+n86usXybW7QFgXdz4ReDk76fxHzS5kdsE/6dSy5UcasDCAYsadqc/TarnFcTKqvqDiE+cGrC2gwaM6nnArJgVd9AO6Bq+Vt+cu JLga2hsX sbLgeH/uwf6AzYBEvtJuXbslG6ELaisUQYl8Pz32aoAuwIwqwm+MynLR/wcL99FuSzDudf2pdBwR7txYii4vGFsOCct/faPaeqQpenPRMmW0mROzI1mu/2SuCikJoZhrk3G39Q2xlYst30eQ= 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:19AM +0100, Christoph Hellwig wrote: > Fold __vfree_deferred into vfree_atomic, and call vfree_atomic early on > from vfree if called from interrupt context so that the extra low-level > helper can be avoided. > > Signed-off-by: Christoph Hellwig > --- > mm/vmalloc.c | 43 +++++++++++++++++-------------------------- > 1 file changed, 17 insertions(+), 26 deletions(-) > > diff --git a/mm/vmalloc.c b/mm/vmalloc.c > index b989828b45109a..fafb6227f4428f 100644 > --- a/mm/vmalloc.c > +++ b/mm/vmalloc.c > @@ -2769,20 +2769,6 @@ static void __vunmap(const void *addr, int deallocate_pages) > kfree(area); > } > > -static inline void __vfree_deferred(const void *addr) > -{ > - /* > - * Use raw_cpu_ptr() because this can be called from preemptible > - * context. Preemption is absolutely fine here, because the llist_add() > - * implementation is lockless, so it works even if we are adding to > - * another cpu's list. schedule_work() should be fine with this too. > - */ > - struct vfree_deferred *p = raw_cpu_ptr(&vfree_deferred); > - > - if (llist_add((struct llist_node *)addr, &p->list)) > - schedule_work(&p->wq); > -} > - > /** > * vfree_atomic - release memory allocated by vmalloc() > * @addr: memory base address > @@ -2792,13 +2778,19 @@ static inline void __vfree_deferred(const void *addr) > */ > void vfree_atomic(const void *addr) > { > - BUG_ON(in_nmi()); > + struct vfree_deferred *p = raw_cpu_ptr(&vfree_deferred); > > + BUG_ON(in_nmi()); > kmemleak_free(addr); > > - if (!addr) > - return; > - __vfree_deferred(addr); > + /* > + * Use raw_cpu_ptr() because this can be called from preemptible > + * context. Preemption is absolutely fine here, because the llist_add() > + * implementation is lockless, so it works even if we are adding to > + * another cpu's list. schedule_work() should be fine with this too. > + */ > + if (addr && llist_add((struct llist_node *)addr, &p->list)) > + schedule_work(&p->wq); > } > > /** > @@ -2820,17 +2812,16 @@ void vfree_atomic(const void *addr) > */ > void vfree(const void *addr) > { > - BUG_ON(in_nmi()); > + if (unlikely(in_interrupt())) { > + vfree_atomic(addr); > + return; > + } > > + BUG_ON(in_nmi()); > kmemleak_free(addr); > + might_sleep(); > > - might_sleep_if(!in_interrupt()); > - > - if (!addr) > - return; > - if (unlikely(in_interrupt())) > - __vfree_deferred(addr); > - else > + if (addr) > __vunmap(addr, 1); > } > EXPORT_SYMBOL(vfree); > -- > 2.39.0 > Such folding makes sense to me. Reviewed-by: Uladzislau Rezki (Sony) -- Uladzislau Rezki