From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-lf1-f50.google.com (mail-lf1-f50.google.com [209.85.167.50]) (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 61CEB38228C for ; Wed, 13 May 2026 09:09:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.50 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778663369; cv=none; b=EpqCoTGPhQ+UORt+c6XoV4lT9nRwGnaZFm+aNfbHI2043MT8Drz+K9roLMQnEtSoAWokWtL/5DJdITwo01eh1jtdLuXIJoRyq7i2rG8BVz7WR0osPyZ/sav4A42Sh1SMaVO4lMwY+Jv+SSFqnxdZf5yTuqZURe2ONLU+EjFs2M0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778663369; c=relaxed/simple; bh=8wgVrvTzhPuyby+YsggHPtQ7/AgumtARByVyaARbZb0=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type: Content-Disposition; b=fe2aJHpqmvM1xfiByEplf0daJ9ObpLvu7wnpCY4tHkFQm5dcHzLknNHpgxdNZsd88M1zK9Tkw81/XOJH/0xf4l9l6RN6ORWsAFh8jC1k/q8evXZHOUdKEMtcGOksfBtK3BILJj+pvUdgA46NyjNjJ0J9OpbHsSADoJXRayEc3VA= 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=RFD11lWO; arc=none smtp.client-ip=209.85.167.50 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="RFD11lWO" Received: by mail-lf1-f50.google.com with SMTP id 2adb3069b0e04-5a8d1f43432so4665356e87.3 for ; Wed, 13 May 2026 02:09:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1778663367; x=1779268167; darn=vger.kernel.org; h=user-agent:content-disposition:mime-version:message-id:subject:cc :to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=fYyER6YbOgaODTitWGTBF5s2T8z2KS499gj7ChXFEfA=; b=RFD11lWOlZNOM7VW69G9qtkwmzUFfIqvRKEAUuB1Dc7GC1oQLe7fF+aIyGz0N6AIXh hmrPGpO5sAYhj4agTDPx/dPn0xKj4dKLmbKExH6IwouQ07Zs07V+WR3HqD3FP7YTt65g HQh1qVazOKOfMZf0FmH7N+tFHak5eR3BsQ08MHyZtrxDSqgw9BTSijmCAjMg9lCK+WMD gopENqdZ875x6Qa3zMA594hEmSkaRjuGfcd07buA1a1k9p5zGm67TPmvptk7kngETZaD fjmKZ7MnudlWDOTTAOmpTLgcgE+3W8C1/zs6C9Wx0k8gALdVoUUB7AwKmWdZQB8ovr15 GepQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778663367; x=1779268167; h=user-agent:content-disposition:mime-version:message-id:subject:cc :to:from:date:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=fYyER6YbOgaODTitWGTBF5s2T8z2KS499gj7ChXFEfA=; b=Rg/Fx3O3it4DM30IivxNwmomfpfy1VBoHNMjFteEE55vp/yJ9/vCJxro57z5ui3Yd3 zMfQuZNNPpRg0AtVTdw7TfCAe1cFviIbOOp4oDA2Rg9QQYjAMjMv0hktnovO/FkDAMo5 C0RNRKq3YYqG+iVz+dWbEiqiqLy5xMGrhHAebO8OQCT0e4bbTj+EFwhSEf+Ns+IdXaLh JtdZv2+ypXp4nV7oajfWYzh4uchBYUkbh3JpZuYw4N4tJfqSGPYsNbFFmXw8//8BTco3 xa/8rVeoW5/iB5B4COwP5JJZzQ0KWH9+OZJ1gXXyOFhpkctdsjEfH/gogu0F3pNzapVL lcyA== X-Gm-Message-State: AOJu0YwUpVOedGz81Pv0mfxwZx9BCNCdFrqD0r/kyvzYC81ADROWrSnL sFFPk3C1wdCxLNjctgHNJ6SfaPMrCj8+YLRW+dLbbnGh6fBwjssHVLqh X-Gm-Gg: Acq92OHnj9zWYhVtrg6tnybK2HF2HCzEV3NV5aBmhP7Hk4SxlQRsDoKOtatDyNaizMl yP6Fju0qTR0drHGKONC4bj84QrJC5Jrm0dIuCZHb40zrpfp0P56Mi9zo/ZEVIp3iO8WqlNLBEZm YLnA9FcVPngeYiU+7sgR/SLhD6pbbQtO7YG+NzzdJ9lcX39U/uF/0MsURMIw+sMsIoIK9hXEpu1 haFlkZMA4JAMuTGkbjGoHC7HrkHuGFa5YDg9KDfZHF9jz1F7pMe2FFLuKRGp5MK69+ZyTk+zRNV N77md7P6RmagzEo0bwagBOKXAJ6qmxK2nlrpvDq3zZrLGl2cyFTOzf4KF5S19kDiaOiexua4D6d Lp2BjRqvVO1X1iZ2jSIGWToPCd4CMIrWK2wu4x6USGwqNfRZnZabgISzUA6hKJYsqXksXaYdoqW Qqlsno+FOV+AdxULZWHQtBOrkl X-Received: by 2002:a05:6512:3c9f:b0:5a8:d1ed:8d4a with SMTP id 2adb3069b0e04-5a8f445a687mr630442e87.40.1778663366402; Wed, 13 May 2026 02:09:26 -0700 (PDT) Received: from grain.localdomain ([5.18.255.97]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5a8a956b1cfsm3975152e87.73.2026.05.13.02.09.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 May 2026 02:09:26 -0700 (PDT) Received: by grain.localdomain (Postfix, from userid 1000) id 8720A5A0185; Wed, 13 May 2026 12:09:25 +0300 (MSK) Date: Wed, 13 May 2026 12:09:25 +0300 From: Cyrill Gorcunov To: LKML , NETDEV Cc: Tony Nguyen , Przemek Kitszel Subject: [PATCH] ice: Fix wrong dsn read in ice_adapter_put Message-ID: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/2.3.1 (2026-03-20) When registering an adapter instance, we read the PCI configuration space to fetch the DSN and generate an adapter index for lookups. However, if the adapter has been physically unplugged, the PCI space is no longer accessible. Reading it returns a zero value, which results in either an incorrect adapter instance being put or the proper instance not being put at all. To fix this, we will use the previously known index instead. Signed-off-by: Cyrill Gorcunov --- drivers/net/ethernet/intel/ice/ice_adapter.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Index: linux-tip.git/drivers/net/ethernet/intel/ice/ice_adapter.c =================================================================== --- linux-tip.git.orig/drivers/net/ethernet/intel/ice/ice_adapter.c +++ linux-tip.git/drivers/net/ethernet/intel/ice/ice_adapter.c @@ -130,13 +130,13 @@ struct ice_adapter *ice_adapter_get(stru */ void ice_adapter_put(struct pci_dev *pdev) { + const struct ice_pf *pf = pci_get_drvdata(pdev); + unsigned long index = pf->adapter->index; struct ice_adapter *adapter; - unsigned long index; - index = ice_adapter_xa_index(pdev); scoped_guard(mutex, &ice_adapters_mutex) { adapter = xa_load(&ice_adapters, index); - if (WARN_ON(!adapter)) + if (WARN_ON(!adapter || adapter != pf->adapter)) return; if (!refcount_dec_and_test(&adapter->refcount)) return;