From nobody Wed Jul 06 11:04:08 2022 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 027A31D01123; Wed, 6 Jul 2022 11:04:10 +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 4LdGrT06kWz3NYV; Wed, 6 Jul 2022 11:04:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657105449; 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=tuAnlA6/uJt21QM6/Jy/RaDNU9I+b/Rp1CldVCQt3nY=; b=eeJbfpmW/YAFL2scnmdsBxhzfYTQi7lm6Od+PrGtWBDB3sKtPIlB+vc/jaAFqLWY57pWgu nbZ2txVo/1y3nvKBz3fAbDS+D/nKjjmrrdwBLCiHZwXs/ZnW1jWX1hU41jvm/T9yzgDBpd g6XPuwE7bcHiNYKoz3BoZUq1GHZK6VhgQI5Q7euoDhDZg3Y+XTA/53coinWMSRpaH1PSLo 2VsxsZYMdHFL4KQSrna62F454Z97dIf2ZHFhmOo+2Qy9E1D5reFlNJBwCFow8J0DvhbaKg 6z0tb+N9Ox4D7tBfBHdlVJVtjD1d4KbGHH3wDaKn8dL2oXg0FzhalJFtzvYB6Q== 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 BA93219353; Wed, 6 Jul 2022 11:04:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 266B48T1096601; Wed, 6 Jul 2022 11:04:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 266B48sZ096600; Wed, 6 Jul 2022 11:04:08 GMT (envelope-from git) Date: Wed, 6 Jul 2022 11:04:08 GMT Message-Id: <202207061104.266B48sZ096600@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: 29ef2caa02d0 - stable/13 - kdump: Decode Linux clock_nanosleep syscall 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 29ef2caa02d096b867035ed7211babf24e4585f9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657105449; 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=tuAnlA6/uJt21QM6/Jy/RaDNU9I+b/Rp1CldVCQt3nY=; b=qeIPjdMITMuGA/co6hYQheDiXwb4j/T0Q2uJ64wd+bu5IbsvFVdQ5Op5CTnLtIavCjMIj5 NAwaUcaijozyhjAIrjeTgkpFWEjWdaSYiFgS6ziukUDx5QKtgvc0zNefJG2/a8plT+RHTZ hNmzTs8mrTgPVLxQLNVukd1DvqRQL0YFEzyvyMjQtwUaIDm+WEy2uO/cuiOTz6PxB0L9ix 6bBCucwvH4YYe1KDevU51Tz9EGVg0Th5vzboP8aQckteLljO1mIkgyzJS6ks8SARbK+P2N TFkNwMqwkw3AkWkbr6hKdbm908PAmwqLwk7TSXT5TqC4jU2Go5IJd4V1Jcmlew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657105449; a=rsa-sha256; cv=none; b=ecT8T45CXcJM9H8iKGkGeZozLgMuDQR+2YWzWx0YklKF+WIih685GQ6BKkx0Sn06UuG9LV 1vPyAIiM/NMn3HT8ob9eZxm7psrizW94ZsW4VtdMbv8cngAG6H8ZlVthJjqB3GPrevU0Qz EOLA1DATWt+f2qCYm4qeQH8CDNamj+e9WLUd6eTSzUv1gUvPelNCRwcnpnI0uZfpJd72xN Uc6umBoGMAwgxSmTstzlV/MvM4sEWRJiR/GDEV9jwQbUlsKTTILXnrzuXzKhoemW+PuJHl ZQ8fKsO6o0LrWBjRIwtO0vwxGNnbaz6eu03aul3gzXhIC+Xsoc9Z7WxgN26MvQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=29ef2caa02d096b867035ed7211babf24e4585f9 commit 29ef2caa02d096b867035ed7211babf24e4585f9 Author: Dmitry Chagin AuthorDate: 2022-06-22 11:21:42 +0000 Commit: Dmitry Chagin CommitDate: 2022-07-06 11:02:14 +0000 kdump: Decode Linux clock_nanosleep syscall MFC after: 2 weeks (cherry picked from commit 39de84b619b0d8bb27aa77e49b6134ca06370e1a) --- lib/libsysdecode/linux.c | 7 +++++++ lib/libsysdecode/mklinuxtables | 1 + lib/libsysdecode/sysdecode.h | 1 + usr.bin/kdump/linux.c | 22 ++++++++++++++++++++++ 4 files changed, 31 insertions(+) diff --git a/lib/libsysdecode/linux.c b/lib/libsysdecode/linux.c index adaf6172618d..79e71d1207ca 100644 --- a/lib/libsysdecode/linux.c +++ b/lib/libsysdecode/linux.c @@ -190,3 +190,10 @@ sysdecode_linux_sigprocmask_how(int how) return (lookup_value(sigprocmaskhow, how)); } + +bool +sysdecode_linux_clock_flags(FILE *fp, int flags, int *rem) +{ + + return (print_mask_int(fp, clockflags, flags, rem)); +} diff --git a/lib/libsysdecode/mklinuxtables b/lib/libsysdecode/mklinuxtables index efd579adff35..caeeb785b4d3 100644 --- a/lib/libsysdecode/mklinuxtables +++ b/lib/libsysdecode/mklinuxtables @@ -89,6 +89,7 @@ cat <<_EOF_ _EOF_ gen_table "clockids" "LINUX_CLOCK_[A-Z_]+[[:space:]]+[0-9]+" "compat/linux/linux_timer.h" +gen_table "clockflags" "LINUX_TIMER_[A-Z_]+[[:space:]]+0x[0-9]+" "compat/linux/linux_timer.h" gen_table "clockcpuids" "LINUX_CPUCLOCK_[A-Z_]+[[:space:]]+[0-9]+" "compat/linux/linux_timer.h" "_MASK|_MAX" gen_table "sigprocmaskhow" "LINUX_SIG_[A-Z]+[[:space:]]+[0-9]+" "compat/linux/linux.h" diff --git a/lib/libsysdecode/sysdecode.h b/lib/libsysdecode/sysdecode.h index dd765d28d870..6d72a84ef32a 100644 --- a/lib/libsysdecode/sysdecode.h +++ b/lib/libsysdecode/sysdecode.h @@ -142,6 +142,7 @@ bool sysdecode_shmflags(FILE *_fp, int _flags, int *_rem); #define SYSDECODE_HAVE_LINUX void sysdecode_linux_clockid(FILE *_fp, clockid_t _which); +bool sysdecode_linux_clock_flags(FILE *_fp, int _flags, int *_rem); const char *sysdecode_linux_signal(int _sig); const char *sysdecode_linux_sigprocmask_how(int _how); diff --git a/usr.bin/kdump/linux.c b/usr.bin/kdump/linux.c index f55d0b7da83d..1d9768fc302d 100644 --- a/usr.bin/kdump/linux.c +++ b/usr.bin/kdump/linux.c @@ -87,6 +87,17 @@ ktrsyscall_linux(struct ktr_syscall *ktr, register_t **resip, ip++; narg--; break; + case LINUX_SYS_linux_clock_nanosleep: + putchar('('); + sysdecode_linux_clockid(stdout, *ip); + putchar(','); + ip++; + narg--; + print_mask_arg0(sysdecode_linux_clock_flags, *ip); + c = ','; + ip++; + narg--; + break; case LINUX_SYS_linux_kill: case LINUX_SYS_linux_tkill: case LINUX_SYS_linux_rt_sigqueueinfo: @@ -169,6 +180,17 @@ ktrsyscall_linux32(struct ktr_syscall *ktr, register_t **resip, ip++; narg--; break; + case LINUX32_SYS_linux_clock_nanosleep: + putchar('('); + sysdecode_linux_clockid(stdout, *ip); + putchar(','); + ip++; + narg--; + print_mask_arg0(sysdecode_linux_clock_flags, *ip); + c = ','; + ip++; + narg--; + break; case LINUX32_SYS_linux_kill: case LINUX32_SYS_linux_tkill: case LINUX32_SYS_linux_rt_sigqueueinfo: