public inbox for passt-dev@passt.top
 help / color / mirror / code / Atom feed
From: Stefano Brivio <sbrivio@redhat.com>
To: passt-dev@passt.top
Cc: lemmi@nerd2nerd.org
Subject: [PATCH 2/2] util: Provide own version of close_range(), and no-op fallback
Date: Tue, 20 Aug 2024 01:15:05 +0200	[thread overview]
Message-ID: <20240819231505.1481940-3-sbrivio@redhat.com> (raw)
In-Reply-To: <20240819231505.1481940-1-sbrivio@redhat.com>

musl, as of 1.2.5, and glibc < 2.34 don't ship a (trivial)
close_range() implementation. This will probably be added to musl
soon, by the way:
  https://www.openwall.com/lists/musl/2024/08/01/9

Add a weakly-aliased implementation, if it's supported by the kernel.
If it's not supported (< 5.9), use a no-op fallback. Looping over 2^31
file descriptors calling close() on them is probably not a good idea.

Reported-by: lemmi <lemmi@nerd2nerd.org>
Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
---
 util.h | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/util.h b/util.h
index cb4d181..a9deba5 100644
--- a/util.h
+++ b/util.h
@@ -14,6 +14,9 @@
 #include <string.h>
 #include <signal.h>
 #include <arpa/inet.h>
+#include <unistd.h>
+#include <sys/syscall.h>
+#include <linux/close_range.h>
 
 #include "log.h"
 
@@ -160,6 +163,23 @@ struct ctx;
 
 /* cppcheck-suppress funcArgNamesDifferent */
 __attribute__ ((weak)) int ffsl(long int i) { return __builtin_ffsl(i); }
+
+#ifdef CLOSE_RANGE_UNSHARE	/* Linux kernel >= 5.9 */
+/* glibc < 2.34 and musl as of 1.2.5 need these */
+#ifndef SYS_close_range
+#define SYS_close_range		436
+#endif
+__attribute__ ((weak)) int close_range(unsigned int first, unsigned int last,
+				       int flags) {
+	return syscall(SYS_close_range, first, last, flags);
+}
+#else
+/* No reasonable fallback option */
+int close_range(unsigned int first, unsigned int last, int flags) {
+	return 0;
+}
+#endif
+
 int sock_l4_sa(const struct ctx *c, enum epoll_type type,
 	       const void *sa, socklen_t sl,
 	       const char *ifname, bool v6only, uint32_t data);
-- 
@@ -14,6 +14,9 @@
 #include <string.h>
 #include <signal.h>
 #include <arpa/inet.h>
+#include <unistd.h>
+#include <sys/syscall.h>
+#include <linux/close_range.h>
 
 #include "log.h"
 
@@ -160,6 +163,23 @@ struct ctx;
 
 /* cppcheck-suppress funcArgNamesDifferent */
 __attribute__ ((weak)) int ffsl(long int i) { return __builtin_ffsl(i); }
+
+#ifdef CLOSE_RANGE_UNSHARE	/* Linux kernel >= 5.9 */
+/* glibc < 2.34 and musl as of 1.2.5 need these */
+#ifndef SYS_close_range
+#define SYS_close_range		436
+#endif
+__attribute__ ((weak)) int close_range(unsigned int first, unsigned int last,
+				       int flags) {
+	return syscall(SYS_close_range, first, last, flags);
+}
+#else
+/* No reasonable fallback option */
+int close_range(unsigned int first, unsigned int last, int flags) {
+	return 0;
+}
+#endif
+
 int sock_l4_sa(const struct ctx *c, enum epoll_type type,
 	       const void *sa, socklen_t sl,
 	       const char *ifname, bool v6only, uint32_t data);
-- 
2.43.0


  parent reply	other threads:[~2024-08-19 23:15 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-08-19 23:15 [PATCH 0/2] Build fixes for musl, glibc < 2.34 Stefano Brivio
2024-08-19 23:15 ` [PATCH 1/2] udp_flow: Add missing unistd.h include for close() Stefano Brivio
2024-08-20  0:47   ` David Gibson
2024-08-19 23:15 ` Stefano Brivio [this message]
2024-08-20  0:48   ` [PATCH 2/2] util: Provide own version of close_range(), and no-op fallback David Gibson

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=20240819231505.1481940-3-sbrivio@redhat.com \
    --to=sbrivio@redhat.com \
    --cc=lemmi@nerd2nerd.org \
    --cc=passt-dev@passt.top \
    /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.
Code repositories for project(s) associated with this public inbox

	https://passt.top/passt

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 IMAP folder(s).