From patchwork Thu Dec 1 11:03:45 2022 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: 2476 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp197125wrr; Thu, 1 Dec 2022 03:07:14 -0800 (PST) X-Google-Smtp-Source: AA0mqf4NKyQWUIKIhBlWfUwA0y7WxKBt5SJAP2ltSsxwrNgXiHjlwrAFhtsr1/NzVhnFAcRIOLUL X-Received: by 2002:aa7:c759:0:b0:46a:b8e0:f73a with SMTP id c25-20020aa7c759000000b0046ab8e0f73amr27637024eds.425.1669892834708; Thu, 01 Dec 2022 03:07:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669892834; cv=none; d=google.com; s=arc-20160816; b=pjU995FDfOgUBYWre4L2oYvIU+7a8gJ2Q4bq2jCPIgIwzX15CstMeEuFV0/yPQUWL8 of1Wmy5U6KxtVIMVerHo/54yBIsK9tnkTwwzAOw8nXU0ImIp0pQEW2kKmknTSkzlRTv1 B80AkWaHCKpATJaqFzi62XG0fQlC1gyYv3A5lgx2FtqkMABWA2feJ1+09pdp3tOUvCM4 KHP+HB2KumlJW+sUGnVOnxsSWxNcGoUqw7WB/5T5g7e2Ao7b2rJN7d2+63tTSe1rQ8J9 X0YwLByVdge9YNV2+r/bJa91S7ua0DTd1frSwLV88Bpn+di0rnsFPQR4oxuquzpCvzyf nxQQ== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=bCSFONotMGlT5jcNSWA3wEw//+37lRPpQvu379eQdb4=; b=K+Bb1ad+mgde1SNGdMfC5YZTy4tyhDsgaKn0Vf6kK1AU+WuPxtBRtUMEV8PHMEvk/e +JGDXRpTPopez4PMEZFhtU46HTAbJ44ONEoxKs5rEY2ZLB7gKHZ47TsP6vOH4sJg9Ioy Cm10enk0karvfRMqR2Ryw3GKHT6C5W+bQrGbGATnUyHf+kSZROyIR44bq9hQmkjtzOGE UVoA+V2Tuj4nWP7dBRy44kmZVsJls4Ue01EtqA/LW1DTthbFgPqGMqFb9yKCn/Jbic+1 DImjNr3jC/aFsaCVu6bELylFg5X8bob85XbT7o/QjkJ9juznBdzlMiOHDASbv2emahvb TfTA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linbit-com.20210112.gappssmtp.com header.s=20210112 header.b="mky/H4kq"; 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id qk11-20020a1709077f8b00b0078772382b35si3431835ejc.91.2022.12.01.03.06.48; Thu, 01 Dec 2022 03:07:14 -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=@linbit-com.20210112.gappssmtp.com header.s=20210112 header.b="mky/H4kq"; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231289AbiLALFu (ORCPT + 99 others); Thu, 1 Dec 2022 06:05:50 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45118 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231213AbiLALEb (ORCPT ); Thu, 1 Dec 2022 06:04:31 -0500 Received: from mail-ej1-x634.google.com (mail-ej1-x634.google.com [IPv6:2a00:1450:4864:20::634]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6AAFC5C0F7 for ; Thu, 1 Dec 2022 03:04:28 -0800 (PST) Received: by mail-ej1-x634.google.com with SMTP id o13so3355497ejm.1 for ; Thu, 01 Dec 2022 03:04:28 -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:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=bCSFONotMGlT5jcNSWA3wEw//+37lRPpQvu379eQdb4=; b=mky/H4kqev/SBa6soq1k+oMgOaV2tJ6fff0Qn4zByh6t4++4mdmoeRtyyf3dT0AGXh 8qcdBXx/eU+yX2ubXovz++PON5OelriwP9No7rBn8afMyyq4glmQiIX/S4k8FEotVKNa tm5Ta4VNNWwL2Di8riPg+0yKi3AJntfpfgWvpOprnbKahJ/NZpIqhIm20ggN6r0EuxmC c0uM8xGx2bd7ZsNkzMYTihZTjhxs6FHLbzuzIFza+54tb64iXc/1ks7O2IfHtQ6zedtz bjZcNpxzIuMAiGBZ/+cNhUThlzgMlYueD6SJic/P2fmG9VN7zurkQCVwTEoN4AZ87+gY SvGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=bCSFONotMGlT5jcNSWA3wEw//+37lRPpQvu379eQdb4=; b=4Rnck5kAmOE3naeO7xySrKlThpRxf1osqc/ynEJqQM7Sxced2eBZTpyL0rDHyO5J2e FpVNZSdqMqpJrM5/KmMTKoWabUMuq9P8U+QXh+9PjeB8RMZj9zldVMm3Lz79Q5aCFTVv h2WMNnyRCv4Wp1ujxx1/5IT1XqThnXwr8CLFAnstpux49mu0yOL3PfqlQ8EqFvY9aRWI XGFdtd2EPJQlRfBAo2aJTvBDiTwxwI1/UZ5ZYdClbOyyzajOzTZnDLlCt+WJSDCHm9VS upFRFl0GuuvSpIEk9E5MO5x3nmU2rbS3kaxjftMw0Q2Md4KyF3wHtdBDdy95r/gxjCwt RP7g== X-Gm-Message-State: ANoB5plMFbapSiTN0XBBrQsDg2QklMB2zISxzRYzEW1a3Qrg49Iv2Dve 6BYh3fnwjERYesk5C/QyZ1pSDA== X-Received: by 2002:a17:906:a198:b0:7b4:bc42:3b44 with SMTP id s24-20020a170906a19800b007b4bc423b44mr48503029ejy.101.1669892666946; Thu, 01 Dec 2022 03:04:26 -0800 (PST) Received: from localhost.localdomain (h082218028181.host.wavenet.at. [82.218.28.181]) by smtp.gmail.com with ESMTPSA id f26-20020a056402161a00b00463a83ce063sm1576424edv.96.2022.12.01.03.04.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Dec 2022 03:04:26 -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, =?utf-8?q?Christoph_B=C3=B6hmwalder?= Subject: [PATCH 0/5] Backported DRBD printk/debug improvements Date: Thu, 1 Dec 2022 12:03:45 +0100 Message-Id: <20221201110349.1282687-1-christoph.boehmwalder@linbit.com> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=unavailable 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?1751009549052786602?= X-GMAIL-MSGID: =?utf-8?q?1751009549052786602?= Some changes to DRBD's logging infrastructure, backported from the out-of-tree module. Since the two code bases have diverged so much, it is tough to preserve authorship information without "putting words into someone's mouth". So I ended up using Originally-from tags to try and encode the original authors of these patches. Christoph Böhmwalder (5): drbd: unify how failed assertions are logged drbd: split polymorph printk to its own file drbd: introduce dynamic debug drbd: introduce drbd_ratelimit() drbd: add context parameter to expect() macro drivers/block/drbd/drbd_actlog.c | 6 +- drivers/block/drbd/drbd_bitmap.c | 60 ++++----- drivers/block/drbd/drbd_int.h | 68 +--------- drivers/block/drbd/drbd_main.c | 10 +- drivers/block/drbd/drbd_nl.c | 2 +- drivers/block/drbd/drbd_polymorph_printk.h | 141 +++++++++++++++++++++ drivers/block/drbd/drbd_receiver.c | 16 +-- drivers/block/drbd/drbd_req.c | 6 +- drivers/block/drbd/drbd_worker.c | 12 +- 9 files changed, 199 insertions(+), 122 deletions(-) create mode 100644 drivers/block/drbd/drbd_polymorph_printk.h base-commit: b4c0482bfe89cd6c4f030314c86aae35642c44a5