On Mon 20 Jan 08:28 PST 2020, Mathieu Poirier wrote:
> On Sun, 19 Jan 2020 at 12:40, Clément Leger <cleger@xxxxxxxxx> wrote:
> >
> > Hi Mathieu,
> >
> > ----- On 17 Jan, 2020, at 23:52, Mathieu Poirier mathieu.poirier@xxxxxxxxxx wrote:
> >
> > > Hey guys,
> > >
> > > On Wed, Jan 15, 2020 at 04:11:03PM +0100, Clément Leger wrote:
> > >>
> > >>
> > >> ----- On 15 Jan, 2020, at 16:09, Arnaud Pouliquen arnaud.pouliquen@xxxxxx wrote:
> > >>
> > >> > On 1/15/20 3:28 PM, Clément Leger wrote:
> > >> >> Hi Arnaud,
> > >> >>
> > >> >> ----- On 15 Jan, 2020, at 15:06, Arnaud Pouliquen arnaud.pouliquen@xxxxxx wrote:
> > >> >>
> > >> >>> Hi Clément,
> > >> >>>
> > >> >>> On 1/15/20 11:21 AM, Clement Leger wrote:
> > >> >>>> In order to support preallocated notify ids, if their value is
> > >> >>>> equal to FW_RSC_NOTIFY_ID_ANY, then do no allocate a notify id
> > >> >>>> dynamically but try to allocate the requested one. This is useful when
> > >> >>>> using custom ids to bind them to custom vendor resources. For instance,
> > >> >>>> it allow to assign a group of queues to a specific interrupti in order
> > >> >>>> to dispatch notifications.
> > >> >>>>
> > >> >>>> Signed-off-by: Clement Leger <cleger@xxxxxxxxx>
> > >> >>>> ---
> > >> >>>> drivers/remoteproc/remoteproc_core.c | 27 +++++++++++++++++++--------
> > >> >>>> include/linux/remoteproc.h | 1 +
> > >> >>>> 2 files changed, 20 insertions(+), 8 deletions(-)
> > >> >>>>
> > >> >>>> diff --git a/drivers/remoteproc/remoteproc_core.c
> > >> >>>> b/drivers/remoteproc/remoteproc_core.c
> > >> >>>> index 307df98347ba..b1485fcd0f11 100644
> > >> >>>> --- a/drivers/remoteproc/remoteproc_core.c
> > >> >>>> +++ b/drivers/remoteproc/remoteproc_core.c
> > >> >>>> @@ -351,14 +351,27 @@ int rproc_alloc_vring(struct rproc_vdev *rvdev, int i)
> > >> >>>> /*
> > >> >>>> * Assign an rproc-wide unique index for this vring
> > >> >>>> * TODO: assign a notifyid for rvdev updates as well
> > >> >>>> - * TODO: support predefined notifyids (via resource table)
> > >> >>>> */
> > >> >>>> - ret = idr_alloc(&rproc->notifyids, rvring, 0, 0, GFP_KERNEL);
> > >> >>>> - if (ret < 0) {
> > >> >>>> - dev_err(dev, "idr_alloc failed: %d\n", ret);
> > >> >>>> - return ret;
> > >> >>>> + if (rsc->vring[i].notifyid == FW_RSC_NOTIFY_ID_ANY) {
> > >> >>>> + ret = idr_alloc(&rproc->notifyids, rvring, 0, 0, GFP_KERNEL);
> > >> >>>> + if (ret < 0) {
> > >> >>>> + dev_err(dev, "idr_alloc failed: %d\n", ret);
> > >> >>>> + return ret;
> > >> >>>> + }
> > >> >>>> + notifyid = ret;
> > >> >>>> +
> > >> >>>> + /* Let the rproc know the notifyid of this vring.*/
> > >> >>>> + rsc->vring[i].notifyid = notifyid;
> > >> >>>> + } else {
> > >> >>>> + /* Reserve requested notify_id */
> > >> >>>> + notifyid = rsc->vring[i].notifyid;
> > >> >>>> + ret = idr_alloc(&rproc->notifyids, rvring, notifyid,
> > >> >>>> + notifyid + 1, GFP_KERNEL);
> > >> >>>> + if (ret < 0) {
> > >> >>>> + dev_err(dev, "idr_alloc failed: %d\n", ret);
> > >> >>>> + return ret;
> > >> >>>> + }
> > >> >>>> }
> > >> >>>> - notifyid = ret;
> > >> >>>>
> > >> >>>> /* Potentially bump max_notifyid */
> > >> >>>> if (notifyid > rproc->max_notifyid)
> > >> >>>> @@ -366,8 +379,6 @@ int rproc_alloc_vring(struct rproc_vdev *rvdev, int i)
> > >> >>>>
> > >> >>>> rvring->notifyid = notifyid;
> > >> >>>>
> > >> >>>> - /* Let the rproc know the notifyid of this vring.*/
> > >> >>>> - rsc->vring[i].notifyid = notifyid;
> > >> >>>> return 0;
> > >> >>>> }
> > >> >>> The rproc_free_vring function resets the notifyid to -1 on free.
> > >> >>> This could generate a side effect if the resource table is not reloaded.
> > >> >>
> > >> >> Oh indeed, I did not thought of that. What would you recommend ?
> > >> >> If using -1 in free vring, notify ids will be reallocated at next
> > >> >> round.
> > >> > Regarding the code i'm not sure that it is useful to reset the notifyID to -1 on
> > >> > free.
> > >
> > > I'm not sure setting notifyid to -1 in rproc_free_vring() is such a big problem.
> > > No matter the code path I look at, if rproc_free_vring() is called something
> > > serious has happened and the resource table will be reloaded if another attempt
> > > at booting the remote processor is done. It can also be that a graceful
> > > shutdown is underway, in which case the resource table will be reloaded anyway
> > > if/when the slave is brought back in service.
> > >
> > > Let me know if I'm missing a scenario.
> >
> > No, you are actually right
> >
> > >
> > > To me the real problem is if a FW image has set the notifyids in the resource
> > > table to 0xffffffff, thinking they will be overwritten. In that case things
> > > will really south.
> >
> > Hum, if set to 0xFFFFFFFF, then they will be assigned dynamically and updated
> > in the resource table (with this patch). But your probably mean existing code,
> > right ?
>
> My apologies for not expressing myself clearly here - let me try again.
>
> At this time notifyids in the firmware's resource table can be set to
> anything because the code will overwrite them. With this patch
> firmware images that don't have their notifyids set to -1 will see a
> change in how ids are assigned, something that has the potential to
> break user space.
>
Right, we should have had a check in place to ensure that we only
accepted -1 here, as that's what the code relies upon.
If a conclusion on the new resource table format is imminent it sounds
reasonable to document the behaviour for the current version and make it
behave as as expected in the new one.
Regards,
Bjorn
