From: Petr Valenta <petr@jevklidu.cz>
To: Bjorn Helgaas <helgaas@kernel.org>, Jiri Slaby <jirislaby@kernel.org>
Cc: Bjorn Helgaas <bhelgaas@google.com>, Len Brown <lenb@kernel.org>,
"linux-acpi@vger.kernel.org" <linux-acpi@vger.kernel.org>,
Linux kernel mailing list <linux-kernel@vger.kernel.org>,
Linux regressions mailing list <regressions@lists.linux.dev>,
Tony Nguyen <anthony.l.nguyen@intel.com>,
przemyslaw.kitszel@intel.com, intel-wired-lan@lists.osuosl.org,
"Rafael J. Wysocki" <rafael@kernel.org>
Subject: Re: ACPI IRQ storm with 6.10
Date: Tue, 20 Aug 2024 23:13:54 +0200 [thread overview]
Message-ID: <7ec28d20-c729-496a-b8bf-2bf88bbb4d70@jevklidu.cz> (raw)
In-Reply-To: <20240820180952.GA217979@bhelgaas>
Dne 20. 08. 24 v 20:09 Bjorn Helgaas napsal(a):
> [+to Petr, -cc Jesse, bouncing]
>
> On Mon, Aug 19, 2024 at 07:23:42AM +0200, Jiri Slaby wrote:
>> On 19. 08. 24, 6:50, Jiri Slaby wrote:
>>> CC e1000e guys + Jesse (due to 75a3f93b5383) + Bjorn (due to b2c289415b2b)
>>
>> Bjorn,
>>
>> I am confused by these changes:
>> ==========================================
>> @@ -291,16 +288,13 @@ static int e1000_set_link_ksettings(struct net_device
>> *net
>> dev,
>> * duplex is forced.
>> */
>> if (cmd->base.eth_tp_mdix_ctrl) {
>> - if (hw->phy.media_type != e1000_media_type_copper) {
>> - ret_val = -EOPNOTSUPP;
>> - goto out;
>> - }
>> + if (hw->phy.media_type != e1000_media_type_copper)
>> + return -EOPNOTSUPP;
>>
>> if ((cmd->base.eth_tp_mdix_ctrl != ETH_TP_MDI_AUTO) &&
>> (cmd->base.autoneg != AUTONEG_ENABLE)) {
>> e_err("forcing MDI/MDI-X state is not supported when
>> lin
>> k speed and/or duplex are forced\n");
>> - ret_val = -EINVAL;
>> - goto out;
>> + return -EINVAL;
>> }
>> }
>>
>> @@ -347,7 +341,6 @@ static int e1000_set_link_ksettings(struct net_device
>> *netde
>> v,
>> }
>>
>> out:
>> - pm_runtime_put_sync(netdev->dev.parent);
>> clear_bit(__E1000_RESETTING, &adapter->state);
>> return ret_val;
>> }
>> ==========================================
>>
>> So no more clear_bit(__E1000_RESETTING in the above fail paths. Is that
>> intentional?
>
> Not intentional. Petr, do you have the ability to test the patch
> below? I'm not sure it's the correct fix, but it reverts the pieces
> of b2c289415b2b that Jiri pointed out.
>
I tested the patch below but it didn't help. After the first boot with
new kernel it looked promising as the irq storm only appeared for a few
seconds, but with subsequent reboots it was the same as without the patch.
To be sure, I also send the md5sum of ethtool.c after applying the patch:
a25c003257538f16994b4d7c4260e894 ethtool.c
> diff --git a/drivers/net/ethernet/intel/e1000e/ethtool.c b/drivers/net/ethernet/intel/e1000e/ethtool.c
> index 9364bc2b4eb1..9db36ee71684 100644
> --- a/drivers/net/ethernet/intel/e1000e/ethtool.c
> +++ b/drivers/net/ethernet/intel/e1000e/ethtool.c
> @@ -280,7 +280,8 @@ static int e1000_set_link_ksettings(struct net_device *netdev,
> if (hw->phy.ops.check_reset_block &&
> hw->phy.ops.check_reset_block(hw)) {
> e_err("Cannot change link characteristics when SoL/IDER is active.\n");
> - return -EINVAL;
> + ret_val = -EINVAL;
> + goto out;
> }
>
> /* MDI setting is only allowed when autoneg enabled because
> @@ -288,13 +289,16 @@ static int e1000_set_link_ksettings(struct net_device *netdev,
> * duplex is forced.
> */
> if (cmd->base.eth_tp_mdix_ctrl) {
> - if (hw->phy.media_type != e1000_media_type_copper)
> - return -EOPNOTSUPP;
> + if (hw->phy.media_type != e1000_media_type_copper) {
> + ret_val = -EOPNOTSUPP;
> + goto out;
> + }
>
> if ((cmd->base.eth_tp_mdix_ctrl != ETH_TP_MDI_AUTO) &&
> (cmd->base.autoneg != AUTONEG_ENABLE)) {
> e_err("forcing MDI/MDI-X state is not supported when link speed and/or duplex are forced\n");
> - return -EINVAL;
> + ret_val = -EINVAL;
> + goto out;
> }
> }
>
next prev parent reply other threads:[~2024-08-20 21:14 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-14 5:22 Jiri Slaby
2024-08-14 6:47 ` Jiri Slaby
2024-08-16 18:29 ` Rafael J. Wysocki
2024-08-16 21:36 ` Petr Valenta
2024-08-17 17:57 ` Petr Valenta
2024-08-19 4:50 ` Jiri Slaby
2024-08-19 5:23 ` Jiri Slaby
2024-08-19 16:47 ` Bjorn Helgaas
2024-08-20 18:09 ` Bjorn Helgaas
2024-08-20 21:13 ` Petr Valenta [this message]
2024-08-20 21:30 ` Bjorn Helgaas
2024-08-21 5:09 ` Jiri Slaby
2024-08-21 11:39 ` Petr Valenta
2024-08-21 14:59 ` Bjorn Helgaas
[not found] ` <1041b9b5-cc78-13b1-459a-d1d3a313475a@intel.com>
2024-08-22 7:44 ` Petr Valenta
2024-08-22 8:33 ` Petr Valenta
2024-08-22 9:18 ` Vitaly Lifshits
2024-08-22 10:24 ` Petr Valenta
2024-08-20 18:44 ` Bjorn Helgaas
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7ec28d20-c729-496a-b8bf-2bf88bbb4d70@jevklidu.cz \
--to=petr@jevklidu.cz \
--cc=anthony.l.nguyen@intel.com \
--cc=bhelgaas@google.com \
--cc=helgaas@kernel.org \
--cc=intel-wired-lan@lists.osuosl.org \
--cc=jirislaby@kernel.org \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=przemyslaw.kitszel@intel.com \
--cc=rafael@kernel.org \
--cc=regressions@lists.linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®