From patchwork Tue Feb 12 10:12:09 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Pirko X-Patchwork-Id: 219769 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 0F0512C0320 for ; Tue, 12 Feb 2013 21:12:54 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932915Ab3BLKMu (ORCPT ); Tue, 12 Feb 2013 05:12:50 -0500 Received: from mail-ea0-f180.google.com ([209.85.215.180]:35229 "EHLO mail-ea0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932138Ab3BLKMs (ORCPT ); Tue, 12 Feb 2013 05:12:48 -0500 Received: by mail-ea0-f180.google.com with SMTP id c1so69306eaa.25 for ; Tue, 12 Feb 2013 02:12:47 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=q6KWcXteaP2I11YFUdTCmuw3+zZg9CGTwXOmjlRGPsw=; b=exGQ5aDwhPQSVDebP7vjj3QU6Qt3YGHIrSbrSNea6ANiTWL4KavDYbm4ih5NfRa04N gvUxbdjYugMTmEVebATo9KVBTwrgvDdG3EWzrngEHSv1sf08+ekAgWjyZ6zEGcYWIEZv r8cwcxel6HTw+p12Zfwms3X6aRbpwqlTrwsa2J2QjHvtVIh34hqXK2SwlWuukIS+NpZq mTG7crRydd3AhRAijbMQUxe53qlaWXLdwXzm9OcrEw8kjj5Y8WTOTfHu8JtKn8LMedof Ja5UKWJ3uOepYY8pEVH8/XYVRwLbjdkiUmI3O1iAVYRFDI0TVlpL69tYTjIvXpOTmM6k eKvg== X-Received: by 10.14.175.70 with SMTP id y46mr60646818eel.6.1360663966982; Tue, 12 Feb 2013 02:12:46 -0800 (PST) Received: from localhost (ip-94-112-98-141.net.upcbroadband.cz. [94.112.98.141]) by mx.google.com with ESMTPS id o3sm66968221eem.15.2013.02.12.02.12.45 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 12 Feb 2013 02:12:46 -0800 (PST) From: Jiri Pirko To: netdev@vger.kernel.org Cc: davem@davemloft.net, edumazet@google.com, jhs@mojatatu.com, kuznet@ms2.inr.ac.ru, j.vimal@gmail.com Subject: [patch net-next v5 11/11] act_police: remove <=mtu check for gso skbs Date: Tue, 12 Feb 2013 11:12:09 +0100 Message-Id: <1360663929-1023-12-git-send-email-jiri@resnulli.us> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1360663929-1023-1-git-send-email-jiri@resnulli.us> References: <1360663929-1023-1-git-send-email-jiri@resnulli.us> X-Gm-Message-State: ALoCoQleqQCk3xCg5G3rK1MWqOYf3YKHFgUrwtSchNS9958ggN4fUoYAoXJcwv4NN0kVgKKKiBsA Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This check made bigger packets incorrectly dropped. Remove this limitation for gso skbs. Signed-off-by: Jiri Pirko --- net/sched/act_police.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/sched/act_police.c b/net/sched/act_police.c index 823463a..2dba297 100644 --- a/net/sched/act_police.c +++ b/net/sched/act_police.c @@ -325,7 +325,7 @@ static int tcf_act_police(struct sk_buff *skb, const struct tc_action *a, return police->tcf_action; } - if (qdisc_pkt_len(skb) <= police->tcfp_mtu) { + if (qdisc_pkt_len(skb) <= police->tcfp_mtu || skb_is_gso(skb)) { if (!police->rate_present) { spin_unlock(&police->tcf_lock); return police->tcfp_result; @@ -336,7 +336,7 @@ static int tcf_act_police(struct sk_buff *skb, const struct tc_action *a, police->tcfp_burst); if (police->peak_present) { ptoks = toks + police->tcfp_ptoks; - if (ptoks > police->tcfp_mtu_ptoks) + if (ptoks > police->tcfp_mtu_ptoks && !skb_is_gso(skb)) ptoks = police->tcfp_mtu_ptoks; ptoks -= (s64) psched_l2t_ns(&police->peak, qdisc_pkt_len(skb));