From nobody Sat May 18 15:38:16 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=1691078203; cv=none; d=zohomail.com; s=zohoarc; b=QTXeqrTne4UP0+mqoAfidEh0tXdss/eWHiccSIlDdc7iU78SYKOErRoPbe0GX6pP38UUQgi624bybokb8uP9Dj97/zAT6AQlf8F45pHFItNFhX7foahYoxHBAu4WQXkUVIIXamKk5k20vzyrHstfAZlFjxuqh0fY5s9/RKkQZs8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1691078203; 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=S0nHXg7Hq0LS6ZaBQRM10/HgF4wbNdZndEcHXItpz8M=; b=Q/aI7qlIUyF0DzmWZWLUeDHRyDg+hp9HuQwORP9LbzOzwt1Y0YA1FrbF0grcYJ0IH4Jnom/WYmTCtpwQ8um9X82qx2WLnMgMV2z54iX1kkFPsBveCZeymecOtDl093vvYMp5pSennY3LASnqZONClUmcgtshZfiwL4y+xSNfud8= 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 1691078203179193.3174921935124; Thu, 3 Aug 2023 08:56:43 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qRagF-0006qP-Nq; Thu, 03 Aug 2023 11:56:03 -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 1qRag8-0006oX-NC for qemu-devel@nongnu.org; Thu, 03 Aug 2023 11:55:57 -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 1qRag6-0004oF-Sz for qemu-devel@nongnu.org; Thu, 03 Aug 2023 11:55:56 -0400 Received: from mimecast-mx02.redhat.com (66.187.233.73 [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-425-nFHGfxbPP3mRc9iesPOptA-1; Thu, 03 Aug 2023 11:55:49 -0400 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 86ACD3C0C4A9; Thu, 3 Aug 2023 15:55:49 +0000 (UTC) Received: from localhost (unknown [10.39.194.215]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0511D4021C9; Thu, 3 Aug 2023 15:55:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1691078154; 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=S0nHXg7Hq0LS6ZaBQRM10/HgF4wbNdZndEcHXItpz8M=; b=BaWjY0f/RqI2SZC1qev8fC+GUrVxCn1e+VYDK2j/fcyMMPw48Yc6uQwiOPAELk4Paa5hFu wk5guq+VAZ3W1o5Sml0PvjTWORialAx0qR0NCzYAMHc+06MYNsaIgovP9mnsau24SLG+Tb 5FRmQvoMVhRM6nQ8K9B682+Quy2ypAE= X-MC-Unique: nFHGfxbPP3mRc9iesPOptA-1 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Cc: Kevin Wolf , Fam Zheng , Stefan Hajnoczi , Hanna Reitz , qemu-block@nongnu.org, Richard Henderson , Stefano Garzarella Subject: [PULL for-8.1 1/2] block/blkio: close the fd when blkio_connect() fails Date: Thu, 3 Aug 2023 11:55:44 -0400 Message-ID: <20230803155545.2349984-2-stefanha@redhat.com> In-Reply-To: <20230803155545.2349984-1-stefanha@redhat.com> References: <20230803155545.2349984-1-stefanha@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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=unavailable 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: 1691078204524100005 Content-Type: text/plain; charset="utf-8" From: Stefano Garzarella libblkio drivers take ownership of `fd` only after a successful blkio_connect(), so if it fails, we are still the owners. Fixes: cad2ccc395 ("block/blkio: use qemu_open() to support fd passing for = virtio-blk") Suggested-by: Hanna Czenczek Signed-off-by: Stefano Garzarella Reviewed-by: Hanna Czenczek Message-id: 20230803082825.25293-2-sgarzare@redhat.com Signed-off-by: Stefan Hajnoczi --- block/blkio.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/block/blkio.c b/block/blkio.c index 8e7ce42c79..baba2f0b67 100644 --- a/block/blkio.c +++ b/block/blkio.c @@ -678,7 +678,7 @@ static int blkio_virtio_blk_connect(BlockDriverState *b= s, QDict *options, const char *path =3D qdict_get_try_str(options, "path"); BDRVBlkioState *s =3D bs->opaque; bool fd_supported =3D false; - int fd, ret; + int fd =3D -1, ret; =20 if (!path) { error_setg(errp, "missing 'path' option"); @@ -719,6 +719,7 @@ static int blkio_virtio_blk_connect(BlockDriverState *b= s, QDict *options, if (ret < 0) { fd_supported =3D false; qemu_close(fd); + fd =3D -1; } } } @@ -733,14 +734,18 @@ static int blkio_virtio_blk_connect(BlockDriverState = *bs, QDict *options, } =20 ret =3D blkio_connect(s->blkio); + if (ret < 0 && fd >=3D 0) { + /* Failed to give the FD to libblkio, close it */ + qemu_close(fd); + fd =3D -1; + } + /* * If the libblkio driver doesn't support the `fd` property, blkio_con= nect() * will fail with -EINVAL. So let's try calling blkio_connect() again = by * directly setting `path`. */ if (fd_supported && ret =3D=3D -EINVAL) { - qemu_close(fd); - /* * We need to clear the `fd` property we set previously by setting * it to -1. --=20 2.41.0 From nobody Sat May 18 15:38:16 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=1691078200; cv=none; d=zohomail.com; s=zohoarc; b=Nmz0hX8gUlz/JPZwpdj02ztv0fIhmp0Hk4wjO9jQDQG5uuVIj9WYlrj/AjFuv0jgVsgF5TwOMzE3zrYpgdL6/YqGJigK0stQ3i7azheoSSbniGeYOUwSQJHJFPEUbfpQfE92EQklqWtHq7ZC1mqOTvJNWp2zvx/apzh4g++wDmU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1691078200; 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=vuhqgQawoFar29iDZgHO95xXm2Ku6g+zYEg0foUzyKc=; b=aPcC4Y8u6mwxkQXJAsGYamT38nE1V77p5RmYTKMYhf8U++8xTz/T2lo1WbhPjOaSbS8Bd1wp0hKXr8jWetwEIeZHfbl1heV3zwCFoyF2kq2rF+9DQhm0hu40rKOV962yMLxFLgXNFbSxMehBFMnsbsK4ACU3AUZIskbFbimXxn8= 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 1691078200375788.6514400329673; Thu, 3 Aug 2023 08:56:40 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qRagD-0006pr-Tc; Thu, 03 Aug 2023 11:56:02 -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 1qRagA-0006pd-0n for qemu-devel@nongnu.org; Thu, 03 Aug 2023 11:55:58 -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 1qRag8-0004oa-G4 for qemu-devel@nongnu.org; Thu, 03 Aug 2023 11:55:57 -0400 Received: from mimecast-mx02.redhat.com (66.187.233.73 [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-13-03VoesUdPH-dmPVq28NMQg-1; Thu, 03 Aug 2023 11:55:52 -0400 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C360A29AA38B; Thu, 3 Aug 2023 15:55:51 +0000 (UTC) Received: from localhost (unknown [10.39.194.215]) by smtp.corp.redhat.com (Postfix) with ESMTP id 28861403162; Thu, 3 Aug 2023 15:55:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1691078155; 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=vuhqgQawoFar29iDZgHO95xXm2Ku6g+zYEg0foUzyKc=; b=XY1/il34oUpKYP/CDAyUWXokhNpaTAEXa/HZ+oHaWCQujX4tcIWm2WiYsWSDa+rohH1ACp TxUil8/isJ54S0EcwOz65lzUzGeY03Kczw3uIc6D3ylmO6OZVquaqyrLNsHuBfkq5OTgi5 BMbNZbSEE39It29VUCYgWmXMGjrVrwU= X-MC-Unique: 03VoesUdPH-dmPVq28NMQg-1 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Cc: Kevin Wolf , Fam Zheng , Stefan Hajnoczi , Hanna Reitz , qemu-block@nongnu.org, Richard Henderson , Stefano Garzarella Subject: [PULL for-8.1 2/2] block/blkio: add more comments on the fd passing handling Date: Thu, 3 Aug 2023 11:55:45 -0400 Message-ID: <20230803155545.2349984-3-stefanha@redhat.com> In-Reply-To: <20230803155545.2349984-1-stefanha@redhat.com> References: <20230803155545.2349984-1-stefanha@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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=unavailable 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: 1691078202452100003 Content-Type: text/plain; charset="utf-8" From: Stefano Garzarella As Hanna pointed out, it is not clear in the code why qemu_open() can fail, and why blkio_set_int("fd") is not enough to discover the `fd` property support. Let's fix them by adding more details in the code comments. Suggested-by: Hanna Czenczek Reviewed-by: Hanna Czenczek Signed-off-by: Stefano Garzarella Message-id: 20230803082825.25293-3-sgarzare@redhat.com Signed-off-by: Stefan Hajnoczi --- block/blkio.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/block/blkio.c b/block/blkio.c index baba2f0b67..1dd495617c 100644 --- a/block/blkio.c +++ b/block/blkio.c @@ -713,6 +713,12 @@ static int blkio_virtio_blk_connect(BlockDriverState *= bs, QDict *options, */ fd =3D qemu_open(path, O_RDWR, NULL); if (fd < 0) { + /* + * qemu_open() can fail if the user specifies a path that is n= ot + * a file or device, for example in the case of Unix Domain So= cket + * for the virtio-blk-vhost-user driver. In such cases let's h= ave + * libblkio open the path directly. + */ fd_supported =3D false; } else { ret =3D blkio_set_int(s->blkio, "fd", fd); @@ -741,9 +747,12 @@ static int blkio_virtio_blk_connect(BlockDriverState *= bs, QDict *options, } =20 /* - * If the libblkio driver doesn't support the `fd` property, blkio_con= nect() - * will fail with -EINVAL. So let's try calling blkio_connect() again = by - * directly setting `path`. + * Before https://gitlab.com/libblkio/libblkio/-/merge_requests/208 + * (libblkio <=3D v1.3.0), setting the `fd` property is not enough to = check + * whether the driver supports the `fd` property or not. In that case, + * blkio_connect() will fail with -EINVAL. + * So let's try calling blkio_connect() again by directly setting `pat= h` + * to cover this scenario. */ if (fd_supported && ret =3D=3D -EINVAL) { /* --=20 2.41.0