Linux 2.6.32.23
Subsystems (48)
I'm announcing the release of the 2.6.32.23 kernel.
All users of the 2.6.32 kernel series must upgrade.
The updated 2.6.32.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.32.y.git
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-2.6.32.y.git;a=summarythanks,
greg k-h
------------
Makefile | 2 arch/alpha/kernel/err_marvel.c | 6 arch/arm/mach-at91/at91sam9g45_devices.c | 2 arch/ia64/kernel/fsys.S | 30 ++ arch/mips/include/asm/atomic.h | 24 +- arch/mips/mm/tlbex.c | 22 +- arch/mips/mm/uasm.c | 4 arch/mips/mm/uasm.h | 1 arch/mips/mti-malta/malta-pci.c | 2 arch/mips/nxp/pnx8550/common/pci.c | 1 arch/mips/nxp/pnx8550/common/setup.c | 2 arch/mips/pci/ops-pmcmsp.c | 1 arch/mips/pci/pci-yosemite.c | 1 arch/sparc/include/asm/io_32.h | 4 arch/sparc/include/asm/io_64.h | 4 arch/sparc/include/asm/oplib_64.h | 27 -- arch/sparc/prom/cif.S | 16 - arch/sparc/prom/console_64.c | 48 +++- arch/sparc/prom/devops_64.c | 36 +++ arch/sparc/prom/misc_64.c | 314 +++++++++++++++++++++---------- arch/sparc/prom/p1275.c | 102 ---------- arch/sparc/prom/tree_64.c | 210 +++++++++++++++----- arch/x86/include/asm/cmpxchg_32.h | 65 +----- arch/x86/include/asm/cmpxchg_64.h | 4 arch/x86/oprofile/nmi_int.c | 4 drivers/acpi/blacklist.c | 14 + drivers/ata/pata_pdc202xx_old.c | 15 + drivers/char/agp/sis-agp.c | 8 drivers/char/mem.c | 3 drivers/clocksource/sh_tmu.c | 20 + drivers/input/input.c | 86 +++++++- drivers/message/fusion/mptscsih.c | 2 drivers/net/3c503.c | 41 ++-- drivers/net/bnx2.c | 20 + drivers/net/bonding/bond_3ad.c | 3 drivers/net/bonding/bond_alb.c | 3 drivers/net/cxgb3/cxgb3_main.c | 3 drivers/net/eql.c | 2 drivers/net/r8169.c | 11 + drivers/net/usb/asix.c | 30 ++ drivers/net/usb/hso.c | 2 drivers/net/wireless/hostap/hostap_pci.c | 1 drivers/pci/intel-iommu.c | 90 ++++---- drivers/staging/vt6655/wpactl.c | 11 - drivers/usb/serial/mos7720.c | 3 drivers/usb/serial/mos7840.c | 3 drivers/video/sis/sis_main.c | 3 drivers/video/via/ioctl.c | 2 fs/aio.c | 3 fs/char_dev.c | 4 fs/ext4/inode.c | 40 ++- fs/notify/inotify/inotify_fsnotify.c | 3 fs/notify/inotify/inotify_user.c | 7 fs/partitions/ibm.c | 13 + fs/xfs/linux-2.6/xfs_ioctl.c | 2 include/linux/mm.h | 8 include/linux/mmzone.h | 13 + include/linux/vmstat.h | 22 ++ include/net/tcp.h | 36 ++- kernel/exit.c | 5 kernel/sched.c | 4 kernel/sys.c | 2 mm/memory.c | 15 + mm/mmap.c | 3 mm/mmzone.c | 21 ++ mm/page_alloc.c | 33 ++- mm/percpu.c | 2 mm/vmstat.c | 15 + net/bridge/br_netfilter.c | 9 net/core/skbuff.c | 7 net/ipv4/tcp.c | 33 +-- net/ipv4/tcp_timer.c | 8 net/irda/af_irda.c | 4 net/llc/af_llc.c | 3 net/rds/recv.c | 2 net/sctp/output.c | 1 net/unix/af_unix.c | 15 + security/keys/keyctl.c | 6 78 files changed, 1076 insertions(+), 571 deletions(-)
Alexey Kuznetsov (1):
tcp: Prevent overzealous packetization by SWS logic.
Andrew Morton (1):
drivers/pci/intel-iommu.c: fix build with older gcc's
Andy Gospodarek (1):
bonding: correctly process non-linear skbs
Aurelien Jarno (1):
clocksource: sh_tmu: compute mult and shift before registration
Bartlomiej Zolnierkiewicz (2):
pata_pdc202xx_old: fix UDMA mode for Promise UDMA33 cards
pata_pdc202xx_old: fix UDMA mode for PDC2026x chipsets
Ben Hutchings (3):
3c503: Fix IRQ probing
MIPS: Set io_map_base for several PCI bridges lacking it
sis-agp: Remove SIS 760, handled by amd64-agp
Benjamin Li (1):
bnx2: Fix netpoll crash.
Christoph Lameter (1):
mm: page allocator: calculate a better estimate of NR_FREE_PAGES when memory is low and kswapd is awake
Dan Carpenter (2):
Staging: vt6655: fix buffer overflow net/llc: make opt unsigned in llc_ui_setsockopt()
Dan Rosenberg (7):
USB: serial/mos*: prevent reading uninitialized stack memory drivers/net/usb/hso.c: prevent reading uninitialized memory drivers/net/cxgb3/cxgb3_main.c: prevent reading uninitialized stack memory drivers/net/eql.c: prevent reading uninitialized stack memory drivers/video/sis/sis_main.c: prevent reading uninitialized stack memory
xfs: prevent reading uninitialized stack memory drivers/video/via/ioctl.c: prevent reading uninitialized stack memory
Daniel J Blueman (1):
Fix unprotected access to task credentials in waitid()
David Daney (1):
MIPS: Quit using undefined behavior of ADDU in 64-bit atomic operations.
David Howells (2):
KEYS: Fix RCU no-lock warning in keyctl_session_to_parent()
KEYS: Fix bug in keyctl_session_to_parent() if parent has no session keyring
David S. Miller (5):
sparc: Provide io{read,write}{16,32}be().
irda: Correctly clean up self->ias_obj on irda_bind() failure.
tcp: Combat per-cpu skew in orphan tests.
bridge: Clear INET control block of SKBs passed into ip_fragment().
sparc64: Get rid of indirect p1275 PROM call buffer.
Divy Le Ray (1):
cxgb3: fix hot plug removal crash
Dmitry Monakhov (1):
ext4: Fix remaining racy updates of EXT4_I(inode)->i_flags
Dmitry Torokhov (1):
Input: add compat support for sysfs and /proc capabilities output
Eric Dumazet (3):
gro: fix different skb headrooms
tcp: fix three tcp sysctls tuning
rds: fix a leak of kernel memory
Eric Paris (2):
inotify: send IN_UNMOUNT events
inotify: fix inotify oneshot support
Greg Kroah-Hartman (1):
Linux 2.6.32.23
H. Peter Anvin (1):
x86: Add memory modify constraints to xchg() and cmpxchg()
Herbert Xu (2):
bridge: Clear IPCB before possible entry into IP stack
gro: Fix bogus gso_size on the first fraglist entry
Jan Kara (1):
char: Mark /dev/zero and /dev/kmem as not capable of writeback
Jarek Poplawski (1):
gro: Re-fix different skb headrooms
Jeff Moyer (1):
aio: check for multiplication overflow in do_io_submit
John W. Linville (1):
hostap_pci: set dev->base_addr during probe
Jussi Kivilinna (1):
asix: fix setting mac address for AX88772
KOSAKI Motohiro (1):
tcp: select(writefds) don't hang up when a peer close connection
Mel Gorman (2):
mm: page allocator: drain per-cpu lists after direct reclaim allocation fails
mm: page allocator: update free page counters after pages are placed on the free list
Michael Chan (1):
bnx2: Fix hang during rmmod bnx2.
Michael Cree (1):
alpha: Fix printk format errors
Nicolas Ferre (1):
AT91: change dma resource index
Patrick Simmons (1):
oprofile: Add Support for Intel CPU Family 6 / Model 22 (Intel Celeron 540)
Paul E. McKenney (1):
pid: make setpgid() system call use RCU read-side critical section
Peter Oberparleiter (1):
dasd: use correct label location for diag fba disks
Petr Tesarik (1):
IA64: Optimize ticket spinlocks in fsys_rt_sigprocmask
Ralf Baechle (2):
MIPS: uasm: Add OR instruction.
MIPS: Sibyte: Fix M3 TLB exception handler workaround.
Ryan Kuester (1):
SCSI: mptsas: fix hangs caused by ATA pass-through
Stanislaw Gruszka (1):
sched: Fix user time incorrectly accounted as system time on 32-bit
Steven J. Magnani (1):
net: Fix oops from tcp_collapse() when using splice()
Tejun Heo (1):
percpu: fix pcpu_last_unit_cpu
Tetsuo Handa (1):
UNIX: Do not loop forever at unix_autobind().
Timo Teräs (2):
r8169: fix random mdio_write failures
r8169: fix mdio_read and update mdio_write according to hw specs
Tony Luck (2):
IA64: fix siglock
guard page for stacks that grow upwards
Vlad Yasevich (1):
sctp: Do not reset the packet during sctp_packet_config().
Zhang Rui (1):
ACPI: disable _OSI(Windows 2009) on Asus K50IJ
Makefile +1 -1
@@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 32 -EXTRAVERSION = .22 +EXTRAVERSION = .23 NAME = Man-Eating Seals of Antiquity # *DOCUMENTATION*
arch/alpha/kernel/err_marvel.c +3 -3
@@ -109,7 +109,7 @@ marvel_print_err_cyc(u64 err_cyc)#define IO7__ERR_CYC__CYCLE__M (0x7) printk("%s Packet In Error: %s\n" - "%s Error in %s, cycle %ld%s%s\n", + "%s Error in %s, cycle %lld%s%s\n", err_print_prefix, packet_desc[EXTRACT(err_cyc, IO7__ERR_CYC__PACKET)], err_print_prefix,
@@ -313,7 +313,7 @@ marvel_print_po7_ugbge_sym(u64 ugbge_sym) } printk("%s Up Hose Garbage Symptom:\n" - "%s Source Port: %ld - Dest PID: %ld - OpCode: %s\n", + "%s Source Port: %lld - Dest PID: %lld - OpCode: %s\n", err_print_prefix, err_print_prefix, EXTRACT(ugbge_sym, IO7__PO7_UGBGE_SYM__UPH_SRC_PORT),
@@ -552,7 +552,7 @@ marvel_print_pox_spl_cmplt(u64 spl_cmplt)#define IO7__POX_SPLCMPLT__REM_BYTE_COUNT__M (0xfff) printk("%s Split Completion Error:\n" - "%s Source (Bus:Dev:Func): %ld:%ld:%ld\n", + "%s Source (Bus:Dev:Func): %lld:%lld:%lld\n", err_print_prefix, err_print_prefix, EXTRACT(spl_cmplt, IO7__POX_SPLCMPLT__SOURCE_BUS),
arch/arm/mach-at91/at91sam9g45_devices.c +1 -1
@@ -46,7 +46,7 @@ static struct resource hdmac_resources[] = { .end = AT91_BASE_SYS + AT91_DMA + SZ_512 - 1, .flags = IORESOURCE_MEM, }, - [2] = { + [1] = { .start = AT91SAM9G45_ID_DMA, .end = AT91SAM9G45_ID_DMA, .flags = IORESOURCE_IRQ,
arch/ia64/kernel/fsys.S +21 -9
@@ -420,22 +420,31 @@ EX(.fail_efault, ld8 r14=[r33]) // r14 <- *set ;; RSM_PSR_I(p0, r18, r19) // mask interrupt delivery - mov ar.ccv=0 andcm r14=r14,r17 // filter out SIGKILL & SIGSTOP + mov r8=EINVAL // default to EINVAL #ifdef CONFIG_SMP - mov r17=1 + // __ticket_spin_trylock(r31) + ld4 r17=[r31] ;; - cmpxchg4.acq r18=[r31],r17,ar.ccv // try to acquire the lock - mov r8=EINVAL // default to EINVAL + mov.m ar.ccv=r17 + extr.u r9=r17,17,15 + adds r19=1,r17 + extr.u r18=r17,0,15 + ;; + cmp.eq p6,p7=r9,r18 ;; +(p6) cmpxchg4.acq r9=[r31],r19,ar.ccv +(p6) dep.z r20=r19,1,15 // next serving ticket for unlock +(p7) br.cond.spnt.many .lock_contention + ;; + cmp4.eq p0,p7=r9,r17 + adds r31=2,r31 +(p7) br.cond.spnt.many .lock_contention ld8 r3=[r2] // re-read current->blocked now that we hold the lock - cmp4.ne p6,p0=r18,r0 -(p6) br.cond.spnt.many .lock_contention ;; #else ld8 r3=[r2] // re-read current->blocked now that we hold the lock - mov r8=EINVAL // default to EINVAL #endif add r18=IA64_TASK_PENDING_OFFSET+IA64_SIGPENDING_SIGNAL_OFFSET,r16 add r19=IA64_TASK_SIGNAL_OFFSET,r16
@@ -490,7 +499,9 @@ EX(.fail_efault, ld8 r14=[r33]) // r14 <- *set (p6) br.cond.spnt.few 1b // yes -> retry #ifdef CONFIG_SMP - st4.rel [r31]=r0 // release the lock + // __ticket_spin_unlock(r31) + st2.rel [r31]=r20 + mov r20=0 // i must not leak kernel bits... #endif SSM_PSR_I(p0, p9, r31) ;;
@@ -512,7 +523,8 @@ EX(.fail_efault, (p15) st8 [r34]=r3) .sig_pending: #ifdef CONFIG_SMP - st4.rel [r31]=r0 // release the lock + // __ticket_spin_unlock(r31) + st2.rel [r31]=r20 // release the lock #endif SSM_PSR_I(p0, p9, r17) ;;
arch/mips/include/asm/atomic.h +12 -12
@@ -434,7 +434,7 @@ static __inline__ void atomic64_add(long i, atomic64_t * v) __asm__ __volatile__(" .set mips3 \n" "1: lld %0, %1 # atomic64_add \n" -" addu %0, %2 \n" +" daddu %0, %2 \n" " scd %0, %1 \n" " beqzl %0, 1b \n" " .set mips0 \n"
@@ -446,7 +446,7 @@ static __inline__ void atomic64_add(long i, atomic64_t * v) __asm__ __volatile__(" .set mips3 \n" "1: lld %0, %1 # atomic64_add \n" -" addu %0, %2 \n" +" daddu %0, %2 \n" " scd %0, %1 \n" " beqz %0, 2f \n" " .subsection 2 \n"
@@ -479,7 +479,7 @@ static __inline__ void atomic64_sub(long i, atomic64_t * v) __asm__ __volatile__(" .set mips3 \n" "1: lld %0, %1 # atomic64_sub \n" -" subu %0, %2 \n" +" dsubu %0, %2 \n" " scd %0, %1 \n" " beqzl %0, 1b \n" " .set mips0 \n"
@@ -491,7 +491,7 @@ static __inline__ void atomic64_sub(long i, atomic64_t * v) __asm__ __volatile__(" .set mips3 \n" "1: lld %0, %1 # atomic64_sub \n" -" subu %0, %2 \n" +" dsubu %0, %2 \n" " scd %0, %1 \n" " beqz %0, 2f \n" " .subsection 2 \n"
@@ -524,10 +524,10 @@ static __inline__ long atomic64_add_return(long i, atomic64_t * v) __asm__ __volatile__(" .set mips3 \n" "1: lld %1, %2 # atomic64_add_return \n" -" addu %0, %1, %3 \n" +" daddu %0, %1, %3 \n" " scd %0, %2 \n" " beqzl %0, 1b \n" -" addu %0, %1, %3 \n" +" daddu %0, %1, %3 \n" " .set mips0 \n" :"=&r" (result),"=&r" (temp),"=m" (v->counter) : "Ir" (i), "m" (v->counter)
@@ -538,10 +538,10 @@ static __inline__ long atomic64_add_return(long i, atomic64_t * v) __asm__ __volatile__(" .set mips3 \n" "1: lld %1, %2 # atomic64_add_return \n" -" addu %0, %1, %3 \n" +" daddu %0, %1, %3 \n" " scd %0, %2 \n" " beqz %0, 2f \n" -" addu %0, %1, %3 \n" +" daddu %0, %1, %3 \n" " .subsection 2 \n" "2: b 1b \n" " .previous \n"
@@ -576,10 +576,10 @@ static __inline__ long atomic64_sub_return(long i, atomic64_t * v) __asm__ __volatile__(" .set mips3 \n" "1: lld %1, %2 # atomic64_sub_return \n" -" subu %0, %1, %3 \n" +" dsubu %0, %1, %3 \n" " scd %0, %2 \n" " beqzl %0, 1b \n" -" subu %0, %1, %3 \n" +" dsubu %0, %1, %3 \n" " .set mips0 \n" :"=&r" (result),"=&r" (temp),"=m" (v->counter) : "Ir" (i), "m" (v->counter)
@@ -590,10 +590,10 @@ static __inline__ long atomic64_sub_return(long i, atomic64_t * v) __asm__ __volatile__(" .set mips3 \n" "1: lld %1, %2 # atomic64_sub_return \n" -" subu %0, %1, %3 \n" +" dsubu %0, %1, %3 \n" " scd %0, %2 \n" " beqz %0, 2f \n" -" subu %0, %1, %3 \n" +" dsubu %0, %1, %3 \n" " .subsection 2 \n" "2: b 1b \n" " .previous \n"
arch/mips/mm/tlbex.c +16 -6
@@ -725,10 +725,15 @@ static void __cpuinit build_r4000_tlb_refill_handler(void)* create the plain linear handler */ if (bcm1250_m3_war ()) { -UASM_i_MFC0 (&p,K0 ,C0_BADVADDR ); -UASM_i_MFC0 (&p,K1 ,C0_ENTRYHI ); +unsigned int segbits =44 ; + +uasm_i_dmfc0 (&p,K0 ,C0_BADVADDR ); +uasm_i_dmfc0 (&p,K1 ,C0_ENTRYHI );uasm_i_xor (&p,K0 ,K0 ,K1 ); -UASM_i_SRL (&p,K0 ,K0 ,PAGE_SHIFT +1 ); +uasm_i_dsrl32 (&p,K1 ,K0 ,62 -32 ); +uasm_i_dsrl (&p,K0 ,K0 ,12 +1 ); +uasm_i_dsll32 (&p,K0 ,K0 ,64 +12 +1 - segbits -32 ); +uasm_i_or (&p,K0 ,K0 ,K1 );uasm_il_bnez (&p, &r,K0 , label_leave);/* No need for uasm_i_nop */ }
@@ -1242,10 +1247,15 @@ static void __cpuinit build_r4000_tlb_load_handler(void)memset (relocs,0 ,sizeof (relocs));if (bcm1250_m3_war ()) { -UASM_i_MFC0 (&p,K0 ,C0_BADVADDR ); -UASM_i_MFC0 (&p,K1 ,C0_ENTRYHI ); +unsigned int segbits =44 ; + +uasm_i_dmfc0 (&p,K0 ,C0_BADVADDR ); +uasm_i_dmfc0 (&p,K1 ,C0_ENTRYHI );uasm_i_xor (&p,K0 ,K0 ,K1 ); -UASM_i_SRL (&p,K0 ,K0 ,PAGE_SHIFT +1 ); +uasm_i_dsrl32 (&p,K1 ,K0 ,62 -32 ); +uasm_i_dsrl (&p,K0 ,K0 ,12 +1 ); +uasm_i_dsll32 (&p,K0 ,K0 ,64 +12 +1 - segbits -32 ); +uasm_i_or (&p,K0 ,K0 ,K1 );uasm_il_bnez (&p, &r,K0 , label_leave);/* No need for uasm_i_nop */ }
arch/mips/mm/uasm.c +3 -1
@@ -62,7 +62,7 @@ enum opcode { insn_dmtc0, insn_dsll, insn_dsll32, insn_dsra, insn_dsrl, insn_dsrl32, insn_dsubu, insn_eret, insn_j, insn_jal, insn_jr, insn_ld, insn_ll, insn_lld, insn_lui, insn_lw, insn_mfc0, - insn_mtc0, insn_ori, insn_pref, insn_rfe, insn_sc, insn_scd, + insn_mtc0, insn_or, insn_ori, insn_pref, insn_rfe, insn_sc, insn_scd, insn_sd, insn_sll, insn_sra, insn_srl, insn_subu, insn_sw, insn_tlbp, insn_tlbwi, insn_tlbwr, insn_xor, insn_xori };
@@ -116,6 +116,7 @@ static struct insn insn_table[] __cpuinitdata = { { insn_lw, M(lw_op, 0, 0, 0, 0, 0), RS | RT | SIMM }, { insn_mfc0, M(cop0_op, mfc_op, 0, 0, 0, 0), RT | RD | SET}, { insn_mtc0, M(cop0_op, mtc_op, 0, 0, 0, 0), RT | RD | SET}, + { insn_or, M(spec_op, 0, 0, 0, 0, or_op), RS | RT | RD }, { insn_ori, M(ori_op, 0, 0, 0, 0, 0), RS | RT | UIMM }, { insn_pref, M(pref_op, 0, 0, 0, 0, 0), RS | RT | SIMM }, { insn_rfe, M(cop0_op, cop_op, 0, 0, 0, rfe_op), 0 },
@@ -362,6 +363,7 @@ I_u2s3u1(_lw) I_u1u2u3(_mfc0) I_u1u2u3(_mtc0) I_u2u1u3(_ori) +I_u3u1u2(_or) I_u2s3u1(_pref) I_0(_rfe) I_u2s3u1(_sc)
arch/mips/mm/uasm.h +1 -0
@@ -78,6 +78,7 @@ Ip_u2s3u1(_lw);Ip_u1u2u3 (_mfc0);Ip_u1u2u3 (_mtc0);Ip_u2u1u3 (_ori); +Ip_u3u1u2 (_or);Ip_u2s3u1 (_pref);Ip_0 (_rfe);Ip_u2s3u1 (_sc);
arch/mips/mti-malta/malta-pci.c +2 -0
@@ -247,6 +247,8 @@ void __init mips_pcibios_init(void) iomem_resource.end &=0xfffffffffULL ;/* 64 GB */ ioport_resource.end = controller->io_resource->end; + controller->io_map_base = mips_io_port_base; +register_pci_controller (controller); }
arch/mips/nxp/pnx8550/common/pci.c +1 -0
@@ -44,6 +44,7 @@ extern struct pci_ops pnx8550_pci_ops;static struct pci_controller pnx8550_controller = { .pci_ops = &pnx8550_pci_ops, + .io_map_base =PNX8550_PORT_BASE , .io_resource = &pci_io_resource, .mem_resource = &pci_mem_resource, };
arch/mips/nxp/pnx8550/common/setup.c +1 -1
@@ -113,7 +113,7 @@ void __init plat_mem_setup(void)PNX8550_GLB2_ENAB_INTA_O =0 ;/* IO/MEM resources. */ -set_io_port_base (KSEG1 ); +set_io_port_base (PNX8550_PORT_BASE ); ioport_resource.start =0 ; ioport_resource.end = ~0 ; iomem_resource.start =0 ;
arch/mips/pci/ops-pmcmsp.c +1 -0
@@ -944,6 +944,7 @@ static struct pci_controller msp_pci_controller = { .pci_ops = &msp_pci_ops, .mem_resource = &pci_mem_resource, .mem_offset = 0, + .io_map_base = MSP_PCI_IOSPACE_BASE, .io_resource = &pci_io_resource, .io_offset = 0 };
arch/mips/pci/pci-yosemite.c +1 -0
@@ -54,6 +54,7 @@ static int __init pmc_yosemite_setup(void)panic (ioremap_failed);set_io_port_base (io_v_base); + py_controller.io_map_base = io_v_base;TITAN_WRITE (RM9000x2_OCD_LKM7,TITAN_READ (RM9000x2_OCD_LKM7) |1 ); ioport_resource.end =TITAN_IO_SIZE -1 ;
arch/sparc/include/asm/io_32.h +4 -0
@@ -249,10 +249,14 @@ extern void iounmap(volatile void __iomem *addr);#define ioread8 (X ) readb(X)#define ioread16 (X ) readw(X) +#define ioread16be (X ) __raw_readw(X)#define ioread32 (X ) readl(X) +#define ioread32be (X ) __raw_readl(X)#define iowrite8 (val,X ) writeb(val,X)#define iowrite16 (val,X ) writew(val,X) +#define iowrite16be (val,X ) __raw_writew(val,X)#define iowrite32 (val,X ) writel(val,X) +#define iowrite32be (val,X ) __raw_writel(val,X)static inline void ioread8_rep (void __iomem *port,void *buf,unsigned long count) {
arch/sparc/include/asm/io_64.h +4 -0
@@ -468,10 +468,14 @@ static inline void iounmap(volatile void __iomem *addr)#define ioread8 (X ) readb(X)#define ioread16 (X ) readw(X) +#define ioread16be (X ) __raw_readw(X)#define ioread32 (X ) readl(X) +#define ioread32be (X ) __raw_readl(X)#define iowrite8 (val,X ) writeb(val,X)#define iowrite16 (val,X ) writew(val,X) +#define iowrite16be (val,X ) __raw_writew(val,X)#define iowrite32 (val,X ) writel(val,X) +#define iowrite32be (val,X ) __raw_writel(val,X)/* Create a virtual mapping cookie for an IO port range */ extern void __iomem *ioport_map (unsigned long port,unsigned int nr);
arch/sparc/include/asm/oplib_64.h +3 -24
@@ -185,9 +185,8 @@ extern int prom_getunumber(int syndrome_code, char *buf, int buflen);/* Retain physical memory to the caller across soft resets. */ -extern unsigned long prom_retain (const char *name, -unsigned long pa_low,unsigned long pa_high, -long size,long align); +extern int prom_retain (const char *name,unsigned long size, +unsigned long align,unsigned long *paddr);/* Load explicit I/D TLB entries into the calling processor. */ extern long prom_itlb_load(unsigned long index,
@@ -287,26 +286,6 @@ extern void prom_sun4v_guest_soft_state(void);extern int prom_ihandle2path (int handle,char *buffer,int bufsize);/* Client interface level routines. */ -extern long p1275_cmd (const char *,long , ...); - -#if 0 -#define P1275_SIZE (x) ((((long)((x) / 32)) << 32) | (x)) -#else -#define P1275_SIZE (x) x -#endif - -/* We support at most 16 input and 1 output argument */ -#define P1275_ARG_NUMBER 0 -#define P1275_ARG_IN_STRING 1 -#define P1275_ARG_OUT_BUF 2 -#define P1275_ARG_OUT_32B 3 -#define P1275_ARG_IN_FUNCTION 4 -#define P1275_ARG_IN_BUF 5 -#define P1275_ARG_IN_64B 6 - -#define P1275_IN (x) ((x) & 0xf) -#define P1275_OUT (x) (((x) << 4) & 0xf0) -#define P1275_INOUT (i,o) (P1275_IN(i)|P1275_OUT(o)) -#define P1275_ARG (n,x) ((x) << ((n)*3 + 8)) +extern void p1275_cmd_direct (unsigned long *);#endif /* !(__SPARC64_OPLIB_H) */
arch/sparc/prom/cif.S +8 -8
@@ -9,18 +9,18 @@ #include <asm/thread_info.h> .text - .globl prom_cif_interface -prom_cif_interface: - sethi %hi(p1275buf), %o0 - or %o0, %lo(p1275buf), %o0 - ldx [%o0 + 0x010], %o1 ! prom_cif_stack - save %o1, -192, %sp - ldx [%i0 + 0x008], %l2 ! prom_cif_handler + .globl prom_cif_direct +prom_cif_direct: + sethi %hi(p1275buf), %o1 + or %o1, %lo(p1275buf), %o1 + ldx [%o1 + 0x0010], %o2 ! prom_cif_stack + save %o2, -192, %sp + ldx [%i1 + 0x0008], %l2 ! prom_cif_handler mov %g4, %l0 mov %g5, %l1 mov %g6, %l3 call %l2 - add %i0, 0x018, %o0 ! prom_args + mov %i0, %o0 ! prom_args mov %l0, %g4 mov %l1, %g5 mov %l3, %g6
arch/sparc/prom/console_64.c +37 -11
70 lines not on this page · raw message
arch/sparc/prom/devops_64.c +31 -5
@@ -18,16 +18,32 @@int prom_devopen (const char *dstr) { -return p1275_cmd ("open" ,P1275_ARG (0 ,P1275_ARG_IN_STRING )| -P1275_INOUT (1 ,1 ), - dstr); +unsigned long args[5 ]; + + args[0 ] = (unsigned long )"open" ; + args[1 ] =1 ; + args[2 ] =1 ; + args[3 ] = (unsigned long ) dstr; + args[4 ] = (unsigned long )-1 ; + +p1275_cmd_direct (args); + +return (int ) args[4 ]; }/* Close the device described by device handle 'dhandle'. */ int prom_devclose (int dhandle) { -p1275_cmd ("close" ,P1275_INOUT (1 ,0 ), dhandle); +unsigned long args[4 ]; + + args[0 ] = (unsigned long )"close" ; + args[1 ] =1 ; + args[2 ] =0 ; + args[3 ] = (unsigned int ) dhandle; + +p1275_cmd_direct (args); +return 0 ; }
@@ -37,5 +53,15 @@ prom_devclose(int dhandle)void prom_seek (int dhandle,unsigned int seekhi,unsigned int seeklo) { -p1275_cmd ("seek" ,P1275_INOUT (3 ,1 ), dhandle, seekhi, seeklo); +unsigned long args[7 ]; + + args[0 ] = (unsigned long )"seek" ; + args[1 ] =3 ; + args[2 ] =1 ; + args[3 ] = (unsigned int ) dhandle; + args[4 ] = seekhi; + args[5 ] = seeklo; + args[6 ] = (unsigned long )-1 ; + +p1275_cmd_direct (args); }
arch/sparc/prom/misc_64.c +220 -94
464 lines not on this page · raw message
arch/sparc/prom/p1275.c +3 -99
130 lines not on this page · raw message
arch/sparc/prom/tree_64.c +154 -56
354 lines not on this page · raw message
arch/x86/include/asm/cmpxchg_32.h +19 -46
79 lines not on this page · raw message
arch/x86/include/asm/cmpxchg_64.h +1 -3
@@ -8,13 +8,11 @@#define __xg (x) ((volatile long *)(x)) -static inline void set_64bit (volatile unsigned long *ptr,unsigned long val) +static inline void set_64bit (volatile u64 *ptr,u64 val) { *ptr = val; } -#define _set_64bit set_64bit -/* * Note: no "lock" prefix even on SMP: xchg always implies lock anyway * Note 2: xchg has side effect, so that attribute volatile is necessary,
arch/x86/oprofile/nmi_int.c +3 -1
@@ -621,7 +621,9 @@ static int __init ppro_init(char **cpu_type)case 14 : *cpu_type ="i386/core" ;break ; -case 15 :case 23 : +case 0x0f : +case 0x16 : +case 0x17 : *cpu_type ="i386/core_2" ;break ;case 0x1a :
drivers/acpi/blacklist.c +14 -0
@@ -185,6 +185,12 @@ static int __init dmi_disable_osi_vista(const struct dmi_system_id *d)acpi_osi_setup ("!Windows 2006" );return 0 ; } +static int __init dmi_disable_osi_win7 (const struct dmi_system_id *d) +{ + printk(KERN_NOTICE PREFIX "DMI detected: %s\n", d->ident); +acpi_osi_setup ("!Windows 2009" ); +return 0 ; +}static struct dmi_system_id acpi_osi_dmi_table[]__initdata = { {
@@ -211,6 +217,14 @@ static struct dmi_system_id acpi_osi_dmi_table[] __initdata = { DMI_MATCH(DMI_PRODUCT_NAME, "Sony VGN-SR290J"), }, }, + { + .callback = dmi_disable_osi_win7, + .ident = "ASUS K50IJ", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "K50IJ"), + }, + },/* * BIOS invocation of _OSI(Linux) is almost always a BIOS bug.
drivers/ata/pata_pdc202xx_old.c +14 -1
@@ -2,7 +2,7 @@* pata_pdc202xx_old.c - Promise PDC202xx PATA for new ATA layer * (C) 2005 Red Hat Inc * Alan Cox <[email protected]> -* (C) 2007,2009 Bartlomiej Zolnierkiewicz +* (C) 2007,2009,2010 Bartlomiej Zolnierkiewicz * * Based in part on linux/drivers/ide/pci/pdc202xx_old.c *
@@ -35,6 +35,15 @@ static int pdc2026x_cable_detect(struct ata_port *ap)return ATA_CBL_PATA80 ; } +static void pdc202xx_exec_command (struct ata_port *ap, +const struct ata_taskfile *tf) +{ +DPRINTK ("ata%u: cmd 0x%X\n" , ap->print_id, tf->command); + +iowrite8 (tf->command, ap->ioaddr.command_addr); +ndelay (400 ); +} +/** * pdc202xx_configure_piomode - set chip PIO timing * @ap: ATA interface
@@ -271,6 +280,8 @@ static struct ata_port_operations pdc2024x_port_ops = { .cable_detect = ata_cable_40wire, .set_piomode = pdc202xx_set_piomode, .set_dmamode = pdc202xx_set_dmamode, + + .sff_exec_command = pdc202xx_exec_command, };static struct ata_port_operations pdc2026x_port_ops = {
@@ -284,6 +295,8 @@ static struct ata_port_operations pdc2026x_port_ops = { .dev_config = pdc2026x_dev_config, .port_start = pdc2026x_port_start, + + .sff_exec_command = pdc202xx_exec_command, };static int pdc202xx_init_one (struct pci_dev *dev,const struct pci_device_id *id)
drivers/char/agp/sis-agp.c +0 -8
@@ -415,14 +415,6 @@ static struct pci_device_id agp_sis_pci_table[] = { .subvendor = PCI_ANY_ID, .subdevice = PCI_ANY_ID, }, - { - .class = (PCI_CLASS_BRIDGE_HOST << 8), - .class_mask = ~0, - .vendor = PCI_VENDOR_ID_SI, - .device = PCI_DEVICE_ID_SI_760, - .subvendor = PCI_ANY_ID, - .subdevice = PCI_ANY_ID, - }, { } };
drivers/char/mem.c +2 -1
@@ -822,10 +822,11 @@ static const struct file_operations zero_fops = {/* * capabilities for /dev/zero * - permits private mappings, "copies" are taken of the source of zeros +* - no writeback happens */ static struct backing_dev_info zero_bdi = { .name ="char/mem" , - .capabilities =BDI_CAP_MAP_COPY , + .capabilities =BDI_CAP_MAP_COPY |BDI_CAP_NO_ACCT_AND_WRITEBACK , };static const struct file_operations full_fops = {
drivers/clocksource/sh_tmu.c +11 -9
@@ -199,16 +199,8 @@ static cycle_t sh_tmu_clocksource_read(struct clocksource *cs)static int sh_tmu_clocksource_enable (struct clocksource *cs) {struct sh_tmu_priv *p =cs_to_sh_tmu (cs); -int ret; - - ret =sh_tmu_enable (p); -if (ret) -return ret; -/* TODO: calculate good shift from rate and counter bit width */ - cs->shift =10 ; - cs->mult =clocksource_hz2mult (p->rate, cs->shift); -return 0 ; +return sh_tmu_enable (p); }static void sh_tmu_clocksource_disable (struct clocksource *cs)
@@ -228,6 +220,16 @@ static int sh_tmu_register_clocksource(struct sh_tmu_priv *p, cs->disable = sh_tmu_clocksource_disable; cs->mask =CLOCKSOURCE_MASK (32 ); cs->flags =CLOCK_SOURCE_IS_CONTINUOUS ; + +/* clk_get_rate() needs an enabled clock */ +clk_enable (p->clk); +/* channel will be configured at parent clock / 4 */ + p->rate =clk_get_rate (p->clk) /4 ; +clk_disable (p->clk); +/* TODO: calculate good shift from rate and counter bit width */ + cs->shift =10 ; + cs->mult =clocksource_hz2mult (p->rate, cs->shift); +pr_info ("sh_tmu: %s used as clock source\n" , cs->name);clocksource_register (cs);return 0 ;
drivers/input/input.c +71 -15
125 lines not on this page · raw message
drivers/message/fusion/mptscsih.c +2 -0
@@ -2439,6 +2439,8 @@ mptscsih_slave_configure(struct scsi_device *sdev) ioc->name,sdev->tagged_supported, sdev->simple_tags, sdev->ordered_tags)); +blk_queue_dma_alignment (sdev->request_queue,512 -1 ); +return 0 ; }
drivers/net/3c503.c +30 -11
58 lines not on this page · raw message
drivers/net/bnx2.c +17 -3
@@ -247,6 +247,9 @@ static const struct flash_spec flash_5709 = {MODULE_DEVICE_TABLE (pci, bnx2_pci_tbl); +static void bnx2_init_napi (struct bnx2 *bp); +static void bnx2_del_napi (struct bnx2 *bp); +static inline u32 bnx2_tx_avail (struct bnx2 *bp,struct bnx2_tx_ring_info *txr) {u32 diff;
@@ -6173,6 +6176,7 @@ bnx2_open(struct net_device *dev)bnx2_disable_int (bp);bnx2_setup_int_mode (bp, disable_msi); +bnx2_init_napi (bp);bnx2_napi_enable (bp); rc =bnx2_alloc_mem (bp);if (rc)
@@ -6234,6 +6238,7 @@ open_err:bnx2_free_skbs (bp);bnx2_free_irq (bp);bnx2_free_mem (bp); +bnx2_del_napi (bp);return rc; }
@@ -6441,6 +6446,7 @@ bnx2_close(struct net_device *dev)bnx2_free_irq (bp);bnx2_free_skbs (bp);bnx2_free_mem (bp); +bnx2_del_napi (bp); bp->link_up =0 ;netif_carrier_off (bp->dev);bnx2_set_power_state (bp, PCI_D3hot);
@@ -8016,12 +8022,21 @@ bnx2_bus_string(struct bnx2 *bp, char *str)return str; } -static void __devinit +static void +bnx2_del_napi (struct bnx2 *bp) +{ +int i; + +for (i =0 ; i < bp->irq_nvecs; i++) +netif_napi_del (&bp->bnx2_napi[i].napi); +} + +static void bnx2_init_napi (struct bnx2 *bp) {int i; -for (i =0 ; i <BNX2_MAX_MSIX_VEC ; i++) { +for (i =0 ; i < bp->irq_nvecs; i++) {struct bnx2_napi *bnapi = &bp->bnx2_napi[i];int (*poll)(struct napi_struct *,int );
@@ -8090,7 +8105,6 @@ bnx2_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) dev->ethtool_ops = &bnx2_ethtool_ops; bp =netdev_priv (dev); -bnx2_init_napi (bp);pci_set_drvdata (pdev, dev);
drivers/net/bonding/bond_3ad.c +3 -0
@@ -2451,6 +2451,9 @@ int bond_3ad_lacpdu_recv(struct sk_buff *skb, struct net_device *dev, struct pacif (!(dev->flags &IFF_MASTER )) goto out; +if (!pskb_may_pull (skb,sizeof (struct lacpdu ))) + goto out; +read_lock (&bond->lock); slave =bond_get_slave_by_dev ((struct bonding *)netdev_priv (dev), orig_dev);
drivers/net/bonding/bond_alb.c +3 -0
@@ -370,6 +370,9 @@ static int rlb_arp_recv(struct sk_buff *skb, struct net_device *bond_dev, struct goto out; } +if (!pskb_may_pull (skb,arp_hdr_len (bond_dev))) + goto out; +if (skb->len <sizeof (struct arp_pkt )) {pr_debug ("Packet is too small to be an ARP\n" ); goto out;
drivers/net/cxgb3/cxgb3_main.c +3 -0
@@ -1274,6 +1274,7 @@ static void cxgb_down(struct adapter *adapter)free_irq_resources (adapter);quiesce_rx (adapter); +t3_sge_stop (adapter);flush_workqueue (cxgb3_wq);/* wait for external IRQ handler */ }
@@ -2274,6 +2275,8 @@ static int cxgb_extension_ioctl(struct net_device *dev, void __user *useraddr)case CHELSIO_GET_QSET_NUM :{struct ch_reg edata; +memset (&edata,0 ,sizeof (struct ch_reg )); + edata.cmd =CHELSIO_GET_QSET_NUM ; edata.val = pi->nqsets;if (copy_to_user (useraddr, &edata,sizeof (edata)))
drivers/net/eql.c +2 -0
@@ -554,6 +554,8 @@ static int eql_g_master_cfg(struct net_device *dev, master_config_t __user *mcp)equalizer_t *eql;master_config_t mc; +memset (&mc,0 ,sizeof (master_config_t)); +if (eql_is_master (dev)) { eql =netdev_priv (dev); mc.max_slaves = eql->max_slaves;
drivers/net/r8169.c +11 -0
@@ -557,6 +557,11 @@ static void mdio_write(void __iomem *ioaddr, int reg_addr, int value)break ;udelay (25 ); } +/* +* According to hardware specs a 20us delay is required after write +* complete indication, but before sending next command. +*/ +udelay (20 ); }static int mdio_read (void __iomem *ioaddr,int reg_addr)
@@ -576,6 +581,12 @@ static int mdio_read(void __iomem *ioaddr, int reg_addr) }udelay (25 ); } +/* +* According to hardware specs a 20us delay is required after read +* complete indication, but before sending next command. +*/ +udelay (20 ); +return value; }
drivers/net/usb/asix.c +28 -2
@@ -54,6 +54,7 @@ static const char driver_name [] = "asix";#define AX_CMD_WRITE_IPG0 0x12#define AX_CMD_WRITE_IPG1 0x13#define AX_CMD_READ_NODE_ID 0x13 +#define AX_CMD_WRITE_NODE_ID 0x14#define AX_CMD_WRITE_IPG2 0x14#define AX_CMD_WRITE_MULTI_FILTER 0x16#define AX88172_CMD_READ_NODE_ID 0x17
@@ -165,6 +166,7 @@ static const char driver_name [] = "asix";/* This structure cannot exceed sizeof(unsigned long [5]) AKA 20 bytes */ struct asix_data {u8 multi_filter[AX_MCAST_FILTER_SIZE ]; +u8 mac_addr[ETH_ALEN ];u8 phymode;u8 ledmode;u8 eeprom_len;
@@ -728,6 +730,30 @@ static int asix_ioctl (struct net_device *net, struct ifreq *rq, int cmd)return generic_mii_ioctl (&dev->mii,if_mii (rq), cmd,NULL ); } +static int asix_set_mac_address (struct net_device *net,void *p) +{ +struct usbnet *dev =netdev_priv (net); +struct asix_data *data = (struct asix_data *)&dev->data; +struct sockaddr *addr = p; + +if (netif_running (net)) +return -EBUSY ; +if (!is_valid_ether_addr (addr->sa_data)) +return -EADDRNOTAVAIL ; + +memcpy (net->dev_addr, addr->sa_data,ETH_ALEN ); + +/* We use the 20 byte dev->data +* for our 6 byte mac buffer +* to avoid allocating memory that +* is tricky to free later */ +memcpy (data->mac_addr, addr->sa_data,ETH_ALEN ); +asix_write_cmd_async (dev,AX_CMD_WRITE_NODE_ID ,0 ,0 ,ETH_ALEN , + data->mac_addr); + +return 0 ; +} +/* We need to override some ethtool_ops so we require our own structure so we don't interfere with other usbnet devices that may be connected at the same time. */
@@ -915,7 +941,7 @@ static const struct net_device_ops ax88772_netdev_ops = { .ndo_start_xmit = usbnet_start_xmit, .ndo_tx_timeout = usbnet_tx_timeout, .ndo_change_mtu = usbnet_change_mtu, - .ndo_set_mac_address = eth_mac_addr, + .ndo_set_mac_address = asix_set_mac_address, .ndo_validate_addr = eth_validate_addr, .ndo_do_ioctl = asix_ioctl, .ndo_set_multicast_list = asix_set_multicast,
@@ -1208,7 +1234,7 @@ static const struct net_device_ops ax88178_netdev_ops = { .ndo_stop = usbnet_stop, .ndo_start_xmit = usbnet_start_xmit, .ndo_tx_timeout = usbnet_tx_timeout, - .ndo_set_mac_address = eth_mac_addr, + .ndo_set_mac_address = asix_set_mac_address, .ndo_validate_addr = eth_validate_addr, .ndo_set_multicast_list = asix_set_multicast, .ndo_do_ioctl = asix_ioctl,
drivers/net/usb/hso.c +2 -0
@@ -1634,6 +1634,8 @@ static int hso_get_count(struct hso_serial *serial,struct uart_icount cnow;struct hso_tiocmget *tiocmget = serial->tiocmget; +memset (&icount,0 ,sizeof (struct serial_icounter_struct )); +if (!tiocmget)return -ENOENT ;spin_lock_irq (&serial->serial_lock);
drivers/net/wireless/hostap/hostap_pci.c +1 -0
@@ -329,6 +329,7 @@ static int prism2_pci_probe(struct pci_dev *pdev, dev->irq = pdev->irq; hw_priv->mem_start = mem; + dev->base_addr = (unsigned long ) mem;prism2_pci_cor_sreset (local);
drivers/pci/intel-iommu.c +43 -47
108 lines not on this page · raw message
drivers/staging/vt6655/wpactl.c +8 -3
@@ -767,9 +767,14 @@ static int wpa_set_associate(PSDevice pDevice,DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO "wpa_ie_len = %d\n" , param->u.wpa_associate.wpa_ie_len); -if (param->u.wpa_associate.wpa_ie && -copy_from_user (&abyWPAIE[0 ], param->u.wpa_associate.wpa_ie, param->u.wpa_associate.wpa_ie_len)) -return -EINVAL ; +if (param->u.wpa_associate.wpa_ie_len) { +if (!param->u.wpa_associate.wpa_ie) +return -EINVAL ; +if (param->u.wpa_associate.wpa_ie_len >sizeof (abyWPAIE)) +return -EINVAL ; +if (copy_from_user (&abyWPAIE[0 ], param->u.wpa_associate.wpa_ie, param->u.wpa_associate.wpa_ie_len)) +return -EFAULT ; + }if (param->u.wpa_associate.mode ==1 ) pMgmt->eConfigMode =WMAC_CONFIG_IBSS_STA ;
drivers/usb/serial/mos7720.c +3 -0
@@ -1466,6 +1466,9 @@ static int mos7720_ioctl(struct tty_struct *tty, struct file *file,case TIOCGICOUNT : cnow = mos7720_port->icount; + +memset (&icount,0 ,sizeof (struct serial_icounter_struct )); + icount.cts = cnow.cts; icount.dsr = cnow.dsr; icount.rng = cnow.rng;
drivers/usb/serial/mos7840.c +3 -0
@@ -2287,6 +2287,9 @@ static int mos7840_ioctl(struct tty_struct *tty, struct file *file,case TIOCGICOUNT : cnow = mos7840_port->icount;smp_rmb (); + +memset (&icount,0 ,sizeof (struct serial_icounter_struct )); + icount.cts = cnow.cts; icount.dsr = cnow.dsr; icount.rng = cnow.rng;
drivers/video/sis/sis_main.c +3 -0
@@ -1701,6 +1701,9 @@ static int sisfb_ioctl(struct fb_info *info, unsigned int cmd,break ;case FBIOGET_VBLANK : + +memset (&sisvbblank,0 ,sizeof (struct fb_vblank )); + sisvbblank.count =0 ; sisvbblank.flags =sisfb_setupvbblankflags (ivideo, &sisvbblank.vcount, &sisvbblank.hcount);
drivers/video/via/ioctl.c +2 -0
@@ -25,6 +25,8 @@ int viafb_ioctl_get_viafb_info(u_long arg) {struct viafb_ioctl_info viainfo; +memset (&viainfo,0 ,sizeof (struct viafb_ioctl_info )); + viainfo.viafb_id =VIAID ; viainfo.vendor_id =PCI_VIA_VENDOR_ID ;
fs/aio.c +3 -0
@@ -1639,6 +1639,9 @@ SYSCALL_DEFINE3(io_submit, aio_context_t, ctx_id, long, nr,if (unlikely (nr <0 ))return -EINVAL ; +if (unlikely (nr >LONG_MAX /sizeof (*iocbpp))) + nr =LONG_MAX /sizeof (*iocbpp); +if (unlikely (!access_ok (VERIFY_READ , iocbpp, (nr*sizeof (*iocbpp)))))return -EFAULT ;
fs/char_dev.c +3 -1
@@ -39,7 +39,9 @@ struct backing_dev_info directly_mappable_cdev_bdi = {#endif /* permit direct mmap, for read, write or exec */ BDI_CAP_MAP_DIRECT | - BDI_CAP_READ_MAP | BDI_CAP_WRITE_MAP | BDI_CAP_EXEC_MAP), +BDI_CAP_READ_MAP |BDI_CAP_WRITE_MAP |BDI_CAP_EXEC_MAP | +/* no writeback happens */ + BDI_CAP_NO_ACCT_AND_WRITEBACK), };static struct kobj_map *cdev_map;
fs/ext4/inode.c +23 -17
@@ -4815,20 +4815,26 @@ void ext4_set_inode_flags(struct inode *inode)/* Propagate flags from i_flags to EXT4_I(inode)->i_flags */ void ext4_get_inode_flags (struct ext4_inode_info *ei) { -unsigned int flags = ei->vfs_inode.i_flags; - - ei->i_flags &= ~(EXT4_SYNC_FL |EXT4_APPEND_FL | -EXT4_IMMUTABLE_FL |EXT4_NOATIME_FL |EXT4_DIRSYNC_FL ); -if (flags &S_SYNC ) - ei->i_flags |=EXT4_SYNC_FL ; -if (flags &S_APPEND ) - ei->i_flags |=EXT4_APPEND_FL ; -if (flags &S_IMMUTABLE ) - ei->i_flags |=EXT4_IMMUTABLE_FL ; -if (flags &S_NOATIME ) - ei->i_flags |=EXT4_NOATIME_FL ; -if (flags &S_DIRSYNC ) - ei->i_flags |=EXT4_DIRSYNC_FL ; +unsigned int vfs_fl; +unsigned long old_fl, new_fl; + +do { + vfs_fl = ei->vfs_inode.i_flags; + old_fl = ei->i_flags; + new_fl = old_fl & ~(EXT4_SYNC_FL |EXT4_APPEND_FL | +EXT4_IMMUTABLE_FL |EXT4_NOATIME_FL | +EXT4_DIRSYNC_FL ); +if (vfs_fl &S_SYNC ) + new_fl |=EXT4_SYNC_FL ; +if (vfs_fl &S_APPEND ) + new_fl |=EXT4_APPEND_FL ; +if (vfs_fl &S_IMMUTABLE ) + new_fl |=EXT4_IMMUTABLE_FL ; +if (vfs_fl &S_NOATIME ) + new_fl |=EXT4_NOATIME_FL ; +if (vfs_fl &S_DIRSYNC ) + new_fl |=EXT4_DIRSYNC_FL ; + }while (cmpxchg (&ei->i_flags, old_fl, new_fl) != old_fl); } static blkcnt_t ext4_inode_blocks(struct ext4_inode *raw_inode,
@@ -5067,7 +5073,7 @@ static int ext4_inode_blocks_set(handle_t *handle,*/ raw_inode->i_blocks_lo =cpu_to_le32 (i_blocks); raw_inode->i_blocks_high =0 ; - ei->i_flags &= ~EXT4_HUGE_FILE_FL ; +ext4_clear_inode_flag (inode,EXT4_INODE_HUGE_FILE );return 0 ; }if (!EXT4_HAS_RO_COMPAT_FEATURE (sb,EXT4_FEATURE_RO_COMPAT_HUGE_FILE ))
@@ -5080,9 +5086,9 @@ static int ext4_inode_blocks_set(handle_t *handle,*/ raw_inode->i_blocks_lo =cpu_to_le32 (i_blocks); raw_inode->i_blocks_high =cpu_to_le16 (i_blocks >>32 ); - ei->i_flags &= ~EXT4_HUGE_FILE_FL ; +ext4_clear_inode_flag (inode,EXT4_INODE_HUGE_FILE ); }else { - ei->i_flags |=EXT4_HUGE_FILE_FL ; +ext4_set_inode_flag (inode,EXT4_INODE_HUGE_FILE );/* i_block is stored in file system block size */ i_blocks = i_blocks >> (inode->i_blkbits -9 ); raw_inode->i_blocks_lo =cpu_to_le32 (i_blocks);
fs/notify/inotify/inotify_fsnotify.c +3 -0
@@ -72,6 +72,9 @@ static int inotify_handle_event(struct fsnotify_group *group, struct fsnotify_ev ret =0 ; } +if (entry->mask &IN_ONESHOT ) +fsnotify_destroy_mark_by_entry (entry); +/* * If we hold the entry until after the event is on the queue * IN_IGNORED won't be able to pass this event in the queue
fs/notify/inotify/inotify_user.c +5 -2
@@ -106,8 +106,11 @@ static inline __u32 inotify_arg_to_mask(u32 arg) {__u32 mask; -/* everything should accept their own ignored and cares about children */ - mask = (FS_IN_IGNORED |FS_EVENT_ON_CHILD ); +/* +* everything should accept their own ignored, cares about children, +* and should receive events when the inode is unmounted +*/ + mask = (FS_IN_IGNORED |FS_EVENT_ON_CHILD |FS_UNMOUNT );/* mask off the flags used to open the fd */ mask |= (arg & (IN_ALL_EVENTS |IN_ONESHOT ));
fs/partitions/ibm.c +12 -1
@@ -74,6 +74,7 @@ ibm_partition(struct parsed_partitions *state, struct block_device *bdev) } *label;unsigned char *data;Sector sect; +sector_t labelsect; res =0 ; blocksize =bdev_logical_block_size (bdev);
@@ -98,9 +99,19 @@ ibm_partition(struct parsed_partitions *state, struct block_device *bdev) goto out_freeall;/* +* Special case for FBA disks: label sector does not depend on +* blocksize. +*/ +if ((info->cu_type ==0x6310 && info->dev_type ==0x9336 ) || + (info->cu_type ==0x3880 && info->dev_type ==0x3370 )) + labelsect = info->label_block; +else + labelsect = info->label_block * (blocksize >>9 ); + +/* * Get volume label, extract name and type. */ - data =read_dev_sector (bdev, info->label_block*(blocksize/512 ), §); + data =read_dev_sector (bdev, labelsect, §);if (data ==NULL ) goto out_readerr;
fs/xfs/linux-2.6/xfs_ioctl.c +2 -0
@@ -789,6 +789,8 @@ xfs_ioc_fsgetxattr( {struct fsxattr fa; +memset (&fa,0 ,sizeof (struct fsxattr )); +xfs_ilock (ip,XFS_ILOCK_SHARED ); fa.fsx_xflags =xfs_ip2xflags (ip); fa.fsx_extsize = ip->i_d.di_extsize << ip->i_mount->m_sb.sb_blocklog;
include/linux/mm.h +7 -1
@@ -77,7 +77,11 @@ extern unsigned int kobjsize(const void *objp);#define VM_MAYSHARE 0x00000080#define VM_GROWSDOWN 0x00000100/* general info on the segment */ +#if defined(CONFIG_STACK_GROWSUP ) || defined(CONFIG_IA64 )#define VM_GROWSUP 0x00000200 +#else +#define VM_GROWSUP 0x00000000 +#endif #define VM_PFNMAP 0x00000400/* Page-ranges managed without "struct page", just pure PFN */ #define VM_DENYWRITE 0x00000800/* ETXTBSY on write attempts.. */
@@ -1195,8 +1199,10 @@ unsigned long ra_submit(struct file_ra_state *ra,/* Do stack extension */ extern int expand_stack (struct vm_area_struct *vma,unsigned long address); -#ifdef CONFIG_IA64 +#if VM_GROWSUP extern int expand_upwards (struct vm_area_struct *vma,unsigned long address); +#else +#define expand_upwards (vma, address) do { } while (0)#endif extern int expand_stack_downwards (struct vm_area_struct *vma,unsigned long address);
include/linux/mmzone.h +13 -0
@@ -290,6 +290,13 @@ struct zone {unsigned long watermark[NR_WMARK ];/* +* When free pages are below this point, additional steps are taken +* when reading the number of free pages to avoid per-cpu counter +* drift allowing watermarks to be breached +*/ +unsigned long percpu_drift_mark; + +/* * We don't know if the memory that we're going to allocate will be freeable * or/and it will be released eventually, so to avoid totally wasting several * GB of ram we must reserve some of the lower zone memory (otherwise we risk
@@ -460,6 +467,12 @@ static inline int zone_is_oom_locked(const struct zone *zone)return test_bit (ZONE_OOM_LOCKED , &zone->flags); } +#ifdef CONFIG_SMP +unsigned long zone_nr_free_pages (struct zone *zone); +#else +#define zone_nr_free_pages (zone) zone_page_state(zone, NR_FREE_PAGES) +#endif /* CONFIG_SMP */ +/* * The "priority" of VM scanning is how much of the queues we will scan in one * go. A value of 12 for DEF_PRIORITY implies that we will scan 1/4096th of the
include/linux/vmstat.h +22 -0
@@ -166,6 +166,28 @@ static inline unsigned long zone_page_state(struct zone *zone,return x; } +/* +* More accurate version that also considers the currently pending +* deltas. For that we need to loop over all cpus to find the current +* deltas. There is no synchronization so the result cannot be +* exactly accurate either. +*/ +static inline unsigned long zone_page_state_snapshot (struct zone *zone, +enum zone_stat_item item) +{ +long x =atomic_long_read (&zone->vm_stat[item]); + +#ifdef CONFIG_SMP +int cpu; +for_each_online_cpu (cpu) + x +=zone_pcp (zone, cpu)->vm_stat_diff[item]; + +if (x <0 ) + x =0 ; +#endif +return x; +} +extern unsigned long global_reclaimable_pages (void );extern unsigned long zone_reclaimable_pages (struct zone *zone);
include/net/tcp.h +30 -6
@@ -259,11 +259,21 @@ static inline int between(__u32 seq1, __u32 seq2, __u32 seq3)return seq3 - seq2 >= seq1 - seq2; } -static inline int tcp_too_many_orphans (struct sock *sk,int num) +static inline bool tcp_too_many_orphans (struct sock *sk,int shift) { -return (num > sysctl_tcp_max_orphans) || - (sk->sk_wmem_queued >SOCK_MIN_SNDBUF && -atomic_read (&tcp_memory_allocated) > sysctl_tcp_mem[2 ]); +struct percpu_counter *ocp = sk->sk_prot->orphan_count; +int orphans =percpu_counter_read_positive (ocp); + +if (orphans << shift > sysctl_tcp_max_orphans) { + orphans =percpu_counter_sum_positive (ocp); +if (orphans << shift > sysctl_tcp_max_orphans) +return true; + } + +if (sk->sk_wmem_queued >SOCK_MIN_SNDBUF && +atomic_read (&tcp_memory_allocated) > sysctl_tcp_mem[2 ]) +return true; +return false; }/* syncookies: remember time of last synqueue overflow */
@@ -501,8 +511,22 @@ extern unsigned int tcp_current_mss(struct sock *sk);/* Bound MSS / TSO packet size with the half of the window */ static inline int tcp_bound_to_half_wnd (struct tcp_sock *tp,int pktsize) { -if (tp->max_window && pktsize > (tp->max_window >>1 )) -return max (tp->max_window >>1 ,68U - tp->tcp_header_len); +int cutoff; + +/* When peer uses tiny windows, there is no use in packetizing +* to sub-MSS pieces for the sake of SWS or making sure there +* are enough packets in the pipe for fast recovery. +* +* On the other hand, for extremely large MSS devices, handling +* smaller than MSS windows in this way does make sense. +*/ +if (tp->max_window >=512 ) + cutoff = (tp->max_window >>1 ); +else + cutoff = tp->max_window; + +if (cutoff && pktsize > cutoff) +return max_t (int, cutoff,68U - tp->tcp_header_len);else return pktsize; }
kernel/exit.c +2 -3
@@ -1374,8 +1374,7 @@ static int wait_task_stopped(struct wait_opts *wo,if (!unlikely (wo->wo_flags &WNOWAIT )) *p_code =0 ; -/* don't need the RCU readlock here as we're holding a spinlock */ - uid =__task_cred (p)->uid; + uid =task_uid (p); unlock_sig:spin_unlock_irq (&p->sighand->siglock);if (!exit_code)
@@ -1448,7 +1447,7 @@ static int wait_task_continued(struct wait_opts *wo, struct task_struct *p) }if (!unlikely (wo->wo_flags &WNOWAIT )) p->signal->flags &= ~SIGNAL_STOP_CONTINUED ; - uid =__task_cred (p)->uid; + uid =task_uid (p);spin_unlock_irq (&p->sighand->siglock); pid =task_pid_vnr (p);
kernel/sched.c +2 -2
@@ -5341,9 +5341,9 @@ void thread_group_times(struct task_struct *p, cputime_t *ut, cputime_t *st) rtime =nsecs_to_cputime (cputime.sum_exec_runtime);if (total) { -u64 temp; +u64 temp = rtime; - temp = (u64)(rtime * cputime.utime); + temp *= cputime.utime;do_div (temp, total); utime = (cputime_t )temp; }else
kernel/sys.c +2 -0
@@ -962,6 +962,7 @@ SYSCALL_DEFINE2(setpgid, pid_t, pid, pid_t, pgid) pgid = pid;if (pgid <0 )return -EINVAL ; +rcu_read_lock ();/* From this point forward we keep holding onto the tasklist lock * so that our parent does not change from under us. -DaveM
@@ -1015,6 +1016,7 @@ SYSCALL_DEFINE2(setpgid, pid_t, pid, pid_t, pgid) out:/* All paths lead to here, thus we are safe. -DaveM */ write_unlock_irq (&tasklist_lock); +rcu_read_unlock ();return err; }
mm/memory.c +11 -4
@@ -2630,11 +2630,9 @@ out_release: }/* -* This is like a special single-page "expand_downwards()", -* except we must first make sure that 'address-PAGE_SIZE' +* This is like a special single-page "expand_{down|up}wards()", +* except we must first make sure that 'address{-|+}PAGE_SIZE' * doesn't hit another vma. -* -* The "find_vma()" will do the right thing even if we wrap */ static inline int check_stack_guard_page (struct vm_area_struct *vma,unsigned long address) {
@@ -2653,6 +2651,15 @@ static inline int check_stack_guard_page(struct vm_area_struct *vma, unsigned loexpand_stack (vma, address -PAGE_SIZE ); } +if ((vma->vm_flags &VM_GROWSUP ) && address +PAGE_SIZE == vma->vm_end) { +struct vm_area_struct *next = vma->vm_next; + +/* As VM_GROWSDOWN but s/below/above/ */ +if (next && next->vm_start == address +PAGE_SIZE ) +return next->vm_flags &VM_GROWSUP ?0 : -ENOMEM ; + +expand_upwards (vma, address +PAGE_SIZE ); + }return 0 ; }
mm/mmap.c +0 -3
@@ -1600,9 +1600,6 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns* PA-RISC uses this for its stack; IA64 for its Register Backing Store. * vma is the last one with address > vma->vm_end. Have to extend vma. */ -#ifndef CONFIG_IA64 -static -#endif int expand_upwards (struct vm_area_struct *vma,unsigned long address) {int error;
mm/mmzone.c +21 -0
@@ -87,3 +87,24 @@ int memmap_valid_within(unsigned long pfn, return 1; }#endif /* CONFIG_ARCH_HAS_HOLES_MEMORYMODEL */ + +#ifdef CONFIG_SMP +/* Called when a more accurate view of NR_FREE_PAGES is needed */ +unsigned long zone_nr_free_pages (struct zone *zone) +{ +unsigned long nr_free_pages =zone_page_state (zone,NR_FREE_PAGES ); + +/* +* While kswapd is awake, it is considered the zone is under some +* memory pressure. Under pressure, there is a risk that +* per-cpu-counter-drift will allow the min watermark to be breached +* potentially causing a live-lock. While kswapd is awake and +* free pages are low, get a better estimate for free pages +*/ +if (nr_free_pages < zone->percpu_drift_mark && + !waitqueue_active (&zone->zone_pgdat->kswapd_wait)) +return zone_page_state_snapshot (zone,NR_FREE_PAGES ); + +return nr_free_pages; +} +#endif /* CONFIG_SMP */
mm/page_alloc.c +23 -10
@@ -531,13 +531,13 @@ static void free_pcppages_bulk(struct zone *zone, int count, {int migratetype =0 ;int batch_free =0 ; +int to_free = count;spin_lock (&zone->lock);zone_clear_flag (zone,ZONE_ALL_UNRECLAIMABLE ); zone->pages_scanned =0 ; -__mod_zone_page_state (zone,NR_FREE_PAGES , count); -while (count) { +while (to_free) {struct page *page;struct list_head *list;
@@ -562,8 +562,9 @@ static void free_pcppages_bulk(struct zone *zone, int count,/* MIGRATE_MOVABLE list may include MIGRATE_RESERVEs */ __free_one_page (page, zone,0 ,page_private (page));trace_mm_page_pcpu_drain (page,0 ,page_private (page)); - }while (--count && --batch_free && !list_empty (list)); + }while (--to_free && --batch_free && !list_empty (list)); } +__mod_zone_page_state (zone,NR_FREE_PAGES , count);spin_unlock (&zone->lock); }
@@ -574,8 +575,8 @@ static void free_one_page(struct zone *zone, struct page *page, int order,zone_clear_flag (zone,ZONE_ALL_UNRECLAIMABLE ); zone->pages_scanned =0 ; -__mod_zone_page_state (zone,NR_FREE_PAGES ,1 << order);__free_one_page (page, zone, order, migratetype); +__mod_zone_page_state (zone,NR_FREE_PAGES ,1 << order);spin_unlock (&zone->lock); }
@@ -1365,7 +1366,7 @@ int zone_watermark_ok(struct zone *z, int order, unsigned long mark, {/* free_pages my go negative - that's OK */ long min = mark; -long free_pages =zone_page_state (z,NR_FREE_PAGES ) - (1 << order) +1 ; +long free_pages =zone_nr_free_pages (z) - (1 << order) +1 ;int o;if (alloc_flags &ALLOC_HIGH )
@@ -1681,6 +1682,7 @@ __alloc_pages_direct_reclaim(gfp_t gfp_mask, unsigned int order,struct page *page =NULL ;struct reclaim_state reclaim_state;struct task_struct *p = current; +bool drained = false;cond_resched ();
@@ -1699,14 +1701,25 @@ __alloc_pages_direct_reclaim(gfp_t gfp_mask, unsigned int order,cond_resched (); -if (order !=0 ) -drain_all_pages (); +if (unlikely (!(*did_some_progress))) +return NULL ; -if (likely (*did_some_progress)) - page =get_page_from_freelist (gfp_mask, nodemask, order, +retry: + page =get_page_from_freelist (gfp_mask, nodemask, order, zonelist, high_zoneidx, alloc_flags, preferred_zone, migratetype); + +/* +* If an allocation failed after direct reclaim, it could be because +* pages are pinned on the per-cpu lists. Drain them and try again +*/ +if (!page && !drained) { +drain_all_pages (); + drained = true; + goto retry; + } +return page; }
@@ -2238,7 +2251,7 @@ void show_free_areas(void)" all_unreclaimable? %s" "\n" , zone->name, -K (zone_page_state (zone,NR_FREE_PAGES )), +K (zone_nr_free_pages (zone)),K (min_wmark_pages (zone)),K (low_wmark_pages (zone)), K(high_wmark_pages(zone)),
mm/percpu.c +1 -1
@@ -1702,9 +1702,9 @@ int __init pcpu_setup_first_chunk(const struct pcpu_alloc_info *ai,if (pcpu_first_unit_cpu ==NR_CPUS ) pcpu_first_unit_cpu = cpu; + pcpu_last_unit_cpu = cpu; } } - pcpu_last_unit_cpu = cpu; pcpu_nr_units = unit;for_each_possible_cpu (cpu)
mm/vmstat.c +14 -1
@@ -136,10 +136,23 @@ static void refresh_zone_stat_thresholds(void)int threshold;for_each_populated_zone (zone) { +unsigned long max_drift, tolerate_drift; + threshold =calculate_threshold (zone);for_each_online_cpu (cpu)zone_pcp (zone, cpu)->stat_threshold = threshold; + +/* +* Only set percpu_drift_mark if there is a danger that +* NR_FREE_PAGES reports the low watermark is ok when in fact +* the min watermark could be breached by an allocation +*/ + tolerate_drift =low_wmark_pages (zone) -min_wmark_pages (zone); + max_drift =num_online_cpus () * threshold; +if (max_drift > tolerate_drift) + zone->percpu_drift_mark =high_wmark_pages (zone) + + max_drift; } }
@@ -715,7 +728,7 @@ static void zoneinfo_show_print(struct seq_file *m, pg_data_t *pgdat,"\n scanned %lu" "\n spanned %lu" "\n present %lu" , -zone_page_state (zone,NR_FREE_PAGES ), +zone_nr_free_pages (zone),min_wmark_pages (zone),low_wmark_pages (zone), high_wmark_pages(zone),
net/bridge/br_netfilter.c +7 -2
@@ -600,6 +600,9 @@ static unsigned int br_nf_pre_routing(unsigned int hook, struct sk_buff *skb,pskb_trim_rcsum (skb, len); +/* BUG: Should really parse the IP options here. */ +memset (IPCB (skb),0 ,sizeof (struct inet_skb_parm )); +nf_bridge_put (skb->nf_bridge);if (!nf_bridge_alloc (skb))return NF_DROP ;
@@ -797,9 +800,11 @@ static int br_nf_dev_queue_xmit(struct sk_buff *skb)if (skb->nfct !=NULL && (skb->protocol ==htons (ETH_P_IP ) ||IS_VLAN_IP (skb)) && skb->len > skb->dev->mtu && - !skb_is_gso (skb)) + !skb_is_gso (skb)) { +/* BUG: Should really parse the IP options here. */ +memset (IPCB (skb),0 ,sizeof (struct inet_skb_parm ));return ip_fragment (skb, br_dev_queue_push_xmit); -else + }else return br_dev_queue_push_xmit(skb); }#else
net/core/skbuff.c +6 -1
@@ -2575,6 +2575,10 @@ struct sk_buff *skb_segment(struct sk_buff *skb, int features)__copy_skb_header (nskb, skb); nskb->mac_len = skb->mac_len; +/* nskb and skb might have different headroom */ +if (nskb->ip_summed ==CHECKSUM_PARTIAL ) + nskb->csum_start +=skb_headroom (nskb) - headroom; +skb_reset_mac_header (nskb);skb_set_network_header (nskb, skb->mac_len); nskb->transport_header = (nskb->network_header +
@@ -2705,7 +2709,7 @@ int skb_gro_receive(struct sk_buff **head, struct sk_buff *skb)return -E2BIG ; headroom =skb_headroom (p); - nskb =netdev_alloc_skb (p->dev, headroom +skb_gro_offset (p)); + nskb =alloc_skb (headroom +skb_gro_offset (p),GFP_ATOMIC );if (unlikely (!nskb))return -ENOMEM ;
@@ -2726,6 +2730,7 @@ int skb_gro_receive(struct sk_buff **head, struct sk_buff *skb) *NAPI_GRO_CB (nskb) = *NAPI_GRO_CB (p);skb_shinfo (nskb)->frag_list = p;skb_shinfo (nskb)->gso_size = pinfo->gso_size; + pinfo->gso_size =0 ;skb_header_release (p); nskb->prev = p;
net/ipv4/tcp.c +11 -22
@@ -451,7 +451,8 @@ unsigned int tcp_poll(struct file *file, struct socket *sock, poll_table *wait)if (sk_stream_wspace (sk) >=sk_stream_min_wspace (sk)) mask |=POLLOUT |POLLWRNORM ; } - } + }else + mask |=POLLOUT |POLLWRNORM ;if (tp->urg_data &TCP_URG_VALID ) mask |=POLLPRI ;
@@ -1334,6 +1335,7 @@ int tcp_read_sock(struct sock *sk, read_descriptor_t *desc,sk_eat_skb (sk, skb,0 );if (!desc->count)break ; + tp->copied_seq = seq; } tp->copied_seq = seq;
@@ -1975,11 +1977,8 @@ adjudge_to_death: } }if (sk->sk_state !=TCP_CLOSE ) { -int orphan_count =percpu_counter_read_positive ( - sk->sk_prot->orphan_count); -sk_mem_reclaim (sk); -if (tcp_too_many_orphans (sk, orphan_count)) { +if (tcp_too_many_orphans (sk,0 )) {if (net_ratelimit ())printk (KERN_INFO "TCP: too many of orphaned " "sockets\n" );
@@ -2880,7 +2879,7 @@ void __init tcp_init(void) {struct sk_buff *skb =NULL ;unsigned long nr_pages, limit; -int order, i, max_share; +int i, max_share, cnt;BUILD_BUG_ON (sizeof (struct tcp_skb_cb ) >sizeof (skb->cb));
@@ -2929,22 +2928,12 @@ void __init tcp_init(void)INIT_HLIST_HEAD (&tcp_hashinfo.bhash[i].chain); } -/* Try to be a bit smarter and adjust defaults depending -* on available memory. -*/ -for (order =0 ; ((1 << order) <<PAGE_SHIFT ) < - (tcp_hashinfo.bhash_size *sizeof (struct inet_bind_hashbucket )); - order++) - ; -if (order >=4 ) { - tcp_death_row.sysctl_max_tw_buckets =180000 ; - sysctl_tcp_max_orphans =4096 << (order -4 ); - sysctl_max_syn_backlog =1024 ; - }else if (order <3 ) { - tcp_death_row.sysctl_max_tw_buckets >>= (3 - order); - sysctl_tcp_max_orphans >>= (3 - order); - sysctl_max_syn_backlog =128 ; - } + + cnt = tcp_hashinfo.ehash_size; + + tcp_death_row.sysctl_max_tw_buckets = cnt /2 ; + sysctl_tcp_max_orphans = cnt /2 ; + sysctl_max_syn_backlog =max (128 , cnt /256 );/* Set the pressure threshold to be a fraction of global memory that * is up to 1/2 at 256 MB, decreasing toward zero with the amount of
net/ipv4/tcp_timer.c +4 -4
@@ -65,18 +65,18 @@ static void tcp_write_err(struct sock *sk)static int tcp_out_of_resources (struct sock *sk,int do_reset) {struct tcp_sock *tp =tcp_sk (sk); -int orphans =percpu_counter_read_positive (&tcp_orphan_count); +int shift =0 ;/* If peer does not open window for long time, or did not transmit * anything for long time, penalize it. */ if ((s32)(tcp_time_stamp - tp->lsndtime) >2 *TCP_RTO_MAX || !do_reset) - orphans <<=1 ; + shift++;/* If some dubious ICMP arrived, penalize even more. */ if (sk->sk_err_soft) - orphans <<=1 ; + shift++; -if (tcp_too_many_orphans (sk, orphans)) { +if (tcp_too_many_orphans (sk, shift)) {if (net_ratelimit ())printk (KERN_INFO "Out of socket memory\n" );
net/irda/af_irda.c +2 -2
@@ -810,8 +810,8 @@ static int irda_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len) err =irda_open_tsap (self, addr->sir_lsap_sel, addr->sir_name);if (err <0 ) { -kfree (self->ias_obj->name); -kfree (self->ias_obj); +irias_delete_object (self->ias_obj); + self->ias_obj =NULL ;return err; }
net/llc/af_llc.c +2 -1
@@ -977,7 +977,8 @@ static int llc_ui_setsockopt(struct socket *sock, int level, int optname, {struct sock *sk = sock->sk;struct llc_sock *llc =llc_sk (sk); -int rc = -EINVAL , opt; +unsigned int opt; +int rc = -EINVAL ;lock_sock (sk);if (unlikely (level !=SOL_LLC || optlen !=sizeof (int )))
net/rds/recv.c +1 -1
@@ -296,7 +296,7 @@ static int rds_still_queued(struct rds_sock *rs, struct rds_incoming *inc,int rds_notify_queue_get (struct rds_sock *rs,struct msghdr *msghdr) {struct rds_notifier *notifier; -struct rds_rdma_notify cmsg; +struct rds_rdma_notify cmsg = {0 };/* fill holes with zero */ unsigned int count =0 , max_messages = ~0U ;unsigned long flags;LIST_HEAD (copy);
net/sctp/output.c +0 -1
@@ -91,7 +91,6 @@ struct sctp_packet *sctp_packet_config(struct sctp_packet *packet,SCTP_DEBUG_PRINTK ("%s: packet:%p vtag:0x%x\n" , __func__, packet, vtag); -sctp_packet_reset (packet); packet->vtag = vtag;if (ecn_capable &&sctp_packet_empty (packet)) {
net/unix/af_unix.c +12 -3
@@ -671,6 +671,7 @@ static int unix_autobind(struct socket *sock)static u32 ordernum =1 ;struct unix_address *addr;int err; +unsigned int retries =0 ;mutex_lock (&u->readlock);
@@ -696,9 +697,17 @@ retry:if (__unix_find_socket_byname (net, addr->name, addr->len, sock->type, addr->hash)) {spin_unlock (&unix_table_lock); -/* Sanity yield. It is unusual case, but yet... */ -if (!(ordernum&0xFF )) -yield (); +/* +* __unix_find_socket_byname() may take long time if many names +* are already in use. +*/ +cond_resched (); +/* Give up if all names seems to be in use. */ +if (retries++ ==0xFFFFF ) { + err = -ENOSPC ; +kfree (addr); + goto out; + } goto retry; } addr->hash ^= sk->sk_type;
security/keys/keyctl.c +5 -1
@@ -1259,6 +1259,7 @@ long keyctl_session_to_parent(void) keyring_r =NULL ; me = current; +rcu_read_lock ();write_lock_irq (&tasklist_lock); parent = me->real_parent;
@@ -1291,7 +1292,8 @@ long keyctl_session_to_parent(void) goto not_permitted;/* the keyrings must have the same UID */ -if (pcred ->tgcred->session_keyring->uid != mycred->euid || +if ((pcred->tgcred->session_keyring && + pcred->tgcred->session_keyring->uid != mycred->euid) || mycred->tgcred->session_keyring->uid != mycred->euid) goto not_permitted;
@@ -1313,6 +1315,7 @@ long keyctl_session_to_parent(void)set_ti_thread_flag (task_thread_info (parent),TIF_NOTIFY_RESUME );write_unlock_irq (&tasklist_lock); +rcu_read_unlock ();if (oldcred)put_cred (oldcred);return 0 ;
@@ -1321,6 +1324,7 @@ already_same: ret =0 ; not_permitted:write_unlock_irq (&tasklist_lock); +rcu_read_unlock ();put_cred (cred);return ret;