From nobody Tue Feb 14 15:36:19 2023 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 4PGQKc1Mthz3s5QM; Tue, 14 Feb 2023 15:36:20 +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 4PGQKc0y5Kz4KyB; Tue, 14 Feb 2023 15:36:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676388980; 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=7D6g6+xWgXVOsmvCcPfWCtE/164znXWDImaGgdnOE/I=; b=yEFC1Af04OJAurpm47SNTdFT3VkE5BsogBB8SOblQbDeXEnNx4VmY83PGmDZRhFbKKx264 uevQRAbaDDQ1Ss4wveAfbW1eOEjYSTTkNnU5mFwmn2Nn05wwMlK84le3QsS6f2HvdYRFKd 1v7ackHnUZQcBggSzGF7xEdJT/2CXUi1BL7iNGZFuASzAWbXs+r2C6wp/XFGl038mq9Umu 2eaASRaDxDIJL4dj0D2xwGcQeo/lMt7Rv61uKL+u9foHeVU4lo4zsujtPef9IhTKWbgv/J uSsjdO3iDkubOLG7rUGB4+nWNMEfFCRYZdlRxgyinV+UcTmom9GWjWwWk/bAKQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676388980; 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=7D6g6+xWgXVOsmvCcPfWCtE/164znXWDImaGgdnOE/I=; b=iWjWXXKe9rAG69vAxebtlGyoZ8nOC5bEoRiz7CoG3zuXU02h7seRw7uCb6xWPcrwxZu5hQ s1PsD3VlIQNFQmVLfwvufW9pkIMEn2n+hIfpaf+KbslhkLB1AtCYmDZ58b+KF5vUC1aunS bmbP1DT91IYNtGnrsZMSJ+WwhA3SZJIC1FOEroGb9fsUHV8thB9Kq9QWccy0Ok6P+IKaYk Hvk45ejXsg3c9G2T6P7jAe0Rpl2q44OduJSxILMRYJgdI/Wc70npowy+LHAuzJuOWS+kWH nGY1HW9FjFbw4OunVIqzI3UTlQjTFHhZWwT1glmelra3RaEFKfrmdHuy5OeyMw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676388980; a=rsa-sha256; cv=none; b=wXlZyFCWHKia4FKs/PEu1RW8a+W8eNGm20vuuhlf+4g/8/mRkFkSlqvqT0FKpZ8GchkSAA TFeCGLFVV1A6R0n7bUNQxxb8DquoIXuq6DI9kfEtFRP3ly6VGsxMZ3USuTht7hqqgPZUYD 1caHoSxFRDuH7Bf8zUfGpT7EG1Qtl8XQ3mZ8EELqp13smhLRkz15Dtm/Bt9U3AEJLJzOcf wf3whLjRs7rN/xQw2ORnhHFcXhSEpLUMHagwERDUIAaVfcvvJsS6tXuvHVKtpVuALkD/zK qKVvZNG+tD5sWeeZpQWzn5CLm76knaCVj/7yUEiZul/yaRTybluWZco7mEz+LQ== 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 4PGQKc041pz142T; Tue, 14 Feb 2023 15:36:20 +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 31EFaJCN043742; Tue, 14 Feb 2023 15:36:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31EFaJOJ043741; Tue, 14 Feb 2023 15:36:19 GMT (envelope-from git) Date: Tue, 14 Feb 2023 15:36:19 GMT Message-Id: <202302141536.31EFaJOJ043741@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Justin Hibbits Subject: git: 189c3729d84f - main - IfAPI: More accessors 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: jhibbits X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 189c3729d84f620a6be10f62daef32ae9a47eff3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=189c3729d84f620a6be10f62daef32ae9a47eff3 commit 189c3729d84f620a6be10f62daef32ae9a47eff3 Author: Justin Hibbits AuthorDate: 2023-02-10 15:53:19 +0000 Commit: Justin Hibbits CommitDate: 2023-02-14 15:21:19 +0000 IfAPI: More accessors Summary: Add the following accessors needed by infiniband drivers: * if_getaddrlen() * if_setbroadcastaddr() * if_resolvemulti() With these accessors, and additional changes on the drivers' side, an amd64 kernel can be compiled with `struct ifnet` completely hidden. Reviewed by: melifaro Sponsored by: Juniper Networks, Inc. Differential Revision: https://reviews.freebsd.org/D38488 --- sys/net/if.c | 21 +++++++++++++++++++++ sys/net/if_var.h | 3 +++ 2 files changed, 24 insertions(+) diff --git a/sys/net/if.c b/sys/net/if.c index 43d1e2b95a63..d17738fda0b7 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -4681,6 +4681,15 @@ if_transmit(if_t ifp, struct mbuf *m) return (0); } +int +if_resolvemulti(if_t ifp, struct sockaddr **srcs, struct sockaddr *dst) +{ + if (ifp->if_resolvemulti == NULL) + return (EOPNOTSUPP); + + return (ifp->if_resolvemulti(ifp, srcs, dst)); +} + struct mbuf * if_dequeue(if_t ifp) { @@ -4928,6 +4937,12 @@ if_getbroadcastaddr(if_t ifp) return (ifp->if_broadcastaddr); } +void +if_setbroadcastaddr(if_t ifp, const uint8_t *addr) +{ + ifp->if_broadcastaddr = addr; +} + int if_getnumadomain(if_t ifp) { @@ -4964,6 +4979,12 @@ if_getfib(if_t ifp) return (ifp->if_fib); } +uint8_t +if_getaddrlen(if_t ifp) +{ + return (ifp->if_addrlen); +} + struct bpf_if * if_getbpf(if_t ifp) { diff --git a/sys/net/if_var.h b/sys/net/if_var.h index f33b4fc590c7..f6bb77908d40 100644 --- a/sys/net/if_var.h +++ b/sys/net/if_var.h @@ -604,8 +604,10 @@ int if_setflags(if_t ifp, int flags); void if_setllsoftc(if_t ifp, void *softc); void *if_getllsoftc(if_t ifp); u_int if_getfib(if_t ifp); +uint8_t if_getaddrlen(if_t ifp); int if_gethwaddr(const if_t ifp, struct ifreq *); const uint8_t *if_getbroadcastaddr(const if_t ifp); +void if_setbroadcastaddr(if_t ifp, const uint8_t *); int if_setmtu(if_t ifp, int mtu); int if_getmtu(const if_t ifp); int if_getmtu_family(const if_t ifp, int family); @@ -640,6 +642,7 @@ void if_etherbpfmtap(if_t ifp, struct mbuf *m); void if_vlancap(if_t ifp); int if_transmit(if_t ifp, struct mbuf *m); int if_init(if_t ifp, void *ctx); +int if_resolvemulti(if_t ifp, struct sockaddr **, struct sockaddr *); uint64_t if_getcounter(if_t ifp, ift_counter counter); struct label *if_getmaclabel(if_t ifp); void if_setmaclabel(if_t ifp, struct label *label);