forked from ~ljy/RK356X_SDK_RELEASE
blame | history | patch | commit | commitdiff
hc
2024-02-20 ea08eeccae9297f7aabd2ef7f0c2517ac4549acc 
 kernel/net/can/af_can.c
....@@ -1,5 +1,5 @@
1
-/*
2
- * af_can.c - Protocol family CAN core module
1
+// SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause)
2
+/* af_can.c - Protocol family CAN core module
33  *            (used by different CAN protocol modules)
44  *
55  * Copyright (c) 2002-2017 Volkswagen Group Electronic Research
....@@ -58,6 +58,7 @@
5858 #include <linux/can.h>
5959 #include <linux/can/core.h>
6060 #include <linux/can/skb.h>
61
+#include <linux/can/can-ml.h>
6162 #include <linux/ratelimit.h>
6263 #include <net/net_namespace.h>
6364 #include <net/sock.h>
....@@ -83,30 +84,14 @@
8384 
8485 static atomic_t skbcounter = ATOMIC_INIT(0);
8586 
86
-/*
87
- * af_can socket functions
88
- */
87
+/* af_can socket functions */
8988 
90
-int can_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
91
-{
92
-	struct sock *sk = sock->sk;
93
-
94
-	switch (cmd) {
95
-
96
-	case SIOCGSTAMP:
97
-		return sock_get_timestamp(sk, (struct timeval __user *)arg);
98
-
99
-	default:
100
-		return -ENOIOCTLCMD;
101
-	}
102
-}
103
-EXPORT_SYMBOL(can_ioctl);
104
-
105
-static void can_sock_destruct(struct sock *sk)
89
+void can_sock_destruct(struct sock *sk)
10690 {
10791 	skb_queue_purge(&sk->sk_receive_queue);
10892 	skb_queue_purge(&sk->sk_error_queue);
10993 }
94
+EXPORT_SYMBOL(can_sock_destruct);
11095 
11196 static const struct can_proto *can_get_proto(int protocol)
11297 {
....@@ -146,14 +131,13 @@
146131 
147132 		err = request_module("can-proto-%d", protocol);
148133 
149
-		/*
150
-		 * In case of error we only print a message but don't
134
+		/* In case of error we only print a message but don't
151135 		 * return the error code immediately.  Below we will
152136 		 * return -EPROTONOSUPPORT
153137 		 */
154138 		if (err)
155
-			printk_ratelimited(KERN_ERR "can: request_module "
156
-			       "(can-proto-%d) failed.\n", protocol);
139
+			pr_err_ratelimited("can: request_module (can-proto-%d) failed.\n",
140
+					   protocol);
157141 
158142 		cp = can_get_proto(protocol);
159143 	}
....@@ -194,9 +178,7 @@
194178 	return err;
195179 }
196180 
197
-/*
198
- * af_can tx path
199
- */
181
+/* af_can tx path */
200182 
201183 /**
202184  * can_send - transmit a CAN frame (optional with local loopback)
....@@ -218,7 +200,7 @@
218200 {
219201 	struct sk_buff *newskb = NULL;
220202 	struct canfd_frame *cfd = (struct canfd_frame *)skb->data;
221
-	struct s_stats *can_stats = dev_net(skb->dev)->can.can_stats;
203
+	struct can_pkg_stats *pkg_stats = dev_net(skb->dev)->can.pkg_stats;
222204 	int err = -EINVAL;
223205 
224206 	if (skb->len == CAN_MTU) {
....@@ -229,11 +211,11 @@
229211 		skb->protocol = htons(ETH_P_CANFD);
230212 		if (unlikely(cfd->len > CANFD_MAX_DLEN))
231213 			goto inval_skb;
232
-	} else
214
+	} else {
233215 		goto inval_skb;
216
+	}
234217 
235
-	/*
236
-	 * Make sure the CAN frame can pass the selected CAN netdevice.
218
+	/* Make sure the CAN frame can pass the selected CAN netdevice.
237219 	 * As structs can_frame and canfd_frame are similar, we can provide
238220 	 * CAN FD frames to legacy CAN drivers as long as the length is <= 8
239221 	 */
....@@ -264,8 +246,7 @@
264246 		/* indication for the CAN driver: do loopback */
265247 		skb->pkt_type = PACKET_LOOPBACK;
266248 
267
-		/*
268
-		 * The reference to the originating sock may be required
249
+		/* The reference to the originating sock may be required
269250 		 * by the receiving socket to check whether the frame is
270251 		 * its own. Example: can_raw sockopt CAN_RAW_RECV_OWN_MSGS
271252 		 * Therefore we have to ensure that skb->sk remains the
....@@ -274,8 +255,7 @@
274255 		 */
275256 
276257 		if (!(skb->dev->flags & IFF_ECHO)) {
277
-			/*
278
-			 * If the interface is not capable to do loopback
258
+			/* If the interface is not capable to do loopback
279259 			 * itself, we do it here.
280260 			 */
281261 			newskb = skb_clone(skb, GFP_ATOMIC);
....@@ -307,8 +287,8 @@
307287 		netif_rx_ni(newskb);
308288 
309289 	/* update statistics */
310
-	can_stats->tx_frames++;
311
-	can_stats->tx_frames_delta++;
290
+	pkg_stats->tx_frames++;
291
+	pkg_stats->tx_frames_delta++;
312292 
313293 	return 0;
314294 
....@@ -318,17 +298,17 @@
318298 }
319299 EXPORT_SYMBOL(can_send);
320300 
321
-/*
322
- * af_can rx path
323
- */
301
+/* af_can rx path */
324302 
325
-static struct can_dev_rcv_lists *find_dev_rcv_lists(struct net *net,
326
-						struct net_device *dev)
303
+static struct can_dev_rcv_lists *can_dev_rcv_lists_find(struct net *net,
304
+							struct net_device *dev)
327305 {
328
-	if (!dev)
329
-		return net->can.can_rx_alldev_list;
330
-	else
331
-		return (struct can_dev_rcv_lists *)dev->ml_priv;
306
+	if (dev) {
307
+		struct can_ml_priv *can_ml = can_get_ml_priv(dev);
308
+		return &can_ml->dev_rcv_lists;
309
+	} else {
310
+		return net->can.rx_alldev_list;
311
+	}
332312 }
333313 
334314 /**
....@@ -355,10 +335,10 @@
355335 }
356336 
357337 /**
358
- * find_rcv_list - determine optimal filterlist inside device filter struct
338
+ * can_rcv_list_find - determine optimal filterlist inside device filter struct
359339  * @can_id: pointer to CAN identifier of a given can_filter
360340  * @mask: pointer to CAN mask of a given can_filter
361
- * @d: pointer to the device filter struct
341
+ * @dev_rcv_lists: pointer to the device filter struct
362342  *
363343  * Description:
364344  *  Returns the optimal filterlist to reduce the filter handling in the
....@@ -378,11 +358,11 @@
378358  *
379359  * Return:
380360  *  Pointer to optimal filterlist for the given can_id/mask pair.
381
- *  Constistency checked mask.
361
+ *  Consistency checked mask.
382362  *  Reduced can_id to have a preprocessed filter compare value.
383363  */
384
-static struct hlist_head *find_rcv_list(canid_t *can_id, canid_t *mask,
385
-					struct can_dev_rcv_lists *d)
364
+static struct hlist_head *can_rcv_list_find(canid_t *can_id, canid_t *mask,
365
+					    struct can_dev_rcv_lists *dev_rcv_lists)
386366 {
387367 	canid_t inv = *can_id & CAN_INV_FILTER; /* save flag before masking */
388368 
....@@ -390,7 +370,7 @@
390370 	if (*mask & CAN_ERR_FLAG) {
391371 		/* clear CAN_ERR_FLAG in filter entry */
392372 		*mask &= CAN_ERR_MASK;
393
-		return &d->rx[RX_ERR];
373
+		return &dev_rcv_lists->rx[RX_ERR];
394374 	}
395375 
396376 	/* with cleared CAN_ERR_FLAG we have a simple mask/value filterpair */
....@@ -406,32 +386,32 @@
406386 
407387 	/* inverse can_id/can_mask filter */
408388 	if (inv)
409
-		return &d->rx[RX_INV];
389
+		return &dev_rcv_lists->rx[RX_INV];
410390 
411391 	/* mask == 0 => no condition testing at receive time */
412392 	if (!(*mask))
413
-		return &d->rx[RX_ALL];
393
+		return &dev_rcv_lists->rx[RX_ALL];
414394 
415395 	/* extra filterlists for the subscription of a single non-RTR can_id */
416396 	if (((*mask & CAN_EFF_RTR_FLAGS) == CAN_EFF_RTR_FLAGS) &&
417397 	    !(*can_id & CAN_RTR_FLAG)) {
418
-
419398 		if (*can_id & CAN_EFF_FLAG) {
420399 			if (*mask == (CAN_EFF_MASK | CAN_EFF_RTR_FLAGS))
421
-				return &d->rx_eff[effhash(*can_id)];
400
+				return &dev_rcv_lists->rx_eff[effhash(*can_id)];
422401 		} else {
423402 			if (*mask == (CAN_SFF_MASK | CAN_EFF_RTR_FLAGS))
424
-				return &d->rx_sff[*can_id];
403
+				return &dev_rcv_lists->rx_sff[*can_id];
425404 		}
426405 	}
427406 
428407 	/* default: filter via can_id/can_mask */
429
-	return &d->rx[RX_FIL];
408
+	return &dev_rcv_lists->rx[RX_FIL];
430409 }
431410 
432411 /**
433412  * can_rx_register - subscribe CAN frames from a specific interface
434
- * @dev: pointer to netdevice (NULL => subcribe from 'all' CAN devices list)
413
+ * @net: the applicable net namespace
414
+ * @dev: pointer to netdevice (NULL => subscribe from 'all' CAN devices list)
435415  * @can_id: CAN identifier (see description)
436416  * @mask: CAN mask (see description)
437417  * @func: callback function on filter match
....@@ -463,70 +443,63 @@
463443 		    canid_t mask, void (*func)(struct sk_buff *, void *),
464444 		    void *data, char *ident, struct sock *sk)
465445 {
466
-	struct receiver *r;
467
-	struct hlist_head *rl;
468
-	struct can_dev_rcv_lists *d;
469
-	struct s_pstats *can_pstats = net->can.can_pstats;
446
+	struct receiver *rcv;
447
+	struct hlist_head *rcv_list;
448
+	struct can_dev_rcv_lists *dev_rcv_lists;
449
+	struct can_rcv_lists_stats *rcv_lists_stats = net->can.rcv_lists_stats;
470450 	int err = 0;
471451 
472452 	/* insert new receiver  (dev,canid,mask) -> (func,data) */
473453 
474
-	if (dev && dev->type != ARPHRD_CAN)
454
+	if (dev && (dev->type != ARPHRD_CAN || !can_get_ml_priv(dev)))
475455 		return -ENODEV;
476456 
477457 	if (dev && !net_eq(net, dev_net(dev)))
478458 		return -ENODEV;
479459 
480
-	r = kmem_cache_alloc(rcv_cache, GFP_KERNEL);
481
-	if (!r)
460
+	rcv = kmem_cache_alloc(rcv_cache, GFP_KERNEL);
461
+	if (!rcv)
482462 		return -ENOMEM;
483463 
484
-	spin_lock(&net->can.can_rcvlists_lock);
464
+	spin_lock_bh(&net->can.rcvlists_lock);
485465 
486
-	d = find_dev_rcv_lists(net, dev);
487
-	if (d) {
488
-		rl = find_rcv_list(&can_id, &mask, d);
466
+	dev_rcv_lists = can_dev_rcv_lists_find(net, dev);
467
+	rcv_list = can_rcv_list_find(&can_id, &mask, dev_rcv_lists);
489468 
490
-		r->can_id  = can_id;
491
-		r->mask    = mask;
492
-		r->matches = 0;
493
-		r->func    = func;
494
-		r->data    = data;
495
-		r->ident   = ident;
496
-		r->sk      = sk;
469
+	rcv->can_id = can_id;
470
+	rcv->mask = mask;
471
+	rcv->matches = 0;
472
+	rcv->func = func;
473
+	rcv->data = data;
474
+	rcv->ident = ident;
475
+	rcv->sk = sk;
497476 
498
-		hlist_add_head_rcu(&r->list, rl);
499
-		d->entries++;
477
+	hlist_add_head_rcu(&rcv->list, rcv_list);
478
+	dev_rcv_lists->entries++;
500479 
501
-		can_pstats->rcv_entries++;
502
-		if (can_pstats->rcv_entries_max < can_pstats->rcv_entries)
503
-			can_pstats->rcv_entries_max = can_pstats->rcv_entries;
504
-	} else {
505
-		kmem_cache_free(rcv_cache, r);
506
-		err = -ENODEV;
507
-	}
508
-
509
-	spin_unlock(&net->can.can_rcvlists_lock);
480
+	rcv_lists_stats->rcv_entries++;
481
+	rcv_lists_stats->rcv_entries_max = max(rcv_lists_stats->rcv_entries_max,
482
+					       rcv_lists_stats->rcv_entries);
483
+	spin_unlock_bh(&net->can.rcvlists_lock);
510484 
511485 	return err;
512486 }
513487 EXPORT_SYMBOL(can_rx_register);
514488 
515
-/*
516
- * can_rx_delete_receiver - rcu callback for single receiver entry removal
517
- */
489
+/* can_rx_delete_receiver - rcu callback for single receiver entry removal */
518490 static void can_rx_delete_receiver(struct rcu_head *rp)
519491 {
520
-	struct receiver *r = container_of(rp, struct receiver, rcu);
521
-	struct sock *sk = r->sk;
492
+	struct receiver *rcv = container_of(rp, struct receiver, rcu);
493
+	struct sock *sk = rcv->sk;
522494 
523
-	kmem_cache_free(rcv_cache, r);
495
+	kmem_cache_free(rcv_cache, rcv);
524496 	if (sk)
525497 		sock_put(sk);
526498 }
527499 
528500 /**
529501  * can_rx_unregister - unsubscribe CAN frames from a specific interface
502
+ * @net: the applicable net namespace
530503  * @dev: pointer to netdevice (NULL => unsubscribe from 'all' CAN devices list)
531504  * @can_id: CAN identifier
532505  * @mask: CAN mask
....@@ -540,10 +513,10 @@
540513 		       canid_t mask, void (*func)(struct sk_buff *, void *),
541514 		       void *data)
542515 {
543
-	struct receiver *r = NULL;
544
-	struct hlist_head *rl;
545
-	struct s_pstats *can_pstats = net->can.can_pstats;
546
-	struct can_dev_rcv_lists *d;
516
+	struct receiver *rcv = NULL;
517
+	struct hlist_head *rcv_list;
518
+	struct can_rcv_lists_stats *rcv_lists_stats = net->can.rcv_lists_stats;
519
+	struct can_dev_rcv_lists *dev_rcv_lists;
547520 
548521 	if (dev && dev->type != ARPHRD_CAN)
549522 		return;
....@@ -551,86 +524,72 @@
551524 	if (dev && !net_eq(net, dev_net(dev)))
552525 		return;
553526 
554
-	spin_lock(&net->can.can_rcvlists_lock);
527
+	spin_lock_bh(&net->can.rcvlists_lock);
555528 
556
-	d = find_dev_rcv_lists(net, dev);
557
-	if (!d) {
558
-		pr_err("BUG: receive list not found for "
559
-		       "dev %s, id %03X, mask %03X\n",
560
-		       DNAME(dev), can_id, mask);
561
-		goto out;
562
-	}
529
+	dev_rcv_lists = can_dev_rcv_lists_find(net, dev);
530
+	rcv_list = can_rcv_list_find(&can_id, &mask, dev_rcv_lists);
563531 
564
-	rl = find_rcv_list(&can_id, &mask, d);
565
-
566
-	/*
567
-	 * Search the receiver list for the item to delete.  This should
532
+	/* Search the receiver list for the item to delete.  This should
568533 	 * exist, since no receiver may be unregistered that hasn't
569534 	 * been registered before.
570535 	 */
571
-
572
-	hlist_for_each_entry_rcu(r, rl, list) {
573
-		if (r->can_id == can_id && r->mask == mask &&
574
-		    r->func == func && r->data == data)
536
+	hlist_for_each_entry_rcu(rcv, rcv_list, list) {
537
+		if (rcv->can_id == can_id && rcv->mask == mask &&
538
+		    rcv->func == func && rcv->data == data)
575539 			break;
576540 	}
577541 
578
-	/*
579
-	 * Check for bugs in CAN protocol implementations using af_can.c:
580
-	 * 'r' will be NULL if no matching list item was found for removal.
542
+	/* Check for bugs in CAN protocol implementations using af_can.c:
543
+	 * 'rcv' will be NULL if no matching list item was found for removal.
544
+	 * As this case may potentially happen when closing a socket while
545
+	 * the notifier for removing the CAN netdev is running we just print
546
+	 * a warning here.
581547 	 */
582
-
583
-	if (!r) {
584
-		WARN(1, "BUG: receive list entry not found for dev %s, "
585
-		     "id %03X, mask %03X\n", DNAME(dev), can_id, mask);
548
+	if (!rcv) {
549
+		pr_warn("can: receive list entry not found for dev %s, id %03X, mask %03X\n",
550
+			DNAME(dev), can_id, mask);
586551 		goto out;
587552 	}
588553 
589
-	hlist_del_rcu(&r->list);
590
-	d->entries--;
554
+	hlist_del_rcu(&rcv->list);
555
+	dev_rcv_lists->entries--;
591556 
592
-	if (can_pstats->rcv_entries > 0)
593
-		can_pstats->rcv_entries--;
594
-
595
-	/* remove device structure requested by NETDEV_UNREGISTER */
596
-	if (d->remove_on_zero_entries && !d->entries) {
597
-		kfree(d);
598
-		dev->ml_priv = NULL;
599
-	}
557
+	if (rcv_lists_stats->rcv_entries > 0)
558
+		rcv_lists_stats->rcv_entries--;
600559 
601560  out:
602
-	spin_unlock(&net->can.can_rcvlists_lock);
561
+	spin_unlock_bh(&net->can.rcvlists_lock);
603562 
604563 	/* schedule the receiver item for deletion */
605
-	if (r) {
606
-		if (r->sk)
607
-			sock_hold(r->sk);
608
-		call_rcu(&r->rcu, can_rx_delete_receiver);
564
+	if (rcv) {
565
+		if (rcv->sk)
566
+			sock_hold(rcv->sk);
567
+		call_rcu(&rcv->rcu, can_rx_delete_receiver);
609568 	}
610569 }
611570 EXPORT_SYMBOL(can_rx_unregister);
612571 
613
-static inline void deliver(struct sk_buff *skb, struct receiver *r)
572
+static inline void deliver(struct sk_buff *skb, struct receiver *rcv)
614573 {
615
-	r->func(skb, r->data);
616
-	r->matches++;
574
+	rcv->func(skb, rcv->data);
575
+	rcv->matches++;
617576 }
618577 
619
-static int can_rcv_filter(struct can_dev_rcv_lists *d, struct sk_buff *skb)
578
+static int can_rcv_filter(struct can_dev_rcv_lists *dev_rcv_lists, struct sk_buff *skb)
620579 {
621
-	struct receiver *r;
580
+	struct receiver *rcv;
622581 	int matches = 0;
623582 	struct can_frame *cf = (struct can_frame *)skb->data;
624583 	canid_t can_id = cf->can_id;
625584 
626
-	if (d->entries == 0)
585
+	if (dev_rcv_lists->entries == 0)
627586 		return 0;
628587 
629588 	if (can_id & CAN_ERR_FLAG) {
630589 		/* check for error message frame entries only */
631
-		hlist_for_each_entry_rcu(r, &d->rx[RX_ERR], list) {
632
-			if (can_id & r->mask) {
633
-				deliver(skb, r);
590
+		hlist_for_each_entry_rcu(rcv, &dev_rcv_lists->rx[RX_ERR], list) {
591
+			if (can_id & rcv->mask) {
592
+				deliver(skb, rcv);
634593 				matches++;
635594 			}
636595 		}
....@@ -638,23 +597,23 @@
638597 	}
639598 
640599 	/* check for unfiltered entries */
641
-	hlist_for_each_entry_rcu(r, &d->rx[RX_ALL], list) {
642
-		deliver(skb, r);
600
+	hlist_for_each_entry_rcu(rcv, &dev_rcv_lists->rx[RX_ALL], list) {
601
+		deliver(skb, rcv);
643602 		matches++;
644603 	}
645604 
646605 	/* check for can_id/mask entries */
647
-	hlist_for_each_entry_rcu(r, &d->rx[RX_FIL], list) {
648
-		if ((can_id & r->mask) == r->can_id) {
649
-			deliver(skb, r);
606
+	hlist_for_each_entry_rcu(rcv, &dev_rcv_lists->rx[RX_FIL], list) {
607
+		if ((can_id & rcv->mask) == rcv->can_id) {
608
+			deliver(skb, rcv);
650609 			matches++;
651610 		}
652611 	}
653612 
654613 	/* check for inverted can_id/mask entries */
655
-	hlist_for_each_entry_rcu(r, &d->rx[RX_INV], list) {
656
-		if ((can_id & r->mask) != r->can_id) {
657
-			deliver(skb, r);
614
+	hlist_for_each_entry_rcu(rcv, &dev_rcv_lists->rx[RX_INV], list) {
615
+		if ((can_id & rcv->mask) != rcv->can_id) {
616
+			deliver(skb, rcv);
658617 			matches++;
659618 		}
660619 	}
....@@ -664,16 +623,16 @@
664623 		return matches;
665624 
666625 	if (can_id & CAN_EFF_FLAG) {
667
-		hlist_for_each_entry_rcu(r, &d->rx_eff[effhash(can_id)], list) {
668
-			if (r->can_id == can_id) {
669
-				deliver(skb, r);
626
+		hlist_for_each_entry_rcu(rcv, &dev_rcv_lists->rx_eff[effhash(can_id)], list) {
627
+			if (rcv->can_id == can_id) {
628
+				deliver(skb, rcv);
670629 				matches++;
671630 			}
672631 		}
673632 	} else {
674633 		can_id &= CAN_SFF_MASK;
675
-		hlist_for_each_entry_rcu(r, &d->rx_sff[can_id], list) {
676
-			deliver(skb, r);
634
+		hlist_for_each_entry_rcu(rcv, &dev_rcv_lists->rx_sff[can_id], list) {
635
+			deliver(skb, rcv);
677636 			matches++;
678637 		}
679638 	}
....@@ -683,14 +642,14 @@
683642 
684643 static void can_receive(struct sk_buff *skb, struct net_device *dev)
685644 {
686
-	struct can_dev_rcv_lists *d;
645
+	struct can_dev_rcv_lists *dev_rcv_lists;
687646 	struct net *net = dev_net(dev);
688
-	struct s_stats *can_stats = net->can.can_stats;
647
+	struct can_pkg_stats *pkg_stats = net->can.pkg_stats;
689648 	int matches;
690649 
691650 	/* update statistics */
692
-	can_stats->rx_frames++;
693
-	can_stats->rx_frames_delta++;
651
+	pkg_stats->rx_frames++;
652
+	pkg_stats->rx_frames_delta++;
694653 
695654 	/* create non-zero unique skb identifier together with *skb */
696655 	while (!(can_skb_prv(skb)->skbcnt))
....@@ -699,12 +658,11 @@
699658 	rcu_read_lock();
700659 
701660 	/* deliver the packet to sockets listening on all devices */
702
-	matches = can_rcv_filter(net->can.can_rx_alldev_list, skb);
661
+	matches = can_rcv_filter(net->can.rx_alldev_list, skb);
703662 
704663 	/* find receive list for this device */
705
-	d = find_dev_rcv_lists(net, dev);
706
-	if (d)
707
-		matches += can_rcv_filter(d, skb);
664
+	dev_rcv_lists = can_dev_rcv_lists_find(net, dev);
665
+	matches += can_rcv_filter(dev_rcv_lists, skb);
708666 
709667 	rcu_read_unlock();
710668 
....@@ -712,8 +670,8 @@
712670 	consume_skb(skb);
713671 
714672 	if (matches > 0) {
715
-		can_stats->matches++;
716
-		can_stats->matches_delta++;
673
+		pkg_stats->matches++;
674
+		pkg_stats->matches_delta++;
717675 	}
718676 }
719677 
....@@ -722,7 +680,7 @@
722680 {
723681 	struct canfd_frame *cfd = (struct canfd_frame *)skb->data;
724682 
725
-	if (unlikely(dev->type != ARPHRD_CAN || skb->len != CAN_MTU)) {
683
+	if (unlikely(dev->type != ARPHRD_CAN || !can_get_ml_priv(dev) || skb->len != CAN_MTU)) {
726684 		pr_warn_once("PF_CAN: dropped non conform CAN skbuff: dev type %d, len %d\n",
727685 			     dev->type, skb->len);
728686 		goto free_skb;
....@@ -744,11 +702,11 @@
744702 }
745703 
746704 static int canfd_rcv(struct sk_buff *skb, struct net_device *dev,
747
-		   struct packet_type *pt, struct net_device *orig_dev)
705
+		     struct packet_type *pt, struct net_device *orig_dev)
748706 {
749707 	struct canfd_frame *cfd = (struct canfd_frame *)skb->data;
750708 
751
-	if (unlikely(dev->type != ARPHRD_CAN || skb->len != CANFD_MTU)) {
709
+	if (unlikely(dev->type != ARPHRD_CAN || !can_get_ml_priv(dev) || skb->len != CANFD_MTU)) {
752710 		pr_warn_once("PF_CAN: dropped non conform CAN FD skbuff: dev type %d, len %d\n",
753711 			     dev->type, skb->len);
754712 		goto free_skb;
....@@ -769,9 +727,7 @@
769727 	return NET_RX_DROP;
770728 }
771729 
772
-/*
773
- * af_can protocol functions
774
- */
730
+/* af_can protocol functions */
775731 
776732 /**
777733  * can_proto_register - register CAN transport protocol
....@@ -802,8 +758,9 @@
802758 	if (rcu_access_pointer(proto_tab[proto])) {
803759 		pr_err("can: protocol %d already registered\n", proto);
804760 		err = -EBUSY;
805
-	} else
761
+	} else {
806762 		RCU_INIT_POINTER(proto_tab[proto], cp);
763
+	}
807764 
808765 	mutex_unlock(&proto_tab_lock);
809766 
....@@ -833,121 +790,56 @@
833790 }
834791 EXPORT_SYMBOL(can_proto_unregister);
835792 
836
-/*
837
- * af_can notifier to create/remove CAN netdevice specific structs
838
- */
839
-static int can_notifier(struct notifier_block *nb, unsigned long msg,
840
-			void *ptr)
841
-{
842
-	struct net_device *dev = netdev_notifier_info_to_dev(ptr);
843
-	struct can_dev_rcv_lists *d;
844
-
845
-	if (dev->type != ARPHRD_CAN)
846
-		return NOTIFY_DONE;
847
-
848
-	switch (msg) {
849
-
850
-	case NETDEV_REGISTER:
851
-
852
-		/* create new dev_rcv_lists for this device */
853
-		d = kzalloc(sizeof(*d), GFP_KERNEL);
854
-		if (!d)
855
-			return NOTIFY_DONE;
856
-		BUG_ON(dev->ml_priv);
857
-		dev->ml_priv = d;
858
-
859
-		break;
860
-
861
-	case NETDEV_UNREGISTER:
862
-		spin_lock(&dev_net(dev)->can.can_rcvlists_lock);
863
-
864
-		d = dev->ml_priv;
865
-		if (d) {
866
-			if (d->entries)
867
-				d->remove_on_zero_entries = 1;
868
-			else {
869
-				kfree(d);
870
-				dev->ml_priv = NULL;
871
-			}
872
-		} else
873
-			pr_err("can: notifier: receive list not found for dev "
874
-			       "%s\n", dev->name);
875
-
876
-		spin_unlock(&dev_net(dev)->can.can_rcvlists_lock);
877
-
878
-		break;
879
-	}
880
-
881
-	return NOTIFY_DONE;
882
-}
883
-
884793 static int can_pernet_init(struct net *net)
885794 {
886
-	spin_lock_init(&net->can.can_rcvlists_lock);
887
-	net->can.can_rx_alldev_list =
888
-		kzalloc(sizeof(struct can_dev_rcv_lists), GFP_KERNEL);
889
-	if (!net->can.can_rx_alldev_list)
795
+	spin_lock_init(&net->can.rcvlists_lock);
796
+	net->can.rx_alldev_list =
797
+		kzalloc(sizeof(*net->can.rx_alldev_list), GFP_KERNEL);
798
+	if (!net->can.rx_alldev_list)
890799 		goto out;
891
-	net->can.can_stats = kzalloc(sizeof(struct s_stats), GFP_KERNEL);
892
-	if (!net->can.can_stats)
893
-		goto out_free_alldev_list;
894
-	net->can.can_pstats = kzalloc(sizeof(struct s_pstats), GFP_KERNEL);
895
-	if (!net->can.can_pstats)
896
-		goto out_free_can_stats;
800
+	net->can.pkg_stats = kzalloc(sizeof(*net->can.pkg_stats), GFP_KERNEL);
801
+	if (!net->can.pkg_stats)
802
+		goto out_free_rx_alldev_list;
803
+	net->can.rcv_lists_stats = kzalloc(sizeof(*net->can.rcv_lists_stats), GFP_KERNEL);
804
+	if (!net->can.rcv_lists_stats)
805
+		goto out_free_pkg_stats;
897806 
898807 	if (IS_ENABLED(CONFIG_PROC_FS)) {
899808 		/* the statistics are updated every second (timer triggered) */
900809 		if (stats_timer) {
901
-			timer_setup(&net->can.can_stattimer, can_stat_update,
810
+			timer_setup(&net->can.stattimer, can_stat_update,
902811 				    0);
903
-			mod_timer(&net->can.can_stattimer,
812
+			mod_timer(&net->can.stattimer,
904813 				  round_jiffies(jiffies + HZ));
905814 		}
906
-		net->can.can_stats->jiffies_init = jiffies;
815
+		net->can.pkg_stats->jiffies_init = jiffies;
907816 		can_init_proc(net);
908817 	}
909818 
910819 	return 0;
911820 
912
- out_free_can_stats:
913
-	kfree(net->can.can_stats);
914
- out_free_alldev_list:
915
-	kfree(net->can.can_rx_alldev_list);
821
+ out_free_pkg_stats:
822
+	kfree(net->can.pkg_stats);
823
+ out_free_rx_alldev_list:
824
+	kfree(net->can.rx_alldev_list);
916825  out:
917826 	return -ENOMEM;
918827 }
919828 
920829 static void can_pernet_exit(struct net *net)
921830 {
922
-	struct net_device *dev;
923
-
924831 	if (IS_ENABLED(CONFIG_PROC_FS)) {
925832 		can_remove_proc(net);
926833 		if (stats_timer)
927
-			del_timer_sync(&net->can.can_stattimer);
834
+			del_timer_sync(&net->can.stattimer);
928835 	}
929836 
930
-	/* remove created dev_rcv_lists from still registered CAN devices */
931
-	rcu_read_lock();
932
-	for_each_netdev_rcu(net, dev) {
933
-		if (dev->type == ARPHRD_CAN && dev->ml_priv) {
934
-			struct can_dev_rcv_lists *d = dev->ml_priv;
935
-
936
-			BUG_ON(d->entries);
937
-			kfree(d);
938
-			dev->ml_priv = NULL;
939
-		}
940
-	}
941
-	rcu_read_unlock();
942
-
943
-	kfree(net->can.can_rx_alldev_list);
944
-	kfree(net->can.can_stats);
945
-	kfree(net->can.can_pstats);
837
+	kfree(net->can.rx_alldev_list);
838
+	kfree(net->can.pkg_stats);
839
+	kfree(net->can.rcv_lists_stats);
946840 }
947841 
948
-/*
949
- * af_can module init/exit functions
950
- */
842
+/* af_can module init/exit functions */
951843 
952844 static struct packet_type can_packet __read_mostly = {
953845 	.type = cpu_to_be16(ETH_P_CAN),
....@@ -965,11 +857,6 @@
965857 	.owner  = THIS_MODULE,
966858 };
967859 
968
-/* notifier block for netdevice event */
969
-static struct notifier_block can_netdev_notifier __read_mostly = {
970
-	.notifier_call = can_notifier,
971
-};
972
-
973860 static struct pernet_operations can_pernet_ops __read_mostly = {
974861 	.init = can_pernet_init,
975862 	.exit = can_pernet_exit,
....@@ -985,7 +872,7 @@
985872 		     offsetof(struct can_frame, data) !=
986873 		     offsetof(struct canfd_frame, data));
987874 
988
-	pr_info("can: controller area network core (" CAN_VERSION_STRING ")\n");
875
+	pr_info("can: controller area network core\n");
989876 
990877 	rcv_cache = kmem_cache_create("can_receiver", sizeof(struct receiver),
991878 				      0, 0, NULL);
....@@ -1000,17 +887,12 @@
1000887 	err = sock_register(&can_family_ops);
1001888 	if (err)
1002889 		goto out_sock;
1003
-	err = register_netdevice_notifier(&can_netdev_notifier);
1004
-	if (err)
1005
-		goto out_notifier;
1006890 
1007891 	dev_add_pack(&can_packet);
1008892 	dev_add_pack(&canfd_packet);
1009893 
1010894 	return 0;
1011895 
1012
-out_notifier:
1013
-	sock_unregister(PF_CAN);
1014896 out_sock:
1015897 	unregister_pernet_subsys(&can_pernet_ops);
1016898 out_pernet:
....@@ -1024,7 +906,6 @@
1024906 	/* protocol unregister */
1025907 	dev_remove_pack(&canfd_packet);
1026908 	dev_remove_pack(&can_packet);
1027
-	unregister_netdevice_notifier(&can_netdev_notifier);
1028909 	sock_unregister(PF_CAN);
1029910 
1030911 	unregister_pernet_subsys(&can_pernet_ops);