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,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 1A0E8FA3728 for ; Wed, 16 Oct 2019 22:01:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D901220872 for ; Wed, 16 Oct 2019 22:01:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1571263282; bh=OvHNm/qVCMS+oT5kxGIv21k4COUn0WEv4e0HUk1HUqc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=S3pimoCSXSufvP6hkGshTCWnFXkkyZpi7/zjzVdxnIYvN4+z+QLYTzxnAemTh9gvb kcBOMrJu0atmoIVJgcYQ26o8LFRscI+MSF0Y/L0S8AIB2QST3j1A2Gkr3U+ElbeBg4 j3rtiWLDfu072vFoif/JRYjnbzhZgnRye2cfLcXU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2438919AbfJPWA6 (ORCPT ); Wed, 16 Oct 2019 18:00:58 -0400 Received: from mail.kernel.org ([198.145.29.99]:54840 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2438607AbfJPV7n (ORCPT ); Wed, 16 Oct 2019 17:59:43 -0400 Received: from localhost (unknown [192.55.54.58]) (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 279B5222C2; Wed, 16 Oct 2019 21:59:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1571263183; bh=OvHNm/qVCMS+oT5kxGIv21k4COUn0WEv4e0HUk1HUqc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oOgiPwEy9YzTNJ10iIIlPEhBlh1/Lp/i0i35TfJFHPpPm90JK1A02VGkkkphOdKYB lO58MjRAgfLUcLbo0KzSq4EM2o9mRHmk277EnrulmzADInvG8io26u44GDXJQTTn+n t+3YZyAQ26ekjcnx1rPByD4ST2EyKynXbb/yrDac= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Stefan Hajnoczi , Jens Axboe Subject: [PATCH 5.3 110/112] io_uring: only flush workqueues on fileset removal Date: Wed, 16 Oct 2019 14:51:42 -0700 Message-Id: <20191016214907.445814511@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191016214844.038848564@linuxfoundation.org> References: <20191016214844.038848564@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jens Axboe commit 8a99734081775c012a4a6c442fdef0379fe52bdf upstream. We should not remove the workqueue, we just need to ensure that the workqueues are synced. The workqueues are torn down on ctx removal. Cc: stable@vger.kernel.org Fixes: 6b06314c47e1 ("io_uring: add file set registration") Reported-by: Stefan Hajnoczi Signed-off-by: Jens Axboe Signed-off-by: Greg Kroah-Hartman --- fs/io_uring.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -2566,7 +2566,8 @@ static void io_destruct_skb(struct sk_bu { struct io_ring_ctx *ctx = skb->sk->sk_user_data; - io_finish_async(ctx); + if (ctx->sqo_wq) + flush_workqueue(ctx->sqo_wq); unix_destruct_scm(skb); }