Commit 7686e4b6 authored by Julian Wiedmann's avatar Julian Wiedmann Committed by David S. Miller

s390/qeth: defer IPv6 address notifier events

The inet6addr_chain is atomic. So instead of starting the cmd IO for
SETIP / DELIP straight from the notifier callback, run it from a
workqueue. This is the last step towards removal of cmd IO completion
polling.
Signed-off-by: default avatarJulian Wiedmann <jwi@linux.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 05a17851
...@@ -774,6 +774,7 @@ struct qeth_card { ...@@ -774,6 +774,7 @@ struct qeth_card {
struct qeth_card_options options; struct qeth_card_options options;
struct workqueue_struct *event_wq; struct workqueue_struct *event_wq;
struct workqueue_struct *cmd_wq;
wait_queue_head_t wait_q; wait_queue_head_t wait_q;
unsigned long active_vlans[BITS_TO_LONGS(VLAN_N_VID)]; unsigned long active_vlans[BITS_TO_LONGS(VLAN_N_VID)];
DECLARE_HASHTABLE(mac_htable, 4); DECLARE_HASHTABLE(mac_htable, 4);
......
...@@ -1450,7 +1450,8 @@ static struct qeth_card *qeth_alloc_card(struct ccwgroup_device *gdev) ...@@ -1450,7 +1450,8 @@ static struct qeth_card *qeth_alloc_card(struct ccwgroup_device *gdev)
CARD_WDEV(card) = gdev->cdev[1]; CARD_WDEV(card) = gdev->cdev[1];
CARD_DDEV(card) = gdev->cdev[2]; CARD_DDEV(card) = gdev->cdev[2];
card->event_wq = alloc_ordered_workqueue("%s", 0, dev_name(&gdev->dev)); card->event_wq = alloc_ordered_workqueue("%s_event", 0,
dev_name(&gdev->dev));
if (!card->event_wq) if (!card->event_wq)
goto out_wq; goto out_wq;
if (qeth_setup_channel(&card->read, true)) if (qeth_setup_channel(&card->read, true))
......
...@@ -2267,12 +2267,18 @@ static int qeth_l3_probe_device(struct ccwgroup_device *gdev) ...@@ -2267,12 +2267,18 @@ static int qeth_l3_probe_device(struct ccwgroup_device *gdev)
int rc; int rc;
hash_init(card->ip_htable); hash_init(card->ip_htable);
card->cmd_wq = alloc_ordered_workqueue("%s_cmd", 0,
dev_name(&gdev->dev));
if (!card->cmd_wq)
return -ENOMEM;
if (gdev->dev.type == &qeth_generic_devtype) { if (gdev->dev.type == &qeth_generic_devtype) {
rc = qeth_l3_create_device_attributes(&gdev->dev); rc = qeth_l3_create_device_attributes(&gdev->dev);
if (rc) if (rc) {
destroy_workqueue(card->cmd_wq);
return rc; return rc;
} }
}
hash_init(card->ip_mc_htable); hash_init(card->ip_mc_htable);
INIT_WORK(&card->rx_mode_work, qeth_l3_rx_mode_work); INIT_WORK(&card->rx_mode_work, qeth_l3_rx_mode_work);
...@@ -2295,6 +2301,9 @@ static void qeth_l3_remove_device(struct ccwgroup_device *cgdev) ...@@ -2295,6 +2301,9 @@ static void qeth_l3_remove_device(struct ccwgroup_device *cgdev)
cancel_work_sync(&card->close_dev_work); cancel_work_sync(&card->close_dev_work);
if (qeth_netdev_is_registered(card->dev)) if (qeth_netdev_is_registered(card->dev))
unregister_netdev(card->dev); unregister_netdev(card->dev);
flush_workqueue(card->cmd_wq);
destroy_workqueue(card->cmd_wq);
qeth_l3_clear_ip_htable(card, 0); qeth_l3_clear_ip_htable(card, 0);
qeth_l3_clear_ipato_list(card); qeth_l3_clear_ipato_list(card);
} }
...@@ -2542,6 +2551,30 @@ static int qeth_l3_handle_ip_event(struct qeth_card *card, ...@@ -2542,6 +2551,30 @@ static int qeth_l3_handle_ip_event(struct qeth_card *card,
} }
} }
struct qeth_l3_ip_event_work {
struct work_struct work;
struct qeth_card *card;
struct qeth_ipaddr addr;
};
#define to_ip_work(w) container_of((w), struct qeth_l3_ip_event_work, work)
static void qeth_l3_add_ip_worker(struct work_struct *work)
{
struct qeth_l3_ip_event_work *ip_work = to_ip_work(work);
qeth_l3_modify_ip(ip_work->card, &ip_work->addr, true);
kfree(work);
}
static void qeth_l3_delete_ip_worker(struct work_struct *work)
{
struct qeth_l3_ip_event_work *ip_work = to_ip_work(work);
qeth_l3_modify_ip(ip_work->card, &ip_work->addr, false);
kfree(work);
}
static struct qeth_card *qeth_l3_get_card_from_dev(struct net_device *dev) static struct qeth_card *qeth_l3_get_card_from_dev(struct net_device *dev)
{ {
if (is_vlan_dev(dev)) if (is_vlan_dev(dev))
...@@ -2586,9 +2619,12 @@ static int qeth_l3_ip6_event(struct notifier_block *this, ...@@ -2586,9 +2619,12 @@ static int qeth_l3_ip6_event(struct notifier_block *this,
{ {
struct inet6_ifaddr *ifa = (struct inet6_ifaddr *)ptr; struct inet6_ifaddr *ifa = (struct inet6_ifaddr *)ptr;
struct net_device *dev = ifa->idev->dev; struct net_device *dev = ifa->idev->dev;
struct qeth_ipaddr addr; struct qeth_l3_ip_event_work *ip_work;
struct qeth_card *card; struct qeth_card *card;
if (event != NETDEV_UP && event != NETDEV_DOWN)
return NOTIFY_DONE;
card = qeth_l3_get_card_from_dev(dev); card = qeth_l3_get_card_from_dev(dev);
if (!card) if (!card)
return NOTIFY_DONE; return NOTIFY_DONE;
...@@ -2596,11 +2632,23 @@ static int qeth_l3_ip6_event(struct notifier_block *this, ...@@ -2596,11 +2632,23 @@ static int qeth_l3_ip6_event(struct notifier_block *this,
if (!qeth_is_supported(card, IPA_IPV6)) if (!qeth_is_supported(card, IPA_IPV6))
return NOTIFY_DONE; return NOTIFY_DONE;
qeth_l3_init_ipaddr(&addr, QETH_IP_TYPE_NORMAL, QETH_PROT_IPV6); ip_work = kmalloc(sizeof(*ip_work), GFP_ATOMIC);
addr.u.a6.addr = ifa->addr; if (!ip_work)
addr.u.a6.pfxlen = ifa->prefix_len; return NOTIFY_DONE;
return qeth_l3_handle_ip_event(card, &addr, event); if (event == NETDEV_UP)
INIT_WORK(&ip_work->work, qeth_l3_add_ip_worker);
else
INIT_WORK(&ip_work->work, qeth_l3_delete_ip_worker);
ip_work->card = card;
qeth_l3_init_ipaddr(&ip_work->addr, QETH_IP_TYPE_NORMAL,
QETH_PROT_IPV6);
ip_work->addr.u.a6.addr = ifa->addr;
ip_work->addr.u.a6.pfxlen = ifa->prefix_len;
queue_work(card->cmd_wq, &ip_work->work);
return NOTIFY_OK;
} }
static struct notifier_block qeth_l3_ip6_notifier = { static struct notifier_block qeth_l3_ip6_notifier = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment