From nobody Wed Nov 22 20:23:56 2023 X-Original-To: freebsd-current@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 4SbCQ02rGYz51pLc for ; Wed, 22 Nov 2023 20:24:08 +0000 (UTC) (envelope-from rick.macklem@gmail.com) Received: from mail-pg1-x536.google.com (mail-pg1-x536.google.com [IPv6:2607:f8b0:4864:20::536]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SbCPz53Vtz4S8Y; Wed, 22 Nov 2023 20:24:07 +0000 (UTC) (envelope-from rick.macklem@gmail.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20230601 header.b=DhKoxZrK; spf=pass (mx1.freebsd.org: domain of rick.macklem@gmail.com designates 2607:f8b0:4864:20::536 as permitted sender) smtp.mailfrom=rick.macklem@gmail.com; dmarc=pass (policy=none) header.from=gmail.com Received: by mail-pg1-x536.google.com with SMTP id 41be03b00d2f7-5c186f027cfso108404a12.3; Wed, 22 Nov 2023 12:24:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1700684646; x=1701289446; darn=freebsd.org; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=BCnPP2Lt8KsVpERFQPUfwutkmn00JaUwN1kaZ7EjlSs=; b=DhKoxZrKyRzxFy3Shfjr/b9UTyybBJUG5Niki5U42k8do2r1OzRN720HLblOM1DpGH 40SY+Mkq1mUTq9EyU25ADoAg7/YwVMed+NAm183v/CsatwzjpeokiCDQvQvUcZ0SJIQ5 iE1BAm2d56yrwNZnGmGq1BnJ4l6qounapj9SUU+OTFB3CbjFjKgGfbH8qh6zy2UnJenS 1Vfz8fpWNbNTad9EMFehk8ztd6DrWJSbzea9tmJm3vNa9ZyspBuWYooG81/JEyXDA6cY r3X4sxxEKLKDxJoiNDAk1sgYqMYct3GoR7FA1GUZ5synWjXN0T3WflEDbRjBoc6EPtIP 49sw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700684646; x=1701289446; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=BCnPP2Lt8KsVpERFQPUfwutkmn00JaUwN1kaZ7EjlSs=; b=xRkepDNp71u1QcPN5MkTcS/UR2j3QsfWkegbMwRlUM1OYvXDZrVL7ev7qt6C+mCbGx oZA5YAzAW4S/xkHbCM5j5Z02bQb+NBnspDgfg6F9DUEWtU7hrYTrN15+yBI3HfMhCNl9 jJkxpqrM6naA8lPMX2epzXwdBCPk68JhYN51Ug4775Ls3ztb/1UIUBSbIVcQWBqWGaIa 3pGFBVhgdrmSIS6QsHuf5CtRUpkdQjqBOCvTGbCcUOkxac3weORUyB7bBclRg65H3psW JqVIY8HBMaSmQzdXCk26QvupQ/LworN0h0D64TbLuoZbmRbl6orcwGujJUVMHoidTJpU yyDw== X-Gm-Message-State: AOJu0YyWQWH7zObKcO1NtaUy/7mXDNG3phYloNiy+A99RS4uPG+jm4hD YyyQsS3TqtHZgnVC6cqFrKvLmIdtDZiUI3e/HDi9SDU= X-Google-Smtp-Source: AGHT+IFs3YF8vDuB/fyVi0iYPV4EuZ13E0VIk+yBk8k5sB2HgrLvvywr+qnBmC6OVEfQFLQe8MeQhqAFuug8ui74Zkc= X-Received: by 2002:a05:6a20:a182:b0:187:f2f7:2383 with SMTP id r2-20020a056a20a18200b00187f2f72383mr2465485pzk.45.1700684646263; Wed, 22 Nov 2023 12:24:06 -0800 (PST) List-Id: Discussions about the use of FreeBSD-current List-Archive: https://lists.freebsd.org/archives/freebsd-current List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-current@freebsd.org MIME-Version: 1.0 From: Rick Macklem Date: Wed, 22 Nov 2023 12:23:56 -0800 Message-ID: Subject: RFC: #f FreeBSD_version of #ifdef for OpenZFS pull request To: Martin Matuska , Alexander Motin , FreeBSD CURRENT , Garrett Wollman , Mike Karels Content-Type: text/plain; charset="UTF-8" X-Spamd-Result: default: False [-3.90 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.90)[-0.902]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20230601]; MIME_GOOD(-0.10)[text/plain]; RCVD_COUNT_ONE(0.00)[1]; MLMMJ_DEST(0.00)[freebsd-current@freebsd.org]; FROM_EQ_ENVFROM(0.00)[]; RCVD_TLS_LAST(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::536:from]; DKIM_TRACE(0.00)[gmail.com:+]; TAGGED_FROM(0.00)[]; FROM_HAS_DN(0.00)[]; ARC_NA(0.00)[]; MID_RHS_MATCH_FROMTLD(0.00)[]; FREEMAIL_FROM(0.00)[gmail.com]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCPT_COUNT_FIVE(0.00)[5]; TO_DN_ALL(0.00)[]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim] X-Rspamd-Queue-Id: 4SbCPz53Vtz4S8Y X-Spamd-Bar: --- Hi, I have a patch currently under review at D42672 that fixes visibility of snapshots under .zfs/snapshot for NFS clients. It adds a new function called vfs_exjail_clone(), which the ZFS code needs to use to fill in the mnt_exjail field. Since the OpenZFS code is supposed to build for 12.2 or later, I can see two ways of doing this: (A) #if on the FreeBSD_versions, which will look something like: #if (__FreeBSD_version >= 1300xxx && __FreeBSD_version < 1400000) || (__FreeBSD_version >= 1400yyy && __FreeBSD_version < 1400500) || (__FreeBSD_version >= 1400zzz && __FreeBSD_version < 1500000) || __FreeBSD_version >= 1500wwww vfs_exjail_clone(); #endif The problem with this one is I do not know what www, xxx, yyy and zzz are until I have MFC'd the patch and bumped __FreeBSD_version. --> I cannot generate the OpenZFS pull request until after that and, since I am headed to Florida for a few weeks, it would be late December at the earliest. OR (B) add a line like #define VFS_SUPPORTS_EXJAIL_CLONE 1 to mount.h in the patch and then: #ifdef VFS_SUPPORTS_EXJAIL_CLONE vfs_exjail_clone(); #endif The adavntage of (B) is that I can do the pull request on OpenZFS right away and commit the patch to main, etc as soon as possible, So, which do you think is preferred? rick ps: Unless D42672 gets reviewed soon, it won't really matter w.r.t. timing.