From patchwork Tue Mar 2 01:56:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: ChangLimin X-Patchwork-Id: 12110887 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=-18.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 CA7C3C433E0 for ; Tue, 2 Mar 2021 02:08:30 +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 DE7036148E for ; Tue, 2 Mar 2021 02:08:29 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DE7036148E Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=chinatelecom.cn Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:51528 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lGuSa-0004ut-IV for qemu-devel@archiver.kernel.org; Mon, 01 Mar 2021 21:08:28 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43912) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lGuR5-0003nU-2w; Mon, 01 Mar 2021 21:06:55 -0500 Received: from prt-mail.chinatelecom.cn ([42.123.76.228]:38960 helo=chinatelecom.cn) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lGuR1-0003Px-2H; Mon, 01 Mar 2021 21:06:53 -0500 HMM_SOURCE_IP: 172.18.0.218:29801.1800995752 HMM_ATTACHE_NUM: 0000 HMM_SOURCE_TYPE: SMTP Received: from clientip-106.120.101.58?logid-9db7f54045604fc5a17714c25d21d57b (unknown [172.18.0.218]) by chinatelecom.cn (HERMES) with SMTP id 29F1B2800FB; Tue, 2 Mar 2021 09:56:52 +0800 (CST) X-189-SAVE-TO-SEND: 71112636@chinatelecom.cn Received: from ([172.18.0.218]) by App0025 with ESMTP id 9db7f54045604fc5a17714c25d21d57b for qemu-block@nongnu.org; Tue Mar 2 09:56:58 2021 X-Transaction-ID: 9db7f54045604fc5a17714c25d21d57b X-filter-score: filter<0> X-Real-From: changlm@chinatelecom.cn X-Receive-IP: 172.18.0.218 X-MEDUSA-Status: 0 Date: Tue, 2 Mar 2021 09:56:42 +0800 From: ChangLimin To: qemu-block Subject: [PATCH] file-posix: allow -EBUSY errors during write zeros on block X-Priority: 3 X-GUID: 8E9EC420-F20E-414D-8611-F52628B71530 X-Has-Attach: no X-Mailer: Foxmail 7.2.17.58[cn] Mime-Version: 1.0 Message-ID: <2021030209564214018344@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, SPF_HELO_PASS=-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.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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" After Linux 5.10, write zeros to a multipath device using ioctl(fd, BLKZEROOUT, range) with cache none or directsync will return EBUSY. Similar to handle_aiocb_write_zeroes_unmap, handle_aiocb_write_zeroes_block allow -EBUSY 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 | 7 ++++++-  1 file changed, 6 insertions(+), 1 deletion(-) -- 2.27.0 diff --git a/block/file-posix.c b/block/file-posix.c index 05079b40ca..3e60c96214 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) { +        switch (ret) { +        case -ENOTSUP: +        case -EINVAL: +        case -EBUSY:              s->has_write_zeroes = false; +            return -ENOTSUP; +            break;          }      }  #endif