From patchwork Sun Sep 24 19:50:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 144206 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:cae8:0:b0:403:3b70:6f57 with SMTP id r8csp989591vqu; Sun, 24 Sep 2023 22:21:04 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHL9W8l/C++FgRacJOpIhHq0NXtjHOgXG1BQ/U1ISymnytTaaOGM7vtSwfx/Vw+Jr7E9XaB X-Received: by 2002:a17:902:7881:b0:1c5:7aa1:3a52 with SMTP id q1-20020a170902788100b001c57aa13a52mr3131078pll.2.1695619264200; Sun, 24 Sep 2023 22:21:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695619264; cv=none; d=google.com; s=arc-20160816; b=A7josW3cd0QXsiweFwviFYFwP71cxJuWGx02V06wcqiGsVWCBOCneR2Q9HeAr9CBYY WqvJBAhbZP1OT4eew27NsQVfDmiDJxU3JM/wWMvg2DnxJGvmZAg/sLwhoXOq/prwnZMH XaLejtw1/5vxXQsqvR9TI1W+3ch9oMf4QOtlFQAIy2ERUaGo4lJnRk0dQ6QJ4j94GNC/ 38zNol1pcKYj+3C+c3niBb/n2MtvlKiA9JyllPCpgqNa/t2mJ/+tXUdZ028+EMgWcAlm wD9sqRpyqiyWEom6cIy4j6rh4O9z0qctDq07/oG5ptCER52U8PVexIvJ2rEw1Fk0AMbC 6Q4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:to:from:date:dkim-signature; bh=fgyKxqKA15nbfaH4vMDu01hflBvGs/eg6IGSdQy6Jmg=; fh=Sw1rtAM+hKyOoOQVYiiLzcdjc4spg79Z/tN6UmWUAKs=; b=cSDKB7zU/XxTQhO0inl2dx19IcF4mT15tM7FvbrYMEyPXpNjR9dI05h07ZwGXukpfN 1cz7cXdnfCT46LW29yPOyRuFnQ8Omz87WExgLQRJyjyV7stICauiIUPStoqgCvoqt9ME ePZ13w8EK8bmQF7xA6Iw/9AobQAmcr/t5aGpzA4hl58vmxKf8dZKvYoDJLds3FKciJuv /8oOr6gRdzkAyGJbhdn4AOJ4lnbHp5ShpHcruEhVPz0Y8j7dHHyCD4zTMvU9YSIJqK1m yx5rgxmycVRGPUqg+Y564RV718yPYutlzW2WoClJRoy+Y0shEpO1oBisKkCbj6xuRb8z bQuw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=YICS9s8c; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from howler.vger.email (howler.vger.email. [2620:137:e000::3:4]) by mx.google.com with ESMTPS id cp1-20020a170902e78100b001bbac6722e6si8886108plb.371.2023.09.24.22.21.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Sep 2023 22:21:04 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=YICS9s8c; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id 0C01D8078E3D; Sun, 24 Sep 2023 12:51:19 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231455AbjIXTvL (ORCPT + 30 others); Sun, 24 Sep 2023 15:51:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45946 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231459AbjIXTvH (ORCPT ); Sun, 24 Sep 2023 15:51:07 -0400 Received: from mail-wm1-x336.google.com (mail-wm1-x336.google.com [IPv6:2a00:1450:4864:20::336]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ADF5D193 for ; Sun, 24 Sep 2023 12:50:59 -0700 (PDT) Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-4051d33af1fso16243905e9.0 for ; Sun, 24 Sep 2023 12:50:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695585058; x=1696189858; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=fgyKxqKA15nbfaH4vMDu01hflBvGs/eg6IGSdQy6Jmg=; b=YICS9s8cGplPci++Do1NpU+EWsUwFr37i+tcskMiZqQ8CzHTfXjWSABODQKyI9mfqB xxpnqt11FtmcA2Uq5KPE8QxDSJ5qlHtv3nFrtv79DLZWOqqipIcoafFTgpRHvQahA2sy l4+EIOC0z4F7C3fd6rKEuy7fJDLCC1+wXFFXwgL54lXdyHQqz8UfOJjLtmCmIWiKluOQ Z0NnL9fLZMSAdDx3qjCKIamJwDisu2lNt1PnIiPah/SfkRrYX5E6+OGwwryh22bbv4qE Q0EM72Y5cSQmG80Uf+PLuMYLN7gT4mZVaU1v80zqlb1wy6e2JfrFc6q+QsN1GvXAsyMY Z2SQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695585058; x=1696189858; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=fgyKxqKA15nbfaH4vMDu01hflBvGs/eg6IGSdQy6Jmg=; b=V9JOC9N0xIaNqV8Lg+L3rZFlVBPH1dysZsgvEdIrskalKi3R6H7YGPQhIuC/wxdzSM VnJNdKOzOdaFk409GgVIHPUHSUK6SWVmovbTXm/hhruLM32IdB5DRxffANci5Gnp3cHi rsQhcpgYN+s/yZ2Bjy1BLTx3iZbzWM+1aEvyJp52K6/irtmQiiANF9YeKd3dbSn1G4rN coLM2gMz8dIF1TOwZQdMm+bhbkuTm34RyZ3roiq7CaB3mvRCKFlFeyds8jLCPKCUntWp mS/Nl2oaT7qHfh8cxDOydEwXV4eWiio2CFmq/C6f+I7WB3oGo4UxOwfW8ibVvpXYMKX1 /YUQ== X-Gm-Message-State: AOJu0Yz5rHNsvoxGu73F+ph4/LEreZYL1JBxEnCtzziD431LGb8p8rQB X/cM6xIbh2vFi6yb1b19M0Y= X-Received: by 2002:a05:600c:3223:b0:3fe:d46a:ef4b with SMTP id r35-20020a05600c322300b003fed46aef4bmr4053775wmp.1.1695585057685; Sun, 24 Sep 2023 12:50:57 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p579356c7.dip0.t-ipconnect.de. [87.147.86.199]) by smtp.gmail.com with ESMTPSA id s17-20020a1cf211000000b003fe2a40d287sm10339959wmc.1.2023.09.24.12.50.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Sep 2023 12:50:57 -0700 (PDT) Date: Sun, 24 Sep 2023 21:50:55 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 2/4] staging: rtl8192e: Remove mutex from rtllib_softmac_free() Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Sun, 24 Sep 2023 12:51:19 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777985665710172568 X-GMAIL-MSGID: 1777985665710172568 The following commands use the mutex ieee->wx_mutex: cancel_delayed_work_sync(&ieee->associate_retry_wq) cancel_delayed_work_sync(&ieee->associate_procedure_wq) cancel_work_sync(&ieee->wx_sync_scan_wq) Therefore they cannot be canceled with ieee->wx_mutex locked. As the work functions are executed time shifted during normal operation of the driver, proper locking can only be done inside the functions. Signed-off-by: Philipp Hortmann --- Tested with rtl8192e (WLL6130-D99) in Mode n (12.5 MB/s) Transferred this patch over wlan connection of rtl8192e. [ 261.339100] ====================================================== [ 261.339102] WARNING: possible circular locking dependency detected [ 261.339103] 6.6.0-rc1+ #15 Tainted: G C OE [ 261.339105] ------------------------------------------------------ [ 261.339106] rmmod/6566 is trying to acquire lock: [ 261.339109] ffff888113ca8800 ((work_completion)(&(&ieee->associate_procedure_wq)->work)){+.+.}-{0:0}, at: __flush_work+0x4d/0x490 [ 261.339118] but task is already holding lock: [ 261.339119] ffff888113ca7aa0 (&ieee->wx_mutex){+.+.}-{4:4}, at: rtllib_softmac_free+0x20/0xd0 [rtllib] [ 261.339134] which lock already depends on the new lock. [ 261.339136] the existing dependency chain (in reverse order) is: [ 261.339137] -> #1 (&ieee->wx_mutex){+.+.}-{4:4}: [ 261.339140] __mutex_lock+0x99/0xce0 [ 261.339146] mutex_lock_nested+0x1b/0x30 [ 261.339149] rtllib_associate_procedure_wq+0x5b/0x4b0 [rtllib] [ 261.339159] process_scheduled_works+0x308/0x580 [ 261.339161] worker_thread+0x19b/0x360 [ 261.339163] kthread+0x116/0x150 [ 261.339166] ret_from_fork+0x3c/0x60 [ 261.339170] ret_from_fork_asm+0x1b/0x30 [ 261.339174] -> #0 ((work_completion)(&(&ieee->associate_procedure_wq)->work)){+.+.}-{0:0}: [ 261.339177] __lock_acquire+0x12e0/0x1de0 [ 261.339182] lock_acquire+0xdc/0x2c0 [ 261.339185] __flush_work+0x6d/0x490 [ 261.339187] __cancel_work_timer+0x137/0x1c0 [ 261.339190] cancel_delayed_work_sync+0x13/0x20 [ 261.339192] rtllib_softmac_free+0x5b/0xd0 [rtllib] [ 261.339201] free_rtllib+0x27/0x70 [rtllib] [ 261.339209] _rtl92e_pci_disconnect+0xaf/0x140 [r8192e_pci] [ 261.339217] pci_device_remove+0x39/0xb0 [ 261.339221] device_remove+0x46/0x70 [ 261.339225] device_release_driver_internal+0xb9/0x140 [ 261.339228] driver_detach+0x4d/0xa0 [ 261.339231] bus_remove_driver+0x6e/0xf0 [ 261.339233] driver_unregister+0x31/0x50 [ 261.339236] pci_unregister_driver+0x40/0x90 [ 261.339239] rtl8192_pci_driver_exit+0x10/0x380 [r8192e_pci] [ 261.339247] __do_sys_delete_module.isra.0+0x187/0x2f0 [ 261.339251] __x64_sys_delete_module+0x12/0x20 [ 261.339254] do_syscall_64+0x3b/0x90 [ 261.339257] entry_SYSCALL_64_after_hwframe+0x6e/0xd8 [ 261.339261] other info that might help us debug this: [ 261.339262] Possible unsafe locking scenario: [ 261.339263] CPU0 CPU1 [ 261.339264] ---- ---- [ 261.339265] lock(&ieee->wx_mutex); [ 261.339268] lock((work_completion)(&(&ieee->associate_procedure_wq)->work)); [ 261.339270] lock(&ieee->wx_mutex); [ 261.339272] lock((work_completion)(&(&ieee->associate_procedure_wq)->work)); [ 261.339274] *** DEADLOCK *** [ 261.339275] 2 locks held by rmmod/6566: [ 261.339277] #0: ffff8881015d51b0 (&dev->mutex){....}-{4:4}, at: __device_driver_lock+0x2d/0x50 [ 261.339283] #1: ffff888113ca7aa0 (&ieee->wx_mutex){+.+.}-{4:4}, at: rtllib_softmac_free+0x20/0xd0 [rtllib] [ 261.339295] stack backtrace: [ 261.339296] CPU: 1 PID: 6566 Comm: rmmod Tainted: G C OE 6.6.0-rc1+ #15 [ 261.339299] Hardware name: FUJITSU ESPRIMO P710/D3161-A1, BIOS V4.6.5.3 R1.16.0 for D3161-A1x 10/29/2012 [ 261.339301] Call Trace: [ 261.339302] [ 261.339304] dump_stack_lvl+0x5c/0xa0 [ 261.339309] dump_stack+0x10/0x20 [ 261.339311] print_circular_bug.isra.0+0x300/0x440 [ 261.339316] check_noncircular+0x136/0x150 [ 261.339319] ? register_lock_class+0x4c/0x460 [ 261.339322] ? __bfs+0x110/0x250 [ 261.339326] __lock_acquire+0x12e0/0x1de0 [ 261.339330] ? hugetlb_init+0x5b2/0x720 [ 261.339335] lock_acquire+0xdc/0x2c0 [ 261.339339] ? __flush_work+0x4d/0x490 [ 261.339342] ? __this_cpu_preempt_check+0x13/0x20 [ 261.339345] ? lock_release+0x14f/0x380 [ 261.339349] __flush_work+0x6d/0x490 [ 261.339352] ? __flush_work+0x4d/0x490 [ 261.339354] ? lock_timer_base+0x72/0xa0 [ 261.339357] ? __this_cpu_preempt_check+0x13/0x20 [ 261.339359] ? lock_acquired+0xef/0x3b0 [ 261.339362] ? sched_clock_noinstr+0x9/0x10 [ 261.339367] ? __cancel_work_timer+0x10d/0x1c0 [ 261.339369] ? __this_cpu_preempt_check+0x13/0x20 [ 261.339373] __cancel_work_timer+0x137/0x1c0 [ 261.339377] cancel_delayed_work_sync+0x13/0x20 [ 261.339380] rtllib_softmac_free+0x5b/0xd0 [rtllib] [ 261.339389] free_rtllib+0x27/0x70 [rtllib] [ 261.339397] _rtl92e_pci_disconnect+0xaf/0x140 [r8192e_pci] [ 261.339406] pci_device_remove+0x39/0xb0 [ 261.339410] device_remove+0x46/0x70 [ 261.339413] device_release_driver_internal+0xb9/0x140 [ 261.339417] driver_detach+0x4d/0xa0 [ 261.339420] bus_remove_driver+0x6e/0xf0 [ 261.339424] driver_unregister+0x31/0x50 [ 261.339427] pci_unregister_driver+0x40/0x90 [ 261.339431] rtl8192_pci_driver_exit+0x10/0x380 [r8192e_pci] [ 261.339439] __do_sys_delete_module.isra.0+0x187/0x2f0 [ 261.339442] ? syscall_enter_from_user_mode+0x21/0x60 [ 261.339446] ? lockdep_hardirqs_on+0x86/0x110 [ 261.339450] __x64_sys_delete_module+0x12/0x20 [ 261.339454] do_syscall_64+0x3b/0x90 [ 261.339457] entry_SYSCALL_64_after_hwframe+0x6e/0xd8 [ 261.339461] RIP: 0033:0x7f3b2132da6b [ 261.339464] Code: 73 01 c3 48 8b 0d 25 c4 0c 00 f7 d8 64 89 01 48 83 c8 ff c3 66 2e 0f 1f 84 00 00 00 00 00 90 f3 0f 1e fa b8 b0 00 00 00 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d f5 c3 0c 00 f7 d8 64 89 01 48 [ 261.339466] RSP: 002b:00007ffea140e858 EFLAGS: 00000206 ORIG_RAX: 00000000000000b0 [ 261.339469] RAX: ffffffffffffffda RBX: 00005637c0086770 RCX: 00007f3b2132da6b [ 261.339471] RDX: 000000000000000a RSI: 0000000000000800 RDI: 00005637c00867d8 [ 261.339473] RBP: 00007ffea140e8b8 R08: 0000000000000000 R09: 0000000000000000 [ 261.339474] R10: 00007f3b213a9ac0 R11: 0000000000000206 R12: 00007ffea140ea90 [ 261.339476] R13: 00007ffea140f7c0 R14: 00005637c00862a0 R15: 00005637c0086770 [ 261.339480] --- drivers/staging/rtl8192e/rtllib_softmac.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rtl8192e/rtllib_softmac.c index d3468b646ca8..c874468d075c 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac.c +++ b/drivers/staging/rtl8192e/rtllib_softmac.c @@ -2461,7 +2461,6 @@ int rtllib_softmac_init(struct rtllib_device *ieee) void rtllib_softmac_free(struct rtllib_device *ieee) { - mutex_lock(&ieee->wx_mutex); del_timer_sync(&ieee->associate_timer); cancel_delayed_work_sync(&ieee->associate_retry_wq); @@ -2477,7 +2476,6 @@ void rtllib_softmac_free(struct rtllib_device *ieee) kfree(ieee->dot11d_info); ieee->dot11d_info = NULL; - mutex_unlock(&ieee->wx_mutex); } static inline struct sk_buff * From patchwork Sun Sep 24 19:51:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 144160 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:cae8:0:b0:403:3b70:6f57 with SMTP id r8csp888110vqu; Sun, 24 Sep 2023 16:45:13 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHbvlvOY00ZlCvNKI9iXJYmbu/AuJQYJak0GimlnFPTTm+XaQNiFU0eC3bZqpVVrUuL+oPS X-Received: by 2002:a05:6358:430c:b0:139:c75f:63eb with SMTP id r12-20020a056358430c00b00139c75f63ebmr6384623rwc.21.1695599113260; Sun, 24 Sep 2023 16:45:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695599113; cv=none; d=google.com; s=arc-20160816; b=njsOGxoYS1FVQ98/Thg76R5P5i2F0K05qK/OwktrS4UojlfB9THPQTDTyVDuJmykIi 9fAQFTi6LsVxpkta0jbFHKMRbnyKmDufY1nMO51ayD+OsI/mlC2ROY0PyEQbZHA3IdBV Q3GLOAcPgsY4sQ2RYNNg/RmOpAVzf0aQS2IumfiKsQGASbBUKCvNO4WJvl8Wbokduo8f nyRL1Kwe8Yf5/NuP2h0KOflSypuTQ8dIAmRVAAXoR4MZkSol1KBrYiBv1Euzy5IgWtul 2A47zVdI0gudKNHp4RIBReN0tvCAfyvQU9/NdKQpgmzIvru7YxsQ+Y199pgc3yV287Cr Ubjw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:to:from:date:dkim-signature; bh=MuoEl24Ovx/D9LBO4Mnd3G/eYK2lcTJZM4N+OjhdEbs=; fh=Sw1rtAM+hKyOoOQVYiiLzcdjc4spg79Z/tN6UmWUAKs=; b=WcwKAzl5zOXdOIywzQ0AT0IAxKTRl6dRDD2/324i59bu6hNK3fC/K8R+vzA1TB9/tG yud7fWRfkm6E+NbNuuREDZpWcwWizl+WLyhal2P972Xhu3dcj9lEsmFw6Lxcj2yMKi/q ZHkSl+DyqTWu09WK3bCtKPTyDDyen0KbMgcN0vFp535Q7bS18YwFGL8J07c7RybXFfLF yX+FZ0HYUEuED2y+spwvw4OY5LokPbEOoQNx8mGnTAK8hYdviXeRE91rKm3hDqkKYjAd E91elKW2iFfsYJd88EzH1ksb9Yv+UChCUbLC3E8lTZnhuj5o4Ug5o1xutAygalnmHe0y hDvA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=eOsQYaNg; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from fry.vger.email (fry.vger.email. [2620:137:e000::3:8]) by mx.google.com with ESMTPS id 184-20020a6302c1000000b00565322ef4f1si8949014pgc.348.2023.09.24.16.45.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Sep 2023 16:45:13 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) client-ip=2620:137:e000::3:8; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=eOsQYaNg; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id 9B58280B8F19; Sun, 24 Sep 2023 12:51:29 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231555AbjIXTvY (ORCPT + 30 others); Sun, 24 Sep 2023 15:51:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52912 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231486AbjIXTvP (ORCPT ); Sun, 24 Sep 2023 15:51:15 -0400 Received: from mail-wm1-x330.google.com (mail-wm1-x330.google.com [IPv6:2a00:1450:4864:20::330]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D2F371B4 for ; Sun, 24 Sep 2023 12:51:05 -0700 (PDT) Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-4056ce55e6fso6045425e9.1 for ; Sun, 24 Sep 2023 12:51:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695585064; x=1696189864; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=MuoEl24Ovx/D9LBO4Mnd3G/eYK2lcTJZM4N+OjhdEbs=; b=eOsQYaNgJyH6y+6Orc/0437So4eZ+kqDqIw8G144zexiIs6WVISQKP+LMSzQDRg5rr Tfvwt+ZhBA03LALYIv5sEQsJdsW0Rgeh54mJBLEe0Iza7lvEdxrRU6eCgk9S4kCqtHEJ OZpdkOJrioAAAyfrTeJODo0DxvGBklw1VImlIC4Y4Ck0cMBGvUzjgKEmmy2ZkL/I4HPG ArqD3TegPy3pUYGFPB4Qmc7q09MCOAbi610/hPGwzAAgDBXHRR82bLJnx4Vui1leKQa7 JwaaPUtpyKacMHadk1Pyz4SucIxs/7LVR7C/eEYHLe1/QnlpkvNvH40pfOnIYnUkZeNv 5FJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695585064; x=1696189864; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=MuoEl24Ovx/D9LBO4Mnd3G/eYK2lcTJZM4N+OjhdEbs=; b=HnZjhPEY1GQb26rHUkXyv8e21ILvUS+pirnGtCgzhR0s10d6+JFL2xIBnXzabu4JoN LBp/PUsl580fVqpj3ALmmuPcr6oQZW9QQiqtfvIT8nWSafUW9uDct2vtIga21zgOu2fw 8YPNlZsRtwWVL0FMxfuhHw98UiHMkT4kKHfCletB/bnv5eHUt4u0GDFVSPYHtsAbSQpa 3F2hUZITuE958gzbMic7Jj6YrV/O9ZXitGC5X/L0LXoBwOwR8zDYtOaa7ZPJD//lx4ZF nNQQCaLOrxDxLtzU3fw/oFjUFTlcgOwFylrHby3ndpVF8fpgV+xJYkDHcbq03Z3JlQnk rnsA== X-Gm-Message-State: AOJu0Yz/8jYIa/uezBm3Xv9qdoLpJRvnpeWJhiw63Wb1qGVIjHHpy9Jy CLA+oizysAom6aZTM9cSTq8= X-Received: by 2002:a7b:c456:0:b0:404:72f9:d59a with SMTP id l22-20020a7bc456000000b0040472f9d59amr4358161wmi.0.1695585063719; Sun, 24 Sep 2023 12:51:03 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p579356c7.dip0.t-ipconnect.de. [87.147.86.199]) by smtp.gmail.com with ESMTPSA id y23-20020a05600c365700b004052093a8f6sm10326495wmq.25.2023.09.24.12.51.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Sep 2023 12:51:03 -0700 (PDT) Date: Sun, 24 Sep 2023 21:51:02 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 3/4] staging: rtl8192e: Unlock mutex for one line in rtllib_stop_protocol() Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Sun, 24 Sep 2023 12:51:29 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777964535442986631 X-GMAIL-MSGID: 1777964535442986631 The following command uses the mutex ieee->wx_mutex: cancel_delayed_work_sync(&ieee->associate_retry_wq) Therefore it cannot be canceled with ieee->wx_mutex locked. rtllib_stop_protocol() is always called with ieee->wx_mutex locked so according line can be unlocked. Signed-off-by: Philipp Hortmann --- [ 848.458088] ====================================================== [ 848.458089] WARNING: possible circular locking dependency detected [ 848.458091] 6.6.0-rc1+ #15 Tainted: G C OE [ 848.458102] ------------------------------------------------------ [ 848.458103] kworker/0:9/346 is trying to acquire lock: [ 848.458104] ffff88817dc37aa0 (&ieee->wx_mutex){+.+.}-{4:4}, at: rtllib_associate_retry_wq+0x2d/0xb0 [rtllib] [ 848.458121] but task is already holding lock: [ 848.458122] ffffc900017cfe38 ((work_completion)(&(&ieee->associate_retry_wq)->work)){+.+.}-{0:0}, at: process_scheduled_works+0x27f/0x580 [ 848.458129] which lock already depends on the new lock. [ 848.458130] the existing dependency chain (in reverse order) is: [ 848.458131] -> #1 ((work_completion)(&(&ieee->associate_retry_wq)->work)){+.+.}-{0:0}: [ 848.458134] __flush_work+0x6d/0x490 [ 848.458137] __cancel_work_timer+0x137/0x1c0 [ 848.458140] cancel_delayed_work_sync+0x13/0x20 [ 848.458142] rtllib_stop_protocol.part.0+0x49/0x120 [rtllib] [ 848.458151] rtllib_stop_protocol+0x1c/0x30 [rtllib] [ 848.458159] rtllib_wx_set_essid+0x12a/0x150 [rtllib] [ 848.458167] _rtl92e_wx_set_essid+0x4e/0xa0 [r8192e_pci] [ 848.458176] ioctl_standard_iw_point+0x2e6/0x390 [ 848.458180] ioctl_standard_call+0xaa/0xe0 [ 848.458183] wireless_process_ioctl+0x149/0x170 [ 848.458185] wext_handle_ioctl+0x9e/0x100 [ 848.458188] sock_ioctl+0x203/0x340 [ 848.458192] __x64_sys_ioctl+0x98/0xd0 [ 848.458195] do_syscall_64+0x3b/0x90 [ 848.458198] entry_SYSCALL_64_after_hwframe+0x6e/0xd8 [ 848.458202] -> #0 (&ieee->wx_mutex){+.+.}-{4:4}: [ 848.458206] __lock_acquire+0x12e0/0x1de0 [ 848.458209] lock_acquire+0xdc/0x2c0 [ 848.458212] __mutex_lock+0x99/0xce0 [ 848.458216] mutex_lock_nested+0x1b/0x30 [ 848.458219] rtllib_associate_retry_wq+0x2d/0xb0 [rtllib] [ 848.458227] process_scheduled_works+0x308/0x580 [ 848.458229] worker_thread+0x19b/0x360 [ 848.458231] kthread+0x116/0x150 [ 848.458234] ret_from_fork+0x3c/0x60 [ 848.458237] ret_from_fork_asm+0x1b/0x30 [ 848.458242] other info that might help us debug this: [ 848.458243] Possible unsafe locking scenario: [ 848.458244] CPU0 CPU1 [ 848.458245] ---- ---- [ 848.458246] lock((work_completion)(&(&ieee->associate_retry_wq)->work)); [ 848.458248] lock(&ieee->wx_mutex); [ 848.458250] lock((work_completion)(&(&ieee->associate_retry_wq)->work)); [ 848.458252] lock(&ieee->wx_mutex); [ 848.458254] *** DEADLOCK *** [ 848.458255] 2 locks held by kworker/0:9/346: [ 848.458257] #0: ffff88810004f148 ((wq_completion)events){+.+.}-{0:0}, at: process_scheduled_works+0x27f/0x580 [ 848.458262] #1: ffffc900017cfe38 ((work_completion)(&(&ieee->associate_retry_wq)->work)){+.+.}-{0:0}, at: process_scheduled_works+0x27f/0x580 [ 848.458266] stack backtrace: [ 848.458268] CPU: 0 PID: 346 Comm: kworker/0:9 Tainted: G C OE 6.6.0-rc1+ #15 [ 848.458270] Hardware name: FUJITSU ESPRIMO P710/D3161-A1, BIOS V4.6.5.3 R1.16.0 for D3161-A1x 10/29/2012 [ 848.458272] Workqueue: events rtllib_associate_retry_wq [rtllib] [ 848.458281] Call Trace: [ 848.458283] [ 848.458285] dump_stack_lvl+0x5c/0xa0 [ 848.458288] dump_stack+0x10/0x20 [ 848.458291] print_circular_bug.isra.0+0x300/0x440 [ 848.458295] check_noncircular+0x136/0x150 [ 848.458298] ? ret_from_fork_asm+0x1b/0x30 [ 848.458302] ? __kernel_text_address+0x12/0x40 [ 848.458305] __lock_acquire+0x12e0/0x1de0 [ 848.458311] lock_acquire+0xdc/0x2c0 [ 848.458314] ? rtllib_associate_retry_wq+0x2d/0xb0 [rtllib] [ 848.458324] __mutex_lock+0x99/0xce0 [ 848.458327] ? rtllib_associate_retry_wq+0x2d/0xb0 [rtllib] [ 848.458336] ? rtllib_associate_retry_wq+0x2d/0xb0 [rtllib] [ 848.458344] ? __this_cpu_preempt_check+0x13/0x20 [ 848.458348] mutex_lock_nested+0x1b/0x30 [ 848.458351] ? mutex_lock_nested+0x1b/0x30 [ 848.458354] rtllib_associate_retry_wq+0x2d/0xb0 [rtllib] [ 848.458363] process_scheduled_works+0x308/0x580 [ 848.458368] ? __pfx_worker_thread+0x10/0x10 [ 848.458370] worker_thread+0x19b/0x360 [ 848.458373] ? __pfx_worker_thread+0x10/0x10 [ 848.458375] kthread+0x116/0x150 [ 848.458378] ? __pfx_kthread+0x10/0x10 [ 848.458381] ret_from_fork+0x3c/0x60 [ 848.458384] ? __pfx_kthread+0x10/0x10 [ 848.458387] ret_from_fork_asm+0x1b/0x30 [ 848.458392] --- drivers/staging/rtl8192e/rtllib_softmac.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rtl8192e/rtllib_softmac.c index c874468d075c..72d0225dfdf1 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac.c +++ b/drivers/staging/rtl8192e/rtllib_softmac.c @@ -2307,7 +2307,9 @@ void rtllib_stop_protocol(struct rtllib_device *ieee, u8 shutdown) } del_timer_sync(&ieee->associate_timer); + mutex_unlock(&ieee->wx_mutex); cancel_delayed_work_sync(&ieee->associate_retry_wq); + mutex_lock(&ieee->wx_mutex); cancel_delayed_work_sync(&ieee->link_change_wq); rtllib_stop_scan(ieee);