From owner-dev-commits-src-all@freebsd.org Sun Feb 7 15:27:14 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A782052F2CF; Sun, 7 Feb 2021 15:27:14 +0000 (UTC) (envelope-from mjguzik@gmail.com) Received: from mail-wr1-x42d.google.com (mail-wr1-x42d.google.com [IPv6:2a00:1450:4864:20::42d]) (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 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DYY1G3hNMz4kXH; Sun, 7 Feb 2021 15:27:14 +0000 (UTC) (envelope-from mjguzik@gmail.com) Received: by mail-wr1-x42d.google.com with SMTP id r7so4562567wrq.9; Sun, 07 Feb 2021 07:27:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=0wSozjItnSq03tsCWQrJgEP0Gvy+ZSrQZcyyTaDk1+g=; b=lV+HQvYazG3aLbC+ZAY6ozK+tkWhxcMt+ahuTOCGJ32H8DV2PQHlRQKlHiS8yYKNTM B7AaJ410UcFPGm08ULlK4KS1pmSSOslcuBU8lKqmJnwrLBJwb1LwYH7v0d+ZxANe6zGV gvp3vdblg/bmjIWJ6PoiNVJvi3iDv7RCZ7vvS8BvEdzxG3p+w5Npx73osOWHPLeyCrh0 GhKtrYuBMOnuFG8rr8srA/w9m6BCq6FN5HPj/dWN1nX0LkapxQeXAtbP9rfM1hVzwqpG OTLDyjxTiDrOzYjlL1rnkJ790TS8FbUQzqwOC9JlEdqiLO0oJR5Rr2lrI3UpFDVnh0NZ YtDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=0wSozjItnSq03tsCWQrJgEP0Gvy+ZSrQZcyyTaDk1+g=; b=g7XsKDcgfCY1W7lAjffmBOEQHsFdh4uVihM/P6IQsidGJo3NnH191OeiD4USkEsg+W C7f9/T2mu9qD1mrlSLvqrzB65EHCxVSLiSHTyMHNGqIfF8VFPZn2GJz18rp8+W2qpxA1 o80dO4YyLjsOl/KSt1Y40H842vrnNljQEXltdEGZKRFTgcXF0XSi+AS5g4YzOLdSEcAO yP5qzSyQRx40H6HJYkqwgt17R/EP2zygCd/I5FfRAkx+3AmXwdmgr+52Q0KbIr3l95c5 K8mfqqaIf+drrcHsV3o7vDhwJcsrXeaYrV47YQpGP68H5EUeoSrII2LS7a9ObhMFoGWK P82w== X-Gm-Message-State: AOAM533cDr+LG2npfe0bUqKHJS3y73pikiU/xf2z3Fjp1EBjV0FQaD4b he3Jr0PCC5/Kn1vIjtsH7VGSIPKuR7S5lJusfnrCkFRROPQ= X-Google-Smtp-Source: ABdhPJxapNvzX9SC9rjh6QGOZ1FfwipFnGjnpf2N5f1kizW3koZPMtuGKfg5DI9lQjZ5JYF5w6w40qG6vaL3sYSDLJc= X-Received: by 2002:a05:6000:186f:: with SMTP id d15mr15556831wri.237.1612711632989; Sun, 07 Feb 2021 07:27:12 -0800 (PST) MIME-Version: 1.0 Received: by 2002:a5d:464c:0:0:0:0:0 with HTTP; Sun, 7 Feb 2021 07:27:11 -0800 (PST) In-Reply-To: <202102071440.117Eep3U033223@gitrepo.freebsd.org> References: <202102071440.117Eep3U033223@gitrepo.freebsd.org> From: Mateusz Guzik Date: Sun, 7 Feb 2021 16:27:11 +0100 Message-ID: Subject: Re: git: bb67e52db143 - main - netgraph/ng_bridge: Make simple internal functions read-only To: Lutz Donnerhacke Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 4DYY1G3hNMz4kXH X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Feb 2021 15:27:14 -0000 One of your commits mass breaks LINT kernels: arm LINT kernel failed, check _.arm.LINT for details riscv LINT kernel failed, check _.riscv.LINT for details arm64 LINT kernel failed, check _.arm64.LINT for details i386 LINT-NOIP kernel failed, check _.i386.LINT-NOIP for details i386 LINT-NOINET6 kernel failed, check _.i386.LINT-NOINET6 for details i386 LINT kernel failed, check _.i386.LINT for details i386 LINT-NOINET kernel failed, check _.i386.LINT-NOINET for details powerpc LINT64 kernel failed, check _.powerpc.LINT64 for details powerpc LINT kernel failed, check _.powerpc.LINT for details amd64 LINT kernel failed, check _.amd64.LINT for details amd64 LINT-NOIP kernel failed, check _.amd64.LINT-NOIP for details amd64 LINT-NOINET kernel failed, check _.amd64.LINT-NOINET for details amd64 LINT-NOINET6 kernel failed, check _.amd64.LINT-NOINET6 for details /usr/src/sys/netgraph/ng_base.c:841:28: error: passing 'node_cp' (aka 'const struct ng_node *') to parameter of type 'node_p' (aka 'stru ct ng_node *') discards qualifiers [-Werror,-Wincompatible-pointer-types-discards-qualifiers] return (node ? NG_NODE_ID(node) : 0); ^~~~ /usr/src/sys/netgraph/netgraph.h:580:39: note: expanded from macro 'NG_NODE_ID' #define NG_NODE_ID(node) _ng_node_id(node, _NN_) ^~~~ /usr/src/sys/netgraph/netgraph.h:485:20: note: passing argument to parameter 'node' here _ng_node_id(node_p node, char *file, int line) On 2/7/21, Lutz Donnerhacke wrote: > The branch main has been updated by donner: > > URL: > https://cgit.FreeBSD.org/src/commit/?id=bb67e52db143b699bdac1830717930b26a7b5766 > > commit bb67e52db143b699bdac1830717930b26a7b5766 > Author: Lutz Donnerhacke > AuthorDate: 2021-01-13 22:18:55 +0000 > Commit: Lutz Donnerhacke > CommitDate: 2021-02-07 14:39:57 +0000 > > netgraph/ng_bridge: Make simple internal functions read-only > > The data path in netgraph is designed to work on an read only state of > the whole netgraph network. Currently this is achived by convetion, > there is no technical enforcment. This patch is part of a series to > make ng_brigde multithreaded, which is done by rewrite the data path > to const handling. > > Reviewed By: kp > MFC after: 2 weeks > Differential Revision: https://reviews.freebsd.org/D28141 > --- > sys/netgraph/netgraph.h | 5 ++++- > sys/netgraph/ng_base.c | 2 +- > sys/netgraph/ng_bridge.c | 10 ++++++---- > 3 files changed, 11 insertions(+), 6 deletions(-) > > diff --git a/sys/netgraph/netgraph.h b/sys/netgraph/netgraph.h > index 7535472dc631..5040471c5ce0 100644 > --- a/sys/netgraph/netgraph.h > +++ b/sys/netgraph/netgraph.h > @@ -87,6 +87,9 @@ struct ng_item ; > typedef struct ng_item *item_p; > typedef struct ng_node *node_p; > typedef struct ng_hook *hook_p; > +typedef struct ng_item const *item_cp; > +typedef struct ng_node const *node_cp; > +typedef struct ng_hook const *hook_cp; > > /* node method definitions */ > typedef int ng_constructor_t(node_p node); > @@ -1139,7 +1142,7 @@ int ng_make_node_common(struct ng_type *typep, node_p > *nodep); > int ng_name_node(node_p node, const char *name); > node_p ng_name2noderef(node_p node, const char *name); > int ng_newtype(struct ng_type *tp); > -ng_ID_t ng_node2ID(node_p node); > +ng_ID_t ng_node2ID(node_cp node); > item_p ng_package_data(struct mbuf *m, int flags); > item_p ng_package_msg(struct ng_mesg *msg, int flags); > item_p ng_package_msg_self(node_p here, hook_p hook, struct ng_mesg *msg); > diff --git a/sys/netgraph/ng_base.c b/sys/netgraph/ng_base.c > index dadf86eb8dde..6ab39421b255 100644 > --- a/sys/netgraph/ng_base.c > +++ b/sys/netgraph/ng_base.c > @@ -836,7 +836,7 @@ ng_ID2noderef(ng_ID_t ID) > } > > ng_ID_t > -ng_node2ID(node_p node) > +ng_node2ID(node_cp node) > { > return (node ? NG_NODE_ID(node) : 0); > } > diff --git a/sys/netgraph/ng_bridge.c b/sys/netgraph/ng_bridge.c > index 4898a55f1463..d5b3b520a497 100644 > --- a/sys/netgraph/ng_bridge.c > +++ b/sys/netgraph/ng_bridge.c > @@ -115,6 +115,7 @@ struct ng_bridge_link { > sendUnknown : 1;/* send unknown macs out */ > struct ng_bridge_link_kernel_stats stats; /* link stats */ > }; > +typedef struct ng_bridge_link const *link_cp; /* read only access */ > > /* Per-node private data */ > struct ng_bridge_private { > @@ -130,6 +131,7 @@ struct ng_bridge_private { > struct callout timer; /* one second periodic timer */ > }; > typedef struct ng_bridge_private *priv_p; > +typedef struct ng_bridge_private const *priv_cp; /* read only access */ > > /* Information about a host, stored in a hash table entry */ > struct ng_bridge_hent { > @@ -149,12 +151,12 @@ static ng_rcvdata_t ng_bridge_rcvdata; > static ng_disconnect_t ng_bridge_disconnect; > > /* Other internal functions */ > -static struct ng_bridge_host *ng_bridge_get(priv_p priv, const u_char > *addr); > +static struct ng_bridge_host *ng_bridge_get(priv_cp priv, const u_char > *addr); > static int ng_bridge_put(priv_p priv, const u_char *addr, link_p link); > static void ng_bridge_rehash(priv_p priv); > static void ng_bridge_remove_hosts(priv_p priv, link_p link); > static void ng_bridge_timeout(node_p node, hook_p hook, void *arg1, int > arg2); > -static const char *ng_bridge_nodename(node_p node); > +static const char *ng_bridge_nodename(node_cp node); > > /* Ethernet broadcast */ > static const u_char ng_bridge_bcast_addr[ETHER_ADDR_LEN] = > @@ -920,7 +922,7 @@ ng_bridge_disconnect(hook_p hook) > * Find a host entry in the table. > */ > static struct ng_bridge_host * > -ng_bridge_get(priv_p priv, const u_char *addr) > +ng_bridge_get(priv_cp priv, const u_char *addr) > { > const int bucket = HASH(addr, priv->hashMask); > struct ng_bridge_hent *hent; > @@ -1131,7 +1133,7 @@ ng_bridge_timeout(node_p node, hook_p hook, void > *arg1, int arg2) > * Return node's "name", even if it doesn't have one. > */ > static const char * > -ng_bridge_nodename(node_p node) > +ng_bridge_nodename(node_cp node) > { > static char name[NG_NODESIZ]; > > -- Mateusz Guzik