From nobody Mon Aug 14 12:47:18 2023 X-Original-To: dev-commits-src-all@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 4RPZ130qndz4qRwg; Mon, 14 Aug 2023 12:47:19 +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 4RPZ130LZ0z3CPG; Mon, 14 Aug 2023 12:47:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692017239; 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=EqilIjwKzpyqxieuOJekGmssYUglV+ONsEvql5pjS5M=; b=BJk9XJ2bg/tmaEEYnhMa5Us7CiKZFOs5jm5PQf60JTKTDJfSJDYcwZji/NTDqHKMLCLWwB Erj6qVzPcV8TEyLaxsSUg69l1a2S5gafj8olvgPQIJfpeIbm4Sr88n7qPGfAGULzjvLHw6 6IDL+V/pb0lYXMd0qtYfN8iVyy2BNzIuDwCqddHwMEgSt8tAKmgt2MWz75Q3oZjkPNkvns eXTnwQlxEM9ypdEKXJFNKjcVJ+Wu7cVSzYkLs8zJcLZcbHLi7GS4HLgzN9TfiL8W3vJsyD /Eh4nDPBndaUyRFvfO8ZXA2RjUaN9pmgi3gK4Bvg7G2t9tHdwK5Y3v4OmcL3Kw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692017239; 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=EqilIjwKzpyqxieuOJekGmssYUglV+ONsEvql5pjS5M=; b=IHOXsyv2gtknrPLB1jOC1gONGGQ8zcKey7UXN/tC5uGc/4yeU0wb5qdIkBbQA7D/kFiFP+ TnOoTts3DmzeajQZ+JN3A0dK4msyaYPi0rAC0FP1WtrWeWt1iht8uyXICIfI4nipuIitXu CYWUlgKIrAomDP0Y9Ggg5gMx15lo/S9xFI2cv+kcjPIoQjpB37hdK1671MqvgaEf0d2hJR arnPuYKefk6DPmTz7RIte5hHtngb693TwqLhk2ofTv8lxMrIE04/yW1a1r/enfmb1wQFSP F/2UH8IkejPm4S0M7KCB8vqenfJs21HR/psBAx6WlzkNZj3Sx2cvniCmSRXwxw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692017239; a=rsa-sha256; cv=none; b=PpCEQmrHm3P5Ff8Z8Jn7C3xK2rx/d2xewsHhJiFsf9unMIYpcU5pij4Pu8wY7qMKlj3MOO E4YFb4sLrlTVZu1Jt8x2BxD5FULcqDdvjiXlNnTmg93Sk/dAWoQgDyZjvcylkF5r8sqREN mrDSMl3msmJ3gnB2yvPkJPzjUT8GxQNtIBY9BGt+yPg5KM2lN7uYGSzCsNnOnjeqwqCWhT K0CM518DxH8eiDEou8qmO1uJJg4rMIQVezSC6aO/4Bu+C7nNyFv3qIQ76zgpRBaUXhJ5VN BDRwI6lGrkRMknBSGU7D/hWF9xkpLZ7bC010nJ0HrihZW1SJGUY+PHnWkQCHIA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RPZ126YF9zTcp; Mon, 14 Aug 2023 12:47:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37EClIk7044365; Mon, 14 Aug 2023 12:47:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37EClIb5044362; Mon, 14 Aug 2023 12:47:18 GMT (envelope-from git) Date: Mon, 14 Aug 2023 12:47:18 GMT Message-Id: <202308141247.37EClIb5044362@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: de20eb26d014 - main - linux(4): Refactor recvmsg List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: de20eb26d014f7d9ba81fd1f84636609c8efa8e1 Auto-Submitted: auto-generated The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=de20eb26d014f7d9ba81fd1f84636609c8efa8e1 commit de20eb26d014f7d9ba81fd1f84636609c8efa8e1 Author: Dmitry Chagin AuthorDate: 2023-08-14 12:46:12 +0000 Commit: Dmitry Chagin CommitDate: 2023-08-14 12:46:12 +0000 linux(4): Refactor recvmsg As the amount of handled anxiliary messages grows move they handlers into a separate functions. MFC after: 1 week --- sys/compat/linux/linux_socket.c | 101 +++++++++++++++++++++++++--------------- 1 file changed, 64 insertions(+), 37 deletions(-) diff --git a/sys/compat/linux/linux_socket.c b/sys/compat/linux/linux_socket.c index 90dc25f2e653..90a1cf879517 100644 --- a/sys/compat/linux/linux_socket.c +++ b/sys/compat/linux/linux_socket.c @@ -1699,6 +1699,39 @@ _Static_assert(sizeof(struct bintime) >= sizeof(struct timespec), "scm_timestampns sizeof timespec"); #endif /* __i386__ || (__amd64__ && COMPAT_LINUX32) */ +static int +recvmsg_scm_sol_socket(struct thread *td, l_int msg_type, l_int lmsg_type, + l_uint flags, socklen_t *datalen, void **data, void **udata) +{ + int error; + + error = 0; + switch (msg_type) { + case SCM_RIGHTS: + error = recvmsg_scm_rights(td, flags, datalen, + data, udata); + break; + case SCM_CREDS: + error = recvmsg_scm_creds(datalen, data, udata); + break; + case SCM_CREDS2: + error = recvmsg_scm_creds2(datalen, data, udata); + break; + case SCM_TIMESTAMP: +#if defined(__i386__) || (defined(__amd64__) && defined(COMPAT_LINUX32)) + error = recvmsg_scm_timestamp(lmsg_type, datalen, + data, udata); +#endif + break; + case SCM_BINTIME: + error = recvmsg_scm_timestampns(lmsg_type, datalen, + data, udata); + break; + } + + return (error); +} + static int recvmsg_scm_ip_origdstaddr(socklen_t *datalen, void **data, void **udata) { @@ -1713,6 +1746,23 @@ recvmsg_scm_ip_origdstaddr(socklen_t *datalen, void **data, void **udata) return (error); } +static int +recvmsg_scm_ipproto_ip(l_int msg_type, l_int lmsg_type, socklen_t *datalen, + void **data, void **udata) +{ + int error; + + error = 0; + switch (msg_type) { + case IP_ORIGDSTADDR: + error = recvmsg_scm_ip_origdstaddr(datalen, data, + udata); + break; + } + + return (error); +} + static int linux_recvmsg_common(struct thread *td, l_int s, struct l_msghdr *msghdr, l_uint flags, struct msghdr *msg) @@ -1801,18 +1851,6 @@ linux_recvmsg_common(struct thread *td, l_int s, struct l_msghdr *msghdr, cm->cmsg_level); lcm->cmsg_level = bsd_to_linux_sockopt_level(cm->cmsg_level); - data = CMSG_DATA(cm); - datalen = (caddr_t)cm + cm->cmsg_len - (caddr_t)data; - udata = NULL; - error = 0; - - /* Process non SOL_SOCKET types. */ - if (cm->cmsg_level == IPPROTO_IP && - lcm->cmsg_type == LINUX_IP_ORIGDSTADDR) { - error = recvmsg_scm_ip_origdstaddr(&datalen, &data, &udata); - goto cont; - } - if (lcm->cmsg_type == -1 || cm->cmsg_level == -1) { LINUX_RATELIMIT_MSG_OPT2( @@ -1822,33 +1860,22 @@ linux_recvmsg_common(struct thread *td, l_int s, struct l_msghdr *msghdr, skiped++; continue; } + data = CMSG_DATA(cm); + datalen = (caddr_t)cm + cm->cmsg_len - (caddr_t)data; + udata = NULL; + error = 0; - switch (cm->cmsg_type) { - case SCM_RIGHTS: - error = recvmsg_scm_rights(td, flags, - &datalen, &data, &udata); - break; - case SCM_CREDS: - error = recvmsg_scm_creds(&datalen, - &data, &udata); - break; - case SCM_CREDS2: - error = recvmsg_scm_creds2(&datalen, - &data, &udata); - break; - case SCM_TIMESTAMP: -#if defined(__i386__) || (defined(__amd64__) && defined(COMPAT_LINUX32)) - error = recvmsg_scm_timestamp(lcm->cmsg_type, - &datalen, &data, &udata); -#endif - break; - case SCM_BINTIME: - error = recvmsg_scm_timestampns(lcm->cmsg_type, - &datalen, &data, &udata); - break; - } + switch (cm->cmsg_level) { + case IPPROTO_IP: + error = recvmsg_scm_ipproto_ip(cm->cmsg_type, + lcm->cmsg_type, &datalen, &data, &udata); + break; + case SOL_SOCKET: + error = recvmsg_scm_sol_socket(td, cm->cmsg_type, + lcm->cmsg_type, flags, &datalen, &data, &udata); + break; + } -cont: if (error != 0) goto bad;