From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id CF766C3DA4A for ; Tue, 20 Aug 2024 16:16:50 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 843A64014D; Tue, 20 Aug 2024 16:16:50 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id NAqE5lfg-DQQ; Tue, 20 Aug 2024 16:16:49 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=intel-wired-lan-bounces@osuosl.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 3A1BC401DF DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=osuosl.org; s=default; t=1724170609; bh=HTTXLIuJSU8bEb4VLmqX87SLxVWy1+GFEpn3mb/vDz0=; h=From:To:Date:Subject:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:Cc:From; b=1ck6N+slDP/12WQjfBu5c2FApqlRCySAriwdjb3ivaUg+UanKgGR6dEoBsFtWqFaQ yfWNZY4KCiyMXbcftHoXYnoSYBjryy5CtNtBcafEutxP1EpXruAt2nUEozqLOdVMNY +u7pis7YuVEgapbPJ23+9zg1Q5QDAVjCr/+Yt5U79Ix/4Zb4b/jK3EN3UWtXXGqSKY +e7Z/fhxz5Wv5CJS+74fF2dJvMz1cyVgW8zwIQOth9eNvtfV7yGYCj88XLqLbzRMUb z9qZrJu8wXIlsDcI+zomniy+ODl9+Z7z2ScVNWpzGEaxPNPf8TDqENrNObjXjChQAz MC28SKdeOfLog== Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp2.osuosl.org (Postfix) with ESMTP id 3A1BC401DF; Tue, 20 Aug 2024 16:16:49 +0000 (UTC) Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id D1BB41BF37A for ; Tue, 20 Aug 2024 16:16:47 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id BE7B581276 for ; Tue, 20 Aug 2024 16:16:47 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id wNnD3q_VkJ9W for ; Tue, 20 Aug 2024 16:16:46 +0000 (UTC) Received-SPF: None (mailfrom) identity=mailfrom; client-ip=198.175.65.21; helo=mgamail.intel.com; envelope-from=dawid.osuchowski@linux.intel.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp1.osuosl.org 1FB9C81271 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 1FB9C81271 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.21]) by smtp1.osuosl.org (Postfix) with ESMTPS id 1FB9C81271 for ; Tue, 20 Aug 2024 16:16:45 +0000 (UTC) X-CSE-ConnectionGUID: XATnUAMRTjy410eRHr8PjA== X-CSE-MsgGUID: EnGIIEoGQ7uyHvGHEVXeOQ== X-IronPort-AV: E=McAfee;i="6700,10204,11170"; a="22452823" X-IronPort-AV: E=Sophos;i="6.10,162,1719903600"; d="scan'208";a="22452823" Received: from orviesa002.jf.intel.com ([10.64.159.142]) by orvoesa113.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Aug 2024 09:15:53 -0700 X-CSE-ConnectionGUID: 6zDUOe6XTTu9DbWTyc7pjw== X-CSE-MsgGUID: jRtI3O3LSLC5n78td7lzEA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.10,162,1719903600"; d="scan'208";a="91502808" Received: from pae-dbg-x10sri-f_n1_f.igk.intel.com (HELO localhost.igk.intel.com) ([10.91.240.220]) by orviesa002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Aug 2024 09:15:50 -0700 From: Dawid Osuchowski To: intel-wired-lan@lists.osuosl.org Date: Tue, 20 Aug 2024 18:15:24 +0200 Message-ID: <20240820161524.108578-1-dawid.osuchowski@linux.intel.com> X-Mailer: git-send-email 2.44.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1724170607; x=1755706607; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=mCCvaMkdnhuYW+qISu3LkjPeWGUYJVB6928qIq6h5xQ=; b=d8Ayq8fsco8eEax5iAM6DPdNMq+MVhNI11yPPdxnWqDTcX0pzb3WebUq yr5bwyQ325GxGo1mxia6RbdkrVWY40mAObGSR7Wq5Mq+M6xqP2lydPtuk U/O+XQrySBSm9VteROe899eVIWdsu20/og2vuQynjPWMMmRg7i5qZdpnk BaXEzjdcijRB03tZNkHPBnzGRphe0mCs6soWQUHSPIzjo5tFOXFquNb0i WaKqnQIBNtEDsmIqwvQRmwYA6xMB8XOtuTGiw2WaoAVXX1oB2IWUmOrxI +TCdwoiOPPJccbX2qkKNq4Aj9rHvTq9HWoHCG7j+naVnMKrSzuP7buxia A==; X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dmarc=none (p=none dis=none) header.from=linux.intel.com X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dkim=pass (2048-bit key, unprotected) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=d8Ayq8fs Subject: [Intel-wired-lan] [PATCH iwl-net v4] ice: Add netif_device_attach/detach into PF reset flow X-BeenThere: intel-wired-lan@osuosl.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel Wired Ethernet Linux Kernel Driver Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: maciej.fijalkowski@intel.com, larysa.zaremba@intel.com, netdev@vger.kernel.org, kalesh-anakkur.purayil@broadcom.com, Igor Bagnucki , Jakub Kicinski , Dawid Osuchowski Errors-To: intel-wired-lan-bounces@osuosl.org Sender: "Intel-wired-lan" Ethtool callbacks can be executed while reset is in progress and try to access deleted resources, e.g. getting coalesce settings can result in a NULL pointer dereference seen below. Reproduction steps: Once the driver is fully initialized, trigger reset: # echo 1 > /sys/class/net//device/reset when reset is in progress try to get coalesce settings using ethtool: # ethtool -c BUG: kernel NULL pointer dereference, address: 0000000000000020 PGD 0 P4D 0 Oops: Oops: 0000 [#1] PREEMPT SMP PTI CPU: 11 PID: 19713 Comm: ethtool Tainted: G S 6.10.0-rc7+ #7 RIP: 0010:ice_get_q_coalesce+0x2e/0xa0 [ice] RSP: 0018:ffffbab1e9bcf6a8 EFLAGS: 00010206 RAX: 000000000000000c RBX: ffff94512305b028 RCX: 0000000000000000 RDX: 0000000000000000 RSI: ffff9451c3f2e588 RDI: ffff9451c3f2e588 RBP: 0000000000000000 R08: 0000000000000000 R09: 0000000000000000 R10: ffff9451c3f2e580 R11: 000000000000001f R12: ffff945121fa9000 R13: ffffbab1e9bcf760 R14: 0000000000000013 R15: ffffffff9e65dd40 FS: 00007faee5fbe740(0000) GS:ffff94546fd80000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000000000000020 CR3: 0000000106c2e005 CR4: 00000000001706f0 Call Trace: ice_get_coalesce+0x17/0x30 [ice] coalesce_prepare_data+0x61/0x80 ethnl_default_doit+0xde/0x340 genl_family_rcv_msg_doit+0xf2/0x150 genl_rcv_msg+0x1b3/0x2c0 netlink_rcv_skb+0x5b/0x110 genl_rcv+0x28/0x40 netlink_unicast+0x19c/0x290 netlink_sendmsg+0x222/0x490 __sys_sendto+0x1df/0x1f0 __x64_sys_sendto+0x24/0x30 do_syscall_64+0x82/0x160 entry_SYSCALL_64_after_hwframe+0x76/0x7e RIP: 0033:0x7faee60d8e27 Calling netif_device_detach() before reset makes the net core not call the driver when ethtool command is issued, the attempt to execute an ethtool command during reset will result in the following message: netlink error: No such device instead of NULL pointer dereference. Once reset is done and ice_rebuild() is executing, the netif_device_attach() is called to allow for ethtool operations to occur again in a safe manner. Fixes: fcea6f3da546 ("ice: Add stats and ethtool support") Suggested-by: Jakub Kicinski Reviewed-by: Igor Bagnucki Signed-off-by: Dawid Osuchowski --- Changes since v1: * Changed Fixes tag to point to another commit * Minified the stacktrace Changes since v2: * Moved netif_device_attach() directly into ice_rebuild() and perform it only on main vsi Changes since v3: * Style changes requested by Przemek Kitszel Suggestion from Kuba: https://lore.kernel.org/netdev/20240610194756.5be5be90@kernel.org/ Previous attempt (dropped because it introduced regression with link up): https://lore.kernel.org/netdev/20240722122839.51342-1-dawid.osuchowski@linux.intel.com/ --- drivers/net/ethernet/intel/ice/ice_main.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c index eaa73cc200f4..a840690f2385 100644 --- a/drivers/net/ethernet/intel/ice/ice_main.c +++ b/drivers/net/ethernet/intel/ice/ice_main.c @@ -608,6 +608,9 @@ ice_prepare_for_reset(struct ice_pf *pf, enum ice_reset_req reset_type) memset(&vsi->mqprio_qopt, 0, sizeof(vsi->mqprio_qopt)); } } + + if (vsi->netdev) + netif_device_detach(vsi->netdev); skip: /* clear SW filtering DB */ @@ -7591,6 +7594,7 @@ static void ice_rebuild(struct ice_pf *pf, enum ice_reset_req reset_type) { struct device *dev = ice_pf_to_dev(pf); struct ice_hw *hw = &pf->hw; + struct ice_vsi *vsi = ice_get_main_vsi(pf); bool dvm; int err; @@ -7731,6 +7735,9 @@ static void ice_rebuild(struct ice_pf *pf, enum ice_reset_req reset_type) ice_rebuild_arfs(pf); } + if (vsi && vsi->netdev) + netif_device_attach(vsi->netdev); + ice_update_pf_netdev_link(pf); /* tell the firmware we are up */ -- 2.44.0