From nobody Mon Feb 9 05:10:19 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571998960; cv=none; d=zoho.com; s=zohoarc; b=RPqPYPE/3nzHc8UAX1DDoB4tflqiifpWeHAkfjKiUs+zgLgPpBbK6L79CHP1WxjFgLTXlq2iT/NGj5lYe5pPBioZccpc01i0BYL3LlV3JY8m5wpxa8cKXg1QbDUNPvXT6vqSPhSjXn4HzmFsvxZ+RFeBDv905Cm0g45+ZR2AxZk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571998960; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=TQ2J0lOK6C/VkGuvG9H0ogetwI5GrWwsL4uotJB2Qnk=; b=RGIjc/SsLH6B9poxnvvPVcdf+JhpuD6aT25HkVK1OafYlXWEUjSMetYOkXssdyBId+lpgEjUffXcIDWv8d8IsEj672HyHEQIy4nu+4Z4E/dKYMX3B0m8FE0UECZ46PjlDOIyfLD72dBYrzxJ6AGrInLUBLHlwW2lImyiGAra4Xo= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1571998960415449.6161537674452; Fri, 25 Oct 2019 03:22:40 -0700 (PDT) Received: from localhost ([::1]:58294 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNwjv-0001K0-9z for importer@patchew.org; Fri, 25 Oct 2019 06:22:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60806) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNwNF-0006Xh-Cc for qemu-devel@nongnu.org; Fri, 25 Oct 2019 05:59:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iNwNC-0004hW-Vn for qemu-devel@nongnu.org; Fri, 25 Oct 2019 05:59:13 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:38810 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iNwNB-0004ef-RM for qemu-devel@nongnu.org; Fri, 25 Oct 2019 05:59:10 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-34-md9qFZ0MPp-s7G59vGboqg-1; Fri, 25 Oct 2019 05:59:04 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4247A1005500; Fri, 25 Oct 2019 09:59:03 +0000 (UTC) Received: from localhost (ovpn-117-205.ams2.redhat.com [10.36.117.205]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E07D410013A1; Fri, 25 Oct 2019 09:58:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571997547; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=TQ2J0lOK6C/VkGuvG9H0ogetwI5GrWwsL4uotJB2Qnk=; b=DMgX7+NNitDHMxl3Siq7ZFcyFGlzQeU3bt5yZOH4xpRiq/XlU5fGAf6em0pD+z94UU56G0 PcDXvwCxIJFoD0S4koE16EWUbCUazghurGUVkcG0A+3Aed71dFGKaBJd4wzYaUGuBXzDs1 wWLzgGMIBu8sAAufzhMVW2xBiIUN5IQ= From: Max Reitz To: qemu-block@nongnu.org Subject: [RFC 1/3] block: Make wait/mark serialising requests public Date: Fri, 25 Oct 2019 11:58:47 +0200 Message-Id: <20191025095849.25283-2-mreitz@redhat.com> In-Reply-To: <20191025095849.25283-1-mreitz@redhat.com> References: <20191025095849.25283-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: md9qFZ0MPp-s7G59vGboqg-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.61 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Anton Nefedov , Alberto Garcia , qemu-devel@nongnu.org, Max Reitz , Vladimir Sementsov-Ogievskiy , Stefan Hajnoczi Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Make both bdrv_mark_request_serialising() and bdrv_wait_serialising_requests() public so they can be used from block drivers. Signed-off-by: Max Reitz --- include/block/block_int.h | 3 +++ block/io.c | 24 ++++++++++++------------ 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/include/block/block_int.h b/include/block/block_int.h index ca4ccac4c1..c85733293d 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -984,6 +984,9 @@ extern unsigned int bdrv_drain_all_count; void bdrv_apply_subtree_drain(BdrvChild *child, BlockDriverState *new_pare= nt); void bdrv_unapply_subtree_drain(BdrvChild *child, BlockDriverState *old_pa= rent); =20 +bool coroutine_fn bdrv_wait_serialising_requests(BdrvTrackedRequest *self); +void bdrv_mark_request_serialising(BdrvTrackedRequest *req, uint64_t align= ); + int get_tmp_filename(char *filename, int size); BlockDriver *bdrv_probe_all(const uint8_t *buf, int buf_size, const char *filename); diff --git a/block/io.c b/block/io.c index f0b86c1d19..a65cc7fb61 100644 --- a/block/io.c +++ b/block/io.c @@ -715,7 +715,7 @@ static void tracked_request_begin(BdrvTrackedRequest *r= eq, qemu_co_mutex_unlock(&bs->reqs_lock); } =20 -static void mark_request_serialising(BdrvTrackedRequest *req, uint64_t ali= gn) +void bdrv_mark_request_serialising(BdrvTrackedRequest *req, uint64_t align) { int64_t overlap_offset =3D req->offset & ~(align - 1); uint64_t overlap_bytes =3D ROUND_UP(req->offset + req->bytes, align) @@ -805,7 +805,7 @@ void bdrv_dec_in_flight(BlockDriverState *bs) bdrv_wakeup(bs); } =20 -static bool coroutine_fn wait_serialising_requests(BdrvTrackedRequest *sel= f) +bool coroutine_fn bdrv_wait_serialising_requests(BdrvTrackedRequest *self) { BlockDriverState *bs =3D self->bs; BdrvTrackedRequest *req; @@ -1437,14 +1437,14 @@ static int coroutine_fn bdrv_aligned_preadv(BdrvChi= ld *child, * with each other for the same cluster. For example, in copy-on-= read * it ensures that the CoR read and write operations are atomic and * guest writes cannot interleave between them. */ - mark_request_serialising(req, bdrv_get_cluster_size(bs)); + bdrv_mark_request_serialising(req, bdrv_get_cluster_size(bs)); } =20 /* BDRV_REQ_SERIALISING is only for write operation */ assert(!(flags & BDRV_REQ_SERIALISING)); =20 if (!(flags & BDRV_REQ_NO_SERIALISING)) { - wait_serialising_requests(req); + bdrv_wait_serialising_requests(req); } =20 if (flags & BDRV_REQ_COPY_ON_READ) { @@ -1841,10 +1841,10 @@ bdrv_co_write_req_prepare(BdrvChild *child, int64_t= offset, uint64_t bytes, assert(!(flags & ~BDRV_REQ_MASK)); =20 if (flags & BDRV_REQ_SERIALISING) { - mark_request_serialising(req, bdrv_get_cluster_size(bs)); + bdrv_mark_request_serialising(req, bdrv_get_cluster_size(bs)); } =20 - waited =3D wait_serialising_requests(req); + waited =3D bdrv_wait_serialising_requests(req); =20 assert(!waited || !req->serialising || is_request_serialising_and_aligned(req)); @@ -2008,8 +2008,8 @@ static int coroutine_fn bdrv_co_do_zero_pwritev(BdrvC= hild *child, =20 padding =3D bdrv_init_padding(bs, offset, bytes, &pad); if (padding) { - mark_request_serialising(req, align); - wait_serialising_requests(req); + bdrv_mark_request_serialising(req, align); + bdrv_wait_serialising_requests(req); =20 bdrv_padding_rmw_read(child, req, &pad, true); =20 @@ -2111,8 +2111,8 @@ int coroutine_fn bdrv_co_pwritev_part(BdrvChild *chil= d, } =20 if (bdrv_pad_request(bs, &qiov, &qiov_offset, &offset, &bytes, &pad)) { - mark_request_serialising(&req, align); - wait_serialising_requests(&req); + bdrv_mark_request_serialising(&req, align); + bdrv_wait_serialising_requests(&req); bdrv_padding_rmw_read(child, &req, &pad, false); } =20 @@ -3205,7 +3205,7 @@ static int coroutine_fn bdrv_co_copy_range_internal( /* BDRV_REQ_SERIALISING is only for write operation */ assert(!(read_flags & BDRV_REQ_SERIALISING)); if (!(read_flags & BDRV_REQ_NO_SERIALISING)) { - wait_serialising_requests(&req); + bdrv_wait_serialising_requests(&req); } =20 ret =3D src->bs->drv->bdrv_co_copy_range_from(src->bs, @@ -3332,7 +3332,7 @@ int coroutine_fn bdrv_co_truncate(BdrvChild *child, i= nt64_t offset, * new area, we need to make sure that no write requests are made to it * concurrently or they might be overwritten by preallocation. */ if (new_bytes) { - mark_request_serialising(&req, 1); + bdrv_mark_request_serialising(&req, 1); } if (bs->read_only) { error_setg(errp, "Image is read-only"); --=20 2.21.0 From nobody Mon Feb 9 05:10:19 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571998900; cv=none; d=zoho.com; s=zohoarc; b=VMSZqPmDtKiCTt8TGLHQoq968Dq0ksYDuCPIMFPML+HXPiPzStEsZGsaRit79QkdqiO/vsNhopjCfr62ElNWPIuQedNkXJFDEVeSzKA3r6gsMUG7uuiIgibkBpdnFo43CuamGuLIm6Gra3NylONs99Q6CwaNo1qkAQ9550WA+dc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571998900; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=UUHZOaRNOqcyKMqpJaNBzFYvFemyltC6wzDCezpuH3U=; b=ke2ubqQuF0a/Cy9eN5l0BG5pjkwnu1uuG6IGk5bVi6Ie5FQ9EXlbjxOAGCqKLpXlv22luLkWOqdOyJS9zERk6+sLYNEc0Dii1k65Smu6tflQnwXOjkPXDQkqZgXkgvb3V9oTALwwE2GUdTNEUKICGlW9y3tKNvJZ+kzAo6slCsA= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1571998900097400.0540121078034; Fri, 25 Oct 2019 03:21:40 -0700 (PDT) Received: from localhost ([::1]:58290 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNwiu-0000iw-9D for importer@patchew.org; Fri, 25 Oct 2019 06:21:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60845) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNwNG-0006Za-EO for qemu-devel@nongnu.org; Fri, 25 Oct 2019 05:59:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iNwNF-0004j7-9a for qemu-devel@nongnu.org; Fri, 25 Oct 2019 05:59:14 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:37515 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iNwNF-0004ip-5i for qemu-devel@nongnu.org; Fri, 25 Oct 2019 05:59:13 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-149-kiF3_ktUONuk8iqS5BoS_Q-1; Fri, 25 Oct 2019 05:59:09 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A459B107AD31; Fri, 25 Oct 2019 09:59:08 +0000 (UTC) Received: from localhost (ovpn-117-205.ams2.redhat.com [10.36.117.205]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 75886600CD; Fri, 25 Oct 2019 09:59:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571997552; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=UUHZOaRNOqcyKMqpJaNBzFYvFemyltC6wzDCezpuH3U=; b=ZjLlRgNyjv4jqeZSQMzvFF8BSnpveY2vi1g053s8b+xb/V6YOaaj2hyq9q4Ac59QRK69tX 4nmWoNUCd2cVJ7yh00ihPXALCDB7K92jbFN5Y38ZRWSuNVFvtCdt6dhk2rcPcW8kGwHh+r nBHguMHDPUzkfhCRfm8gsjiQ5w5Vr74= From: Max Reitz To: qemu-block@nongnu.org Subject: [RFC 2/3] block/file-posix: Detect XFS with CONFIG_FALLOCATE Date: Fri, 25 Oct 2019 11:58:48 +0200 Message-Id: <20191025095849.25283-3-mreitz@redhat.com> In-Reply-To: <20191025095849.25283-1-mreitz@redhat.com> References: <20191025095849.25283-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: kiF3_ktUONuk8iqS5BoS_Q-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Anton Nefedov , Alberto Garcia , qemu-devel@nongnu.org, Max Reitz , Vladimir Sementsov-Ogievskiy , Stefan Hajnoczi Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" We will need this for the next patch. Signed-off-by: Max Reitz --- block/file-posix.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/block/file-posix.c b/block/file-posix.c index 695fcf740d..5cd54c8bff 100644 --- a/block/file-posix.c +++ b/block/file-posix.c @@ -149,7 +149,7 @@ typedef struct BDRVRawState { int perm_change_flags; BDRVReopenState *reopen_state; =20 -#ifdef CONFIG_XFS +#if defined(CONFIG_XFS) || defined(CONFIG_FALLOCATE) bool is_xfs:1; #endif bool has_discard:1; @@ -667,7 +667,7 @@ static int raw_open_common(BlockDriverState *bs, QDict = *options, } #endif =20 -#ifdef CONFIG_XFS +#if defined(CONFIG_XFS) || defined(CONFIG_FALLOCATE) if (platform_test_xfs_fd(s->fd)) { s->is_xfs =3D true; } --=20 2.21.0 From nobody Mon Feb 9 05:10:19 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571999565; cv=none; d=zoho.com; s=zohoarc; b=VuKf1d8PK7Uz0QVucaQw+PGaweE4hjVnjqYYBca/fmMDip3G2gShURoX5znWTKt47Pxt6dEaSoXrQxIpr5jWH198Tx3oN8I9FAcWycA5baO62rIsx/lmITJEmwj3E1zO7C1P6fYk9ZEkyIkEy+vLFm5yQfgXlw8MM0M3udbyiiQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571999565; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=XpsKnDhhSg9Wa3tqe3NS161Z+XJaiocRkSfdBx9/23U=; b=YY3p5g0HTjBIZK7pNBXDDNZwTUENMk0G7B+Rgb3kMkXK/mZfWVDyC5h4x34GYTKZhYVSvjiZvt055p7HUQKjLIg5vZqYFwtzm4xNcNQxx7y+N9Q1fSggRPFTZO14p/p5P1+UiGLk4rPnaMAFvsW+zH8ys1sJiZu2WVMj7mUY+PY= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1571999565293688.6790736443401; Fri, 25 Oct 2019 03:32:45 -0700 (PDT) Received: from localhost ([::1]:58346 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNwte-0003sz-OU for importer@patchew.org; Fri, 25 Oct 2019 06:32:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60889) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNwNN-0006lU-PT for qemu-devel@nongnu.org; Fri, 25 Oct 2019 05:59:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iNwNM-0004nZ-Lu for qemu-devel@nongnu.org; Fri, 25 Oct 2019 05:59:21 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:32049 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iNwNM-0004mr-Ac for qemu-devel@nongnu.org; Fri, 25 Oct 2019 05:59:20 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-258-P_a8lt4PO8-w_kZgh-nW7w-1; Fri, 25 Oct 2019 05:59:15 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id F0AD680183D; Fri, 25 Oct 2019 09:59:13 +0000 (UTC) Received: from localhost (ovpn-117-205.ams2.redhat.com [10.36.117.205]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 099065C1B5; Fri, 25 Oct 2019 09:59:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571997558; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=XpsKnDhhSg9Wa3tqe3NS161Z+XJaiocRkSfdBx9/23U=; b=LpB+bMJ3a9LGKruUL84bm3sNPazEdvuv9TAo5hfCReDPyRjDxiKF+6jrUa2MCnx/zvSX4q QHG4i1ZG8QEIvEUm3tBGX20Lb4vNgGiqCWqeluEOkUFzi2i/vPiRkMcfoEiliXy8Ot/qYq GIZpOnqBMAT/Z6pQ81+Ol4XvwmrLPLI= From: Max Reitz To: qemu-block@nongnu.org Subject: [RFC 3/3] block/file-posix: Let post-EOF fallocate serialize Date: Fri, 25 Oct 2019 11:58:49 +0200 Message-Id: <20191025095849.25283-4-mreitz@redhat.com> In-Reply-To: <20191025095849.25283-1-mreitz@redhat.com> References: <20191025095849.25283-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-MC-Unique: P_a8lt4PO8-w_kZgh-nW7w-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Anton Nefedov , Alberto Garcia , qemu-devel@nongnu.org, Max Reitz , Vladimir Sementsov-Ogievskiy , Stefan Hajnoczi Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" The XFS kernel driver has a bug that may cause data corruption for qcow2 images as of qemu commit c8bb23cbdbe32f. We can work around it by treating post-EOF fallocates as serializing up until infinity (INT64_MAX in practice). Signed-off-by: Max Reitz --- block/file-posix.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/block/file-posix.c b/block/file-posix.c index 5cd54c8bff..1f5a01df70 100644 --- a/block/file-posix.c +++ b/block/file-posix.c @@ -2713,6 +2713,48 @@ raw_do_pwrite_zeroes(BlockDriverState *bs, int64_t o= ffset, int bytes, RawPosixAIOData acb; ThreadPoolFunc *handler; =20 +#ifdef CONFIG_FALLOCATE + if (s->is_xfs && s->use_linux_aio && + offset + bytes > bs->total_sectors * BDRV_SECTOR_SIZE) + { + BdrvTrackedRequest *req; + uint64_t end; + + /* + * The Linux XFS driver has a bug where it will discard writes + * submitted through the AIO interface if they happen beyond a + * concurrently running fallocate() that increases the file + * length (i.e., both the write and the fallocate() happen + * beyond the EOF). + * + * To work around it, we look for the tracked request for this + * zero write, extend it until INT64_MAX (effectively + * infinity), and mark it as serializing. + * + * TODO: Detect whether this has been fixed in the XFS driver. + */ + + QLIST_FOREACH(req, &bs->tracked_requests, list) { + if (req->co =3D=3D qemu_coroutine_self() && + req->type =3D=3D BDRV_TRACKED_WRITE) + { + break; + } + } + + assert(req); + assert(req->offset <=3D offset); + assert(req->offset + req->bytes >=3D offset + bytes); + + end =3D INT64_MAX & -(uint64_t)bs->bl.request_alignment; + req->bytes =3D end - req->offset; + req->overlap_bytes =3D req->bytes; + + bdrv_mark_request_serialising(req, bs->bl.request_alignment); + bdrv_wait_serialising_requests(req); + } +#endif + acb =3D (RawPosixAIOData) { .bs =3D bs, .aio_fildes =3D s->fd, --=20 2.21.0