Skip to content

Advance next_qdisc in homa_qdisc_destroy #140

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
randomizedcoder wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Advance next_qdisc in homa_qdisc_destroy #140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions homa_qdisc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -473,6 +473,8 @@ void homa_qdisc_destroy(struct Qdisc *qdisc)
while (!skb_queue_empty(&q->deferred_tcp))
kfree_skb_reason(__skb_dequeue(&q->deferred_tcp),
SKB_DROP_REASON_QDISC_DROP);
if (q->qdev->next_qdisc == &q->defer_links)
q->qdev->next_qdisc = q->defer_links.next;
list_del_init(&q->defer_links);
homa_qdisc_unlock_qdev(q->qdev);
homa_qdisc_qdev_put(q->qdev);
Expand Down
28 changes: 28 additions & 0 deletions test/unit_homa_qdisc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -484,6 +484,34 @@ TEST_F(homa_qdisc, homa_qdisc_destroy)
kfree(qdisc);
kfree(qdisc2);
}
TEST_F(homa_qdisc, homa_qdisc_destroy__advance_next_qdisc)
{
struct Qdisc *qdisc, *qdisc2;
struct homa_qdisc_dev *qdev;
struct homa_qdisc *q, *q2;

qdisc = mock_alloc_qdisc(&mock_net_queue);
EXPECT_EQ(0, homa_qdisc_init(qdisc, NULL, NULL));
q = qdisc_priv(qdisc);
qdisc2 = mock_alloc_qdisc(&mock_net_queue);
EXPECT_EQ(0, homa_qdisc_init(qdisc2, NULL, NULL));
q2 = qdisc_priv(qdisc2);
qdev = q->qdev;

homa_qdisc_defer_tcp(q, mock_tcp_skb(&self->addr, &self->addr2, 5000,
1000));
homa_qdisc_defer_tcp(q2, mock_tcp_skb(&self->addr, &self->addr2, 6000,
1100));
qdev->next_qdisc = &q2->defer_links;

/* The pacer must not be left pointing at the destroyed qdisc. */
homa_qdisc_destroy(qdisc2);
EXPECT_EQ(&qdev->deferred_qdiscs, qdev->next_qdisc);

homa_qdisc_destroy(qdisc);
kfree(qdisc);
kfree(qdisc2);
}

TEST_F(homa_qdisc, homa_qdisc_add_queued__no_lag)
{
Expand Down