From: Takashi Yano <takashi.yano@nifty.ne.jp>
To: cygwin-developers@cygwin.com
Subject: Re: cygrunsrv + sshd + rsync = 20 times too slow -- throttled?
Date: Tue, 14 Sep 2021 17:07:16 +0900 [thread overview]
Message-ID: <20210914170716.39d5b48d129c9193b410b2f3@nifty.ne.jp> (raw)
In-Reply-To: <YT+xXa//EaTV1X1t@calimero.vinschen.de>
[-- Attachment #1: Type: text/plain, Size: 2099 bytes --]
On Mon, 13 Sep 2021 22:15:25 +0200
Corinna Vinschen wrote:
> On Sep 14 04:37, Takashi Yano wrote:
> > On Mon, 13 Sep 2021 20:32:33 +0200
> > Corinna Vinschen wrote:
> > > I don't understand why calling fork_fixup on query_hdl should depend
> > > on the handle count. If you duplicate a writer, you always have to
> > > duplicate query_hdl as well to keep the count, no? Inheritence is
> > > handled by the O_CLOEXEC flag and fork_fixup will do the right thing.
> >
> > I thought so, however, counting query_hdl cannot work as expected
> > without this check. The number of query_hdl opend seems to exceed
> > the number of writer.
>
> If the write handle as well as the query handle are both opened,
> duplicated and closed in the same manner, they should never have a
> different count, unless the write side is inherited by a non-Cygwin
> client.
>
> > There seems to be the case that handle is already inherited here
> > without fork_fixup. Any idea?
>
> That should depend on the O_CLOEXEC setting, but identically for
> all handles in the fhandler.
I found the cause. set_close_on_exec() in fhandler_pipe is missing.
set_no_inheritance() calls for all adjunct handles are necessary.
> I pushed two more patches to topic/pipe in terms of inheritence,
> maybe that gives a clue?
I attached two additional patch for this issue.
> > > > + if (!DuplicateHandle (GetCurrentProcess (), r,
> > > > + GetCurrentProcess (), &fhs[1]->query_hdl,
> > > > + GENERIC_READ, !(mode & O_CLOEXEC), 0))
> > >
> > > This is a bug I introduced accidentally during testing. This
> > > GENERIC_READ is actually supposed to be a FILE_READ_ATTRIBUTES.
> > > Sorry about that.
> >
> > The PoC code uses PeekNamedPipe for query_hdl, so GENERIC_READ is
> > necessary I think.
>
> Oh, right, that's how it's documented. Funny enough, the descriptions
> of FSCTL_PIPE_PEEK does not mention any permissions at all. I tried the
> permissions and it's FILE_READ_DATA which is required.
Thanks. I revised the patch and attach it the subsequent mail.
--
Takashi Yano <takashi.yano@nifty.ne.jp>
[-- Attachment #2: 0001-Cygwin-fhandler_base-dup-Reflect-O_CLOEXEC-to-inheri.patch --]
[-- Type: application/octet-stream, Size: 1257 bytes --]
From 8dd2bdff579762497898044e9e5304b4b6ab5e93 Mon Sep 17 00:00:00 2001
From: Takashi Yano <takashi.yano@nifty.ne.jp>
Date: Tue, 14 Sep 2021 12:48:03 +0900
Subject: [PATCH 1/2] Cygwin: fhandler_base::dup Reflect O_CLOEXEC to
inheritance flag.
- Currently fhandler_base::dup duplicates handles with bInheritHandle
TRUE unconditionally. This patch reflects O_CLOEXEC flag to that
parameter.
---
winsup/cygwin/fhandler.cc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/winsup/cygwin/fhandler.cc b/winsup/cygwin/fhandler.cc
index 39fe2640a..9dfe70be3 100644
--- a/winsup/cygwin/fhandler.cc
+++ b/winsup/cygwin/fhandler.cc
@@ -1308,7 +1308,7 @@ fhandler_base::init (HANDLE f, DWORD a, mode_t bin)
}
int
-fhandler_base::dup (fhandler_base *child, int)
+fhandler_base::dup (fhandler_base *child, int flags)
{
debug_printf ("in fhandler_base dup");
@@ -1317,7 +1317,7 @@ fhandler_base::dup (fhandler_base *child, int)
{
if (!DuplicateHandle (GetCurrentProcess (), get_handle (),
GetCurrentProcess (), &nh,
- 0, TRUE, DUPLICATE_SAME_ACCESS))
+ 0, !(flags & O_CLOEXEC), DUPLICATE_SAME_ACCESS))
{
debug_printf ("dup(%s) failed, handle %p, %E",
get_name (), get_handle ());
--
2.33.0
[-- Attachment #3: 0002-Cygwin-pipe-fifo-Call-set_no_inheritance-for-adjunct.patch --]
[-- Type: application/octet-stream, Size: 1962 bytes --]
From a3c223f72f98baf14df3b58941761c72690f5eee Mon Sep 17 00:00:00 2001
From: Takashi Yano <takashi.yano@nifty.ne.jp>
Date: Tue, 14 Sep 2021 12:49:35 +0900
Subject: [PATCH 2/2] Cygwin: pipe, fifo: Call set_no_inheritance() for adjunct
handles.
- Currntly, set_no_inheritance() is not called for the adjunct handles
such as select_sem. This patch fixes the issue.
---
winsup/cygwin/fhandler.h | 1 +
winsup/cygwin/fhandler_fifo.cc | 2 ++
winsup/cygwin/fhandler_pipe.cc | 10 ++++++++++
3 files changed, 13 insertions(+)
diff --git a/winsup/cygwin/fhandler.h b/winsup/cygwin/fhandler.h
index 13fba9a14..46381c397 100644
--- a/winsup/cygwin/fhandler.h
+++ b/winsup/cygwin/fhandler.h
@@ -1208,6 +1208,7 @@ public:
void open_setup (int flags);
void fixup_after_fork (HANDLE);
int dup (fhandler_base *child, int);
+ void set_close_on_exec (bool val);
int close ();
void __reg3 raw_read (void *ptr, size_t& len);
int ioctl (unsigned int cmd, void *);
diff --git a/winsup/cygwin/fhandler_fifo.cc b/winsup/cygwin/fhandler_fifo.cc
index aa89fa7ae..37498f547 100644
--- a/winsup/cygwin/fhandler_fifo.cc
+++ b/winsup/cygwin/fhandler_fifo.cc
@@ -1817,4 +1817,6 @@ fhandler_fifo::set_close_on_exec (bool val)
set_no_inheritance (fc_handler[i].h, val);
fifo_client_unlock ();
}
+ if (select_sem)
+ set_no_inheritance (select_sem, val);
}
diff --git a/winsup/cygwin/fhandler_pipe.cc b/winsup/cygwin/fhandler_pipe.cc
index 70cfa3784..da473a1dc 100644
--- a/winsup/cygwin/fhandler_pipe.cc
+++ b/winsup/cygwin/fhandler_pipe.cc
@@ -515,6 +515,16 @@ fhandler_pipe_fifo::raw_write (const void *ptr, size_t len)
return nbytes ?: -1;
}
+void
+fhandler_pipe::set_close_on_exec (bool val)
+{
+ fhandler_base::set_close_on_exec (val);
+ if (read_mtx)
+ set_no_inheritance (read_mtx, val);
+ if (select_sem)
+ set_no_inheritance (select_sem, val);
+}
+
void
fhandler_pipe::fixup_after_fork (HANDLE parent)
{
--
2.33.0
next prev parent reply other threads:[~2021-09-14 8:07 UTC|newest]
Thread overview: 250+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <41A583E1-C8E7-42AB-9F24-EEC33A41EC60@house.org>
[not found] ` <20210825201845.07b6400b79dc5558a7761efe@nifty.ne.jp>
[not found] ` <f8106fe7-a2b8-d106-3061-4d888124f4b0@cornell.edu>
[not found] ` <20210826062934.54f2f2216021c095bb7ba13b@nifty.ne.jp>
[not found] ` <d0a8c57d-1ed1-6b4f-c6e7-cbe0e2ec8a1c@cornell.edu>
[not found] ` <3b560051-ab27-f392-ca4b-d1fd9b5733b0@cornell.edu>
[not found] ` <20210827202440.47706fc2fc07c5e9a1bc0047@nifty.ne.jp>
[not found] ` <4f2cb5f3-ce9c-c617-f65f-841a5eca096e@cornell.edu>
[not found] ` <20210828022111.91ef5b4ff24f6da9fadb489e@nifty.ne.jp>
[not found] ` <YSn3L0W1M527utK0@calimero.vinschen.de>
[not found] ` <20210828184102.f2206a8a9e5fe5cf24bf5e45@nifty.ne.jp>
[not found] ` <YSok0PoCQn2TPPrn@calimero.vinschen.de>
[not found] ` <20210829004346.c2f80469abc3a07fd4b2918d@nifty.ne.jp>
[not found] ` <e8caa02f-be85-33bc-3f09-347c1cdb0923@cornell.edu>
[not found] ` <20210829174124.0c1ae6c16a3e8da1f490abc7@nifty.ne.jp>
[not found] ` <6e9bb35e-6f4f-cf78-e515-549da487b5ef@cornell.edu>
2021-08-30 7:57 ` Corinna Vinschen
[not found] ` <20210829180729.48b4e877f773cb3980c5766d@nifty.ne.jp>
[not found] ` <789f056a-f164-d71d-1dc9-230f5a41846d@cornell.edu>
2021-08-30 8:27 ` Corinna Vinschen
2021-08-30 13:00 ` Corinna Vinschen
2021-08-30 13:20 ` Corinna Vinschen
2021-08-30 13:41 ` Ken Brown
2021-08-30 14:12 ` Corinna Vinschen
2021-08-30 14:52 ` Ken Brown
2021-08-30 15:15 ` Corinna Vinschen
[not found] ` <20210830043756.8aa0ada77db0bfbbe3889f62@nifty.ne.jp>
[not found] ` <47e5dd74-b940-f305-fd5a-c6c9d8f41305@cornell.edu>
2021-08-30 8:48 ` Corinna Vinschen
[not found] ` <c62d18df-ab7a-7233-62ee-29a8eced5353@cornell.edu>
[not found] ` <20210830091314.f9a2cb71794d0f68cdb5eba7@nifty.ne.jp>
[not found] ` <20210830092259.52f7d54fc3fa340738373af4@nifty.ne.jp>
[not found] ` <d217ef03-7858-5e22-0aa6-f0507eedd9da@cornell.edu>
[not found] ` <20210830170204.fa91eaf110f310f13b67abc3@nifty.ne.jp>
2021-08-30 10:20 ` Corinna Vinschen
2021-08-30 10:38 ` Corinna Vinschen
2021-08-30 12:04 ` Takashi Yano
2021-08-30 12:55 ` Corinna Vinschen
2021-08-30 13:31 ` Corinna Vinschen
2021-08-31 8:50 ` Takashi Yano
2021-08-30 13:51 ` Ken Brown
2021-08-30 15:00 ` Ken Brown
2021-08-30 15:19 ` Corinna Vinschen
2021-08-30 15:43 ` Ken Brown
2021-08-31 9:43 ` Corinna Vinschen
2021-08-31 8:52 ` Takashi Yano
2021-08-31 9:04 ` Corinna Vinschen
2021-08-31 11:05 ` Takashi Yano
2021-08-31 15:20 ` Corinna Vinschen
2021-09-01 2:39 ` Takashi Yano
2021-09-01 8:03 ` Corinna Vinschen
2021-09-01 8:13 ` Corinna Vinschen
2021-08-30 13:36 ` Ken Brown
2021-08-30 14:05 ` Corinna Vinschen
2021-08-30 15:53 ` Corinna Vinschen
2021-08-30 17:00 ` Corinna Vinschen
2021-08-30 17:11 ` Corinna Vinschen
2021-08-30 18:59 ` Ken Brown
2021-08-30 19:12 ` Ken Brown
2021-08-30 20:21 ` Corinna Vinschen
2021-08-30 20:14 ` Corinna Vinschen
2021-08-30 20:47 ` Ken Brown
2021-08-31 8:55 ` Takashi Yano
2021-08-31 9:08 ` Corinna Vinschen
2021-08-31 9:25 ` Takashi Yano
2021-08-31 10:05 ` Corinna Vinschen
2021-08-31 10:18 ` Corinna Vinschen
2021-08-31 11:45 ` Takashi Yano
2021-08-31 12:31 ` Takashi Yano
2021-08-31 15:08 ` Corinna Vinschen
2021-08-31 12:33 ` Ken Brown
2021-08-31 15:18 ` Corinna Vinschen
2021-08-31 15:27 ` Corinna Vinschen
2021-08-31 15:50 ` Corinna Vinschen
2021-08-31 16:19 ` Ken Brown
2021-08-31 16:38 ` Ken Brown
2021-08-31 17:30 ` Corinna Vinschen
2021-08-31 18:54 ` Ken Brown
2021-08-31 19:51 ` Corinna Vinschen
2021-08-31 23:02 ` Takashi Yano
2021-09-01 0:16 ` Takashi Yano
2021-09-01 8:07 ` Corinna Vinschen
2021-09-01 8:23 ` Takashi Yano
2021-09-01 8:46 ` Corinna Vinschen
2021-09-01 12:56 ` Ken Brown
2021-09-01 13:52 ` Corinna Vinschen
2021-09-01 23:02 ` Ken Brown
2021-09-02 8:17 ` Corinna Vinschen
2021-09-02 13:01 ` Ken Brown
2021-09-02 19:00 ` Corinna Vinschen
2021-09-02 19:34 ` Ken Brown
2021-09-02 19:35 ` Corinna Vinschen
2021-09-02 20:19 ` Ken Brown
2021-09-03 9:12 ` Corinna Vinschen
2021-09-03 19:00 ` Ken Brown
2021-09-03 19:53 ` Ken Brown
2021-09-03 19:54 ` Corinna Vinschen
2021-09-03 20:05 ` Ken Brown
2021-09-03 10:00 ` Takashi Yano
2021-09-03 10:13 ` Takashi Yano
2021-09-03 11:31 ` Corinna Vinschen
2021-09-03 11:41 ` Corinna Vinschen
2021-09-03 12:13 ` Ken Brown
2021-09-03 15:00 ` Corinna Vinschen
2021-09-03 15:14 ` Ken Brown
2021-09-03 15:17 ` Corinna Vinschen
2021-09-03 12:22 ` Takashi Yano
2021-09-03 13:27 ` Ken Brown
2021-09-03 15:37 ` Corinna Vinschen
2021-09-04 12:02 ` Takashi Yano
2021-09-04 12:37 ` Takashi Yano
2021-09-04 14:04 ` Ken Brown
2021-09-04 23:15 ` Takashi Yano
2021-09-05 13:40 ` Takashi Yano
2021-09-05 13:50 ` Takashi Yano
2021-09-05 18:47 ` Ken Brown
2021-09-05 19:42 ` Takashi Yano
2021-09-05 20:09 ` Takashi Yano
2021-09-05 20:27 ` Ken Brown
2021-09-06 8:13 ` Corinna Vinschen
2021-09-06 11:16 ` Takashi Yano
2021-09-06 12:49 ` Corinna Vinschen
2021-09-06 13:16 ` Takashi Yano
2021-09-06 16:08 ` Corinna Vinschen
2021-09-06 23:39 ` Takashi Yano
2021-09-07 9:14 ` Corinna Vinschen
2021-09-07 11:03 ` Takashi Yano
2021-09-07 16:14 ` Ken Brown
2021-09-07 18:26 ` Corinna Vinschen
2021-09-03 10:38 ` Takashi Yano
2021-09-08 11:32 ` Takashi Yano
2021-09-08 11:55 ` Corinna Vinschen
2021-09-08 12:33 ` Takashi Yano
2021-09-08 17:43 ` Ken Brown
2021-09-08 18:28 ` Corinna Vinschen
2021-09-02 8:15 ` Takashi Yano
2021-09-02 18:54 ` Corinna Vinschen
2021-09-07 3:26 ` Takashi Yano
2021-09-07 10:50 ` Takashi Yano
2021-09-08 0:07 ` Takashi Yano
2021-09-08 4:11 ` Takashi Yano
2021-09-08 9:01 ` Takashi Yano
2021-09-08 9:01 ` Corinna Vinschen
2021-09-08 9:26 ` Corinna Vinschen
2021-09-08 9:45 ` Takashi Yano
2021-09-08 10:04 ` Corinna Vinschen
2021-09-08 10:45 ` Takashi Yano
2021-09-08 10:51 ` Corinna Vinschen
2021-09-09 3:21 ` Takashi Yano
2021-09-09 9:37 ` Corinna Vinschen
2021-09-09 10:55 ` Takashi Yano
2021-09-09 11:41 ` Corinna Vinschen
2021-09-08 9:37 ` Takashi Yano
2021-09-09 3:41 ` Takashi Yano
2021-09-09 8:05 ` Takashi Yano
2021-09-09 12:19 ` Takashi Yano
2021-09-09 12:42 ` Takashi Yano
2021-09-09 21:53 ` Takashi Yano
2021-09-10 3:41 ` Takashi Yano
2021-09-10 10:57 ` Ken Brown
2021-09-10 15:17 ` Ken Brown
2021-09-10 15:26 ` Corinna Vinschen
2021-09-10 22:57 ` Takashi Yano
2021-09-11 2:17 ` Ken Brown
2021-09-11 2:35 ` Takashi Yano
2021-09-11 13:12 ` Ken Brown
2021-09-12 6:23 ` Takashi Yano
2021-09-12 14:39 ` Ken Brown
2021-09-13 9:11 ` Corinna Vinschen
2021-09-13 12:30 ` Ken Brown
2021-09-12 8:48 ` Takashi Yano
2021-09-12 11:04 ` Takashi Yano
2021-09-12 15:10 ` Ken Brown
2021-09-12 21:46 ` Ken Brown
2021-09-12 23:54 ` Takashi Yano
2021-09-13 2:19 ` Ken Brown
2021-09-13 8:40 ` Takashi Yano
2021-09-13 12:51 ` Ken Brown
2021-09-13 17:05 ` Ken Brown
2021-09-13 9:42 ` Corinna Vinschen
2021-09-13 13:03 ` Ken Brown
2021-09-13 18:39 ` Takashi Yano
2021-09-12 23:41 ` Takashi Yano
2021-09-13 17:42 ` Ken Brown
2021-09-13 18:54 ` Takashi Yano
2021-09-13 18:32 ` Corinna Vinschen
2021-09-13 19:37 ` Takashi Yano
2021-09-13 20:15 ` Corinna Vinschen
2021-09-14 8:07 ` Takashi Yano [this message]
2021-09-14 8:47 ` Corinna Vinschen
2021-09-14 12:38 ` Ken Brown
2021-09-14 14:15 ` Corinna Vinschen
2021-09-14 8:08 ` Takashi Yano
2021-09-14 9:03 ` Corinna Vinschen
2021-09-14 9:56 ` Takashi Yano
2021-09-14 10:19 ` Takashi Yano
2021-09-14 11:03 ` Corinna Vinschen
2021-09-14 12:05 ` Takashi Yano
2021-09-14 14:17 ` Corinna Vinschen
2021-09-14 22:14 ` Ken Brown
2021-09-15 0:21 ` Takashi Yano
2021-09-15 0:44 ` Takashi Yano
2021-09-15 0:59 ` Takashi Yano
2021-09-15 9:57 ` Corinna Vinschen
2021-09-15 10:48 ` Takashi Yano
2021-09-15 10:58 ` Takashi Yano
2021-09-15 11:34 ` Corinna Vinschen
2021-09-15 11:40 ` Corinna Vinschen
2021-09-15 11:13 ` Corinna Vinschen
2021-09-15 11:41 ` Ken Brown
2021-09-15 11:49 ` Corinna Vinschen
2021-09-15 11:54 ` Takashi Yano
2021-09-15 12:20 ` Corinna Vinschen
2021-09-15 13:04 ` Takashi Yano
2021-09-15 13:42 ` Corinna Vinschen
2021-09-15 16:22 ` Ken Brown
2021-09-15 17:09 ` Ken Brown
2021-09-16 0:22 ` Takashi Yano
2021-09-16 2:28 ` Ken Brown
2021-09-16 9:09 ` Takashi Yano
2021-09-16 13:02 ` Takashi Yano
2021-09-16 13:25 ` Corinna Vinschen
2021-09-16 14:27 ` Takashi Yano
2021-09-16 15:01 ` Corinna Vinschen
2021-09-16 15:46 ` Ken Brown
2021-09-16 16:02 ` Ken Brown
2021-09-16 19:42 ` Takashi Yano
2021-09-16 20:28 ` Ken Brown
2021-09-16 19:48 ` Ken Brown
2021-09-16 20:01 ` Takashi Yano
2021-09-17 2:25 ` Ken Brown
2021-09-17 8:31 ` Takashi Yano
2021-09-17 11:16 ` Ken Brown
2021-09-17 16:23 ` Takashi Yano
2021-09-17 17:08 ` Ken Brown
2021-09-17 17:39 ` Jon Turney
2021-09-17 17:43 ` Takashi Yano
2021-09-17 19:53 ` Ken Brown
2021-09-18 1:30 ` Takashi Yano
2021-09-18 2:07 ` Ken Brown
2021-09-18 2:10 ` Ken Brown
2021-09-18 8:03 ` Takashi Yano
2021-09-18 11:12 ` Ken Brown
2021-09-18 11:35 ` Takashi Yano
2021-09-18 14:11 ` Jon Turney
2021-09-18 13:44 ` Ken Brown
2021-09-19 1:31 ` Takashi Yano
2021-09-19 14:35 ` Ken Brown
2021-09-20 9:29 ` Takashi Yano
2021-09-16 0:13 ` Takashi Yano
2021-09-16 2:26 ` Ken Brown
2021-09-13 9:07 ` Corinna Vinschen
2021-09-20 12:52 ` Takashi Yano
2021-09-20 19:14 ` Ken Brown
2021-09-20 21:09 ` Ken Brown
2021-09-20 21:21 ` Ken Brown
2021-09-20 21:27 ` Takashi Yano
2021-09-20 21:39 ` Ken Brown
2021-09-20 22:16 ` Takashi Yano
2021-09-20 22:46 ` Ken Brown
2021-09-20 22:50 ` Ken Brown
2021-09-20 23:22 ` Takashi Yano
2021-09-21 8:30 ` Takashi Yano
2021-09-21 9:26 ` Mark Geisert
2021-09-21 10:10 ` Takashi Yano
2021-09-21 21:10 ` Mark Geisert
2021-09-21 13:31 ` Ken Brown
2021-09-21 15:36 ` Takashi Yano
2021-09-21 18:51 ` Ken Brown
2021-09-23 8:26 ` Takashi Yano
2021-09-23 13:03 ` Ken Brown
2021-09-23 15:03 ` Takashi Yano
2021-09-23 16:29 ` Ken Brown
2021-10-18 10:51 ` Corinna Vinschen
2021-10-18 12:02 ` Takashi Yano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210914170716.39d5b48d129c9193b410b2f3@nifty.ne.jp \
--to=takashi.yano@nifty.ne.jp \
--cc=cygwin-developers@cygwin.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).