can-isotp: implement cleanups / improvements from review
Subsystems (4)
Oliver Hartkopp
maintainerPATCH v3 1/2 can-isotp: implement cleanups / improvements from review
As pointed out by Jakub Kicinski here:
http://lore.kernel.org/r/20201009175751.5c54097f@kicinski-fedora-pc1c0hjn.dhcp.thefacebook.com
this patch addresses the remarked issues:
- remove empty line in comment
- remove default=y for CAN_ISOTP in Kconfig
- make use of pr_notice_once()
- use GFP_ATOMIC instead of gfp_any() in soft hrtimer context
The version strings in the CAN subsystem are removed by a separate patch.
--- include/uapi/linux/can/isotp.h | 1 - net/can/Kconfig | 3 ++- net/can/isotp.c | 14 +++++++------- 3 files changed, 9 insertions(+), 9 deletions(-)
include/uapi/linux/can/isotp.h +0 -1
@@ -160,7 +160,6 @@ struct can_isotp_ll_options {* these default settings can be changed via sockopts. * For that reason the STmin value is intentionally _not_ checked for * consistency and copied directly into the flow control (FC) frame. -* */ #endif /* !_UAPI_CAN_ISOTP_H */
net/can/Kconfig +2 -1
@@ -57,7 +57,6 @@ source "net/can/j1939/Kconfig" config CAN_ISOTP tristate "ISO 15765-2:2016 CAN transport protocol" - default y help CAN Transport Protocols offer support for segmented Point-to-Point communication between CAN nodes via two defined CAN Identifiers.
@@ -67,6 +66,8 @@ config CAN_ISOTP vehicle diagnosis (UDS, ISO 14229) or IP-over-CAN traffic. This protocol driver implements data transfers according to ISO 15765-2:2016 for 'classic' CAN and CAN FD frame types. + If you want to perform automotive vehicle diagnostic services (UDS), + say 'y'. source "drivers/net/can/Kconfig"
net/can/isotp.c +7 -7
@@ -222,8 +222,8 @@ static int isotp_send_fc(struct sock *sk, int ae, u8 flowstatus) can_send_ret =can_send (nskb,1 );if (can_send_ret) -printk_once (KERN_NOTICE "can-isotp: %s: can_send_ret %d\n" , - __func__, can_send_ret); +pr_notice_once ("can-isotp: %s: can_send_ret %d\n" , + __func__, can_send_ret);dev_put (dev);
@@ -769,7 +769,7 @@ static enum hrtimer_restart isotp_tx_timer_handler(struct hrtimer *hrtimer) isotp_tx_burst: skb =alloc_skb (so->ll.mtu +sizeof (struct can_skb_priv ), -gfp_any ()); +GFP_ATOMIC );if (!skb) {dev_put (dev);break ;
@@ -798,8 +798,8 @@ static enum hrtimer_restart isotp_tx_timer_handler(struct hrtimer *hrtimer) can_send_ret =can_send (skb,1 );if (can_send_ret) -printk_once (KERN_NOTICE "can-isotp: %s: can_send_ret %d\n" , - __func__, can_send_ret); +pr_notice_once ("can-isotp: %s: can_send_ret %d\n" , + __func__, can_send_ret);if (so->tx.idx >= so->tx.len) {/* we are done */
@@ -942,8 +942,8 @@ static int isotp_sendmsg(struct socket *sock, struct msghdr *msg, size_t size) err =can_send (skb,1 );dev_put (dev);if (err) { -printk_once (KERN_NOTICE "can-isotp: %s: can_send_ret %d\n" , - __func__, err); +pr_notice_once ("can-isotp: %s: can_send_ret %d\n" , + __func__, err);return err; }
Signature · 1 line
2.28.0
Oliver Hartkopp
maintainerPATCH v3 2/2 can: remove obsolete version strings
As pointed out by Jakub Kicinski here:
http://lore.kernel.org/r/20201009175751.5c54097f@kicinski-fedora-pc1c0hjn.dhcp.thefacebook.com
this patch removes the obsolete version information of the different CAN protocols and the AF_CAN core module.
--- include/linux/can/core.h | 7 ------- include/net/netns/can.h | 1 - net/can/af_can.c | 2 +- net/can/bcm.c | 4 +--- net/can/gw.c | 4 +--- net/can/isotp.c | 4 +--- net/can/proc.c | 12 ------------ net/can/raw.c | 4 +--- 8 files changed, 5 insertions(+), 33 deletions(-)
include/linux/can/core.h +0 -7
@@ -18,13 +18,6 @@#include <linux/skbuff.h> #include <linux/netdevice.h> -#define CAN_VERSION "20170425" - -/* increment this number each time you change some user-space interface */ -#define CAN_ABI_VERSION "9" - -#define CAN_VERSION_STRING "rev " CAN_VERSION " abi " CAN_ABI_VERSION -#define DNAME (dev) ((dev) ? (dev)->name : "any")/**
include/net/netns/can.h +0 -1
@@ -15,7 +15,6 @@ struct can_rcv_lists_stats;struct netns_can {#if IS_ENABLED (CONFIG_PROC_FS )struct proc_dir_entry *proc_dir; -struct proc_dir_entry *pde_version;struct proc_dir_entry *pde_stats;struct proc_dir_entry *pde_reset_stats;struct proc_dir_entry *pde_rcvlist_all;
net/can/af_can.c +1 -1
@@ -875,7 +875,7 @@ static __init int can_init(void) offsetof(struct can_frame , data) != offsetof(struct canfd_frame, data)); -pr_info ("can: controller area network core (" CAN_VERSION_STRING ")\n" ); +pr_info ("can: controller area network core\n" ); rcv_cache =kmem_cache_create ("can_receiver" ,sizeof (struct receiver ),0 ,0 ,NULL );
net/can/bcm.c +1 -3
@@ -81,8 +81,6 @@ (CAN_EFF_MASK | CAN_EFF_FLAG | CAN_RTR_FLAG) : \ (CAN_SFF_MASK | CAN_EFF_FLAG | CAN_RTR_FLAG)) -#define CAN_BCM_VERSION "20170425" -MODULE_DESCRIPTION ("PF_CAN broadcast manager protocol" );MODULE_LICENSE ("Dual BSD/GPL" );MODULE_AUTHOR ("Oliver Hartkopp <[email protected]>" );
@@ -1696,7 +1694,7 @@ static int __init bcm_module_init(void) {int err; -pr_info ("can: broadcast manager protocol (rev " CAN_BCM_VERSION " t)\n" ); +pr_info ("can: broadcast manager protocol\n" ); err =can_proto_register (&bcm_can_proto);if (err <0 ) {
net/can/gw.c +1 -3
@@ -59,7 +59,6 @@#include <net/net_namespace.h> #include <net/sock.h> -#define CAN_GW_VERSION "20190810"#define CAN_GW_NAME "can-gw"MODULE_DESCRIPTION ("PF_CAN netlink gateway" );
@@ -1194,8 +1193,7 @@ static __init int cgw_module_init(void)/* sanitize given module parameter */ max_hops = clamp_t(unsigned int, max_hops, CGW_MIN_HOPS, CGW_MAX_HOPS); -pr_info ("can: netlink gateway (rev " CAN_GW_VERSION ") max_hops=%d\n" , - max_hops); +pr_info ("can: netlink gateway - max_hops=%d\n" , max_hops); ret =register_pernet_subsys (&cangw_pernet_ops);if (ret)
net/can/isotp.c +1 -3
@@ -72,8 +72,6 @@#include <net/sock.h> #include <net/net_namespace.h> -#define CAN_ISOTP_VERSION "20200928" -MODULE_DESCRIPTION ("PF_CAN isotp 15765-2:2016 protocol" );MODULE_LICENSE ("Dual BSD/GPL" );MODULE_AUTHOR ("Oliver Hartkopp <[email protected]>" );
@@ -1408,7 +1406,7 @@ static __init int isotp_module_init(void) {int err; -pr_info ("can: isotp protocol (rev " CAN_ISOTP_VERSION ")\n" ); +pr_info ("can: isotp protocol\n" ); err =can_proto_register (&isotp_can_proto);if (err <0 )
net/can/proc.c +0 -12
@@ -54,7 +54,6 @@* proc filenames for the PF_CAN core */ -#define CAN_PROC_VERSION "version"#define CAN_PROC_STATS "stats"#define CAN_PROC_RESET_STATS "reset_stats"#define CAN_PROC_RCVLIST_ALL "rcvlist_all"
@@ -293,12 +292,6 @@ static int can_reset_stats_proc_show(struct seq_file *m, void *v)return 0 ; } -static int can_version_proc_show (struct seq_file *m,void *v) -{ -seq_printf (m,"%s\n" ,CAN_VERSION_STRING ); -return 0 ; -} -static inline void can_rcvlist_proc_show_one (struct seq_file *m,int idx,struct net_device *dev,struct can_dev_rcv_lists *dev_rcv_lists)
@@ -441,8 +434,6 @@ void can_init_proc(struct net *net) }/* own procfs entries from the AF_CAN core */ - net->can.pde_version =proc_create_net_single (CAN_PROC_VERSION ,0644 , - net->can.proc_dir, can_version_proc_show,NULL ); net->can.pde_stats =proc_create_net_single (CAN_PROC_STATS ,0644 , net->can.proc_dir, can_stats_proc_show,NULL ); net->can.pde_reset_stats = proc_create_net_single(CAN_PROC_RESET_STATS,
@@ -471,9 +462,6 @@ void can_init_proc(struct net *net)*/ void can_remove_proc (struct net *net) { -if (net->can.pde_version) -remove_proc_entry (CAN_PROC_VERSION , net->can.proc_dir); -if (net->can.pde_stats)remove_proc_entry (CAN_PROC_STATS , net->can.proc_dir);
net/can/raw.c +1 -3
@@ -55,8 +55,6 @@#include <net/sock.h> #include <net/net_namespace.h> -#define CAN_RAW_VERSION CAN_VERSION -MODULE_DESCRIPTION ("PF_CAN raw protocol" );MODULE_LICENSE ("Dual BSD/GPL" );MODULE_AUTHOR ("Urs Thuermann <[email protected]>" );
@@ -885,7 +883,7 @@ static __init int raw_module_init(void) {int err; -pr_info ("can: raw protocol (rev " CAN_RAW_VERSION ")\n" ); +pr_info ("can: raw protocol\n" ); err =can_proto_register (&raw_can_proto);if (err <0 )
Signature · 1 line
2.28.0
Marc Kleine-Budde
maintainerQuoted 9 lines · Oliver Hartkopp
As pointed out by Jakub Kicinski here:
http://lore.kernel.org/r/20201009175751.5c54097f@kicinski-fedora-pc1c0hjn.dhcp.thefacebook.com
this patch addresses the remarked issues:- remove empty line in comment
- remove default=y forCAN_ISOTPinKconfig
- make use ofpr_notice_once()
- useGFP_ATOMICinstead ofgfp_any()in soft hrtimer context
Quoted 4 lines
The version strings in the CAN subsystem are removed by a separate patch.
Signed-off-by Oliver Hartkopp <[email protected]>---
Added both to linux-can-next.
tnx,
Marc
Signature · 4 lines
Pengutronix e.K. | Marc Kleine-Budde | Embedded Linux | https://www.pengutronix.de | Vertretung West/Dortmund | Phone: +49-231-2826-924 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
Oliver Hartkopp
maintainerQuoted 10 lines · Marc Kleine-Budde
Quoted 9 lines · Oliver Hartkopp
As pointed out by Jakub Kicinski here:
http://lore.kernel.org/r/20201009175751.5c54097f@kicinski-fedora-pc1c0hjn.dhcp.thefacebook.com
this patch addresses the remarked issues:- remove empty line in comment
- remove default=y forCAN_ISOTPinKconfig
- make use ofpr_notice_once()
- useGFP_ATOMICinstead ofgfp_any()in soft hrtimer context
Quoted 6 lines
Quoted 4 lines
The version strings in the CAN subsystem are removed by a separate patch.
Signed-off-by Oliver Hartkopp <[email protected]>---
Added both to linux-can-next.
The patches were intended for 'net-next' as the merge window will open *very* soon.
I'm not sure if there would be another pull from linux-can-next until then, therefore I would suggest that Jakub takes the patches himself.
Thanks,
Oliver
Marc Kleine-Budde
maintainerQuoted 18 lines · Oliver Hartkopp
Quoted 15 lines · Marc Kleine-Budde
Quoted 13 lines · Oliver Hartkopp
As pointed out by Jakub Kicinski here:
http://lore.kernel.org/r/20201009175751.5c54097f@kicinski-fedora-pc1c0hjn.dhcp.thefacebook.com
this patch addresses the remarked issues:- remove empty line in comment
- remove default=y forCAN_ISOTPinKconfig
- make use ofpr_notice_once()
- useGFP_ATOMICinstead ofgfp_any()in soft hrtimer contextThe version strings in the CAN subsystem are removed by a separate patch.
Signed-off-by Oliver Hartkopp <[email protected]>---
Quoted 7 lines
Quoted 1 line
Added both to linux-can-next.
The patches were intended for 'net-next' as the merge window will open *very* soon.
I'm not sure if there would be another pull from linux-can-next until then, therefore I would suggest that Jakub takes the patches himself.
I don't mind. FWIW, here's the pull request:
http://lore.kernel.org/r/[email protected] git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next.git tags/linux-can-next-for-5.10-20201012
Marc
Signature · 4 lines
Pengutronix e.K. | Marc Kleine-Budde | Embedded Linux | https://www.pengutronix.de | Vertretung West/Dortmund | Phone: +49-231-2826-924 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
Oliver Hartkopp
maintainerQuoted 27 lines · Marc Kleine-Budde
Quoted 18 lines · Oliver Hartkopp
Quoted 15 lines · Marc Kleine-Budde
Quoted 13 lines · Oliver Hartkopp
As pointed out by Jakub Kicinski here:
http://lore.kernel.org/r/20201009175751.5c54097f@kicinski-fedora-pc1c0hjn.dhcp.thefacebook.com
this patch addresses the remarked issues:- remove empty line in comment
- remove default=y forCAN_ISOTPinKconfig
- make use ofpr_notice_once()
- useGFP_ATOMICinstead ofgfp_any()in soft hrtimer contextThe version strings in the CAN subsystem are removed by a separate patch.
Signed-off-by Oliver Hartkopp <[email protected]>---
Quoted 7 lines
Quoted 1 line
Added both to linux-can-next.
The patches were intended for 'net-next' as the merge window will open *very* soon.
I'm not sure if there would be another pull from linux-can-next until then, therefore I would suggest that Jakub takes the patches himself.
Quoted 7 lines
I don't mind. FWIW, here's the pull request:
http://lore.kernel.org/r/[email protected] git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next.git tags/linux-can-next-for-5.10-20201012Marc
:-D
Well thanks!
I just got the feeling that especially the
"remove default=y for CAN_ISOTP in Kconfig"
issue is urgent in net-next.
So now any way to get the patches is fine.
Thanks & BR,
Oliver