From patchwork Mon Feb 22 13:21:44 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: 586164 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 B091D140BEB for ; Tue, 23 Feb 2016 00:22:15 +1100 (AEDT) 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=Yozg4OuZ; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754994AbcBVNWJ (ORCPT ); Mon, 22 Feb 2016 08:22:09 -0500 Received: from mail-io0-f170.google.com ([209.85.223.170]:33109 "EHLO mail-io0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754937AbcBVNWG (ORCPT ); Mon, 22 Feb 2016 08:22:06 -0500 Received: by mail-io0-f170.google.com with SMTP id z135so176665213iof.0 for ; Mon, 22 Feb 2016 05:22:04 -0800 (PST) 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=aJ/q716YEDHzYeJ+mUSc21zB8UhGWXaobbw1avHvDFw=; b=Yozg4OuZm9miWXBvzJvZcAQ+TGkrQxiRTfO+K2G5x4XWpyusTZwreVdgHuDABVM0ro AvIS583seOa3h7Efn1MTwItfLjvReJCJPjwyiu620MHWFhWQdigjyVwK4uJR7EMoWt1i ySDFVW1hfagq1hsUmTR/zqm6skHN4zM83dOdyOkd1cg5S6j5xG/jZpdPaBiAakqQGnd/ HFFBbF//Xsq5K/JR3cM+vbVMemK9vzJ15FycJVUOQYr5Lt4inSnBRd4ntDNPVvFyG/i0 nkAeaIf5MYG51MEqagKKWZiO70Ej5w0cbjhQv5xKmXn5JYW+9ywwEJFqFBiXRvpSTvlg YagA== 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=aJ/q716YEDHzYeJ+mUSc21zB8UhGWXaobbw1avHvDFw=; b=XJJtaKd8SIKf4syTIjQdxEDxF9yNL1pgPUcyiYHpJaCBS4nOwWnfsuvicsvB1hsOMW BKHnyHfbRz4dzDbiNu9Zm4iEr7ymKYbJDtHrNDlpG3nLSC9RklfetWYVz2XPiUUlm8Vo lp6DWomlxZG+qLvNkK6cm1tbq9B1P3gzBxX9GRI9YPrhEPZZ1lBsezbPbFiMzmlOPZ/n 54UFcT+Ge/jxVitZlT2VYGn+DEyzEWSo40Xfex6JguO0NVvPfidZse0GxtMK3zAIFtfE 4tWZTmn0AsqWOK6idCAg+kAO4zDhp3SmSPRwudGsVnp2AMgbtMrOmRrTh/bVNenJ5lH8 tWrw== X-Gm-Message-State: AG10YORI3ocsR2d+1WkNfcb4UP1d/eyzqgcBzksob0cTNmX0l78NQbIRQcUneYHh+PC22w== X-Received: by 10.107.39.135 with SMTP id n129mr28292260ion.153.1456147324071; Mon, 22 Feb 2016 05:22:04 -0800 (PST) Received: from jhs-UX303LB.lan ([23.233.30.50]) by smtp.gmail.com with ESMTPSA id qt3sm9219468igb.2.2016.02.22.05.22.03 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 22 Feb 2016 05:22:03 -0800 (PST) From: Jamal Hadi Salim X-Google-Original-From: Jamal Hadi Salim To: davem@davemloft.net Cc: netdev@vger.kernel.org, daniel@iogearbox.net, xiyou.wangcong@gmail.com, alexei.starovoitov@gmail.com, Jamal Hadi Salim Subject: [net-next PATCH 5/5] Support to encoding decoding skb queue map on IFE action Date: Mon, 22 Feb 2016 08:21:44 -0500 Message-Id: <1456147304-13355-6-git-send-email-jhs@emojatatu.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1456147304-13355-1-git-send-email-jhs@emojatatu.com> References: <1456147304-13355-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 hard code static value of 10 for qmap mark of 12 prio of 13 and hashid of 11 sudo tc filter add dev $ETH parent 1: protocol ip prio 10 \ u32 match ip protocol 1 0xff flowid 1:2 \ action ife encode \ type 0xDEAD \ use mark 12 \ use prio 13 \ use hashid 11 \ use qmap 10 \ dst 02:15:15:15:15:15 Note: as of the time of submission skbedit of queue map doesnt work (just in case you try to use it) Signed-off-by: Jamal Hadi Salim --- net/sched/Kconfig | 5 +++ net/sched/Makefile | 1 + net/sched/act_meta_qmap.c | 100 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 106 insertions(+) create mode 100644 net/sched/act_meta_qmap.c diff --git a/net/sched/Kconfig b/net/sched/Kconfig index 4c0c694..c25b192 100644 --- a/net/sched/Kconfig +++ b/net/sched/Kconfig @@ -766,6 +766,11 @@ config NET_IFE_SKBHASH depends on NET_ACT_IFE ---help--- +config NET_IFE_SKBQMAP + tristate "Support to encoding decoding skb queue_map on IFE action" + depends on NET_ACT_IFE + ---help--- + config NET_CLS_IND bool "Incoming device classification" depends on NET_CLS_U32 || NET_CLS_FW diff --git a/net/sched/Makefile b/net/sched/Makefile index 321a9bc..fa97501 100644 --- a/net/sched/Makefile +++ b/net/sched/Makefile @@ -23,6 +23,7 @@ obj-$(CONFIG_NET_ACT_IFE) += act_ife.o obj-$(CONFIG_NET_IFE_SKBMARK) += act_meta_mark.o obj-$(CONFIG_NET_IFE_SKBPRIO) += act_meta_skbprio.o obj-$(CONFIG_NET_IFE_SKBHASH) += act_meta_skbhash.o +obj-$(CONFIG_NET_IFE_SKBQMAP) += act_meta_qmap.o obj-$(CONFIG_NET_SCH_FIFO) += sch_fifo.o obj-$(CONFIG_NET_SCH_CBQ) += sch_cbq.o obj-$(CONFIG_NET_SCH_HTB) += sch_htb.o diff --git a/net/sched/act_meta_qmap.c b/net/sched/act_meta_qmap.c new file mode 100644 index 0000000..e5e8dbe --- /dev/null +++ b/net/sched/act_meta_qmap.c @@ -0,0 +1,100 @@ +/* + * net/sched/act_meta_qmap.c skb queue map encoder/decoder + * + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version + * 2 of the License, or (at your option) any later version. + * + * copyright Jamal Hadi Salim (2015) + * +*/ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include /*XXX*/ + +int skbqmap_check(struct sk_buff *skb, struct tcf_meta_info *e) +{ + //XXX: skb_get_queue_mapping()? + u32 ifeqmap = skb->queue_mapping; + + if (e->metaval) { + ifeqmap = *(u32 *)e->metaval; + } + + if (!ifeqmap) + return 0; + /* data + pad + LV = 2+2+4 */ + return 8; +} + +int skbqmap_encode(struct sk_buff *skb, void *skbdata, struct tcf_meta_info *e) +{ + /*(XXX: skb_get_queue_mapping()? */ + u16 ifeqmap = skb->queue_mapping; + + if (e->metaval) { + ifeqmap = *(u16 *)e->metaval; + } + + if (!ifeqmap) + return 0; + + ifeqmap = htons(ifeqmap); + + return tlv_meta_encode(skbdata, e->metaid, 2, &ifeqmap); +} + +int qmap_decode(struct sk_buff *skb, void *data, u16 len) +{ + u16 qm = *(u16 *) data; + + skb->queue_mapping = ntohs(qm); + return 0; +} + +static struct tcf_meta_ops ife_qmap_ops = { + .metaid = IFE_META_QMAP, + .metatype = NLA_U16, + .name = "skbqmap", + .synopsis = "skb queue map 16 bit metadata", + .check_presence = skbqmap_check, + .encode = skbqmap_encode, + .decode = qmap_decode, + .get = get_meta_u16, + .alloc = alloc_meta_u16, + .owner = THIS_MODULE, +}; + +static int __init ifeqmap_init_module(void) +{ + pr_emerg("Loaded IFE qmap\n"); + + return register_ife_op(&ife_qmap_ops); +} + +static void __exit ifeqmap_cleanup_module(void) +{ + pr_emerg("Unloaded IFE qmap\n"); + unregister_ife_op(&ife_qmap_ops); +} + +module_init(ifeqmap_init_module); +module_exit(ifeqmap_cleanup_module); + +MODULE_AUTHOR("Jamal Hadi Salim(2015)"); +MODULE_DESCRIPTION("Inter-FE skb qmap metadata action"); +MODULE_LICENSE("GPL"); +MODULE_ALIAS_IFE_META(IFE_META_QMAP);