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=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=ham 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 2A13DC433E0 for ; Sun, 5 Jul 2020 09:21:24 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id EC95820772 for ; Sun, 5 Jul 2020 09:21:23 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EC95820772 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=hisilicon.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 766C28D001C; Sun, 5 Jul 2020 05:21:23 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6EF108D0001; Sun, 5 Jul 2020 05:21:23 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5DE438D001C; Sun, 5 Jul 2020 05:21:23 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0131.hostedemail.com [216.40.44.131]) by kanga.kvack.org (Postfix) with ESMTP id 49A158D0001 for ; Sun, 5 Jul 2020 05:21:23 -0400 (EDT) Received: from smtpin07.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 15E8F2C93 for ; Sun, 5 Jul 2020 09:21:23 +0000 (UTC) X-FDA: 77003478846.07.hen54_3d02b7b26ea2 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin07.hostedemail.com (Postfix) with ESMTP id E07C11803F9AF for ; Sun, 5 Jul 2020 09:21:22 +0000 (UTC) X-HE-Tag: hen54_3d02b7b26ea2 X-Filterd-Recvd-Size: 4214 Received: from huawei.com (szxga06-in.huawei.com [45.249.212.32]) by imf02.hostedemail.com (Postfix) with ESMTP for ; Sun, 5 Jul 2020 09:21:22 +0000 (UTC) Received: from DGGEMS407-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id 38A4C33388E8EC3EB74C; Sun, 5 Jul 2020 17:21:15 +0800 (CST) Received: from SWX921481.china.huawei.com (10.126.202.129) by DGGEMS407-HUB.china.huawei.com (10.3.19.207) with Microsoft SMTP Server id 14.3.487.0; Sun, 5 Jul 2020 17:21:04 +0800 From: Barry Song To: , CC: , , , , , , , Barry Song Subject: [PATCH v3 2/3] crypto: hisilicon/zip - permit users to specify NUMA node Date: Sun, 5 Jul 2020 21:18:59 +1200 Message-ID: <20200705091900.29232-3-song.bao.hua@hisilicon.com> X-Mailer: git-send-email 2.21.0.windows.1 In-Reply-To: <20200705091900.29232-1-song.bao.hua@hisilicon.com> References: <20200705091900.29232-1-song.bao.hua@hisilicon.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.126.202.129] X-CFilter-Loop: Reflected X-Rspamd-Queue-Id: E07C11803F9AF X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam03 Content-Transfer-Encoding: quoted-printable 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: If users don't specify NUMA node, the driver will use the ZIP module near the CPU allocating acomp. Otherwise, it uses the ZIP module according to the requirement of users. Cc: Zhou Wang Signed-off-by: Barry Song --- drivers/crypto/hisilicon/zip/zip.h | 2 +- drivers/crypto/hisilicon/zip/zip_crypto.c | 6 +++--- drivers/crypto/hisilicon/zip/zip_main.c | 5 +++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/crypto/hisilicon/zip/zip.h b/drivers/crypto/hisilico= n/zip/zip.h index f3ed4c0e5493..4484be13812b 100644 --- a/drivers/crypto/hisilicon/zip/zip.h +++ b/drivers/crypto/hisilicon/zip/zip.h @@ -76,7 +76,7 @@ struct hisi_zip_sqe { u32 rsvd1[4]; }; =20 -int zip_create_qps(struct hisi_qp **qps, int ctx_num); +int zip_create_qps(struct hisi_qp **qps, int ctx_num, int node); int hisi_zip_register_to_crypto(void); void hisi_zip_unregister_from_crypto(void); #endif diff --git a/drivers/crypto/hisilicon/zip/zip_crypto.c b/drivers/crypto/h= isilicon/zip/zip_crypto.c index c73707c2e539..01fd6a78111d 100644 --- a/drivers/crypto/hisilicon/zip/zip_crypto.c +++ b/drivers/crypto/hisilicon/zip/zip_crypto.c @@ -158,13 +158,13 @@ static void hisi_zip_release_qp(struct hisi_zip_qp_= ctx *ctx) hisi_qm_release_qp(ctx->qp); } =20 -static int hisi_zip_ctx_init(struct hisi_zip_ctx *hisi_zip_ctx, u8 req_t= ype) +static int hisi_zip_ctx_init(struct hisi_zip_ctx *hisi_zip_ctx, u8 req_t= ype, int node) { struct hisi_qp *qps[HZIP_CTX_Q_NUM] =3D { NULL }; struct hisi_zip *hisi_zip; int ret, i, j; =20 - ret =3D zip_create_qps(qps, HZIP_CTX_Q_NUM); + ret =3D zip_create_qps(qps, HZIP_CTX_Q_NUM, node); if (ret) { pr_err("Can not create zip qps!\n"); return -ENODEV; @@ -379,7 +379,7 @@ static int hisi_zip_acomp_init(struct crypto_acomp *t= fm) struct hisi_zip_ctx *ctx =3D crypto_tfm_ctx(&tfm->base); int ret; =20 - ret =3D hisi_zip_ctx_init(ctx, COMP_NAME_TO_TYPE(alg_name)); + ret =3D hisi_zip_ctx_init(ctx, COMP_NAME_TO_TYPE(alg_name), tfm->base.n= ode); if (ret) return ret; =20 diff --git a/drivers/crypto/hisilicon/zip/zip_main.c b/drivers/crypto/his= ilicon/zip/zip_main.c index 2229a21ae7c8..e2845b2c963d 100644 --- a/drivers/crypto/hisilicon/zip/zip_main.c +++ b/drivers/crypto/hisilicon/zip/zip_main.c @@ -234,9 +234,10 @@ static const struct pci_device_id hisi_zip_dev_ids[]= =3D { }; MODULE_DEVICE_TABLE(pci, hisi_zip_dev_ids); =20 -int zip_create_qps(struct hisi_qp **qps, int qp_num) +int zip_create_qps(struct hisi_qp **qps, int qp_num, int node) { - int node =3D cpu_to_node(smp_processor_id()); + if (node =3D=3D NUMA_NO_NODE) + node =3D cpu_to_node(smp_processor_id()); =20 return hisi_qm_alloc_qps_node(&zip_devices, qp_num, 0, node, qps); } --=20 2.27.0