| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Mon, 13 Jul 2015 11:35:49 -0700 (PDT)
From: Yasuaki Ishimatsu <yasu.isimatu@...il.com>
To: Taku Izumi <izumi.taku@...fujitsu.com>
Cc: netdev@...r.kernel.org, davem@...emloft.net,
platform-driver-x86@...r.kernel.org, dvhart@...radead.org,
rkhan@...hat.com, alexander.h.duyck@...hat.com,
linux-acpi@...r.kernel.org, joe@...ches.com,
sergei.shtylyov@...entembedded.com, stephen@...workplumber.org,
Yasuaki Ishimatsu <yasu.isimatu@...il.com>
Subject: Re: [PATCH v2 18/22] fjes: unshare_watch_task
Hi Izumi-san,
On Wed, 24 Jun 2015 11:55:50 +0900
Taku Izumi <izumi.taku@...fujitsu.com> wrote:
> This patch adds unshare_watch_task.
> Shared buffer's status can be changed into unshared.
> This task is used to monitor shared buffer's status.
>
> Signed-off-by: Taku Izumi <izumi.taku@...fujitsu.com>
> ---
> drivers/net/fjes/fjes.h | 3 +
> drivers/net/fjes/fjes_main.c | 130 +++++++++++++++++++++++++++++++++++++++++++
> 2 files changed, 133 insertions(+)
>
> diff --git a/drivers/net/fjes/fjes.h b/drivers/net/fjes/fjes.h
> index d31d4c3..57feee8 100644
> --- a/drivers/net/fjes/fjes.h
> +++ b/drivers/net/fjes/fjes.h
> @@ -59,6 +59,9 @@ struct fjes_adapter {
> struct work_struct tx_stall_task;
> struct work_struct raise_intr_rxdata_task;
>
> + struct work_struct unshare_watch_task;
> + unsigned long unshare_watch_bitmask;
> +
> struct delayed_work interrupt_watch_task;
> bool interrupt_watch_enable;
>
> diff --git a/drivers/net/fjes/fjes_main.c b/drivers/net/fjes/fjes_main.c
> index 1ddb9d3..69a238c 100644
> --- a/drivers/net/fjes/fjes_main.c
> +++ b/drivers/net/fjes/fjes_main.c
> @@ -73,6 +73,7 @@ static int fjes_remove(struct platform_device *);
> static int fjes_sw_init(struct fjes_adapter *);
> static void fjes_netdev_setup(struct net_device *);
> static void fjes_irq_watch_task(struct work_struct *);
> +static void fjes_watch_unshare_task(struct work_struct *);
> static void fjes_rx_irq(struct fjes_adapter *, int);
> static int fjes_poll(struct napi_struct *, int);
>
> @@ -312,6 +313,8 @@ static int fjes_close(struct net_device *netdev)
> fjes_free_irq(adapter);
>
> cancel_delayed_work_sync(&adapter->interrupt_watch_task);
> + cancel_work_sync(&adapter->unshare_watch_task);
> + adapter->unshare_watch_bitmask = 0;
> cancel_work_sync(&adapter->raise_intr_rxdata_task);
> cancel_work_sync(&adapter->tx_stall_task);
>
> @@ -1032,6 +1035,8 @@ static int fjes_probe(struct platform_device *plat_dev)
> INIT_WORK(&adapter->tx_stall_task, fjes_tx_stall_task);
> INIT_WORK(&adapter->raise_intr_rxdata_task,
> fjes_raise_intr_rxdata_task);
> + INIT_WORK(&adapter->unshare_watch_task, fjes_watch_unshare_task);
> + adapter->unshare_watch_bitmask = 0;
>
> INIT_DELAYED_WORK(&adapter->interrupt_watch_task, fjes_irq_watch_task);
> adapter->interrupt_watch_enable = false;
> @@ -1077,6 +1082,7 @@ static int fjes_remove(struct platform_device *plat_dev)
> struct fjes_hw *hw = &adapter->hw;
>
> cancel_delayed_work_sync(&adapter->interrupt_watch_task);
> + cancel_work_sync(&adapter->unshare_watch_task);
> cancel_work_sync(&adapter->raise_intr_rxdata_task);
> cancel_work_sync(&adapter->tx_stall_task);
> if (adapter->control_wq)
> @@ -1136,6 +1142,130 @@ static void fjes_irq_watch_task(struct work_struct *work)
> }
> }
>
> +static void fjes_watch_unshare_task(struct work_struct *work)
> +{
> + struct fjes_adapter *adapter =
> + container_of(work, struct fjes_adapter, unshare_watch_task);
> +
> + struct fjes_hw *hw = &adapter->hw;
> + struct net_device *netdev = adapter->netdev;
> + int epidx;
> + int max_epid, my_epid;
> + unsigned long unshare_watch_bitmask;
> + int wait_time = 0;
> + int is_shared;
> + int stop_req, stop_req_done;
> + int unshare_watch, unshare_reserve;
> + int ret;
> +
> + my_epid = hw->my_epid;
> + max_epid = hw->max_epid;
> +
> + unshare_watch_bitmask = adapter->unshare_watch_bitmask;
> + adapter->unshare_watch_bitmask = 0;
> +
> + while ((unshare_watch_bitmask || hw->txrx_stop_req_bit) &&
> + (wait_time < 3000)) {
> + for (epidx = 0; epidx < hw->max_epid; epidx++) {
> + if (epidx == hw->my_epid)
> + continue;
> +
> + is_shared =
> + fjes_hw_epid_is_shared(hw->hw_info.share, epidx);
> +
> + stop_req =
> + test_bit(epidx, &hw->txrx_stop_req_bit);
> +
> + stop_req_done =
> + hw->ep_shm_info[epidx].rx.info->v1i.rx_status &
> + FJES_RX_STOP_REQ_DONE;
> +
> + unshare_watch =
> + test_bit(epidx, &unshare_watch_bitmask);
> +
> + unshare_reserve =
> + test_bit(epidx,
> + &hw->hw_info.buffer_unshare_reserve_bit);
> +
> + if ((!stop_req ||
> + (is_shared && (!is_shared || !stop_req_done))) &&
> + (is_shared || !unshare_watch || !unshare_reserve))
> + continue;
> +
> + mutex_lock(&hw->hw_info.lock);
> + ret = fjes_hw_unregister_buff_addr(hw, epidx);
> + switch (ret) {
> + case 0:
> + break;
> + case -ENOMSG:
> + case -EBUSY:
> + default:
> + if (!work_pending(
> + &adapter->force_close_task)) {
> + adapter->force_reset = true;
> + schedule_work(
> + &adapter->force_close_task);
> + }
> + break;
> + }
> + mutex_unlock(&hw->hw_info.lock);
> +
> + fjes_hw_setup_epbuf(&hw->ep_shm_info[epidx].tx,
> + netdev->dev_addr, netdev->mtu);
> +
> + clear_bit(epidx, &hw->txrx_stop_req_bit);
> + clear_bit(epidx, &unshare_watch_bitmask);
> + clear_bit(epidx,
> + &hw->hw_info.buffer_unshare_reserve_bit);
How about creating a new function? There are the same codes below.
Thanks,
Yasuaki Ishimatsu
> + }
> +
> + msleep(100);
> + wait_time += 100;
> + }
> +
> + if (hw->hw_info.buffer_unshare_reserve_bit) {
> + for (epidx = 0; epidx < hw->max_epid; epidx++) {
> + if (epidx == hw->my_epid)
> + continue;
> +
> + if (test_bit(epidx,
> + &hw->hw_info.buffer_unshare_reserve_bit)) {
> + mutex_lock(&hw->hw_info.lock);
> +
> + ret = fjes_hw_unregister_buff_addr(hw, epidx);
> + switch (ret) {
> + case 0:
> + break;
> + case -ENOMSG:
> + case -EBUSY:
> + default:
> + if (!work_pending(
> + &adapter->force_close_task)) {
> + adapter->force_reset = true;
> + schedule_work(
> + &adapter->force_close_task);
> + }
> + break;
> + }
> + mutex_unlock(&hw->hw_info.lock);
> +
> + fjes_hw_setup_epbuf(
> + &hw->ep_shm_info[epidx].tx,
> + netdev->dev_addr, netdev->mtu);
> +
> + clear_bit(epidx, &hw->txrx_stop_req_bit);
> + clear_bit(epidx, &unshare_watch_bitmask);
> + clear_bit(epidx, &hw->hw_info.buffer_unshare_reserve_bit);
> + }
> +
> + if (test_bit(epidx, &unshare_watch_bitmask)) {
> + hw->ep_shm_info[epidx].tx.info->v1i.rx_status &=
> + ~FJES_RX_STOP_REQ_DONE;
> + }
> + }
> + }
> +}
> +
> /* fjes_init_module - Driver Registration Routine */
> static int __init fjes_init_module(void)
> {
> --
> 1.8.3.1
>
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists