From nobody Thu Feb 03 16:20:41 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 324C31939290; Thu, 3 Feb 2022 16:20:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JqP6L0pRCz4fTk; Thu, 3 Feb 2022 16:20:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643905242; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C5gMIfkXZQHmCnaUrFRoRfgNOz+zAvTdSn5e29+cY/o=; b=l4mAyVtpgaXFjSkKL1ItB1lfsk0oj46SUn+hHytBGeeaxFZpRr5KVVxFMsL1zMC82SfcW0 1edz7ERtbTmNCzMcYqjkT+9B7++4KEvBpt5EgkAziMccyIxhRuOjSR5nEz26ntSROXAAMh dbJyRFsBG5kGhvO2tXgd44NeHhOdLQcgfXOMJ/nyKB/gNxYjXDrQw1St74yttfmirOx1rl MQHCR/KUtEPs5z9YAdeNy2tlrKD3a/SMYz9BLfjaWvaeB/kGpDGSL578JXLRThl080ZSAI VUnjUoCTX8qe3JKLxdLBv0FjnZTO3jBTlIF+75a1UlzTrnhhcim1tHXnLduwxQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E78DB1B38B; Thu, 3 Feb 2022 16:20:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 213GKfTS080272; Thu, 3 Feb 2022 16:20:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 213GKff2080271; Thu, 3 Feb 2022 16:20:41 GMT (envelope-from git) Date: Thu, 3 Feb 2022 16:20:41 GMT Message-Id: <202202031620.213GKff2080271@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Motin Subject: git: 1a8d8a3a909f - main - CTL: Fix mode page trucation on HA synchronization. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mav X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1a8d8a3a909f906ed69cca080a6446e7295bcbbb Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643905242; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C5gMIfkXZQHmCnaUrFRoRfgNOz+zAvTdSn5e29+cY/o=; b=xEN94CQNNLUcuCPBdCdAF/hmoimwm0v7/AMbj9YNvJofenDGXtjpdaOeVQcVDiDVU5/N6F 4f43WQZgeK1KVTkCY3mvuh6Ok3tePoU5i6Xr9aHh7i6IkjtvCtQrHurww+0UWYVSMppKv/ EU6Ex+jnewSLr2JAs2hk8PYimt1cxWMLWp7UC/Acd545u6AOBp2OEk+xhForDNCRR4INgw hRiojV9Stk/7CoLoUQQhdJfJt0gjDmmE2BuZYFBT2bor5cxheWEjb1mc0e2pqgvLw9Z3uI Y9excTlNzO8HLOaRf9kFNdcEQvokzwKJ49LxcIGG1Y8ft2fBW16HTBzIdoXKGQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643905242; a=rsa-sha256; cv=none; b=Ss9LBWNZXfOBKd6sBEzZWeqdPN7e/jFehhlD5IQpiGxZrw7Wo4j3kxXyMMEaQ47cWnZunR X29shSL4nLw11hHk31poV/GdRL/8G8c68Hs4pGXuY+V+0Gol3DM1sviY9KjmXqq25mWGz4 1Aqi47r/0yZVCFbatsx74F8WkUDPyWaMQAnjxFX8tqNs0CY8lgNhL1SuvjD1DlZ8Fo70LU YYHhcQjgKVgKr9gX7Wtoa7X9pJ1gED8CUFopzKoIGrSM6QpRhPvEEgJKXXEA6bK17DUZOY AIoSJOFpSdHMybkFV4nJZm+ktbvSb/FnoXU0SSbusyG/1Bp6UQ35yHwuHVzU6Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=1a8d8a3a909f906ed69cca080a6446e7295bcbbb commit 1a8d8a3a909f906ed69cca080a6446e7295bcbbb Author: Alexander Motin AuthorDate: 2022-02-03 15:48:19 +0000 Commit: Alexander Motin CommitDate: 2022-02-03 16:10:12 +0000 CTL: Fix mode page trucation on HA synchronization. Due to variable size of struct ctl_ha_msg_mode ctl_isc_announce_mode() sent only first 4 bytes of modified mode page to the other HA side, that caused its corruption there, noticeable only after failover. I've found alike bug also in ctl_isc_announce_lun(), but there it was sending slightly more than needed, that is a smaller problem. MFC after: 1 week Sponsored by: iXsystems, Inc. --- sys/cam/ctl/ctl.c | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/sys/cam/ctl/ctl.c b/sys/cam/ctl/ctl.c index 7ad62894509b..96f598a8c740 100644 --- a/sys/cam/ctl/ctl.c +++ b/sys/cam/ctl/ctl.c @@ -879,7 +879,7 @@ alloc: i += sizeof(pr_key); } mtx_unlock(&lun->lun_lock); - ctl_ha_msg_send(CTL_HA_CHAN_CTL, &msg->port, sizeof(msg->port) + i, + ctl_ha_msg_send(CTL_HA_CHAN_CTL, &msg->lun, sizeof(msg->lun) + i, M_WAITOK); free(msg, M_CTL); @@ -994,8 +994,8 @@ ctl_isc_announce_mode(struct ctl_lun *lun, uint32_t initidx, uint8_t page, uint8_t subpage) { struct ctl_softc *softc = lun->ctl_softc; - union ctl_ha_msg msg; - u_int i; + union ctl_ha_msg *msg; + u_int i, l; if (softc->ha_link != CTL_HA_LINK_ONLINE) return; @@ -1011,19 +1011,20 @@ ctl_isc_announce_mode(struct ctl_lun *lun, uint32_t initidx, if (lun->mode_pages.index[i].page_data == NULL) return; - bzero(&msg.mode, sizeof(msg.mode)); - msg.hdr.msg_type = CTL_MSG_MODE_SYNC; - msg.hdr.nexus.targ_port = initidx / CTL_MAX_INIT_PER_PORT; - msg.hdr.nexus.initid = initidx % CTL_MAX_INIT_PER_PORT; - msg.hdr.nexus.targ_lun = lun->lun; - msg.hdr.nexus.targ_mapped_lun = lun->lun; - msg.mode.page_code = page; - msg.mode.subpage = subpage; - msg.mode.page_len = lun->mode_pages.index[i].page_len; - memcpy(msg.mode.data, lun->mode_pages.index[i].page_data, - msg.mode.page_len); - ctl_ha_msg_send(CTL_HA_CHAN_CTL, &msg.mode, sizeof(msg.mode), - M_WAITOK); + l = sizeof(msg->mode) + lun->mode_pages.index[i].page_len; + msg = malloc(l, M_CTL, M_WAITOK | M_ZERO); + msg->hdr.msg_type = CTL_MSG_MODE_SYNC; + msg->hdr.nexus.targ_port = initidx / CTL_MAX_INIT_PER_PORT; + msg->hdr.nexus.initid = initidx % CTL_MAX_INIT_PER_PORT; + msg->hdr.nexus.targ_lun = lun->lun; + msg->hdr.nexus.targ_mapped_lun = lun->lun; + msg->mode.page_code = page; + msg->mode.subpage = subpage; + msg->mode.page_len = lun->mode_pages.index[i].page_len; + memcpy(msg->mode.data, lun->mode_pages.index[i].page_data, + msg->mode.page_len); + ctl_ha_msg_send(CTL_HA_CHAN_CTL, &msg->mode, l, M_WAITOK); + free(msg, M_CTL); } static void