From patchwork Wed Nov 5 09:00:11 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Tao X-Patchwork-Id: 5232921 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.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 1DE10C11AC for ; Wed, 5 Nov 2014 09:00:46 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4B0E820179 for ; Wed, 5 Nov 2014 09:00:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4A9BF2015E for ; Wed, 5 Nov 2014 09:00:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753832AbaKEJAm (ORCPT ); Wed, 5 Nov 2014 04:00:42 -0500 Received: from mail-pd0-f178.google.com ([209.85.192.178]:47995 "EHLO mail-pd0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751711AbaKEJAl (ORCPT ); Wed, 5 Nov 2014 04:00:41 -0500 Received: by mail-pd0-f178.google.com with SMTP id fp1so379489pdb.9 for ; Wed, 05 Nov 2014 01:00:41 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=3VfDDrUdGx5Fx11vYoGqCyPjTslxoCvc7wRx82JxZfM=; b=JWkNZve/pf1QopxAbRdOWbX0YATs5F+8vDPqnsxtEjZFHh3K25k/FeVS2GjkHtdeoj ugRrBQ4mlGLQKm2DfpjJCE350xlZ306TsvldzT2fVFvSU6cKvNAIx9bRXeJgn6dqaWwM lJC+3uvMjl3eNWcvO1VOsaembIZt75HY7yov9ozm8ftjcXnwtyAfzB/Tg1hmFglhLioV BTMhwrqLnoEo8S53+WTlkOozQfbP5QKfglSI5xMA/it8NonOq8mOalNOwdaQWCvf8b5F HudSSUFosohWA69f/ly05YBL61CCCmwNrvSj8fKzKsZdLS2I7zYs/rnOXoGUU74k/pN/ ypzg== X-Gm-Message-State: ALoCoQl5/lth1o8srKKbvGQiuRXRlSgE2QFkJLLELKKhUtQU43WwxBq6DSE4v/VPDXtnKrW62lOJ X-Received: by 10.66.150.102 with SMTP id uh6mr14081696pab.141.1415178040879; Wed, 05 Nov 2014 01:00:40 -0800 (PST) Received: from localhost.localdomain ([222.211.196.59]) by mx.google.com with ESMTPSA id db7sm2572186pdb.27.2014.11.05.01.00.38 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 05 Nov 2014 01:00:40 -0800 (PST) From: Peng Tao To: Trond Myklebust Cc: linux-nfs@vger.kernel.org, Peng Tao Subject: [PATCH] nfs: fix pnfs direct write memory leak Date: Wed, 5 Nov 2014 17:00:11 +0800 Message-Id: <1415178014-17893-1-git-send-email-tao.peng@primarydata.com> X-Mailer: git-send-email 1.9.1 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.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, 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 For pNFS direct writes, layout driver may dynamically allocate ds_cinfo.buckets. So we need to take care to free them when freeing dreq. Ideally this needs to be done inside layout driver where ds_cinfo.buckets are allocated. But buckets are attached to dreq and reused across LD IO iterations. So I feel it's OK to free them in the generic layer. Cc: stable@vger.kernel.org [v3.4+] Signed-off-by: Peng Tao --- fs/nfs/direct.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c index 20cffc8..61f1904 100644 --- a/fs/nfs/direct.c +++ b/fs/nfs/direct.c @@ -266,6 +266,8 @@ static void nfs_direct_req_free(struct kref *kref) { struct nfs_direct_req *dreq = container_of(kref, struct nfs_direct_req, kref); + if (dreq->ds_cinfo.nbuckets) + kfree(dreq->ds_cinfo.buckets); if (dreq->l_ctx != NULL) nfs_put_lock_context(dreq->l_ctx); if (dreq->ctx != NULL)