From: Ding Tianhong <dingtianhong@huawei•com>
To: Thomas Gleixner <tglx@linutronix•de>, David Miller <davem@davemloft•net>
Cc: <arnd@arndb•de>, <linux-kernel@vger•kernel.org>,
<peterz@infradead•org>, <mingo@kernel•org>,
<zhangfei.gao@linaro•org>, <dan.carpenter@oracle•com>,
<netdev@vger•kernel.org>
Subject: Re: [patch v2] net: hip04: Make tx coalesce timer actually work
Date: Wed, 15 Apr 2015 10:24:16 +0800 [thread overview]
Message-ID: <552DCBD0.5030607@huawei.com> (raw)
In-Reply-To: <alpine.DEB.2.11.1504142140290.3845@nanos>
On 2015/4/15 3:42, Thomas Gleixner wrote:
> The code sets the expiry value of the timer to a relative value and
> starts it with hrtimer_start_expires. That's fine, but that only works
> once. The timer is started in relative mode, so the expiry value gets
> overwritten with the absolut expiry time (now + expiry).
>
> So once the timer expired, a new call to hrtimer_start_expires results
> in an immidiately expired timer, because the expiry value is
> already in the past.
>
> Use the proper mechanisms to (re)start the timer in the intended way.
>
Acked-by: Ding Tianhong <dingtianhong@huawei•com>
> Signed-off-by: Thomas Gleixner <tglx@linutronix•de>
> Cc: "David S. Miller" <davem@davemloft•net>
> Cc: dingtianhong <dingtianhong@huawei•com>
> Cc: Arnd Bergmann <arnd@arndb•de>
> Cc: Zhangfei Gao <zhangfei.gao@linaro•org>
> Cc: Dan Carpenter <dan.carpenter@oracle•com>
> Cc: netdev@vger•kernel.org
> ---
> drivers/net/ethernet/hisilicon/hip04_eth.c | 18 +++++++++++-------
> 1 file changed, 11 insertions(+), 7 deletions(-)
>
> Index: linux/drivers/net/ethernet/hisilicon/hip04_eth.c
> ===================================================================
> --- linux.orig/drivers/net/ethernet/hisilicon/hip04_eth.c
> +++ linux/drivers/net/ethernet/hisilicon/hip04_eth.c
> @@ -413,6 +413,15 @@ out:
> return count;
> }
>
> +static void hip04_start_tx_timer(struct hip04_priv *priv)
> +{
> + unsigned long ns = priv->tx_coalesce_usecs * NSEC_PER_USEC / 2;
> +
> + /* allow timer to fire after half the time at the earliest */
> + hrtimer_start_range_ns(&priv->tx_coalesce_timer, ns_to_ktime(ns),
> + ns, HRTIMER_MODE_REL);
> +}
> +
> static int hip04_mac_start_xmit(struct sk_buff *skb, struct net_device *ndev)
> {
> struct hip04_priv *priv = netdev_priv(ndev);
> @@ -466,8 +475,7 @@ static int hip04_mac_start_xmit(struct s
> }
> } else if (!hrtimer_is_queued(&priv->tx_coalesce_timer)) {
> /* cleanup not pending yet, start a new timer */
> - hrtimer_start_expires(&priv->tx_coalesce_timer,
> - HRTIMER_MODE_REL);
> + hip04_start_tx_timer(priv);
> }
>
> return NETDEV_TX_OK;
> @@ -549,7 +557,7 @@ done:
> /* clean up tx descriptors and start a new timer if necessary */
> tx_remaining = hip04_tx_reclaim(ndev, false);
> if (rx < budget && tx_remaining)
> - hrtimer_start_expires(&priv->tx_coalesce_timer, HRTIMER_MODE_REL);
> + hip04_start_tx_timer(priv);
>
> return rx;
> }
> @@ -809,7 +817,6 @@ static int hip04_mac_probe(struct platfo
> struct hip04_priv *priv;
> struct resource *res;
> unsigned int irq;
> - ktime_t txtime;
> int ret;
>
> ndev = alloc_etherdev(sizeof(struct hip04_priv));
> @@ -846,9 +853,6 @@ static int hip04_mac_probe(struct platfo
> */
> priv->tx_coalesce_frames = TX_DESC_NUM * 3 / 4;
> priv->tx_coalesce_usecs = 200;
> - /* allow timer to fire after half the time at the earliest */
> - txtime = ktime_set(0, priv->tx_coalesce_usecs * NSEC_PER_USEC / 2);
> - hrtimer_set_expires_range(&priv->tx_coalesce_timer, txtime, txtime);
> priv->tx_coalesce_timer.function = tx_done;
>
> priv->map = syscon_node_to_regmap(arg.np);
>
> .
>
next prev parent reply other threads:[~2015-04-15 2:24 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20150413210009.682000343@linutronix.de>
2015-04-13 21:02 ` [patch 4/5] net: hip04: Make tx coalesce timer actually work Thomas Gleixner
2015-04-13 21:24 ` Arnd Bergmann
2015-04-13 21:42 ` Thomas Gleixner
2015-04-13 22:03 ` Arnd Bergmann
2015-04-13 22:08 ` Thomas Gleixner
2015-04-14 7:53 ` Ding Tianhong
2015-04-14 18:15 ` David Miller
2015-04-14 19:42 ` [patch v2] " Thomas Gleixner
2015-04-15 2:24 ` Ding Tianhong [this message]
2015-04-15 10:20 ` Arnd Bergmann
2015-04-15 21:22 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=552DCBD0.5030607@huawei.com \
--to=dingtianhong@huawei$(echo .)com \
--cc=arnd@arndb$(echo .)de \
--cc=dan.carpenter@oracle$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=mingo@kernel$(echo .)org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=peterz@infradead$(echo .)org \
--cc=tglx@linutronix$(echo .)de \
--cc=zhangfei.gao@linaro$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox