Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ba6b5084 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'stable/for-linus-3.14-rc0-tag' of... 

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
parents 398b60a8 0cb637bf

Documentation/kernel-parameters.txt

+5 −1
Original line number Diff line number Diff line
@@ -3124,7 +3124,11 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
			controller if no parameter or 1 is given or disable

			it if 0 is given (See Documentation/cgroups/memory.txt)



	swiotlb=	[IA-64] Number of I/O TLB slabs

	swiotlb=	[ARM,IA-64,PPC,MIPS,X86]

			Format: { <int> | force }

			<int> -- Number of I/O TLB slabs

			force -- force using of bounce buffers even if they

			         wouldn't be automatically used by the kernel



	switches=	[HW,M68k]

lib/swiotlb.c

+2 −1
Original line number Diff line number Diff line
@@ -510,7 +510,8 @@ phys_addr_t swiotlb_tbl_map_single(struct device *hwdev, 


not_found:

	spin_unlock_irqrestore(&io_tlb_lock, flags);

	dev_warn(hwdev, "swiotlb buffer is full\n");

	if (printk_ratelimit())

		dev_warn(hwdev, "swiotlb buffer is full (sz: %zd bytes)\n", size);

	return SWIOTLB_MAP_ERROR;

found:

	spin_unlock_irqrestore(&io_tlb_lock, flags);