Received-SPF: pass (google.com: domain of linux-kernel+bounces-76304-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
From: =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= <ilpo.jarvinen@linux.intel.com>
Date: Thu, 22 Feb 2024 12:13:50 +0200 (EET)
To: Maciej Wieczor-Retman <maciej.wieczor-retman@intel.com>
cc: Fenghua Yu <fenghua.yu@intel.com>, 
    Reinette Chatre <reinette.chatre@intel.com>, Shuah Khan <shuah@kernel.org>, 
    LKML <linux-kernel@vger.kernel.org>, linux-kselftest@vger.kernel.org
Subject: Re: [PATCH v2 2/3] selftests/resctrl: Simplify cleanup in ctrl-c
 handler
In-Reply-To: <c472e478-eaf1-0003-cf2d-c861e620fce2@linux.intel.com>
Message-ID: <064e7069-9ed7-b7b2-b0e9-3e730cca39ff@linux.intel.com>
References: <cover.1708596015.git.maciej.wieczor-retman@intel.com> <3a6639cd338a706bd2ed341aa6c717e1e79cc1f0.1708596015.git.maciej.wieczor-retman@intel.com> <c472e478-eaf1-0003-cf2d-c861e620fce2@linux.intel.com>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="8323328-2000140883-1708596830=:1961"

  This message is in MIME format.  The first part should be readable text,
  while the remaining parts are likely unreadable without MIME-aware tools.

--8323328-2000140883-1708596830=:1961
Content-Type: text/plain; charset=ISO-8859-15
Content-Transfer-Encoding: QUOTED-PRINTABLE

On Thu, 22 Feb 2024, Ilpo J=E4rvinen wrote:

> On Thu, 22 Feb 2024, Maciej Wieczor-Retman wrote:
>=20
> > Ctrl-c handler isn't aware of what test is currently running. Because o=
f
> > that it executes all cleanups even if they aren't necessary. Since the
> > ctrl-c handler uses the sa_sigaction system no parameters can be passed
> > to it as function arguments.
> >=20
> > Add a global variable to make ctrl-c handler aware of the currently run
> > test and only execute the correct cleanup callback.
> >=20
> > Signed-off-by: Maciej Wieczor-Retman <maciej.wieczor-retman@intel.com>
> > ---

> > diff --git a/tools/testing/selftests/resctrl/resctrl_val.c b/tools/test=
ing/selftests/resctrl/resctrl_val.c
> > index 5a49f07a6c85..d572815436f3 100644
> > --- a/tools/testing/selftests/resctrl/resctrl_val.c
> > +++ b/tools/testing/selftests/resctrl/resctrl_val.c
> > @@ -62,6 +62,7 @@ struct imc_counter_config {
> >  static char mbm_total_path[1024];
> >  static int imcs;
> >  static struct imc_counter_config imc_counters_config[MAX_IMCS][2];
> > +const struct resctrl_test *current_test;
>=20
> static const struct
>=20
> >  void membw_initialize_perf_event_attr(int i, int j)
> >  {
> > @@ -472,7 +473,7 @@ void ctrlc_handler(int signum, siginfo_t *info, voi=
d *ptr)
> >  =09if (bm_pid)
> >  =09=09kill(bm_pid, SIGKILL);
> >  =09umount_resctrlfs();
> > -=09tests_cleanup();
> > +=09current_test->cleanup();
>=20
> These calls should have if (current_test->cleanup()) guard. Isn't the=20

Err, if (current_test->cleanup) is what I meant.

> non-contiguous already test w/o the cleanup function?
>=20
> Other than those two, this looked okay.

--=20
 i.

--8323328-2000140883-1708596830=:1961--