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=-16.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS 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 3C56AC5CFC2 for ; Thu, 15 Jul 2021 17:32:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 288A8613D7 for ; Thu, 15 Jul 2021 17:32:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230296AbhGORfo (ORCPT ); Thu, 15 Jul 2021 13:35:44 -0400 Received: from mail.kernel.org ([198.145.29.99]:57714 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229832AbhGORfn (ORCPT ); Thu, 15 Jul 2021 13:35:43 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 81F9261357; Thu, 15 Jul 2021 17:32:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626370370; bh=TspSQrdYsvKt5G7QcaVoQ0OF/C4arsn9rMRe1c/kxyM=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=dDCAiTXJG4zAADbDB2J1ySxzdNnRW27h0jNcySNLpkzYbZ93gpsuku0T3b2y1SlaF uLoTTvqABrxpbHXPq+idioHuJF6aHCDEVErVy3mhwdIelvp+1pe+ovuUMcu8Z1pMZ0 b2jtsmqQkjxTBPo9XGCUR73zBkawS4WdchelHsNI= Date: Thu, 15 Jul 2021 19:32:47 +0200 From: Greg KH To: Jens Axboe Cc: Yang Yingliang , linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: Re: [PATCH stable-5.10] io_uring: fix clear IORING_SETUP_R_DISABLED in wrong function Message-ID: References: <20210715131825.2410912-1-yangyingliang@huawei.com> <2d9aa268-fd78-17ec-df0f-00daa1138a72@kernel.dk> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <2d9aa268-fd78-17ec-df0f-00daa1138a72@kernel.dk> Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org On Thu, Jul 15, 2021 at 09:27:53AM -0600, Jens Axboe wrote: > On 7/15/21 7:22 AM, Greg KH wrote: > > On Thu, Jul 15, 2021 at 09:18:25PM +0800, Yang Yingliang wrote: > >> In commit 3ebba796fa25 ("io_uring: ensure that SQPOLL thread is started for exit"), > >> the IORING_SETUP_R_DISABLED is cleared in io_sq_offload_start(), but when backport > >> it to stable-5.10, IORING_SETUP_R_DISABLED is cleared in __io_req_task_submit(), > >> move clearing IORING_SETUP_R_DISABLED to io_sq_offload_start() to fix this. > >> > >> Fixes: 6cae8095490ca ("io_uring: ensure that SQPOLL thread is started for exit") > >> Signed-off-by: Yang Yingliang > >> --- > >> fs/io_uring.c | 2 +- > >> 1 file changed, 1 insertion(+), 1 deletion(-) > > > > I need an ack from Jens before I can take this... > > Ack, that looks like a bad merge. Fine to apply this patch, thanks. THanks, now queued up. greg k-h