Received: from mo4-p00-ob.smtp.rzone.de (mo4-p00-ob.smtp.rzone.de [81.169.146.217]) (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 880A53A7F6B for ; Fri, 7 Aug 2026 07:50:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=81.169.146.217 ARC-Seal:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786089043; cv=pass; b=OKXSnOQaC9JLZaDQWETYjhnPW9GIw+FplMqBUoU6iYyguOzebfgL6teWUc6TDFwXxZt0XH7vXL3++YzrFO1dts/LNbUBUjyMZYArRhwz7IxqVKIlIjfIgkwNfPd2AgpkRbFKTrwDjDb1d8iPMEY3VL87khk+TVmWSy9iFeWSk2Y= ARC-Message-Signature:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786089043; c=relaxed/simple; bh=8HEjtQYfbjpKZVQJ3HCe9ax7gS2ztThq1yEI8Byqmc8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=nw5UZutT1zjtXkQTe6bTguFX0ijx2wIuOBdTdY08VhuMS2JrCaMAOSqwwaR40f0xU2BVirBCYaKGOY6UhtXE6BWnejX8FwVyDffFShaDHSonA+gvXZgID1pyE25WP3H2T3W7qdson1MVQP57frGNrsx7hbTCdKCj+x3AuyjsPrg= ARC-Authentication-Results:i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=hartkopp.net; spf=fail smtp.mailfrom=hartkopp.net; dkim=pass (2048-bit key) header.d=hartkopp.net header.i=@hartkopp.net header.b=arnCaCQ9; dkim=permerror (0-bit key) header.d=hartkopp.net header.i=@hartkopp.net header.b=xixqOgMZ; arc=pass smtp.client-ip=81.169.146.217 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=hartkopp.net Authentication-Results: smtp.subspace.kernel.org; spf=fail 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="arnCaCQ9"; dkim=permerror (0-bit key) header.d=hartkopp.net header.i=@hartkopp.net header.b="xixqOgMZ" ARC-Seal: i=1; a=rsa-sha256; t=1786089037; cv=none; d=strato.com; s=strato-dkim-0002; b=DXxCXnjOjEAUU23z5MZcyEOnzFeqzJ0tt1PYpSjooTfoUkcFlHFNeqfkwuZZkX+lBS pa/6W19pq3MItmhiCka+wtyyHqnwfyRanYigAZ4qv+wG0a0aCxsjP26DR6dTBtnC0+eA YE1I9/Pob9DgXXB4bQjt/5P2wwZIpbKqkvso5HhWNVFQ1rB1F6wVfAAwcNKvqyp0di0I ObVz3YUm0UcEpL6tCcW5yKLOaLsko65luEgg08xidELKlUv8goMiBgGiQObQ9ssjID3f Di1jDC0lWPR2ggbt0BLNRh8l35021HPw0LD6GsX959RSi6rMI9mzhjAyN7gEUU8ix5dR 48JQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; t=1786089037; 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=8NZbwWOAkGHCVfQ+BVEL3CsNTe7UMiCZr/WytB77vQw=; b=GOXdmIiD+DlS4SAVoK5UskCVawFo5WRr+WNJYB54CunT8TYZOK6RGQ8x8g6yiTEhoK 8kiv7V5kOQSxATf+MHiInVG7ReCE/+TPKCHJteB+Z02kYasjrtqfT9pddPYjuajfXZ9w 2iCWuM4o8fTqyKuU1vPuEeOP+95E/zDxy8HfA+M74JcNQOS5ziLG/TZwT8UJCVbARVxy mjkod1iw+NawiGtI/cNZlwx69NJEW/ICcSP/BkwDLe0XGkOEkMWyYZdOL+8yyxJty/00 nqKMIHI4IdW34kB78Iv/HaG3C5zmS2e1BNgGexKOIyHxJWb1a3zfX/OVC6D2bssGZdwe fhMA== ARC-Authentication-Results: i=1; strato.com; arc=none; dkim=none X-RZG-CLASS-ID: mo00 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1786089037; 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=8NZbwWOAkGHCVfQ+BVEL3CsNTe7UMiCZr/WytB77vQw=; b=arnCaCQ9i9p0+imQdbklvmCedC+ODEqm9c8MVHIgInvyMI3eg/vyf38oVlWPNjMNIj PkJltJFRq3PsX523dgTmhZLYKceQsH61WEiJzxvpaEYBDkz9JgBgI4XdHeNB8xpoYAEi WIUL4GZ25KrtPSYxeI9FXv5xYXnseo7bDEHfND4tcNJJTQjd8WGBNfZnxPuyV7++uHki hxTrr9Urnq0RWR0t2Gb+27gf4GFeBEaoGlmqd0PfhEFuEQ+iaHePiR9WbmGPv6fTpHDX HurrHUJImt4y57W6I1pC+OizLLev9pdL4SrZ5myu6pqyX9cUHjwZPcyXXsdFpwyntcbB pCRw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; t=1786089037; 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=8NZbwWOAkGHCVfQ+BVEL3CsNTe7UMiCZr/WytB77vQw=; b=xixqOgMZT/4QfAB6c8UOkEWTAfsnp+eVxSqXQRUDkzLs6ekhaG7ve92E9icCXiKibj fUBslCiEkETGvMFsmUDg== X-RZG-AUTH: ":P2MHfkW8eP4Mre39l357AZT/I7AY/7nT2yrDxb8mjH4JKvMdQv2tRkI16oOSW1Ti/f4PoH8=" Received: from vivo.lan by smtp.strato.de (RZmta 55.5.6 DYNA|AUTH) with ESMTPSA id K528192777obFbQ (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate); Fri, 7 Aug 2026 09:50:37 +0200 (CEST) From: Oliver Hartkopp To: stable@vger.kernel.org Cc: Oliver Hartkopp , Marc Kleine-Budde Subject: [PATCH 6.12.y v2 1/2] can: use skb hash instead of private variable in headroom Date: Fri, 7 Aug 2026 09:50:24 +0200 Message-ID: <20260807075025.104370-1-socketcan@hartkopp.net> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026080551-puma-venture-46d7@gregkh> References: <2026080551-puma-venture-46d7@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="us-ascii" commit d4fb6514ff8ed6912a71294e6b66a5d59ee88007 upstream. The can_skb_priv::skbcnt variable is used to identify CAN skbs in the RX path analogue to the skb->hash. As the skb hash is not filled in CAN skbs move the private skbcnt value to skb->hash and set skb->sw_hash accordingly. The skb->hash is a value used for RPS to identify skbs. Use it as intended. Signed-off-by: Marc Kleine-Budde Signed-off-by: Oliver Hartkopp Link: https://patch.msgid.link/20260201-can_skb_ext-v8-1-3635d790fe8b@hartkopp.net Signed-off-by: Paolo Abeni Signed-off-by: Oliver Hartkopp --- drivers/net/can/dev/skb.c | 2 -- include/linux/can/core.h | 1 + include/linux/can/skb.h | 2 -- net/can/af_can.c | 14 +++++++++++--- net/can/bcm.c | 2 -- net/can/isotp.c | 3 --- net/can/j1939/socket.c | 1 - net/can/j1939/transport.c | 2 -- net/can/raw.c | 7 +++---- 9 files changed, 15 insertions(+), 19 deletions(-) diff --git a/drivers/net/can/dev/skb.c b/drivers/net/can/dev/skb.c index 3ebd4f779b9b..0da615afa04d 100644 --- a/drivers/net/can/dev/skb.c +++ b/drivers/net/can/dev/skb.c @@ -200,11 +200,10 @@ static void init_can_skb_reserve(struct sk_buff *skb) skb_reset_mac_header(skb); skb_reset_network_header(skb); skb_reset_transport_header(skb); can_skb_reserve(skb); - can_skb_prv(skb)->skbcnt = 0; } struct sk_buff *alloc_can_skb(struct net_device *dev, struct can_frame **cf) { struct sk_buff *skb; @@ -310,11 +309,10 @@ static bool can_skb_headroom_valid(struct net_device *dev, struct sk_buff *skb) /* af_packet does not apply CAN skb specific settings */ if (skb->ip_summed == CHECKSUM_NONE) { /* init headroom */ can_skb_prv(skb)->ifindex = dev->ifindex; - can_skb_prv(skb)->skbcnt = 0; skb->ip_summed = CHECKSUM_UNNECESSARY; /* perform proper loopback on capable devices */ if (dev->flags & IFF_ECHO) diff --git a/include/linux/can/core.h b/include/linux/can/core.h index 5fb8d0e3f9c1..3287232e3cad 100644 --- a/include/linux/can/core.h +++ b/include/linux/can/core.h @@ -56,8 +56,9 @@ extern void can_rx_unregister(struct net *net, struct net_device *dev, canid_t can_id, canid_t mask, void (*func)(struct sk_buff *, void *), void *data); extern int can_send(struct sk_buff *skb, int loop); +void can_set_skb_uid(struct sk_buff *skb); void can_sock_destruct(struct sock *sk); #endif /* !_CAN_CORE_H */ diff --git a/include/linux/can/skb.h b/include/linux/can/skb.h index 1abc25a8d144..869ea574a40a 100644 --- a/include/linux/can/skb.h +++ b/include/linux/can/skb.h @@ -47,17 +47,15 @@ bool can_dropped_invalid_skb(struct net_device *dev, struct sk_buff *skb); */ /** * struct can_skb_priv - private additional data inside CAN sk_buffs * @ifindex: ifindex of the first interface the CAN frame appeared on - * @skbcnt: atomic counter to have an unique id together with skb pointer * @frame_len: length of CAN frame in data link layer * @cf: align to the following CAN frame at skb->data */ struct can_skb_priv { int ifindex; - int skbcnt; unsigned int frame_len; struct can_frame cf[]; }; static inline struct can_skb_priv *can_skb_prv(struct sk_buff *skb) diff --git a/net/can/af_can.c b/net/can/af_can.c index c86cbb3ed9c5..c2c6372f56b7 100644 --- a/net/can/af_can.c +++ b/net/can/af_can.c @@ -637,10 +637,20 @@ static int can_rcv_filter(struct can_dev_rcv_lists *dev_rcv_lists, struct sk_buf } return matches; } +void can_set_skb_uid(struct sk_buff *skb) +{ + /* create non-zero unique skb identifier together with *skb */ + while (!(skb->hash)) + skb->hash = atomic_inc_return(&skbcounter); + + skb->sw_hash = 1; +} +EXPORT_SYMBOL(can_set_skb_uid); + static void can_receive(struct sk_buff *skb, struct net_device *dev) { struct can_dev_rcv_lists *dev_rcv_lists; struct net *net = dev_net(dev); struct can_pkg_stats *pkg_stats = net->can.pkg_stats; @@ -648,13 +658,11 @@ static void can_receive(struct sk_buff *skb, struct net_device *dev) /* update statistics */ atomic_long_inc(&pkg_stats->rx_frames); atomic_long_inc(&pkg_stats->rx_frames_delta); - /* create non-zero unique skb identifier together with *skb */ - while (!(can_skb_prv(skb)->skbcnt)) - can_skb_prv(skb)->skbcnt = atomic_inc_return(&skbcounter); + can_set_skb_uid(skb); rcu_read_lock(); /* deliver the packet to sockets listening on all devices */ matches = can_rcv_filter(net->can.rx_alldev_list, skb); diff --git a/net/can/bcm.c b/net/can/bcm.c index 0c7e6203eb44..d35a39d55edd 100644 --- a/net/can/bcm.c +++ b/net/can/bcm.c @@ -348,11 +348,10 @@ static void bcm_can_tx(struct bcm_op *op, struct canfd_frame *cf) if (!skb) goto out; can_skb_reserve(skb); can_skb_prv(skb)->ifindex = dev->ifindex; - can_skb_prv(skb)->skbcnt = 0; skb_put_data(skb, cf, op->cfsiz); /* send with loopback */ skb->dev = dev; @@ -1622,11 +1621,10 @@ static int bcm_tx_send(struct msghdr *msg, int ifindex, struct sock *sk, kfree_skb(skb); return -ENODEV; } can_skb_prv(skb)->ifindex = dev->ifindex; - can_skb_prv(skb)->skbcnt = 0; skb->dev = dev; can_skb_set_owner(skb, sk); err = can_send(skb, 1); /* send with loopback */ dev_put(dev); diff --git a/net/can/isotp.c b/net/can/isotp.c index b2622c881aa3..83b847edde3c 100644 --- a/net/can/isotp.c +++ b/net/can/isotp.c @@ -230,11 +230,10 @@ static int isotp_send_fc(struct sock *sk, int ae, u8 flowstatus) return 1; } can_skb_reserve(nskb); can_skb_prv(nskb)->ifindex = dev->ifindex; - can_skb_prv(nskb)->skbcnt = 0; nskb->dev = dev; can_skb_set_owner(nskb, sk); ncf = (struct canfd_frame *)nskb->data; skb_put_zero(nskb, so->ll.mtu); @@ -796,11 +795,10 @@ static void isotp_send_cframe(struct isotp_sock *so) return; } can_skb_reserve(skb); can_skb_prv(skb)->ifindex = dev->ifindex; - can_skb_prv(skb)->skbcnt = 0; cf = (struct canfd_frame *)skb->data; skb_put_zero(skb, so->ll.mtu); /* create consecutive frame */ @@ -1102,11 +1100,10 @@ static int isotp_sendmsg(struct socket *sock, struct msghdr *msg, size_t size) goto err_out_drop; } can_skb_reserve(skb); can_skb_prv(skb)->ifindex = dev->ifindex; - can_skb_prv(skb)->skbcnt = 0; so->tx.len = size; so->tx.idx = 0; cf = (struct canfd_frame *)skb->data; diff --git a/net/can/j1939/socket.c b/net/can/j1939/socket.c index 75c2b9b23390..e843891a9323 100644 --- a/net/can/j1939/socket.c +++ b/net/can/j1939/socket.c @@ -887,11 +887,10 @@ static struct sk_buff *j1939_sk_alloc_skb(struct net_device *ndev, if (!skb) goto failure; can_skb_reserve(skb); can_skb_prv(skb)->ifindex = ndev->ifindex; - can_skb_prv(skb)->skbcnt = 0; skb_reserve(skb, offsetof(struct can_frame, data)); ret = memcpy_from_msg(skb_put(skb, size), msg, size); if (ret < 0) goto free_skb; diff --git a/net/can/j1939/transport.c b/net/can/j1939/transport.c index d8dada03b3cd..ea0d6fdd1889 100644 --- a/net/can/j1939/transport.c +++ b/net/can/j1939/transport.c @@ -610,11 +610,10 @@ sk_buff *j1939_tp_tx_dat_new(struct j1939_priv *priv, return ERR_PTR(-ENOMEM); skb->dev = priv->ndev; can_skb_reserve(skb); can_skb_prv(skb)->ifindex = priv->ndev->ifindex; - can_skb_prv(skb)->skbcnt = 0; /* 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 */ BUILD_BUG_ON(sizeof(skb->cb) < sizeof(*re_skcb)); @@ -1549,11 +1548,10 @@ j1939_session *j1939_session_fresh_new(struct j1939_priv *priv, return NULL; skb->dev = priv->ndev; can_skb_reserve(skb); can_skb_prv(skb)->ifindex = priv->ndev->ifindex; - can_skb_prv(skb)->skbcnt = 0; skcb = j1939_skb_to_cb(skb); memcpy(skcb, rel_skcb, sizeof(*skcb)); session = j1939_session_new(priv, skb, size); if (!session) { diff --git a/net/can/raw.c b/net/can/raw.c index 3b274db1da61..d0b84bdd0cb5 100644 --- a/net/can/raw.c +++ b/net/can/raw.c @@ -73,12 +73,12 @@ MODULE_ALIAS("can-proto-1"); * list containing only one item. This common case is optimized by * storing the single filter in dfilter, to avoid using dynamic memory. */ struct uniqframe { - int skbcnt; const struct sk_buff *skb; + u32 hash; unsigned int join_rx_count; }; struct raw_sock { struct sock sk; @@ -161,21 +161,21 @@ static void raw_rcv(struct sk_buff *oskb, void *data) } } /* eliminate multiple filter matches for the same skb */ if (this_cpu_ptr(ro->uniq)->skb == oskb && - this_cpu_ptr(ro->uniq)->skbcnt == can_skb_prv(oskb)->skbcnt) { + this_cpu_ptr(ro->uniq)->hash == oskb->hash) { if (!ro->join_filters) return; this_cpu_inc(ro->uniq->join_rx_count); /* drop frame until all enabled filters matched */ if (this_cpu_ptr(ro->uniq)->join_rx_count < ro->count) return; } else { this_cpu_ptr(ro->uniq)->skb = oskb; - this_cpu_ptr(ro->uniq)->skbcnt = can_skb_prv(oskb)->skbcnt; + this_cpu_ptr(ro->uniq)->hash = oskb->hash; this_cpu_ptr(ro->uniq)->join_rx_count = 1; /* drop first frame to check all enabled filters? */ if (ro->join_filters && ro->count > 1) return; } @@ -943,11 +943,10 @@ static int raw_sendmsg(struct socket *sock, struct msghdr *msg, size_t size) if (!skb) goto put_dev; can_skb_reserve(skb); can_skb_prv(skb)->ifindex = dev->ifindex; - can_skb_prv(skb)->skbcnt = 0; /* fill the skb before testing for valid CAN frames */ err = memcpy_from_msg(skb_put(skb, size), msg, size); if (err < 0) goto free_skb; -- 2.53.0