From patchwork Thu Feb 27 21:16:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Simmons X-Patchwork-Id: 11410503 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7E9C217E0 for ; Thu, 27 Feb 2020 21:40:00 +0000 (UTC) Received: from pdx1-mailman02.dreamhost.com (pdx1-mailman02.dreamhost.com [64.90.62.194]) (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 677EB24690 for ; Thu, 27 Feb 2020 21:40:00 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 677EB24690 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=infradead.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lustre-devel-bounces@lists.lustre.org Received: from pdx1-mailman02.dreamhost.com (localhost [IPv6:::1]) by pdx1-mailman02.dreamhost.com (Postfix) with ESMTP id 469C734A698; Thu, 27 Feb 2020 13:32:33 -0800 (PST) X-Original-To: lustre-devel@lists.lustre.org Delivered-To: lustre-devel-lustre.org@pdx1-mailman02.dreamhost.com Received: from smtp3.ccs.ornl.gov (smtp3.ccs.ornl.gov [160.91.203.39]) by pdx1-mailman02.dreamhost.com (Postfix) with ESMTP id CE8353488A2 for ; Thu, 27 Feb 2020 13:20:58 -0800 (PST) Received: from star.ccs.ornl.gov (star.ccs.ornl.gov [160.91.202.134]) by smtp3.ccs.ornl.gov (Postfix) with ESMTP id 514FD919C; Thu, 27 Feb 2020 16:18:19 -0500 (EST) Received: by star.ccs.ornl.gov (Postfix, from userid 2004) id 5076F47C; Thu, 27 Feb 2020 16:18:19 -0500 (EST) From: James Simmons To: Andreas Dilger , Oleg Drokin , NeilBrown Date: Thu, 27 Feb 2020 16:16:23 -0500 Message-Id: <1582838290-17243-516-git-send-email-jsimmons@infradead.org> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1582838290-17243-1-git-send-email-jsimmons@infradead.org> References: <1582838290-17243-1-git-send-email-jsimmons@infradead.org> Subject: [lustre-devel] [PATCH 515/622] lustre: llite: move agl_thread cleanup out of thread. X-BeenThere: lustre-devel@lists.lustre.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "For discussing Lustre software development." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Lustre Development List MIME-Version: 1.0 Errors-To: lustre-devel-bounces@lists.lustre.org Sender: "lustre-devel" From: NeilBrown When we start a thread with kthread_create() and later stop it with kthread_stop(), there is no guarantee that the thread function runs at all. So it is not safe to leave cleanup to the thread. So move the cleanup code to a separate function which stops the thread and then cleans up. Fixes: c044fb0f835c ("staging: lustre: remove 'ptlrpc_thread usage' for sai_agl_thread") Signed-off-by: NeilBrown Reviewed-by: James Simmons --- fs/lustre/llite/statahead.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/fs/lustre/llite/statahead.c b/fs/lustre/llite/statahead.c index 497aba3..1639408 100644 --- a/fs/lustre/llite/statahead.c +++ b/fs/lustre/llite/statahead.c @@ -915,7 +915,19 @@ static int ll_agl_thread(void *arg) schedule(); __set_current_state(TASK_RUNNING); } + return 0; +} + +static void ll_stop_agl(struct ll_statahead_info *sai) +{ + struct ll_inode_info *plli = ll_i2info(sai->sai_dentry->d_inode); + struct ll_inode_info *clli; + CDEBUG(D_READA, "stop agl thread: sai %p pid %u\n", + sai, (unsigned int)sai->sai_agl_task->pid); + kthread_stop(sai->sai_agl_task); + + sai->sai_agl_task = NULL; spin_lock(&plli->lli_agl_lock); sai->sai_agl_valid = 0; while ((clli = list_first_entry_or_null(&sai->sai_agls, @@ -929,9 +941,8 @@ static int ll_agl_thread(void *arg) } spin_unlock(&plli->lli_agl_lock); CDEBUG(D_READA, "agl thread stopped: sai %p, parent %pd\n", - sai, parent); + sai, sai->sai_dentry); ll_sai_put(sai); - return 0; } /* start agl thread */ @@ -1134,13 +1145,9 @@ static int ll_statahead_thread(void *arg) __set_current_state(TASK_RUNNING); } out: - if (sai->sai_agl_task) { - kthread_stop(sai->sai_agl_task); + if (sai->sai_agl_task) + ll_stop_agl(sai); - CDEBUG(D_READA, "stop agl thread: sai %p pid %u\n", - sai, (unsigned int)sai->sai_agl_task->pid); - sai->sai_agl_task = NULL; - } /* * wait for inflight statahead RPCs to finish, and then we can free sai * safely because statahead RPC will access sai data