From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mo4-p02-ob.smtp.rzone.de (mo4-p02-ob.smtp.rzone.de [85.215.255.82]) (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 41D95433049 for ; Tue, 25 Aug 2026 12:31:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=85.215.255.82 ARC-Seal:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787661065; cv=pass; b=WQuBGz2nZ8ClUjCSA7iUlqM6iDFVOzfwIJsvVDeQNea0C68pqspp6WhMp+Ng9vpHcql5OE99lpnlJN2mepFKo7EVXvHi4FBbFbsYHZrO6lBf4C7M0jxY3vMMGWsrAw/5fp3B518KicEaVXr6AHTnyh8AFGSdwBhX+RXKlHSdT5k= ARC-Message-Signature:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787661065; c=relaxed/simple; bh=b0EiLxXJ2KC1P9wIXw7WqhMzHxY1jKIQ0drKQqoq5Gk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=g8j+fmQpVHRoA8hXb5r+0QFI9x6JB3lzhh7X0z3/UIx27Z3VqKxoBBj1paqRZnjkmnt89cF9/V3jY0qCBvcMrw1mfSiglVNAEr7L6ZEzb/oA1912gbAvnbY/zLohZOY2TLDF6QOmFa63vZesqD4cIkv9Qpl1yzc8T26cob4/CO8= 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=dY3VCYLG; dkim=permerror (0-bit key) header.d=hartkopp.net header.i=@hartkopp.net header.b=ESk1duo4; arc=pass smtp.client-ip=85.215.255.82 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="dY3VCYLG"; dkim=permerror (0-bit key) header.d=hartkopp.net header.i=@hartkopp.net header.b="ESk1duo4" ARC-Seal: i=1; a=rsa-sha256; t=1787660874; cv=none; d=strato.com; s=strato-dkim-0002; b=MgFImG53zGRiiizigbrVUHgN6N4GczxJ23K800ZgkdsoqIpH5JwUL0sJcm4gEDM4Ai YM35mza/qGgiCuZKVDl2uzf0wSloO7u6ACnF96i3oC1kcyWNfi3ADafIqYsueRLKS3lr ChXBivsyqzC+rtdtk74rkESTNMbTElqvVzyfBc/mbQfa8Z+hw7ndshUlBBi7B4/yEimz ChKVS6kvOAJUOZ9d9f5jfOrMzIK1wn3xHWK9p9XkNTherFkHLH1/nmjYIY4/uEgVTBzt 1FFQ7EcQnXu+wRw3SiTWqQmZ+u4y+YP6dIXOTng1lreoGiy858loWeF3Z8b+hM/ZVwcw /9cA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; t=1787660874; 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=Vc2DCmB68IwLq+Mrv235fNkyjlIlHz7XNqGc5LLL1ik=; b=G9SXf7vZSsjt6T4sKAnvgsQhOLHbAHmQn+HwqEva2szrZEeeqsxtiL+STW0M5yChzY 6zkbOtEshM2WXX7K1uesq/dsVcmxzNoPr91Ai2UMXCmKYWrkVKfGBLY0plqjIiDbEbLl 0OhJAxvXqJzlKJwZzEZItfBLTjYoJiS5xYEhWDlbC92b8lnndOhS5eYs60Ct0ybAs0QY CuMsxcQQEtLt9EW5xwhypSdrl4Ez4ImSBajNu0D4HAdobsLMWIlVN5OzPLcj3pJ+WzfM X74RS/chQcg0Begc4uHTUpWABkpAquYF+3QX1rdxdtm3e9GYhtBzjzZFa/vQzpuM8Xt7 PoRw== ARC-Authentication-Results: i=1; strato.com; arc=none; dkim=none X-RZG-CLASS-ID: mo02 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1787660874; 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=Vc2DCmB68IwLq+Mrv235fNkyjlIlHz7XNqGc5LLL1ik=; b=dY3VCYLGKJS65LUl8dUaVuBmiez3Qv44SNylei1NpiE34fHO+r8P/WV7m+XP7rW2fE pJ9+A4ruMNLVgEYdUy0rODLxb2AIWwH+JmUkwjTQEIKkXRuHjSkN13oUgFOefv95m1Bj KABTrfum54Pqh2+2+USLGRMI82KkwhR/+ZcmWkLGiQsi4C0AvpsSTdRc+JrG+uUeAwiA 7Wy56bcm4C8z14Pf5ycNUW6k7lvliHDSnYLFTjn2AQbKPwezQWSuLB5R2K0aVqbFHtEn x8iMiVdWf8Inv/jdXxndsds4MF2sGNoy87IL0fS2HqSHJWY69tYiq/yHSJm71S5Ju43S qN0w== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; t=1787660874; 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=Vc2DCmB68IwLq+Mrv235fNkyjlIlHz7XNqGc5LLL1ik=; b=ESk1duo4trmDE85kChRiEfWXZ9KALQWl8zjOUL36XHGHJQ8+W31ZvvAGSF2XAzyd0I QBKaGZU3GQitzm8sXoDg== X-RZG-AUTH: ":P2MHfkW8eP4Mre39l357AZT/I7AY/7nT2yrDxb8mjH4JKvMdQv2tTUsMrZpkO3Mw3lZ/t54cFxeEQ7s8bDup0Q==" Received: from vivo.lan by smtp.strato.de (RZmta 55.6.2 AUTH) with ESMTPSA id K171b727PCRskVd (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate); Tue, 25 Aug 2026 14:27:54 +0200 (CEST) From: Oliver Hartkopp To: stable@vger.kernel.org Cc: Oliver Hartkopp , Marc Kleine-Budde Subject: [PATCH 6.1.y 1/2] can: use skb hash instead of private variable in headroom Date: Tue, 25 Aug 2026 14:27:14 +0200 Message-ID: <20260825122715.3884-5-socketcan@hartkopp.net> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260825122715.3884-1-socketcan@hartkopp.net> References: <202608250013.6e9c30257cf35cff@kernel.org> <20260825122715.3884-1-socketcan@hartkopp.net> 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 851d2c90901c..e7bafb2e013a 100644 --- a/net/can/af_can.c +++ b/net/can/af_can.c @@ -638,10 +638,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; @@ -649,13 +659,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 16640650c433..35f0037ac48b 100644 --- a/net/can/bcm.c +++ b/net/can/bcm.c @@ -336,11 +336,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; @@ -1580,11 +1579,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 645e0bd16782..2beb11766902 100644 --- a/net/can/isotp.c +++ b/net/can/isotp.c @@ -216,11 +216,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); @@ -771,11 +770,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 */ @@ -1067,11 +1065,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 502975fd5f97..c8173cd34433 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 b11febe2b5fb..a1a28240fec2 100644 --- a/net/can/j1939/transport.c +++ b/net/can/j1939/transport.c @@ -611,11 +611,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)); @@ -1551,11 +1550,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 bcd6061f43d8..c54d3b8ee215 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; @@ -138,21 +138,21 @@ static void raw_rcv(struct sk_buff *oskb, void *data) (!ro->xl_frames && can_is_canxl_skb(oskb))) return; /* 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; } @@ -868,11 +868,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