From nobody Thu Apr 25 19:54:03 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:ab0:590e:0:0:0:0:0 with SMTP id n14csp530445uad; Thu, 28 Jul 2022 11:53:35 -0700 (PDT) X-Google-Smtp-Source: AGRyM1twnirYSeM5weSdImLQyvczRQsLO1WCTIvh6yk6hzTeOJFDPnplT5hpN66Oug3gHZGsW8Ou X-Received: by 2002:a05:622a:2cc:b0:31f:523:c318 with SMTP id a12-20020a05622a02cc00b0031f0523c318mr328262qtx.286.1659034415326; Thu, 28 Jul 2022 11:53:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1659034415; cv=none; d=google.com; s=arc-20160816; b=EG/pS6DiDm/JtNSI38D1GpRSRqV17D/pxIFvC6B7WJRS9RyV2lJ8P2kX+Slbut5DJP swQJq6ySK+rDefVBIfhgR7B7FcPo6ZDa88Iw9nCxAV0sJiUSoS8O2t75U23Ce9NsaYfJ zcozn0XGDHn5koUyw5QUaA2x5b2NM3LaP2qVwrWBj/cUbch+Pwjnsra1uEkAstxASHDw k3uHRoiG7OApMTzBTQb/dT56S1/1HmlZezneKeG6szaJ2lUBub+k7YRVqdoDw6f7ua/N VVIZnukRFq5E97xUtfDrs7FlzRTCzbs24z4xfqyeDI+t3BU7OmcFS2UCs2DcPsWQEXEl adJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:date:subject:cc:to :from; bh=x7Wb/kTiEDr1b8HNdcdC5IcRvlKeum2/RBJarnNIyJA=; b=CpBE62skwlIYce6GZINQO/me/Xw0YEK2damYUKIn1lG7lSL36F8GzkkXYH+jQsqYtj E2Q3M3Rhw/PfeDrO6LocIkk7vuSzvSsV7sNuno+t29YPI9JtvgRZRCKdCFlYp+jeX8cM 9VwquclgzwRX1VTxKI+3euovaky9QCyrNLp/kLDubq3pgujLiWMjAnmq0avV1lA9CNfV 7UftIZjs8X5AcD0PRyKJLDUyxOpEJku11cjQFsr37eAeoJ/QvmtRB69roHz1PMhWUa+M AqgzTR9BVFA/0gBcvbbqvjQrpuK0wuOL3GyIXx8fkEvPhL72fDHkCB4USqTvxdScqplK aCzA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of mptcp+bounces-6058-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="mptcp+bounces-6058-wpasupplicant.patchew=gmail.com@lists.linux.dev" Return-Path: Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id 5-20020a05620a06c500b006b5cc8686e6si757401qky.538.2022.07.28.11.53.35 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Jul 2022 11:53:35 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-6058-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; spf=pass (google.com: domain of mptcp+bounces-6058-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="mptcp+bounces-6058-wpasupplicant.patchew=gmail.com@lists.linux.dev" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 034F41C208FA for ; Thu, 28 Jul 2022 18:53:35 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 9619433EF; Thu, 28 Jul 2022 18:53:33 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from Chamillionaire.breakpoint.cc (Chamillionaire.breakpoint.cc [193.142.43.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7AC507A for ; Thu, 28 Jul 2022 18:53:31 +0000 (UTC) Received: from fw by Chamillionaire.breakpoint.cc with local (Exim 4.92) (envelope-from ) id 1oH8Ck-0005MX-Kg; Thu, 28 Jul 2022 20:25:50 +0200 From: Florian Westphal To: mptcp@lists.linux.dev Cc: mathew.j.martineau@linux.intel.com, matthieu.baerts@tessares.net, Paolo Abeni , Florian Westphal Subject: [PATCH mptcp] selftests: mptcp: make sendfile selftest work Date: Thu, 28 Jul 2022 20:25:44 +0200 Message-Id: <20220728182544.4128-1-fw@strlen.de> X-Mailer: git-send-email 2.35.1 Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" When the selftest got added, sendfile() on mptcp sockets returned -EOPNOTSUPP, so running 'mptcp_connect.sh -m sendfile' failed immediately. This is no longer the case, but the script fails anyway due to timeout. Let the receiver know once the sender has sent all data, just like with '-m mmap' mode. Fixes: 048d19d444be ("mptcp: add basic kselftest for mptcp") Signed-off-by: Florian Westphal --- tools/testing/selftests/net/mptcp/mptcp_connect.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.c b/tools/test= ing/selftests/net/mptcp/mptcp_connect.c index e2ea6c126c99..6e429b88f911 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_connect.c +++ b/tools/testing/selftests/net/mptcp/mptcp_connect.c @@ -791,6 +791,9 @@ static int copyfd_io_sendfile(int infd, int peerfd, int= outfd, err =3D do_sendfile(infd, peerfd, size); if (err) return err; + + shutdown(peerfd, SHUT_WR); + err =3D do_recvfile(peerfd, outfd); *in_closed_after_out =3D true; } --=20 2.35.1