From nobody Tue Nov 26 18:38:38 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1705688220; cv=none; d=zohomail.com; s=zohoarc; b=N12wldtznOaNBR6fwI7kSlexJWLFWTgyOhfdpV5sfFLgxrlQsV5eYUITAjH7WOj+5iltAZGl8VcIAVjbKgDkKAfsKcN4+um34uAWHOUwtM4+aXOGXMHqQzOlVOWCJDUUCBi+GV14pbyHP71tFFByHWIjN9DXbpiaZ0R+21/WOVU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1705688220; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=7KXVoT9IraWqlZ0Y8JMlj17j6pFajLnqEWukWX7hPLs=; b=bAOt1m2SRqAE26IJVfbEzJGGM07SKcRNEoKaacyYMC7SjUNciPNtCW0oliM9UG86wMQPyKaVIKjUhjE6/ZSkNxlh86Ks0P+60EJR6kYYRjp3CfnJeMnDWOxoRo7ra/N4fpYWMW/BwEUYEywZ0U/ADRbPzJAXDlaQ6vZbDNMEg8w= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1705688220448552.8084878896921; Fri, 19 Jan 2024 10:17:00 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rQtNK-0001gk-4j; Fri, 19 Jan 2024 13:13:54 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rQtN8-0001cv-KR for qemu-devel@nongnu.org; Fri, 19 Jan 2024 13:13:43 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rQtN5-0007ZP-V3 for qemu-devel@nongnu.org; Fri, 19 Jan 2024 13:13:42 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-207-ipxZrrffOJqw720Kkp8Eqw-1; Fri, 19 Jan 2024 13:13:35 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id BCE9F185A786; Fri, 19 Jan 2024 18:13:33 +0000 (UTC) Received: from merkur.fritz.box (unknown [10.39.194.86]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2E5CA1B96; Fri, 19 Jan 2024 18:13:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1705688017; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7KXVoT9IraWqlZ0Y8JMlj17j6pFajLnqEWukWX7hPLs=; b=CV/2AWqZZf12VtMojhRxDgEIokTNwDBlxo9oLLM//os5McsJPwH7A976ZYlhPGIEbBondS rpDcgkKdxpKfyG78g9Mp4N6FCb1Wd6ucNWh81XqBVw+NtQFY/tIhZmhMlYpClUawAl3pYh 7atDQckhAM4QXN93xW2efJovn/oEHgw= X-MC-Unique: ipxZrrffOJqw720Kkp8Eqw-1 From: Kevin Wolf To: qemu-block@nongnu.org Cc: kwolf@redhat.com, qemu-devel@nongnu.org Subject: [PULL 01/14] block/blklogwrites: Fix a bug when logging "write zeroes" operations. Date: Fri, 19 Jan 2024 19:13:14 +0100 Message-ID: <20240119181327.236745-2-kwolf@redhat.com> In-Reply-To: <20240119181327.236745-1-kwolf@redhat.com> References: <20240119181327.236745-1-kwolf@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.1 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=kwolf@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -45 X-Spam_score: -4.6 X-Spam_bar: ---- X-Spam_report: (-4.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.519, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1705688222199100003 Content-Type: text/plain; charset="utf-8" From: Ari Sundholm There is a bug in the blklogwrites driver pertaining to logging "write zeroes" operations, causing log corruption. This can be easily observed by setting detect-zeroes to something other than "off" for the driver. The issue is caused by a concurrency bug pertaining to the fact that "write zeroes" operations have to be logged in two parts: first the log entry metadata, then the zeroed-out region. While the log entry metadata is being written by bdrv_co_pwritev(), another operation may begin in the meanwhile and modify the state of the blklogwrites driver. This is as intended by the coroutine-driven I/O model in QEMU, of course. Unfortunately, this specific scenario is mishandled. A short example: 1. Initially, in the current operation (#1), the current log sector number in the driver state is only incremented by the number of sectors taken by the log entry metadata, after which the log entry metadata is written. The current operation yields. 2. Another operation (#2) may start while the log entry metadata is being written. It uses the current log position as the start offset for its log entry. This is in the sector right after the operation #1 log entry metadata, which is bad! 3. After bdrv_co_pwritev() returns (#1), the current log sector number is reread from the driver state in order to find out the start offset for bdrv_co_pwrite_zeroes(). This is an obvious blunder, as the offset will be the sector right after the (misplaced) operation #2 log entry, which means that the zeroed-out region begins at the wrong offset. 4. As a result of the above, the log is corrupt. Fix this by only reading the driver metadata once, computing the offsets and sizes in one go (including the optional zeroed-out region) and setting the log sector number to the appropriate value for the next operation in line. Signed-off-by: Ari Sundholm Cc: qemu-stable@nongnu.org Message-ID: <20240109184646.1128475-1-megari@gmx.com> Reviewed-by: Kevin Wolf Signed-off-by: Kevin Wolf --- block/blklogwrites.c | 35 ++++++++++++++++++++++++++--------- 1 file changed, 26 insertions(+), 9 deletions(-) diff --git a/block/blklogwrites.c b/block/blklogwrites.c index 7207b2e757..ba717dab4d 100644 --- a/block/blklogwrites.c +++ b/block/blklogwrites.c @@ -328,22 +328,39 @@ static void coroutine_fn GRAPH_RDLOCK blk_log_writes_co_do_log(BlkLogWritesLogReq *lr) { BDRVBlkLogWritesState *s =3D lr->bs->opaque; - uint64_t cur_log_offset =3D s->cur_log_sector << s->sectorbits; =20 - s->nr_entries++; - s->cur_log_sector +=3D - ROUND_UP(lr->qiov->size, s->sectorsize) >> s->sectorbits; + /* + * Determine the offsets and sizes of different parts of the entry, and + * update the state of the driver. + * + * This needs to be done in one go, before any actual I/O is done, as = the + * log entry may have to be written in two parts, and the state of the + * driver may be modified by other driver operations while waiting for= the + * I/O to complete. + */ + const uint64_t entry_start_sector =3D s->cur_log_sector; + const uint64_t entry_offset =3D entry_start_sector << s->sectorbits; + const uint64_t qiov_aligned_size =3D ROUND_UP(lr->qiov->size, s->secto= rsize); + const uint64_t entry_aligned_size =3D qiov_aligned_size + + ROUND_UP(lr->zero_size, s->sectorsize); + const uint64_t entry_nr_sectors =3D entry_aligned_size >> s->sectorbit= s; =20 - lr->log_ret =3D bdrv_co_pwritev(s->log_file, cur_log_offset, lr->qiov-= >size, + s->nr_entries++; + s->cur_log_sector +=3D entry_nr_sectors; + + /* + * Write the log entry. Note that if this is a "write zeroes" operatio= n, + * only the entry header is written here, with the zeroing being done + * separately below. + */ + lr->log_ret =3D bdrv_co_pwritev(s->log_file, entry_offset, lr->qiov->s= ize, lr->qiov, 0); =20 /* Logging for the "write zeroes" operation */ if (lr->log_ret =3D=3D 0 && lr->zero_size) { - cur_log_offset =3D s->cur_log_sector << s->sectorbits; - s->cur_log_sector +=3D - ROUND_UP(lr->zero_size, s->sectorsize) >> s->sectorbits; + const uint64_t zeroes_offset =3D entry_offset + qiov_aligned_size; =20 - lr->log_ret =3D bdrv_co_pwrite_zeroes(s->log_file, cur_log_offset, + lr->log_ret =3D bdrv_co_pwrite_zeroes(s->log_file, zeroes_offset, lr->zero_size, 0); } =20 --=20 2.43.0