From nobody Mon Mar 18 21:13:54 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Tz6zQ3j9Bz5F1wG; Mon, 18 Mar 2024 21:13:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tz6zQ35Ldz4SR2; Mon, 18 Mar 2024 21:13:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710796434; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LXnbXjo7yYjwhstIzmM0XdbuWkz17P3yyMpRActT3g4=; b=YM82RVba2Uo0wd+c1jm7oJaqJ2qDFh4kord2MKSTSkxPOOmdAJJhA12XLs9hTFPf/Ysy5V ZYJcQLu0lEXlM5HyUGx2Pzli2NeIoFv+fVSuzImbF1bc5K3th+/nU0hEP/vhlPY7paKG0A lMYfvcUWwmG3dyqbPel4T1h8m6whea8OpQqWou18CPpdMAwkb1z5OAEgUPBb3AW9R5L36S OlZ/mOTnstedalQP5E+4pD4pxnlgcYtxFYd/ECn71D0NER06WZJz2SsvFoanet3F6Oj5s/ V7AijtgdtnfarCzjF78hqcp3lhxN+WNJaPSj9OgsPxuKg/i8A03R07P2tPh8Qg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710796434; a=rsa-sha256; cv=none; b=et+ptkTfbXL9uGTE/p5Mm1w0UXJMjfTQfZbFQyJBlR/Mk/I+zm9fkE4evZeDwOoA6TRjxp s1+0sAymSHpVqkQeHXAowE73VIkiatK0Yo622U4UeASmLL2b/GlKNMkYj4PLFbE1J1gwtA I5YhOEoNt9Z7D+v9EAgtdWAPysjcW0K2zVvBdkvaHck5arrOPTf1VCL2/B14WHEafldKeg yKcb6RolCG1PZm2unuqCA1TAqC8IcDydL3jbgnE2yB8N7XBfJeoV/Jak5L6M49hZRWiRhR 0DoRv1YVkK2QKtrLj4hdmDzZOfxXYAOHKP5FVppUdUc0rPlEN4yoRtdk71LIvQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710796434; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LXnbXjo7yYjwhstIzmM0XdbuWkz17P3yyMpRActT3g4=; b=fnbGqj5S92TIYTzQi4gQzkda9i+JCuDKNd0a7EeMfAeSNEG+dD3wC+RdZWhYMcwca0okzi xnVP0DbzQFPQrOV4KWjEesPM5+J827KO8IsekH5BKs+YEEn4iFquw3TFL+4KcVpB8GdIlx 6OFiFkpJdDmj3a9ZVCASNmMcUxiJq5ZCZuenguM8u6glsKajpeadv0t3vo2X+YU4pWGLvw 0EV1jS4kqOZqCAUrJyRBA7KQw85yEMaVpMeXeXv53I7iru/FgCRTh6GGJBkHPj4GkL0IMZ OAEWdIqZiKdHpjbef1Z3ZK3ZMMrJR8W/IBnQt8nbKGCBj2DHuyCSqJsnPfZrmg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Tz6zQ2hZkzfwT; Mon, 18 Mar 2024 21:13:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42ILDssb044114; Mon, 18 Mar 2024 21:13:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42ILDsux044111; Mon, 18 Mar 2024 21:13:54 GMT (envelope-from git) Date: Mon, 18 Mar 2024 21:13:54 GMT Message-Id: <202403182113.42ILDsux044111@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ka Ho Ng Subject: git: 60bc9617e79e - main - kerneldump: add livedump_start_vnode(9) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: khng X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 60bc9617e79e99bdf670304923f3baed4b749ad3 Auto-Submitted: auto-generated The branch main has been updated by khng: URL: https://cgit.FreeBSD.org/src/commit/?id=60bc9617e79e99bdf670304923f3baed4b749ad3 commit 60bc9617e79e99bdf670304923f3baed4b749ad3 Author: Vijeyalakshumi Koteeswaran AuthorDate: 2024-03-18 19:26:29 +0000 Commit: Ka Ho Ng CommitDate: 2024-03-18 21:12:18 +0000 kerneldump: add livedump_start_vnode(9) livedump_start_vnode(9) is introduced such that the live minidump on the system could take a vnode. This interface could be used to extend support for the existing framework in downstream. Bump __FreeBSD_version for introducing livedump_start_vnode(9). Sponsored by: Juniper Networks, Inc. Reviewed by: khng Differential Revision: https://reviews.freebsd.org/D43471 --- sys/kern/kern_vnodedumper.c | 32 +++++++++++++++++++++++--------- sys/sys/kerneldump.h | 1 + sys/sys/param.h | 2 +- 3 files changed, 25 insertions(+), 10 deletions(-) diff --git a/sys/kern/kern_vnodedumper.c b/sys/kern/kern_vnodedumper.c index 0104369b9d67..5a2c255390cc 100644 --- a/sys/kern/kern_vnodedumper.c +++ b/sys/kern/kern_vnodedumper.c @@ -61,11 +61,8 @@ int livedump_start(int fd, int flags, uint8_t compression) { #if MINIDUMP_PAGE_TRACKING == 1 - struct dumperinfo di, *livedi; - struct diocskerneldump_arg kda; - struct vnode *vp; struct file *fp; - void *rl_cookie; + struct vnode *vp; int error; error = priv_check(curthread, PRIV_KMEM_READ); @@ -84,8 +81,27 @@ livedump_start(int fd, int flags, uint8_t compression) error = EBADF; goto drop; } + error = livedump_start_vnode(vp, flags, compression); + if (error != 0) + goto drop; +drop: + fdrop(fp, curthread); + return (error); +#else + return (EOPNOTSUPP); +#endif /* MINIDUMP_PAGE_TRACKING == 1 */ +} - /* Set up a new dumper. */ +int +livedump_start_vnode(struct vnode *vp, int flags, uint8_t compression) +{ +#if MINIDUMP_PAGE_TRACKING == 1 + struct dumperinfo di, *livedi; + struct diocskerneldump_arg kda; + void *rl_cookie; + int error; + + /* Set up a new dumper. */ bzero(&di, sizeof(di)); di.dumper_start = vnode_dumper_start; di.dumper = vnode_dump; @@ -97,13 +113,13 @@ livedump_start(int fd, int flags, uint8_t compression) kda.kda_compression = compression; error = dumper_create(&di, "livedump", &kda, &livedi); if (error != 0) - goto drop; + return (error); /* Only allow one livedump to proceed at a time. */ if (sx_try_xlock(&livedump_sx) == 0) { dumper_destroy(livedi); error = EBUSY; - goto drop; + return (error); } /* To be used by the callback functions. */ @@ -126,8 +142,6 @@ out: vn_rangelock_unlock(vp, rl_cookie); sx_xunlock(&livedump_sx); dumper_destroy(livedi); -drop: - fdrop(fp, curthread); return (error); #else return (EOPNOTSUPP); diff --git a/sys/sys/kerneldump.h b/sys/sys/kerneldump.h index 46f05b3c130d..1f03c4b9c2d5 100644 --- a/sys/sys/kerneldump.h +++ b/sys/sys/kerneldump.h @@ -161,6 +161,7 @@ void dumpsys_pb_progress(size_t); extern int do_minidump; int livedump_start(int, int, uint8_t); +int livedump_start_vnode(struct vnode *, int, uint8_t); /* Live minidump events */ typedef void (*livedump_start_fn)(void *arg, int *errorp); diff --git a/sys/sys/param.h b/sys/sys/param.h index 4369aba9bb46..d56255431ba2 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -73,7 +73,7 @@ * cannot include sys/param.h and should only be updated here. */ #undef __FreeBSD_version -#define __FreeBSD_version 1500015 +#define __FreeBSD_version 1500016 /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,