Pablo Neira Ayuso
a992ca2a04
netfilter: nf_conntrack_tstamp: add flow-based timestamp extension ...
This patch adds flow-based timestamping for conntracks. This
conntrack extension is disabled by default. Basically, we use
two 64-bits variables to store the creation timestamp once the
conntrack has been confirmed and the other to store the deletion
time. This extension is disabled by default, to enable it, you
have to:
echo 1 > /proc/sys/net/netfilter/nf_conntrack_timestamp
This patch allows to save memory for user-space flow-based
loogers such as ulogd2. In short, ulogd2 does not need to
keep a hashtable with the conntrack in user-space to know
when they were created and destroyed, instead we use the
kernel timestamp. If we want to have a sane IPFIX implementation
in user-space, this nanosecs resolution timestamps are also
useful. Other custom user-space applications can benefit from
this via libnetfilter_conntrack.
This patch modifies the /proc output to display the delta time
in seconds since the flow start. You can also obtain the
flow-start date by means of the conntrack-tools.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Patrick McHardy <kaber@trash.net>
2011-01-19 16:00:07 +01:00
Merge branch 'misc' into devel
2011-01-06 22:32:52 +00:00
ceph: mark user pages dirty on direct-io reads
2010-12-17 09:54:40 -08:00
Merge branch 'usb-next' into musb-merge
2010-12-16 10:05:06 -08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2011-01-07 14:45:47 -08:00
NLM: Fix a regression in lockd
2010-11-15 20:44:26 -05:00
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6
2011-01-06 18:32:12 -08:00
Merge branch 'rmobile/urgent' into rmobile-latest
2010-12-21 00:40:51 +09:00
Merge git://git.infradead.org/mtd-2.6
2010-10-30 08:31:35 -07:00
netfilter: nf_conntrack_tstamp: add flow-based timestamp extension
2011-01-19 16:00:07 +01:00
netfilter: xtables: use __uXX guarded types for userspace exports
2011-01-18 07:33:09 +01:00
netfilter: xtables: use __uXX guarded types for userspace exports
2011-01-18 07:33:09 +01:00
netfilter: xtables: use __uXX guarded types for userspace exports
2011-01-18 07:33:09 +01:00
regulator: Add option for machine drivers to enable the dummy regulator
2010-10-28 22:40:31 +01:00
Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6
2011-01-07 17:08:46 -08:00
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2010-12-26 22:37:05 -08:00
nfsd4: fix 4.1 connection registration race
2010-11-02 17:13:52 -04:00
include/linux/unaligned: pack the whole struct rather than just the field
2010-12-22 19:43:34 -08:00
Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
2011-01-07 13:16:28 -08:00
acpi: fix _OSI string setup regression
2010-12-11 01:28:58 -05:00
atm: correct sysfs 'device' link creation and parent relationships
2010-12-10 15:45:05 -08:00
atomic: add atomic_inc_not_zero_hint()
2010-11-12 07:55:30 -08:00
netfilter: create audit records for x_tables replaces
2011-01-16 18:12:59 +01:00
lib: Improve EWMA efficiency by using bitshifts
2010-12-06 15:58:43 -05:00
exec: copy-and-paste the fixes into compat_do_execve() paths
2010-11-30 17:56:38 -08:00
block: remove REQ_HARDBARRIER
2010-11-10 14:54:09 +01:00
bit_spinlock: add required includes
2011-01-07 17:50:31 +11:00
bitops: Provide generic sign_extend32 function
2010-11-15 13:27:04 -05:00
block: remove REQ_HARDBARRIER
2010-11-10 14:54:09 +01:00
block: max hardware sectors limit wrapper
2010-12-17 08:36:01 +01:00
bootmem: Add alloc_bootmem_align()
2010-12-13 16:11:13 -08:00
ARM: 6483/1: arm & sh: factorised duplicated clkdev.c
2010-11-26 10:51:04 +00:00
clarify a usage constraint for cnt32_to_63()
2010-12-20 09:07:35 -08:00
fs: provide rcu-walk aware permission i_ops
2011-01-07 17:50:29 +11:00
sched: Change wait_for_completion_*_timeout() to return a signed long
2011-01-05 14:15:50 +01:00
tty: add 'active' sysfs attribute to tty0 and console device
2010-12-16 16:15:34 -08:00
driver core: prune docs about device_interface
2010-11-10 16:57:11 -08:00
ARM: 6485/5: proc/vmcore - allow archs to override vmcore_elf_check_arch()
2010-11-30 13:39:55 +00:00
fs: implement faster dentry memcmp
2011-01-07 17:50:32 +11:00
dcbnl: adding DCBX feature flags get-set
2010-12-31 10:50:54 -08:00
dccp: Policy-based packet dequeueing infrastructure
2010-12-07 13:47:12 +01:00
dmaengine: provide dummy functions for DMA_ENGINE=n
2011-01-03 01:41:40 -08:00
dmar, x86: Use function stubs when CONFIG_INTR_REMAP is disabled
2010-11-26 09:57:36 +01:00
core: Replace __get_cpu_var with __this_cpu_read if not used for an address.
2010-12-17 15:07:19 +01:00
ethtool: Report link-down while interface is down
2010-12-10 15:55:23 -08:00
fanotify: split version into version and metadata_len
2010-12-15 13:56:33 -05:00
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
2010-12-22 12:56:10 +09:00
filter: constify sk_run_filter()
2010-12-08 10:30:34 -08:00
fs: dcache per-bucket dcache hash locking
2011-01-07 17:50:31 +11:00
fs: fs_struct use seqlock
2011-01-07 17:50:27 +11:00
fsl-diu-fb: drop dead ioctl define
2010-11-15 13:49:51 +09:00
fs: dcache remove dcache_lock
2011-01-07 17:50:23 +11:00
fs: dcache remove dcache_lock
2011-01-07 17:50:23 +11:00
tracing/events: Show real number in array fields
2010-11-19 10:18:47 -05:00
fs: provide rcu-walk aware permission i_ops
2011-01-07 17:50:29 +11:00
PM / Hibernate: Fix memory corruption related to swap
2010-12-06 23:52:08 +01:00
Input: add input driver for polled GPIO buttons
2010-12-06 17:15:15 -08:00
hardirq.h: needs sched.h if using BKL
2010-11-18 10:56:29 -08:00
highmem: Use this_cpu_xx_return() operations
2010-12-17 15:18:04 +01:00
hrtimers: Convert hrtimers to use timerlist infrastructure
2010-12-10 11:54:35 -08:00
perf,hw_breakpoint: Initialize hardware api earlier
2010-11-12 14:51:55 +01:00
i2c: Delete unused adapter IDs
2010-11-15 22:40:38 +01:00
OMAP: I2C: split device registration and convert OMAP2+ to omap_device
2010-11-09 09:31:10 -08:00
i2c: Mark i2c_adapter.id as deprecated
2010-11-15 22:40:38 +01:00
mac80211: Remove unused third address from mesh address extension header.
2010-12-20 14:49:47 -05:00
bridge: add proper RCU annotation to should_route_hook
2010-11-15 11:13:16 -08:00
include/linux/if_ether.h: Add #define ETH_P_LINK_CTL for HPNA and wlan local tunnel
2011-01-06 11:10:05 -08:00
macvlan: Introduce 'passthru' mode to takeover the underlying device
2010-11-22 08:24:29 -08:00
macvlan: lockless tx path
2010-11-16 10:58:30 -08:00
vlan: Add function to retrieve EtherType from vlan packets.
2010-11-12 12:30:57 -08:00
net: typos in comments in include/linux/igmp.h
2011-01-04 11:29:52 -08:00
__in_dev_get_rtnl() can use rtnl_dereference()
2010-12-06 12:59:05 -08:00
Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2011-01-06 10:23:33 -08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2011-01-07 14:45:47 -08:00
irq: Better struct irqaction layout
2010-11-10 10:21:22 +01:00
block: remove unused copy_io_context()
2010-11-11 13:40:11 +01:00
resources: add arch hook for preventing allocation in reserved areas
2010-12-17 10:01:09 -08:00
IPVS: Backup, Adding Version 1 receive capability
2010-11-25 10:42:59 +09:00
ipv6: mcast: RCU conversion
2010-11-24 11:16:42 -08:00
The new jhash implementation
2010-12-09 20:17:07 -08:00
jump label: Add work around to i386 gcc asm goto bug
2010-10-29 14:45:29 -04:00
[media] V4L1 removal: Remove linux/videodev.h
2010-12-29 08:17:11 -02:00
include/linux/kernel.h: Move logging bits to include/linux/printk.h
2010-11-15 13:37:37 -08:00
core: Replace __get_cpu_var with __this_cpu_read if not used for an address.
2010-12-17 15:07:19 +01:00
debug_core,x86,blackfin: Clean up hw debug disable API
2010-10-29 13:14:41 -05:00
Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
2011-01-07 17:02:58 -08:00
kthread_work: make lockdep happy
2010-12-22 10:27:53 +01:00
leds: driver for National Semiconductor LP5521 chip
2010-11-12 07:55:32 -08:00
leds: driver for National Semiconductors LP5523 chip
2010-11-12 07:55:32 -08:00
led-class: always implement blinking
2010-11-12 07:55:32 -08:00
SCSI host lock push-down
2010-11-16 13:33:23 -08:00
kernel: add bl_list
2011-01-07 17:50:31 +11:00
phylib: Add support for Marvell 88E1149R devices.
2010-11-22 08:34:23 -08:00
tg3: Move EEE definitions into mdio.h
2010-12-06 11:03:46 -08:00
mem-hotplug: introduce {un}lock_memory_hotplug()
2010-12-02 14:51:15 -08:00
Merge commit 'v2.6.37-rc7' into x86/security
2010-12-23 09:48:41 +01:00
fs: scale mntget/mntput
2011-01-07 17:50:33 +11:00
mutexes, sched: Introduce arch_mutex_cpu_relax()
2010-11-26 15:05:34 +01:00
fs: rcu-walk for path lookup
2011-01-07 17:50:27 +11:00
fs: change d_compare for rcu-walk
2011-01-07 17:50:19 +11:00
fs: avoid inode RCU freeing for pseudo fs
2011-01-07 17:50:26 +11:00
trivial: Fix typo fault in netdevice.h
2011-01-03 12:06:21 -08:00
netfilter: allow NFQUEUE bypass if no listener is available
2011-01-18 16:08:30 +01:00
netlink: fix gcc -Wconversion compilation warning
2010-12-17 12:03:14 -08:00
fs: provide rcu-walk aware permission i_ops
2011-01-07 17:50:29 +11:00
nfs: remove extraneous and problematic calls to nfs_clear_request
2010-12-07 23:02:44 -05:00
NFS: Ensure we return the dirent->d_type when it is known
2010-11-22 13:24:48 -05:00
nl80211: Export available antennas
2010-12-20 14:49:47 -05:00
x86, nmi_watchdog: Remove ARCH_HAS_NMI_WATCHDOG and rely on CONFIG_HARDLOCKUP_DETECTOR
2010-12-22 22:15:32 +01:00
driver core: prune docs about device_interface
2010-11-10 16:57:11 -08:00
memcg: fix false positive VM_BUG on non-SMP
2010-11-25 06:50:40 +09:00
fs: scale mntget/mntput
2011-01-07 17:50:33 +11:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
2010-11-29 14:36:33 -08:00
percpu: Generic this_cpu_cmpxchg() and this_cpu_xchg support
2010-12-18 15:54:04 +01:00
perf: Sysfs enumeration
2010-12-16 11:36:43 +01:00
Un-inline get_pipe_info() helper function
2010-11-28 16:27:19 -08:00
PM / Runtime: Fix pm_runtime_suspended()
2010-12-16 17:12:25 +01:00
fs: provide simple rcu-walk generic_check_acl implementation
2011-01-07 17:50:29 +11:00
include/linux/kernel.h: Move logging bits to include/linux/printk.h
2010-11-15 13:37:37 -08:00
backlight: add low threshold to pwm backlight
2010-11-12 07:55:33 -08:00
spi/pxa2xx: Add chipselect support for Sodaville
2010-12-02 17:55:12 +01:00
radix-tree: fix RCU bug
2010-11-12 07:55:32 -08:00
convert get_sb_nodev() users
2010-10-29 04:16:31 -04:00
rcu: remove unused __list_for_each_rcu() macro
2010-12-17 12:34:59 -08:00
kernel: add bl_list
2011-01-07 17:50:31 +11:00
rcu: increase synchronize_sched_expedited() batching
2010-12-17 12:34:08 -08:00
rcu,cleanup: move synchronize_sched_expedited() out of sched.c
2010-11-29 22:01:58 -08:00
rcu,cleanup: move synchronize_sched_expedited() out of sched.c
2010-11-29 22:01:58 -08:00
BKL: remove extraneous #include <smp_lock.h>
2010-11-17 08:59:32 -08:00
fs: provide rcu-walk aware permission i_ops
2011-01-07 17:50:29 +11:00
include/linux/resource.h needs types.h
2010-11-12 07:55:30 -08:00
rfkill: remove dead code
2010-11-15 13:24:06 -05:00
net: rtnetlink.h -- only include linux/netdevice.h when used by the kernel
2010-11-15 11:29:30 -08:00
sched: Consolidate the name of root_task_group and init_task_group
2011-01-07 15:54:34 +01:00
Merge branch 'vfs-scale-working' of git://git.kernel.org/pub/scm/linux/kernel/git/npiggin/linux-npiggin
2011-01-07 08:56:33 -08:00
semaphore: Remove mutex emulation
2010-10-30 12:12:50 +02:00
kernel: optimise seqlock
2011-01-07 17:50:27 +11:00
Serial: Avoid unbalanced IRQ wake disable during resume
2010-12-16 13:14:32 -08:00
omap: Serial: Define register access modes in LCR
2010-11-30 14:11:49 -08:00
x86/mrst: Add SFI platform device parsing code
2010-11-09 14:45:52 +01:00
sh: clkfwk: Disable init clk op for non-legacy clocks.
2010-11-15 18:48:25 +09:00
sh: intc: Fix up initializers for gcc 4.5.
2010-11-09 16:38:20 +09:00
ARM: shmobile: remove sh_timer_config clk member
2010-10-31 10:40:39 -04:00
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 into HEAD
2011-01-13 10:29:21 +09:00
kernel: kmem_ptr_validate considered harmful
2011-01-07 17:50:16 +11:00
Fix build failure due to hwirq.h needing smp_lock.h
2010-11-17 14:58:36 -08:00
tcp: Replace time wait bucket msg by counter
2010-12-08 12:16:33 -08:00
net: remove the duplicate #ifdef __KERNEL__
2011-01-06 11:41:42 -08:00
x86: Eliminate bp argument from the stack tracing routines
2010-11-18 14:37:34 +01:00
stmmac: add init/exit callback in plat_stmmacenet_data struct
2010-11-24 11:14:24 -08:00
tracing: Remove useless syscall ftrace_event_call declaration
2010-11-18 14:37:45 +01:00
taskstats: pad taskstats netlink response for aligment issues on ia64
2010-12-22 19:43:34 -08:00
timerqueue: Make timerqueue_getnext() static inline
2010-12-11 12:34:34 +01:00
tipc: cleanup various cosmetic whitespace issues
2011-01-01 13:57:56 -08:00
tipc: cleanup various cosmetic whitespace issues
2011-01-01 13:57:56 -08:00
tracing: Add TRACE_EVENT_CONDITIONAL()
2010-12-03 10:45:34 -05:00
Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6
2010-12-02 12:58:16 -08:00
tty: fix typos/errors in tty_driver.h comments
2010-12-16 13:14:32 -08:00
Input: introduce device properties
2010-12-20 09:37:33 +01:00
uio: Change mail address of Hans J. Koch
2010-11-10 16:57:11 -08:00
Merge branch 'usb-next' into musb-merge
2010-12-16 10:05:06 -08:00
Merge branch 'viafb-next' of git://github.com/schandinat/linux-2.6
2010-11-10 12:04:41 +09:00
ACPI: video: fix build for VIDEO_OUTPUT_CONTROL=n
2010-12-11 02:01:35 -05:00
vmalloc: eagerly clear ptes on vunmap
2010-12-02 14:51:15 -08:00
wl1271: ref_clock cosmetic changes
2010-11-15 13:25:02 -05:00
Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
2011-01-07 16:58:04 -08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
2010-10-30 09:05:48 -07:00
xfrm: Add Traffic Flow Confidentiality padding XFRM attribute
2010-12-10 14:43:58 -08:00
