From patchwork Fri Sep 22 14:02:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Carlo_Marcelo_Arenas_Bel=C3=B3n?= X-Patchwork-Id: 9966225 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 6A8B560381 for ; Fri, 22 Sep 2017 14:04:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6A04520223 for ; Fri, 22 Sep 2017 14:04:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5EBF229879; Fri, 22 Sep 2017 14:04:27 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, UPPERCASE_50_75 autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 9A9BC20223 for ; Fri, 22 Sep 2017 14:04:26 +0000 (UTC) Received: from localhost ([::1]:59076 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dvOZ6-0006un-SZ for patchwork-qemu-devel@patchwork.kernel.org; Fri, 22 Sep 2017 10:04:24 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53740) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dvOXq-0006uF-Sy for qemu-devel@nongnu.org; Fri, 22 Sep 2017 10:03:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dvOXo-0001Lz-Gr for qemu-devel@nongnu.org; Fri, 22 Sep 2017 10:03:06 -0400 Received: from mail-pf0-x241.google.com ([2607:f8b0:400e:c00::241]:38472) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dvOXo-0001LX-9m for qemu-devel@nongnu.org; Fri, 22 Sep 2017 10:03:04 -0400 Received: by mail-pf0-x241.google.com with SMTP id a7so497467pfj.5 for ; Fri, 22 Sep 2017 07:03:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=lMCNEZAGXmisQl5GGgjAX2AK+RwgWvNAGRFaiHyPHJM=; b=fvBm34BFpnmzaJMWPbmKNzwQFZ8BJKLq23eqaMb8+BJ2lzFjULmfaQmkh8/ADN2D3z +CCweD3dKKSwbkFYE2yoq4l9CK53pri2nSX8MNrt/p6ABDc74uENpw4/gYOrT8Tq1FBw 49HXQnkZcBlSM1HX1hDYcLcfaeC7j8JFaDK4N1VByx5N+fU+RBVABu/2YuP1qVUuCFI1 JSyzLhtrqGdOjiMo3804TiuODHJ0TdjzoDb2moJUYxlu5S5j47zRxOdJ2c8NkyxTuQaq ybzGHRecX8XvwyiOieKjnOnO/NvkfJ4dIhfvUzyujB/rPcywixnYhxrWouTU6Fx584fh o3aQ== 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=lMCNEZAGXmisQl5GGgjAX2AK+RwgWvNAGRFaiHyPHJM=; b=rOLtRdrnwvp7/4ildVJglWjrTahediqVVoYCfXUUdt1zeMhoLofMltBN+AeQrjPS2E Ji2U9MW8MZTXNebWpdYjTZdcNUNZbv3PxSX6xzzGUEvuG3HXECPYneBoEB6HN++WwaPL 7Qat8eM6BHb4ujgfA/7MRUexpLFytKf9m4EI3GGq5Z9oDJjU3v+nO/eQrdf84FgSXHzp 1ADSXCc+SUF3WLixV7tCjdWAjM2dO8F4aLTnTpfDVyvntqnAmdfE1w+630PipdX4FvlC egnYd/1hEa82AowLh8ztw6sWv3k/LJ3exgqHmuxaBeJkXJF95eCah5zf2FJYkJ9GIn7t JZcw== X-Gm-Message-State: AHPjjUgDWKX0TvgeH9/cmRcMdZXMlaojLg3n95SMraBG1Px5j8cEGlh6 J63wSQti8KJ0qbSbj4pHWLo0OvFz X-Google-Smtp-Source: AOwi7QALFAUDWnVbhRyHQTVxzbfJa9gjdyYcvcdb+bttquuz/x557iRv6vEChBrx1m09BBUPPutfGQ== X-Received: by 10.98.166.72 with SMTP id t69mr5145874pfe.263.1506088983075; Fri, 22 Sep 2017 07:03:03 -0700 (PDT) Received: from localhost.localdomain (c-73-189-82-67.hsd1.ca.comcast.net. [73.189.82.67]) by smtp.gmail.com with ESMTPSA id d124sm6428901pfc.42.2017.09.22.07.03.01 (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 22 Sep 2017 07:03:02 -0700 (PDT) From: =?UTF-8?q?Carlo=20Marcelo=20Arenas=20Bel=C3=B3n?= To: qemu-devel@nongnu.org Date: Fri, 22 Sep 2017 07:02:33 -0700 Message-Id: <20170922140237.10869-3-carenas@gmail.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170922140237.10869-1-carenas@gmail.com> References: <20170922140237.10869-1-carenas@gmail.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c00::241 Subject: [Qemu-devel] [RFC 2/6] linux-user: refactor socket.h for alpha X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Carlo=20Marcelo=20Arenas=20Bel=C3=B3n?= , riku.voipio@iki.fi, laurent@vivier.eu, rth@twiddle.net Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP based on fresh bits from linux 4.14 and therefore enabling SO_REUSEPORT as a side effect Signed-off-by: Carlo Marcelo Arenas Belón --- linux-user/alpha/sockbits.h | 104 ++++++++++++++++++++++++++++++++++++++++++++ linux-user/socket.h | 104 +------------------------------------------- 2 files changed, 105 insertions(+), 103 deletions(-) create mode 100644 linux-user/alpha/sockbits.h diff --git a/linux-user/alpha/sockbits.h b/linux-user/alpha/sockbits.h new file mode 100644 index 0000000000..768579a1f7 --- /dev/null +++ b/linux-user/alpha/sockbits.h @@ -0,0 +1,104 @@ +#define TARGET_SOL_SOCKET 0xffff + +#define TARGET_SO_DEBUG 0x0001 +#define TARGET_SO_REUSEADDR 0x0004 +#define TARGET_SO_KEEPALIVE 0x0008 +#define TARGET_SO_DONTROUTE 0x0010 +#define TARGET_SO_BROADCAST 0x0020 +#define TARGET_SO_LINGER 0x0080 +#define TARGET_SO_OOBINLINE 0x0100 +#define TARGET_SO_REUSEPORT 0x0200 +#define TARGET_SO_TYPE 0x1008 +#define TARGET_SO_ERROR 0x1007 +#define TARGET_SO_SNDBUF 0x1001 +#define TARGET_SO_RCVBUF 0x1002 +#define TARGET_SO_SNDBUFFORCE 0x100a +#define TARGET_SO_RCVBUFFORCE 0x100b +#define TARGET_SO_RCVLOWAT 0x1010 +#define TARGET_SO_SNDLOWAT 0x1011 +#define TARGET_SO_RCVTIMEO 0x1012 +#define TARGET_SO_SNDTIMEO 0x1013 +#define TARGET_SO_ACCEPTCONN 0x1014 +#define TARGET_SO_PROTOCOL 0x1028 +#define TARGET_SO_DOMAIN 0x1029 +#define TARGET_SO_NO_CHECK 11 +#define TARGET_SO_PRIORITY 12 +#define TARGET_SO_BSDCOMPAT 14 +#define TARGET_SO_PASSCRED 17 +#define TARGET_SO_PEERCRED 18 +#define TARGET_SO_BINDTODEVICE 25 +#define TARGET_SO_ATTACH_FILTER 26 +#define TARGET_SO_DETACH_FILTER 27 +#define TARGET_SO_GET_FILTER TARGET_SO_ATTACH_FILTER +#define TARGET_SO_PEERNAME 28 +#define TARGET_SO_TIMESTAMP 29 +#define TARGET_SCM_TIMESTAMP TARGET_SO_TIMESTAMP +#define TARGET_SO_PEERSEC 30 +#define TARGET_SO_PASSSEC 34 +#define TARGET_SO_TIMESTAMPNS 35 +#define TARGET_SCM_TIMESTAMPNS TARGET_SO_TIMESTAMPNS +#define TARGET_SO_SECURITY_AUTHENTICATION 19 +#define TARGET_SO_SECURITY_ENCRYPTION_TRANSPORT 20 +#define TARGET_SO_SECURITY_ENCRYPTION_NETWORK 21 +#define TARGET_SO_MARK 36 +#define TARGET_SO_TIMESTAMPING 37 +#define TARGET_SCM_TIMESTAMPING TARGET_SO_TIMESTAMPING +#define TARGET_SO_RXQ_OVFL 40 +#define TARGET_SO_WIFI_STATUS 41 +#define TARGET_SCM_WIFI_STATUS TARGET_SO_WIFI_STATUS +#define TARGET_SO_PEEK_OFF 42 +#define TARGET_SO_NOFCS 43 +#define TARGET_SO_LOCK_FILTER 44 +#define TARGET_SO_SELECT_ERR_QUEUE 45 +#define TARGET_SO_BUSY_POLL 46 +#define TARGET_SO_MAX_PACING_RATE 47 +#define TARGET_SO_BPF_EXTENSIONS 48 +#define TARGET_SO_INCOMING_CPU 49 +#define TARGET_SO_ATTACH_BPF 50 +#define TARGET_SO_DETACH_BPF TARGET_SO_DETACH_FILTER +#define TARGET_SO_ATTACH_REUSEPORT_CBPF 51 +#define TARGET_SO_ATTACH_REUSEPORT_EBPF 52 +#define TARGET_SO_CNX_ADVICE 53 +#define TARGET_SCM_TIMESTAMPING_OPT_STATS 54 +#define TARGET_SO_MEMINFO 55 +#define TARGET_SO_INCOMING_NAPI_ID 56 +#define TARGET_SO_COOKIE 57 +#define TARGET_SCM_TIMESTAMPING_PKTINFO 58 +#define TARGET_SO_PEERGROUPS 59 +#define TARGET_SO_ZEROCOPY 60 + +/** sock_type - Socket types + * + * Please notice that for binary compat reasons ALPHA has to + * override the enum sock_type in include/linux/net.h, so + * we define ARCH_HAS_SOCKET_TYPES here. + * + * @SOCK_STREAM - stream (connection) socket + * @SOCK_DGRAM - datagram (conn.less) socket + * @SOCK_RAW - raw socket + * @SOCK_RDM - reliably-delivered message + * @SOCK_SEQPACKET - sequential packet socket + * @SOCK_DCCP - Datagram Congestion Control Protocol socket + * @SOCK_PACKET - linux specific way of getting packets at the dev level. + * For writing rarp and other similar things on the user + * level. + * @SOCK_CLOEXEC - sets the close-on-exec (FD_CLOEXEC) flag. + * @SOCK_NONBLOCK - sets the O_NONBLOCK file status flag. + */ + +enum sock_type { + TARGET_SOCK_STREAM = 1, + TARGET_SOCK_DGRAM = 2, + TARGET_SOCK_RAW = 3, + TARGET_SOCK_RDM = 4, + TARGET_SOCK_SEQPACKET = 5, + TARGET_SOCK_DCCP = 6, + TARGET_SOCK_PACKET = 10, + TARGET_SOCK_CLOEXEC = 010000000, + TARGET_SOCK_NONBLOCK = 0x40000000, +}; + +#define TARGET_SOCK_MAX (TARGET_SOCK_PACKET + 1) +#define TARGET_SOCK_TYPE_MASK 0xf /* Covers up to TARGET_SOCK_MAX - 1. */ + +#define ARCH_HAS_SOCKET_TYPES 1 diff --git a/linux-user/socket.h b/linux-user/socket.h index c7e6cb8ea1..115bdf2ddb 100644 --- a/linux-user/socket.h +++ b/linux-user/socket.h @@ -102,109 +102,7 @@ #define TARGET_SOCK_TYPE_MASK 0xf /* Covers up to TARGET_SOCK_MAX-1. */ #elif defined(TARGET_ALPHA) - - /* For setsockopt(2) */ - #define TARGET_SOL_SOCKET 0xffff - - #define TARGET_SO_DEBUG 0x0001 - #define TARGET_SO_REUSEADDR 0x0004 - #define TARGET_SO_KEEPALIVE 0x0008 - #define TARGET_SO_DONTROUTE 0x0010 - #define TARGET_SO_BROADCAST 0x0020 - #define TARGET_SO_LINGER 0x0080 - #define TARGET_SO_OOBINLINE 0x0100 - /* To add :#define TARGET_SO_REUSEPORT 0x0200 */ - - #define TARGET_SO_TYPE 0x1008 - #define TARGET_SO_ERROR 0x1007 - #define TARGET_SO_SNDBUF 0x1001 - #define TARGET_SO_RCVBUF 0x1002 - #define TARGET_SO_SNDBUFFORCE 0x100a - #define TARGET_SO_RCVBUFFORCE 0x100b - #define TARGET_SO_RCVLOWAT 0x1010 - #define TARGET_SO_SNDLOWAT 0x1011 - #define TARGET_SO_RCVTIMEO 0x1012 - #define TARGET_SO_SNDTIMEO 0x1013 - #define TARGET_SO_ACCEPTCONN 0x1014 - #define TARGET_SO_PROTOCOL 0x1028 - #define TARGET_SO_DOMAIN 0x1029 - - /* linux-specific, might as well be the same as on i386 */ - #define TARGET_SO_NO_CHECK 11 - #define TARGET_SO_PRIORITY 12 - #define TARGET_SO_BSDCOMPAT 14 - - #define TARGET_SO_PASSCRED 17 - #define TARGET_SO_PEERCRED 18 - #define TARGET_SO_BINDTODEVICE 25 - - /* Socket filtering */ - #define TARGET_SO_ATTACH_FILTER 26 - #define TARGET_SO_DETACH_FILTER 27 - - #define TARGET_SO_PEERNAME 28 - #define TARGET_SO_TIMESTAMP 29 - #define TARGET_SCM_TIMESTAMP TARGET_SO_TIMESTAMP - - #define TARGET_SO_PEERSEC 30 - #define TARGET_SO_PASSSEC 34 - #define TARGET_SO_TIMESTAMPNS 35 - #define TARGET_SCM_TIMESTAMPNS TARGET_SO_TIMESTAMPNS - - /* Security levels - as per NRL IPv6 - don't actually do anything */ - #define TARGET_SO_SECURITY_AUTHENTICATION 19 - #define TARGET_SO_SECURITY_ENCRYPTION_TRANSPORT 20 - #define TARGET_SO_SECURITY_ENCRYPTION_NETWORK 21 - - #define TARGET_SO_MARK 36 - - #define TARGET_SO_TIMESTAMPING 37 - #define TARGET_SCM_TIMESTAMPING TARGET_SO_TIMESTAMPING - - #define TARGET_SO_RXQ_OVFL 40 - - #define TARGET_SO_WIFI_STATUS 41 - #define TARGET_SCM_WIFI_STATUS TARGET_SO_WIFI_STATUS - #define TARGET_SO_PEEK_OFF 42 - - /* Instruct lower device to use last 4-bytes of skb data as FCS */ - #define TARGET_SO_NOFCS 43 - - /** sock_type - Socket types - * - * Please notice that for binary compat reasons ALPHA has to - * override the enum sock_type in include/linux/net.h, so - * we define ARCH_HAS_SOCKET_TYPES here. - * - * @SOCK_DGRAM - datagram (conn.less) socket - * @SOCK_STREAM - stream (connection) socket - * @SOCK_RAW - raw socket - * @SOCK_RDM - reliably-delivered message - * @SOCK_SEQPACKET - sequential packet socket - * @SOCK_DCCP - Datagram Congestion Control Protocol socket - * @SOCK_PACKET - linux specific way of getting packets at the dev level. - * For writing rarp and other similar things on the user - * level. - * @SOCK_CLOEXEC - sets the close-on-exec (FD_CLOEXEC) flag. - * @SOCK_NONBLOCK - sets the O_NONBLOCK file status flag. - */ - - #define ARCH_HAS_SOCKET_TYPES 1 - - enum sock_type { - TARGET_SOCK_STREAM = 1, - TARGET_SOCK_DGRAM = 2, - TARGET_SOCK_RAW = 3, - TARGET_SOCK_RDM = 4, - TARGET_SOCK_SEQPACKET = 5, - TARGET_SOCK_DCCP = 6, - TARGET_SOCK_PACKET = 10, - TARGET_SOCK_CLOEXEC = 010000000, - TARGET_SOCK_NONBLOCK = 010000000000, - }; - - #define TARGET_SOCK_MAX (TARGET_SOCK_PACKET + 1) - #define TARGET_SOCK_TYPE_MASK 0xf /* Covers up to TARGET_SOCK_MAX-1. */ +#include "alpha/sockbits.h" #elif defined(TARGET_HPPA) #include "hppa/sockbits.h" #else