From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm2-f12.google.com (mail-wm2-f12.google.com [74.125.225.140]) (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 30E1F3B0AD3 for ; Mon, 14 Sep 2026 07:16:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.225.140 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789370166; cv=none; b=s9Ce82+j0MYgMnx3Q5/S0jATKP6Rka5sIpVwDL1a349pWfPQlltcytxTX+LSsx2KOqJY6YwvH9MpcEpK9tkxwy4o6JSY8n3WX+1z/L/VMGWGHlrkFEPNKzuMmA4BTCiB3tpNTdSeGB7CcfoV+1BcYpJFTaCIndY8aeMHhdLIX24= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789370166; c=relaxed/simple; bh=Z2lb95NyFj5VMsmWjYdqmvMmkWFzhfs0R05riKxv8DI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=STRrZgN1AFDCJtq84epZ5b/1ndPN31/znrs9ReGDrXW8tVqp3nJFT7TEHTJ6ysD/hm+gWjarJI1ErgGKUBtjlfXdMVfZaLWGIELJSPlUT4lljo1w1OG/vCMvG8T1Ul4K7+28+SZd0U+CyzdhMGxhCWlGnVrqVtt8H1v6F4kb8go= 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=EyRugKS9; arc=none smtp.client-ip=74.125.225.140 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="EyRugKS9" Received: by mail-wm2-f12.google.com with SMTP id 5b1f17b1804b1-49cd38e0e5dso19928795e9.2 for ; Mon, 14 Sep 2026 00:16:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1789370163; x=1789974963; 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:content-type; bh=CYDvBl7Hf5spaenerJy9kw2Xhfgsi5OoXNIquuHbSV8=; b=EyRugKS9GCbkM5p6x9ZscNtVNToZLTaNyVuuaQR3fDtnmRBpYPwz3cnSx4txSSpL43 lv0L7kV7mjwpfc8gq3x3k4GA3myUduSISe0qMXVwFF6RTyPIN874QDjQfFc+nGolw8IA tYhw6FBJhEv7UlW/j8/T19N68RLjTm9wyITvbEhd4CwGgyFIKSQFZe56ci1DCxX2uiM8 OYQKqpPhMv2eWAALKhpgl4hKimtEGXLuXSH7gD1uVmn4NUV+GKOpm+oLjs+LF4RGtNbq Qxs3D7WeKHYmfqjjuaR5Uly17lO6ZnO627fCe1kz7qBw7pdBYmNvxp8pH6LlvxLYGSLP FWXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1789370163; x=1789974963; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=CYDvBl7Hf5spaenerJy9kw2Xhfgsi5OoXNIquuHbSV8=; b=nyHWt3bUgz8raJ1E2947tPVGQRbNJw+UBJfPS5zDkZEeo9UP1oh8S6hZgp5hZD9XOO k7u88TsidiTN7GnFLYH7gV4oirMHAWI2pYVwOYWQpa8J0oAEA/j0eGq+Vej90BGdosUL lQHfPmGsJmLLAy/CvVEFqo1ry9R0GtCwUejjOFKQVGUi3i8UJNQpMc59GoRb7m9YipCv BuNoREAVqwtatH+cZCiVx4a+AGcyVEwS4YSxCuNFPKuXCmeKuDt9myxlEF/zGKuemtHL /IV+HbkosoR3UjNG2HC2LSuZSu/VmO/ntaQkBOBj6ngecz5FH6xClf9ryFzNYl1K0xb/ Bu4A== X-Forwarded-Encrypted: i=1; AKwUvBzOXKRCAuckyzh8+NTbjBFnkbJrYQnJSfCyHi+9kDfZOTHDuEt7obpi10lY0LjnAfhRyk/Oq8g=@vger.kernel.org X-Gm-Message-State: AFuF++mkTmiGwT64PbkqjAyvZz9KNZwnDMQ/waKOFUVZ2bKsEYsj9KkX kL36m7M0VPlV49e2nC1ymqE+XX4TtZIUq+JNifdmsDQvYzDQt9kb0fj5 X-Gm-Gg: AYBFou0oSLkeUOoSZGQ0Z+T4jJ0JeE5orDhvy90BX07KbyFpIN3jEnKkcccY7PqlnwI ofZRSN6SKOQDVHlF2r7VpYMVNt+N0oZjee5CLISoMP3W7L52GOfapRYMMxqSK60VkwemeDPLnUf 6ekODVvFO5sTsRAnG9xKswFV76xM/SGaPY2Xqm4FLNLxhcLqAAB/ae4WpsXcnPIa/hzP4AXdsJZ K6X+MuvjqPlthDUJd8YTmNhUe4r/xlWLfcsEJ8sVMC1r1MlSXDgt2Q03WHzCI4tpu+ph2sYDrBT iZxYxaJ5F6Nyro54e90wJ5sA3TtcPhRp2n1dE2LM1Zu8gN3rIXnLp2Fmft71Fto8hFRkWLnu3Cc No9Vg2OGdu0HzmGFjLEoXQqh/dQ/2cCDmlgepB3LetHrNHeWDDEnSGuuhZ/1/ChMZkkfN4VMUXr HZwbpE+TuyKTdCHrj9qTPd8s74qHXhRx/PKkScuAFG1mCRuhIPoUXDUyq/skpmge+DunbSetRDx 9+vdcfDXMLNDp89+BE9O+FFSrtGujy0HQlGclrN X-Received: by 2002:a05:600c:8b6b:b0:49c:d52e:d0ea with SMTP id 5b1f17b1804b1-49e7a64acc2mr29705975e9.4.1789370163158; Mon, 14 Sep 2026 00:16:03 -0700 (PDT) Received: from fedora-tap.advaoptical.com ([82.166.23.19]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-486eb357288sm25161082f8f.29.2026.09.14.00.15.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Sep 2026 00:16:01 -0700 (PDT) From: Sagi Maimon To: Richard Cochran , Vadim Fedorenko , Jakub Kicinski , "David S. Miller" , Eric Dumazet , Paolo Abeni , Andrew Lunn , Simon Horman , Jiri Pirko , Arkadiusz Kubalewski , Jonathan Corbet , Randy Dunlap , Shuah Khan , netdev@vger.kernel.org Cc: linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, Sagi Maimon Subject: [PATCH net-next v14 1/4] ptp: ocp: unregister devlink before detach on probe error Date: Mon, 14 Sep 2026 10:15:52 +0300 Message-ID: <20260914071555.11684-2-maimon.sagi@gmail.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20260914071555.11684-1-maimon.sagi@gmail.com> References: <20260914071555.11684-1-maimon.sagi@gmail.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit devlink_register() runs before the dpll setup in ptp_ocp_probe(), but the failure paths after it went straight to ptp_ocp_detach() and then devlink_free(), which opens with ASSERT_DEVLINK_NOT_REGISTERED(devlink). Any dpll failure during probe therefore freed a devlink instance that was still registered. Route those paths through a new out_devlink label that unregisters first, matching the order ptp_ocp_remove() already uses. Fixes: 09eeb3aecc6c ("ptp_ocp: implement DPLL ops") Signed-off-by: Sagi Maimon --- drivers/ptp/ptp_ocp.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/ptp/ptp_ocp.c b/drivers/ptp/ptp_ocp.c index 3d26ec1f7b9e..401b04f12d2b 100644 --- a/drivers/ptp/ptp_ocp.c +++ b/drivers/ptp/ptp_ocp.c @@ -5119,12 +5119,12 @@ ptp_ocp_probe(struct pci_dev *pdev, const struct pci_device_id *id) if (IS_ERR(bp->dpll)) { err = PTR_ERR(bp->dpll); dev_err(&pdev->dev, "dpll_device_alloc failed\n"); - goto out; + goto out_devlink; } err = dpll_device_register(bp->dpll, DPLL_TYPE_PPS, &dpll_ops, bp); if (err) - goto out; + goto out_devlink; for (i = 0; i < OCP_SMA_NUM; i++) { bp->sma[i].dpll_pin = dpll_pin_get(clkid, i, THIS_MODULE, @@ -5151,6 +5151,8 @@ ptp_ocp_probe(struct pci_dev *pdev, const struct pci_device_id *id) dpll_pin_put(bp->sma[i].dpll_pin, &bp->sma[i].tracker); } dpll_device_put(bp->dpll, &bp->tracker); +out_devlink: + devlink_unregister(devlink); out: ptp_ocp_detach(bp); out_disable: -- 2.47.0