Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp1163338yba; Wed, 24 Apr 2019 16:30:29 -0700 (PDT) X-Google-Smtp-Source: APXvYqz+lBWyfmh2ohdHBQp1bETXA+5btpbfU+N+hqZZzawWbuXtjd2yMdno5sIFc+93N6s1ZB+S X-Received: by 2002:a17:902:102a:: with SMTP id b39mr35647157pla.188.1556148628718; Wed, 24 Apr 2019 16:30:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556148628; cv=none; d=google.com; s=arc-20160816; b=OiCxjcj3535Dw6uVKuwi31CtTMwT9LH10WBpGO15euIJJjpzWYsO5QfTTTZQ7+U3eT XELGM8jW2+IBqMZVKMOuSqBuhAkUwcmpUyxL2zG25bweu3nUs26LCBYd4cE14bhZiZYy gSBHP72eHIGs579nhvRmqsRAi8LoHcaC0Kk1FioYxXo5wvQiPgKp9BIxIYj3LDR2zzBH A6egE8i9BcQryy34T5XKxPQLgxkJQWc8Ip+NfwTm3SG3tRR006PEIYTbHAR1vuuQ1g2g QrhW1o6Ru8U30/yaMX5hAZnTIZLfHBN9UDAhKsdDcX72DD7eSW7xLfHf8XKmEFc4hkE4 yoeg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=0Ny1MZY7ziCLZ9zqQinLTOn2ayaYuXN3gNP1w8bBVRQ=; b=C87Fqqc+AqA60K00JibXFoOPNt5FfSg6X/d9FzAIz2D32CahH5F0Pc0yBaPMiAw6K8 QNPOex+K1CE56YxY3p//xLBntxem+YjYsxNdHxTJcOlaoVOFPlvjXQiVsEeQizovEAgU LGKig0A8x3i+i3ZhZPod3enkoAfpRjbPwmRx+iAKJ5cg1CJgqVr4wfJksBnGbu5NWxQc 8RA2sB9DUFJM0a8bQpCujz/tKJ79PT4yleei6/oami/6dCreUIGQoi45+Clryl+PdtBB 1MhnMDemayo6sSsO3xTeHEZi/Y3b+V5IsMD/ArgiitPcfYV0UI3B8wW9pVwrj7F3J2k3 0iHg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=cUSv7okX; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p32si9181502pgm.310.2019.04.24.16.30.13; Wed, 24 Apr 2019 16:30:28 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=cUSv7okX; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389291AbfDXRVL (ORCPT + 99 others); Wed, 24 Apr 2019 13:21:11 -0400 Received: from mail.kernel.org ([198.145.29.99]:46612 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389283AbfDXRVG (ORCPT ); Wed, 24 Apr 2019 13:21:06 -0400 Received: from localhost (62-193-50-229.as16211.net [62.193.50.229]) (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 99A9120835; Wed, 24 Apr 2019 17:21:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556126466; bh=lI9kc5cDms9hJ8BTMoC0tjOimcd+Pi92HoaaDLv/DMs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cUSv7okX2/m46EBJKo1bdH0CWi/6BFgTmRTM0bHjhqFXVufgDzoLq/ma1Ft4scyR8 HVSKvRI7dKtLUo7PV1YqwyQ/iWKbJ31vvUXDS45+W8ijU5GSbZwi6KBC4DhKX6Cueu xT478mwuTp9dVjqywve2dMYvYSlevA8IlMtNGsbM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Siva Rebbagondla , Kalle Valo , Sasha Levin Subject: [PATCH 4.4 119/168] rsi: improve kernel thread handling to fix kernel panic Date: Wed, 24 Apr 2019 19:09:23 +0200 Message-Id: <20190424170930.467812032@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190424170923.452349382@linuxfoundation.org> References: <20190424170923.452349382@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 [ Upstream commit 4c62764d0fc21a34ffc44eec1210038c3a2e4473 ] While running regressions, observed below kernel panic when sdio disconnect called. This is because of, kthread_stop() is taking care of wait_for_completion() by default. When wait_for_completion triggered in kthread_stop and as it was done already, giving kernel panic. Hence, removing redundant wait_for_completion() from rsi_kill_thread(). ... skipping ... BUG: unable to handle kernel NULL pointer dereference at (null) IP: [] exit_creds+0x1f/0x50 PGD 0 Oops: 0002 [#1] SMP CPU: 0 PID: 6502 Comm: rmmod Tainted: G OE 4.15.9-Generic #154-Ubuntu Hardware name: Dell Inc. Edge Gateway 3003/ , BIOS 01.00.00 04/17/2017 Stack: ffff88007392e600 ffff880075847dc0 ffffffff8108160a 0000000000000000 ffff88007392e600 ffff880075847de8 ffffffff810a484b ffff880076127000 ffff88003cd3a800 ffff880074f12a00 ffff880075847e28 ffffffffc09bed15 Call Trace: [] __put_task_struct+0x5a/0x140 [] kthread_stop+0x10b/0x110 [] rsi_disconnect+0x2f5/0x300 [ven_rsi_sdio] [] ? __pm_runtime_resume+0x5b/0x80 [] sdio_bus_remove+0x38/0x100 [] __device_release_driver+0xa4/0x150 [] driver_detach+0xb5/0xc0 [] bus_remove_driver+0x55/0xd0 [] driver_unregister+0x2c/0x50 [] sdio_unregister_driver+0x1a/0x20 [] rsi_module_exit+0x15/0x30 [ven_rsi_sdio] [] SyS_delete_module+0x1b8/0x210 [] entry_SYSCALL_64_fastpath+0x1c/0xbb Signed-off-by: Siva Rebbagondla Signed-off-by: Kalle Valo Signed-off-by: Sasha Levin --- drivers/net/wireless/rsi/rsi_common.h | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/net/wireless/rsi/rsi_common.h b/drivers/net/wireless/rsi/rsi_common.h index d3fbe33d2324..a13f08fd8690 100644 --- a/drivers/net/wireless/rsi/rsi_common.h +++ b/drivers/net/wireless/rsi/rsi_common.h @@ -75,7 +75,6 @@ static inline int rsi_kill_thread(struct rsi_thread *handle) atomic_inc(&handle->thread_done); rsi_set_event(&handle->event); - wait_for_completion(&handle->completion); return kthread_stop(handle->task); } -- 2.19.1