From patchwork Thu Aug 10 09:31:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konstantin Khlebnikov X-Patchwork-Id: 800145 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=yandex-team.ru header.i=@yandex-team.ru header.b="hvWFzZDB"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xSjl748ptz9sNc for ; Thu, 10 Aug 2017 19:39:15 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752233AbdHJJjN (ORCPT ); Thu, 10 Aug 2017 05:39:13 -0400 Received: from forwardcorp1h.cmail.yandex.net ([87.250.230.216]:33110 "EHLO forwardcorp1h.cmail.yandex.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752002AbdHJJjM (ORCPT ); Thu, 10 Aug 2017 05:39:12 -0400 X-Greylist: delayed 445 seconds by postgrey-1.27 at vger.kernel.org; Thu, 10 Aug 2017 05:39:12 EDT Received: from smtpcorp1p.mail.yandex.net (smtpcorp1p.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b6:10]) by forwardcorp1h.cmail.yandex.net (Yandex) with ESMTP id D4E0F2070C; Thu, 10 Aug 2017 12:31:45 +0300 (MSK) Received: from smtpcorp1p.mail.yandex.net (localhost.localdomain [127.0.0.1]) by smtpcorp1p.mail.yandex.net (Yandex) with ESMTP id D2A7B6E40D64; Thu, 10 Aug 2017 12:31:45 +0300 (MSK) Received: from unknown (unknown [2a02:6b8:0:40c:e089:6c68:90e2:42d5]) by smtpcorp1p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id X1HLBI4aYv-VjUe27mw; Thu, 10 Aug 2017 12:31:45 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client certificate not present) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex-team.ru; s=default; t=1502357505; bh=+wUyjQXANnR+TnhAaA2A8jiQkvxOCicnaAS+4qxsd/4=; h=Subject:From:To:Date:Message-ID; b=hvWFzZDB2BgSIDF3GxisBUKIlNdho8PKTY/Q96zoweuQW+GUQeKXCuJGamIOU5VUZ cXHgjDszOKTCSQUz5uD4D73tNdCL7z3hjEPtoa/jl0NjQifFdOtxsNhZrm4FbEM7wt cajcdhhALZazKmllgGBDik2NdoMgFUP61O7oUPao= Authentication-Results: smtpcorp1p.mail.yandex.net; dkim=pass header.i=@yandex-team.ru Subject: [PATCH] net/sched/hfsc: allocate tcf block for hfsc root class From: Konstantin Khlebnikov To: netdev@vger.kernel.org, Jiri Pirko , "David S. Miller" , Jamal Hadi Salim Date: Thu, 10 Aug 2017 12:31:40 +0300 Message-ID: <150235750037.493227.16245118631720190134.stgit@buzz> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Without this filters cannot be attached. Signed-off-by: Konstantin Khlebnikov Fixes: 6529eaba33f0 ("net: sched: introduce tcf block infractructure") Acked-by: Cong Wang --- net/sched/sch_hfsc.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/net/sched/sch_hfsc.c b/net/sched/sch_hfsc.c index b52f74610dc7..3ad02bbe6903 100644 --- a/net/sched/sch_hfsc.c +++ b/net/sched/sch_hfsc.c @@ -1428,6 +1428,10 @@ hfsc_init_qdisc(struct Qdisc *sch, struct nlattr *opt) return err; q->eligible = RB_ROOT; + err = tcf_block_get(&q->root.block, &q->root.filter_list); + if (err) + goto err_tcf; + q->root.cl_common.classid = sch->handle; q->root.refcnt = 1; q->root.sched = q; @@ -1447,6 +1451,10 @@ hfsc_init_qdisc(struct Qdisc *sch, struct nlattr *opt) qdisc_watchdog_init(&q->watchdog, sch); return 0; + +err_tcf: + qdisc_class_hash_destroy(&q->clhash); + return err; } static int