From nobody Fri Jun 17 19:41:05 2022 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 6925285D6CC; Fri, 17 Jun 2022 19:41:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LPqCk0kLNz3j3X; Fri, 17 Jun 2022 19:41:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494866; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JdsFRH3bxqFWjHCC6rjrXbd71TmYafytzSzNt1i2se0=; b=vq+v2yksRE0oSn5E3Gfr3QXU2tw/ovEWTbjBB9iewrU9aOJGOD3XIln/n7RLcEalzCoFE6 Bbe8gDk+TqH1wPijsDmHO1XOESINzio81q/v/j2ySAZBG0lKoyWI7gsQqHkpZ1kLGIxR5Y HXc1Y8fNtFT7106trNUcsuJD95PJnkPs7zsIM3voYFAQqSKfK2O44E838PUGj4R66h5tkb /yV7C3ygbV/apxhft5OSGMvSH1ZuOAxh7xIFD1BVoJr02sffh1gBxVbCPFohcxwzJ1BBxZ wNXwDFYZm0CnVGctEz6p1J8qMGf7Lr9CFAlBQttw3rQ/L5WXPNR1fGgJLWEezA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 631FB259DA; Fri, 17 Jun 2022 19:41:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 25HJf5DS030011; Fri, 17 Jun 2022 19:41:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25HJf58c030010; Fri, 17 Jun 2022 19:41:05 GMT (envelope-from git) Date: Fri, 17 Jun 2022 19:41:05 GMT Message-Id: <202206171941.25HJf58c030010@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: 089a76e915e1 - stable/13 - Finish cpuset_getaffinity() after f35093f8 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 089a76e915e13446ed09d0c9854474461c398389 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494866; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JdsFRH3bxqFWjHCC6rjrXbd71TmYafytzSzNt1i2se0=; b=q9boaKYlMYMbiJf9ljgl4QhsFPlvV2ETBmSji/iHZ/I7dJwSzflm3ReiPnZfb6GJzLgH3c j7y27V6/ga0yUTEr4sORExekXghhtKKTkHPp35Ajdtl1epPv9zjQykhlDeQiWvKpmRQVbt Hl3i588fiWXGkHxqeLGkuMqfYqd0pEvqEaDHfM+vqG+gDjf74625apodAbnltjATV7IpfW L7tv7owNXVgEjSx8RE8IhkTbQj0Jabf5bq103AfvIyRyBi35mSxjLzKcCB/pD1DjdoE9RB fd5jeO9FATf5KjMqe5y7hldM2wyTZCVuvOCns/dXBW6175pbaV+BXDDz2BAvuA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655494866; a=rsa-sha256; cv=none; b=gExccogf059uGg35Nw6In8410SFa43SN3UmslaKpWYx9fdhMirtjJbSsm9ntugnXxlaDq7 x57HF5j3MtbUO3fNyxCmWcegpmVuddtDbumOTcYAddBTh8n9wWC7ZTnmJJLcs1piUgu5v0 NWFqxF94EqO8VOtlK6dGOCRRL8TSj9+boTY03vDqrRE2PZYJ0+wvJ1Mh9eVg5+Xr1fwDIx ksfSQbyILat7ESGC/6n5iPdv7ekq1tencjSWZwmFKm/6xDXcGDYTZRzdfKLW7wEreVcJ+s 1rJ/cFjfN3NqvRyi77YnG8qKDqXVFCS3+DnXPYErmYfNC2RfnKWQt9vz0yP12Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=089a76e915e13446ed09d0c9854474461c398389 commit 089a76e915e13446ed09d0c9854474461c398389 Author: Dmitry Chagin AuthorDate: 2022-05-28 17:53:08 +0000 Commit: Dmitry Chagin CommitDate: 2022-06-17 19:35:31 +0000 Finish cpuset_getaffinity() after f35093f8 Split cpuset_getaffinity() into a two counterparts, where the user_cpuset_getaffinity() is intended to operate on the cpuset_t from user va, while kern_cpuset_getaffinity() expects the cpuset from kernel va. Accordingly, the code that clears the high bits is moved to the user_cpuset_getaffinity(). Linux sched_getaffinity() syscall returns the size of set copied to the user-space and then glibc wrapper clears the high bits. MFC after: 2 weeks (cherry picked from commit d46174cd8838b86b9fe956b80c82bd238c302b2e) --- sys/compat/freebsd32/freebsd32_misc.c | 2 +- sys/compat/linux/linux_misc.c | 17 ++++++------- sys/kern/kern_cpuset.c | 45 +++++++++++++++++++++-------------- sys/sys/syscallsubr.h | 4 +++- 4 files changed, 40 insertions(+), 28 deletions(-) diff --git a/sys/compat/freebsd32/freebsd32_misc.c b/sys/compat/freebsd32/freebsd32_misc.c index 9b54653d4489..14f2e2a4b752 100644 --- a/sys/compat/freebsd32/freebsd32_misc.c +++ b/sys/compat/freebsd32/freebsd32_misc.c @@ -3311,7 +3311,7 @@ freebsd32_cpuset_getaffinity(struct thread *td, struct freebsd32_cpuset_getaffinity_args *uap) { - return (kern_cpuset_getaffinity(td, uap->level, uap->which, + return (user_cpuset_getaffinity(td, uap->level, uap->which, PAIR32TO64(id_t,uap->id), uap->cpusetsize, uap->mask, &cpuset_copy32_cb)); } diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c index bffef4c838dd..64e6b03c5451 100644 --- a/sys/compat/linux/linux_misc.c +++ b/sys/compat/linux/linux_misc.c @@ -2241,11 +2241,6 @@ linux_sched_getparam(struct thread *td, return (error); } -static const struct cpuset_copy_cb copy_set = { - .cpuset_copyin = copyin, - .cpuset_copyout = copyout -}; - /* * Get affinity of a process. */ @@ -2254,6 +2249,8 @@ linux_sched_getaffinity(struct thread *td, struct linux_sched_getaffinity_args *args) { struct thread *tdt; + cpuset_t *mask; + size_t size; int error; id_t tid; @@ -2263,13 +2260,17 @@ linux_sched_getaffinity(struct thread *td, tid = tdt->td_tid; PROC_UNLOCK(tdt->td_proc); + mask = malloc(sizeof(cpuset_t), M_LINUX, M_WAITOK | M_ZERO); + size = min(args->len, sizeof(cpuset_t)); error = kern_cpuset_getaffinity(td, CPU_LEVEL_WHICH, CPU_WHICH_TID, - tid, args->len, (cpuset_t *)args->user_mask_ptr, ©_set); + tid, size, mask); if (error == ERANGE) error = EINVAL; + if (error == 0) + error = copyout(mask, args->user_mask_ptr, size); if (error == 0) - td->td_retval[0] = min(args->len, sizeof(cpuset_t)); - + td->td_retval[0] = size; + free(mask, M_LINUX); return (error); } diff --git a/sys/kern/kern_cpuset.c b/sys/kern/kern_cpuset.c index a5c644687241..0670d9a046a7 100644 --- a/sys/kern/kern_cpuset.c +++ b/sys/kern/kern_cpuset.c @@ -1888,29 +1888,26 @@ int sys_cpuset_getaffinity(struct thread *td, struct cpuset_getaffinity_args *uap) { - return (kern_cpuset_getaffinity(td, uap->level, uap->which, + return (user_cpuset_getaffinity(td, uap->level, uap->which, uap->id, uap->cpusetsize, uap->mask, ©_set)); } int kern_cpuset_getaffinity(struct thread *td, cpulevel_t level, cpuwhich_t which, - id_t id, size_t cpusetsize, cpuset_t *maskp, const struct cpuset_copy_cb *cb) + id_t id, size_t cpusetsize, cpuset_t *mask) { struct thread *ttd; struct cpuset *nset; struct cpuset *set; struct proc *p; - cpuset_t *mask; int error; - size_t size; error = cpuset_check_capabilities(td, level, which, id); if (error != 0) return (error); - mask = malloc(sizeof(cpuset_t), M_TEMP, M_WAITOK | M_ZERO); error = cpuset_which(which, id, &p, &ttd, &set); - if (error) - goto out; + if (error != 0) + return (error); switch (level) { case CPU_LEVEL_ROOT: case CPU_LEVEL_CPUSET: @@ -1928,8 +1925,7 @@ kern_cpuset_getaffinity(struct thread *td, cpulevel_t level, cpuwhich_t which, case CPU_WHICH_INTRHANDLER: case CPU_WHICH_ITHREAD: case CPU_WHICH_DOMAIN: - error = EINVAL; - goto out; + return (EINVAL); } if (level == CPU_LEVEL_ROOT) nset = cpuset_refroot(set); @@ -1978,11 +1974,28 @@ kern_cpuset_getaffinity(struct thread *td, cpulevel_t level, cpuwhich_t which, if (p) PROC_UNLOCK(p); if (error == 0) { - if (cpusetsize < howmany(CPU_FLS(mask), NBBY)) { - error = ERANGE; - goto out; - } - size = min(cpusetsize, sizeof(cpuset_t)); + if (cpusetsize < howmany(CPU_FLS(mask), NBBY)) + return (ERANGE); +#ifdef KTRACE + if (KTRPOINT(td, KTR_STRUCT)) + ktrcpuset(mask, cpusetsize); +#endif + } + return (error); +} + +int +user_cpuset_getaffinity(struct thread *td, cpulevel_t level, cpuwhich_t which, + id_t id, size_t cpusetsize, cpuset_t *maskp, const struct cpuset_copy_cb *cb) +{ + cpuset_t *mask; + size_t size; + int error; + + mask = malloc(sizeof(cpuset_t), M_TEMP, M_WAITOK | M_ZERO); + size = min(cpusetsize, sizeof(cpuset_t)); + error = kern_cpuset_getaffinity(td, level, which, id, size, mask); + if (error == 0) { error = cb->cpuset_copyout(mask, maskp, size); if (error != 0) goto out; @@ -2003,10 +2016,6 @@ kern_cpuset_getaffinity(struct thread *td, cpulevel_t level, cpuwhich_t which, cp++; } } -#ifdef KTRACE - if ( KTRPOINT(td, KTR_STRUCT)) - ktrcpuset(mask, size); -#endif } out: free(mask, M_TEMP); diff --git a/sys/sys/syscallsubr.h b/sys/sys/syscallsubr.h index 6c6f644ede33..ae17a10d01da 100644 --- a/sys/sys/syscallsubr.h +++ b/sys/sys/syscallsubr.h @@ -116,9 +116,11 @@ int kern_connectat(struct thread *td, int dirfd, int fd, struct sockaddr *sa); int kern_copy_file_range(struct thread *td, int infd, off_t *inoffp, int outfd, off_t *outoffp, size_t len, unsigned int flags); -int kern_cpuset_getaffinity(struct thread *td, cpulevel_t level, +int user_cpuset_getaffinity(struct thread *td, cpulevel_t level, cpuwhich_t which, id_t id, size_t cpusetsize, cpuset_t *maskp, const struct cpuset_copy_cb *cb); +int kern_cpuset_getaffinity(struct thread *td, cpulevel_t level, + cpuwhich_t which, id_t id, size_t cpusetsize, cpuset_t *mask); int kern_cpuset_setaffinity(struct thread *td, cpulevel_t level, cpuwhich_t which, id_t id, cpuset_t *maskp); int user_cpuset_setaffinity(struct thread *td, cpulevel_t level,