Merge tag 'stable/for-linus-3.14-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb

Pull swiotlb bug-fixes from Konrad Rzeszutek Wilk: - Don't DoS with 'swiotlb is full' message. - Documentation update. * tag 'stable/for-linus-3.14-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb: swiotlb: Don't DoS us with 'swiotlb buffer is full' (v2) swiotlb: update format

Linus Torvalds committed 12 years ago

Commit ba6b5082 parents 398b60a 0cb637b2 files · +7 −2Browse files

Unified · Split

2 files

Documentation/kernel-parameters.txt +5 −1
lib/swiotlb.c +2 −1

Documentation/kernel-parameters.txt+5−1

@@ -3124,7 +3124,11 @@ bytes respectively. Such letter suffixes can also be entirely omitted. · 3123 unmodified lines
3124	3124	controller if no parameter or 1 is given or disable
3125	3125	it if 0 is given (See Documentation/cgroups/memory.txt)
3126	3126
3127		− swiotlb= [IA-64] Number of I/O TLB slabs
	3127	+ swiotlb= [ARM,IA-64,PPC,MIPS,X86]
	3128	+ Format: { <int> \| force }
	3129	+ <int> -- Number of I/O TLB slabs
	3130	+ force -- force using of bounce buffers even if they
	3131	+ wouldn't be automatically used by the kernel
3128	3132
3129	3133	switches= [HW,M68k]
3130	3134

lib/swiotlb.c+2−1

@@ -510,7 +510,8 @@ phys_addr_t swiotlb_tbl_map_single(struct device *hwdev, · 509 unmodified lines
510	510
511	511	not_found:
512	512	spin_unlock_irqrestore(&io_tlb_lock, flags);
513		− dev_warn(hwdev, "swiotlb buffer is full\n");
	513	+ if (printk_ratelimit())
	514	+ dev_warn(hwdev, "swiotlb buffer is full (sz: %zd bytes)\n", size);
514	515	return SWIOTLB_MAP_ERROR;
515	516	found:
516	517	spin_unlock_irqrestore(&io_tlb_lock, flags);