From patchwork Sat May 6 20:55:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Flavio Cruz X-Patchwork-Id: 68880 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 3B38F3858CDB for ; Sat, 6 May 2023 20:55:43 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3B38F3858CDB DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1683406543; bh=vvWMbOhNrlQO7VDuObZ1hfvnu1lODwteVouTNDZ61sU=; h=Date:To:Cc:Subject:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=O8PHvSBhwKoA/rt1Yof/vqSo6pBUz2DHUYU/UigCKfm4aIgxXVAhX53leQKY8NKf7 kuXFDalSG5lhVEHO/fBa6gDLmKVvo9kJuPQ17UuJNyz+gjpMbF5GrEyze/eCWOM9XN 3GNiym0pgXpXokhE5n5gPioSZC+IkefKyAfiaZ3s= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-yw1-x1133.google.com (mail-yw1-x1133.google.com [IPv6:2607:f8b0:4864:20::1133]) by sourceware.org (Postfix) with ESMTPS id EC67A3858D28 for ; Sat, 6 May 2023 20:55:19 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org EC67A3858D28 Received: by mail-yw1-x1133.google.com with SMTP id 00721157ae682-55d2e87048cso46751407b3.1 for ; Sat, 06 May 2023 13:55:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683406519; x=1685998519; h=content-disposition:mime-version:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=vvWMbOhNrlQO7VDuObZ1hfvnu1lODwteVouTNDZ61sU=; b=PUXfJ2Z+mYERzBbjSYJoC4Dg12qonvrn0Rbay8eBZXhAK8NUGpjM4JrteNP1fbz9I8 nApnXvTE9zZe01zInT6RlqyjoNzv4cgf2QiOgmG255HeZwueGO/uLcRKmOcXlQUX2Fkl 6kydROFtkJjTtxLu3+B8svyAxQhUqN0Sylxe48h3mj5dgnqNDBFv0daVkZ+GRlA2MfHZ ILg9O2qq3KdGDo9fZJUiFREwNVGAPHSp+w6o+pMlUuQ4tzEZr7qV/mlT6NE4D5GEfJGU rOsBM68U47jtlcteAScYQWJ12kVNGN9bAR86CSdTT3OKcxtBYN2vC77UpB7eVDxzPFOs /0lg== X-Gm-Message-State: AC+VfDwz7wbispe+QhQnRRY3TsKcR+UKYYVDs6vNcz2iaMAjynX8hnZX SMWHLMQFsYTmYT9zv/4jCA== X-Google-Smtp-Source: ACHHUZ7ZRf1frRo1R2Eg22KQnVGkUkdYNaoC3gO6B/hyeh5lNjQRLjBV2nzzG+TBa047gxF42Tx2FQ== X-Received: by 2002:a81:a106:0:b0:55a:2cdb:55c9 with SMTP id y6-20020a81a106000000b0055a2cdb55c9mr5944085ywg.3.1683406518912; Sat, 06 May 2023 13:55:18 -0700 (PDT) Received: from jupiter.tail36e24.ts.net (dynamic-acs-24-154-253-225.zoominternet.net. [24.154.253.225]) by smtp.gmail.com with ESMTPSA id o2-20020a0de502000000b0054f8b1f21e5sm1374749ywe.85.2023.05.06.13.55.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 May 2023 13:55:18 -0700 (PDT) Date: Sat, 6 May 2023 16:55:10 -0400 To: bug-hurd@gnu.org, libc-alpha@sourceware.org Cc: samuel.thibault@gnu.org Subject: [PATCH glibc] Update hurd/hurdselect.c to be more portable. Message-ID: MIME-Version: 1.0 Content-Disposition: inline X-Spam-Status: No, score=-12.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Flavio Cruz via Libc-alpha From: Flavio Cruz Reply-To: Flavio Cruz Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" Summary of changes: - Use BAD_TYPECHECK to perform type checking in a cleaner way. BAD_TYPECHECK is moved into sysdeps/mach/rpc.h to avoid duplication. - Remove assertions for mach_msg_type_t since those won't work for x86_64. - Update message structs to use mach_msg_type_t directly. - Use designated initializers. --- hurd/hurdselect.c | 30 ++++++++++++++---------------- hurd/intr-msg.c | 6 +----- sysdeps/mach/hurd/ioctl.c | 6 +----- sysdeps/mach/mach_rpc.h | 31 +++++++++++++++++++++++++++++++ 4 files changed, 47 insertions(+), 26 deletions(-) create mode 100644 sysdeps/mach/mach_rpc.h diff --git a/hurd/hurdselect.c b/hurd/hurdselect.c index 08fcc92170..9630cae474 100644 --- a/hurd/hurdselect.c +++ b/hurd/hurdselect.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include @@ -69,14 +70,6 @@ _hurd_select (int nfds, sigset_t oset; struct hurd_sigstate *ss = NULL; - union typeword /* Use this to avoid unkosher casts. */ - { - mach_msg_type_t type; - uint32_t word; - }; - assert (sizeof (union typeword) == sizeof (mach_msg_type_t)); - assert (sizeof (uint32_t) == sizeof (mach_msg_type_t)); - if (nfds < 0 || (pollfds == NULL && nfds > FD_SETSIZE)) { errno = EINVAL; @@ -404,15 +397,15 @@ _hurd_select (int nfds, struct { mach_msg_header_t head; - union typeword err_type; + mach_msg_type_t err_type; error_t err; } error; struct { mach_msg_header_t head; - union typeword err_type; + mach_msg_type_t err_type; error_t err; - union typeword result_type; + mach_msg_type_t result_type; int result; } success; #endif @@ -443,9 +436,14 @@ _hurd_select (int nfds, /* We got a message. Decode it. */ #ifdef MACH_MSG_TYPE_BIT - const union typeword inttype = - { type: - { MACH_MSG_TYPE_INTEGER_T, sizeof (integer_t) * 8, 1, 1, 0, 0 } + static const mach_msg_type_t inttype = { + .msgt_name = MACH_MSG_TYPE_INTEGER_T, + .msgt_size = sizeof (integer_t) * 8, + .msgt_number = 1, + .msgt_inline = TRUE, + .msgt_longform = FALSE, + .msgt_deallocate = FALSE, + .msgt_unused = 0 }; #endif @@ -462,7 +460,7 @@ _hurd_select (int nfds, && msg.head.msgh_size >= sizeof msg.error && !(msg.head.msgh_bits & MACH_MSGH_BITS_COMPLEX) #ifdef MACH_MSG_TYPE_BIT - && msg.error.err_type.word == inttype.word + && !BAD_TYPECHECK (&msg.error.err_type, &inttype) #endif ) { @@ -480,7 +478,7 @@ _hurd_select (int nfds, occurred. */ if (msg.error.err #ifdef MACH_MSG_TYPE_BIT - || msg.success.result_type.word != inttype.word + || BAD_TYPECHECK (&msg.success.result_type, &inttype) #endif || msg.head.msgh_size != sizeof msg.success) { diff --git a/hurd/intr-msg.c b/hurd/intr-msg.c index b535397bfb..bc1f43d383 100644 --- a/hurd/intr-msg.c +++ b/hurd/intr-msg.c @@ -17,6 +17,7 @@ . */ #include +#include #include #include #include @@ -28,11 +29,6 @@ # define mig_reply_header_t mig_reply_error_t #endif -/* Macro used by MIG to cleanly check the type. */ -#define BAD_TYPECHECK(type, check) __glibc_unlikely (({ \ - union { mach_msg_type_t t; uint32_t w; } _t, _c; \ - _t.t = *(type); _c.t = *(check);_t.w != _c.w; })) - error_t _hurd_intr_rpc_mach_msg (mach_msg_header_t *msg, mach_msg_option_t option, diff --git a/sysdeps/mach/hurd/ioctl.c b/sysdeps/mach/hurd/ioctl.c index 66daaa751e..752cfa60f4 100644 --- a/sysdeps/mach/hurd/ioctl.c +++ b/sysdeps/mach/hurd/ioctl.c @@ -28,6 +28,7 @@ #include #include #include +#include #include #include @@ -35,11 +36,6 @@ #define msg_align(x) ALIGN_UP (x, __alignof__ (uintptr_t)) #define typesize(type) (1 << (type)) -/* Macro used by MIG to cleanly check the type. */ -#define BAD_TYPECHECK(type, check) __glibc_unlikely (({ \ - union { mach_msg_type_t t; uint32_t w; } _t, _c; \ - _t.t = *(type); _c.t = *(check);_t.w != _c.w; })) - /* Perform the I/O control operation specified by REQUEST on FD. The actual type and use of ARG and the return value depend on REQUEST. */ int diff --git a/sysdeps/mach/mach_rpc.h b/sysdeps/mach/mach_rpc.h new file mode 100644 index 0000000000..ff1ee1cae9 --- /dev/null +++ b/sysdeps/mach/mach_rpc.h @@ -0,0 +1,31 @@ +/* Macros for handling Mach RPC messages. + Copyright (C) 2023 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#include + +/* Macro used by MIG to cleanly check the type. */ +#define BAD_TYPECHECK(type, check) __glibc_unlikely (({ \ + union { mach_msg_type_t t; uint32_t w; } _t, _c; \ + _t.t = *(type); _c.t = *(check);_t.w != _c.w; })) + +/* TODO: add this assertion for x86_64. */ +#ifndef __x86_64__ +_Static_assert (sizeof (uint32_t) == sizeof (mach_msg_type_t), + "mach_msg_type_t needs to be the same size as uint32_t"); +#endif +