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=-10.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham 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 43292C433E2 for ; Mon, 7 Sep 2020 03:28:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E3CE020DD4 for ; Mon, 7 Sep 2020 03:28:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1599449298; bh=MJu1y3OACOeIPE9VdiWlkHp4eAPivsdT7Py/C2nKtrA=; h=Date:From:To:Cc:Subject:In-Reply-To:References:List-ID:From; b=gu5XK91yzShzV6jTSybxsIBUFLjdtkmmXAaFMHtUBD5QpQoIkrfIAz7i1mQgqrvef AilU51UHdUPAQCVSMBWL3k3dAEHxuNMGGF5i6OPK2LqHe5kqBpCx3EuBvR3gkP9acw H9p0NATD+YdhUNhZ4o9wZZ3uTgtu6Y9fTcysGDA0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726357AbgIGD2Q (ORCPT ); Sun, 6 Sep 2020 23:28:16 -0400 Received: from mail.kernel.org ([198.145.29.99]:40280 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726286AbgIGD2P (ORCPT ); Sun, 6 Sep 2020 23:28:15 -0400 Received: from kicinski-fedora-pc1c0hjn.dhcp.thefacebook.com (unknown [163.114.132.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C277F20738; Mon, 7 Sep 2020 03:28:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1599449295; bh=MJu1y3OACOeIPE9VdiWlkHp4eAPivsdT7Py/C2nKtrA=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=ojEAKudYS/g/HDtDWn/WzO24x+Fhic8otPh5lyVVgFFj/0YMH9MMNSGapbzfzvkRM xm8FxIR+uZKgff1unr017mWBk4wgu8979Pkz4H1cnQqREBm2c8DajWpOWOFdJgSi+C 4mWnUM3yC0v0Yk6r9DtZAOBDOU9fBehIgOe7Gy5M= Date: Sun, 6 Sep 2020 20:28:13 -0700 From: Jakub Kicinski To: Jon Maloy Cc: Tetsuo Handa , Ying Xue , Parthasarathy Bhuvaragan , "David S. Miller" , netdev@vger.kernel.org, tipc-discussion@lists.sourceforge.net Subject: Re: [PATCH] tipc: fix shutdown() of connection oriented socket Message-ID: <20200906202813.759b1a09@kicinski-fedora-pc1c0hjn.dhcp.thefacebook.com> In-Reply-To: <20200905061447.3463-1-penguin-kernel@I-love.SAKURA.ne.jp> References: <20200905061447.3463-1-penguin-kernel@I-love.SAKURA.ne.jp> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On Sat, 5 Sep 2020 15:14:47 +0900 Tetsuo Handa wrote: > I confirmed that the problem fixed by commit 2a63866c8b51a3f7 ("tipc: fix > shutdown() of connectionless socket") also applies to stream socket. > > ---------- > #include > #include > #include > > int main(int argc, char *argv[]) > { > int fds[2] = { -1, -1 }; > socketpair(PF_TIPC, SOCK_STREAM /* or SOCK_DGRAM */, 0, fds); > if (fork() == 0) > _exit(read(fds[0], NULL, 1)); > shutdown(fds[0], SHUT_RDWR); /* This must make read() return. */ > wait(NULL); /* To be woken up by _exit(). */ > return 0; > } > ---------- > > Since shutdown(SHUT_RDWR) should affect all processes sharing that socket, > unconditionally setting sk->sk_shutdown to SHUTDOWN_MASK will be the right > behavior. > > Signed-off-by: Tetsuo Handa Jon, this looks correct to me but it may change the behavior for applications (at least poll events). Please review. > diff --git a/net/tipc/socket.c b/net/tipc/socket.c > index ebd280e767bd..11b27ddc75ba 100644 > --- a/net/tipc/socket.c > +++ b/net/tipc/socket.c > @@ -2771,10 +2771,7 @@ static int tipc_shutdown(struct socket *sock, int how) > > trace_tipc_sk_shutdown(sk, NULL, TIPC_DUMP_ALL, " "); > __tipc_shutdown(sock, TIPC_CONN_SHUTDOWN); > - if (tipc_sk_type_connectionless(sk)) > - sk->sk_shutdown = SHUTDOWN_MASK; > - else > - sk->sk_shutdown = SEND_SHUTDOWN; > + sk->sk_shutdown = SHUTDOWN_MASK; > > if (sk->sk_state == TIPC_DISCONNECTING) { > /* Discard any unreceived messages */