From nobody Wed May 15 10:04:10 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=1667500631; cv=none; d=zohomail.com; s=zohoarc; b=kXjLAYMvsNaAkV0T8iyzrQDbtmpRNSAAxgLlSUqkrLdQpcCXwyIXxN4DDJCWWf337RyhiHf8M+hIhTd9E4iBuT/0pB0ykUtzqLNFATgJRB52ikrtnY+S9y9yiOpciCN52Nr4AxZwivbZk/GR9WfNBCIWpHvGDBeaBkuptn3N7Ls= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1667500631; h=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=Ded1a2U6Xedrxf6kW/l6okfBPQsZfD0YQ01y6VrbaBY=; b=E5tml7SB0xBCNO29iCHcQg1NC+GkODAsO133Qwjl5RZIJk2JD182e0xRCyg1PE6m3bPcFpho520fdt49EuoAMYCqpmr+trJfYzgSXKNLlyOUrvbUCRTlEtjx0E0vONHWO0NsD9TgLbpv6bvmWpBENWUybP9dJlMQX68VqmZeXgE= 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 1667500631282254.73396718902677; Thu, 3 Nov 2022 11:37:11 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oqf4i-0006Sr-Nc; Thu, 03 Nov 2022 14:36:24 -0400 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 1oqf4d-0006Ra-Jx for qemu-devel@nongnu.org; Thu, 03 Nov 2022 14:36:21 -0400 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 1oqf4b-0005gr-40 for qemu-devel@nongnu.org; Thu, 03 Nov 2022 14:36:19 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-223-iv_X79BQOb2o4EMtzDP6Ww-1; Thu, 03 Nov 2022 14:36:15 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id ACFBC800186; Thu, 3 Nov 2022 18:36:14 +0000 (UTC) Received: from localhost (unknown [10.39.194.112]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2DB74C15BA4; Thu, 3 Nov 2022 18:36:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1667500576; 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=Ded1a2U6Xedrxf6kW/l6okfBPQsZfD0YQ01y6VrbaBY=; b=OtLAirlIx2o/mVawdL6qKzNRuNkgkTqMTgVfZRvHaxR+K4dfdhNEbHYte8yJKzCLTm3LL2 /rd9qMH/MwkJWuI792nWD/2Z7IrWgyC6jw7K6ufFf8UAv9Fscg5Iz5/j9BqTPPPBWwu9jq 9G0RNU1L5YVuvEE2HTu5rb8/gU2i228= X-MC-Unique: iv_X79BQOb2o4EMtzDP6Ww-1 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Cc: Hanna Reitz , nsoffer@redhat.com, , Kevin Wolf , Stefan Hajnoczi Subject: [PATCH v2 1/2] file-posix: fix Linux alignment probing when EIO is returned Date: Thu, 3 Nov 2022 14:36:08 -0400 Message-Id: <20221103183609.363027-2-stefanha@redhat.com> In-Reply-To: <20221103183609.363027-1-stefanha@redhat.com> References: <20221103183609.363027-1-stefanha@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 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=stefanha@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.047, 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_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1667500632513100002 Content-Type: text/plain; charset="utf-8" Linux v6.0 dm-crypt returns errno EIO from unaligned O_DIRECT pread(2) calls. Alignment probing fails on dm-crypt devices because the code expects EINVAL. This is a kernel regression that is expected to be fixed upstream: https://lore.kernel.org/linux-block/20221103193837.3b5b4bac@xps.demsh.org/T= /#t Treating any errno as an "unaligned" indicator would be easy, but breaks commit 22d182e82b4b ("block/raw-posix: fix launching with failed disks"). Offline disks return EIO for correctly aligned requests and EINVAL for unaligned requests. It's possible to make both v6.0 dm-crypt and offline disks work: look for the transition from EINVAL to EIO instead of for a single EINVAL value. Buglink: https://gitlab.com/qemu-project/qemu/-/issues/1290 Fixes: 22d182e82b4b ("block/raw-posix: fix launching with failed disks") Signed-off-by: Stefan Hajnoczi --- block/file-posix.c | 42 +++++++++++++++--------------------------- 1 file changed, 15 insertions(+), 27 deletions(-) diff --git a/block/file-posix.c b/block/file-posix.c index b9647c5ffc..b9d62f52fe 100644 --- a/block/file-posix.c +++ b/block/file-posix.c @@ -355,31 +355,6 @@ static bool raw_needs_alignment(BlockDriverState *bs) return s->force_alignment; } =20 -/* Check if read is allowed with given memory buffer and length. - * - * This function is used to check O_DIRECT memory buffer and request align= ment. - */ -static bool raw_is_io_aligned(int fd, void *buf, size_t len) -{ - ssize_t ret =3D pread(fd, buf, len, 0); - - if (ret >=3D 0) { - return true; - } - -#ifdef __linux__ - /* The Linux kernel returns EINVAL for misaligned O_DIRECT reads. Ign= ore - * other errors (e.g. real I/O error), which could happen on a failed - * drive, since we only care about probing alignment. - */ - if (errno !=3D EINVAL) { - return true; - } -#endif - - return false; -} - static void raw_probe_alignment(BlockDriverState *bs, int fd, Error **errp) { BDRVRawState *s =3D bs->opaque; @@ -426,34 +401,47 @@ static void raw_probe_alignment(BlockDriverState *bs,= int fd, Error **errp) * try to detect buf_align, which cannot be detected in some cases (e.= g. * Gluster). If buf_align cannot be detected, we fallback to the value= of * request_alignment. + * + * The probing loop keeps track of the last errno so that the alignmen= t of + * offline disks can be probed. On Linux pread(2) returns with errno E= INVAL + * for most file descriptors when O_DIRECT alignment constraints are u= nmet. + * Offline disks fail correctly aligned pread(2) with EIO. Therefore i= t's + * possible to detect alignment on offline disks by observing when the + * errno changes from EINVAL to something else. */ =20 if (!bs->bl.request_alignment) { + int last_errno =3D 0; int i; size_t align; buf =3D qemu_memalign(max_align, max_align); for (i =3D 0; i < ARRAY_SIZE(alignments); i++) { align =3D alignments[i]; - if (raw_is_io_aligned(fd, buf, align)) { + if (pread(fd, buf, align, 0) >=3D 0 || + (errno !=3D EINVAL && last_errno =3D=3D EINVAL)) { /* Fallback to safe value. */ bs->bl.request_alignment =3D (align !=3D 1) ? align : max_= align; break; } + last_errno =3D errno; } qemu_vfree(buf); } =20 if (!s->buf_align) { + int last_errno =3D 0; int i; size_t align; buf =3D qemu_memalign(max_align, 2 * max_align); for (i =3D 0; i < ARRAY_SIZE(alignments); i++) { align =3D alignments[i]; - if (raw_is_io_aligned(fd, buf + align, max_align)) { + if (pread(fd, buf + align, max_align, 0) >=3D 0 || + (errno !=3D EINVAL && last_errno =3D=3D EINVAL)) { /* Fallback to request_alignment. */ s->buf_align =3D (align !=3D 1) ? align : bs->bl.request_a= lignment; break; } + last_errno =3D errno; } qemu_vfree(buf); } --=20 2.38.1 From nobody Wed May 15 10:04:10 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=1667500631; cv=none; d=zohomail.com; s=zohoarc; b=MF5LQ0Sa5u1dWlcNNNYAVS1923AMHvihomn3cjYkuVPGLmpbmCWS5/V4x6ePRKL1IVkyIDkJMDvG3wl+QjkOTvlZ1p6/EqQ/WoSvooiN8bz7yB2kvP/3CAgzWN8c8GTHxqdo14NSrOGPpBI/ftgsGHpUJVaVaQvUXWtdePEDtTw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1667500631; h=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=c2MfVwRghPeOHL1TyG+S6gWTsw9Xt990NW+vZPNS5KU=; b=c9O1lhyZOVJEnNRd/dolm6gQxutj+Anm00fX5d+qvan+fMRr4YRf2XxGoZBUg9RJ4VWmBWlXqlag9BjDARiGIgqjA4VnTyNYEI22oITusi8QcwaSGhAyOrrQJcJ3p8eL/RzfA6bo1uZ6B2FlKn39v4DBouUtJH5cczx0EEvKCmA= 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 1667500631336950.7884124929504; Thu, 3 Nov 2022 11:37:11 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oqf4j-0006TW-I2; Thu, 03 Nov 2022 14:36:25 -0400 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 1oqf4e-0006Rd-TF for qemu-devel@nongnu.org; Thu, 03 Nov 2022 14:36:21 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oqf4d-0005hG-9N for qemu-devel@nongnu.org; Thu, 03 Nov 2022 14:36:20 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-256-nY7w9QflOjm9tSlf9Y0Gxw-1; Thu, 03 Nov 2022 14:36:17 -0400 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E9C77803D50; Thu, 3 Nov 2022 18:36:16 +0000 (UTC) Received: from localhost (unknown [10.39.194.112]) by smtp.corp.redhat.com (Postfix) with ESMTP id 735B64A9254; Thu, 3 Nov 2022 18:36:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1667500578; 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=c2MfVwRghPeOHL1TyG+S6gWTsw9Xt990NW+vZPNS5KU=; b=Fl9sehP7qcqLibJ1RxfvYaqIZdSgkDHqo5lFb/Hbk0lXVEUpH2wtDaL3fcowlenbcgYhwI ZtGGLLDYh2J4wE7btlLvSBM+qEHC16vjcu4WcUglp0sU86Vezlx6xSLpQy6ZiztDZXYIkp g/NlXXtluTiWKWZcaukYAKpeX5C1Op4= X-MC-Unique: nY7w9QflOjm9tSlf9Y0Gxw-1 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Cc: Hanna Reitz , nsoffer@redhat.com, , Kevin Wolf , Stefan Hajnoczi , Eric Biggers Subject: [PATCH v2 2/2] file-posix: add statx(STATX_DIOALIGN) support Date: Thu, 3 Nov 2022 14:36:09 -0400 Message-Id: <20221103183609.363027-3-stefanha@redhat.com> In-Reply-To: <20221103183609.363027-1-stefanha@redhat.com> References: <20221103183609.363027-1-stefanha@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 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.133.124; envelope-from=stefanha@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.047, 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_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1667500632512100001 Content-Type: text/plain; charset="utf-8" Linux v6.1 commit 825cf206ed51 ("statx: add direct I/O alignment information") added an interface to fetch O_DIRECT alignment values for block devices and file systems. Prefer STATX_DIOALIGN to older interfaces and probing, but keep them as fallbacks in case STATX_DIOALIGN cannot provide the information. Testing shows the status of STATX_DIOALIGN support in Linux 6.1-rc3 appears to be: - btrfs: no - ext4: yes - XFS: yes - NVMe block devices: yes - dm-crypt: yes Cc: Eric Biggers Signed-off-by: Stefan Hajnoczi --- v2: - Make sure that XFS_IOC_DIOINFO takes priority over logical blocksize [Eri= c Biggers] --- block/file-posix.c | 60 ++++++++++++++++++++++++++++++---------------- 1 file changed, 40 insertions(+), 20 deletions(-) diff --git a/block/file-posix.c b/block/file-posix.c index b9d62f52fe..b7e5a08e41 100644 --- a/block/file-posix.c +++ b/block/file-posix.c @@ -372,29 +372,49 @@ static void raw_probe_alignment(BlockDriverState *bs,= int fd, Error **errp) =20 bs->bl.request_alignment =3D 0; s->buf_align =3D 0; + +#if defined(__linux__) && defined(STATX_DIOALIGN) + struct statx stx; + + /* + * Linux 6.1 introduced an interface for both block devices and file + * systems. The system call returns with the STATX_DIOALIGN bit cleared + * when the information is unavailable. + */ + if (statx(fd, "", AT_EMPTY_PATH, STATX_DIOALIGN, &stx) =3D=3D 0 && + (stx.stx_mask & STATX_DIOALIGN)) { + bs->bl.request_alignment =3D stx.stx_dio_offset_align; + s->buf_align =3D stx.stx_dio_mem_align; + } +#endif /* defined(__linux__) && defined(STATX_DIOALIGN) */ + +#ifdef __linux__ + if (!bs->bl.request_alignment) { + /* + * The XFS ioctl definitions are shipped in extra packages that mi= ght + * not always be available. Since we just need the XFS_IOC_DIOINFO= ioctl + * here, we simply use our own definition instead: + */ + struct xfs_dioattr { + uint32_t d_mem; + uint32_t d_miniosz; + uint32_t d_maxiosz; + } da; + if (ioctl(fd, _IOR('X', 30, struct xfs_dioattr), &da) >=3D 0) { + bs->bl.request_alignment =3D da.d_miniosz; + /* The kernel returns wrong information for d_mem */ + /* s->buf_align =3D da.d_mem; */ + } + } +#endif /* __linux__ */ + /* Let's try to use the logical blocksize for the alignment. */ - if (probe_logical_blocksize(fd, &bs->bl.request_alignment) < 0) { - bs->bl.request_alignment =3D 0; + if (!bs->bl.request_alignment) { + if (probe_logical_blocksize(fd, &bs->bl.request_alignment) < 0) { + bs->bl.request_alignment =3D 0; + } } =20 -#ifdef __linux__ - /* - * The XFS ioctl definitions are shipped in extra packages that might - * not always be available. Since we just need the XFS_IOC_DIOINFO ioc= tl - * here, we simply use our own definition instead: - */ - struct xfs_dioattr { - uint32_t d_mem; - uint32_t d_miniosz; - uint32_t d_maxiosz; - } da; - if (ioctl(fd, _IOR('X', 30, struct xfs_dioattr), &da) >=3D 0) { - bs->bl.request_alignment =3D da.d_miniosz; - /* The kernel returns wrong information for d_mem */ - /* s->buf_align =3D da.d_mem; */ - } -#endif - /* * If we could not get the sizes so far, we can only guess them. First= try * to detect request alignment, since it is more likely to succeed. Th= en --=20 2.38.1