From patchwork Fri Apr 24 11:04:38 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Andreas_Gr=C3=BCnbacher?= X-Patchwork-Id: 6267931 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.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id AA9149F1C4 for ; Fri, 24 Apr 2015 11:08:28 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D6995201E4 for ; Fri, 24 Apr 2015 11:08:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E9FD3200F3 for ; Fri, 24 Apr 2015 11:08:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754820AbbDXLHX (ORCPT ); Fri, 24 Apr 2015 07:07:23 -0400 Received: from mail-wg0-f49.google.com ([74.125.82.49]:33818 "EHLO mail-wg0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1030615AbbDXLFt (ORCPT ); Fri, 24 Apr 2015 07:05:49 -0400 Received: by wgso17 with SMTP id o17so46825279wgs.1; Fri, 24 Apr 2015 04:05:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:in-reply-to:references:in-reply-to :references; bh=ymIClp1gGUjAA5QHJeYY98dTRkcgbMqrbSjHyUkndqk=; b=GVBpOuinFhm4nz+HwYCt/ptxGkFw6Bau4Drq7FAsBfbDkCvdlVuyhIe3hWXVY/jN1H ADhXMA0/YUDBdFXQDcV7T2XSCz4nXeBnN72Afg3Ti4fRGo28MC5zHp4EgZIMqaShY6SD s/DuMARnEvuFIy6bgg6KVTC2jhP8b5GaStEX6gjD4XJP2fSZUO6bHDJotXs/NXipZycq 6l41O+3GtHnN+je4AGC+anOh964N1IMGDFq07lup+QuFLYkXIOMJHtRZ53MdVwWNm5yc j9wJ+efv5mVlA1KOFJdb+3u8aUOSaNFiuOJpmW5LIGrBPGWhHToMWTP4SdOgSjfaRHSH ExSw== X-Received: by 10.194.123.67 with SMTP id ly3mr14867242wjb.105.1429873547771; Fri, 24 Apr 2015 04:05:47 -0700 (PDT) Received: from nuc.home.com (80-110-112-232.cgn.dynamic.surfer.at. [80.110.112.232]) by mx.google.com with ESMTPSA id ch6sm16410648wjc.3.2015.04.24.04.05.46 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 24 Apr 2015 04:05:47 -0700 (PDT) From: Andreas Gruenbacher X-Google-Original-From: Andreas Gruenbacher To: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-nfs@vger.kernel.org Subject: [RFC v3 41/45] rpc: Allow to demand-allocate pages to encode into Date: Fri, 24 Apr 2015 13:04:38 +0200 Message-Id: <4bf77d045d2bd3494c695229cd0505b7002cc9a2.1429868795.git.agruenba@redhat.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: References: In-Reply-To: References: Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_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 When encoding large, variable-length objects such as acls into xdr_bufs, it is easier to allocate buffer pages on demand rather than computing the required buffer size beforehand. Signed-off-by: Andreas Gruenbacher --- net/sunrpc/xdr.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/net/sunrpc/xdr.c b/net/sunrpc/xdr.c index 4439ac4..062951b 100644 --- a/net/sunrpc/xdr.c +++ b/net/sunrpc/xdr.c @@ -537,6 +537,14 @@ static __be32 *xdr_get_next_encode_buffer(struct xdr_stream *xdr, */ xdr->scratch.iov_base = xdr->p; xdr->scratch.iov_len = frag1bytes; + + if (!*xdr->page_ptr) { + struct page *page = alloc_page(GFP_KERNEL); + if (!page) + return ERR_PTR(-ENOMEM); + *xdr->page_ptr = page; + } + p = page_address(*xdr->page_ptr); /* * Note this is where the next encode will start after we've