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 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 6427CC4332F for ; Thu, 3 Nov 2022 18:37:11 +0000 (UTC) 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 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= 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 X-MC-Unique: nY7w9QflOjm9tSlf9Y0Gxw-1 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) 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: 8bit X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 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+qemu-devel=archiver.kernel.org@nongnu.org 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 [Eric 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) bs->bl.request_alignment = 0; s->buf_align = 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) == 0 && + (stx.stx_mask & STATX_DIOALIGN)) { + bs->bl.request_alignment = stx.stx_dio_offset_align; + s->buf_align = 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 might + * 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) >= 0) { + bs->bl.request_alignment = da.d_miniosz; + /* The kernel returns wrong information for d_mem */ + /* s->buf_align = 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 = 0; + if (!bs->bl.request_alignment) { + if (probe_logical_blocksize(fd, &bs->bl.request_alignment) < 0) { + bs->bl.request_alignment = 0; + } } -#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 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) >= 0) { - bs->bl.request_alignment = da.d_miniosz; - /* The kernel returns wrong information for d_mem */ - /* s->buf_align = 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. Then -- 2.38.1