Message ID | 20230113123538.144276-8-christoph.boehmwalder@linbit.com |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp248509wrt; Fri, 13 Jan 2023 04:47:50 -0800 (PST) X-Google-Smtp-Source: AMrXdXsoEPPy0N7OA8stB17kMPgTBiOzN7FEBvSLddUhsjsK4Ai2gIpkvmRzVHPoAwuh6ZSLnU2h X-Received: by 2002:a05:6a20:3c93:b0:b0:c30:5819 with SMTP id b19-20020a056a203c9300b000b00c305819mr123975848pzj.1.1673614070360; Fri, 13 Jan 2023 04:47:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673614070; cv=none; d=google.com; s=arc-20160816; b=qertBDewoEXZiL4qfxL2VXr3q+80bG+t5/a9igXLnjVcz7ILZc9QoIfVd/j09mQ23R IpcYKJfdHECwPS/wJNJOruUJIjM81BBsm8mSerfxH8YYqzqEqtaaNF8Bi0yWyPg+Gppg LtTH4kBmnYjAF2n1PlqfjihCMiR513EvGIMoHpYHja6Vf9uOSuzOi4vCgNfh4LyuufLF bBU9NWXgIZnRH3lah4jRMp9aAwBRru+Xacs9k4hDQcJU/7oIyIq7MAI+Io/gFcZLwXVV sjXPAPDtR0b7hghOxHpq9NPuST1wwRfs66M69poKZm838UHctku4nWuC806VMtSPeryk ypEw== 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=T5KT6Auu94HJGq65sn5VmhXW8yJRnWzEtldTHa29AT0=; b=n+MCOFkRzIGEuzjRPLY0UixGNTcTESlbRc6V15maJrEV+N2GMzYqptjdho0fnaLRkK 4kPYq+G1GFSjBkntEuTNenu7rtomCkZ/tBT5ftE5OX8AnKTlpcTAk0Pt+1oF6rD92DR8 o9qqhgIUFToIxdVHFdpk81AFIIx5/KX91Skm6lWzWWug1vd33PGaBw6N3PlEGqmclOcC Z815AtnjJ9ijIAOao1Sa8prTyoTYJtp/E4qoR6q9yZ6OnPaCnmIAkSzAKI7uBUUYqCW8 wN33MvMT/2PWiSipWCpAwasJ4eub2n87MC3TncbRNpyTg5a07In5GZ1LaIkQHGpNbfOd fMWw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linbit-com.20210112.gappssmtp.com header.s=20210112 header.b=iEvtkhCX; 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 l72-20020a63914b000000b004ba7c769004si6345961pge.656.2023.01.13.04.47.37; Fri, 13 Jan 2023 04:47:50 -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=iEvtkhCX; 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 S241797AbjAMMqO (ORCPT <rfc822;callmefire3@gmail.com> + 99 others); Fri, 13 Jan 2023 07:46:14 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53550 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242017AbjAMMoU (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Fri, 13 Jan 2023 07:44:20 -0500 Received: from mail-ej1-x632.google.com (mail-ej1-x632.google.com [IPv6:2a00:1450:4864:20::632]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3577F1C13F for <linux-kernel@vger.kernel.org>; Fri, 13 Jan 2023 04:36:30 -0800 (PST) Received: by mail-ej1-x632.google.com with SMTP id az20so32929547ejc.1 for <linux-kernel@vger.kernel.org>; Fri, 13 Jan 2023 04:36:29 -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=T5KT6Auu94HJGq65sn5VmhXW8yJRnWzEtldTHa29AT0=; b=iEvtkhCXslE72xJ4rRq1o4dPaZjuX9JLsa7ypmZFDHZvO1spA7qgOqdlMIgNqmOd4Q BmnYm1AreZ0f08H6qA5zzq1vhit1vtTePd21UHj1cHFD1HjWkkgvd6vUd0NYq3Flo4tW PU4z44ieH6GRE99WOpB7LDRHJPfdP/JK0iDdurBhlgpJdztFtfu1wNuJqycRTt4DfmwJ DKQGPJsW0QdNBPlwzpGCReJQBTQGz5fJbIzvrcijgWMbeBy62bZDqSBq0eYILOugbfBK POQt3cU00BEvXOTS6Px7H7/seYT2YAjrwmY0BkAOAChZsa+VBCMGVy2V6DjUXPacBhb7 5YvQ== 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=T5KT6Auu94HJGq65sn5VmhXW8yJRnWzEtldTHa29AT0=; b=U+vaQtoFLsOBcgZvVSV+xkVhzPpp5gz3ZxZecd95K6ELuBL71r3dFsh+Nde5aEE/5l idt3ERKGxaxae32+iJ9HCqb0bIyCksTKuZ1rhspiImOWaCb3OdmS9FMGACSFgXTP5liu fZswv5+cPJVJi/e7T0kA+7NZGf7Q/McoyhaxRQtkpWf9pW9KWivPnhxaR5PNOvoM0QIX Wmeul1gPB+xf2HJ+iZ55+CEGznEoeOXGKUZU3ektcBBz7OAPUf+Ld/FPBga9dtfnh+rA w6co/xAOrP5Xo5lU6r2ZZGhOy9kBenRQC3RHXdfZfRLFu+LOstGDUGrI2x/2mKGtckHI Ju8Q== X-Gm-Message-State: AFqh2koyWEUb+FOwk90tu7DdJ27lWxsZep3pQoTCMyoQxafbjovlzFCI JbHGkz5BdT3Qjkp+14qY+0llTw== X-Received: by 2002:a17:907:7f12:b0:7c1:9eb:845b with SMTP id qf18-20020a1709077f1200b007c109eb845bmr3841305ejc.16.1673613348224; Fri, 13 Jan 2023 04:35:48 -0800 (PST) Received: from localhost.localdomain (h082218028181.host.wavenet.at. [82.218.28.181]) by smtp.gmail.com with ESMTPSA id 17-20020a170906329100b007c0bb571da5sm8402496ejw.41.2023.01.13.04.35.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Jan 2023 04:35:47 -0800 (PST) From: =?utf-8?q?Christoph_B=C3=B6hmwalder?= <christoph.boehmwalder@linbit.com> To: Jens Axboe <axboe@kernel.dk> Cc: drbd-dev@lists.linbit.com, linux-kernel@vger.kernel.org, Lars Ellenberg <lars.ellenberg@linbit.com>, Philipp Reisner <philipp.reisner@linbit.com>, linux-block@vger.kernel.org, =?utf-8?q?Christoph_B=C3=B6hmwalder?= <christoph.boehmwalder@linbit.com> Subject: [PATCH 7/8] drbd: interval tree: make removing an "empty" interval a no-op Date: Fri, 13 Jan 2023 13:35:37 +0100 Message-Id: <20230113123538.144276-8-christoph.boehmwalder@linbit.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230113123538.144276-1-christoph.boehmwalder@linbit.com> References: <20230113123538.144276-1-christoph.boehmwalder@linbit.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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=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: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1754911547495786007?= X-GMAIL-MSGID: =?utf-8?q?1754911547495786007?= |
Series |
Miscellaneous DRBD reorganization
|
|
Commit Message
Christoph Böhmwalder
Jan. 13, 2023, 12:35 p.m. UTC
From: Lars Ellenberg <lars.ellenberg@linbit.com> Trying to remove an "empty" (just initialized, or "cleared") interval from the tree, this results in an endless loop. As we typically protect the tree with a spinlock_irq, the result is a hung system. Be nice to error cleanup code paths, ignore removal of empty intervals. Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com> Signed-off-by: Christoph Böhmwalder <christoph.boehmwalder@linbit.com> --- drivers/block/drbd/drbd_interval.c | 4 ++++ 1 file changed, 4 insertions(+)
diff --git a/drivers/block/drbd/drbd_interval.c b/drivers/block/drbd/drbd_interval.c index 5024ffd6143d..b6aaf0d4d85b 100644 --- a/drivers/block/drbd/drbd_interval.c +++ b/drivers/block/drbd/drbd_interval.c @@ -95,6 +95,10 @@ drbd_contains_interval(struct rb_root *root, sector_t sector, void drbd_remove_interval(struct rb_root *root, struct drbd_interval *this) { + /* avoid endless loop */ + if (drbd_interval_empty(this)) + return; + rb_erase_augmented(&this->rb, root, &augment_callbacks); }