From patchwork Mon Jun 7 20:35:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 43757 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 CBAC43938C15 for ; Mon, 7 Jun 2021 20:41:18 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org CBAC43938C15 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1623098478; bh=VZ/JpD5uw1HH7nsRq1OYseaNJxklVnQ/8o3G9x6lvjs=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=G6LJ8s25rrKiKKEl8pO6WIZQz+Biwum9KMi9QMSKcqE4i7DUBe0mn8taFAQkJBlx9 xloTRaNXXJGcIla0r96CzWJxnVSjUQrki7u0Re2YSK5NUULHGg8Z0hywuQpE6t6kjz cqwCHY40ZCGnc/ZRsnanWfoqlzQ3pshd6EBNFE7M= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qt1-x833.google.com (mail-qt1-x833.google.com [IPv6:2607:f8b0:4864:20::833]) by sourceware.org (Postfix) with ESMTPS id 753EF3898536 for ; Mon, 7 Jun 2021 20:36:29 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 753EF3898536 Received: by mail-qt1-x833.google.com with SMTP id t20so13645466qtx.8 for ; Mon, 07 Jun 2021 13:36:29 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=VZ/JpD5uw1HH7nsRq1OYseaNJxklVnQ/8o3G9x6lvjs=; b=f8q7HcWhlVw206Q+CHlxB33Zc+0kR7xyaiJIojSlWu4zrBYteeaKHDgifj4YUVc9// dBmAxc+pVnGhMP28cvLwK3owotq+xrdbrmB8ecpp9SrPvwNeMWOU3h31N1fEWQsiLubt BJ3bsDIWWTDBKMGRJJ5bfiCcjYuWHJznden3t0/AchDFPPbwiHryK3RLRn+v2dJvwqvF gyJtqN3owQIc3b4invCTgWcUJxN5TLo5UeB5IqmgSl6i9FPbYOI+vtz7a+GpgbxuaHPw uS4pJNB5KfYkDl10ituitOFuaOwq1uctTUVPa3Cul2+XZcIqq+DeOS/RMh4fHRKg2Dwb vZUA== X-Gm-Message-State: AOAM5335Q2bsH6P2Dy26wbbpeetBjmYNrUDv4L+hRy3AKGz23ixZTfL4 nqzuo1564dqUI47MBAibnEvtGzl9y+x2zQ== X-Google-Smtp-Source: ABdhPJyNF9opOXmx3Dc5DsAvfFlxK6wY7NJ57zBWVpoAGgwL+bhGp7EmXboM6IoIPa566WAuoSJ6rA== X-Received: by 2002:a05:622a:2d2:: with SMTP id a18mr17974194qtx.296.1623098188869; Mon, 07 Jun 2021 13:36:28 -0700 (PDT) Received: from birita.. ([177.194.59.218]) by smtp.googlemail.com with ESMTPSA id t196sm10422123qke.50.2021.06.07.13.36.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Jun 2021 13:36:28 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH v3 06/24] linux: Add recvvmsg fallback for 64-bit time_t SO_TIMESTAMP{NS} Date: Mon, 7 Jun 2021 17:35:55 -0300 Message-Id: <20210607203613.282543-7-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210607203613.282543-1-adhemerval.zanella@linaro.org> References: <20210607203613.282543-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-12.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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: Adhemerval Zanella via Libc-alpha From: Adhemerval Zanella Netto Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" Handle the SO_TIMESTAMP{NS} similar to recvmsg: for !__ASSUME_TIME64_SYSCALLS it converts the first 32-bit time SO_TIMESTAMP or SO_TIMESTAMPNS and appends it to the control buffer if has extra space or returns MSG_CTRUNC otherwise. The 32-bit time field is kept as-is. Also for !__ASSUME_TIME64_SYSCALLS it limits the maximum number of 'struct mmsghdr *' to IOV_MAX (and also increases the stack size requirement to IOV_MAX times sizeof (socklen_t)). The Linux imposes a similar limit to sendmmsg, so bound the array size on recvmmsg is not unreasonable. And this will be used only on older when building with 32-bit time support. Checked on x86_64-linux-gnu and i686-linux-gnu (on 5.4 and on 4.15 kernel). Reviewed-by: Lukasz Majewski Reviewed-by: Carlos O'Donell Tested-by: Carlos O'Donell --- sysdeps/unix/sysv/linux/recvmmsg.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/sysdeps/unix/sysv/linux/recvmmsg.c b/sysdeps/unix/sysv/linux/recvmmsg.c index 672ba20332..5cd107ffa9 100644 --- a/sysdeps/unix/sysv/linux/recvmmsg.c +++ b/sysdeps/unix/sysv/linux/recvmmsg.c @@ -44,13 +44,26 @@ __recvmmsg64 (int fd, struct mmsghdr *vmessages, unsigned int vlen, int flags, ts32 = valid_timespec64_to_timespec (*timeout); pts32 = &ts32; } + + socklen_t csize[IOV_MAX]; + if (vlen > IOV_MAX) + vlen = IOV_MAX; + for (int i = 0; i < vlen; i++) + csize[i] = vmessages[i].msg_hdr.msg_controllen; + # ifdef __ASSUME_RECVMMSG_SYSCALL r = SYSCALL_CANCEL (recvmmsg, fd, vmessages, vlen, flags, pts32); # else r = SOCKETCALL_CANCEL (recvmmsg, fd, vmessages, vlen, flags, pts32); # endif - if (r >= 0 && timeout != NULL) - *timeout = valid_timespec_to_timespec64 (ts32); + if (r >= 0) + { + if (timeout != NULL) + *timeout = valid_timespec_to_timespec64 (ts32); + + for (int i=0; i < r; i++) + __convert_scm_timestamps (&vmessages[i].msg_hdr, csize[i]); + } #endif /* __ASSUME_TIME64_SYSCALLS */ return r; }