From nobody Fri Nov 17 17:24:53 2023 X-Original-To: dev-commits-src-main@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 4SX3gT5WCXz51BHD; Fri, 17 Nov 2023 17:24:53 +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 4SX3gT51mkz4ThQ; Fri, 17 Nov 2023 17:24:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700241893; 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=rkvCpyMAwE+Gk4xbiCMnLmmC9WBdhiwayVRLL65pYzM=; b=iWuqhIZZxumbAW1X9Z5SVC6sMAFjuX1aDbMT5BL36wvv5sSkcRz771jOoZbeRcc701/A0v vO/gtd1UdXfmIHwMidJXvGwsOp+L0l3EzOWbabIG+EteHfpdwoJkBPi+y8qdBWe50RqU7Y h4zqBQY1tuzpbLet0G+RGhCFL39Hs4LkeYrcEitdiI5r6acE7YHmA3mqZR2enqQlkeZwSP +DwYnqgVG9pdfsZBS9Jj6/5P85WiPzi4N96+WjYNH99iZ3jiL8dlkAZsgMgTlBxgSp6sCv lguU8Mkn0iAqe6xYB4BnLcoY5txyXyQabm2/YQO70tHoCkY1Aii7TpnWA3we7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700241893; 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=rkvCpyMAwE+Gk4xbiCMnLmmC9WBdhiwayVRLL65pYzM=; b=vL5RLCvYjpj9Oxr9/ovBiXSY4D4HnOUG2fvztVl2NBk+9Z5Wlz04J0q5ZRFMh1xyr9IIpB q6+ynSqQyRuvDy4aRhmTRLLB5N3846aWnunXIlZPi3T3YM5CuyM3lMx1E1T95qKUgVRTF8 RiqFI4DwXO176DIORlVhVz/iW9h3J2v++wq6Qhf8DG8rHYHwWgRTPfRHrLHM3SPy4gBU62 UUUZu4LmsqVKmrwbL1Z0zne6QcLzIufntsh5hmYtVKl4IHGmns0R9lbQ9IGGtkpoLOTdL9 372QvVsasoFV82E5vY6Q/Vhmh6uY2f1A71DZyWuFZymXbEfFexvQM5cwLINVHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700241893; a=rsa-sha256; cv=none; b=TJfwqXXzRgopABmDyu2f38Leed0HsZYatH80RRRg+qGON/PkuNU0A1tDkkSIZY3OqQ/CKF Q+ykH7T1Khe0RbHqQ90VX451is0Kxak6SpZv/7uH/hSyp5aoThXosyXF2dl12TXgR7+ZCR WEaUXj35t4EqUdvK98IQRWZy5iL2FqnHyp59ALHbmVdAR05MQ6zBuQljUdJgbBL/vKQwRq nbia+dffsykF46X0gbH5NsoyZDs7cx0I+9i48+wOfsqgrrKzsYaWDu4WUxAAEnlSB3F2YY 8WdQCXS04IzoB590dN2KwJuJbbDEjsWvOKp4v9mhrRQyE4Cq29vg6xDm+ne5Ig== 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 4SX3gT3kYbzsGY; Fri, 17 Nov 2023 17:24:53 +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 3AHHOrGM008262; Fri, 17 Nov 2023 17:24:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AHHOr9Z008259; Fri, 17 Nov 2023 17:24:53 GMT (envelope-from git) Date: Fri, 17 Nov 2023 17:24:53 GMT Message-Id: <202311171724.3AHHOr9Z008259@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 43f7e2166810 - main - ng_ksocket: fix accept(2) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 43f7e21668105cc5a3c66eae5ecef0203c2df62f Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=43f7e21668105cc5a3c66eae5ecef0203c2df62f commit 43f7e21668105cc5a3c66eae5ecef0203c2df62f Author: Gleb Smirnoff AuthorDate: 2023-11-17 17:24:30 +0000 Commit: Gleb Smirnoff CommitDate: 2023-11-17 17:24:30 +0000 ng_ksocket: fix accept(2) - Provide listen upcall and set it on NGM_KSOCKET_LISTEN - Mask EWOULDBLOCK on NGM_KSOCKET_ACCEPT Reviewed by: afedorov Differential Revision: https://reviews.freebsd.org/D42637 PR: 272319 PR: 275106 Fixes: 779f106aa169256b7010a1d8f963ff656b881e92 --- sys/netgraph/ng_ksocket.c | 41 +++++++++++++++++++++++++++++++++++------ 1 file changed, 35 insertions(+), 6 deletions(-) diff --git a/sys/netgraph/ng_ksocket.c b/sys/netgraph/ng_ksocket.c index 337248789473..777f3261356d 100644 --- a/sys/netgraph/ng_ksocket.c +++ b/sys/netgraph/ng_ksocket.c @@ -152,6 +152,10 @@ static const struct ng_ksocket_alias ng_ksocket_protos[] = { /* Helper functions */ static int ng_ksocket_accept(priv_p); +static int ng_ksocket_listen_upcall(struct socket *so, void *arg, + int waitflag); +static void ng_ksocket_listen_upcall2(node_p node, hook_p hook, + void *arg1, int arg2); static int ng_ksocket_incoming(struct socket *so, void *arg, int waitflag); static int ng_ksocket_parse(const struct ng_ksocket_alias *aliases, const char *s, int family); @@ -695,6 +699,12 @@ ng_ksocket_rcvmsg(node_p node, item_p item, hook_p lasthook) /* Listen */ so->so_state |= SS_NBIO; error = solisten(so, *((int32_t *)msg->data), td); + if (error == 0) { + SOLISTEN_LOCK(so); + solisten_upcall_set(so, + ng_ksocket_listen_upcall, priv); + SOLISTEN_UNLOCK(so); + } break; } @@ -715,11 +725,15 @@ ng_ksocket_rcvmsg(node_p node, item_p item, hook_p lasthook) /* * If a connection is already complete, take it. * Otherwise let the upcall function deal with - * the connection when it comes in. + * the connection when it comes in. Don't return + * EWOULDBLOCK, per ng_ksocket(4) documentation. */ error = ng_ksocket_accept(priv); - if (error != 0 && error != EWOULDBLOCK) + if (error == EWOULDBLOCK) + error = 0; + if (error != 0) ERROUT(error); + priv->response_token = msg->header.token; priv->response_addr = NGI_RETADDR(item); break; @@ -1064,10 +1078,6 @@ ng_ksocket_incoming2(node_p node, hook_p hook, void *arg1, int arg2) } } - /* Check whether a pending accept operation has completed */ - if (priv->flags & KSF_ACCEPTING) - (void )ng_ksocket_accept(priv); - /* * If we don't have a hook, we must handle data events later. When * the hook gets created and is connected, this upcall function @@ -1250,6 +1260,25 @@ out: return (0); } +static int +ng_ksocket_listen_upcall(struct socket *so, void *arg, int waitflag) +{ + priv_p priv = arg; + int wait = ((waitflag & M_WAITOK) ? NG_WAITOK : 0) | NG_QUEUE; + + ng_send_fn1(priv->node, NULL, &ng_ksocket_listen_upcall2, priv, 0, + wait); + return (SU_OK); +} + +static void +ng_ksocket_listen_upcall2(node_p node, hook_p hook, void *arg1, int arg2) +{ + const priv_p priv = NG_NODE_PRIVATE(node); + + (void )ng_ksocket_accept(priv); +} + /* * Parse out either an integer value or an alias. */