netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Paolo valente <paolo.valente@unimore.it>
To: Jamal Hadi Salim <jhs@mojatatu.com>,
	"David S. Miller" <davem@davemloft.net>,
	shemminger@vyatta.com
Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
	fchecconi@gmail.com, rizzo@iet.unipi.it,
	Paolo Valente <paolo.valente@unimore.it>
Subject: [PATCH BUGFIX 2/6] pkt_sched: fix the update of eligible-group sets
Date: Tue,  5 Mar 2013 19:04:58 +0100	[thread overview]
Message-ID: <1362506702-4985-3-git-send-email-paolo.valente@unimore.it> (raw)
In-Reply-To: <1362506702-4985-1-git-send-email-paolo.valente@unimore.it>

Between two invocations of make_eligible, the system virtual time may
happen to grow enough that, in its binary representation, a bit with
higher order than 31 flips. This happens especially with
TSO/GSO. Before this fix, the mask used in make_eligible was computed
as (1UL<<index_of_last_flipped_bit)-1, whose value is well defined on
a 64-bit architecture, because index_of_flipped_bit <= 63, but is in
general undefined on a 32-bit architecture if index_of_flipped_bit > 31.
The fix just replaces 1UL with 1ULL.

Signed-off-by: Paolo Valente <paolo.valente@unimore.it>
Reviewed-by: Fabio Checconi <fchecconi@gmail.com>
---
 net/sched/sch_qfq.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/sched/sch_qfq.c b/net/sched/sch_qfq.c
index 0f6e2db..4cbbf79 100644
--- a/net/sched/sch_qfq.c
+++ b/net/sched/sch_qfq.c
@@ -823,7 +823,7 @@ static void qfq_make_eligible(struct qfq_sched *q)
 	unsigned long old_vslot = q->oldV >> q->min_slot_shift;
 
 	if (vslot != old_vslot) {
-		unsigned long mask = (1UL << fls(vslot ^ old_vslot)) - 1;
+		unsigned long mask = (1ULL << fls(vslot ^ old_vslot)) - 1;
 		qfq_move_groups(q, mask, IR, ER);
 		qfq_move_groups(q, mask, IB, EB);
 	}
-- 
1.7.9.5

  parent reply	other threads:[~2013-03-05 18:04 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-12-19 17:31 [PATCH BUGFIX] pkt_sched: fix little service anomalies and possible crashes of qfq+ Paolo valente
2012-12-26 23:13 ` David Miller
2013-02-26 17:02   ` Paolo valente
2013-02-26 22:37     ` David Miller
2013-03-05 18:04       ` [PATCH BUGFIX 0/6] " Paolo valente
2013-03-05 18:04         ` [PATCH BUGFIX 1/6] pkt_sched: properly cap timestamps in charge_actual_service Paolo valente
2013-03-05 18:04         ` Paolo valente [this message]
2013-03-06 10:05           ` [PATCH BUGFIX 2/6] pkt_sched: fix the update of eligible-group sets David Laight
2013-03-05 18:04         ` [PATCH BUGFIX 3/6] pkt_sched: serve activated aggregates immediately if the scheduler is empty Paolo valente
2013-03-05 18:05         ` [PATCH BUGFIX 4/6] pkt_sched: prevent budget from wrapping around after a dequeue Paolo valente
2013-03-05 18:05         ` [PATCH BUGFIX 5/6] pkt_sched: do not allow virtual time to jump if an aggregate is in service Paolo valente
2013-03-05 18:05         ` [PATCH BUGFIX 6/6] pkt_sched: remove a useless invocation of qfq_update_eligible Paolo valente
2013-03-06  4:50         ` [PATCH BUGFIX 0/6] pkt_sched: fix little service anomalies and possible crashes of qfq+ David Miller
2013-07-10 13:46           ` [PATCH 0/2] pkt_sched: sch_qfq: efficiency and codestyle improvements Paolo Valente
2013-07-10 13:46             ` [PATCH 1/2] pkt_sched: sch_qfq: improve efficiency of make_eligible Paolo Valente
2013-07-10 13:46             ` [PATCH 2/2] pkt_sched: sch_qfq: remove forward declaration of qfq_update_agg_ts Paolo Valente
2013-07-11 20:01             ` [PATCH 0/2] pkt_sched: sch_qfq: efficiency and codestyle improvements 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=1362506702-4985-3-git-send-email-paolo.valente@unimore.it \
    --to=paolo.valente@unimore.it \
    --cc=davem@davemloft.net \
    --cc=fchecconi@gmail.com \
    --cc=jhs@mojatatu.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=rizzo@iet.unipi.it \
    --cc=shemminger@vyatta.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).