Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Liam Howlett <liam.howlett@oracle.com>
To:     Suren Baghdasaryan <surenb@google.com>
CC:     "maple-tree@lists.infradead.org" <maple-tree@lists.infradead.org>,
        "linux-mm@kvack.org" <linux-mm@kvack.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        Andrew Morton <akpm@linux-foundation.org>,
        Song Liu <songliubraving@fb.com>,
        Davidlohr Bueso <dave@stgolabs.net>,
        "Paul E . McKenney" <paulmck@kernel.org>,
        Matthew Wilcox <willy@infradead.org>,
        Laurent Dufour <ldufour@linux.ibm.com>,
        David Rientjes <rientjes@google.com>,
        Axel Rasmussen <axelrasmussen@google.com>,
        Vlastimil Babka <vbabka@suse.cz>,
        Rik van Riel <riel@surriel.com>,
        Peter Zijlstra <peterz@infradead.org>,
        Michel Lespinasse <walken.cr@gmail.com>
Subject: Re: [PATCH 24/94] radix tree test suite: Add keme_cache_alloc_bulk()
 support
Thread-Topic: [PATCH 24/94] radix tree test suite: Add keme_cache_alloc_bulk()
 support
Thread-Index: AQHXPEQuvP7qWSQZGk6zUNYAinMQpKr5YvOAgAAT0oA=
Date:   Fri, 28 May 2021 19:28:41 +0000
Message-ID: <20210528192835.fqty5lk65dsg2q5c@revolver>
References: <20210428153542.2814175-1-Liam.Howlett@Oracle.com>
 <20210428153542.2814175-25-Liam.Howlett@Oracle.com>
 <CAJuCfpEq3xVPrk0d_UNbgNOLQ7wN5rm4wx+CK2krc-bkmGpq1Q@mail.gmail.com>
In-Reply-To: <CAJuCfpEq3xVPrk0d_UNbgNOLQ7wN5rm4wx+CK2krc-bkmGpq1Q@mail.gmail.com>
Accept-Language: en-US
Content-Language: en-US
Content-Type: text/plain; charset="us-ascii"
Content-ID: <BBAC53ACBDF2274FA578FC176339FEF8@namprd10.prod.outlook.com>
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: 78397d5c-7285-4a67-d86d-08d9220eccf9
X-MS-Exchange-CrossTenant-originalarrivaltime: 28 May 2021 19:28:41.2108
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: iQq8SJ+bOYW+G9OMzNRJTcLaN1XvXWFJ2CfeRVWQyV5DIVl5n7F4i2JSHZbmOsw7peXK6SVDetjZh2otQmCTxQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR10MB1982
X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=9998 signatures=668682
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 phishscore=0 bulkscore=0
 mlxlogscore=999 malwarescore=0 spamscore=0 suspectscore=0 adultscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2104190000
 definitions=main-2105280126
X-Proofpoint-ORIG-GUID: 9bfzg73_7QiqYT-uDJjlZhR0x8Du2FYq
X-Proofpoint-GUID: 9bfzg73_7QiqYT-uDJjlZhR0x8Du2FYq
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

* Suren Baghdasaryan <surenb@google.com> [210528 14:17]:
> On Wed, Apr 28, 2021 at 8:36 AM Liam Howlett <liam.howlett@oracle.com> wr=
ote:
> >
> > Signed-off-by: Liam R. Howlett <Liam.Howlett@Oracle.com>
> > ---
> >  tools/testing/radix-tree/linux.c      | 51 +++++++++++++++++++++++++++
> >  tools/testing/radix-tree/linux/slab.h |  1 +
> >  2 files changed, 52 insertions(+)
> >
> > diff --git a/tools/testing/radix-tree/linux.c b/tools/testing/radix-tre=
e/linux.c
> > index 380bbc0a48d6..fb19a40ebb46 100644
> > --- a/tools/testing/radix-tree/linux.c
> > +++ b/tools/testing/radix-tree/linux.c
> > @@ -99,6 +99,57 @@ void kmem_cache_free_bulk(struct kmem_cache *cachep,=
 size_t size, void **list)
> >         for (int i =3D 0; i < size; i++)
> >                 kmem_cache_free(cachep, list[i]);
> >  }
> > +int kmem_cache_alloc_bulk(struct kmem_cache *cachep, gfp_t gfp, size_t=
 size,
> > +                         void **p)
> > +{
> > +       size_t i;
> > +
> > +       if (kmalloc_verbose)
> > +               printk("Bulk alloc %lu\n", size);
> > +
> > +       if (!(gfp & __GFP_DIRECT_RECLAIM) && cachep->non_kernel < size)
> > +               return 0;
> > +
> > +       if (!(gfp & __GFP_DIRECT_RECLAIM))
> > +               cachep->non_kernel -=3D size;
> > +
> > +       pthread_mutex_lock(&cachep->lock);
> > +       if (cachep->nr_objs >=3D size) {
> > +               struct radix_tree_node *node =3D cachep->objs;
> > +
>=20
> I don't think the loop below is correct because "node" is not being
> changed on each iteration:
>=20
> > +               for (i =3D 0; i < size; i++) {
> > +                       cachep->nr_objs--;
> > +                       cachep->objs =3D node->parent;
>=20
> In the above assignment cachep->objs will be assigned the same value
> on all iterations.
>=20
> > +                       p[i] =3D cachep->objs;
>=20
> p[0] should point to the node, however here it would point to the node->p=
arent.
>=20
> > +               }
> > +               pthread_mutex_unlock(&cachep->lock);
> > +               node->parent =3D NULL;
>=20
> here you terminated the original cachep->objs which is not even inside
> the "p" list at this point (it was skipped).

I just verified that this code wasn't hit in my current test code.  I
will test and fix this.  Good catch.

>=20
> > +       } else {
> > +               pthread_mutex_unlock(&cachep->lock);
> > +               for (i =3D 0; i < size; i++) {
> > +                       if (cachep->align) {
> > +                               posix_memalign(&p[i], cachep->align,
> > +                                              cachep->size * size);
> > +                       } else {
> > +                               p[i] =3D malloc(cachep->size * size);
> > +                       }
> > +                       if (cachep->ctor)
> > +                               cachep->ctor(p[i]);
> > +                       else if (gfp & __GFP_ZERO)
> > +                               memset(p[i], 0, cachep->size);
> > +               }
> > +       }
> > +
> > +       for (i =3D 0; i < size; i++) {
> > +               uatomic_inc(&nr_allocated);
> > +               uatomic_inc(&nr_tallocated);
>=20
> I don't see nr_tallocated even in linux-next branch. Was it introduced
> in one of the previous patches and I missed it?

It was introduced with the maple tree itself.  I will spin this off as
its own patch with the same edits as nr_allocated.

>=20
> > +               if (kmalloc_verbose)
> > +                       printf("Allocating %p from slab\n", p[i]);
> > +       }
> > +
> > +       return size;
> > +}
> > +
> >
> >  void *kmalloc(size_t size, gfp_t gfp)
> >  {
> > diff --git a/tools/testing/radix-tree/linux/slab.h b/tools/testing/radi=
x-tree/linux/slab.h
> > index 53b79c15b3a2..ba42b8cc11d0 100644
> > --- a/tools/testing/radix-tree/linux/slab.h
> > +++ b/tools/testing/radix-tree/linux/slab.h
> > @@ -25,4 +25,5 @@ struct kmem_cache *kmem_cache_create(const char *name=
, unsigned int size,
> >                         void (*ctor)(void *));
> >
> >  void kmem_cache_free_bulk(struct kmem_cache *cachep, size_t, void **);
> > +int kmem_cache_alloc_bulk(struct kmem_cache *cachep, gfp_t, size_t, vo=
id **);
> >  #endif         /* SLAB_H */
> > --
> > 2.30.2=