From nobody Mon Feb 9 17:58:16 2026 Received: from mail-yb1-f172.google.com (mail-yb1-f172.google.com [209.85.219.172]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B153145978 for ; Sat, 13 Apr 2024 14:16:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713017794; cv=none; b=RN0k2FPErq70LShv3Ay2OIeaP9AmRrxcv/EFXMNBbg0fZup8Whs0B0Os1VBoSHtlJBs1JaCvQq0gDeSRQgtsQqDP1+B05ZuYUUleFbPF/zNs1IBYwyPOViHzXWasl+Zx/0nSvh+Y9gLat8AiVJ3y5PKy1eyLqSff8ncokkfFQ5c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713017794; c=relaxed/simple; bh=dtcXlJarwcAh738y46KpVauFfDZzs+CPG9CoF31We34=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=iFWv4YxRO06WsCMiYscKcwC9KEo+3CIacVAj5ik1W2wryxrbzvXjMJzPwCNnGl/38Nx0s/tc35ji+aDdp53AGNUHZAd+1p4xiMPIIDEJ+GfkmP0IHQtciQZkmZShvBY34UI0Yq7Hf1ZT+s3E7s8ZmBUpLh7eZjFPbDK7ewMj/yg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kylehuey.com; spf=pass smtp.mailfrom=kylehuey.com; dkim=pass (2048-bit key) header.d=kylehuey.com header.i=@kylehuey.com header.b=Nu2bsjxV; arc=none smtp.client-ip=209.85.219.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kylehuey.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=kylehuey.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kylehuey.com header.i=@kylehuey.com header.b="Nu2bsjxV" Received: by mail-yb1-f172.google.com with SMTP id 3f1490d57ef6-dcd7c526cc0so1714109276.1 for ; Sat, 13 Apr 2024 07:16:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kylehuey.com; s=google; t=1713017791; x=1713622591; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=wlVoXtYOUZbgedQGH68sMA7/TKjo/LarRqMzSUO0lI8=; b=Nu2bsjxVqTg/ziqOueDSd91dHssNR9yH/ZebKAPCUg2QODI4KC4Pzbzw9M6/uLPM0e W7YTVxWBO4rp2+nsL5PGCmxHGjkTA0u61oCYTsTfNj2Rhi3L959+2Im1yZsJlbfNDrOa PMsGYXn2p7DiTgi3Rc19eo26VE5+z30pxR1QiFGKcmkoRLo0fYtfA+Fnhb90j6Q2gslY zjbRoZ+kYS6oPWwPZwXLgceEXIqownbnI2Dh/xZ/7h4I6A2jmHUG20iTO2RjNC/LHQPO zS9rXQbjckRziA9xewB0UoT5wFoWDXLc3htDDGW+RWD0PejiOnGqlqwl/HGFv/37Y9zQ 4aHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713017791; x=1713622591; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=wlVoXtYOUZbgedQGH68sMA7/TKjo/LarRqMzSUO0lI8=; b=eA+2Ff95DKiyF3opSH2StqDL0Ru80LNKB3QZq2oz516QMrcQrpp7J1ydHzYP49ZEpU nQBpXz9nl3I6bYK8YyZFqptxREv45ljlJ/ILIMqqg0SCaBpJzHH3Cbqlx+t1N7gr7L8g LbX8D8GHyJ7X4k00Oi1n9tmDmUcZlMnacMViUlzZmqxl+QCSSyFqYcZe7CyhPHSH1M9k 9HG6n+Wf7E3wGYX22jVMVKpwtCD5Fwukq03a5/CbyFfMGAW/mY/ljGy7llh0+X0d3dxK T2Qt00U00kn3MiFiH2Am5jr4UuBylL2MJZaaA3IfogFfgHkqUDMrvhPdma5rCMqOVXQD tgfg== X-Forwarded-Encrypted: i=1; AJvYcCXN0YZnZXnZzdqTydyq83vKTsgjWOLfkPNbgBNCN4+nwDvMP5uvBV54/emTLaopS83ZU3YQvUW9STmokRrBKH0Rb0iw6ZoRU7Yr+Isu X-Gm-Message-State: AOJu0YwpnLrtpkEykNwf4JrShOx584YU5P3swlM+xcRUe8lNw8/Ka0MY R03PZ3Lc3B10+O52sx0bCcl8nR/K+UhuNZvED9K30ifBwZtfLdGRjzJGW7HkUw== X-Google-Smtp-Source: AGHT+IHfzpuJoLkZ5tVYHvUeMheeAQWCbrYbrG2Pq0evod13mRpefIayqHQkJwSzDH+nNCGjp5Q6RQ== X-Received: by 2002:a25:8083:0:b0:dc6:bd4c:b119 with SMTP id n3-20020a258083000000b00dc6bd4cb119mr5325358ybk.55.1713017791674; Sat, 13 Apr 2024 07:16:31 -0700 (PDT) Received: from ip-172-31-11-157.us-east-2.compute.internal (ec2-3-145-99-109.us-east-2.compute.amazonaws.com. [3.145.99.109]) by smtp.googlemail.com with ESMTPSA id v5-20020a254805000000b00dcdb6934617sm1193349yba.62.2024.04.13.07.16.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 Apr 2024 07:16:31 -0700 (PDT) From: Kyle Huey X-Google-Original-From: Kyle Huey To: Kyle Huey , linux-kernel@vger.kernel.org, Namhyung Kim , Ian Rodgers , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo Cc: Robert O'Callahan , Ingo Molnar , Mark Rutland , Alexander Shishkin , Jiri Olsa , Adrian Hunter , linux-perf-users@vger.kernel.org Subject: [PATCH v3 1/3] perf: Move perf_event_fasync() to perf_event.h Date: Sat, 13 Apr 2024 07:16:16 -0700 Message-Id: <20240413141618.4160-2-khuey@kylehuey.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240413141618.4160-1-khuey@kylehuey.com> References: <20240413141618.4160-1-khuey@kylehuey.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This will allow it to be called from perf_output_wakeup(). Signed-off-by: Kyle Huey --- include/linux/perf_event.h | 8 ++++++++ kernel/events/core.c | 8 -------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h index 13a2b05cc431..4924bae0a015 100644 --- a/include/linux/perf_event.h +++ b/include/linux/perf_event.h @@ -1680,6 +1680,14 @@ perf_event_addr_filters(struct perf_event *event) return ifh; } =20 +static inline struct fasync_struct **perf_event_fasync(struct perf_event *= event) +{ + /* only the parent has fasync state */ + if (event->parent) + event =3D event->parent; + return &event->fasync; +} + extern void perf_event_addr_filters_sync(struct perf_event *event); extern void perf_report_aux_output_id(struct perf_event *event, u64 hw_id); =20 diff --git a/kernel/events/core.c b/kernel/events/core.c index cd88d1e89eb8..7358b11f9003 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -6684,14 +6684,6 @@ static const struct file_operations perf_fops =3D { * to user-space before waking everybody up. */ =20 -static inline struct fasync_struct **perf_event_fasync(struct perf_event *= event) -{ - /* only the parent has fasync state */ - if (event->parent) - event =3D event->parent; - return &event->fasync; -} - void perf_event_wakeup(struct perf_event *event) { ring_buffer_wakeup(event); --=20 2.34.1 From nobody Mon Feb 9 17:58:16 2026 Received: from mail-yb1-f180.google.com (mail-yb1-f180.google.com [209.85.219.180]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 476F23FB1B for ; Sat, 13 Apr 2024 14:16:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713017811; cv=none; b=j/lPEjayTI+eUvAUSPVcLVpiiSRReaoc7HLjlvt181Qmb13c9DbaHaYLOx8VwdiBLKmE+EC0eXQBxcWaozlGW+z23j+CiBxEG2/8q06RWHY3FUaBjUpDsbLGTPMBdJQLbEylYwHnCi9gzBEjoudtwbLmXSGgUXsiTlC4MWu8HGE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713017811; c=relaxed/simple; bh=DU50FXhrCuqhtNLOaapUXMuCslN3deTrvJGkJumTsUM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=U/BJ3VDPpjtGmmiMUMhdRBYZ6eDtyLHJzyuPGGtou0uS8xhYb6AK9ldhESTzT/+qrn2ry1g8ZI8IMKqGPkwjR1UwQGTFsIA5BdsfbElaXvlZQI5azOVqMu7pCE6RJdekOcUHhn+xUT0IgGGtqbNXbJJXutu9QEbZw9tC212Q6sQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kylehuey.com; spf=pass smtp.mailfrom=kylehuey.com; dkim=pass (2048-bit key) header.d=kylehuey.com header.i=@kylehuey.com header.b=cAPy4kkf; arc=none smtp.client-ip=209.85.219.180 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kylehuey.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=kylehuey.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kylehuey.com header.i=@kylehuey.com header.b="cAPy4kkf" Received: by mail-yb1-f180.google.com with SMTP id 3f1490d57ef6-db4364ecd6aso1969195276.2 for ; Sat, 13 Apr 2024 07:16:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kylehuey.com; s=google; t=1713017809; x=1713622609; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=wDrdykoIXMbP7phUYiJI1yePs0EFYaz2XrXDwzySQjw=; b=cAPy4kkfSUmZR+hXckSUlPaaef5IwNiFk1XkRTaHmRByL/XdYZzAVkZQw3fQ2RkU/H PDsFtC1QBrJ9aFBk8g878ctQYK/V6YLzMLkGl0Bqrmka7nOk6KnPPPSK9Y+/W5bSPOsu OIUwymznFCGbP2wHqXfzNSAtBsk0cx7S885WCO1ru/X2bHU3PpZmG+3AMw8wNkDIu8QJ QaxuE71FaXyggY+CpM3JqIe77nuRMXEts1Msn9AqGrANKZSrW94MYnYaQJJ3s8BRTcR7 fjd+LFixychMnKqi8syz/vjfg2/8v/WobLdfYLEIB423mgOOYi5x1r3Rnd8OWWVEIZts 7f3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713017809; x=1713622609; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=wDrdykoIXMbP7phUYiJI1yePs0EFYaz2XrXDwzySQjw=; b=iJHc7KAPg+b7MDWHito1NGwOlVZU/tA5TEJ69oO8dqdc92bfkt5XyTtxZ5VhicGIxZ 5WtRz0WVO8LdHDSUMcGSt+Ni6p7Bwpb+vFN7cLOSdBI977ZNkU05XrOJcfOojQ1yQTLn Vd+o9L6Xj6/B/Mz3mave8OEtk8uRpj8zSNmt++rtNvZsjEv+7h2t9HPF578rr8ayhwY4 iqqTZKYLsuBlkOXram8RHVCTkcU1qUm4Vg38Obz20Zl21+FWtCM8wDluQPZB27aCmWR5 kP1xsJ3ScUpEoR4CUFEhnmY+WvjtG8sOfes2bWz7t52daSv/x7muogto81x5ALZieTtD 5tOg== X-Forwarded-Encrypted: i=1; AJvYcCXgydomgYQtza5GFmraTvYXvbjraokRLOD9wf+yE94Y2uyzLpkcSwMs3AkQ5oYTpUhH2vLLaKbREWjSM4qM7XnnQW6L181G/y0iEP2S X-Gm-Message-State: AOJu0Yx/eyh7TmAdZCoNHgc4GpciK2Sqt2Ow3yIyP6GGAyme6I8Ct4uf Sq9ICCPLWDA4ubRz90KnFstHeACdSVcmyGoaF43IxigWWB0D5dVXqjTsLVn6jw== X-Google-Smtp-Source: AGHT+IEPuFA7BoJq94Q7691/uH1K4Hr0sbggqPd6G24r2jhNxtEzpxxCYcjtl26dmMUD1ygx7+PSww== X-Received: by 2002:a5b:890:0:b0:dc7:4460:878a with SMTP id e16-20020a5b0890000000b00dc74460878amr4899160ybq.3.1713017809304; Sat, 13 Apr 2024 07:16:49 -0700 (PDT) Received: from ip-172-31-11-157.us-east-2.compute.internal (ec2-3-145-99-109.us-east-2.compute.amazonaws.com. [3.145.99.109]) by smtp.googlemail.com with ESMTPSA id v5-20020a254805000000b00dcdb6934617sm1193349yba.62.2024.04.13.07.16.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 Apr 2024 07:16:48 -0700 (PDT) From: Kyle Huey X-Google-Original-From: Kyle Huey To: Kyle Huey , linux-kernel@vger.kernel.org, Namhyung Kim , Ian Rodgers , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo Cc: Robert O'Callahan , Ingo Molnar , Mark Rutland , Alexander Shishkin , Jiri Olsa , Adrian Hunter , linux-perf-users@vger.kernel.org Subject: [PATCH v3 2/3] perf/ring_buffer: Trigger IO signals for watermark_wakeup Date: Sat, 13 Apr 2024 07:16:18 -0700 Message-Id: <20240413141618.4160-3-khuey@kylehuey.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240413141618.4160-1-khuey@kylehuey.com> References: <20240413141618.4160-1-khuey@kylehuey.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" perf_output_wakeup() already marks the perf event fd available for polling. Trigger IO signals with FASYNC too. Signed-off-by: Kyle Huey --- kernel/events/ring_buffer.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/kernel/events/ring_buffer.c b/kernel/events/ring_buffer.c index 60ed43d1c29e..4013408ce012 100644 --- a/kernel/events/ring_buffer.c +++ b/kernel/events/ring_buffer.c @@ -22,6 +22,10 @@ static void perf_output_wakeup(struct perf_output_handle= *handle) atomic_set(&handle->rb->poll, EPOLLIN); =20 handle->event->pending_wakeup =3D 1; + + if (*perf_event_fasync(handle->event) && !handle->event->pending_kill) + handle->event->pending_kill =3D POLL_IN; + irq_work_queue(&handle->event->pending_irq); } =20 --=20 2.34.1 From nobody Mon Feb 9 17:58:16 2026 Received: from mail-yb1-f180.google.com (mail-yb1-f180.google.com [209.85.219.180]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 56090482D3 for ; Sat, 13 Apr 2024 14:17:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713017853; cv=none; b=HV5C9nY1APHogmn0+avvgyNq+RvCCb1kZFKq1ZvDO6SO6/DBM9zA9Rc31Cy+qvG58pwjP+lTH9Jy9Nz4aj6m3yOss8zJY/ij+FgLrp5yO2bqOBIts3ZFp1MCmnmojYQPQVWa752tNv2+ntkNFBjH95a4aJGWWzPwf8IdGt/9gbQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713017853; c=relaxed/simple; bh=TRqOC8Vk0vbbiZ0MlxLenaXd116F99mVCwhGyj/rLiI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=uLj0x/D/Ccm8p9BmH7N9EdKML8BUnqKuSBqOJI156L8JxMThY5VrENDFNeNaBpfdouBpPnRhdkET8XfU29FMnqWer5oYz71/XzIDpyut6/ompcUR6lQqCgpRQ0OULCrc2eZO1FQo4iHaXxxqqCmvcs0JqGBfxMeH7D8L0aZNPoA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kylehuey.com; spf=pass smtp.mailfrom=kylehuey.com; dkim=pass (2048-bit key) header.d=kylehuey.com header.i=@kylehuey.com header.b=L9R+QSm4; arc=none smtp.client-ip=209.85.219.180 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kylehuey.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=kylehuey.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kylehuey.com header.i=@kylehuey.com header.b="L9R+QSm4" Received: by mail-yb1-f180.google.com with SMTP id 3f1490d57ef6-dc23bf7e5aaso1917038276.0 for ; Sat, 13 Apr 2024 07:17:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kylehuey.com; s=google; t=1713017850; x=1713622650; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=xv8kG9m16/eb8RbFxYy706uGwjYMM+2HEkRfZeEGPKE=; b=L9R+QSm4s3DftkUfwzT5+StmzJ62j9crCegKBf4LWnzwKykchpyyMGEWHeugx/9EMa d3SalJgsDhXSqo0AgMLQu0pBjeusffCIRMvxHVLIGwk9KDAY+Mf8nWfwqhJdUNlNeTkM wk+EXjnARRE+ErSrPABxqRq6eKPXK1JR54a7tNfRxPVmRWPVpl63hAMai6KFEWsm4zDz oHE1ep8oJ4tyjhPesvFI2bsrwlIzsmNIOU1Z1LFC+n696CVjAAegZHuE9haXV4uq9LSu dkgxiOifRNOsgJN8GFesvcmKm3mPEDJ1ZsB4s6tqshtozhGyrovutpHKXPQn57kKkXiN 5eog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713017850; x=1713622650; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xv8kG9m16/eb8RbFxYy706uGwjYMM+2HEkRfZeEGPKE=; b=KMXlzxksq/6ocvc8g1/A88oInmL/oyabOltm9Oz6NBSeiBLNThA7NASkzI8Z3rS03i r269suflsw0MRETp+ZKukEFLjaeB26QDixPxh7mG9KFjiwg9oarxGSS8vz7lD1QwFHz/ 6HX57p5C4JHLKw26hFHC/kLmoejaeVPRZUZYm2+JcTGWJ25CwnTs8xdqEJ3jc+nHowQi uGycV34WinIpvqJrq8B+6SLFY8O7/9kFXhYCyD/wZt3h9sweE6UOKVQsNmotvW6vi+dY YfO5kKC/EGrsw5DCWs/+cTcM3y2+AirEuooXqlyl8mK/baQFZkycq9pEL/ExQcGHCP+a ImKA== X-Forwarded-Encrypted: i=1; AJvYcCVobiWoy6KqzX9en2ZcT5IHAv8hCMLEAyLvc8H5K4iR34+95LV0jRdeD/b5aw/1Op1EELN5yQaojTcJQYBxbYVWANs3igBiOc5EsIb4 X-Gm-Message-State: AOJu0YyjVJ/8we5b+l5bSyXc4PbkYW/43whW5bjne3hIbWqPoEiGWV2D hbe+5/iRtchokW6llNKQzohAkKXd+bWEq5d0SngSjwvt0KMTX48qjBteTnba4Q== X-Google-Smtp-Source: AGHT+IHdWfmUP29OS2Mnz/ZajV0Y8zieEb03Y4pOFphhcucJKssu82pq8Zz29O1npwOpQtXUYBkM/A== X-Received: by 2002:a25:9392:0:b0:dcb:38d3:3c6a with SMTP id a18-20020a259392000000b00dcb38d33c6amr5447050ybm.46.1713017850353; Sat, 13 Apr 2024 07:17:30 -0700 (PDT) Received: from ip-172-31-11-157.us-east-2.compute.internal (ec2-3-145-99-109.us-east-2.compute.amazonaws.com. [3.145.99.109]) by smtp.googlemail.com with ESMTPSA id v5-20020a254805000000b00dcdb6934617sm1193349yba.62.2024.04.13.07.17.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 Apr 2024 07:17:30 -0700 (PDT) From: Kyle Huey X-Google-Original-From: Kyle Huey To: Kyle Huey , linux-kernel@vger.kernel.org, Namhyung Kim , Ian Rodgers , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo Cc: Robert O'Callahan , Shuah Khan , linux-kselftest@vger.kernel.org Subject: [PATCH v3 3/3] selftests/perf_events: Test FASYNC with watermark wakeups Date: Sat, 13 Apr 2024 07:16:20 -0700 Message-Id: <20240413141618.4160-4-khuey@kylehuey.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240413141618.4160-1-khuey@kylehuey.com> References: <20240413141618.4160-1-khuey@kylehuey.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The test uses PERF_RECORD_SWITCH records to fill the ring buffer and trigger the watermark wakeup, which in turn should trigger an IO signal. Signed-off-by: Kyle Huey --- .../testing/selftests/perf_events/.gitignore | 1 + tools/testing/selftests/perf_events/Makefile | 2 +- .../selftests/perf_events/watermark_signal.c | 146 ++++++++++++++++++ 3 files changed, 148 insertions(+), 1 deletion(-) create mode 100644 tools/testing/selftests/perf_events/watermark_signal.c diff --git a/tools/testing/selftests/perf_events/.gitignore b/tools/testing= /selftests/perf_events/.gitignore index 790c47001e77..ee93dc4969b8 100644 --- a/tools/testing/selftests/perf_events/.gitignore +++ b/tools/testing/selftests/perf_events/.gitignore @@ -1,3 +1,4 @@ # SPDX-License-Identifier: GPL-2.0-only sigtrap_threads remove_on_exec +watermark_signal diff --git a/tools/testing/selftests/perf_events/Makefile b/tools/testing/s= elftests/perf_events/Makefile index db93c4ff081a..70e3ff211278 100644 --- a/tools/testing/selftests/perf_events/Makefile +++ b/tools/testing/selftests/perf_events/Makefile @@ -2,5 +2,5 @@ CFLAGS +=3D -Wl,-no-as-needed -Wall $(KHDR_INCLUDES) LDFLAGS +=3D -lpthread =20 -TEST_GEN_PROGS :=3D sigtrap_threads remove_on_exec +TEST_GEN_PROGS :=3D sigtrap_threads remove_on_exec watermark_signal include ../lib.mk diff --git a/tools/testing/selftests/perf_events/watermark_signal.c b/tools= /testing/selftests/perf_events/watermark_signal.c new file mode 100644 index 000000000000..49dc1e831174 --- /dev/null +++ b/tools/testing/selftests/perf_events/watermark_signal.c @@ -0,0 +1,146 @@ +// SPDX-License-Identifier: GPL-2.0 +#define _GNU_SOURCE + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "../kselftest_harness.h" + +#define __maybe_unused __attribute__((__unused__)) + +static int sigio_count; + +static void handle_sigio(int signum __maybe_unused, + siginfo_t *oh __maybe_unused, + void *uc __maybe_unused) +{ + ++sigio_count; +} + +static void do_child(void) +{ + raise(SIGSTOP); + + for (int i =3D 0; i < 20; ++i) + sleep(1); + + raise(SIGSTOP); + + exit(0); +} + +TEST(watermark_signal) +{ + struct perf_event_attr attr; + struct perf_event_mmap_page *p =3D NULL; + struct sigaction previous_sigio, sigio =3D { 0 }; + pid_t child =3D -1; + int child_status; + int fd =3D -1; + long page_size =3D sysconf(_SC_PAGE_SIZE); + + sigio.sa_sigaction =3D handle_sigio; + EXPECT_EQ(sigaction(SIGIO, &sigio, &previous_sigio), 0); + + memset(&attr, 0, sizeof(attr)); + attr.size =3D sizeof(attr); + attr.type =3D PERF_TYPE_SOFTWARE; + attr.config =3D PERF_COUNT_SW_DUMMY; + attr.sample_period =3D 1; + attr.disabled =3D 1; + attr.watermark =3D 1; + attr.context_switch =3D 1; + attr.wakeup_watermark =3D 1; + + child =3D fork(); + EXPECT_GE(child, 0); + if (child =3D=3D 0) + do_child(); + else if (child < 0) { + perror("fork()"); + goto cleanup; + } + + if (waitpid(child, &child_status, WSTOPPED) !=3D child || + !(WIFSTOPPED(child_status) && WSTOPSIG(child_status) =3D=3D SIGSTOP))= { + fprintf(stderr, + "failed to sycnhronize with child errno=3D%d status=3D%x\n", + errno, + child_status); + goto cleanup; + } + + fd =3D syscall(__NR_perf_event_open, &attr, child, -1, -1, + PERF_FLAG_FD_CLOEXEC); + if (fd < 0) { + fprintf(stderr, "failed opening event %llx\n", attr.config); + goto cleanup; + } + + if (fcntl(fd, F_SETFL, FASYNC)) { + perror("F_SETFL FASYNC"); + goto cleanup; + } + + if (fcntl(fd, F_SETOWN, getpid())) { + perror("F_SETOWN getpid()"); + goto cleanup; + } + + if (fcntl(fd, F_SETSIG, SIGIO)) { + perror("F_SETSIG SIGIO"); + goto cleanup; + } + + p =3D mmap(NULL, 2 * page_size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0= ); + if (p =3D=3D NULL) { + perror("mmap"); + goto cleanup; + } + + if (ioctl(fd, PERF_EVENT_IOC_ENABLE, 0)) { + perror("PERF_EVENT_IOC_ENABLE"); + goto cleanup; + } + + if (kill(child, SIGCONT) < 0) { + perror("SIGCONT"); + goto cleanup; + } + + if (waitpid(child, &child_status, WSTOPPED) !=3D -1 || errno !=3D EINTR) + fprintf(stderr, + "expected SIGIO to terminate wait errno=3D%d status=3D%x\n%d", + errno, + child_status, + sigio_count); + + EXPECT_GE(sigio_count, 1); + +cleanup: + if (p !=3D NULL) + munmap(p, 2 * page_size); + + if (fd >=3D 0) + close(fd); + + if (child > 0) { + kill(child, SIGKILL); + waitpid(child, NULL, 0); + } + + sigaction(SIGIO, &previous_sigio, NULL); +} + +TEST_HARNESS_MAIN --=20 2.34.1