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 X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1CF22C4320A for ; Thu, 29 Jul 2021 08:37:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 07470603E7 for ; Thu, 29 Jul 2021 08:37:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235149AbhG2Iho (ORCPT ); Thu, 29 Jul 2021 04:37:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32830 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235124AbhG2Ihn (ORCPT ); Thu, 29 Jul 2021 04:37:43 -0400 Received: from mail-wr1-x42e.google.com (mail-wr1-x42e.google.com [IPv6:2a00:1450:4864:20::42e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B33B3C0613CF for ; Thu, 29 Jul 2021 01:37:40 -0700 (PDT) Received: by mail-wr1-x42e.google.com with SMTP id c16so5846629wrp.13 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=hHD+otd9uiDkvMJwnIIQ++NEFLGvOvy0ci4pBhzYU1FMQUMOrxv2Cy3tJ45FJi/SGn VQ5BtTl/PF/qKsF4BAzQWhvcW1IZRx1gyBYcfsWc7eh3EPO0UQOMSkGIrDRCe0OMkjRL mpCycQKfmXwYUEFUbgpInFUvG8vjzhSQwTf1+sUabPyI1pZXzFj0Kj7kzIzUMdZH+na2 CLKy9TanM7GKc51nb4iLAnGY3oLfYD+PMwWXm6DJz6Cl8oonAmKY1crg4jpeCOWVfmUs IhEJWjuEvfRjvjbCG3w4JogRUuSion2tMJFqHbeMclHFyadGHmS7ls7qDZoONf8ow010 x7Ow== X-Gm-Message-State: AOAM532DfBUyyCVkFgzNCuiVif3cOdwdx34x5mqgeeGVMka7Vi9A2m7O KBx+tjPJbql3nTEnAE1/b+Cy/w== X-Google-Smtp-Source: ABdhPJwvfdPV+HEbqfc1QfuveLLbR+7bPKmajYzrC1UCQPb+dGWvjUdHZDdMDmZMYftDrgrPwNV0WQ== 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-kselftest@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) > {