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 X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, 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 D8E20C34049 for ; Tue, 18 Feb 2020 20:01:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B37B524672 for ; Tue, 18 Feb 2020 20:01:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582056063; bh=OgNurUw7ZIV9uIg954/9ZZV6/+R5DLqLOsAcVlC0myo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=egr47njdje96aFntPWAnWw1fuT/7pUiwiSVrGP5H3LyDnxRSpMKdzPuiWO4LX2Va/ bKJsiQ42vVnZc1eG7A7JYXSuUJxYQvo8Oh0Per9kb/MLO4IqOkXnfPJ2zqV0sJtHMv v5GMiMshT6pm1thRAI6xRjLDAA3zkUZ/GgTyxqrk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726723AbgBRUBC (ORCPT ); Tue, 18 Feb 2020 15:01:02 -0500 Received: from mail.kernel.org ([198.145.29.99]:40456 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728712AbgBRUBB (ORCPT ); Tue, 18 Feb 2020 15:01:01 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 4C30B24670; Tue, 18 Feb 2020 20:01:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582056060; bh=OgNurUw7ZIV9uIg954/9ZZV6/+R5DLqLOsAcVlC0myo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eZXJ2bBtXUlMfoydKSn5cQoMKuhRl8mI/v3cdLEGhcw83h4g3Vq7QyjFzbdjHazPh NFtlYY078sFILxjExFSBMeUFaBKGTJ6tIyGlVLVwEksQdYGVlmHDt52P06TluX3yEn +Tf0xTIDUQdgHKnorGMmwoF1LNNMpzLo1QYb43fA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jens Axboe Subject: [PATCH 5.5 02/80] io_uring: retry raw bdev writes if we hit -EOPNOTSUPP Date: Tue, 18 Feb 2020 20:54:23 +0100 Message-Id: <20200218190432.275656418@linuxfoundation.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200218190432.043414522@linuxfoundation.org> References: <20200218190432.043414522@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Jens Axboe commit faac996ccd5da95bc56b91aa80f2643c2d0a1c56 upstream. For non-blocking issue, we set IOCB_NOWAIT in the kiocb. However, on a raw block device, this yields an -EOPNOTSUPP return, as non-blocking writes aren't supported. Turn this -EOPNOTSUPP into -EAGAIN, so we retry from blocking context with IOCB_NOWAIT cleared. Cc: stable@vger.kernel.org # 5.5 Signed-off-by: Jens Axboe Signed-off-by: Greg Kroah-Hartman --- fs/io_uring.c | 6 ++++++ 1 file changed, 6 insertions(+) --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -1978,6 +1978,12 @@ static int io_write(struct io_kiocb *req ret2 = call_write_iter(req->file, kiocb, &iter); else ret2 = loop_rw_iter(WRITE, req->file, kiocb, &iter); + /* + * Raw bdev writes will -EOPNOTSUPP for IOCB_NOWAIT. Just + * retry them without IOCB_NOWAIT. + */ + if (ret2 == -EOPNOTSUPP && (kiocb->ki_flags & IOCB_NOWAIT)) + ret2 = -EAGAIN; if (!force_nonblock || ret2 != -EAGAIN) { kiocb_done(kiocb, ret2, nxt, req->in_async); } else {