From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B9F71C33CA4 for ; Sat, 11 Jan 2020 10:12:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8360A206DA for ; Sat, 11 Jan 2020 10:12:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578737567; bh=MSDiproYo3WADSlzilDQfi8s9qyoDD9w4tomXkXUypo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=C0FlEw+5QJDuJ9LwiFuI+VUahz6DFndatcb6JAhJMOl92sG6y1E4FdDsT0LE7DzxE KjLaDg4n9+4zzxngoPh1ZyHMvETEgboGTqzSzrDCRoozxW+q+NDbVqEnS8m6hjHPui 4AcoT81XKjSNZ8l2gAT2dwmSQsJFxlTy0NIm8XjY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730055AbgAKKMq (ORCPT ); Sat, 11 Jan 2020 05:12:46 -0500 Received: from mail.kernel.org ([198.145.29.99]:50866 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729782AbgAKKMp (ORCPT ); Sat, 11 Jan 2020 05:12:45 -0500 Received: from localhost (unknown [62.119.166.9]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id BFB8E2077C; Sat, 11 Jan 2020 10:12:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578737564; bh=MSDiproYo3WADSlzilDQfi8s9qyoDD9w4tomXkXUypo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=b5Niiit8A2HWRPHP2AvGgrjjgCLCnUtgdJKjrOktXACAk6I4JWN1hPaegNLb2TA0R CDHBMYgkFmjAZSYBKDO3C5QX9/QOncQc8Q3ljGaUsGeQY18bMZ2tEWxkeVko+1No++ x4yrS2ofcL+XwvTRbiHCsA+ygKxsHgYbsEXANMAc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Petr Machata , Jiri Pirko , "David S. Miller" Subject: [PATCH 4.14 61/62] net: sch_prio: When ungrafting, replace with FIFO Date: Sat, 11 Jan 2020 10:50:43 +0100 Message-Id: <20200111094857.906503326@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200111094837.425430968@linuxfoundation.org> References: <20200111094837.425430968@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Petr Machata [ Upstream commit 240ce7f6428ff5188b9eedc066e1e4d645b8635f ] When a child Qdisc is removed from one of the PRIO Qdisc's bands, it is replaced unconditionally by a NOOP qdisc. As a result, any traffic hitting that band gets dropped. That is incorrect--no Qdisc was explicitly added when PRIO was created, and after removal, none should have to be added either. Fix PRIO by first attempting to create a default Qdisc and only falling back to noop when that fails. This pattern of attempting to create an invisible FIFO, using NOOP only as a fallback, is also seen in other Qdiscs. Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Signed-off-by: Petr Machata Acked-by: Jiri Pirko Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/sched/sch_prio.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) --- a/net/sched/sch_prio.c +++ b/net/sched/sch_prio.c @@ -244,8 +244,14 @@ static int prio_graft(struct Qdisc *sch, struct prio_sched_data *q = qdisc_priv(sch); unsigned long band = arg - 1; - if (new == NULL) - new = &noop_qdisc; + if (!new) { + new = qdisc_create_dflt(sch->dev_queue, &pfifo_qdisc_ops, + TC_H_MAKE(sch->handle, arg)); + if (!new) + new = &noop_qdisc; + else + qdisc_hash_add(new, true); + } *old = qdisc_replace(sch, new, &q->queues[band]); return 0;