From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 7E4DBC77B6F for ; Tue, 11 Apr 2023 17:12:53 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pmHWQ-00044p-5J; Tue, 11 Apr 2023 13:11:10 -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 1pmHVu-0003rG-Ar for qemu-devel@nongnu.org; Tue, 11 Apr 2023 13:10:39 -0400 Received: from mail-il1-x133.google.com ([2607:f8b0:4864:20::133]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pmHVr-000695-Vw for qemu-devel@nongnu.org; Tue, 11 Apr 2023 13:10:38 -0400 Received: by mail-il1-x133.google.com with SMTP id k7so14954801ils.3 for ; Tue, 11 Apr 2023 10:10:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20210112.gappssmtp.com; s=20210112; t=1681233033; 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=mO99b13qRlgHCWdPhSoOiqyC95aMtsRkFEpbNDXSAnY=; b=XA+nTkNuoJ/IRdvg5+dOAudm0mL0auajydllO+jSw27Yr3Rjsxet1PSgawT7eLSVca y3uDYQM/q2rG08tGz/sef1tknO8xzZWoa9/viZjKdxNMqF06kn+QjgQdf0BjktgVz7/+ Kn+ENtBIqaehk/2RtogZJafm82X0ZT+9m4LvJADmzQxruMSsF6QqTips538p+gdvoC7+ qvJ/GLTAZkKkIlNPopJmPUQWB5FXxzK91LOMJk6Gz0XHJqZu/Dj8iNTP/OcT1V9u3J2+ zCJ+MGvSNB+tzk7bH/8BXu55Hb6baB6KCb72JZUo3oZ7UNYuYv3jm4u16Y6A34trmYpc hHKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1681233033; 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=mO99b13qRlgHCWdPhSoOiqyC95aMtsRkFEpbNDXSAnY=; b=0F5eFDg0Y/KqwQDrMC3UMqSJe71/gDTKjVEjN9MMLUoNu4nuy2iL0X/2sbb11DZPyg ovOJdnjvL8zkbFtBfKjXasGnDep54cynYV7nVNnTpJGnMpugO3pTGTM3kZNqvzF+/3qP QzwyVgkAx5hNIV2VCMO3B9OGRxujR6grhtUAT6W0kUq+hTGyOO6D8e/7u8aEtCGw9y+P VvVsgjhn/XQr5JmL8go3quh39Ddjf2FON9fkhVDHL3qEpgCRHSRgbxcpMjNdm5eHU2YO 2n7CE8zzeIp+vJUecy8ChIXSb6ael/zEUK2SrJZ/9ra98+Nup29Oi1drGsFrBZW6jR5H w+Dw== X-Gm-Message-State: AAQBX9fc/kXn3RLdWAY02CzNwzW10fl3btm2Jp3VDeonCkfbJbGuwa+l Af9lWv6RoGzW0B9+W3IsAwWx/k9j22y8I5pMy14= X-Google-Smtp-Source: AKy350bnVLrRazpuCubAMTa2TCAwFWhy1PkmvrDFxju1VPY4JNbAwltY2r/5PtB+BVskYxM+HOfleA== X-Received: by 2002:a92:4a10:0:b0:326:53bc:7817 with SMTP id m16-20020a924a10000000b0032653bc7817mr8643236ilf.17.1681233033552; Tue, 11 Apr 2023 10:10:33 -0700 (PDT) Received: from dune.bsdimp.com (c-71-237-47-177.hsd1.co.comcast.net. [71.237.47.177]) by smtp.gmail.com with ESMTPSA id d36-20020a0285a7000000b0040b11b7ef54sm4140942jai.39.2023.04.11.10.10.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Apr 2023 10:10:33 -0700 (PDT) From: Warner Losh To: qemu-devel@nongnu.org Cc: ryoon@netbsd.org, kevans@freebsd.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth , riastradh@netbsd.org, brad@comstyle.com, reinoud@netbsd.org, jrtc27@jrtc27.com, =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini , Warner Losh , Stacey Son , Richard Henderson Subject: [PATCH v3 11/20] bsd-user: Implement do_sysctl_kern_proc_filedesc Date: Tue, 11 Apr 2023 11:09:46 -0600 Message-Id: <20230411170955.17358-12-imp@bsdimp.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230411170955.17358-1-imp@bsdimp.com> References: <20230411170955.17358-1-imp@bsdimp.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: none client-ip=2607:f8b0:4864:20::133; envelope-from=imp@bsdimp.com; helo=mail-il1-x133.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, RCVD_IN_DNSWL_NONE=-0.0001, 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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: Stacey Son Implement do_sysctl_kern_proc_filedesc. This pulls kern.proc.filedesc out of the host kernel and converts it to the guest's format. Signed-off-by: Stacey Son Signed-off-by: Warner Losh Reviewed-by: Richard Henderson --- bsd-user/freebsd/os-sys.c | 193 ++++++++++++++++++++++++++++++++++++++ bsd-user/qemu.h | 3 + 2 files changed, 196 insertions(+) diff --git a/bsd-user/freebsd/os-sys.c b/bsd-user/freebsd/os-sys.c index d4a6dcc6c2b..00b2dcc9641 100644 --- a/bsd-user/freebsd/os-sys.c +++ b/bsd-user/freebsd/os-sys.c @@ -270,6 +270,199 @@ do_sysctl_kern_getprocs(int op, int arg, size_t olen, return ret; } +static void +host_to_target_kinfo_file(struct target_kinfo_file *tkif, + struct kinfo_file *hkif) +{ + int type = hkif->kf_type; + + __put_user(hkif->kf_structsize, &tkif->kf_structsize); + __put_user(hkif->kf_type, &tkif->kf_type); + __put_user(hkif->kf_fd, &tkif->kf_fd); + __put_user(hkif->kf_ref_count, &tkif->kf_ref_count); + __put_user(hkif->kf_flags, &tkif->kf_flags); + __put_user(hkif->kf_offset, &tkif->kf_offset); + switch (type) { + case TARGET_KF_TYPE_FIFO: + case TARGET_KF_TYPE_SHM: + case TARGET_KF_TYPE_VNODE: + __put_user(hkif->kf_un.kf_file.kf_file_type, + &tkif->kf_un.kf_file.kf_file_type); + __put_user(hkif->kf_un.kf_file.kf_file_fsid, + &tkif->kf_un.kf_file.kf_file_fsid); + __put_user(hkif->kf_un.kf_file.kf_file_rdev, + &tkif->kf_un.kf_file.kf_file_rdev); + __put_user(hkif->kf_un.kf_file.kf_file_fileid, + &tkif->kf_un.kf_file.kf_file_fileid); + __put_user(hkif->kf_un.kf_file.kf_file_size, + &tkif->kf_un.kf_file.kf_file_size); + __put_user(hkif->kf_un.kf_file.kf_file_fsid_freebsd11, + &tkif->kf_un.kf_file.kf_file_fsid_freebsd11); + __put_user(hkif->kf_un.kf_file.kf_file_rdev_freebsd11, + &tkif->kf_un.kf_file.kf_file_rdev_freebsd11); + __put_user(hkif->kf_un.kf_file.kf_file_mode, + &tkif->kf_un.kf_file.kf_file_mode); + break; + + case TARGET_KF_TYPE_SOCKET: + __put_user(hkif->kf_un.kf_sock.kf_sock_domain0, + &tkif->kf_un.kf_sock.kf_sock_domain0); + __put_user(hkif->kf_un.kf_sock.kf_sock_type0, + &tkif->kf_un.kf_sock.kf_sock_type0); + __put_user(hkif->kf_un.kf_sock.kf_sock_protocol0, + &tkif->kf_un.kf_sock.kf_sock_protocol0); +/* XXX - Implement copy function for sockaddr_storage + host_to_target_copy_sockaddr_storage( + &hkif->kf_un.kf_file.kf_sa_local, + &kif->kf_un.kf_file.kf_sa_local); + host_to_target_copy_sockaddr_storage( + &hkif->kf_un.kf_file.kf_sa_peer, + &kif->kf_un.kf_file.kf_sa_peer); +*/ + __put_user(hkif->kf_un.kf_sock.kf_sock_pcb, + &tkif->kf_un.kf_sock.kf_sock_pcb); + __put_user(hkif->kf_un.kf_sock.kf_sock_inpcb, + &tkif->kf_un.kf_sock.kf_sock_inpcb); + __put_user(hkif->kf_un.kf_sock.kf_sock_unpconn, + &tkif->kf_un.kf_sock.kf_sock_unpconn); + __put_user(hkif->kf_un.kf_sock.kf_sock_snd_sb_state, + &tkif->kf_un.kf_sock.kf_sock_snd_sb_state); + __put_user(hkif->kf_un.kf_sock.kf_sock_rcv_sb_state, + &tkif->kf_un.kf_sock.kf_sock_rcv_sb_state); + break; + + case TARGET_KF_TYPE_PIPE: + __put_user(hkif->kf_un.kf_pipe.kf_pipe_addr, + &tkif->kf_un.kf_pipe.kf_pipe_addr); + __put_user(hkif->kf_un.kf_pipe.kf_pipe_peer, + &tkif->kf_un.kf_pipe.kf_pipe_peer); + __put_user(hkif->kf_un.kf_pipe.kf_pipe_buffer_cnt, + &tkif->kf_un.kf_pipe.kf_pipe_buffer_cnt); + break; + + case TARGET_KF_TYPE_SEM: + __put_user(hkif->kf_un.kf_sem.kf_sem_value, + &tkif->kf_un.kf_sem.kf_sem_value); + __put_user(hkif->kf_un.kf_sem.kf_sem_mode, + &tkif->kf_un.kf_sem.kf_sem_mode); + break; + + case TARGET_KF_TYPE_PTS: + __put_user(hkif->kf_un.kf_pts.kf_pts_dev_freebsd11, + &tkif->kf_un.kf_pts.kf_pts_dev_freebsd11); + __put_user(hkif->kf_un.kf_pts.kf_pts_dev, + &tkif->kf_un.kf_pts.kf_pts_dev); + break; + + case TARGET_KF_TYPE_PROCDESC: + __put_user(hkif->kf_un.kf_proc.kf_pid, + &tkif->kf_un.kf_proc.kf_pid); + break; + + + case TARGET_KF_TYPE_CRYPTO: + case TARGET_KF_TYPE_KQUEUE: + case TARGET_KF_TYPE_MQUEUE: + case TARGET_KF_TYPE_NONE: + case TARGET_KF_TYPE_UNKNOWN: + default: + /* Do nothing. */ + break; + } + __put_user(hkif->kf_status, &tkif->kf_status); + for (int i = 0; i < (CAP_RIGHTS_VERSION + 2); i++) + __put_user(hkif->kf_cap_rights.cr_rights[i], + &tkif->kf_cap_rights.cr_rights[i]); + strncpy(tkif->kf_path, hkif->kf_path, sizeof(tkif->kf_path)); +} + +abi_long +do_sysctl_kern_proc_filedesc(int pid, size_t olen, + struct target_kinfo_file *tkif, size_t *tlen) +{ + abi_long ret; + int mib[4], sz; + size_t len; + char *buf, *bp, *eb, *tp; + struct kinfo_file *kf, kif; + struct target_kinfo_file target_kif; + + if (tlen == NULL) { + return -TARGET_EINVAL; + } + + len = 0; + mib[0] = CTL_KERN; + mib[1] = KERN_PROC; + mib[2] = KERN_PROC_FILEDESC; + mib[3] = pid; + + ret = get_errno(sysctl(mib, 4, NULL, &len, NULL, 0)); + if (is_error(ret)) { + return ret; + } + if (tkif == NULL) { + *tlen = len; + return ret; + } + len = len * 4 / 3; + buf = g_malloc(len); + if (buf == NULL) { + return -TARGET_ENOMEM; + } + + /* + * Count the number of records. + * + * Given that the kinfo_file information returned by + * the kernel may be different sizes per record we have + * to read it in and count the variable length records + * by walking them. + */ + ret = get_errno(sysctl(mib, 4, buf, &len, NULL, 0)); + if (is_error(ret)) { + g_free(buf); + return ret; + } + *tlen = len; + bp = buf; + eb = buf + len; + while (bp < eb) { + kf = (struct kinfo_file *)(uintptr_t)bp; + bp += kf->kf_structsize; + } + if (olen < *tlen) { + g_free(buf); + return -TARGET_EINVAL; + } + + /* + * Unpack the records from the kernel into full length records + * and byte swap, if needed. + */ + bp = buf; + eb = buf + len; + tp = (char *)tkif; + while (bp < eb) { + kf = (struct kinfo_file *)(uintptr_t)bp; + sz = kf->kf_structsize; + /* Copy/expand into a zeroed buffer */ + memset(&kif, 0, sizeof(kif)); + memcpy(&kif, kf, sz); + /* Byte swap and copy into a target buffer. */ + host_to_target_kinfo_file(&target_kif, &kif); + /* Copy target buffer to user buffer and pack */ + memcpy(tp, &target_kif, sz); + /* Advance to next packed record. */ + bp += sz; + /* Advance to next packed, target record. */ + tp += sz; + } + + g_free(buf); + return ret; +} + /* * This uses the undocumented oidfmt interface to find the kind of a requested * sysctl, see /sys/kern/kern_sysctl.c:sysctl_sysctl_oidfmt() (compare to diff --git a/bsd-user/qemu.h b/bsd-user/qemu.h index fcaf794ad6e..5926bdcc101 100644 --- a/bsd-user/qemu.h +++ b/bsd-user/qemu.h @@ -259,8 +259,11 @@ int host_to_target_errno(int err); /* os-sys.c */ struct target_kinfo_proc; +struct target_kinfo_file; abi_long do_sysctl_kern_getprocs(int op, int arg, size_t olen, struct target_kinfo_proc *tki, size_t *tlen); +abi_long do_sysctl_kern_proc_filedesc(int pid, size_t olen, + struct target_kinfo_file *tkif, size_t *tlen); abi_long do_freebsd_sysctl(CPUArchState *env, abi_ulong namep, int32_t namelen, abi_ulong oldp, abi_ulong oldlenp, abi_ulong newp, abi_ulong newlen); abi_long do_freebsd_sysctlbyname(CPUArchState *env, abi_ulong namep, -- 2.40.0