From nobody Sun May 19 06:23:09 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=syrmia.com) ARC-Seal: i=2; a=rsa-sha256; t=1598391304; cv=pass; d=zohomail.com; s=zohoarc; b=B9WwD5iVkr8EAgeyIBuQI8Ca/DmL7bfWZZWTjCo3EMd7EW8pDQchWB7IB6yBRGjJFQWXoKU+dqOZxwixcRqllQC4GjsIoql3GbAXpmbEiVRSkLvqdVh5FkJpcPpLx7Oa5sC5tptGnScVtLDC6YF7nctQYaqs/t3AmubatHmziic= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598391304; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=0rxDHV8VzSrstEgbdUUXtJ1blVeoXD32EQXBcZLp9Ls=; b=kDUMltWCEpTi6Jy6IcqQNFqLXhm/T2tskiMosPCvOV+HJvunCyXX6KWSzzUs3rInqUKJL0OH8eFeaKSXuPhVaAqRPdBPCbDDpqt3fcfX5djAjdcSJSsYaRhw+di7Mztp2hlLBo6tDZe8lyEjSxzb3xq1epN91t3DtXyMLf03quA= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=syrmia.com) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1598391304946616.8966691883442; Tue, 25 Aug 2020 14:35:04 -0700 (PDT) Received: from localhost ([::1]:40906 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kAgat-00068b-JL for importer@patchew.org; Tue, 25 Aug 2020 17:35:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40768) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kAgMm-0005ja-Gg for qemu-devel@nongnu.org; Tue, 25 Aug 2020 17:20:29 -0400 Received: from mail-eopbgr60111.outbound.protection.outlook.com ([40.107.6.111]:2560 helo=EUR04-DB3-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kAgMk-0004EC-A6 for qemu-devel@nongnu.org; Tue, 25 Aug 2020 17:20:28 -0400 Received: from VE1PR03MB5246.eurprd03.prod.outlook.com (2603:10a6:802:a1::22) by VI1PR0301MB2253.eurprd03.prod.outlook.com (2603:10a6:800:27::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3305.26; Tue, 25 Aug 2020 21:20:20 +0000 Received: from VE1PR03MB5246.eurprd03.prod.outlook.com ([fe80::3568:5b4f:ab6b:e362]) by VE1PR03MB5246.eurprd03.prod.outlook.com ([fe80::3568:5b4f:ab6b:e362%6]) with mapi id 15.20.3261.026; Tue, 25 Aug 2020 21:20:20 +0000 Received: from localhost.localdomain (147.91.217.240) by ZR0P278CA0045.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:1d::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3326.19 via Frontend Transport; Tue, 25 Aug 2020 21:20:19 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=J0LWHoec1axFoThhFgRRosR9FxSjKh+ipIwdOhC1dDhu13LeLKxZ1qDtS7CX9ubya6mbxYKlDuRanCOMwPm1MWcrDpdhBtuTIeDyeP2GFXBhLnTpTT13Z94wqPdwXMYY0Dw101jwXfbTssc14UZ1uq4IjSnCWxitvZDk4EXdR/KAK9XQgLDTsIVYnqWd9vGS3v24Aua7OpF5VsZTviiBUx7BD+/Pazo7UtZQpT2maaeVy5btmYYPOe8gapOht+K0YJd6tarT4jkpTIDscHWtIDR6/bdQ0pagB0tpffxfI/L/7ULIW/qETKLyP6g5TGC5HGnRbrs/UNaaHVJHt0OHuQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=0rxDHV8VzSrstEgbdUUXtJ1blVeoXD32EQXBcZLp9Ls=; b=Ej/kTAwyuP6F3xOVVKBauQJg6cWUt/+ICcga4UO8J/ghnachI5fYvkLVbHx+ozvXtYTOl36mN0/OUY1YUWUtByf5A1uKI1nZb+BUo81ZF8rU4BLSawZd+0CPtYnbZkhqfti1bYDk48g3FxRTmGkEwPbRgHeSDEKXV1trhVd6eEE/zJubHe0b3QJQD5e+k9q5TsFW6RmB/kBpZ6AtAjKFzdCi5pPuUfUEszMezvmBtQFokKzOu9u/rQxPXPH+5uuZ29v3jzaqjpqzpYnCduzkUKZqylF42l16O9dvOMpHBqGZUkZ9PDvjXG4y98ALGvBCkCeRavLzNc9WvGA5gtrv7A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=syrmia.com; dmarc=pass action=none header.from=syrmia.com; dkim=pass header.d=syrmia.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=syrmia.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=0rxDHV8VzSrstEgbdUUXtJ1blVeoXD32EQXBcZLp9Ls=; b=ehdWG6eJE5a0M3HjFZVoC9NKKNIeEckMMzu7Qa4p65KOvnTwnwg3f+vlxWN1X4/WeBb6P5b5Umg6lzHv3PuY3FK4kxXtvIXIeTAZXJ8UNHzUlkV/yWaUTLagZzE805nmATwMnD2GJdm+0glld1Y2IFO47P6kGfgCrnXzjizTTI8= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=syrmia.com; From: Filip Bozuta To: qemu-devel@nongnu.org Subject: [PATCH v2 1/2] linux-user: Modify 'recvmmsg()' implementation Date: Tue, 25 Aug 2020 23:20:04 +0200 Message-Id: <20200825212005.35982-2-Filip.Bozuta@syrmia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200825212005.35982-1-Filip.Bozuta@syrmia.com> References: <20200825212005.35982-1-Filip.Bozuta@syrmia.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: ZR0P278CA0045.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:1d::14) To VE1PR03MB5246.eurprd03.prod.outlook.com (2603:10a6:802:a1::22) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Mailer: git-send-email 2.25.1 X-Originating-IP: [147.91.217.240] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d857388d-7c28-4e8d-a4a0-08d8493cab97 X-MS-TrafficTypeDiagnostic: VI1PR0301MB2253: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5797; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ehds/tTxiGlnuXXt3KkvS0gQqaPWF/Ir/1eUJSUGsTMeHgdeAw4NMvxxbD6rIdMS2NBzugzJmAaqxuYTCXypxuSnrKfMM0tFepxfrz+m3G5PNyJa209RMYr+VXEe1KVfXbZfCgyznDEmRDEzcOqIdWaGlZeXzzqSvrdz3YhMx4X+ihPyDAMFggU6vSZL/7d0GanVuPIebp5Ft4tyeQu4KyfWR8tOZkX0YK4i25nzkBxu+1HX9KwEI4eELjy1Oy8WyX4NDG/U38yGNhJjyGEtxg/Hc0cy2nnPBZEoAioHJdp6KIlT8Kh99AYqwrD2bw1WHy5wuALR+oisulEScjrRELlr+f/ByP1rm0ELW+Wl1mp4dKFgolpf95FL9jUHgbI+vfhiXBUwCZmYhYrKseuPItnOb3I3ZL2OMc+AHbi4gA5MpLgZ/h5dDHEPAAXUPrtVoPx/NFX7U9PCtnZr5dOdYQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VE1PR03MB5246.eurprd03.prod.outlook.com; PTR:; CAT:NONE; SFS:(346002)(366004)(39830400003)(136003)(376002)(396003)(66476007)(86362001)(16526019)(66556008)(107886003)(1076003)(8936002)(186003)(2616005)(956004)(6512007)(26005)(6916009)(5660300002)(83380400001)(4326008)(966005)(316002)(66946007)(52116002)(478600001)(6486002)(2906002)(54906003)(36756003)(6666004)(8676002)(6506007)(69590400007); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: tmW7yrqfTcrwHk8epaq8Izpwdf3mnCx016mlU9UCfBJI2i8n7+h02uODd/Zxj8X0wMoIICQRfQtWwA6kVNXLUO/7CRsmKwME3Vs3k8yxXS1Sm9AHhVBYoU63FqAMttzYRiZUjYgiPuaeQl7v2yFwKmUZImcGtBLneh3eAQvFatc8X4D2BoXwjbAy/QvtrJ9BQ1am/j7GTUi3pmiXHY2r5cGxXj35Y1KLBRbDy/W9xIrpHziE0lGZzz+5lBO/2yrTysNBE6tseVy3aOsb48EJrHa0LtYGsVgSr4EbV2tFzD4FoO8v4FVFGMU+PwOYJ2SbGY/HHfG/A+qgQQk/DpvEtOZBvbbr5Cs2tS+iFVNdsVVfhwbzMg0t6MXIs++Pvtngdaq/sGcHq0kepDLdl0n1mjIXjqS4L2ZAkwyp7zeVD3m+Dy2HmB/5tVRjuv08JfD0lNOA4ZZh/JVRg6X3N+TIGR+bUO39UZmUZ/j4Qrnw0AnNQ7goVUFr//J/MpZbXl795s8hst3hjG3LRNTDNnSvrTO0ktLhZe34axXCyQ0OZGU7wcwVJ/t/X/2OlCF7Jvd3kZMjqJ6EuBdpOpMt/um8ujpN/7Xk/ZKMBkEQ0j3AWVSOktxPnQZWWpOdFngiIUl8naYt5CKO3lmvGT9y0UuCOQ== X-OriginatorOrg: syrmia.com X-MS-Exchange-CrossTenant-Network-Message-Id: d857388d-7c28-4e8d-a4a0-08d8493cab97 X-MS-Exchange-CrossTenant-AuthSource: VE1PR03MB5246.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Aug 2020 21:20:20.0241 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 19214a73-c1ab-4e19-8f59-14bdcb09a66e X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: dTvEwBI7XgTGs+EYMRu8LzyKGKPNiPuvoYuxcd4GmOU+GKC3r2qYzwbRU7vzJ1rVmPTwWQP6h20cDA31e07NSg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0301MB2253 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=40.107.6.111; envelope-from=Filip.Bozuta@syrmia.com; helo=EUR04-DB3-obe.outbound.protection.outlook.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/25 17:20:21 X-ACL-Warn: Detected OS = Windows NT kernel [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Riku Voipio , Laurent Vivier , Filip Bozuta Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @syrmia.com) Content-Type: text/plain; charset="utf-8" Implementation of syscall 'recvmmsg()' in file 'syscall.c' uses a loop over 'recvmsg()' to receive each individual message from a socket. However, the implementation ignores the timeout argument. This patch changes that by introducing a timeout check after each received message. Implementation notes: Function 'clock_gettime()' is used to check the time before messages start getting received. After each message is received, 'clock_gettime()' is called and used to check whether the timeout is expired. Signed-off-by: Filip Bozuta --- linux-user/syscall.c | 45 ++++++++++++++++++++++++++++++++++++-------- 1 file changed, 37 insertions(+), 8 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 05f03919ff..dc89bfacca 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -3197,21 +3197,36 @@ static abi_long do_sendrecvmsg(int fd, abi_ulong ta= rget_msg, =20 static abi_long do_sendrecvmmsg(int fd, abi_ulong target_msgvec, unsigned int vlen, unsigned int flags, - int send) + abi_ulong timeout, int send) { struct target_mmsghdr *mmsgp; + struct timespec ts, end_time, curr_time; abi_long ret =3D 0; int i; =20 if (vlen > UIO_MAXIOV) { vlen =3D UIO_MAXIOV; } - mmsgp =3D lock_user(VERIFY_WRITE, target_msgvec, sizeof(*mmsgp) * vlen= , 1); if (!mmsgp) { return -TARGET_EFAULT; } + if (timeout) { + if (target_to_host_timespec(&ts, timeout)) { + return -TARGET_EFAULT; + } + if (ts.tv_sec < 0 || ts.tv_nsec < 0 || ts.tv_nsec > 1000000000) { + return -TARGET_EINVAL; + } =20 + clock_gettime(CLOCK_REALTIME, &curr_time); + end_time.tv_sec =3D curr_time.tv_sec + ts.tv_sec; + end_time.tv_nsec =3D curr_time.tv_nsec + ts.tv_nsec; + if (end_time.tv_nsec > 1000000000) { + end_time.tv_nsec -=3D 1000000000; + end_time.tv_sec++; + } + } for (i =3D 0; i < vlen; i++) { ret =3D do_sendrecvmsg_locked(fd, &mmsgp[i].msg_hdr, flags, send); if (is_error(ret)) { @@ -3222,6 +3237,20 @@ static abi_long do_sendrecvmmsg(int fd, abi_ulong ta= rget_msgvec, if (flags & MSG_WAITFORONE) { flags |=3D MSG_DONTWAIT; } + /* + * For recvmmsg() the timeout is checked only after a datagram is + * received.This is an existing bug in the kernel for this syscall: + * https://man7.org/linux/man-pages/man2/recvmmsg.2.html#BUGS + */ + if (timeout) { + clock_gettime(CLOCK_REALTIME, &curr_time); + if (curr_time.tv_sec > end_time.tv_sec || + (curr_time.tv_sec =3D=3D end_time.tv_sec && + curr_time.tv_nsec >=3D end_time.tv_nsec)) { + i++; + break; + } + } } =20 unlock_user(mmsgp, target_msgvec, sizeof(*mmsgp) * i); @@ -3477,7 +3506,7 @@ static abi_long do_socketcall(int num, abi_ulong vptr) [TARGET_SYS_SENDMSG] =3D 3, /* fd, msg, flags */ [TARGET_SYS_RECVMSG] =3D 3, /* fd, msg, flags */ [TARGET_SYS_ACCEPT4] =3D 4, /* fd, addr, addrlen, flags */ - [TARGET_SYS_RECVMMSG] =3D 4, /* fd, msgvec, vlen, flags */ + [TARGET_SYS_RECVMMSG] =3D 5, /* fd, msgvec, vlen, flags, timeou= t */ [TARGET_SYS_SENDMMSG] =3D 4, /* fd, msgvec, vlen, flags */ }; abi_long a[6]; /* max 6 args */ @@ -3536,10 +3565,10 @@ static abi_long do_socketcall(int num, abi_ulong vp= tr) return do_sendrecvmsg(a[0], a[1], a[2], 0); case TARGET_SYS_ACCEPT4: /* sockfd, addr, addrlen, flags */ return do_accept4(a[0], a[1], a[2], a[3]); - case TARGET_SYS_RECVMMSG: /* sockfd, msgvec, vlen, flags */ - return do_sendrecvmmsg(a[0], a[1], a[2], a[3], 0); + case TARGET_SYS_RECVMMSG: /* sockfd, msgvec, vlen, flags, timeout */ + return do_sendrecvmmsg(a[0], a[1], a[2], a[3], a[4], 0); case TARGET_SYS_SENDMMSG: /* sockfd, msgvec, vlen, flags */ - return do_sendrecvmmsg(a[0], a[1], a[2], a[3], 1); + return do_sendrecvmmsg(a[0], a[1], a[2], a[3], 0, 1); default: qemu_log_mask(LOG_UNIMP, "Unsupported socketcall: %d\n", num); return -TARGET_EINVAL; @@ -9343,11 +9372,11 @@ static abi_long do_syscall1(void *cpu_env, int num,= abi_long arg1, #endif #ifdef TARGET_NR_sendmmsg case TARGET_NR_sendmmsg: - return do_sendrecvmmsg(arg1, arg2, arg3, arg4, 1); + return do_sendrecvmmsg(arg1, arg2, arg3, arg4, 0, 1); #endif #ifdef TARGET_NR_recvmmsg case TARGET_NR_recvmmsg: - return do_sendrecvmmsg(arg1, arg2, arg3, arg4, 0); + return do_sendrecvmmsg(arg1, arg2, arg3, arg4, arg5, 0); #endif #ifdef TARGET_NR_sendto case TARGET_NR_sendto: --=20 2.25.1 From nobody Sun May 19 06:23:09 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=syrmia.com) ARC-Seal: i=2; a=rsa-sha256; t=1598391290; cv=pass; d=zohomail.com; s=zohoarc; b=TgnlzemoFOW3h2tccV9Jlc8TcYUme6TcSeWcWIVqeTeEC7qzvz0WcYUWqdWQi1nMPBjGVf2F7CihoifeSdDUxje9TOFV+HJ71QWHiu4lnO1FFJMvkxA+W06/Odb0Ma3nh3Wa7WoGr/jQQlpiY9zxwsVJVnOVspaRJAys38AxwXU= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598391290; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=J1dV1RWzSFMO1GVgumA+XdGxwE57lNFLjPnlvb0DEGY=; b=HuHFBVVFk0O5TQaAgiojbi8wzaLcNWSUKGurq7eOE95725CivrpO8yQZpoNvhf08fVn0rxlQklpC9v2gMocXQnoY1x6EjrFSfnOQMWqo9lSSqyHh44M/y+a8B1bggkod+MwV8G6SNttt5/ucn7t63Z9mr3CyisrerkqTpGLSm2M= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=syrmia.com) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1598391290549409.18229550360263; Tue, 25 Aug 2020 14:34:50 -0700 (PDT) Received: from localhost ([::1]:39436 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kAgaf-0005WL-17 for importer@patchew.org; Tue, 25 Aug 2020 17:34:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40780) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kAgMo-0005ku-V8 for qemu-devel@nongnu.org; Tue, 25 Aug 2020 17:20:30 -0400 Received: from mail-eopbgr60111.outbound.protection.outlook.com ([40.107.6.111]:2560 helo=EUR04-DB3-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kAgMm-0004EC-N7 for qemu-devel@nongnu.org; Tue, 25 Aug 2020 17:20:30 -0400 Received: from VE1PR03MB5246.eurprd03.prod.outlook.com (2603:10a6:802:a1::22) by VI1PR0301MB2253.eurprd03.prod.outlook.com (2603:10a6:800:27::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3305.26; Tue, 25 Aug 2020 21:20:20 +0000 Received: from VE1PR03MB5246.eurprd03.prod.outlook.com ([fe80::3568:5b4f:ab6b:e362]) by VE1PR03MB5246.eurprd03.prod.outlook.com ([fe80::3568:5b4f:ab6b:e362%6]) with mapi id 15.20.3261.026; Tue, 25 Aug 2020 21:20:20 +0000 Received: from localhost.localdomain (147.91.217.240) by ZR0P278CA0045.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:1d::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3326.19 via Frontend Transport; Tue, 25 Aug 2020 21:20:20 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=apriyXGWLAjVtem2eK31qwNo6ifrjR7ea9BPRayAsxIRRO4tla/2KLZyUok/Y/9Owr5xk5sd3/brjktsSYoFNVsg3Fbx0GDgwJrSCG14Yn6DqqyvSQkElDai0A77C4JdqIXuuVV/W/Fc9mxBYRe0UZY71y5A9fi+j6xkypRFOfymz1I0yZkZqwn+7RZmG21OUBOFyItn9FJTUvyPSkxzaO/64k0j+XMUerMyxhChZHq7K29yOzVkNBnRB1GeBgUVPlwC2ozSz9ntGglp2OiUlUTu9EhRhg4JgetMMLEzn55W916grh8zbn7zns1shTBph4FHPxuEKfnzqweGsFKMow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=J1dV1RWzSFMO1GVgumA+XdGxwE57lNFLjPnlvb0DEGY=; b=RY/SxPx5yUE51MQ+n3+UsJqinAqcWSxMvnd6fz6jHonNHoNxhlE2UafKneYjX04SYA+VWkDdk8UhhbVhYK9kNtb1GQU/nd/poia1E0bksrA6ApQ/PAvuU1oD8XU306G9a6edhdhhfoGBHJIIxGv7VpQw9jbxtLApnCtsmoGI8w/B0NYvhpVNZcQ4URgriYwdkkf+gYlhaPMHahaVwssTGu0Fyi0kO/gDL27ThAAuLvulAnH6d4Z3MU1uHRzPn3A24H/Gg1Ew6HxjCVrkQDRuyoNFjkC5PQ5JhoczWmsFNIJPxevIYDBnN+gDNmPc0I33sKslpBi5nGd1kn+MPGa+mg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=syrmia.com; dmarc=pass action=none header.from=syrmia.com; dkim=pass header.d=syrmia.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=syrmia.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=J1dV1RWzSFMO1GVgumA+XdGxwE57lNFLjPnlvb0DEGY=; b=LoSCpzwvGOPC1KgEJrkwUuoWt0ynVzU32KE0Ir1ZHnEqJjmfKI+3YebdiQk76UjMK4Bb2NzBbVW5pohH83Cz7LYk/1Ui/zEQPYs8BFg3EhmO0UqBM2xY2BoEEzfPEei67uJpDSbaq9a+Y9AOM3xnVkppxtlEoxLrViZHSea+1MM= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=syrmia.com; From: Filip Bozuta To: qemu-devel@nongnu.org Subject: [PATCH v2 2/2] linux-user: Add support for 'recvmmsg_time64()' Date: Tue, 25 Aug 2020 23:20:05 +0200 Message-Id: <20200825212005.35982-3-Filip.Bozuta@syrmia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200825212005.35982-1-Filip.Bozuta@syrmia.com> References: <20200825212005.35982-1-Filip.Bozuta@syrmia.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: ZR0P278CA0045.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:1d::14) To VE1PR03MB5246.eurprd03.prod.outlook.com (2603:10a6:802:a1::22) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Mailer: git-send-email 2.25.1 X-Originating-IP: [147.91.217.240] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: bb6754b0-4dd0-411a-389f-08d8493cac0d X-MS-TrafficTypeDiagnostic: VI1PR0301MB2253: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6790; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: AQsSqSTSCcbJVgwFeEJkwZX1NVS916uv3B4V6Q1Fy8vtTc6ORJAoyNd7okOJWpgjF2t/EcaqbVHCXA6gfPIs3wvAAl/vJhNaMN3ciIU7HBqrIM6L8RyiTy+YKlLChgnLALRZ8eTvlE8HlCQV9r6JHEmePzk8OSzQkz2bzehzW2EgLeGXKhHqYUe8B/4rKeu5XBALr//FP6H6MMgVXR2lWWXn1XGSQMz6h7rte+LtGJiZ3BoPqKUnBzp0KPlWo5jOJDch7cmKvkOPfGO/sqEnUBXnkDlFuftNW35Ou9o9sYSp+SDdgwgMbLXftEEU2LNHqnwkowXvuA8fV1aM49HmBFWA+EKKTFKu5n/j6/avQDa/WtalcAlepXqZ0FDvg2Bl/7YOR40kp7zxcVHLerAuECJqwvoelsQS38/Y6v/Pp/VUPBs9wCVOqbop4jvRwC5LAveC2xWXKChokS4p0bAqcQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VE1PR03MB5246.eurprd03.prod.outlook.com; PTR:; CAT:NONE; SFS:(346002)(366004)(39830400003)(136003)(376002)(396003)(66476007)(86362001)(16526019)(66556008)(107886003)(1076003)(8936002)(186003)(2616005)(956004)(6512007)(26005)(6916009)(5660300002)(83380400001)(4326008)(966005)(316002)(66946007)(52116002)(478600001)(6486002)(2906002)(54906003)(36756003)(6666004)(8676002)(6506007)(69590400007); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: 4GuMjlE5kvfRzKJ7iMYZjTi1uBtJBhMQuBjC4AXQvNfDiy2HPDOQzi/1t9tBHK/T2xL7p+xUf70Ri+clCUVDGjhjs03TZKX5YqJTythuL6U1yrIN/ry8ZCz6LPKLrtob2w9BsSiuDxnQEnJOg4iFkTeKRPGKUtAZ15tye2Zxs95darTNwG0NEUYSxYu4SCAnVTZItzYWGUJELIKZ0kJ3trA+NvZ7HfJtt0GlSq7bn4HnEYSrPddve/iVM7eDuu/yqUlnvJLZZhuz2l/ljboLzb0KI2QViLGXJL9Bs47gM9RGJXoDodxGWfXVkETThSFSlL1Y1IB09R7IkOdXW62GwuLZLTFpEoSrT/xOFu62KXwUbBCr/JMJQC4W5gW1+ZkEm8deLyoXv+7t4fOYBB9gNvLqWrSWbQWAX+TM/72qgsmv8WZ3b8oQWQd4RP1HWB3YuWimx5wTREbF1yYTZcvn8yGDuY8mdDi+dKmZ/N9/91wTxZtjcLHzknBinlBna77dP2xWaJJpEs7dj6gY/r8Db1eEozMX5JKSacXPHI6Bjhco5ntfJsgDnkv+VCYnlbj1znOKwcFkrq/lAZzUiDbFmmsvDy+2uMIn79V5DKHyqxqBNCsRyMNKg4xxXjT4HS4pRA6OKXFDWfhlKXpD+lZG0Q== X-OriginatorOrg: syrmia.com X-MS-Exchange-CrossTenant-Network-Message-Id: bb6754b0-4dd0-411a-389f-08d8493cac0d X-MS-Exchange-CrossTenant-AuthSource: VE1PR03MB5246.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Aug 2020 21:20:20.7877 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 19214a73-c1ab-4e19-8f59-14bdcb09a66e X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: MokUvIORbi26zL4BEgVp4S8WpNYbyvUs6oCC3nZTEmzPDQUFFSwOdY4Pg4GG2DgkseGHkutLtAWzI03TMiNPzg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0301MB2253 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=40.107.6.111; envelope-from=Filip.Bozuta@syrmia.com; helo=EUR04-DB3-obe.outbound.protection.outlook.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/25 17:20:21 X-ACL-Warn: Detected OS = Windows NT kernel [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Riku Voipio , Laurent Vivier , Filip Bozuta Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @syrmia.com) Content-Type: text/plain; charset="utf-8" This patch introduces functionality for syscall: *recvmmsg_time64 This syscall is a 2038 safe variant for syscall: int recvmmsg(int sockfd, struct mmsghdr *msgvec, unsigned int vlen, int flags, struct timespec *timeout) --receive multiple messages on a socket-- man page: https://man7.org/linux/man-pages/man2/recvmmsg.2.html Implementation notes: Function 'do_sendrecvmmsg()' in 'syscall.c' was changed with the addition of a new argument 'time64' which represents a flag by which the function knows what kind of 'struct timespec' converting function to call ('target_to_host_timespec() or 'target_to_host_timespec64()'). It is false in case of 'TARGET_NR_recvmmsg' and true in case of 'TARGET_NR_recvmmsg_time64'. In 'do_socketcall()', the 'TARGET_ABI_BITS' was checked to know what value for 'time64' argument to pass. Signed-off-by: Filip Bozuta --- linux-user/syscall.c | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index dc89bfacca..762eea0e5b 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -3197,7 +3197,7 @@ static abi_long do_sendrecvmsg(int fd, abi_ulong targ= et_msg, =20 static abi_long do_sendrecvmmsg(int fd, abi_ulong target_msgvec, unsigned int vlen, unsigned int flags, - abi_ulong timeout, int send) + abi_ulong timeout, bool time64, int send) { struct target_mmsghdr *mmsgp; struct timespec ts, end_time, curr_time; @@ -3212,8 +3212,14 @@ static abi_long do_sendrecvmmsg(int fd, abi_ulong ta= rget_msgvec, return -TARGET_EFAULT; } if (timeout) { - if (target_to_host_timespec(&ts, timeout)) { - return -TARGET_EFAULT; + if (time64) { + if (target_to_host_timespec64(&ts, timeout)) { + return -TARGET_EFAULT; + } + } else { + if (target_to_host_timespec(&ts, timeout)) { + return -TARGET_EFAULT; + } } if (ts.tv_sec < 0 || ts.tv_nsec < 0 || ts.tv_nsec > 1000000000) { return -TARGET_EINVAL; @@ -3506,7 +3512,7 @@ static abi_long do_socketcall(int num, abi_ulong vptr) [TARGET_SYS_SENDMSG] =3D 3, /* fd, msg, flags */ [TARGET_SYS_RECVMSG] =3D 3, /* fd, msg, flags */ [TARGET_SYS_ACCEPT4] =3D 4, /* fd, addr, addrlen, flags */ - [TARGET_SYS_RECVMMSG] =3D 5, /* fd, msgvec, vlen, flags, timeou= t */ + [TARGET_SYS_RECVMMSG] =3D 6, /* fd, msgvec, vlen, flags, timeou= t */ [TARGET_SYS_SENDMMSG] =3D 4, /* fd, msgvec, vlen, flags */ }; abi_long a[6]; /* max 6 args */ @@ -3566,9 +3572,10 @@ static abi_long do_socketcall(int num, abi_ulong vpt= r) case TARGET_SYS_ACCEPT4: /* sockfd, addr, addrlen, flags */ return do_accept4(a[0], a[1], a[2], a[3]); case TARGET_SYS_RECVMMSG: /* sockfd, msgvec, vlen, flags, timeout */ - return do_sendrecvmmsg(a[0], a[1], a[2], a[3], a[4], 0); + return do_sendrecvmmsg(a[0], a[1], a[2], a[3], a[4], + TARGET_ABI_BITS =3D=3D 64, 0); case TARGET_SYS_SENDMMSG: /* sockfd, msgvec, vlen, flags */ - return do_sendrecvmmsg(a[0], a[1], a[2], a[3], 0, 1); + return do_sendrecvmmsg(a[0], a[1], a[2], a[3], 0, false, 1); default: qemu_log_mask(LOG_UNIMP, "Unsupported socketcall: %d\n", num); return -TARGET_EINVAL; @@ -9372,11 +9379,15 @@ static abi_long do_syscall1(void *cpu_env, int num,= abi_long arg1, #endif #ifdef TARGET_NR_sendmmsg case TARGET_NR_sendmmsg: - return do_sendrecvmmsg(arg1, arg2, arg3, arg4, 0, 1); + return do_sendrecvmmsg(arg1, arg2, arg3, arg4, 0, false, 1); #endif #ifdef TARGET_NR_recvmmsg case TARGET_NR_recvmmsg: - return do_sendrecvmmsg(arg1, arg2, arg3, arg4, arg5, 0); + return do_sendrecvmmsg(arg1, arg2, arg3, arg4, arg5, false, 0); +#endif +#ifdef TARGET_NR_recvmmsg_time64 + case TARGET_NR_recvmmsg_time64: + return do_sendrecvmmsg(arg1, arg2, arg3, arg4, arg5, true, 0); #endif #ifdef TARGET_NR_sendto case TARGET_NR_sendto: --=20 2.25.1