From patchwork Mon May 24 16:36:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 12276593 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 82E9BC04FF3 for ; Mon, 24 May 2021 16:40:40 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 328E5610FC for ; Mon, 24 May 2021 16:40:40 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 328E5610FC Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:53802 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1llDd9-0002t0-4M for qemu-devel@archiver.kernel.org; Mon, 24 May 2021 12:40:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43974) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1llDZT-00076k-Fy; Mon, 24 May 2021 12:36:51 -0400 Received: from mail-ed1-x52a.google.com ([2a00:1450:4864:20::52a]:44904) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1llDZR-0002kw-Po; Mon, 24 May 2021 12:36:51 -0400 Received: by mail-ed1-x52a.google.com with SMTP id t15so32726869edr.11; Mon, 24 May 2021 09:36:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=mfZamIf15Ke/BeRA5FMstz0DDkSoart1dVqPlrNSeDc=; b=XK/AQIEqMEpVsNugmbEfMYGf123pNsC5/ASU4D0lXQZ5OcINiZe+pR6BVRjasUVjzi XUMz1rvgtujTB8zdDBAptq45wV09b5ALbvG8HbtWaJEawZa24NQLHA0n85Lq0eL2MNEY 3pxH2fK1lSZ1EFKtnqnj0uhNAN14FdRPMOtOdyh1Nz2xZMtaCpZunozQJlUR69ql3L8s nwHzi1jLpSwKq3+fRq+R9ymYsQpWCB7ZEAMefhO7l5ozUPMu0G/rKlUgbBvUdIFnXb6D YmbYSj5TT5iNCaascZDMHLy/DhCemePVyrkWMTPwCtZODm9wp7JgxksAu1DvGAxkF6RF XvTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=mfZamIf15Ke/BeRA5FMstz0DDkSoart1dVqPlrNSeDc=; b=To3TIJABsqrCQaxXJQutqvvRrpiRc8eQDe21c8g1CvQWHhuYQLUbXcdI7mEF63yg5E NTF7PBts7QqutfHkW0OlDZPg8UgJJwoNe3h8cBOobJCDJ50/htqhRqNpkeAhdJ+ToRW+ /RjPiwj2r3ZcchVznBylCDJ9BMgsVi1ltPHr+mRn+C1GHceUMvAr5CDTzuSSqauqIlQl OdCnR91BL3AdHnNGnh9I+IRHgvg+bLo+oLw/QuV+XQvs4e8b2U+DXNEZQ8NNeRXsDm2k S+3HSqvhZU/xy+dWgXCwYPcg+/YTWM2Jv7eyOtQODOiC3CKZ+SE4rKaZaMQKgk7bwS5g m1Gw== X-Gm-Message-State: AOAM530rGYQOLFghSuTEKxxGCpT+n5qhGKeN/FjRJ6cmwWXUOmwga/C4 wSuaFZ1ITO3S8kaetksDabwYiRr6qO/clw== X-Google-Smtp-Source: ABdhPJwVYWMDnSG8hQnwP71u3irBpnNn453Vmytt3B4CIr/Kqm2WzvMjM4OYpUP2em6GAJftPtfFgg== X-Received: by 2002:a50:fd11:: with SMTP id i17mr26486789eds.23.1621874207472; Mon, 24 May 2021 09:36:47 -0700 (PDT) Received: from avogadro.redhat.com ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id n8sm7967684ejl.0.2021.05.24.09.36.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 May 2021 09:36:47 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH v2 1/6] scsi-generic: pass max_segments via max_iov field in BlockLimits Date: Mon, 24 May 2021 18:36:40 +0200 Message-Id: <20210524163645.382940-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210524163645.382940-1-pbonzini@redhat.com> References: <20210524163645.382940-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::52a; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x52a.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action 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: qemu-block@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" I/O to a disk via read/write is not limited by the number of segments allowed by the host adapter; the kernel can split requests if needed, and the limit imposed by the host adapter can be very low (256k or so) to avoid that SG_IO returns EINVAL if memory is heavily fragmented. Since this value is only interesting for SG_IO-based I/O, do not include it in the max_transfer and only take it into account when patching the block limits VPD page in the scsi-generic device. Signed-off-by: Paolo Bonzini --- block/file-posix.c | 3 +-- hw/scsi/scsi-generic.c | 6 ++++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/block/file-posix.c b/block/file-posix.c index 10b71d9a13..59c889d5a7 100644 --- a/block/file-posix.c +++ b/block/file-posix.c @@ -1228,8 +1228,7 @@ static void raw_refresh_limits(BlockDriverState *bs, Error **errp) ret = sg_get_max_segments(s->fd); if (ret > 0) { - bs->bl.max_transfer = MIN(bs->bl.max_transfer, - ret * qemu_real_host_page_size); + bs->bl.max_iov = ret; } } diff --git a/hw/scsi/scsi-generic.c b/hw/scsi/scsi-generic.c index 98c30c5d5c..82e1e2ee79 100644 --- a/hw/scsi/scsi-generic.c +++ b/hw/scsi/scsi-generic.c @@ -179,10 +179,12 @@ static void scsi_handle_inquiry_reply(SCSIGenericReq *r, SCSIDevice *s) (r->req.cmd.buf[1] & 0x01)) { page = r->req.cmd.buf[2]; if (page == 0xb0) { - uint32_t max_transfer = - blk_get_max_transfer(s->conf.blk) / s->blocksize; + uint32_t max_transfer = blk_get_max_transfer(s->conf.blk); + uint32_t max_iov = blk_get_max_iov(s->conf.blk); assert(max_transfer); + max_transfer = MIN_NON_ZERO(max_transfer, max_iov * qemu_real_host_page_size) + / s->blocksize; stl_be_p(&r->buf[8], max_transfer); /* Also take care of the opt xfer len. */ stl_be_p(&r->buf[12], From patchwork Mon May 24 16:36:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 12276605 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 40241C04FF3 for ; Mon, 24 May 2021 16:49:40 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id EEEDB613F9 for ; Mon, 24 May 2021 16:49:39 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EEEDB613F9 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:40494 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1llDlq-000575-QW for qemu-devel@archiver.kernel.org; Mon, 24 May 2021 12:49:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44002) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1llDZU-00079P-Gu; Mon, 24 May 2021 12:36:52 -0400 Received: from mail-ed1-x52a.google.com ([2a00:1450:4864:20::52a]:34434) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1llDZR-0002l5-Qt; Mon, 24 May 2021 12:36:52 -0400 Received: by mail-ed1-x52a.google.com with SMTP id w12so24952935edx.1; Mon, 24 May 2021 09:36:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=bXssOFtwQI3r6hP5tP3UWXJ1+o0S9QmsQBbP86KdnTE=; b=JM/r/QhGlSJGNaVdHuJ1OceasQBm8yD0QDfPGexGJ86fEKYV3/zyVVhUCtBpkY6dBw Ala0C7NnSnNfW68vBUzhyuKa/zFquIYd3ANIhcvz1X+PvDnEMktEVouJiLHqjTgSN+TB 2in/VyVxslutphvG4hfd3FQT86vquk6bexEPfVHZJIaQAvt4uKCfmK36hWdiOQKZZVRd xpFz56nRKiRSgYiQ06eAg4kguyeemUuvgfvVlOa30hYp24pTiSpMAW2Mt5DH/JYsdd86 F+WRHm6DE8lmE9nAsqDNTfKkO//ZraAuTnY6kryyW91gNp430hRdMtFKVK8pPy2dxBTu fjTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=bXssOFtwQI3r6hP5tP3UWXJ1+o0S9QmsQBbP86KdnTE=; b=B3afOuO6f3Al7W2R7k5AGLiUPGAWigOhqQcOHHDPG5cyQ6nNEgiQ1KUnMkBXee0AMU /2Hy3G9JMiofqZxDDX6p4BzIXgDwj6ysnq0JrT7OLPtkDd11dTd8QQgiq9MihKbn8eKR Ry189CYYJecKNr+TRDfEBu+0SFQDnH4bHtxN9v7ZwduSOzVkbNrI0F3g6oqA06vuUy6y z76NOIQ0VII0FvWiJd8Wm/Sb5HRx+Ez6syNXgZJlUWaaeogVCfe73LMb6KaVOsRW+6kq RxAjtqJO5EtgjG2437ntjGbP3y4hybGi/gSqLXk1dyjyf2LDIQ6944+d+4fsqOGrB9li 374w== X-Gm-Message-State: AOAM530VdFUJ3W6/btwKE3gBZ/kJDWHJYjp3qU9X85ImSkV3MZLr1Hmr CRxubg3wQKIc7SBmehig02u43wJ+kIYNwg== X-Google-Smtp-Source: ABdhPJy1mS3AY5eMRZLIfopr7BVuyL/UM2uPboPgU/bImWH+5wJY/Yv4eN0Ci72NCCCGqyQX43wyEw== X-Received: by 2002:aa7:ccc6:: with SMTP id y6mr26934016edt.303.1621874208217; Mon, 24 May 2021 09:36:48 -0700 (PDT) Received: from avogadro.redhat.com ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id n8sm7967684ejl.0.2021.05.24.09.36.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 May 2021 09:36:47 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH v2 2/6] file-posix: try BLKSECTGET on block devices too, do not round to power of 2 Date: Mon, 24 May 2021 18:36:41 +0200 Message-Id: <20210524163645.382940-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210524163645.382940-1-pbonzini@redhat.com> References: <20210524163645.382940-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::52a; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x52a.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action 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: qemu-block@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" bs->sg is only true for character devices, but block devices can also be used with scsi-block and scsi-generic. Unfortunately BLKSECTGET returns bytes in an int for /dev/sgN devices, and sectors in a short for block devices, so account for that in the code. The maximum transfer also need not be a power of 2 (for example I have seen disks with 1280 KiB maximum transfer) so there's no need to pass the result through pow2floor. Signed-off-by: Paolo Bonzini --- block/file-posix.c | 40 ++++++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/block/file-posix.c b/block/file-posix.c index 59c889d5a7..e5ef006aee 100644 --- a/block/file-posix.c +++ b/block/file-posix.c @@ -1149,22 +1149,27 @@ static void raw_reopen_abort(BDRVReopenState *state) s->reopen_state = NULL; } -static int sg_get_max_transfer_length(int fd) +static int sg_get_max_transfer_length(int fd, struct stat *st) { #ifdef BLKSECTGET - int max_bytes = 0; - - if (ioctl(fd, BLKSECTGET, &max_bytes) == 0) { - return max_bytes; + if (S_ISBLK(st->st_mode)) { + unsigned short max_sectors = 0; + if (ioctl(fd, BLKSECTGET, &max_sectors) == 0) { + return max_sectors * 512; + } } else { - return -errno; + int max_bytes = 0; + if (ioctl(fd, BLKSECTGET, &max_bytes) == 0) { + return max_bytes; + } } + return -errno; #else return -ENOSYS; #endif } -static int sg_get_max_segments(int fd) +static int sg_get_max_segments(int fd, struct stat *st) { #ifdef CONFIG_LINUX char buf[32]; @@ -1173,15 +1178,9 @@ static int sg_get_max_segments(int fd) int ret; int sysfd = -1; long max_segments; - struct stat st; - - if (fstat(fd, &st)) { - ret = -errno; - goto out; - } sysfspath = g_strdup_printf("/sys/dev/block/%u:%u/queue/max_segments", - major(st.st_rdev), minor(st.st_rdev)); + major(st->st_rdev), minor(st->st_rdev)); sysfd = open(sysfspath, O_RDONLY); if (sysfd == -1) { ret = -errno; @@ -1218,15 +1217,20 @@ out: static void raw_refresh_limits(BlockDriverState *bs, Error **errp) { BDRVRawState *s = bs->opaque; + struct stat st; + + if (fstat(s->fd, &st)) { + return; + } - if (bs->sg) { - int ret = sg_get_max_transfer_length(s->fd); + if (bs->sg || S_ISBLK(st.st_mode)) { + int ret = sg_get_max_transfer_length(s->fd, &st); if (ret > 0 && ret <= BDRV_REQUEST_MAX_BYTES) { - bs->bl.max_transfer = pow2floor(ret); + bs->bl.max_transfer = ret; } - ret = sg_get_max_segments(s->fd); + ret = sg_get_max_segments(s->fd, &st); if (ret > 0) { bs->bl.max_iov = ret; } From patchwork Mon May 24 16:36:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 12276599 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3544DC04FF3 for ; Mon, 24 May 2021 16:44:50 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id DD847610FC for ; Mon, 24 May 2021 16:44:49 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DD847610FC Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:59802 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1llDh3-0007RJ-95 for qemu-devel@archiver.kernel.org; Mon, 24 May 2021 12:44:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44006) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1llDZU-00079m-L4; Mon, 24 May 2021 12:36:52 -0400 Received: from mail-ej1-x62d.google.com ([2a00:1450:4864:20::62d]:38807) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1llDZS-0002lo-Jw; Mon, 24 May 2021 12:36:52 -0400 Received: by mail-ej1-x62d.google.com with SMTP id i7so24932697ejc.5; Mon, 24 May 2021 09:36:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=K5qPvgjroW4HFZ0QOxtJbrxU7fNNc6UbjjlweCupMYc=; b=HNzmLz8bIGRGr2Edn3bbBj5hVWJTK0ApnCLryKAwDdz3QU7xw/V3x0acbR3ldrYrV3 6ZHvcSJmYuTsHUQ1Z1qGrDAwOdx9LNLtFyqoc+Qj7tpIGTd6LVDtwT0OtCIlfKKc+jPo tpUqmEAxnKEnrdvYiFApNmDavaeqJhhetavaCaGygOe+H5D/P//k3tGZgIPKErr9oqhX lgX8vuoHvbbRJLEJfKdfNyXX/u0dGgwCAp8yGDYrIW5PiIchQOjI4HTqjBZ6lGdNisZL dloBKfPqCrVX6gM7TLOzb0f0wK3YnixBcd+ds0MgefcXWaqcZxvEFRDOncZm7W8RVQ5y PT2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=K5qPvgjroW4HFZ0QOxtJbrxU7fNNc6UbjjlweCupMYc=; b=bOQlHG+GhHnbQoSBX3NKrPGsqM8AaFv7FNNarzNHgX4O8oNY1hoNE3DiHw6nxTtnK8 FrZSjPHJ7nS0qpVQp9zRB5iTRSK6z4JxC5uoU3QbC93LTbCHJXwiw3ddakFUUfKjtLPX FzSzpoCL27rkM9hjaaZnUD9eUTsmrQ5AyjjXWsrSnUanLyVO50r8m2secmkrm4B+9tmx L8rh9ytcYy1TONUq3Uvve9ZouDa2PwbbnoptEm0sLdIHL/6xZ/MKA4NUKQiGairGVnRT kWFOyEM+E6EW83NdwiY7+FDiy7caW5RCpadoWXHKicudMqkbxEp7fyB0OZvAuuJfIT7Z 8RFg== X-Gm-Message-State: AOAM532H91LjooVwxBtVh8MvXkj0lHI4jC4meHcivg681f/3dgFZFHq+ yCP19bQfWtklUgEbknaOiwdd4N9Cdnyb1A== X-Google-Smtp-Source: ABdhPJwN1KhPgMhgA3TfVilwxOX5Xj9HrT0eWPja2SZzBJYpg0WxF+aNTeFMtDv6EbVcQ7hjXhrpBw== X-Received: by 2002:a17:906:76c6:: with SMTP id q6mr11778984ejn.387.1621874208860; Mon, 24 May 2021 09:36:48 -0700 (PDT) Received: from avogadro.redhat.com ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id n8sm7967684ejl.0.2021.05.24.09.36.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 May 2021 09:36:48 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH v2 3/6] file-posix: fix max_iov for /dev/sg devices Date: Mon, 24 May 2021 18:36:42 +0200 Message-Id: <20210524163645.382940-4-pbonzini@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210524163645.382940-1-pbonzini@redhat.com> References: <20210524163645.382940-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::62d; envelope-from=paolo.bonzini@gmail.com; helo=mail-ej1-x62d.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action 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: qemu-block@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Even though it was only called for devices that have bs->sg set (which must be character devices), sg_get_max_segments looked at /sys/dev/block which only works for block devices. On Linux the sg driver has its own way to provide the maximum number of iovecs in a scatter/gather list. Signed-off-by: Paolo Bonzini --- block/file-posix.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/block/file-posix.c b/block/file-posix.c index e5ef006aee..77a45083a6 100644 --- a/block/file-posix.c +++ b/block/file-posix.c @@ -1179,6 +1179,17 @@ static int sg_get_max_segments(int fd, struct stat *st) int sysfd = -1; long max_segments; + if (S_ISCHR(st->st_mode)) { + if (ioctl(fd, SG_GET_SG_TABLESIZE, &ret) == 0) { + return ret; + } + return -EIO; + } + + if (!S_ISBLK(st->st_mode)) { + return -ENOTSUP; + } + sysfspath = g_strdup_printf("/sys/dev/block/%u:%u/queue/max_segments", major(st->st_rdev), minor(st->st_rdev)); sysfd = open(sysfspath, O_RDONLY); From patchwork Mon May 24 16:36:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 12276609 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B795AC04FF3 for ; Mon, 24 May 2021 16:49:59 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 45F39613F9 for ; Mon, 24 May 2021 16:49:59 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 45F39613F9 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:41574 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1llDmA-0005p2-9j for qemu-devel@archiver.kernel.org; Mon, 24 May 2021 12:49:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44020) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1llDZV-0007CB-AH; Mon, 24 May 2021 12:36:53 -0400 Received: from mail-ed1-x52d.google.com ([2a00:1450:4864:20::52d]:38811) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1llDZT-0002n1-FP; Mon, 24 May 2021 12:36:53 -0400 Received: by mail-ed1-x52d.google.com with SMTP id o5so23733307edc.5; Mon, 24 May 2021 09:36:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9cWPUOgWVB4wkBJ6NxHpTA2vxP1CKgnUeZ/ZVl3Z0Ss=; b=Ui7YTZc5Jq3xDL6Q5JUyH7qGT4fI8JkIn6vmThiL6u9qA9HpVw82FWAE/hcAhbkdzZ iHioO+029+diWmsx8ZocQuL7g3O70zz77VXykt1/+UFGhMwMFqCl7RDU1d5drnt5twH5 F47IbL3fO0pkKKSTOV+yuuFAfBHI0d89odSdKG4oZ2TG1YIHR6fFn3quvHJ15HuMJFA7 OFJElgdpcf4sZldiHCLTkhJzdSxtZUuod/3nEvOCrpL52eqZ0tF3SwuReAPLnB06lR4r JFavEy4l5f4LiXkdERtuR0fM50wG/1LqWDE7AvJf6AUsIHDJ18WzudgItlX1qxg5mMFi hlug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=9cWPUOgWVB4wkBJ6NxHpTA2vxP1CKgnUeZ/ZVl3Z0Ss=; b=Z/ddIOP+gQtq2oeE/Fmyl2fQ4550MEI8fBZKbYxabEMFu16cAh+BC/bB508FBw6j7h 6nCSmRknb5lsBofXPbAjVumOwF08/cj6E+a4WVcYb6mZ61L+VouLIY6Yalp9xQIexJvN CtjfGqnnBBU5THaDt6wIJhzPYbl2DI2s0zF04BWJzNnG6G8Qx/mgo5LP9REBQCGPSJq9 cTKIBUSPrMrbhT0donzdtBuldV/ke9SBMese7Puc/pVRvz/j3swBlvTKlC8sWdrO3WY4 XAJbtzwk387nbixHfEDxmVlOiPQDFwhtNCZvjY4nZ/FJ8G2BjaB8GP/TlWh15a6zWiMx Gsww== X-Gm-Message-State: AOAM533r/MGrViLggu+kBbpe6sstPU2NEt4bVSaHv//OXykt63XV2xwr H9OpDT/16X/GLEd9HnzCYfQbx66/cMKtyA== X-Google-Smtp-Source: ABdhPJxh1176TZ6OWg8B/tmAACA6a/unp+1dxQKGUOb7sGwmRBWFdLKW4UAKOJMuKMg2WMxwHsk6kw== X-Received: by 2002:a05:6402:684:: with SMTP id f4mr27603744edy.25.1621874209642; Mon, 24 May 2021 09:36:49 -0700 (PDT) Received: from avogadro.redhat.com ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id n8sm7967684ejl.0.2021.05.24.09.36.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 May 2021 09:36:49 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH v2 4/6] block: feature detection for host block support Date: Mon, 24 May 2021 18:36:43 +0200 Message-Id: <20210524163645.382940-5-pbonzini@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210524163645.382940-1-pbonzini@redhat.com> References: <20210524163645.382940-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::52d; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x52d.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action 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: Joelle van Dyne , qemu-block@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Joelle van Dyne On Darwin (iOS), there are no system level APIs for directly accessing host block devices. We detect this at configure time. Signed-off-by: Joelle van Dyne Message-Id: <20210315180341.31638-2-j@getutm.app> Signed-off-by: Paolo Bonzini --- block/file-posix.c | 33 ++++++++++++++++++++++----------- meson.build | 6 +++++- qapi/block-core.json | 10 +++++++--- 3 files changed, 34 insertions(+), 15 deletions(-) diff --git a/block/file-posix.c b/block/file-posix.c index 77a45083a6..e83f34a960 100644 --- a/block/file-posix.c +++ b/block/file-posix.c @@ -42,6 +42,8 @@ #include "scsi/constants.h" #if defined(__APPLE__) && (__MACH__) +#include +#if defined(HAVE_HOST_BLOCK_DEVICE) #include #include #include @@ -52,6 +54,7 @@ //#include #include #include +#endif /* defined(HAVE_HOST_BLOCK_DEVICE) */ #endif #ifdef __sun__ @@ -180,7 +183,17 @@ typedef struct BDRVRawReopenState { bool check_cache_dropped; } BDRVRawReopenState; -static int fd_open(BlockDriverState *bs); +static int fd_open(BlockDriverState *bs) +{ + BDRVRawState *s = bs->opaque; + + /* this is just to ensure s->fd is sane (its called by io ops) */ + if (s->fd >= 0) { + return 0; + } + return -EIO; +} + static int64_t raw_getlength(BlockDriverState *bs); typedef struct RawPosixAIOData { @@ -3017,6 +3030,7 @@ static BlockStatsSpecific *raw_get_specific_stats(BlockDriverState *bs) return stats; } +#if defined(HAVE_HOST_BLOCK_DEVICE) static BlockStatsSpecific *hdev_get_specific_stats(BlockDriverState *bs) { BlockStatsSpecific *stats = g_new(BlockStatsSpecific, 1); @@ -3026,6 +3040,7 @@ static BlockStatsSpecific *hdev_get_specific_stats(BlockDriverState *bs) return stats; } +#endif /* HAVE_HOST_BLOCK_DEVICE */ static QemuOptsList raw_create_opts = { .name = "raw-create-opts", @@ -3241,6 +3256,8 @@ BlockDriver bdrv_file = { /***********************************************/ /* host device */ +#if defined(HAVE_HOST_BLOCK_DEVICE) + #if defined(__APPLE__) && defined(__MACH__) static kern_return_t GetBSDPath(io_iterator_t mediaIterator, char *bsdPath, CFIndex maxPathSize, int flags); @@ -3533,16 +3550,6 @@ hdev_co_ioctl(BlockDriverState *bs, unsigned long int req, void *buf) } #endif /* linux */ -static int fd_open(BlockDriverState *bs) -{ - BDRVRawState *s = bs->opaque; - - /* this is just to ensure s->fd is sane (its called by io ops) */ - if (s->fd >= 0) - return 0; - return -EIO; -} - static coroutine_fn int hdev_co_pdiscard(BlockDriverState *bs, int64_t offset, int bytes) { @@ -3866,6 +3873,8 @@ static BlockDriver bdrv_host_cdrom = { }; #endif /* __FreeBSD__ */ +#endif /* HAVE_HOST_BLOCK_DEVICE */ + static void bdrv_file_init(void) { /* @@ -3873,6 +3882,7 @@ static void bdrv_file_init(void) * registered last will get probed first. */ bdrv_register(&bdrv_file); +#if defined(HAVE_HOST_BLOCK_DEVICE) bdrv_register(&bdrv_host_device); #ifdef __linux__ bdrv_register(&bdrv_host_cdrom); @@ -3880,6 +3890,7 @@ static void bdrv_file_init(void) #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) bdrv_register(&bdrv_host_cdrom); #endif +#endif /* HAVE_HOST_BLOCK_DEVICE */ } block_init(bdrv_file_init); diff --git a/meson.build b/meson.build index 890d7cf6b3..338ea279ee 100644 --- a/meson.build +++ b/meson.build @@ -182,7 +182,7 @@ if targetos == 'windows' include_directories: include_directories('.')) elif targetos == 'darwin' coref = dependency('appleframeworks', modules: 'CoreFoundation') - iokit = dependency('appleframeworks', modules: 'IOKit') + iokit = dependency('appleframeworks', modules: 'IOKit', required: false) elif targetos == 'sunos' socket = [cc.find_library('socket'), cc.find_library('nsl'), @@ -1071,6 +1071,9 @@ if get_option('cfi') add_global_link_arguments(cfi_flags, native: false, language: ['c', 'cpp', 'objc']) endif +have_host_block_device = (targetos != 'darwin' or + cc.has_header('IOKit/storage/IOMedia.h')) + ################# # config-host.h # ################# @@ -1164,6 +1167,7 @@ config_host_data.set('HAVE_PTY_H', cc.has_header('pty.h')) config_host_data.set('HAVE_SYS_IOCCOM_H', cc.has_header('sys/ioccom.h')) config_host_data.set('HAVE_SYS_KCOV_H', cc.has_header('sys/kcov.h')) config_host_data.set('HAVE_SYSTEM_FUNCTION', cc.has_function('system', prefix: '#include ')) +config_host_data.set('HAVE_HOST_BLOCK_DEVICE', have_host_block_device) config_host_data.set('CONFIG_PREADV', cc.has_function('preadv', prefix: '#include ')) diff --git a/qapi/block-core.json b/qapi/block-core.json index 2ea294129e..2dd41be156 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -897,7 +897,8 @@ 'discriminator': 'driver', 'data': { 'file': 'BlockStatsSpecificFile', - 'host_device': 'BlockStatsSpecificFile', + 'host_device': { 'type': 'BlockStatsSpecificFile', + 'if': 'defined(HAVE_HOST_BLOCK_DEVICE)' }, 'nvme': 'BlockStatsSpecificNvme' } } ## @@ -2814,7 +2815,9 @@ { 'enum': 'BlockdevDriver', 'data': [ 'blkdebug', 'blklogwrites', 'blkreplay', 'blkverify', 'bochs', 'cloop', 'compress', 'copy-on-read', 'dmg', 'file', 'ftp', 'ftps', - 'gluster', 'host_cdrom', 'host_device', 'http', 'https', 'iscsi', + 'gluster', 'host_cdrom', + {'name': 'host_device', 'if': 'defined(HAVE_HOST_BLOCK_DEVICE)' }, + 'http', 'https', 'iscsi', 'luks', 'nbd', 'nfs', 'null-aio', 'null-co', 'nvme', 'parallels', 'preallocate', 'qcow', 'qcow2', 'qed', 'quorum', 'raw', 'rbd', { 'name': 'replication', 'if': 'defined(CONFIG_REPLICATION)' }, @@ -3996,7 +3999,8 @@ 'ftps': 'BlockdevOptionsCurlFtps', 'gluster': 'BlockdevOptionsGluster', 'host_cdrom': 'BlockdevOptionsFile', - 'host_device':'BlockdevOptionsFile', + 'host_device': { 'type': 'BlockdevOptionsFile', + 'if': 'defined(HAVE_HOST_BLOCK_DEVICE)' }, 'http': 'BlockdevOptionsCurlHttp', 'https': 'BlockdevOptionsCurlHttps', 'iscsi': 'BlockdevOptionsIscsi', From patchwork Mon May 24 16:36:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 12276621 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id ADB71C04FF3 for ; Mon, 24 May 2021 16:53:33 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 4249A61405 for ; Mon, 24 May 2021 16:53:33 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4249A61405 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:51520 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1llDpc-0004Ay-Be for qemu-devel@archiver.kernel.org; Mon, 24 May 2021 12:53:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44030) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1llDZV-0007EC-Th; Mon, 24 May 2021 12:36:55 -0400 Received: from mail-ej1-x633.google.com ([2a00:1450:4864:20::633]:46807) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1llDZU-0002nR-6O; Mon, 24 May 2021 12:36:53 -0400 Received: by mail-ej1-x633.google.com with SMTP id b9so7564905ejc.13; Mon, 24 May 2021 09:36:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=XYlUDcbBxgUcTpH3YlxFdCaEX5vrfyOwZM1f/TOD9bA=; b=fOyPTICgqU+3lofnxPNIPQy9fMe/BUypD4pVE/4bwZF1GaARoax+L5RnVfuuykVnwy dDnuSUvP9YRY+F/I+fsccsf6uwpU2mIWB/ZVO0mcPZXL9pEa9QM9o9DjXvidNEvZ4YLB BUvUHve+D43gBaLrrTQorLl+c05jskBQKxaUb2PnqRNyN+V7HPykOs7VWR/TmRq+azRI UCwpqbqjzksI1HV0DjELAkCq0DUG9Kn91e20Y0w3m7RdEhBv4UgkTMRi0lsnjCW9gJZq GrkwQ0bMVG8IAvRLaeiaUX/CsEgTuxtP1hLbJMH2v2IplNkZlF93xGqw91UdEhs+aX3R 4PyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=XYlUDcbBxgUcTpH3YlxFdCaEX5vrfyOwZM1f/TOD9bA=; b=kKwOUVWXfIB9xK7QbU5jXKY+oXM1C8M0A2Tx5kC2bptmdUmuAMJkx1oGuJFlDV+VcR l2AYdz5ZmS0YbsXxcWRTdHVJxoJ6+UH9nqy7Ik8SdG9a/oYu/2APAYP6uRpfcYJCYJGx pTxH5QSj1McZuRPZREFo9WbbRlUTZWOJZruNieWzB0uYk6RDG9LvQU8XdZNz61NJpWoA INI3JSzulaG9zroqg3HsfoqhW6l9zG9Att4liQCaZSNtRAb2Wz7rTDJ97NZXStZtMkFQ BNO8Un3SwXhEPEMZWPP/0rcJwM4vS9gVCCXA3dIxe1A64DZbHB4OtAZIBqyBwk216hEM lDRg== X-Gm-Message-State: AOAM532GHWMgUFKDI+zFQBPH8kkvKWv6ZuejunkK29yH3nULBWbUSI2A tGlKgyuTBBMMVtv9PRYEb42+/e+rVW2pmA== X-Google-Smtp-Source: ABdhPJyxyblcaKLWYwjQ5Y1oaKRtWKAydhMWfTI+gUdhueAQw80nFpQ6fo8WEbCvw3lFbmTv2AdYkQ== X-Received: by 2002:a17:907:1b06:: with SMTP id mp6mr24579515ejc.292.1621874210475; Mon, 24 May 2021 09:36:50 -0700 (PDT) Received: from avogadro.redhat.com ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id n8sm7967684ejl.0.2021.05.24.09.36.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 May 2021 09:36:50 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH v2 5/6] block: check for sys/disk.h Date: Mon, 24 May 2021 18:36:44 +0200 Message-Id: <20210524163645.382940-6-pbonzini@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210524163645.382940-1-pbonzini@redhat.com> References: <20210524163645.382940-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::633; envelope-from=paolo.bonzini@gmail.com; helo=mail-ej1-x633.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action 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: Peter Maydell , =?utf-8?q?Philippe_Mathieu-Dau?= =?utf-8?q?d=C3=A9?= , Joelle van Dyne , qemu-block@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Joelle van Dyne Some BSD platforms do not have this header. Reviewed-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Joelle van Dyne Message-Id: <20210315180341.31638-3-j@getutm.app> Signed-off-by: Paolo Bonzini --- block.c | 2 +- meson.build | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/block.c b/block.c index 0dc97281dc..a16a2840d3 100644 --- a/block.c +++ b/block.c @@ -54,7 +54,7 @@ #ifdef CONFIG_BSD #include #include -#ifndef __DragonFly__ +#if defined(HAVE_SYS_DISK_H) #include #endif #endif diff --git a/meson.build b/meson.build index 338ea279ee..82d0e6a224 100644 --- a/meson.build +++ b/meson.build @@ -1168,6 +1168,7 @@ config_host_data.set('HAVE_SYS_IOCCOM_H', cc.has_header('sys/ioccom.h')) config_host_data.set('HAVE_SYS_KCOV_H', cc.has_header('sys/kcov.h')) config_host_data.set('HAVE_SYSTEM_FUNCTION', cc.has_function('system', prefix: '#include ')) config_host_data.set('HAVE_HOST_BLOCK_DEVICE', have_host_block_device) +config_host_data.set('HAVE_SYS_DISK_H', cc.has_header('sys/disk.h')) config_host_data.set('CONFIG_PREADV', cc.has_function('preadv', prefix: '#include ')) From patchwork Mon May 24 16:36:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 12276629 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5B834C04FF3 for ; Mon, 24 May 2021 16:56:03 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 051B8613F4 for ; Mon, 24 May 2021 16:56:02 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 051B8613F4 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:59966 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1llDs2-0001Ul-28 for qemu-devel@archiver.kernel.org; Mon, 24 May 2021 12:56:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44036) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1llDZW-0007El-ME; Mon, 24 May 2021 12:36:55 -0400 Received: from mail-ed1-x536.google.com ([2a00:1450:4864:20::536]:33409) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1llDZV-0002o0-1q; Mon, 24 May 2021 12:36:54 -0400 Received: by mail-ed1-x536.google.com with SMTP id b17so32752592ede.0; Mon, 24 May 2021 09:36:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=J4uFbK1t87t3yE0My/WwkVODQQO6taRX0FVG5vrflTQ=; b=eP65eK+uSkEvfyUl9Ny+71ANhXbWPpNMGho2aQ6VfrFRZimqG6dLZdC5ZF9ertN3Ci vqedzIX4azAFLU9VfGpF/weC530GhO9faVY4e2gFHKcfT634W9RSdADimnwBOCHzwKhu cZI9c1bwP38vacSgZlaYABkSE3ic6DMF6v0bDA5zF0/jb1/1Bgs1CFfEbyTCtTvGQIoT axK49XzmUVCfaxM9SBVd31b1VbOKLH9iTf4cJ1TmNe5m3apJpUaP6FcgRqbyp01Dw9Bx YHokBvo9v8ZGkWNKdW1j7QQ2y1tIfALmjYT7yOD+WBIe6KCGDzab01OPB5Rd1uK4fp8M D7sA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=J4uFbK1t87t3yE0My/WwkVODQQO6taRX0FVG5vrflTQ=; b=TmQo89MzeNF8KXPuPwiKyi+yVbMR4o3nfDlsSKVdIo9ipURRzfsRnDI2G/T/n0Sw14 T6Y++rhDotNVz3PLG0Cx3wF93P8cDj2kJWIpKNfqs63vOsWgH4Fg5CJES8pB2Ja2cItq RXAAKRyXlz/E0Witc34SDz1ZkLP+nq77gJ5LQ3enczER01NCtwgB4lZvJ+aq6P51s5W1 3MGE+wobhwdz7EWxw1TGCmOw36FG9uhwqFZOii1jHOO/IJQM6w3LgKnUH0iK0Urh44vD tucjtOmDixMAylMWM4QfIKURY4JzjS1fYvw9pUsUoGFOse6qUYkjIPNbQvLVMsmEoiUg ObUA== X-Gm-Message-State: AOAM533k+S4Ne0hDcGWYkHklRX3n/QEvJOH6F4KphxxqzIxX4Dszrg3B uZQBfZ5SLJPulstT4du6bLSaeShA8k9pCg== X-Google-Smtp-Source: ABdhPJy+JRfjkiP4KQxWcbX09dlRXvlUmDcmcmRZ8T72OAqsSeziHyD5VBLsRV7tGuiplx0KxF5KSg== X-Received: by 2002:aa7:c4c2:: with SMTP id p2mr25774073edr.144.1621874211294; Mon, 24 May 2021 09:36:51 -0700 (PDT) Received: from avogadro.redhat.com ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id n8sm7967684ejl.0.2021.05.24.09.36.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 May 2021 09:36:50 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH v2 6/6] block: detect DKIOCGETBLOCKCOUNT/SIZE before use Date: Mon, 24 May 2021 18:36:45 +0200 Message-Id: <20210524163645.382940-7-pbonzini@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210524163645.382940-1-pbonzini@redhat.com> References: <20210524163645.382940-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::536; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x536.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action 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: Warner Losh , Joelle van Dyne , qemu-block@nongnu.org, Peter Maydell Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Joelle van Dyne iOS hosts do not have these defined so we fallback to the default behaviour. Co-authored-by: Warner Losh Reviewed-by: Peter Maydell Signed-off-by: Joelle van Dyne Message-Id: <20210315180341.31638-4-j@getutm.app> Signed-off-by: Paolo Bonzini --- block/file-posix.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/block/file-posix.c b/block/file-posix.c index e83f34a960..34bd413553 100644 --- a/block/file-posix.c +++ b/block/file-posix.c @@ -2311,8 +2311,11 @@ static int64_t raw_getlength(BlockDriverState *bs) again: #endif if (!fstat(fd, &sb) && (S_IFCHR & sb.st_mode)) { + size = 0; #ifdef DIOCGMEDIASIZE - if (ioctl(fd, DIOCGMEDIASIZE, (off_t *)&size)) + if (ioctl(fd, DIOCGMEDIASIZE, (off_t *)&size)) { + size = 0; + } #elif defined(DIOCGPART) { struct partinfo pi; @@ -2321,9 +2324,7 @@ again: else size = 0; } - if (size == 0) -#endif -#if defined(__APPLE__) && defined(__MACH__) +#elif defined(DKIOCGETBLOCKCOUNT) && defined(DKIOCGETBLOCKSIZE) { uint64_t sectors = 0; uint32_t sector_size = 0; @@ -2331,19 +2332,15 @@ again: if (ioctl(fd, DKIOCGETBLOCKCOUNT, §ors) == 0 && ioctl(fd, DKIOCGETBLOCKSIZE, §or_size) == 0) { size = sectors * sector_size; - } else { - size = lseek(fd, 0LL, SEEK_END); - if (size < 0) { - return -errno; - } } } -#else - size = lseek(fd, 0LL, SEEK_END); +#endif + if (size == 0) { + size = lseek(fd, 0LL, SEEK_END); + } if (size < 0) { return -errno; } -#endif #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) switch(s->type) { case FTYPE_CD: