From patchwork Sun May 8 17:26:31 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jamal Hadi Salim X-Patchwork-Id: 619678 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 3r2srh49yRz9t3f for ; Mon, 9 May 2016 03:27:00 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=mojatatu-com.20150623.gappssmtp.com header.i=@mojatatu-com.20150623.gappssmtp.com header.b=gpUhCPDb; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750993AbcEHR0v (ORCPT ); Sun, 8 May 2016 13:26:51 -0400 Received: from mail-io0-f196.google.com ([209.85.223.196]:33511 "EHLO mail-io0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750927AbcEHR0q (ORCPT ); Sun, 8 May 2016 13:26:46 -0400 Received: by mail-io0-f196.google.com with SMTP id x35so16899843ioi.0 for ; Sun, 08 May 2016 10:26:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mojatatu-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=cpe071RSbECX8N/rsvSn25+6PxVfb+TAVHaxH53hU9c=; b=gpUhCPDbDluJClNXkWWpxLEgph/spNgNtT/fA6rnWU51zNV9rrztu/yA8Q9/TiZkW3 cAn7Dpy9J+wsMGYspYv0L59kQz6ngrs5Tm337S0E04cHE4YpNtcgrmeMzpROdKkfqltF bJdg5S30aA4edgVj/1Xkg4P1A9Blr6Ogg+mGos/iuQy4gIDsxTjOTi8GRxRZ5crLqhIt zmudqbdwsJraxZMOUhH6+8JDc1WsDLDkNRaARnCKRmXzm6qhXTA29ZfLP7xd6zpcMkIY PKuriauMqUiEPUR7xc/Sq0UQcLPzXctD06CAMUuNf1kCU+KQ6jL2A5nbFqSp5rsfeYVA Kv2w== 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=cpe071RSbECX8N/rsvSn25+6PxVfb+TAVHaxH53hU9c=; b=ZJHUTT2tD++dmqVFD02TPlqidHzFKcwWPCJRQOTh4p7i5s3Uxc/+2AffeUFHD4cVZu FZBksWDnKNE7wGSWD5akDymoMMXiYFdAincrXxMiGQp0o0r9EULiew0fOgMF0rUvxUKK qpRhBOsRWk+Bx4lYZSpveisvRdSrYruKGRFVS40xHV/DJxkk5gQDwdw8EMANT8bZ9Xei A9N8pYiFJ0GpLQRzoVzUNtu60NamZh/osIJ6KW8OIlcLiCrwDvvuKGZqhgz8Kfsj8FV1 5CRHdJ98eR2HQi5hetugWvjLvaz0SCcYSAqvLqO5PEQwr1AdEZ40ROCcetbte6UboYaS shpw== X-Gm-Message-State: AOPr4FVVR+vkSEp5XOE587toYtcR5nHDmM6U3GnIgYgrRYmbZyeLDaNCuIguFhTZbRth5A== X-Received: by 10.107.9.74 with SMTP id j71mr34958863ioi.50.1462728405670; Sun, 08 May 2016 10:26:45 -0700 (PDT) Received: from localhost.localdomain ([23.233.30.50]) by smtp.gmail.com with ESMTPSA id r81sm11805221ioe.36.2016.05.08.10.26.44 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 08 May 2016 10:26:45 -0700 (PDT) From: Jamal Hadi Salim X-Google-Original-From: Jamal Hadi Salim To: davem@davemloft.net Cc: netdev@vger.kernel.org, Jamal Hadi Salim Subject: [net-next PATCH v2 5/6] net sched: skbedit action fix late binding Date: Sun, 8 May 2016 13:26:31 -0400 Message-Id: <1462728392-28489-6-git-send-email-jhs@emojatatu.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1462728392-28489-1-git-send-email-jhs@emojatatu.com> References: <1462728392-28489-1-git-send-email-jhs@emojatatu.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jamal Hadi Salim The process below was broken and is fixed with this patch. //add a skbedit action and give it an instance id of 1 sudo tc actions add action skbedit mark 10 index 1 //create a filter which binds to skbedit action id 1 sudo tc filter add dev $DEV parent ffff: protocol ip prio 1 u32\ match ip dst 17.0.0.1/32 flowid 1:10 action skbedit index 1 Message before fix was: RTNETLINK answers: Invalid argument We have an error talking to the kernel Signed-off-by: Jamal Hadi Salim --- net/sched/act_skbedit.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/net/sched/act_skbedit.c b/net/sched/act_skbedit.c index 51b2499..784b478 100644 --- a/net/sched/act_skbedit.c +++ b/net/sched/act_skbedit.c @@ -69,7 +69,7 @@ static int tcf_skbedit_init(struct net *net, struct nlattr *nla, struct tcf_skbedit *d; u32 flags = 0, *priority = NULL, *mark = NULL; u16 *queue_mapping = NULL; - int ret = 0, err; + int ret = 0, err, aexists = 0; if (nla == NULL) return -EINVAL; @@ -96,12 +96,22 @@ static int tcf_skbedit_init(struct net *net, struct nlattr *nla, mark = nla_data(tb[TCA_SKBEDIT_MARK]); } - if (!flags) - return -EINVAL; - parm = nla_data(tb[TCA_SKBEDIT_PARMS]); - if (!tcf_hash_check(tn, parm->index, a, bind)) { + aexists = tcf_hash_check(tn, parm->index, a, bind); + + /* if action exists and this is a late filter bind, no need + * to continue processing + */ + if (aexists && bind) + return 0; + + if (!flags) { + tcf_hash_release(a, bind); + return -EINVAL; + } + + if (!aexists) { ret = tcf_hash_create(tn, parm->index, est, a, sizeof(*d), bind, false); if (ret) @@ -111,8 +121,6 @@ static int tcf_skbedit_init(struct net *net, struct nlattr *nla, ret = ACT_P_CREATED; } else { d = to_skbedit(a); - if (bind) - return 0; tcf_hash_release(a, bind); if (!ovr) return -EEXIST;