From patchwork Fri Apr 5 20:29:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 13619393 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-lj1-f179.google.com (mail-lj1-f179.google.com [209.85.208.179]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E90BC174ED5 for ; Fri, 5 Apr 2024 20:29:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712348960; cv=none; b=pXu9E4DfVsPaslspXdha2amq2mvWwWnV7oncabatqKhdB3DEMQDX4p1QuokvqYvEmw5KHZUznOGW7yVaTb2RcOPduPGNubCuiCMWwPUyywf34XXqZeG4RXfYCoqhdtw4YSxv26WJcdSefck1kKaGb706Wu6rLDVDgoycFbq457M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712348960; c=relaxed/simple; bh=SIKxjQ5uGFsLjoRcZZ6RhVfRtu4RHZDzTmqkSL9r6UM=; h=Message-ID:Date:MIME-Version:Cc:From:Subject:To:Content-Type; b=b0AA69WTwP4c/ZkJF1MY6Txz3hOnR/D7GT7i1xgOPTo2OSIR/08X6pf6mf1KOK+M/9qHglqJqETJmRcANMrzq5vMKTnKd5RvAafhOsHU3zNqDwDCRU+eiVYDnu96h8wubaNZB6rfB88Sj4WSKx9MgEalNr/2v2Ca2S4V4R5+mtQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=FUJvKpsK; arc=none smtp.client-ip=209.85.208.179 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="FUJvKpsK" Received: by mail-lj1-f179.google.com with SMTP id 38308e7fff4ca-2d8129797fcso33847891fa.1 for ; Fri, 05 Apr 2024 13:29:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1712348956; x=1712953756; darn=vger.kernel.org; h=content-transfer-encoding:to:autocrypt:subject:from:cc :content-language:user-agent:mime-version:date:message-id:from:to:cc :subject:date:message-id:reply-to; bh=I8K/7MorK30NpCqnMG3JqcQN0gZJgIyPD9B3dUB8TvI=; b=FUJvKpsKdSVt+vLC239GhTJmGmGIcPIfabLoSkyw3hMpSc9DgAUilcGASeMuoytNEC a/HTUI5jblPyaAcO4vjO6T9CTRFxhKKPcgfhiwvcBP38vgmxU5NQv31GR26MoOg1Z6QJ QI07cQBJIjzyh+tMmvAIsxUn1ElcUj1ZH6O8wotxZoVEzMtVCMf0t8MTF4aFyk+5t2BE wZAUgL7CPxpzbmPnchj1r6G7t1jyJng4ldPhsmZ5dDyw5BbmykELrS83/XCZitbfb53/ n4hDS3NEpZhXcfeKOgvVNAuL2jDU2q1Xc+DffsX/Nk4UItYKP8p3k2V4AL+NP/prsvdR D7iw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712348956; x=1712953756; h=content-transfer-encoding:to:autocrypt:subject:from:cc :content-language:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=I8K/7MorK30NpCqnMG3JqcQN0gZJgIyPD9B3dUB8TvI=; b=hKdYXVeYIDszwqCcdcUabCdgOv1vbaPqHt7LqaK7p9xnxV5cpDZw9tqsl1nwVos+BK K9oQao93BDPxb+oeUGyyXwb8fZLfapwJbGJKNcG12pjXEf/jqPYoFRrf8ABJ430ubQ/L 7DM2hwj4CxjJ5kWeNI2tnfmV782w7GPCRH6TcAaj5Nybtuo4ptfHhU5Iq+6dklfoEQ5s cre1eZ7/AM4U32MpMpNFczD19z6tISfEvUel5OBVxbCewESK7gD2fcxXjL5rLaA2OOFL tkXt10eoUzH/963h8WUd/KjVDG5yHHStf4TxldhfdGqoiNnEBsWWJ1YjSw6xoMzAHv9R Tb4g== X-Forwarded-Encrypted: i=1; AJvYcCXQxbCS2SOFaIcMa7IBLZnJTzjZSjzGrOiFbbFMivTEXpurXgIWmyGbAOcC0knKzv8b/Ue+l2gxyNH+4RhkdczfRA78Z1Cw X-Gm-Message-State: AOJu0YxL3BQbGzcxn8pvBPACpf6AzkQGB5xMD0eExPezk06q3TmxlTc5 aDbQjlRtvGL4w3e7c70dumwasGxxZrzvIjBHrCsC6wAtDRoCYdIX X-Google-Smtp-Source: AGHT+IGfgpzqH/wl5V4hyG93qVAMN1QswdKt6virMzYxULwOrBvh4YLtv1YozVlhIFDU1+9OI7B5SA== X-Received: by 2002:a19:ca07:0:b0:516:ced5:3afa with SMTP id a7-20020a19ca07000000b00516ced53afamr1899827lfg.5.1712348956304; Fri, 05 Apr 2024 13:29:16 -0700 (PDT) Received: from ?IPV6:2a01:c22:72bb:b200:e0e0:cd27:7a04:5c79? (dynamic-2a01-0c22-72bb-b200-e0e0-cd27-7a04-5c79.c22.pool.telefonica.de. [2a01:c22:72bb:b200:e0e0:cd27:7a04:5c79]) by smtp.googlemail.com with ESMTPSA id e9-20020a17090618e900b00a4655513f0bsm1210303ejf.88.2024.04.05.13.29.15 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 05 Apr 2024 13:29:15 -0700 (PDT) Message-ID: Date: Fri, 5 Apr 2024 22:29:15 +0200 Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US Cc: Lukas Wunner , "netdev@vger.kernel.org" From: Heiner Kallweit Subject: [PATCH net] r8169: fix LED-related deadlock on module removal Autocrypt: addr=hkallweit1@gmail.com; keydata= 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 To: Eric Dumazet , Paolo Abeni , Jakub Kicinski , David Miller , Realtek linux nic maintainers X-Patchwork-Delegate: kuba@kernel.org Binding devm_led_classdev_register() to the netdev is problematic because on module removal we get a RTNL-related deadlock. Fix this by using the parent device instead for device-managed resources. This is cleaner anyway because then all device-managed resources in the driver use the same device (the one belonging to the PCI device). Fixes: 18764b883e15 ("r8169: add support for LED's on RTL8168/RTL8101") Cc: stable@vger.kernel.org Reported-by: Lukas Wunner Suggested-by: Lukas Wunner Signed-off-by: Heiner Kallweit --- drivers/net/ethernet/realtek/r8169_leds.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/net/ethernet/realtek/r8169_leds.c b/drivers/net/ethernet/realtek/r8169_leds.c index 7c5dc9d0d..7f2b8a361 100644 --- a/drivers/net/ethernet/realtek/r8169_leds.c +++ b/drivers/net/ethernet/realtek/r8169_leds.c @@ -146,13 +146,12 @@ static void rtl8168_setup_ldev(struct r8169_led_classdev *ldev, led_cdev->hw_control_get_device = r8169_led_hw_control_get_device; /* ignore errors */ - devm_led_classdev_register(&ndev->dev, led_cdev); + devm_led_classdev_register(ndev->dev.parent, led_cdev); } void rtl8168_init_leds(struct net_device *ndev) { - /* bind resource mgmt to netdev */ - struct device *dev = &ndev->dev; + struct device *dev = ndev->dev.parent; struct r8169_led_classdev *leds; int i; @@ -245,13 +244,12 @@ static void rtl8125_setup_led_ldev(struct r8169_led_classdev *ldev, led_cdev->hw_control_get_device = r8169_led_hw_control_get_device; /* ignore errors */ - devm_led_classdev_register(&ndev->dev, led_cdev); + devm_led_classdev_register(ndev->dev.parent, led_cdev); } void rtl8125_init_leds(struct net_device *ndev) { - /* bind resource mgmt to netdev */ - struct device *dev = &ndev->dev; + struct device *dev = ndev->dev.parent; struct r8169_led_classdev *leds; int i;