From: Mathieu Poirier <mathieu.poirier@linaro.org> To: Suzuki K Poulose <Suzuki.Poulose@arm.com> Cc: "linux-arm-kernel@lists.infradead.org" <linux-arm-kernel@lists.infradead.org>, "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org> Subject: Re: [PATCH V2 11/15] coresight: tmc: make sysFS and Perf mode mutually exclusive Date: Tue, 19 Apr 2016 10:16:22 -0600 [thread overview] Message-ID: <CANLsYkwOkF3Huzjxr6Pds4_e3m9kC03Qu1t-8xUg7fyFQGOvzg@mail.gmail.com> (raw) In-Reply-To: <571635C6.9070903@arm.com> On 19 April 2016 at 07:42, Suzuki K Poulose <Suzuki.Poulose@arm.com> wrote: > On 12/04/16 18:54, Mathieu Poirier wrote: >> >> The sysFS and Perf access methods can't be allowed to interfere >> with one another. As such introducing guards to access >> functions that prevents moving forward if a TMC is already >> being used. >> >> Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org> >> --- >> drivers/hwtracing/coresight/coresight-tmc-etf.c | 59 >> +++++++++++++++++++++- >> drivers/hwtracing/coresight/coresight-tmc-etr.c | 67 >> +++++++++++++++++++++++-- >> 2 files changed, 119 insertions(+), 7 deletions(-) >> >> diff --git a/drivers/hwtracing/coresight/coresight-tmc-etf.c >> b/drivers/hwtracing/coresight/coresight-tmc-etf.c >> index 9b4cdaed09f5..50d32e8ef4ea 100644 >> --- a/drivers/hwtracing/coresight/coresight-tmc-etf.c >> +++ b/drivers/hwtracing/coresight/coresight-tmc-etf.c >> @@ -111,7 +111,7 @@ static void tmc_etf_disable_hw(struct tmc_drvdata >> *drvdata) >> CS_LOCK(drvdata->base); >> } >> >> -static int tmc_enable_etf_sink(struct coresight_device *csdev, u32 mode) >> +static int tmc_enable_etf_sink_sysfs(struct coresight_device *csdev, u32 >> mode) >> { >> bool allocated = false; >> char *buf = NULL; >> @@ -189,6 +189,53 @@ out: >> return 0; >> } >> >> +static int tmc_enable_etf_sink_perf(struct coresight_device *csdev, u32 >> mode) >> +{ >> + int ret = 0; >> + u32 val; > > > To be on the safer side, I believe 'val' should be unsigned long, to match > the size of local_t. > >> + unsigned long flags; >> + struct tmc_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent); >> + >> + /* This shouldn't be happening */ >> + WARN_ON(mode != CS_MODE_PERF); > > > I think the above check, and the mode parameter itself is superfluous, given > that this is a static function used internally only for the PERF mode. > Similarly for the _sysfs version. We definitely misunderstood each other then - the only reason I added the checks is after what (I thought) you suggested in the previous revision. > >> + >> + spin_lock_irqsave(&drvdata->spinlock, flags); >> + if (drvdata->reading) { >> + ret = -EINVAL; >> + goto out; >> + } >> + >> + val = local_xchg(&drvdata->mode, mode); > > > We should be using local_cmpxchg() here. Otherwise, we could corrupt the > mode. The newly added (above) check allows us to do that now. There can only be one value coming in (CS_MODE_PERF) and the current type can only be CS_MODE_PERF/DISABLED. > Similarly for the _sysfs version. I though the previous version of your > series > did that. > >> + /* >> + * In Perf mode there can be only one writer per sink. There >> + * is also no need to continue if the ETB/ETR is already operated >> + * from sysFS. >> + */ >> + if (val != CS_MODE_DISABLED) { >> + ret = -EINVAL; >> + goto out; >> + } > > > >> static void tmc_disable_etf_sink(struct coresight_device *csdev) >> { >> u32 val; >> @@ -271,6 +318,7 @@ const struct coresight_ops tmc_etf_cs_ops = { >> >> int tmc_read_prepare_etb(struct tmc_drvdata *drvdata) >> { >> + u32 val; >> enum tmc_mode mode; >> int ret = 0; >> unsigned long flags; >> @@ -289,6 +337,13 @@ int tmc_read_prepare_etb(struct tmc_drvdata *drvdata) >> goto out; >> } >> >> + val = local_read(&drvdata->mode); >> + /* Don't interfere if operated from Perf */ >> + if (val == CS_MODE_PERF) { >> + ret = -EINVAL; >> + goto out; >> + } > > > Could we get here when CS_DISABLED ? If not, we could get rid of the check > for CS_MODE_SYSFS below. > >> + >> /* If drvdata::buf is NULL the trace data has been read already */ >> if (drvdata->buf == NULL) { >> ret = -EINVAL; >> @@ -296,7 +351,7 @@ int tmc_read_prepare_etb(struct tmc_drvdata *drvdata) >> } >> >> /* Disable the TMC if need be */ >> - if (local_read(&drvdata->mode) == CS_MODE_SYSFS) >> + if (val == CS_MODE_SYSFS) >> tmc_etb_disable_hw(drvdata); > > See above Yes, we can get here when mode is set to CS_MODE_DISABLED. Someone can read the /dev/xyz entry whenever they want, including when a sink hasn't been enabled. Thanks, Mathieu > >> drvdata->reading = true; >> diff --git a/drivers/hwtracing/coresight/coresight-tmc-etr.c >> b/drivers/hwtracing/coresight/coresight-tmc-etr.c >> index de5cf0056802..04fc63d85696 100644 >> --- a/drivers/hwtracing/coresight/coresight-tmc-etr.c >> +++ b/drivers/hwtracing/coresight/coresight-tmc-etr.c >> @@ -87,7 +87,7 @@ static void tmc_etr_disable_hw(struct tmc_drvdata >> *drvdata) >> CS_LOCK(drvdata->base); >> } >> >> -static int tmc_enable_etr_sink(struct coresight_device *csdev, u32 mode) >> +static int tmc_enable_etr_sink_sysfs(struct coresight_device *csdev, u32 >> mode) >> { >> bool allocated = false; >> u32 val; >> @@ -166,6 +166,53 @@ out: >> return 0; >> } >> > >> +static int tmc_enable_etr_sink_perf(struct coresight_device *csdev, u32 >> mode) > > ... > >> static void tmc_disable_etr_sink(struct coresight_device *csdev) > > > Same comments as for the etb side. > > Suzuki > > { >
WARNING: multiple messages have this Message-ID (diff)
From: mathieu.poirier@linaro.org (Mathieu Poirier) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH V2 11/15] coresight: tmc: make sysFS and Perf mode mutually exclusive Date: Tue, 19 Apr 2016 10:16:22 -0600 [thread overview] Message-ID: <CANLsYkwOkF3Huzjxr6Pds4_e3m9kC03Qu1t-8xUg7fyFQGOvzg@mail.gmail.com> (raw) In-Reply-To: <571635C6.9070903@arm.com> On 19 April 2016 at 07:42, Suzuki K Poulose <Suzuki.Poulose@arm.com> wrote: > On 12/04/16 18:54, Mathieu Poirier wrote: >> >> The sysFS and Perf access methods can't be allowed to interfere >> with one another. As such introducing guards to access >> functions that prevents moving forward if a TMC is already >> being used. >> >> Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org> >> --- >> drivers/hwtracing/coresight/coresight-tmc-etf.c | 59 >> +++++++++++++++++++++- >> drivers/hwtracing/coresight/coresight-tmc-etr.c | 67 >> +++++++++++++++++++++++-- >> 2 files changed, 119 insertions(+), 7 deletions(-) >> >> diff --git a/drivers/hwtracing/coresight/coresight-tmc-etf.c >> b/drivers/hwtracing/coresight/coresight-tmc-etf.c >> index 9b4cdaed09f5..50d32e8ef4ea 100644 >> --- a/drivers/hwtracing/coresight/coresight-tmc-etf.c >> +++ b/drivers/hwtracing/coresight/coresight-tmc-etf.c >> @@ -111,7 +111,7 @@ static void tmc_etf_disable_hw(struct tmc_drvdata >> *drvdata) >> CS_LOCK(drvdata->base); >> } >> >> -static int tmc_enable_etf_sink(struct coresight_device *csdev, u32 mode) >> +static int tmc_enable_etf_sink_sysfs(struct coresight_device *csdev, u32 >> mode) >> { >> bool allocated = false; >> char *buf = NULL; >> @@ -189,6 +189,53 @@ out: >> return 0; >> } >> >> +static int tmc_enable_etf_sink_perf(struct coresight_device *csdev, u32 >> mode) >> +{ >> + int ret = 0; >> + u32 val; > > > To be on the safer side, I believe 'val' should be unsigned long, to match > the size of local_t. > >> + unsigned long flags; >> + struct tmc_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent); >> + >> + /* This shouldn't be happening */ >> + WARN_ON(mode != CS_MODE_PERF); > > > I think the above check, and the mode parameter itself is superfluous, given > that this is a static function used internally only for the PERF mode. > Similarly for the _sysfs version. We definitely misunderstood each other then - the only reason I added the checks is after what (I thought) you suggested in the previous revision. > >> + >> + spin_lock_irqsave(&drvdata->spinlock, flags); >> + if (drvdata->reading) { >> + ret = -EINVAL; >> + goto out; >> + } >> + >> + val = local_xchg(&drvdata->mode, mode); > > > We should be using local_cmpxchg() here. Otherwise, we could corrupt the > mode. The newly added (above) check allows us to do that now. There can only be one value coming in (CS_MODE_PERF) and the current type can only be CS_MODE_PERF/DISABLED. > Similarly for the _sysfs version. I though the previous version of your > series > did that. > >> + /* >> + * In Perf mode there can be only one writer per sink. There >> + * is also no need to continue if the ETB/ETR is already operated >> + * from sysFS. >> + */ >> + if (val != CS_MODE_DISABLED) { >> + ret = -EINVAL; >> + goto out; >> + } > > > >> static void tmc_disable_etf_sink(struct coresight_device *csdev) >> { >> u32 val; >> @@ -271,6 +318,7 @@ const struct coresight_ops tmc_etf_cs_ops = { >> >> int tmc_read_prepare_etb(struct tmc_drvdata *drvdata) >> { >> + u32 val; >> enum tmc_mode mode; >> int ret = 0; >> unsigned long flags; >> @@ -289,6 +337,13 @@ int tmc_read_prepare_etb(struct tmc_drvdata *drvdata) >> goto out; >> } >> >> + val = local_read(&drvdata->mode); >> + /* Don't interfere if operated from Perf */ >> + if (val == CS_MODE_PERF) { >> + ret = -EINVAL; >> + goto out; >> + } > > > Could we get here when CS_DISABLED ? If not, we could get rid of the check > for CS_MODE_SYSFS below. > >> + >> /* If drvdata::buf is NULL the trace data has been read already */ >> if (drvdata->buf == NULL) { >> ret = -EINVAL; >> @@ -296,7 +351,7 @@ int tmc_read_prepare_etb(struct tmc_drvdata *drvdata) >> } >> >> /* Disable the TMC if need be */ >> - if (local_read(&drvdata->mode) == CS_MODE_SYSFS) >> + if (val == CS_MODE_SYSFS) >> tmc_etb_disable_hw(drvdata); > > See above Yes, we can get here when mode is set to CS_MODE_DISABLED. Someone can read the /dev/xyz entry whenever they want, including when a sink hasn't been enabled. Thanks, Mathieu > >> drvdata->reading = true; >> diff --git a/drivers/hwtracing/coresight/coresight-tmc-etr.c >> b/drivers/hwtracing/coresight/coresight-tmc-etr.c >> index de5cf0056802..04fc63d85696 100644 >> --- a/drivers/hwtracing/coresight/coresight-tmc-etr.c >> +++ b/drivers/hwtracing/coresight/coresight-tmc-etr.c >> @@ -87,7 +87,7 @@ static void tmc_etr_disable_hw(struct tmc_drvdata >> *drvdata) >> CS_LOCK(drvdata->base); >> } >> >> -static int tmc_enable_etr_sink(struct coresight_device *csdev, u32 mode) >> +static int tmc_enable_etr_sink_sysfs(struct coresight_device *csdev, u32 >> mode) >> { >> bool allocated = false; >> u32 val; >> @@ -166,6 +166,53 @@ out: >> return 0; >> } >> > >> +static int tmc_enable_etr_sink_perf(struct coresight_device *csdev, u32 >> mode) > > ... > >> static void tmc_disable_etr_sink(struct coresight_device *csdev) > > > Same comments as for the etb side. > > Suzuki > > { >
next prev parent reply other threads:[~2016-04-19 16:16 UTC|newest] Thread overview: 96+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-04-12 17:54 [PATCH V2 00/15] coresight: tmc: make driver usable by Perf Mathieu Poirier 2016-04-12 17:54 ` Mathieu Poirier 2016-04-12 17:54 ` [PATCH V2 01/15] coresight: tmc: modifying naming convention Mathieu Poirier 2016-04-12 17:54 ` Mathieu Poirier 2016-04-14 17:01 ` Suzuki K Poulose 2016-04-14 17:01 ` Suzuki K Poulose 2016-04-12 17:54 ` [PATCH V2 02/15] coresight: tmc: waiting for TMCReady bit before programming Mathieu Poirier 2016-04-12 17:54 ` Mathieu Poirier 2016-04-14 17:05 ` Suzuki K Poulose 2016-04-14 17:05 ` Suzuki K Poulose 2016-04-12 17:54 ` [PATCH V2 03/15] coresight: tmc: re-implementing tmc_read_prepare/unprepare() functions Mathieu Poirier 2016-04-12 17:54 ` Mathieu Poirier 2016-04-14 17:11 ` Suzuki K Poulose 2016-04-14 17:11 ` Suzuki K Poulose 2016-04-15 15:40 ` Mathieu Poirier 2016-04-15 15:40 ` Mathieu Poirier 2016-04-15 17:41 ` Suzuki K Poulose 2016-04-15 17:41 ` Suzuki K Poulose 2016-04-12 17:54 ` [PATCH V2 04/15] coresight: tmc: introducing new header file Mathieu Poirier 2016-04-12 17:54 ` Mathieu Poirier 2016-04-14 17:33 ` Suzuki K Poulose 2016-04-14 17:33 ` Suzuki K Poulose 2016-04-15 16:03 ` Mathieu Poirier 2016-04-15 16:03 ` Mathieu Poirier 2016-04-15 16:08 ` Suzuki K Poulose 2016-04-15 16:08 ` Suzuki K Poulose 2016-04-15 16:15 ` Mathieu Poirier 2016-04-15 16:15 ` Mathieu Poirier 2016-04-15 16:18 ` Suzuki K Poulose 2016-04-15 16:18 ` Suzuki K Poulose 2016-04-12 17:54 ` [PATCH V2 05/15] coresight: tmc: splitting driver in ETB/ETF and ETR components Mathieu Poirier 2016-04-12 17:54 ` Mathieu Poirier 2016-04-19 12:20 ` Suzuki K Poulose 2016-04-19 12:20 ` Suzuki K Poulose 2016-04-19 15:14 ` Mathieu Poirier 2016-04-19 15:14 ` Mathieu Poirier 2016-04-12 17:54 ` [PATCH V2 06/15] coresight: tmc: making prepare/unprepare functions generic Mathieu Poirier 2016-04-12 17:54 ` Mathieu Poirier 2016-04-19 12:30 ` Suzuki K Poulose 2016-04-19 12:30 ` Suzuki K Poulose 2016-04-19 15:22 ` Mathieu Poirier 2016-04-19 15:22 ` Mathieu Poirier 2016-04-19 15:32 ` Suzuki K Poulose 2016-04-19 15:32 ` Suzuki K Poulose 2016-04-12 17:54 ` [PATCH V2 07/15] coresight: tmc: allocating memory when needed Mathieu Poirier 2016-04-12 17:54 ` Mathieu Poirier 2016-04-19 12:55 ` Suzuki K Poulose 2016-04-19 12:55 ` Suzuki K Poulose 2016-04-19 13:14 ` Suzuki K Poulose 2016-04-19 13:14 ` Suzuki K Poulose 2016-04-19 15:39 ` Mathieu Poirier 2016-04-19 15:39 ` Mathieu Poirier 2016-04-12 17:54 ` [PATCH V2 08/15] coresight: tmc: getting the right read_count on tmc_open() Mathieu Poirier 2016-04-12 17:54 ` Mathieu Poirier 2016-04-19 13:07 ` Suzuki K Poulose 2016-04-19 13:07 ` Suzuki K Poulose 2016-04-12 17:54 ` [PATCH V2 09/15] coresight: tmc: adding mode of operation for link/sinks Mathieu Poirier 2016-04-12 17:54 ` Mathieu Poirier 2016-04-19 13:19 ` Suzuki K Poulose 2016-04-19 13:19 ` Suzuki K Poulose 2016-04-19 15:45 ` Mathieu Poirier 2016-04-19 15:45 ` Mathieu Poirier 2016-04-19 15:49 ` Suzuki K Poulose 2016-04-19 15:49 ` Suzuki K Poulose 2016-04-12 17:54 ` [PATCH V2 10/15] coresight: tmc: dump system memory content only when needed Mathieu Poirier 2016-04-12 17:54 ` Mathieu Poirier 2016-04-12 17:54 ` [PATCH V2 11/15] coresight: tmc: make sysFS and Perf mode mutually exclusive Mathieu Poirier 2016-04-12 17:54 ` Mathieu Poirier 2016-04-19 13:42 ` Suzuki K Poulose 2016-04-19 13:42 ` Suzuki K Poulose 2016-04-19 16:16 ` Mathieu Poirier [this message] 2016-04-19 16:16 ` Mathieu Poirier 2016-04-12 17:54 ` [PATCH V2 12/15] coresight: tmc: keep track of memory width Mathieu Poirier 2016-04-12 17:54 ` Mathieu Poirier 2016-04-14 11:19 ` Suzuki K Poulose 2016-04-14 11:19 ` Suzuki K Poulose 2016-04-15 16:10 ` Mathieu Poirier 2016-04-15 16:10 ` Mathieu Poirier 2016-04-12 17:54 ` [PATCH V2 13/15] coresight: tmc: implementing TMC-ETF AUX space API Mathieu Poirier 2016-04-12 17:54 ` Mathieu Poirier 2016-04-19 16:16 ` Suzuki K Poulose 2016-04-19 16:16 ` Suzuki K Poulose 2016-04-19 16:45 ` Mathieu Poirier 2016-04-19 16:45 ` Mathieu Poirier 2016-04-19 16:50 ` Suzuki K Poulose 2016-04-19 16:50 ` Suzuki K Poulose 2016-04-12 17:54 ` [PATCH V2 14/15] coresight: tmc: implementing TMC-ETR " Mathieu Poirier 2016-04-12 17:54 ` Mathieu Poirier 2016-04-21 16:10 ` Suzuki K Poulose 2016-04-21 16:10 ` Suzuki K Poulose 2016-04-21 22:00 ` Mathieu Poirier 2016-04-21 22:00 ` Mathieu Poirier 2016-04-12 17:54 ` [PATCH V2 15/15] coresight: configuring ETF in FIFO mode when acting as link Mathieu Poirier 2016-04-12 17:54 ` Mathieu Poirier 2016-04-21 12:53 ` Suzuki K Poulose 2016-04-21 12:53 ` Suzuki K Poulose
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=CANLsYkwOkF3Huzjxr6Pds4_e3m9kC03Qu1t-8xUg7fyFQGOvzg@mail.gmail.com \ --to=mathieu.poirier@linaro.org \ --cc=Suzuki.Poulose@arm.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.