From: Eric Garver <eric@garver.life>
To: Florian Westphal <fw@strlen.de>
Cc: netfilter-devel@vger.kernel.org, Pablo Neira Ayuso <pablo@netfilter.org>
Subject: Re: [PATCH nftables 3/3] src: mnl: retry when we hit -ENOBUFS
Date: Mon, 9 Sep 2019 17:11:10 -0400 [thread overview]
Message-ID: <20190909211110.2dzcta4dgengb4wy@egarver.localdomain> (raw)
In-Reply-To: <20190813201246.5543-4-fw@strlen.de>
Hi Florian,
On Tue, Aug 13, 2019 at 10:12:46PM +0200, Florian Westphal wrote:
> tests/shell/testcases/transactions/0049huge_0
>
> still fails with ENOBUFS error after endian fix done in
> previous patch. Its enough to increase the scale factor (4)
> on s390x, but rather than continue with these "guess the proper
> size" game, just increase the buffer size and retry up to 3 times.
>
> This makes above test work on s390x.
>
> So, implement what Pablo suggested in the earlier commit:
> We could also explore increasing the buffer and retry if
> mnl_nft_socket_sendmsg() hits ENOBUFS if we ever hit this problem again.
>
> v2: call setsockopt unconditionally, then increase on error.
>
> Signed-off-by: Florian Westphal <fw@strlen.de>
> ---
> src/mnl.c | 12 ++++++++++--
> 1 file changed, 10 insertions(+), 2 deletions(-)
>
> diff --git a/src/mnl.c b/src/mnl.c
> index 97a2e0765189..9c1f5356c9b9 100644
> --- a/src/mnl.c
> +++ b/src/mnl.c
> @@ -311,6 +311,7 @@ int mnl_batch_talk(struct netlink_ctx *ctx, struct list_head *err_list,
> int ret, fd = mnl_socket_get_fd(nl), portid = mnl_socket_get_portid(nl);
> uint32_t iov_len = nftnl_batch_iovec_len(ctx->batch);
> char rcv_buf[MNL_SOCKET_BUFFER_SIZE];
> + unsigned int enobuf_restarts = 0;
> size_t avg_msg_size, batch_size;
> const struct sockaddr_nl snl = {
> .nl_family = AF_NETLINK
> @@ -320,6 +321,7 @@ int mnl_batch_talk(struct netlink_ctx *ctx, struct list_head *err_list,
> .tv_usec = 0
> };
> struct iovec iov[iov_len];
> + unsigned int scale = 4;
> struct msghdr msg = {};
> fd_set readfds;
>
> @@ -328,7 +330,8 @@ int mnl_batch_talk(struct netlink_ctx *ctx, struct list_head *err_list,
> batch_size = mnl_nft_batch_to_msg(ctx, &msg, &snl, iov, iov_len);
> avg_msg_size = div_round_up(batch_size, num_cmds);
>
> - mnl_set_rcvbuffer(ctx->nft->nf_sock, num_cmds * avg_msg_size * 4);
> +restart:
> + mnl_set_rcvbuffer(ctx->nft->nf_sock, num_cmds * avg_msg_size * scale);
>
> ret = mnl_nft_socket_sendmsg(ctx, &msg);
> if (ret == -1)
> @@ -347,8 +350,13 @@ int mnl_batch_talk(struct netlink_ctx *ctx, struct list_head *err_list,
> break;
>
> ret = mnl_socket_recvfrom(nl, rcv_buf, sizeof(rcv_buf));
> - if (ret == -1)
> + if (ret == -1) {
> + if (errno == ENOBUFS && enobuf_restarts++ < 3) {
> + scale *= 2;
> + goto restart;
> + }
If this restart is triggered it causes rules to be duplicated. We send
the same batch again.
I'm hitting this on x86_64. Maybe we need find a better way to estimate
the rcvbuffer in the case of --echo. By the time we see ENOBUFS we're
already in a bad way - events have already be lost.
> return -1;
> + }
>
> ret = mnl_cb_run(rcv_buf, ret, 0, portid, &netlink_echo_callback, ctx);
> /* Continue on error, make sure we get all acknowledgments */
> --
> 2.21.0
>
next prev parent reply other threads:[~2019-09-09 21:11 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-13 20:12 [PATCH v2 nftables 0/3] un-break nftables on big-endian arches Florian Westphal
2019-08-13 20:12 ` [PATCH nftables 1/3] src: fix jumps on bigendian arches Florian Westphal
2019-08-14 7:41 ` Pablo Neira Ayuso
2019-08-13 20:12 ` [PATCH nftables 2/3] src: parser: fix parsing of chain priority and policy on bigendian Florian Westphal
2019-08-14 7:42 ` Pablo Neira Ayuso
2019-08-13 20:12 ` [PATCH nftables 3/3] src: mnl: retry when we hit -ENOBUFS Florian Westphal
2019-08-14 7:42 ` Pablo Neira Ayuso
2019-09-09 21:11 ` Eric Garver [this message]
2019-09-09 22:12 ` Florian Westphal
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=20190909211110.2dzcta4dgengb4wy@egarver.localdomain \
--to=eric@garver.life \
--cc=fw@strlen.de \
--cc=netfilter-devel@vger.kernel.org \
--cc=pablo@netfilter.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).