From patchwork Fri Apr 21 16:41:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Karim Taha X-Patchwork-Id: 1772028 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20221208 header.b=X1YeQAOG; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Q30jg2N8Kz1ybF for ; Sat, 22 Apr 2023 02:44:23 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pptqc-0004xc-W5; Fri, 21 Apr 2023 12:42:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pptqa-0004xH-T4 for qemu-devel@nongnu.org; Fri, 21 Apr 2023 12:42:56 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pptqZ-00036J-9Z for qemu-devel@nongnu.org; Fri, 21 Apr 2023 12:42:56 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-3f18123d9f6so13869055e9.0 for ; Fri, 21 Apr 2023 09:42:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682095373; x=1684687373; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Gp4j69SMZPwsWvT5LUaznCtmcmVnsoJ2lq/e90PdDrU=; b=X1YeQAOGbh27CHtKhvZYqR6AoYqysj1BSxHwQcMXaXCsexcGzHOElH/XZ/DAOG2V+p UfSoPa74+5EcEScFxxQP0G36expmA40H5nXOrUaLm6I0zGZMo6fUG2teokfz4BdQHmOx cWrRrbq77AX30IGPrNf7NySV/xwfCWRnFkvCsGkQffiK7eTj2jE2ymQtEZfLdroYRAV/ 4abOIg+sADfk2jm7qAXjNMnIvmIr/U5cU7xAh4piZ3URIaNhRRRQgth/wq43bfvnsUss MvungWs14jbYkOo3zkALHsOP5U3FR2N6qns6PyD49Z3/U+3mHQ5/sPnBIFx0xpSawW/G L7dw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682095373; x=1684687373; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Gp4j69SMZPwsWvT5LUaznCtmcmVnsoJ2lq/e90PdDrU=; b=iVPkKB+p8PtNIT62AlbvP0m6ADkjtuSqFhqiXaIag02MQ+WYVgIM4GsoJCtKw+mxE+ YHZdmOuzEA2HClEjYDVBiklm4qQ6KYEh8F78dlHDY8nvh7qTYYsalrv2f99ASb3ji3M0 LkUkvgW3zumkuY+0bAWsD6VHsyn/q1GiZQtC7Km1+8XbKoX2tnJBa4+H1Gnyjvi0cs4P nDBW91vQDLOkl+MpY/rvOPA3NK3uclCotqHFyPoZU1DVqwkr9n13znMIKbn0k1gb/T+Y hfWzA1wkX1EHCaG4K1y65T3HjLyIpDOyAlkin+qzhy+mHTeguewqkH/ELs3p705goR5t Z89Q== X-Gm-Message-State: AAQBX9dtJXMO/osxilfdMRR/29O8b3PW6106OD7gi/WZgy49ypsgz5d4 UMUMQ6/t02Nnle+seEXKaWnux7BAqFU= X-Google-Smtp-Source: AKy350Zts3U7tNk7Rv4ocHVySqegiiwC/W1KfLYWoLBmHC9w2Ipk3WnTRn85LpYR2iCfdxO+qdSkng== X-Received: by 2002:a1c:7211:0:b0:3f1:82d8:8fde with SMTP id n17-20020a1c7211000000b003f182d88fdemr2236708wmc.24.1682095373308; Fri, 21 Apr 2023 09:42:53 -0700 (PDT) Received: from karim.my.domain ([197.39.145.151]) by smtp.gmail.com with ESMTPSA id z16-20020a05600c221000b003ee1b2ab9a0sm5266658wml.11.2023.04.21.09.42.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Apr 2023 09:42:52 -0700 (PDT) From: Karim Taha To: qemu-devel@nongnu.org Cc: imp@bsdimp.com, Karim Taha Subject: [PATCH v3 01/11] Signed-off-by: Karim Taha Date: Fri, 21 Apr 2023 18:41:50 +0200 Message-Id: <20230421164200.2913-2-kariem.taha2.7@gmail.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230421164200.2913-1-kariem.taha2.7@gmail.com> References: <20230421164200.2913-1-kariem.taha2.7@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=kariem.taha2.7@gmail.com; helo=mail-wm1-x332.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Warner Losh Intialize guest_base in bsd-user/main.c. Allow guest_base to be initialized on 64-bit hosts, the initial value is used by g2h_untagged function defined in include/exec/cpu_ldst.h Signed-off-by: Karim Taha --- bsd-user/main.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/bsd-user/main.c b/bsd-user/main.c index babc3b009b..afdc1b5f3c 100644 --- a/bsd-user/main.c +++ b/bsd-user/main.c @@ -50,8 +50,22 @@ #include "target_arch_cpu.h" int singlestep; -uintptr_t guest_base; + +/* + * Going hand in hand with the va space needed (see below), we need + * to find a host address to map the guest to. Assume that qemu + * itself doesn't need memory above 32GB (or that we don't collide + * with anything interesting). This is selected rather arbitrarily, + * but seems to produce good results in tests to date. + */ +# if HOST_LONG_BITS >= 64 +uintptr_t guest_base = 0x800000000ul; /* at 32GB */ +bool have_guest_base = true; +#else +uintptr_t guest_base; /* TODO: use sysctl to find big enough hole */ bool have_guest_base; +#endif + /* * When running 32-on-64 we should make sure we can fit all of the possible * guest address space into a contiguous chunk of virtual host memory. From patchwork Fri Apr 21 16:41:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Karim Taha X-Patchwork-Id: 1772032 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20221208 header.b=Y8YF3F0R; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Q30kJ1d3tz23tm for ; Sat, 22 Apr 2023 02:44:56 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pptqi-00057E-Kj; Fri, 21 Apr 2023 12:43:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pptqh-00053f-8e for qemu-devel@nongnu.org; Fri, 21 Apr 2023 12:43:03 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pptqe-00036V-3q for qemu-devel@nongnu.org; Fri, 21 Apr 2023 12:43:02 -0400 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-3f195b164c4so3614225e9.1 for ; Fri, 21 Apr 2023 09:42:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682095378; x=1684687378; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=7Ocm2Mi/3XffgQukYR6fjIgFb1H6iTkSkxgaD4YHDdM=; b=Y8YF3F0RTWYy+xToBIiArxuzE3M5O3l1b85d45BqyyYdF78dcnAoevUcuyUgLEs53U yl97jxZE6oCh5EweqFOnuOsJknYE0h9TWsD4uIRe4ghpjFiFzx/RZC7GWcv4b0oSqPzM t2FZp2iOiP7ptfI/vmMndJsKIB0hRw3a06dx2++7U2o+RiJjyHoYYWeHvUqwlNRnTPSY Kf1jFTwXWI7Yyzsx7AfgyuLUpW35+/B6zVC7sGC3JhbO7yAjALZ4DXPXyL6w54r+VH7C t0YfM/BVBRPsTQOiXLM9eiHDcJMB5Mta/IpsWdEL4hnNq6I8kQoNveVLiZRRKKEw1nuR +uug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682095378; x=1684687378; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7Ocm2Mi/3XffgQukYR6fjIgFb1H6iTkSkxgaD4YHDdM=; b=Dp1JHeERUifLKMfucV/Mfu5KaoLDW1lVxmMk4ctF2uQA+gYv7D8fr6NrTUjNClg077 bGCd39Fiy9SKk8t5Um/SE/rqnCpyv9FoBXFysAs1sV0SvU1jPDkG4tDfzvlsPWZuBPIT 8jCwtCyB151df8LMPCaJzye67ajFtMhrqZRNb8caMp1wOjNVHpwrXW1uT6FLJSXICt9L nPH81avYAWQLBmZKNAkakjmnQG8LUmpPhATGhtF/ZVVy0Vy0BoO67/RmhfqYZ30SD5qL mRUO15ywJjopRkOKvV3BMTVhQPj1GgRDSI3bfoPW+WiQRJcXYww/T2xsRj/QJw6n0+9x Ivog== X-Gm-Message-State: AAQBX9cFdArwV9t6qHz8tyibjg3NK929bszR0JSIRxWMS2N+LaU75adz NF7KMU6Nh8EgcWCoMbiCGEyRz89h9mE= X-Google-Smtp-Source: AKy350ad+Pd6PZ8UyyncqhKdTZXSYiBU4znbB7Vr/Uy+GHPwCkM9ZH7Oq913dAcObZ25UIJ+wpttxg== X-Received: by 2002:a05:600c:230e:b0:3ee:6cdf:c357 with SMTP id 14-20020a05600c230e00b003ee6cdfc357mr2393100wmo.20.1682095378273; Fri, 21 Apr 2023 09:42:58 -0700 (PDT) Received: from karim.my.domain ([197.39.145.151]) by smtp.gmail.com with ESMTPSA id z16-20020a05600c221000b003ee1b2ab9a0sm5266658wml.11.2023.04.21.09.42.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Apr 2023 09:42:57 -0700 (PDT) From: Karim Taha To: qemu-devel@nongnu.org Cc: imp@bsdimp.com, Stacey Son , Karim Taha Subject: [PATCH v3 02/11] Signed-off-by: Karim Taha Date: Fri, 21 Apr 2023 18:41:51 +0200 Message-Id: <20230421164200.2913-3-kariem.taha2.7@gmail.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230421164200.2913-1-kariem.taha2.7@gmail.com> References: <20230421164200.2913-1-kariem.taha2.7@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=kariem.taha2.7@gmail.com; helo=mail-wm1-x336.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Stacey Son Add the socket conversion related flags and structs. Add the relevant definitions of struct target_sockaddr and struct target_ip_mreq and the related flags, to be used in bsd-user/bsd-socket.c for the socket conversion functions: target_to_host_sockaddr, host_to_target_sockaddr, target_to_host_ip_mreq Signed-off-by: Karim Taha --- bsd-user/syscall_defs.h | 110 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 110 insertions(+) diff --git a/bsd-user/syscall_defs.h b/bsd-user/syscall_defs.h index b6d113d24a..f041245792 100644 --- a/bsd-user/syscall_defs.h +++ b/bsd-user/syscall_defs.h @@ -179,6 +179,116 @@ struct target_freebsd__wrusage { struct target_freebsd_rusage wru_children; }; +/* + * sys/socket.h + */ + +/* + * Types + */ +#define TARGET_SOCK_STREAM 1 /* stream socket */ +#define TARGET_SOCK_DGRAM 2 /* datagram socket */ +#define TARGET_SOCK_RAW 3 /* raw-protocol interface */ +#define TARGET_SOCK_RDM 4 /* reliably-delivered message */ +#define TARGET_SOCK_SEQPACKET 5 /* sequenced packet stream */ + + +/* + * Option flags per-socket. + */ + +#define TARGET_SO_DEBUG 0x0001 /* turn on debugging info recording */ +#define TARGET_SO_ACCEPTCONN 0x0002 /* socket has had listen() */ +#define TARGET_SO_REUSEADDR 0x0004 /* allow local address reuse */ +#define TARGET_SO_KEEPALIVE 0x0008 /* keep connections alive */ +#define TARGET_SO_DONTROUTE 0x0010 /* just use interface addresses */ +#define TARGET_SO_BROADCAST 0x0020 /* permit sending of broadcast msgs */ +#define TARGET_SO_USELOOPBACK 0x0040 /* bypass hardware when possible */ +#define TARGET_SO_LINGER 0x0080 /* linger on close if data present */ +#define TARGET_SO_OOBINLINE 0x0100 /* leave received OOB data in line */ +#define TARGET_SO_REUSEPORT 0x0200 /* allow local address & port reuse */ +#define TARGET_SO_TIMESTAMP 0x0400 /* timestamp received dgram traffic */ +#define TARGET_SO_NOSIGPIPE 0x0800 /* no SIGPIPE from EPIPE */ +#define TARGET_SO_ACCEPTFILTER 0x1000 /* there is an accept filter */ +#define TARGET_SO_BINTIME 0x2000 /* timestamp received dgram traffic */ +#define TARGET_SO_NO_OFFLOAD 0x4000 /* socket cannot be offloaded */ +#define TARGET_SO_NO_DDP 0x8000 /* disable direct data placement */ + +/* + * Additional options, not kept in so_options. + */ +#define TARGET_SO_SNDBUF 0x1001 /* send buffer size */ +#define TARGET_SO_RCVBUF 0x1002 /* receive buffer size */ +#define TARGET_SO_SNDLOWAT 0x1003 /* send low-water mark */ +#define TARGET_SO_RCVLOWAT 0x1004 /* receive low-water mark */ +#define TARGET_SO_SNDTIMEO 0x1005 /* send timeout */ +#define TARGET_SO_RCVTIMEO 0x1006 /* receive timeout */ +#define TARGET_SO_ERROR 0x1007 /* get error status and clear */ +#define TARGET_SO_TYPE 0x1008 /* get socket type */ +#define TARGET_SO_LABEL 0x1009 /* socket's MAC label */ +#define TARGET_SO_PEERLABEL 0x1010 /* socket's peer's MAC label */ +#define TARGET_SO_LISTENQLIMIT 0x1011 /* socket's backlog limit */ +#define TARGET_SO_LISTENQLEN 0x1012 /* socket's complete queue length */ +#define TARGET_SO_LISTENINCQLEN 0x1013 /* socket's incomplete queue length */ +#define TARGET_SO_SETFIB 0x1014 /* use this FIB to route */ +#define TARGET_SO_USER_COOKIE 0x1015 /* user cookie (dummynet etc.) */ +#define TARGET_SO_PROTOCOL 0x1016 /* get socket protocol (Linux name) */ + +/* alias for SO_PROTOCOL (SunOS name) */ +#define TARGET_SO_PROTOTYPE TARGET_SO_PROTOCOL + +/* + * Level number for (get/set)sockopt() to apply to socket itself. + */ +#define TARGET_SOL_SOCKET 0xffff /* options for socket level */ + +#ifndef CMSG_ALIGN +#define CMSG_ALIGN(len) (((len) + sizeof(long) - 1) & ~(sizeof(long) - 1)) +#endif + +/* + * sys/socket.h + */ +struct target_msghdr { + abi_long msg_name; /* Socket name */ + int32_t msg_namelen; /* Length of name */ + abi_long msg_iov; /* Data blocks */ + int32_t msg_iovlen; /* Number of blocks */ + abi_long msg_control; /* Per protocol magic (eg BSD fd passing) */ + int32_t msg_controllen; /* Length of cmsg list */ + int32_t msg_flags; /* flags on received message */ +}; + +struct target_sockaddr { + uint8_t sa_len; + uint8_t sa_family; + uint8_t sa_data[14]; +} QEMU_PACKED; + +struct target_in_addr { + uint32_t s_addr; /* big endian */ +}; + +struct target_cmsghdr { + uint32_t cmsg_len; + int32_t cmsg_level; + int32_t cmsg_type; +}; + +/* + * netinet/in.h + */ +struct target_ip_mreq { + struct target_in_addr imr_multiaddr; + struct target_in_addr imr_interface; +}; + +struct target_ip_mreqn { + struct target_in_addr imr_multiaddr; + struct target_in_addr imr_address; + int32_t imr_ifindex; +}; + #define safe_syscall0(type, name) \ type safe_##name(void) \ { \ From patchwork Fri Apr 21 16:41:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Karim Taha X-Patchwork-Id: 1772024 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20221208 header.b=Hqr2NoRC; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Q30hv5YQ2z1ybF for ; Sat, 22 Apr 2023 02:43:43 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pptql-0005Aw-UJ; Fri, 21 Apr 2023 12:43:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pptqj-00057a-NY for qemu-devel@nongnu.org; Fri, 21 Apr 2023 12:43:05 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pptqi-00036o-4M for qemu-devel@nongnu.org; Fri, 21 Apr 2023 12:43:05 -0400 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-3f1957e80a2so16556965e9.1 for ; Fri, 21 Apr 2023 09:43:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682095382; x=1684687382; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=QeRtqpEqOoSMNPEarWHZ/QkhctimiStgr4hRhWpY1cE=; b=Hqr2NoRCV7zOfioY9NY2qfxP5QJJB+Lv72EGGYs1FVNbXMafFJQIUXK3S5WiXdJv2t /5X8lLoppsqMjPUOAoqw0Nli9AFmIiZ5wgklDEtrWx2OG0vGO6IJwG0q1lkFPTUpFMdS 8gJvXYQ5tysLvtal8AeATSlDZbcFJKehp6fRfJ4Lw+ZFDk+4RnevbNmS+0oQ0JCGeTWF tGDpLh19/jU5Z1Hd4UnStPbZbFmZmnIJjXlDsQf2jo2lRQ+eqLVQ8HKSUHaPl/Ui2iH3 bavOOuOvvWacB4Z4QlYMeM/0U2atJ0hqB6Gz4lo/mJ7xrGTwA+c4I9LDxfkWGocRA6h5 AUlQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682095382; x=1684687382; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=QeRtqpEqOoSMNPEarWHZ/QkhctimiStgr4hRhWpY1cE=; b=AAv52CIYcJWTSt/OYQiwuT0R2OcdGld/frTWZXt56nwtulmt7sZbZK5TK3D2tWZYKb H+dJp5vn9kQvvQAcUHWtoGH/3/5ZeNs9ht/EKz7OO4kU1TO8mLLwE/X1aPFZdkCjEm+5 f1pJo+Kcg+V1YbahVmHiNL6IfMYykkoA1sEwr+ryquXWiH73xg+gm5BPZI3OAYp8Vq8i wtw7A/bAyr3feuZ1Dfuh4cMwrospIZ7jnWmNsDn3HEmW6GmuRqghbsp6/WElPvs4kqzk 4diXoUhql43diBAJ8PP3Y88OL77MrkvP443Y9e0bS6ki4bwqryUoLz8vt50yxo0cdbX8 MnXQ== X-Gm-Message-State: AAQBX9ftotxnsrKV+JyV1Y+d3sVoP6h31BA0zJhz+qJ3GWIoSKhF5zhP 9jemam1S5dqUF44pKBon/JiDhytPakU= X-Google-Smtp-Source: AKy350bsyyqNDx502pqgMZ/51//fI2sihOWhKaeUjXmkL9+RzJq817C7qk4iFjhfBy0hVlT3iB8+YQ== X-Received: by 2002:a1c:e904:0:b0:3ed:3268:5f35 with SMTP id q4-20020a1ce904000000b003ed32685f35mr2467158wmc.18.1682095382324; Fri, 21 Apr 2023 09:43:02 -0700 (PDT) Received: from karim.my.domain ([197.39.145.151]) by smtp.gmail.com with ESMTPSA id z16-20020a05600c221000b003ee1b2ab9a0sm5266658wml.11.2023.04.21.09.42.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Apr 2023 09:43:01 -0700 (PDT) From: Karim Taha To: qemu-devel@nongnu.org Cc: imp@bsdimp.com, Sean Bruno , Kyle Evans , Karim Taha Subject: [PATCH v3 03/11] Signed-off-by: Karim Taha Date: Fri, 21 Apr 2023 18:41:52 +0200 Message-Id: <20230421164200.2913-4-kariem.taha2.7@gmail.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230421164200.2913-1-kariem.taha2.7@gmail.com> References: <20230421164200.2913-1-kariem.taha2.7@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::329; envelope-from=kariem.taha2.7@gmail.com; helo=mail-wm1-x329.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Sean Bruno Target cmsghdr struct and flags. Add the cmsghdr struct and alignment flags. Co-authored-by: Kyle Evans Signed-off-by: Karim Taha --- bsd-user/syscall_defs.h | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/bsd-user/syscall_defs.h b/bsd-user/syscall_defs.h index f041245792..b594fafecc 100644 --- a/bsd-user/syscall_defs.h +++ b/bsd-user/syscall_defs.h @@ -275,6 +275,44 @@ struct target_cmsghdr { int32_t cmsg_type; }; +/* + * mips32 is the exception to the general rule of long-alignment; it + * unconditionally uses 64-bit alignment instead. + */ +#if defined(TARGET_MIPS) && TARGET_ABI_BITS == 32 +#define TARGET_ALIGNBYTES (sizeof(abi_llong) - 1) +#else +#define TARGET_ALIGNBYTES (sizeof(abi_long) - 1) +#endif + +#define TARGET_CMSG_NXTHDR(mhdr, cmsg, cmsg_start) \ + __target_cmsg_nxthdr(mhdr, cmsg, cmsg_start) +#define TARGET_CMSG_ALIGN(len) (((len) + TARGET_ALIGNBYTES) \ + & (size_t) ~TARGET_ALIGNBYTES) +#define TARGET_CMSG_DATA(cmsg) \ + ((unsigned char *)(cmsg) + TARGET_CMSG_ALIGN(sizeof(struct target_cmsghdr))) +#define TARGET_CMSG_SPACE(len) \ + (TARGET_CMSG_ALIGN(sizeof(struct target_cmsghdr)) + TARGET_CMSG_ALIGN(len)) +#define TARGET_CMSG_LEN(len) \ + (TARGET_CMSG_ALIGN(sizeof(struct target_cmsghdr)) + (len)) + +static inline struct target_cmsghdr * +__target_cmsg_nxthdr(struct target_msghdr *__mhdr, + struct target_cmsghdr *__cmsg, + struct target_cmsghdr *__cmsg_start) +{ + struct target_cmsghdr *__ptr; + + __ptr = (struct target_cmsghdr *)((unsigned char *) __cmsg + + TARGET_CMSG_ALIGN(tswap32(__cmsg->cmsg_len))); + if ((unsigned long)((char *)(__ptr + 1) - (char *)__cmsg_start) > + tswap32(__mhdr->msg_controllen)) { + /* No more entries. */ + return (struct target_cmsghdr *)0; + } + return __ptr; +} + /* * netinet/in.h */ From patchwork Fri Apr 21 16:41:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Karim Taha X-Patchwork-Id: 1772023 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20221208 header.b=qJDVelWN; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Q30hv5f6yz23tm for ; Sat, 22 Apr 2023 02:43:43 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pptqn-0005BV-GU; Fri, 21 Apr 2023 12:43:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pptqm-0005B9-DE for qemu-devel@nongnu.org; Fri, 21 Apr 2023 12:43:08 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pptqk-00036o-Nz for qemu-devel@nongnu.org; Fri, 21 Apr 2023 12:43:08 -0400 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-3f1957e80a2so16558255e9.1 for ; Fri, 21 Apr 2023 09:43:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682095385; x=1684687385; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=k2Um5wgBWBpl0Ohqwu5qkKXb0EUjSh7ibG2/yRb/lxc=; b=qJDVelWNfh+Jq38fI5PGljlnxUjBy+kcf/KHFGZlijOD1Vkw0W8SEIAFv2zOMbJ/VB nHtgTYogRx4etwRUKpdLCJOFB8in0L8h2+nFh9E0vUYlANkJ5wbeMQ0tHKEUaodEpq6k XH45M50sdh3DCpikcen5erLNspWEoenP8chmaGgJEDYLRVDY7xUMEHZ0fQWH3JucXggF zCfFydEIeFnrQHPqigdQJk6XqEo0zqx6FI9aEoQgnxHzHHW5QdUYTA8se5p2ugT98mdx VFyehMRYbMeMG4lT3m6mm6RnVarlxC20iOemw6OhcsUMArYuv6rQ6excL0UDttIZW/94 Ja3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682095385; x=1684687385; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=k2Um5wgBWBpl0Ohqwu5qkKXb0EUjSh7ibG2/yRb/lxc=; b=UTYzfNN7x+2WNtBQ7hQD10FqrZclEaKAY/Bvr7YoIokm9GyRjsIXf9skDaCQ5AXC4X hRFDdEYNfXD2wQDpQMnBEPOktkAwh81Qsy4AsjxKI7Rc6EAO+znZMJ2Gnptv0RTwBm+O N9e2hkS/uTfTopcxwRP8OCDUiAwggzXWWtiDPXobaD++uTaCEo/qUbjt8O9IG0VE32Zn RZSN2hd8qlrsU94+0lmCUQUEj5BLpkNZAX5Fcf1T9WoZJoCJy0qMXkvNae1mywAbX/4m 9cVbu/tjC0SLhuYdTGrDxWjiivK7nGlrlmHGjzZKwvXvOcrNIMu9Fg1NVA30+asDLbkj 3tAw== X-Gm-Message-State: AAQBX9e1JjmmJx1L+Q9wLBPVF9bOg2nkhhEFuP5+y73YhaQzHfuqwCsI gpEU5u+RhVQ2oY7P6+GT1166dTNhojs= X-Google-Smtp-Source: AKy350atCX7mEHfzip+veB8+YCL9AR6nEBKN7eNUrDB6kvUGejhaWD5pXkqaZ3UFzZnpBlPqFO/L7Q== X-Received: by 2002:a5d:6789:0:b0:2ef:e73d:605d with SMTP id v9-20020a5d6789000000b002efe73d605dmr7637193wru.30.1682095385420; Fri, 21 Apr 2023 09:43:05 -0700 (PDT) Received: from karim.my.domain ([197.39.145.151]) by smtp.gmail.com with ESMTPSA id z16-20020a05600c221000b003ee1b2ab9a0sm5266658wml.11.2023.04.21.09.43.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Apr 2023 09:43:05 -0700 (PDT) From: Karim Taha To: qemu-devel@nongnu.org Cc: imp@bsdimp.com, Stacey Son , Karim Taha Subject: [PATCH v3 04/11] Signed-off-by: Karim Taha Date: Fri, 21 Apr 2023 18:41:53 +0200 Message-Id: <20230421164200.2913-5-kariem.taha2.7@gmail.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230421164200.2913-1-kariem.taha2.7@gmail.com> References: <20230421164200.2913-1-kariem.taha2.7@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::329; envelope-from=kariem.taha2.7@gmail.com; helo=mail-wm1-x329.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Stacey Son Declaration of the socket conversion functions. Add bsd-user/qemu-bsd.h, required by bsd-user/bsd-socket.h, contains forward declarations of the socket conversion functions defined in bsd-user/bsd-socket.c. Signed-off-by: Karim Taha --- bsd-user/qemu-bsd.h | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 bsd-user/qemu-bsd.h diff --git a/bsd-user/qemu-bsd.h b/bsd-user/qemu-bsd.h new file mode 100644 index 0000000000..a052688596 --- /dev/null +++ b/bsd-user/qemu-bsd.h @@ -0,0 +1,36 @@ +/* + * BSD conversion extern declarations + * + * Copyright (c) 2013 Stacey D. Son + * + * 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 QEMU_BSD_H +#define QEMU_BSD_H + +#include +#include +#include +#include + +/* bsd-socket.c */ +abi_long target_to_host_sockaddr(struct sockaddr *addr, abi_ulong target_addr, + socklen_t len); +abi_long host_to_target_sockaddr(abi_ulong target_addr, struct sockaddr *addr, + socklen_t len); +abi_long target_to_host_ip_mreq(struct ip_mreqn *mreqn, abi_ulong target_addr, + socklen_t len); + +#endif /* QEMU_BSD_H */ From patchwork Fri Apr 21 16:41:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Karim Taha X-Patchwork-Id: 1772033 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20221208 header.b=j2nnpG8R; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Q30kc6JLYz23rW for ; Sat, 22 Apr 2023 02:45:12 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pptqs-0005C5-3r; Fri, 21 Apr 2023 12:43:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pptqr-0005Bs-DK for qemu-devel@nongnu.org; Fri, 21 Apr 2023 12:43:13 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pptqo-00037O-KK for qemu-devel@nongnu.org; Fri, 21 Apr 2023 12:43:12 -0400 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-3f191c1a8a7so6511295e9.1 for ; Fri, 21 Apr 2023 09:43:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682095389; x=1684687389; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ygsSYmAgHgY0D/4bVUo73Ymnd1PXTOqmTYyxkwj2FwY=; b=j2nnpG8RBudCNn8BVtT9x8w5F2sR3Igo60aN5ZMkhX/ObybjVg/SZsSnjHRpuyTUWI jjw66IBxLr25v4cM3jYI7kyqKiFJKPLXA4PVaMgI0WeYkHCzoA/vbySn678VBhuueaFX Fd9kuc1lDJgpouXFYkzxLIVEwmXiVsZxzHusen4QxaZ5n3I2YseihMaCnBbAc8UrYpgH swCeTw2pm4gWtFybj4ZMzLYzTzxoF2KHyu5gfH3MjI3nKFFFgc2aLnKuHynmiOLi/FPN 4GZqDSp0U0nxEUthe+vS/I2nltkdVODfDDBs9oDq2ZH6XECDWGbvTuGZy9Lx7wqgOIWV R8sQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682095389; x=1684687389; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ygsSYmAgHgY0D/4bVUo73Ymnd1PXTOqmTYyxkwj2FwY=; b=Pymf9salD8PeCYJPcyPyJ+C3r+Zu4jMPP1zzzHsLIY61qPZzzaxx1u1r48fOJEaQ83 zLZpNjRThH8BapkT4PIOffWDOScQjpO0WPHF6fN3E08rHsmTv79OwbFiQw6YrAUo/62w 5rYNoFjD6ulBX4KVsxuGxg+Y3oeqBN3vEUxy2JGuGYehFogzUCZTYtPnr99pys5tBnxA gJjDETsMovMF/lS0EViQurDvwh526LPFV8yXTdTK7xOh0BRQ92H1jOe0l/cITeuU961w XI5EpH/Y41VKsTZNddIcIXExvor13oL5/KMGgajNuRGz1WMq+Esnm3jl97pdqLSpZYm4 Tcrw== X-Gm-Message-State: AAQBX9f9TIDI76U1pWnm2Ze+MX5sS58qZ+FrqvzzYz/VqQh7zvsIEhtm qx6LOgO0faAn3gAd1jGziutLXi2NAs8= X-Google-Smtp-Source: AKy350Y5v8TUJk0Uhttmy95dIk/9UnpK2+cjb2g3gnf+8yz5GQr4jCdIOX3ivACdOz+vhqSGjT0dnw== X-Received: by 2002:a1c:f703:0:b0:3ef:6b97:f0c3 with SMTP id v3-20020a1cf703000000b003ef6b97f0c3mr2650829wmh.15.1682095388845; Fri, 21 Apr 2023 09:43:08 -0700 (PDT) Received: from karim.my.domain ([197.39.145.151]) by smtp.gmail.com with ESMTPSA id z16-20020a05600c221000b003ee1b2ab9a0sm5266658wml.11.2023.04.21.09.43.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Apr 2023 09:43:08 -0700 (PDT) From: Karim Taha To: qemu-devel@nongnu.org Cc: imp@bsdimp.com, Stacey Son , Karim Taha Subject: [PATCH v3 05/11] Signed-off-by: Karim Taha Date: Fri, 21 Apr 2023 18:41:54 +0200 Message-Id: <20230421164200.2913-6-kariem.taha2.7@gmail.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230421164200.2913-1-kariem.taha2.7@gmail.com> References: <20230421164200.2913-1-kariem.taha2.7@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=kariem.taha2.7@gmail.com; helo=mail-wm1-x32d.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Stacey Son Definitions of the socket conversion functions. Add bsd-user/bsd-socket.c, which contains the actual definitions of the socket conversion functions. Signed-off-by: Karim Taha --- bsd-user/bsd-socket.c | 108 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 108 insertions(+) create mode 100644 bsd-user/bsd-socket.c diff --git a/bsd-user/bsd-socket.c b/bsd-user/bsd-socket.c new file mode 100644 index 0000000000..8a5e44444d --- /dev/null +++ b/bsd-user/bsd-socket.c @@ -0,0 +1,108 @@ +/* + * BSD socket system call related helpers + * + * Copyright (c) 2013 Stacey D. Son + * + * 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 +#include + +#include "qemu.h" +#include "qemu-bsd.h" + +/* + * socket conversion + */ +abi_long target_to_host_sockaddr(struct sockaddr *addr, abi_ulong target_addr, + socklen_t len) +{ + const socklen_t unix_maxlen = sizeof(struct sockaddr_un); + sa_family_t sa_family; + struct target_sockaddr *target_saddr; + + target_saddr = lock_user(VERIFY_READ, target_addr, len, 1); + if (target_saddr == 0) { + return -TARGET_EFAULT; + } + + sa_family = target_saddr->sa_family; + + /* + * Oops. The caller might send a incomplete sun_path; sun_path + * must be terminated by \0 (see the manual page), but unfortunately + * it is quite common to specify sockaddr_un length as + * "strlen(x->sun_path)" while it should be "strlen(...) + 1". We will + * fix that here if needed. + */ + if (target_saddr->sa_family == AF_UNIX) { + if (len < unix_maxlen && len > 0) { + char *cp = (char *)target_saddr; + + if (cp[len - 1] && !cp[len]) { + len++; + } + } + if (len > unix_maxlen) { + len = unix_maxlen; + } + } + + memcpy(addr, target_saddr, len); + addr->sa_family = sa_family; /* type uint8_t */ + addr->sa_len = target_saddr->sa_len; /* type uint8_t */ + unlock_user(target_saddr, target_addr, 0); + + return 0; +} + +abi_long host_to_target_sockaddr(abi_ulong target_addr, struct sockaddr *addr, + socklen_t len) +{ + struct target_sockaddr *target_saddr; + + target_saddr = lock_user(VERIFY_WRITE, target_addr, len, 0); + if (target_saddr == 0) { + return -TARGET_EFAULT; + } + memcpy(target_saddr, addr, len); + target_saddr->sa_family = addr->sa_family; /* type uint8_t */ + target_saddr->sa_len = addr->sa_len; /* type uint8_t */ + unlock_user(target_saddr, target_addr, len); + + return 0; +} + +abi_long target_to_host_ip_mreq(struct ip_mreqn *mreqn, abi_ulong target_addr, + socklen_t len) +{ + struct target_ip_mreqn *target_smreqn; + + target_smreqn = lock_user(VERIFY_READ, target_addr, len, 1); + if (target_smreqn == 0) { + return -TARGET_EFAULT; + } + mreqn->imr_multiaddr.s_addr = target_smreqn->imr_multiaddr.s_addr; + mreqn->imr_address.s_addr = target_smreqn->imr_address.s_addr; + if (len == sizeof(struct target_ip_mreqn)) { + mreqn->imr_ifindex = tswapal(target_smreqn->imr_ifindex); + } + unlock_user(target_smreqn, target_addr, 0); + + return 0; +} From patchwork Fri Apr 21 16:41:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Karim Taha X-Patchwork-Id: 1772026 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20221208 header.b=k61pcPV4; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Q30jB6HdGz1ybF for ; Sat, 22 Apr 2023 02:43:58 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pptqv-0005Cj-VK; Fri, 21 Apr 2023 12:43:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pptqt-0005CM-PA for qemu-devel@nongnu.org; Fri, 21 Apr 2023 12:43:15 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pptqs-00037n-As for qemu-devel@nongnu.org; Fri, 21 Apr 2023 12:43:15 -0400 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-3f09b9ac51dso56083595e9.0 for ; Fri, 21 Apr 2023 09:43:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682095392; x=1684687392; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=7jgiE25TkQPb7QKZwOmBGpdrqCl81qjrHt2UK3yyPZ4=; b=k61pcPV4/N50xTq0JG1GP4qfD5SUHHHvxOD4IdCdZIwM/V0nylzI8EAKRs2seMvwMN aq9LSSTZN1YYvAyW6bwnmU7AbY+trcqLDzh7H+Nuq/YPt8mQxuOUa/52hYHpQussN8rg dvLb8WBJJp89GNwHIw0t3Oe+a+/kfXrFuz2XNYQXV8UAsvMCpDPfOc8lvE5DUyNfCsi5 Z3N3iL9/PNhJYSEgoSege0xEz48cPHgHzs3IfXYKd31lt7jd3g9LRuCvwA1LFmQUfsfs UDxBBMOVF91qBuyZR74e45z7PVJFwigb4TLKMrQZwe6dekUziHaK0PZPfJv3DxhdxQga pcsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682095392; x=1684687392; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7jgiE25TkQPb7QKZwOmBGpdrqCl81qjrHt2UK3yyPZ4=; b=MhbS40xPog3DD1Qas8nw0C1J6ugWA44OvaOypufrjDsSb4agoweZXwO+Q0EhS4CxYH 66Bu4aZcrJRyl+pgL8Kxx39qP3R/E/VbVVMQAblHb84/Nw486AHuCx90f/yXbbBT6MPc MjooedENyyqiQJB4/NNsNxLWGONCs66DeqV+dBOIPjYM5bal8QvW/GYoPT9tl/RGn1im IEPY6ySZR+zAKUKKPe2x/6hv/YisfC/YAWRj4oZ+2PA92qdfRvAo71x3yRKubAsbKeCA WmkuylylBjuKt9BD1OmlM5Gnzijyt33nb4GsVoEvodxe53Wz9EqctWtottayb9/kEzbJ xZWg== X-Gm-Message-State: AAQBX9d8q848ACCCWtpZN0wVAWHydI9AUoPcHfvjz6woR9+w/D4RUx/+ emcMMELoEQZx9WKNS5jbfVquzX5dpc0= X-Google-Smtp-Source: AKy350aGgl+ypOzZorYUKGzoUlbWLNPu8FWzsRgsHZh+Oj5Uu3DpfPmu6P6OwMdo7McUPB1TGmzR/Q== X-Received: by 2002:a5d:620b:0:b0:2fb:48a9:f554 with SMTP id y11-20020a5d620b000000b002fb48a9f554mr8695520wru.2.1682095392496; Fri, 21 Apr 2023 09:43:12 -0700 (PDT) Received: from karim.my.domain ([197.39.145.151]) by smtp.gmail.com with ESMTPSA id z16-20020a05600c221000b003ee1b2ab9a0sm5266658wml.11.2023.04.21.09.43.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Apr 2023 09:43:12 -0700 (PDT) From: Karim Taha To: qemu-devel@nongnu.org Cc: imp@bsdimp.com, Karim Taha Subject: [PATCH v3 06/11] Signed-off-by: Karim Taha Date: Fri, 21 Apr 2023 18:41:55 +0200 Message-Id: <20230421164200.2913-7-kariem.taha2.7@gmail.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230421164200.2913-1-kariem.taha2.7@gmail.com> References: <20230421164200.2913-1-kariem.taha2.7@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::334; envelope-from=kariem.taha2.7@gmail.com; helo=mail-wm1-x334.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Build bsd-user/bsd-socket.c. Add bsd-user/bsd-socket.c to meson.build. Signed-off-by: Karim Taha --- bsd-user/meson.build | 1 + 1 file changed, 1 insertion(+) diff --git a/bsd-user/meson.build b/bsd-user/meson.build index 5243122fc5..f648bd3554 100644 --- a/bsd-user/meson.build +++ b/bsd-user/meson.build @@ -7,6 +7,7 @@ bsd_user_ss = ss.source_set() common_user_inc += include_directories('include') bsd_user_ss.add(files( + 'bsd-socket.c', 'bsdload.c', 'elfload.c', 'main.c', From patchwork Fri Apr 21 16:41:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Karim Taha X-Patchwork-Id: 1772031 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20221208 header.b=Dn/q3flX; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Q30kJ0k14z1ybF for ; Sat, 22 Apr 2023 02:44:56 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pptqy-0005DQ-V4; Fri, 21 Apr 2023 12:43:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pptqw-0005D9-Vu for qemu-devel@nongnu.org; Fri, 21 Apr 2023 12:43:19 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pptqv-000389-2O for qemu-devel@nongnu.org; Fri, 21 Apr 2023 12:43:18 -0400 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-3f18dacd392so10945525e9.0 for ; Fri, 21 Apr 2023 09:43:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682095395; x=1684687395; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ka+zdK02+0LJUWtfpqNCyyWfl1iAa9xQ9iZg6niusK0=; b=Dn/q3flXxkhxGampPz9HIugBSLPTr9eE40DWi65516vfuahOaDaeySdELn3DZIQM7P 8VEtW3J/r0kBGS85GKQH05mqkkMqADTPBGg7rVt/14VKMykewzyLg9k0l8VtUkqpECHd dBwDQaAl0UGxqUG/an2pG07+884EuvpjK/PVSEmLw/TvUN5nla/LKUaJT0RdkMIM7e3t qaTJS30RE2EJCGQXLBvtj8Y49TopM0T4/OiNy/Z7hkz6uTl7HEatscvfR1n4nRVS3WQG b0l4Bdi0kR4mQg0IFH0R5b7xEEHNIQFF7DdS2n56rgH54YhCsBBEEt3Ie/EnxNu2i8TT NczQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682095395; x=1684687395; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ka+zdK02+0LJUWtfpqNCyyWfl1iAa9xQ9iZg6niusK0=; b=hRxCYuMAB0+Um4k0P9/Cxw/0YeVWAOaG6oxygnTnhF4NNRINiRJ201/zi69bC3oz6h bZFxLBMEIYqTmRQTN8RDpDpzx6SM/XoJPcC2yRRd6Fpko2VeFSyEX/eutinIPRXHKP9N pcERLxRAmFAuo+3HS0K1qbOqJiAsoFfpEAK0oWK8BQ3QdNPSwcPm1N1bo8EUyiwFHdXY GMk7kKP7oCUinfBrt3Kwh9GhyTE2bgBWcOjNNqqiGgE6+VGVJASC5lLK0eiftAqTqHm6 MWcy/V/ykJJKoG9eRsSpAtghbSe3U+kHCFCLPpqsIp9BJNk3EkT4fnuueZJ/fzzsWHxN TWOA== X-Gm-Message-State: AAQBX9cXlJdXCP9+/o1fYnXPuLc+Cc/fTbi/J4uD0t17oG7hcBFABWjk WdwEioiFPgQZ34N6pPRyT+Mi67YoKxc= X-Google-Smtp-Source: AKy350apqFcx06fl3XYS8j2OMzBUoi8RSDoZBrKfzhzSem1dKiHays7fq2Vs8UH77sCeoikR2CYPYw== X-Received: by 2002:a1c:ed01:0:b0:3f1:6eaf:daa7 with SMTP id l1-20020a1ced01000000b003f16eafdaa7mr2358311wmh.10.1682095395381; Fri, 21 Apr 2023 09:43:15 -0700 (PDT) Received: from karim.my.domain ([197.39.145.151]) by smtp.gmail.com with ESMTPSA id z16-20020a05600c221000b003ee1b2ab9a0sm5266658wml.11.2023.04.21.09.43.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Apr 2023 09:43:14 -0700 (PDT) From: Karim Taha To: qemu-devel@nongnu.org Cc: imp@bsdimp.com, Stacey Son , Karim Taha Subject: [PATCH v3 07/11] Signed-off-by: Karim Taha Date: Fri, 21 Apr 2023 18:41:56 +0200 Message-Id: <20230421164200.2913-8-kariem.taha2.7@gmail.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230421164200.2913-1-kariem.taha2.7@gmail.com> References: <20230421164200.2913-1-kariem.taha2.7@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=kariem.taha2.7@gmail.com; helo=mail-wm1-x333.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Stacey Son The implementation of bind(2) syscall and socket related syscalls. Add bsd-user/bsd-socket.h, which contains the implementation of bind(2), and the socket related system call shims. Signed-off-by: Karim Taha --- bsd-user/bsd-socket.h | 61 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 bsd-user/bsd-socket.h diff --git a/bsd-user/bsd-socket.h b/bsd-user/bsd-socket.h new file mode 100644 index 0000000000..7da4cf11a0 --- /dev/null +++ b/bsd-user/bsd-socket.h @@ -0,0 +1,61 @@ +/* + * socket related system call shims + * + * Copyright (c) 2013 Stacey D. Son + * + * 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 BSD_SOCKET_H +#define BSD_SOCKET_H + +#include +#include +#include +#include + +#include "qemu-bsd.h" + +ssize_t safe_recvfrom(int s, void *buf, size_t len, int flags, + struct sockaddr *restrict from, socklen_t *restrict fromlen); +ssize_t safe_sendto(int s, const void *buf, size_t len, int flags, + const struct sockaddr *to, socklen_t tolen); +int safe_select(int nfds, fd_set *readfs, fd_set *writefds, fd_set *exceptfds, + struct timeval *timeout); +int safe_pselect(int nfds, fd_set *restrict readfds, + fd_set *restrict writefds, fd_set *restrict exceptfds, + const struct timespec *restrict timeout, + const sigset_t *restrict newsigmask); + +/* bind(2) */ +static inline abi_long do_bsd_bind(int sockfd, abi_ulong target_addr, + socklen_t addrlen) +{ + abi_long ret; + void *addr; + + if ((int)addrlen < 0) { + return -TARGET_EINVAL; + } + + addr = alloca(addrlen + 1); + ret = target_to_host_sockaddr(addr, target_addr, addrlen); + if (is_error(ret)) { + return ret; + } + + return get_errno(bind(sockfd, addr, addrlen)); +} + +#endif /* BSD_SOCKET_H */ From patchwork Fri Apr 21 16:41:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Karim Taha X-Patchwork-Id: 1772027 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20221208 header.b=gnsag7hH; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Q30jG5tZFz1ybF for ; Sat, 22 Apr 2023 02:44:02 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pptrF-0005vo-JB; Fri, 21 Apr 2023 12:43:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pptrB-0005oJ-RG for qemu-devel@nongnu.org; Fri, 21 Apr 2023 12:43:33 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pptqy-00038H-QS for qemu-devel@nongnu.org; Fri, 21 Apr 2023 12:43:33 -0400 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-3f173af665fso13361655e9.3 for ; Fri, 21 Apr 2023 09:43:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682095398; x=1684687398; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=mvz6pathaKo/xWUwUfShy8GpfzHorlNtVrON5T3eHBA=; b=gnsag7hHD5wWrs6w+MOqPOlSc818obux+TgWKGAVZhHqJ9K35ElBjcBeHW2YRLUANa 1p0SlBDiRLWWEWi/QD2Qp5fXnDdOp59mFy5WG3ZfDyhUWCEFHKTpKQUZO53Ef0jSLfIw WmGNukVu+NoCMDz0XgHh6Ea9Dcv9iSVn3nRiPhaxbK66Ah8CCm6+PutPGo/MbOzlKDAT HTebYKYVirFrdzp0Gx6W8syskqM1EF3T2LPu1b1rwPEc1Kfo1lyVx06FZ/gqRdRkvrKm RwMKns3mC7eIRZYBqKom5l1EgsXGkSUO/gd5lW0puKD6RvsG5vByFllnssklk1W/rVjg z6gA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682095398; x=1684687398; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=mvz6pathaKo/xWUwUfShy8GpfzHorlNtVrON5T3eHBA=; b=Jgh3XSSCUoM5gn9WRQgGMf3auWTPxJ0e9Uww143cvM4wll057FULkE9xAuKiB2FQni LHD1AQwfEIpKCc4GZ0KiP4YkM+yvWVvdtkGxTAnh80DKG4kswDcVx4+U1ntOMubLHD2T yLJpeMwlcRK83e1JCTOasnYtqtTDXkUNXdiGTM842gmTAGc9ygGfZUjLQ1S4OzaPE1/Y zvv1zpiQJ4173GFy235+19J/kTYqLQ2YS2js4nO57qBFralEtIbiBbz0QTn5Wp0r+zCY OMeP2VMoe7gE/76Coo7uzxLGcffueElWy2uB5IAkZjjIg6EureASJpJOrzIAcTSH+bFP 6iiw== X-Gm-Message-State: AAQBX9dHV4RcqXM3F04sh3yKGO19Eyb2pJJ4rqfU85RbYki6QbcChg7h UrdqTbMIGRrYl1SfbaW4Q+Rxns62Q24= X-Google-Smtp-Source: AKy350YN67duDuvrSt9RsefdcCCXUDViapsMLxEAKXyAh2WPSZz8BuZQ/UBCu0X+bFMLE8eWv+zzQQ== X-Received: by 2002:a1c:6a13:0:b0:3f1:6f44:ff3a with SMTP id f19-20020a1c6a13000000b003f16f44ff3amr2562378wmc.13.1682095398130; Fri, 21 Apr 2023 09:43:18 -0700 (PDT) Received: from karim.my.domain ([197.39.145.151]) by smtp.gmail.com with ESMTPSA id z16-20020a05600c221000b003ee1b2ab9a0sm5266658wml.11.2023.04.21.09.43.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Apr 2023 09:43:17 -0700 (PDT) From: Karim Taha To: qemu-devel@nongnu.org Cc: imp@bsdimp.com, Stacey Son , Karim Taha Subject: [PATCH v3 08/11] Signed-off-by: Karim Taha Date: Fri, 21 Apr 2023 18:41:57 +0200 Message-Id: <20230421164200.2913-9-kariem.taha2.7@gmail.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230421164200.2913-1-kariem.taha2.7@gmail.com> References: <20230421164200.2913-1-kariem.taha2.7@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32a; envelope-from=kariem.taha2.7@gmail.com; helo=mail-wm1-x32a.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, SPF_HELO_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01, T_SPF_TEMPERROR=0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Stacey Son connect(2) syscall. Add the connect(2) syscall to bsd-user/bsd-socket.h. Signed-off-by: Karim Taha --- bsd-user/bsd-socket.h | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/bsd-user/bsd-socket.h b/bsd-user/bsd-socket.h index 7da4cf11a0..f191f22d63 100644 --- a/bsd-user/bsd-socket.h +++ b/bsd-user/bsd-socket.h @@ -58,4 +58,25 @@ static inline abi_long do_bsd_bind(int sockfd, abi_ulong target_addr, return get_errno(bind(sockfd, addr, addrlen)); } +/* connect(2) */ +static inline abi_long do_bsd_connect(int sockfd, abi_ulong target_addr, + socklen_t addrlen) +{ + abi_long ret; + void *addr; + + if ((int)addrlen < 0) { + return -TARGET_EINVAL; + } + addr = alloca(addrlen + 1); + + ret = target_to_host_sockaddr(addr, target_addr, addrlen); + + if (is_error(ret)) { + return ret; + } + + return get_errno(connect(sockfd, addr, addrlen)); +} + #endif /* BSD_SOCKET_H */ From patchwork Fri Apr 21 16:41:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Karim Taha X-Patchwork-Id: 1772029 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20221208 header.b=rBNpGf+Z; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Q30jv5mjgz1ybF for ; Sat, 22 Apr 2023 02:44:35 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pptr5-0005KY-KI; Fri, 21 Apr 2023 12:43:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pptr4-0005EX-CH for qemu-devel@nongnu.org; Fri, 21 Apr 2023 12:43:26 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pptr2-0003BL-P2 for qemu-devel@nongnu.org; Fri, 21 Apr 2023 12:43:26 -0400 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-3f1958d3a53so5496855e9.0 for ; Fri, 21 Apr 2023 09:43:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682095403; x=1684687403; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=BjrkwxvVPTvNWYJuB2LG+yltGr38S+xqYHTbaTmByUQ=; b=rBNpGf+ZtceNGHWotPCJhKFGOr82yIj2PD9jFGeaKb++Jo/JVnwh/ih0N1aKQMK05H 5mqHICGINwocY5ahKfO70SNEP6LDntzsLBXH+Zx50ED/ya+70FGbnytgtWAZlHjn1pgq OLwrfYUBTb+DJX1vRLU34ITTgjNSpd6JPphN4/pS+AhizrLdtJh8FO4q2cW9jwWz2vTX YNvWgcbgIjMGhZWP9HXhTKSvls2KPcwt2NAv3uJj6eSKdhG5ft+PzB/OMlo4ZXaYBbi0 yzzOWJlAn/JT8a/kXqpX0ceGrpRyYPiTuNcT+0Hl2pcDts9oMhvuPfh5rquu5ht+s3l5 lhsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682095403; x=1684687403; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=BjrkwxvVPTvNWYJuB2LG+yltGr38S+xqYHTbaTmByUQ=; b=fEIZvMFqD1WeQjw/f3tVfhDFUpNudGoEjfg86CQobGHDZvzJlqz03860Xerxw5J5cu /Bw4/J3sEoEoyfThpjQMYqcrxeLPuXWyqoWz92iosXF9FaOSzNZZE64ZCkzMfoY/fMUO GPysF8iIvn16KXwh4ermme99EgfUAAJ2adJBmw0mNTUsK426MQ9BEl1HfkxmDzoMNONM pEwqqkJxmDvbZvnUtst0Fc94UKsj+GJVGmga+jxJk2kWQrX+PXaOMavzP1KLX1aiGfIj m+9jnNE5Nqtn4VHOWunOq/rErAnX2efjrWI8znnDLs/iAxHQQo3ETo2u/mQ4aouuYcDV b4Tw== X-Gm-Message-State: AAQBX9cjWBa8NpgRTA7qN8NgNFmDD8T2gq37REUCdP2VQ4EO1QBkzL6N B3V3p8eXzd+5Lk8E35VO8UoHGo+ePB8= X-Google-Smtp-Source: AKy350Y7xs70qiQ5ZQjG+VN6vAvILEo8veKVUNvKUY7UCtppLVne4/9riqJzrMQ8UC1TRWZxsbFEyA== X-Received: by 2002:adf:e886:0:b0:2f9:94ae:99f8 with SMTP id d6-20020adfe886000000b002f994ae99f8mr4976100wrm.14.1682095402837; Fri, 21 Apr 2023 09:43:22 -0700 (PDT) Received: from karim.my.domain ([197.39.145.151]) by smtp.gmail.com with ESMTPSA id z16-20020a05600c221000b003ee1b2ab9a0sm5266658wml.11.2023.04.21.09.43.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Apr 2023 09:43:22 -0700 (PDT) From: Karim Taha To: qemu-devel@nongnu.org Cc: imp@bsdimp.com, Stacey Son , Karim Taha Subject: [PATCH v3 09/11] Signed-off-by: Karim Taha Date: Fri, 21 Apr 2023 18:41:58 +0200 Message-Id: <20230421164200.2913-10-kariem.taha2.7@gmail.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230421164200.2913-1-kariem.taha2.7@gmail.com> References: <20230421164200.2913-1-kariem.taha2.7@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=kariem.taha2.7@gmail.com; helo=mail-wm1-x32f.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Stacey Son accept(2) syscall. Add the accept(2) syscall to bsd-user/bsd-socket.h. Signed-off-by: Karim Taha --- bsd-user/bsd-socket.h | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/bsd-user/bsd-socket.h b/bsd-user/bsd-socket.h index f191f22d63..f748266730 100644 --- a/bsd-user/bsd-socket.h +++ b/bsd-user/bsd-socket.h @@ -79,4 +79,37 @@ static inline abi_long do_bsd_connect(int sockfd, abi_ulong target_addr, return get_errno(connect(sockfd, addr, addrlen)); } +/* accept(2) */ +static inline abi_long do_bsd_accept(int fd, abi_ulong target_addr, + abi_ulong target_addrlen_addr) +{ + socklen_t addrlen; + void *addr; + abi_long ret; + + if (target_addr == 0) { + return get_errno(accept(fd, NULL, NULL)); + } + /* return EINVAL if addrlen pointer is invalid */ + if (get_user_u32(addrlen, target_addrlen_addr)) { + return -TARGET_EINVAL; + } + if ((int)addrlen < 0) { + return -TARGET_EINVAL; + } + if (!access_ok(VERIFY_WRITE, target_addr, addrlen)) { + return -TARGET_EINVAL; + } + addr = alloca(addrlen); + + ret = get_errno(accept(fd, addr, &addrlen)); + if (!is_error(ret)) { + host_to_target_sockaddr(target_addr, addr, addrlen); + if (put_user_u32(addrlen, target_addrlen_addr)) { + ret = -TARGET_EFAULT; + } + } + return ret; +} + #endif /* BSD_SOCKET_H */ From patchwork Fri Apr 21 16:41:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Karim Taha X-Patchwork-Id: 1772025 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20221208 header.b=bEnIq4v7; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Q30hw0dRcz23tn for ; Sat, 22 Apr 2023 02:43:43 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pptr9-0005jt-Rs; Fri, 21 Apr 2023 12:43:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pptr7-0005a8-UU for qemu-devel@nongnu.org; Fri, 21 Apr 2023 12:43:29 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pptr6-0003DX-Ds for qemu-devel@nongnu.org; Fri, 21 Apr 2023 12:43:29 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-3f1763ee85bso19888455e9.2 for ; Fri, 21 Apr 2023 09:43:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682095407; x=1684687407; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=CBPVCIXYWbrgeZfGHUWLZM7K49/+jH+34j73GNoWcag=; b=bEnIq4v7aJ7w2S2r9mzv5eKqbPaA+rBGaeHNmdZet22qW8zYXzr4U0IBhlAtFAT06u od7osAXuKRPM927iYuXolOYrryKFFBe2xSGyq1F7d2b5p949dJ3zVDTTcaSXsI6QfCeU 8D5IbuDE5dEZ3cIMEc2/phLJNA1+n4bEFQwwSHmPe9KRKjsrJitH3tkcVy9SWiTtOx8b Mk3w2TOdLqOAVtTleiTVLiTjmxfTM96PBgpUJkD8OQlcnFpHLQ/iVWqAC/qxJPKvy6Af i4Mo9VGlmt0VAquIo2RysyXEMyv9zacjhH/yolYf+ZGLfJDRfF8b79Cgh39pchGF6MWF +ULQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682095407; x=1684687407; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=CBPVCIXYWbrgeZfGHUWLZM7K49/+jH+34j73GNoWcag=; b=C+xLy8FTIBllY2LeuiB8ZVdQqBPF400N2UbS9X4mziztpgrP5uL3vSA5tF1ovNuF+6 acL14NvVMfAN8lg+a81emWErm8kqOOpR7P1ol2+c3jpX1Hh12LIDmLhsumUHcTA1pn4h +hC5XUprrzOcynz6l8MziKbTukOut6IzQis0CV2dX5geZSvrEorix7er7HT3vznCfzXI iWVAyscPx8rwZRpQ/c+HNcS/98Tn3gGMS3q1ytlYm3j3LBzAEjToGYQqc065y5V4j78X sBuHR8iYbtdm6DOjlJmGvVlOLxugmnJo7kk5tEGO9AeJ0t5v/PgEb2NpCyvzkrxcHQp0 9IvA== X-Gm-Message-State: AAQBX9fsGjaUERtu3ssS4hiUZn7NLrNZ7/wKLcvUAc3pWbx68+ZACMeW 9EqH1EKvAIMJPOVyLjZttqX5uZM6YCk= X-Google-Smtp-Source: AKy350bn99doHB4gYr99CmYzLAx1jMah/DSQpKd9/T8nwQN1paq29WaPHwaVg0EJWw/mFY8UHonrPg== X-Received: by 2002:a05:600c:2297:b0:3f1:72ee:97b7 with SMTP id 23-20020a05600c229700b003f172ee97b7mr2820846wmf.15.1682095406603; Fri, 21 Apr 2023 09:43:26 -0700 (PDT) Received: from karim.my.domain ([197.39.145.151]) by smtp.gmail.com with ESMTPSA id z16-20020a05600c221000b003ee1b2ab9a0sm5266658wml.11.2023.04.21.09.43.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Apr 2023 09:43:26 -0700 (PDT) From: Karim Taha To: qemu-devel@nongnu.org Cc: imp@bsdimp.com, Stacey Son , Karim Taha Subject: [PATCH v3 10/11] Signed-off-by: Karim Taha Date: Fri, 21 Apr 2023 18:41:59 +0200 Message-Id: <20230421164200.2913-11-kariem.taha2.7@gmail.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230421164200.2913-1-kariem.taha2.7@gmail.com> References: <20230421164200.2913-1-kariem.taha2.7@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=kariem.taha2.7@gmail.com; helo=mail-wm1-x332.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Stacey Son getpeername(2) syscall. Add the getpeername(2) syscall to bsd-user/bsd-socket.h. Signed-off-by: Karim Taha --- bsd-user/bsd-socket.h | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/bsd-user/bsd-socket.h b/bsd-user/bsd-socket.h index f748266730..16fae3752a 100644 --- a/bsd-user/bsd-socket.h +++ b/bsd-user/bsd-socket.h @@ -112,4 +112,32 @@ static inline abi_long do_bsd_accept(int fd, abi_ulong target_addr, return ret; } +/* getpeername(2) */ +static inline abi_long do_bsd_getpeername(int fd, abi_ulong target_addr, + abi_ulong target_addrlen_addr) +{ + socklen_t addrlen; + void *addr; + abi_long ret; + + if (get_user_u32(addrlen, target_addrlen_addr)) { + return -TARGET_EFAULT; + } + if ((int)addrlen < 0) { + return -TARGET_EINVAL; + } + if (!access_ok(VERIFY_WRITE, target_addr, addrlen)) { + return -TARGET_EFAULT; + } + addr = alloca(addrlen); + ret = get_errno(getpeername(fd, addr, &addrlen)); + if (!is_error(ret)) { + host_to_target_sockaddr(target_addr, addr, addrlen); + if (put_user_u32(addrlen, target_addrlen_addr)) { + ret = -TARGET_EFAULT; + } + } + return ret; +} + #endif /* BSD_SOCKET_H */ From patchwork Fri Apr 21 16:42:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Karim Taha X-Patchwork-Id: 1772030 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20221208 header.b=PeHpoFJS; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Q30k41F7yz1ybF for ; Sat, 22 Apr 2023 02:44:44 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pptrG-0005zD-6T; Fri, 21 Apr 2023 12:43:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pptrB-0005oC-72 for qemu-devel@nongnu.org; Fri, 21 Apr 2023 12:43:33 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pptr9-0003Eb-OF for qemu-devel@nongnu.org; Fri, 21 Apr 2023 12:43:32 -0400 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-3f178da21b5so14075255e9.3 for ; Fri, 21 Apr 2023 09:43:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682095410; x=1684687410; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=vnQfui4LvJlqBZLzJkayAo9pyQ0/W5+m4YKJSAvgiQs=; b=PeHpoFJSb5Ss0uS6M2jwXKF6OOhS1jevhrxZjwfzwsSs764gC3Jv88ygCxJ3JxtmuL X9RqC7bS8N7ha5osbpJGCrnbm9GAMGv+59KfagTbUeApFZs1yzo8BkLtp/Fa91BnCzkd n6kzUoUQNk27aKkzdHRKSSOTh+Cw3idc8jmvY9jzT+Q7zlSdFETg4hvMO/3l6Btt3KSW euU4ofdHh1eBnKaiEDsD4k/2br3vzsKD8zGgTQmwtynQG0WoomXCO9b3t1J2lnhBvbgh d8L5pekmUC1kr/uLbg0Ch5LiYi20NcFEFEeqxfta5lruau8VKlU1JBM7aUVQ3fTf1X5f nTrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682095410; x=1684687410; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=vnQfui4LvJlqBZLzJkayAo9pyQ0/W5+m4YKJSAvgiQs=; b=eYbhcLaBcvrta0eIXUU5WmnGIlNHKCT3LTFlvZE7UyqxMYxFBU/3oHEAqwPQU2dZo9 LsZk2YgFUaNFytb4Jqh1yISkN0BuZ4TamQUaZ+m7Yrwm3oV/TEHd5vPg1K36PAlwUfL7 J7fM/lxXO2iRhnmzdFY468i7gNinFYaDTT1fdDsIDmSyvAIrSI3oDKS8bmNSwGyV9+08 NDfCqLySsug35u0/DloCTdOsu5K0s5qD+2jHPg6enfJvLfxyFc66gao+VIKH00G0gVfm Ivcr0sCXA0f3jpzqTcMcuBRmzwG8qGS086Q4gGZi5cmluVpBZJQ4hHM1+C0t651oy8gq NP5g== X-Gm-Message-State: AAQBX9dmZ9msZJo4tUxeXvBrFDuyLtnAZFlFunfaQjVwOrGZLatgHSyl 1h1PTZVLaBrnB8yENLgjRJQ1QhVKif8= X-Google-Smtp-Source: AKy350Y6ymRHqrynPbozzy5ZG3FyrJfXBfqnLkUshWhw2FsWNiRhicCGUjYwWf6o6IkdNyCjH5l1fg== X-Received: by 2002:a05:600c:2257:b0:3f1:76d4:d43f with SMTP id a23-20020a05600c225700b003f176d4d43fmr2460332wmm.8.1682095410047; Fri, 21 Apr 2023 09:43:30 -0700 (PDT) Received: from karim.my.domain ([197.39.145.151]) by smtp.gmail.com with ESMTPSA id z16-20020a05600c221000b003ee1b2ab9a0sm5266658wml.11.2023.04.21.09.43.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Apr 2023 09:43:29 -0700 (PDT) From: Karim Taha To: qemu-devel@nongnu.org Cc: imp@bsdimp.com, Karim Taha Subject: [PATCH v3 11/11] Signed-off-by: Karim Taha Date: Fri, 21 Apr 2023 18:42:00 +0200 Message-Id: <20230421164200.2913-12-kariem.taha2.7@gmail.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230421164200.2913-1-kariem.taha2.7@gmail.com> References: <20230421164200.2913-1-kariem.taha2.7@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=kariem.taha2.7@gmail.com; helo=mail-wm1-x32e.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Warner Losh Add the dispatching code of bind(2),connect(2), accpet(2), getpeername(2). Add the bind(2), connect(2), accept(2), getpeername(2) syscalls case statements to freebsd_syscall function defined in bsd-user/freebsd/os-syscall.c Signed-off-by: Karim Taha --- bsd-user/freebsd/os-syscall.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/bsd-user/freebsd/os-syscall.c b/bsd-user/freebsd/os-syscall.c index c8f998ecec..7f29196a05 100644 --- a/bsd-user/freebsd/os-syscall.c +++ b/bsd-user/freebsd/os-syscall.c @@ -44,6 +44,8 @@ #include "signal-common.h" #include "user/syscall-trace.h" +/* BSD independent syscall shims */ +#include "bsd-socket.h" #include "bsd-file.h" #include "bsd-proc.h" @@ -508,6 +510,25 @@ static abi_long freebsd_syscall(void *cpu_env, int num, abi_long arg1, ret = do_freebsd_sysarch(cpu_env, arg1, arg2); break; + /* + * socket related system calls + */ + case TARGET_FREEBSD_NR_accept: /* accept(2) */ + ret = do_bsd_accept(arg1, arg2, arg3); + break; + + case TARGET_FREEBSD_NR_bind: /* bind(2) */ + ret = do_bsd_bind(arg1, arg2, arg3); + break; + + case TARGET_FREEBSD_NR_connect: /* connect(2) */ + ret = do_bsd_connect(arg1, arg2, arg3); + break; + + case TARGET_FREEBSD_NR_getpeername: /* getpeername(2) */ + ret = do_bsd_getpeername(arg1, arg2, arg3); + break; + default: qemu_log_mask(LOG_UNIMP, "Unsupported syscall: %d\n", num); ret = -TARGET_ENOSYS;