John Fastabend
b8970f0bfc
net_sched: implement a root container qdisc sch_mqprio ...
This implements a mqprio queueing discipline that by default creates
a pfifo_fast qdisc per tx queue and provides the needed configuration
interface.
Using the mqprio qdisc the number of tcs currently in use along
with the range of queues alloted to each class can be configured. By
default skbs are mapped to traffic classes using the skb priority.
This mapping is configurable.
Configurable parameters,
struct tc_mqprio_qopt {
__u8 num_tc;
__u8 prio_tc_map[TC_BITMASK + 1];
__u8 hw;
__u16 count[TC_MAX_QUEUE];
__u16 offset[TC_MAX_QUEUE];
};
Here the count/offset pairing give the queue alignment and the
prio_tc_map gives the mapping from skb->priority to tc.
The hw bit determines if the hardware should configure the count
and offset values. If the hardware bit is set then the operation
will fail if the hardware does not implement the ndo_setup_tc
operation. This is to avoid undetermined states where the hardware
may or may not control the queue mapping. Also minimal bounds
checking is done on the count/offset to verify a queue does not
exceed num_tx_queues and that queue ranges do not overlap. Otherwise
it is left to user policy or hardware configuration to create
useful mappings.
It is expected that hardware QOS schemes can be implemented by
creating appropriate mappings of queues in ndo_tc_setup().
One expected use case is drivers will use the ndo_setup_tc to map
queue ranges onto 802.1Q traffic classes. This provides a generic
mechanism to map network traffic onto these traffic classes and
removes the need for lower layer drivers to know specifics about
traffic types.
Signed-off-by: John Fastabend <john.r.fastabend@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2011-01-19 23:31:11 -08:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
2011-01-17 10:54:41 -08:00
net/ceph: make ceph_msgr_wq non-reentrant
2011-01-12 15:15:14 -08:00
decompressors: remove unused constant from inflate.h
2011-01-13 08:03:25 -08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2011-01-13 09:58:14 -08:00
mfd: ab8500-core chip version cut 2.0 support
2011-01-14 12:38:18 +01:00
IB/mlx4: Handle protocol field in multicast table
2011-01-12 14:49:17 -08:00
Merge branch 'sh/sdio' into sh-latest
2011-01-12 14:37:42 +09:00
NFC: Driver for NXP Semiconductors PN544 NFC chip.
2011-01-13 08:03:19 -08:00
nfsd: don't support msnfs export option
2011-01-13 21:04:07 -05:00
power_supply: Add MAX17042 Fuel Gauge Driver
2011-01-14 18:11:59 +03:00
regulator: Add initial per-regulator debugfs support
2011-01-12 14:33:05 +00:00
Merge branch 'for-2.6.38' of git://linux-nfs.org/~bfields/linux
2011-01-14 13:17:26 -08:00
include/linux/unaligned/packed_struct.h: use __packed
2011-01-13 08:03:08 -08:00
ACPI / PM: Fix build problems for !CONFIG_ACPI related to NVS rework
2011-01-12 16:11:30 -05:00
autofs4: Bump version
2011-01-15 20:07:45 -05:00
binfmt_elf: cleanups
2011-01-13 08:03:12 -08:00
Merge branch 'for-2.6.38/core' of git://git.kernel.dk/linux-2.6-block
2011-01-13 10:45:01 -08:00
fs/char_dev.c: remove unused cdev_index()
2011-01-13 08:03:17 -08:00
thp: use compaction in kswapd for GFP_ATOMIC order > 0
2011-01-13 17:32:46 -08:00
cpuidle: CPUIDLE_FLAG_CHECK_BM is omap3_idle specific
2011-01-12 12:47:34 -05:00
cramfs: hide function prototypes behind __KERNEL__ macro
2011-01-13 08:03:22 -08:00
drivers/staging/olpc_dcon: convert to new cs5535 gpio API
2011-01-13 08:03:13 -08:00
Allow d_manage() to be used in RCU-walk mode
2011-01-15 20:07:47 -05:00
dm: per target unplug callback support
2011-01-13 20:00:02 +00:00
Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
2011-01-10 16:10:33 -08:00
dm: use non reentrant workqueues if equivalent
2011-01-13 19:59:58 +00:00
dm log userspace: add version number to comms
2011-01-13 19:59:52 +00:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
2011-01-17 10:54:41 -08:00
etherdevice.h: Add is_unicast_ether_addr function
2011-01-13 21:49:56 -08:00
fs: add hole punching to fallocate
2011-01-12 20:16:43 -05:00
Add an AT_NO_AUTOMOUNT flag to suppress terminal automount
2011-01-15 20:07:33 -05:00
fs: Remove unlikely() from fput_light()
2011-01-17 03:26:26 -05:00
fs: fix address space warnings in ioctl_fiemap()
2011-01-17 08:21:42 -05:00
Merge branch 'for-2.6.38/event-handling' into for-2.6.38/core
2011-01-13 14:47:54 +01:00
thp: add numa awareness to hugepage allocations
2011-01-13 17:32:45 -08:00
include/gpio.h: remove remaining __must_check-annotiations
2011-01-14 08:06:39 -08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
2011-01-13 09:58:38 -08:00
thp: add compound_trans_head() helper
2011-01-13 17:32:48 -08:00
ieee80211: correct IEEE80211_ADDBA_PARAM_BUF_SIZE_MASK macro
2011-01-13 15:46:45 -05:00
netfilter: ebtables: make broute table work again
2011-01-11 23:55:51 +01:00
net_device: add support for network device groups
2011-01-19 23:31:09 -08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2011-01-13 09:58:14 -08:00
irq: use per_cpu kstat_irqs
2011-01-13 17:32:31 -08:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
2011-01-13 10:25:58 -08:00
mm: vmscan: reclaim order-0 and use compaction instead of lumpy reclaim
2011-01-13 17:32:33 -08:00
irq: use per_cpu kstat_irqs
2011-01-13 17:32:31 -08:00
thp: madvise(MADV_NOHUGEPAGE)
2011-01-13 17:32:47 -08:00
kmsg_dump: add kmsg_dump() calls to the reboot, halt, poweroff and emergency_restart paths
2011-01-13 08:03:07 -08:00
KVM: Add PV MSR to enable asynchronous page faults delivery.
2011-01-12 11:23:12 +02:00
KVM: Fix build error on s390 due to missing tlbs_dirty
2011-01-12 11:30:50 +02:00
KVM: Add memory slot versioning and use it to provide fast guest write interface
2011-01-12 11:23:08 +02:00
leds-lp5521: modify the way of setting led device name
2011-01-13 08:03:06 -08:00
leds: leds-lp5523: modify the way of setting led device name
2011-01-13 08:03:05 -08:00
kernel: fix hlist_bl again
2011-01-14 13:12:45 +00:00
ecryptfs: moved ECRYPTFS_SUPER_MAGIC definition to linux/magic.h
2011-01-17 10:44:31 -06:00
memcg: fix memory migration of shmem swapcache
2011-01-13 17:32:51 -08:00
Merge branch 'slub/hotplug' into slab/urgent
2011-01-15 13:28:17 +02:00
mm: migration: cleanup migrate_pages API by matching types for offlining and sync
2011-01-13 17:32:34 -08:00
thp: madvise(MADV_NOHUGEPAGE)
2011-01-13 17:32:47 -08:00
thp: fix anon memory statistics with transparent hugepages
2011-01-13 17:32:46 -08:00
thp: add pmd_huge_pte to mm_struct
2011-01-13 17:32:41 -08:00
thp: mmu_notifier_test_young
2011-01-13 17:32:46 -08:00
thp: transparent hugepage vmstat
2011-01-13 17:32:43 -08:00
sanitize vfsmount refcounting changes
2011-01-16 13:47:07 -05:00
Add an AT_NO_AUTOMOUNT flag to suppress terminal automount
2011-01-15 20:07:33 -05:00
move internal-only parts of ncpfs headers to fs/ncpfs
2011-01-12 20:03:43 -05:00
move internal-only parts of ncpfs headers to fs/ncpfs
2011-01-12 20:03:43 -05:00
net: implement mechanism for HW based QOS
2011-01-19 23:31:10 -08:00
Merge branch 'for-2.6.38' of git://linux-nfs.org/~bfields/linux
2011-01-14 13:17:26 -08:00
NFS: Use d_automount() rather than abusing follow_link()
2011-01-15 20:07:34 -05:00
dt/flattree: Return virtual address from early_init_dt_alloc_memory_arch()
2011-01-15 22:01:58 -07:00
thp: remove PG_buddy
2011-01-13 17:32:43 -08:00
Revert update for dirty_ratio for memcg.
2011-01-14 07:52:02 -08:00
mm: remove likely() from mapping_unevictable()
2011-01-13 17:32:36 -08:00
sanitize vfsmount refcounting changes
2011-01-16 13:47:07 -05:00
PCI / ACPI: Fix build of the AER driver for CONFIG_ACPI unset
2011-01-16 11:56:26 -08:00
PCI / ACPI: Fix build issue in pci_root.c for !CONFIG_PCIEPORTBUS
2011-01-14 15:23:25 -08:00
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
2011-01-14 09:29:05 -08:00
net_sched: implement a root container qdisc sch_mqprio
2011-01-19 23:31:11 -08:00
pps: add kernel consumer support
2011-01-13 08:03:21 -08:00
pps: capture MONOTONIC_RAW timestamps as well
2011-01-13 08:03:21 -08:00
include/linux/printk.h: use tab not spaces for indent
2011-01-13 08:03:10 -08:00
mm: migration: use rcu_dereference_protected when dereferencing the radix tree slot during file page migration
2011-01-13 17:32:48 -08:00
fs: hlist UP debug fixup
2011-01-14 02:36:43 +00:00
rapidio: add definitions of Component Tag fields
2011-01-13 08:03:18 -08:00
rapidio: use common destid storage for endpoints and switches
2011-01-13 08:03:17 -08:00
rapidio: add new idt sRIO switches
2011-01-13 08:03:18 -08:00
thp: transparent hugepage core
2011-01-13 17:32:42 -08:00
romfs: have romfs_fs.h pull in necessary headers
2011-01-13 08:03:23 -08:00
thp: khugepaged
2011-01-13 17:32:43 -08:00
pps: unify timestamp gathering
2011-01-13 08:03:19 -08:00
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into common/serial-rework
2011-01-13 15:06:28 +09:00
netfilter: fix compilation when conntrack is disabled but tproxy is enabled
2011-01-12 20:25:08 +01:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
2011-01-13 10:25:58 -08:00
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
2011-01-13 20:15:35 -08:00
thp: transparent hugepage core
2011-01-13 17:32:42 -08:00
Merge branch 'misc' into release
2011-01-12 05:14:15 -05:00
pps: capture MONOTONIC_RAW timestamps as well
2011-01-13 08:03:21 -08:00
ntp: add hardpps implementation
2011-01-13 08:03:20 -08:00
toshiba.h: hide a function prototypes behind __KERNEL__ macro
2011-01-13 08:03:08 -08:00
pps: timestamp is always passed to dcd_change()
2011-01-13 08:03:20 -08:00
user_ns: improve the user_ns on-the-slab packaging
2011-01-13 08:03:18 -08:00
mm: unify module_alloc code for vmalloc
2011-01-13 17:32:34 -08:00
mm: vmstat: use a single setter function and callback for adjusting percpu thresholds
2011-01-13 17:32:31 -08:00
decompressors: add XZ decompressor module
2011-01-13 08:03:24 -08:00
