From patchwork Mon Jan 11 14:16:18 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Riku Voipio X-Patchwork-Id: 565903 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id CD9FC1402ED for ; Tue, 12 Jan 2016 01:26:13 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b=WuPWm8oJ; dkim-atps=neutral Received: from localhost ([::1]:54559 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aIdQB-0005ec-PN for incoming@patchwork.ozlabs.org; Mon, 11 Jan 2016 09:26:11 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52691) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aIdH3-0004tY-26 for qemu-devel@nongnu.org; Mon, 11 Jan 2016 09:16:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aIdH2-0002CY-00 for qemu-devel@nongnu.org; Mon, 11 Jan 2016 09:16:44 -0500 Received: from mail-lf0-x22e.google.com ([2a00:1450:4010:c07::22e]:35860) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aIdH1-0002CS-P8 for qemu-devel@nongnu.org; Mon, 11 Jan 2016 09:16:43 -0500 Received: by mail-lf0-x22e.google.com with SMTP id h129so18639279lfh.3 for ; Mon, 11 Jan 2016 06:16:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=iAJjJzdfGSgrJ2oNOPvavv0JR5lR0U6ju7R99yvmHF4=; b=WuPWm8oJWL5PvWpw6Ia/Pi5PeUobCqXX5dx/K2IBaKMCaXvGbDN7HIAtpbSPHRSzrL AUEAdhkcpAHz4nG9ocjQGa4Mjqfy+H+SCVtXXz7f9E8hLDJdWDMUvcIjhGaoCCpP841Z MXYNUUtN79HO0Bw/+RcMnZ6ODSfwlpAT5+xwE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=iAJjJzdfGSgrJ2oNOPvavv0JR5lR0U6ju7R99yvmHF4=; b=RYCjbPPQLC4FeenjSqcHtbcr9shYw40KGJ6UguAEevWDQTEJTK+wzNXt+0jT0v5AHd m5/Tf/fB5EMKTSzQibMM8f8jrmzR+EnTl8G0Pe9nsfmImbCuI0YBfIuM+8bG594Rw7IM cDnpt69OWauWphfNyMfK7Tz6lgg7iaK84kQwArjVmZOc0ju7tRPk9rXQPSvafsJH2hJr 64Y6rNn0Xn4fsnZOo3RSZcS8D8lqA5Fpvjh/kB43JBJ5oPwHia14tH+nZpvKT5XjSZbN E/fJWwxQZ0RHeivnTX/G6UrPOBAz5p4L/BRibgp97ihobYCVTr8atADaenpJiiygvFiJ b14A== X-Gm-Message-State: ALoCoQlhcGorWCss5jomPkSwzYytjmWUy+3c8Eq8XvPj7NMyr0W/Td1YEUDlYObMrrD5UgYfaDkCfti3BKeZNFgxS7zVL+YlhA== X-Received: by 10.25.131.150 with SMTP id f144mr26525422lfd.155.1452521803208; Mon, 11 Jan 2016 06:16:43 -0800 (PST) Received: from localhost.localdomain (91-157-175-207.elisa-laajakaista.fi. [91.157.175.207]) by smtp.gmail.com with ESMTPSA id 130sm16806735lff.31.2016.01.11.06.16.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 11 Jan 2016 06:16:42 -0800 (PST) From: riku.voipio@linaro.org To: qemu-devel@nongnu.org Date: Mon, 11 Jan 2016 16:16:18 +0200 Message-Id: <5a53dc5042d9250f2011e54cd065ed360e34d2ac.1452521686.git.riku.voipio@linaro.org> X-Mailer: git-send-email 2.6.4 In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:4010:c07::22e Cc: John Paul Adrian Glaubitz Subject: [Qemu-devel] [PULL 16/17] linux-user: Add SOCKOP_sendmmsg and SOCKOP_recvmmsg socket call, wire them up. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: John Paul Adrian Glaubitz Adds the definitions for the socket calls SOCKOP_sendmmsg and SOCKOP_recvmmsg and wires them up with the rest of the code. The necessary function do_sendrecvmmsg() is already present in linux-user/syscall.c. After adding these two definitions and wiring them up, I no longer receive an error message about the unimplemented socket calls when running "apt-get update" on Debian unstable running on qemu with glibc_2.21 on m68k. Signed-off-by: John Paul Adrian Glaubitz Reviewed-by: Laurent Vivier Signed-off-by: Riku Voipio --- linux-user/syscall.c | 8 ++++++-- linux-user/syscall_defs.h | 2 ++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 11b72e1..0cbace4 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -2272,7 +2272,6 @@ static abi_long do_sendrecvmsg(int fd, abi_ulong target_msg, return ret; } -#ifdef TARGET_NR_sendmmsg /* We don't rely on the C library to have sendmmsg/recvmmsg support, * so it might not have this *mmsg-specific flag either. */ @@ -2319,7 +2318,6 @@ static abi_long do_sendrecvmmsg(int fd, abi_ulong target_msgvec, } return ret; } -#endif /* If we don't have a system accept4() then just call accept. * The callsites to do_accept4() will ensure that they don't @@ -2542,6 +2540,8 @@ static abi_long do_socketcall(int num, abi_ulong vptr) [SOCKOP_shutdown] = 2, /* sockfd, how */ [SOCKOP_sendmsg] = 3, /* sockfd, msg, flags */ [SOCKOP_recvmsg] = 3, /* sockfd, msg, flags */ + [SOCKOP_sendmmsg] = 4, /* sockfd, msgvec, vlen, flags */ + [SOCKOP_recvmmsg] = 4, /* sockfd, msgvec, vlen, flags */ [SOCKOP_setsockopt] = 5, /* sockfd, level, optname, optval, optlen */ [SOCKOP_getsockopt] = 5, /* sockfd, level, optname, optval, optlen */ }; @@ -2592,6 +2592,10 @@ static abi_long do_socketcall(int num, abi_ulong vptr) return do_sendrecvmsg(a[0], a[1], a[2], 1); case SOCKOP_recvmsg: /* sockfd, msg, flags */ return do_sendrecvmsg(a[0], a[1], a[2], 0); + case SOCKOP_sendmmsg: /* sockfd, msgvec, vlen, flags */ + return do_sendrecvmmsg(a[0], a[1], a[2], a[3], 1); + case SOCKOP_recvmmsg: /* sockfd, msgvec, vlen, flags */ + return do_sendrecvmmsg(a[0], a[1], a[2], a[3], 0); case SOCKOP_setsockopt: /* sockfd, level, optname, optval, optlen */ return do_setsockopt(a[0], a[1], a[2], a[3], a[4]); case SOCKOP_getsockopt: /* sockfd, level, optname, optval, optlen */ diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h index 2fd4aff..9e2b3c2 100644 --- a/linux-user/syscall_defs.h +++ b/linux-user/syscall_defs.h @@ -28,6 +28,8 @@ #define SOCKOP_sendmsg 16 #define SOCKOP_recvmsg 17 #define SOCKOP_accept4 18 +#define SOCKOP_recvmmsg 19 +#define SOCKOP_sendmmsg 20 #define IPCOP_semop 1 #define IPCOP_semget 2