From patchwork Thu Nov 16 06:18:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guoshuai Li X-Patchwork-Id: 838428 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=) 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 3ycrff6c5Rz9s7M for ; Thu, 16 Nov 2017 17:18:50 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 28492A70; Thu, 16 Nov 2017 06:18:49 +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 2A1E994F for ; Thu, 16 Nov 2017 06:18:48 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from smtp2203-239.mail.aliyun.com (smtp2203-239.mail.aliyun.com [121.197.203.239]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 087D88A for ; Thu, 16 Nov 2017 06:18:45 +0000 (UTC) X-Alimail-AntiSpam: AC=CONTINUE; BC=0.2170417|-1; FP=0|0|0|0|0|-1|-1|-1; HT=e01l10422; MF=ligs@dtdream.com; NM=1; PH=DS; RN=3; RT=3; SR=0; TI=SMTPD_---.9QQrj22_1510813118; Received: from localhost.localdomain(mailfrom:ligs@dtdream.com ip:222.128.6.202) by smtp.aliyun-inc.com(10.147.41.121); Thu, 16 Nov 2017 14:18:39 +0800 From: Guoshuai Li To: dev@openvswitch.org Date: Thu, 16 Nov 2017 14:18:26 +0800 Message-Id: <20171116061826.10456-1-ligs@dtdream.com> X-Mailer: git-send-email 2.13.2.windows.1 X-Spam-Status: No, score=0.0 required=5.0 tests=UNPARSEABLE_RELAY autolearn=disabled version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Cc: huweihua Subject: [ovs-dev] [PATCH v2] netdev-linux: Do not remove ingress qdisc when policing is never enabled. 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 rate limiting may be implemented in other ways (such as nova/libvirt), ovs never enable policing. I think ovs need not control qdisc, such as remove qdisk added by other. Signed-off-by: Guoshuai Li Signed-off-by: huweihua --- v2: Fix cannot disable policing when set ingress_policing_rate to 0. --- lib/netdev-linux.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/lib/netdev-linux.c b/lib/netdev-linux.c index fbbbb7205..99704938d 100644 --- a/lib/netdev-linux.c +++ b/lib/netdev-linux.c @@ -2128,13 +2128,15 @@ netdev_linux_set_policing(struct netdev *netdev_, goto out; } - COVERAGE_INC(netdev_set_policing); - /* Remove any existing ingress qdisc. */ - error = tc_add_del_ingress_qdisc(ifindex, false); - if (error) { - VLOG_WARN_RL(&rl, "%s: removing policing failed: %s", - netdev_name, ovs_strerror(error)); - goto out; + if (netdev->kbits_rate || kbits_rate) { + COVERAGE_INC(netdev_set_policing); + /* Remove any existing ingress qdisc. */ + error = tc_add_del_ingress_qdisc(ifindex, false); + if (error) { + VLOG_WARN_RL(&rl, "%s: removing policing failed: %s", + netdev_name, ovs_strerror(error)); + goto out; + } } if (kbits_rate) {