From patchwork Wed Nov 5 14:36:50 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Tao X-Patchwork-Id: 5234411 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id DCF319F2F1 for ; Wed, 5 Nov 2014 14:37:58 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0990F20172 for ; Wed, 5 Nov 2014 14:37:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2A5EE20165 for ; Wed, 5 Nov 2014 14:37:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754489AbaKEOh4 (ORCPT ); Wed, 5 Nov 2014 09:37:56 -0500 Received: from mail-pa0-f42.google.com ([209.85.220.42]:48211 "EHLO mail-pa0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754039AbaKEOhz (ORCPT ); Wed, 5 Nov 2014 09:37:55 -0500 Received: by mail-pa0-f42.google.com with SMTP id bj1so897754pad.15 for ; Wed, 05 Nov 2014 06:37:55 -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=3sXEHEEcf/TlYocjakwqclon2djFrMGwZ8vVQCXAoEo=; b=CX1HC++N3eCn4MkrXhx4Gr1Qip4Zrr2BfFkZDoxEl1NFNBeQD95IJ6UJDTEZDJQHs+ nTuqIgtPLnFx0x5Dvcog7IONvAE39Ee5W/c+/lw6EyULER7uBOlDXReco8CbGuKwLsVB 0f6xyUuK6qofQUNR8QGceOm3WcUVnUB2TJD/stOlfbW1DTEb+Yyke+mFEDGQFDnAduEw tfyWB9A4Tq9Xb3z/MAexKD4Ikyk5/S69R1Dyj9SmKIp1KciJaWG1zdYku1XmiIA3icwe 4/pzYZqbbKdogbT50O2jBJHxIbRTo59hExyVE6i8cbknvQR5kfUQ8J6g4KI6kplrMJoU JiTg== X-Gm-Message-State: ALoCoQnVUt5sHkMdIFvLNLErz0VJMJxLhsbnfPMVyfqkBfoJQ0XtWk+zYjQluBZGzZieZWGIHcnz X-Received: by 10.68.180.130 with SMTP id do2mr57480848pbc.28.1415198275164; Wed, 05 Nov 2014 06:37:55 -0800 (PST) Received: from localhost.localdomain ([222.211.196.59]) by mx.google.com with ESMTPSA id a13sm3342672pbu.77.2014.11.05.06.37.53 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 05 Nov 2014 06:37:54 -0800 (PST) From: Peng Tao To: Trond Myklebust Cc: linux-nfs@vger.kernel.org, Peng Tao Subject: [PATCH v2] nfs: fix pnfs direct write memory leak Date: Wed, 5 Nov 2014 22:36:50 +0800 Message-Id: <1415198213-20094-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 | 1 + include/linux/nfs_xdr.h | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c index 20cffc8..10bf072 100644 --- a/fs/nfs/direct.c +++ b/fs/nfs/direct.c @@ -266,6 +266,7 @@ static void nfs_direct_req_free(struct kref *kref) { struct nfs_direct_req *dreq = container_of(kref, struct nfs_direct_req, kref); + nfs_free_pnfs_ds_cinfo(&dreq->ds_cinfo); if (dreq->l_ctx != NULL) nfs_put_lock_context(dreq->l_ctx); if (dreq->ctx != NULL) diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h index 983876f..10dee95 100644 --- a/include/linux/nfs_xdr.h +++ b/include/linux/nfs_xdr.h @@ -1224,11 +1224,20 @@ struct nfs41_free_stateid_res { unsigned int status; }; +static inline void +nfs_free_pnfs_ds_cinfo(struct pnfs_ds_commit_info *cinfo) +{ + kfree(cinfo->buckets); +} + #else struct pnfs_ds_commit_info { }; +static inline void +nfs_free_pnfs_ds_cinfo(struct pnfs_ds_commit_info *cinfo) {} + #endif /* CONFIG_NFS_V4_1 */ #ifdef CONFIG_NFS_V4_2