From patchwork Tue Sep 25 08:54:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 974310 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42KFRd1nyrz9sB5 for ; Tue, 25 Sep 2018 19:01:17 +1000 (AEST) Received: from localhost ([::1]:51732 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g4jDW-0007kH-LW for incoming@patchwork.ozlabs.org; Tue, 25 Sep 2018 05:01:14 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47418) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g4j7x-0003St-5W for qemu-devel@nongnu.org; Tue, 25 Sep 2018 04:55:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g4j7k-0000BK-QP for qemu-devel@nongnu.org; Tue, 25 Sep 2018 04:55:24 -0400 Received: from mout.kundenserver.de ([212.227.126.135]:41565) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1g4j7k-0000Aj-5q for qemu-devel@nongnu.org; Tue, 25 Sep 2018 04:55:16 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue011 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MZkYx-1gJAlU3Obv-00WqIr; Tue, 25 Sep 2018 10:55:05 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Tue, 25 Sep 2018 10:54:28 +0200 Message-Id: <20180925085432.3791-2-laurent@vivier.eu> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180925085432.3791-1-laurent@vivier.eu> References: <20180925085432.3791-1-laurent@vivier.eu> X-Provags-ID: V03:K1:Whu/uW9s6xhR+3BA93+oVAsH+LWuILUtR8POsx10ijuHD2ellJy GNTYo33gV3e61o4D7bWda8HkLG8WWRizFKa/dBhP1420nSfT8amlEdM8s9xWDFOMjHXAh6J A1Va0JE/Kfd6riQdLoGrsS9DsgxiJyi4aBw720XFAXaVQWH5n4Io+RBUvvRe5B5cfHm8MLF 8L1/N5Ev6iP8zvTzXqyNg== X-UI-Out-Filterresults: notjunk:1; V01:K0:y07KLJDmHxY=:N3t6oCaqAUL4Zv90BNRcbX LFxoC/2OS3ODFRVUURvhFsg54X4nAQirufKVdhwwqV/YMI58iSQULqe8Ql0XRQYR1CKDgvpjv UK8rS7xrG86MXA4nHsPVRR0+4kUjDxOLdZ75kAQhzeVEtCd/vGCm/Cd+eIGwijhvTe7u++aWI 9fuiuuYjpSXm8YQrxcbjmwKGm8X1oXCkGozY3B8Wm0HUGk9RDftdWUla88VWlXY/KU46rsasc wNfl/ngYikG85rlCtiPSO2M0t2FNGXIglX168C1Ic3NYZs6QDk8Nbl5IYkbcVfxgofe5qL62X QVFmrXS6IU7d2B++aWHUOL77j5T9a42dOkbZn2bDL+Y5n5Ebqvk5K8Sf12yITcOR0VXwEZGyI pDVVOJKgCgIx0aCo6Hp3w5R0QVuBTtx+AsvO1hsk4+ZuvRYMSkYOo7t17+pdpRwVYTQUF/HG7 6WcNOPFFREZdwr9an2/g3LkAQ9iRMcmEioAcC13gt68OOCJgAvVwWNLePp7bxOoAWx3844TYQ xN/ojdiF4/yGHaavAYpSyEhrdq91z37L5NaaTC6LjBxVktnIJIJ1L1tq7G3bSSCaCdNWY8Rvz 3s35qok9QVNj5lvg5oWCR93/0UnvOlUw0I1EVPAlIwdjVTSedf30DPToE4Xjpijlc/XN/vAMa ztuzZmuav38qyaz9N1zBy30dsVDqyvN8ZPK7fXg/qPbQ9uEt+SrKQdfXUR+7kT0RA38k= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.126.135 Subject: [Qemu-devel] [PULL 1/5] linux-user: move TargetFdTrans functions to their own file 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: Riku Voipio , Laurent Vivier Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" This will ease to move out syscall functions from syscall.c Signed-off-by: Laurent Vivier Reviewed-by: Richard Henderson Message-Id: <20180823222215.13781-1-laurent@vivier.eu> --- linux-user/Makefile.objs | 2 +- linux-user/fd-trans.c | 1408 ++++++++++++++++++++++++++++++++++++ linux-user/fd-trans.h | 97 +++ linux-user/syscall.c | 1448 +------------------------------------- 4 files changed, 1507 insertions(+), 1448 deletions(-) create mode 100644 linux-user/fd-trans.c create mode 100644 linux-user/fd-trans.h diff --git a/linux-user/Makefile.objs b/linux-user/Makefile.objs index b5dfb71f25..769b8d8336 100644 --- a/linux-user/Makefile.objs +++ b/linux-user/Makefile.objs @@ -1,7 +1,7 @@ obj-y = main.o syscall.o strace.o mmap.o signal.o \ elfload.o linuxload.o uaccess.o uname.o \ safe-syscall.o $(TARGET_ABI_DIR)/signal.o \ - $(TARGET_ABI_DIR)/cpu_loop.o exit.o + $(TARGET_ABI_DIR)/cpu_loop.o exit.o fd-trans.o obj-$(TARGET_HAS_BFLT) += flatload.o obj-$(TARGET_I386) += vm86.o diff --git a/linux-user/fd-trans.c b/linux-user/fd-trans.c new file mode 100644 index 0000000000..63a3635925 --- /dev/null +++ b/linux-user/fd-trans.c @@ -0,0 +1,1408 @@ +/* + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see . + */ + +#include "qemu/osdep.h" + +#include +#include +#include +#ifdef CONFIG_INOTIFY +#include +#endif +#ifdef CONFIG_RTNETLINK +#include +#include +#endif +#include "qemu.h" +#include "fd-trans.h" + +enum { + QEMU_IFLA_BR_UNSPEC, + QEMU_IFLA_BR_FORWARD_DELAY, + QEMU_IFLA_BR_HELLO_TIME, + QEMU_IFLA_BR_MAX_AGE, + QEMU_IFLA_BR_AGEING_TIME, + QEMU_IFLA_BR_STP_STATE, + QEMU_IFLA_BR_PRIORITY, + QEMU_IFLA_BR_VLAN_FILTERING, + QEMU_IFLA_BR_VLAN_PROTOCOL, + QEMU_IFLA_BR_GROUP_FWD_MASK, + QEMU_IFLA_BR_ROOT_ID, + QEMU_IFLA_BR_BRIDGE_ID, + QEMU_IFLA_BR_ROOT_PORT, + QEMU_IFLA_BR_ROOT_PATH_COST, + QEMU_IFLA_BR_TOPOLOGY_CHANGE, + QEMU_IFLA_BR_TOPOLOGY_CHANGE_DETECTED, + QEMU_IFLA_BR_HELLO_TIMER, + QEMU_IFLA_BR_TCN_TIMER, + QEMU_IFLA_BR_TOPOLOGY_CHANGE_TIMER, + QEMU_IFLA_BR_GC_TIMER, + QEMU_IFLA_BR_GROUP_ADDR, + QEMU_IFLA_BR_FDB_FLUSH, + QEMU_IFLA_BR_MCAST_ROUTER, + QEMU_IFLA_BR_MCAST_SNOOPING, + QEMU_IFLA_BR_MCAST_QUERY_USE_IFADDR, + QEMU_IFLA_BR_MCAST_QUERIER, + QEMU_IFLA_BR_MCAST_HASH_ELASTICITY, + QEMU_IFLA_BR_MCAST_HASH_MAX, + QEMU_IFLA_BR_MCAST_LAST_MEMBER_CNT, + QEMU_IFLA_BR_MCAST_STARTUP_QUERY_CNT, + QEMU_IFLA_BR_MCAST_LAST_MEMBER_INTVL, + QEMU_IFLA_BR_MCAST_MEMBERSHIP_INTVL, + QEMU_IFLA_BR_MCAST_QUERIER_INTVL, + QEMU_IFLA_BR_MCAST_QUERY_INTVL, + QEMU_IFLA_BR_MCAST_QUERY_RESPONSE_INTVL, + QEMU_IFLA_BR_MCAST_STARTUP_QUERY_INTVL, + QEMU_IFLA_BR_NF_CALL_IPTABLES, + QEMU_IFLA_BR_NF_CALL_IP6TABLES, + QEMU_IFLA_BR_NF_CALL_ARPTABLES, + QEMU_IFLA_BR_VLAN_DEFAULT_PVID, + QEMU_IFLA_BR_PAD, + QEMU_IFLA_BR_VLAN_STATS_ENABLED, + QEMU_IFLA_BR_MCAST_STATS_ENABLED, + QEMU_IFLA_BR_MCAST_IGMP_VERSION, + QEMU_IFLA_BR_MCAST_MLD_VERSION, + QEMU___IFLA_BR_MAX, +}; + +enum { + QEMU_IFLA_UNSPEC, + QEMU_IFLA_ADDRESS, + QEMU_IFLA_BROADCAST, + QEMU_IFLA_IFNAME, + QEMU_IFLA_MTU, + QEMU_IFLA_LINK, + QEMU_IFLA_QDISC, + QEMU_IFLA_STATS, + QEMU_IFLA_COST, + QEMU_IFLA_PRIORITY, + QEMU_IFLA_MASTER, + QEMU_IFLA_WIRELESS, + QEMU_IFLA_PROTINFO, + QEMU_IFLA_TXQLEN, + QEMU_IFLA_MAP, + QEMU_IFLA_WEIGHT, + QEMU_IFLA_OPERSTATE, + QEMU_IFLA_LINKMODE, + QEMU_IFLA_LINKINFO, + QEMU_IFLA_NET_NS_PID, + QEMU_IFLA_IFALIAS, + QEMU_IFLA_NUM_VF, + QEMU_IFLA_VFINFO_LIST, + QEMU_IFLA_STATS64, + QEMU_IFLA_VF_PORTS, + QEMU_IFLA_PORT_SELF, + QEMU_IFLA_AF_SPEC, + QEMU_IFLA_GROUP, + QEMU_IFLA_NET_NS_FD, + QEMU_IFLA_EXT_MASK, + QEMU_IFLA_PROMISCUITY, + QEMU_IFLA_NUM_TX_QUEUES, + QEMU_IFLA_NUM_RX_QUEUES, + QEMU_IFLA_CARRIER, + QEMU_IFLA_PHYS_PORT_ID, + QEMU_IFLA_CARRIER_CHANGES, + QEMU_IFLA_PHYS_SWITCH_ID, + QEMU_IFLA_LINK_NETNSID, + QEMU_IFLA_PHYS_PORT_NAME, + QEMU_IFLA_PROTO_DOWN, + QEMU_IFLA_GSO_MAX_SEGS, + QEMU_IFLA_GSO_MAX_SIZE, + QEMU_IFLA_PAD, + QEMU_IFLA_XDP, + QEMU_IFLA_EVENT, + QEMU_IFLA_NEW_NETNSID, + QEMU_IFLA_IF_NETNSID, + QEMU_IFLA_CARRIER_UP_COUNT, + QEMU_IFLA_CARRIER_DOWN_COUNT, + QEMU_IFLA_NEW_IFINDEX, + QEMU___IFLA_MAX +}; + +enum { + QEMU_IFLA_BRPORT_UNSPEC, + QEMU_IFLA_BRPORT_STATE, + QEMU_IFLA_BRPORT_PRIORITY, + QEMU_IFLA_BRPORT_COST, + QEMU_IFLA_BRPORT_MODE, + QEMU_IFLA_BRPORT_GUARD, + QEMU_IFLA_BRPORT_PROTECT, + QEMU_IFLA_BRPORT_FAST_LEAVE, + QEMU_IFLA_BRPORT_LEARNING, + QEMU_IFLA_BRPORT_UNICAST_FLOOD, + QEMU_IFLA_BRPORT_PROXYARP, + QEMU_IFLA_BRPORT_LEARNING_SYNC, + QEMU_IFLA_BRPORT_PROXYARP_WIFI, + QEMU_IFLA_BRPORT_ROOT_ID, + QEMU_IFLA_BRPORT_BRIDGE_ID, + QEMU_IFLA_BRPORT_DESIGNATED_PORT, + QEMU_IFLA_BRPORT_DESIGNATED_COST, + QEMU_IFLA_BRPORT_ID, + QEMU_IFLA_BRPORT_NO, + QEMU_IFLA_BRPORT_TOPOLOGY_CHANGE_ACK, + QEMU_IFLA_BRPORT_CONFIG_PENDING, + QEMU_IFLA_BRPORT_MESSAGE_AGE_TIMER, + QEMU_IFLA_BRPORT_FORWARD_DELAY_TIMER, + QEMU_IFLA_BRPORT_HOLD_TIMER, + QEMU_IFLA_BRPORT_FLUSH, + QEMU_IFLA_BRPORT_MULTICAST_ROUTER, + QEMU_IFLA_BRPORT_PAD, + QEMU_IFLA_BRPORT_MCAST_FLOOD, + QEMU_IFLA_BRPORT_MCAST_TO_UCAST, + QEMU_IFLA_BRPORT_VLAN_TUNNEL, + QEMU_IFLA_BRPORT_BCAST_FLOOD, + QEMU_IFLA_BRPORT_GROUP_FWD_MASK, + QEMU_IFLA_BRPORT_NEIGH_SUPPRESS, + QEMU___IFLA_BRPORT_MAX +}; + +enum { + QEMU_IFLA_TUN_UNSPEC, + QEMU_IFLA_TUN_OWNER, + QEMU_IFLA_TUN_GROUP, + QEMU_IFLA_TUN_TYPE, + QEMU_IFLA_TUN_PI, + QEMU_IFLA_TUN_VNET_HDR, + QEMU_IFLA_TUN_PERSIST, + QEMU_IFLA_TUN_MULTI_QUEUE, + QEMU_IFLA_TUN_NUM_QUEUES, + QEMU_IFLA_TUN_NUM_DISABLED_QUEUES, + QEMU___IFLA_TUN_MAX, +}; + +enum { + QEMU_IFLA_INFO_UNSPEC, + QEMU_IFLA_INFO_KIND, + QEMU_IFLA_INFO_DATA, + QEMU_IFLA_INFO_XSTATS, + QEMU_IFLA_INFO_SLAVE_KIND, + QEMU_IFLA_INFO_SLAVE_DATA, + QEMU___IFLA_INFO_MAX, +}; + +enum { + QEMU_IFLA_INET_UNSPEC, + QEMU_IFLA_INET_CONF, + QEMU___IFLA_INET_MAX, +}; + +enum { + QEMU_IFLA_INET6_UNSPEC, + QEMU_IFLA_INET6_FLAGS, + QEMU_IFLA_INET6_CONF, + QEMU_IFLA_INET6_STATS, + QEMU_IFLA_INET6_MCAST, + QEMU_IFLA_INET6_CACHEINFO, + QEMU_IFLA_INET6_ICMP6STATS, + QEMU_IFLA_INET6_TOKEN, + QEMU_IFLA_INET6_ADDR_GEN_MODE, + QEMU___IFLA_INET6_MAX +}; + +enum { + QEMU_IFLA_XDP_UNSPEC, + QEMU_IFLA_XDP_FD, + QEMU_IFLA_XDP_ATTACHED, + QEMU_IFLA_XDP_FLAGS, + QEMU_IFLA_XDP_PROG_ID, + QEMU___IFLA_XDP_MAX, +}; + +enum { + QEMU_RTA_UNSPEC, + QEMU_RTA_DST, + QEMU_RTA_SRC, + QEMU_RTA_IIF, + QEMU_RTA_OIF, + QEMU_RTA_GATEWAY, + QEMU_RTA_PRIORITY, + QEMU_RTA_PREFSRC, + QEMU_RTA_METRICS, + QEMU_RTA_MULTIPATH, + QEMU_RTA_PROTOINFO, /* no longer used */ + QEMU_RTA_FLOW, + QEMU_RTA_CACHEINFO, + QEMU_RTA_SESSION, /* no longer used */ + QEMU_RTA_MP_ALGO, /* no longer used */ + QEMU_RTA_TABLE, + QEMU_RTA_MARK, + QEMU_RTA_MFC_STATS, + QEMU_RTA_VIA, + QEMU_RTA_NEWDST, + QEMU_RTA_PREF, + QEMU_RTA_ENCAP_TYPE, + QEMU_RTA_ENCAP, + QEMU_RTA_EXPIRES, + QEMU_RTA_PAD, + QEMU_RTA_UID, + QEMU_RTA_TTL_PROPAGATE, + QEMU_RTA_IP_PROTO, + QEMU_RTA_SPORT, + QEMU_RTA_DPORT, + QEMU___RTA_MAX +}; + +TargetFdTrans **target_fd_trans; +unsigned int target_fd_max; + +static void tswap_nlmsghdr(struct nlmsghdr *nlh) +{ + nlh->nlmsg_len = tswap32(nlh->nlmsg_len); + nlh->nlmsg_type = tswap16(nlh->nlmsg_type); + nlh->nlmsg_flags = tswap16(nlh->nlmsg_flags); + nlh->nlmsg_seq = tswap32(nlh->nlmsg_seq); + nlh->nlmsg_pid = tswap32(nlh->nlmsg_pid); +} + +static abi_long host_to_target_for_each_nlmsg(struct nlmsghdr *nlh, + size_t len, + abi_long (*host_to_target_nlmsg) + (struct nlmsghdr *)) +{ + uint32_t nlmsg_len; + abi_long ret; + + while (len > sizeof(struct nlmsghdr)) { + + nlmsg_len = nlh->nlmsg_len; + if (nlmsg_len < sizeof(struct nlmsghdr) || + nlmsg_len > len) { + break; + } + + switch (nlh->nlmsg_type) { + case NLMSG_DONE: + tswap_nlmsghdr(nlh); + return 0; + case NLMSG_NOOP: + break; + case NLMSG_ERROR: + { + struct nlmsgerr *e = NLMSG_DATA(nlh); + e->error = tswap32(e->error); + tswap_nlmsghdr(&e->msg); + tswap_nlmsghdr(nlh); + return 0; + } + default: + ret = host_to_target_nlmsg(nlh); + if (ret < 0) { + tswap_nlmsghdr(nlh); + return ret; + } + break; + } + tswap_nlmsghdr(nlh); + len -= NLMSG_ALIGN(nlmsg_len); + nlh = (struct nlmsghdr *)(((char*)nlh) + NLMSG_ALIGN(nlmsg_len)); + } + return 0; +} + +static abi_long target_to_host_for_each_nlmsg(struct nlmsghdr *nlh, + size_t len, + abi_long (*target_to_host_nlmsg) + (struct nlmsghdr *)) +{ + int ret; + + while (len > sizeof(struct nlmsghdr)) { + if (tswap32(nlh->nlmsg_len) < sizeof(struct nlmsghdr) || + tswap32(nlh->nlmsg_len) > len) { + break; + } + tswap_nlmsghdr(nlh); + switch (nlh->nlmsg_type) { + case NLMSG_DONE: + return 0; + case NLMSG_NOOP: + break; + case NLMSG_ERROR: + { + struct nlmsgerr *e = NLMSG_DATA(nlh); + e->error = tswap32(e->error); + tswap_nlmsghdr(&e->msg); + return 0; + } + default: + ret = target_to_host_nlmsg(nlh); + if (ret < 0) { + return ret; + } + } + len -= NLMSG_ALIGN(nlh->nlmsg_len); + nlh = (struct nlmsghdr *)(((char *)nlh) + NLMSG_ALIGN(nlh->nlmsg_len)); + } + return 0; +} + +#ifdef CONFIG_RTNETLINK +static abi_long host_to_target_for_each_nlattr(struct nlattr *nlattr, + size_t len, void *context, + abi_long (*host_to_target_nlattr) + (struct nlattr *, + void *context)) +{ + unsigned short nla_len; + abi_long ret; + + while (len > sizeof(struct nlattr)) { + nla_len = nlattr->nla_len; + if (nla_len < sizeof(struct nlattr) || + nla_len > len) { + break; + } + ret = host_to_target_nlattr(nlattr, context); + nlattr->nla_len = tswap16(nlattr->nla_len); + nlattr->nla_type = tswap16(nlattr->nla_type); + if (ret < 0) { + return ret; + } + len -= NLA_ALIGN(nla_len); + nlattr = (struct nlattr *)(((char *)nlattr) + NLA_ALIGN(nla_len)); + } + return 0; +} + +static abi_long host_to_target_for_each_rtattr(struct rtattr *rtattr, + size_t len, + abi_long (*host_to_target_rtattr) + (struct rtattr *)) +{ + unsigned short rta_len; + abi_long ret; + + while (len > sizeof(struct rtattr)) { + rta_len = rtattr->rta_len; + if (rta_len < sizeof(struct rtattr) || + rta_len > len) { + break; + } + ret = host_to_target_rtattr(rtattr); + rtattr->rta_len = tswap16(rtattr->rta_len); + rtattr->rta_type = tswap16(rtattr->rta_type); + if (ret < 0) { + return ret; + } + len -= RTA_ALIGN(rta_len); + rtattr = (struct rtattr *)(((char *)rtattr) + RTA_ALIGN(rta_len)); + } + return 0; +} + +#define NLA_DATA(nla) ((void *)((char *)(nla)) + NLA_HDRLEN) + +static abi_long host_to_target_data_bridge_nlattr(struct nlattr *nlattr, + void *context) +{ + uint16_t *u16; + uint32_t *u32; + uint64_t *u64; + + switch (nlattr->nla_type) { + /* no data */ + case QEMU_IFLA_BR_FDB_FLUSH: + break; + /* binary */ + case QEMU_IFLA_BR_GROUP_ADDR: + break; + /* uint8_t */ + case QEMU_IFLA_BR_VLAN_FILTERING: + case QEMU_IFLA_BR_TOPOLOGY_CHANGE: + case QEMU_IFLA_BR_TOPOLOGY_CHANGE_DETECTED: + case QEMU_IFLA_BR_MCAST_ROUTER: + case QEMU_IFLA_BR_MCAST_SNOOPING: + case QEMU_IFLA_BR_MCAST_QUERY_USE_IFADDR: + case QEMU_IFLA_BR_MCAST_QUERIER: + case QEMU_IFLA_BR_NF_CALL_IPTABLES: + case QEMU_IFLA_BR_NF_CALL_IP6TABLES: + case QEMU_IFLA_BR_NF_CALL_ARPTABLES: + case QEMU_IFLA_BR_VLAN_STATS_ENABLED: + case QEMU_IFLA_BR_MCAST_STATS_ENABLED: + case QEMU_IFLA_BR_MCAST_IGMP_VERSION: + case QEMU_IFLA_BR_MCAST_MLD_VERSION: + break; + /* uint16_t */ + case QEMU_IFLA_BR_PRIORITY: + case QEMU_IFLA_BR_VLAN_PROTOCOL: + case QEMU_IFLA_BR_GROUP_FWD_MASK: + case QEMU_IFLA_BR_ROOT_PORT: + case QEMU_IFLA_BR_VLAN_DEFAULT_PVID: + u16 = NLA_DATA(nlattr); + *u16 = tswap16(*u16); + break; + /* uint32_t */ + case QEMU_IFLA_BR_FORWARD_DELAY: + case QEMU_IFLA_BR_HELLO_TIME: + case QEMU_IFLA_BR_MAX_AGE: + case QEMU_IFLA_BR_AGEING_TIME: + case QEMU_IFLA_BR_STP_STATE: + case QEMU_IFLA_BR_ROOT_PATH_COST: + case QEMU_IFLA_BR_MCAST_HASH_ELASTICITY: + case QEMU_IFLA_BR_MCAST_HASH_MAX: + case QEMU_IFLA_BR_MCAST_LAST_MEMBER_CNT: + case QEMU_IFLA_BR_MCAST_STARTUP_QUERY_CNT: + u32 = NLA_DATA(nlattr); + *u32 = tswap32(*u32); + break; + /* uint64_t */ + case QEMU_IFLA_BR_HELLO_TIMER: + case QEMU_IFLA_BR_TCN_TIMER: + case QEMU_IFLA_BR_GC_TIMER: + case QEMU_IFLA_BR_TOPOLOGY_CHANGE_TIMER: + case QEMU_IFLA_BR_MCAST_LAST_MEMBER_INTVL: + case QEMU_IFLA_BR_MCAST_MEMBERSHIP_INTVL: + case QEMU_IFLA_BR_MCAST_QUERIER_INTVL: + case QEMU_IFLA_BR_MCAST_QUERY_INTVL: + case QEMU_IFLA_BR_MCAST_QUERY_RESPONSE_INTVL: + case QEMU_IFLA_BR_MCAST_STARTUP_QUERY_INTVL: + u64 = NLA_DATA(nlattr); + *u64 = tswap64(*u64); + break; + /* ifla_bridge_id: uin8_t[] */ + case QEMU_IFLA_BR_ROOT_ID: + case QEMU_IFLA_BR_BRIDGE_ID: + break; + default: + gemu_log("Unknown QEMU_IFLA_BR type %d\n", nlattr->nla_type); + break; + } + return 0; +} + +static abi_long host_to_target_slave_data_bridge_nlattr(struct nlattr *nlattr, + void *context) +{ + uint16_t *u16; + uint32_t *u32; + uint64_t *u64; + + switch (nlattr->nla_type) { + /* uint8_t */ + case QEMU_IFLA_BRPORT_STATE: + case QEMU_IFLA_BRPORT_MODE: + case QEMU_IFLA_BRPORT_GUARD: + case QEMU_IFLA_BRPORT_PROTECT: + case QEMU_IFLA_BRPORT_FAST_LEAVE: + case QEMU_IFLA_BRPORT_LEARNING: + case QEMU_IFLA_BRPORT_UNICAST_FLOOD: + case QEMU_IFLA_BRPORT_PROXYARP: + case QEMU_IFLA_BRPORT_LEARNING_SYNC: + case QEMU_IFLA_BRPORT_PROXYARP_WIFI: + case QEMU_IFLA_BRPORT_TOPOLOGY_CHANGE_ACK: + case QEMU_IFLA_BRPORT_CONFIG_PENDING: + case QEMU_IFLA_BRPORT_MULTICAST_ROUTER: + case QEMU_IFLA_BRPORT_MCAST_FLOOD: + case QEMU_IFLA_BRPORT_MCAST_TO_UCAST: + case QEMU_IFLA_BRPORT_VLAN_TUNNEL: + case QEMU_IFLA_BRPORT_BCAST_FLOOD: + case QEMU_IFLA_BRPORT_NEIGH_SUPPRESS: + break; + /* uint16_t */ + case QEMU_IFLA_BRPORT_PRIORITY: + case QEMU_IFLA_BRPORT_DESIGNATED_PORT: + case QEMU_IFLA_BRPORT_DESIGNATED_COST: + case QEMU_IFLA_BRPORT_ID: + case QEMU_IFLA_BRPORT_NO: + case QEMU_IFLA_BRPORT_GROUP_FWD_MASK: + u16 = NLA_DATA(nlattr); + *u16 = tswap16(*u16); + break; + /* uin32_t */ + case QEMU_IFLA_BRPORT_COST: + u32 = NLA_DATA(nlattr); + *u32 = tswap32(*u32); + break; + /* uint64_t */ + case QEMU_IFLA_BRPORT_MESSAGE_AGE_TIMER: + case QEMU_IFLA_BRPORT_FORWARD_DELAY_TIMER: + case QEMU_IFLA_BRPORT_HOLD_TIMER: + u64 = NLA_DATA(nlattr); + *u64 = tswap64(*u64); + break; + /* ifla_bridge_id: uint8_t[] */ + case QEMU_IFLA_BRPORT_ROOT_ID: + case QEMU_IFLA_BRPORT_BRIDGE_ID: + break; + default: + gemu_log("Unknown QEMU_IFLA_BRPORT type %d\n", nlattr->nla_type); + break; + } + return 0; +} + +static abi_long host_to_target_data_tun_nlattr(struct nlattr *nlattr, + void *context) +{ + uint32_t *u32; + + switch (nlattr->nla_type) { + /* uint8_t */ + case QEMU_IFLA_TUN_TYPE: + case QEMU_IFLA_TUN_PI: + case QEMU_IFLA_TUN_VNET_HDR: + case QEMU_IFLA_TUN_PERSIST: + case QEMU_IFLA_TUN_MULTI_QUEUE: + break; + /* uint32_t */ + case QEMU_IFLA_TUN_NUM_QUEUES: + case QEMU_IFLA_TUN_NUM_DISABLED_QUEUES: + case QEMU_IFLA_TUN_OWNER: + case QEMU_IFLA_TUN_GROUP: + u32 = NLA_DATA(nlattr); + *u32 = tswap32(*u32); + break; + default: + gemu_log("Unknown QEMU_IFLA_TUN type %d\n", nlattr->nla_type); + break; + } + return 0; +} + +struct linkinfo_context { + int len; + char *name; + int slave_len; + char *slave_name; +}; + +static abi_long host_to_target_data_linkinfo_nlattr(struct nlattr *nlattr, + void *context) +{ + struct linkinfo_context *li_context = context; + + switch (nlattr->nla_type) { + /* string */ + case QEMU_IFLA_INFO_KIND: + li_context->name = NLA_DATA(nlattr); + li_context->len = nlattr->nla_len - NLA_HDRLEN; + break; + case QEMU_IFLA_INFO_SLAVE_KIND: + li_context->slave_name = NLA_DATA(nlattr); + li_context->slave_len = nlattr->nla_len - NLA_HDRLEN; + break; + /* stats */ + case QEMU_IFLA_INFO_XSTATS: + /* FIXME: only used by CAN */ + break; + /* nested */ + case QEMU_IFLA_INFO_DATA: + if (strncmp(li_context->name, "bridge", + li_context->len) == 0) { + return host_to_target_for_each_nlattr(NLA_DATA(nlattr), + nlattr->nla_len, + NULL, + host_to_target_data_bridge_nlattr); + } else if (strncmp(li_context->name, "tun", + li_context->len) == 0) { + return host_to_target_for_each_nlattr(NLA_DATA(nlattr), + nlattr->nla_len, + NULL, + host_to_target_data_tun_nlattr); + } else { + gemu_log("Unknown QEMU_IFLA_INFO_KIND %s\n", li_context->name); + } + break; + case QEMU_IFLA_INFO_SLAVE_DATA: + if (strncmp(li_context->slave_name, "bridge", + li_context->slave_len) == 0) { + return host_to_target_for_each_nlattr(NLA_DATA(nlattr), + nlattr->nla_len, + NULL, + host_to_target_slave_data_bridge_nlattr); + } else { + gemu_log("Unknown QEMU_IFLA_INFO_SLAVE_KIND %s\n", + li_context->slave_name); + } + break; + default: + gemu_log("Unknown host QEMU_IFLA_INFO type: %d\n", nlattr->nla_type); + break; + } + + return 0; +} + +static abi_long host_to_target_data_inet_nlattr(struct nlattr *nlattr, + void *context) +{ + uint32_t *u32; + int i; + + switch (nlattr->nla_type) { + case QEMU_IFLA_INET_CONF: + u32 = NLA_DATA(nlattr); + for (i = 0; i < (nlattr->nla_len - NLA_HDRLEN) / sizeof(*u32); + i++) { + u32[i] = tswap32(u32[i]); + } + break; + default: + gemu_log("Unknown host AF_INET type: %d\n", nlattr->nla_type); + } + return 0; +} + +static abi_long host_to_target_data_inet6_nlattr(struct nlattr *nlattr, + void *context) +{ + uint32_t *u32; + uint64_t *u64; + struct ifla_cacheinfo *ci; + int i; + + switch (nlattr->nla_type) { + /* binaries */ + case QEMU_IFLA_INET6_TOKEN: + break; + /* uint8_t */ + case QEMU_IFLA_INET6_ADDR_GEN_MODE: + break; + /* uint32_t */ + case QEMU_IFLA_INET6_FLAGS: + u32 = NLA_DATA(nlattr); + *u32 = tswap32(*u32); + break; + /* uint32_t[] */ + case QEMU_IFLA_INET6_CONF: + u32 = NLA_DATA(nlattr); + for (i = 0; i < (nlattr->nla_len - NLA_HDRLEN) / sizeof(*u32); + i++) { + u32[i] = tswap32(u32[i]); + } + break; + /* ifla_cacheinfo */ + case QEMU_IFLA_INET6_CACHEINFO: + ci = NLA_DATA(nlattr); + ci->max_reasm_len = tswap32(ci->max_reasm_len); + ci->tstamp = tswap32(ci->tstamp); + ci->reachable_time = tswap32(ci->reachable_time); + ci->retrans_time = tswap32(ci->retrans_time); + break; + /* uint64_t[] */ + case QEMU_IFLA_INET6_STATS: + case QEMU_IFLA_INET6_ICMP6STATS: + u64 = NLA_DATA(nlattr); + for (i = 0; i < (nlattr->nla_len - NLA_HDRLEN) / sizeof(*u64); + i++) { + u64[i] = tswap64(u64[i]); + } + break; + default: + gemu_log("Unknown host AF_INET6 type: %d\n", nlattr->nla_type); + } + return 0; +} + +static abi_long host_to_target_data_spec_nlattr(struct nlattr *nlattr, + void *context) +{ + switch (nlattr->nla_type) { + case AF_INET: + return host_to_target_for_each_nlattr(NLA_DATA(nlattr), nlattr->nla_len, + NULL, + host_to_target_data_inet_nlattr); + case AF_INET6: + return host_to_target_for_each_nlattr(NLA_DATA(nlattr), nlattr->nla_len, + NULL, + host_to_target_data_inet6_nlattr); + default: + gemu_log("Unknown host AF_SPEC type: %d\n", nlattr->nla_type); + break; + } + return 0; +} + +static abi_long host_to_target_data_xdp_nlattr(struct nlattr *nlattr, + void *context) +{ + uint32_t *u32; + + switch (nlattr->nla_type) { + /* uint8_t */ + case QEMU_IFLA_XDP_ATTACHED: + break; + /* uint32_t */ + case QEMU_IFLA_XDP_PROG_ID: + u32 = NLA_DATA(nlattr); + *u32 = tswap32(*u32); + break; + default: + gemu_log("Unknown host XDP type: %d\n", nlattr->nla_type); + break; + } + return 0; +} + +static abi_long host_to_target_data_link_rtattr(struct rtattr *rtattr) +{ + uint32_t *u32; + struct rtnl_link_stats *st; + struct rtnl_link_stats64 *st64; + struct rtnl_link_ifmap *map; + struct linkinfo_context li_context; + + switch (rtattr->rta_type) { + /* binary stream */ + case QEMU_IFLA_ADDRESS: + case QEMU_IFLA_BROADCAST: + /* string */ + case QEMU_IFLA_IFNAME: + case QEMU_IFLA_QDISC: + break; + /* uin8_t */ + case QEMU_IFLA_OPERSTATE: + case QEMU_IFLA_LINKMODE: + case QEMU_IFLA_CARRIER: + case QEMU_IFLA_PROTO_DOWN: + break; + /* uint32_t */ + case QEMU_IFLA_MTU: + case QEMU_IFLA_LINK: + case QEMU_IFLA_WEIGHT: + case QEMU_IFLA_TXQLEN: + case QEMU_IFLA_CARRIER_CHANGES: + case QEMU_IFLA_NUM_RX_QUEUES: + case QEMU_IFLA_NUM_TX_QUEUES: + case QEMU_IFLA_PROMISCUITY: + case QEMU_IFLA_EXT_MASK: + case QEMU_IFLA_LINK_NETNSID: + case QEMU_IFLA_GROUP: + case QEMU_IFLA_MASTER: + case QEMU_IFLA_NUM_VF: + case QEMU_IFLA_GSO_MAX_SEGS: + case QEMU_IFLA_GSO_MAX_SIZE: + case QEMU_IFLA_CARRIER_UP_COUNT: + case QEMU_IFLA_CARRIER_DOWN_COUNT: + u32 = RTA_DATA(rtattr); + *u32 = tswap32(*u32); + break; + /* struct rtnl_link_stats */ + case QEMU_IFLA_STATS: + st = RTA_DATA(rtattr); + st->rx_packets = tswap32(st->rx_packets); + st->tx_packets = tswap32(st->tx_packets); + st->rx_bytes = tswap32(st->rx_bytes); + st->tx_bytes = tswap32(st->tx_bytes); + st->rx_errors = tswap32(st->rx_errors); + st->tx_errors = tswap32(st->tx_errors); + st->rx_dropped = tswap32(st->rx_dropped); + st->tx_dropped = tswap32(st->tx_dropped); + st->multicast = tswap32(st->multicast); + st->collisions = tswap32(st->collisions); + + /* detailed rx_errors: */ + st->rx_length_errors = tswap32(st->rx_length_errors); + st->rx_over_errors = tswap32(st->rx_over_errors); + st->rx_crc_errors = tswap32(st->rx_crc_errors); + st->rx_frame_errors = tswap32(st->rx_frame_errors); + st->rx_fifo_errors = tswap32(st->rx_fifo_errors); + st->rx_missed_errors = tswap32(st->rx_missed_errors); + + /* detailed tx_errors */ + st->tx_aborted_errors = tswap32(st->tx_aborted_errors); + st->tx_carrier_errors = tswap32(st->tx_carrier_errors); + st->tx_fifo_errors = tswap32(st->tx_fifo_errors); + st->tx_heartbeat_errors = tswap32(st->tx_heartbeat_errors); + st->tx_window_errors = tswap32(st->tx_window_errors); + + /* for cslip etc */ + st->rx_compressed = tswap32(st->rx_compressed); + st->tx_compressed = tswap32(st->tx_compressed); + break; + /* struct rtnl_link_stats64 */ + case QEMU_IFLA_STATS64: + st64 = RTA_DATA(rtattr); + st64->rx_packets = tswap64(st64->rx_packets); + st64->tx_packets = tswap64(st64->tx_packets); + st64->rx_bytes = tswap64(st64->rx_bytes); + st64->tx_bytes = tswap64(st64->tx_bytes); + st64->rx_errors = tswap64(st64->rx_errors); + st64->tx_errors = tswap64(st64->tx_errors); + st64->rx_dropped = tswap64(st64->rx_dropped); + st64->tx_dropped = tswap64(st64->tx_dropped); + st64->multicast = tswap64(st64->multicast); + st64->collisions = tswap64(st64->collisions); + + /* detailed rx_errors: */ + st64->rx_length_errors = tswap64(st64->rx_length_errors); + st64->rx_over_errors = tswap64(st64->rx_over_errors); + st64->rx_crc_errors = tswap64(st64->rx_crc_errors); + st64->rx_frame_errors = tswap64(st64->rx_frame_errors); + st64->rx_fifo_errors = tswap64(st64->rx_fifo_errors); + st64->rx_missed_errors = tswap64(st64->rx_missed_errors); + + /* detailed tx_errors */ + st64->tx_aborted_errors = tswap64(st64->tx_aborted_errors); + st64->tx_carrier_errors = tswap64(st64->tx_carrier_errors); + st64->tx_fifo_errors = tswap64(st64->tx_fifo_errors); + st64->tx_heartbeat_errors = tswap64(st64->tx_heartbeat_errors); + st64->tx_window_errors = tswap64(st64->tx_window_errors); + + /* for cslip etc */ + st64->rx_compressed = tswap64(st64->rx_compressed); + st64->tx_compressed = tswap64(st64->tx_compressed); + break; + /* struct rtnl_link_ifmap */ + case QEMU_IFLA_MAP: + map = RTA_DATA(rtattr); + map->mem_start = tswap64(map->mem_start); + map->mem_end = tswap64(map->mem_end); + map->base_addr = tswap64(map->base_addr); + map->irq = tswap16(map->irq); + break; + /* nested */ + case QEMU_IFLA_LINKINFO: + memset(&li_context, 0, sizeof(li_context)); + return host_to_target_for_each_nlattr(RTA_DATA(rtattr), rtattr->rta_len, + &li_context, + host_to_target_data_linkinfo_nlattr); + case QEMU_IFLA_AF_SPEC: + return host_to_target_for_each_nlattr(RTA_DATA(rtattr), rtattr->rta_len, + NULL, + host_to_target_data_spec_nlattr); + case QEMU_IFLA_XDP: + return host_to_target_for_each_nlattr(RTA_DATA(rtattr), rtattr->rta_len, + NULL, + host_to_target_data_xdp_nlattr); + default: + gemu_log("Unknown host QEMU_IFLA type: %d\n", rtattr->rta_type); + break; + } + return 0; +} + +static abi_long host_to_target_data_addr_rtattr(struct rtattr *rtattr) +{ + uint32_t *u32; + struct ifa_cacheinfo *ci; + + switch (rtattr->rta_type) { + /* binary: depends on family type */ + case IFA_ADDRESS: + case IFA_LOCAL: + break; + /* string */ + case IFA_LABEL: + break; + /* u32 */ + case IFA_FLAGS: + case IFA_BROADCAST: + u32 = RTA_DATA(rtattr); + *u32 = tswap32(*u32); + break; + /* struct ifa_cacheinfo */ + case IFA_CACHEINFO: + ci = RTA_DATA(rtattr); + ci->ifa_prefered = tswap32(ci->ifa_prefered); + ci->ifa_valid = tswap32(ci->ifa_valid); + ci->cstamp = tswap32(ci->cstamp); + ci->tstamp = tswap32(ci->tstamp); + break; + default: + gemu_log("Unknown host IFA type: %d\n", rtattr->rta_type); + break; + } + return 0; +} + +static abi_long host_to_target_data_route_rtattr(struct rtattr *rtattr) +{ + uint32_t *u32; + struct rta_cacheinfo *ci; + + switch (rtattr->rta_type) { + /* binary: depends on family type */ + case QEMU_RTA_GATEWAY: + case QEMU_RTA_DST: + case QEMU_RTA_PREFSRC: + break; + /* u8 */ + case QEMU_RTA_PREF: + break; + /* u32 */ + case QEMU_RTA_PRIORITY: + case QEMU_RTA_TABLE: + case QEMU_RTA_OIF: + u32 = RTA_DATA(rtattr); + *u32 = tswap32(*u32); + break; + /* struct rta_cacheinfo */ + case QEMU_RTA_CACHEINFO: + ci = RTA_DATA(rtattr); + ci->rta_clntref = tswap32(ci->rta_clntref); + ci->rta_lastuse = tswap32(ci->rta_lastuse); + ci->rta_expires = tswap32(ci->rta_expires); + ci->rta_error = tswap32(ci->rta_error); + ci->rta_used = tswap32(ci->rta_used); +#if defined(RTNETLINK_HAVE_PEERINFO) + ci->rta_id = tswap32(ci->rta_id); + ci->rta_ts = tswap32(ci->rta_ts); + ci->rta_tsage = tswap32(ci->rta_tsage); +#endif + break; + default: + gemu_log("Unknown host RTA type: %d\n", rtattr->rta_type); + break; + } + return 0; +} + +static abi_long host_to_target_link_rtattr(struct rtattr *rtattr, + uint32_t rtattr_len) +{ + return host_to_target_for_each_rtattr(rtattr, rtattr_len, + host_to_target_data_link_rtattr); +} + +static abi_long host_to_target_addr_rtattr(struct rtattr *rtattr, + uint32_t rtattr_len) +{ + return host_to_target_for_each_rtattr(rtattr, rtattr_len, + host_to_target_data_addr_rtattr); +} + +static abi_long host_to_target_route_rtattr(struct rtattr *rtattr, + uint32_t rtattr_len) +{ + return host_to_target_for_each_rtattr(rtattr, rtattr_len, + host_to_target_data_route_rtattr); +} + +static abi_long host_to_target_data_route(struct nlmsghdr *nlh) +{ + uint32_t nlmsg_len; + struct ifinfomsg *ifi; + struct ifaddrmsg *ifa; + struct rtmsg *rtm; + + nlmsg_len = nlh->nlmsg_len; + switch (nlh->nlmsg_type) { + case RTM_NEWLINK: + case RTM_DELLINK: + case RTM_GETLINK: + if (nlh->nlmsg_len >= NLMSG_LENGTH(sizeof(*ifi))) { + ifi = NLMSG_DATA(nlh); + ifi->ifi_type = tswap16(ifi->ifi_type); + ifi->ifi_index = tswap32(ifi->ifi_index); + ifi->ifi_flags = tswap32(ifi->ifi_flags); + ifi->ifi_change = tswap32(ifi->ifi_change); + host_to_target_link_rtattr(IFLA_RTA(ifi), + nlmsg_len - NLMSG_LENGTH(sizeof(*ifi))); + } + break; + case RTM_NEWADDR: + case RTM_DELADDR: + case RTM_GETADDR: + if (nlh->nlmsg_len >= NLMSG_LENGTH(sizeof(*ifa))) { + ifa = NLMSG_DATA(nlh); + ifa->ifa_index = tswap32(ifa->ifa_index); + host_to_target_addr_rtattr(IFA_RTA(ifa), + nlmsg_len - NLMSG_LENGTH(sizeof(*ifa))); + } + break; + case RTM_NEWROUTE: + case RTM_DELROUTE: + case RTM_GETROUTE: + if (nlh->nlmsg_len >= NLMSG_LENGTH(sizeof(*rtm))) { + rtm = NLMSG_DATA(nlh); + rtm->rtm_flags = tswap32(rtm->rtm_flags); + host_to_target_route_rtattr(RTM_RTA(rtm), + nlmsg_len - NLMSG_LENGTH(sizeof(*rtm))); + } + break; + default: + return -TARGET_EINVAL; + } + return 0; +} + +static inline abi_long host_to_target_nlmsg_route(struct nlmsghdr *nlh, + size_t len) +{ + return host_to_target_for_each_nlmsg(nlh, len, host_to_target_data_route); +} + +static abi_long target_to_host_for_each_rtattr(struct rtattr *rtattr, + size_t len, + abi_long (*target_to_host_rtattr) + (struct rtattr *)) +{ + abi_long ret; + + while (len >= sizeof(struct rtattr)) { + if (tswap16(rtattr->rta_len) < sizeof(struct rtattr) || + tswap16(rtattr->rta_len) > len) { + break; + } + rtattr->rta_len = tswap16(rtattr->rta_len); + rtattr->rta_type = tswap16(rtattr->rta_type); + ret = target_to_host_rtattr(rtattr); + if (ret < 0) { + return ret; + } + len -= RTA_ALIGN(rtattr->rta_len); + rtattr = (struct rtattr *)(((char *)rtattr) + + RTA_ALIGN(rtattr->rta_len)); + } + return 0; +} + +static abi_long target_to_host_data_link_rtattr(struct rtattr *rtattr) +{ + switch (rtattr->rta_type) { + default: + gemu_log("Unknown target QEMU_IFLA type: %d\n", rtattr->rta_type); + break; + } + return 0; +} + +static abi_long target_to_host_data_addr_rtattr(struct rtattr *rtattr) +{ + switch (rtattr->rta_type) { + /* binary: depends on family type */ + case IFA_LOCAL: + case IFA_ADDRESS: + break; + default: + gemu_log("Unknown target IFA type: %d\n", rtattr->rta_type); + break; + } + return 0; +} + +static abi_long target_to_host_data_route_rtattr(struct rtattr *rtattr) +{ + uint32_t *u32; + switch (rtattr->rta_type) { + /* binary: depends on family type */ + case QEMU_RTA_DST: + case QEMU_RTA_SRC: + case QEMU_RTA_GATEWAY: + break; + /* u32 */ + case QEMU_RTA_PRIORITY: + case QEMU_RTA_OIF: + u32 = RTA_DATA(rtattr); + *u32 = tswap32(*u32); + break; + default: + gemu_log("Unknown target RTA type: %d\n", rtattr->rta_type); + break; + } + return 0; +} + +static void target_to_host_link_rtattr(struct rtattr *rtattr, + uint32_t rtattr_len) +{ + target_to_host_for_each_rtattr(rtattr, rtattr_len, + target_to_host_data_link_rtattr); +} + +static void target_to_host_addr_rtattr(struct rtattr *rtattr, + uint32_t rtattr_len) +{ + target_to_host_for_each_rtattr(rtattr, rtattr_len, + target_to_host_data_addr_rtattr); +} + +static void target_to_host_route_rtattr(struct rtattr *rtattr, + uint32_t rtattr_len) +{ + target_to_host_for_each_rtattr(rtattr, rtattr_len, + target_to_host_data_route_rtattr); +} + +static abi_long target_to_host_data_route(struct nlmsghdr *nlh) +{ + struct ifinfomsg *ifi; + struct ifaddrmsg *ifa; + struct rtmsg *rtm; + + switch (nlh->nlmsg_type) { + case RTM_GETLINK: + break; + case RTM_NEWLINK: + case RTM_DELLINK: + if (nlh->nlmsg_len >= NLMSG_LENGTH(sizeof(*ifi))) { + ifi = NLMSG_DATA(nlh); + ifi->ifi_type = tswap16(ifi->ifi_type); + ifi->ifi_index = tswap32(ifi->ifi_index); + ifi->ifi_flags = tswap32(ifi->ifi_flags); + ifi->ifi_change = tswap32(ifi->ifi_change); + target_to_host_link_rtattr(IFLA_RTA(ifi), nlh->nlmsg_len - + NLMSG_LENGTH(sizeof(*ifi))); + } + break; + case RTM_GETADDR: + case RTM_NEWADDR: + case RTM_DELADDR: + if (nlh->nlmsg_len >= NLMSG_LENGTH(sizeof(*ifa))) { + ifa = NLMSG_DATA(nlh); + ifa->ifa_index = tswap32(ifa->ifa_index); + target_to_host_addr_rtattr(IFA_RTA(ifa), nlh->nlmsg_len - + NLMSG_LENGTH(sizeof(*ifa))); + } + break; + case RTM_GETROUTE: + break; + case RTM_NEWROUTE: + case RTM_DELROUTE: + if (nlh->nlmsg_len >= NLMSG_LENGTH(sizeof(*rtm))) { + rtm = NLMSG_DATA(nlh); + rtm->rtm_flags = tswap32(rtm->rtm_flags); + target_to_host_route_rtattr(RTM_RTA(rtm), nlh->nlmsg_len - + NLMSG_LENGTH(sizeof(*rtm))); + } + break; + default: + return -TARGET_EOPNOTSUPP; + } + return 0; +} + +static abi_long target_to_host_nlmsg_route(struct nlmsghdr *nlh, size_t len) +{ + return target_to_host_for_each_nlmsg(nlh, len, target_to_host_data_route); +} +#endif /* CONFIG_RTNETLINK */ + +static abi_long host_to_target_data_audit(struct nlmsghdr *nlh) +{ + switch (nlh->nlmsg_type) { + default: + gemu_log("Unknown host audit message type %d\n", + nlh->nlmsg_type); + return -TARGET_EINVAL; + } + return 0; +} + +static inline abi_long host_to_target_nlmsg_audit(struct nlmsghdr *nlh, + size_t len) +{ + return host_to_target_for_each_nlmsg(nlh, len, host_to_target_data_audit); +} + +static abi_long target_to_host_data_audit(struct nlmsghdr *nlh) +{ + switch (nlh->nlmsg_type) { + case AUDIT_USER: + case AUDIT_FIRST_USER_MSG ... AUDIT_LAST_USER_MSG: + case AUDIT_FIRST_USER_MSG2 ... AUDIT_LAST_USER_MSG2: + break; + default: + gemu_log("Unknown target audit message type %d\n", + nlh->nlmsg_type); + return -TARGET_EINVAL; + } + + return 0; +} + +static abi_long target_to_host_nlmsg_audit(struct nlmsghdr *nlh, size_t len) +{ + return target_to_host_for_each_nlmsg(nlh, len, target_to_host_data_audit); +} + +static abi_long packet_target_to_host_sockaddr(void *host_addr, + abi_ulong target_addr, + socklen_t len) +{ + struct sockaddr *addr = host_addr; + struct target_sockaddr *target_saddr; + + target_saddr = lock_user(VERIFY_READ, target_addr, len, 1); + if (!target_saddr) { + return -TARGET_EFAULT; + } + + memcpy(addr, target_saddr, len); + addr->sa_family = tswap16(target_saddr->sa_family); + /* spkt_protocol is big-endian */ + + unlock_user(target_saddr, target_addr, 0); + return 0; +} + +TargetFdTrans target_packet_trans = { + .target_to_host_addr = packet_target_to_host_sockaddr, +}; + +#ifdef CONFIG_RTNETLINK +static abi_long netlink_route_target_to_host(void *buf, size_t len) +{ + abi_long ret; + + ret = target_to_host_nlmsg_route(buf, len); + if (ret < 0) { + return ret; + } + + return len; +} + +static abi_long netlink_route_host_to_target(void *buf, size_t len) +{ + abi_long ret; + + ret = host_to_target_nlmsg_route(buf, len); + if (ret < 0) { + return ret; + } + + return len; +} + +TargetFdTrans target_netlink_route_trans = { + .target_to_host_data = netlink_route_target_to_host, + .host_to_target_data = netlink_route_host_to_target, +}; +#endif /* CONFIG_RTNETLINK */ + +static abi_long netlink_audit_target_to_host(void *buf, size_t len) +{ + abi_long ret; + + ret = target_to_host_nlmsg_audit(buf, len); + if (ret < 0) { + return ret; + } + + return len; +} + +static abi_long netlink_audit_host_to_target(void *buf, size_t len) +{ + abi_long ret; + + ret = host_to_target_nlmsg_audit(buf, len); + if (ret < 0) { + return ret; + } + + return len; +} + +TargetFdTrans target_netlink_audit_trans = { + .target_to_host_data = netlink_audit_target_to_host, + .host_to_target_data = netlink_audit_host_to_target, +}; + +/* signalfd siginfo conversion */ + +static void +host_to_target_signalfd_siginfo(struct signalfd_siginfo *tinfo, + const struct signalfd_siginfo *info) +{ + int sig = host_to_target_signal(info->ssi_signo); + + /* linux/signalfd.h defines a ssi_addr_lsb + * not defined in sys/signalfd.h but used by some kernels + */ + +#ifdef BUS_MCEERR_AO + if (tinfo->ssi_signo == SIGBUS && + (tinfo->ssi_code == BUS_MCEERR_AR || + tinfo->ssi_code == BUS_MCEERR_AO)) { + uint16_t *ssi_addr_lsb = (uint16_t *)(&info->ssi_addr + 1); + uint16_t *tssi_addr_lsb = (uint16_t *)(&tinfo->ssi_addr + 1); + *tssi_addr_lsb = tswap16(*ssi_addr_lsb); + } +#endif + + tinfo->ssi_signo = tswap32(sig); + tinfo->ssi_errno = tswap32(tinfo->ssi_errno); + tinfo->ssi_code = tswap32(info->ssi_code); + tinfo->ssi_pid = tswap32(info->ssi_pid); + tinfo->ssi_uid = tswap32(info->ssi_uid); + tinfo->ssi_fd = tswap32(info->ssi_fd); + tinfo->ssi_tid = tswap32(info->ssi_tid); + tinfo->ssi_band = tswap32(info->ssi_band); + tinfo->ssi_overrun = tswap32(info->ssi_overrun); + tinfo->ssi_trapno = tswap32(info->ssi_trapno); + tinfo->ssi_status = tswap32(info->ssi_status); + tinfo->ssi_int = tswap32(info->ssi_int); + tinfo->ssi_ptr = tswap64(info->ssi_ptr); + tinfo->ssi_utime = tswap64(info->ssi_utime); + tinfo->ssi_stime = tswap64(info->ssi_stime); + tinfo->ssi_addr = tswap64(info->ssi_addr); +} + +static abi_long host_to_target_data_signalfd(void *buf, size_t len) +{ + int i; + + for (i = 0; i < len; i += sizeof(struct signalfd_siginfo)) { + host_to_target_signalfd_siginfo(buf + i, buf + i); + } + + return len; +} + +TargetFdTrans target_signalfd_trans = { + .host_to_target_data = host_to_target_data_signalfd, +}; + +static abi_long swap_data_eventfd(void *buf, size_t len) +{ + uint64_t *counter = buf; + int i; + + if (len < sizeof(uint64_t)) { + return -EINVAL; + } + + for (i = 0; i < len; i += sizeof(uint64_t)) { + *counter = tswap64(*counter); + counter++; + } + + return len; +} + +TargetFdTrans target_eventfd_trans = { + .host_to_target_data = swap_data_eventfd, + .target_to_host_data = swap_data_eventfd, +}; + +#if (defined(TARGET_NR_inotify_init) && defined(__NR_inotify_init)) || \ + (defined(CONFIG_INOTIFY1) && defined(TARGET_NR_inotify_init1) && \ + defined(__NR_inotify_init1)) +static abi_long host_to_target_data_inotify(void *buf, size_t len) +{ + struct inotify_event *ev; + int i; + uint32_t name_len; + + for (i = 0; i < len; i += sizeof(struct inotify_event) + name_len) { + ev = (struct inotify_event *)((char *)buf + i); + name_len = ev->len; + + ev->wd = tswap32(ev->wd); + ev->mask = tswap32(ev->mask); + ev->cookie = tswap32(ev->cookie); + ev->len = tswap32(name_len); + } + + return len; +} + +TargetFdTrans target_inotify_trans = { + .host_to_target_data = host_to_target_data_inotify, +}; +#endif diff --git a/linux-user/fd-trans.h b/linux-user/fd-trans.h new file mode 100644 index 0000000000..a3fcdaabc7 --- /dev/null +++ b/linux-user/fd-trans.h @@ -0,0 +1,97 @@ +/* + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see . + */ + +#ifndef FD_TRANS_H +#define FD_TRANS_H + +typedef abi_long (*TargetFdDataFunc)(void *, size_t); +typedef abi_long (*TargetFdAddrFunc)(void *, abi_ulong, socklen_t); +typedef struct TargetFdTrans { + TargetFdDataFunc host_to_target_data; + TargetFdDataFunc target_to_host_data; + TargetFdAddrFunc target_to_host_addr; +} TargetFdTrans; + +extern TargetFdTrans **target_fd_trans; + +extern unsigned int target_fd_max; + +static inline TargetFdDataFunc fd_trans_target_to_host_data(int fd) +{ + if (fd >= 0 && fd < target_fd_max && target_fd_trans[fd]) { + return target_fd_trans[fd]->target_to_host_data; + } + return NULL; +} + +static inline TargetFdDataFunc fd_trans_host_to_target_data(int fd) +{ + if (fd >= 0 && fd < target_fd_max && target_fd_trans[fd]) { + return target_fd_trans[fd]->host_to_target_data; + } + return NULL; +} + +static inline TargetFdAddrFunc fd_trans_target_to_host_addr(int fd) +{ + if (fd >= 0 && fd < target_fd_max && target_fd_trans[fd]) { + return target_fd_trans[fd]->target_to_host_addr; + } + return NULL; +} + +static inline void fd_trans_register(int fd, TargetFdTrans *trans) +{ + unsigned int oldmax; + + if (fd >= target_fd_max) { + oldmax = target_fd_max; + target_fd_max = ((fd >> 6) + 1) << 6; /* by slice of 64 entries */ + target_fd_trans = g_renew(TargetFdTrans *, + target_fd_trans, target_fd_max); + memset((void *)(target_fd_trans + oldmax), 0, + (target_fd_max - oldmax) * sizeof(TargetFdTrans *)); + } + target_fd_trans[fd] = trans; +} + +static inline void fd_trans_unregister(int fd) +{ + if (fd >= 0 && fd < target_fd_max) { + target_fd_trans[fd] = NULL; + } +} + +static inline void fd_trans_dup(int oldfd, int newfd) +{ + fd_trans_unregister(newfd); + if (oldfd < target_fd_max && target_fd_trans[oldfd]) { + fd_trans_register(newfd, target_fd_trans[oldfd]); + } +} + +extern TargetFdTrans target_packet_trans; +#ifdef CONFIG_RTNETLINK +extern TargetFdTrans target_netlink_route_trans; +#endif +extern TargetFdTrans target_netlink_audit_trans; +extern TargetFdTrans target_signalfd_trans; +extern TargetFdTrans target_eventfd_trans; +#if (defined(TARGET_NR_inotify_init) && defined(__NR_inotify_init)) || \ + (defined(CONFIG_INOTIFY1) && defined(TARGET_NR_inotify_init1) && \ + defined(__NR_inotify_init1)) +extern TargetFdTrans target_inotify_trans; +#endif +#endif diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 850b72a0c7..e252f8b555 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -102,15 +102,11 @@ #include #include #include -#ifdef CONFIG_RTNETLINK -#include -#include -#endif -#include #include "linux_loop.h" #include "uname.h" #include "qemu.h" +#include "fd-trans.h" #ifndef CLONE_IO #define CLONE_IO 0x80000000 /* Clone io context */ @@ -360,298 +356,6 @@ static bitmask_transtbl fcntl_flags_tbl[] = { { 0, 0, 0, 0 } }; -enum { - QEMU_IFLA_BR_UNSPEC, - QEMU_IFLA_BR_FORWARD_DELAY, - QEMU_IFLA_BR_HELLO_TIME, - QEMU_IFLA_BR_MAX_AGE, - QEMU_IFLA_BR_AGEING_TIME, - QEMU_IFLA_BR_STP_STATE, - QEMU_IFLA_BR_PRIORITY, - QEMU_IFLA_BR_VLAN_FILTERING, - QEMU_IFLA_BR_VLAN_PROTOCOL, - QEMU_IFLA_BR_GROUP_FWD_MASK, - QEMU_IFLA_BR_ROOT_ID, - QEMU_IFLA_BR_BRIDGE_ID, - QEMU_IFLA_BR_ROOT_PORT, - QEMU_IFLA_BR_ROOT_PATH_COST, - QEMU_IFLA_BR_TOPOLOGY_CHANGE, - QEMU_IFLA_BR_TOPOLOGY_CHANGE_DETECTED, - QEMU_IFLA_BR_HELLO_TIMER, - QEMU_IFLA_BR_TCN_TIMER, - QEMU_IFLA_BR_TOPOLOGY_CHANGE_TIMER, - QEMU_IFLA_BR_GC_TIMER, - QEMU_IFLA_BR_GROUP_ADDR, - QEMU_IFLA_BR_FDB_FLUSH, - QEMU_IFLA_BR_MCAST_ROUTER, - QEMU_IFLA_BR_MCAST_SNOOPING, - QEMU_IFLA_BR_MCAST_QUERY_USE_IFADDR, - QEMU_IFLA_BR_MCAST_QUERIER, - QEMU_IFLA_BR_MCAST_HASH_ELASTICITY, - QEMU_IFLA_BR_MCAST_HASH_MAX, - QEMU_IFLA_BR_MCAST_LAST_MEMBER_CNT, - QEMU_IFLA_BR_MCAST_STARTUP_QUERY_CNT, - QEMU_IFLA_BR_MCAST_LAST_MEMBER_INTVL, - QEMU_IFLA_BR_MCAST_MEMBERSHIP_INTVL, - QEMU_IFLA_BR_MCAST_QUERIER_INTVL, - QEMU_IFLA_BR_MCAST_QUERY_INTVL, - QEMU_IFLA_BR_MCAST_QUERY_RESPONSE_INTVL, - QEMU_IFLA_BR_MCAST_STARTUP_QUERY_INTVL, - QEMU_IFLA_BR_NF_CALL_IPTABLES, - QEMU_IFLA_BR_NF_CALL_IP6TABLES, - QEMU_IFLA_BR_NF_CALL_ARPTABLES, - QEMU_IFLA_BR_VLAN_DEFAULT_PVID, - QEMU_IFLA_BR_PAD, - QEMU_IFLA_BR_VLAN_STATS_ENABLED, - QEMU_IFLA_BR_MCAST_STATS_ENABLED, - QEMU_IFLA_BR_MCAST_IGMP_VERSION, - QEMU_IFLA_BR_MCAST_MLD_VERSION, - QEMU___IFLA_BR_MAX, -}; - -enum { - QEMU_IFLA_UNSPEC, - QEMU_IFLA_ADDRESS, - QEMU_IFLA_BROADCAST, - QEMU_IFLA_IFNAME, - QEMU_IFLA_MTU, - QEMU_IFLA_LINK, - QEMU_IFLA_QDISC, - QEMU_IFLA_STATS, - QEMU_IFLA_COST, - QEMU_IFLA_PRIORITY, - QEMU_IFLA_MASTER, - QEMU_IFLA_WIRELESS, - QEMU_IFLA_PROTINFO, - QEMU_IFLA_TXQLEN, - QEMU_IFLA_MAP, - QEMU_IFLA_WEIGHT, - QEMU_IFLA_OPERSTATE, - QEMU_IFLA_LINKMODE, - QEMU_IFLA_LINKINFO, - QEMU_IFLA_NET_NS_PID, - QEMU_IFLA_IFALIAS, - QEMU_IFLA_NUM_VF, - QEMU_IFLA_VFINFO_LIST, - QEMU_IFLA_STATS64, - QEMU_IFLA_VF_PORTS, - QEMU_IFLA_PORT_SELF, - QEMU_IFLA_AF_SPEC, - QEMU_IFLA_GROUP, - QEMU_IFLA_NET_NS_FD, - QEMU_IFLA_EXT_MASK, - QEMU_IFLA_PROMISCUITY, - QEMU_IFLA_NUM_TX_QUEUES, - QEMU_IFLA_NUM_RX_QUEUES, - QEMU_IFLA_CARRIER, - QEMU_IFLA_PHYS_PORT_ID, - QEMU_IFLA_CARRIER_CHANGES, - QEMU_IFLA_PHYS_SWITCH_ID, - QEMU_IFLA_LINK_NETNSID, - QEMU_IFLA_PHYS_PORT_NAME, - QEMU_IFLA_PROTO_DOWN, - QEMU_IFLA_GSO_MAX_SEGS, - QEMU_IFLA_GSO_MAX_SIZE, - QEMU_IFLA_PAD, - QEMU_IFLA_XDP, - QEMU_IFLA_EVENT, - QEMU_IFLA_NEW_NETNSID, - QEMU_IFLA_IF_NETNSID, - QEMU_IFLA_CARRIER_UP_COUNT, - QEMU_IFLA_CARRIER_DOWN_COUNT, - QEMU_IFLA_NEW_IFINDEX, - QEMU___IFLA_MAX -}; - -enum { - QEMU_IFLA_BRPORT_UNSPEC, - QEMU_IFLA_BRPORT_STATE, - QEMU_IFLA_BRPORT_PRIORITY, - QEMU_IFLA_BRPORT_COST, - QEMU_IFLA_BRPORT_MODE, - QEMU_IFLA_BRPORT_GUARD, - QEMU_IFLA_BRPORT_PROTECT, - QEMU_IFLA_BRPORT_FAST_LEAVE, - QEMU_IFLA_BRPORT_LEARNING, - QEMU_IFLA_BRPORT_UNICAST_FLOOD, - QEMU_IFLA_BRPORT_PROXYARP, - QEMU_IFLA_BRPORT_LEARNING_SYNC, - QEMU_IFLA_BRPORT_PROXYARP_WIFI, - QEMU_IFLA_BRPORT_ROOT_ID, - QEMU_IFLA_BRPORT_BRIDGE_ID, - QEMU_IFLA_BRPORT_DESIGNATED_PORT, - QEMU_IFLA_BRPORT_DESIGNATED_COST, - QEMU_IFLA_BRPORT_ID, - QEMU_IFLA_BRPORT_NO, - QEMU_IFLA_BRPORT_TOPOLOGY_CHANGE_ACK, - QEMU_IFLA_BRPORT_CONFIG_PENDING, - QEMU_IFLA_BRPORT_MESSAGE_AGE_TIMER, - QEMU_IFLA_BRPORT_FORWARD_DELAY_TIMER, - QEMU_IFLA_BRPORT_HOLD_TIMER, - QEMU_IFLA_BRPORT_FLUSH, - QEMU_IFLA_BRPORT_MULTICAST_ROUTER, - QEMU_IFLA_BRPORT_PAD, - QEMU_IFLA_BRPORT_MCAST_FLOOD, - QEMU_IFLA_BRPORT_MCAST_TO_UCAST, - QEMU_IFLA_BRPORT_VLAN_TUNNEL, - QEMU_IFLA_BRPORT_BCAST_FLOOD, - QEMU_IFLA_BRPORT_GROUP_FWD_MASK, - QEMU_IFLA_BRPORT_NEIGH_SUPPRESS, - QEMU___IFLA_BRPORT_MAX -}; - -enum { - QEMU_IFLA_TUN_UNSPEC, - QEMU_IFLA_TUN_OWNER, - QEMU_IFLA_TUN_GROUP, - QEMU_IFLA_TUN_TYPE, - QEMU_IFLA_TUN_PI, - QEMU_IFLA_TUN_VNET_HDR, - QEMU_IFLA_TUN_PERSIST, - QEMU_IFLA_TUN_MULTI_QUEUE, - QEMU_IFLA_TUN_NUM_QUEUES, - QEMU_IFLA_TUN_NUM_DISABLED_QUEUES, - QEMU___IFLA_TUN_MAX, -}; - -enum { - QEMU_IFLA_INFO_UNSPEC, - QEMU_IFLA_INFO_KIND, - QEMU_IFLA_INFO_DATA, - QEMU_IFLA_INFO_XSTATS, - QEMU_IFLA_INFO_SLAVE_KIND, - QEMU_IFLA_INFO_SLAVE_DATA, - QEMU___IFLA_INFO_MAX, -}; - -enum { - QEMU_IFLA_INET_UNSPEC, - QEMU_IFLA_INET_CONF, - QEMU___IFLA_INET_MAX, -}; - -enum { - QEMU_IFLA_INET6_UNSPEC, - QEMU_IFLA_INET6_FLAGS, - QEMU_IFLA_INET6_CONF, - QEMU_IFLA_INET6_STATS, - QEMU_IFLA_INET6_MCAST, - QEMU_IFLA_INET6_CACHEINFO, - QEMU_IFLA_INET6_ICMP6STATS, - QEMU_IFLA_INET6_TOKEN, - QEMU_IFLA_INET6_ADDR_GEN_MODE, - QEMU___IFLA_INET6_MAX -}; - -enum { - QEMU_IFLA_XDP_UNSPEC, - QEMU_IFLA_XDP_FD, - QEMU_IFLA_XDP_ATTACHED, - QEMU_IFLA_XDP_FLAGS, - QEMU_IFLA_XDP_PROG_ID, - QEMU___IFLA_XDP_MAX, -}; - -enum { - QEMU_RTA_UNSPEC, - QEMU_RTA_DST, - QEMU_RTA_SRC, - QEMU_RTA_IIF, - QEMU_RTA_OIF, - QEMU_RTA_GATEWAY, - QEMU_RTA_PRIORITY, - QEMU_RTA_PREFSRC, - QEMU_RTA_METRICS, - QEMU_RTA_MULTIPATH, - QEMU_RTA_PROTOINFO, /* no longer used */ - QEMU_RTA_FLOW, - QEMU_RTA_CACHEINFO, - QEMU_RTA_SESSION, /* no longer used */ - QEMU_RTA_MP_ALGO, /* no longer used */ - QEMU_RTA_TABLE, - QEMU_RTA_MARK, - QEMU_RTA_MFC_STATS, - QEMU_RTA_VIA, - QEMU_RTA_NEWDST, - QEMU_RTA_PREF, - QEMU_RTA_ENCAP_TYPE, - QEMU_RTA_ENCAP, - QEMU_RTA_EXPIRES, - QEMU_RTA_PAD, - QEMU_RTA_UID, - QEMU_RTA_TTL_PROPAGATE, - QEMU_RTA_IP_PROTO, - QEMU_RTA_SPORT, - QEMU_RTA_DPORT, - QEMU___RTA_MAX -}; - -typedef abi_long (*TargetFdDataFunc)(void *, size_t); -typedef abi_long (*TargetFdAddrFunc)(void *, abi_ulong, socklen_t); -typedef struct TargetFdTrans { - TargetFdDataFunc host_to_target_data; - TargetFdDataFunc target_to_host_data; - TargetFdAddrFunc target_to_host_addr; -} TargetFdTrans; - -static TargetFdTrans **target_fd_trans; - -static unsigned int target_fd_max; - -static TargetFdDataFunc fd_trans_target_to_host_data(int fd) -{ - if (fd >= 0 && fd < target_fd_max && target_fd_trans[fd]) { - return target_fd_trans[fd]->target_to_host_data; - } - return NULL; -} - -static TargetFdDataFunc fd_trans_host_to_target_data(int fd) -{ - if (fd >= 0 && fd < target_fd_max && target_fd_trans[fd]) { - return target_fd_trans[fd]->host_to_target_data; - } - return NULL; -} - -static TargetFdAddrFunc fd_trans_target_to_host_addr(int fd) -{ - if (fd >= 0 && fd < target_fd_max && target_fd_trans[fd]) { - return target_fd_trans[fd]->target_to_host_addr; - } - return NULL; -} - -static void fd_trans_register(int fd, TargetFdTrans *trans) -{ - unsigned int oldmax; - - if (fd >= target_fd_max) { - oldmax = target_fd_max; - target_fd_max = ((fd >> 6) + 1) << 6; /* by slice of 64 entries */ - target_fd_trans = g_renew(TargetFdTrans *, - target_fd_trans, target_fd_max); - memset((void *)(target_fd_trans + oldmax), 0, - (target_fd_max - oldmax) * sizeof(TargetFdTrans *)); - } - target_fd_trans[fd] = trans; -} - -static void fd_trans_unregister(int fd) -{ - if (fd >= 0 && fd < target_fd_max) { - target_fd_trans[fd] = NULL; - } -} - -static void fd_trans_dup(int oldfd, int newfd) -{ - fd_trans_unregister(newfd); - if (oldfd < target_fd_max && target_fd_trans[oldfd]) { - fd_trans_register(newfd, target_fd_trans[oldfd]); - } -} - static int sys_getcwd1(char *buf, size_t size) { if (getcwd(buf, size) == NULL) { @@ -2076,968 +1780,6 @@ static inline abi_long host_to_target_cmsg(struct target_msghdr *target_msgh, return 0; } -static void tswap_nlmsghdr(struct nlmsghdr *nlh) -{ - nlh->nlmsg_len = tswap32(nlh->nlmsg_len); - nlh->nlmsg_type = tswap16(nlh->nlmsg_type); - nlh->nlmsg_flags = tswap16(nlh->nlmsg_flags); - nlh->nlmsg_seq = tswap32(nlh->nlmsg_seq); - nlh->nlmsg_pid = tswap32(nlh->nlmsg_pid); -} - -static abi_long host_to_target_for_each_nlmsg(struct nlmsghdr *nlh, - size_t len, - abi_long (*host_to_target_nlmsg) - (struct nlmsghdr *)) -{ - uint32_t nlmsg_len; - abi_long ret; - - while (len > sizeof(struct nlmsghdr)) { - - nlmsg_len = nlh->nlmsg_len; - if (nlmsg_len < sizeof(struct nlmsghdr) || - nlmsg_len > len) { - break; - } - - switch (nlh->nlmsg_type) { - case NLMSG_DONE: - tswap_nlmsghdr(nlh); - return 0; - case NLMSG_NOOP: - break; - case NLMSG_ERROR: - { - struct nlmsgerr *e = NLMSG_DATA(nlh); - e->error = tswap32(e->error); - tswap_nlmsghdr(&e->msg); - tswap_nlmsghdr(nlh); - return 0; - } - default: - ret = host_to_target_nlmsg(nlh); - if (ret < 0) { - tswap_nlmsghdr(nlh); - return ret; - } - break; - } - tswap_nlmsghdr(nlh); - len -= NLMSG_ALIGN(nlmsg_len); - nlh = (struct nlmsghdr *)(((char*)nlh) + NLMSG_ALIGN(nlmsg_len)); - } - return 0; -} - -static abi_long target_to_host_for_each_nlmsg(struct nlmsghdr *nlh, - size_t len, - abi_long (*target_to_host_nlmsg) - (struct nlmsghdr *)) -{ - int ret; - - while (len > sizeof(struct nlmsghdr)) { - if (tswap32(nlh->nlmsg_len) < sizeof(struct nlmsghdr) || - tswap32(nlh->nlmsg_len) > len) { - break; - } - tswap_nlmsghdr(nlh); - switch (nlh->nlmsg_type) { - case NLMSG_DONE: - return 0; - case NLMSG_NOOP: - break; - case NLMSG_ERROR: - { - struct nlmsgerr *e = NLMSG_DATA(nlh); - e->error = tswap32(e->error); - tswap_nlmsghdr(&e->msg); - return 0; - } - default: - ret = target_to_host_nlmsg(nlh); - if (ret < 0) { - return ret; - } - } - len -= NLMSG_ALIGN(nlh->nlmsg_len); - nlh = (struct nlmsghdr *)(((char *)nlh) + NLMSG_ALIGN(nlh->nlmsg_len)); - } - return 0; -} - -#ifdef CONFIG_RTNETLINK -static abi_long host_to_target_for_each_nlattr(struct nlattr *nlattr, - size_t len, void *context, - abi_long (*host_to_target_nlattr) - (struct nlattr *, - void *context)) -{ - unsigned short nla_len; - abi_long ret; - - while (len > sizeof(struct nlattr)) { - nla_len = nlattr->nla_len; - if (nla_len < sizeof(struct nlattr) || - nla_len > len) { - break; - } - ret = host_to_target_nlattr(nlattr, context); - nlattr->nla_len = tswap16(nlattr->nla_len); - nlattr->nla_type = tswap16(nlattr->nla_type); - if (ret < 0) { - return ret; - } - len -= NLA_ALIGN(nla_len); - nlattr = (struct nlattr *)(((char *)nlattr) + NLA_ALIGN(nla_len)); - } - return 0; -} - -static abi_long host_to_target_for_each_rtattr(struct rtattr *rtattr, - size_t len, - abi_long (*host_to_target_rtattr) - (struct rtattr *)) -{ - unsigned short rta_len; - abi_long ret; - - while (len > sizeof(struct rtattr)) { - rta_len = rtattr->rta_len; - if (rta_len < sizeof(struct rtattr) || - rta_len > len) { - break; - } - ret = host_to_target_rtattr(rtattr); - rtattr->rta_len = tswap16(rtattr->rta_len); - rtattr->rta_type = tswap16(rtattr->rta_type); - if (ret < 0) { - return ret; - } - len -= RTA_ALIGN(rta_len); - rtattr = (struct rtattr *)(((char *)rtattr) + RTA_ALIGN(rta_len)); - } - return 0; -} - -#define NLA_DATA(nla) ((void *)((char *)(nla)) + NLA_HDRLEN) - -static abi_long host_to_target_data_bridge_nlattr(struct nlattr *nlattr, - void *context) -{ - uint16_t *u16; - uint32_t *u32; - uint64_t *u64; - - switch (nlattr->nla_type) { - /* no data */ - case QEMU_IFLA_BR_FDB_FLUSH: - break; - /* binary */ - case QEMU_IFLA_BR_GROUP_ADDR: - break; - /* uint8_t */ - case QEMU_IFLA_BR_VLAN_FILTERING: - case QEMU_IFLA_BR_TOPOLOGY_CHANGE: - case QEMU_IFLA_BR_TOPOLOGY_CHANGE_DETECTED: - case QEMU_IFLA_BR_MCAST_ROUTER: - case QEMU_IFLA_BR_MCAST_SNOOPING: - case QEMU_IFLA_BR_MCAST_QUERY_USE_IFADDR: - case QEMU_IFLA_BR_MCAST_QUERIER: - case QEMU_IFLA_BR_NF_CALL_IPTABLES: - case QEMU_IFLA_BR_NF_CALL_IP6TABLES: - case QEMU_IFLA_BR_NF_CALL_ARPTABLES: - case QEMU_IFLA_BR_VLAN_STATS_ENABLED: - case QEMU_IFLA_BR_MCAST_STATS_ENABLED: - case QEMU_IFLA_BR_MCAST_IGMP_VERSION: - case QEMU_IFLA_BR_MCAST_MLD_VERSION: - break; - /* uint16_t */ - case QEMU_IFLA_BR_PRIORITY: - case QEMU_IFLA_BR_VLAN_PROTOCOL: - case QEMU_IFLA_BR_GROUP_FWD_MASK: - case QEMU_IFLA_BR_ROOT_PORT: - case QEMU_IFLA_BR_VLAN_DEFAULT_PVID: - u16 = NLA_DATA(nlattr); - *u16 = tswap16(*u16); - break; - /* uint32_t */ - case QEMU_IFLA_BR_FORWARD_DELAY: - case QEMU_IFLA_BR_HELLO_TIME: - case QEMU_IFLA_BR_MAX_AGE: - case QEMU_IFLA_BR_AGEING_TIME: - case QEMU_IFLA_BR_STP_STATE: - case QEMU_IFLA_BR_ROOT_PATH_COST: - case QEMU_IFLA_BR_MCAST_HASH_ELASTICITY: - case QEMU_IFLA_BR_MCAST_HASH_MAX: - case QEMU_IFLA_BR_MCAST_LAST_MEMBER_CNT: - case QEMU_IFLA_BR_MCAST_STARTUP_QUERY_CNT: - u32 = NLA_DATA(nlattr); - *u32 = tswap32(*u32); - break; - /* uint64_t */ - case QEMU_IFLA_BR_HELLO_TIMER: - case QEMU_IFLA_BR_TCN_TIMER: - case QEMU_IFLA_BR_GC_TIMER: - case QEMU_IFLA_BR_TOPOLOGY_CHANGE_TIMER: - case QEMU_IFLA_BR_MCAST_LAST_MEMBER_INTVL: - case QEMU_IFLA_BR_MCAST_MEMBERSHIP_INTVL: - case QEMU_IFLA_BR_MCAST_QUERIER_INTVL: - case QEMU_IFLA_BR_MCAST_QUERY_INTVL: - case QEMU_IFLA_BR_MCAST_QUERY_RESPONSE_INTVL: - case QEMU_IFLA_BR_MCAST_STARTUP_QUERY_INTVL: - u64 = NLA_DATA(nlattr); - *u64 = tswap64(*u64); - break; - /* ifla_bridge_id: uin8_t[] */ - case QEMU_IFLA_BR_ROOT_ID: - case QEMU_IFLA_BR_BRIDGE_ID: - break; - default: - gemu_log("Unknown QEMU_IFLA_BR type %d\n", nlattr->nla_type); - break; - } - return 0; -} - -static abi_long host_to_target_slave_data_bridge_nlattr(struct nlattr *nlattr, - void *context) -{ - uint16_t *u16; - uint32_t *u32; - uint64_t *u64; - - switch (nlattr->nla_type) { - /* uint8_t */ - case QEMU_IFLA_BRPORT_STATE: - case QEMU_IFLA_BRPORT_MODE: - case QEMU_IFLA_BRPORT_GUARD: - case QEMU_IFLA_BRPORT_PROTECT: - case QEMU_IFLA_BRPORT_FAST_LEAVE: - case QEMU_IFLA_BRPORT_LEARNING: - case QEMU_IFLA_BRPORT_UNICAST_FLOOD: - case QEMU_IFLA_BRPORT_PROXYARP: - case QEMU_IFLA_BRPORT_LEARNING_SYNC: - case QEMU_IFLA_BRPORT_PROXYARP_WIFI: - case QEMU_IFLA_BRPORT_TOPOLOGY_CHANGE_ACK: - case QEMU_IFLA_BRPORT_CONFIG_PENDING: - case QEMU_IFLA_BRPORT_MULTICAST_ROUTER: - case QEMU_IFLA_BRPORT_MCAST_FLOOD: - case QEMU_IFLA_BRPORT_MCAST_TO_UCAST: - case QEMU_IFLA_BRPORT_VLAN_TUNNEL: - case QEMU_IFLA_BRPORT_BCAST_FLOOD: - case QEMU_IFLA_BRPORT_NEIGH_SUPPRESS: - break; - /* uint16_t */ - case QEMU_IFLA_BRPORT_PRIORITY: - case QEMU_IFLA_BRPORT_DESIGNATED_PORT: - case QEMU_IFLA_BRPORT_DESIGNATED_COST: - case QEMU_IFLA_BRPORT_ID: - case QEMU_IFLA_BRPORT_NO: - case QEMU_IFLA_BRPORT_GROUP_FWD_MASK: - u16 = NLA_DATA(nlattr); - *u16 = tswap16(*u16); - break; - /* uin32_t */ - case QEMU_IFLA_BRPORT_COST: - u32 = NLA_DATA(nlattr); - *u32 = tswap32(*u32); - break; - /* uint64_t */ - case QEMU_IFLA_BRPORT_MESSAGE_AGE_TIMER: - case QEMU_IFLA_BRPORT_FORWARD_DELAY_TIMER: - case QEMU_IFLA_BRPORT_HOLD_TIMER: - u64 = NLA_DATA(nlattr); - *u64 = tswap64(*u64); - break; - /* ifla_bridge_id: uint8_t[] */ - case QEMU_IFLA_BRPORT_ROOT_ID: - case QEMU_IFLA_BRPORT_BRIDGE_ID: - break; - default: - gemu_log("Unknown QEMU_IFLA_BRPORT type %d\n", nlattr->nla_type); - break; - } - return 0; -} - -static abi_long host_to_target_data_tun_nlattr(struct nlattr *nlattr, - void *context) -{ - uint32_t *u32; - - switch (nlattr->nla_type) { - /* uint8_t */ - case QEMU_IFLA_TUN_TYPE: - case QEMU_IFLA_TUN_PI: - case QEMU_IFLA_TUN_VNET_HDR: - case QEMU_IFLA_TUN_PERSIST: - case QEMU_IFLA_TUN_MULTI_QUEUE: - break; - /* uint32_t */ - case QEMU_IFLA_TUN_NUM_QUEUES: - case QEMU_IFLA_TUN_NUM_DISABLED_QUEUES: - case QEMU_IFLA_TUN_OWNER: - case QEMU_IFLA_TUN_GROUP: - u32 = NLA_DATA(nlattr); - *u32 = tswap32(*u32); - break; - default: - gemu_log("Unknown QEMU_IFLA_TUN type %d\n", nlattr->nla_type); - break; - } - return 0; -} - -struct linkinfo_context { - int len; - char *name; - int slave_len; - char *slave_name; -}; - -static abi_long host_to_target_data_linkinfo_nlattr(struct nlattr *nlattr, - void *context) -{ - struct linkinfo_context *li_context = context; - - switch (nlattr->nla_type) { - /* string */ - case QEMU_IFLA_INFO_KIND: - li_context->name = NLA_DATA(nlattr); - li_context->len = nlattr->nla_len - NLA_HDRLEN; - break; - case QEMU_IFLA_INFO_SLAVE_KIND: - li_context->slave_name = NLA_DATA(nlattr); - li_context->slave_len = nlattr->nla_len - NLA_HDRLEN; - break; - /* stats */ - case QEMU_IFLA_INFO_XSTATS: - /* FIXME: only used by CAN */ - break; - /* nested */ - case QEMU_IFLA_INFO_DATA: - if (strncmp(li_context->name, "bridge", - li_context->len) == 0) { - return host_to_target_for_each_nlattr(NLA_DATA(nlattr), - nlattr->nla_len, - NULL, - host_to_target_data_bridge_nlattr); - } else if (strncmp(li_context->name, "tun", - li_context->len) == 0) { - return host_to_target_for_each_nlattr(NLA_DATA(nlattr), - nlattr->nla_len, - NULL, - host_to_target_data_tun_nlattr); - } else { - gemu_log("Unknown QEMU_IFLA_INFO_KIND %s\n", li_context->name); - } - break; - case QEMU_IFLA_INFO_SLAVE_DATA: - if (strncmp(li_context->slave_name, "bridge", - li_context->slave_len) == 0) { - return host_to_target_for_each_nlattr(NLA_DATA(nlattr), - nlattr->nla_len, - NULL, - host_to_target_slave_data_bridge_nlattr); - } else { - gemu_log("Unknown QEMU_IFLA_INFO_SLAVE_KIND %s\n", - li_context->slave_name); - } - break; - default: - gemu_log("Unknown host QEMU_IFLA_INFO type: %d\n", nlattr->nla_type); - break; - } - - return 0; -} - -static abi_long host_to_target_data_inet_nlattr(struct nlattr *nlattr, - void *context) -{ - uint32_t *u32; - int i; - - switch (nlattr->nla_type) { - case QEMU_IFLA_INET_CONF: - u32 = NLA_DATA(nlattr); - for (i = 0; i < (nlattr->nla_len - NLA_HDRLEN) / sizeof(*u32); - i++) { - u32[i] = tswap32(u32[i]); - } - break; - default: - gemu_log("Unknown host AF_INET type: %d\n", nlattr->nla_type); - } - return 0; -} - -static abi_long host_to_target_data_inet6_nlattr(struct nlattr *nlattr, - void *context) -{ - uint32_t *u32; - uint64_t *u64; - struct ifla_cacheinfo *ci; - int i; - - switch (nlattr->nla_type) { - /* binaries */ - case QEMU_IFLA_INET6_TOKEN: - break; - /* uint8_t */ - case QEMU_IFLA_INET6_ADDR_GEN_MODE: - break; - /* uint32_t */ - case QEMU_IFLA_INET6_FLAGS: - u32 = NLA_DATA(nlattr); - *u32 = tswap32(*u32); - break; - /* uint32_t[] */ - case QEMU_IFLA_INET6_CONF: - u32 = NLA_DATA(nlattr); - for (i = 0; i < (nlattr->nla_len - NLA_HDRLEN) / sizeof(*u32); - i++) { - u32[i] = tswap32(u32[i]); - } - break; - /* ifla_cacheinfo */ - case QEMU_IFLA_INET6_CACHEINFO: - ci = NLA_DATA(nlattr); - ci->max_reasm_len = tswap32(ci->max_reasm_len); - ci->tstamp = tswap32(ci->tstamp); - ci->reachable_time = tswap32(ci->reachable_time); - ci->retrans_time = tswap32(ci->retrans_time); - break; - /* uint64_t[] */ - case QEMU_IFLA_INET6_STATS: - case QEMU_IFLA_INET6_ICMP6STATS: - u64 = NLA_DATA(nlattr); - for (i = 0; i < (nlattr->nla_len - NLA_HDRLEN) / sizeof(*u64); - i++) { - u64[i] = tswap64(u64[i]); - } - break; - default: - gemu_log("Unknown host AF_INET6 type: %d\n", nlattr->nla_type); - } - return 0; -} - -static abi_long host_to_target_data_spec_nlattr(struct nlattr *nlattr, - void *context) -{ - switch (nlattr->nla_type) { - case AF_INET: - return host_to_target_for_each_nlattr(NLA_DATA(nlattr), nlattr->nla_len, - NULL, - host_to_target_data_inet_nlattr); - case AF_INET6: - return host_to_target_for_each_nlattr(NLA_DATA(nlattr), nlattr->nla_len, - NULL, - host_to_target_data_inet6_nlattr); - default: - gemu_log("Unknown host AF_SPEC type: %d\n", nlattr->nla_type); - break; - } - return 0; -} - -static abi_long host_to_target_data_xdp_nlattr(struct nlattr *nlattr, - void *context) -{ - uint32_t *u32; - - switch (nlattr->nla_type) { - /* uint8_t */ - case QEMU_IFLA_XDP_ATTACHED: - break; - /* uint32_t */ - case QEMU_IFLA_XDP_PROG_ID: - u32 = NLA_DATA(nlattr); - *u32 = tswap32(*u32); - break; - default: - gemu_log("Unknown host XDP type: %d\n", nlattr->nla_type); - break; - } - return 0; -} - -static abi_long host_to_target_data_link_rtattr(struct rtattr *rtattr) -{ - uint32_t *u32; - struct rtnl_link_stats *st; - struct rtnl_link_stats64 *st64; - struct rtnl_link_ifmap *map; - struct linkinfo_context li_context; - - switch (rtattr->rta_type) { - /* binary stream */ - case QEMU_IFLA_ADDRESS: - case QEMU_IFLA_BROADCAST: - /* string */ - case QEMU_IFLA_IFNAME: - case QEMU_IFLA_QDISC: - break; - /* uin8_t */ - case QEMU_IFLA_OPERSTATE: - case QEMU_IFLA_LINKMODE: - case QEMU_IFLA_CARRIER: - case QEMU_IFLA_PROTO_DOWN: - break; - /* uint32_t */ - case QEMU_IFLA_MTU: - case QEMU_IFLA_LINK: - case QEMU_IFLA_WEIGHT: - case QEMU_IFLA_TXQLEN: - case QEMU_IFLA_CARRIER_CHANGES: - case QEMU_IFLA_NUM_RX_QUEUES: - case QEMU_IFLA_NUM_TX_QUEUES: - case QEMU_IFLA_PROMISCUITY: - case QEMU_IFLA_EXT_MASK: - case QEMU_IFLA_LINK_NETNSID: - case QEMU_IFLA_GROUP: - case QEMU_IFLA_MASTER: - case QEMU_IFLA_NUM_VF: - case QEMU_IFLA_GSO_MAX_SEGS: - case QEMU_IFLA_GSO_MAX_SIZE: - case QEMU_IFLA_CARRIER_UP_COUNT: - case QEMU_IFLA_CARRIER_DOWN_COUNT: - u32 = RTA_DATA(rtattr); - *u32 = tswap32(*u32); - break; - /* struct rtnl_link_stats */ - case QEMU_IFLA_STATS: - st = RTA_DATA(rtattr); - st->rx_packets = tswap32(st->rx_packets); - st->tx_packets = tswap32(st->tx_packets); - st->rx_bytes = tswap32(st->rx_bytes); - st->tx_bytes = tswap32(st->tx_bytes); - st->rx_errors = tswap32(st->rx_errors); - st->tx_errors = tswap32(st->tx_errors); - st->rx_dropped = tswap32(st->rx_dropped); - st->tx_dropped = tswap32(st->tx_dropped); - st->multicast = tswap32(st->multicast); - st->collisions = tswap32(st->collisions); - - /* detailed rx_errors: */ - st->rx_length_errors = tswap32(st->rx_length_errors); - st->rx_over_errors = tswap32(st->rx_over_errors); - st->rx_crc_errors = tswap32(st->rx_crc_errors); - st->rx_frame_errors = tswap32(st->rx_frame_errors); - st->rx_fifo_errors = tswap32(st->rx_fifo_errors); - st->rx_missed_errors = tswap32(st->rx_missed_errors); - - /* detailed tx_errors */ - st->tx_aborted_errors = tswap32(st->tx_aborted_errors); - st->tx_carrier_errors = tswap32(st->tx_carrier_errors); - st->tx_fifo_errors = tswap32(st->tx_fifo_errors); - st->tx_heartbeat_errors = tswap32(st->tx_heartbeat_errors); - st->tx_window_errors = tswap32(st->tx_window_errors); - - /* for cslip etc */ - st->rx_compressed = tswap32(st->rx_compressed); - st->tx_compressed = tswap32(st->tx_compressed); - break; - /* struct rtnl_link_stats64 */ - case QEMU_IFLA_STATS64: - st64 = RTA_DATA(rtattr); - st64->rx_packets = tswap64(st64->rx_packets); - st64->tx_packets = tswap64(st64->tx_packets); - st64->rx_bytes = tswap64(st64->rx_bytes); - st64->tx_bytes = tswap64(st64->tx_bytes); - st64->rx_errors = tswap64(st64->rx_errors); - st64->tx_errors = tswap64(st64->tx_errors); - st64->rx_dropped = tswap64(st64->rx_dropped); - st64->tx_dropped = tswap64(st64->tx_dropped); - st64->multicast = tswap64(st64->multicast); - st64->collisions = tswap64(st64->collisions); - - /* detailed rx_errors: */ - st64->rx_length_errors = tswap64(st64->rx_length_errors); - st64->rx_over_errors = tswap64(st64->rx_over_errors); - st64->rx_crc_errors = tswap64(st64->rx_crc_errors); - st64->rx_frame_errors = tswap64(st64->rx_frame_errors); - st64->rx_fifo_errors = tswap64(st64->rx_fifo_errors); - st64->rx_missed_errors = tswap64(st64->rx_missed_errors); - - /* detailed tx_errors */ - st64->tx_aborted_errors = tswap64(st64->tx_aborted_errors); - st64->tx_carrier_errors = tswap64(st64->tx_carrier_errors); - st64->tx_fifo_errors = tswap64(st64->tx_fifo_errors); - st64->tx_heartbeat_errors = tswap64(st64->tx_heartbeat_errors); - st64->tx_window_errors = tswap64(st64->tx_window_errors); - - /* for cslip etc */ - st64->rx_compressed = tswap64(st64->rx_compressed); - st64->tx_compressed = tswap64(st64->tx_compressed); - break; - /* struct rtnl_link_ifmap */ - case QEMU_IFLA_MAP: - map = RTA_DATA(rtattr); - map->mem_start = tswap64(map->mem_start); - map->mem_end = tswap64(map->mem_end); - map->base_addr = tswap64(map->base_addr); - map->irq = tswap16(map->irq); - break; - /* nested */ - case QEMU_IFLA_LINKINFO: - memset(&li_context, 0, sizeof(li_context)); - return host_to_target_for_each_nlattr(RTA_DATA(rtattr), rtattr->rta_len, - &li_context, - host_to_target_data_linkinfo_nlattr); - case QEMU_IFLA_AF_SPEC: - return host_to_target_for_each_nlattr(RTA_DATA(rtattr), rtattr->rta_len, - NULL, - host_to_target_data_spec_nlattr); - case QEMU_IFLA_XDP: - return host_to_target_for_each_nlattr(RTA_DATA(rtattr), rtattr->rta_len, - NULL, - host_to_target_data_xdp_nlattr); - default: - gemu_log("Unknown host QEMU_IFLA type: %d\n", rtattr->rta_type); - break; - } - return 0; -} - -static abi_long host_to_target_data_addr_rtattr(struct rtattr *rtattr) -{ - uint32_t *u32; - struct ifa_cacheinfo *ci; - - switch (rtattr->rta_type) { - /* binary: depends on family type */ - case IFA_ADDRESS: - case IFA_LOCAL: - break; - /* string */ - case IFA_LABEL: - break; - /* u32 */ - case IFA_FLAGS: - case IFA_BROADCAST: - u32 = RTA_DATA(rtattr); - *u32 = tswap32(*u32); - break; - /* struct ifa_cacheinfo */ - case IFA_CACHEINFO: - ci = RTA_DATA(rtattr); - ci->ifa_prefered = tswap32(ci->ifa_prefered); - ci->ifa_valid = tswap32(ci->ifa_valid); - ci->cstamp = tswap32(ci->cstamp); - ci->tstamp = tswap32(ci->tstamp); - break; - default: - gemu_log("Unknown host IFA type: %d\n", rtattr->rta_type); - break; - } - return 0; -} - -static abi_long host_to_target_data_route_rtattr(struct rtattr *rtattr) -{ - uint32_t *u32; - struct rta_cacheinfo *ci; - - switch (rtattr->rta_type) { - /* binary: depends on family type */ - case QEMU_RTA_GATEWAY: - case QEMU_RTA_DST: - case QEMU_RTA_PREFSRC: - break; - /* u8 */ - case QEMU_RTA_PREF: - break; - /* u32 */ - case QEMU_RTA_PRIORITY: - case QEMU_RTA_TABLE: - case QEMU_RTA_OIF: - u32 = RTA_DATA(rtattr); - *u32 = tswap32(*u32); - break; - /* struct rta_cacheinfo */ - case QEMU_RTA_CACHEINFO: - ci = RTA_DATA(rtattr); - ci->rta_clntref = tswap32(ci->rta_clntref); - ci->rta_lastuse = tswap32(ci->rta_lastuse); - ci->rta_expires = tswap32(ci->rta_expires); - ci->rta_error = tswap32(ci->rta_error); - ci->rta_used = tswap32(ci->rta_used); -#if defined(RTNETLINK_HAVE_PEERINFO) - ci->rta_id = tswap32(ci->rta_id); - ci->rta_ts = tswap32(ci->rta_ts); - ci->rta_tsage = tswap32(ci->rta_tsage); -#endif - break; - default: - gemu_log("Unknown host RTA type: %d\n", rtattr->rta_type); - break; - } - return 0; -} - -static abi_long host_to_target_link_rtattr(struct rtattr *rtattr, - uint32_t rtattr_len) -{ - return host_to_target_for_each_rtattr(rtattr, rtattr_len, - host_to_target_data_link_rtattr); -} - -static abi_long host_to_target_addr_rtattr(struct rtattr *rtattr, - uint32_t rtattr_len) -{ - return host_to_target_for_each_rtattr(rtattr, rtattr_len, - host_to_target_data_addr_rtattr); -} - -static abi_long host_to_target_route_rtattr(struct rtattr *rtattr, - uint32_t rtattr_len) -{ - return host_to_target_for_each_rtattr(rtattr, rtattr_len, - host_to_target_data_route_rtattr); -} - -static abi_long host_to_target_data_route(struct nlmsghdr *nlh) -{ - uint32_t nlmsg_len; - struct ifinfomsg *ifi; - struct ifaddrmsg *ifa; - struct rtmsg *rtm; - - nlmsg_len = nlh->nlmsg_len; - switch (nlh->nlmsg_type) { - case RTM_NEWLINK: - case RTM_DELLINK: - case RTM_GETLINK: - if (nlh->nlmsg_len >= NLMSG_LENGTH(sizeof(*ifi))) { - ifi = NLMSG_DATA(nlh); - ifi->ifi_type = tswap16(ifi->ifi_type); - ifi->ifi_index = tswap32(ifi->ifi_index); - ifi->ifi_flags = tswap32(ifi->ifi_flags); - ifi->ifi_change = tswap32(ifi->ifi_change); - host_to_target_link_rtattr(IFLA_RTA(ifi), - nlmsg_len - NLMSG_LENGTH(sizeof(*ifi))); - } - break; - case RTM_NEWADDR: - case RTM_DELADDR: - case RTM_GETADDR: - if (nlh->nlmsg_len >= NLMSG_LENGTH(sizeof(*ifa))) { - ifa = NLMSG_DATA(nlh); - ifa->ifa_index = tswap32(ifa->ifa_index); - host_to_target_addr_rtattr(IFA_RTA(ifa), - nlmsg_len - NLMSG_LENGTH(sizeof(*ifa))); - } - break; - case RTM_NEWROUTE: - case RTM_DELROUTE: - case RTM_GETROUTE: - if (nlh->nlmsg_len >= NLMSG_LENGTH(sizeof(*rtm))) { - rtm = NLMSG_DATA(nlh); - rtm->rtm_flags = tswap32(rtm->rtm_flags); - host_to_target_route_rtattr(RTM_RTA(rtm), - nlmsg_len - NLMSG_LENGTH(sizeof(*rtm))); - } - break; - default: - return -TARGET_EINVAL; - } - return 0; -} - -static inline abi_long host_to_target_nlmsg_route(struct nlmsghdr *nlh, - size_t len) -{ - return host_to_target_for_each_nlmsg(nlh, len, host_to_target_data_route); -} - -static abi_long target_to_host_for_each_rtattr(struct rtattr *rtattr, - size_t len, - abi_long (*target_to_host_rtattr) - (struct rtattr *)) -{ - abi_long ret; - - while (len >= sizeof(struct rtattr)) { - if (tswap16(rtattr->rta_len) < sizeof(struct rtattr) || - tswap16(rtattr->rta_len) > len) { - break; - } - rtattr->rta_len = tswap16(rtattr->rta_len); - rtattr->rta_type = tswap16(rtattr->rta_type); - ret = target_to_host_rtattr(rtattr); - if (ret < 0) { - return ret; - } - len -= RTA_ALIGN(rtattr->rta_len); - rtattr = (struct rtattr *)(((char *)rtattr) + - RTA_ALIGN(rtattr->rta_len)); - } - return 0; -} - -static abi_long target_to_host_data_link_rtattr(struct rtattr *rtattr) -{ - switch (rtattr->rta_type) { - default: - gemu_log("Unknown target QEMU_IFLA type: %d\n", rtattr->rta_type); - break; - } - return 0; -} - -static abi_long target_to_host_data_addr_rtattr(struct rtattr *rtattr) -{ - switch (rtattr->rta_type) { - /* binary: depends on family type */ - case IFA_LOCAL: - case IFA_ADDRESS: - break; - default: - gemu_log("Unknown target IFA type: %d\n", rtattr->rta_type); - break; - } - return 0; -} - -static abi_long target_to_host_data_route_rtattr(struct rtattr *rtattr) -{ - uint32_t *u32; - switch (rtattr->rta_type) { - /* binary: depends on family type */ - case QEMU_RTA_DST: - case QEMU_RTA_SRC: - case QEMU_RTA_GATEWAY: - break; - /* u32 */ - case QEMU_RTA_PRIORITY: - case QEMU_RTA_OIF: - u32 = RTA_DATA(rtattr); - *u32 = tswap32(*u32); - break; - default: - gemu_log("Unknown target RTA type: %d\n", rtattr->rta_type); - break; - } - return 0; -} - -static void target_to_host_link_rtattr(struct rtattr *rtattr, - uint32_t rtattr_len) -{ - target_to_host_for_each_rtattr(rtattr, rtattr_len, - target_to_host_data_link_rtattr); -} - -static void target_to_host_addr_rtattr(struct rtattr *rtattr, - uint32_t rtattr_len) -{ - target_to_host_for_each_rtattr(rtattr, rtattr_len, - target_to_host_data_addr_rtattr); -} - -static void target_to_host_route_rtattr(struct rtattr *rtattr, - uint32_t rtattr_len) -{ - target_to_host_for_each_rtattr(rtattr, rtattr_len, - target_to_host_data_route_rtattr); -} - -static abi_long target_to_host_data_route(struct nlmsghdr *nlh) -{ - struct ifinfomsg *ifi; - struct ifaddrmsg *ifa; - struct rtmsg *rtm; - - switch (nlh->nlmsg_type) { - case RTM_GETLINK: - break; - case RTM_NEWLINK: - case RTM_DELLINK: - if (nlh->nlmsg_len >= NLMSG_LENGTH(sizeof(*ifi))) { - ifi = NLMSG_DATA(nlh); - ifi->ifi_type = tswap16(ifi->ifi_type); - ifi->ifi_index = tswap32(ifi->ifi_index); - ifi->ifi_flags = tswap32(ifi->ifi_flags); - ifi->ifi_change = tswap32(ifi->ifi_change); - target_to_host_link_rtattr(IFLA_RTA(ifi), nlh->nlmsg_len - - NLMSG_LENGTH(sizeof(*ifi))); - } - break; - case RTM_GETADDR: - case RTM_NEWADDR: - case RTM_DELADDR: - if (nlh->nlmsg_len >= NLMSG_LENGTH(sizeof(*ifa))) { - ifa = NLMSG_DATA(nlh); - ifa->ifa_index = tswap32(ifa->ifa_index); - target_to_host_addr_rtattr(IFA_RTA(ifa), nlh->nlmsg_len - - NLMSG_LENGTH(sizeof(*ifa))); - } - break; - case RTM_GETROUTE: - break; - case RTM_NEWROUTE: - case RTM_DELROUTE: - if (nlh->nlmsg_len >= NLMSG_LENGTH(sizeof(*rtm))) { - rtm = NLMSG_DATA(nlh); - rtm->rtm_flags = tswap32(rtm->rtm_flags); - target_to_host_route_rtattr(RTM_RTA(rtm), nlh->nlmsg_len - - NLMSG_LENGTH(sizeof(*rtm))); - } - break; - default: - return -TARGET_EOPNOTSUPP; - } - return 0; -} - -static abi_long target_to_host_nlmsg_route(struct nlmsghdr *nlh, size_t len) -{ - return target_to_host_for_each_nlmsg(nlh, len, target_to_host_data_route); -} -#endif /* CONFIG_RTNETLINK */ - -static abi_long host_to_target_data_audit(struct nlmsghdr *nlh) -{ - switch (nlh->nlmsg_type) { - default: - gemu_log("Unknown host audit message type %d\n", - nlh->nlmsg_type); - return -TARGET_EINVAL; - } - return 0; -} - -static inline abi_long host_to_target_nlmsg_audit(struct nlmsghdr *nlh, - size_t len) -{ - return host_to_target_for_each_nlmsg(nlh, len, host_to_target_data_audit); -} - -static abi_long target_to_host_data_audit(struct nlmsghdr *nlh) -{ - switch (nlh->nlmsg_type) { - case AUDIT_USER: - case AUDIT_FIRST_USER_MSG ... AUDIT_LAST_USER_MSG: - case AUDIT_FIRST_USER_MSG2 ... AUDIT_LAST_USER_MSG2: - break; - default: - gemu_log("Unknown target audit message type %d\n", - nlh->nlmsg_type); - return -TARGET_EINVAL; - } - - return 0; -} - -static abi_long target_to_host_nlmsg_audit(struct nlmsghdr *nlh, size_t len) -{ - return target_to_host_for_each_nlmsg(nlh, len, target_to_host_data_audit); -} - /* do_setsockopt() Must return target values and target errnos. */ static abi_long do_setsockopt(int sockfd, int level, int optname, abi_ulong optval_addr, socklen_t optlen) @@ -3733,90 +2475,6 @@ static int sock_flags_fixup(int fd, int target_type) return fd; } -static abi_long packet_target_to_host_sockaddr(void *host_addr, - abi_ulong target_addr, - socklen_t len) -{ - struct sockaddr *addr = host_addr; - struct target_sockaddr *target_saddr; - - target_saddr = lock_user(VERIFY_READ, target_addr, len, 1); - if (!target_saddr) { - return -TARGET_EFAULT; - } - - memcpy(addr, target_saddr, len); - addr->sa_family = tswap16(target_saddr->sa_family); - /* spkt_protocol is big-endian */ - - unlock_user(target_saddr, target_addr, 0); - return 0; -} - -static TargetFdTrans target_packet_trans = { - .target_to_host_addr = packet_target_to_host_sockaddr, -}; - -#ifdef CONFIG_RTNETLINK -static abi_long netlink_route_target_to_host(void *buf, size_t len) -{ - abi_long ret; - - ret = target_to_host_nlmsg_route(buf, len); - if (ret < 0) { - return ret; - } - - return len; -} - -static abi_long netlink_route_host_to_target(void *buf, size_t len) -{ - abi_long ret; - - ret = host_to_target_nlmsg_route(buf, len); - if (ret < 0) { - return ret; - } - - return len; -} - -static TargetFdTrans target_netlink_route_trans = { - .target_to_host_data = netlink_route_target_to_host, - .host_to_target_data = netlink_route_host_to_target, -}; -#endif /* CONFIG_RTNETLINK */ - -static abi_long netlink_audit_target_to_host(void *buf, size_t len) -{ - abi_long ret; - - ret = target_to_host_nlmsg_audit(buf, len); - if (ret < 0) { - return ret; - } - - return len; -} - -static abi_long netlink_audit_host_to_target(void *buf, size_t len) -{ - abi_long ret; - - ret = host_to_target_nlmsg_audit(buf, len); - if (ret < 0) { - return ret; - } - - return len; -} - -static TargetFdTrans target_netlink_audit_trans = { - .target_to_host_data = netlink_audit_target_to_host, - .host_to_target_data = netlink_audit_host_to_target, -}; - /* do_socket() Must return target values and target errnos. */ static abi_long do_socket(int domain, int type, int protocol) { @@ -7596,61 +6254,6 @@ static abi_long do_open_by_handle_at(abi_long mount_fd, abi_long handle, #if defined(TARGET_NR_signalfd) || defined(TARGET_NR_signalfd4) -/* signalfd siginfo conversion */ - -static void -host_to_target_signalfd_siginfo(struct signalfd_siginfo *tinfo, - const struct signalfd_siginfo *info) -{ - int sig = host_to_target_signal(info->ssi_signo); - - /* linux/signalfd.h defines a ssi_addr_lsb - * not defined in sys/signalfd.h but used by some kernels - */ - -#ifdef BUS_MCEERR_AO - if (tinfo->ssi_signo == SIGBUS && - (tinfo->ssi_code == BUS_MCEERR_AR || - tinfo->ssi_code == BUS_MCEERR_AO)) { - uint16_t *ssi_addr_lsb = (uint16_t *)(&info->ssi_addr + 1); - uint16_t *tssi_addr_lsb = (uint16_t *)(&tinfo->ssi_addr + 1); - *tssi_addr_lsb = tswap16(*ssi_addr_lsb); - } -#endif - - tinfo->ssi_signo = tswap32(sig); - tinfo->ssi_errno = tswap32(tinfo->ssi_errno); - tinfo->ssi_code = tswap32(info->ssi_code); - tinfo->ssi_pid = tswap32(info->ssi_pid); - tinfo->ssi_uid = tswap32(info->ssi_uid); - tinfo->ssi_fd = tswap32(info->ssi_fd); - tinfo->ssi_tid = tswap32(info->ssi_tid); - tinfo->ssi_band = tswap32(info->ssi_band); - tinfo->ssi_overrun = tswap32(info->ssi_overrun); - tinfo->ssi_trapno = tswap32(info->ssi_trapno); - tinfo->ssi_status = tswap32(info->ssi_status); - tinfo->ssi_int = tswap32(info->ssi_int); - tinfo->ssi_ptr = tswap64(info->ssi_ptr); - tinfo->ssi_utime = tswap64(info->ssi_utime); - tinfo->ssi_stime = tswap64(info->ssi_stime); - tinfo->ssi_addr = tswap64(info->ssi_addr); -} - -static abi_long host_to_target_data_signalfd(void *buf, size_t len) -{ - int i; - - for (i = 0; i < len; i += sizeof(struct signalfd_siginfo)) { - host_to_target_signalfd_siginfo(buf + i, buf + i); - } - - return len; -} - -static TargetFdTrans target_signalfd_trans = { - .host_to_target_data = host_to_target_data_signalfd, -}; - static abi_long do_signalfd4(int fd, abi_long mask, int flags) { int host_flags; @@ -7976,55 +6579,6 @@ static target_timer_t get_timer_id(abi_long arg) return timerid; } -static abi_long swap_data_eventfd(void *buf, size_t len) -{ - uint64_t *counter = buf; - int i; - - if (len < sizeof(uint64_t)) { - return -EINVAL; - } - - for (i = 0; i < len; i += sizeof(uint64_t)) { - *counter = tswap64(*counter); - counter++; - } - - return len; -} - -static TargetFdTrans target_eventfd_trans = { - .host_to_target_data = swap_data_eventfd, - .target_to_host_data = swap_data_eventfd, -}; - -#if (defined(TARGET_NR_inotify_init) && defined(__NR_inotify_init)) || \ - (defined(CONFIG_INOTIFY1) && defined(TARGET_NR_inotify_init1) && \ - defined(__NR_inotify_init1)) -static abi_long host_to_target_data_inotify(void *buf, size_t len) -{ - struct inotify_event *ev; - int i; - uint32_t name_len; - - for (i = 0; i < len; i += sizeof(struct inotify_event) + name_len) { - ev = (struct inotify_event *)((char *)buf + i); - name_len = ev->len; - - ev->wd = tswap32(ev->wd); - ev->mask = tswap32(ev->mask); - ev->cookie = tswap32(ev->cookie); - ev->len = tswap32(name_len); - } - - return len; -} - -static TargetFdTrans target_inotify_trans = { - .host_to_target_data = host_to_target_data_inotify, -}; -#endif - static int target_to_host_cpu_mask(unsigned long *host_mask, size_t host_size, abi_ulong target_addr, From patchwork Tue Sep 25 08:54:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 974309 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42KFQB20zZz9sBW for ; Tue, 25 Sep 2018 19:00:02 +1000 (AEST) Received: from localhost ([::1]:51723 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g4jCJ-0006vR-Mf for incoming@patchwork.ozlabs.org; Tue, 25 Sep 2018 04:59:59 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47534) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g4j8F-0003fz-2B for qemu-devel@nongnu.org; Tue, 25 Sep 2018 04:55:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g4j8C-0000Sb-5y for qemu-devel@nongnu.org; Tue, 25 Sep 2018 04:55:46 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:40181) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1g4j8B-0000Rf-Pf for qemu-devel@nongnu.org; Tue, 25 Sep 2018 04:55:44 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue011 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MKsSj-1gKsvX0jAj-00LFiV; Tue, 25 Sep 2018 10:55:06 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Tue, 25 Sep 2018 10:54:29 +0200 Message-Id: <20180925085432.3791-3-laurent@vivier.eu> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180925085432.3791-1-laurent@vivier.eu> References: <20180925085432.3791-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:3nSZTeJ62SVBfAqkE9/oQnNzvX3cASD5VApzFe/fjBiKxVLu11c pMaeZAH5R31n/5di8G1YzpdMBM7rKwNzNWV//RoC5+kXBf9nQbpwbpapqZgx81LtBaguwFO RqHZHFjz5el59gi2AerUF0mnaY91kiYJcHPu+8XkuD3xtim1eE4Letz+xukHoznwEHghWRm N7C9w4jdUypqekO3cv01Q== X-UI-Out-Filterresults: notjunk:1; V01:K0:+trD5SD8FQI=:LRRvNdk2IzjFhseVztOn1E EFi/oifNu5gREnb8IiMmFzhrjJ0R+74Q2lSt3IUs12XiWe7vD68C3VtFbXZMOjHpsfWhHZCTN hpgsJfHDh3IIoX4Q8H86qM5GDhxC56hnd1D34dkcdIsktYjE3C8Xa25Tss4oQ+e8DnmBgjNEJ v8dsOhDTVyBYZ70RPok/r5o4JiTQ1PVlpEweV5K+i5zlZfUB/1SnfhHjGWAtLaZj88pmnMPs1 DWNPHX36wfE2lo3j7u4nZqI0lxdgMh+TBwzHDPvegATyl+OXDXn04BOYexkfwn/nZIKvKYwXe LCN2+tGOsMFQP97sQczjY2M5DE1k+69B3LuOjFNsamqwBudRlgzi6H8iVkDVv0PWUlkjOJtO/ r71GkHtb83dhjHrrc8yoIr5ZdM6SSHAgb3dHRaDo3WP38QTcRF3Ufcu2mDBQQP4+WU1Mh3vju XqpwTeHU71ewmtqTxnS6c73I0uESUy2jl+wpts2f70VGqhZcL5Xze1tdtQp/w78Q25DROFDlo zWLnkJbP+c5IWdWrkQOZr7qsPBKstqaf0m5cGHimW4liyXcbq8sOGh70oMW+QgDHHerp8pAqj 9gS8CMClrXf2BDM7riZyaE98+FH6PIBqDCLd0MOYfwY4rdToFZdD3mHI8/9cGw4nSGMkQl5MH QDms+iAAkkfzy1/2U+Qe+abAnwM4g/VpD6sn/5tM3uRRxVuaypp7Tfpi9CrACtbJ4qqBKppng scx/W2yN+JSuWaAO X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.126.187 Subject: [Qemu-devel] [PULL 2/5] linux-user: add SO_LINGER to {g, s}etsockopt 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_Marcelo_Arenas_Bel=C3=B3n?= , Riku Voipio , Laurent Vivier Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Carlo Marcelo Arenas Belón Original implementation for setsockopt by Chen Gang[1]; all bugs mine, including removing assignment for optname which hopefully makes the logic easier to follow and moving some variables to make the code more selfcontained. [1] http://patchwork.ozlabs.org/patch/565659/ Signed-off-by: Carlo Marcelo Arenas Belón Co-Authored-By: Chen Gang Reviewed-by: Laurent Vivier Message-Id: <20180824085601.6259-1-carenas@gmail.com> Signed-off-by: Laurent Vivier --- linux-user/syscall.c | 52 ++++++++++++++++++++++++++++++++++++++- linux-user/syscall_defs.h | 5 ++++ 2 files changed, 56 insertions(+), 1 deletion(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index e252f8b555..58fb967499 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -2032,6 +2032,24 @@ set_timeout: unlock_user (dev_ifname, optval_addr, 0); return ret; } + case TARGET_SO_LINGER: + { + struct linger lg; + struct target_linger *tlg; + + if (optlen != sizeof(struct target_linger)) { + return -TARGET_EINVAL; + } + if (!lock_user_struct(VERIFY_READ, tlg, optval_addr, 1)) { + return -TARGET_EFAULT; + } + __get_user(lg.l_onoff, &tlg->l_onoff); + __get_user(lg.l_linger, &tlg->l_linger); + ret = get_errno(setsockopt(sockfd, SOL_SOCKET, SO_LINGER, + &lg, sizeof(lg))); + unlock_user_struct(tlg, optval_addr, 0); + return ret; + } /* Options with 'int' argument. */ case TARGET_SO_DEBUG: optname = SO_DEBUG; @@ -2123,7 +2141,6 @@ static abi_long do_getsockopt(int sockfd, int level, int optname, level = SOL_SOCKET; switch (optname) { /* These don't just return a single integer */ - case TARGET_SO_LINGER: case TARGET_SO_RCVTIMEO: case TARGET_SO_SNDTIMEO: case TARGET_SO_PEERNAME: @@ -2161,6 +2178,39 @@ static abi_long do_getsockopt(int sockfd, int level, int optname, } break; } + case TARGET_SO_LINGER: + { + struct linger lg; + socklen_t lglen; + struct target_linger *tlg; + + if (get_user_u32(len, optlen)) { + return -TARGET_EFAULT; + } + if (len < 0) { + return -TARGET_EINVAL; + } + + lglen = sizeof(lg); + ret = get_errno(getsockopt(sockfd, level, SO_LINGER, + &lg, &lglen)); + if (ret < 0) { + return ret; + } + if (len > lglen) { + len = lglen; + } + if (!lock_user_struct(VERIFY_WRITE, tlg, optval_addr, 0)) { + return -TARGET_EFAULT; + } + __put_user(lg.l_onoff, &tlg->l_onoff); + __put_user(lg.l_linger, &tlg->l_linger); + unlock_user_struct(tlg, optval_addr, 1); + if (put_user_u32(len, optlen)) { + return -TARGET_EFAULT; + } + break; + } /* Options with 'int' argument. */ case TARGET_SO_DEBUG: optname = SO_DEBUG; diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h index 40bb60ef4c..18d434d6dc 100644 --- a/linux-user/syscall_defs.h +++ b/linux-user/syscall_defs.h @@ -203,6 +203,11 @@ struct target_ip_mreq_source { uint32_t imr_sourceaddr; }; +struct target_linger { + abi_int l_onoff; /* Linger active */ + abi_int l_linger; /* How long to linger for */ +}; + struct target_timeval { abi_long tv_sec; abi_long tv_usec; From patchwork Tue Sep 25 08:54:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 974305 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42KFKb6lplz9sBW for ; Tue, 25 Sep 2018 18:56:03 +1000 (AEST) Received: from localhost ([::1]:51703 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g4j8T-0003O2-37 for incoming@patchwork.ozlabs.org; Tue, 25 Sep 2018 04:56:01 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47391) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g4j7p-0003Jv-MS for qemu-devel@nongnu.org; Tue, 25 Sep 2018 04:55:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g4j7m-0000CD-7O for qemu-devel@nongnu.org; Tue, 25 Sep 2018 04:55:21 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:41231) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1g4j7l-0000Bg-TK for qemu-devel@nongnu.org; Tue, 25 Sep 2018 04:55:18 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue011 [212.227.15.167]) with ESMTPSA (Nemesis) id 1N6bTa-1fhvCm2yo2-018744; Tue, 25 Sep 2018 10:55:06 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Tue, 25 Sep 2018 10:54:30 +0200 Message-Id: <20180925085432.3791-4-laurent@vivier.eu> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180925085432.3791-1-laurent@vivier.eu> References: <20180925085432.3791-1-laurent@vivier.eu> X-Provags-ID: V03:K1:eBxRn6kvGqX22mPCh8g/0EUkmpS8p+LDLkKOSNxuAokPWCPY+UM n4uIs8asX+99pjgAfSvq/GRHsQeudUXAyDWjZV++ND17MTz8kmipq2edoqGwMiBsy3HSkYI mznXZK5qmFWw4ZQZcNl8+TrDevSMTsOBeb2ZQo30fzO74msr//inQWVaoM8nJlv5yin6xeU SWcT/Ju1UEowpyh7Egx1g== X-UI-Out-Filterresults: notjunk:1; V01:K0:v9KiQ/bhLr4=:D9Jpe3IWpu5c+KqJgGrPoL VKOoTr92j9Ktf0Ps2/zPB7ePKxOqrhp5v/qZxufWXQ+a84I/Ci+XS+4C1UAwunesCGOawQqcg DpWt2ZK655/Nu+9ZRueSNR7p745jRcLMPPxFWNw1kIsL1A+bMDVOJRSHpwABgbmGzw4aJgJ0+ rE7zMgWlyMZORu0s6x+vI02udrhZ0igY1ahTInCvlY6HlwCFE9vaYhYeNT30b2AsaZxB5Qtq4 wZWJPPWL2Zf63eg5p2JAY1Zqqo+8RlPkwRlasi+cgwp9N+aUwwE5yA7CwK+gh79y+9DajFwES yUSBYsJ4Y47ctC/QStftLnOZ9in89U21iurm5SB0kRDAPcOCLfmIgMvZcp+soQljyPCq7r1BY L3QL2SakJTDuPBBJ8mKQ9f1f02isaAf+4cwi09zbN4XVCZjeBNYgKKH/TAt9ktrA4yh1nWGQE 998hPdWuDGNX0ivrPr3V/MDn1pSaApn1TRPwRFNfTQdtJzevjGFYOfZey88WbTOm8neXsmovC j7U+rg23/2R3rnpPbB81JtN0CvN5FBuUsR71OoX6B4I+j4xRNFgMFxj1hvQ8fa1AMyZDcHuIw g3MjxiCf6nesuFipLt56GU6fFx3kbWJTMAqOp41oVtNVFK9bdaP3PjND6Wvs/+/rtPDKEAcM+ ZzUmBs4lXy7hgP8C8P8x0jiKhrggt4wVLx1jeJwhNDnEhEySBKlu8oMh2YTrn1Sl79qM= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.126.187 Subject: [Qemu-devel] [PULL 3/5] linux-user: elf: mmap all the target-pages of hostpage for data segment 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: Riku Voipio , Shivaprasad G Bhat , Laurent Vivier Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Shivaprasad G Bhat If the hostpage size is greater than the TARGET_PAGESIZE, the target-pages of size TARGET_PAGESIZE are marked valid only till the length requested during the elfload. The glibc attempts to consume unused space in the last page of data segment(__libc_memalign() in elf/dl-minimal.c). If PT_LOAD p_align is greater than or equal to hostpage size, the GLRO(dl_pagesize) is actually the host pagesize as set in the auxillary vectors. So, there is no explicit mmap request for the remaining target-pages on the last hostpage. The glibc assumes that particular space as available and subsequent attempts to use those addresses lead to crash as the target_mmap has not marked them valid for those target-pages. The issue is seen when trying to chroot to 16.04-x86_64 ubuntu on a PPC64 host where the fork fails to access the thread_id as it is allocated on a page not marked valid. The recent glibc doesn't have checks for thread-id in fork, but the issue can manifest somewhere else, none the less. The fix here is to map all the target-pages of the hostpage during the elfload if the p_align is greater than or equal to hostpage size, for data segment to allow the glibc for proper consumption. Signed-off-by: Shivaprasad G Bhat Reviewed-by: Laurent Vivier Message-Id: <153553435604.51992.5640085189104207249.stgit@lep8c.aus.stglabs.ibm.com> Signed-off-by: Laurent Vivier --- linux-user/elfload.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/linux-user/elfload.c b/linux-user/elfload.c index 8638612aec..6ead0d11c6 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -1437,7 +1437,10 @@ struct exec #define QMAGIC 0314 /* Necessary parameters */ -#define TARGET_ELF_EXEC_PAGESIZE TARGET_PAGE_SIZE +#define TARGET_ELF_EXEC_PAGESIZE \ + (((eppnt->p_align & ~qemu_host_page_mask) != 0) ? \ + TARGET_PAGE_SIZE : MAX(qemu_host_page_size, TARGET_PAGE_SIZE)) +#define TARGET_ELF_PAGELENGTH(_v) ROUND_UP((_v), TARGET_ELF_EXEC_PAGESIZE) #define TARGET_ELF_PAGESTART(_v) ((_v) & \ ~(abi_ulong)(TARGET_ELF_EXEC_PAGESIZE-1)) #define TARGET_ELF_PAGEOFFSET(_v) ((_v) & (TARGET_ELF_EXEC_PAGESIZE-1)) @@ -2279,7 +2282,7 @@ static void load_elf_image(const char *image_name, int image_fd, for (i = 0; i < ehdr->e_phnum; i++) { struct elf_phdr *eppnt = phdr + i; if (eppnt->p_type == PT_LOAD) { - abi_ulong vaddr, vaddr_po, vaddr_ps, vaddr_ef, vaddr_em; + abi_ulong vaddr, vaddr_po, vaddr_ps, vaddr_ef, vaddr_em, vaddr_len; int elf_prot = 0; if (eppnt->p_flags & PF_R) elf_prot = PROT_READ; @@ -2289,8 +2292,9 @@ static void load_elf_image(const char *image_name, int image_fd, vaddr = load_bias + eppnt->p_vaddr; vaddr_po = TARGET_ELF_PAGEOFFSET(vaddr); vaddr_ps = TARGET_ELF_PAGESTART(vaddr); + vaddr_len = TARGET_ELF_PAGELENGTH(eppnt->p_filesz + vaddr_po); - error = target_mmap(vaddr_ps, eppnt->p_filesz + vaddr_po, + error = target_mmap(vaddr_ps, vaddr_len, elf_prot, MAP_PRIVATE | MAP_FIXED, image_fd, eppnt->p_offset - vaddr_po); if (error == -1) { From patchwork Tue Sep 25 08:54:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 974306 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42KFMD5tPZz9sBJ for ; Tue, 25 Sep 2018 18:57:28 +1000 (AEST) Received: from localhost ([::1]:51713 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g4j9q-0004UK-4E for incoming@patchwork.ozlabs.org; Tue, 25 Sep 2018 04:57:26 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47381) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g4j7o-0003Hj-DT for qemu-devel@nongnu.org; Tue, 25 Sep 2018 04:55:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g4j7l-0000Bc-50 for qemu-devel@nongnu.org; Tue, 25 Sep 2018 04:55:20 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:52205) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1g4j7k-0000B3-Rj for qemu-devel@nongnu.org; Tue, 25 Sep 2018 04:55:17 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue011 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MplHR-1fPZH41FIj-00qAfr; Tue, 25 Sep 2018 10:55:07 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Tue, 25 Sep 2018 10:54:31 +0200 Message-Id: <20180925085432.3791-5-laurent@vivier.eu> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180925085432.3791-1-laurent@vivier.eu> References: <20180925085432.3791-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:NHSvVWPesnYgKS+DomRkRM5J4YNtyV3v0NYg8M4eelFtYAMBPMA QWMRLmonUMN38kTLg21CsGPUVBzgkvhwKhzp3k0SQ29Mz14/8tSjgCbKWAZswCmbsXCYUxY B1ur4QL7JKEUienBhC+NDHaWVUEu/vUpdKwHK2vRBE0qU/2uUHc7P5tdAkXcI9P6RRvxxQ4 RQhTS8gnYMyeDfT4yKrAQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:PspBHH92UJ4=:uATAEFRpRDY21eb4n8qzZ8 lYuus6Y6KIV8kp31OD5WbSKIBwlvsuzmxjWpOLY0D0Ld0oVTzEaixs14SY6AfvOXfjswzDn6r R64pz/VSAaykr7ULDHaIVQvJlI2UFqvOkfZuhSSIzL3Uex+8AN0rtcqgvQHsGPnqIYw4PhsEw iqQC59qQhT3I6R8I5B5QUZz7yzjqRptBdxOF80Qey9L3+BqTBzLLPMIv0M6owLKxBRs0VACyD hl86KGgD+wQ0AiNQKmyuf5iJEo90X6KBoFnSq+m2hGtNo1MUeKnz3g/4w5zqW60A7kQ9rcKin Rh7Rm9d8rrjVespAeHH/bu9q3DNZ/+XGOl8ShPJxI9raywXVS0oiW1raVbZSoyT0QkvwHYN5f FaJj9QQvynq5eTn3B17Gkn1rQqW9RzzCgGCwFT8+B3FEROgDuArLNQFBD4o7aaUIoIe0D9Y/u RhaPtP/CsGlkTLbDGsqOl4G2O+gl/V72tdCkXg1XVk3WNOTJipTud5CkWWWiQlMY3rgQdKucg alvg8flNhozt0FAIhcuxlju0/kb/liljZv7smL7Hvbzc8o62f3DBAJxzRgLMiJbOZXTmgflKI 1Sg7+Pc6hIZ0E9rgx4fo4xkNqgObHz0QvdH0pwg2t+yXtFOaNUgv6iVburyrOa/DAMkHzNifh Fu5d133y2Q2iMSl9YYHpMIvliJF6Gdkgm6CdKkQBNETN2tnyNUiJo5NxE+R63NN2l718YIBo0 E8htXiMru+T69mGt X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.126.130 Subject: [Qemu-devel] [PULL 4/5] linux-user: write(fd, NULL, 0) parity with linux's treatment of same 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: Tony Garnock-Jones , Riku Voipio , Laurent Vivier , Tony Garnock-Jones Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Tony Garnock-Jones Bring linux-user write(2) handling into line with linux for the case of a 0-byte write with a NULL buffer. Based on a patch originally written by Zhuowei Zhang. Addresses https://bugs.launchpad.net/qemu/+bug/1716292. >From Zhuowei Zhang's patch (https://lists.gnu.org/archive/html/qemu-devel/2017-09/msg08073.html): Linux returns success for the special case of calling write with a zero-length NULL buffer: compiling and running int main() { ssize_t ret = write(STDOUT_FILENO, NULL, 0); fprintf(stderr, "write returned %ld\n", ret); return 0; } gives "write returned 0" when run directly, but "write returned -1" in QEMU. This commit checks for this situation and returns success if found. Subsequent discussion raised the following questions (and my answers): - Q. Should TARGET_NR_read pass through to safe_read in this situation too? A. I'm wary of changing unrelated code to the specific problem I'm addressing. TARGET_NR_read is already consistent with Linux for this case. - Q. Do pread64/pwrite64 need to be changed similarly? A. Experiment suggests not: both linux and linux-user yield -1 for NULL 0-length reads/writes. Signed-off-by: Tony Garnock-Jones Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Laurent Vivier Message-Id: <20180908182205.GB409@mornington.dcs.gla.ac.uk> Signed-off-by: Laurent Vivier --- linux-user/syscall.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 58fb967499..019af632df 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -6772,6 +6772,9 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1, } return ret; case TARGET_NR_write: + if (arg2 == 0 && arg3 == 0) { + return get_errno(safe_write(arg1, 0, 0)); + } if (!(p = lock_user(VERIFY_READ, arg2, arg3, 1))) return -TARGET_EFAULT; if (fd_trans_target_to_host_data(arg1)) { From patchwork Tue Sep 25 08:54:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 974308 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42KFPN17Mwz9sB5 for ; Tue, 25 Sep 2018 18:59:20 +1000 (AEST) Received: from localhost ([::1]:51721 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g4jBd-0006VE-NN for incoming@patchwork.ozlabs.org; Tue, 25 Sep 2018 04:59:17 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47412) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g4j7w-0003S1-0I for qemu-devel@nongnu.org; Tue, 25 Sep 2018 04:55:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g4j7n-0000DF-OU for qemu-devel@nongnu.org; Tue, 25 Sep 2018 04:55:24 -0400 Received: from mout.kundenserver.de ([212.227.126.134]:42249) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1g4j7n-0000CS-Dv for qemu-devel@nongnu.org; Tue, 25 Sep 2018 04:55:19 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue011 [212.227.15.167]) with ESMTPSA (Nemesis) id 1Mdva2-1fX2CL3HM6-00azBI; Tue, 25 Sep 2018 10:55:07 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Tue, 25 Sep 2018 10:54:32 +0200 Message-Id: <20180925085432.3791-6-laurent@vivier.eu> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180925085432.3791-1-laurent@vivier.eu> References: <20180925085432.3791-1-laurent@vivier.eu> X-Provags-ID: V03:K1:0VNIbOyDGca8rd1l3pOCUu+0dkjl7YCp3wllQ+Syh3NstwCI9pk TlH8U22ujQzdeV9Nni5gqdYzCXIliDw+4UCb/d3KePAZv79dJBamIlk+ka5h4+OeDDW7y14 A6Qu7/zltsv6r7JW3+zCEoEbujRmkIBpWFiTgYmSzRQ1dyCFzXGh/qHKzCy6/jYBvSQz/TJ /9PohDhfjY4FR7GtiR4Jg== X-UI-Out-Filterresults: notjunk:1; V01:K0:+vYfhZcjYSU=:JWiWxiPtd+idLZxI5n36Cd mN/fIRHu+hyrDpvMbAon0NdgsW5WgvAieOBnsWWedtr8MRGoEUDMuU1Ija49mCzThYtehyA11 9A244+pIJYoDd7sWyyz+FE03yrT9mZhwOeKAGF9BgX460uilVxEYd1+kI5m28EPI3YuMV7GAE PP+yRr2dZBOARklZUUDH8lZO10veallap1Iw2AnfZCQEobyMrKzvtpzNuTWQ5x4NuhbdSIrjc t6omOrxQWVjjul4hUyhz7fRkfhN4zxSBcv0OgLo3V/GI68SoAcA+IpuUv8WM8KcuwA2GUjnQ4 GbGUfYhprvZzEwUqTGb7OavJeftKwUI7LNSS4jIFYZWKvW7p+bh7u/OuJ61Z7dkBmy3Hcpg+X oqkgbLlgF5VOJKDx3H7YvCL2bltBygukPbfEuCvc3V3uA821yg44yfX9xNkaPvy6P6m9FBAPx 20BW4hBNlb0IV1//Dkqg6FGP2jGeKMMbvkHoMYuJLOIuB7vt5jKqP1HBJboommsml5uLq6brk ilr7iBiugBArHTQ/uiklXrUo6L3LO4/pxXtLidqBbA431Yo+8pluLaBEuk0vkIKBu8fUzCdFG kbyyJjfgnKQgBmAize804kcb2E66WjXsJ1z5Jf6U2dZYGfKmfXY68tMplKJZbqzZkX+EMaE2y rA1e0KhmrwqnFP7o+DAWse8l3v3J6Dv8ASwprkt3hxz8Zmvo2VB7OkJxyAMmMZ4ZbWEo= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.126.134 Subject: [Qemu-devel] [PULL 5/5] linux-user: do setrlimit selectively 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: Max Filippov , Riku Voipio , Laurent Vivier Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Max Filippov setrlimit guest calls that affect memory resources (RLIMIT_{AS,DATA,STACK}) may interfere with QEMU internal memory management. They may result in QEMU lockup because mprotect call in page_unprotect would fail with ENOMEM error code, causing infinite loop of SIGSEGV. E.g. it happens when running libstdc++ testsuite for xtensa target on x86_64 host. Don't call host setrlimit for memory-related resources. Reviewed-by: Peter Maydell Signed-off-by: Max Filippov Message-Id: <20180917181314.22551-1-jcmvbkbc@gmail.com> [lv: rebase on master] Signed-off-by: Laurent Vivier --- linux-user/syscall.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 019af632df..ae3c0dfef7 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -7879,7 +7879,21 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1, rlim.rlim_cur = target_to_host_rlim(target_rlim->rlim_cur); rlim.rlim_max = target_to_host_rlim(target_rlim->rlim_max); unlock_user_struct(target_rlim, arg2, 0); - return get_errno(setrlimit(resource, &rlim)); + /* + * If we just passed through resource limit settings for memory then + * they would also apply to QEMU's own allocations, and QEMU will + * crash or hang or die if its allocations fail. Ideally we would + * track the guest allocations in QEMU and apply the limits ourselves. + * For now, just tell the guest the call succeeded but don't actually + * limit anything. + */ + if (resource != RLIMIT_AS && + resource != RLIMIT_DATA && + resource != RLIMIT_STACK) { + return get_errno(setrlimit(resource, &rlim)); + } else { + return 0; + } } #endif #ifdef TARGET_NR_getrlimit