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=ham 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 00C54C33C9E for ; Sat, 11 Jan 2020 10:33:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CC1C72087F for ; Sat, 11 Jan 2020 10:33:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578738823; bh=6Km0dNntMQlznu/2kdlM2OLUda37TQIeESQhzvg+gUY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=VnbOs2a7S/JD0yZ7PRbRrA0cDVaG4NSvisBTiabyDgCAIzNDRUp06dyDJKcotNeQW VDe6zgm5T6AdCVmTDOkWd/ypqdO0EAEpt7bsffoZekiF3NHh2XcpbMwhYnSBmn72ib BrJcLFW8TtK76j6SiPhgZ5JML5l9xAtCWtnQ46M0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731302AbgAKKdm (ORCPT ); Sat, 11 Jan 2020 05:33:42 -0500 Received: from mail.kernel.org ([198.145.29.99]:48704 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731497AbgAKKdl (ORCPT ); Sat, 11 Jan 2020 05:33:41 -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 1162F20678; Sat, 11 Jan 2020 10:33:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578738820; bh=6Km0dNntMQlznu/2kdlM2OLUda37TQIeESQhzvg+gUY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1sByjruOXC5Wl+jj2Ezjn/GiTQlDpoXKBMtY8NVJ93UrnDqIjNDcuoXYbpXi2MiZX czINYOsISCWJ10sG1eJaa5yuYdHLBOX+McsHBjrazdsb6WAdy8Vnso42mEmeJG73Y8 9EvbYV/nAKw/ifhdES3aMkyj+kv48ohZRhTouIRg= 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 5.4 152/165] net: sch_prio: When ungrafting, replace with FIFO Date: Sat, 11 Jan 2020 10:51:11 +0100 Message-Id: <20200111094940.933170652@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200111094921.347491861@linuxfoundation.org> References: <20200111094921.347491861@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@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 @@ -292,8 +292,14 @@ static int prio_graft(struct Qdisc *sch, struct tc_prio_qopt_offload graft_offload; 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), extack); + if (!new) + new = &noop_qdisc; + else + qdisc_hash_add(new, true); + } *old = qdisc_replace(sch, new, &q->queues[band]);