Linux 3.4.16
Greg KH
maintainerI'm announcing the release of the 3.4.16 kernel.
All users of the 3.4 kernel series must upgrade.
The updated 3.4.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-3.4.y
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Makefile | 2 arch/s390/boot/compressed/vmlinux.lds.S | 2 arch/s390/kernel/vmlinux.lds.S | 2 arch/sparc/kernel/perf_event.c | 15 +++-- arch/sparc/kernel/sys_sparc_64.c | 10 +-- arch/sparc/kernel/syscalls.S | 32 +++++------ arch/sparc/mm/init_64.c | 28 ++++++++-- arch/tile/Makefile | 4 + arch/x86/kernel/entry_32.S | 8 +- arch/x86/kernel/entry_64.S | 2 arch/x86/kernel/setup.c | 17 +++++- arch/x86/oprofile/nmi_int.c | 2 drivers/edac/amd64_edac.c | 11 +-- drivers/infiniband/core/cma.c | 3 - drivers/infiniband/core/netlink.c | 1 drivers/iommu/tegra-smmu.c | 2 drivers/media/video/au0828/au0828-video.c | 12 ++-- drivers/mtd/nand/nand_base.c | 9 +-- drivers/net/ethernet/marvell/skge.c | 7 ++ drivers/pcmcia/pxa2xx_sharpsl.c | 2 drivers/pinctrl/pinctrl-tegra.c | 2 drivers/pinctrl/pinctrl-tegra30.c | 24 ++++---- drivers/usb/class/cdc-acm.c | 22 +++++-- drivers/usb/dwc3/gadget.c | 1 drivers/usb/host/xhci.c | 3 - drivers/usb/serial/option.c | 84 ++++++++++++++++++++++-------- fs/ext4/extents.c | 57 ++++++++++++++++---- fs/ext4/mballoc.c | 5 + fs/lockd/clntxdr.c | 2 fs/lockd/svcproc.c | 3 - fs/proc/stat.c | 14 +++-- include/linux/if_vlan.h | 8 +- include/linux/mtd/nand.h | 3 - include/linux/netlink.h | 21 ++++++- include/linux/sunrpc/xprt.h | 3 + include/rdma/rdma_netlink.h | 1 kernel/cgroup.c | 41 +++----------- kernel/sys.c | 12 ++-- net/8021q/vlan_core.c | 10 --- net/core/dev.c | 7 +- net/core/neighbour.c | 6 -- net/ipv4/tcp_ipv4.c | 7 +- net/ipv6/addrconf.c | 15 +++-- net/ipv6/tcp_ipv6.c | 3 - net/netlink/af_netlink.c | 29 +++++++--- net/rds/send.c | 2 net/sunrpc/cache.c | 4 - net/sunrpc/xprt.c | 34 +++++++----- net/sunrpc/xprtrdma/transport.c | 1 net/sunrpc/xprtsock.c | 4 + 50 files changed, 380 insertions(+), 219 deletions(-)
Al Viro (1):
sparc64: fix ptrace interaction with force_successful_syscall_return()
Alexey Kuznetsov (1):
tcp: resets are misrouted
Alexis R. Cortes (1):
usb: host: xhci: New system added for Compliance Mode Patch on SN65LVPE502CP
Andrew Morton (1):
amd64_edac:__amd64_set_scrub_rate(): avoid overindexing scrubrates[]
Arnd Bergmann (1):
pcmcia: sharpsl: don't discard sharpsl_pcmcia_ops
Bjørn Mork (2):
USB: option: blacklist net interface on ZTE devices
USB: option: add more ZTE devices
Brian Norris (1):
mtd: nand: allow NAND_NO_SUBPAGE_WRITE to be set from driver
Chris Metcalf (1):
arch/tile: avoid generating .eh_frame information in modules
Daisuke Nishimura (1):
cgroup: notify_on_release may not be triggered in some cases
Dan Carpenter (1):
oprofile, x86: Fix wrapping bug in op_x86_get_ctrl()
David S. Miller (3):
sparc64: Like x86 we should check current->mm during perf backtrace generation.
sparc64: Fix bit twiddling in sparc_pmu_enable_event().
sparc64: Be less verbose during vmemmap population.
David Vrabel (1):
xen/x86: don't corrupt %eip when returning from a signal handler
Devin Heitmueller (1):
media: au0828: fix case where STREAMOFF being called on stopped stream causes BUG()
Dmitry Monakhov (1):
ext4: race-condition protection for ext4_convert_unwritten_extents_endio
Eric Dumazet (1):
ipv6: addrconf: fix /proc/net/if_inet6
Felipe Balbi (1):
usb: dwc3: gadget: fix 'endpoint always busy' bug
Florian Zumbiehl (1):
vlan: don't deliver frames for unknown vlans to protocols
Gao feng (2):
netlink: add reference of module in netlink_dump_start
infiniband: pass rdma_cm module to netlink_dump_start
Graham Gower (1):
skge: Add DMA mask quirk for Marvell 88E8001 on ASUS P5NSLI motherboard
Greg Kroah-Hartman (1):
Linux 3.4.16
Heiko Carstens (1):
s390: fix linker script for 31 bit builds
Hiro Sugawara (1):
iommu/tegra: smmu: Fix deadly typo
Jacob Shin (1):
x86: Exclude E820_RESERVED regions and memory holes above 4 GB from direct mapping.
Jiri Kosina (1):
sparc64: do not clobber personality flags in sys_sparc64_personality()
Kees Cook (2):
kernel/sys.c: fix stack memory content leak via UNAME26 use clamp_t in UNAME26 fix
Lukas Czerner (1):
ext4: Avoid underflow in ext4_trim_fs()
Michal Hocko (1):
nohz: Fix idle ticks in cpu summary line of /proc/stat
Ming Lei (1):
USB: cdc-acm: fix pipe type of write endpoint
Nicolas Boullis (1):
usb: acm: fix the computation of the number of data bits
Pritesh Raithatha (2):
pinctrl: tegra: correct bank for pingroup and drv pingroup
pinctrl: tegra: set low power mode bank width to 2
Sasha Levin (1):
SUNRPC: Prevent kernel stack corruption on long values of flush
Tejun Heo (2):
Revert "cgroup: Remove task_lock() from cgroup_post_fork()" Revert "cgroup: Drop task_lock(parent) on cgroup_fork()"
Trond Myklebust (2):
NLM: nlm_lookup_file() may return NLMv4-specific error codes
SUNRPC: Fix a UDP transport regression
jeff.liu (1):
RDS: fix rds-ping spinlock recursion
[email protected] (1):
net: Fix skb_under_panic oops in neigh_resolve_output
Greg KH
maintainerMakefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 3 PATCHLEVEL = 4 -SUBLEVEL = 15 +SUBLEVEL = 16 EXTRAVERSION = NAME = Saber-toothed Squirrel
arch/s390/boot/compressed/vmlinux.lds.S +1 -1
@@ -5,7 +5,7 @@ OUTPUT_FORMAT("elf64-s390", "elf64-s390", "elf64-s390") OUTPUT_ARCH(s390:64-bit) #else OUTPUT_FORMAT("elf32-s390", "elf32-s390", "elf32-s390") -OUTPUT_ARCH(s390) +OUTPUT_ARCH(s390:31-bit) #endif ENTRY(startup)
arch/s390/kernel/vmlinux.lds.S +1 -1
@@ -8,7 +8,7 @@ #ifndef CONFIG_64BIT OUTPUT_FORMAT("elf32-s390", "elf32-s390", "elf32-s390") -OUTPUT_ARCH(s390) +OUTPUT_ARCH(s390:31-bit) ENTRY(startup) jiffies = jiffies_64 + 4; #else
arch/sparc/kernel/perf_event.c +9 -6
@@ -557,11 +557,13 @@ static u64 nop_for_index(int idx)static inline void sparc_pmu_enable_event (struct cpu_hw_events *cpuc,struct hw_perf_event *hwc,int idx) { -u64 val, mask =mask_for_index (idx); +u64 enc, val, mask =mask_for_index (idx); + + enc =perf_event_get_enc (cpuc->events[idx]); val = cpuc->pcr; val &= ~mask; - val |= hwc->config; + val |=event_encoding (enc, idx); cpuc->pcr = val; pcr_ops->write (cpuc->pcr);
@@ -1428,8 +1430,6 @@ static void perf_callchain_user_64(struct perf_callchain_entry *entry, {unsigned long ufp; -perf_callchain_store (entry, regs->tpc); - ufp = regs->u_regs[UREG_I6 ] +STACK_BIAS ; do { struct sparc_stackf *usf, sf;
@@ -1450,8 +1450,6 @@ static void perf_callchain_user_32(struct perf_callchain_entry *entry, {unsigned long ufp; -perf_callchain_store (entry, regs->tpc); - ufp = regs->u_regs[UREG_I6 ] &0xffffffffUL ; do { struct sparc_stackf32 *usf, sf;
@@ -1470,6 +1468,11 @@ static void perf_callchain_user_32(struct perf_callchain_entry *entry,void perf_callchain_user (struct perf_callchain_entry *entry,struct pt_regs *regs) { +perf_callchain_store (entry, regs->tpc); + +if (!current->mm) +return ; +flushw_user ();if (test_thread_flag (TIF_32BIT ))perf_callchain_user_32 (entry, regs);
arch/sparc/kernel/sys_sparc_64.c +5 -5
@@ -519,12 +519,12 @@ SYSCALL_DEFINE1(sparc64_personality, unsigned long, personality) {int ret; -if (current->personality ==PER_LINUX32 && - personality ==PER_LINUX ) - personality =PER_LINUX32 ; +if (personality (current->personality) ==PER_LINUX32 && +personality (personality) ==PER_LINUX ) + personality |=PER_LINUX32 ; ret =sys_personality (personality); -if (ret ==PER_LINUX32 ) - ret =PER_LINUX ; +if (personality (ret) ==PER_LINUX32 ) + ret &= ~PER_LINUX32 ;return ret; }
arch/sparc/kernel/syscalls.S +14 -18
@@ -212,24 +212,20 @@ linux_sparc_syscall: 3: stx %o0, [%sp + PTREGS_OFF + PT_V9_I0] ret_sys_call: ldx [%sp + PTREGS_OFF + PT_V9_TSTATE], %g3 - ldx [%sp + PTREGS_OFF + PT_V9_TNPC], %l1 ! pc = npc sra %o0, 0, %o0 mov %ulo(TSTATE_XCARRY | TSTATE_ICARRY), %g2 sllx %g2, 32, %g2 - /* Check if force_successful_syscall_return() - * was invoked. - */ - ldub [%g6 + TI_SYS_NOERROR], %l2 - brnz,a,pn %l2, 80f - stb %g0, [%g6 + TI_SYS_NOERROR] - cmp %o0, -ERESTART_RESTARTBLOCK bgeu,pn %xcc, 1f - andcc %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT), %l6 -80: + andcc %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT), %g0 + ldx [%sp + PTREGS_OFF + PT_V9_TNPC], %l1 ! pc = npc + +2: + stb %g0, [%g6 + TI_SYS_NOERROR] /* System call success, clear Carry condition code. */ andn %g3, %g2, %g3 +3: stx %g3, [%sp + PTREGS_OFF + PT_V9_TSTATE] bne,pn %icc, linux_syscall_trace2 add %l1, 0x4, %l2 ! npc = npc+4
@@ -238,20 +234,20 @@ ret_sys_call: stx %l2, [%sp + PTREGS_OFF + PT_V9_TNPC] 1: + /* Check if force_successful_syscall_return() + * was invoked. + */ + ldub [%g6 + TI_SYS_NOERROR], %l2 + brnz,pn %l2, 2b + ldx [%sp + PTREGS_OFF + PT_V9_TNPC], %l1 ! pc = npc /* System call failure, set Carry condition code. * Also, get abs(errno) to return to the process. */ - andcc %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT), %l6 sub %g0, %o0, %o0 - or %g3, %g2, %g3 stx %o0, [%sp + PTREGS_OFF + PT_V9_I0] - stx %g3, [%sp + PTREGS_OFF + PT_V9_TSTATE] - bne,pn %icc, linux_syscall_trace2 - add %l1, 0x4, %l2 ! npc = npc+4 - stx %l1, [%sp + PTREGS_OFF + PT_V9_TPC] + ba,pt %xcc, 3b + or %g3, %g2, %g3 - b,pt %xcc, rtrap - stx %l2, [%sp + PTREGS_OFF + PT_V9_TNPC] linux_syscall_trace2: call syscall_trace_leave add %sp, PTREGS_OFF, %o0
arch/sparc/mm/init_64.c +23 -5
@@ -2099,6 +2099,9 @@ EXPORT_SYMBOL(_PAGE_CACHE);#ifdef CONFIG_SPARSEMEM_VMEMMAP unsigned long vmemmap_table[VMEMMAP_SIZE ]; +static long __meminitdata addr_start, addr_end; +static int __meminitdata node_start; +int __meminit vmemmap_populate (struct page *start,unsigned long nr,int node) {unsigned long vstart = (unsigned long ) start;
@@ -2129,15 +2132,30 @@ int __meminit vmemmap_populate(struct page *start, unsigned long nr, int node) *vmem_pp = pte_base |__pa (block); -printk (KERN_INFO "[%p-%p] page_structs=%lu " -"node=%d entry=%lu/%lu\n" , start, block, nr, - node, - addr >>VMEMMAP_CHUNK_SHIFT , - VMEMMAP_SIZE); +/* check to see if we have contiguous blocks */ +if (addr_end != addr || node_start != node) { +if (addr_start) +printk (KERN_DEBUG " [%lx-%lx] on node %d\n" , + addr_start, addr_end-1 , node_start); + addr_start = addr; + node_start = node; + } + addr_end = addr + VMEMMAP_CHUNK; } }return 0 ; } + +void __meminit vmemmap_populate_print_last (void ) +{ +if (addr_start) { +printk (KERN_DEBUG " [%lx-%lx] on node %d\n" , + addr_start, addr_end-1 , node_start); + addr_start =0 ; + addr_end =0 ; + node_start =0 ; + } +}#endif /* CONFIG_SPARSEMEM_VMEMMAP */ static void prot_init_common(unsigned long page_none,
arch/tile/Makefile +4 -0
@@ -26,6 +26,10 @@ $(error Set TILERA_ROOT or CROSS_COMPILE when building $(ARCH) on $(HOST_ARCH)) endif endif +# The tile compiler may emit .eh_frame information for backtracing. +# In kernel modules, this causes load failures due to unsupported relocations. +KBUILD_CFLAGS += -fno-asynchronous-unwind-tables + ifneq ($(CONFIG_DEBUG_EXTRA_FLAGS),"") KBUILD_CFLAGS += $(CONFIG_DEBUG_EXTRA_FLAGS) endif
arch/x86/kernel/entry_32.S +5 -3
@@ -1025,7 +1025,7 @@ ENTRY(xen_sysenter_target) ENTRY(xen_hypervisor_callback) CFI_STARTPROC - pushl_cfi $0 + pushl_cfi $-1 /* orig_ax = -1 => not a system call */ SAVE_ALL TRACE_IRQS_OFF
@@ -1067,14 +1067,16 @@ ENTRY(xen_failsafe_callback) 2: mov 8(%esp),%es 3: mov 12(%esp),%fs 4: mov 16(%esp),%gs + /* EAX == 0 => Category 1 (Bad segment) + EAX != 0 => Category 2 (Bad IRET) */ testl %eax,%eax popl_cfi %eax lea 16(%esp),%esp CFI_ADJUST_CFA_OFFSET -16 jz 5f addl $16,%esp - jmp iret_exc # EAX != 0 => Category 2 (Bad IRET) -5: pushl_cfi $0 # EAX == 0 => Category 1 (Bad segment) + jmp iret_exc +5: pushl_cfi $-1 /* orig_ax = -1 => not a system call */ SAVE_ALL jmp ret_from_exception CFI_ENDPROC
arch/x86/kernel/entry_64.S +1 -1
@@ -1351,7 +1351,7 @@ ENTRY(xen_failsafe_callback) CFI_RESTORE r11 addq $0x30,%rsp CFI_ADJUST_CFA_OFFSET -0x30 - pushq_cfi $0 + pushq_cfi $-1 /* orig_ax = -1 => not a system call */ SAVE_ALL jmp error_exit CFI_ENDPROC
arch/x86/kernel/setup.c +15 -2
@@ -927,8 +927,21 @@ void __init setup_arch(char **cmdline_p)#ifdef CONFIG_X86_64 if (max_pfn > max_low_pfn) { - max_pfn_mapped =init_memory_mapping (1UL <<32 , - max_pfn<<PAGE_SHIFT ); +int i; +for (i =0 ; i < e820.nr_map; i++) { +struct e820entry *ei = &e820.map[i]; + +if (ei->addr + ei->size <=1UL <<32 ) +continue ; + +if (ei->type ==E820_RESERVED ) +continue ; + + max_pfn_mapped =init_memory_mapping ( + ei->addr <1UL <<32 ?1UL <<32 : ei->addr, + ei->addr + ei->size); + } +/* can we preseve max_low_pfn ?*/ max_low_pfn = max_pfn; }
arch/x86/oprofile/nmi_int.c +1 -1
@@ -55,7 +55,7 @@ u64 op_x86_get_ctrl(struct op_x86_model_spec const *model, val |= counter_config->extra; event &= model->event_mask ? model->event_mask :0xFF ; val |= event &0xFF ; - val |= (event &0x0F00 ) <<24 ; + val |= (u64)(event &0x0F00 ) <<24 ;return val; }
drivers/edac/amd64_edac.c +4 -7
@@ -170,8 +170,11 @@ static int __amd64_set_scrub_rate(struct pci_dev *ctl, u32 new_bw, u32 min_rate)* memory controller and apply to register. Search for the first * bandwidth entry that is greater or equal than the setting requested * and program that. If at last entry, turn off DRAM scrubbing. +* +* If no suitable bandwidth is found, turn off DRAM scrubbing entirely +* by falling back to the last element in scrubrates[]. */ -for (i =0 ; i <ARRAY_SIZE (scrubrates); i++) { +for (i =0 ; i <ARRAY_SIZE (scrubrates) -1 ; i++) {/* * skip scrub rates which aren't recommended * (see F10 BKDG, F3x58)
@@ -181,12 +184,6 @@ static int __amd64_set_scrub_rate(struct pci_dev *ctl, u32 new_bw, u32 min_rate)if (scrubrates[i].bandwidth <= new_bw)break ; - -/* -* if no suitable bandwidth found, turn off DRAM scrubbing -* entirely by falling back to the last element in the -* scrubrates array. -*/ } scrubval = scrubrates[i].scrubval;
drivers/infiniband/core/cma.c +2 -1
@@ -3451,7 +3451,8 @@ out: }static const struct ibnl_client_cbs cma_cb_table[] = { - [RDMA_NL_RDMA_CM_ID_STATS ] = { .dump = cma_get_id_stats }, + [RDMA_NL_RDMA_CM_ID_STATS ] = { .dump = cma_get_id_stats, + .module =THIS_MODULE }, };static int __init cma_init (void )
drivers/infiniband/core/netlink.c +1 -0
@@ -151,6 +151,7 @@ static int ibnl_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh) {struct netlink_dump_control c = { .dump = client->cb_table[op].dump, + .module = client->cb_table[op].module, };return netlink_dump_start (nls, skb, nlh, &c); }
drivers/iommu/tegra-smmu.c +1 -1
@@ -148,7 +148,7 @@#define SMMU_ADDR_TO_PFN (addr) ((addr) >> 12)#define SMMU_ADDR_TO_PDN (addr) ((addr) >> 22) -#define SMMU_PDN_TO_ADDR (addr) ((pdn) << 22) +#define SMMU_PDN_TO_ADDR (pdn) ((pdn) << 22)#define _READABLE (1 << SMMU_PTB_DATA_ASID_READABLE_SHIFT)#define _WRITABLE (1 << SMMU_PTB_DATA_ASID_WRITABLE_SHIFT)
drivers/media/video/au0828/au0828-video.c +8 -4
@@ -1692,14 +1692,18 @@ static int vidioc_streamoff(struct file *file, void *priv, (AUVI_INPUT (i).audio_setup)(dev,0 ); } -videobuf_streamoff (&fh->vb_vidq); -res_free (fh,AU0828_RESOURCE_VIDEO ); +if (res_check (fh,AU0828_RESOURCE_VIDEO )) { +videobuf_streamoff (&fh->vb_vidq); +res_free (fh,AU0828_RESOURCE_VIDEO ); + } }else if (fh->type ==V4L2_BUF_TYPE_VBI_CAPTURE ) { dev->vbi_timeout_running =0 ;del_timer_sync (&dev->vbi_timeout); -videobuf_streamoff (&fh->vb_vbiq); -res_free (fh,AU0828_RESOURCE_VBI ); +if (res_check (fh,AU0828_RESOURCE_VBI )) { +videobuf_streamoff (&fh->vb_vbiq); +res_free (fh,AU0828_RESOURCE_VBI ); + } }return 0 ;
drivers/mtd/nand/nand_base.c +3 -6
@@ -2897,9 +2897,7 @@ static int nand_flash_detect_onfi(struct mtd_info *mtd, struct nand_chip *chip,if (le16_to_cpu (p->features) &1 ) *busw =NAND_BUSWIDTH_16 ; - chip->options &= ~NAND_CHIPOPTIONS_MSK ; - chip->options |= (NAND_NO_READRDY | -NAND_NO_AUTOINCR ) &NAND_CHIPOPTIONS_MSK ; + chip->options |=NAND_NO_READRDY |NAND_NO_AUTOINCR ;pr_info ("ONFI flash detected\n" );return 1 ;
@@ -3064,9 +3062,8 @@ static struct nand_flash_dev *nand_get_flash_type(struct mtd_info *mtd, mtd->erasesize <<= ((id_data[3 ] &0x03 ) <<1 ); } } -/* Get chip options, preserve non chip based options */ - chip->options &= ~NAND_CHIPOPTIONS_MSK ; - chip->options |= type->options &NAND_CHIPOPTIONS_MSK ; +/* Get chip options */ + chip->options |= type->options;/* * Check if chip is not a Samsung device. Do not clear the
drivers/net/ethernet/marvell/skge.c +7 -0
@@ -4153,6 +4153,13 @@ static struct dmi_system_id skge_32bit_dma_boards[] = { DMI_MATCH(DMI_BOARD_NAME, "nForce"), }, }, + { + .ident = "ASUS P5NSLI", + .matches = { + DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTeK Computer INC."), + DMI_MATCH(DMI_BOARD_NAME, "P5NSLI") + }, + }, {} };
drivers/pcmcia/pxa2xx_sharpsl.c +1 -1
@@ -194,7 +194,7 @@ static void sharpsl_pcmcia_socket_suspend(struct soc_pcmcia_socket *skt)sharpsl_pcmcia_init_reset (skt); } -static struct pcmcia_low_level sharpsl_pcmcia_ops__initdata = { +static struct pcmcia_low_level sharpsl_pcmcia_ops = { .owner =THIS_MODULE , .hw_init = sharpsl_pcmcia_hw_init, .socket_state = sharpsl_pcmcia_socket_state,
drivers/pinctrl/pinctrl-tegra.c +1 -1
@@ -259,7 +259,7 @@ static int tegra_pinconf_reg(struct tegra_pmx *pmx, *bank = g->drv_bank; *reg = g->drv_reg; *bit = g->lpmd_bit; - *width =1 ; + *width =2 ;break ;case TEGRA_PINCONF_PARAM_DRIVE_DOWN_STRENGTH : *bank = g->drv_bank;
drivers/pinctrl/pinctrl-tegra30.c +12 -12
@@ -3343,10 +3343,10 @@ static const struct tegra_function tegra30_functions[] = { FUNCTION(vi_alt3), }; -#define MUXCTL_REG_A 0x3000 -#define PINGROUP_REG_A 0x868 +#define DRV_PINGROUP_REG_A 0x868/* bank 0 */ +#define PINGROUP_REG_A 0x3000/* bank 1 */ -#define PINGROUP_REG_Y (r) ((r) - MUXCTL_REG_A) +#define PINGROUP_REG_Y (r) ((r) - PINGROUP_REG_A)#define PINGROUP_REG_N (r) -1#define PINGROUP (pg_name, f0, f1, f2, f3, f_safe, r, od, ior) \
@@ -3362,25 +3362,25 @@ static const struct tegra_function tegra30_functions[] = { }, \ .func_safe = TEGRA_MUX_ ## f_safe, \ .mux_reg = PINGROUP_REG_Y(r), \ - .mux_bank = 0, \ + .mux_bank = 1, \ .mux_bit = 0, \ .pupd_reg = PINGROUP_REG_Y(r), \ - .pupd_bank = 0, \ + .pupd_bank = 1, \ .pupd_bit = 2, \ .tri_reg = PINGROUP_REG_Y(r), \ - .tri_bank = 0, \ + .tri_bank = 1, \ .tri_bit = 4, \ .einput_reg = PINGROUP_REG_Y(r), \ - .einput_bank = 0, \ + .einput_bank = 1, \ .einput_bit = 5, \ .odrain_reg = PINGROUP_REG_##od(r), \ - .odrain_bank = 0, \ + .odrain_bank = 1, \ .odrain_bit = 6, \ .lock_reg = PINGROUP_REG_Y(r), \ - .lock_bank = 0, \ + .lock_bank = 1, \ .lock_bit = 7, \ .ioreset_reg = PINGROUP_REG_##ior(r), \ - .ioreset_bank = 0, \ + .ioreset_bank = 1, \ .ioreset_bit = 8, \ .drv_reg = -1, \ }
@@ -3399,8 +3399,8 @@ static const struct tegra_function tegra30_functions[] = { .odrain_reg = -1, \ .lock_reg = -1, \ .ioreset_reg = -1, \ - .drv_reg = ((r) - PINGROUP_REG_A), \ - .drv_bank = 1, \ + .drv_reg = ((r) - DRV_PINGROUP_REG_A), \ + .drv_bank = 0, \ .hsm_bit = hsm_b, \ .schmitt_bit = schmitt_b, \ .lpmd_bit = lpmd_b, \
drivers/usb/class/cdc-acm.c +16 -6
@@ -818,10 +818,6 @@ static const __u32 acm_tty_speed[] = { 2500000, 3000000, 3500000, 4000000 }; -static const __u8 acm_tty_size[] = { -5 ,6 ,7 ,8 -}; -static void acm_tty_set_termios (struct tty_struct *tty,struct ktermios *termios_old) {
@@ -835,7 +831,21 @@ static void acm_tty_set_termios(struct tty_struct *tty, newline.bParityType = termios->c_cflag &PARENB ? (termios->c_cflag &PARODD ?1 :2 ) + (termios->c_cflag &CMSPAR ?2 :0 ) :0 ; - newline.bDataBits = acm_tty_size[(termios->c_cflag &CSIZE ) >>4 ]; +switch (termios->c_cflag &CSIZE ) { +case CS5 : + newline.bDataBits =5 ; +break ; +case CS6 : + newline.bDataBits =6 ; +break ; +case CS7 : + newline.bDataBits =7 ; +break ; +case CS8 : +default : + newline.bDataBits =8 ; +break ; + }/* FIXME: Needs to clear unsupported bits in the termios */ acm->clocal = ((termios->c_cflag &CLOCAL ) !=0 );
@@ -1234,7 +1244,7 @@ made_compressed_probe:if (usb_endpoint_xfer_int (epwrite))usb_fill_int_urb (snd->urb, usb_dev, -usb_sndbulkpipe (usb_dev, epwrite->bEndpointAddress), +usb_sndintpipe (usb_dev, epwrite->bEndpointAddress),NULL , acm->writesize, acm_write_bulk, snd, epwrite->bInterval);else usb_fill_bulk_urb(snd->urb, usb_dev,
drivers/usb/dwc3/gadget.c +1 -0
@@ -1777,6 +1777,7 @@ static void dwc3_stop_active_transfer(struct dwc3 *dwc, u32 epnum) ret =dwc3_send_gadget_ep_cmd (dwc, dep->number, cmd, ¶ms);WARN_ON_ONCE (ret); dep->res_trans_idx =0 ; + dep->flags &= ~DWC3_EP_BUSY ; } }
drivers/usb/host/xhci.c +2 -1
@@ -479,7 +479,8 @@ static bool compliance_mode_recovery_timer_quirk_check(void)if (strstr (dmi_product_name,"Z420" ) ||strstr (dmi_product_name,"Z620" ) || -strstr (dmi_product_name,"Z820" )) +strstr (dmi_product_name,"Z820" ) || +strstr (dmi_product_name,"Z1" ))return true;return false;
drivers/usb/serial/option.c +64 -20
149 lines not on this page · raw message
fs/ext4/extents.c +46 -11
118 lines not on this page · raw message
fs/ext4/mballoc.c +3 -2
@@ -4984,8 +4984,9 @@ int ext4_trim_fs(struct super_block *sb, struct fstrim_range *range) end = start + (range->len >> sb->s_blocksize_bits) -1 ; minlen = range->minlen >> sb->s_blocksize_bits; -if (unlikely (minlen >EXT4_CLUSTERS_PER_GROUP (sb)) || -unlikely (start >= max_blks)) +if (minlen >EXT4_CLUSTERS_PER_GROUP (sb) || + start >= max_blks || + range->len < sb->s_blocksize)return -EINVAL ;if (end >= max_blks) end = max_blks -1 ;
fs/lockd/clntxdr.c +1 -1
@@ -223,7 +223,7 @@ static void encode_nlm_stat(struct xdr_stream *xdr, {__be32 *p; -BUG_ON (be32_to_cpu (stat) >NLM_LCK_DENIED_GRACE_PERIOD ); +WARN_ON_ONCE (be32_to_cpu (stat) >NLM_LCK_DENIED_GRACE_PERIOD ); p =xdr_reserve_space (xdr,4 ); *p = stat; }
fs/lockd/svcproc.c +2 -1
@@ -67,7 +67,8 @@ nlmsvc_retrieve_args(struct svc_rqst *rqstp, struct nlm_args *argp,/* Obtain file pointer. Not used by FREE_ALL call. */ if (filp !=NULL ) { -if ((error =nlm_lookup_file (rqstp, &file, &lock->fh)) !=0 ) + error =cast_status (nlm_lookup_file (rqstp, &file, &lock->fh)); +if (error !=0 ) goto no_locks; *filp = file;
fs/proc/stat.c +10 -4
@@ -45,10 +45,13 @@ static cputime64_t get_iowait_time(int cpu)static u64 get_idle_time (int cpu) { -u64 idle, idle_time =get_cpu_idle_time_us (cpu,NULL ); +u64 idle, idle_time =-1ULL ; + +if (cpu_online (cpu)) + idle_time =get_cpu_idle_time_us (cpu,NULL );if (idle_time ==-1ULL ) -/* !NO_HZ so we can rely on cpustat.idle */ +/* !NO_HZ or cpu offline so we can rely on cpustat.idle */ idle =kcpustat_cpu (cpu).cpustat[CPUTIME_IDLE ];else idle =usecs_to_cputime64 (idle_time);
@@ -58,10 +61,13 @@ static u64 get_idle_time(int cpu)static u64 get_iowait_time (int cpu) { -u64 iowait, iowait_time =get_cpu_iowait_time_us (cpu,NULL ); +u64 iowait, iowait_time =-1ULL ; + +if (cpu_online (cpu)) + iowait_time =get_cpu_iowait_time_us (cpu,NULL );if (iowait_time ==-1ULL ) -/* !NO_HZ so we can rely on cpustat.iowait */ +/* !NO_HZ or cpu offline so we can rely on cpustat.iowait */ iowait =kcpustat_cpu (cpu).cpustat[CPUTIME_IOWAIT ];else iowait =usecs_to_cputime64 (iowait_time);
include/linux/if_vlan.h +4 -4
@@ -82,6 +82,8 @@ static inline int is_vlan_dev(struct net_device *dev) }#define vlan_tx_tag_present (__skb) ((__skb)->vlan_tci & VLAN_TAG_PRESENT) +#define vlan_tx_nonzero_tag_present (__skb) \ + (vlan_tx_tag_present(__skb) && ((__skb)->vlan_tci & VLAN_VID_MASK))#define vlan_tx_tag_get (__skb) ((__skb)->vlan_tci & ~VLAN_TAG_PRESENT)#if defined(CONFIG_VLAN_8021Q ) || defined(CONFIG_VLAN_8021Q_MODULE )
@@ -91,7 +93,7 @@ extern struct net_device *__vlan_find_dev_deep(struct net_device *real_dev,extern struct net_device *vlan_dev_real_dev (const struct net_device *dev);extern u16 vlan_dev_vlan_id (const struct net_device *dev); -extern bool vlan_do_receive (struct sk_buff **skb,bool last_handler); +extern bool vlan_do_receive (struct sk_buff **skb);extern struct sk_buff *vlan_untag (struct sk_buff *skb);extern int vlan_vid_add (struct net_device *dev,unsigned short vid);
@@ -120,10 +122,8 @@ static inline u16 vlan_dev_vlan_id(const struct net_device *dev)return 0 ; } -static inline bool vlan_do_receive (struct sk_buff **skb,bool last_handler) +static inline bool vlan_do_receive (struct sk_buff **skb) { -if (((*skb)->vlan_tci &VLAN_VID_MASK ) && last_handler) - (*skb)->pkt_type =PACKET_OTHERHOST ;return false; }
include/linux/mtd/nand.h +0 -3
@@ -215,9 +215,6 @@ typedef enum {#define NAND_SUBPAGE_READ (chip) ((chip->ecc.mode == NAND_ECC_SOFT) \ && (chip->page_shift > 9)) -/* Mask to zero out the chip options, which come from the id table */ -#define NAND_CHIPOPTIONS_MSK (0x0000ffff & ~NAND_NO_AUTOINCR) -/* Non chip related options */ /* This option skips the bbt scan during initialization. */ #define NAND_SKIP_BBTSCAN 0x00010000
include/linux/netlink.h +17 -4
@@ -153,6 +153,7 @@ struct nlattr {#include <linux/capability.h> #include <linux/skbuff.h> +#include <linux/export.h> struct net ;
@@ -226,6 +227,8 @@ struct netlink_callback { struct netlink_callback *cb);int (*done)(struct netlink_callback *cb);void *data; +/* the module that dump function belong to */ +struct module *module;u16 family;u16 min_dump_alloc;unsigned int prev_seq, seq;
@@ -251,14 +254,24 @@ __nlmsg_put(struct sk_buff *skb, u32 pid, u32 seq, int type, int len, int flags)struct netlink_dump_control {int (*dump)(struct sk_buff *skb,struct netlink_callback *); -int (*done)(struct netlink_callback *); +int (*done)(struct netlink_callback *);void *data; +struct module *module;u16 min_dump_alloc; }; -extern int netlink_dump_start (struct sock *ssk,struct sk_buff *skb, -const struct nlmsghdr *nlh, -struct netlink_dump_control *control); +extern int __netlink_dump_start (struct sock *ssk,struct sk_buff *skb, +const struct nlmsghdr *nlh, +struct netlink_dump_control *control); +static inline int netlink_dump_start (struct sock *ssk,struct sk_buff *skb, +const struct nlmsghdr *nlh, +struct netlink_dump_control *control) +{ +if (!control->module) + control->module =THIS_MODULE ; + +return __netlink_dump_start (ssk, skb, nlh, control); +}#define NL_NONROOT_RECV 0x1
include/linux/sunrpc/xprt.h +3 -0
@@ -114,6 +114,7 @@ struct rpc_xprt_ops {void (*set_buffer_size)(struct rpc_xprt *xprt,size_t sndsize,size_t rcvsize);int (*reserve_xprt)(struct rpc_xprt *xprt,struct rpc_task *task);void (*release_xprt)(struct rpc_xprt *xprt,struct rpc_task *task); +void (*alloc_slot)(struct rpc_xprt *xprt,struct rpc_task *task);void (*rpcbind)(struct rpc_task *task);void (*set_port)(struct rpc_xprt *xprt,unsigned short port);void (*connect)(struct rpc_task *task);
@@ -279,6 +280,8 @@ void xprt_connect(struct rpc_task *task);void xprt_reserve (struct rpc_task *task);int xprt_reserve_xprt (struct rpc_xprt *xprt,struct rpc_task *task);int xprt_reserve_xprt_cong (struct rpc_xprt *xprt,struct rpc_task *task); +void xprt_alloc_slot (struct rpc_xprt *xprt,struct rpc_task *task); +void xprt_lock_and_alloc_slot (struct rpc_xprt *xprt,struct rpc_task *task);int xprt_prepare_transmit (struct rpc_task *task);void xprt_transmit (struct rpc_task *task);void xprt_end_transmit (struct rpc_task *task);
include/rdma/rdma_netlink.h +1 -0
@@ -39,6 +39,7 @@ struct rdma_cm_id_stats {struct ibnl_client_cbs {int (*dump)(struct sk_buff *skb,struct netlink_callback *nlcb); +struct module *module; };int ibnl_init (void );
kernel/cgroup.c +10 -31
69 lines not on this page · raw message
kernel/sys.c +7 -5
@@ -1180,15 +1180,16 @@ DECLARE_RWSEM(uts_sem);* Work around broken programs that cannot handle "Linux 3.0". * Instead we map 3.x to 2.6.40+x, so e.g. 3.0 would be 2.6.40 */ -static int override_release (char __user *release,int len) +static int override_release (char __user *release,size_t len) {int ret =0 ; -char buf[65 ];if (current->personality &UNAME26 ) { -char *rest =UTS_RELEASE ; +const char *rest =UTS_RELEASE ; +char buf[65 ] = {0 };int ndots =0 ;unsigned v; +size_t copy;while (*rest) {if (*rest =='.' && ++ndots >=3 )
@@ -1198,8 +1199,9 @@ static int override_release(char __user *release, int len) rest++; } v = ((LINUX_VERSION_CODE >>8 ) &0xff ) +40 ; -snprintf (buf, len,"2.6.%u%s" , v, rest); - ret =copy_to_user (release, buf, len); + copy =clamp_t (size_t, len,1 ,sizeof (buf)); + copy =scnprintf (buf, copy,"2.6.%u%s" , v, rest); + ret =copy_to_user (release, buf, copy +1 ); }return ret; }
net/8021q/vlan_core.c +2 -8
@@ -5,7 +5,7 @@#include <linux/export.h> #include "vlan.h" -bool vlan_do_receive (struct sk_buff **skbp,bool last_handler) +bool vlan_do_receive (struct sk_buff **skbp) {struct sk_buff *skb = *skbp;u16 vlan_id = skb->vlan_tci &VLAN_VID_MASK ;
@@ -13,14 +13,8 @@ bool vlan_do_receive(struct sk_buff **skbp, bool last_handler)struct vlan_pcpu_stats *rx_stats; vlan_dev =vlan_find_dev (skb->dev, vlan_id); -if (!vlan_dev) { -/* Only the last call to vlan_do_receive() should change -* pkt_type to PACKET_OTHERHOST -*/ -if (vlan_id && last_handler) - skb->pkt_type =PACKET_OTHERHOST ; +if (!vlan_dev)return false; - } skb = *skbp =skb_share_check (skb,GFP_ATOMIC );if (unlikely (!skb))
net/core/dev.c +5 -2
@@ -3209,18 +3209,18 @@ another_round: ncls:#endif - rx_handler =rcu_dereference (skb->dev->rx_handler);if (vlan_tx_tag_present (skb)) {if (pt_prev) { ret =deliver_skb (skb, pt_prev, orig_dev); pt_prev =NULL ; } -if (vlan_do_receive (&skb, !rx_handler)) +if (vlan_do_receive (&skb)) goto another_round;else if (unlikely (!skb)) goto out; } + rx_handler =rcu_dereference (skb->dev->rx_handler);if (rx_handler) {if (pt_prev) { ret =deliver_skb (skb, pt_prev, orig_dev);
@@ -3240,6 +3240,9 @@ ncls: } } +if (vlan_tx_nonzero_tag_present (skb)) + skb->pkt_type =PACKET_OTHERHOST ; +/* deliver only exact match when indicated */ null_or_dev = deliver_exact ? skb->dev :NULL ;
net/core/neighbour.c +2 -4
@@ -1285,8 +1285,6 @@ int neigh_resolve_output(struct neighbour *neigh, struct sk_buff *skb)if (!dst) goto discard; -__skb_pull (skb,skb_network_offset (skb)); -if (!neigh_event_send (neigh, skb)) {int err;struct net_device *dev = neigh->dev;
@@ -1296,6 +1294,7 @@ int neigh_resolve_output(struct neighbour *neigh, struct sk_buff *skb)neigh_hh_init (neigh, dst); do { + __skb_pull(skb, skb_network_offset(skb)); seq = read_seqbegin(&neigh->ha_lock); err = dev_hard_header(skb, dev, ntohs(skb->protocol), neigh->ha, NULL, skb->len);
@@ -1326,9 +1325,8 @@ int neigh_connected_output(struct neighbour *neigh, struct sk_buff *skb)unsigned int seq;int err; -__skb_pull (skb,skb_network_offset (skb)); - do { + __skb_pull(skb, skb_network_offset(skb)); seq = read_seqbegin(&neigh->ha_lock); err = dev_hard_header(skb, dev, ntohs(skb->protocol), neigh->ha, NULL, skb->len);
net/ipv4/tcp_ipv4.c +4 -3
@@ -678,10 +678,11 @@ static void tcp_v4_send_reset(struct sock *sk, struct sk_buff *skb) arg.csumoffset = offsetof(struct tcphdr , check) /2 ; arg.flags = (sk &&inet_sk (sk)->transparent) ?IP_REPLY_ARG_NOSRCCHECK :0 ;/* When socket is gone, all binding information is lost. -* routing might fail in this case. using iif for oif to -* make sure we can deliver it +* routing might fail in this case. No choice here, if we choose to force +* input interface, we will misroute in case of asymmetric route. */ - arg.bound_dev_if = sk ? sk->sk_bound_dev_if :inet_iif (skb); +if (sk) + arg.bound_dev_if = sk->sk_bound_dev_if; net =dev_net (skb_dst (skb)->dev); arg.tos =ip_hdr (skb)->tos;
net/ipv6/addrconf.c +9 -6
@@ -3095,14 +3095,15 @@ static struct inet6_ifaddr *if6_get_first(struct seq_file *seq, loff_t pos)struct hlist_node *n;hlist_for_each_entry_rcu_bh (ifa, n, &inet6_addr_lst[state->bucket], addr_lst) { +if (!net_eq (dev_net (ifa->idev->dev), net)) +continue ;/* sync with offset */ if (p < state->offset) { p++;continue ; } state->offset++; -if (net_eq (dev_net (ifa->idev->dev), net)) -return ifa; +return ifa; }/* prepare for next bucket */
@@ -3120,18 +3121,20 @@ static struct inet6_ifaddr *if6_get_next(struct seq_file *seq,struct hlist_node *n = &ifa->addr_lst;hlist_for_each_entry_continue_rcu_bh (ifa, n, addr_lst) { +if (!net_eq (dev_net (ifa->idev->dev), net)) +continue ; state->offset++; -if (net_eq (dev_net (ifa->idev->dev), net)) -return ifa; +return ifa; }while (++state->bucket <IN6_ADDR_HSIZE ) { state->offset =0 ;hlist_for_each_entry_rcu_bh (ifa, n, &inet6_addr_lst[state->bucket], addr_lst) { +if (!net_eq (dev_net (ifa->idev->dev), net)) +continue ; state->offset++; -if (net_eq (dev_net (ifa->idev->dev), net)) -return ifa; +return ifa; } }
net/ipv6/tcp_ipv6.c +2 -1
@@ -896,7 +896,8 @@ static void tcp_v6_send_response(struct sk_buff *skb, u32 seq, u32 ack, u32 win,__tcp_v6_send_check (buff, &fl6.saddr, &fl6.daddr); fl6.flowi6_proto =IPPROTO_TCP ; - fl6.flowi6_oif =inet6_iif (skb); +if (ipv6_addr_type (&fl6.daddr) &IPV6_ADDR_LINKLOCAL ) + fl6.flowi6_oif =inet6_iif (skb); fl6.fl6_dport = t1->dest; fl6.fl6_sport = t1->source;security_skb_classify_flow (skb,flowi6_to_flowi (&fl6));
net/netlink/af_netlink.c +21 -8
@@ -156,6 +156,8 @@ static void netlink_sock_destruct(struct sock *sk)if (nlk->cb) {if (nlk->cb->done) nlk->cb->done (nlk->cb); + +module_put (nlk->cb->module);netlink_destroy_callback (nlk->cb); }
@@ -1728,6 +1730,7 @@ static int netlink_dump(struct sock *sk) nlk->cb =NULL ;mutex_unlock (nlk->cb_mutex); +module_put (cb->module);netlink_destroy_callback (cb);return 0 ;
@@ -1737,9 +1740,9 @@ errout_skb:return err; } -int netlink_dump_start (struct sock *ssk,struct sk_buff *skb, -const struct nlmsghdr *nlh, -struct netlink_dump_control *control) +int __netlink_dump_start (struct sock *ssk,struct sk_buff *skb, +const struct nlmsghdr *nlh, +struct netlink_dump_control *control) {struct netlink_callback *cb;struct sock *sk;
@@ -1754,6 +1757,7 @@ int netlink_dump_start(struct sock *ssk, struct sk_buff *skb, cb->done = control->done; cb->nlh = nlh; cb->data = control->data; + cb->module = control->module; cb->min_dump_alloc = control->min_dump_alloc;atomic_inc (&skb->users); cb->skb = skb;
@@ -1764,19 +1768,28 @@ int netlink_dump_start(struct sock *ssk, struct sk_buff *skb,return -ECONNREFUSED ; } nlk =nlk_sk (sk); -/* A dump is in progress... */ +mutex_lock (nlk->cb_mutex); +/* A dump is in progress... */ if (nlk->cb) {mutex_unlock (nlk->cb_mutex);netlink_destroy_callback (cb); -sock_put (sk); -return -EBUSY ; + ret = -EBUSY ; + goto out; } +/* add reference of module which cb->dump belongs to */ +if (!try_module_get (cb->module)) { +mutex_unlock (nlk->cb_mutex); +netlink_destroy_callback (cb); + ret = -EPROTONOSUPPORT ; + goto out; + } + nlk->cb = cb;mutex_unlock (nlk->cb_mutex); ret =netlink_dump (sk); - +out:sock_put (sk);if (ret)
@@ -1787,7 +1800,7 @@ int netlink_dump_start(struct sock *ssk, struct sk_buff *skb,*/ return -EINTR ; } -EXPORT_SYMBOL (netlink_dump_start); +EXPORT_SYMBOL (__netlink_dump_start);void netlink_ack (struct sk_buff *in_skb,struct nlmsghdr *nlh,int err) {
net/rds/send.c +1 -1
@@ -1122,7 +1122,7 @@ rds_send_pong(struct rds_connection *conn, __be16 dport)rds_stats_inc (s_send_pong);if (!test_bit (RDS_LL_SEND_FULL , &conn->c_flags)) -rds_send_xmit (conn); +queue_delayed_work (rds_wq, &conn->c_send_w,0 );rds_message_put (rm);return 0 ;
net/sunrpc/cache.c +2 -2
@@ -1406,11 +1406,11 @@ static ssize_t read_flush(struct file *file, char __user *buf, size_t count, loff_t *ppos, struct cache_detail *cd) { - char tbuf[20]; + char tbuf[22];unsigned long p = *ppos;size_t len; -sprintf (tbuf,"%lu\n" ,convert_to_wallclock (cd->flush_time)); +snprintf (tbuf,sizeof (tbuf),"%lu\n" ,convert_to_wallclock (cd->flush_time)); len =strlen (tbuf);if (p >= len)return 0 ;
net/sunrpc/xprt.c +20 -14
@@ -969,11 +969,11 @@ static bool xprt_dynamic_free_slot(struct rpc_xprt *xprt, struct rpc_rqst *req)return false; } -static void xprt_alloc_slot (struct rpc_task *task) +void xprt_alloc_slot (struct rpc_xprt *xprt,struct rpc_task *task) { -struct rpc_xprt *xprt = task->tk_xprt;struct rpc_rqst *req; +spin_lock (&xprt->reserve_lock);if (!list_empty (&xprt->free)) { req = list_entry(xprt->free.next, struct rpc_rqst, rq_list);list_del (&req->rq_list);
@@ -994,12 +994,29 @@ static void xprt_alloc_slot(struct rpc_task *task)default : task->tk_status = -EAGAIN ; } +spin_unlock (&xprt->reserve_lock);return ; out_init_req: task->tk_status =0 ; task->tk_rqstp = req;xprt_request_init (task, xprt); +spin_unlock (&xprt->reserve_lock); +} +EXPORT_SYMBOL_GPL (xprt_alloc_slot); + +void xprt_lock_and_alloc_slot (struct rpc_xprt *xprt,struct rpc_task *task) +{ +/* Note: grabbing the xprt_lock_write() ensures that we throttle +* new slot allocation if the transport is congested (i.e. when +* reconnecting a stream transport or when out of socket write +* buffer space). +*/ +if (xprt_lock_write (xprt, task)) { +xprt_alloc_slot (xprt, task); +xprt_release_write (xprt, task); + } } +EXPORT_SYMBOL_GPL (xprt_lock_and_alloc_slot);static void xprt_free_slot (struct rpc_xprt *xprt,struct rpc_rqst *req) {
@@ -1083,20 +1100,9 @@ void xprt_reserve(struct rpc_task *task)if (task->tk_rqstp !=NULL )return ; -/* Note: grabbing the xprt_lock_write() here is not strictly needed, -* but ensures that we throttle new slot allocation if the transport -* is congested (e.g. if reconnecting or if we're out of socket -* write buffer space). -*/ task->tk_timeout =0 ; task->tk_status = -EAGAIN ; -if (!xprt_lock_write (xprt, task)) -return ; - -spin_lock (&xprt->reserve_lock); -xprt_alloc_slot (task); -spin_unlock (&xprt->reserve_lock); -xprt_release_write (xprt, task); + xprt->ops->alloc_slot (xprt, task); }static inline __be32 xprt_alloc_xid (struct rpc_xprt *xprt)
net/sunrpc/xprtrdma/transport.c +1 -0
@@ -713,6 +713,7 @@ static void xprt_rdma_print_stats(struct rpc_xprt *xprt, struct seq_file *seq)static struct rpc_xprt_ops xprt_rdma_procs = { .reserve_xprt = xprt_rdma_reserve_xprt, .release_xprt = xprt_release_xprt_cong,/* sunrpc/xprt.c */ + .alloc_slot = xprt_alloc_slot, .release_request = xprt_release_rqst_cong,/* ditto */ .set_retrans_timeout = xprt_set_retrans_timeout_def,/* ditto */ .rpcbind = rpcb_getport_async,/* sunrpc/rpcb_clnt.c */
net/sunrpc/xprtsock.c +4 -0
@@ -2444,6 +2444,7 @@ static void bc_destroy(struct rpc_xprt *xprt)static struct rpc_xprt_ops xs_local_ops = { .reserve_xprt = xprt_reserve_xprt, .release_xprt = xs_tcp_release_xprt, + .alloc_slot = xprt_alloc_slot, .rpcbind = xs_local_rpcbind, .set_port = xs_local_set_port, .connect = xs_connect,
@@ -2460,6 +2461,7 @@ static struct rpc_xprt_ops xs_udp_ops = { .set_buffer_size = xs_udp_set_buffer_size, .reserve_xprt = xprt_reserve_xprt_cong, .release_xprt = xprt_release_xprt_cong, + .alloc_slot = xprt_alloc_slot, .rpcbind = rpcb_getport_async, .set_port = xs_set_port, .connect = xs_connect,
@@ -2477,6 +2479,7 @@ static struct rpc_xprt_ops xs_udp_ops = {static struct rpc_xprt_ops xs_tcp_ops = { .reserve_xprt = xprt_reserve_xprt, .release_xprt = xs_tcp_release_xprt, + .alloc_slot = xprt_lock_and_alloc_slot, .rpcbind = rpcb_getport_async, .set_port = xs_set_port, .connect = xs_connect,
@@ -2496,6 +2499,7 @@ static struct rpc_xprt_ops xs_tcp_ops = {static struct rpc_xprt_ops bc_tcp_ops = { .reserve_xprt = xprt_reserve_xprt, .release_xprt = xprt_release_xprt, + .alloc_slot = xprt_alloc_slot, .rpcbind = xs_local_rpcbind, .buf_alloc = bc_malloc, .buf_free = bc_free,