diff --git a/iproute2-2.6.25-DCCP-redefine b/iproute2-2.6.25-DCCP-redefine new file mode 100644 index 0000000..ed41dbe --- /dev/null +++ b/iproute2-2.6.25-DCCP-redefine @@ -0,0 +1,14 @@ +Index: iproute2-2.6.25/ip/xfrm.h +=================================================================== +--- iproute2-2.6.25.orig/ip/xfrm.h ++++ iproute2-2.6.25/ip/xfrm.h +@@ -32,9 +32,6 @@ + #ifndef IPPROTO_SCTP + # define IPPROTO_SCTP 132 + #endif +-#ifndef IPPPROTO_DCCP +-# define IPPROTO_DCCP 33 +-#endif + #ifndef IPPROTO_MH + # define IPPROTO_MH 135 + #endif diff --git a/iproute2-m_skbedit.patch b/iproute2-m_skbedit.patch new file mode 100644 index 0000000..2991665 --- /dev/null +++ b/iproute2-m_skbedit.patch @@ -0,0 +1,281 @@ +IPROUTE: add support for skbedit action + +From: Alexander Duyck + +Add support for skbedit action. + Provides ability to edit queue_mapping field + Provides ability to edit priority field + +usage: action skbedit [queue_mapping QUEUE_MAPPING] [priority PRIORITY] + at least one option must be select, or both at the same time + +Signed-off-by: Alexander Duyck +--- + + include/linux/tc_act/tc_skbedit.h | 43 ++++++++ + tc/Makefile | 1 + tc/m_skbedit.c | 192 +++++++++++++++++++++++++++++++++++++ + 3 files changed, 236 insertions(+), 0 deletions(-) + create mode 100644 include/linux/tc_act/tc_skbedit.h + create mode 100644 tc/m_skbedit.c + + +diff --git a/include/linux/tc_act/tc_skbedit.h b/include/linux/tc_act/tc_skbedit.h +new file mode 100644 +index 0000000..98311f0 +--- /dev/null ++++ b/include/linux/tc_act/tc_skbedit.h +@@ -0,0 +1,43 @@ ++/* Copyright (c) 2008, Intel Corporation. ++ * ++ * This program is free software; you can redistribute it and/or modify it ++ * under the terms and conditions of the GNU General Public License, ++ * version 2, as published by the Free Software Foundation. ++ * ++ * This program is distributed in the hope it will be useful, but WITHOUT ++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or ++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for ++ * more details. ++ * ++ * You should have received a copy of the GNU General Public License along with ++ * this program; if not, write to the Free Software Foundation, Inc., 59 Temple ++ * Place - Suite 330, Boston, MA 02111-1307 USA. ++ * ++ * Author: Alexander Duyck ++ */ ++ ++#ifndef __LINUX_TC_SKBEDIT_H ++#define __LINUX_TC_SKBEDIT_H ++ ++#include ++ ++#define TCA_ACT_SKBEDIT 11 ++ ++#define SKBEDIT_F_PRIORITY 0x1 ++#define SKBEDIT_F_QUEUE_MAPPING 0x2 ++ ++struct tc_skbedit { ++ tc_gen; ++}; ++ ++enum { ++ TCA_SKBEDIT_UNSPEC, ++ TCA_SKBEDIT_TM, ++ TCA_SKBEDIT_PARMS, ++ TCA_SKBEDIT_PRIORITY, ++ TCA_SKBEDIT_QUEUE_MAPPING, ++ __TCA_SKBEDIT_MAX ++}; ++#define TCA_SKBEDIT_MAX (__TCA_SKBEDIT_MAX - 1) ++ ++#endif +diff --git a/tc/Makefile b/tc/Makefile +index 4116983..1b4169d 100644 +--- a/tc/Makefile ++++ b/tc/Makefile +@@ -30,6 +30,7 @@ TCMODULES += m_mirred.o + TCMODULES += m_ipt.o + TCMODULES += m_nat.o + TCMODULES += m_pedit.o ++TCMODULES += m_skbedit.o + TCMODULES += p_ip.o + TCMODULES += p_icmp.o + TCMODULES += p_tcp.o +diff --git a/tc/m_skbedit.c b/tc/m_skbedit.c +new file mode 100644 +index 0000000..55e3f89 +--- /dev/null ++++ b/tc/m_skbedit.c +@@ -0,0 +1,192 @@ ++/* ++ * m_skbedit.c SKB Editing module ++ * ++ * Copyright (c) 2008, Intel Corporation. ++ * ++ * This program is free software; you can redistribute it and/or modify it ++ * under the terms and conditions of the GNU General Public License, ++ * version 2, as published by the Free Software Foundation. ++ * ++ * This program is distributed in the hope it will be useful, but WITHOUT ++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or ++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for ++ * more details. ++ * ++ * You should have received a copy of the GNU General Public License along with ++ * this program; if not, write to the Free Software Foundation, Inc., 59 Temple ++ * Place - Suite 330, Boston, MA 02111-1307 USA. ++ * ++ * Authors: Alexander Duyck ++ * ++ */ ++ ++#include ++#include ++#include ++#include ++#include "utils.h" ++#include "tc_util.h" ++#include ++ ++static void ++explain(void) ++{ ++ fprintf(stderr, "Usage: ... skbedit " ++ "queue_mapping QUEUE_MAPPING | priority PRIORITY \n" ++ "QUEUE_MAPPING = device transmit queue to use\n" ++ "PRIORITY = classID to assign to priority field\n"); ++} ++ ++static void ++usage(void) ++{ ++ explain(); ++ exit(-1); ++} ++ ++static int ++parse_skbedit(struct action_util *a, int *argc_p, char ***argv_p, int tca_id, ++ struct nlmsghdr *n) ++{ ++ struct tc_skbedit sel; ++ int argc = *argc_p; ++ char **argv = *argv_p; ++ int ok = 0; ++ struct rtattr *tail; ++ unsigned int tmp; ++ __u16 queue_mapping; ++ __u32 flags = 0, priority; ++ ++ if (matches(*argv, "skbedit") != 0) ++ return -1; ++ ++ NEXT_ARG(); ++ ++ while (argc > 0) { ++ if (matches(*argv, "queue_mapping") == 0) { ++ flags |= SKBEDIT_F_QUEUE_MAPPING; ++ NEXT_ARG(); ++ if (get_unsigned(&tmp, *argv, 10) || tmp > 65535) { ++ fprintf(stderr, "Illegal queue_mapping\n"); ++ return -1; ++ } ++ queue_mapping = tmp; ++ ok++; ++ } else if (matches(*argv, "priority") == 0) { ++ flags |= SKBEDIT_F_PRIORITY; ++ NEXT_ARG(); ++ if (get_tc_classid(&priority, *argv)) { ++ fprintf(stderr, "Illegal priority\n"); ++ return -1; ++ } ++ ok++; ++ } else if (matches(*argv, "help") == 0) { ++ usage(); ++ } else { ++ break; ++ } ++ argc--; ++ argv++; ++ } ++ ++ if (argc) { ++ if (matches(*argv, "reclassify") == 0) { ++ sel.action = TC_ACT_RECLASSIFY; ++ NEXT_ARG(); ++ } else if (matches(*argv, "pipe") == 0) { ++ sel.action = TC_ACT_PIPE; ++ NEXT_ARG(); ++ } else if (matches(*argv, "drop") == 0 || ++ matches(*argv, "shot") == 0) { ++ sel.action = TC_ACT_SHOT; ++ NEXT_ARG(); ++ } else if (matches(*argv, "continue") == 0) { ++ sel.action = TC_ACT_UNSPEC; ++ NEXT_ARG(); ++ } else if (matches(*argv, "pass") == 0) { ++ sel.action = TC_ACT_OK; ++ NEXT_ARG(); ++ } ++ } ++ ++ if (argc) { ++ if (matches(*argv, "index") == 0) { ++ NEXT_ARG(); ++ if (get_u32(&sel.index, *argv, 10)) { ++ fprintf(stderr, "Pedit: Illegal \"index\"\n"); ++ return -1; ++ } ++ argc--; ++ argv++; ++ ok++; ++ } ++ } ++ ++ if (!ok) { ++ explain(); ++ return -1; ++ } ++ ++ ++ tail = NLMSG_TAIL(n); ++ addattr_l(n, MAX_MSG, tca_id, NULL, 0); ++ addattr_l(n, MAX_MSG, TCA_SKBEDIT_PARMS, &sel, sizeof(sel)); ++ if (flags & SKBEDIT_F_QUEUE_MAPPING) ++ addattr_l(n, MAX_MSG, TCA_SKBEDIT_QUEUE_MAPPING, ++ &queue_mapping, sizeof(queue_mapping)); ++ if (flags & SKBEDIT_F_PRIORITY) ++ addattr_l(n, MAX_MSG, TCA_SKBEDIT_PRIORITY, ++ &priority, sizeof(priority)); ++ tail->rta_len = (char *)NLMSG_TAIL(n) - (char *)tail; ++ ++ *argc_p = argc; ++ *argv_p = argv; ++ return 0; ++} ++ ++static int print_skbedit(struct action_util *au, FILE *f, struct rtattr *arg) ++{ ++ struct tc_skbedit *sel; ++ struct rtattr *tb[TCA_SKBEDIT_MAX + 1]; ++ SPRINT_BUF(b1); ++ __u32 *priority; ++ __u16 *queue_mapping; ++ ++ if (arg == NULL) ++ return -1; ++ ++ parse_rtattr_nested(tb, TCA_SKBEDIT_MAX, arg); ++ ++ if (tb[TCA_SKBEDIT_PARMS] == NULL) { ++ fprintf(f, "[NULL skbedit parameters]"); ++ return -1; ++ } ++ ++ sel = RTA_DATA(tb[TCA_SKBEDIT_PARMS]); ++ ++ fprintf(f, " skbedit"); ++ ++ if (tb[TCA_SKBEDIT_QUEUE_MAPPING] != NULL) { ++ queue_mapping = RTA_DATA(tb[TCA_SKBEDIT_QUEUE_MAPPING]); ++ fprintf(f, " queue_mapping %u", *queue_mapping); ++ } ++ if (tb[TCA_SKBEDIT_PRIORITY] != NULL) { ++ priority = RTA_DATA(tb[TCA_SKBEDIT_PRIORITY]); ++ fprintf(f, " priority %s", sprint_tc_classid(*priority, b1)); ++ } ++ ++ if (show_stats) { ++ if (tb[TCA_SKBEDIT_TM]) { ++ struct tcf_t *tm = RTA_DATA(tb[TCA_SKBEDIT_TM]); ++ print_tm(f, tm); ++ } ++ } ++ ++ return 0; ++} ++ ++struct action_util skbedit_action_util = { ++ .id = "skbedit", ++ .parse_aopt = parse_skbedit, ++ .print_aopt = print_skbedit, ++}; diff --git a/iproute2-q_multiq.patch b/iproute2-q_multiq.patch new file mode 100644 index 0000000..bd326d7 --- /dev/null +++ b/iproute2-q_multiq.patch @@ -0,0 +1,142 @@ +IPROUTE: add support for multiq qdisc + +From: Alexander Duyck + +Add support for multiq qdisc + This patch adds the ability to configure the multiq qdisc. Since the qdisc does not require any input it will pull the number of bands directly from the device that it is added to the root of. + +usage: tc qdisc add dev root handle multiq + +Signed-off-by: Alexander Duyck +--- + + include/linux/pkt_sched.h | 7 ++++ + tc/Makefile | 1 + + tc/q_multiq.c | 87 +++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 95 insertions(+), 0 deletions(-) + create mode 100644 tc/q_multiq.c + + +diff --git a/include/linux/pkt_sched.h b/include/linux/pkt_sched.h +index dbb7ac3..3b0e633 100644 +--- a/include/linux/pkt_sched.h ++++ b/include/linux/pkt_sched.h +@@ -112,6 +112,13 @@ enum + + #define TCA_PRIO_MAX (__TCA_PRIO_MAX - 1) + ++/* MULTIQ section */ ++ ++struct tc_multiq_qopt { ++ __u16 bands; /* Number of bands */ ++ __u16 max_bands; /* Maximum number of queues */ ++}; ++ + /* TBF section */ + + struct tc_tbf_qopt +diff --git a/tc/Makefile b/tc/Makefile +index 1b4169d..743a946 100644 +--- a/tc/Makefile ++++ b/tc/Makefile +@@ -12,6 +12,7 @@ TCMODULES += q_prio.o + TCMODULES += q_tbf.o + TCMODULES += q_cbq.o + TCMODULES += q_rr.o ++TCMODULES += q_multiq.o + TCMODULES += q_netem.o + TCMODULES += f_rsvp.o + TCMODULES += f_u32.o +diff --git a/tc/q_multiq.c b/tc/q_multiq.c +new file mode 100644 +index 0000000..d3f6188 +--- /dev/null ++++ b/tc/q_multiq.c +@@ -0,0 +1,87 @@ ++/* ++ * q_multiq.c Multiqueue aware qdisc ++ * ++ * Copyright (c) 2008, Intel Corporation. ++ * ++ * This program is free software; you can redistribute it and/or modify it ++ * under the terms and conditions of the GNU General Public License, ++ * version 2, as published by the Free Software Foundation. ++ * ++ * This program is distributed in the hope it will be useful, but WITHOUT ++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or ++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for ++ * more details. ++ * ++ * You should have received a copy of the GNU General Public License along with ++ * this program; if not, write to the Free Software Foundation, Inc., 59 Temple ++ * Place - Suite 330, Boston, MA 02111-1307 USA. ++ * ++ * Author: Alexander Duyck ++ * ++ * Original Authors: PJ Waskiewicz, (RR) ++ * Alexey Kuznetsov, (from PRIO) ++ * ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include "utils.h" ++#include "tc_util.h" ++ ++static void explain(void) ++{ ++ fprintf(stderr, "Usage: ... multiq [help]\n"); ++} ++ ++#define usage() return(-1) ++ ++static int multiq_parse_opt(struct qdisc_util *qu, int argc, char **argv, ++ struct nlmsghdr *n) ++{ ++ struct tc_multiq_qopt opt; ++ ++ if (argc > 0) { ++ if (strcmp(*argv, "help") == 0) { ++ explain(); ++ return -1; ++ } else { ++ fprintf(stderr, "What is \"%s\"?\n", *argv); ++ explain(); ++ return -1; ++ } ++ argc--; argv++; ++ } ++ ++ addattr_l(n, 1024, TCA_OPTIONS, &opt, sizeof(opt)); ++ return 0; ++} ++ ++int multiq_print_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt) ++{ ++ struct tc_multiq_qopt *qopt; ++ ++ if (opt == NULL) ++ return 0; ++ if (RTA_PAYLOAD(opt) < sizeof(*qopt)) ++ return 0; ++ ++ qopt = RTA_DATA(opt); ++ ++ fprintf(f, "bands %u/%u ", qopt->bands, qopt->max_bands); ++ ++ return 0; ++} ++ ++struct qdisc_util multiq_qdisc_util = { ++ .id = "multiq", ++ .parse_qopt = multiq_parse_opt, ++ .print_qopt = multiq_print_opt, ++}; diff --git a/iproute2.changes b/iproute2.changes index 08eb770..e73a5ec 100644 --- a/iproute2.changes +++ b/iproute2.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Thu Sep 18 09:46:42 CEST 2008 - hare@suse.de + +- Add skbedit support for FCoE (FATE#303914) +- Add multiqueue support for FCoE (FATE#303914) +- Rename libnl to libnetlink-devel +- Fix IPPROTO_DCCP redefine +- rpmlint fixes + ------------------------------------------------------------------- Mon Jul 14 14:33:38 CEST 2008 - ms@suse.de diff --git a/iproute2.spec b/iproute2.spec index dddfd94..fadd3c5 100644 --- a/iproute2.spec +++ b/iproute2.spec @@ -2,9 +2,16 @@ # spec file for package iproute2 (Version 2.6.25) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -12,13 +19,13 @@ Name: iproute2 -BuildRequires: bison db-devel flex ghostscript-fonts-std ghostscript-x11 glib libpng-devel libtiff-devel sgmltool texlive-latex xorg-x11-devel +BuildRequires: bison db-devel flex ghostscript-fonts-std ghostscript-x11 libpng-devel libtiff-devel sgmltool texlive-latex xorg-x11-devel License: GPL v2 or later Group: Productivity/Networking/Routing Provides: iproute AutoReqProv: on Version: 2.6.25 -Release: 2 +Release: 40 Summary: Advanced Routing Url: http://developer.osdl.org/dev/iproute2/ Source0: %name-%version.tar.bz2 @@ -29,15 +36,18 @@ Patch3: %name-2.6.25-tc-flex-fixes.diff Patch4: %name-2.6.25-resolve-address.diff Patch5: %name-2.6.25-fragtimeout.diff Patch6: %name-2.6.25-flushcheckuid.diff +Patch7: %name-m_skbedit.patch +Patch8: %name-q_multiq.patch +Patch9: %name-2.6.25-DCCP-redefine BuildRoot: %{_tmppath}/%{name}-%{version}-build -%package -n libnlink +%package -n libnetlink-devel License: GPL v2 or later Summary: A Higher Level Interface to the Netlink Service -Group: System/Libraries +Group: Development/Libraries/C and C++ Provides: libnetlink -%description -n libnlink +%description -n libnetlink-devel libnetlink provides a higher level interface to rtnetlink(7). @@ -64,19 +74,22 @@ Authors: %patch4 %patch5 %patch6 +%patch7 -p1 +%patch8 -p1 +%patch9 -p1 find . -name *.orig -print0 | xargs -r0 rm -v %build # build with -fPIC. For details see # https://bugzilla.novell.com/show_bug.cgi?id=388021 -make CCOPTS="-D_GNU_SOURCE $RPM_OPT_FLAGS -Wstrict-prototypes -fPIC" +make LIBDIR=/usr/share CCOPTS="-D_GNU_SOURCE $RPM_OPT_FLAGS -Wstrict-prototypes -fPIC" cd doc make pdf %install install -d $RPM_BUILD_ROOT/{etc/,sbin/,usr/{sbin,share/man/man{3,8}}} -install -d $RPM_BUILD_ROOT/{/usr/include,%_libdir} -make install DESTDIR=$RPM_BUILD_ROOT +install -d $RPM_BUILD_ROOT/{/usr/include,%_libdir,/usr/share} +make install DESTDIR=$RPM_BUILD_ROOT LIBDIR=/usr/share install lib/libnetlink.a $RPM_BUILD_ROOT/%_libdir install include/libnetlink.h $RPM_BUILD_ROOT/usr/include mv $RPM_BUILD_ROOT/usr/sbin/ip $RPM_BUILD_ROOT/sbin @@ -104,15 +117,22 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) /etc/iproute2/rt_realms %config(noreplace) /etc/iproute2/rt_tables %config(noreplace) /etc/iproute2/ematch_map -/usr/lib/tc +%dir /usr/share/tc +%attr(644,root,root)/usr/share/tc/* -%files -n libnlink -%defattr(-,root,root) -%attr(644,root,root) /usr/include/* +%files -n libnetlink-devel +%defattr(644,root,root) +/usr/include/* %_mandir/man3/libnetlink* %_libdir/lib* %changelog +* Thu Sep 18 2008 hare@suse.de +- Add skbedit support for FCoE (FATE#303914) +- Add multiqueue support for FCoE (FATE#303914) +- Rename libnl to libnetlink-devel +- Fix IPPROTO_DCCP redefine +- rpmlint fixes * Mon Jul 14 2008 ms@suse.de - update to version 2.6.25 * Fix off by one in nested attribute management.