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 DDE8C2FFFB8; Sun, 25 Jan 2026 20:17:55 +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=1769372278; cv=pass; b=nVQXhV3HTRADt6IP+ndSfL3v0OC4WUAFph0Vhn10/dJ9xIDHs744tRgnGMxdB33j6u68eaWXnPdM6UUbbxGpAWI5uk3dECuBg/nb7JrrWN1NzJzMtuer+TnKKplTngRPKollvp3WhMT11hUqdh1/wcZ/d5nSxGxv/06awh9VRP4= ARC-Message-Signature:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769372278; c=relaxed/simple; bh=Jj+GNiV/8xrJMnU1GUyBbFmOJfxTaCLZ06cMlXeLFhQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=amNV/qyptfuyGaXWXf63SMzd00rDZCbW0NWwngDkRVgjeESz2IEmA1fJ5XHfzVhzCqt6PUb3A9ASnN50ayPzHag3b9juBAg4Xujqwl+Y2DpYQYNew0w70CKjBPUA2vsK/ae6376jHX0F1Pyg4Uh/HbT/VXeEMyzaSG63ESuTzGM= 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=b5hbB9Vs; dkim=permerror (0-bit key) header.d=hartkopp.net header.i=@hartkopp.net header.b=pxSZWU0f; 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="b5hbB9Vs"; dkim=permerror (0-bit key) header.d=hartkopp.net header.i=@hartkopp.net header.b="pxSZWU0f" ARC-Seal: i=1; a=rsa-sha256; t=1769372268; cv=none; d=strato.com; s=strato-dkim-0002; b=qua+QhI3sLqf513427OCGPazeyLp4S22UPnS6xn/jfOzkSVPLSN/9SFp6twU+iGw+6 hq5idTUvVToYrdEjs3gyaZdOtkjs2u+aXgj9/Xf/vu84cPP0lwudotRjKS87ijCidVwV vLzCGIHW02Rxebw1RASujA5jx8ADXUEHi0souczmvhJ4SwjYUhGrGXYPnlIgDHo0YjNp 5n1ihti30H2/vLdqEG68x2O9OdpSkvB5W+/gEn5if8lyDsXX7c8zKO7UxaA6iY56MBX6 VktVLwtU/Sfj6X/Hy/jMZGifmtY4QgJOPy9fZtW6sgtEZU803xXcZj6C1YPfiNoXuOt3 y7DQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; t=1769372268; 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=lsIanAfzEJ85y3r+sw1agcbip8FAXGkv0yXrtDZe7U0=; b=XSnZmqXeh+EBHO5tBh03bPy/AFn+ZvJ5MeggPDJtdxsVB4RcSS87e1A7EBv8Iyz8gm L0FExf0OocxXpBtcJFhxj85/fL6zrJr0qSmNWQsL5dRygV8T0JSoYm5dJgEWwoiStbn+ 4YMXdqh6UTrjLAIIR7lzokGfZz1B9W6cq7HL0DeOpW2KrJt4L1lrLnHHeTbL8rhvEvBE DyNUhZ2znio9nX+ySFSZlQFf+eVPqsBqX8L+WH1qMSW78SNIgWS04kUlV5m6Ut6jKYp/ u3gS6toidwGyP8p2P3MWqCf7bfmqa7BXWqBmIyurwlnHgFDnwbO3RXmkaRUBK6JRK68T L1ug== 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=1769372268; 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=lsIanAfzEJ85y3r+sw1agcbip8FAXGkv0yXrtDZe7U0=; b=b5hbB9VssAfOzEqZhdW6aLzrY5yazhBrLYPe18FFBHGRcLMu4L6jO7tXWes2xpDFFn b4sxf5EF1BckVv45oaKj9OpzsJcvuvhEG/uQyso/pJTkF5WZUb3Sx0ZyYOZKU3+Ozy9/ 00lVrIg//EF+lkZKQtl5ppFK475HHikEGDU8M+Xvp1H8qCWVXLKpYNmF+V4w1qc/14lR 2gWSSrjS6spIYWotsF1OhSon2IMlGQdiDdVhS5MGWNed+yq+A7YWmy45fP3Wej7BZzrx g7Os5ckfZKdHDLq5K8/LpriqbWeQP+XZyvkIA00LqWKAXT6TWr/MYJkrQAhp24IbZMcf awiQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; t=1769372268; 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=lsIanAfzEJ85y3r+sw1agcbip8FAXGkv0yXrtDZe7U0=; b=pxSZWU0fU6ERaDZPHdxYiVAz4spvd1u72fyHYMkuJd/KHndbcp55i9prVpSevJKEP2 BxhnNzGH1wugCOSVgGAQ== X-RZG-AUTH: ":P2MHfkW8eP4Mre39l357AZT/I7AY/7nT2yrDxb8mjH4JKvMdQv2tTUsMrZpkO3Mw3lZ/t54cFxeFQ7s1YTqptmo87qzm6sElmZEI+VN6rw==" Received: from lenov17.lan by smtp.strato.de (RZmta 54.1.0 AUTH) with ESMTPSA id K0e68b20PKHmYsU (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate); Sun, 25 Jan 2026 21:17:48 +0100 (CET) From: Oliver Hartkopp To: netdev@vger.kernel.org, linux-can@vger.kernel.org Cc: Oliver Hartkopp Subject: [net-next 3/6] can: move ifindex to CAN skb extensions Date: Sun, 25 Jan 2026 21:15:58 +0100 Message-ID: <20260125201601.5018-4-socketcan@hartkopp.net> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260125201601.5018-1-socketcan@hartkopp.net> References: <20260125201601.5018-1-socketcan@hartkopp.net> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="us-ascii" When routing CAN frames over different CAN interfaces the interface index skb->iif is overwritten with every single hop. To prevent sending a CAN frame back to its originating (first) incoming CAN interface another ifindex variable is needed, which was stored in can_skb_priv::ifindex. Move the can_skb_priv::ifindex content to can_skb_ext::can_iif. Patch 3/6 to remove the private CAN bus skb headroom infrastructure. Signed-off-by: Oliver Hartkopp --- drivers/net/can/dev/skb.c | 9 ++++----- net/can/bcm.c | 4 ++-- net/can/gw.c | 2 +- net/can/isotp.c | 6 +++--- net/can/j1939/socket.c | 2 +- net/can/j1939/transport.c | 4 ++-- net/can/raw.c | 2 +- 7 files changed, 14 insertions(+), 15 deletions(-) diff --git a/drivers/net/can/dev/skb.c b/drivers/net/can/dev/skb.c index c572745565f6..470255fe7367 100644 --- a/drivers/net/can/dev/skb.c +++ b/drivers/net/can/dev/skb.c @@ -221,11 +221,11 @@ struct sk_buff *alloc_can_skb(struct net_device *dev, struct can_frame **cf) goto out_error_cc; } skb->protocol = htons(ETH_P_CAN); init_can_skb_reserve(skb); - can_skb_prv(skb)->ifindex = dev->ifindex; + csx->can_iif = dev->ifindex; *cf = skb_put_zero(skb, sizeof(struct can_frame)); return skb; @@ -253,11 +253,11 @@ struct sk_buff *alloc_canfd_skb(struct net_device *dev, goto out_error_fd; } skb->protocol = htons(ETH_P_CANFD); init_can_skb_reserve(skb); - can_skb_prv(skb)->ifindex = dev->ifindex; + csx->can_iif = dev->ifindex; *cfd = skb_put_zero(skb, sizeof(struct canfd_frame)); /* set CAN FD flag by default */ (*cfd)->flags = CANFD_FDF; @@ -292,11 +292,11 @@ struct sk_buff *alloc_canxl_skb(struct net_device *dev, goto out_error_xl; } skb->protocol = htons(ETH_P_CANXL); init_can_skb_reserve(skb); - can_skb_prv(skb)->ifindex = dev->ifindex; + csx->can_iif = dev->ifindex; *cxl = skb_put_zero(skb, CANXL_HDR_SIZE + data_len); /* set CAN XL flag and length information by default */ (*cxl)->flags = CANXL_XLF; @@ -342,12 +342,11 @@ static bool can_skb_headroom_valid(struct net_device *dev, struct sk_buff *skb) csx = can_skb_ext_add(skb); if (!csx) return false; } - can_skb_prv(skb)->ifindex = dev->ifindex; - + csx->can_iif = dev->ifindex; skb->ip_summed = CHECKSUM_UNNECESSARY; /* perform proper loopback on capable devices */ if (dev->flags & IFF_ECHO) skb->pkt_type = PACKET_LOOPBACK; diff --git a/net/can/bcm.c b/net/can/bcm.c index 38452069dea8..f102d17e8619 100644 --- a/net/can/bcm.c +++ b/net/can/bcm.c @@ -321,11 +321,11 @@ static void bcm_can_tx(struct bcm_op *op) kfree_skb(skb); goto out; } can_skb_reserve(skb); - can_skb_prv(skb)->ifindex = dev->ifindex; + csx->can_iif = dev->ifindex; skb_put_data(skb, cf, op->cfsiz); /* send with loopback */ skb->dev = dev; @@ -1355,11 +1355,11 @@ static int bcm_tx_send(struct msghdr *msg, int ifindex, struct sock *sk, if (!dev) { kfree_skb(skb); return -ENODEV; } - can_skb_prv(skb)->ifindex = dev->ifindex; + csx->can_iif = dev->ifindex; 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/gw.c b/net/can/gw.c index 8894ab5d2087..ad89a1913b34 100644 --- a/net/can/gw.c +++ b/net/can/gw.c @@ -503,11 +503,11 @@ static void can_can_gw_rcv(struct sk_buff *skb, void *data) return; } /* is sending the skb back to the incoming interface not allowed? */ if (!(gwj->flags & CGW_FLAGS_CAN_IIF_TX_OK) && - can_skb_prv(skb)->ifindex == gwj->dst.dev->ifindex) + csx->can_iif == gwj->dst.dev->ifindex) return; /* clone the given skb, which has not been done in can_rcv() * * When there is at least one modification function activated, diff --git a/net/can/isotp.c b/net/can/isotp.c index c4fb8afde165..01ceb3febbb7 100644 --- a/net/can/isotp.c +++ b/net/can/isotp.c @@ -235,11 +235,11 @@ static int isotp_send_fc(struct sock *sk, int ae, u8 flowstatus) kfree_skb(nskb); return 1; } can_skb_reserve(nskb); - can_skb_prv(nskb)->ifindex = dev->ifindex; + csx->can_iif = dev->ifindex; nskb->dev = dev; can_skb_set_owner(nskb, sk); ncf = (struct canfd_frame *)nskb->data; skb_put_zero(nskb, so->ll.mtu); @@ -792,11 +792,11 @@ static void isotp_send_cframe(struct isotp_sock *so) dev_put(dev); return; } can_skb_reserve(skb); - can_skb_prv(skb)->ifindex = dev->ifindex; + csx->can_iif = dev->ifindex; cf = (struct canfd_frame *)skb->data; skb_put_zero(skb, so->ll.mtu); /* create consecutive frame */ @@ -1028,11 +1028,11 @@ static int isotp_sendmsg(struct socket *sock, struct msghdr *msg, size_t size) dev_put(dev); goto err_out_drop; } can_skb_reserve(skb); - can_skb_prv(skb)->ifindex = dev->ifindex; + csx->can_iif = dev->ifindex; 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 fc28a7677369..f03bae79354e 100644 --- a/net/can/j1939/socket.c +++ b/net/can/j1939/socket.c @@ -902,11 +902,11 @@ static struct sk_buff *j1939_sk_alloc_skb(struct net_device *ndev, kfree_skb(skb); goto failure; } can_skb_reserve(skb); - can_skb_prv(skb)->ifindex = ndev->ifindex; + csx->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) goto free_skb; diff --git a/net/can/j1939/transport.c b/net/can/j1939/transport.c index 0514f3504e39..96e02ad4a726 100644 --- a/net/can/j1939/transport.c +++ b/net/can/j1939/transport.c @@ -606,11 +606,11 @@ 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; + csx->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 */ BUILD_BUG_ON(sizeof(skb->cb) < sizeof(*re_skcb)); @@ -1547,11 +1547,11 @@ 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; + csx->can_iif = priv->ndev->ifindex; 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 2eadf7e06993..e26cda398e22 100644 --- a/net/can/raw.c +++ b/net/can/raw.c @@ -963,11 +963,11 @@ static int raw_sendmsg(struct socket *sock, struct msghdr *msg, size_t size) kfree_skb(skb); goto put_dev; } can_skb_reserve(skb); - can_skb_prv(skb)->ifindex = dev->ifindex; + csx->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) goto free_skb; -- 2.47.3