[PATCH] tcp_splice, udp_flow: fcntl64() support on PPC64 depends on glibc version

[PATCH] tcp_splice, udp_flow: fcntl64() support on PPC64 depends on glibc version

[Stefano Brivio]

I explicitly added fcntl64() to the list of allowed system calls for
PPC64 a while ago, and now it turns out it's not available in recent
Debian builds. The warning from seccomp.sh is harmless because we
unconditionally try to enable fcntl() anyway, but take care of it
anyway.

Link: https://buildd.debian.org/status/fetch.php?pkg=passt&arch=ppc64&ver=0.0%7Egit20250121.4f2c8e7-1&stamp=1737477147&raw=0
Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
---
 tcp_splice.c | 2 +-
 udp_flow.c   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tcp_splice.c b/tcp_splice.c
index 5db1d62..f048a82 100644
--- a/tcp_splice.c
+++ b/tcp_splice.c
@@ -28,7 +28,7 @@
  * - FIN_SENT_0:		FIN (write shutdown) sent to accepted socket
  * - FIN_SENT_1:		FIN (write shutdown) sent to target socket
  *
- * #syscalls:pasta pipe2|pipe fcntl arm:fcntl64 ppc64:fcntl64 i686:fcntl64
+ * #syscalls:pasta pipe2|pipe fcntl arm:fcntl64 ppc64:fcntl64|fcntl i686:fcntl64
  */
 
 #include <sched.h>
diff --git a/udp_flow.c b/udp_flow.c
index 7fae81d..83c2568 100644
--- a/udp_flow.c
+++ b/udp_flow.c
@@ -174,7 +174,7 @@ cancel:
  * @s_in:	Source socket address, filled in by recvmmsg()
  * @now:	Timestamp
  *
- * #syscalls fcntl arm:fcntl64 ppc64:fcntl64 i686:fcntl64
+ * #syscalls fcntl arm:fcntl64 ppc64:fcntl64|fcntl i686:fcntl64
  *
  * Return: sidx for the destination side of the flow for this packet, or
  *         FLOW_SIDX_NONE if we couldn't find or create a flow.
-- 
@@ -174,7 +174,7 @@ cancel:
  * @s_in:	Source socket address, filled in by recvmmsg()
  * @now:	Timestamp
  *
- * #syscalls fcntl arm:fcntl64 ppc64:fcntl64 i686:fcntl64
+ * #syscalls fcntl arm:fcntl64 ppc64:fcntl64|fcntl i686:fcntl64
  *
  * Return: sidx for the destination side of the flow for this packet, or
  *         FLOW_SIDX_NONE if we couldn't find or create a flow.
-- 
2.43.0

Re: [PATCH] tcp_splice, udp_flow: fcntl64() support on PPC64 depends on glibc version

[David Gibson]

[-- Attachment #1: Type: text/plain, Size: 1913 bytes --]

On Mon, Feb 03, 2025 at 07:25:25AM +0100, Stefano Brivio wrote:
> I explicitly added fcntl64() to the list of allowed system calls for
> PPC64 a while ago, and now it turns out it's not available in recent
> Debian builds. The warning from seccomp.sh is harmless because we
> unconditionally try to enable fcntl() anyway, but take care of it
> anyway.
> 
> Link: https://buildd.debian.org/status/fetch.php?pkg=passt&arch=ppc64&ver=0.0%7Egit20250121.4f2c8e7-1&stamp=1737477147&raw=0
> Signed-off-by: Stefano Brivio <sbrivio@redhat.com>

Reviewed-by: David Gibson <david@gibson.dropbear.id.au>

> ---
>  tcp_splice.c | 2 +-
>  udp_flow.c   | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/tcp_splice.c b/tcp_splice.c
> index 5db1d62..f048a82 100644
> --- a/tcp_splice.c
> +++ b/tcp_splice.c
> @@ -28,7 +28,7 @@
>   * - FIN_SENT_0:		FIN (write shutdown) sent to accepted socket
>   * - FIN_SENT_1:		FIN (write shutdown) sent to target socket
>   *
> - * #syscalls:pasta pipe2|pipe fcntl arm:fcntl64 ppc64:fcntl64 i686:fcntl64
> + * #syscalls:pasta pipe2|pipe fcntl arm:fcntl64 ppc64:fcntl64|fcntl i686:fcntl64
>   */
>  
>  #include <sched.h>
> diff --git a/udp_flow.c b/udp_flow.c
> index 7fae81d..83c2568 100644
> --- a/udp_flow.c
> +++ b/udp_flow.c
> @@ -174,7 +174,7 @@ cancel:
>   * @s_in:	Source socket address, filled in by recvmmsg()
>   * @now:	Timestamp
>   *
> - * #syscalls fcntl arm:fcntl64 ppc64:fcntl64 i686:fcntl64
> + * #syscalls fcntl arm:fcntl64 ppc64:fcntl64|fcntl i686:fcntl64
>   *
>   * Return: sidx for the destination side of the flow for this packet, or
>   *         FLOW_SIDX_NONE if we couldn't find or create a flow.

-- 
David Gibson (he or they)	| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you, not the other way
				| around.
http://www.ozlabs.org/~dgibson

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]