Received-SPF: pass (google.com: domain of linux-kernel+bounces-168936-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
From: Josua Mayer <josua@solid-run.com>
Date: Sun, 05 May 2024 11:52:45 +0200
Subject: [PATCH net-next v3] net: dsa: mv88e6xxx: control mdio bus-id
 truncation for long paths
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
Message-Id: <20240505-mv88e6xxx-truncate-busid-v3-1-e70d6ec2f3db@solid-run.com>
To: Andrew Lunn <andrew@lunn.ch>, Florian Fainelli <f.fainelli@gmail.com>, 
 Vladimir Oltean <olteanv@gmail.com>, 
 "David S. Miller" <davem@davemloft.net>, Eric Dumazet <edumazet@google.com>, 
 Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>
Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, 
 Josua Mayer <josua@solid-run.com>, Mor Nagli <mor.nagli@solid-run.com>
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?utf-8?B?eHJGV2tVdlBpZGRUaU1xUnZma3ZZMmpsMEVadlVnRHBNbSt5d0xPc0xmQ2M0?=
 =?utf-8?B?VlJ4NTFwN3JOeXhPaWtiNXNMUW1ZWmVkYS9nSE5rN2d5OUY4NFRjUWRMNjUw?=
 =?utf-8?B?b0YyV0hINENuTXhETVhUWlNCbGlnTFVVR1ZxcFJIdjRTMldDSjRCUnlZWkJY?=
 =?utf-8?B?dE85eWxoSEF6cUxheDNxTUhOamdmU1ltMGw2STZzMStRY1pneGtqWXpUbXE5?=
 =?utf-8?B?NzZla2VSN21TVFFiMElCc1paWkhKVk5QOG5lOHZLOWFUVlU4R3MwdlZNOWdp?=
 =?utf-8?B?MXg1YWovSXNJQ3JWNlh4dkorNytIdk13R3VrRXY4VTlLS3FKUlgzcC94ZHB6?=
 =?utf-8?B?bXRJQnZqbUVXWFphR0xqa1NhbGtsQUZSOW95b0liOUlaVUxiVnNsa1kvQXh5?=
 =?utf-8?B?ZTlkdDJQQjVRS2VOM25JejlQTzVRWDB3bU1lS3lHMkRDc0tVTGxDdGp6ckdO?=
 =?utf-8?B?bzlONjFzWTNWN2p1d2FkMTlXZTdhanhUMktRaDRnQ2JhRytNdC95UGp6OXlB?=
 =?utf-8?B?OUszVXQ4ZGRCV1dPKzI1Z1VuUm50Q3g5VlNJNjR4d3pIOXZZTkJJUlRGakJ1?=
 =?utf-8?B?Nzk4Tk1scGZHejBZOXZlWkttQ0poQkZWOERwTjlnWDN0N0JIVmoyd2FNS2pV?=
 =?utf-8?B?akk0bXg1TzBkazYwYkowK2RQWjlNdWR0WEdtUEcybWY3YjVpeTlUT0tTMGlu?=
 =?utf-8?B?cXFsQzFETVFNbFQ4S2NueURZMjRkTDBIRmpmdGd2ZDVOSWV1ei9yVkJxZUxl?=
 =?utf-8?B?cG9jSmw5bVgzeVV1VnBUTXZxenZxOEo5SmlFT0RTSjVVUFZHRVYySXgzV3Jl?=
 =?utf-8?B?TU94UCtxYStURm9jWnROQkJBU1JoZTMyUHppQjAxbHFYODJuMEcwbnAvc1Yv?=
 =?utf-8?B?M3c5Mi85MXJpdThSZFRMRmR0NmR2V2dKZHlWQWFCVGtVMnVIMTU5WnhQbUNt?=
 =?utf-8?B?UHRBQndRTzlLZkd6VmE2NDY3UGlBT3RiRzVuTEd0VkxETDNVOCtxN2JyZDFD?=
 =?utf-8?B?MWdjWmY1M0o0MjJaNlpwK2pSbnRmU3psdzVsZnBYZEhpS1NHQWp1UTYxcm91?=
 =?utf-8?B?Q0E3bmdEOStxRTFuUzlYVHBLbERFVGZqUkk5T1lrOERJSW1pTXYyRjFoZWJP?=
 =?utf-8?B?SW04b0Z3Q3Z1N3VIZ3JaakZEeENIb2NKL01hbk11bXhVelpTN21QVWlxTGlP?=
 =?utf-8?B?MU1PS0cvS0JqUzI2ZFBXNXJZUXVCR3ZhQXV6V21QalBSYzlnRGxRd3dqN3lo?=
 =?utf-8?B?RTQxU1BOR1QzYjNXd1R3a1Y5MEYzYXJMcWxBMG9TUThEemR5a3dTcGxDQ2JH?=
 =?utf-8?B?K01NRmVPVlpGaGFGNE1IM3dhRThjbU9KRUJYSmdtUkViN21DL1BJbk40b0Na?=
 =?utf-8?B?WXVieU56K2l4eWt6Y1FXZG5KSzc0OGN1SEJDWFZrRWRvRmFkMDZOQy85T3h1?=
 =?utf-8?B?c25IRWxxOHRjdThSLzJNVjhsR0pDcXlKRTV4Ulg3VE9GeG4rYTNmMEtrTW9E?=
 =?utf-8?B?SWNBaDZDc09CbjlHeWdxWjI0SG9vWldTVUd2Z2Fac21Jb3VlME9PWnZhemFl?=
 =?utf-8?B?RjhnSHluU1BsUGVybnovKzR0bmdrNmpXMkRjdWRMVHdGQ2RzT2tGUTgvSVpZ?=
 =?utf-8?B?bFoyWU1iVGVNM2Y0OW11KytvQ0ZnTm5XOEorTlRGcjZQOUFkdVd2VWlwaGJF?=
 =?utf-8?B?QU9Gck80dHVVb1h4QW11WTEzaTJNdU5XQ1JLU1VLdTZLUGF5RGVwRGlEM2FR?=
 =?utf-8?B?ZHViR1pOdDdCWXR4d0o5cktsNUIwTFNlNzY0WUtlTTZHQ0s2SFFRVTZ1VWQ4?=
 =?utf-8?B?NmpLYzVFeFkyTTZEUjZhaVpITkFGaGE2c3VKek82VFowSFRFSzg2OUxNd292?=
 =?utf-8?B?ZVNBS1dhOVBoR1hHK2JrSkJnVTN3b1U1YnRHbXpiZnB4dUk2NHVoRHVNZnVI?=
 =?utf-8?B?R0Q5VThEQlM5TDZhc0lLdWcrTkduNU1vTmFSY3hSU0Y4SW82SkxCM1Qrcm93?=
 =?utf-8?B?bDJJRjZZcTZzMjRhK2JUbHVCSFNjRWdCcnVlK1BXdVdYaUpQVFljb0t1NmZ6?=
 =?utf-8?B?VnpSRUlUQTBzSXR4MXE0TllsdEpEZFJoL1RHMm1mSk5aamdmdEFGdmJTQTZV?=
 =?utf-8?Q?BA1BXEl168R704sc2VKkkZJ3A?=
X-OriginatorOrg: solid-run.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 76c133e7-5732-4f1d-4599-08dc6ce91eb3
X-MS-Exchange-CrossTenant-AuthSource: AM9PR04MB7586.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 May 2024 09:52:47.9357
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: a4a8aaf3-fd27-4e27-add2-604707ce5b82
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: LsHANZfP45pWRDC2KjSlPjci8RTuihxYfbqRkkmoKCnH/uejFCZgkXwJyuBcYPWOkSJ5VzlfUSayrp9sPk2oXA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR04MB7331

mv88e6xxx supports multiple mdio buses as children, e.g. to model both
internal and external phys. If the child buses mdio ids are truncated,
they might collide with each other leading to an obscure error from
kobject_add.

The maximum length of bus id is currently defined as 61
(MII_BUS_ID_SIZE). Truncation can occur on platforms with long node
names and multiple levels before the parent bus on which the dsa switch
itself sits, e.g. CN9130 [1].

Compare the return value of snprintf against maximum bus-id length to
detect truncation. In that case write an incrementing marker to the end
to avoid name collisions.
This changes the problematic bus-ids mdio and mdio-external from [1]
to [2].

Truncation at the beginning was considered as a workaround, however that
is still subject to name collisions in sysfs where only the first
characters differ.

[1]
[    8.324631] mv88e6085 f212a200.mdio-mii:04: switch 0x1760 detected: Marvell 88E6176, revision 1
[    8.389516] mv88e6085 f212a200.mdio-mii:04: Truncated bus-id may collide.
[    8.592367] mv88e6085 f212a200.mdio-mii:04: Truncated bus-id may collide.
[    8.623593] sysfs: cannot create duplicate filename '/devices/platform/cp0/cp0:config-space@f2000000/f212a200.mdio/mdio_bus/f212a200.mdio-mii/f212a200.mdio-mii:04/mdio_bus/!cp0!config-space@f2000000!mdio@12a200!ethernet-switch@4!mdi'
[    8.785480] kobject: kobject_add_internal failed for !cp0!config-space@f2000000!mdio@12a200!ethernet-switch@4!mdi with -EEXIST, don't try to register things with the same name in the same directory.
[    8.936514] libphy: mii_bus /cp0/config-space@f2000000/mdio@12a200/ethernet-switch@4/mdi failed to register
[    8.946300] mdio_bus !cp0!config-space@f2000000!mdio@12a200!ethernet-switch@4!mdi: __mdiobus_register: -22
[    8.956003] mv88e6085 f212a200.mdio-mii:04: Cannot register MDIO bus (-22)
[    8.965329] mv88e6085: probe of f212a200.mdio-mii:04 failed with error -22

[2]
/devices/platform/cp0/cp0:config-space@f2000000/f212a200.mdio/mdio_bus/f212a200.mdio-mii/f212a200.mdio-mii:04/mdio_bus/!cp0!config-space@f2000000!mdio@12a200!ethernet-switch...!-0
/devices/platform/cp0/cp0:config-space@f2000000/f212a200.mdio/mdio_bus/f212a200.mdio-mii/f212a200.mdio-mii:04/mdio_bus/!cp0!config-space@f2000000!mdio@12a200!ethernet-switch...!-1

Signed-off-by: Josua Mayer <josua@solid-run.com>
---


Bcc: Mor Nagli <mor.nagli@solid-run.com>
---
Changes in v3:
- Added better named variable "len" for snprintf return value to improve
  readability
  (Reported-by: Andrew Lunn <andrew@lunn.ch>)
- Added short explanation why there are two calls of snprintf in comment
- Link to v2: https://lore.kernel.org/r/20240404-mv88e6xxx-truncate-busid-v2-1-69683f67008b@solid-run.com

Changes in v2:
- fixed typo in commit message
  (Reportby: Jiri Pirko <jiri@resnulli.us>)
- replaced warning message with controlled truncation
- Link to v1: https://lore.kernel.org/r/20240320-mv88e6xxx-truncate-busid-v1-1-cface50b2efb@solid-run.com
---
 drivers/net/dsa/mv88e6xxx/chip.c | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c
index 964c7b847fd3..9c996be00362 100644
--- a/drivers/net/dsa/mv88e6xxx/chip.c
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -3774,10 +3774,10 @@ static int mv88e6xxx_mdio_register(struct mv88e6xxx_chip *chip,
 				   struct device_node *np,
 				   bool external)
 {
-	static int index;
+	static int index, trunc;
 	struct mv88e6xxx_mdio_bus *mdio_bus;
 	struct mii_bus *bus;
-	int err;
+	int err, len;
 
 	if (external) {
 		mv88e6xxx_reg_lock(chip);
@@ -3803,10 +3803,28 @@ static int mv88e6xxx_mdio_register(struct mv88e6xxx_chip *chip,
 
 	if (np) {
 		bus->name = np->full_name;
-		snprintf(bus->id, MII_BUS_ID_SIZE, "%pOF", np);
+		len = snprintf(bus->id, MII_BUS_ID_SIZE, "%pOF", np);
 	} else {
 		bus->name = "mv88e6xxx SMI";
-		snprintf(bus->id, MII_BUS_ID_SIZE, "mv88e6xxx-%d", index++);
+		len = snprintf(bus->id, MII_BUS_ID_SIZE, "mv88e6xxx-%d", index++);
+	}
+	if (len < 0) {
+		return len;
+	} else if (len >= MII_BUS_ID_SIZE) {
+		/* If generated bus id is truncated, names in sysfs
+		 * may collide.
+		 * Generate a special numeric suffix. If it fits
+		 * within MII_BUS_ID_SIZE, insert at the end to mark
+		 * truncation and avoid name collisions.
+		 */
+		len = snprintf(NULL, 0, "...!-%d", trunc);
+		if (len < 0)
+			return err;
+		else if (len >= MII_BUS_ID_SIZE)
+			return -ENOBUFS;
+
+		snprintf(bus->id + MII_BUS_ID_SIZE - err - 1,
+			 MII_BUS_ID_SIZE - err, "...!-%d", trunc++);
 	}
 
 	bus->read = mv88e6xxx_mdio_read;

---
base-commit: 173e7622ccb3f46834bd4176ed363f435e142942
change-id: 20240320-mv88e6xxx-truncate-busid-34a1d2769bbf

Sincerely,
-- 
Josua Mayer <josua@solid-run.com>