Jason Wang
f663dd9aaf
net: core: explicitly select a txq before doing l2 forwarding ...
Currently, the tx queue were selected implicitly in ndo_dfwd_start_xmit(). The
will cause several issues:
- NETIF_F_LLTX were removed for macvlan, so txq lock were done for macvlan
instead of lower device which misses the necessary txq synchronization for
lower device such as txq stopping or frozen required by dev watchdog or
control path.
- dev_hard_start_xmit() was called with NULL txq which bypasses the net device
watchdog.
- dev_hard_start_xmit() does not check txq everywhere which will lead a crash
when tso is disabled for lower device.
Fix this by explicitly introducing a new param for .ndo_select_queue() for just
selecting queues in the case of l2 forwarding offload. netdev_pick_tx() was also
extended to accept this parameter and dev_queue_xmit_accel() was used to do l2
forwarding transmission.
With this fixes, NETIF_F_LLTX could be preserved for macvlan and there's no need
to check txq against NULL in dev_hard_start_xmit(). Also there's no need to keep
a dedicated ndo_dfwd_start_xmit() and we can just reuse the code of
dev_queue_xmit() to do the transmission.
In the future, it was also required for macvtap l2 forwarding support since it
provides a necessary synchronization method.
Cc: John Fastabend <john.r.fastabend@intel.com>
Cc: Neil Horman <nhorman@tuxdriver.com>
Cc: e1000-devel@lists.sourceforge.net
Signed-off-by: Jason Wang <jasowang@redhat.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Acked-by: John Fastabend <john.r.fastabend@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-01-10 13:23:08 -05:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2013-11-15 16:47:22 -08:00
fsl /bestcomm
gpiolib: add missing declarations
2013-12-03 13:10:47 +01:00
Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
2013-11-18 15:50:07 -08:00
Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm
2013-11-14 08:51:29 +09:00
mfd/rtc: s5m: fix register updating by adding regmap for RTC
2013-12-12 18:19:26 -08:00
net/mlx4_en: Datapath structures are allocated per NUMA node
2013-11-07 19:22:48 -05:00
mlx5: Use enum to indicate adapter page size
2013-11-08 14:43:01 -08:00
mmc: core: Add MMC_CAP_RUNTIME_RESUME to resume at runtime_resume
2013-10-30 20:28:43 -04:00
mtd: nand_bbt: kill NAND_BBT_SCANALLPAGES
2013-11-06 23:33:14 -08:00
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
2013-11-04 19:46:58 -05:00
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
2013-11-20 13:20:24 -08:00
power_supply: Add support for bq24735 charger
2013-10-25 15:56:51 -07:00
Merge remote-tracking branch 'regulator/topic/optional' into regulator-next
2013-10-24 11:11:39 +01:00
Merge branch 'sched/core' into core/locking, to prepare the kernel/locking/ file move
2013-11-06 07:50:37 +01:00
Merge remote-tracking branch 'spi/topic/wr' into spi-next
2013-10-25 09:51:41 +01:00
SUNRPC: Add a helper to switch the transport of an rpc_clnt
2013-10-28 15:21:32 -04:00
usb: wusbcore: fix deadlock in wusbhc_gtk_rekey
2013-12-02 15:21:04 -08:00
ACPI: Provide acpi_dev_name accessor for struct acpi_device device name
2013-11-14 23:20:45 +01:00
gpiolib / ACPI: allow passing GPIOF_ACTIVE_LOW for GpioInt resources
2013-10-19 23:32:14 +02:00
... and kill anon_inode_getfile_private()
2013-11-09 00:16:28 -05:00
KEYS: Fix multiple key add into associative array
2013-12-02 11:24:18 +00:00
libata: Add some missing command descriptions
2013-10-27 08:40:39 -04:00
tty/serial: at91: add a fallback option to determine uart/usart property
2013-10-17 13:31:19 -07:00
audit: call audit_bprm() only once to add AUDIT_EXECVE information
2013-11-05 11:15:03 -05:00
auxvec.h: account for AT_HWCAP2 in AT_VECTOR_SIZE_BASE
2013-12-24 09:35:17 -08:00
bdi: test bdi_init failure
2013-11-08 08:59:44 -07:00
Merge branch 'akpm' (patches from Andrew Morton)
2013-11-13 15:45:43 +09:00
Merge branch 'blk-mq/core' into for-3.13/core
2013-11-08 09:08:12 -07:00
ACPI and power management updates for 3.13-rc1
2013-11-14 13:41:48 +09:00
blk-mq: fix for flush deadlock
2013-10-28 13:33:58 -06:00
blk-mq: new multi-queue block IO queueing mechanism
2013-10-25 11:56:00 +01:00
blk-mq: ensure that we set REQ_IO_STAT so diskstats work
2013-11-19 09:25:07 -07:00
kernel: trace: blktrace: remove redundent memcpy() in compat_blk_trace_setup()
2013-11-08 09:04:30 -07:00
cmdline-parser: fix build
2013-11-15 09:32:23 +09:00
Merge branch 'akpm' (patches from Andrew Morton)
2013-11-13 15:45:43 +09:00
x86, build, icc: Remove uninitialized_var() from compiler-intel.h
2013-12-10 15:01:01 -08:00
sched: remove INIT_COMPLETION
2013-11-15 09:32:21 +09:00
constify do_coredump() argument
2013-11-09 00:16:29 -05:00
ACPI, APEI, CPER: Add UEFI 2.4 support for memory error
2013-10-23 10:10:20 -07:00
ACPI and power management updates for 3.13-rc1
2013-11-14 13:41:48 +09:00
Revert "cpufreq: suspend governors on system suspend/hibernate"
2013-12-08 01:04:17 +01:00
cpuidle: remove cpuidle_unregister_governor()
2013-10-30 01:21:24 +01:00
cpuset: Fix potential deadlock w/ set_mems_allowed
2013-11-06 12:40:27 +01:00
lib: crc32: add functionality to combine two crc32{, c}s in GF(2)
2013-11-03 23:04:56 -05:00
dcache: allow word-at-a-time name hashing with big-endian CPUs
2013-12-12 10:39:01 -08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2013-11-15 16:47:22 -08:00
ACPI / driver core: Store an ACPI device pointer in struct acpi_dev_node
2013-11-14 23:14:43 +01:00
ARM: 7795/1: mm: dma-mapping: Add dma_max_pfn(dev) helper function
2013-10-31 14:49:24 +00:00
Merge commit 'dmaengine-3.13-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/dmaengine
2013-11-16 12:02:36 +05:30
DMI: Parse memory device (type 17) in SMBIOS
2013-10-23 10:10:12 -07:00
EDAC, GHES: Update ghes error record info
2013-10-23 10:11:00 -07:00
efivars, efi-pstore: Hold off deletion of sysfs entry until the scan is completed
2013-11-28 20:16:55 +00:00
switch elf_coredump_extra_notes_write() to dump_emit()
2013-11-09 00:16:24 -05:00
switch elf_core_write_extra_data() to dump_emit()
2013-11-09 00:16:23 -05:00
asmlinkage, module: Make ksymtab and kcrctab symbols and __this_module __visible
2013-10-29 09:43:37 +10:30
framebuffer: Add fb_<level> convenience logging macros
2013-10-29 12:53:04 +02:00
consolidate simple ->d_delete() instances
2013-11-15 22:04:17 -05:00
tracing: Make register/unregister_ftrace_command __init
2013-11-05 17:43:40 -05:00
ftrace, perf: Avoid infinite event generation loop
2013-11-19 16:57:40 +01:00
lib/genalloc: add a helper function for DMA buffer allocation
2013-11-13 12:09:22 +09:00
genetlink: make multicast groups const, prevent abuse
2013-11-19 16:39:06 -05:00
GPIO bulk changes for the v3.13 development cycle
2013-11-12 15:50:46 +09:00
HID: hid-sensor-hub: Add logical min and max
2013-12-02 21:05:30 +00:00
iio: hid-sensors: Fix power and report state
2013-12-02 21:05:32 +00:00
gpu: host1x: Add syncpoint base support
2013-10-31 09:55:48 +01:00
mm, thp: move ptl taking inside page_check_address_pmd()
2013-11-15 09:32:14 +09:00
include/linux/hugetlb.h: make isolate_huge_page() an inline
2013-12-12 18:19:25 -08:00
mac80211: process the CSA frame for mesh accordingly
2013-10-28 15:05:28 +01:00
macvlan: introduce macvlan_dev_real_dev() helper function
2013-11-15 17:55:48 -05:00
vlan: Implement vlan_dev_get_egress_qos_mask as an inline.
2013-11-11 00:42:07 -05:00
init.h: document the existence of __initconst
2013-11-13 12:09:26 +09:00
seqcount: Add lockdep functionality to seqcount/seqlock structures
2013-11-06 12:40:26 +01:00
revert "softirq: Add support for triggering softirq work on softirqs"
2013-11-15 09:32:22 +09:00
ipc, msg: forbid negative values for "msg{max,mnb,mni}"
2013-11-03 10:53:11 -08:00
xen-netback: fix fragment detection in checksum setup
2013-12-05 20:31:40 -05:00
genirq: Prevent spurious detection for unconditionally polled interrupts
2013-11-13 16:03:02 +01:00
genirq: Correct fuzzy and fragile IRQ_RETVAL() definition
2013-11-19 19:06:41 +01:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2013-11-13 17:40:34 +09:00
static_key: WARN on usage before jump_label_init was called
2013-10-19 19:45:35 -04:00
tools/vm/page-types.c: support KPF_SOFTDIRTY bit
2013-11-13 12:09:07 +09:00
include/linux/kernel.h: make might_fault() a nop for !MMU
2013-12-12 18:19:26 -08:00
PCI: Disable Bus Master only on kexec reboot
2013-12-07 14:20:28 -07:00
kfifo API type safety
2013-11-15 09:32:23 +09:00
Merge branch 'kvm-ppc-queue' of git://github.com/agraf/linux-2.6 into queue
2013-11-04 10:20:57 +02:00
no need to keep brlock macros anymore...
2013-11-09 00:16:21 -05:00
libata: implement ATA_HORKAGE_NO_NCQ_TRIM and apply it to Micro M500 SSDs
2013-12-17 07:03:14 -05:00
list: introduce list_last_entry(), use list_{first,last}_entry()
2013-11-13 12:09:24 +09:00
llists: move llist_reverse_order from raid5 to llist.c
2013-11-15 09:32:22 +09:00
seqcount: Add lockdep functionality to seqcount/seqlock structures
2013-11-06 12:40:26 +01:00
mm: do not allocate page->ptl dynamically, if spinlock_t fits to long
2013-12-20 12:25:45 -08:00
math64: Add mul_u64_u32_shr()
2013-12-11 15:52:34 +01:00
mm/memblock.c: introduce bottom-up allocation mode
2013-11-13 12:09:08 +09:00
mm/sparsemem: use PAGES_PER_SECTION to remove redundant nr_pages parameter
2013-11-13 12:09:06 +09:00
mm, mempolicy: make mpol_to_str robust and always succeed
2013-11-13 12:09:05 +09:00
micrel: add support for KSZ8041RNLI
2013-12-11 13:54:13 -05:00
aio/migratepages: make aio migrate pages sane
2013-12-21 17:56:08 -05:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse
2013-11-13 15:27:00 +09:00
mm: do not allocate page->ptl dynamically, if spinlock_t fits to long
2013-12-20 12:25:45 -08:00
mm: do not allocate page->ptl dynamically, if spinlock_t fits to long
2013-12-20 12:25:45 -08:00
mm: factor commit limit calculation
2013-11-13 12:09:11 +09:00
RCU'd vfsmounts
2013-11-09 00:16:19 -05:00
ipc, msg: fix message length check for negative values
2013-11-13 12:09:36 +09:00
PCI: Fix whitespace, capitalization, and spelling errors
2013-11-14 11:28:18 -07:00
locking/doc: Update references to kernel/mutex.c
2013-11-11 12:41:33 +01:00
RCU'd vfsmounts
2013-11-09 00:16:19 -05:00
net: unix: allow set_peek_off to fail
2013-12-10 21:45:15 -05:00
net: Add layer 2 hardware acceleration operations for macvlan devices
2013-11-07 19:11:41 -05:00
net: core: explicitly select a txq before doing l2 forwarding
2014-01-10 13:23:08 -05:00
netpoll: fix rx_hook() interface by passing the skb
2013-10-25 19:26:58 -04:00
NFS client bugfixes
2013-12-05 13:05:48 -08:00
NFS: Enabling v4.2 should not recompile nfsd and lockd
2013-11-19 16:20:40 -05:00
NFS: cache parsed auth_info in nfs_server
2013-10-28 15:37:43 -04:00
NFS: add support for multiple sec= mount options
2013-10-28 15:38:02 -04:00
DeviceTree updates for 3.13. This is a bit larger pull request than
2013-11-12 16:52:17 +09:00
gpiolib: include gpio/consumer.h in of_gpio.h for desc_to_gpio()
2013-10-29 18:26:14 -07:00
dt/irq: add empty of_irq_count for !OF_IRQ
2013-11-08 10:47:28 -06:00
of_mtd: Add no-op stubs to support CONFIG_OF=n
2013-10-27 16:26:58 -07:00
of/irq: Create of_irq_parse_and_map_pci() to consolidate arch code.
2013-10-24 11:50:36 +01:00
mm: add a helper function to check may oom condition
2013-11-13 12:09:04 +09:00
padata: make the sequence counter an atomic_t
2013-10-30 12:02:58 +08:00
ACPI: Eliminate the DEVICE_ACPI_HANDLE() macro
2013-11-14 23:17:21 +01:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2013-12-15 11:56:47 -08:00
PCI: Fix whitespace, capitalization, and spelling errors
2013-11-14 11:28:18 -07:00
PCI: Fix whitespace, capitalization, and spelling errors
2013-11-14 11:28:18 -07:00
percpu: fix spurious sparse warnings from DEFINE_PER_CPU()
2013-12-05 12:59:23 -05:00
Merge branch 'for-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
2013-11-13 15:17:16 +09:00
percpu_ida: add an API to return free tags
2013-10-25 11:56:00 +01:00
net/phy: Add the autocross feature for forced links on VSC82x4
2013-11-20 22:09:19 -05:00
pid_namespace: make freeing struct pid_namespace rcu-delayed
2013-10-24 23:43:29 -04:00
PM / OPP: rename header to linux/pm_opp.h
2013-10-25 22:33:23 +02:00
preempt: Make PREEMPT_ACTIVE generic
2013-11-13 20:21:47 +01:00
printk: pr_debug_ratelimited: check state first to reduce "callbacks suppressed" messages
2013-10-29 16:50:52 -07:00
pstore: Don't allow high traffic options on fragile devices
2013-12-20 13:12:01 -08:00
random32: upgrade taus88 generator to taus113 from errata paper
2013-11-11 14:32:15 -05:00
rbtree: fix rbtree_postorder_for_each_entry_safe() iterator
2013-11-13 12:09:33 +09:00
kexec: migrate to reboot cpu
2013-12-18 19:04:50 -08:00
Merge remote-tracking branch 'regmap/topic/spmi' into regmap-next
2013-10-28 13:01:35 -07:00
net: allow netdev_all_upper_get_next_dev_rcu with rtnl lock held
2013-12-17 21:19:08 -08:00
sched/fair: Rework sched_fair time accounting
2013-12-11 15:52:35 +01:00
Merge branch 'master' of git://git.infradead.org/users/pcmoore/selinux into ra-next
2013-10-22 22:26:41 +11:00
seq_file: introduce seq_setwidth() and seq_pad()
2013-11-15 09:32:20 +09:00
take read_seqbegin_or_lock() and friends to seqlock.h
2013-11-15 22:04:17 -05:00
intel_mid: Move platform device setups to their own platform_<device>.* files
2013-10-17 16:41:50 -07:00
security: shmem: implement kernel private shmem inodes
2013-12-02 11:24:19 +00:00
net: Add some clarification to skb_tx_timestamp() comment.
2013-12-27 13:04:33 -05:00
slab.h: remove duplicate kmalloc declaration and fix kernel-doc warnings
2013-11-24 11:01:16 -08:00
Merge branch 'slab/next' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/linux
2013-11-22 08:10:34 -08:00
Merge branch 'slab/next' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/linux
2013-11-22 08:10:34 -08:00
kernel-provide-a-__smp_call_function_single-stub-for-config_smp-fix
2013-11-15 09:32:22 +09:00
srcu: API for barrier after srcu read unlock
2013-11-06 09:32:09 +02:00
mm, hugetlb: convert hugetlbfs to use split pmd lock
2013-11-15 09:32:14 +09:00
This batch of changes is mostly clean ups and small bug fixes.
2013-11-16 12:23:18 -08:00
ARM: tegra: Provide dummy powergate implementation
2013-11-25 13:34:51 -08:00
ftrace, perf: Avoid infinite event generation loop
2013-11-19 16:57:40 +01:00
Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2013-11-12 10:20:12 +09:00
net: Explicitly initialize u64_stats_sync structures for lockdep
2013-11-06 12:40:25 +01:00
uprobes: Export write_opcode() as uprobe_write_opcode()
2013-11-06 20:00:09 +01:00
usb: xhci: Link TRB must not occur within a USB payload burst
2013-12-02 11:57:10 -08:00
virtio_ring: add new function virtqueue_is_broken()
2013-10-29 11:28:17 +10:30
virtio_ring: change host notification API
2013-10-29 11:28:11 +10:30
mm: numa: return the number of base pages altered by protection changes
2013-11-13 12:09:11 +09:00
wait: add wait_event_cmd()
2013-11-14 15:16:16 +11:00
writeback: do not sync data dirtied after sync start
2013-11-13 12:09:07 +09:00
