From nobody Fri Apr 15 15:06:20 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 413A65D2881; Fri, 15 Apr 2022 15:06:21 +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 4Kg05n1JfXz58LH; Fri, 15 Apr 2022 15:06:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650035181; 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=AtzyVeOz1cy8/yYaF+0v1DzokxsCJ0dxQz2aRHKjvHo=; b=MJ1G6gKKoLUTqDwP1viWHWp4TLgmLoEhCxo9Ux6ibwkaft4WtIPZmVT/PxvxvRo0yS0COz JqvEdWlflkFN6vWmK/ni1tz+mDxkT5xXQjEB+8S/4SrwQq8XquRjluhK5skOBVLSeH+Z2A hk3KjhzE/XoxbBtrq4F5yg4Xl6aMbZ8HNYO9qpjkSa3N2Xg8rp4IV7VwR6LfO+jwFMFKrH ynIMPv8CUDoadq9QOE3A5NpwHzHKvy+fkwQ+dYPM3q16dzmMKjXTUjhuUIw60zKhz4ZPdI NlkVdJPv6nobSqgKs/T11PEOTlB2pYRs/87RfRvOpHg1FZ1waMWHcNdQrJ7exQ== 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 0DBCD17710; Fri, 15 Apr 2022 15:06:21 +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 23FF6KaN017904; Fri, 15 Apr 2022 15:06:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23FF6K1S017903; Fri, 15 Apr 2022 15:06:20 GMT (envelope-from git) Date: Fri, 15 Apr 2022 15:06:20 GMT Message-Id: <202204151506.23FF6K1S017903@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 9c90bfcd319c - main - Remove 11.x ABI compat for kernel dump ioctls 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: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9c90bfcd319c4342fd55310d876976399184a910 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650035181; 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=AtzyVeOz1cy8/yYaF+0v1DzokxsCJ0dxQz2aRHKjvHo=; b=Eh3j28l9N4GAWSMIuM6D5+mpSI9iZjJqF7nlB8BRXrceVi+JG0P5+SD7WeNAoPPDdYtdtt 6KHdEVwzIpUlHAOnCWQIk6voRpKJoPHTxgZVyexBNEz5ynipRNQmRFGSRYcBLVj6DQdML/ FR1EB5wyM3QEfjQaPMr0Nq1twyKfSQzkG1B4zt0v4M2p34dTxfVCIVmtpGGmUyiSyMKPEW 037W7UOifYmR4+qjZYhXrsLBpMUuqUIOd05NvNEgYsQ+Nb5jA6BMlrM8K3XLqTRWzAiMTV mbujgdsN9I6twEq/dpuechJuhp6gu1/hjeK8bbZ0RqtXlwurfwzJR3ao904PNA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650035181; a=rsa-sha256; cv=none; b=FyPDvARIVGWlEs/lfNzuyzhVz0+2CyK30tdq+CWJyVkjY5/fhbcTDx+ru1J6BJHndyKEgI Cq5vMXPT8OCYH91PM1SnHHQZC6+2Sfe+JFYiLZgpp0VCHszSrWczTjAy4FtOsdbpYQvY/+ nt2yiahEY65i/WrAiNsP7ULnQAn+7WQBO6AXpumJrS7hE++R6nmNIfYkvv5zAJZq3YrSPt BrVkTNfs1lWQOLFIg0zi6gP8feBOlvs84uoQ896zYWxjTUopAacz2CKu74Qwo3/YRFHmo5 B5bR1kkcTb0EM/0+F6oz5zxY5w7NdKqTaAhuj6BDqpQpeJYLEGXFddYeX2nvPQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=9c90bfcd319c4342fd55310d876976399184a910 commit 9c90bfcd319c4342fd55310d876976399184a910 Author: Mitchell Horne AuthorDate: 2022-04-14 22:44:02 +0000 Commit: Mitchell Horne CommitDate: 2022-04-15 15:06:04 +0000 Remove 11.x ABI compat for kernel dump ioctls This code was marked gone_in(13), so its time has passed. The only consumer of this interface is dumpon(8). We do not maintain strict backwards compatibility for this utility because a) it can't/shouldn't be used from a jail or chroot and b) it is highly specific interface unique to FreeBSD. The host's (presumably more up-to-date) copy of dumpon(8) should be used to configure kernel dump devices. Reviewed by: markj, emaste MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D34913 --- sys/dev/null/null.c | 5 ----- sys/geom/geom_dev.c | 17 ----------------- sys/netinet/netdump/netdump_client.c | 15 --------------- sys/sys/disk.h | 6 ------ 4 files changed, 43 deletions(-) diff --git a/sys/dev/null/null.c b/sys/dev/null/null.c index cae470a3bcc4..54b648bbf086 100644 --- a/sys/dev/null/null.c +++ b/sys/dev/null/null.c @@ -109,11 +109,6 @@ null_ioctl(struct cdev *dev __unused, u_long cmd, caddr_t data __unused, error = 0; switch (cmd) { -#ifdef COMPAT_FREEBSD11 - case DIOCSKERNELDUMP_FREEBSD11: - gone_in(13, "FreeBSD 11.x ABI compat"); - /* FALLTHROUGH */ -#endif #ifdef COMPAT_FREEBSD12 case DIOCSKERNELDUMP_FREEBSD12: if (cmd == DIOCSKERNELDUMP_FREEBSD12) diff --git a/sys/geom/geom_dev.c b/sys/geom/geom_dev.c index b94df9fcda67..574cfa9f0215 100644 --- a/sys/geom/geom_dev.c +++ b/sys/geom/geom_dev.c @@ -570,23 +570,6 @@ g_dev_ioctl(struct cdev *dev, u_long cmd, caddr_t data, int fflag, struct thread if (error == 0 && *(u_int *)data == 0) error = ENOENT; break; -#ifdef COMPAT_FREEBSD11 - case DIOCSKERNELDUMP_FREEBSD11: - { - struct diocskerneldump_arg kda; - - gone_in(13, "FreeBSD 11.x ABI compat"); - - bzero(&kda, sizeof(kda)); - kda.kda_encryption = KERNELDUMP_ENC_NONE; - kda.kda_index = (*(u_int *)data ? 0 : KDA_REMOVE_ALL); - if (kda.kda_index == KDA_REMOVE_ALL) - error = dumper_remove(devtoname(dev), &kda); - else - error = g_dev_setdumpdev(dev, &kda); - break; - } -#endif #ifdef COMPAT_FREEBSD12 case DIOCSKERNELDUMP_FREEBSD12: { diff --git a/sys/netinet/netdump/netdump_client.c b/sys/netinet/netdump/netdump_client.c index d6fd7db364b8..5a1b10316860 100644 --- a/sys/netinet/netdump/netdump_client.c +++ b/sys/netinet/netdump/netdump_client.c @@ -500,9 +500,6 @@ netdump_ioctl(struct cdev *dev __unused, u_long cmd, caddr_t addr, struct dumperinfo dumper; uint8_t *encryptedkey; int error; -#ifdef COMPAT_FREEBSD11 - u_int u; -#endif #ifdef COMPAT_FREEBSD12 struct diocskerneldump_arg_freebsd12 *kda12; struct netdump_conf_freebsd12 *conf12; @@ -513,18 +510,6 @@ netdump_ioctl(struct cdev *dev __unused, u_long cmd, caddr_t addr, NETDUMP_WLOCK(); switch (cmd) { -#ifdef COMPAT_FREEBSD11 - case DIOCSKERNELDUMP_FREEBSD11: - gone_in(13, "11.x ABI compatibility"); - u = *(u_int *)addr; - if (u != 0) { - error = ENXIO; - break; - } - if (netdump_enabled()) - netdump_unconfigure(); - break; -#endif #ifdef COMPAT_FREEBSD12 /* * Used by dumpon(8) in 12.x for clearing previous diff --git a/sys/sys/disk.h b/sys/sys/disk.h index 043a02c2d304..ce79dcad9566 100644 --- a/sys/sys/disk.h +++ b/sys/sys/disk.h @@ -58,12 +58,6 @@ void disk_err(struct bio *bp, const char *what, int blkdone, int nl); * disk label formats. Don't use it unless you have to. */ -#define DIOCSKERNELDUMP_FREEBSD11 _IOW('d', 133, u_int) - /* - * Enable/Disable (the argument is boolean) the device for kernel - * core dumps. - */ - #define DIOCGFLUSH _IO('d', 135) /* Flush write cache */ /* * Flush write cache of the device.