From patchwork Tue Aug 20 16:15:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dawid Osuchowski X-Patchwork-Id: 13770451 X-Patchwork-Delegate: kuba@kernel.org Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.21]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6CA4C208D7 for ; Tue, 20 Aug 2024 16:16:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.21 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724170606; cv=none; b=BHGPEZPO1Z/gX7P9BCiEr/dSdgV4TJjETZMG3/ZbqWDR8mwvPdOA/98dJzFjskxjdkyxccyYp7N0MMES3t0RnNcuS73IRk+u75NQ5eMCOknrnE7Tw/yvzOo0nAW/S1O8V3BDLaBuYOFXgaWfdzQTLwdjHy4ms7mFFakdb2HOVNo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724170606; c=relaxed/simple; bh=mCCvaMkdnhuYW+qISu3LkjPeWGUYJVB6928qIq6h5xQ=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=OJMPHvdTBzIt1L9NtL+GJrb0g6cv0vwI+nNg4bWZIJpJPT4sszcI+D8z2MVJRrgpOsckCEo2baI+dviuTAhePyFN81WzwylujXTBR7TO88a5trY6IBx72rqCbEZ1EMzC3nwYYW+UljJMjBFU2thOMASL6+uqtpp4V70aZT3OkIo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=KEcCTSYp; arc=none smtp.client-ip=198.175.65.21 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="KEcCTSYp" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1724170605; x=1755706605; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=mCCvaMkdnhuYW+qISu3LkjPeWGUYJVB6928qIq6h5xQ=; b=KEcCTSYpC3LUjL6zR2cPFZvYgp3QxGPy1S+O5HAB24grgBkkG0arFXjr bvCKUwaqVdUV5JHGvYP/LBgEY42EZE7Sv02UEBRkb/PXV0yITdD8lfZSQ 8J0jxVoUTTgPL1pmtqAs1jKFjSTsvOicZYg4WPBfFPUk48UKslwjkI8En Q+fFCvchR1oDyzgJzH7Ce/7fbjVkKcC3vL+IS0Ou+uQDGDvGs15tw9e67 Fkd4KENHGHlEDTnf1W/JIQ0fwRJyJCiJFvL/Ve1rswXyD/VsUwaxBha4u pzngL6qXfuT3zgqc+UgqSPMVmbNP5rA2hp6bThqMRNcR6se8QhHJR0zF0 g==; X-CSE-ConnectionGUID: CA5h5+kaR3mnvFiAsRpxYg== X-CSE-MsgGUID: jWaWIIhkRAOk0R7n/yttog== X-IronPort-AV: E=McAfee;i="6700,10204,11170"; a="22452820" X-IronPort-AV: E=Sophos;i="6.10,162,1719903600"; d="scan'208";a="22452820" 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 Cc: netdev@vger.kernel.org, larysa.zaremba@intel.com, maciej.fijalkowski@intel.com, kalesh-anakkur.purayil@broadcom.com, Dawid Osuchowski , Jakub Kicinski , Igor Bagnucki Subject: [PATCH iwl-net v4] ice: Add netif_device_attach/detach into PF reset flow 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 Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org 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 */