netdev - Re: [PATCH net v2] net: cbs: Fix software cbs to consider packet sending time

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

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:   Mon, 23 Mar 2020 10:47:13 -0700
From:   Jakub Kicinski <kuba@...nel.org>
To:     Zh-yuan Ye <ye.zh-yuan@...ionext.com>
Cc:     netdev@...r.kernel.org, okamoto.satoru@...ionext.com,
        kojima.masahisa@...ionext.com, vinicius.gomes@...el.com
Subject: Re: [PATCH net v2] net: cbs: Fix software cbs to consider packet
 sending time

Minor comments, while waiting for more in-depth review from Vinicius :)

On Mon, 23 Mar 2020 15:17:09 +0900 Zh-yuan Ye wrote:
> Currently the software CBS does not consider the packet sending time
> when depleting the credits. It caused the throughput to be
> Idleslope[kbps] * (Port transmit rate[kbps] / |Sendslope[kbps]|) where
> Idleslope * (Port transmit rate / (Idleslope + |Sendslope|)) = Idleslope
> is expected. In order to fix the issue above, this patch takes the time
> when the packet sending completes into account by moving the anchor time
> variable "last" ahead to the send completion time upon transmission and
> adding wait when the next dequeue request comes before the send
> completion time of the previous packet.

Please add a Fixes tag.

> Signed-off-by: Zh-yuan Ye <ye.zh-yuan@...ionext.com>
> ---
> changes in v2:
>  - combine variable "send_completed" into "last"
>  - add the comment for estimate of the packet sending

You can keep those inside the commit message for networking patches

> diff --git a/net/sched/sch_cbs.c b/net/sched/sch_cbs.c
> index b2905b03a432..20f95f0b9d5b 100644
> --- a/net/sched/sch_cbs.c
> +++ b/net/sched/sch_cbs.c
> @@ -181,6 +181,11 @@ static struct sk_buff *cbs_dequeue_soft(struct Qdisc *sch)
>  	s64 credits;
>  	int len;
>  
> +	/* The previous packet is still being sent */
> +	if (now < q->last) {
> +		qdisc_watchdog_schedule_ns(&q->watchdog, q->last);
> +		return NULL;
> +	}
>  	if (q->credits < 0) {
>  		credits = timediff_to_credits(now - q->last, q->idleslope);
>  
> @@ -192,7 +197,6 @@ static struct sk_buff *cbs_dequeue_soft(struct Qdisc *sch)
>  
>  			delay = delay_from_credits(q->credits, q->idleslope);
>  			qdisc_watchdog_schedule_ns(&q->watchdog, now + delay);
> -

Please don't do whitespace cleanup like this in a bug fix. Bug fixes
should be minimal to avoid conflicts.

>  			q->last = now;
>  
>  			return NULL;
> @@ -212,7 +216,9 @@ static struct sk_buff *cbs_dequeue_soft(struct Qdisc *sch)
>  	credits += q->credits;
>  
>  	q->credits = max_t(s64, credits, q->locredit);
> -	q->last = now;
> +	/* Estimate of the transmission of the last byte of the packet in ns */
> +	q->last = now + div64_s64(len * NSEC_PER_SEC,
> +				  atomic64_read(&q->port_rate));

credits_from_len() checks if port_rate is 0 before division. Can you double check 
it's unnecessary?

>  
>  	return skb;
>  }