From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.5 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_2 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E56ACC433E2 for ; Mon, 22 Jun 2020 10:00:19 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id C757B206F1 for ; Mon, 22 Jun 2020 10:00:18 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C757B206F1 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=Huawei.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 577396B0002; Mon, 22 Jun 2020 06:00:18 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 528976B0003; Mon, 22 Jun 2020 06:00:18 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 43F786B0005; Mon, 22 Jun 2020 06:00:18 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0090.hostedemail.com [216.40.44.90]) by kanga.kvack.org (Postfix) with ESMTP id 356E86B0002 for ; Mon, 22 Jun 2020 06:00:18 -0400 (EDT) Received: from smtpin09.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id F1DDB181AC9CC for ; Mon, 22 Jun 2020 10:00:17 +0000 (UTC) X-FDA: 76956402474.09.rule31_01088bc26e32 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin09.hostedemail.com (Postfix) with ESMTP id C5170180AD822 for ; Mon, 22 Jun 2020 10:00:17 +0000 (UTC) X-HE-Tag: rule31_01088bc26e32 X-Filterd-Recvd-Size: 9277 Received: from huawei.com (lhrrgout.huawei.com [185.176.76.210]) by imf01.hostedemail.com (Postfix) with ESMTP for ; Mon, 22 Jun 2020 10:00:17 +0000 (UTC) Received: from lhreml710-chm.china.huawei.com (unknown [172.18.7.107]) by Forcepoint Email with ESMTP id 29053AA4E1028E86C6D6; Mon, 22 Jun 2020 11:00:14 +0100 (IST) Received: from localhost (10.52.127.176) by lhreml710-chm.china.huawei.com (10.201.108.61) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.1.1913.5; Mon, 22 Jun 2020 11:00:13 +0100 Date: Mon, 22 Jun 2020 10:59:23 +0100 From: Jonathan Cameron To: Barry Song CC: , , Seth Jennings , , , , , , Dan Streetman , Vitaly Wool Subject: Re: [PATCH 1/3] crypto: permit users to specify numa node of acomp hardware Message-ID: <20200622105923.0000710b@Huawei.com> In-Reply-To: <20200622024901.12632-2-song.bao.hua@hisilicon.com> References: <20200622024901.12632-1-song.bao.hua@hisilicon.com> <20200622024901.12632-2-song.bao.hua@hisilicon.com> Organization: Huawei Technologies Research and Development (UK) Ltd. X-Mailer: Claws Mail 3.17.4 (GTK+ 2.24.32; i686-w64-mingw32) MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.52.127.176] X-ClientProxiedBy: lhreml708-chm.china.huawei.com (10.201.108.57) To lhreml710-chm.china.huawei.com (10.201.108.61) X-CFilter-Loop: Reflected X-Rspamd-Queue-Id: C5170180AD822 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam04 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On Mon, 22 Jun 2020 14:48:59 +1200 Barry Song wrote: > For a Linux server with NUMA, there are possibly multiple (de)compressors > which are either local or remote to some NUMA node. Some drivers will > automatically use the (de)compressor near the CPU calling acomp_alloc(). > However, it is not necessarily correct because users who send acomp_req > could be from different NUMA node with the CPU which allocates acomp. > > Just like kernel has kmalloc() and kmalloc_node(), here crypto can have > same support. > > Cc: Seth Jennings > Cc: Dan Streetman > Cc: Vitaly Wool > Cc: Andrew Morton > Signed-off-by: Barry Song Hi Barry, Seems sensible to me. A few trivial comments inline. Thanks, Jonathan > --- > crypto/acompress.c | 8 ++++++++ > crypto/api.c | 22 ++++++++++++++-------- > crypto/internal.h | 23 +++++++++++++++++++---- > include/crypto/acompress.h | 7 +++++++ > include/linux/crypto.h | 3 ++- > 5 files changed, 50 insertions(+), 13 deletions(-) > > diff --git a/crypto/acompress.c b/crypto/acompress.c > index 84a76723e851..c32c72048a1c 100644 > --- a/crypto/acompress.c > +++ b/crypto/acompress.c > @@ -109,6 +109,14 @@ struct crypto_acomp *crypto_alloc_acomp(const char *alg_name, u32 type, > } > EXPORT_SYMBOL_GPL(crypto_alloc_acomp); > > +struct crypto_acomp *crypto_alloc_acomp_node(const char *alg_name, u32 type, > + u32 mask, int node) > +{ > + return crypto_alloc_tfm_node(alg_name, &crypto_acomp_type, type, mask, > + node); > +} > +EXPORT_SYMBOL_GPL(crypto_alloc_acomp_node); > + > struct acomp_req *acomp_request_alloc(struct crypto_acomp *acomp) > { > struct crypto_tfm *tfm = crypto_acomp_tfm(acomp); > diff --git a/crypto/api.c b/crypto/api.c > index edcf690800d4..4ecf712286af 100644 > --- a/crypto/api.c > +++ b/crypto/api.c > @@ -433,8 +433,9 @@ struct crypto_tfm *crypto_alloc_base(const char *alg_name, u32 type, u32 mask) > } > EXPORT_SYMBOL_GPL(crypto_alloc_base); > > -void *crypto_create_tfm(struct crypto_alg *alg, > - const struct crypto_type *frontend) > +void *crypto_create_tfm_node(struct crypto_alg *alg, > + const struct crypto_type *frontend, > + int node) > { > char *mem; > struct crypto_tfm *tfm = NULL; > @@ -451,6 +452,7 @@ void *crypto_create_tfm(struct crypto_alg *alg, > > tfm = (struct crypto_tfm *)(mem + tfmsize); > tfm->__crt_alg = alg; > + tfm->node = node; > > err = frontend->init_tfm(tfm); > if (err) > @@ -472,7 +474,7 @@ void *crypto_create_tfm(struct crypto_alg *alg, > out: > return mem; > } > -EXPORT_SYMBOL_GPL(crypto_create_tfm); > +EXPORT_SYMBOL_GPL(crypto_create_tfm_node); > > struct crypto_alg *crypto_find_alg(const char *alg_name, > const struct crypto_type *frontend, > @@ -490,11 +492,13 @@ struct crypto_alg *crypto_find_alg(const char *alg_name, > EXPORT_SYMBOL_GPL(crypto_find_alg); > > /* > - * crypto_alloc_tfm - Locate algorithm and allocate transform > + * crypto_alloc_tfm_node - Locate algorithm and allocate transform > * @alg_name: Name of algorithm > * @frontend: Frontend algorithm type > * @type: Type of algorithm > * @mask: Mask for type comparison > + * @node: NUMA node in which users desire to put requests, if node is > + * NUMA_NO_NODE, it means users have no special requirement. > * > * crypto_alloc_tfm() will first attempt to locate an already loaded > * algorithm. If that fails and the kernel supports dynamically loadable > @@ -509,8 +513,10 @@ EXPORT_SYMBOL_GPL(crypto_find_alg); > * > * In case of error the return value is an error pointer. > */ > -void *crypto_alloc_tfm(const char *alg_name, > - const struct crypto_type *frontend, u32 type, u32 mask) > + > +void *crypto_alloc_tfm_node(const char *alg_name, > + const struct crypto_type *frontend, u32 type, u32 mask, > + int node) > { > void *tfm; > int err; > @@ -524,7 +530,7 @@ void *crypto_alloc_tfm(const char *alg_name, > goto err; > } > > - tfm = crypto_create_tfm(alg, frontend); > + tfm = crypto_create_tfm_node(alg, frontend, node); > if (!IS_ERR(tfm)) > return tfm; > > @@ -542,7 +548,7 @@ void *crypto_alloc_tfm(const char *alg_name, > > return ERR_PTR(err); > } > -EXPORT_SYMBOL_GPL(crypto_alloc_tfm); > +EXPORT_SYMBOL_GPL(crypto_alloc_tfm_node); > > /* > * crypto_destroy_tfm - Free crypto transform > diff --git a/crypto/internal.h b/crypto/internal.h > index ff06a3bd1ca1..1b92a5a61852 100644 > --- a/crypto/internal.h > +++ b/crypto/internal.h > @@ -68,13 +68,28 @@ void crypto_remove_final(struct list_head *list); > void crypto_shoot_alg(struct crypto_alg *alg); > struct crypto_tfm *__crypto_alloc_tfm(struct crypto_alg *alg, u32 type, > u32 mask); > -void *crypto_create_tfm(struct crypto_alg *alg, > - const struct crypto_type *frontend); > +void *crypto_create_tfm_node(struct crypto_alg *alg, > + const struct crypto_type *frontend, int node); > + > +static inline void *crypto_create_tfm(struct crypto_alg *alg, > + const struct crypto_type *frontend) > +{ > + return crypto_create_tfm_node(alg, frontend, NUMA_NO_NODE); > +} > + > struct crypto_alg *crypto_find_alg(const char *alg_name, > const struct crypto_type *frontend, > u32 type, u32 mask); > -void *crypto_alloc_tfm(const char *alg_name, > - const struct crypto_type *frontend, u32 type, u32 mask); > + > +void *crypto_alloc_tfm_node(const char *alg_name, > + const struct crypto_type *frontend, u32 type, u32 mask, > + int node); > + > +static inline void *crypto_alloc_tfm(const char *alg_name, > + const struct crypto_type *frontend, u32 type, u32 mask) > +{ > + return crypto_alloc_tfm_node(alg_name, frontend, type, mask, NUMA_NO_NODE); > +} > > int crypto_probing_notify(unsigned long val, void *v); > > diff --git a/include/crypto/acompress.h b/include/crypto/acompress.h > index 2b4d2b06ccbd..b1a78687014a 100644 > --- a/include/crypto/acompress.h > +++ b/include/crypto/acompress.h > @@ -106,6 +106,13 @@ struct acomp_alg { > */ > struct crypto_acomp *crypto_alloc_acomp(const char *alg_name, u32 type, > u32 mask); > +/** > + * crypto_alloc_acomp_node() -- allocate ACOMPRESS tfm handle with desired NUMA > + * node Given slightly relaxed view on 80 chars now in place, I'd put that on one line. Also kernel-doc needs to be complete so though it's tedious you should document the other parameters. > + * @node: specifies the NUMA node the ZIP hardware belongs to > + */ > +struct crypto_acomp *crypto_alloc_acomp_node(const char *alg_name, u32 type, > + u32 mask, int node); > > static inline struct crypto_tfm *crypto_acomp_tfm(struct crypto_acomp *tfm) > { > diff --git a/include/linux/crypto.h b/include/linux/crypto.h > index 763863dbc079..c1a47ce4c09e 100644 > --- a/include/linux/crypto.h > +++ b/include/linux/crypto.h > @@ -593,8 +593,9 @@ int crypto_has_alg(const char *name, u32 type, u32 mask); > */ > > struct crypto_tfm { > - Stray change. Shouldn't be in this patch. > u32 crt_flags; > + > + int node; > > void (*exit)(struct crypto_tfm *tfm); >