From patchwork Thu Jan 21 12:38:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1429791 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: 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=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DM29S3r0dz9sB4 for ; Thu, 21 Jan 2021 23:42:52 +1100 (AEDT) Received: from localhost ([::1]:57252 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l2ZIY-0008II-Es for incoming@patchwork.ozlabs.org; Thu, 21 Jan 2021 07:42:50 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40198) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l2ZEr-0006em-Qx for qemu-devel@nongnu.org; Thu, 21 Jan 2021 07:39:01 -0500 Received: from mout.kundenserver.de ([212.227.126.187]:59915) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l2ZEp-0007OP-CM for qemu-devel@nongnu.org; Thu, 21 Jan 2021 07:39:01 -0500 Received: from localhost.localdomain ([82.252.149.54]) by mrelayeu.kundenserver.de (mreue009 [212.227.15.167]) with ESMTPSA (Nemesis) id 1M3UhO-1l37T818OQ-000dkM; Thu, 21 Jan 2021 13:38:56 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 1/5] linux-user: Support F_ADD_SEALS and F_GET_SEALS fcntls Date: Thu, 21 Jan 2021 13:38:48 +0100 Message-Id: <20210121123852.91187-2-laurent@vivier.eu> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210121123852.91187-1-laurent@vivier.eu> References: <20210121123852.91187-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:jvbM2uIT6Xjve5KAAeh5FAlogIiUtUqex5ag22u/9IFpGy8FOZ9 1yQlcYnZZjyv+5ll7pm2vPCW/2qcn3WA2FgAn2ZPTmIuZ0jLE5g6cGBG2rT5Q2AuqHHurK6 g3DQnwh2HRmbmzDQTilGYi13wa8pC5Mmf1LwNFxbeEcXLMUpNygHzs3OF+aU02Oa/H3x41/ b5RvLtZQWovApfIy1LmHA== X-UI-Out-Filterresults: notjunk:1;V03:K0:t6bjw0sjFpk=:PG/Zz3NGiVVWjDksNs0VAr xmH6M/GwMQmBoq/ivsL3JfiwHzaYMw2SSvU2KQsHW3TYy9cxxWekk2THz/QvdB2cIaVUCCn1N sHf95J4bDxAC63WAce5IoFKYjD9CtaKTzwL5zqSjofWrpxYvtAaRUKXjUDANKl4e0rrSkKL5H n5UU8nBCHVwdnH5MeK2BwgQsh269ex4nb8QAE0pbGMF60jrP0MF1vD2LMXI1h1G2Y31aF3jps Bnyc4XRiDHQ/e4BtPulBrk47HZEr2qSLtblKmFbuprLJBW7fiYBu+Ks89PH2PVdanhCQSnobd V1BYePLUFJZIIUMv1qVDu7tRuluu1UX8dvOncONhSZgPPWCiNM5BsdUCNBE34fNFLibtExWSe SYiOd7mgCyaurRtYdMBbHzXsy1bGcQPNSKG4qO8aY1nrsSUlRRoVaGZzB2Or7XuKie4DAy1WJ 4suHKB5LLA== Received-SPF: none client-ip=212.227.126.187; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de 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, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Shu-Chun Weng Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Shu-Chun Weng Also reorder blocks so that they are all in the same order everywhere. Signed-off-by: Shu-Chun Weng Reviewed-by: Laurent Vivier Message-Id: <20201218193213.3566856-2-scw@google.com> Signed-off-by: Laurent Vivier --- linux-user/strace.c | 39 ++++++++++++++++++++++++++++++++------- linux-user/syscall.c | 10 ++++++++++ linux-user/syscall_defs.h | 14 ++++++++------ 3 files changed, 50 insertions(+), 13 deletions(-) diff --git a/linux-user/strace.c b/linux-user/strace.c index e00275fcb51b..227812c07e63 100644 --- a/linux-user/strace.c +++ b/linux-user/strace.c @@ -2066,11 +2066,34 @@ print_fcntl(void *cpu_env, const struct syscallname *name, break; case TARGET_F_SETLEASE: qemu_log("F_SETLEASE,"); - print_raw_param(TARGET_ABI_FMT_ld, arg2, 0); + print_raw_param(TARGET_ABI_FMT_ld, arg2, 1); break; case TARGET_F_GETLEASE: qemu_log("F_GETLEASE"); break; +#ifdef F_DUPFD_CLOEXEC + case TARGET_F_DUPFD_CLOEXEC: + qemu_log("F_DUPFD_CLOEXEC,"); + print_raw_param(TARGET_ABI_FMT_ld, arg2, 1); + break; +#endif + case TARGET_F_NOTIFY: + qemu_log("F_NOTIFY,"); + print_raw_param(TARGET_ABI_FMT_ld, arg2, 1); + break; +#ifdef F_GETOWN_EX + case TARGET_F_GETOWN_EX: + qemu_log("F_GETOWN_EX,"); + print_pointer(arg2, 1); + break; +#endif +#ifdef F_SETOWN_EX + case TARGET_F_SETOWN_EX: + qemu_log("F_SETOWN_EX,"); + print_pointer(arg2, 1); + break; +#endif +#ifdef F_SETPIPE_SZ case TARGET_F_SETPIPE_SZ: qemu_log("F_SETPIPE_SZ,"); print_raw_param(TARGET_ABI_FMT_ld, arg2, 1); @@ -2078,14 +2101,16 @@ print_fcntl(void *cpu_env, const struct syscallname *name, case TARGET_F_GETPIPE_SZ: qemu_log("F_GETPIPE_SZ"); break; - case TARGET_F_DUPFD_CLOEXEC: - qemu_log("F_DUPFD_CLOEXEC,"); - print_raw_param(TARGET_ABI_FMT_ld, arg2, 1); +#endif +#ifdef F_ADD_SEALS + case TARGET_F_ADD_SEALS: + qemu_log("F_ADD_SEALS,"); + print_raw_param("0x"TARGET_ABI_FMT_lx, arg2, 1); break; - case TARGET_F_NOTIFY: - qemu_log("F_NOTIFY,"); - print_raw_param(TARGET_ABI_FMT_ld, arg2, 0); + case TARGET_F_GET_SEALS: + qemu_log("F_GET_SEALS"); break; +#endif default: print_raw_param(TARGET_ABI_FMT_ld, arg1, 0); print_pointer(arg2, 1); diff --git a/linux-user/syscall.c b/linux-user/syscall.c index d182890ff04a..98aaca01872f 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -6639,6 +6639,14 @@ static int target_to_host_fcntl_cmd(int cmd) case TARGET_F_GETPIPE_SZ: ret = F_GETPIPE_SZ; break; +#endif +#ifdef F_ADD_SEALS + case TARGET_F_ADD_SEALS: + ret = F_ADD_SEALS; + break; + case TARGET_F_GET_SEALS: + ret = F_GET_SEALS; + break; #endif default: ret = -TARGET_EINVAL; @@ -6931,6 +6939,8 @@ static abi_long do_fcntl(int fd, int cmd, abi_ulong arg) case TARGET_F_GETLEASE: case TARGET_F_SETPIPE_SZ: case TARGET_F_GETPIPE_SZ: + case TARGET_F_ADD_SEALS: + case TARGET_F_GET_SEALS: ret = get_errno(safe_fcntl(fd, host_cmd, arg)); break; diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h index a00bfc2647c7..f98c1c1c8de4 100644 --- a/linux-user/syscall_defs.h +++ b/linux-user/syscall_defs.h @@ -2408,12 +2408,14 @@ struct target_statfs64 { #endif #define TARGET_F_LINUX_SPECIFIC_BASE 1024 -#define TARGET_F_SETLEASE (TARGET_F_LINUX_SPECIFIC_BASE + 0) -#define TARGET_F_GETLEASE (TARGET_F_LINUX_SPECIFIC_BASE + 1) -#define TARGET_F_DUPFD_CLOEXEC (TARGET_F_LINUX_SPECIFIC_BASE + 6) -#define TARGET_F_SETPIPE_SZ (TARGET_F_LINUX_SPECIFIC_BASE + 7) -#define TARGET_F_GETPIPE_SZ (TARGET_F_LINUX_SPECIFIC_BASE + 8) -#define TARGET_F_NOTIFY (TARGET_F_LINUX_SPECIFIC_BASE+2) +#define TARGET_F_SETLEASE (TARGET_F_LINUX_SPECIFIC_BASE + 0) +#define TARGET_F_GETLEASE (TARGET_F_LINUX_SPECIFIC_BASE + 1) +#define TARGET_F_DUPFD_CLOEXEC (TARGET_F_LINUX_SPECIFIC_BASE + 6) +#define TARGET_F_NOTIFY (TARGET_F_LINUX_SPECIFIC_BASE + 2) +#define TARGET_F_SETPIPE_SZ (TARGET_F_LINUX_SPECIFIC_BASE + 7) +#define TARGET_F_GETPIPE_SZ (TARGET_F_LINUX_SPECIFIC_BASE + 8) +#define TARGET_F_ADD_SEALS (TARGET_F_LINUX_SPECIFIC_BASE + 9) +#define TARGET_F_GET_SEALS (TARGET_F_LINUX_SPECIFIC_BASE + 10) #include "target_fcntl.h" From patchwork Thu Jan 21 12:38:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1429779 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: 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=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DM2712n43z9sW4 for ; Thu, 21 Jan 2021 23:40:41 +1100 (AEDT) Received: from localhost ([::1]:53774 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l2ZGP-0006fj-HH for incoming@patchwork.ozlabs.org; Thu, 21 Jan 2021 07:40:37 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40162) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l2ZEq-0006dU-I4 for qemu-devel@nongnu.org; Thu, 21 Jan 2021 07:39:00 -0500 Received: from mout.kundenserver.de ([212.227.126.187]:56899) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l2ZEo-0007OO-SI for qemu-devel@nongnu.org; Thu, 21 Jan 2021 07:39:00 -0500 Received: from localhost.localdomain ([82.252.149.54]) by mrelayeu.kundenserver.de (mreue009 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MnJdE-1lllLQ2nvY-00jMAK; Thu, 21 Jan 2021 13:38:56 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 2/5] linux-user: add missing UDP get/setsockopt option Date: Thu, 21 Jan 2021 13:38:49 +0100 Message-Id: <20210121123852.91187-3-laurent@vivier.eu> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210121123852.91187-1-laurent@vivier.eu> References: <20210121123852.91187-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:05h2J2B8rFDDKxxhXb4J+rl7rekDMDov2+sk/QgjW+vNPM6ThEn bCcpoLtzYc0BhcPlcQ0XpdFgD2e0tftFkt5vMBfIVaIqubYdzJTbFK815FpjQGriNbeaDHf BplnD7RWcZShoF4EWVG4hadg/o0LFltS7zhEauMwx9CcBek5IpdKmYDscJFdc3fCA2hk2Dl mzIQ+BdIk7q4pnNzZRx0w== X-UI-Out-Filterresults: notjunk:1;V03:K0:ummW5OCjQ1U=:AGQBGTS2G7wOunSYrebkWk cHatBp4D5O9w0ZIRic12UNV17jUKYn86sNFy5o5fl4FuhsnAcdFbt5e4jYV+rA39ApKn+MezL pKHeA498i3XYyN08F/U5gB1/y0vwaTIjgulESthlN9+urC6bkkng2HeyO1U6CieRlWro1zC1k A4TTjS/Gt7XnXGl3xrhFO3nk9PSBpl4JQRmkJPsk3IguNsFDSeAKfD/gPEYmBK26c0dciPKxV vmzn1VgEWeZ0lQqEgnk0wxkkMkvsLcus1VD3FeOtZSOUswHyPZKIyQWvisrRk21u6KgWKz8MD m3b1SBk0+HaHOMyoUeRxmbjvzGR79MhpZjwLmHRrnQY0cp4ZqkrMdK1Za8CB2jm8IfrQxjmj6 KsxJiTpf9POV8cXP78YUqI0M05iPwj2JML56Qk1tFwFAVqn4JDpLYX7SfSep3 Received-SPF: none client-ip=212.227.126.187; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de 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, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Shu-Chun Weng Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Shu-Chun Weng SOL_UDP manipulate options at UDP level. All six options currently defined in linux source include/uapi/linux/udp.h take integer values. Signed-off-by: Shu-Chun Weng Reviewed-by: Laurent Vivier Message-Id: <20201218193213.3566856-3-scw@google.com> Signed-off-by: Laurent Vivier --- linux-user/strace.c | 6 ++++++ linux-user/syscall.c | 7 +++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/linux-user/strace.c b/linux-user/strace.c index 227812c07e63..64172de99d98 100644 --- a/linux-user/strace.c +++ b/linux-user/strace.c @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include @@ -2644,6 +2645,11 @@ static void do_print_sockopt(const char *name, abi_long arg1) print_raw_param(TARGET_ABI_FMT_ld, optname, 0); print_pointer(optval, 0); break; + case SOL_UDP: + qemu_log("SOL_UDP,"); + print_raw_param(TARGET_ABI_FMT_ld, optname, 0); + print_pointer(optval, 0); + break; case SOL_IP: qemu_log("SOL_IP,"); print_raw_param(TARGET_ABI_FMT_ld, optname, 0); diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 98aaca01872f..969db2008104 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -53,6 +53,7 @@ //#include #include #include +#include #include #include #include @@ -2184,7 +2185,8 @@ static abi_long do_setsockopt(int sockfd, int level, int optname, switch(level) { case SOL_TCP: - /* TCP options all take an 'int' value. */ + case SOL_UDP: + /* TCP and UDP options all take an 'int' value. */ if (optlen < sizeof(uint32_t)) return -TARGET_EINVAL; @@ -2832,7 +2834,8 @@ get_timeout: } break; case SOL_TCP: - /* TCP options all take an 'int' value. */ + case SOL_UDP: + /* TCP and UDP options all take an 'int' value. */ int_case: if (get_user_u32(len, optlen)) return -TARGET_EFAULT; From patchwork Thu Jan 21 12:38:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1429810 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: 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=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DM2KT07sRz9sWk for ; Thu, 21 Jan 2021 23:49:49 +1100 (AEDT) Received: from localhost ([::1]:38460 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l2ZPG-0004Cf-Vh for incoming@patchwork.ozlabs.org; Thu, 21 Jan 2021 07:49:47 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40220) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l2ZEu-0006jW-Cw for qemu-devel@nongnu.org; Thu, 21 Jan 2021 07:39:04 -0500 Received: from mout.kundenserver.de ([212.227.126.131]:53623) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l2ZEs-0007QR-Gn for qemu-devel@nongnu.org; Thu, 21 Jan 2021 07:39:03 -0500 Received: from localhost.localdomain ([82.252.149.54]) by mrelayeu.kundenserver.de (mreue009 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MBDva-1lAmy70WmE-00CmJ0; Thu, 21 Jan 2021 13:38:57 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 3/5] linux-user: add missing IPv6 get/setsockopt option Date: Thu, 21 Jan 2021 13:38:50 +0100 Message-Id: <20210121123852.91187-4-laurent@vivier.eu> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210121123852.91187-1-laurent@vivier.eu> References: <20210121123852.91187-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:UfDgn/V84wVgz/0m9gpHWTHbi5c1g9r/mC8hZ+r6KNr1ysSwBX9 LAuFD62VoqDCIn79aEeqSwe+tNeHmPsD+TEv44/vzKjZIkWQXv0I8k0P6DamP76WQtdEumV xpyLOVHbgTkHf38YXNlx6tx27N/pzn94+mLSSG0CLCOeVdKpDH88eT81HEMIxd0jptss+LI VQRXeVeI8ddyDGpQ6tfDw== X-UI-Out-Filterresults: notjunk:1;V03:K0:voalCCUVyM0=:dKJasTO5QxMP+BVZHCqSzJ WGY92pCzaycc3PxhIgX3DOu6onfeT5P3tNBuSW67LuCHYEk9tknvlcK4YxJLV3d6OlRrv76Rn oaEhpBTjnZkyfGYPqGwBfpHxY4QrEn8Amxz4gV26MKcRR7JQ9z2t0Rym9jTLqdT6FH9SGQsKk 7si3jEG+CMIN9hWt79cr7Eln6Uu96FExcn4twSsCjZmC/g2zBiq73a2ZOD7tQBdUA7+Vp9A8F D4FUY2vMw4L+yN8H1tv4DfUbjRH+d5c083uTS86XCwQXvkZf/nPZ9KS0Oc0foNIsyilZCmriY UB4c//zSEwJyBIKUYcyBidHdlXxZ+oYkVz48lwAmgmGjbtdpAW3HBp9xDJ4zZXb4u7WqExrSS +6ONhHa8RvRamZxF81cnHzMl1X6CXHhavAGIk4NUJHwwD4/GI6g+5GoCnMkQZBjTwTXEGMyMt 6COnrajNrQ== Received-SPF: none client-ip=212.227.126.131; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de 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, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Laurent Vivier , Shu-Chun Weng Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Shu-Chun Weng IPV6_ADDR_PREFERENCES (RFC5014: Source address selection) was not supported. Signed-off-by: Shu-Chun Weng Reviewed-by: Laurent Vivier Message-Id: <20201218193213.3566856-4-scw@google.com> [PMD: Add missing include for IPV6_ADDR_PREFERENCES] Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Laurent Vivier --- linux-user/syscall.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 969db2008104..5d482dcbefd6 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -51,6 +51,7 @@ #include #include //#include +#include #include #include #include @@ -58,6 +59,7 @@ #include #include #include +#include #include #include #ifdef CONFIG_TIMERFD @@ -2272,6 +2274,7 @@ static abi_long do_setsockopt(int sockfd, int level, int optname, case IPV6_RECVDSTOPTS: case IPV6_2292DSTOPTS: case IPV6_TCLASS: + case IPV6_ADDR_PREFERENCES: #ifdef IPV6_RECVPATHMTU case IPV6_RECVPATHMTU: #endif @@ -2926,6 +2929,7 @@ get_timeout: case IPV6_RECVDSTOPTS: case IPV6_2292DSTOPTS: case IPV6_TCLASS: + case IPV6_ADDR_PREFERENCES: #ifdef IPV6_RECVPATHMTU case IPV6_RECVPATHMTU: #endif From patchwork Thu Jan 21 12:38:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1429807 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: 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=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DM2Dl5LKwz9sVF for ; Thu, 21 Jan 2021 23:45:43 +1100 (AEDT) Received: from localhost ([::1]:60150 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l2ZLH-00016E-Jh for incoming@patchwork.ozlabs.org; Thu, 21 Jan 2021 07:45:39 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40222) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l2ZEu-0006jc-UY for qemu-devel@nongnu.org; Thu, 21 Jan 2021 07:39:05 -0500 Received: from mout.kundenserver.de ([212.227.126.133]:38657) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l2ZEq-0007PA-1y for qemu-devel@nongnu.org; Thu, 21 Jan 2021 07:39:04 -0500 Received: from localhost.localdomain ([82.252.149.54]) by mrelayeu.kundenserver.de (mreue009 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MiJhW-1lhvs726li-00fS8g; Thu, 21 Jan 2021 13:38:57 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 4/5] linux-user: Add IPv6 options to do_print_sockopt() Date: Thu, 21 Jan 2021 13:38:51 +0100 Message-Id: <20210121123852.91187-5-laurent@vivier.eu> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210121123852.91187-1-laurent@vivier.eu> References: <20210121123852.91187-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:JD7SgQgJyw8pIIelnmQIf+QImVqKmplofngE3GnwPZ48vKXGw78 hSwWxAzGRWUJ9OO1s1h916gpmRr1muvwrqWcdyFdIta6sjqfzuu94R3kSPcfAwDOCw2j8QX j0zR9zkfizXh+e0i6UF14nvtNczUKvw9i7/2v4tMxdGWb1PK0tcZt/JMm8nFvJmnJVyJ8Pr nH4CjS5Ir3FoT3AvshzBg== X-UI-Out-Filterresults: notjunk:1;V03:K0:6BmlkWRVFp0=:XfDOCeq+30kNEd9SMXzB5b gL7FH8A1EVxxS2hmDJDAQoIw5Nuhibq0itDq5ILCGJCpbdMU5rb0pwxkgPCsFZ4/NJo/V61Px Q4hgcl5eZ40YWIlXFywJab4fMMpi0+VNg9a45uZvU3vCwdY0atY5qclV/3A5/YQQQghfwDGYW KBNwJq/zhmepgANrHixjyVLaMkH/jIn7Si3Ok/IC0ICoLUZcjC+5Tj8OTKhDX2IPo2RgJ+v3V 5v5LclEv2SmX9tlYmeVN/FVORtic2u92EmSO/DqpEy7eGWk0XvYQAs/zxTh6Irnk88ctcAwbW G7TCAJ8Tpm9P8sVc1TBMsWVcv140M1Oi1D8mfPQLn8ycOz61j8YqIC7ndBwc/gDL81SohaYWL +76OnhdUs1AxyznLFabkHW8Bx096y9JLor2uI5nrCLSyPCa4W4ERkSBws2rOu Received-SPF: none client-ip=212.227.126.133; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de 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, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Shu-Chun Weng Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Shu-Chun Weng Signed-off-by: Shu-Chun Weng Reviewed-by: Laurent Vivier Message-Id: <20201218193213.3566856-5-scw@google.com> [lv: Add missing include for IPV6_ADDR_PREFERENCES] Signed-off-by: Laurent Vivier --- linux-user/strace.c | 109 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 109 insertions(+) diff --git a/linux-user/strace.c b/linux-user/strace.c index 64172de99d98..e969121b6cd7 100644 --- a/linux-user/strace.c +++ b/linux-user/strace.c @@ -6,9 +6,11 @@ #include #include #include +#include #include #include #include +#include #include #include #include "qemu.h" @@ -2761,6 +2763,113 @@ print_optint: break; } break; + case SOL_IPV6: + qemu_log("SOL_IPV6,"); + switch (optname) { + case IPV6_MTU_DISCOVER: + qemu_log("IPV6_MTU_DISCOVER,"); + goto print_optint; + case IPV6_MTU: + qemu_log("IPV6_MTU,"); + goto print_optint; + case IPV6_V6ONLY: + qemu_log("IPV6_V6ONLY,"); + goto print_optint; + case IPV6_RECVPKTINFO: + qemu_log("IPV6_RECVPKTINFO,"); + goto print_optint; + case IPV6_UNICAST_HOPS: + qemu_log("IPV6_UNICAST_HOPS,"); + goto print_optint; + case IPV6_MULTICAST_HOPS: + qemu_log("IPV6_MULTICAST_HOPS,"); + goto print_optint; + case IPV6_MULTICAST_LOOP: + qemu_log("IPV6_MULTICAST_LOOP,"); + goto print_optint; + case IPV6_RECVERR: + qemu_log("IPV6_RECVERR,"); + goto print_optint; + case IPV6_RECVHOPLIMIT: + qemu_log("IPV6_RECVHOPLIMIT,"); + goto print_optint; + case IPV6_2292HOPLIMIT: + qemu_log("IPV6_2292HOPLIMIT,"); + goto print_optint; + case IPV6_CHECKSUM: + qemu_log("IPV6_CHECKSUM,"); + goto print_optint; + case IPV6_ADDRFORM: + qemu_log("IPV6_ADDRFORM,"); + goto print_optint; + case IPV6_2292PKTINFO: + qemu_log("IPV6_2292PKTINFO,"); + goto print_optint; + case IPV6_RECVTCLASS: + qemu_log("IPV6_RECVTCLASS,"); + goto print_optint; + case IPV6_RECVRTHDR: + qemu_log("IPV6_RECVRTHDR,"); + goto print_optint; + case IPV6_2292RTHDR: + qemu_log("IPV6_2292RTHDR,"); + goto print_optint; + case IPV6_RECVHOPOPTS: + qemu_log("IPV6_RECVHOPOPTS,"); + goto print_optint; + case IPV6_2292HOPOPTS: + qemu_log("IPV6_2292HOPOPTS,"); + goto print_optint; + case IPV6_RECVDSTOPTS: + qemu_log("IPV6_RECVDSTOPTS,"); + goto print_optint; + case IPV6_2292DSTOPTS: + qemu_log("IPV6_2292DSTOPTS,"); + goto print_optint; + case IPV6_TCLASS: + qemu_log("IPV6_TCLASS,"); + goto print_optint; + case IPV6_ADDR_PREFERENCES: + qemu_log("IPV6_ADDR_PREFERENCES,"); + goto print_optint; +#ifdef IPV6_RECVPATHMTU + case IPV6_RECVPATHMTU: + qemu_log("IPV6_RECVPATHMTU,"); + goto print_optint; +#endif +#ifdef IPV6_TRANSPARENT + case IPV6_TRANSPARENT: + qemu_log("IPV6_TRANSPARENT,"); + goto print_optint; +#endif +#ifdef IPV6_FREEBIND + case IPV6_FREEBIND: + qemu_log("IPV6_FREEBIND,"); + goto print_optint; +#endif +#ifdef IPV6_RECVORIGDSTADDR + case IPV6_RECVORIGDSTADDR: + qemu_log("IPV6_RECVORIGDSTADDR,"); + goto print_optint; +#endif + case IPV6_PKTINFO: + qemu_log("IPV6_PKTINFO,"); + print_pointer(optval, 0); + break; + case IPV6_ADD_MEMBERSHIP: + qemu_log("IPV6_ADD_MEMBERSHIP,"); + print_pointer(optval, 0); + break; + case IPV6_DROP_MEMBERSHIP: + qemu_log("IPV6_DROP_MEMBERSHIP,"); + print_pointer(optval, 0); + break; + default: + print_raw_param(TARGET_ABI_FMT_ld, optname, 0); + print_pointer(optval, 0); + break; + } + break; default: print_raw_param(TARGET_ABI_FMT_ld, level, 0); print_raw_param(TARGET_ABI_FMT_ld, optname, 0); From patchwork Thu Jan 21 12:38:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1429808 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: 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=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DM2H95rdWz9sWX for ; Thu, 21 Jan 2021 23:47:49 +1100 (AEDT) Received: from localhost ([::1]:34306 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l2ZNL-0002MP-R4 for incoming@patchwork.ozlabs.org; Thu, 21 Jan 2021 07:47:47 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40214) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l2ZEt-0006hV-A9 for qemu-devel@nongnu.org; Thu, 21 Jan 2021 07:39:03 -0500 Received: from mout.kundenserver.de ([212.227.126.130]:59289) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l2ZEr-0007PN-0x for qemu-devel@nongnu.org; Thu, 21 Jan 2021 07:39:03 -0500 Received: from localhost.localdomain ([82.252.149.54]) by mrelayeu.kundenserver.de (mreue009 [212.227.15.167]) with ESMTPSA (Nemesis) id 1N3bb1-1m2TNh26eh-010cAZ; Thu, 21 Jan 2021 13:38:58 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 5/5] linux-user: Remove obsolete F_SHLCK and F_EXLCK translation Date: Thu, 21 Jan 2021 13:38:52 +0100 Message-Id: <20210121123852.91187-6-laurent@vivier.eu> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210121123852.91187-1-laurent@vivier.eu> References: <20210121123852.91187-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:Sxs8zB1JX5txQwppMD9tf4Hes7Baw+GnarHYQ3YGYftHg9r7The F896el1np8VXlfMzJyAez6BVfnd6/1W2tJUTa8etGIoL7PZFgHxGYjaQp9kCRQRL4HLdPQA EPoOhJ/oaPA6BqZdfDP3A+6Ij0fzQbYb64xUEr/FyBhl3KJ4sJUVsLYOO4sFKA/S/FQMqr8 SV/J9rnA7NbjXptx6+iig== X-UI-Out-Filterresults: notjunk:1;V03:K0:hUTFT1TGc/w=:sijSqjUXzjksFp59dRjVLv fnVsH96u7z6ymdXwSwf8Ep/dgl4w6d4/w5t3ixJ8wyv40eFeK3QSeiO27A0PvBsu126rtVnyC 3hNj0u3CP1p76wsd2ImgCrI9A1IZOTqYrWJaH+TI91J9VUQO6jFSWiNu07KHTyx10SEuxpvIE jg6+R/6tSSP8Rqq2eqlIKGoje/HD4SMgaXskmiwTnE6O2VQlWPNCD9aeL9L3AUM5cTvX/+cyR rEw3696ScpF8A2YYajJPeo1Fmvp26HUaWPUrLQ9GGZ0VysilqKhYGQkgKXgmNwzZPbvX45gEa Gxrf3QFFbutL9DV24RwbPsRltDm/aR/ELNy9g1Ty9El6eJhKs9xzwdRGMVIJfFfbKM4ssQiV9 Vnrbnqask7DMLQuim4cfydMtn4HWO0JiIaHCeQUXIZxIKiMS7on8Bznr14lyDX5gqEVOBhECh /Bm0gZmutQ== Received-SPF: none client-ip=212.227.126.130; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de 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, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Michael Forney Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Michael Forney These lock types are unsupported by Linux since v2.2[0][1] and always return EINVAL (except on SPARC up until v2.6, which just warned). musl libc does not define these constants, so just remove them from the translation cases. [0] https://github.com/mpe/linux-fullhistory/blob/v2.2.0/fs/locks.c#L322-L324 [1] https://github.com/mpe/linux-fullhistory/blob/v2.2.0/fs/locks.c#L429-L445 Signed-off-by: Michael Forney Reviewed-by: Laurent Vivier Message-Id: <20210114223602.9004-1-mforney@mforney.org> Signed-off-by: Laurent Vivier --- linux-user/alpha/target_fcntl.h | 2 -- linux-user/generic/fcntl.h | 5 ----- linux-user/syscall.c | 2 -- 3 files changed, 9 deletions(-) diff --git a/linux-user/alpha/target_fcntl.h b/linux-user/alpha/target_fcntl.h index 2617e73472b7..e16ed1d4157f 100644 --- a/linux-user/alpha/target_fcntl.h +++ b/linux-user/alpha/target_fcntl.h @@ -33,8 +33,6 @@ #define TARGET_F_RDLCK 1 #define TARGET_F_WRLCK 2 #define TARGET_F_UNLCK 8 -#define TARGET_F_EXLCK 16 -#define TARGET_F_SHLCK 32 #include "../generic/fcntl.h" #endif diff --git a/linux-user/generic/fcntl.h b/linux-user/generic/fcntl.h index c85c5b9fed65..4568d1f42bdd 100644 --- a/linux-user/generic/fcntl.h +++ b/linux-user/generic/fcntl.h @@ -119,11 +119,6 @@ struct target_f_owner_ex { #define TARGET_F_UNLCK 2 #endif -#ifndef TARGET_F_EXLCK -#define TARGET_F_EXLCK 4 -#define TARGET_F_SHLCK 8 -#endif - #ifndef TARGET_HAVE_ARCH_STRUCT_FLOCK #ifndef TARGET_ARCH_FLOCK_PAD #define TARGET_ARCH_FLOCK_PAD diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 5d482dcbefd6..34760779c8ec 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -6679,8 +6679,6 @@ static int target_to_host_fcntl_cmd(int cmd) TRANSTBL_CONVERT(F_RDLCK); \ TRANSTBL_CONVERT(F_WRLCK); \ TRANSTBL_CONVERT(F_UNLCK); \ - TRANSTBL_CONVERT(F_EXLCK); \ - TRANSTBL_CONVERT(F_SHLCK); \ } static int target_to_host_flock(int type)