From patchwork Wed Dec 19 17:37:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roman Gushchin X-Patchwork-Id: 10737825 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 36A9513B5 for ; Wed, 19 Dec 2018 17:38:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1AE3B2AD7F for ; Wed, 19 Dec 2018 17:38:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 08BCF2B6E4; Wed, 19 Dec 2018 17:38:04 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2A1DD2AD7F for ; Wed, 19 Dec 2018 17:38:03 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 37EE88E000C; Wed, 19 Dec 2018 12:38:02 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 330928E0001; Wed, 19 Dec 2018 12:38:02 -0500 (EST) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1FA038E000C; Wed, 19 Dec 2018 12:38:02 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-it1-f197.google.com (mail-it1-f197.google.com [209.85.166.197]) by kanga.kvack.org (Postfix) with ESMTP id E3E418E0001 for ; Wed, 19 Dec 2018 12:38:01 -0500 (EST) Received: by mail-it1-f197.google.com with SMTP id x82so8002642ita.9 for ; Wed, 19 Dec 2018 09:38:01 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=UdqeJGh8eBs0Vxjdpc2lfQPUvzKGZN7048QD4f17sLA=; b=fBp2QSN6sCNQXdjz94OIWLZcWK6sGzVeyiEFYxD+S8rxo/rKWuRHOq4QUD1C+ILaXd 2O5TrFZpdNh2DRHw2Cr/OqCcObmjt3VlZnf8+cKAtl+leirIXAzm8IK2VBCRUEeJYrVf 2aoPZj+U8mRCbFZjY0Zr/v3L2aHrQn15M3EbFFmwcyRYKScLz5U4tR1Y0jRj5g1sIWHY ajcqs+LirosFk7dFeeMv+9iwiFUHu/LzGWkHmSuoN+Km5LJXyDd9YN1xztxX+vlvRm80 I1Q0YEHdEALZNR05oJQeK5VPDFagyeamXssfQ5+C2QyNq+FooqQA5xq5lZoel5dsx4hT ic6g== X-Gm-Message-State: AA+aEWaSfoR48WtHYLhmQB9Xv+NPvWIB0sWFR3UjL0uXqvsJClM+NTVn mdNe575upH0egt3eDUWNa6P44pT691bymLPmgVc4DEuxPA9HJXpjh+RSRgfts9GBm95SDkRq37D txdpbAXvqVAiFaHQwjyqm1s/6erafvDaE9nr6smSihsTBKmZyArJ8Aawj5kWFVT3VxnmcKwguGt WzUSksiRasZMRiAWxIj1IA5QEvTcjML3whVdZo+a2upaWZZPyaOWBN4cEZ8YoFDjQrdfNF/BWS4 i/ChZLf1hlF53DyxF5HeqV2/wSrgSdv5cQ6M4YDgGRgtRoahbSKofeOsf/6X3ZOLfSAXXYhttMO Bllj+dIzlDvKQ+w101cnprKNE5dBTy3YO21sNfAXBARSjDQYEkVkO41NXgYNarD0xExT8ZOJ/J6 0 X-Received: by 2002:a6b:5d01:: with SMTP id r1mr17969473iob.170.1545241081646; Wed, 19 Dec 2018 09:38:01 -0800 (PST) X-Received: by 2002:a6b:5d01:: with SMTP id r1mr17969432iob.170.1545241080720; Wed, 19 Dec 2018 09:38:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1545241080; cv=none; d=google.com; s=arc-20160816; b=HBL/Bfd6GaBj8j6NFzpxEonnJNLm1felPvNqruqKBF+KoGDmJFviZ+w2mQQlW38Beb /Hkks75vZB3oXxbwmWdxsiuiXIvBrvbOgyc9BQg0YkCMmGFB9O+2UV/3QcUKgZPgtHC1 Cg/RMvTiICHy0tE7WNrXcSw9RDP+biWLEQNUIW77qU1CoA4LD8KU/y/WHyHyJbhmtek8 qI2p5XyKNVsuGnuLDxlEfOD1nx7rIME5eDMXGyaW9qMkDoNRBF0zLz1NLRCwUd5BATcp knrGjf8v4TeLryf//L/dFHtEUMN9Xn7nBu3z5qW+Ach1CHlvrF/auPBS+5ky2b3nWD/P tisg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=UdqeJGh8eBs0Vxjdpc2lfQPUvzKGZN7048QD4f17sLA=; b=eZJWQP7StDOYRnBOSSJohCusCXwGEqILNfm3PxhFhuiHcJaQU7TTb60qevfPfWLN8F mdWDjE49SQntRRP/W7DNhlbCF2RF3Co4YAetD/LoO3W0YfalfcsC6R+C6H7k4W5oiB89 PCjQosBhEKp2tG3DEiK4FreH+YlKaIPVU3/bY3TFZeivPoJHVp4PKyNchwKXT+F2vUuh PVKPnECJDxwSYu9D2H3JFVzuspm2BJqfDcOAow1SokXDHGSguNC4H5HNpMZJYMqCwqoq sjQzyJ8uEHhUsE1Ltvutsup93LQL+Kb/RRyU0w+C72RSUuQcHR2OIfU2JdlPyTxASa7i 7TXA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=g24Jm02l; spf=pass (google.com: domain of guroan@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=guroan@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id f191sor9516662itc.25.2018.12.19.09.38.00 for (Google Transport Security); Wed, 19 Dec 2018 09:38:00 -0800 (PST) Received-SPF: pass (google.com: domain of guroan@gmail.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=g24Jm02l; spf=pass (google.com: domain of guroan@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=guroan@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=UdqeJGh8eBs0Vxjdpc2lfQPUvzKGZN7048QD4f17sLA=; b=g24Jm02lTHisRulhMjdKrS2YpsweRYzgegnBG/62cvxcmiLNgIurArCftA5qWknRcr hoR88vnD4Exj2GKoEpY2VDrVeILyJ25fgFPGWiZggVZIFb9xM5geAPqzvRgGZtU3ABYH zSCKeesB9RTNLerkW83FhRA4AMaXqrotM7GKRx4p656dQa5Fwe8kew2r1IGLVWQJSLHU oLOgi0FK0FjsKNMd0R9LNqW++j8RloOlYkJeYXgNqwZ13Bue0/la6q8aJhjVqfPl/3aA ICZADCbALxPUGO6iclE+ADAmEVX5Vg7Yx57dbS1LIZPjPBPO7FsEl06kH79YYVp1hLyc ihvw== X-Google-Smtp-Source: AFSGD/X/at+ZP0D1i56JW5Q0CfBhmDQagfdlxtZeCCXMZ2r09a82BkphuHqGE17Jaii2XvlGm4rCgQ== X-Received: by 2002:a24:25ce:: with SMTP id g197mr7454854itg.61.1545241080179; Wed, 19 Dec 2018 09:38:00 -0800 (PST) Received: from tower.thefacebook.com ([2620:10d:c090:200::7:bd3e]) by smtp.gmail.com with ESMTPSA id a10sm3637728itc.3.2018.12.19.09.37.58 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 19 Dec 2018 09:37:59 -0800 (PST) From: Roman Gushchin X-Google-Original-From: Roman Gushchin To: linux-mm@kvack.org Cc: Matthew Wilcox , Johannes Weiner , Michal Hocko , linux-kernel@vger.kernel.org, kernel-team@fb.com, Roman Gushchin Subject: [PATCH 1/3] mm: refactor __vunmap() to avoid duplicated call to find_vm_area() Date: Wed, 19 Dec 2018 09:37:49 -0800 Message-Id: <20181219173751.28056-2-guro@fb.com> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181219173751.28056-1-guro@fb.com> References: <20181219173751.28056-1-guro@fb.com> MIME-Version: 1.0 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: X-Virus-Scanned: ClamAV using ClamSMTP __vunmap() calls find_vm_area() twice without an obvious reason: first directly to get the area pointer, second indirectly by calling remove_vm_area(), which is again searching for the area. To remove this redundancy, let's split remove_vm_area() into __remove_vm_area(struct vmap_area *), which performs the actual area removal, and remove_vm_area(const void *addr) wrapper, which can be used everywhere, where it has been used before. On my test setup, I've got up to 12% speed up on vfree()'ing 1000000 of 4-pages vmalloc blocks. Signed-off-by: Roman Gushchin Acked-by: Johannes Weiner Reviewed-by: Matthew Wilcox --- mm/vmalloc.c | 47 +++++++++++++++++++++++++++-------------------- 1 file changed, 27 insertions(+), 20 deletions(-) diff --git a/mm/vmalloc.c b/mm/vmalloc.c index 871e41c55e23..7660e3ef4133 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -1462,6 +1462,24 @@ struct vm_struct *find_vm_area(const void *addr) return NULL; } +static struct vm_struct *__remove_vm_area(struct vmap_area *va) +{ + struct vm_struct *vm = va->vm; + + might_sleep(); + + spin_lock(&vmap_area_lock); + va->vm = NULL; + va->flags &= ~VM_VM_AREA; + va->flags |= VM_LAZY_FREE; + spin_unlock(&vmap_area_lock); + + kasan_free_shadow(vm); + free_unmap_vmap_area(va); + + return vm; +} + /** * remove_vm_area - find and remove a continuous kernel virtual area * @addr: base address @@ -1472,31 +1490,20 @@ struct vm_struct *find_vm_area(const void *addr) */ struct vm_struct *remove_vm_area(const void *addr) { + struct vm_struct *vm = NULL; struct vmap_area *va; - might_sleep(); - va = find_vmap_area((unsigned long)addr); - if (va && va->flags & VM_VM_AREA) { - struct vm_struct *vm = va->vm; - - spin_lock(&vmap_area_lock); - va->vm = NULL; - va->flags &= ~VM_VM_AREA; - va->flags |= VM_LAZY_FREE; - spin_unlock(&vmap_area_lock); - - kasan_free_shadow(vm); - free_unmap_vmap_area(va); + if (va && va->flags & VM_VM_AREA) + vm = __remove_vm_area(va); - return vm; - } - return NULL; + return vm; } static void __vunmap(const void *addr, int deallocate_pages) { struct vm_struct *area; + struct vmap_area *va; if (!addr) return; @@ -1505,17 +1512,18 @@ static void __vunmap(const void *addr, int deallocate_pages) addr)) return; - area = find_vmap_area((unsigned long)addr)->vm; - if (unlikely(!area)) { + va = find_vmap_area((unsigned long)addr); + if (unlikely(!va || !va->vm)) { WARN(1, KERN_ERR "Trying to vfree() nonexistent vm area (%p)\n", addr); return; } + area = va->vm; debug_check_no_locks_freed(area->addr, get_vm_area_size(area)); debug_check_no_obj_freed(area->addr, get_vm_area_size(area)); - remove_vm_area(addr); + __remove_vm_area(va); if (deallocate_pages) { int i; @@ -1530,7 +1538,6 @@ static void __vunmap(const void *addr, int deallocate_pages) } kfree(area); - return; } static inline void __vfree_deferred(const void *addr) From patchwork Wed Dec 19 17:37:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roman Gushchin X-Patchwork-Id: 10737827 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5314514DE for ; Wed, 19 Dec 2018 17:38:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 399F62AD7F for ; Wed, 19 Dec 2018 17:38:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 293582B6E4; Wed, 19 Dec 2018 17:38:06 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 99AB32AD7F for ; Wed, 19 Dec 2018 17:38:05 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CA8928E000F; Wed, 19 Dec 2018 12:38:03 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id C559F8E0001; Wed, 19 Dec 2018 12:38:03 -0500 (EST) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AA8828E000F; Wed, 19 Dec 2018 12:38:03 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-it1-f200.google.com (mail-it1-f200.google.com [209.85.166.200]) by kanga.kvack.org (Postfix) with ESMTP id 7E9178E0001 for ; Wed, 19 Dec 2018 12:38:03 -0500 (EST) Received: by mail-it1-f200.google.com with SMTP id t143so7280327itc.9 for ; Wed, 19 Dec 2018 09:38:03 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=kgDREch0uno6TnGn8VSgP/fbnyM+Daf0DWv6CA+Hm7o=; b=F1ErAFRYfci2bt7fUZbA5lu2msbwH7z46QIx3sXN7GlxQLK2motXr3+7ycyZxKAgdo +owzUiKl37I+9Y74Dc4kUOGLXD9nABRz3N3Gp4HiPDaSiTBmHsSDy/yXTK/+6Py/hZOO k6tRvS09e/TRyaB0VKoVsHaCwVG+UfWCDQhFdGJw15aWhMPU37F965PTC+d0L50K3jqg tD2gumnp4XaxMm6i9/F9P06lVXmM3L6wWD8cai/NQ4Pht8sslE21TAAg/6xF6dey5fHs F9QJ1ZWDxMu4nXDAgHYnn7eyV+Fzhx+Q2n1hGaTqjGdWa2PgbQxKy3M3ZOI7Ai3xPmeV o7Rw== X-Gm-Message-State: AA+aEWZ7o+1X5FHFwH5CVX1nOCY6kjaEL5YN8wHqeGxoe+eSp5YGHSAi i3G9TljP2IDxC8K2uCEQRuM9tTrfecG6ixJjbGz9u6W0DgoFOxHSZbsF2JJTsmZsZAG6AZOr4+K 5fpS1mJWAnYbVhVsFdiiUwDjGWrboVA/EVIvzMqXik7ZRp15WDh0/PN3CvQbksLdZYxcAwMpJKM q/doame7nq61iCIINQoQ5B6ciPLlHzf3raAlezE5FFqSZkg+WxfjCYziO0u1M2kg8XTUeBE7qzf vAn3bHBe460ZdMzQGdL4e5VzrQAXtFyfjdS8GrN85oFrX6ee4XnIaBVHeCeEQfXxnVpnR0SkPh4 K12ry9WbhCUu148TFirDlga2Uhgphuo/zsnkqU9WXyxz25VspTSrFGkZCyUP0RD4QvOnfobayMQ I X-Received: by 2002:a05:660c:8c7:: with SMTP id g7mr7848379itl.44.1545241083242; Wed, 19 Dec 2018 09:38:03 -0800 (PST) X-Received: by 2002:a05:660c:8c7:: with SMTP id g7mr7848332itl.44.1545241082408; Wed, 19 Dec 2018 09:38:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1545241082; cv=none; d=google.com; s=arc-20160816; b=u7Lryd1Uo9lcaCoikrEXRuMrCOy1D7kQhOCVuWpVQc0jbwQ9Y18ZAIZgLLWqXDXoUE 2yUxyj8QfPfVuruVgI0TSdUyibHaqNBCLJXiFSlb6sBd8Q5wOA6fl+KHoB4Q1dBQBVJa L2afigMQ3e5yiWRrCuqL7PDDvHltkuYMdzq8njLkOW+pO0iuwd6BYglgdhh2MY/637ZW INynl7rjbPDhaEY2pI75piVZX21sRsBvwIrEg+e/H0wP04AHkAgP46g4SppR8+lQ7Qq6 ic0aKvPGw55PLKfXk0J8ocBrehzh/95Ur0SaV+x5ljiQMjx97gm7i0sygdNIBnSN5ery pK7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=kgDREch0uno6TnGn8VSgP/fbnyM+Daf0DWv6CA+Hm7o=; b=cN9oMhv15n4w984D4IuZRQbGCRhNjk0rNVJYelW2dbA/Q1wI7OEi5RvAsdv0gxVwq0 U3NAANAnJIlEEcM+QV5Bh9q4T3M/YX+U/PVMgH3CbRB6okp6yG2n5eGiGKIdaglpmJhM mRj++xYIyOmtnZT8Rvprq4XfPqSKF8cazVwtxpEkQjJK/t7a5jO4bFB9x/7cfHNSDZYP YDs2vzYY/uSRYjRIyovg+wfzbsZxNdZZ3o7HOUmixIvasalk0BjqnI/HbkzhcA0Bve8k BmUK1kO/xBKvnT1HuaL7llUjW/DN/VhFShygJbPOoDKehuCnB5nbGpIKRvVcvMVQL5lv WSkg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=EDmYQL9h; spf=pass (google.com: domain of guroan@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=guroan@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id m25sor2590900iti.26.2018.12.19.09.38.02 for (Google Transport Security); Wed, 19 Dec 2018 09:38:02 -0800 (PST) Received-SPF: pass (google.com: domain of guroan@gmail.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=EDmYQL9h; spf=pass (google.com: domain of guroan@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=guroan@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=kgDREch0uno6TnGn8VSgP/fbnyM+Daf0DWv6CA+Hm7o=; b=EDmYQL9hb4bDPQdcE93OZn3ioCoP52SxxzGFhz0zf5rH+Ox1gnqs8MluVRoJmSEdTh LqA2yOsLrmTl5fh4qGqZsGrmtNB6n7hKKXE6FOrjJTsDMZd6u5mHEz5L5lrpbI5Vbw3C LxSEWdQHUFV/QQLNWUYZoWCC9IbSy4pvLaSUl2fjHyEyWX+G9IntgwPmxsKXB+KO7KRD DK0BMk48t5EUbKJG+SkHp2mvjZqvR3/wETNBeh8AxjtrpXL+rPbHymphuU3XEggXK/vp Uta1GFKR2u5cwG6+tZ5DFmtiiH3WjrrJPqeoUTYad2daPOkmBZpSwVjspQBBk/Oy4FW7 KmkA== X-Google-Smtp-Source: AFSGD/UQryS0JBeZSHy5Ve6NEwHMkAFotihqqp++wX/z/7Cpw+1p8Vn/QuZCOnyDhw7iwMUh4DCcGQ== X-Received: by 2002:a24:8203:: with SMTP id t3mr7216765itd.151.1545241081846; Wed, 19 Dec 2018 09:38:01 -0800 (PST) Received: from tower.thefacebook.com ([2620:10d:c090:200::7:bd3e]) by smtp.gmail.com with ESMTPSA id a10sm3637728itc.3.2018.12.19.09.38.00 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 19 Dec 2018 09:38:01 -0800 (PST) From: Roman Gushchin X-Google-Original-From: Roman Gushchin To: linux-mm@kvack.org Cc: Matthew Wilcox , Johannes Weiner , Michal Hocko , linux-kernel@vger.kernel.org, kernel-team@fb.com, Roman Gushchin Subject: [PATCH 2/3] mm: separate memory allocation and actual work in alloc_vmap_area() Date: Wed, 19 Dec 2018 09:37:50 -0800 Message-Id: <20181219173751.28056-3-guro@fb.com> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181219173751.28056-1-guro@fb.com> References: <20181219173751.28056-1-guro@fb.com> MIME-Version: 1.0 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: X-Virus-Scanned: ClamAV using ClamSMTP alloc_vmap_area() is allocating memory for the vmap_area, and performing the actual lookup of the vm area and vmap_area initialization. This prevents us from using a pre-allocated memory for the map_area structure, which can be used in some cases to minimize the number of required memory allocations. Let's keep the memory allocation part in alloc_vmap_area() and separate everything else into init_vmap_area(). Signed-off-by: Roman Gushchin Acked-by: Johannes Weiner Reviewed-by: Matthew Wilcox --- mm/vmalloc.c | 50 +++++++++++++++++++++++++++++++++----------------- 1 file changed, 33 insertions(+), 17 deletions(-) diff --git a/mm/vmalloc.c b/mm/vmalloc.c index 7660e3ef4133..042175d7d95f 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -395,16 +395,10 @@ static void purge_vmap_area_lazy(void); static BLOCKING_NOTIFIER_HEAD(vmap_notify_list); -/* - * Allocate a region of KVA of the specified size and alignment, within the - * vstart and vend. - */ -static struct vmap_area *alloc_vmap_area(unsigned long size, - unsigned long align, - unsigned long vstart, unsigned long vend, - int node, gfp_t gfp_mask) +static int init_vmap_area(struct vmap_area *va, unsigned long size, + unsigned long align, unsigned long vstart, + unsigned long vend, int node, gfp_t gfp_mask) { - struct vmap_area *va; struct rb_node *n; unsigned long addr; int purged = 0; @@ -416,11 +410,6 @@ static struct vmap_area *alloc_vmap_area(unsigned long size, might_sleep(); - va = kmalloc_node(sizeof(struct vmap_area), - gfp_mask & GFP_RECLAIM_MASK, node); - if (unlikely(!va)) - return ERR_PTR(-ENOMEM); - /* * Only scan the relevant parts containing pointers to other objects * to avoid false negatives. @@ -512,7 +501,7 @@ static struct vmap_area *alloc_vmap_area(unsigned long size, BUG_ON(va->va_start < vstart); BUG_ON(va->va_end > vend); - return va; + return 0; overflow: spin_unlock(&vmap_area_lock); @@ -534,8 +523,35 @@ static struct vmap_area *alloc_vmap_area(unsigned long size, if (!(gfp_mask & __GFP_NOWARN) && printk_ratelimit()) pr_warn("vmap allocation for size %lu failed: use vmalloc= to increase size\n", size); - kfree(va); - return ERR_PTR(-EBUSY); + + return -EBUSY; +} + +/* + * Allocate a region of KVA of the specified size and alignment, within the + * vstart and vend. + */ +static struct vmap_area *alloc_vmap_area(unsigned long size, + unsigned long align, + unsigned long vstart, + unsigned long vend, + int node, gfp_t gfp_mask) +{ + struct vmap_area *va; + int ret; + + va = kmalloc_node(sizeof(struct vmap_area), + gfp_mask & GFP_RECLAIM_MASK, node); + if (unlikely(!va)) + return ERR_PTR(-ENOMEM); + + ret = init_vmap_area(va, size, align, vstart, vend, node, gfp_mask); + if (ret) { + kfree(va); + return ERR_PTR(ret); + } + + return va; } int register_vmap_purge_notifier(struct notifier_block *nb) From patchwork Wed Dec 19 17:37:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roman Gushchin X-Patchwork-Id: 10737829 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E84DF14DE for ; Wed, 19 Dec 2018 17:38:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CDC6D2AD7F for ; Wed, 19 Dec 2018 17:38:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BFA8C2B6E4; Wed, 19 Dec 2018 17:38:08 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4B2E52AD7F for ; Wed, 19 Dec 2018 17:38:08 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 642858E0012; Wed, 19 Dec 2018 12:38:05 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 5A4E68E0001; Wed, 19 Dec 2018 12:38:05 -0500 (EST) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3AA508E0012; Wed, 19 Dec 2018 12:38:05 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-it1-f199.google.com (mail-it1-f199.google.com [209.85.166.199]) by kanga.kvack.org (Postfix) with ESMTP id 0CD0F8E0001 for ; Wed, 19 Dec 2018 12:38:05 -0500 (EST) Received: by mail-it1-f199.google.com with SMTP id p66so7332313itc.0 for ; Wed, 19 Dec 2018 09:38:05 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=wGPRSNth6iPSKAi8vQAaivAUkebwaHgP+2JHZws28fk=; b=TmxCgaREGVL/uzHMlqnCFtWsdH1Coj2XCkNldz/6lUxguHZQA2YmoABybN3v+m0vZ1 mBVmI+lU2UxubFQtWihuyyzGychMSOWLGWVvVXJ41FudGzJhQ+HmzBsmfQMn17GVdqG9 OuDi7fqbDmiI7zS9tswR8+Y+n25QKl+ub/kEoQDDWCaOdOTsnQ17sOhulvmEB76TuMNk r+gOC8tznhqH7s/7CkjpwEiqn0DjaBX2Eo/FjPC7PEe6PfRPoVhQaLHLxI/WNei2ldwy OQQcjBxlGh7xE3AyiDgL6mnodNWMJAD5BGPF+vFRPat1u52HmRs7zTXhJoJgJBrBDi+X jxHw== X-Gm-Message-State: AA+aEWalsvOPqjqG9NwWEtdaCunxXERu2Jd2jgUY07a2e9lITepNbusH NjOvB91tqUmX7u2QUJJpcKTBOAiQUUx+E3zdM+Mqjva8+eozgFy58qDlPngkJzRRr5ZirK7gey6 5GBwbkKNVMbwYoU2gLpR40BlYyVW9IguXmDcygUzYaO3Uao691pYfSOjp58z7r4bJG94YW38MI3 vsgUgyfKmXbIlNC/uBnzpz18kHNZdc6AMKniirI6r5tZNLuooCJCAIZbaTBfOOgV23IonAKtHZA XpG1DjoM8Xs2J7wvRnzoqHXBRtTQgjgU0HwIpUzBL+2qcJAwb0Se+lS+B1eQzAWVbJEhxc+rLl0 nEpb/9qcvbQ9ZPni/LdEs0nCZAXZD57GyG/hYxAMIcmA5pkluKOz3djyEpIQ7llOPscobDwn6iZ 6 X-Received: by 2002:a24:4242:: with SMTP id i63mr7706925itb.139.1545241084823; Wed, 19 Dec 2018 09:38:04 -0800 (PST) X-Received: by 2002:a24:4242:: with SMTP id i63mr7706873itb.139.1545241083962; Wed, 19 Dec 2018 09:38:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1545241083; cv=none; d=google.com; s=arc-20160816; b=rw7a+Gjz1pt/EX/oAdAGgrLn09Kn2j0fcUFzhHGxoHFrtyTm8aZM1reR8JOaKwyrSW /3VWKp2jDiFXeeb0qWWKg9hPR7SGCPTG//f3XT4eljuW98Qexei5wtL7QFnPcOBl2HvD DFcZ2f9M3SFYKWpSA3BcScgwwKLWljJP7BWqY4JmviEEyuh5fceAsAknVcg4MH3NE/H2 1ZhwrOyDMwP69KT2WiqigBJNQv3Xb86STAFZS0nc+pAGM+zLu7+jKob5A4YBsNfN7P+n wrzWRrS3eChZWZeNZA2IbRyeaLqnDLx876DAH+gMaSqhUK5Y1kwfim4SPuhQ9ptpM6ez 9mnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=wGPRSNth6iPSKAi8vQAaivAUkebwaHgP+2JHZws28fk=; b=CRbnwaUmtGQ+Fa02e5zVwgePVdYkKuvONFe7oxkpja7+Dkw3+IgZ98li/La1FDuvx4 8dsCe8G7xAXdEDWdshIAKG8mG1hB2k7Bz7N2ytPJptSJjMcH3egMtnF9hYZ5m0s2CbLO 9uRbANmLV2n9JU0ymJtB0KnZpgV8xGDhYMWOBVmfseunw5lgNcdNGzX5DYoow0TWMbVE mxNav6zJ6ID3dXl52cL6AyDYtGCm+HD0VXlDVEXsYsnS6tzfZCpWSN4g/874HkBlGzrt BO/nwMGXW9gZ9rJUrxeGyhGvI+wdEA+fuWnwvODKkMn9Puqwsq6onSANR3X6iRz8b4MZ Mbkg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=iRmVSVsZ; spf=pass (google.com: domain of guroan@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=guroan@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id h3sor4247055jaa.13.2018.12.19.09.38.03 for (Google Transport Security); Wed, 19 Dec 2018 09:38:03 -0800 (PST) Received-SPF: pass (google.com: domain of guroan@gmail.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=iRmVSVsZ; spf=pass (google.com: domain of guroan@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=guroan@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=wGPRSNth6iPSKAi8vQAaivAUkebwaHgP+2JHZws28fk=; b=iRmVSVsZ98WGq8EZk8v0Fdo8TcqRgGxUJNzUDcty4cMZYeXYDlJggpQ+epKYxN8JTM N6GL6Q5tDXErdfIc/e2Ss9gtNZj6hhsLaFadATQW/lDl6ezqbfWHgM8OeduCGdC4JeGP 69GrF46gXzATbCcLe25dafJYtf9YncdZyOjHNihxmOOFPGd6u1TF5PKJtlXdiJr4PbkX /uRD9mzlYsGWjq0UQBFLk5nG6XIdZyiddf2Nnhgc/nz8P/3ULpKnP0VJDmSw19Ia9Uo9 ytim2irbZMj/EllkJjKfcMY8ghVKK7w0/Ehc4d0i8vPhC+yAvhuJaLxT9Nt9t6XGxE7E lFpg== X-Google-Smtp-Source: AFSGD/Xf0h3jJ4k6s2Zr4NE7SG4Cgf9kLMhBR2J1eZ9j0yX9+WW1xwz1u3Q876n+7BNHKLI+629CHQ== X-Received: by 2002:a02:89a4:: with SMTP id p33mr20680316jaj.0.1545241083388; Wed, 19 Dec 2018 09:38:03 -0800 (PST) Received: from tower.thefacebook.com ([2620:10d:c090:200::7:bd3e]) by smtp.gmail.com with ESMTPSA id a10sm3637728itc.3.2018.12.19.09.38.01 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 19 Dec 2018 09:38:02 -0800 (PST) From: Roman Gushchin X-Google-Original-From: Roman Gushchin To: linux-mm@kvack.org Cc: Matthew Wilcox , Johannes Weiner , Michal Hocko , linux-kernel@vger.kernel.org, kernel-team@fb.com, Roman Gushchin Subject: [PATCH 3/3] mm: show number of vmalloc pages in /proc/meminfo Date: Wed, 19 Dec 2018 09:37:51 -0800 Message-Id: <20181219173751.28056-4-guro@fb.com> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181219173751.28056-1-guro@fb.com> References: <20181219173751.28056-1-guro@fb.com> MIME-Version: 1.0 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: X-Virus-Scanned: ClamAV using ClamSMTP Vmalloc() is getting more and more used these days (kernel stacks, bpf and percpu allocator are new top users), and the total % of memory consumed by vmalloc() can be pretty significant and changes dynamically. /proc/meminfo is the best place to display this information: its top goal is to show top consumers of the memory. Since the VmallocUsed field in /proc/meminfo is not in use for quite a long time (it has been defined to 0 by the commit a5ad88ce8c7f ("mm: get rid of 'vmalloc_info' from /proc/meminfo")), let's reuse it for showing the actual physical memory consumption of vmalloc(). Signed-off-by: Roman Gushchin Acked-by: Johannes Weiner --- fs/proc/meminfo.c | 2 +- include/linux/vmalloc.h | 2 ++ mm/vmalloc.c | 10 ++++++++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/fs/proc/meminfo.c b/fs/proc/meminfo.c index 568d90e17c17..465ea0153b2a 100644 --- a/fs/proc/meminfo.c +++ b/fs/proc/meminfo.c @@ -120,7 +120,7 @@ static int meminfo_proc_show(struct seq_file *m, void *v) show_val_kb(m, "Committed_AS: ", committed); seq_printf(m, "VmallocTotal: %8lu kB\n", (unsigned long)VMALLOC_TOTAL >> 10); - show_val_kb(m, "VmallocUsed: ", 0ul); + show_val_kb(m, "VmallocUsed: ", vmalloc_nr_pages()); show_val_kb(m, "VmallocChunk: ", 0ul); show_val_kb(m, "Percpu: ", pcpu_nr_pages()); diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h index 398e9c95cd61..0b497408272b 100644 --- a/include/linux/vmalloc.h +++ b/include/linux/vmalloc.h @@ -63,10 +63,12 @@ extern void vm_unmap_aliases(void); #ifdef CONFIG_MMU extern void __init vmalloc_init(void); +extern unsigned long vmalloc_nr_pages(void); #else static inline void vmalloc_init(void) { } +static inline unsigned long vmalloc_nr_pages(void) { return 0; } #endif extern void *vmalloc(unsigned long size); diff --git a/mm/vmalloc.c b/mm/vmalloc.c index 042175d7d95f..efca916940e9 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -340,6 +340,13 @@ static unsigned long cached_align; static unsigned long vmap_area_pcpu_hole; +static atomic_long_t nr_vmalloc_pages; + +unsigned long vmalloc_nr_pages(void) +{ + return atomic_long_read(&nr_vmalloc_pages); +} + static struct vmap_area *__find_vmap_area(unsigned long addr) { struct rb_node *n = vmap_area_root.rb_node; @@ -1549,6 +1556,7 @@ static void __vunmap(const void *addr, int deallocate_pages) BUG_ON(!page); __free_pages(page, 0); } + atomic_long_sub(area->nr_pages, &nr_vmalloc_pages); kvfree(area->pages); } @@ -1717,12 +1725,14 @@ static void *__vmalloc_area_node(struct vm_struct *area, gfp_t gfp_mask, if (unlikely(!page)) { /* Successfully allocated i pages, free them in __vunmap() */ area->nr_pages = i; + atomic_long_add(area->nr_pages, &nr_vmalloc_pages); goto fail; } area->pages[i] = page; if (gfpflags_allow_blocking(gfp_mask|highmem_mask)) cond_resched(); } + atomic_long_add(area->nr_pages, &nr_vmalloc_pages); if (map_vm_area(area, prot, pages)) goto fail;