From patchwork Sun Jan 31 12:50:21 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kinglong Mee X-Patchwork-Id: 8174261 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 66F81BEEE5 for ; Sun, 31 Jan 2016 12:50:36 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7D41620320 for ; Sun, 31 Jan 2016 12:50:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 996E4202FE for ; Sun, 31 Jan 2016 12:50:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757451AbcAaMud (ORCPT ); Sun, 31 Jan 2016 07:50:33 -0500 Received: from mail-pf0-f182.google.com ([209.85.192.182]:33558 "EHLO mail-pf0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757401AbcAaMud (ORCPT ); Sun, 31 Jan 2016 07:50:33 -0500 Received: by mail-pf0-f182.google.com with SMTP id x125so68304583pfb.0 for ; Sun, 31 Jan 2016 04:50:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=to:cc:from:subject:message-id:date:user-agent:mime-version :content-type:content-transfer-encoding; bh=g4A5hKgafHr8YyLxvRNCZHHR3ikfRnST7Gmdjh7rSvg=; b=dbabPirtCp578Ru0z5P4J2SnxLL9iPboIKFAvjsrf7TPPjajHzgyfe8LrwrrxPer6e LO/+P+Ak+csrkEFTNyRp8ddL198gkx4/PJgsLmAPQxvSddsSWa/wGu7jvlykBk0ApmD/ LGXBcZS5gqFRPntpWY8BcrZTcH1COIa34zQQG/e2y5CeVlDajj/7EfeITDbadADdODyU DQEfIxC5QOp/S0HDYI/n/433gNdpyLQYjlC490+3V8twkk+HOkkTmxQ4hCk1YCUbbPW+ UoZTxBugpzf98lmCUh5Q4RCOLTB9N4gKxknG+icJsce8PP6dk3k3OzT1xUBJ/19xDJdj 5FmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:to:cc:from:subject:message-id:date:user-agent :mime-version:content-type:content-transfer-encoding; bh=g4A5hKgafHr8YyLxvRNCZHHR3ikfRnST7Gmdjh7rSvg=; b=PiGJ3iko8DWRfsndxBPsioB9Ca7/yEPZpm1fMkAmfDDLWdILOqQhS0FRo5tA20WbCi 8S7wC5M78Y9lwmV458alr11JrkrAIVkv67Xf5qyeP8lhDHMut08g9e+B554ECHchSWOa OOgFtDhqpWemiugpjgg7QFOER/grrFHxhYzpbVEMy9IBH+rNf5ToxCLm7LBgp8bvnHUT ItEj2FD6Mrg49mGpeA93k8v6TpIf1cgmV2pWegUP0KpumoP2G4Xz+9ys0pv3ZviYCOqu VkYB3VbBnM0qw/WnFznQclMt1A66GCWWL6TKzWs8mnpdCfDfs/6fam06EIbyXkNdC7vo zZtw== X-Gm-Message-State: AG10YORZkJFDXSGGBxPcBd7pcI/iqwafAxv0FvkFz2HOIUW+FnPjx7Mvz22lcBV1h6AB2A== X-Received: by 10.98.8.153 with SMTP id 25mr23206249pfi.51.1454244632723; Sun, 31 Jan 2016 04:50:32 -0800 (PST) Received: from [192.168.99.8] (li1100-244.members.linode.com. [45.79.1.244]) by smtp.googlemail.com with ESMTPSA id d8sm36086442pas.14.2016.01.31.04.50.29 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 31 Jan 2016 04:50:32 -0800 (PST) To: Trond Myklebust Cc: "linux-nfs@vger.kernel.org" , kinglongmee@gmail.com From: Kinglong Mee Subject: pnfs/blocklayout: fix a memory leak after using vmalloc_to_page Message-ID: <56AE030D.3050709@gmail.com> Date: Sun, 31 Jan 2016 20:50:21 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:38.0) Gecko/20100101 Thunderbird/38.5.1 MIME-Version: 1.0 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP unreferenced object 0xffffc90000abf000 (size 16900): comm "fsync02", pid 15765, jiffies 4297431627 (age 423.772s) hex dump (first 32 bytes): 00 00 00 00 00 00 00 00 00 a0 c2 19 00 88 ff ff ................ 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ backtrace: [] kmemleak_alloc+0x4e/0xb0 [] __vmalloc_node_range+0x231/0x280 [] __vmalloc+0x4a/0x50 [] ext_tree_prepare_commit+0x231/0x2e0 [blocklayoutdriver] [] bl_prepare_layoutcommit+0xe/0x10 [blocklayoutdriver] [] pnfs_layoutcommit_inode+0x29c/0x330 [nfsv4] [] pnfs_generic_sync+0x13/0x20 [nfsv4] [] nfs4_file_fsync+0x58/0x150 [nfsv4] [] vfs_fsync_range+0x4b/0xb0 [] do_fsync+0x3d/0x70 [] SyS_fsync+0x10/0x20 [] entry_SYSCALL_64_fastpath+0x12/0x76 [] 0xffffffffffffffff Signed-off-by: Kinglong Mee --- fs/nfs/blocklayout/extent_tree.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/fs/nfs/blocklayout/extent_tree.c b/fs/nfs/blocklayout/extent_tree.c index c59a59c..35ab51c 100644 --- a/fs/nfs/blocklayout/extent_tree.c +++ b/fs/nfs/blocklayout/extent_tree.c @@ -476,6 +476,7 @@ static void ext_tree_free_commitdata(struct nfs4_layoutcommit_args *arg, for (i = 0; i < nr_pages; i++) put_page(arg->layoutupdate_pages[i]); + vfree(arg->start_p); kfree(arg->layoutupdate_pages); } else { put_page(arg->layoutupdate_page); @@ -559,10 +560,15 @@ retry: if (unlikely(arg->layoutupdate_pages != &arg->layoutupdate_page)) { void *p = start_p, *end = p + arg->layoutupdate_len; + struct page *page = NULL; int i = 0; - for ( ; p < end; p += PAGE_SIZE) - arg->layoutupdate_pages[i++] = vmalloc_to_page(p); + arg->start_p = start_p; + for ( ; p < end; p += PAGE_SIZE) { + page = vmalloc_to_page(p); + arg->layoutupdate_pages[i++] = page; + get_page(page); + } } dprintk("%s found %zu ranges\n", __func__, count);