net/iucv: updates 2020-05-19
Subsystems (4)
cover net/iucv: updates 2020-05-19
Hi Dave & Jakub,
please apply the following patch series for iucv to netdev's net-next tree.
s390 dropped its support for power management, this removes the relevant iucv code. Also, some easy cleanups I found mouldering in an old branch.
Thanks,
Julian
Julian Wiedmann (5):
net/iucv: remove pm support
net/af_iucv: remove pm support
net/af_iucv: replace open-coded U16_MAX net/af_iucv: remove a redundant zero initialization net/af_iucv: clean up function prototypes
include/net/iucv/af_iucv.h | 8 -- net/iucv/af_iucv.c | 253 ++++++++----------------------------- net/iucv/iucv.c | 188 --------------------------- 3 files changed, 54 insertions(+), 395 deletions(-)
Signature · 1 line
2.17.1
PATCH 1/5 net/iucv: remove pm support
commit 394216275c7d ("s390: remove broken hibernate / power management support") removed support for ARCH_HIBERNATION_POSSIBLE from s390.
So drop the unused pm ops from the s390-only iucv bus driver.
--- net/iucv/iucv.c | 188 ------------------------------------------------ 1 file changed, 188 deletions(-)
net/iucv/iucv.c +0 -188
@@ -67,32 +67,9 @@ static int iucv_bus_match(struct device *dev, struct device_driver *drv)return 0 ; } -enum iucv_pm_states { -IUCV_PM_INITIAL =0 , -IUCV_PM_FREEZING =1 , -IUCV_PM_THAWING =2 , -IUCV_PM_RESTORING =3 , -}; -static enum iucv_pm_states iucv_pm_state; - -static int iucv_pm_prepare (struct device *); -static void iucv_pm_complete (struct device *); -static int iucv_pm_freeze (struct device *); -static int iucv_pm_thaw (struct device *); -static int iucv_pm_restore (struct device *); - -static const struct dev_pm_ops iucv_pm_ops = { - .prepare = iucv_pm_prepare, - .complete = iucv_pm_complete, - .freeze = iucv_pm_freeze, - .thaw = iucv_pm_thaw, - .restore = iucv_pm_restore, -}; -struct bus_type iucv_bus = { .name ="iucv" , .match = iucv_bus_match, - .pm = &iucv_pm_ops, };EXPORT_SYMBOL (iucv_bus);
@@ -434,31 +411,6 @@ static void iucv_block_cpu(void *data)cpumask_clear_cpu (cpu, &iucv_irq_cpumask); } -/** -* iucv_block_cpu_almost -* @data: unused -* -* Allow connection-severed interrupts only on this cpu. -*/ -static void iucv_block_cpu_almost (void *data) -{ -int cpu =smp_processor_id (); -union iucv_param *parm; - -/* Allow iucv control interrupts only */ - parm = iucv_param_irq[cpu]; -memset (parm,0 ,sizeof (union iucv_param )); - parm->set_mask.ipmask =0x08 ; -iucv_call_b2f0 (IUCV_SETMASK , parm); -/* Allow iucv-severed interrupt only */ -memset (parm,0 ,sizeof (union iucv_param )); - parm->set_mask.ipmask =0x20 ; -iucv_call_b2f0 (IUCV_SETCONTROLMASK , parm); - -/* Clear indication that iucv interrupts are allowed for this cpu. */ -cpumask_clear_cpu (cpu, &iucv_irq_cpumask); -} -/** * iucv_declare_cpu * @data: unused
@@ -1834,146 +1786,6 @@ static void iucv_external_interrupt(struct ext_code ext_code,spin_unlock (&iucv_queue_lock); } -static int iucv_pm_prepare (struct device *dev) -{ -int rc =0 ; - -#ifdef CONFIG_PM_DEBUG -printk (KERN_INFO "iucv_pm_prepare\n" ); -#endif -if (dev->driver && dev->driver->pm && dev->driver->pm->prepare) - rc = dev->driver->pm->prepare (dev); -return rc; -} - -static void iucv_pm_complete (struct device *dev) -{ -#ifdef CONFIG_PM_DEBUG -printk (KERN_INFO "iucv_pm_complete\n" ); -#endif -if (dev->driver && dev->driver->pm && dev->driver->pm->complete) - dev->driver->pm->complete (dev); -} - -/** -* iucv_path_table_empty() - determine if iucv path table is empty -* -* Returns 0 if there are still iucv pathes defined -* 1 if there are no iucv pathes defined -*/ -static int iucv_path_table_empty (void ) -{ -int i; - -for (i =0 ; i < iucv_max_pathid; i++) { -if (iucv_path_table[i]) -return 0 ; - } -return 1 ; -} - -/** -* iucv_pm_freeze() - Freeze PM callback -* @dev: iucv-based device -* -* disable iucv interrupts -* invoke callback function of the iucv-based driver -* shut down iucv, if no iucv-pathes are established anymore -*/ -static int iucv_pm_freeze (struct device *dev) -{ -int cpu; -struct iucv_irq_list *p, *n; -int rc =0 ; - -#ifdef CONFIG_PM_DEBUG -printk (KERN_WARNING "iucv_pm_freeze\n" ); -#endif -if (iucv_pm_state !=IUCV_PM_FREEZING ) { -for_each_cpu (cpu, &iucv_irq_cpumask) -smp_call_function_single (cpu, iucv_block_cpu_almost, -NULL ,1 ); -cancel_work_sync (&iucv_work); -list_for_each_entry_safe (p, n, &iucv_work_queue, list) { -list_del_init (&p->list); -iucv_sever_pathid (p->data.ippathid, - iucv_error_no_listener); -kfree (p); - } - } - iucv_pm_state =IUCV_PM_FREEZING ; -if (dev->driver && dev->driver->pm && dev->driver->pm->freeze) - rc = dev->driver->pm->freeze (dev); -if (iucv_path_table_empty ()) -iucv_disable (); -return rc; -} - -/** -* iucv_pm_thaw() - Thaw PM callback -* @dev: iucv-based device -* -* make iucv ready for use again: allocate path table, declare interrupt buffers -* and enable iucv interrupts -* invoke callback function of the iucv-based driver -*/ -static int iucv_pm_thaw (struct device *dev) -{ -int rc =0 ; - -#ifdef CONFIG_PM_DEBUG -printk (KERN_WARNING "iucv_pm_thaw\n" ); -#endif - iucv_pm_state =IUCV_PM_THAWING ; -if (!iucv_path_table) { - rc =iucv_enable (); -if (rc) - goto out; - } -if (cpumask_empty (&iucv_irq_cpumask)) { -if (iucv_nonsmp_handler) -/* enable interrupts on one cpu */ -iucv_allow_cpu (NULL ); -else -/* enable interrupts on all cpus */ -iucv_setmask_mp (); - } -if (dev->driver && dev->driver->pm && dev->driver->pm->thaw) - rc = dev->driver->pm->thaw (dev); -out: -return rc; -} - -/** -* iucv_pm_restore() - Restore PM callback -* @dev: iucv-based device -* -* make iucv ready for use again: allocate path table, declare interrupt buffers -* and enable iucv interrupts -* invoke callback function of the iucv-based driver -*/ -static int iucv_pm_restore (struct device *dev) -{ -int rc =0 ; - -#ifdef CONFIG_PM_DEBUG -printk (KERN_WARNING "iucv_pm_restore %p\n" , iucv_path_table); -#endif -if ((iucv_pm_state !=IUCV_PM_RESTORING ) && iucv_path_table) -pr_warn ("Suspending Linux did not completely close all IUCV connections\n" ); - iucv_pm_state =IUCV_PM_RESTORING ; -if (cpumask_empty (&iucv_irq_cpumask)) { - rc =iucv_query_maxconn (); - rc =iucv_enable (); -if (rc) - goto out; - } -if (dev->driver && dev->driver->pm && dev->driver->pm->restore) - rc = dev->driver->pm->restore (dev); -out: -return rc; -} -struct iucv_interface iucv_if = { .message_receive = iucv_message_receive, .__message_receive = __iucv_message_receive,
Signature · 1 line
2.17.1
PATCH 2/5 net/af_iucv: remove pm support
In reply to Julian Wiedmanncommit 394216275c7d ("s390: remove broken hibernate / power management support") removed support for ARCH_HIBERNATION_POSSIBLE from s390.
So drop the unused pm ops from the s390-only af_iucv socket code.
--- net/iucv/af_iucv.c | 141 +-------------------------------------------- 1 file changed, 1 insertion(+), 140 deletions(-)
net/iucv/af_iucv.c +1 -140
@@ -87,7 +87,6 @@ do { \static void iucv_sock_kill (struct sock *sk);static void iucv_sock_close (struct sock *sk); -static void iucv_sever_path (struct sock *,int );static int afiucv_hs_rcv (struct sk_buff *skb,struct net_device *dev,struct packet_type *pt,struct net_device *orig_dev);
@@ -127,110 +126,6 @@ static inline void low_nmcpy(unsigned char *dst, char *src)memcpy (&dst[8 ], src,8 ); } -static int afiucv_pm_prepare (struct device *dev) -{ -#ifdef CONFIG_PM_DEBUG -printk (KERN_WARNING "afiucv_pm_prepare\n" ); -#endif -return 0 ; -} - -static void afiucv_pm_complete (struct device *dev) -{ -#ifdef CONFIG_PM_DEBUG -printk (KERN_WARNING "afiucv_pm_complete\n" ); -#endif -} - -/** -* afiucv_pm_freeze() - Freeze PM callback -* @dev: AFIUCV dummy device -* -* Sever all established IUCV communication pathes -*/ -static int afiucv_pm_freeze (struct device *dev) -{ -struct iucv_sock *iucv; -struct sock *sk; - -#ifdef CONFIG_PM_DEBUG -printk (KERN_WARNING "afiucv_pm_freeze\n" ); -#endif -read_lock (&iucv_sk_list.lock); -sk_for_each (sk, &iucv_sk_list.head) { - iucv =iucv_sk (sk); -switch (sk->sk_state) { -case IUCV_DISCONN : -case IUCV_CLOSING : -case IUCV_CONNECTED : -iucv_sever_path (sk,0 ); -break ; -case IUCV_OPEN : -case IUCV_BOUND : -case IUCV_LISTEN : -case IUCV_CLOSED : -default : -break ; - } -skb_queue_purge (&iucv->send_skb_q); -skb_queue_purge (&iucv->backlog_skb_q); - } -read_unlock (&iucv_sk_list.lock); -return 0 ; -} - -/** -* afiucv_pm_restore_thaw() - Thaw and restore PM callback -* @dev: AFIUCV dummy device -* -* socket clean up after freeze -*/ -static int afiucv_pm_restore_thaw (struct device *dev) -{ -struct sock *sk; - -#ifdef CONFIG_PM_DEBUG -printk (KERN_WARNING "afiucv_pm_restore_thaw\n" ); -#endif -read_lock (&iucv_sk_list.lock); -sk_for_each (sk, &iucv_sk_list.head) { -switch (sk->sk_state) { -case IUCV_CONNECTED : - sk->sk_err =EPIPE ; - sk->sk_state =IUCV_DISCONN ; - sk->sk_state_change (sk); -break ; -case IUCV_DISCONN : -case IUCV_CLOSING : -case IUCV_LISTEN : -case IUCV_BOUND : -case IUCV_OPEN : -default : -break ; - } - } -read_unlock (&iucv_sk_list.lock); -return 0 ; -} - -static const struct dev_pm_ops afiucv_pm_ops = { - .prepare = afiucv_pm_prepare, - .complete = afiucv_pm_complete, - .freeze = afiucv_pm_freeze, - .thaw = afiucv_pm_restore_thaw, - .restore = afiucv_pm_restore_thaw, -}; - -static struct device_driver af_iucv_driver = { - .owner =THIS_MODULE , - .name ="afiucv" , - .bus =NULL , - .pm = &afiucv_pm_ops, -}; - -/* dummy device used as trigger for PM functions */ -static struct device *af_iucv_dev; -/** * iucv_msg_length() - Returns the length of an iucv message. * @msg: Pointer to struct iucv_message, MUST NOT be NULL
@@ -2409,45 +2304,11 @@ static struct packet_type iucv_packet_type = {static int afiucv_iucv_init (void ) { -int err; - - err = pr_iucv->iucv_register (&af_iucv_handler,0 ); -if (err) - goto out; -/* establish dummy device */ - af_iucv_driver.bus = pr_iucv->bus; - err =driver_register (&af_iucv_driver); -if (err) - goto out_iucv; - af_iucv_dev =kzalloc (sizeof (struct device ),GFP_KERNEL ); -if (!af_iucv_dev) { - err = -ENOMEM ; - goto out_driver; - } -dev_set_name (af_iucv_dev,"af_iucv" ); - af_iucv_dev->bus = pr_iucv->bus; - af_iucv_dev->parent = pr_iucv->root; - af_iucv_dev->release = (void (*)(struct device *))kfree; - af_iucv_dev->driver = &af_iucv_driver; - err =device_register (af_iucv_dev); -if (err) - goto out_iucv_dev; -return 0 ; - -out_iucv_dev: -put_device (af_iucv_dev); -out_driver: -driver_unregister (&af_iucv_driver); -out_iucv: - pr_iucv->iucv_unregister (&af_iucv_handler,0 ); -out: -return err; +return pr_iucv->iucv_register (&af_iucv_handler,0 ); }static void afiucv_iucv_exit (void ) { -device_unregister (af_iucv_dev); -driver_unregister (&af_iucv_driver); pr_iucv->iucv_unregister (&af_iucv_handler,0 ); }
Signature · 1 line
2.17.1
PATCH 3/5 net/af_iucv: replace open-coded U16_MAX
In reply to Julian WiedmannImprove the readability of a range check.
--- net/iucv/af_iucv.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/iucv/af_iucv.c +2 -1
@@ -16,6 +16,7 @@#include <linux/module.h> #include <linux/netdevice.h> #include <linux/types.h> +#include <linux/limits.h> #include <linux/list.h> #include <linux/errno.h> #include <linux/kernel.h>
@@ -1559,7 +1560,7 @@ static int iucv_sock_setsockopt(struct socket *sock, int level, int optname,switch (sk->sk_state) {case IUCV_OPEN :case IUCV_BOUND : -if (val <1 || val > (u16)(~0 )) +if (val <1 || val >U16_MAX ) rc = -EINVAL ;else iucv->msglimit = val;
Signature · 1 line
2.17.1
PATCH 4/5 net/af_iucv: remove a redundant zero initialization
In reply to Julian Wiedmanntxmsg is declared as {0}, no need to clear individual fields later on.
--- net/iucv/af_iucv.c | 1 - 1 file changed, 1 deletion(-)
net/iucv/af_iucv.c +0 -1
@@ -996,7 +996,6 @@ static int iucv_sock_sendmsg(struct socket *sock, struct msghdr *msg,/* initialize defaults */ cmsg_done =0 ;/* check for duplicate headers */ - txmsg.class =0 ;/* iterate over control messages */ for_each_cmsghdr (cmsg, msg) {
Signature · 1 line
2.17.1
PATCH 5/5 net/af_iucv: clean up function prototypes
In reply to Julian WiedmannRemove a bunch of forward declarations (trivially shifting code around where needed), and make a few functions static.
--- include/net/iucv/af_iucv.h | 8 --- net/iucv/af_iucv.c | 108 ++++++++++++++++++------------------- 2 files changed, 51 insertions(+), 65 deletions(-)
include/net/iucv/af_iucv.h +0 -8
@@ -158,12 +158,4 @@ struct iucv_sock_list { atomic_t autobind_name; }; -__poll_t iucv_sock_poll (struct file *file,struct socket *sock, -poll_table *wait); -void iucv_sock_link (struct iucv_sock_list *l,struct sock *s); -void iucv_sock_unlink (struct iucv_sock_list *l,struct sock *s); -void iucv_accept_enqueue (struct sock *parent,struct sock *sk); -void iucv_accept_unlink (struct sock *sk); -struct sock *iucv_accept_dequeue (struct sock *parent,struct socket *newsock); -#endif /* __IUCV_H */
net/iucv/af_iucv.c +51 -57
159 lines not on this page · raw message
Signature · 1 line
2.17.1
David Miller
maintainerFrom: Julian Wiedmann <[email protected]>
Date: Tue, 19 May 2020 21:10:07 +0200
Quoted 5 lines
please apply the following patch series for iucv to netdev's net-next tree.
s390 dropped its support for power management, this removes the relevant iucv code. Also, some easy cleanups I found mouldering in an old branch.
Series applied, thank you.