From: Jakub Kicinski <kuba@kernel.org>
To: Andrea Mayer <andrea.mayer@uniroma2.it>
Cc: "David S. Miller" <davem@davemloft.net>,
David Ahern <dsahern@kernel.org>,
Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>,
Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>,
Shuah Khan <shuah@kernel.org>,
Shrijeet Mukherjee <shrijeet@gmail.com>,
Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
Andrii Nakryiko <andrii@kernel.org>,
Martin KaFai Lau <kafai@fb.com>, Song Liu <songliubraving@fb.com>,
Yonghong Song <yhs@fb.com>,
John Fastabend <john.fastabend@gmail.com>,
KP Singh <kpsingh@chromium.org>,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-kselftest@vger.kernel.org,
Stefano Salsano <stefano.salsano@uniroma2.it>,
Paolo Lungaroni <paolo.lungaroni@cnit.it>,
Ahmed Abdelsalam <ahabdels.dev@gmail.com>
Subject: Re: [net-next,v2,3/5] seg6: add callbacks for customizing the creation/destruction of a behavior
Date: Tue, 10 Nov 2020 14:56:55 -0800 [thread overview]
Message-ID: <20201110145655.513eab48@kicinski-fedora-pc1c0hjn.dhcp.thefacebook.com> (raw)
In-Reply-To: <20201107153139.3552-4-andrea.mayer@uniroma2.it>
On Sat, 7 Nov 2020 16:31:37 +0100 Andrea Mayer wrote:
> We introduce two callbacks used for customizing the creation/destruction of
> a SRv6 behavior. Such callbacks are defined in the new struct
> seg6_local_lwtunnel_ops and hereafter we provide a brief description of
> them:
>
> - build_state(...): used for calling the custom constructor of the
> behavior during its initialization phase and after all the attributes
> have been parsed successfully;
>
> - destroy_state(...): used for calling the custom destructor of the
> behavior before it is completely destroyed.
>
> Signed-off-by: Andrea Mayer <andrea.mayer@uniroma2.it>
Looks good, minor nits.
> diff --git a/net/ipv6/seg6_local.c b/net/ipv6/seg6_local.c
> index 63a82e2fdea9..4b0f155d641d 100644
> --- a/net/ipv6/seg6_local.c
> +++ b/net/ipv6/seg6_local.c
> @@ -33,11 +33,23 @@
>
> struct seg6_local_lwt;
>
> +typedef int (*slwt_build_state_t)(struct seg6_local_lwt *slwt, const void *cfg,
> + struct netlink_ext_ack *extack);
> +typedef void (*slwt_destroy_state_t)(struct seg6_local_lwt *slwt);
Let's avoid the typedefs. Instead of taking a pointer to the op take a
pointer to the ops struct in seg6_local_lwtunnel_build_state() etc.
> +/* callbacks used for customizing the creation and destruction of a behavior */
> +struct seg6_local_lwtunnel_ops {
> + slwt_build_state_t build_state;
> + slwt_destroy_state_t destroy_state;
> +};
> +
> struct seg6_action_desc {
> int action;
> unsigned long attrs;
> int (*input)(struct sk_buff *skb, struct seg6_local_lwt *slwt);
> int static_headroom;
> +
> + struct seg6_local_lwtunnel_ops slwt_ops;
> };
>
> struct bpf_lwt_prog {
> @@ -1015,6 +1027,45 @@ static void destroy_attrs(struct seg6_local_lwt *slwt)
> __destroy_attrs(attrs, 0, SEG6_LOCAL_MAX + 1, slwt);
> }
>
> +/* call the custom constructor of the behavior during its initialization phase
> + * and after that all its attributes have been parsed successfully.
> + */
> +static int
> +seg6_local_lwtunnel_build_state(struct seg6_local_lwt *slwt, const void *cfg,
> + struct netlink_ext_ack *extack)
> +{
> + slwt_build_state_t build_func;
> + struct seg6_action_desc *desc;
> + int err = 0;
> +
> + desc = slwt->desc;
> + if (!desc)
> + return -EINVAL;
This is impossible, right?
> +
> + build_func = desc->slwt_ops.build_state;
> + if (build_func)
> + err = build_func(slwt, cfg, extack);
> +
> + return err;
no need for err, just use return directly.
if (!ops->build_state)
return 0;
return ops->build_state(...);
> +}
> +
> +/* call the custom destructor of the behavior which is invoked before the
> + * tunnel is going to be destroyed.
> + */
> +static void seg6_local_lwtunnel_destroy_state(struct seg6_local_lwt *slwt)
> +{
> + slwt_destroy_state_t destroy_func;
> + struct seg6_action_desc *desc;
> +
> + desc = slwt->desc;
> + if (!desc)
> + return;
> +
> + destroy_func = desc->slwt_ops.destroy_state;
> + if (destroy_func)
> + destroy_func(slwt);
> +}
> +
> static int parse_nla_action(struct nlattr **attrs, struct seg6_local_lwt *slwt)
> {
> struct seg6_action_param *param;
> @@ -1090,8 +1141,16 @@ static int seg6_local_build_state(struct net *net, struct nlattr *nla,
>
> err = parse_nla_action(tb, slwt);
> if (err < 0)
> + /* In case of error, the parse_nla_action() takes care of
> + * releasing resources which have been acquired during the
> + * processing of attributes.
> + */
that's the normal behavior for a kernel function, comment is
unnecessary IMO
> goto out_free;
>
> + err = seg6_local_lwtunnel_build_state(slwt, cfg, extack);
> + if (err < 0)
> + goto free_attrs;
The function is called destroy_attrs, call the label out_destroy_attrs,
or err_destroy_attrs.
> newts->type = LWTUNNEL_ENCAP_SEG6_LOCAL;
> newts->flags = LWTUNNEL_STATE_INPUT_REDIRECT;
> newts->headroom = slwt->headroom;
> @@ -1100,6 +1159,9 @@ static int seg6_local_build_state(struct net *net, struct nlattr *nla,
>
> return 0;
>
> +free_attrs:
> + destroy_attrs(slwt);
> +
no need for empty lines on error paths
> out_free:
> kfree(newts);
> return err;
> @@ -1109,6 +1171,8 @@ static void seg6_local_destroy_state(struct lwtunnel_state *lwt)
> {
> struct seg6_local_lwt *slwt = seg6_local_lwtunnel(lwt);
>
> + seg6_local_lwtunnel_destroy_state(slwt);
> +
> destroy_attrs(slwt);
>
> return;
next prev parent reply other threads:[~2020-11-10 22:57 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-07 15:31 [net-next,v2,0/5] seg6: add support for SRv6 End.DT4 behavior Andrea Mayer
2020-11-07 15:31 ` [net-next,v2,1/5] vrf: add mac header for tunneled packets when sniffer is attached Andrea Mayer
2020-11-10 22:50 ` Jakub Kicinski
2020-11-13 0:37 ` Andrea Mayer
2020-11-07 15:31 ` [net-next,v2,2/5] seg6: improve management of behavior attributes Andrea Mayer
2020-11-10 22:50 ` Jakub Kicinski
2020-11-13 0:55 ` Andrea Mayer
2020-11-07 15:31 ` [net-next,v2,3/5] seg6: add callbacks for customizing the creation/destruction of a behavior Andrea Mayer
2020-11-10 22:56 ` Jakub Kicinski [this message]
2020-11-13 1:06 ` Andrea Mayer
2020-11-07 15:31 ` [net-next,v2,4/5] seg6: add support for the SRv6 End.DT4 behavior Andrea Mayer
2020-11-10 23:12 ` Jakub Kicinski
2020-11-13 1:28 ` Andrea Mayer
2020-11-13 1:49 ` David Ahern
2020-11-13 16:55 ` Jakub Kicinski
2020-11-13 17:02 ` Stefano Salsano
2020-11-13 17:04 ` David Ahern
2020-11-13 19:40 ` Jakub Kicinski
2020-11-13 21:32 ` Stefano Salsano
2020-11-13 21:40 ` Jakub Kicinski
2020-11-13 23:00 ` Andrea Mayer
2020-11-13 23:54 ` Jakub Kicinski
2020-11-14 1:50 ` Andrea Mayer
2020-11-14 2:01 ` Jakub Kicinski
2020-11-14 2:29 ` Andrea Mayer
2020-11-14 2:52 ` David Ahern
2020-11-13 9:23 ` kernel test robot
2020-11-13 16:57 ` Jakub Kicinski
2020-11-13 17:05 ` David Ahern
2020-11-13 19:00 ` Nathan Chancellor
2020-11-14 3:37 ` David Ahern
2020-11-23 1:13 ` [kbuild-all] " Rong Chen
2020-11-23 17:19 ` Jakub Kicinski
2020-11-07 15:31 ` [net-next,v2,5/5] selftests: add selftest " Andrea Mayer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201110145655.513eab48@kicinski-fedora-pc1c0hjn.dhcp.thefacebook.com \
--to=kuba@kernel.org \
--cc=ahabdels.dev@gmail.com \
--cc=andrea.mayer@uniroma2.it \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=dsahern@kernel.org \
--cc=john.fastabend@gmail.com \
--cc=kafai@fb.com \
--cc=kpsingh@chromium.org \
--cc=kuznet@ms2.inr.ac.ru \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=paolo.lungaroni@cnit.it \
--cc=shrijeet@gmail.com \
--cc=shuah@kernel.org \
--cc=songliubraving@fb.com \
--cc=stefano.salsano@uniroma2.it \
--cc=yhs@fb.com \
--cc=yoshfuji@linux-ipv6.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).