From nobody Tue Nov 26 01:47:57 2024 Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) (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 7E1F91CC8AA for ; Tue, 22 Oct 2024 21:53:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729633982; cv=none; b=e3Jx6Ln0nNUlE+dHwSsBRZ1SJfYyae5fyRKJl5KMeGyi0G1EPAvzNs/m+7vfXEXhXKD/81ffWUXVLHNUmAnNhYPfb0PnVyyiknDC4wvRkG6KGvhjO8DtOP93XNGD3oHCu9VEqh96YT8V4cPVHXar7fm779erbyAJFD/9+YemDwo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729633982; c=relaxed/simple; bh=g4AGHfFsmNBHhh+32vEdnyiyGH20LdrZ8q9xYLKZ3/o=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Tf/yNepWCNNWDBxVJUnpp9Hss7CygJKf5JTqBaV2x9IcGmXQ3neG8OEI/KFIfK7CYc1ynOOOjyRPEIzlh0+vfYuH7uxl17yc16u4H+hBl2wGJQre0L4ZCGxnV7XAW+GT3p3sA4Y3+cmhTWcYHqCixjFhw4bMzaMC3bagHyNVhG4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=fastly.com; spf=pass smtp.mailfrom=fastly.com; dkim=pass (1024-bit key) header.d=fastly.com header.i=@fastly.com header.b=QUA5rFtU; arc=none smtp.client-ip=209.85.210.169 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=fastly.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=fastly.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=fastly.com header.i=@fastly.com header.b="QUA5rFtU" Received: by mail-pf1-f169.google.com with SMTP id d2e1a72fcca58-71e8235f0b6so4652502b3a.3 for ; Tue, 22 Oct 2024 14:53:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastly.com; s=google; t=1729633981; x=1730238781; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=PWinoD1wO6ePUpgD5DMyiNj/aEcCeyyglRhhpFipWcw=; b=QUA5rFtUeK/46sX+7mAIID4pAtWY+t5roORQBtPSJ/FKv+1TcU2jJ/Ql6YobNcamFJ mncum8SewPR/k6F9YMsoNVkhlgViVlknop0m2qp2lRi+PWndhnQzHUCS3jShegLxi2EM 71+shaECltD87Mjrd1OFrDbY+wyxka5yeo90w= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729633981; x=1730238781; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=PWinoD1wO6ePUpgD5DMyiNj/aEcCeyyglRhhpFipWcw=; b=fjSz7RhD/VswZFqbSMki0ZB0ZIE3w/r2JLdTrhQj3ZjphH9g38vnBmknUC5TG4x9bX IxWyN9hFuQLEqP70QJxWOEoc3FrmO6snpGFUALSx6gO6wNT3QKlz4yaGQzq7bveZvw/2 ODvHzW0DIJW/Sl6MP8elAHraugaxFhtrAxd6nruJSwAzjdv6o2+g03jSJeioexUmndMz ptjuf+9RjKfCnE9u70056IqaUBBi3kBl2/uU3pjwRJ/rcfyE2+r9Wz8KZdUejNWL1MRB BZyEU/Q5iY9NSF0sK3UujwSOvSH1nDGPdn1LAAUWD08O8vRA1VgUjGcaPZmBXHPngQRA uW2A== X-Forwarded-Encrypted: i=1; AJvYcCWiNzHdY42c9HjJeHiaVyojNd5Z7dWgvIOKtbsJBp/ofRmhRjh7pxZOGjNXjrl/VKKVBXiZXYJjsr99+FI=@vger.kernel.org X-Gm-Message-State: AOJu0Yzf/oejAZ55BaEqff6aorUamyBi5A/Az1DRta5X6/O3GQiBxoki 0IdwoYYzr3EhKaYuIl2bvWrHtyL2FdNMggz0T/ju7WXy50QrwdlG2pG4lxHiYDI= X-Google-Smtp-Source: AGHT+IEBGKBqCfafdvHpjRzZnehZKZkddBy+EkierZd4IZWl7C0GOGagj0Q5numluvTKArbqw3mVhw== X-Received: by 2002:a05:6a00:2e1c:b0:71e:634e:fe0d with SMTP id d2e1a72fcca58-72030a8ae4bmr1005608b3a.12.1729633980674; Tue, 22 Oct 2024 14:53:00 -0700 (PDT) Received: from localhost.localdomain ([2620:11a:c019:0:65e:3115:2f58:c5fd]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-71ec13d75b9sm5194375b3a.131.2024.10.22.14.52.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Oct 2024 14:53:00 -0700 (PDT) From: Joe Damato To: netdev@vger.kernel.org Cc: jacob.e.keller@intel.com, kurt@linutronix.de, vinicius.gomes@intel.com, Joe Damato , Tony Nguyen , Przemek Kitszel , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , intel-wired-lan@lists.osuosl.org (moderated list:INTEL ETHERNET DRIVERS), linux-kernel@vger.kernel.org (open list) Subject: [iwl-next v4 1/2] igc: Link IRQs to NAPI instances Date: Tue, 22 Oct 2024 21:52:44 +0000 Message-Id: <20241022215246.307821-2-jdamato@fastly.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20241022215246.307821-1-jdamato@fastly.com> References: <20241022215246.307821-1-jdamato@fastly.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Link IRQs to NAPI instances via netdev-genl API so that users can query this information with netlink. Compare the output of /proc/interrupts (noting that IRQ 128 is the "other" IRQ which does not appear to have a NAPI instance): $ cat /proc/interrupts | grep enp86s0 | cut --delimiter=3D":" -f1 128 129 130 131 132 The output from netlink shows the mapping of NAPI IDs to IRQs (again noting that 128 is absent as it is the "other" IRQ): $ ./tools/net/ynl/cli.py --spec Documentation/netlink/specs/netdev.yaml \ --dump napi-get --json=3D'{"ifindex": 2}' [{'defer-hard-irqs': 0, 'gro-flush-timeout': 0, 'id': 8196, 'ifindex': 2, 'irq': 132}, {'defer-hard-irqs': 0, 'gro-flush-timeout': 0, 'id': 8195, 'ifindex': 2, 'irq': 131}, {'defer-hard-irqs': 0, 'gro-flush-timeout': 0, 'id': 8194, 'ifindex': 2, 'irq': 130}, {'defer-hard-irqs': 0, 'gro-flush-timeout': 0, 'id': 8193, 'ifindex': 2, 'irq': 129}] Signed-off-by: Joe Damato Acked-by: Vinicius Costa Gomes --- v4: - Fix typo in commit message (replacing 144 with 128) v2: - Line wrap at 80 characters drivers/net/ethernet/intel/igc/igc_main.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/ethernet/intel/igc/igc_main.c b/drivers/net/ethern= et/intel/igc/igc_main.c index 6e70bca15db1..7964bbedb16c 100644 --- a/drivers/net/ethernet/intel/igc/igc_main.c +++ b/drivers/net/ethernet/intel/igc/igc_main.c @@ -5576,6 +5576,9 @@ static int igc_request_msix(struct igc_adapter *adapt= er) q_vector); if (err) goto err_free; + + netif_napi_set_irq(&q_vector->napi, + adapter->msix_entries[vector].vector); } =20 igc_configure_msix(adapter); --=20 2.25.1 From nobody Tue Nov 26 01:47:57 2024 Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) (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 5DF511CDFBD for ; Tue, 22 Oct 2024 21:53:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729633985; cv=none; b=fPnJPOU0utbNNijKWk2Poq3Yd1IowmcnEaEd3yHCq0sVDF/xAG+ZLK5di624TPXB3paccucPp9WaoJWwQq8rxtdLfqRxiQtGYW5q68mRKNIudsSRu8/bSCtz7ZUCde1q6dE6VBZSSu6hJxmsSidHE7swaQ29m+BHtBZ0FXT24u4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729633985; c=relaxed/simple; bh=uXNQQt4GmPGz8CyecR0wdkkb7QgO0NDr8DnSq+dZQrI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=RgCkVGW0sLSpdaQcv2lqvWiflIlQ/7FI2f+JwLIBYmAMVJYCXVyoKt/36Mo78CxkfFed2tKvh2bEfBZQovfA3/yplOYI5OTca0KQEVPA88s2Z16jTTLwt/N4mFRcE7Ki00ki9BAospmT0shHTYKYQqyL6q1ScM29sYqxsGL1rUk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=fastly.com; spf=pass smtp.mailfrom=fastly.com; dkim=pass (1024-bit key) header.d=fastly.com header.i=@fastly.com header.b=flkqyZbE; arc=none smtp.client-ip=209.85.210.169 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=fastly.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=fastly.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=fastly.com header.i=@fastly.com header.b="flkqyZbE" Received: by mail-pf1-f169.google.com with SMTP id d2e1a72fcca58-71e93d551a3so4363161b3a.1 for ; Tue, 22 Oct 2024 14:53:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastly.com; s=google; t=1729633983; x=1730238783; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=yu/fX3X5EHjeQVvxkbdBwctpaSABzbSE8yyiwWRX/QA=; b=flkqyZbERRcScgcl915h6iWp2/CgLrbhx/HFgRUg+4Mw3I1vk1icdX1N732DJ4dcgC ba7fOLOkcFZPYvpdOA1LP+eRg1SKCEtmJMZUFuQMmV8zTh6mI9aT5wjbWL8sgaJQz4Bo AtaSsHO/ivU91mw9rMuIf4dM5z7WoIv8ujBOI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729633983; x=1730238783; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=yu/fX3X5EHjeQVvxkbdBwctpaSABzbSE8yyiwWRX/QA=; b=l+9tKiWxBQ97vx2QC1QQWLQoDZGT7IvFCO3KKrLCbYHFIpLNSC1vy23Tm29QeEholA izcq3thmFMtoZfAHTAa2jljecIO03lTIcwtsftYMOlVno/FNkH25i+pFGE3OtNhDKWmJ OD5aNywixiiBgXOcZUAJVQSB79FMbnV1hDiFpr0iLaePRgPPlDfDN8CvxxD5Lfsm7TWc idX22cztQpoV4HO4UcrqG1qMDWZp2FkP7KiPpIbX177XCnBUUu4VzEsjvr10h51SYYcM zmaw7QV1X5fPUTCFR4lc2iexb9r7a5BZ2OblNxiSzS6Sftvd8n+ba6bwlK9PxruAVa+a 8vQQ== X-Forwarded-Encrypted: i=1; AJvYcCVDfbQzsUQ7wc3U9Znni4YGAY0SpVhg5Mp1F7/waQwE+32ep6uNB5k70DdrhI2MaWEJfrVBp5xacEQ9vQg=@vger.kernel.org X-Gm-Message-State: AOJu0Yy/ptOxWN7KiPFpsMBoZ/oodo4/6INC95T0RCOHzTRxVmgIfzBp F7J4aP9kgcOGDSzNS90YioU9GK/dLMryShOvOFLZFZed/zJN5vyaw78yjIEHPzY= X-Google-Smtp-Source: AGHT+IH4isynMkoiDOybRISeWiy9JT1O/biRUjKmi+P0qbCUFonIWqa8OOZz8Txnn8elOaBsjA6aHQ== X-Received: by 2002:a05:6a00:4f90:b0:71d:f64d:ec60 with SMTP id d2e1a72fcca58-72030babcb0mr922064b3a.7.1729633982713; Tue, 22 Oct 2024 14:53:02 -0700 (PDT) Received: from localhost.localdomain ([2620:11a:c019:0:65e:3115:2f58:c5fd]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-71ec13d75b9sm5194375b3a.131.2024.10.22.14.53.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Oct 2024 14:53:02 -0700 (PDT) From: Joe Damato To: netdev@vger.kernel.org Cc: jacob.e.keller@intel.com, kurt@linutronix.de, vinicius.gomes@intel.com, Joe Damato , Tony Nguyen , Przemek Kitszel , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Alexei Starovoitov , Daniel Borkmann , Jesper Dangaard Brouer , John Fastabend , intel-wired-lan@lists.osuosl.org (moderated list:INTEL ETHERNET DRIVERS), linux-kernel@vger.kernel.org (open list), bpf@vger.kernel.org (open list:XDP (eXpress Data Path)) Subject: [iwl-next v4 2/2] igc: Link queues to NAPI instances Date: Tue, 22 Oct 2024 21:52:45 +0000 Message-Id: <20241022215246.307821-3-jdamato@fastly.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20241022215246.307821-1-jdamato@fastly.com> References: <20241022215246.307821-1-jdamato@fastly.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Link queues to NAPI instances via netdev-genl API so that users can query this information with netlink. Handle a few cases in the driver: 1. Link/unlink the NAPIs when XDP is enabled/disabled 2. Handle IGC_FLAG_QUEUE_PAIRS enabled and disabled Example output when IGC_FLAG_QUEUE_PAIRS is enabled: $ ./tools/net/ynl/cli.py --spec Documentation/netlink/specs/netdev.yaml \ --dump queue-get --json=3D'{"ifindex": 2}' [{'id': 0, 'ifindex': 2, 'napi-id': 8193, 'type': 'rx'}, {'id': 1, 'ifindex': 2, 'napi-id': 8194, 'type': 'rx'}, {'id': 2, 'ifindex': 2, 'napi-id': 8195, 'type': 'rx'}, {'id': 3, 'ifindex': 2, 'napi-id': 8196, 'type': 'rx'}, {'id': 0, 'ifindex': 2, 'napi-id': 8193, 'type': 'tx'}, {'id': 1, 'ifindex': 2, 'napi-id': 8194, 'type': 'tx'}, {'id': 2, 'ifindex': 2, 'napi-id': 8195, 'type': 'tx'}, {'id': 3, 'ifindex': 2, 'napi-id': 8196, 'type': 'tx'}] Since IGC_FLAG_QUEUE_PAIRS is enabled, you'll note that the same NAPI ID is present for both rx and tx queues at the same index, for example index 0: {'id': 0, 'ifindex': 2, 'napi-id': 8193, 'type': 'rx'}, {'id': 0, 'ifindex': 2, 'napi-id': 8193, 'type': 'tx'}, To test IGC_FLAG_QUEUE_PAIRS disabled, a test system was booted using the grub command line option "maxcpus=3D2" to force igc_set_interrupt_capability to disable IGC_FLAG_QUEUE_PAIRS. Example output when IGC_FLAG_QUEUE_PAIRS is disabled: $ lscpu | grep "On-line CPU" On-line CPU(s) list: 0,2 $ ethtool -l enp86s0 | tail -5 Current hardware settings: RX: n/a TX: n/a Other: 1 Combined: 2 $ cat /proc/interrupts | grep enp 144: [...] enp86s0 145: [...] enp86s0-rx-0 146: [...] enp86s0-rx-1 147: [...] enp86s0-tx-0 148: [...] enp86s0-tx-1 1 "other" IRQ, and 2 IRQs for each of RX and Tx, so we expect netlink to report 4 IRQs with unique NAPI IDs: $ ./tools/net/ynl/cli.py --spec Documentation/netlink/specs/netdev.yaml \ --dump napi-get --json=3D'{"ifindex": 2}' [{'id': 8196, 'ifindex': 2, 'irq': 148}, {'id': 8195, 'ifindex': 2, 'irq': 147}, {'id': 8194, 'ifindex': 2, 'irq': 146}, {'id': 8193, 'ifindex': 2, 'irq': 145}] Now we examine which queues these NAPIs are associated with, expecting that since IGC_FLAG_QUEUE_PAIRS is disabled each RX and TX queue will have its own NAPI instance: $ ./tools/net/ynl/cli.py --spec Documentation/netlink/specs/netdev.yaml \ --dump queue-get --json=3D'{"ifindex": 2}' [{'id': 0, 'ifindex': 2, 'napi-id': 8193, 'type': 'rx'}, {'id': 1, 'ifindex': 2, 'napi-id': 8194, 'type': 'rx'}, {'id': 0, 'ifindex': 2, 'napi-id': 8195, 'type': 'tx'}, {'id': 1, 'ifindex': 2, 'napi-id': 8196, 'type': 'tx'}] Signed-off-by: Joe Damato Acked-by: Vinicius Costa Gomes --- v4: - Add rtnl_lock/rtnl_unlock in two paths: igc_resume and igc_io_error_detected. The code added to the latter is inspired by a similar implementation in ixgbe's ixgbe_io_error_detected. v3: - Replace igc_unset_queue_napi with igc_set_queue_napi(adapater, i, NULL), as suggested by Vinicius Costa Gomes - Simplify implemention of igc_set_queue_napi as suggested by Kurt Kanzenbach, with a tweak to use ring->queue_index v2: - Update commit message to include tests for IGC_FLAG_QUEUE_PAIRS disabled - Refactored code to move napi queue mapping and unmapping to helper functions igc_set_queue_napi and igc_unset_queue_napi - Adjust the code to handle IGC_FLAG_QUEUE_PAIRS disabled - Call helpers to map/unmap queues to NAPIs in igc_up, __igc_open, igc_xdp_enable_pool, and igc_xdp_disable_pool drivers/net/ethernet/intel/igc/igc.h | 2 ++ drivers/net/ethernet/intel/igc/igc_main.c | 41 ++++++++++++++++++++--- drivers/net/ethernet/intel/igc/igc_xdp.c | 2 ++ 3 files changed, 40 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/intel/igc/igc.h b/drivers/net/ethernet/in= tel/igc/igc.h index eac0f966e0e4..b8111ad9a9a8 100644 --- a/drivers/net/ethernet/intel/igc/igc.h +++ b/drivers/net/ethernet/intel/igc/igc.h @@ -337,6 +337,8 @@ struct igc_adapter { struct igc_led_classdev *leds; }; =20 +void igc_set_queue_napi(struct igc_adapter *adapter, int q_idx, + struct napi_struct *napi); void igc_up(struct igc_adapter *adapter); void igc_down(struct igc_adapter *adapter); int igc_open(struct net_device *netdev); diff --git a/drivers/net/ethernet/intel/igc/igc_main.c b/drivers/net/ethern= et/intel/igc/igc_main.c index 7964bbedb16c..04aa216ef612 100644 --- a/drivers/net/ethernet/intel/igc/igc_main.c +++ b/drivers/net/ethernet/intel/igc/igc_main.c @@ -4948,6 +4948,22 @@ static int igc_sw_init(struct igc_adapter *adapter) return 0; } =20 +void igc_set_queue_napi(struct igc_adapter *adapter, int vector, + struct napi_struct *napi) +{ + struct igc_q_vector *q_vector =3D adapter->q_vector[vector]; + + if (q_vector->rx.ring) + netif_queue_set_napi(adapter->netdev, + q_vector->rx.ring->queue_index, + NETDEV_QUEUE_TYPE_RX, napi); + + if (q_vector->tx.ring) + netif_queue_set_napi(adapter->netdev, + q_vector->tx.ring->queue_index, + NETDEV_QUEUE_TYPE_TX, napi); +} + /** * igc_up - Open the interface and prepare it to handle traffic * @adapter: board private structure @@ -4955,6 +4971,7 @@ static int igc_sw_init(struct igc_adapter *adapter) void igc_up(struct igc_adapter *adapter) { struct igc_hw *hw =3D &adapter->hw; + struct napi_struct *napi; int i =3D 0; =20 /* hardware has been reset, we need to reload some things */ @@ -4962,8 +4979,11 @@ void igc_up(struct igc_adapter *adapter) =20 clear_bit(__IGC_DOWN, &adapter->state); =20 - for (i =3D 0; i < adapter->num_q_vectors; i++) - napi_enable(&adapter->q_vector[i]->napi); + for (i =3D 0; i < adapter->num_q_vectors; i++) { + napi =3D &adapter->q_vector[i]->napi; + napi_enable(napi); + igc_set_queue_napi(adapter, i, napi); + } =20 if (adapter->msix_entries) igc_configure_msix(adapter); @@ -5192,6 +5212,7 @@ void igc_down(struct igc_adapter *adapter) for (i =3D 0; i < adapter->num_q_vectors; i++) { if (adapter->q_vector[i]) { napi_synchronize(&adapter->q_vector[i]->napi); + igc_set_queue_napi(adapter, i, NULL); napi_disable(&adapter->q_vector[i]->napi); } } @@ -6021,6 +6042,7 @@ static int __igc_open(struct net_device *netdev, bool= resuming) struct igc_adapter *adapter =3D netdev_priv(netdev); struct pci_dev *pdev =3D adapter->pdev; struct igc_hw *hw =3D &adapter->hw; + struct napi_struct *napi; int err =3D 0; int i =3D 0; =20 @@ -6056,8 +6078,11 @@ static int __igc_open(struct net_device *netdev, boo= l resuming) =20 clear_bit(__IGC_DOWN, &adapter->state); =20 - for (i =3D 0; i < adapter->num_q_vectors; i++) - napi_enable(&adapter->q_vector[i]->napi); + for (i =3D 0; i < adapter->num_q_vectors; i++) { + napi =3D &adapter->q_vector[i]->napi; + napi_enable(napi); + igc_set_queue_napi(adapter, i, napi); + } =20 /* Clear any pending interrupts. */ rd32(IGC_ICR); @@ -7385,7 +7410,9 @@ static int igc_resume(struct device *dev) wr32(IGC_WUS, ~0); =20 if (netif_running(netdev)) { + rtnl_lock(); err =3D __igc_open(netdev, true); + rtnl_unlock(); if (!err) netif_device_attach(netdev); } @@ -7440,14 +7467,18 @@ static pci_ers_result_t igc_io_error_detected(struc= t pci_dev *pdev, struct net_device *netdev =3D pci_get_drvdata(pdev); struct igc_adapter *adapter =3D netdev_priv(netdev); =20 + rtnl_lock(); netif_device_detach(netdev); =20 - if (state =3D=3D pci_channel_io_perm_failure) + if (state =3D=3D pci_channel_io_perm_failure) { + rtnl_unlock(); return PCI_ERS_RESULT_DISCONNECT; + } =20 if (netif_running(netdev)) igc_down(adapter); pci_disable_device(pdev); + rtnl_unlock(); =20 /* Request a slot reset. */ return PCI_ERS_RESULT_NEED_RESET; diff --git a/drivers/net/ethernet/intel/igc/igc_xdp.c b/drivers/net/etherne= t/intel/igc/igc_xdp.c index e27af72aada8..4da633430b80 100644 --- a/drivers/net/ethernet/intel/igc/igc_xdp.c +++ b/drivers/net/ethernet/intel/igc/igc_xdp.c @@ -84,6 +84,7 @@ static int igc_xdp_enable_pool(struct igc_adapter *adapte= r, napi_disable(napi); } =20 + igc_set_queue_napi(adapter, queue_id, NULL); set_bit(IGC_RING_FLAG_AF_XDP_ZC, &rx_ring->flags); set_bit(IGC_RING_FLAG_AF_XDP_ZC, &tx_ring->flags); =20 @@ -133,6 +134,7 @@ static int igc_xdp_disable_pool(struct igc_adapter *ada= pter, u16 queue_id) xsk_pool_dma_unmap(pool, IGC_RX_DMA_ATTR); clear_bit(IGC_RING_FLAG_AF_XDP_ZC, &rx_ring->flags); clear_bit(IGC_RING_FLAG_AF_XDP_ZC, &tx_ring->flags); + igc_set_queue_napi(adapter, queue_id, napi); =20 if (needs_reset) { napi_enable(napi); --=20 2.25.1