Re: CVS commit: src/sys/kern

[Rin Okuyama]

Hmm, misleading commit log (code itself is correct). More precisely:

s/the last element of ksyms_symtabs/ksyms_last_snapshot/

Anyway, does this help you to reintroduce
"ksyms(4): Don't skip symbol tables that are soon to be freed."?

That KASSERT does not fire anymore for aarch64, as far as I can see.

Thanks,
rin

On 2021/06/03 0:43, Rin Okuyama wrote:

Module Name:    src
Committed By:   rin
Date:           Wed Jun  2 15:43:33 UTC 2021

Modified Files:
        src/sys/kern: kern_ksyms.c

Log Message:
Fix regression introduced in rev 1.90:

http://cvsweb.netbsd.org/bsdweb.cgi/src/sys/kern/kern_ksyms.c#rev1.90

in which the last element of ksyms_symtabs is skipped by mistake.


To generate a diff of this commit:
cvs rdiff -u -r1.93 -r1.94 src/sys/kern/kern_ksyms.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/kern/kern_ksyms.c
diff -u src/sys/kern/kern_ksyms.c:1.93 src/sys/kern/kern_ksyms.c:1.94
--- src/sys/kern/kern_ksyms.c:1.93      Wed Jun  2 08:46:16 2021
+++ src/sys/kern/kern_ksyms.c   Wed Jun  2 15:43:33 2021
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern_ksyms.c,v 1.93 2021/06/02 08:46:16 riastradh Exp $        
*/
+/*     $NetBSD: kern_ksyms.c,v 1.94 2021/06/02 15:43:33 rin Exp $      */

/*-

   * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -73,7 +73,7 @@
   */

#include <sys/cdefs.h>

-__KERNEL_RCSID(0, "$NetBSD: kern_ksyms.c,v 1.93 2021/06/02 08:46:16 riastradh Exp 
$");
+__KERNEL_RCSID(0, "$NetBSD: kern_ksyms.c,v 1.94 2021/06/02 15:43:33 rin Exp 
$");

#if defined(_KERNEL) && defined(_KERNEL_OPT)

  #include "opt_copy_symtab.h"
@@ -1087,7 +1087,7 @@ ksymsread(dev_t dev, struct uio *uio, in
         */
        filepos = sizeof(struct ksyms_hdr);
        for (st = TAILQ_FIRST(&ksyms_symtabs);
-            st != ksyms_last_snapshot;
+            st != TAILQ_NEXT(ksyms_last_snapshot, sd_queue);
             st = TAILQ_NEXT(st, sd_queue)) {
                if (__predict_false(st->sd_gone))
                        continue;
@@ -1109,7 +1109,7 @@ ksymsread(dev_t dev, struct uio *uio, in
        KASSERT(filepos <= sizeof(struct ksyms_hdr) +
            ksyms_hdr.kh_shdr[SYMTAB].sh_size);
        for (st = TAILQ_FIRST(&ksyms_symtabs);
-            st != ksyms_last_snapshot;
+            st != TAILQ_NEXT(ksyms_last_snapshot, sd_queue);
             st = TAILQ_NEXT(st, sd_queue)) {
                if (__predict_false(st->sd_gone))
                        continue;