From patchwork Thu Feb 6 17:45:01 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Patchwork-Id: 13963383 X-Patchwork-Delegate: kuba@kernel.org Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (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 2E59518A6AD; Thu, 6 Feb 2025 17:46:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738863969; cv=none; b=cbMv7UuNYy6QO5RENQmuNnFwux0QfX57fZFiAjNo6xCI1U173lK2SFcLxptEKIBpFRnOKdR1TsrG1izy8mbHB80lQ1EPs29YUccV3YUj9Slh4WOpCl8Mv/77YGgvV87Pzc5bl+T9tS0TtRUiM6+6LnascExpVsH5SUALDYBz5Vs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738863969; c=relaxed/simple; bh=o8hw8b06FQjYLKmUpeXn7PVmDXgAzF3nOanhCnadJMY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=YRs5NHQizxA1FEouvyTxVoSI+uAk4tdSwCsv+HKSycu0jd079Xd2suGwBSSb5iEGwqgc7gjtSjqSpkgdDduMgzaHgcHn3GHge7Xb4gEqHjs7l3bUBFBwHywNEEPj0er+j5xvywOvK/OUrYaN/AuuElLMYfiQJLpakvgyej+Perg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=31sDh86z; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=TQcE3EIg; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="31sDh86z"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="TQcE3EIg" From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1738863966; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=CC4gUgCnxt0BPV+hTHbd+rpIn+XhiTgaTWIDW6YhHwQ=; b=31sDh86za1XRzhLoqf8DJ944rJhnU5PFJP8AqqmdZ/7Ip1ZC+56rKWKufMKl/6R5/CSsyd X+TsuHRmqM+Rff6Z4lF1Z9wQo37JLIsuGW808nOLdCFSqaC0fYJGz2KblqnvAztRjjJiFc se5WVpgyooTq3v9RhKSYIKDZBxNEiFkfiWwM6ySLLCjk0M+mUHPt4N5e5F3OFzWAIO1ior xAA7aM4a4jFxSad0Smbk1x8ZgbvPahU13n+NZKYO3M/WkfDhQRhyeN9+3itKYLNqrZdZbE XHiATvWoh4qe3JtF4CCEw2k7J1oVq5JNdGimaxVlf8RAmcMvHu93k5f+DtAewg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1738863966; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=CC4gUgCnxt0BPV+hTHbd+rpIn+XhiTgaTWIDW6YhHwQ=; b=TQcE3EIgyB3zc567VE5TKCsWwZdRx0N9VnOE+GafORIhGgnuFcwdZPD3xp7Nv8p9eTNuoI BwZiqNcG8pKnBpCA== Date: Thu, 06 Feb 2025 18:45:01 +0100 Subject: [PATCH net-next 1/4] ptp: vmclock: Set driver data before its usage Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250206-vmclock-probe-v1-1-17a3ea07be34@linutronix.de> References: <20250206-vmclock-probe-v1-0-17a3ea07be34@linutronix.de> In-Reply-To: <20250206-vmclock-probe-v1-0-17a3ea07be34@linutronix.de> To: David Woodhouse , Richard Cochran , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: David Woodhouse , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, =?utf-8?q?Thomas_Wei=C3=9Fschuh?= , stable@vger.kernel.org X-Developer-Signature: v=1; a=ed25519-sha256; t=1738863961; l=1299; i=thomas.weissschuh@linutronix.de; s=20240209; h=from:subject:message-id; bh=o8hw8b06FQjYLKmUpeXn7PVmDXgAzF3nOanhCnadJMY=; b=fr8uQDAtVbN35sf9Hp8cnEXQnxPzZ6dBSXcvwXwyy82ViNHqakf/dvvGqhGR5my5QKbJYtfHJ dqYk0t1EIuyDl0NsWFuLDx1Mo0M8YWeju7V/H8Xw9z67VbLzyW7jlbr X-Developer-Key: i=thomas.weissschuh@linutronix.de; a=ed25519; pk=pfvxvpFUDJV2h2nY0FidLUml22uGLSjByFbM6aqQQws= X-Patchwork-Delegate: kuba@kernel.org If vmlock_ptp_register() fails during probing, vmclock_remove() is called to clean up the ptp clock and misc device. It uses dev_get_drvdata() to access the vmclock state. However the driver data is not yet set at this point. Assign the driver data earlier. Fixes: 205032724226 ("ptp: Add support for the AMZNC10C 'vmclock' device") Cc: stable@vger.kernel.org Signed-off-by: Thomas Weißschuh Reviewed-by: Mateusz Polchlopek --- drivers/ptp/ptp_vmclock.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/ptp/ptp_vmclock.c b/drivers/ptp/ptp_vmclock.c index 0a2cfc8ad3c5408a87fd8fedeff274ab895de3dd..1920698ae6eba6abfff5b61afae1b047910026fd 100644 --- a/drivers/ptp/ptp_vmclock.c +++ b/drivers/ptp/ptp_vmclock.c @@ -524,6 +524,8 @@ static int vmclock_probe(struct platform_device *pdev) goto out; } + dev_set_drvdata(dev, st); + if (le32_to_cpu(st->clk->magic) != VMCLOCK_MAGIC || le32_to_cpu(st->clk->size) > resource_size(&st->res) || le16_to_cpu(st->clk->version) != 1) { @@ -587,8 +589,6 @@ static int vmclock_probe(struct platform_device *pdev) (st->miscdev.minor && st->ptp_clock) ? ", " : "", st->ptp_clock ? "PTP" : ""); - dev_set_drvdata(dev, st); - out: return ret; } From patchwork Thu Feb 6 17:45:02 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Patchwork-Id: 13963385 X-Patchwork-Delegate: kuba@kernel.org Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (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 3FEB818A95A; Thu, 6 Feb 2025 17:46:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738863970; cv=none; b=aeVhH//XsZ1YCzdbgC+6GUSYDh97i3FiPl4Pg6/1Th/KAoaxoptWYrxmrs+pJvno8yUYOG5WG1/oWnQf2eoIxnhc+SLwvkbVTZAB8J48tQvnxL5nMNFOtoM7HqjapT8cvSouODdzGbjHliCrgWWzC94XSoPyJEkUoFrn2VLFHcQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738863970; c=relaxed/simple; bh=oUP3uARQb8ElTZZgfn00uglkGDh3XLe4pUDHXD8wncc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ulrxNCFg3qy5iBbDeoZPSnNM4yn13SFjzzZZdCLmw8MUxjfne9r6WYhpjUmmxmwAeyR+vIxDpPXYUmQ9wskLnc8sWrWL9JbwLUeSsgce4VsOB6Q8MTIRepMMMBo4cfzoPLyOLscfMMGsf66jEpgq+9X5KZ1fFC/h37uddi6PUTk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=VNaXBJCt; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=EFilHyGV; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="VNaXBJCt"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="EFilHyGV" From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1738863967; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ZzFzW2m/x4Wy5ubrf65StcWZ+T0d8i2QbPnyKM6LHPE=; b=VNaXBJCtTSZlI4xwTpWVxGpPJmclYni8Y2nLk76DSZwPUiAWqFvrw+nf7rbAGF7FBoVhmR kaKE9FFEQn0vFZvaoO7+I0bsesXg0uW2gWh86HAm928YDIGczo80frP5eFLOoPDItEGlYX +6m6Sl/OkdW3zixY/47kb/9EpLh21KoUzX2oA32m04HG7J8vQH0YZeX+y3mn0NVJA8xRau eCg0J/vK7Lx3KEdFCUdKM2criMTdYVLaM2r93Rx4sFdLqEed4lVoXj6OAhJFaREsOT6QRj FAdNepTZN+r1GnkstylhFYpF4XzBX9vpl8a/xQBt9mDDWamtj19CjXdgaErKaA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1738863967; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ZzFzW2m/x4Wy5ubrf65StcWZ+T0d8i2QbPnyKM6LHPE=; b=EFilHyGVrzltxjpKSMKvoZy5/tSQo9HDNi572VFGNb3ZtiCvg23uRfDVgcpMQTcdSZ7aCO H1oR+btb/FbtO9Cg== Date: Thu, 06 Feb 2025 18:45:02 +0100 Subject: [PATCH net-next 2/4] ptp: vmclock: Don't unregister misc device if it was not registered Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250206-vmclock-probe-v1-2-17a3ea07be34@linutronix.de> References: <20250206-vmclock-probe-v1-0-17a3ea07be34@linutronix.de> In-Reply-To: <20250206-vmclock-probe-v1-0-17a3ea07be34@linutronix.de> To: David Woodhouse , Richard Cochran , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: David Woodhouse , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, =?utf-8?q?Thomas_Wei=C3=9Fschuh?= , stable@vger.kernel.org X-Developer-Signature: v=1; a=ed25519-sha256; t=1738863961; l=1397; i=thomas.weissschuh@linutronix.de; s=20240209; h=from:subject:message-id; bh=oUP3uARQb8ElTZZgfn00uglkGDh3XLe4pUDHXD8wncc=; b=DmSYiVmqrG8PzDKMP/ONn2O1YrFJxXOlv9Hi6FxA4ynn+1sO47IEjrhTbGxj8qwD2Ypsj1Lek m+ZlLIOFoYgBRS38AkO740Ekb476ZkDIGnqzb6/OVY2mSlsWX/RgcTv X-Developer-Key: i=thomas.weissschuh@linutronix.de; a=ed25519; pk=pfvxvpFUDJV2h2nY0FidLUml22uGLSjByFbM6aqQQws= X-Patchwork-Delegate: kuba@kernel.org vmclock_remove() tries to detect the successful registration of the misc device based on the value of its minor value. However that check is incorrect if the misc device registration was not attempted in the first place. Always initialize the minor number, so the check works properly. Fixes: 205032724226 ("ptp: Add support for the AMZNC10C 'vmclock' device") Cc: stable@vger.kernel.org Signed-off-by: Thomas Weißschuh --- drivers/ptp/ptp_vmclock.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/ptp/ptp_vmclock.c b/drivers/ptp/ptp_vmclock.c index 1920698ae6eba6abfff5b61afae1b047910026fd..82e6bef72b1b6edef7d891964c3f9c4546f6ddba 100644 --- a/drivers/ptp/ptp_vmclock.c +++ b/drivers/ptp/ptp_vmclock.c @@ -549,6 +549,8 @@ static int vmclock_probe(struct platform_device *pdev) goto out; } + st->miscdev.minor = MISC_DYNAMIC_MINOR; + /* * If the structure is big enough, it can be mapped to userspace. * Theoretically a guest OS even using larger pages could still @@ -556,7 +558,6 @@ static int vmclock_probe(struct platform_device *pdev) * cross that bridge if/when we come to it. */ if (le32_to_cpu(st->clk->size) >= PAGE_SIZE) { - st->miscdev.minor = MISC_DYNAMIC_MINOR; st->miscdev.fops = &vmclock_miscdev_fops; st->miscdev.name = st->name; From patchwork Thu Feb 6 17:45:03 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Patchwork-Id: 13963386 X-Patchwork-Delegate: kuba@kernel.org Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (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 58E9A18BC26; Thu, 6 Feb 2025 17:46:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738863971; cv=none; b=bUgpHtrQaFH2A8zm1cq/guVFMyLQKGOVbnwEiRrDlYXRIA/lhCtbMR8eHktyy789am4thdG7qkV/OsjJ6oHnWn0QEVUE6MqkDM3bTwKPjrvxIVSfeCuHCCHVLKAPYf0RACTALKVjEBD9pPshkJn8BHCO0JBUZPOS2O5mJnNikSU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738863971; c=relaxed/simple; bh=D2uw8E5m7qU4s/kSSq8BNC0Ymfmw4Q5BJg/ZHDFP3ZM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=T+hvAw76SjNeVly2W+kvoasEkfgx4/GbfHkU281oChR3yII4e9yYA+hxOEV8g4MWnByGBNc8gs4juhVntF+znKLacQmaRcGjOPcDwu1GCyHq39TOTCVEx/UoUy0TTjVodlEPRHxNcc4DvignCDiyhPusNGERwAW0oNhHxnxij4A= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=K9p2xjnF; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=TfmZApLV; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="K9p2xjnF"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="TfmZApLV" From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1738863967; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=YrnoNxsM9IRV2d1rDU60TjRPqbP3VVkVbfOQJnrK0iw=; b=K9p2xjnFLnlHq2zXUTt58BRJYqH2RD8kj16NhFO+eUkZhVgGT1KNIsVQ916RnQqiWxCH2A 9IRFZcOhukmlPpvIUaHySpHR9A+YIHROPRGLhLE2dzDBahsIAPe/kPOGbyqHk+rG0WRTGR 4FwJV4E3ZRF1ZqK7oR6On1j9ujc7tn97Q1rRvy8MGix13DhDH2QfSHoMpVbz8Gp0mWxQ06 DAt+p8+DX/uGqtoKs3ACoXX/cguMpS2RZ03utj/XCaa1T5A9gGG/9yVY3+XLDJM34fXZmE C/ozf0EqoLOD3GB8DVa+XnvMjYKlqFXqL7TlkGDZk+mGKTBlQ8f+XS7oAhcs7w== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1738863967; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=YrnoNxsM9IRV2d1rDU60TjRPqbP3VVkVbfOQJnrK0iw=; b=TfmZApLVMdeGj5gnXNWk3iCiuK3ONlh5BUuuL0gFFfG2frSJNz+uFMMiujSumuGrJbOFYW X6Phy+vZMrCY72Cg== Date: Thu, 06 Feb 2025 18:45:03 +0100 Subject: [PATCH net-next 3/4] ptp: vmclock: Clean up miscdev and ptp clock through devres Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250206-vmclock-probe-v1-3-17a3ea07be34@linutronix.de> References: <20250206-vmclock-probe-v1-0-17a3ea07be34@linutronix.de> In-Reply-To: <20250206-vmclock-probe-v1-0-17a3ea07be34@linutronix.de> To: David Woodhouse , Richard Cochran , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: David Woodhouse , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Developer-Signature: v=1; a=ed25519-sha256; t=1738863961; l=2240; i=thomas.weissschuh@linutronix.de; s=20240209; h=from:subject:message-id; bh=D2uw8E5m7qU4s/kSSq8BNC0Ymfmw4Q5BJg/ZHDFP3ZM=; b=KeG5k0px0ALp/CI4DLQz/xyTX0xDyuwh7eWqsU4KIpQRZA+f/Zb7mLIP+xZjrXt8XaiO8svnJ EIK+CIuNXDlDuMkF/C1envIubr2ATM0BVio4e9VBBtqVwQDakv6Y2vs X-Developer-Key: i=thomas.weissschuh@linutronix.de; a=ed25519; pk=pfvxvpFUDJV2h2nY0FidLUml22uGLSjByFbM6aqQQws= X-Patchwork-Delegate: kuba@kernel.org Most resources owned by the vmclock device are managed through devres. Only the miscdev and ptp clock are managed manually. This makes the code slightly harder to understand than necessary. Switch them over to devres and remove the now unnecessary drvdata. Signed-off-by: Thomas Weißschuh --- drivers/ptp/ptp_vmclock.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/drivers/ptp/ptp_vmclock.c b/drivers/ptp/ptp_vmclock.c index 82e6bef72b1b6edef7d891964c3f9c4546f6ddba..b7fa196975229cec6d27b34f7bb235c53b5b5732 100644 --- a/drivers/ptp/ptp_vmclock.c +++ b/drivers/ptp/ptp_vmclock.c @@ -420,10 +420,9 @@ static const struct file_operations vmclock_miscdev_fops = { /* module operations */ -static void vmclock_remove(struct platform_device *pdev) +static void vmclock_remove(void *data) { - struct device *dev = &pdev->dev; - struct vmclock_state *st = dev_get_drvdata(dev); + struct vmclock_state *st = data; if (st->ptp_clock) ptp_clock_unregister(st->ptp_clock); @@ -524,8 +523,6 @@ static int vmclock_probe(struct platform_device *pdev) goto out; } - dev_set_drvdata(dev, st); - if (le32_to_cpu(st->clk->magic) != VMCLOCK_MAGIC || le32_to_cpu(st->clk->size) > resource_size(&st->res) || le16_to_cpu(st->clk->version) != 1) { @@ -551,6 +548,10 @@ static int vmclock_probe(struct platform_device *pdev) st->miscdev.minor = MISC_DYNAMIC_MINOR; + ret = devm_add_action_or_reset(&pdev->dev, vmclock_remove, st); + if (ret) + goto out; + /* * If the structure is big enough, it can be mapped to userspace. * Theoretically a guest OS even using larger pages could still @@ -573,7 +574,6 @@ static int vmclock_probe(struct platform_device *pdev) if (IS_ERR(st->ptp_clock)) { ret = PTR_ERR(st->ptp_clock); st->ptp_clock = NULL; - vmclock_remove(pdev); goto out; } } @@ -602,7 +602,6 @@ MODULE_DEVICE_TABLE(acpi, vmclock_acpi_ids); static struct platform_driver vmclock_platform_driver = { .probe = vmclock_probe, - .remove = vmclock_remove, .driver = { .name = "vmclock", .acpi_match_table = vmclock_acpi_ids, From patchwork Thu Feb 6 17:45:04 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Patchwork-Id: 13963387 X-Patchwork-Delegate: kuba@kernel.org Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (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 5863C1925B8; Thu, 6 Feb 2025 17:46:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738863972; cv=none; b=gg+3EfaYPdsndO+ISrXPHYszUByvCL52tLlpAAt7CwEUaPLeRB5ufp32MeE8oKEX2PurfLmeVzsxUjSsPtYmQeDAZnhulqr2dKIdCTCu/KgsxdAZPYfzpp1mc1fOPA4+XT/tuPxs55KlqmfmySC0WsnSxcVPGO2zKn2ghj2ytJw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738863972; c=relaxed/simple; bh=gTovkeAuc1k45/RNg29XG45qZ+duoj9ctG+BqWvkfwc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=YqVAwjySwKH74FAjAuALLcTCigk0bQwPDwoCr3xvmcPPJxrvVnbP4tgqsMqWYdKP4CteMmdgABCzQl2OSs2UmXqUjvQnJmK54OyAxMnQbRKbr6NraGdoNxWmEtMHMskU0fUaF7dsONTUcljsYRqG5m60as1odTlxhAMlNk3Bdt8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=1EOONuJV; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=Pvwf6yhh; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="1EOONuJV"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="Pvwf6yhh" From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1738863968; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=yJACVaUgR6f3bBOq37IygZM3AouaTCTmenYGHYfPeqc=; b=1EOONuJVDPGCFyBYF2NZeH9JaYOE7y7LyiIvz6xYYYs61mbwB+y0nMljnVlc7XESjX08YA HUjCOBHLkkcdQNPRhFM04van1tQFzoxDmPUUvncFdH2EhMjp1R6wkkNxQSKEfT+dmqgj8p /KpkV+um9gqXQV2NPbNLM5iGzcEpeehH+s3VBrvcgSGh9I7qFr59iGMlSP0IjiupSDtHiz b2i36GhNVz4t6biD8L9F/MqUH/cRdNprH5+diRhAPqY05eHrG+yfNi0dti3dy1G/vafDQa G+CAbUU3COiGWv7IskYOUo9d2EYOKCZmZWPJx45jOgOhIug6eDNEmk/+vbvPdA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1738863968; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=yJACVaUgR6f3bBOq37IygZM3AouaTCTmenYGHYfPeqc=; b=Pvwf6yhhQnraLNiaPBbtfufGUknGLJXLMoqn6jmoVoBh76zpUs6XO3aiWSbMUymG9E1KJL Orvae3YOpLQZ+QAg== Date: Thu, 06 Feb 2025 18:45:04 +0100 Subject: [PATCH net-next 4/4] ptp: vmclock: Remove goto-based cleanup logic Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250206-vmclock-probe-v1-4-17a3ea07be34@linutronix.de> References: <20250206-vmclock-probe-v1-0-17a3ea07be34@linutronix.de> In-Reply-To: <20250206-vmclock-probe-v1-0-17a3ea07be34@linutronix.de> To: David Woodhouse , Richard Cochran , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: David Woodhouse , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Developer-Signature: v=1; a=ed25519-sha256; t=1738863961; l=3397; i=thomas.weissschuh@linutronix.de; s=20240209; h=from:subject:message-id; bh=gTovkeAuc1k45/RNg29XG45qZ+duoj9ctG+BqWvkfwc=; b=NJNbIqLK38DrSxmfOjF4hQ86H2W9H1exnGRxc8J42x7mQUxfZ75hkqgOZAIHVtiK0qdAbw44m xD9YlZVTee4AXsyKycYQP4mz3brzoLiRh8gssFwv9OLaomj13uY4q2W X-Developer-Key: i=thomas.weissschuh@linutronix.de; a=ed25519; pk=pfvxvpFUDJV2h2nY0FidLUml22uGLSjByFbM6aqQQws= X-Patchwork-Delegate: kuba@kernel.org vmclock_probe() uses an "out:" label to return from the function on error. This indicates that some cleanup operation is necessary. However the label does not do anything as all resources are managed through devres, making the code slightly harder to read. Remove the label and just return directly. Signed-off-by: Thomas Weißschuh --- drivers/ptp/ptp_vmclock.c | 32 +++++++++++++------------------- 1 file changed, 13 insertions(+), 19 deletions(-) diff --git a/drivers/ptp/ptp_vmclock.c b/drivers/ptp/ptp_vmclock.c index b7fa196975229cec6d27b34f7bb235c53b5b5732..26fcc1185ee72999a43842a59164498657799b1f 100644 --- a/drivers/ptp/ptp_vmclock.c +++ b/drivers/ptp/ptp_vmclock.c @@ -505,14 +505,13 @@ static int vmclock_probe(struct platform_device *pdev) if (ret) { dev_info(dev, "Failed to obtain physical address: %d\n", ret); - goto out; + return ret; } if (resource_size(&st->res) < VMCLOCK_MIN_SIZE) { dev_info(dev, "Region too small (0x%llx)\n", resource_size(&st->res)); - ret = -EINVAL; - goto out; + return -EINVAL; } st->clk = devm_memremap(dev, st->res.start, resource_size(&st->res), MEMREMAP_WB | MEMREMAP_DEC); @@ -520,37 +519,34 @@ static int vmclock_probe(struct platform_device *pdev) ret = PTR_ERR(st->clk); dev_info(dev, "failed to map shared memory\n"); st->clk = NULL; - goto out; + return ret; } if (le32_to_cpu(st->clk->magic) != VMCLOCK_MAGIC || le32_to_cpu(st->clk->size) > resource_size(&st->res) || le16_to_cpu(st->clk->version) != 1) { dev_info(dev, "vmclock magic fields invalid\n"); - ret = -EINVAL; - goto out; + return -EINVAL; } ret = ida_alloc(&vmclock_ida, GFP_KERNEL); if (ret < 0) - goto out; + return ret; st->index = ret; ret = devm_add_action_or_reset(&pdev->dev, vmclock_put_idx, st); if (ret) - goto out; + return ret; st->name = devm_kasprintf(&pdev->dev, GFP_KERNEL, "vmclock%d", st->index); - if (!st->name) { - ret = -ENOMEM; - goto out; - } + if (!st->name) + return -ENOMEM; st->miscdev.minor = MISC_DYNAMIC_MINOR; ret = devm_add_action_or_reset(&pdev->dev, vmclock_remove, st); if (ret) - goto out; + return ret; /* * If the structure is big enough, it can be mapped to userspace. @@ -564,7 +560,7 @@ static int vmclock_probe(struct platform_device *pdev) ret = misc_register(&st->miscdev); if (ret) - goto out; + return ret; } /* If there is valid clock information, register a PTP clock */ @@ -574,15 +570,14 @@ static int vmclock_probe(struct platform_device *pdev) if (IS_ERR(st->ptp_clock)) { ret = PTR_ERR(st->ptp_clock); st->ptp_clock = NULL; - goto out; + return ret; } } if (!st->miscdev.minor && !st->ptp_clock) { /* Neither miscdev nor PTP registered */ dev_info(dev, "vmclock: Neither miscdev nor PTP available; not registering\n"); - ret = -ENODEV; - goto out; + return -ENODEV; } dev_info(dev, "%s: registered %s%s%s\n", st->name, @@ -590,8 +585,7 @@ static int vmclock_probe(struct platform_device *pdev) (st->miscdev.minor && st->ptp_clock) ? ", " : "", st->ptp_clock ? "PTP" : ""); - out: - return ret; + return 0; } static const struct acpi_device_id vmclock_acpi_ids[] = { From patchwork Fri Feb 7 09:13:54 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Woodhouse X-Patchwork-Id: 13964662 X-Patchwork-Delegate: kuba@kernel.org Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) (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 747121D86CE; Fri, 7 Feb 2025 09:13:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=90.155.50.34 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738919640; cv=none; b=LdjjNBOjPaFjSt+0yBiGkyoqJThz8pllJQ9G8OOT2n3KdWiTsPE+ujVlUma7PNGybsUKQ5orgmW3p/ZIsfnBMpfcIi0PRwoDFdw1IUGa2oyLL31Nnvpp2aQojzXxioFFe4/lX6Z0+5b4D9uZZQW1LAOZ2GRUeekfVbtiz5MiXbI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738919640; c=relaxed/simple; bh=GS5ky6+zhoGkum/n0efGVQjPu0p95hAeeVLQ/CMn4mI=; h=Message-ID:Subject:From:To:Cc:Date:In-Reply-To:References: Content-Type:MIME-Version; b=m33m+z+ItJkxV2ebPPxY0LqNdXgUqfNRD9x+xTrq0zmUef+MW9vX3xvDzc26fuPZ8IN+F75wiQ9Ws7ygNBGKMhINTgrZBSzVWCoRQ/ssusL/+TpdHEvqmI9GdElH1qM+7g0V3hwo+xgZ3z3xMOytqzkwnROZt79AJLp3ogR/NZg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=infradead.org; spf=none smtp.mailfrom=casper.srs.infradead.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b=jeeDBtCJ; arc=none smtp.client-ip=90.155.50.34 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=infradead.org Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=casper.srs.infradead.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="jeeDBtCJ" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=MIME-Version:Content-Type:References: In-Reply-To:Date:Cc:To:From:Subject:Message-ID:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=y95Y+HtpyIVUja8P9QJUZepIX2HX2ocCC3swTjpEo1k=; b=jeeDBtCJ3T0PVE4fHz1k/9Sjcg T+9Kdc5F2O5BbILI9d2CSPTuSE1AiZKipyYiUgu7sG4Xh8wC3QDeymd+GmuaD+FsjrXwZnDylCUOE zRmkUbudA+lopUkwrLaerGtpH17H49Zgk1nVVKyIupckKPS2TiGiTuvxG0iUqIximgY7RlGSamrXU yFh9zomfgWoRxTnzGKyRvFmnAlcHTTRJz4yLAsQ8j5pxqgPdOEexjRQdnqMI7BtSuViuunAgcz43V ItDoMjC3DVRolTuBGEQ2Wi8decvrbjO4mZI4bIU+7vscF0ghzVPWk95uFnEy6VmIP9skHRaBFyady vSObkiww==; Received: from 54-240-197-238.amazon.com ([54.240.197.238] helo=freeip.amazon.com) by casper.infradead.org with esmtpsa (Exim 4.98 #2 (Red Hat Linux)) id 1tgKQs-00000007XkW-4B4V; Fri, 07 Feb 2025 09:13:55 +0000 Message-ID: <9f5ee0186d6062eb31ed197d1b4a45c5eec110b2.camel@infradead.org> Subject: [PATCH net-next 5/4] ptp: vmclock: Add .owner to vmclock_miscdev_fops From: David Woodhouse To: Thomas =?iso-8859-1?q?Wei=DFschuh?= , Richard Cochran , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org, Mateusz Polchlopek , "Mohamed Abuelfotoh, Hazem" Date: Fri, 07 Feb 2025 09:13:54 +0000 In-Reply-To: <20250206-vmclock-probe-v1-0-17a3ea07be34@linutronix.de> References: <20250206-vmclock-probe-v1-0-17a3ea07be34@linutronix.de> User-Agent: Evolution 3.52.3-0ubuntu1 Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by casper.infradead.org. See http://www.infradead.org/rpr.html X-Patchwork-Delegate: kuba@kernel.org From: David Woodhouse Without the .owner field, the module can be unloaded while /dev/vmclock0 is open, leading to an oops. Fixes: 205032724226 ("ptp: Add support for the AMZNC10C 'vmclock' device") Cc: stable@vger.kernel.org Signed-off-by: David Woodhouse --- drivers/ptp/ptp_vmclock.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/ptp/ptp_vmclock.c b/drivers/ptp/ptp_vmclock.c index 26fcc1185ee7..b3a83b03d9c1 100644 --- a/drivers/ptp/ptp_vmclock.c +++ b/drivers/ptp/ptp_vmclock.c @@ -414,6 +414,7 @@ static ssize_t vmclock_miscdev_read(struct file *fp, char __user *buf, } static const struct file_operations vmclock_miscdev_fops = { + .owner = THIS_MODULE, .mmap = vmclock_miscdev_mmap, .read = vmclock_miscdev_read, };