Skip to contentSkip to conversation

kcov: don't generate a warning on vm_insert_page()'s failure

PATCH Superseded Aleksandr Nogikh 2 participants 2 messages Mar 31, 2022 KCOV

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 kcov: don't generate a warning on vm_insert_page()'s failure

vm_insert_page()'s failure is not an unexpected condition, so don't do WARN_ONCE() in such a case.

Instead, print a kernel message and just return an error code.

---
 kernel/kcov.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
kernel/kcov.c +5 -2
index 475524bd900a..961536a03127 100644
@@ -475,8 +475,11 @@ static int kcov_mmap(struct file *filep, struct vm_area_struct *vma)
 	vma->vm_flags |= VM_DONTEXPAND;
 	for (off = 0; off < size; off += PAGE_SIZE) {
 		page = vmalloc_to_page(kcov->area + off);
-		if (vm_insert_page(vma, vma->vm_start + off, page))
-			WARN_ONCE(1, "vm_insert_page() failed");
+		res = vm_insert_page(vma, vma->vm_start + off, page);
+		if (res) {
+			pr_warn_once("kcov: vm_insert_page() failed");
+			return res;
+		}
 	}
 	return 0;
 exit:
Signature · 1 line
2.35.1.1094.g7c7d902a7c-goog
#1 lore raw
Quoted 16 lines · Aleksandr Nogikh

vm_insert_page()'s failure is not an unexpected condition, so don't do WARN_ONCE() in such a case.

Instead, print a kernel message and just return an error code.

---
 kernel/kcov.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
kernel/kcov.c +0 -0
index 475524bd900a..961536a03127 100644

kernel/kcov.c static int kcov_mmap(struct file *filep, struct vm_area_struct *vma) · line 480

Quoted 8 lines
kernel/kcov.c +3 -2
@@ -475,8 +475,11 @@ static int kcov_mmap(struct file *filep, struct vm_area_struct *vma)
        vma->vm_flags |= VM_DONTEXPAND;
        for (off = 0; off < size; off += PAGE_SIZE) {
                page = vmalloc_to_page(kcov->area + off);
-               if (vm_insert_page(vma, vma->vm_start + off, page))
-                       WARN_ONCE(1, "vm_insert_page() failed");
+               res = vm_insert_page(vma, vma->vm_start + off, page);
+               if (res) {
+                       pr_warn_once("kcov: vm_insert_page() failed");

pr_*() should be terminated by "\n" -- sorry, I missed this.

Quoted 8 lines
kernel/kcov.c +2 -1
+                       return res;
+               }
        }
        return 0;
 exit:
--

2.35.1.1094.g7c7d902a7c-goog