From nobody Thu Dec 09 18:58:57 2021 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 8F2C718C6A6B; Thu, 9 Dec 2021 18:58:59 +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 4J93Gq10DSz4TL0; Thu, 9 Dec 2021 18:58:58 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 D62573E41; Thu, 9 Dec 2021 18:58:57 +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 1B9IwvmO046135; Thu, 9 Dec 2021 18:58:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B9IwvN7046134; Thu, 9 Dec 2021 18:58:57 GMT (envelope-from git) Date: Thu, 9 Dec 2021 18:58:57 GMT Message-Id: <202112091858.1B9IwvN7046134@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: a0ff553e0128 - stable/13 - ipfilter: New DT5 DTrace macro 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: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a0ff553e012827d645ffe4c004de148b07eafddf Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639076339; 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=TVvq9G9TmzC/5Yb3xwJjyhLsyQSVZEw2xeflMlOCeOg=; b=J1eNfsox60Mup9THf2flm3ogwZaYepuE/EA/j5CQnfStMIB6ATdF0dr/qSuRgNGyY8GYMr 0colWgwz8F+LzEl1ktmdC4j+piOWdc6LGB7YTqiT9/oGvgNHFjWfclYknp+0fN5Gy9a/Mv X3ldrG3ZAb8R+lq7WYOcmmRPuzBRl3Y0OQKxNayc/KYWTZSOTXKta1e+SCFZYuW4+kmEJN 3TzzwTi7ijTxc9kT2KSbsrMLr2ifcUMxfC9KxGUaF0dLupi+b7V8PkMCtXqMCxVUYUAqzR aOF4qJkGqM7k63FRYEnkW6NX6KJKtDSLcQLPhet5HYr1yULmzrgLHudPqbHORQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639076339; a=rsa-sha256; cv=none; b=GmnSSfm60zKAfsFNqXfLGHzjIrwcSI3D9kbgDfS9skR9lMfJ4FgEhxjWp2Yn6fGNao25fk 6kOZQhPbTye3+7Uq2LFtNuTz1T+Pvm3dSg+xJUn+PYk3WjrL8GsCPaUFyi7tUCBEdVXqT/ ZjMTBcE22hmQGWT0ac8kerp4a5v+CnEYkOS9fD5cq8kF5JDx05zrkIy+y0hDjf9nJjE06A kx8O9rs5zCnVOqPUbFr+1cSKPvLOF8FVqAGOzuocSQbZT+GQGzUZ5cUoOGTnYt2EqQQnKz rPNKUt0+VeUNQTx4QL8ZTpWSCn6S6OBjZFeF3pV5tAC89hW1qE9kD+oXDqT/vw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=a0ff553e012827d645ffe4c004de148b07eafddf commit a0ff553e012827d645ffe4c004de148b07eafddf Author: Cy Schubert AuthorDate: 2021-10-05 04:18:42 +0000 Commit: Cy Schubert CommitDate: 2021-12-09 18:50:22 +0000 ipfilter: New DT5 DTrace macro Define a new DT5 DTrace macro used to call DTRACE_PROBE5, for use with SDT probes with five arguments. (cherry picked from commit ca8bf28e1ee6ff213338c2a111069f5e639ea03a) --- sys/contrib/ipfilter/netinet/ip_compat.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/contrib/ipfilter/netinet/ip_compat.h b/sys/contrib/ipfilter/netinet/ip_compat.h index 6bfb323aeb23..4562b0518766 100644 --- a/sys/contrib/ipfilter/netinet/ip_compat.h +++ b/sys/contrib/ipfilter/netinet/ip_compat.h @@ -1229,12 +1229,15 @@ typedef struct tcpiphdr tcpiphdr_t; DTRACE_PROBE3(_n,_a,_b,_c,_d,_e,_f) # define DT4(_n,_a,_b,_c,_d,_e,_f,_g,_h) \ DTRACE_PROBE4(_n,_a,_b,_c,_d,_e,_f,_g,_h) +# define DT5(_n,_a,_b,_c,_d,_e,_f,_g,_h,_i,_j) \ + DTRACE_PROBE5(_n,_a,_b,_c,_d,_e,_f,_g,_h,_i,_j) #else # define DT(_n) # define DT1(_n,_a,_b) # define DT2(_n,_a,_b,_c,_d) # define DT3(_n,_a,_b,_c,_d,_e,_f) # define DT4(_n,_a,_b,_c,_d,_e,_f,_g,_h) +# define DT5(_n,_a,_b,_c,_d,_e,_f,_g,_h,_i,_j) #endif struct ip6_routing {