From patchwork Wed Sep 1 17:01:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Omar Sandoval X-Patchwork-Id: 12469951 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 734F5C432BE for ; Wed, 1 Sep 2021 17:01:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5AF8661058 for ; Wed, 1 Sep 2021 17:01:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345647AbhIARCq (ORCPT ); Wed, 1 Sep 2021 13:02:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36962 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345610AbhIARCl (ORCPT ); Wed, 1 Sep 2021 13:02:41 -0400 Received: from mail-pf1-x42b.google.com (mail-pf1-x42b.google.com [IPv6:2607:f8b0:4864:20::42b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 67BFFC061764 for ; Wed, 1 Sep 2021 10:01:44 -0700 (PDT) Received: by mail-pf1-x42b.google.com with SMTP id y17so286384pfl.13 for ; Wed, 01 Sep 2021 10:01:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=osandov-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=H4mqyz+VHmVtbXHcMEv44uByT200A+1BRqo8V2YXL9M=; b=ialasvKUQPgOdb9gSUFy4RIzHHMAG9xOJVL+WDq6GPsl8hcZSIS4udMgU+azX2lzxL ddw/BYi+O19RPnhWZJCtLk0rMyZcp22oDAUYwKgpWuXIkbOrB5fkkPcSEsM9SCjAwEOZ AlLqDLcZfuRHOHJZ9KtDnKlbfD78Ij2qArVhsqXEObvR/h+yDaLoZ3aZLrsd/1R7+RuV fflqtpbtjfT+h7d6D6Qth76Ty5uCLuHuJv10bg3ddE2mAGD4zjcvgzj70iRvxv3pVmLu KQX9GfZqp3/cQ4phABt3lYSELkgFl9LZB4WgOO/9qOqkYm003XFDSwf0oG57eyDaQdCT eoTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=H4mqyz+VHmVtbXHcMEv44uByT200A+1BRqo8V2YXL9M=; b=SyaZyBQ4sRjG5sDTd88AsuIYhZYvLhiDaD6dyYyt22Uf2cZn4lkABIDw9B3gLvXWZD E8B2E0XwBBduQn336ukj2oYnnXRm9Gen9LmyinBqvt203QnwDn+vXGjzSqvau9oEwcq/ BmwW2P604aC8/B0OQiyjrM2ryLwoKsGuXuT0u1ppk1OuwXdhYKdYg2xuJ29xgsTJUHFd vtuDoTN+4ASbQY44GMfgqfC6alIWTS6HQZIB0zyUjyeLvEDnk2KpOF9Bnlquc14PBmE0 den+bb4XvsbB/ZXErQnoPF+2zW35OBJGCxeTKfCXovFUPrP6y7p6yQTaFBB3L76haDVe +wYQ== X-Gm-Message-State: AOAM533LpDypulUJMlewiHIOestqkkilnvT8BCuz4vXDZSZSnAO80TW4 wS/JCtfkYzgvE2i3OCpxXBFPG06fRX3ijA== X-Google-Smtp-Source: ABdhPJzFMqjmOiGBLzuZ4kF6o5QUswSvkhGEtqlF8lvwUm62lLRgqWAdN/kIMk/L5J5VfMAyDeyNKQ== X-Received: by 2002:a05:6a00:234f:b0:3eb:3ffd:6da2 with SMTP id j15-20020a056a00234f00b003eb3ffd6da2mr345536pfj.15.1630515703587; Wed, 01 Sep 2021 10:01:43 -0700 (PDT) Received: from relinquished.tfbnw.net ([2620:10d:c090:400::5:a2b2]) by smtp.gmail.com with ESMTPSA id y7sm58642pff.206.2021.09.01.10.01.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Sep 2021 10:01:42 -0700 (PDT) From: Omar Sandoval To: linux-btrfs@vger.kernel.org Cc: kernel-team@fb.com, linux-fsdevel@vger.kernel.org, linux-api@vger.kernel.org Subject: [PATCH v11 12/14] btrfs: send: allocate send buffer with alloc_page() and vmap() for v2 Date: Wed, 1 Sep 2021 10:01:07 -0700 Message-Id: <74a9595599ad41fa5b843473ce6e9d436def210f.1630514529.git.osandov@fb.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org From: Omar Sandoval For encoded writes, we need the raw pages for reading compressed data directly via a bio. So, replace kvmalloc() with vmap() so we have access to the raw pages. 144k is large enough that it usually gets allocated with vmalloc(), anyways. Signed-off-by: Omar Sandoval Reviewed-by: Nikolay Borisov --- fs/btrfs/send.c | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c index 80736e2670eb..a000efe2658a 100644 --- a/fs/btrfs/send.c +++ b/fs/btrfs/send.c @@ -81,6 +81,7 @@ struct send_ctx { char *send_buf; u32 send_size; u32 send_max_size; + struct page **send_buf_pages; u64 total_send_size; u64 cmd_send_size[BTRFS_SEND_C_MAX + 1]; u64 flags; /* 'flags' member of btrfs_ioctl_send_args is u64 */ @@ -7223,6 +7224,7 @@ long btrfs_ioctl_send(struct file *mnt_file, struct btrfs_ioctl_send_args *arg) struct btrfs_root *clone_root; struct send_ctx *sctx = NULL; u32 i; + u32 send_buf_num_pages = 0; u64 *clone_sources_tmp = NULL; int clone_sources_to_rollback = 0; size_t alloc_size; @@ -7303,10 +7305,28 @@ long btrfs_ioctl_send(struct file *mnt_file, struct btrfs_ioctl_send_args *arg) if (sctx->flags & BTRFS_SEND_FLAG_STREAM_V2) { sctx->send_max_size = ALIGN(SZ_16K + BTRFS_MAX_COMPRESSED, PAGE_SIZE); + send_buf_num_pages = sctx->send_max_size >> PAGE_SHIFT; + sctx->send_buf_pages = kcalloc(send_buf_num_pages, + sizeof(*sctx->send_buf_pages), + GFP_KERNEL); + if (!sctx->send_buf_pages) { + send_buf_num_pages = 0; + ret = -ENOMEM; + goto out; + } + for (i = 0; i < send_buf_num_pages; i++) { + sctx->send_buf_pages[i] = alloc_page(GFP_KERNEL); + if (!sctx->send_buf_pages[i]) { + ret = -ENOMEM; + goto out; + } + } + sctx->send_buf = vmap(sctx->send_buf_pages, send_buf_num_pages, + VM_MAP, PAGE_KERNEL); } else { sctx->send_max_size = BTRFS_SEND_BUF_SIZE_V1; + sctx->send_buf = kvmalloc(sctx->send_max_size, GFP_KERNEL); } - sctx->send_buf = kvmalloc(sctx->send_max_size, GFP_KERNEL); if (!sctx->send_buf) { ret = -ENOMEM; goto out; @@ -7513,7 +7533,16 @@ long btrfs_ioctl_send(struct file *mnt_file, struct btrfs_ioctl_send_args *arg) fput(sctx->send_filp); kvfree(sctx->clone_roots); - kvfree(sctx->send_buf); + if (sctx->flags & BTRFS_SEND_FLAG_STREAM_V2) { + vunmap(sctx->send_buf); + for (i = 0; i < send_buf_num_pages; i++) { + if (sctx->send_buf_pages[i]) + __free_page(sctx->send_buf_pages[i]); + } + kfree(sctx->send_buf_pages); + } else { + kvfree(sctx->send_buf); + } name_cache_free(sctx);