From nobody Wed Feb 11 04:20:30 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 83ED033F39C; Thu, 29 Jan 2026 16:29:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769704193; cv=none; b=pVT5yMld0wREWJMbuuMOqQ3ZZ2K1vLgFTF23xSzfBUXbrvVv5VFdh6SrvH9QAWo1+NBuQ+o/Ksr8ioOGahB6p0hhNVknbP5mNR+35lYvhiuf9nlti6hBa73/OVL97Onw/gO2KuXhQbrwx92aLmi+V0OYU6dACwzNxR1GO5gZW7w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769704193; c=relaxed/simple; bh=SBs/C150pguj/vCEZlWhOTRKiUV8IQgb9NQzwVbQ8vI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=TB781ADKuO8S8JVIFMYqCPB7OEMEcGYucPOob/1Ps6mV/ycQ9OGSaN+T2WRmbpJX5n6k5tUuXwmu3XC6Bpkqdxzd2pUHZc2La6+u5Cmcb/NMmbaS0/7mTyTxn3UT9svA4rsvQQfVv214qZkcXkJ07CnUmPNqyEy1YPkE87IxprQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ZZsGLOv3; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="ZZsGLOv3" Received: by smtp.kernel.org (Postfix) with ESMTPS id 5D89DC4AF0E; Thu, 29 Jan 2026 16:29:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1769704193; bh=SBs/C150pguj/vCEZlWhOTRKiUV8IQgb9NQzwVbQ8vI=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=ZZsGLOv3WBci7FF8bxYxVz6HprtzczuvGXRbyRj8IOjXHxjg7C1hOGhphS8l7I2tA CEDv5cW856xCJg/PxqxGemOdaUhIulLSfNvcuHiGZLtAs9glDzAIsyT8rQSrlLP5Hz kV9uC4ntRqP/gMfaYQlPBxtYBB480bG4HAmdIhueiO16mrKoI/fzOQ3V8Q9YbRoBpq y6nfOV1upXqTrzjFkt36Q8bjKOQb7OVHOzVPyEfDCCpQ9RGIaKIBLIe98LpN/iMYD1 v+C1sxPngFrjLlOymtMtENx39yRE85T31xIlwQBarLZxkSbxQ4IzvUXnppjuiznG0e joQlEoIDrIxFg== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 524E6D6B08D; Thu, 29 Jan 2026 16:29:53 +0000 (UTC) From: Oliver Hartkopp via B4 Relay Date: Thu, 29 Jan 2026 17:29:10 +0100 Subject: [PATCH net-next v5 4/6] can: move frame_len to CAN skb extensions 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="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260129-can_skb_ext-v5-4-21252fdc8900@hartkopp.net> References: <20260129-can_skb_ext-v5-0-21252fdc8900@hartkopp.net> In-Reply-To: <20260129-can_skb_ext-v5-0-21252fdc8900@hartkopp.net> To: Marc Kleine-Budde , Vincent Mailhol , Oliver Hartkopp , Robin van der Gracht , Oleksij Rempel , kernel@pengutronix.de, "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman Cc: linux-can@vger.kernel.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org X-Mailer: b4 0.15-dev-47773 X-Developer-Signature: v=1; a=ed25519-sha256; t=1769704191; l=3158; i=socketcan@hartkopp.net; s=20260128; h=from:subject:message-id; bh=ArF50dGFLTJeKrJinhCvEu9UmJPwPrODNYHzRcVUyg0=; b=hjMwnl5LeoKBPYvQSLtsYxYw6gaCDuEVEEWAkgD+3cyi7/f5OESzPthT2N9Ifa1Cu9SGi72lC lDkZqmKYm+fCMYZpO0GdEdFqwmW3Q8IOD54cM+MoWrURtqnX9QxQTmz X-Developer-Key: i=socketcan@hartkopp.net; a=ed25519; pk=/gU/7/wBqak3kTsTeFbCCqUi9dnh+1i6ITEkfPj/BvU= X-Endpoint-Received: by B4 Relay for socketcan@hartkopp.net/20260128 with auth_id=620 X-Original-From: Oliver Hartkopp Reply-To: socketcan@hartkopp.net From: Oliver Hartkopp The can_skb_priv::frame_len variable is used to cache a previous calculated CAN frame length to be passed to BQL queueing disciplines. Move the can_skb_priv::frame_len content to can_skb_ext::can_framelen. Signed-off-by: Marc Kleine-Budde Signed-off-by: Oliver Hartkopp --- drivers/net/can/dev/skb.c | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/drivers/net/can/dev/skb.c b/drivers/net/can/dev/skb.c index 470255fe7367..408ee49abce1 100644 --- a/drivers/net/can/dev/skb.c +++ b/drivers/net/can/dev/skb.c @@ -47,10 +47,11 @@ void can_flush_echo_skb(struct net_device *dev) */ int can_put_echo_skb(struct sk_buff *skb, struct net_device *dev, unsigned int idx, unsigned int frame_len) { struct can_priv *priv =3D netdev_priv(dev); + struct can_skb_ext *csx; =20 if (idx >=3D priv->echo_skb_max) { netdev_err(dev, "%s: BUG! Trying to access can_priv::echo_skb out of bou= nds (%u/max %u)\n", __func__, idx, priv->echo_skb_max); return -EINVAL; @@ -73,11 +74,13 @@ int can_put_echo_skb(struct sk_buff *skb, struct net_de= vice *dev, /* make settings for echo to reduce code in irq context */ skb->ip_summed =3D CHECKSUM_UNNECESSARY; skb->dev =3D dev; =20 /* save frame_len to reuse it when transmission is completed */ - can_skb_prv(skb)->frame_len =3D frame_len; + csx =3D can_skb_ext_find(skb); + if (csx) + csx->can_framelen =3D frame_len; =20 if (skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP) skb_shinfo(skb)->tx_flags |=3D SKBTX_IN_PROGRESS; =20 skb_tx_timestamp(skb); @@ -110,20 +113,25 @@ __can_get_echo_skb(struct net_device *dev, unsigned i= nt idx, if (priv->echo_skb[idx]) { /* Using "struct canfd_frame::len" for the frame * length is supported on both CAN and CANFD frames. */ struct sk_buff *skb =3D priv->echo_skb[idx]; - struct can_skb_priv *can_skb_priv =3D can_skb_prv(skb); + struct can_skb_ext *csx; =20 if (skb_shinfo(skb)->tx_flags & SKBTX_IN_PROGRESS) skb_tstamp_tx(skb, skb_hwtstamps(skb)); =20 /* get the real payload length for netdev statistics */ *len_ptr =3D can_skb_get_data_len(skb); =20 - if (frame_len_ptr) - *frame_len_ptr =3D can_skb_priv->frame_len; + if (frame_len_ptr) { + csx =3D can_skb_ext_find(skb); + if (csx) + *frame_len_ptr =3D csx->can_framelen; + else + *frame_len_ptr =3D 0; + } =20 priv->echo_skb[idx] =3D NULL; =20 if (skb->pkt_type =3D=3D PACKET_LOOPBACK) { skb->pkt_type =3D PACKET_BROADCAST; @@ -179,14 +187,19 @@ void can_free_echo_skb(struct net_device *dev, unsign= ed int idx, return; } =20 if (priv->echo_skb[idx]) { struct sk_buff *skb =3D priv->echo_skb[idx]; - struct can_skb_priv *can_skb_priv =3D can_skb_prv(skb); - - if (frame_len_ptr) - *frame_len_ptr =3D can_skb_priv->frame_len; + struct can_skb_ext *csx; + + if (frame_len_ptr) { + csx =3D can_skb_ext_find(skb); + if (csx) + *frame_len_ptr =3D csx->can_framelen; + else + *frame_len_ptr =3D 0; + } =20 dev_kfree_skb_any(skb); priv->echo_skb[idx] =3D NULL; } } --=20 2.51.0