Hi Suman,
On 4/7/20 9:47 PM, Suman Anna wrote:
> Hi Arnaud,
>
> On 3/30/20 7:29 AM, Arnaud POULIQUEN wrote:
>>
>>
>> On 3/27/20 10:09 PM, Mathieu Poirier wrote:
>>> On Wed, 25 Mar 2020 at 17:39, Suman Anna <s-anna@xxxxxx> wrote:
>>>>
>>>> Hi Mathieu,
>>>>
>>>> On 3/25/20 3:38 PM, Mathieu Poirier wrote:
>>>>> On Thu, Mar 19, 2020 at 11:23:20AM -0500, Suman Anna wrote:
>>>>>> From: Tero Kristo <t-kristo@xxxxxx>
>>>>>>
>>>>>> In some cases, like with OMAP remoteproc, we are not creating dedicated
>>>>>> memory pool for the virtio device. Instead, we use the same memory pool
>>>>>> for all shared memories. The current virtio memory pool handling forces
>>>>>> a split between these two, as a separate device is created for it,
>>>>>> causing memory to be allocated from bad location if the dedicated pool
>>>>>> is not available. Fix this by falling back to using the parent device
>>>>>> memory pool if dedicated is not available.
>>>>>>
>>>>>> Fixes: 086d08725d34 ("remoteproc: create vdev subdevice with specific dma memory pool")
>>>>>> Signed-off-by: Tero Kristo <t-kristo@xxxxxx>
>>>>>> Signed-off-by: Suman Anna <s-anna@xxxxxx>
>>>>>> ---
>>>>>> v2:
>>>>>> - Address Arnaud's concerns about hard-coded memory-region index 0
>>>>>> - Update the comment around the new code addition
>>>>>> v1: https://patchwork.kernel.org/patch/11422721/
>>>>>>
>>>>>> drivers/remoteproc/remoteproc_virtio.c | 15 +++++++++++++++
>>>>>> include/linux/remoteproc.h | 2 ++
>>>>>> 2 files changed, 17 insertions(+)
>>>>>>
>>>>>> diff --git a/drivers/remoteproc/remoteproc_virtio.c b/drivers/remoteproc/remoteproc_virtio.c
>>>>>> index eb817132bc5f..b687715cdf4b 100644
>>>>>> --- a/drivers/remoteproc/remoteproc_virtio.c
>>>>>> +++ b/drivers/remoteproc/remoteproc_virtio.c
>>>>>> @@ -369,6 +369,21 @@ int rproc_add_virtio_dev(struct rproc_vdev *rvdev, int id)
>>>>>> goto out;
>>>>>> }
>>>>>> }
>>>>>> + } else {
>>>>>> + struct device_node *np = rproc->dev.parent->of_node;
>>>>>> +
>>>>>> + /*
>>>>>> + * If we don't have dedicated buffer, just attempt to re-assign
>>>>>> + * the reserved memory from our parent. A default memory-region
>>>>>> + * at index 0 from the parent's memory-regions is assigned for
>>>>>> + * the rvdev dev to allocate from, and this can be customized
>>>>>> + * by updating the vdevbuf_mem_id in platform drivers if
>>>>>> + * desired. Failure is non-critical and the allocations will
>>>>>> + * fall back to global pools, so don't check return value
>>>>>> + * either.
>>>>>
>>>>> I'm perplex... In the changelog it is indicated that if a memory pool is
>>>>> not dedicated allocation happens from a bad location but here failure of
>>>>> getting a hold of a dedicated memory pool is not critical.
>>>>
>>>> So, the comment here is a generic one while the bad location part in the
>>>> commit description is actually from OMAP remoteproc usage perspective
>>>> (if you remember the dev_warn messages we added to the memory-region
>>>> parse logic in the driver).
>>>
>>> I can't tell... Are you referring to the comment lines after
>>> of_reserved_mem_device_init() in omap_rproc_probe()?
>>>
>>>>
>>>> Before the fixed-memory carveout support, all the DMA allocations in
>>>> remoteproc core were made from the rproc platform device's DMA pool (
>>>> which can be NULL). That is lost after the fixed-memory support, and
>>>> they were always allocated from global DMA pools if no dedicated pools
>>>> are used. After this patch, that continues to be case for drivers that
>>>> still do not use any dedicated pools, while it does restore the usage of
>>>> the platform device's DMA pool if a driver uses one (OMAP remoteproc
>>>> falls into the latter).
>>>>
>>>>>
>>>>>> + */
>>>>>> + of_reserved_mem_device_init_by_idx(dev, np,
>>>>>> + rproc->vdevbuf_mem_id);
>>>>>
>>>>> I wonder if using an index setup by platform code is really the best way
>>>>> forward when we already have the carveout mechanic available to us. I see the
>>>>> platform code adding a carveout that would have the same name as rproc->name.
>>>>> From there in rproc_add_virtio_dev() we could have something like:
>>>>>
>>>>> mem = rproc_find_carveout_by_name(rproc, "%s", rproc->name);
>>>>>
>>>>>
>>>>> That would be very flexible, the location of the reserved memory withing the
>>>>> memory-region could change without fear of breaking things and no need to add to
>>>>> struct rproc.
>>>>>
>>>>> Let me know what you think.
>>>>
>>>> I think that can work as well but I feel it is lot more cumbersome. It
>>>> does require every platform driver to add code adding/registering that
>>>> carveout, and parse the reserved memory region etc. End of the day, we
>>>> rely on DMA API and we just have to assign the region to the newly
>>>> created device. The DMA pool assignment for devices using
>>>> reserved-memory nodes has simply been the of_reserved_mem_device_init()
>>>> function.
>>>
>>> Given all the things happening in the platform drivers adding and
>>> registering a single carveout doesn't seem that onerous to me. I
>>> also expect setting rproc->vdevbuf_mem_id would involve some form of
>>> parsing. Lastly if a couple of platforms end up doing the same thing
>>> might as well bring the code in the core, hence choosing a generic
>>> name such as rproc->name for the memory region.
>>>
>>> At the very least I would use of_reserved_mem_device_init_by_idx(dev,
>>> np, 0). I agree it is not flexible but I'll take that over adding a
>>> new field to structure rproc.
>>
>> I wonder whether this would not introduce side effect for some legacy
>> drivers. Some rproc platforms can have a memory region defined but not
>> used for the virtio buffers which is allocated in the Linux default
>> memory pool.
>
> I am actually trying to restore the behavior before the separate vdev
> device creation. All allocations were coming from the rproc platform
> device's DMA pool (if assigned, otherwise will fall back to global pool).
Yes deprecated dma_declare_coherent_memory was used to declare the rproc
platform pool for vdev if i well remember).
>
> You have a valid point though, but are there any drivers relying on this
> today? All the usage I saw were only using of_reserved_mem_device_init()
> which is 0-indexed region by default. If this is really an issue, we can
> use -1 as a means to conditionally follow this path.
Up-streamed driver seems using nothing but address 0 for time being.
I don't know for non-up-streamed drivers...
But if you have a look to the stm32 platform driver, we also define the
memory regions for the code.
Even if we are also interesting by the possibility of having a default pool,
it is no simple to implement for our driver using index 0.
We will have to declare it first in DT. But we would also have to determine
if the first memory pool declaration is a default pool or not vs the other
memory region declarations.
>
>> If the aim is to minimize impact in the core part, the solution i proposed
>> in V1 using rproc_of_resm_mem_entry_init seems a good default candidate too.
>> The constraint would be that the platform driver has to pre-register
>> vdev<X>buffer reserved memory associated for a max number of vdev.
>> This max would limit the number of vdev that a remote firmware can request.
>> Also not very flexible more that the index 0, as managed at platform level.
>>
>> Having a default name or a default index seems to me a good compromise...
>> One advantage of the default name (in this case not rproc->name) is the
>> ability to define the memory region in a resource table carveout, instead
>> of a static definition in DT.
>
> Hmm, regarding the default name, vdev rings and vdev buffers are already
> looking for specific names, right? So, what resource type are you
> envisioning for this - RSC_CARVEOUT? Wouldn't that become a separate
> allocation by itself?
After checking, I think my point on the carveout is not valid. As we should no
longer use dma_declare_coherent_memory which seems obsolete since the
introduction of the devicetree. Thus, even if a carveout is defined, we will
have to declare an associated memory region in DT.
Anyway as a name is used today for other memory regions, i would be in flavor
of using the same method to declare a default memory pool in remote proc.
relying on the rproc_of_resm_mem_entry_init function.
If an index is preferred in core, platform drivers that declare more that
one memory region will probably have to implement code based on a default
memory region name to retrieve the associated index.
Regards,
Arnaud
>
> regards
> Suman
>
>>>>>
>>>>>> }
>>>>>>
>>>>>> /* Allocate virtio device */
>>>>>> diff --git a/include/linux/remoteproc.h b/include/linux/remoteproc.h
>>>>>> index ed127b2d35ca..07bd73a6d72a 100644
>>>>>> --- a/include/linux/remoteproc.h
>>>>>> +++ b/include/linux/remoteproc.h
>>>>>> @@ -481,6 +481,7 @@ struct rproc_dump_segment {
>>>>>> * @auto_boot: flag to indicate if remote processor should be auto-started
>>>>>> * @dump_segments: list of segments in the firmware
>>>>>> * @nb_vdev: number of vdev currently handled by rproc
>>>>>> + * @vdevbuf_mem_id: default memory-region index for allocating vdev buffers
>>>>>> */
>>>>>> struct rproc {
>>>>>> struct list_head node;
>>>>>> @@ -514,6 +515,7 @@ struct rproc {
>>>>>> bool auto_boot;
>>>>>> struct list_head dump_segments;
>>>>>> int nb_vdev;
>>>>>> + u8 vdevbuf_mem_id;
>>>>>> u8 elf_class;
>>>>>> };
>>>>>>
>>>>>> --
>>>>>> 2.23.0
>>>>>>
>>>>
>
