12 Dec, 2006
34 commits
-
That accumulated over the last months hackaton, shame on me for not
using git-apply whitespace helping hand, will do that from now on.Signed-off-by: Arnaldo Carvalho de Melo
-
Spotted by David Miller when compiling on sparc64, I reproduced it here on
parisc64, that are the only platforms to define __kernel_suseconds_t as an
'int', all the others, x86_64 and x86 included typedef it as a 'long', but from
the definition of suseconds_t it should just be an 'int' on platforms where it
is >= 32bits, it would not require all the castings from suseconds_t to (int)
when printking variables of this type, that are not needed on parisc64 and
sparc64.Signed-off-by: Arnaldo Carvalho de Melo
-
This fixes conversion errors which arose by not properly type-casting
from u32 to __u64. Fixed by explicitly casting each type which is not
__u64, or by performing operation after assignment.The patch further adds missing debug information to track the current
value of X_recv.Signed-off-by: Gerrit Renker
Acked-by: Ian McDonald
Signed-off-by: Arnaldo Carvalho de Melo -
No code change at all.
This reorders the source file to follow the same order as the corresponding
header file.Signed-off-by: Gerrit Renker
Acked-by: Ian McDonald
Signed-off-by: Arnaldo Carvalho de Melo -
No code change at all.
To make the header file easier to read, the following ordering is established
among the declarations:
* hist_new
* hist_delete
* hist_entry_new
* hist_head
* hist_find_entry
* hist_add_entry
* hist_entry_delete
* hist_purgeSigned-off-by: Gerrit Renker
Acked-by: Ian McDonald
Signed-off-by: Arnaldo Carvalho de Melo -
This patch does not alter any algorithm, just the debug message format:
* s#%s, sk=%p#%s(%p)#g
* when a statename is present, it now uses %s(%p, state=%s)
* when only function entry is debugged, it adds an `- entry'
Signed-off-by: Gerrit Renker
Acked-by: Ian McDonald
Signed-off-by: Arnaldo Carvalho de Melo -
This migrates all packet history operations into the routine
ccid3_hc_tx_packet_sent, thereby removing synchronization problems
that occur when, as before, the operations are spread over multiple
routines.
The following minor simplifications are also applied:
* several simplifications now follow from this change - several tests
are now no longer required
* removal of one unnecessary variable (dp)Justification:
Currently packet history operations span two different routines,
one of which is likely to pass through several iterations of sleeping
and awakening.
The first routine, ccid3_hc_tx_send_packet, allocates an entry and
sets a few fields. The remaining fields are filled in when the second
routine (which is not within a sleeping context), ccid3_hc_tx_packet_sent,
is called. This has several strong drawbacks:
* it is not necessary to split history operations - all fields can be
filled in by the second routine
* the first routine is called multiple times, until a packet can be sent,
and sleeps meanwhile - this causes a lot of difficulties with regard to
keeping the list consistent
* since both routines do not have a producer-consumer like synchronization,
it is very difficult to maintain data across calls to these routines
* the fact that the routines are called in different contexts (sleeping, not
sleeping) adds further problemsSigned-off-by: Gerrit Renker
Acked-by: Ian McDonald
Signed-off-by: Arnaldo Carvalho de Melo -
This removes the `dccphtx_ccval' field since it is nowhere used in the code and
in fact not necessary for the accounting.Signed-off-by: Gerrit Renker
Signed-off-by: Ian McDonald
Signed-off-by: Arnaldo Carvalho de Melo -
This puts the window counter computation [RFC 4342, 8.1] into a separate
function which is called whenever a new packet is ready for immediate
transmission in ccid3_hc_tx_send_packet.Justification:
The window counter update was previously computed after the packet was sent. This has
two drawbacks, both fixed by this patch:
1) re-compute another timestamp almost directly after the packet was sent (expensive),
2) the CCVal for the window counter is needed at the instant the packet is sent.Further details:
The initialisation of the window counter is left in the state NO_SENT, as before.
The algorithm will do nothing if either RTT is initialised to 0 (which is ok) or if
the RTT value remains below 4 microseconds (which is almost pathological).Signed-off-by: Gerrit Renker
Acked-by: Ian McDonald
Signed-off-by: Arnaldo Carvalho de Melo -
CCID3 performance depends much on the accuracy of RTT samples. If RTT
samples grow too large, performance can be catastrophically poor.To limit the amount of possible damage in such cases, the patch
* introduces an upper limit which identifies a maximum `sane' RTT value;
* uses a macro to enforce this upper limit.Using a macro was given preference, since it is necessary to identify the
calling function in the warning message. Since exceeding this threshold
identifies a critical condition, DCCP_CRIT is used and not DCCP_WARN.Many thanks to Ian McDonald for collaboration on this issue.
Signed-off-by: Gerrit Renker
Acked-by: Ian McDonald
Signed-off-by: Arnaldo Carvalho de Melo -
In both the sender and the receiver it is possible that the stored
RTT value is accessed before an actual RTT estimate has been computed.This patch
* initialises the sender RTT to 0
- the sender always accesses the RTT in ccid3_hc_tx_packet_sent
- the RTT is further needed for the window counter algorithm* replaces the receiver initialisation of 5msec with 0
- which has the same effect and removes an `XXX'
- the RTT value is needed in ccid3_hc_rx_packet_recv as rtt_prevSigned-off-by: Gerrit Renker
Acked-by: Ian McDonald
Signed-off-by: Arnaldo Carvalho de Melo -
The function ccid3_hc_tx_insert_options only does a redundant no-op,
as the operationDCCP_SKB_CB(skb)->dccpd_ccval = hctx->ccid3hctx_last_win_count;
is already performed _unconditionally_ in ccid3_hc_tx_send_packet.
Since there is further no current need for this function, it is removed
entirely. Since furthermore, there is actually no present need for the
entire interface function ccid_hc_tx_insert_options, it was decided to
remove it also, to clean up the interface.Signed-off-by: Gerrit Renker
Signed-off-by: Arnaldo Carvalho de Melo -
This adds a (debug) warning message which is triggered whenever a packet is
discarded due to send failure.It also adds a conditional, so that an interruption during dccp_wait_for_ccid
is not treated as a `BUG': the rationale is that interruptions are external,
whereas bug warnings are concerned with the internals.Signed-off-by: Gerrit Renker
Acked-by: Ian McDonald
Signed-off-by: Arnaldo Carvalho de Melo -
This is an optimisation to reduce CPU load. The received feedback is now
only directed to the active CCID component, without requiring processing
also by the inactive one.As a consequence, a similar test in ccid3.c is now redundant and is
also removed.Justification:
Currently DCCP works as a unidirectional service, i.e. a listening server
is not at the same time a connecting client.
As far as I can see, several modifications are necessary until that
becomes possible.
At the present time, received feedback is both fed to the rx/tx CCID
modules. In unidirectional service, only one of these is active at any
one time.Signed-off-by: Gerrit Renker
Acked-by: Ian McDonald
Signed-off-by: Arnaldo Carvalho de Melo -
In migrating towards using the newer functions scaled_div/scaled_div32
for TFRC computations mapped from floating-point onto integer arithmetic,
this completes the last stage of modifications.In particular, the overflow case for computing X_calc is circumvented by
* breaking the computation into two stages
* the first stage, res = (s*1E6)/R, cannot overflow due to use of u64
* in the second stage, res = (res*1E6)/f, overflow on u32 is avoided due
to (i) returning UINT_MAX in this case (which is logically appropriate)
and (ii) issuing a warning message into the system log (since very likely
there is a problem somewhere else with the parameters)Lastly, all such scaling operations are now exported into tfrc.h, since
actually this form of scaled computation is specific to TFRC and not to CCID3.Signed-off-by: Gerrit Renker
Acked-by: Ian McDonald
Signed-off-by: Arnaldo Carvalho de Melo -
Problem:
Most target types in the CCID3 code are u32, so subtle conversion errors
can occur if signed time calculations yield negative results: the original
values are lost in the conversion to unsigned, calculation errors go undetected.This patch therefore
* sets all critical time types from unsigned to suseconds_t
* avoids comparison between signed/unsigned via type-casting
* provides ample warning messages in case time calculations are negativeThese warning messages can be removed at a later stage when the code
has undergone more testing.Signed-off-by: Gerrit Renker
Acked-by: Ian McDonald
Signed-off-by: Arnaldo Carvalho de Melo -
This simplifies the calculation of a value p for a given fval when the
first loss interval is computed (RFC 3448, 6.3.1). It makes use of the
two new functions scaled_div/scaled_div32 to provide overflow protection.Additionally, protection against divide-by-zero is extended - in this
case the function will return the maximally possible value of p=100%.Background:
The maximum fval, f(100%), is approximately 244, i.e. the scaled value of fval
should never exceed 244E6, which fits easily into u32. The problem is the scaling
by 10^6, since additionally R(TT) is in microseconds.
This is resolved by breaking the division into two stages: the first stage
computes fval=(s*10^6)/R, stores that into u64; the second stage computes
fval = (fval*10^6)/X_recv and complains if overflow is reached for u32.
This case is safe since the TFRC reverse-lookup routine then returns p=100%.Signed-off-by: Gerrit Renker
Acked-by: Ian McDonald
Signed-off-by: Arnaldo Carvalho de Melo -
This replaces the remaining uses of usecs_div with scaled_div32, which
internally uses 64bit division and produces a warning on overflow.Signed-off-by: Gerrit Renker
Acked-by: Ian McDonald
Signed-off-by: Arnaldo Carvalho de Melo -
This patch
* resolves a bug where packets smaller than 32/64 bytes resulted in sending rates of 0
* supports all sending rates from 1/64 bytes/second up to 4Gbyte/second
* simplifies the present overflow problems in calculationsCurrent sending rate X and the cached value X_recv of the receiver-estimated
sending rate are both scaled by 64 (2^6) in order to
* cope with low sending rates (minimally 1 byte/second)
* allow upgrading to use a packets-per-second implementation of CCID 3
* avoid calculation errors due to integer arithmetic cut-offThe patch implements a revised strategy from
http://www.mail-archive.com/dccp@vger.kernel.org/msg01040.htmlThe only difference with regard to that strategy is that t_ipi is already
used in the calculation of the nofeedback timeout, which saves one division.Signed-off-by: Gerrit Renker
Acked-by: Ian McDonald
Signed-off-by: Arnaldo Carvalho de Melo -
This fixes
1) a bug in the recomputation of the sending rate by the nofeedback
timer when no feedback at all has so far been sent by the receiver:
min_t was used instead of max_t, which is wrong (cf. RFC 3448, p. 10);2) an error in the computation of larger initial windows: instead of
min(... max()) (cf. RFC 4342, 5.), the code had used max(... max()).Signed-off-by: Gerrit Renker
Acked-by: Ian McDonald
Signed-off-by: Arnaldo Carvalho de Melo -
This performs two optimisations for the recomputation of the sending rate.
1) Currently the target sending rate X_calc is recalculated whenever
a) the nofeedback timer expires, or
b) a feedback packet is received.
In the (a) case, recomputing X_calc is redundant, since* the parameters p and RTT do not change in between the
reception of feedback packets;* the parameter X_recv is either modified from received
feedback or via the nofeedback timer;* a test (`p == 0') in the nofeedback timer avoids using
a stale/undefined value of X_calc if p was previously 0.2) The nofeedback timer now only recomputes a timestamp when p == 0.
This is according to step (4) of [RFC 3448, 4.3] and avoids
unnecessarily determining a timestamp.A debug statement about not updating X is also removed - it helps very
little in debugging and just clutters the logs.Signed-off-by: Gerrit Renker
Acked-by: Ian McDonald
Signed-off-by: Arnaldo Carvalho de Melo -
This patch follows a suggestion by Ian McDonald and ensures that in
the current code the value of p can not exceed 100%. Such a value is
illegal and would consequently cause a bug condition in tfrc_calc_x().The receiver case is also tested, and a warning message is added.
Signed-off-by: Gerrit Renker
Acked-by: Ian McDonald
Signed-off-by: Arnaldo Carvalho de Melo -
As Eddie Kohler points out the RFC is Proposed Standard not experimental.
Also removed documentation about deprecated socket option.Signed-off-by: Ian McDonald
Signed-off-by: Gerrit Renker
Signed-off-by: Arnaldo Carvalho de Melo -
It simplifies waiting for the CCID module to signal that a packet
is ready to be sent. Other simplifications flow on from this such as
removing constants.As a result of this EAGAIN is not returned any more by dccp_wait_for_ccid
(which would otherwise lead to unnecessarily discarding the packet in
dccp_write_xmit).Signed-off-by: Ian McDonald
Signed-off-by: Gerrit Renker
Signed-off-by: Arnaldo Carvalho de Melo -
Acked-by: Herbert Xu
Signed-off-by: David S. Miller -
Signed-off-by: Ralf Baechle
Signed-off-by: David S. Miller -
Currently WAN router drivers can be built in-kernel while the
register/unregister_wan_device interfaces are built as modules.
This causes:drivers/built-in.o: In function `cycx_init':
cycx_main.c:(.init.text+0x5c4b): undefined reference to `register_wan_device'
drivers/built-in.o: In function `cycx_exit':
cycx_main.c:(.exit.text+0x560): undefined reference to `unregister_wan_device'
make: *** [.tmp_vmlinux1] Error 1The problem is caused by tristate -> bool conversion (y or m => y),
so convert WAN_ROUTER_DRIVERS to a tristate so that the correct
dependency is preserved.Signed-off-by: Randy Dunlap
Signed-off-by: David S. Miller -
The SHA384 block size should be 128 bytes, not 96 bytes. This was
spotted by Andrew Donofrio.Fortunately the block size isn't actually used anywhere so this typo
has had no real impact.Signed-off-by: Herbert Xu
-
Fix typo in 'EXPERIMENTAL' in config CC_STACKPROTECTOR in arch/x86_64/Kconfig.
Signed-off-by: Brice Goglin
Signed-off-by: Linus Torvalds -
Make powerpc's __ilog2_u64() take a 64-bit argument.
Signed-off-by: David Howells
Signed-off-by: Linus Torvalds -
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc:
AT91 MMC update for 2.6.19
mmc: Change SDHCI iomem error to a warning
mmc: fix "prev->state: 2 != TASK_RUNNING??" problem on SD/MMC card removal
AT91 MMC 5 : Minor cleanups
AT91 MMC 4 : Interrupt handler cleanup
AT91 MMC 3 : Move global mci_clk variable
AT91 MMC 2 : Use platform resources
AT91 MMC 1: Pass host structure. -
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
[PATCH] smc91x: Kill off excessive versatile hooks.
[PATCH] myri10ge: update driver version to 1.1.0
[PATCH] myri10ge: fix big_bytes in case of vlan frames
[PATCH] myri10ge: Full vlan frame in small_bytes
[PATCH] myri10ge: drop contiguous skb routines
[PATCH] myri10ge: switch to page-based skb
[PATCH] myri10ge: add page-based skb routines
[PATCH] myri10ge: indentation cleanups
[PATCH] chelsio: working NAPI
[PATCH] MACB: Use __raw register access
[PATCH] MACB: Use struct delayed_work instead of struct work_struct
[PATCH] ucc_geth: Initialize mdio_lock.
[PATCH] ucc_geth: compilation error fixes -
We should not initialize rootfs before all the core initializers have
run. So do it as a separate stage just before starting the regular
driver initializers.Signed-off-by: Linus Torvalds
-
As reported by Andy Whitcroft, at least the SLES9 initrd build process
depends on getting the kernel version from the kernel binary. It does
that by simply trawling the binary and looking for the signature of the
"linux_banner" string (the string "Linux version " to be exact. Which
is really broken in itself, but whatever..)That got broken when the string was changed to allow /proc/version to
change the UTS release information dynamically, and "get_kernel_version"
thus returned "%s" (see commit a2ee8649ba6d71416712e798276bf7c40b64e6e5:
"[PATCH] Fix linux banner utsname information").This just restores "linux_banner" as a static string, which should fix
the version finding. And /proc/version simply uses a different string.To avoid wasting even that miniscule amount of memory, the early boot
string should really be marked __initdata, but that just causes the same
bug in SLES9 to re-appear, since it will then find other occurrences of
"Linux version " first.Cc: Andy Whitcroft
Acked-by: Herbert Poetzl
Cc: Andi Kleen
Cc: Andrew Morton
Cc: Steve Fox
Acked-by: Olaf Hering
Signed-off-by: Linus Torvalds
11 Dec, 2006
6 commits
-
This looks like a result of too many auto-merges. The
CONFIG_ARCH_VERSATILE case was handled a total of 6 times.
This kills 5 of them.Signed-off-by: Paul Mundt
--
drivers/net/smc91x.h | 90 ---------------------------------------------------
1 file changed, 90 deletions(-)
Signed-off-by: Jeff Garzik -
Update driver version to 1.1.0.
Signed-off-by: Brice Goglin
Signed-off-by: Jeff Garzik -
Fix sizing of big_bytes in the case of vlan frames. The 4
VLAN_HLEN bytes were omitted, leading to sizing the big buffer
4 bytes smaller than it should be. Due to how rx buffers are
carved from pages, this was harmless for the common (9000, 1500)
byte MTUs, but could lead to data corruption for some MTUs.Signed-off-by: Brice Goglin
Signed-off-by: Jeff Garzik -
Receive full vlan frames into smalls when running with a jumbo MTU.
Signed-off-by: Brice Goglin
Signed-off-by: Jeff Garzik -
Drop the old routines that used the physically contigous skb now
that we use the physical pages. And rename myri10ge_page_rx_done()
to myri10ge_rx_done() as it was previously.Signed-off-by: Brice Goglin
Signed-off-by: Jeff Garzik -
Switch to physical page skb, by calling the new page-based
allocation routines and using myri10ge_page_rx_done().Signed-off-by: Brice Goglin
Signed-off-by: Jeff Garzik
