From patchwork Wed Mar 3 03:24:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: ChangLimin X-Patchwork-Id: 1446419 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) 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 ozlabs.org (Postfix) with ESMTPS id 4DqzsG3XxFz9sCD for ; Wed, 3 Mar 2021 14:25:19 +1100 (AEDT) Received: from localhost ([::1]:39164 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lHI8S-00076z-2p for incoming@patchwork.ozlabs.org; Tue, 02 Mar 2021 22:25:16 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:48218) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lHI7y-00076P-U0; Tue, 02 Mar 2021 22:24:46 -0500 Received: from prt-mail.chinatelecom.cn ([42.123.76.228]:54677 helo=chinatelecom.cn) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lHI7w-0004aF-EH; Tue, 02 Mar 2021 22:24:46 -0500 HMM_SOURCE_IP: 172.18.0.48:5054.1008649981 HMM_ATTACHE_NUM: 0000 HMM_SOURCE_TYPE: SMTP Received: from clientip-106.120.101.58?logid-1539d8b0fdd04a199f5c16d18ac4fd80 (unknown [172.18.0.48]) by chinatelecom.cn (HERMES) with SMTP id F3F8D2800ED; Wed, 3 Mar 2021 11:24:26 +0800 (CST) X-189-SAVE-TO-SEND: 71112636@chinatelecom.cn Received: from ([172.18.0.48]) by App0024 with ESMTP id 1539d8b0fdd04a199f5c16d18ac4fd80 for qemu-block@nongnu.org; Wed Mar 3 11:24:34 2021 X-Transaction-ID: 1539d8b0fdd04a199f5c16d18ac4fd80 X-filter-score: filter<0> X-Real-From: changlm@chinatelecom.cn X-Receive-IP: 172.18.0.48 X-MEDUSA-Status: 0 Date: Wed, 3 Mar 2021 11:24:19 +0800 From: ChangLimin To: qemu-block Subject: [PATCH V2] file-posix: allow -EBUSY -EINVAL errors during write zeros on block References: <2021030209564214018344@chinatelecom.cn> X-Priority: 3 X-GUID: 412A8D7D-1B20-4009-A1F4-255767C0AFAE X-Has-Attach: no X-Mailer: Foxmail 7.2.17.58[cn] Mime-Version: 1.0 Message-ID: <2021030311241928103058@chinatelecom.cn> Received-SPF: pass client-ip=42.123.76.228; envelope-from=changlm@chinatelecom.cn; helo=chinatelecom.cn X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, HTML_MESSAGE=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_KAM_HTML_FONT_INVALID=0.01 autolearn=ham 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: kwolf , qemu-devel , mreitz Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Since Linux 5.10, write zeros to a multipath device using ioctl(fd, BLKZEROOUT, range) with cache none or directsync return -EBUSY permanently. Similar to handle_aiocb_write_zeroes_unmap, handle_aiocb_write_zeroes_block allow -EBUSY and -EINVAL errors during ioctl(fd, BLKZEROOUT, range). Reference commit in Linux 5.10: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=384d87ef2c954fc58e6c5fd8253e4a1984f5fe02 Signed-off-by: ChangLimin --- block/file-posix.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) -- 2.27.0 diff --git a/block/file-posix.c b/block/file-posix.c index 05079b40ca..4e132db929 100644 --- a/block/file-posix.c +++ b/block/file-posix.c @@ -1629,8 +1629,13 @@ static ssize_t handle_aiocb_write_zeroes_block(RawPosixAIOData *aiocb) } while (errno == EINTR); ret = translate_err(-errno); - if (ret == -ENOTSUP) { - s->has_write_zeroes = false; + switch (ret) { + case -ENOTSUP: + s->has_write_zeroes = false; /* fall through */ + case -EINVAL: + case -EBUSY: + return -ENOTSUP; + break; } } #endif