From patchwork Wed Feb 15 16:32:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Christoph_B=C3=B6hmwalder?= X-Patchwork-Id: 13141937 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 15C36C636D7 for ; Wed, 15 Feb 2023 16:32:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229681AbjBOQcQ (ORCPT ); Wed, 15 Feb 2023 11:32:16 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38964 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229618AbjBOQcN (ORCPT ); Wed, 15 Feb 2023 11:32:13 -0500 Received: from mail-wr1-x434.google.com (mail-wr1-x434.google.com [IPv6:2a00:1450:4864:20::434]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5649F3B0FD for ; Wed, 15 Feb 2023 08:32:11 -0800 (PST) Received: by mail-wr1-x434.google.com with SMTP id bk16so19740787wrb.11 for ; Wed, 15 Feb 2023 08:32:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linbit-com.20210112.gappssmtp.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=Tcb29/6rtQpwc/kpAeczx/YDjGscreJ2xzUEcJHD+jU=; b=SiULoR+ISmuhrNAnD07QKQb8SYSxgMwZ7pAAEstG7eURaU9WssGRca+FKa+4X46naD RXqTk1tz6ABgPP51rAEEECEvfmUX/HNqOPvIJiJed8Ykj2Fj3VhXCH8Sl4Cddk3+ct3Z 3d+Na8/yxRgaBJffnSp1WRTCU4Nnvnabdx3flKmm5Rf+pqmXB/ixqs4yKvcAFP3QYKuH YuUv+Iz4ecDpzfPEUnQTvU8j4LxMsisURHuuedKlf6PQX7fXpWGph2koB8Aplg3Xz4BS Ibfpc8Vq8Di3IEDz2F35QQBkYR3yUt6368t7CMX/yLQBCjc5ILFfrcLcx9ClTy0sI6V2 KnCg== 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=Tcb29/6rtQpwc/kpAeczx/YDjGscreJ2xzUEcJHD+jU=; b=KpaXLt/+eFyJsrttXDlxTtVNRoAkBKZcL1MdVkFNPQkLA6maG8414igZq1WDi0/Hq9 OPdcQzJ+RX0iRDqRt3bLQccmlFyv9TCD848wNk/yA4JhFo+wH+GGgSahvOu8zXIojpij +VH3eYxy5BWrIEhKKNVpnXXODjeAVEff5VMxexPQ+wxN7BUMwmJ65r249Pe9m1fKAk0L DNTMiLiqdk7LjgmL6Qgh2EbzUIqAr6IY3OdR5rLj32NjfYMf4jIxpO9TXoNSS1cGVBUC ArVdCSxlQrl0tizCtuaMQWtREgA7QUO0HTYFFT7vBPxiJMgMKziOA1V5qCnxQiitQjmg /pCA== X-Gm-Message-State: AO0yUKUKWOdSmKqg3xEbqw44zbZaD4bbRGqpIld3d2pmnVq57RHPQypM P1aY3+FjgmCy7xgCfscpea0455VKrfeshPznBFDNHA== X-Google-Smtp-Source: AK7set+R1ETjxF5meR15HBFQTAyoHQ/uqK2I8nZZ1ZDgQj9yueHElN0lk1qd2JTeWXj5jk0CviwI+w== X-Received: by 2002:a05:6000:120e:b0:2c5:4784:6f0c with SMTP id e14-20020a056000120e00b002c547846f0cmr2521322wrx.15.1676478729819; Wed, 15 Feb 2023 08:32:09 -0800 (PST) Received: from localhost.localdomain (h082218028181.host.wavenet.at. [82.218.28.181]) by smtp.gmail.com with ESMTPSA id n4-20020a5d67c4000000b002c56287bd2csm4865055wrw.114.2023.02.15.08.32.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Feb 2023 08:32:09 -0800 (PST) From: =?utf-8?q?Christoph_B=C3=B6hmwalder?= To: Jens Axboe Cc: drbd-dev@lists.linbit.com, linux-kernel@vger.kernel.org, Lars Ellenberg , Philipp Reisner , linux-block@vger.kernel.org, Andreas Gruenbacher , =?utf-8?q?Christoph_B=C3=B6hmwalde?= =?utf-8?q?r?= Subject: [PATCH 3/7] drbd: INFO_bm_xfer_stats(): Pass a peer device argument Date: Wed, 15 Feb 2023 17:32:00 +0100 Message-Id: <20230215163204.2856631-4-christoph.boehmwalder@linbit.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230215163204.2856631-1-christoph.boehmwalder@linbit.com> References: <20230215163204.2856631-1-christoph.boehmwalder@linbit.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org From: Andreas Gruenbacher Signed-off-by: Andreas Gruenbacher Signed-off-by: Christoph Böhmwalder --- drivers/block/drbd/drbd_int.h | 4 ++-- drivers/block/drbd/drbd_main.c | 2 +- drivers/block/drbd/drbd_receiver.c | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h index 63919781fe30..8b4d06e10365 100644 --- a/drivers/block/drbd/drbd_int.h +++ b/drivers/block/drbd/drbd_int.h @@ -126,8 +126,8 @@ struct bm_xfer_ctx { unsigned bytes[2]; }; -extern void INFO_bm_xfer_stats(struct drbd_device *device, - const char *direction, struct bm_xfer_ctx *c); +extern void INFO_bm_xfer_stats(struct drbd_peer_device *peer_device, + const char *direction, struct bm_xfer_ctx *c); static inline void bm_xfer_ctx_bit_to_word_offset(struct bm_xfer_ctx *c) { diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c index 5d98017497e4..6f2955f2dcc9 100644 --- a/drivers/block/drbd/drbd_main.c +++ b/drivers/block/drbd/drbd_main.c @@ -1247,7 +1247,7 @@ send_bitmap_rle_or_plain(struct drbd_peer_device *device, struct bm_xfer_ctx *c) } if (!err) { if (len == 0) { - INFO_bm_xfer_stats(device, "send", c); + INFO_bm_xfer_stats(peer_device, "send", c); return 0; } else return 1; diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c index 424748f6e4fa..aa896db1767d 100644 --- a/drivers/block/drbd/drbd_receiver.c +++ b/drivers/block/drbd/drbd_receiver.c @@ -4766,11 +4766,11 @@ decode_bitmap_c(struct drbd_peer_device *peer_device, return -EIO; } -void INFO_bm_xfer_stats(struct drbd_device *device, +void INFO_bm_xfer_stats(struct drbd_peer_device *peer_device, const char *direction, struct bm_xfer_ctx *c) { /* what would it take to transfer it "plaintext" */ - unsigned int header_size = drbd_header_size(first_peer_device(device)->connection); + unsigned int header_size = drbd_header_size(peer_device->connection); unsigned int data_size = DRBD_SOCKET_BUFFER_SIZE - header_size; unsigned int plain = header_size * (DIV_ROUND_UP(c->bm_words, data_size) + 1) + @@ -4794,7 +4794,7 @@ void INFO_bm_xfer_stats(struct drbd_device *device, r = 1000; r = 1000 - r; - drbd_info(device, "%s bitmap stats [Bytes(packets)]: plain %u(%u), RLE %u(%u), " + drbd_info(peer_device, "%s bitmap stats [Bytes(packets)]: plain %u(%u), RLE %u(%u), " "total %u; compression: %u.%u%%\n", direction, c->bytes[1], c->packets[1], @@ -4872,7 +4872,7 @@ static int receive_bitmap(struct drbd_connection *connection, struct packet_info goto out; } - INFO_bm_xfer_stats(device, "receive", &c); + INFO_bm_xfer_stats(peer_device, "receive", &c); if (device->state.conn == C_WF_BITMAP_T) { enum drbd_state_rv rv;