From mboxrd@z Thu Jan 1 00:00:00 1970 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=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 518A1C282C8 for ; Mon, 28 Jan 2019 16:23:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1DE5E2147A for ; Mon, 28 Jan 2019 16:23:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548692581; bh=nKCrKNWTEYIXsDIp0z4cj2RgaMgcv++KrjMxL+ALvOU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=LbeFp02eaXUrtOkBwF/vwkDb4zepRqEdpco3SbSMlYEIu3Mzx6uU+ytxUI/nbCb0f 9AxkaTWFBQ0JWSueuBx5X72gP9KB2LEOWH+WqtMdkRvIbuApBd94QEDc6WvqZYzj9N mp/3ohGCKg68GCbPtT6I5fmBHw+6j06646XurEXY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389342AbfA1QW7 (ORCPT ); Mon, 28 Jan 2019 11:22:59 -0500 Received: from mail.kernel.org ([198.145.29.99]:58966 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389287AbfA1QWw (ORCPT ); Mon, 28 Jan 2019 11:22:52 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id CD8CE2171F; Mon, 28 Jan 2019 16:22:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548692571; bh=nKCrKNWTEYIXsDIp0z4cj2RgaMgcv++KrjMxL+ALvOU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ocNa3VVuqWq8sRtqPhfuhMAE7tufP+cM/tr3SlMwiYjxRWyXE9wTuYPhD4ExuNx7D jMoOOOy04i4cO85dI/sVgGfTVPqBfjdIu4kwXxPBeKagiiSgxQn1KzfJCnUs+oLn9e +Oo80sm6CH6c08+GZZfMY+QUcTKyhN9uxu4MwCz4= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Lars Ellenberg , Jens Axboe , Sasha Levin , drbd-dev@lists.linbit.com, linux-block@vger.kernel.org Subject: [PATCH AUTOSEL 4.9 072/107] drbd: disconnect, if the wrong UUIDs are attached on a connected peer Date: Mon, 28 Jan 2019 11:19:12 -0500 Message-Id: <20190128161947.57405-72-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190128161947.57405-1-sashal@kernel.org> References: <20190128161947.57405-1-sashal@kernel.org> MIME-Version: 1.0 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Lars Ellenberg [ Upstream commit b17b59602b6dcf8f97a7dc7bc489a48388d7063a ] With "on-no-data-accessible suspend-io", DRBD requires the next attach or connect to be to the very same data generation uuid tag it lost last. If we first lost connection to the peer, then later lost connection to our own disk, we would usually refuse to re-connect to the peer, because it presents the wrong data set. However, if the peer first connects without a disk, and then attached its disk, we accepted that same wrong data set, which would be "unexpected" by any user of that DRBD and cause "undefined results" (read: very likely data corruption). The fix is to forcefully disconnect as soon as we notice that the peer attached to the "wrong" dataset. Signed-off-by: Lars Ellenberg Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- drivers/block/drbd/drbd_receiver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c index 77d0f80f62f9..83957a1e15ed 100644 --- a/drivers/block/drbd/drbd_receiver.c +++ b/drivers/block/drbd/drbd_receiver.c @@ -4199,7 +4199,7 @@ static int receive_uuids(struct drbd_connection *connection, struct packet_info kfree(device->p_uuid); device->p_uuid = p_uuid; - if (device->state.conn < C_CONNECTED && + if ((device->state.conn < C_CONNECTED || device->state.pdsk == D_DISKLESS) && device->state.disk < D_INCONSISTENT && device->state.role == R_PRIMARY && (device->ed_uuid & ~((u64)1)) != (p_uuid[UI_CURRENT] & ~((u64)1))) { -- 2.19.1