Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 3 Jan 2021 16:51:14 GMT
From:      Mark Johnston <markj@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: 214257da3a56 - main - sendfile: Clear page pointers when handling a pager error
Message-ID:  <202101031651.103GpEa5002911@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by markj:

URL: https://cgit.FreeBSD.org/src/commit/?id=214257da3a562d1a330a6ce784074a952d354754

commit 214257da3a562d1a330a6ce784074a952d354754
Author:     Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2021-01-03 16:35:42 +0000
Commit:     Mark Johnston <markj@FreeBSD.org>
CommitDate: 2021-01-03 16:50:31 +0000

    sendfile: Clear page pointers when handling a pager error
    
    When INVARIANTS is configred, the sendfile_iodone() callback verifies
    that pages attached to the sendfile header are wired, but we unwire all
    such pages after a synchronous pager error, before calling
    sendfile_iodone().
    
    Reported by:    pho
    Tested by:      pho
    Sponsored by:   The FreeBSD Foundation
---
 sys/kern/kern_sendfile.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sys/kern/kern_sendfile.c b/sys/kern/kern_sendfile.c
index 18c9ade721a9..7d7be6f072e9 100644
--- a/sys/kern/kern_sendfile.c
+++ b/sys/kern/kern_sendfile.c
@@ -540,6 +540,7 @@ sendfile_swapin(vm_object_t obj, struct sf_io *sfio, int *nios, off_t off,
 				    ("%s: page %p[%d] I/O recovery failure",
 				    __func__, pa, j));
 				vm_page_unwire(pa[j], PQ_INACTIVE);
+				pa[j] = NULL;
 			}
 			return (EIO);
 		}



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202101031651.103GpEa5002911>