From patchwork Tue Apr 21 19:27:54 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexei Starovoitov X-Patchwork-Id: 463468 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 9D6A01402EA for ; Wed, 22 Apr 2015 05:28:17 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755996AbbDUT2N (ORCPT ); Tue, 21 Apr 2015 15:28:13 -0400 Received: from mail-pa0-f48.google.com ([209.85.220.48]:35317 "EHLO mail-pa0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755982AbbDUT2M (ORCPT ); Tue, 21 Apr 2015 15:28:12 -0400 Received: by pabtp1 with SMTP id tp1so249941010pab.2 for ; Tue, 21 Apr 2015 12:28:11 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=SbBCOteKC+tveS5F/IPGtJGU4ov4PJSo3ErItYpvEI4=; b=Vchy+8kXzFvPzAwKfTeFm/BslyE1shwuU1w+OTgEa7ljBy51uas7GXprAiKICm20sP vLhHHBkcxn+M5ClDDKe7QFxB2QPauu/wu/BAWk3LbZN7JOwQS8wIt450jVKAyhG352Mo V88HnUR4ZVEESeTOD9u52nEsl7nQPimZfx24mG5djLRsuGLK1uSUGJuiZSLKHg+q8f+/ Y9/R+4/4VNpcVkel8FvLj5fSKd8ZmR9vTIhLHzCPLmFwCArxXVMxCVu1MrgEIHTsMzY6 1ACbOPBYDzeuD/X5psokOgYDhfVmpY4Nkh765jg+2DrmsyjWSeOHEbiTsTa8xleASLPY S9mA== X-Gm-Message-State: ALoCoQnbKMSf5QpI9GaGNnAKdDZL5c1j1IdAZmYgDM1CLTcNP/xbsP9++2aDKj/pk/YzlDTXXL68 X-Received: by 10.66.235.36 with SMTP id uj4mr40205904pac.123.1429644491412; Tue, 21 Apr 2015 12:28:11 -0700 (PDT) Received: from localhost.localdomain ([12.229.56.227]) by mx.google.com with ESMTPSA id nq2sm2802605pdb.70.2015.04.21.12.28.10 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 21 Apr 2015 12:28:10 -0700 (PDT) From: Alexei Starovoitov To: "David S. Miller" Cc: Eric Dumazet , Jamal Hadi Salim , John Fastabend , netdev@vger.kernel.org Subject: [RFC 1/3] tc: fix return values of ingress qdisc Date: Tue, 21 Apr 2015 12:27:54 -0700 Message-Id: <1429644476-8914-2-git-send-email-ast@plumgrid.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1429644476-8914-1-git-send-email-ast@plumgrid.com> References: <1429644476-8914-1-git-send-email-ast@plumgrid.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org ingress qdisc should return NET_XMIT_* values just like all other qdiscs. Since it's invoked via qdisc_enqueue_root() (which suppose to return only NET_XMIT_* values as well), it was working by accident, since TC_ACT_* values fit within NET_XMIT_MASK. Signed-off-by: Alexei Starovoitov --- net/core/dev.c | 8 ++------ net/sched/sch_ingress.c | 9 ++++----- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/net/core/dev.c b/net/core/dev.c index 1796cef55ab5..ac6233f6f353 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -3533,7 +3533,7 @@ static int ing_filter(struct sk_buff *skb, struct netdev_queue *rxq) { struct net_device *dev = skb->dev; u32 ttl = G_TC_RTTL(skb->tc_verd); - int result = TC_ACT_OK; + int result = NET_XMIT_SUCCESS; struct Qdisc *q; if (unlikely(MAX_RED_LOOP < ttl++)) { @@ -3570,12 +3570,8 @@ static inline struct sk_buff *handle_ing(struct sk_buff *skb, *pt_prev = NULL; } - switch (ing_filter(skb, rxq)) { - case TC_ACT_SHOT: - case TC_ACT_STOLEN: - kfree_skb(skb); + if (ing_filter(skb, rxq) == NET_XMIT_DROP) return NULL; - } return skb; } diff --git a/net/sched/sch_ingress.c b/net/sched/sch_ingress.c index 4cdbfb85686a..e68f4a5dbeba 100644 --- a/net/sched/sch_ingress.c +++ b/net/sched/sch_ingress.c @@ -65,21 +65,20 @@ static int ingress_enqueue(struct sk_buff *skb, struct Qdisc *sch) result = tc_classify(skb, fl, &res); - qdisc_bstats_update(sch, skb); switch (result) { case TC_ACT_SHOT: - result = TC_ACT_SHOT; qdisc_qstats_drop(sch); - break; case TC_ACT_STOLEN: case TC_ACT_QUEUED: - result = TC_ACT_STOLEN; + result = NET_XMIT_DROP; + kfree_skb(skb); break; case TC_ACT_RECLASSIFY: case TC_ACT_OK: skb->tc_index = TC_H_MIN(res.classid); default: - result = TC_ACT_OK; + qdisc_bstats_update(sch, skb); + result = NET_XMIT_SUCCESS; break; }