Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/uvm need to use PGO_NOBLOCKALLOC also in ubc_alloc_direc...
details: https://anonhg.NetBSD.org/src/rev/20029ce00216
branches: trunk
changeset: 446024:20029ce00216
user: jdolecek <jdolecek%NetBSD.org@localhost>
date: Tue Nov 20 20:07:19 2018 +0000
description:
need to use PGO_NOBLOCKALLOC also in ubc_alloc_direct() case, same
as non-direct code - otherwise the code tries to acquire the wapbl
lock again in genfs_getpages(), and panic due to locking against itself
towards PR kern/53124
diffstat:
sys/uvm/uvm_bio.c | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diffs (28 lines):
diff -r 01abeab5fd4f -r 20029ce00216 sys/uvm/uvm_bio.c
--- a/sys/uvm/uvm_bio.c Tue Nov 20 19:19:21 2018 +0000
+++ b/sys/uvm/uvm_bio.c Tue Nov 20 20:07:19 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_bio.c,v 1.97 2018/06/02 15:24:55 chs Exp $ */
+/* $NetBSD: uvm_bio.c,v 1.98 2018/11/20 20:07:19 jdolecek Exp $ */
/*
* Copyright (c) 1998 Chuck Silvers.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_bio.c,v 1.97 2018/06/02 15:24:55 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_bio.c,v 1.98 2018/11/20 20:07:19 jdolecek Exp $");
#include "opt_uvmhist.h"
#include "opt_ubc.h"
@@ -814,7 +814,8 @@
{
voff_t pgoff;
int error;
- int gpflags = flags | PGO_NOTIMESTAMP | PGO_SYNCIO | PGO_ALLPAGES;
+ int gpflags = flags | PGO_NOTIMESTAMP | PGO_SYNCIO | PGO_ALLPAGES
+ | PGO_NOBLOCKALLOC;
int access_type = VM_PROT_READ;
UVMHIST_FUNC("ubc_alloc_direct"); UVMHIST_CALLED(ubchist);
Home |
Main Index |
Thread Index |
Old Index