From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mo4-p01-ob.smtp.rzone.de (mo4-p01-ob.smtp.rzone.de [81.169.146.165]) (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 DF8001A256E for ; Thu, 8 Jan 2026 16:07:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=81.169.146.165 ARC-Seal:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767888479; cv=pass; b=fVXh0ksWfRUElVZkHh7uup1MzaDdRWHs3Wv30+zOpC1LQkyTQjrDJ99/j1/mVluErJRBypGdXxBASYYkES5gWgYs/Q8V3gis7tiMLvCJlWSDT7DByS6jHkdf2SbSxKwpRvOPkLZePRNrOOGQnulwCNVg87Tw+Sb8n2xTiaFcEWg= ARC-Message-Signature:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767888479; c=relaxed/simple; bh=dJXbdqVmx/n1Gj9rqEv3JUuU0i5tMRuerGqZKV5AXqI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=o75jyhQ3U0w4awQZ2H11t/tA3tVKXMESEAjSenifT0bQ1upgbi/d9DFygm0JdZyxfStAzoId/AxLUiLudRe0/eQ+UNguTO42x35rqAMs+DXeA7rEqIBYQ9+1qc2Ix5JgUKnX6PYeHtxImdy2Duazzzo/BNLkS6E8tLwgYH4tM54= ARC-Authentication-Results:i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=hartkopp.net; spf=pass smtp.mailfrom=hartkopp.net; dkim=pass (2048-bit key) header.d=hartkopp.net header.i=@hartkopp.net header.b=cVTSelkX; dkim=permerror (0-bit key) header.d=hartkopp.net header.i=@hartkopp.net header.b=D48JTYdK; arc=pass smtp.client-ip=81.169.146.165 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=hartkopp.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=hartkopp.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=hartkopp.net header.i=@hartkopp.net header.b="cVTSelkX"; dkim=permerror (0-bit key) header.d=hartkopp.net header.i=@hartkopp.net header.b="D48JTYdK" ARC-Seal: i=1; a=rsa-sha256; t=1767888454; cv=none; d=strato.com; s=strato-dkim-0002; b=RipGxILB3D2H0iMyaYPne/VpI3rFgW4EDIWnWpZYjBDWIDOOzqcQoEAQ/yU+nlS2z7 OrZ4+sopvqYn00kcRvohfXzaXaMnWetE9K/n6EXrG/SmFG2kIjiJ/qv3/It8VvMxhdgI ZH34BSewlEcKCC9qk/qSKmOMBqIKIKG73SqzhBxHQ6fU2n5Cuve+u4Hxz7UUqEiMfU8U JbohgC+Sx8+18G4klg+1iw/GzcUsbGuaNKkh2rB+wkdDi3MXF3rL+JerLsDS19ievV9r fSdiMyhNJlhkcpmLHMiR0CsaCUI2GD6IC07LHX2hh6VsQ9UrPustJJDFBenK1B4Ip3pI DcCg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; t=1767888454; s=strato-dkim-0002; d=strato.com; h=References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Cc:Date: From:Subject:Sender; bh=zSbnsIaDun//hZh/w8veTVBGyyStGQPcVkyZBzCBSmo=; b=AdmLlN8b2UjuVMC2LB5ysqcZ8VUfaYytvAQBr+TUf+L9qbavH3uRRlrMqP9LM7qym9 1uwpIka4RiWDWygHN+T1BMwU97025wXhyq/QmbjBTfCeDzhEMYNdqPTSXWJZuywzo9Ln uMWZ/JL70JgL+1w8wH9yr90sIxiGFjZ2bDtoNNG1OeOvwPmcD96/9Kw+XRSQ8cymv+J3 S5i/l+AnkVQwNOQSt1gCSrLjNyQlx9W6za9pl/3oGgAqP747JuhOyIURQKi4EDudFWUf dijDYk9LGJDWnbpIT1mI3gyd/Y90GMXjHB7vCSV9hIEjTBPOUCuuK3biJPEXAcsIAv83 tr0Q== ARC-Authentication-Results: i=1; strato.com; arc=none; dkim=none X-RZG-CLASS-ID: mo01 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1767888454; s=strato-dkim-0002; d=hartkopp.net; h=References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Cc:Date: From:Subject:Sender; bh=zSbnsIaDun//hZh/w8veTVBGyyStGQPcVkyZBzCBSmo=; b=cVTSelkXUfTBKbFboDxlnZl4TREPM0TdQB4ZElTXfObIR+7t2MpDWQbHooOio/pwlO y1PieDVwIeDb7IodQZ7Zc++MHEOVl+EkbVRaIwjQAoieiR9kOLMGYIPfgjv3UdRZucLr 6kAMQ/xhKpBwHspZlN1eU2OpX2j6Nv1IaMMNC4t8V3e4HuWkFRwylOQFEq2jaNrzcQzp uOQFK98JlDUzDxGYmJA1l5bqKptUgLTCR85cCeNXmK60OP3Kw5/acf4ZImlHfK1bqNm0 nco54i7XGetFneeZUiF3lRXK/7iVKDxvFRtODmYc6WRXL0g/Sg2wO3DFRtxjRxcYiXIy c7Sw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; t=1767888454; s=strato-dkim-0003; d=hartkopp.net; h=References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Cc:Date: From:Subject:Sender; bh=zSbnsIaDun//hZh/w8veTVBGyyStGQPcVkyZBzCBSmo=; b=D48JTYdKxf5B8c2KqdiL+lNb/Z9qdOKfBYqIynW9sJXBsf75K9aSy7YwLXP1yVrYF3 LEsfzN2Ld4sSBMIyEhCg== X-RZG-AUTH: ":P2MHfkW8eP4Mre39l357AZT/I7AY/7nT2yrDxb8mjH4JKvMdQv2tTUsMrZpkO3Mw3lZ/t54cFxeEQ7s8bGWj0Q==" Received: from lenov17.lan by smtp.strato.de (RZmta 54.1.0 AUTH) with ESMTPSA id K0e68b208G7YJrC (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate); Thu, 8 Jan 2026 17:07:34 +0100 (CET) From: Oliver Hartkopp To: linux-can@vger.kernel.org Cc: Jakub Kicinski , Marc Kleine-Budde , Vincent Mailhol , Oliver Hartkopp Subject: [RFC can-next 4/5] can: remove private skb headroom infrastructure Date: Thu, 8 Jan 2026 17:07:15 +0100 Message-ID: <20260108160716.101883-4-socketcan@hartkopp.net> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260108160716.101883-1-socketcan@hartkopp.net> References: <20260108160716.101883-1-socketcan@hartkopp.net> Precedence: bulk X-Mailing-List: linux-can@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="us-ascii" Signed-off-by: Oliver Hartkopp --- drivers/net/can/dev/skb.c | 30 +++++++++--------------------- include/linux/can/skb.h | 28 ---------------------------- net/can/bcm.c | 7 ++----- net/can/isotp.c | 9 +++------ net/can/j1939/socket.c | 4 +--- net/can/j1939/transport.c | 7 ++----- net/can/raw.c | 3 +-- 7 files changed, 18 insertions(+), 70 deletions(-) diff --git a/drivers/net/can/dev/skb.c b/drivers/net/can/dev/skb.c index ffd71ad0252a..dfe5108600df 100644 --- a/drivers/net/can/dev/skb.c +++ b/drivers/net/can/dev/skb.c @@ -188,36 +188,33 @@ void can_free_echo_skb(struct net_device *dev, unsigned int idx, } } EXPORT_SYMBOL_GPL(can_free_echo_skb); /* fill common values for CAN sk_buffs */ -static void init_can_skb_reserve(struct sk_buff *skb) +static void init_can_skb(struct sk_buff *skb) { skb->pkt_type = PACKET_BROADCAST; skb->ip_summed = CHECKSUM_UNNECESSARY; skb_reset_mac_header(skb); skb_reset_network_header(skb); skb_reset_transport_header(skb); - - can_skb_reserve(skb); } struct sk_buff *alloc_can_skb(struct net_device *dev, struct can_frame **cf) { struct sk_buff *skb; - skb = netdev_alloc_skb(dev, sizeof(struct can_skb_priv) + - sizeof(struct can_frame)); + skb = netdev_alloc_skb(dev, sizeof(struct can_frame)); if (unlikely(!skb)) { *cf = NULL; return NULL; } skb->protocol = htons(ETH_P_CAN); - init_can_skb_reserve(skb); + init_can_skb(skb); skb->can_iif = dev->ifindex; *cf = skb_put_zero(skb, sizeof(struct can_frame)); return skb; @@ -227,20 +224,19 @@ EXPORT_SYMBOL_GPL(alloc_can_skb); struct sk_buff *alloc_canfd_skb(struct net_device *dev, struct canfd_frame **cfd) { struct sk_buff *skb; - skb = netdev_alloc_skb(dev, sizeof(struct can_skb_priv) + - sizeof(struct canfd_frame)); + skb = netdev_alloc_skb(dev, sizeof(struct canfd_frame)); if (unlikely(!skb)) { *cfd = NULL; return NULL; } skb->protocol = htons(ETH_P_CANFD); - init_can_skb_reserve(skb); + init_can_skb(skb); skb->can_iif = dev->ifindex; *cfd = skb_put_zero(skb, sizeof(struct canfd_frame)); /* set CAN FD flag by default */ @@ -257,17 +253,16 @@ struct sk_buff *alloc_canxl_skb(struct net_device *dev, struct sk_buff *skb; if (data_len < CANXL_MIN_DLEN || data_len > CANXL_MAX_DLEN) goto out_error; - skb = netdev_alloc_skb(dev, sizeof(struct can_skb_priv) + - CANXL_HDR_SIZE + data_len); + skb = netdev_alloc_skb(dev, CANXL_HDR_SIZE + data_len); if (unlikely(!skb)) goto out_error; skb->protocol = htons(ETH_P_CANXL); - init_can_skb_reserve(skb); + init_can_skb(skb); skb->can_iif = dev->ifindex; *cxl = skb_put_zero(skb, CANXL_HDR_SIZE + data_len); /* set CAN XL flag and length information by default */ @@ -297,16 +292,12 @@ struct sk_buff *alloc_can_err_skb(struct net_device *dev, struct can_frame **cf) return skb; } EXPORT_SYMBOL_GPL(alloc_can_err_skb); /* Check for outgoing skbs that have not been created by the CAN subsystem */ -static bool can_skb_headroom_valid(struct net_device *dev, struct sk_buff *skb) +static void can_skb_check_init_vals(struct net_device *dev, struct sk_buff *skb) { - /* af_packet creates a headroom of HH_DATA_MOD bytes which is fine */ - if (WARN_ON_ONCE(skb_headroom(skb) < sizeof(struct can_skb_priv))) - return false; - /* af_packet does not apply CAN skb specific settings */ if (skb->ip_summed == CHECKSUM_NONE) { /* init headroom */ skb->can_iif = dev->ifindex; @@ -328,12 +319,10 @@ static bool can_skb_headroom_valid(struct net_device *dev, struct sk_buff *skb) cfd = (struct canfd_frame *)skb->data; cfd->flags |= CANFD_FDF; } } - - return true; } /* Drop a given socketbuffer if it does not contain a valid CAN frame. */ bool can_dropped_invalid_skb(struct net_device *dev, struct sk_buff *skb) { @@ -355,12 +344,11 @@ bool can_dropped_invalid_skb(struct net_device *dev, struct sk_buff *skb) default: goto inval_skb; } - if (!can_skb_headroom_valid(dev, skb)) - goto inval_skb; + can_skb_check_init_vals(dev, skb); return false; inval_skb: kfree_skb(skb); diff --git a/include/linux/can/skb.h b/include/linux/can/skb.h index eba9557e2c1e..c5d617a0f9be 100644 --- a/include/linux/can/skb.h +++ b/include/linux/can/skb.h @@ -35,38 +35,10 @@ struct sk_buff *alloc_canxl_skb(struct net_device *dev, unsigned int data_len); struct sk_buff *alloc_can_err_skb(struct net_device *dev, struct can_frame **cf); bool can_dropped_invalid_skb(struct net_device *dev, struct sk_buff *skb); -/* - * The struct can_skb_priv is used to transport additional information along - * with the stored struct can(fd)_frame that can not be contained in existing - * struct sk_buff elements. - * N.B. that this information must not be modified in cloned CAN sk_buffs. - * To modify the CAN frame content or the struct can_skb_priv content - * skb_copy() needs to be used instead of skb_clone(). - */ - -/** - * struct can_skb_priv - private additional data inside CAN sk_buffs - * @cf: align to the following CAN frame at skb->data - */ -struct can_skb_priv { - unsigned int frame_len_to_be_removed; - struct can_frame cf[]; -}; - -static inline struct can_skb_priv *can_skb_prv(struct sk_buff *skb) -{ - return (struct can_skb_priv *)(skb->head); -} - -static inline void can_skb_reserve(struct sk_buff *skb) -{ - skb_reserve(skb, sizeof(struct can_skb_priv)); -} - static inline void can_skb_set_owner(struct sk_buff *skb, struct sock *sk) { /* If the socket has already been closed by user space, the * refcount may already be 0 (and the socket will be freed * after the last TX skb has been freed). So only increase diff --git a/net/can/bcm.c b/net/can/bcm.c index a8867e7b77d2..99dac9af2b86 100644 --- a/net/can/bcm.c +++ b/net/can/bcm.c @@ -308,15 +308,14 @@ static void bcm_can_tx(struct bcm_op *op) if (!dev) { /* RFC: should this bcm_op remove itself here? */ return; } - skb = alloc_skb(op->cfsiz + sizeof(struct can_skb_priv), gfp_any()); + skb = alloc_skb(op->cfsiz, gfp_any()); if (!skb) goto out; - can_skb_reserve(skb); skb->can_iif = dev->ifindex; skb_put_data(skb, cf, op->cfsiz); /* send with loopback */ @@ -1322,16 +1321,14 @@ static int bcm_tx_send(struct msghdr *msg, int ifindex, struct sock *sk, /* we need a real device to send frames */ if (!ifindex) return -ENODEV; - skb = alloc_skb(cfsiz + sizeof(struct can_skb_priv), GFP_KERNEL); + skb = alloc_skb(cfsiz, GFP_KERNEL); if (!skb) return -ENOMEM; - can_skb_reserve(skb); - err = memcpy_from_msg(skb_put(skb, cfsiz), msg, cfsiz); if (err < 0) { kfree_skb(skb); return err; } diff --git a/net/can/isotp.c b/net/can/isotp.c index e7623e5736ca..3486d558b3c0 100644 --- a/net/can/isotp.c +++ b/net/can/isotp.c @@ -216,21 +216,20 @@ static int isotp_send_fc(struct sock *sk, int ae, u8 flowstatus) struct sk_buff *nskb; struct canfd_frame *ncf; struct isotp_sock *so = isotp_sk(sk); int can_send_ret; - nskb = alloc_skb(so->ll.mtu + sizeof(struct can_skb_priv), gfp_any()); + nskb = alloc_skb(so->ll.mtu, gfp_any()); if (!nskb) return 1; dev = dev_get_by_index(sock_net(sk), so->ifindex); if (!dev) { kfree_skb(nskb); return 1; } - can_skb_reserve(nskb); nskb->can_iif = dev->ifindex; nskb->dev = dev; can_skb_set_owner(nskb, sk); ncf = (struct canfd_frame *)nskb->data; @@ -769,17 +768,16 @@ static void isotp_send_cframe(struct isotp_sock *so) dev = dev_get_by_index(sock_net(sk), so->ifindex); if (!dev) return; - skb = alloc_skb(so->ll.mtu + sizeof(struct can_skb_priv), GFP_ATOMIC); + skb = alloc_skb(so->ll.mtu, GFP_ATOMIC); if (!skb) { dev_put(dev); return; } - can_skb_reserve(skb); skb->can_iif = dev->ifindex; cf = (struct canfd_frame *)skb->data; skb_put_zero(skb, so->ll.mtu); @@ -996,18 +994,17 @@ static int isotp_sendmsg(struct socket *sock, struct msghdr *msg, size_t size) if (!dev) { err = -ENXIO; goto err_out_drop; } - skb = sock_alloc_send_skb(sk, so->ll.mtu + sizeof(struct can_skb_priv), + skb = sock_alloc_send_skb(sk, so->ll.mtu, msg->msg_flags & MSG_DONTWAIT, &err); if (!skb) { dev_put(dev); goto err_out_drop; } - can_skb_reserve(skb); skb->can_iif = dev->ifindex; so->tx.len = size; so->tx.idx = 0; diff --git a/net/can/j1939/socket.c b/net/can/j1939/socket.c index d2642d86b4a9..f7d0b3c4aeb4 100644 --- a/net/can/j1939/socket.c +++ b/net/can/j1939/socket.c @@ -887,17 +887,15 @@ static struct sk_buff *j1939_sk_alloc_skb(struct net_device *ndev, int ret; skb = sock_alloc_send_skb(sk, size + sizeof(struct can_frame) - - sizeof(((struct can_frame *)NULL)->data) + - sizeof(struct can_skb_priv), + sizeof(((struct can_frame *)NULL)->data), msg->msg_flags & MSG_DONTWAIT, &ret); if (!skb) goto failure; - can_skb_reserve(skb); skb->can_iif = ndev->ifindex; skb_reserve(skb, offsetof(struct can_frame, data)); ret = memcpy_from_msg(skb_put(skb, size), msg, size); if (ret < 0) diff --git a/net/can/j1939/transport.c b/net/can/j1939/transport.c index 8a767b75194f..53308755a0c2 100644 --- a/net/can/j1939/transport.c +++ b/net/can/j1939/transport.c @@ -591,17 +591,15 @@ sk_buff *j1939_tp_tx_dat_new(struct j1939_priv *priv, bool swap_src_dst) { struct sk_buff *skb; struct j1939_sk_buff_cb *skcb; - skb = alloc_skb(sizeof(struct can_frame) + sizeof(struct can_skb_priv), - GFP_ATOMIC); + skb = alloc_skb(sizeof(struct can_frame), GFP_ATOMIC); if (unlikely(!skb)) return ERR_PTR(-ENOMEM); skb->dev = priv->ndev; - can_skb_reserve(skb); skb->can_iif = priv->ndev->ifindex; /* reserve CAN header */ skb_reserve(skb, offsetof(struct can_frame, data)); /* skb->cb must be large enough to hold a j1939_sk_buff_cb structure */ @@ -1526,16 +1524,15 @@ j1939_session *j1939_session_fresh_new(struct j1939_priv *priv, { struct sk_buff *skb; struct j1939_sk_buff_cb *skcb; struct j1939_session *session; - skb = alloc_skb(size + sizeof(struct can_skb_priv), GFP_ATOMIC); + skb = alloc_skb(size, GFP_ATOMIC); if (unlikely(!skb)) return NULL; skb->dev = priv->ndev; - can_skb_reserve(skb); skb->can_iif = priv->ndev->ifindex; skcb = j1939_skb_to_cb(skb); memcpy(skcb, rel_skcb, sizeof(*skcb)); session = j1939_session_new(priv, skb, size); diff --git a/net/can/raw.c b/net/can/raw.c index aa0a1a8d1494..58d3d2ca80ae 100644 --- a/net/can/raw.c +++ b/net/can/raw.c @@ -980,16 +980,15 @@ static int raw_sendmsg(struct socket *sock, struct msghdr *msg, size_t size) dev = dev_get_by_index(sock_net(sk), ifindex); if (!dev) return -ENXIO; - skb = sock_alloc_send_skb(sk, size + sizeof(struct can_skb_priv), + skb = sock_alloc_send_skb(sk, size, msg->msg_flags & MSG_DONTWAIT, &err); if (!skb) goto put_dev; - can_skb_reserve(skb); skb->can_iif = dev->ifindex; /* fill the skb before testing for valid CAN frames */ err = memcpy_from_msg(skb_put(skb, size), msg, size); if (err < 0) -- 2.47.3