From patchwork Mon Mar 11 14:34:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roi Dayan X-Patchwork-Id: 1054496 X-Patchwork-Delegate: horms@verge.net.au Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=openvswitch.org (client-ip=140.211.169.12; helo=mail.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=mellanox.com Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44J0wn0vljz9s4V for ; Tue, 12 Mar 2019 01:34:16 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 66D1AAE0; Mon, 11 Mar 2019 14:34:11 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id 1BDCB974 for ; Mon, 11 Mar 2019 14:34:10 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129]) by smtp1.linuxfoundation.org (Postfix) with ESMTP id 279CB2D5 for ; Mon, 11 Mar 2019 14:34:08 +0000 (UTC) Received: from Internal Mail-Server by MTLPINE1 (envelope-from roid@mellanox.com) with ESMTPS (AES256-SHA encrypted); 11 Mar 2019 16:34:07 +0200 Received: from r-vnc05.mtr.labs.mlnx (r-vnc05.mtr.labs.mlnx [10.208.0.115]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id x2BEY76k012614; Mon, 11 Mar 2019 16:34:07 +0200 From: Roi Dayan To: dev@openvswitch.org Date: Mon, 11 Mar 2019 16:34:05 +0200 Message-Id: <1552314845-23758-1-git-send-email-roid@mellanox.com> X-Mailer: git-send-email 2.7.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Cc: Simon Horman , Or Gerlitz , Vu Pham , Pieter Jansen van Vuuren Subject: [ovs-dev] [PATCH] netdev-tc-offloads: Remove ingress qdisc on tc init flow api X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org It could be a port added to ovs bridge already has ingress qdisc which will make the block probe fail. The probes should start clean and ingress is being added later so just remove ingress in case it exists. Signed-off-by: Roi Dayan Acked-by: John Hurley --- lib/netdev-tc-offloads.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/netdev-tc-offloads.c b/lib/netdev-tc-offloads.c index da43549f2f22..b33a79bb14a2 100644 --- a/lib/netdev-tc-offloads.c +++ b/lib/netdev-tc-offloads.c @@ -1527,6 +1527,9 @@ netdev_tc_init_flow_api(struct netdev *netdev) return -ifindex; } + /* make sure there is no ingress qdisc */ + tc_add_del_ingress_qdisc(ifindex, false, 0); + if (ovsthread_once_start(&block_once)) { probe_tc_block_support(ifindex); ovsthread_once_done(&block_once);