s390/qeth: updates 2020-07-14
Subsystems (4)
cover s390/qeth: updates 2020-07-14
Hi Dave & Jakub,
please apply the following patch series for qeth to netdev's net-next tree.
This brings a mix of cleanups for various parts of the control code.
Thanks,
Julian
Julian Wiedmann (10):
s390/qeth: reject unsupported link type earlier s390/qeth: fine-tune errno when cmds are cancelled s390/qeth: only init the isolation mode when necessary s390/qeth: don't clear the configured isolation mode s390/qeth: clean up error handling for isolation mode cmds s390/qeth: use u64_to_user_ptr() in the OAT code s390/qeth: clean up a magic number in the OAT callback s390/qeth: cleanup OAT code
s390/qeth: unify RX-mode hashtables
s390/qeth: constify the MPC initialization data
drivers/s390/net/qeth_core.h | 8 +- drivers/s390/net/qeth_core_main.c | 193 +++++++++++++----------------- drivers/s390/net/qeth_core_mpc.c | 16 +-- drivers/s390/net/qeth_core_mpc.h | 17 ++- drivers/s390/net/qeth_core_sys.c | 20 ++-- drivers/s390/net/qeth_l2_main.c | 9 +- drivers/s390/net/qeth_l3_main.c | 19 +-- 7 files changed, 120 insertions(+), 162 deletions(-)
Signature · 1 line
2.17.1
PATCH 1/10 s390/qeth: reject unsupported link type earlier
Rather than delaying the decision until netdev setup, immediately reject a device when we discover that it has an unsupported link type (ie. Token Ring).
--- drivers/s390/net/qeth_core_main.c | 38 ++++++++++++++++++++++--------- drivers/s390/net/qeth_l3_main.c | 6 ----- 2 files changed, 27 insertions(+), 17 deletions(-)
drivers/s390/net/qeth_core_main.c +27 -11
@@ -2436,6 +2436,17 @@ static int qeth_cm_setup(struct qeth_card *card)return qeth_send_control_data (card, iob, qeth_cm_setup_cb,NULL ); } +static bool qeth_is_supported_link_type (struct qeth_card *card,u8 link_type) +{ +if (link_type ==QETH_LINK_TYPE_LANE_TR || + link_type ==QETH_LINK_TYPE_HSTR ) { +dev_err (&card->gdev->dev,"Unsupported Token Ring device\n" ); +return false; + } + +return true; +} +static int qeth_update_max_mtu (struct qeth_card *card,unsigned int max_mtu) {struct net_device *dev = card->dev;
@@ -2495,8 +2506,8 @@ static int qeth_ulp_enable_cb(struct qeth_card *card, struct qeth_reply *reply, {__u16 mtu, framesize;__u16 len; -__u8 link_type;struct qeth_cmd_buffer *iob; +u8 link_type =0 ;QETH_CARD_TEXT (card,2 ,"ulpenacb" );
@@ -2516,9 +2527,11 @@ static int qeth_ulp_enable_cb(struct qeth_card *card, struct qeth_reply *reply,if (len >=QETH_MPC_DIFINFO_LEN_INDICATES_LINK_TYPE ) {memcpy (&link_type,QETH_ULP_ENABLE_RESP_LINK_TYPE (iob->data),1 ); - card->info.link_type = link_type; - }else - card->info.link_type =0 ; +if (!qeth_is_supported_link_type (card, link_type)) +return -EPROTONOSUPPORT ; + } + + card->info.link_type = link_type;QETH_CARD_TEXT_ (card,2 ,"link%d" , card->info.link_type);return 0 ; }
@@ -3100,7 +3113,6 @@ struct qeth_cmd_buffer *qeth_ipa_alloc_cmd(struct qeth_card *card,enum qeth_prot_versions prot, unsigned int data_length) { - enum qeth_link_types link_type = card->info.link_type; struct qeth_cmd_buffer *iob;struct qeth_ipacmd_hdr *hdr;
@@ -3116,7 +3128,7 @@ struct qeth_cmd_buffer *qeth_ipa_alloc_cmd(struct qeth_card *card, hdr->command = cmd_code; hdr->initiator =IPA_CMD_INITIATOR_HOST ;/* hdr->seqno is set by qeth_send_control_data() */ - hdr->adapter_type = (link_type ==QETH_LINK_TYPE_HSTR ) ?2 :1 ; + hdr->adapter_type =QETH_LINK_TYPE_FAST_ETH ; hdr->rel_adapter_no = (u8 ) card->dev->dev_port; hdr->prim_version_no =IS_LAYER2 (card) ?2 :1 ; hdr->param_count =1 ;
@@ -3199,18 +3211,22 @@ static int qeth_query_setadapterparms_cb(struct qeth_card *card, struct qeth_reply *reply, unsigned long data) {struct qeth_ipa_cmd *cmd = (struct qeth_ipa_cmd *) data; +struct qeth_query_cmds_supp *query_cmd;QETH_CARD_TEXT (card,3 ,"quyadpcb" );if (qeth_setadpparms_inspect_rc (cmd))return -EIO ; -if (cmd->data.setadapterparms.data.query_cmds_supp.lan_type &0x7f ) { - card->info.link_type = - cmd->data.setadapterparms.data.query_cmds_supp.lan_type; + query_cmd = &cmd->data.setadapterparms.data.query_cmds_supp; +if (query_cmd->lan_type &0x7f ) { +if (!qeth_is_supported_link_type (card, query_cmd->lan_type)) +return -EPROTONOSUPPORT ; + + card->info.link_type = query_cmd->lan_type;QETH_CARD_TEXT_ (card,2 ,"lnk %d" , card->info.link_type); } - card->options.adp.supported = - cmd->data.setadapterparms.data.query_cmds_supp.supported_cmds; + + card->options.adp.supported = query_cmd->supported_cmds;return 0 ; }
drivers/s390/net/qeth_l3_main.c +0 -6
@@ -1919,12 +1919,6 @@ static int qeth_l3_setup_netdev(struct qeth_card *card)return rc;if (IS_OSD (card) ||IS_OSX (card)) { -if ((card->info.link_type ==QETH_LINK_TYPE_LANE_TR ) || - (card->info.link_type ==QETH_LINK_TYPE_HSTR )) { -pr_info ("qeth_l3: ignoring TR device\n" ); -return -ENODEV ; - } - card->dev->netdev_ops = &qeth_l3_osa_netdev_ops;/*IPv6 address autoconfiguration stuff*/
Signature · 1 line
2.17.1
PATCH 2/10 s390/qeth: fine-tune errno when cmds are cancelled
In reply to Julian WiedmannIf we cancel all pending cmds (eg. when tearing down the device), don't blame it on an IO error.
--- drivers/s390/net/qeth_core_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/s390/net/qeth_core_main.c +1 -1
@@ -969,7 +969,7 @@ void qeth_clear_ipacmd_list(struct qeth_card *card)spin_lock_irqsave (&card->lock, flags);list_for_each_entry (iob, &card->cmd_waiter_list, list) -qeth_notify_cmd (iob, -EIO ); +qeth_notify_cmd (iob, -ECANCELED );spin_unlock_irqrestore (&card->lock, flags); }EXPORT_SYMBOL_GPL (qeth_clear_ipacmd_list);
Signature · 1 line
2.17.1
PATCH 3/10 s390/qeth: only init the isolation mode when necessary
In reply to Julian WiedmannA newly initialized device defaults to ISOLATION_MODE_NONE, don't bother with programming this a second time.
Then remove the OSD/OSX check, it's already done in the sysfs path whenever the user actually changes the configuration.
--- drivers/s390/net/qeth_core_main.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/s390/net/qeth_core_main.c +6 -5
@@ -4663,8 +4663,7 @@ int qeth_set_access_ctrl_online(struct qeth_card *card, int fallback)QETH_CARD_TEXT (card,4 ,"setactlo" ); -if ((IS_OSD (card) ||IS_OSX (card)) && -qeth_adp_supported (card,IPA_SETADP_SET_ACCESS_CONTROL )) { +if (qeth_adp_supported (card,IPA_SETADP_SET_ACCESS_CONTROL )) { rc =qeth_setadpparms_set_access_ctrl (card, card->options.isolation, fallback);if (rc) {
@@ -5347,9 +5346,11 @@ int qeth_core_hardsetup_card(struct qeth_card *card, bool *carrier_ok) (card->info.hwtrap && qeth_hw_trap(card, QETH_DIAGS_TRAP_ARM))) card->info.hwtrap = 0; - rc =qeth_set_access_ctrl_online (card,0 ); -if (rc) - goto out; +if (card->options.isolation !=ISOLATION_MODE_NONE ) { + rc =qeth_set_access_ctrl_online (card,0 ); +if (rc) + goto out; + } rc =qeth_init_qdio_queues (card);if (rc) {
Signature · 1 line
2.17.1
PATCH 4/10 s390/qeth: don't clear the configured isolation mode
In reply to Julian WiedmannWhen qeth_set_access_ctrl_online() is called during the device's initialization and discovers that isolation mode isn't supported, don't clear the user's currently configured mode.
They intentionally choose to operate the device in this specific mode, and degrading the isolation is not an option.
Only adjust the configuration when called via sysfs (ie. fallback = 1), and here follow the common pattern and restore it from prev_isolation.
--- drivers/s390/net/qeth_core_main.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)
drivers/s390/net/qeth_core_main.c +11 -11
@@ -4663,19 +4663,19 @@ int qeth_set_access_ctrl_online(struct qeth_card *card, int fallback)QETH_CARD_TEXT (card,4 ,"setactlo" ); -if (qeth_adp_supported (card,IPA_SETADP_SET_ACCESS_CONTROL )) { - rc =qeth_setadpparms_set_access_ctrl (card, - card->options.isolation, fallback); -if (rc) { -QETH_DBF_MESSAGE (3 ,"IPA(SET_ACCESS_CTRL(%d) on device %x: sent failed\n" , - rc,CARD_DEVID (card)); - rc = -EOPNOTSUPP ; - } - }else if (card->options.isolation !=ISOLATION_MODE_NONE ) { - card->options.isolation =ISOLATION_MODE_NONE ; - +if (!qeth_adp_supported (card,IPA_SETADP_SET_ACCESS_CONTROL )) {dev_err (&card->gdev->dev,"Adapter does not " "support QDIO data connection isolation\n" ); +if (fallback) + card->options.isolation = card->options.prev_isolation; +return -EOPNOTSUPP ; + } + + rc =qeth_setadpparms_set_access_ctrl (card, card->options.isolation, + fallback); +if (rc) { +QETH_DBF_MESSAGE (3 ,"IPA(SET_ACCESS_CTRL(%d) on device %x: sent failed\n" , + rc,CARD_DEVID (card)); rc = -EOPNOTSUPP ; }return rc;
Signature · 1 line
2.17.1
PATCH 5/10 s390/qeth: clean up error handling for isolation mode cmds
In reply to Julian WiedmannAs the cmd IO path has learned to propagate errnos back to its callers, let them deal with errors instead of trying to restore their previous configuration from within the IO error path.
Also translate the HW error to a meaningful errno, instead of returning -EIO for all cases (and don't map this to -EOPNOTSUPP later on...).
While at it, add a READ_ONCE() / WRITE_ONCE() pair to ensure that the data path always sees a valid isolation mode during reconfiguration.
--- drivers/s390/net/qeth_core.h | 5 +- drivers/s390/net/qeth_core_main.c | 85 ++++++++++--------------------- drivers/s390/net/qeth_core_sys.c | 20 ++++---- 3 files changed, 40 insertions(+), 70 deletions(-)
drivers/s390/net/qeth_core.h +3 -2
@@ -721,7 +721,6 @@ struct qeth_card_options {struct qeth_vnicc_info vnicc;/* VNICC options */ enum qeth_discipline_id layer;enum qeth_ipa_isolation_modes isolation; -enum qeth_ipa_isolation_modes prev_isolation;int sniffer;enum qeth_cq cq;char hsuid[9 ];
@@ -1071,6 +1070,9 @@ int qeth_query_switch_attributes(struct qeth_card *card, struct qeth_switch_info *sw_info);int qeth_query_card_info (struct qeth_card *card,struct carrier_info *carrier_info); +int qeth_setadpparms_set_access_ctrl (struct qeth_card *card, +enum qeth_ipa_isolation_modes mode); +unsigned int qeth_count_elements (struct sk_buff *skb,unsigned int data_offset); int qeth_do_send_packet(struct qeth_card *card, struct qeth_qdio_out_q *queue, struct sk_buff *skb, struct qeth_hdr *hdr,
@@ -1078,7 +1080,6 @@ int qeth_do_send_packet(struct qeth_card *card, struct qeth_qdio_out_q *queue, int elements_needed);int qeth_do_ioctl (struct net_device *dev,struct ifreq *rq,int cmd);void qeth_dbf_longtext (debug_info_t *id,int level,char *text, ...); -int qeth_set_access_ctrl_online (struct qeth_card *card,int fallback);int qeth_configure_cq (struct qeth_card *,enum qeth_cq );int qeth_hw_trap (struct qeth_card *,enum qeth_diags_trap_action );void qeth_trace_features (struct qeth_card *);
drivers/s390/net/qeth_core_main.c +28 -57
160 lines not on this page · raw message
drivers/s390/net/qeth_core_sys.c +9 -11
@@ -448,19 +448,17 @@ static ssize_t qeth_dev_isolation_store(struct device *dev, rc = -EINVAL ; goto out; } - rc = count; - -/* defer IP assist if device is offline (until discipline->set_online)*/ - card->options.prev_isolation = card->options.isolation; - card->options.isolation = isolation; -if (qeth_card_hw_is_reachable (card)) { -int ipa_rc =qeth_set_access_ctrl_online (card,1 ); -if (ipa_rc !=0 ) - rc = ipa_rc; - } + +if (qeth_card_hw_is_reachable (card)) + rc =qeth_setadpparms_set_access_ctrl (card, isolation); + +if (!rc) +WRITE_ONCE (card->options.isolation, isolation); + out:mutex_unlock (&card->conf_mutex); -return rc; + +return rc ? rc : count; } static DEVICE_ATTR(isolation, 0644, qeth_dev_isolation_show,
Signature · 1 line
2.17.1
PATCH 6/10 s390/qeth: use u64_to_user_ptr() in the OAT code
In reply to Julian WiedmannUse the correct helper for casting to a user pointer.
--- drivers/s390/net/qeth_core_main.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/s390/net/qeth_core_main.c +2 -4
@@ -4907,10 +4907,8 @@ static int qeth_query_oat_command(struct qeth_card *card, char __user *udata) rc =qeth_send_ipa_cmd (card, iob, qeth_setadpparms_query_oat_cb, &priv);if (!rc) { -if (is_compat_task ()) - tmp =compat_ptr (oat_data.ptr); -else - tmp = (void __user *)(unsigned long )oat_data.ptr; + tmp =is_compat_task () ?compat_ptr (oat_data.ptr) : +u64_to_user_ptr (oat_data.ptr);if (copy_to_user (tmp, priv.buffer, priv.response_len)) {
Signature · 1 line
2.17.1
PATCH 7/10 s390/qeth: clean up a magic number in the OAT callback
In reply to Julian WiedmannUse the correct struct member instead of hardcoding its offset.
--- drivers/s390/net/qeth_core_main.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/s390/net/qeth_core_main.c +2 -4
@@ -4839,7 +4839,6 @@ static int qeth_setadpparms_query_oat_cb(struct qeth_card *card, {struct qeth_ipa_cmd *cmd = (struct qeth_ipa_cmd *)data;struct qeth_qoat_priv *priv; -char *resdata;int resdatalen;QETH_CARD_TEXT (card,3 ,"qoatcb" );
@@ -4848,13 +4847,12 @@ static int qeth_setadpparms_query_oat_cb(struct qeth_card *card, priv = (struct qeth_qoat_priv *)reply->param; resdatalen = cmd->data.setadapterparms.hdr.cmdlength; - resdata = (char *)data +28 ;if (resdatalen > (priv->buffer_len - priv->response_len))return -ENOSPC ; -memcpy ((priv->buffer + priv->response_len), resdata, - resdatalen); +memcpy (priv->buffer + priv->response_len, + &cmd->data.setadapterparms.hdr, resdatalen); priv->response_len += resdatalen; if (cmd->data.setadapterparms.hdr.seq_no <
Signature · 1 line
2.17.1
PATCH 8/10 s390/qeth: cleanup OAT code
In reply to Julian WiedmannWhile initially just trying to fix up the indentation, condense a few lines and get rid of a goto label.
--- drivers/s390/net/qeth_core_main.c | 40 ++++++++++--------------------- 1 file changed, 12 insertions(+), 28 deletions(-)
drivers/s390/net/qeth_core_main.c +12 -28
@@ -4835,17 +4835,17 @@ static int qeth_snmp_command(struct qeth_card *card, char __user *udata) }static int qeth_setadpparms_query_oat_cb (struct qeth_card *card, -struct qeth_reply *reply,unsigned long data) +struct qeth_reply *reply, +unsigned long data) {struct qeth_ipa_cmd *cmd = (struct qeth_ipa_cmd *)data; -struct qeth_qoat_priv *priv; +struct qeth_qoat_priv *priv = reply->param;int resdatalen;QETH_CARD_TEXT (card,3 ,"qoatcb" );if (qeth_setadpparms_inspect_rc (cmd))return -EIO ; - priv = (struct qeth_qoat_priv *)reply->param; resdatalen = cmd->data.setadapterparms.hdr.cmdlength;if (resdatalen > (priv->buffer_len - priv->response_len))
@@ -4873,24 +4873,17 @@ static int qeth_query_oat_command(struct qeth_card *card, char __user *udata)QETH_CARD_TEXT (card,3 ,"qoatcmd" ); -if (!qeth_adp_supported (card,IPA_SETADP_QUERY_OAT )) { - rc = -EOPNOTSUPP ; - goto out; - } +if (!qeth_adp_supported (card,IPA_SETADP_QUERY_OAT )) +return -EOPNOTSUPP ; -if (copy_from_user (&oat_data, udata, -sizeof (struct qeth_query_oat_data ))) { - rc = -EFAULT ; - goto out; - } +if (copy_from_user (&oat_data, udata,sizeof (oat_data))) +return -EFAULT ; priv.buffer_len = oat_data.buffer_len; priv.response_len =0 ; priv.buffer =vzalloc (oat_data.buffer_len); -if (!priv.buffer) { - rc = -ENOMEM ; - goto out; - } +if (!priv.buffer) +return -ENOMEM ; iob =qeth_get_adapter_cmd (card,IPA_SETADP_QUERY_OAT ,SETADP_DATA_SIZEOF (query_oat));
@@ -4902,28 +4895,19 @@ static int qeth_query_oat_command(struct qeth_card *card, char __user *udata) oat_req = &cmd->data.setadapterparms.data.query_oat; oat_req->subcmd_code = oat_data.command; - rc =qeth_send_ipa_cmd (card, iob, qeth_setadpparms_query_oat_cb, - &priv); + rc =qeth_send_ipa_cmd (card, iob, qeth_setadpparms_query_oat_cb, &priv);if (!rc) { tmp =is_compat_task () ?compat_ptr (oat_data.ptr) :u64_to_user_ptr (oat_data.ptr); - -if (copy_to_user (tmp, priv.buffer, - priv.response_len)) { - rc = -EFAULT ; - goto out_free; - } - oat_data.response_len = priv.response_len; -if (copy_to_user (udata, &oat_data, -sizeof (struct qeth_query_oat_data ))) +if (copy_to_user (tmp, priv.buffer, priv.response_len) || +copy_to_user (udata, &oat_data,sizeof (oat_data))) rc = -EFAULT ; } out_free:vfree (priv.buffer); -out:return rc; }
Signature · 1 line
2.17.1
PATCH 9/10 s390/qeth: unify RX-mode hashtables
In reply to Julian WiedmannTo keep track of the addresses programmed from an RX modeset, we have two separate hashtables (L2: mac_htable, L3: ip_mc_htable).
These are never used at the same time, so unify them into a single rx_mode_addrs hashtable.
--- drivers/s390/net/qeth_core.h | 3 +-- drivers/s390/net/qeth_core_main.c | 1 + drivers/s390/net/qeth_l2_main.c | 9 ++++----- drivers/s390/net/qeth_l3_main.c | 13 ++++++------- 4 files changed, 12 insertions(+), 14 deletions(-)
drivers/s390/net/qeth_core.h +1 -2
@@ -803,14 +803,13 @@ struct qeth_card {struct workqueue_struct *event_wq;struct workqueue_struct *cmd_wq;wait_queue_head_t wait_q; -DECLARE_HASHTABLE (mac_htable,4 );DECLARE_HASHTABLE (ip_htable,4 );DECLARE_HASHTABLE (local_addrs4,4 );DECLARE_HASHTABLE (local_addrs6,4 );spinlock_t local_addrs4_lock;spinlock_t local_addrs6_lock;struct mutex ip_lock; -DECLARE_HASHTABLE (ip_mc_htable,4 ); +DECLARE_HASHTABLE (rx_mode_addrs,4 );struct work_struct rx_mode_work;struct work_struct kernel_thread_starter;spinlock_t thread_mask_lock;
drivers/s390/net/qeth_core_main.c +1 -0
@@ -1647,6 +1647,7 @@ static void qeth_setup_card(struct qeth_card *card)qeth_init_qdio_info (card);INIT_DELAYED_WORK (&card->buffer_reclaim_work, qeth_buffer_reclaim_work);INIT_WORK (&card->close_dev_work, qeth_close_dev_handler); +hash_init (card->rx_mode_addrs);hash_init (card->local_addrs4);hash_init (card->local_addrs6);spin_lock_init (&card->local_addrs4_lock);
drivers/s390/net/qeth_l2_main.c +4 -5
@@ -156,7 +156,7 @@ static void qeth_l2_drain_rx_mode_cache(struct qeth_card *card)struct hlist_node *tmp;int i; -hash_for_each_safe (card->mac_htable, i, tmp, mac, hnode) { +hash_for_each_safe (card->rx_mode_addrs, i, tmp, mac, hnode) {hash_del (&mac->hnode);kfree (mac); }
@@ -438,7 +438,7 @@ static void qeth_l2_add_mac(struct qeth_card *card, struct netdev_hw_addr *ha)u32 mac_hash =get_unaligned ((u32 *)(&ha->addr[2 ]));struct qeth_mac *mac; -hash_for_each_possible (card->mac_htable, mac, hnode, mac_hash) { +hash_for_each_possible (card->rx_mode_addrs, mac, hnode, mac_hash) {if (ether_addr_equal_64bits (ha->addr, mac->mac_addr)) { mac->disp_flag =QETH_DISP_ADDR_DO_NOTHING ;return ;
@@ -452,7 +452,7 @@ static void qeth_l2_add_mac(struct qeth_card *card, struct netdev_hw_addr *ha)ether_addr_copy (mac->mac_addr, ha->addr); mac->disp_flag =QETH_DISP_ADDR_ADD ; -hash_add (card->mac_htable, &mac->hnode, mac_hash); +hash_add (card->rx_mode_addrs, &mac->hnode, mac_hash); }static void qeth_l2_rx_mode_work (struct work_struct *work)
@@ -475,7 +475,7 @@ static void qeth_l2_rx_mode_work(struct work_struct *work)qeth_l2_add_mac (card, ha);netif_addr_unlock_bh (dev); -hash_for_each_safe (card->mac_htable, i, tmp, mac, hnode) { +hash_for_each_safe (card->rx_mode_addrs, i, tmp, mac, hnode) {switch (mac->disp_flag) {case QETH_DISP_ADDR_DELETE :qeth_l2_remove_mac (card, mac->mac_addr);
@@ -601,7 +601,6 @@ static int qeth_l2_probe_device(struct ccwgroup_device *gdev)return rc; } -hash_init (card->mac_htable);INIT_WORK (&card->rx_mode_work, qeth_l2_rx_mode_work);return 0 ; }
drivers/s390/net/qeth_l3_main.c +6 -7
@@ -58,7 +58,7 @@ static struct qeth_ipaddr *qeth_l3_find_addr_by_ip(struct qeth_card *card,struct qeth_ipaddr *addr;if (query->is_multicast) { -hash_for_each_possible (card->ip_mc_htable, addr, hnode, key) +hash_for_each_possible (card->rx_mode_addrs, addr, hnode, key)if (qeth_l3_addr_match_ip (addr, query))return addr; }else {
@@ -239,7 +239,7 @@ static void qeth_l3_drain_rx_mode_cache(struct qeth_card *card)struct hlist_node *tmp;int i; -hash_for_each_safe (card->ip_mc_htable, i, tmp, addr, hnode) { +hash_for_each_safe (card->rx_mode_addrs, i, tmp, addr, hnode) {hash_del (&addr->hnode);kfree (addr); }
@@ -1093,7 +1093,7 @@ static int qeth_l3_add_mcast_rtnl(struct net_device *dev, int vid, void *arg)if (!ipm)continue ; -hash_add (card->ip_mc_htable, &ipm->hnode, +hash_add (card->rx_mode_addrs, &ipm->hnode,qeth_l3_ipaddr_hash (ipm)); }
@@ -1124,8 +1124,8 @@ static int qeth_l3_add_mcast_rtnl(struct net_device *dev, int vid, void *arg)if (!ipm)continue ; -hash_add (card->ip_mc_htable, - &ipm->hnode,qeth_l3_ipaddr_hash (ipm)); +hash_add (card->rx_mode_addrs, &ipm->hnode, +qeth_l3_ipaddr_hash (ipm)); }read_unlock_bh (&in6_dev->lock);
@@ -1219,7 +1219,7 @@ static void qeth_l3_rx_mode_work(struct work_struct *work)vlan_for_each (card->dev, qeth_l3_add_mcast_rtnl, card);rtnl_unlock (); -hash_for_each_safe (card->ip_mc_htable, i, tmp, addr, hnode) { +hash_for_each_safe (card->rx_mode_addrs, i, tmp, addr, hnode) {switch (addr->disp_flag) {case QETH_DISP_ADDR_DELETE : rc =qeth_l3_deregister_addr_entry (card, addr);
@@ -1998,7 +1998,6 @@ static int qeth_l3_probe_device(struct ccwgroup_device *gdev) } } -hash_init (card->ip_mc_htable);INIT_WORK (&card->rx_mode_work, qeth_l3_rx_mode_work);return 0 ; }
Signature · 1 line
2.17.1
PATCH 10/10 s390/qeth: constify the MPC initialization data
In reply to Julian WiedmannWe're not modifying these data blobs, so mark them as constant.
--- drivers/s390/net/qeth_core_main.c | 2 +- drivers/s390/net/qeth_core_mpc.c | 16 ++++++++-------- drivers/s390/net/qeth_core_mpc.h | 17 ++++++++--------- 3 files changed, 17 insertions(+), 18 deletions(-)
drivers/s390/net/qeth_core_main.c +1 -1
@@ -2026,7 +2026,7 @@ static bool qeth_mpc_match_reply(struct qeth_cmd_buffer *iob, }static struct qeth_cmd_buffer *qeth_mpc_alloc_cmd (struct qeth_card *card, -void *data, +const void *data,unsigned int data_length) {struct qeth_cmd_buffer *iob;
drivers/s390/net/qeth_core_mpc.c +8 -8
@@ -10,7 +10,7 @@#include <asm/cio.h> #include "qeth_core_mpc.h" -unsigned char IDX_ACTIVATE_READ [] = { +const unsigned char IDX_ACTIVATE_READ [] = {0x00 ,0x00 ,0x80 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x19 ,0x01 ,0x01 ,0x80 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0xc8 ,0xc1 ,
@@ -18,7 +18,7 @@ unsigned char IDX_ACTIVATE_READ[] = {0x00 ,0x00 }; -unsigned char IDX_ACTIVATE_WRITE [] = { +const unsigned char IDX_ACTIVATE_WRITE [] = {0x00 ,0x00 ,0x80 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x15 ,0x01 ,0x01 ,0x80 ,0x00 ,0x00 ,0x00 ,0x00 , 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xc8, 0xc1,
@@ -26,7 +26,7 @@ unsigned char IDX_ACTIVATE_WRITE[] = {0x00 ,0x00 }; -unsigned char CM_ENABLE [] = { +const unsigned char CM_ENABLE [] = {0x00 ,0xe0 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x01 ,0x00 ,0x00 ,0x00 ,0x14 ,0x00 ,0x00 ,0x00 ,0x63 , 0x10, 0x00, 0x00, 0x01,
@@ -45,7 +45,7 @@ unsigned char CM_ENABLE[] = {0xff ,0xff ,0xff }; -unsigned char CM_SETUP [] = { +const unsigned char CM_SETUP [] = {0x00 ,0xe0 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x02 ,0x00 ,0x00 ,0x00 ,0x14 ,0x00 ,0x00 ,0x00 ,0x64 , 0x10, 0x00, 0x00, 0x01,
@@ -65,7 +65,7 @@ unsigned char CM_SETUP[] = {0x04 ,0x06 ,0xc8 ,0x00 }; -unsigned char ULP_ENABLE [] = { +const unsigned char ULP_ENABLE [] = {0x00 ,0xe0 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x03 ,0x00 ,0x00 ,0x00 ,0x14 ,0x00 ,0x00 ,0x00 ,0x6b , 0x10, 0x00, 0x00, 0x01,
@@ -85,7 +85,7 @@ unsigned char ULP_ENABLE[] = {0xf1 ,0x00 ,0x00 }; -unsigned char ULP_SETUP [] = { +const unsigned char ULP_SETUP [] = {0x00 ,0xe0 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x04 ,0x00 ,0x00 ,0x00 ,0x14 ,0x00 ,0x00 ,0x00 ,0x6c , 0x10, 0x00, 0x00, 0x01,
@@ -107,7 +107,7 @@ unsigned char ULP_SETUP[] = {0x00 ,0x00 ,0x00 ,0x00 }; -unsigned char DM_ACT [] = { +const unsigned char DM_ACT [] = {0x00 ,0xe0 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x05 ,0x00 ,0x00 ,0x00 ,0x14 ,0x00 ,0x00 ,0x00 ,0x55 , 0x10, 0x00, 0x00, 0x01,
@@ -123,7 +123,7 @@ unsigned char DM_ACT[] = {0x05 ,0x40 ,0x01 ,0x01 ,0x00 }; -unsigned char IPA_PDU_HEADER [] = { +const unsigned char IPA_PDU_HEADER [] = {0x00 ,0xe0 ,0x00 ,0x00 ,0x77 ,0x77 ,0x77 ,0x77 ,0x00 ,0x00 ,0x00 ,0x14 ,0x00 ,0x00 ,0x00 ,0x00 , 0x10, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
drivers/s390/net/qeth_core_mpc.h +8 -9
@@ -13,13 +13,13 @@#include <uapi/linux/if_ether.h> #include <uapi/linux/in6.h> +extern const unsigned char IPA_PDU_HEADER [];#define IPA_PDU_HEADER_SIZE 0x40#define QETH_IPA_PDU_LEN_TOTAL (buffer) (buffer + 0x0e)#define QETH_IPA_PDU_LEN_PDU1 (buffer) (buffer + 0x26)#define QETH_IPA_PDU_LEN_PDU2 (buffer) (buffer + 0x29)#define QETH_IPA_PDU_LEN_PDU3 (buffer) (buffer + 0x3a) -extern unsigned char IPA_PDU_HEADER [];#define QETH_IPA_CMD_DEST_ADDR (buffer) (buffer + 0x2c)#define QETH_SEQ_NO_LENGTH 4
@@ -858,7 +858,7 @@ extern const char *qeth_get_ipa_cmd_name(enum qeth_ipa_cmds cmd);/* END OF IP Assist related definitions */ /*****************************************************************************/ -extern unsigned char CM_ENABLE []; +extern const unsigned char CM_ENABLE [];#define CM_ENABLE_SIZE 0x63#define QETH_CM_ENABLE_ISSUER_RM_TOKEN (buffer) (buffer + 0x2c)#define QETH_CM_ENABLE_FILTER_TOKEN (buffer) (buffer + 0x53)
@@ -868,7 +868,7 @@ extern unsigned char CM_ENABLE[]; (PDU_ENCAPSULATION(buffer) + 0x13) -extern unsigned char CM_SETUP []; +extern const unsigned char CM_SETUP [];#define CM_SETUP_SIZE 0x64#define QETH_CM_SETUP_DEST_ADDR (buffer) (buffer + 0x2c)#define QETH_CM_SETUP_CONNECTION_TOKEN (buffer) (buffer + 0x51)
@@ -877,7 +877,7 @@ extern unsigned char CM_SETUP[];#define QETH_CM_SETUP_RESP_DEST_ADDR (buffer) \ (PDU_ENCAPSULATION(buffer) + 0x1a) -extern unsigned char ULP_ENABLE []; +extern const unsigned char ULP_ENABLE [];#define ULP_ENABLE_SIZE 0x6b#define QETH_ULP_ENABLE_LINKNUM (buffer) (buffer + 0x61)#define QETH_ULP_ENABLE_DEST_ADDR (buffer) (buffer + 0x2c)
@@ -898,7 +898,7 @@ extern unsigned char ULP_ENABLE[];#define QETH_ULP_ENABLE_PROT_TYPE (buffer) (buffer + 0x50)#define QETH_IPA_CMD_PROT_TYPE (buffer) (buffer + 0x19) -extern unsigned char ULP_SETUP []; +extern const unsigned char ULP_SETUP [];#define ULP_SETUP_SIZE 0x6c#define QETH_ULP_SETUP_DEST_ADDR (buffer) (buffer + 0x2c)#define QETH_ULP_SETUP_CONNECTION_TOKEN (buffer) (buffer + 0x51)
@@ -910,7 +910,7 @@ extern unsigned char ULP_SETUP[]; (PDU_ENCAPSULATION(buffer) + 0x1a) -extern unsigned char DM_ACT []; +extern const unsigned char DM_ACT [];#define DM_ACT_SIZE 0x55#define QETH_DM_ACT_DEST_ADDR (buffer) (buffer + 0x2c)#define QETH_DM_ACT_CONNECTION_TOKEN (buffer) (buffer + 0x51)
@@ -921,9 +921,8 @@ extern unsigned char DM_ACT[];#define QETH_PDU_HEADER_SEQ_NO (buffer) (buffer + 0x1c)#define QETH_PDU_HEADER_ACK_SEQ_NO (buffer) (buffer + 0x20) -extern unsigned char IDX_ACTIVATE_READ []; -extern unsigned char IDX_ACTIVATE_WRITE []; - +extern const unsigned char IDX_ACTIVATE_READ []; +extern const unsigned char IDX_ACTIVATE_WRITE [];#define IDX_ACTIVATE_SIZE 0x22#define QETH_IDX_ACT_PNO (buffer) (buffer+0x0b)#define QETH_IDX_ACT_ISSUER_RM_TOKEN (buffer) (buffer + 0x0c)
Signature · 1 line
2.17.1
David Miller
maintainerFrom: Julian Wiedmann <[email protected]>
Date: Tue, 14 Jul 2020 16:22:55 +0200
Quoted 3 lines
please apply the following patch series for qeth to netdev's net-next tree.
This brings a mix of cleanups for various parts of the control code.
Series applied, thanks Julian.