From patchwork Tue Feb 14 19:02:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Shi X-Patchwork-Id: 57181 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp3155431wrn; Tue, 14 Feb 2023 11:16:46 -0800 (PST) X-Google-Smtp-Source: AK7set/BPPck0d+asl0ySMhola45YgajQIowGBvuUaxM4OVRJg3qY8hPetIQkSWzF4iRgsmIVTmV X-Received: by 2002:a50:cc98:0:b0:4ab:4676:f92f with SMTP id q24-20020a50cc98000000b004ab4676f92fmr4116434edi.37.1676402206212; Tue, 14 Feb 2023 11:16:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676402206; cv=none; d=google.com; s=arc-20160816; b=Hhz/eNPnDg4pnmvHPIQpQMnVo5pOiUkFQb18pFXBI2sb+W08GAtZIgHqMnw35d0niW Bi9JZQG+N6JW5qkru7eqfEIcnEZkSCvcc/v5UQJv5CDFbTILYLh7H+UrnwDNeI7jvWME cq2Dgx7KXeQ+lDLw0bEN99m2v8jAs6hwy63dCCmB6nCRD0DgoZBGsG1gaXNRWfUlNJN8 cTnvWhvh0oj6Dv9vVIAYGxl1lCtzJGjcMz8jsYg7Rf0+dHwXhXDz5AqIz/szhSri6zNE bQTN+w2z4FxtOXTivWaaQd5KveanRKLEYwOKrmecXPQPVFrNhw652PQqhPtYOuvfq8VB jfuQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=mFajPTMRcCMM2sMtnpqlL+/MlXEk9UiKBjz1wMnJjFA=; b=hZZL/VdfYIv+jdXOVIM99am2LG7C4lyv3NHVJEyy32WGNiu9EqYvz57Z4K7KBiLC7Z kNg4z5VqbqYhsPxj3OzDPxiRsg2Di6yPD7qlS4B1iom0v/RY6P2V7xTb5VZKI6wk6bUi ZvTwGzjJq9IEmphn3xJ44ztNddOsQQEDylc5pj/rs+NeNG0C483uFAATj7Nqsb3DPnUi rFKhPoRcjAoqbd3w3rhJWydcK94ajY9GJ5LiG7opUiFahsemqA6o+R75iX6vg9+M+F+w 0xn5GwccvhNFw74XPTK/rYRfpcZgaRINzHgIls5nyOetwy1os3Y1d9Ej4wfu0gEyFw73 1Ciw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=cpuu8RHh; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id v26-20020a056402185a00b004acbbda703asi10296313edy.41.2023.02.14.11.16.22; Tue, 14 Feb 2023 11:16:46 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=cpuu8RHh; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230194AbjBNTCv (ORCPT + 99 others); Tue, 14 Feb 2023 14:02:51 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52936 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232714AbjBNTCq (ORCPT ); Tue, 14 Feb 2023 14:02:46 -0500 Received: from mail-il1-x129.google.com (mail-il1-x129.google.com [IPv6:2607:f8b0:4864:20::129]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 70FA52FCE2; Tue, 14 Feb 2023 11:02:41 -0800 (PST) Received: by mail-il1-x129.google.com with SMTP id h29so4835774ila.8; Tue, 14 Feb 2023 11:02:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=mFajPTMRcCMM2sMtnpqlL+/MlXEk9UiKBjz1wMnJjFA=; b=cpuu8RHhLHTB9Kf5s0trAt7bengNbUN4ZN2xoDYyF+XdtzVhnHEooRlP9BzRHtxlEP r3Rf1jjDg8BQhkHtx/TVMG/uS8NRXNag+1UWtBCkPSLdTJy+q87vzrf0AACu9OupPfqI GnrPCavwpOhXW44xfYvrtpkf/gp3krMsKHx7/M6K8g4qqClwoz6f8Iz7CE+WhipAL6FO UTRQhaQ8FC74Ihf+tDyxdXiJdWD3uKM5/g54L2eY5a93eT0WfuzvRIFE1gDaP91Cbjii 8/IghgHlkNLzreTfyh7VixSz1DQiCh+dNirmbfzL8nalJsFlCCsVvFn1fwk40nyxGMlR tFOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=mFajPTMRcCMM2sMtnpqlL+/MlXEk9UiKBjz1wMnJjFA=; b=IuEiHuGUNJla3aUfPhcUTLYEiI/u35EM/Xo+0RDpbUp9jZGg7WrhBT5uTFtns77V8S +LB8Wqd2qL29ylm2EAHykH55d+zgZ+W0rVYNm+oTjMfGtQpEYKOBOtCSktaxLuPdQ/e8 Vp/RmfeNry39F0LqaA/f4S55IDSJSo7hX1Vuceh9C22qq0cI7dP6rCof00EJ+OSgkoZB Uqn6wnjwx9OEP/oCdGwrabmPaDvReQfg9CSzCofNqKzN9Mu/VokSMzcv8SOKygrm8hgF gkOWmJdOPNIh5FIrCWSJmd653W7hewNnmT6YE/deQ6kNfYoY+lHvhQWfr0NdBUqOnTxh /xtQ== X-Gm-Message-State: AO0yUKXZhs6R73jkw9ginp6EXCM6OlIz4rCsA7gTnZ1SKyrGomjiyaZG hT5U+J0gGqE9Rhg5RyfjMVc= X-Received: by 2002:a05:6e02:1b8c:b0:315:45c5:9185 with SMTP id h12-20020a056e021b8c00b0031545c59185mr3407244ili.31.1676401360782; Tue, 14 Feb 2023 11:02:40 -0800 (PST) Received: from localhost.localdomain (c-67-174-241-145.hsd1.ca.comcast.net. [67.174.241.145]) by smtp.gmail.com with ESMTPSA id r11-20020a056e0219cb00b0030c27c9eea4sm3608770ill.33.2023.02.14.11.02.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Feb 2023 11:02:40 -0800 (PST) From: Yang Shi To: mgorman@techsingularity.net, agk@redhat.com, snitzer@kernel.org, dm-devel@redhat.com, akpm@linux-foundation.org Cc: linux-mm@kvack.org, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [v2 PATCH 4/5] md: dm-crypt: move crypt_free_buffer_pages ahead Date: Tue, 14 Feb 2023 11:02:20 -0800 Message-Id: <20230214190221.1156876-5-shy828301@gmail.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230214190221.1156876-1-shy828301@gmail.com> References: <20230214190221.1156876-1-shy828301@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757835119291144111?= X-GMAIL-MSGID: =?utf-8?q?1757835119291144111?= With moving crypt_free_buffer_pages() before crypt_alloc_buffer(), we don't need an extra declaration anymore. Signed-off-by: Yang Shi --- drivers/md/dm-crypt.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c index 2653516bcdef..73069f200cc5 100644 --- a/drivers/md/dm-crypt.c +++ b/drivers/md/dm-crypt.c @@ -1639,7 +1639,17 @@ static blk_status_t crypt_convert(struct crypt_config *cc, return 0; } -static void crypt_free_buffer_pages(struct crypt_config *cc, struct bio *clone); + +static void crypt_free_buffer_pages(struct crypt_config *cc, struct bio *clone) +{ + struct bio_vec *bv; + struct bvec_iter_all iter_all; + + bio_for_each_segment_all(bv, clone, iter_all) { + BUG_ON(!bv->bv_page); + mempool_free(bv->bv_page, &cc->page_pool); + } +} /* * Generate a new unfragmented bio with the given size @@ -1707,17 +1717,6 @@ static struct bio *crypt_alloc_buffer(struct dm_crypt_io *io, unsigned size) return clone; } -static void crypt_free_buffer_pages(struct crypt_config *cc, struct bio *clone) -{ - struct bio_vec *bv; - struct bvec_iter_all iter_all; - - bio_for_each_segment_all(bv, clone, iter_all) { - BUG_ON(!bv->bv_page); - mempool_free(bv->bv_page, &cc->page_pool); - } -} - static void crypt_io_init(struct dm_crypt_io *io, struct crypt_config *cc, struct bio *bio, sector_t sector) {