From nobody Mon Mar 31 14:58:01 2025 X-Original-To: dev-commits-src-main@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 4ZRDlG306jz5s88J; Mon, 31 Mar 2025 14:58:02 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZRDlF5n28z44JQ; Mon, 31 Mar 2025 14:58:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743433081; 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=irAMakyIVZBtW88TbQGwGAnwXxsznFdFwc5hMO7CxMo=; b=VxP3ivFvN5SCph4cBh3ki9S/LQy/0KF+OijvG62m7aKVOUS3NDkAVq1CBxH818HKFuQMYv Rl1VC9LsfkjpYOxROCG7CBBr4JQCBZ2OyBZnbqPJJ1osqxWEgDjwgyqeHYqpvB8kIRvmem KkDk9mBozhzi1MYW0nQpIzuhuQBpSoEAQg0pV1oup1tap6JjXL5HyhGpzAPAVkyQZ5+4K2 PIfZoYleJgMDuegpOcHwBvnxQV7XiEUTnZUFlbZFsfs7+XxN7tTSMim8E3lvWsxLc+YkZD Zm97LQBV3xoIiNu7jMx3o/wJ4YYcjaB3DtwKSVdNsFl2QpcnnVcPX6KTDeHK8w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743433081; a=rsa-sha256; cv=none; b=ucBIc1gCEhtQl1Kv1WLgusgqz4kWmO3oVdW34BgMcuSD5sYEdmef28q0ZWxCYcbcGCnv4g qSlW1dG6+zAUJugbsqzj+7ACF1ZRVNt2dyOv+udZiL15d20k+Q3SHf7TmWEE4OtLPEdteH v7++S9N7yiVt9vvBhWXMBIS/Av/aI0RPfMS/geSiyyhW2OR+jMuju+ikVn7xJy3EvYhacG ZZJnmCKBwhChwJNXVaWHDl+vdT0F5ygW9EXh0KafQO1d837F/HR5KwyYSaFzm6dtm/ZXPd pSSJS9/QjrDBRoUW778S59+3+nbwGhKZv62ycO1lrjI1cOG5KhtJHtKRfZrpIQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743433081; 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=irAMakyIVZBtW88TbQGwGAnwXxsznFdFwc5hMO7CxMo=; b=BfNHSkde5WLi18mUrGOlC0xg1XB+ugyHMQn4dmNgHODNMjWfnfdRBdKjQVTlzp6C61hc8i Vux1OF+r6Xch0+qIdswKHxhvv7ybWBR/7H5IJ56ayq/qAXGNSAfWflIl9Y0ypAL3laI2mA CEl5WyYhaJ/YFGx0dXOfdPWEEgUbzH40+BZbz79quKUpDg74DAYrVkRgEcNLUOmRr5m5K4 r9/kjbKVxtT5xcsvCyG0p9jAC2novTO7wUlVo8+zQV4bvGtccVXxJVzz+ZvmjKIFXAtWAQ IsZL+jKLXocW/I9z5q0aDdDei7kZ/PdrePGf4tSzo42k2XCl/Ef6/Te11ghcHg== 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 4ZRDlF4qS8zqZ6; Mon, 31 Mar 2025 14:58:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52VEw1sa038100; Mon, 31 Mar 2025 14:58:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52VEw1vx038097; Mon, 31 Mar 2025 14:58:01 GMT (envelope-from git) Date: Mon, 31 Mar 2025 14:58:01 GMT Message-Id: <202503311458.52VEw1vx038097@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: e7995c99f1e4 - main - pf: inline pf_addrcpy() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e7995c99f1e4b3ae001a4ce53c07fb97ada3d003 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=e7995c99f1e4b3ae001a4ce53c07fb97ada3d003 commit e7995c99f1e4b3ae001a4ce53c07fb97ada3d003 Author: Kristof Provost AuthorDate: 2025-03-29 09:46:54 +0000 Commit: Kristof Provost CommitDate: 2025-03-31 12:56:57 +0000 pf: inline pf_addrcpy() Make it easier for the compiler to inline this in the many cases where the 'af' is known at compile time. Reviewed by: glebius, markj Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D49581 --- sys/net/pfvar.h | 19 +++++++++++++++++++ sys/netpfil/pf/pf.c | 17 ----------------- 2 files changed, 19 insertions(+), 17 deletions(-) diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index 156ffd22c07b..82967dc10d03 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -598,6 +598,25 @@ extern struct sx pf_end_lock; #endif /* PF_INET6_ONLY */ #endif /* PF_INET_INET6 */ +#ifdef _KERNEL +#ifdef INET6 +static void inline +pf_addrcpy(struct pf_addr *dst, const struct pf_addr *src, sa_family_t af) +{ + switch (af) { +#ifdef INET + case AF_INET: + memcpy(&dst->v4, &src->v4, sizeof(dst->v4)); + break; +#endif /* INET */ + case AF_INET6: + memcpy(&dst->v6, &src->v6, sizeof(dst->v6)); + break; + } +} +#endif /* INET6 */ +#endif + /* * XXX callers not FIB-aware in our version of pf yet. * OpenBSD fixed it later it seems, 2010/05/07 13:33:16 claudio. diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index d60b30057cbb..e4affb502d0e 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -798,23 +798,6 @@ pf_set_protostate(struct pf_kstate *s, int which, u_int8_t newstate) s->src.state = newstate; } -#ifdef INET6 -void -pf_addrcpy(struct pf_addr *dst, const struct pf_addr *src, sa_family_t af) -{ - switch (af) { -#ifdef INET - case AF_INET: - memcpy(&dst->v4, &src->v4, sizeof(dst->v4)); - break; -#endif /* INET */ - case AF_INET6: - memcpy(&dst->v6, &src->v6, sizeof(dst->v6)); - break; - } -} -#endif /* INET6 */ - static void pf_init_threshold(struct pf_threshold *threshold, u_int32_t limit, u_int32_t seconds)