Received: by 2002:a05:6a10:1287:0:0:0:0 with SMTP id d7csp5923058pxv; Thu, 29 Jul 2021 01:39:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxOXDnGOzKsYiqF8/TyP7g/ixWtoHyBxM2Kl8CYvUP6UBDf5PGlX5clpjziUTSWPBbHCQdt X-Received: by 2002:a05:6402:28f:: with SMTP id l15mr4627671edv.131.1627547974127; Thu, 29 Jul 2021 01:39:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627547974; cv=none; d=google.com; s=arc-20160816; b=ObYnU3b2ViG7swl+W/UFscFkYVpY8VRErQ8ajmKBGiy5Vv0OmfbxZ1kkrJojinHIll tlwp+4Q/SvXV0YBMzDYkaNb/QakDvFIph/2uvoZwEu0/lSuDget6aSlt2uzIrNw+D9eZ B6u2geg05w+OiUl9UES+AooepQuytfnrEqgz76swSL4bNTx1ZXvn6Tg3WGlBtidySpaW RFy9RZZSWwfvgrN2h/n9Qht5z0ukK2m4aLlSHJf9NNixeY3KiH8DtQxDIU0md+aJpwc8 RtucbBek3Tdl9Ur9wHJajOmPA4tm3eNRENiuYjmBUD8+gkWOIfPMqH7FasvfnLw81Tvz htmw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:date:in-reply-to:subject :cc:to:from:user-agent:references:dkim-signature; bh=p4JKR78YCMT0GzyVFcGrMvlzwUNK0GrOMmgRXzeh3O0=; b=wui9ZV0jdzpj0BAfT5fEKz7LCYCAZ6ZNRw/g+Hqf0biZQr4U9tn3kEQFF3eTbE6adF WQilPda5bp/mYWmxq1eK9hqUdo/KvQ4WrWu5ssCXBTwz18k3Cm4aXepndlfptlPfBhDW chqDVHi3W/zk6sqQbLn02jtq669iKI9o4xBBCOe+vGhf2rwIYgrylk5iYzsPWUKOtqkO 8NAJZMwT3RLNbVTiWlxPy39diVsRm0Hbk7kV8oUendnDRDnqW+V4CC0xwu9M3v1vpvqi EYDA7rYPvjSa9CEMzOTOMEx0vZ94coR2U3QlHMXuvFcJm++FexWbGVAAhZP0nHP/QI/A /arw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@cloudflare.com header.s=google header.b=xXvt4CdF; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=cloudflare.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id mp36si2623460ejc.478.2021.07.29.01.39.10; Thu, 29 Jul 2021 01:39:34 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@cloudflare.com header.s=google header.b=xXvt4CdF; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=cloudflare.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235181AbhG2Iho (ORCPT + 99 others); Thu, 29 Jul 2021 04:37:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32824 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235035AbhG2Ihn (ORCPT ); Thu, 29 Jul 2021 04:37:43 -0400 Received: from mail-wr1-x429.google.com (mail-wr1-x429.google.com [IPv6:2a00:1450:4864:20::429]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9B765C061757 for ; Thu, 29 Jul 2021 01:37:40 -0700 (PDT) Received: by mail-wr1-x429.google.com with SMTP id b11so524112wrx.6 for ; Thu, 29 Jul 2021 01:37:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloudflare.com; s=google; h=references:user-agent:from:to:cc:subject:in-reply-to:date :message-id:mime-version; bh=p4JKR78YCMT0GzyVFcGrMvlzwUNK0GrOMmgRXzeh3O0=; b=xXvt4CdFkg9xhPKQW2RhAebtYEw6tb9FEsWXEB39j21/7Ac1xyB6gAutrVd8Q6k6mo CcGkND+TtkTIXf64uwdmPqKvjncLrsbq1N/FTfj6CVSdgJEKxZ2Tefs2nDx6hS/vcrkC 24EM73E/EzoNnZO4EMIA1OiXCbG+NmtXPlwBM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:references:user-agent:from:to:cc:subject :in-reply-to:date:message-id:mime-version; bh=p4JKR78YCMT0GzyVFcGrMvlzwUNK0GrOMmgRXzeh3O0=; b=A49of3MEPGh8pa+33iQsoWo5fwuHXEmzASf8lL2MiYDmaZapoGrJRKg2cy6NDfI/Vi BM73mRknNyGMNNRTm7OcZNpYBPDke/0fsC0xqNDlgcOS0OmVLKHqtRIZud9VEa2Ws1Mj WwpkZhAFZxq+VNMhJxP/CVSSJD1HGczaNANce+TeOK3jJ7wCB44+rUrEWDKqfXKpYHOo QYZ87wctruSHeuHpdFsu0dmU5d3GXut3f1Xfsn8a1KY5VSRzRXQBRKtfbqYdmygO1lFP xhuGgHFegaEakc/nMQYto2i2KZJsTF6sBDnPJ2VKVcHHVrsBArG0bZbDb5++t+G4WIec 0ZvA== X-Gm-Message-State: AOAM531lKWmlrbvkfdPkiezP0BiY2Jb3flwrGs6Ul6pkI4OMei0y8HSJ +5Q0qYNdbed3uhnYo6TJJDTfgw== X-Received: by 2002:a5d:674c:: with SMTP id l12mr3634542wrw.112.1627547859211; Thu, 29 Jul 2021 01:37:39 -0700 (PDT) Received: from cloudflare.com ([176.221.114.230]) by smtp.gmail.com with ESMTPSA id t17sm2196225wmq.17.2021.07.29.01.37.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Jul 2021 01:37:38 -0700 (PDT) References: <20210727001252.1287673-1-jiang.wang@bytedance.com> <20210727001252.1287673-2-jiang.wang@bytedance.com> User-agent: mu4e 1.1.0; emacs 27.2 From: Jakub Sitnicki To: Jiang Wang Cc: netdev@vger.kernel.org, cong.wang@bytedance.com, duanxiongchun@bytedance.com, xieyongji@bytedance.com, chaiwen.cc@bytedance.com, "David S. Miller" , Jakub Kicinski , John Fastabend , Daniel Borkmann , Lorenz Bauer , Alexei Starovoitov , Andrii Nakryiko , Martin KaFai Lau , Song Liu , Yonghong Song , KP Singh , Shuah Khan , Johan Almbladh , linux-kernel@vger.kernel.org, bpf@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: Re: [PATCH bpf-next v1 1/5] af_unix: add read_sock for stream socket types In-reply-to: <20210727001252.1287673-2-jiang.wang@bytedance.com> Date: Thu, 29 Jul 2021 10:37:37 +0200 Message-ID: <87a6m5zfam.fsf@cloudflare.com> MIME-Version: 1.0 Content-Type: text/plain Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Jul 27, 2021 at 02:12 AM CEST, Jiang Wang wrote: > To support sockmap for af_unix stream type, implement > read_sock, which is similar to the read_sock for unix > dgram sockets. > > Signed-off-by: Jiang Wang > Reviewed-by: Cong Wang . > --- > net/unix/af_unix.c | 12 ++++++++++++ > 1 file changed, 12 insertions(+) > > diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c > index 89927678c..32eeb4a6a 100644 > --- a/net/unix/af_unix.c > +++ b/net/unix/af_unix.c > @@ -672,6 +672,8 @@ static int unix_dgram_sendmsg(struct socket *, struct msghdr *, size_t); > static int unix_dgram_recvmsg(struct socket *, struct msghdr *, size_t, int); > static int unix_read_sock(struct sock *sk, read_descriptor_t *desc, > sk_read_actor_t recv_actor); > +static int unix_stream_read_sock(struct sock *sk, read_descriptor_t *desc, > + sk_read_actor_t recv_actor); > static int unix_dgram_connect(struct socket *, struct sockaddr *, > int, int); > static int unix_seqpacket_sendmsg(struct socket *, struct msghdr *, size_t); > @@ -725,6 +727,7 @@ static const struct proto_ops unix_stream_ops = { > .shutdown = unix_shutdown, > .sendmsg = unix_stream_sendmsg, > .recvmsg = unix_stream_recvmsg, > + .read_sock = unix_stream_read_sock, > .mmap = sock_no_mmap, > .sendpage = unix_stream_sendpage, > .splice_read = unix_stream_splice_read, > @@ -2311,6 +2314,15 @@ struct unix_stream_read_state { > unsigned int splice_flags; > }; > > +static int unix_stream_read_sock(struct sock *sk, read_descriptor_t *desc, > + sk_read_actor_t recv_actor) > +{ > + if (unlikely(sk->sk_state != TCP_ESTABLISHED)) > + return -EINVAL; tcp_read_sock returns -ENOTCONN if socket is not connected. For the sake of being consistent, and in case we start propagating the error up the call chain, I'd use the same error code. > + > + return unix_read_sock(sk, desc, recv_actor); > +} > + > static int unix_stream_read_generic(struct unix_stream_read_state *state, > bool freezable) > {