From patchwork Wed Dec 13 15:13:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Pirko X-Patchwork-Id: 848015 X-Patchwork-Delegate: dsahern@gmail.com Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=resnulli-us.20150623.gappssmtp.com header.i=@resnulli-us.20150623.gappssmtp.com header.b="VzmyzXjb"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yxgFt0n4Dz9s81 for ; Thu, 14 Dec 2017 02:14:10 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753139AbdLMPOH (ORCPT ); Wed, 13 Dec 2017 10:14:07 -0500 Received: from mail-wm0-f66.google.com ([74.125.82.66]:37864 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753298AbdLMPOA (ORCPT ); Wed, 13 Dec 2017 10:14:00 -0500 Received: by mail-wm0-f66.google.com with SMTP id f140so5784289wmd.2 for ; Wed, 13 Dec 2017 07:14:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=resnulli-us.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=0T+gwT2cXxb/pHaENpFx4NJoakD2Vc0eLG2alJ547/E=; b=VzmyzXjb8ISXJhNbEOuZJc5obYL5douX7XBp6nkKSb+V3TUMOwlxmZUXabTzKmZpym U76SUr3k0r5EgVeP8cv2MRIMLYGzD7MgdXel1eZKDFaXT8396YHCDd3eg2//hbY3O6oX I8xGuOklwHY+DK4QYq64yR4ZUBVRyVPeFhVWEOdOKmBerBU64z2DH0Qadzh9MIjpQLKd 5gQPO5Ve3oR4RqebYzjwfcRadbt6rGLKzCQRVMm8iPpdK6z2Cua+Eh/JF3RwQS/GgVKm IGs1Qdld8hU9X5GFAbf+QWCZx4SruDxv2wGVTJnazt60pjyp6MDlfcT2MVvgcymeP8e2 ZLqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=0T+gwT2cXxb/pHaENpFx4NJoakD2Vc0eLG2alJ547/E=; b=KeWa8PltCTUVbHh5x53GE1OBzJ4EOk4lZDdBiKRUoAZJBuyFyoXDHR9a9BE6azHWFd UD1+Wa0isyfTqiN9H1RpZbqNvvnvGX9jlKPQ5rUax0nT5ROHXhWSugtDsM7ColrHpp2F VSnalQX6yO7QWEYMNRJBWRisrlwJMWARfUxAbMLOy6kbEI908n5zr2HYdo3yIPpykdCg BqPixB05asGL55JefJf8NJGh9A4h5tY3PZ7HYMELB0R/U3DQ9OKM36VEafvPsMKXVGhR 13sLF/mZG2O2q7GSH3AVPfPFYyCkbqBDJqyEabS0q7TWBLhC5FwKaGCRF8TMfY5NnAYV dxsg== X-Gm-Message-State: AKGB3mLQlLIo9oc0JoxQ2AZzjz7HhiMF4uJ7lvLgZAxQj0BQ0Qpw04pj /GhaAkwdVeWkCJ3A8SoFbDPT20od X-Google-Smtp-Source: ACJfBov7WWFpjD3SGbYs95xgBIL5Ah5VkNJZVI18XyMXdBAqIO6ACpu1c0tK8GSwntcjXDhsPSJvpw== X-Received: by 10.28.231.25 with SMTP id e25mr2470538wmh.139.1513178038803; Wed, 13 Dec 2017 07:13:58 -0800 (PST) Received: from localhost (f190.dkm.cz. [62.24.70.190]) by smtp.gmail.com with ESMTPSA id l142sm2879194wmb.43.2017.12.13.07.13.57 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 13 Dec 2017 07:13:57 -0800 (PST) From: Jiri Pirko To: netdev@vger.kernel.org Cc: davem@davemloft.net, jhs@mojatatu.com, xiyou.wangcong@gmail.com, mlxsw@mellanox.com, andrew@lunn.ch, vivien.didelot@savoirfairelinux.com, f.fainelli@gmail.com, michael.chan@broadcom.com, ganeshgr@chelsio.com, saeedm@mellanox.com, matanb@mellanox.com, leonro@mellanox.com, idosch@mellanox.com, jakub.kicinski@netronome.com, simon.horman@netronome.com, pieter.jansenvanvuuren@netronome.com, john.hurley@netronome.com, alexander.h.duyck@intel.com, ogerlitz@mellanox.com, john.fastabend@gmail.com, daniel@iogearbox.net Subject: [patch iproute2] tc: implement filter block sharing to ingress and clsact qdiscs Date: Wed, 13 Dec 2017 16:13:57 +0100 Message-Id: <20171213151357.29822-1-jiri@resnulli.us> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20171213151038.29665-1-jiri@resnulli.us> References: <20171213151038.29665-1-jiri@resnulli.us> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jiri Pirko Signed-off-by: Jiri Pirko --- include/uapi/linux/pkt_sched.h | 11 +++++++++ tc/q_clsact.c | 56 ++++++++++++++++++++++++++++++++++++++---- tc/q_ingress.c | 32 +++++++++++++++++++++--- 3 files changed, 91 insertions(+), 8 deletions(-) diff --git a/include/uapi/linux/pkt_sched.h b/include/uapi/linux/pkt_sched.h index af3cc2f..0feee36 100644 --- a/include/uapi/linux/pkt_sched.h +++ b/include/uapi/linux/pkt_sched.h @@ -935,4 +935,15 @@ enum { #define TCA_CBS_MAX (__TCA_CBS_MAX - 1) +/* Ingress/clsact */ + +enum { + TCA_CLSACT_UNSPEC, + TCA_CLSACT_INGRESS_BLOCK, + TCA_CLSACT_EGRESS_BLOCK, + __TCA_CLSACT_MAX +}; + +#define TCA_CLSACT_MAX (__TCA_CLSACT_MAX - 1) + #endif diff --git a/tc/q_clsact.c b/tc/q_clsact.c index 341f653..06d67db 100644 --- a/tc/q_clsact.c +++ b/tc/q_clsact.c @@ -7,23 +7,69 @@ static void explain(void) { - fprintf(stderr, "Usage: ... clsact\n"); + fprintf(stderr, "Usage: ... clsact [ingress_block BLOCK_INDEX] [egress_block BLOCK_INDEX]\n"); } static int clsact_parse_opt(struct qdisc_util *qu, int argc, char **argv, struct nlmsghdr *n, const char *dev) { - if (argc > 0) { - fprintf(stderr, "What is \"%s\"?\n", *argv); - explain(); - return -1; + struct rtattr *tail; + unsigned int ingress_block = 0; + unsigned int egress_block = 0; + + while (argc > 0) { + if (strcmp(*argv, "ingress_block") == 0) { + NEXT_ARG(); + if (get_unsigned(&ingress_block, *argv, 0)) { + fprintf(stderr, "Illegal \"ingress_block\"\n"); + return -1; + } + } else if (strcmp(*argv, "egress_block") == 0) { + NEXT_ARG(); + if (get_unsigned(&egress_block, *argv, 0)) { + fprintf(stderr, "Illegal \"egress_block\"\n"); + return -1; + } + } else { + fprintf(stderr, "What is \"%s\"?\n", *argv); + explain(); + return -1; + } + NEXT_ARG_FWD(); } + tail = NLMSG_TAIL(n); + addattr_l(n, 1024, TCA_OPTIONS, NULL, 0); + if (ingress_block) + addattr32(n, 1024, TCA_CLSACT_INGRESS_BLOCK, ingress_block); + if (egress_block) + addattr32(n, 1024, TCA_CLSACT_EGRESS_BLOCK, egress_block); + tail->rta_len = (void *) NLMSG_TAIL(n) - (void *) tail; return 0; } static int clsact_print_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt) { + struct rtattr *tb[TCA_CLSACT_MAX + 1]; + unsigned int block; + + if (!opt) + return 0; + + parse_rtattr_nested(tb, TCA_CLSACT_MAX, opt); + + if (tb[TCA_CLSACT_INGRESS_BLOCK] && + RTA_PAYLOAD(tb[TCA_CLSACT_INGRESS_BLOCK]) >= sizeof(__u32)) { + block = rta_getattr_u32(tb[TCA_CLSACT_INGRESS_BLOCK]); + print_uint(PRINT_ANY, "ingress_block", + "ingress_block %u ", block); + } + if (tb[TCA_CLSACT_EGRESS_BLOCK] && + RTA_PAYLOAD(tb[TCA_CLSACT_EGRESS_BLOCK]) >= sizeof(__u32)) { + block = rta_getattr_u32(tb[TCA_CLSACT_EGRESS_BLOCK]); + print_uint(PRINT_ANY, "egress_block", + "egress_block %u ", block); + } return 0; } diff --git a/tc/q_ingress.c b/tc/q_ingress.c index 1e42229..6899c4d 100644 --- a/tc/q_ingress.c +++ b/tc/q_ingress.c @@ -17,30 +17,56 @@ static void explain(void) { - fprintf(stderr, "Usage: ... ingress\n"); + fprintf(stderr, "Usage: ... ingress [block BLOCK_INDEX]\n"); } static int ingress_parse_opt(struct qdisc_util *qu, int argc, char **argv, struct nlmsghdr *n, const char *dev) { + struct rtattr *tail; + unsigned int block; + while (argc > 0) { if (strcmp(*argv, "handle") == 0) { NEXT_ARG(); - argc--; argv++; + } else if (strcmp(*argv, "block") == 0) { + NEXT_ARG(); + if (get_unsigned(&block, *argv, 0)) { + fprintf(stderr, "Illegal \"block\"\n"); + return -1; + } } else { fprintf(stderr, "What is \"%s\"?\n", *argv); explain(); return -1; } + NEXT_ARG_FWD(); } + tail = NLMSG_TAIL(n); + addattr_l(n, 1024, TCA_OPTIONS, NULL, 0); + if (block) + addattr32(n, 1024, TCA_CLSACT_INGRESS_BLOCK, block); + tail->rta_len = (void *) NLMSG_TAIL(n) - (void *) tail; return 0; } static int ingress_print_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt) { - fprintf(f, "---------------- "); + struct rtattr *tb[TCA_CLSACT_MAX + 1]; + unsigned int block; + + if (!opt) + return 0; + + parse_rtattr_nested(tb, TCA_CLSACT_MAX, opt); + + if (tb[TCA_CLSACT_INGRESS_BLOCK] && + RTA_PAYLOAD(tb[TCA_CLSACT_INGRESS_BLOCK]) >= sizeof(__u32)) { + block = rta_getattr_u32(tb[TCA_CLSACT_INGRESS_BLOCK]); + print_uint(PRINT_ANY, "block", "block %u ", block); + } return 0; }