From patchwork Wed Jun 14 17:46:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Safonov X-Patchwork-Id: 108080 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp135439vqr; Wed, 14 Jun 2023 11:06:18 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4PdSP6d1XKtBjdA4s1meS3tmKBc0DC8puS+cdZVP7u256XSNRClIrOIJqfPnfw+ivwXI6n X-Received: by 2002:a05:6402:14cb:b0:519:6a6a:7659 with SMTP id f11-20020a05640214cb00b005196a6a7659mr1443224edx.18.1686765978666; Wed, 14 Jun 2023 11:06:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686765978; cv=none; d=google.com; s=arc-20160816; b=spQYR0i6uQ+t4CpCEYrMCAYgSNAujifv/wC23InxegNnuuZXJ8VBaNiAU2LK1vDWTI RIK0m/NqhAweAb0nZC128dmJqK76qIlccrHJ8J7DyQT5yGNlGE19H1Iai5WWhHKh9nNv UBUJD79QfNx1nkBeQ555Uu6dKJxM2l/1q+GDkIgDAv2Mdt3N8SDBDcNnOn7ZdXCQ89xD 5bCDKHNEJ23lNORspPAfE7MREqYrTqQbIWGTIHenzcfEWAAjE6yUV6I1kbCcnf7KsNaz tSx9SpMOi7b6GEO3eN7f6MblKac9x4yRa+yTzBvLNsCTJAMFNH/HSDYrffKyXil0aHWm UwJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=9Eq3cXmTlVfU7159EnlgUU5JLlIDCLN+3DHm0kLajtM=; b=DbbhreE10UkFj0zyY/DBX7Q0KsNi17VrSQ8ZnIveZifVHZ9XaFwInpzrk1laHB3KXS hHK15ZDnogoIOMTN68EUgymxkd1FbTaaReNLrMtPBgLvEti9ncIQhiOj+LC4HHX2cUnz q17JitiaMfTMqFagC0nmVftAKKJZMI3YTLAJnWG9E6JCLawgi/6jlaqR0lJmiOJuHaXo 9pFWsvQkBBkRO+a5enmxTCv0TbZrHwry1omryb+c4qPoXtQr3Hknd/042R0sa0MWaJcf wfIiTodYSt8gQrPV4mn3N0vHFI1e9Hh7okbYp8OJia3GFMXuyzYJtQGMjJbFHWP3hy4U PXvA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@arista.com header.s=google header.b=CgAlly5M; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=arista.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id n25-20020a056402515900b005187ad3094esi2010102edd.403.2023.06.14.11.05.51; Wed, 14 Jun 2023 11:06:18 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@arista.com header.s=google header.b=CgAlly5M; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=arista.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239824AbjFNRrW (ORCPT + 99 others); Wed, 14 Jun 2023 13:47:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57606 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239062AbjFNRq4 (ORCPT ); Wed, 14 Jun 2023 13:46:56 -0400 Received: from mail-wr1-x42f.google.com (mail-wr1-x42f.google.com [IPv6:2a00:1450:4864:20::42f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CFB381720 for ; Wed, 14 Jun 2023 10:46:54 -0700 (PDT) Received: by mail-wr1-x42f.google.com with SMTP id ffacd0b85a97d-30fa23e106bso4179055f8f.3 for ; Wed, 14 Jun 2023 10:46:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=arista.com; s=google; t=1686764813; x=1689356813; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=9Eq3cXmTlVfU7159EnlgUU5JLlIDCLN+3DHm0kLajtM=; b=CgAlly5McM8RcBW6caBKl8PmBgannQmzsPYLMudUMj0xOeDQH+x9Nqgs+jzENspund VHULCsNUqBJhqnKdbkn969JcJty7oua6hbzFSKhySd4S89t644fHDFgwFTFFoAAK9Beo g/Fp5DZDpKtRT71DRXlaT5aXOhfev+xF+DqJ6X5ufIT/37gdpIeWUS6XWlOSfIPU4MN0 pMP6qBkpmS2MsqjCQkTbxSmS/85sb6A3iOPFNfEwDPiKBK9AMhPGpU05+OnH0M85v6cu 8FU9J1IGk2YDqJUGOXqTMFA4prrzqhtQAQF286CbLczCcOkEPaYmLLeGMhhVtj8vF6wn ApyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686764813; x=1689356813; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9Eq3cXmTlVfU7159EnlgUU5JLlIDCLN+3DHm0kLajtM=; b=L9EdZZgu5FAogVXNWsqaclMzmtKAretItxSW7JUOYEQ3+JmIV4tSYx236jUPi/McyC 8yGFRT6m7kbgxzfkPKUtCfSkxFUec7IUOKRN6y85V526YkjttIoRH8iUjy5khq6AJwIZ I9AxSLiNs72QtEKXDmCOkDvKuElUSQURbiMFdtO3Dnfy2wSN1XlhQ7aHmIYXcQL46F8a irPKgKAws8vqfT0D9PInmLAIamY000WjeXGt3wRWR2bMiScu9IOJ2Nqz7eatgsTkX0by Ef/dTBfHmy1Nq/sNi3SjlJ7XnO5ahtzWJnkkWEPTTHMDN5PRTkizI2lKhdydRz+YivTl 9Q3w== X-Gm-Message-State: AC+VfDwzM6yU7ctv8OxmiMVVdJZ2fNtjAnWx8IUWrDa6lJsoMbZqrT9f 93sCCegsFTVV/toYZ+WLil38sQ== X-Received: by 2002:a5d:528e:0:b0:30f:ccca:f482 with SMTP id c14-20020a5d528e000000b0030fcccaf482mr3786136wrv.71.1686764813289; Wed, 14 Jun 2023 10:46:53 -0700 (PDT) Received: from Mindolluin.ire.aristanetworks.com ([217.173.96.166]) by smtp.gmail.com with ESMTPSA id m4-20020a056000180400b0030633152664sm18738740wrh.87.2023.06.14.10.46.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jun 2023 10:46:52 -0700 (PDT) From: Dmitry Safonov To: Herbert Xu , linux-kernel@vger.kernel.org Cc: Dmitry Safonov , Bob Gilligan , David Ahern , "David S. Miller" , Dmitry Safonov <0x7f454c46@gmail.com>, Eric Dumazet , "Eric W. Biederman" , Francesco Ruggeri , Jakub Kicinski , Paolo Abeni , Salam Noureddine , linux-crypto@vger.kernel.org Subject: [PATCH-next 2/3] crypto: api - Provide gfp mask for tfm allocation Date: Wed, 14 Jun 2023 18:46:42 +0100 Message-Id: <20230614174643.3836590-3-dima@arista.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230614174643.3836590-1-dima@arista.com> References: <20230614174643.3836590-1-dima@arista.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768702323052932642?= X-GMAIL-MSGID: =?utf-8?q?1768702323052932642?= Use it straight away in crypto_clone_cipher(), as that is not meant to sleep. Signed-off-by: Dmitry Safonov --- crypto/algapi.c | 2 +- crypto/api.c | 6 +++--- crypto/cipher.c | 2 +- crypto/internal.h | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/crypto/algapi.c b/crypto/algapi.c index 5e7cd603d489..8d7d9cc008ff 100644 --- a/crypto/algapi.c +++ b/crypto/algapi.c @@ -798,7 +798,7 @@ struct crypto_tfm *crypto_spawn_tfm(struct crypto_spawn *spawn, u32 type, if (unlikely((alg->cra_flags ^ type) & mask)) goto out_put_alg; - tfm = __crypto_alloc_tfm(alg, type, mask); + tfm = __crypto_alloc_tfm(alg, type, mask, GFP_KERNEL); if (IS_ERR(tfm)) goto out_put_alg; diff --git a/crypto/api.c b/crypto/api.c index a94bd0695719..54bf7c71b482 100644 --- a/crypto/api.c +++ b/crypto/api.c @@ -387,14 +387,14 @@ void crypto_shoot_alg(struct crypto_alg *alg) EXPORT_SYMBOL_GPL(crypto_shoot_alg); struct crypto_tfm *__crypto_alloc_tfm(struct crypto_alg *alg, u32 type, - u32 mask) + u32 mask, gfp_t gfp) { struct crypto_tfm *tfm = NULL; unsigned int tfm_size; int err = -ENOMEM; tfm_size = sizeof(*tfm) + crypto_ctxsize(alg, type, mask); - tfm = kzalloc(tfm_size, GFP_KERNEL); + tfm = kzalloc(tfm_size, gfp); if (tfm == NULL) goto out_err; @@ -454,7 +454,7 @@ struct crypto_tfm *crypto_alloc_base(const char *alg_name, u32 type, u32 mask) goto err; } - tfm = __crypto_alloc_tfm(alg, type, mask); + tfm = __crypto_alloc_tfm(alg, type, mask, GFP_KERNEL); if (!IS_ERR(tfm)) return tfm; diff --git a/crypto/cipher.c b/crypto/cipher.c index d39ef5f72ab8..184188339a4a 100644 --- a/crypto/cipher.c +++ b/crypto/cipher.c @@ -102,7 +102,7 @@ struct crypto_cipher *crypto_clone_cipher(struct crypto_cipher *cipher) return ERR_PTR(-ENOSYS); ntfm = __crypto_alloc_tfm(alg, CRYPTO_ALG_TYPE_CIPHER, - CRYPTO_ALG_TYPE_MASK); + CRYPTO_ALG_TYPE_MASK, GFP_ATOMIC); if (IS_ERR(ntfm)) return ERR_CAST(ntfm); diff --git a/crypto/internal.h b/crypto/internal.h index 8dd746b1130b..eba723a57689 100644 --- a/crypto/internal.h +++ b/crypto/internal.h @@ -103,7 +103,7 @@ void crypto_remove_spawns(struct crypto_alg *alg, struct list_head *list, 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); + u32 mask, gfp_t gfp); void *crypto_create_tfm_node(struct crypto_alg *alg, const struct crypto_type *frontend, int node); void *crypto_clone_tfm(const struct crypto_type *frontend,