From nobody Mon Apr 18 15:03:36 2022 X-Original-To: dev-commits-src-branches@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 8667711DE1DB; Mon, 18 Apr 2022 15:03:36 +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 4KhqvD3Mg8z4gpY; Mon, 18 Apr 2022 15:03:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650294216; 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=Yp8kA1je3MP5C4l42WtIu/ZTLCLOrKxp/WAD7vZ98MQ=; b=YeW+OrvwGMt3JkjT0469I1F5hE4AYyPcl3LdsgdUFmfRR+bgBHcF/+lOpRFa4R7gg6xGUu ymQRcAMZQmrf4YfKxYvLMpVIKlch2ZuERtTAsYCEfutrPDxs1mjfz854m7sNw12fT+1hcm GE5wl5dgkuYql+XqPh8vr1TZM6T4NXFGHYSH3UirXgGV9fkQ76KMlK5LhVKnSSQJQCob4H MKRdpiAUmVmpmBehAkDppKDhmnus220p6VUBXNEtqaDYlLuzdqUKW7VwnB0pG+j9bhI+XG y4zcy36ZjXPDJVlfYlv6KEldO+UGa0VWFhmGVpniDlXD1Jpfk5Vv0thpbMHA8w== 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 53C7414CF0; Mon, 18 Apr 2022 15:03:36 +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 23IF3a0k063964; Mon, 18 Apr 2022 15:03:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23IF3aVL063963; Mon, 18 Apr 2022 15:03:36 GMT (envelope-from git) Date: Mon, 18 Apr 2022 15:03:36 GMT Message-Id: <202204181503.23IF3aVL063963@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: d15267582d6e - stable/13 - Remove 11.x ABI compat for kernel dump ioctls List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: d15267582d6ef6af239e59f21b9e8c44de3daffa Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650294216; 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=Yp8kA1je3MP5C4l42WtIu/ZTLCLOrKxp/WAD7vZ98MQ=; b=aw7SdlsEguhx72qJA8R/c1H9dVykJOW5yGwW2d/437SXcU5jApeg+e3sRKhjRmr1gGO6H/ Dos0J4o8Gbvqnqe7VQKC/TjB6k1cG0IadSOzdZG98o5pcQqT6j6j7wnxx3G2zCkxgqPjf+ rA2jG5iwaex14W22B990zNgXJxxAv3+bbKXTxqVzqRx1bbxtwuSgPezlS2eBtFL5oj1BjR A4BC92cOi4MejTprmVlhgOUA0qZ/JxVFVcHrbPBwVAyrAWMXWGpP1xfz0y8NQLi+CPxZAo I4xsHJ1ZTbAtAETN/FDTwr2ASFu0UA0f21O2wcIfjnOpuGasPej6PshDqDxo3Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650294216; a=rsa-sha256; cv=none; b=DsQB7HjzoUlE7jFWeMRe2UzB+Pp/8fz9KjggPs8K6RaKhAJn1HIpKkDtZSMmMcR5bS1AAt NLdr2PbAbCvi5jTtGtcSPigMw9lWBov7MabDv6Br8vTd17hwfCgm90F1AoP9KtzCVZiyn0 wgtH5IpEuZQwZ8XNAzB/gFqKzgeo5/iUOrTd97pzDyBDMuiRh1hnMxdlLa19AyANb+BsI8 kRr3V0IA3flcEhnooghPKQ3F7eZSEinYyKHTmSgP+4IFpRrbPZ128tZUPLHAJaOGRGd+f6 Xml4RyT+lNnAjdUbnKhk9ypLylRvD33IxY3LvLwtySV3tLlKs95lUak+XBy+xA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=d15267582d6ef6af239e59f21b9e8c44de3daffa commit d15267582d6ef6af239e59f21b9e8c44de3daffa Author: Mitchell Horne AuthorDate: 2022-04-14 22:44:02 +0000 Commit: Mitchell Horne CommitDate: 2022-04-18 14:51:40 +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 (cherry picked from commit 9c90bfcd319c4342fd55310d876976399184a910) --- 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 06a833c20c07..7b9d260bff44 100644 --- a/sys/netinet/netdump/netdump_client.c +++ b/sys/netinet/netdump/netdump_client.c @@ -466,9 +466,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; @@ -479,18 +476,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.