From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-vs1-f97.google.com (mail-vs1-f97.google.com [209.85.217.97]) (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 830B436AB6A for ; Mon, 23 Feb 2026 19:12:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.217.97 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771873932; cv=none; b=cxoQX1Rrmwj9hWY5jJ6z6H8RKGxzCURsBrgaUyHWgL64Z5HQVHgqZJDMvHz40nmaRqqRn1oEuwFqkc82GhMrnSphF7Iz82sQ6oJcLgOrGo2TGh+JXdb5zacHvBrEn4WWLZQ7WzVSSF801xgr0RjiBZDZwwbstO8RUTLN2y6/11s= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771873932; c=relaxed/simple; bh=WutPYL4cG/EXST+jBmz13oiyimF6V23PC8A+85qvxYI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VWRWlp5IS1iKP/ztGDPFM0SDs8r9p8Hfzkseig4i/VFSHX2wy3/lODzcfb6Vd4d4yWsnPfciIwBPEjvBebwpYUCx6iBKrhOVFaUWD4yuWKRiIGem1h5Y8DrLpj3Dp+mQWHGfFnSM1q4MRd9qjnw1/VsBDKZeeWyq+a7vZy60+no= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=broadcom.com; spf=fail smtp.mailfrom=broadcom.com; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b=acfXjAFp; arc=none smtp.client-ip=209.85.217.97 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=broadcom.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=broadcom.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="acfXjAFp" Received: by mail-vs1-f97.google.com with SMTP id ada2fe7eead31-5fa26e497feso1532035137.3 for ; Mon, 23 Feb 2026 11:12:11 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771873930; x=1772478730; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=v49c/0FsrhD7zmHG67B+ZI0NaJwp1KpfxbdYTpU5cag=; b=G1s1r188DQ8sBRZp1dQw22SFbvXD3piec53mwkZMFN/GAbfN5dRMG2gR2aUCzYIF3c jyau6c5i7WZbhyUJpLzsFQ/oxTdAteaR5ar0kx9eDsXxBht89DpFNzvlcz/YrmZvYKjE VRk16/b4lUuAI6z2iTk6eqHjv+/RBtyJKgKTj5gPCNjPx2c0SPaXvWrORFMaKXuU1ZOV +mO08JRAAkC6a7YG++71E3iLEnPcUTBq4yb63wpdo8vnfQYFkPMT8aZ6moz1hoQFWYHa 7KxtLlrAszsqy8xIqjIA2O0NQ1Mz5XsdRC/qj7EsKz6qnrsr1CJty54DXhivOJWsStcM Y4Fw== X-Forwarded-Encrypted: i=1; AJvYcCXMo16B7xpBe+TTQ/r2K/4ltfqCw5ckaeLofy5doRiIfPZ+4o0OGrRkdjmYz3x6ToQhBPICDQztV6rCmaI=@vger.kernel.org X-Gm-Message-State: AOJu0Yx2+AcJwmNU8DRynwtH4aI6bku30BRUD6lhl9j/DKZcFeFXRREa VFNcywxqvaGQ4pi3ntvjGYdsivO9YBbBmMk6axdQqQ00inOEn1CIgvBZ1dphF3ZYRk3C2xP9NWB sFx37wSwFhN/v2qAQNNBK+c4rEnMAUz1ny8hf10LgTKfjlIFaAj0CpTowINP0AxQEWyfOSEkceR cekHmm222mBqMp7S1TT+CP40+ImyqkHrjAIoYg8uNgmjOgEH7JXuQyKnNyYnls+Y/m9ecImztcc jBYjgCimZtPm6OrFir3 X-Gm-Gg: AZuq6aIfMmU7LGyuk6KBPR/xOZ+lJDpDxFst/keIZw1q2zPp9UVIfpNMeIiBez5VFIb fUXqc+onYiKLatAV8sJuqhZhEhaNQG6tAdGvvRmpC4QHdOrwo+jrcHbGOQC3VaQ9zSQYNBt2t7t RiOLmhj4XIj/tYiMUtt5jAPagGWL8gWAjAFMbNIXZvEQdUMNqkFU2qoofu4K9OE75DPhdc8j0tp TexADyqxBl1NN3A7c36QLO6+CGPTd71up+bHdEHn8P9xFW+b4DOuEZflRNbsV9LshqRZKsvWKlm KNOjZKcbZBgzdY51VAuaLcEvA1XI/CEZOkhRAtnIwMX0wCT2MC7/g7SFxIfG+lLHH2DksWKECTu SzJffSdVzWuw5qBiNGFC0mb7Hl2A27xbp8gEzEdPvoT2enfPYgNBRAesnrH5Z0sRDJKTqwvvaMv D53rUaBZPJV5xzSDmUfYRSAtrTFCJn806H8g979jiJ/Jvdgbg+YWzIzvNkOw== X-Received: by 2002:a05:6102:d8f:b0:5f5:4247:8d08 with SMTP id ada2fe7eead31-5feb30556a2mr3408686137.21.1771873930252; Mon, 23 Feb 2026 11:12:10 -0800 (PST) Received: from smtp-us-east1-p01-i01-si01.dlp.protect.broadcom.com (address-144-49-247-103.dlp.protect.broadcom.com. [144.49.247.103]) by smtp-relay.gmail.com with ESMTPS id a1e0cc1a2514c-94da899fff8sm643346241.2.2026.02.23.11.12.09 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Feb 2026 11:12:10 -0800 (PST) X-Relaying-Domain: broadcom.com X-CFilter-Loop: Reflected Received: by mail-dy1-f200.google.com with SMTP id 5a478bee46e88-2ba8a461dd9so24910323eec.1 for ; Mon, 23 Feb 2026 11:12:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1771873929; x=1772478729; 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; bh=v49c/0FsrhD7zmHG67B+ZI0NaJwp1KpfxbdYTpU5cag=; b=acfXjAFpsNi9FJIrVO3kZ6P80IFlS8Q1QNlkavqBSK1w05O0yW7c+2hrIf9P7PF0T/ YG2udLj3Z7JcD/UV6KoFTOjoEdYWD68hsS24tAwxLvv8ZJelwFVopm4VGF43Ga1SkJsZ ySJXDUItGladoUmBKU4r6HZ0oBOGtrfDgA0Ek= X-Forwarded-Encrypted: i=1; AJvYcCUN3jdivmfoz36y4jMX8QDw2Ik9YkxMvIli4Y0oSozL62fqAQmy642wgv9gp22M5etmUjfvx88tF9a3oVY=@vger.kernel.org X-Received: by 2002:a05:7300:d505:b0:2b7:32a6:82d1 with SMTP id 5a478bee46e88-2bd7bae915dmr4336142eec.13.1771873928895; Mon, 23 Feb 2026 11:12:08 -0800 (PST) X-Received: by 2002:a05:7300:d505:b0:2b7:32a6:82d1 with SMTP id 5a478bee46e88-2bd7bae915dmr4336120eec.13.1771873928176; Mon, 23 Feb 2026 11:12:08 -0800 (PST) Received: from lvnvda4076.lvn.broadcom.net ([192.19.161.250]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-2bd7da3eec5sm5332734eec.4.2026.02.23.11.12.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Feb 2026 11:12:07 -0800 (PST) From: Kiran Kella To: davem@davemloft.net, edumazet@google.com, kuba@kernel.org, daniel.zahka@gmail.com, willemb@google.com, pabeni@redhat.com, andrew+netdev@lunn.ch, horms@kernel.org Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, jayakrishnan.udayavarma@broadcom.com, ajit.khaparde@broadcom.com, akhilesh.samineni@broadcom.com, Kiran Kella Subject: [net-next, v2 1/2] psp: Support for transmit on logical device when the underlying transport device supports PSP. Date: Mon, 23 Feb 2026 11:11:53 -0800 Message-ID: <20260223191154.2800616-2-kiran.kella@broadcom.com> X-Mailer: git-send-email 2.45.4 In-Reply-To: <20260223191154.2800616-1-kiran.kella@broadcom.com> References: <20260223191154.2800616-1-kiran.kella@broadcom.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-DetectorID-Processed: b00c1d49-9d2e-4205-b15f-d015386d3d5e This is achieved by propagating the psp_dev from the lower device to the upper devices in the device stack via a netdevice notifier. The lowest device owns the psp_dev pointer while the upper devices just borrow the pointer. When the lower device is unlinked, the borrowed pointer is cleared in the upper device. Assumption being that psp_dev is set on the lowest device before any upper devices are stacked on that lowest device. Signed-off-by: Kiran Kella Reviewed-by: Ajit Kumar Khaparde Reviewed-by: Akhilesh Samineni --- net/psp/psp_main.c | 109 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 108 insertions(+), 1 deletion(-) diff --git a/net/psp/psp_main.c b/net/psp/psp_main.c index a8534124f626..fac785dcfa0f 100644 --- a/net/psp/psp_main.c +++ b/net/psp/psp_main.c @@ -3,6 +3,7 @@ #include #include #include +#include #include #include #include @@ -110,13 +111,45 @@ void psp_dev_free(struct psp_dev *psd) kfree_rcu(psd, rcu); } +/** + * psp_clear_upper_dev_psp_dev() - Clear borrowed psp_dev pointer on upper + * device + * @upper_dev: Upper device that may have borrowed psp_dev pointer + * @priv: netdev_nested_priv containing the psp_dev being unregistered + * + * Callback for netdev_walk_all_upper_dev_rcu() to clear borrowed psp_dev + * pointers on upper devices when the underlying psp_dev is being unregistered. + * + * Return: 0 to continue walking, non-zero to stop. + */ +static int psp_clear_upper_dev_psp_dev(struct net_device *upper_dev, + struct netdev_nested_priv *priv) +{ + struct psp_dev *psd = priv->data; + struct psp_dev *upper_psd; + + upper_psd = rcu_dereference(upper_dev->psp_dev); + if (upper_psd == psd) + rcu_assign_pointer(upper_dev->psp_dev, NULL); + + return 0; +} + /** * psp_dev_unregister() - unregister PSP device * @psd: PSP device structure + * + * Unregisters a PSP device and clears all borrowed psp_dev pointers on + * upper devices (e.g., VLAN subinterfaces) that reference this device. + * This prevents use-after-free if upper devices still have borrowed + * pointers when the psp_dev structure is freed. */ void psp_dev_unregister(struct psp_dev *psd) { struct psp_assoc *pas, *next; + struct netdev_nested_priv priv = { + .data = psd, + }; mutex_lock(&psp_devs_lock); mutex_lock(&psd->lock); @@ -137,6 +170,12 @@ void psp_dev_unregister(struct psp_dev *psd) rcu_assign_pointer(psd->main_netdev->psp_dev, NULL); + /* Clear borrowed psp_dev pointers on all upper devices */ + rcu_read_lock(); + netdev_walk_all_upper_dev_rcu(psd->main_netdev, + psp_clear_upper_dev_psp_dev, &priv); + rcu_read_unlock(); + psd->ops = NULL; psd->drv_priv = NULL; @@ -313,11 +352,79 @@ int psp_dev_rcv(struct sk_buff *skb, u16 dev_id, u8 generation, bool strip_icv) } EXPORT_SYMBOL(psp_dev_rcv); +/** + * psp_netdevice_event() - Handle netdevice events for PSP device propagation + * @nb: notifier block + * @event: netdevice event + * @ptr: netdevice notifier info + * + * Propagates psp_dev pointer from lower devices to upper devices when + * upper devices are created (e.g., VLAN subinterfaces). + * Excluding from this logic, the upper devices that have multiple lower + * devices eg., bond devices. + * + * Return: NOTIFY_DONE + */ +static int psp_netdevice_event(struct notifier_block *nb, + unsigned long event, void *ptr) +{ + struct netdev_notifier_changeupper_info *info; + struct net_device *dev, *upper_dev; + struct psp_dev *psd; + + if (event != NETDEV_CHANGEUPPER) + return NOTIFY_DONE; + + info = ptr; + dev = netdev_notifier_info_to_dev(ptr); + upper_dev = info->upper_dev; + + if (netif_is_lag_master(upper_dev)) + return NOTIFY_DONE; + + if (info->linking) { + /* Lower device is being linked to an upper device. + * Propagate psp_dev from the immediate lower device to the + * upper device. The immediate lower device would have already + * got the psp_dev pointer set in a previous notification (or + * owns it if it's the lowest device). + * Upper devices just borrow the pointer. + */ + psd = rtnl_dereference(dev->psp_dev); + if (psd) + rcu_assign_pointer(upper_dev->psp_dev, psd); + } else { + /* Lower device is being unlinked from an upper device. + * Clear the borrowed psp_dev pointer. + */ + psd = rtnl_dereference(upper_dev->psp_dev); + if (psd) + rcu_assign_pointer(upper_dev->psp_dev, NULL); + } + + return NOTIFY_DONE; +} + +static struct notifier_block psp_netdevice_notifier = { + .notifier_call = psp_netdevice_event, +}; + static int __init psp_init(void) { + int err; + mutex_init(&psp_devs_lock); - return genl_register_family(&psp_nl_family); + err = register_netdevice_notifier(&psp_netdevice_notifier); + if (err) + return err; + + err = genl_register_family(&psp_nl_family); + if (err) { + unregister_netdevice_notifier(&psp_netdevice_notifier); + return err; + } + return 0; } subsys_initcall(psp_init); -- 2.45.4