From patchwork Tue Apr 1 19:23:16 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ovidiu Panait X-Patchwork-Id: 1868 Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8A65FC2C6 for ; Tue, 1 Apr 2025 19:23:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743535440; cv=none; b=B93rGrjovZ9JM/Zd6YTQrFlzDUwyss4FvRoWFuE/1hQCJNHKu4zDp+ebcieI4oN5cKN9iRsztZs6dkzh3ShLyPoNpxDWvnIihLE7Es1kFnRvJnpsjRCx0QXJ8mqvbrAO7ZSu+gN1zE+htbOEiaRPsaUZ4GfHgDKY85ZDNdT//Lo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743535440; c=relaxed/simple; bh=/4EojNlyd9dMoLRzf5Mm/q8bty3ZBw5BXSWBsU/clpE=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=EjPTIaDbfXs9I+h4GoANZS/A8yjY4Y1t+fccMmFP5DHqMFvTEWm1gNeP43Yw4MyIgLazRlGhPUws3O6aVAoukuZcCusXQz14xUOinzGHr7uaHl1eQ10I4sSi/phymQ5s6BBeGyeuJH8Zrg+t5Vipt1FHAOI/EVUtu9kmmrS6z74= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=W62SlcmM; arc=none smtp.client-ip=209.85.221.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="W62SlcmM" Received: by mail-wr1-f54.google.com with SMTP id ffacd0b85a97d-39c0dfba946so2494963f8f.3 for ; Tue, 01 Apr 2025 12:23:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743535437; x=1744140237; darn=lists.linux.dev; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=nierB4LEgce+4kZQOSa3FNbylwS0gDWPVPBM7TYut2U=; b=W62SlcmMR9yeq02SHX6oa6LzP7AfPeiU6YebnglTFIBc8TRG1m/RlZX69ZJniOFf7D Yn2kXH2kLw5neJpMBkdXsQturoom77EVa2XkLGs65Wup9l8xPKiVvULqmajN/JHMK+3q EbjaT2RrTUo8W/6tuDLdosq1flJlpz39v88TAp6m+jyLEmsM2qZTs+JAUSi4Oogf+eTJ ADu6jz4cQHWEKsXVMVXQmX7KIr3A6Zv2OHub7DHezdIpg2IRrdlBoo23nNLiYOUwRDuW EgHUInMFllC514/B8mias2Nd66KKGH6Y5XEZ8+NcqDuh3i3zjDHOIK14kJ/XX1KPFaj2 GlZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743535437; x=1744140237; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=nierB4LEgce+4kZQOSa3FNbylwS0gDWPVPBM7TYut2U=; b=o5iEhxJVFyXxAxSFDvDhC4tq8xDJvjLHVc4avq1WRFc/O/5kJv5+pyiibDIGRY0ZUP R6r1JtZ6fSRkOz1cjj+ZoA/WrwJUw+5d/hDUlH84ywhivsFpKG77uoGZhH+y2VaHWX2F H1vmuSfFljKEzPQ8qvdqbRf3o3nlZgIDqSdAwcj1dk/7+Aj8fC7mX8h3U7ty0d/smqn5 bwuRKNvcUepIF+M/HpsY1o+GkOQttNHy6T2LU1RM9X/GXKr60oPUSYT7vFOmGDaREoHI Z7ZP1coBq5Xc1UpOGHAK8LonVeRzaBcYNm7yL0XeY+5QFEjuLoZJqjX4bwCXp9ijV1K+ Rclw== X-Forwarded-Encrypted: i=1; AJvYcCVd3U3ebOu/wZP5aimjqIhmBCzriiQchLtcqfBj68YT8qEGkY9qkSnYxrJcnNTqfJbueIjA1wBP/PHtCw==@lists.linux.dev X-Gm-Message-State: AOJu0Yw5fUSJNglcV275U1sMZd6VLUsKAQr//uKBIWRGnMg1rqwbLUpd kuD3uei63hkMxDDw0kA5v3kynCkH13uXKPtRjniWTmsH/gEf0gpkuFervw== X-Gm-Gg: ASbGncv1bV+KmacVZBGn3QSLz1L0s1vn5zHapfdUlHtnvc1nrvyBtHURQpaeYufUdlN wbyswmcqmYKISeWeFIlzmlI+SNxTzUHdD8zRp9qgXQubk/U4vY/xhVeKP2nNySoREeAEUf3Wd+3 +jcP0vkVEZ1PIPkUUzV7hkstcrKpxMMfcl3N2iBQb7VAQojlRrRlPm4ZO1dHvnnEwKx9f17GcqT 4RJ0JP08QWWq3dL5dbKE1XeRd+EB/Ko+o2OjsAXfBu/J9jHLUQzeyOaoXK5oKMdmCMVAzqOWKyi cugPuxx5eQRrYn6VNMr3R8yxDZysTOd+LPsXJHr/S5ESm6rO6IwbvrZz8ub47cSGYoxJsWLD X-Google-Smtp-Source: AGHT+IGHyzi31e3692ONFiGCVRk0AOakCuPS3Q8lpPUYekXyBseRhASvcdujfWAcxWGfSdab5h7ydg== X-Received: by 2002:a5d:64c7:0:b0:391:4bfd:6d5 with SMTP id ffacd0b85a97d-39c1211d5c8mr11428784f8f.52.1743535436607; Tue, 01 Apr 2025 12:23:56 -0700 (PDT) Received: from localhost.localdomain ([2a02:2f0e:c50a:8800:cf9e:ee0b:4a01:37f6]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-39c0b66aa32sm15353438f8f.50.2025.04.01.12.23.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Apr 2025 12:23:56 -0700 (PDT) From: Ovidiu Panait To: clabbe.montjoie@gmail.com, herbert@gondor.apana.org.au, davem@davemloft.net, linux-crypto@vger.kernel.org Cc: wens@csie.org, jernej.skrabec@gmail.com, samuel@sholland.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev, linux-kernel@vger.kernel.org, Ovidiu Panait Subject: [PATCH 1/6] crypto: sun8i-ce-hash - fix error handling in sun8i_ce_hash_run() Date: Tue, 1 Apr 2025 22:23:16 +0300 Message-ID: <20250401192321.3370188-1-ovidiu.panait.oss@gmail.com> X-Mailer: git-send-email 2.48.1 Precedence: bulk X-Mailing-List: linux-sunxi@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Status: O Rework error handling in sun8i_ce_hash_run() to unmap the dma buffers in case of failure. Currently, the dma unmap functions are not called if the function errors out at various points. Fixes: 56f6d5aee88d1 ("crypto: sun8i-ce - support hash algorithms") Signed-off-by: Ovidiu Panait --- .../crypto/allwinner/sun8i-ce/sun8i-ce-hash.c | 34 ++++++++++++------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/drivers/crypto/allwinner/sun8i-ce/sun8i-ce-hash.c b/drivers/crypto/allwinner/sun8i-ce/sun8i-ce-hash.c index 6072dd9f390b..3f9d79ea01aa 100644 --- a/drivers/crypto/allwinner/sun8i-ce/sun8i-ce-hash.c +++ b/drivers/crypto/allwinner/sun8i-ce/sun8i-ce-hash.c @@ -343,9 +343,8 @@ int sun8i_ce_hash_run(struct crypto_engine *engine, void *breq) u32 common; u64 byte_count; __le32 *bf; - void *buf = NULL; + void *buf, *result; int j, i, todo; - void *result = NULL; u64 bs; int digestsize; dma_addr_t addr_res, addr_pad; @@ -365,14 +364,14 @@ int sun8i_ce_hash_run(struct crypto_engine *engine, void *breq) buf = kcalloc(2, bs, GFP_KERNEL | GFP_DMA); if (!buf) { err = -ENOMEM; - goto theend; + goto err_out; } bf = (__le32 *)buf; result = kzalloc(digestsize, GFP_KERNEL | GFP_DMA); if (!result) { err = -ENOMEM; - goto theend; + goto err_free_buf; } flow = rctx->flow; @@ -398,7 +397,7 @@ int sun8i_ce_hash_run(struct crypto_engine *engine, void *breq) if (nr_sgs <= 0 || nr_sgs > MAX_SG) { dev_err(ce->dev, "Invalid sg number %d\n", nr_sgs); err = -EINVAL; - goto theend; + goto err_free_result; } len = areq->nbytes; @@ -411,7 +410,7 @@ int sun8i_ce_hash_run(struct crypto_engine *engine, void *breq) if (len > 0) { dev_err(ce->dev, "remaining len %d\n", len); err = -EINVAL; - goto theend; + goto err_unmap_src; } addr_res = dma_map_single(ce->dev, result, digestsize, DMA_FROM_DEVICE); cet->t_dst[0].addr = desc_addr_val_le32(ce, addr_res); @@ -419,7 +418,7 @@ int sun8i_ce_hash_run(struct crypto_engine *engine, void *breq) if (dma_mapping_error(ce->dev, addr_res)) { dev_err(ce->dev, "DMA map dest\n"); err = -EINVAL; - goto theend; + goto err_unmap_src; } byte_count = areq->nbytes; @@ -441,7 +440,7 @@ int sun8i_ce_hash_run(struct crypto_engine *engine, void *breq) } if (!j) { err = -EINVAL; - goto theend; + goto err_unmap_result; } addr_pad = dma_map_single(ce->dev, buf, j * 4, DMA_TO_DEVICE); @@ -450,7 +449,7 @@ int sun8i_ce_hash_run(struct crypto_engine *engine, void *breq) if (dma_mapping_error(ce->dev, addr_pad)) { dev_err(ce->dev, "DMA error on padding SG\n"); err = -EINVAL; - goto theend; + goto err_unmap_result; } if (ce->variant->hash_t_dlen_in_bits) @@ -463,16 +462,25 @@ int sun8i_ce_hash_run(struct crypto_engine *engine, void *breq) err = sun8i_ce_run_task(ce, flow, crypto_ahash_alg_name(tfm)); dma_unmap_single(ce->dev, addr_pad, j * 4, DMA_TO_DEVICE); - dma_unmap_sg(ce->dev, areq->src, ns, DMA_TO_DEVICE); + +err_unmap_result: dma_unmap_single(ce->dev, addr_res, digestsize, DMA_FROM_DEVICE); + if (!err) + memcpy(areq->result, result, algt->alg.hash.base.halg.digestsize); +err_unmap_src: + dma_unmap_sg(ce->dev, areq->src, ns, DMA_TO_DEVICE); - memcpy(areq->result, result, algt->alg.hash.base.halg.digestsize); -theend: - kfree(buf); +err_free_result: kfree(result); + +err_free_buf: + kfree(buf); + +err_out: local_bh_disable(); crypto_finalize_hash_request(engine, breq, err); local_bh_enable(); + return 0; } From patchwork Tue Apr 1 19:23:17 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ovidiu Panait X-Patchwork-Id: 1867 Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 972BB1E5B64 for ; Tue, 1 Apr 2025 19:23:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743535441; cv=none; b=lT24oMIzHYbdzv0/6HiDtTrk436ZYWCnEogGk4N4PLy3okKDUhwAhDdxStoZzh9zWavxuaBk9zY8Ez91IuM5+iJxd76zZ25s40rzrCjbgDsE67UOGvIfLPcyLI+/wywAN+1H4aVgzI1o5AnbBQ5SkpK4zKuzFglWKprkfJKDLA0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743535441; c=relaxed/simple; bh=C4U1jwV2UTE3RqFfFsVaxqmVcfNk30K3AoLQSuFxdSo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Ra3+JFpKlRP/YeIwYGCOwMPekgfjIpqoqiZqCmNgKi4nLca5+Eq6C84gzu/lTXnhGROIoSdY3xiCpxkJ713JGLa6YSXNOQlT8DVJSll2XzYaYqUqxjfYPf9Ffop4otc62LXLG0OSw07bvuzad6QpOLNggRmY2MZxFHjUSPvhGSA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=JV73NHf6; arc=none smtp.client-ip=209.85.221.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="JV73NHf6" Received: by mail-wr1-f46.google.com with SMTP id ffacd0b85a97d-39c13fa05ebso1526135f8f.0 for ; Tue, 01 Apr 2025 12:23:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743535438; x=1744140238; darn=lists.linux.dev; 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=bH5VLtP+seSAMs8ZXZEEtVjeNgw0O+SRzuS1o+Cett4=; b=JV73NHf6YLf43qt04OSZhw/fn8op8EymlicH3cuXLXyXZN/tpCAi7KpWpn0T+lPBUk ZFOm60mSRUusAy0oCjwO85wew/eoU7Ati/4PsJGpD4qMpgj8Lwe+Pxu6hpHhhv49/8NN zEMwBfKbX46v8sMcpjLGUNsIvmCnEBmpxYJ2zmv1/ptdj25RZIOcv8g3fgf3zOuYDZt8 seckFScL5nZGXAD7uir9vZMoRr1wkZEU7I/5wpVpQ3nfI0Bay8aWmzpYIDWjiqFTB1Nb FoxQp6d+fuuKvZeYGveLQZ3jviI17V8Q3qmWv6Aj0FsD9JcYWUcKcqylF8Y6rF0dPLzh kkeQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743535438; x=1744140238; 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=bH5VLtP+seSAMs8ZXZEEtVjeNgw0O+SRzuS1o+Cett4=; b=FHBMjClLsNnV4rdtxv6Wo+wOpkbQmC3WPMI7t4fPCJYGfZfKtYVtlTMngJYvkFQ28v C0YCKI6GHwtU0q6z4jhVV+On2SDDNvPfwGrrN8KaLuQ5qkL6CXbJ+C/Wp15xPq6qzWRL UP9It2HzRif91d4rJm3GU88w7aU1SXRzZd818uJBENLBjCV8in4wrcHT7Twpc4zYWdv5 zm4Ku13NsJguqFE8Rt1RI5xRde7wtZE3K35PKVHejrgg6CPWp0RDoUK0kf+upgCM9T0x zV8pcGyO+WU5xfJjXMK+kda+tFGomiABsIAWkk7X9nM+wEyZ4YIQ2JbdPqhNRkUNY1kq 1Ecg== X-Forwarded-Encrypted: i=1; AJvYcCVJCyEvu0qyAes33HDXsuWpC7mxHvaOmOOJat70Q0Q3J1QPwmARRhV2YIQH1MTbbUydiejxvokb5Z6rpw==@lists.linux.dev X-Gm-Message-State: AOJu0YxIlDm/Ht8GClUMwHA5UOFmmT6sL3MW3dY51PXRrjuoLsuKtF/q N1mYbaw8rqyK491kvqpnUnqzW2uACw9qzJX2Gs5F47y7agaQxl8B X-Gm-Gg: ASbGncsV2aOHSJNihrF1J33yy6ybg3RVhjobdY84Zb7mGKl8oilI6Zc3nO3lA9bK5nt JwJVltH2dCcHyOBZ+cy/QvJI/673TyvhSHJMwTfeVBeZW/UlAVFCllzakrIu+T4347xHwAItOfm i9ymjRl/Mn/XmBop7UJ8AkECC0Ba9/Y5KEJKaZbiceQYRqFQ4QYLA+9Tr7g0eteHQ+QNd1BGire aE7LwJRGWyI+3cQQ6KtrLVPeeUk1VFAKLCJkngQwWB4pv9/vbT1HedeZAswBFGvCxnDhI59JZDq 7DOSKdE6iyB1Jx2BDpwAefmzyvLGjNB2V0m63JCIaOgHBvTmqVvSZfGSS/r2odu5Jl+oTNCBCAn USFy3gJY= X-Google-Smtp-Source: AGHT+IEeNatuio+GXvnz6jtis2Ifu8CXZWb0U2xpbF/9zUj/YkR/FHukm5fxlTJZb1XZQEdPrISlBQ== X-Received: by 2002:a05:6000:40cf:b0:391:2e6a:30fe with SMTP id ffacd0b85a97d-39c121188b9mr9767506f8f.39.1743535437739; Tue, 01 Apr 2025 12:23:57 -0700 (PDT) Received: from localhost.localdomain ([2a02:2f0e:c50a:8800:cf9e:ee0b:4a01:37f6]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-39c0b66aa32sm15353438f8f.50.2025.04.01.12.23.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Apr 2025 12:23:57 -0700 (PDT) From: Ovidiu Panait To: clabbe.montjoie@gmail.com, herbert@gondor.apana.org.au, davem@davemloft.net, linux-crypto@vger.kernel.org Cc: wens@csie.org, jernej.skrabec@gmail.com, samuel@sholland.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev, linux-kernel@vger.kernel.org, Ovidiu Panait Subject: [PATCH 2/6] crypto: sun8i-ce-hash - remove duplicated fallback checks Date: Tue, 1 Apr 2025 22:23:17 +0300 Message-ID: <20250401192321.3370188-2-ovidiu.panait.oss@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250401192321.3370188-1-ovidiu.panait.oss@gmail.com> References: <20250401192321.3370188-1-ovidiu.panait.oss@gmail.com> Precedence: bulk X-Mailing-List: linux-sunxi@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Status: O Remove duplicated fallback checks in sun8i_ce_hash_digest(). The same checks are already done previously in sun8i_ce_hash_need_fallback(). Signed-off-by: Ovidiu Panait --- drivers/crypto/allwinner/sun8i-ce/sun8i-ce-hash.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/drivers/crypto/allwinner/sun8i-ce/sun8i-ce-hash.c b/drivers/crypto/allwinner/sun8i-ce/sun8i-ce-hash.c index 3f9d79ea01aa..2c2d285de154 100644 --- a/drivers/crypto/allwinner/sun8i-ce/sun8i-ce-hash.c +++ b/drivers/crypto/allwinner/sun8i-ce/sun8i-ce-hash.c @@ -244,21 +244,11 @@ int sun8i_ce_hash_digest(struct ahash_request *areq) struct sun8i_ce_alg_template *algt; struct sun8i_ce_dev *ce; struct crypto_engine *engine; - struct scatterlist *sg; - int nr_sgs, e, i; + int e; if (sun8i_ce_hash_need_fallback(areq)) return sun8i_ce_hash_digest_fb(areq); - nr_sgs = sg_nents_for_len(areq->src, areq->nbytes); - if (nr_sgs > MAX_SG - 1) - return sun8i_ce_hash_digest_fb(areq); - - for_each_sg(areq->src, sg, nr_sgs, i) { - if (sg->length % 4 || !IS_ALIGNED(sg->offset, sizeof(u32))) - return sun8i_ce_hash_digest_fb(areq); - } - algt = container_of(alg, struct sun8i_ce_alg_template, alg.hash.base); ce = algt->ce; From patchwork Tue Apr 1 19:23:18 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ovidiu Panait X-Patchwork-Id: 1866 Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B8306203714 for ; Tue, 1 Apr 2025 19:24:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743535442; cv=none; b=s+bH/LT6e1YqRuV8Su02vh9fTmf2PX4RtRU9vOB+ytKXtf4/mjDYIbqFwOwaIvUHBIheRxhKvV5cWlgtGDdr7bSoiIYv/PrdKEKXFLsIOUUFWNhKrs4Vh+8NY4l7kvWFTrEevHwlecND9t82mhQJYnOAx49CS6HAwVjdlStaefY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743535442; c=relaxed/simple; bh=ijYhgMFPW0GwZbvTlvUWZO6qB0iZ1PV0+yjxL+ZbDOw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=WvOpf6/8C1uNMitnoAg25YdFznSicuqBVwFMS8hkJxjCO8V1WVvq46ARJIJ6rswHhVHjtwiNTb2WhBJUkNrkXzYerPUfPK//Qoyqv2ITPoNWzBN2UV9cb2/B1ri/VKKGH6NqHc4Pov48Ydg67PCs0tbFZDmZTMSqTeTePiqg3KM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=g6NPuu1H; arc=none smtp.client-ip=209.85.221.43 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="g6NPuu1H" Received: by mail-wr1-f43.google.com with SMTP id ffacd0b85a97d-38a25d4b9d4so3050625f8f.0 for ; Tue, 01 Apr 2025 12:24:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743535439; x=1744140239; darn=lists.linux.dev; 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=ZzBkugdw4gdptdF8hF2WvHzloU2qygLTygvgXH5F5js=; b=g6NPuu1H0gBKsMrII/bMUYYWoqBPuhnVskvxaf7h0D38GcAhCX4kbjfnVepigx4nO2 UPZVBvLoAutYaMU6v0v9tTDofpkt2NmFGoU9hJwmM6HkNikSoldMXTYVJEkMtbrEK74u PYVKinwD2ohXhZhcVLyscJvo/HwlnXN94Hk0FjzGqduk/sQM/ZlxshdgZ+Ttf8ZKDEnp 1//5fGeINIZFpXNSj4SpyYJngAdpafnggDaKLE3KmAWBJ2D/0w4+RQVdMut4lNlH8hRE DHwOnBh/yKZDcVw0wsZC2cgOWIeCNckb3/YKVDmXPy5H7f6s6zTB4xoWcNhsbqExE7Ze 78oA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743535439; x=1744140239; 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=ZzBkugdw4gdptdF8hF2WvHzloU2qygLTygvgXH5F5js=; b=wFra/yjWvAKYojtwqKNuVXf4EmFa7mgH/2iNfSdOic8668fPrWmr3qs9FGX3OKFx26 rPL0A+VfNWqwDmNktJTpO2MldQSdv2FCl/xneB18Vv8gcjT+T1/RFNw8Eg5u52Zki6YD DL0VgJzMxBbAdgqVmBfJbToWFHxGZNNIu7Qwja1Mi7O+L32Q9LLopiSWd+WhYr8X9JyX MpQp3Xym7nTBsxO4OV1lOvXmGZnwGifNDO4zOCsYUoSPPSJE3FHdm+YEQF5eyUMwBY8d GctL2gG/4z9cWzUXaEx2rTDVhoXHE9T50SIVY77UL7ac2XIbHcV6b3WhLKGZ12I0aa00 xhbQ== X-Forwarded-Encrypted: i=1; AJvYcCXA7rdHmnscH8YiGCKemORUQCJUin2t7BXYnUDX+mK9CDotZBtopOmOSycYy2e74sPGiB8tacMboVWIZQ==@lists.linux.dev X-Gm-Message-State: AOJu0YzQn+O6A4I4dJ8FaBCCjMxDPrJrJX2HmZJWrjxzML9FWEMmhfxX cnt737tE0jqM7RP0aCBV5u8nR//kkgFxrlOyweE6+BC1f87rHipONKWgbQ== X-Gm-Gg: ASbGncsIXJOwXs7YI+HumY0ggUc5zphFH6bL6dDvFPDk4D0wEpt2UaM+9Ng0HK/K6xE GxucKnZLNUMbGIWfcfjg9qUFzBBJ/zbcm3qvAYQZT6KMK8RpwMI7iMeniOlGQeXwk+eiOwGAsSj J94ldy/SoOSctpMgS14XGxUB/5sWAH209yMtN9JJRwk128tdMWLYdWF75/Ct+MZInS8Z4qJDyh1 70yjGgRf1bd5VSOl9Ble9PEuVKGon01lCFauWXoz+h/bjVcP02THvWj8YRJ4QtuVvQwRL80fAlN d/EqwIpxEeIJ0P53pR6MOAaqsdCqpTaa/eprn6QJ4FRjeWO10VkisC164KIBPl/Qv2ElM2kd X-Google-Smtp-Source: AGHT+IHdVEsoyIGdrpYCryCmSoxbMMM8oYYvuj+OQEED1lz5k318eW2R/hcBuIk9AkMR8eZjNXUkHQ== X-Received: by 2002:a05:6000:381:b0:39c:1f0a:ee0 with SMTP id ffacd0b85a97d-39c1f0a0f69mr5763858f8f.2.1743535438907; Tue, 01 Apr 2025 12:23:58 -0700 (PDT) Received: from localhost.localdomain ([2a02:2f0e:c50a:8800:cf9e:ee0b:4a01:37f6]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-39c0b66aa32sm15353438f8f.50.2025.04.01.12.23.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Apr 2025 12:23:58 -0700 (PDT) From: Ovidiu Panait To: clabbe.montjoie@gmail.com, herbert@gondor.apana.org.au, davem@davemloft.net, linux-crypto@vger.kernel.org Cc: wens@csie.org, jernej.skrabec@gmail.com, samuel@sholland.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev, linux-kernel@vger.kernel.org, Ovidiu Panait Subject: [PATCH 3/6] crypto: sun8i-ce-hash - factor out debugfs fallback statistics Date: Tue, 1 Apr 2025 22:23:18 +0300 Message-ID: <20250401192321.3370188-3-ovidiu.panait.oss@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250401192321.3370188-1-ovidiu.panait.oss@gmail.com> References: <20250401192321.3370188-1-ovidiu.panait.oss@gmail.com> Precedence: bulk X-Mailing-List: linux-sunxi@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Status: O In order to reduce code duplication, factor out to a separate function the codepath that increments debugfs fallback stats. Signed-off-by: Ovidiu Panait --- .../crypto/allwinner/sun8i-ce/sun8i-ce-hash.c | 53 +++++++------------ 1 file changed, 20 insertions(+), 33 deletions(-) diff --git a/drivers/crypto/allwinner/sun8i-ce/sun8i-ce-hash.c b/drivers/crypto/allwinner/sun8i-ce/sun8i-ce-hash.c index 2c2d285de154..b0959d8218cb 100644 --- a/drivers/crypto/allwinner/sun8i-ce/sun8i-ce-hash.c +++ b/drivers/crypto/allwinner/sun8i-ce/sun8i-ce-hash.c @@ -23,6 +23,20 @@ #include #include "sun8i-ce.h" +static void sun8i_ce_hash_stat_fb_inc(struct crypto_ahash *tfm) +{ + if (IS_ENABLED(CONFIG_CRYPTO_DEV_SUN8I_CE_DEBUG)) { + struct sun8i_ce_alg_template *algt __maybe_unused; + struct ahash_alg *alg = crypto_ahash_alg(tfm); + + algt = container_of(alg, struct sun8i_ce_alg_template, + alg.hash.base); +#ifdef CONFIG_CRYPTO_DEV_SUN8I_CE_DEBUG + algt->stat_fb++; +#endif + } +} + int sun8i_ce_hash_init_tfm(struct crypto_ahash *tfm) { struct sun8i_ce_hash_tfm_ctx *op = crypto_ahash_ctx(tfm); @@ -113,22 +127,13 @@ int sun8i_ce_hash_final(struct ahash_request *areq) struct crypto_ahash *tfm = crypto_ahash_reqtfm(areq); struct sun8i_ce_hash_tfm_ctx *tfmctx = crypto_ahash_ctx(tfm); + sun8i_ce_hash_stat_fb_inc(tfm); + ahash_request_set_tfm(&rctx->fallback_req, tfmctx->fallback_tfm); rctx->fallback_req.base.flags = areq->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP; rctx->fallback_req.result = areq->result; - if (IS_ENABLED(CONFIG_CRYPTO_DEV_SUN8I_CE_DEBUG)) { - struct sun8i_ce_alg_template *algt __maybe_unused; - struct ahash_alg *alg = crypto_ahash_alg(tfm); - - algt = container_of(alg, struct sun8i_ce_alg_template, - alg.hash.base); -#ifdef CONFIG_CRYPTO_DEV_SUN8I_CE_DEBUG - algt->stat_fb++; -#endif - } - return crypto_ahash_final(&rctx->fallback_req); } @@ -153,6 +158,8 @@ int sun8i_ce_hash_finup(struct ahash_request *areq) struct crypto_ahash *tfm = crypto_ahash_reqtfm(areq); struct sun8i_ce_hash_tfm_ctx *tfmctx = crypto_ahash_ctx(tfm); + sun8i_ce_hash_stat_fb_inc(tfm); + ahash_request_set_tfm(&rctx->fallback_req, tfmctx->fallback_tfm); rctx->fallback_req.base.flags = areq->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP; @@ -161,17 +168,6 @@ int sun8i_ce_hash_finup(struct ahash_request *areq) rctx->fallback_req.src = areq->src; rctx->fallback_req.result = areq->result; - if (IS_ENABLED(CONFIG_CRYPTO_DEV_SUN8I_CE_DEBUG)) { - struct sun8i_ce_alg_template *algt __maybe_unused; - struct ahash_alg *alg = crypto_ahash_alg(tfm); - - algt = container_of(alg, struct sun8i_ce_alg_template, - alg.hash.base); -#ifdef CONFIG_CRYPTO_DEV_SUN8I_CE_DEBUG - algt->stat_fb++; -#endif - } - return crypto_ahash_finup(&rctx->fallback_req); } @@ -181,6 +177,8 @@ static int sun8i_ce_hash_digest_fb(struct ahash_request *areq) struct crypto_ahash *tfm = crypto_ahash_reqtfm(areq); struct sun8i_ce_hash_tfm_ctx *tfmctx = crypto_ahash_ctx(tfm); + sun8i_ce_hash_stat_fb_inc(tfm); + ahash_request_set_tfm(&rctx->fallback_req, tfmctx->fallback_tfm); rctx->fallback_req.base.flags = areq->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP; @@ -189,17 +187,6 @@ static int sun8i_ce_hash_digest_fb(struct ahash_request *areq) rctx->fallback_req.src = areq->src; rctx->fallback_req.result = areq->result; - if (IS_ENABLED(CONFIG_CRYPTO_DEV_SUN8I_CE_DEBUG)) { - struct sun8i_ce_alg_template *algt __maybe_unused; - struct ahash_alg *alg = crypto_ahash_alg(tfm); - - algt = container_of(alg, struct sun8i_ce_alg_template, - alg.hash.base); -#ifdef CONFIG_CRYPTO_DEV_SUN8I_CE_DEBUG - algt->stat_fb++; -#endif - } - return crypto_ahash_digest(&rctx->fallback_req); } From patchwork Tue Apr 1 19:23:19 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ovidiu Panait X-Patchwork-Id: 1865 Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D478B20F07E for ; Tue, 1 Apr 2025 19:24:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743535443; cv=none; b=kIbVIIrUhbRRyZtTcRaYQd3L2XjCVLs9SXqNavgdBNVS9tz3ICGKIU9BRJoj3FLy1clF7g1bQlB9J2pC+iwibCfQurDCG+SyksONdh0oQKfkApAx+C3JKUI9DIEhKs8YR/m96d2GF08ZVg9w/fjiNUTU4+nX4Kfh2yiIUf3gz3c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743535443; c=relaxed/simple; bh=ujIPapzlL7mjHgW3aviWBgtecWjNM0nt1PjVn8npb/E=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Ua7pw6aqAw10CdmKPtRfDDA+3xHJTC7POc5NqKZ0IXgwHw5ikxx5jnRoCGRzVk99/DWxUyQZu7tKg/aus1qJRAeMCxCDaWLpWFmqAInkyLCHbPbEt4tw+kAV3uQZaMOrMxqzUzK4WyiQgZ75HvIno6eGsh1wwNnCNzrLGTHBBD0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=OJU8uGN3; arc=none smtp.client-ip=209.85.221.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="OJU8uGN3" Received: by mail-wr1-f48.google.com with SMTP id ffacd0b85a97d-3965c995151so3253184f8f.1 for ; Tue, 01 Apr 2025 12:24:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743535440; x=1744140240; darn=lists.linux.dev; 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=I/+iZ7oXBPhE3cNOeJn0BX2fJsfTTe1JAGSbvb0XfLY=; b=OJU8uGN3rUvOte7YnJHMvfT42SBtlpe+Me0DvfABYkxV7LfbAqolVsr9EV58YnZLUQ Mmezm/gbSU8AD1rOyk8KWIMKxf1qpdI1h/xoWZhIa4xClo66UBlrKYcDipukOTet5/Wt Ojb19sWQEVAh5UbCdRaIJGKwuqjn+7T+o1LPT85uPiLQem2FpgKPqiBpXgLgQs+7Kzje MeuQ0uLuKroYovZ0DqDXulk4KNitkzYGyvQ4KcXBc9Gk9eaMWXFJ5eo8JjeIcFuuMQ1Q WVcJSJxTwlQRRETUSMIs6dOzMpHcOsundqh9IRmDZu20TKXfqwFPFzfb5J6N7hNZ1J8S PYsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743535440; x=1744140240; 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=I/+iZ7oXBPhE3cNOeJn0BX2fJsfTTe1JAGSbvb0XfLY=; b=eZNDUP534TR0a9JblV2k+7zhMuecn7ZZEfCd7ofxeDc38k2YjTD6D4HEgW5lG8rkZo 5yftvazZhsrX2E60hn3uWzPcvYt+d8muBpgr1qvfzfSJl6wkV6PxKPcIwk2QrRU9FUVS dVOhO78X1S8glXmMWln+HasV14tjYc9VdiO/l5ky2UjRhpH9+3c5H43OJnMkPHD54Tdn OrS1Ssj2TMqEENTqhVa/mJyRudzYweFltx8QHUNGxzsKZHxcjlGoyCnDIuFCiOvb2pU0 IHqYfrTV+EicXepsxRKqk4WCvYgl1YA8BvEsFA6F7MyZbGEuu0uhAR/UYUHg2i5aLgNP yQMg== X-Forwarded-Encrypted: i=1; AJvYcCVNevHafxoFX2TO6Q6HY7Cz6kzz1Uk7m3DpLTUUnTigi9HfU+b2pPOJbFCPAs7nbxQQERA3INhAQtF2Mw==@lists.linux.dev X-Gm-Message-State: AOJu0YzXuSXEz0dbk+eZbcp3hHohwO0L+72Q4H+ijYlpQ6WIVdRs4lmw 7NQd5ZJSDrO2DY94eZIMvFJo2f4sOHe7/SvvdW260T6oVUEbxq00 X-Gm-Gg: ASbGncs+kSsfr7JnTDxvc/c/ABPEnm9E5+aMVqGVAcdhlTTFrJ8Z/leU7WsmL8ZyDCw GSz4ESANuKSRu8cEeDzhaXfzd+EXtV2R/mJpkgI4LmX65QD8rnHRTVeg2B4aizMxdB22I0Crvlq 34n0v0Sux18pnFasyLmQpha3KDUQdXKgs4TRJUBgKZCVHfomXOsq7KSMzfGiymrTr4cMCWwjiYj jY791MwGMMdo4+1BTWgXzF9WEClN+zQQ9zk1FrlQUSO0IUPmgoDu3HpfBFJNSCCWarAX23IUpii vs/Ycd8p1opr2CXRgR8CZvzVFRBJ38fbqr4p+Ol4MpK9gM8WvklA7PXl1ThQNqMHBogS8LaO X-Google-Smtp-Source: AGHT+IEroLhlH55Nn0a2Cu0BMYw27BSdC4OLp0dlkWXs82H+dhWwczs/WCChC+qm41GDorZgNFvJwA== X-Received: by 2002:a05:6000:40ce:b0:399:6ad6:34 with SMTP id ffacd0b85a97d-39c12118e33mr11160301f8f.35.1743535440077; Tue, 01 Apr 2025 12:24:00 -0700 (PDT) Received: from localhost.localdomain ([2a02:2f0e:c50a:8800:cf9e:ee0b:4a01:37f6]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-39c0b66aa32sm15353438f8f.50.2025.04.01.12.23.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Apr 2025 12:23:59 -0700 (PDT) From: Ovidiu Panait To: clabbe.montjoie@gmail.com, herbert@gondor.apana.org.au, davem@davemloft.net, linux-crypto@vger.kernel.org Cc: wens@csie.org, jernej.skrabec@gmail.com, samuel@sholland.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev, linux-kernel@vger.kernel.org, Ovidiu Panait Subject: [PATCH 4/6] crypto: sun8i-ce-hash - drop CONFIG_CRYPTO_DEV_SUN8I_CE_DEBUG ifdefs Date: Tue, 1 Apr 2025 22:23:19 +0300 Message-ID: <20250401192321.3370188-4-ovidiu.panait.oss@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250401192321.3370188-1-ovidiu.panait.oss@gmail.com> References: <20250401192321.3370188-1-ovidiu.panait.oss@gmail.com> Precedence: bulk X-Mailing-List: linux-sunxi@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Status: O 'struct sun8i_ce_alg_template' is always defined, even with CONFIG_CRYPTO_DEV_SUN8I_CE_DEBUG disabled, so the ifdef guards are not needed. Make sure the statistics have IS_ENABLED() checks instead. Signed-off-by: Ovidiu Panait --- drivers/crypto/allwinner/sun8i-ce/sun8i-ce-hash.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/crypto/allwinner/sun8i-ce/sun8i-ce-hash.c b/drivers/crypto/allwinner/sun8i-ce/sun8i-ce-hash.c index b0959d8218cb..530c5181d73c 100644 --- a/drivers/crypto/allwinner/sun8i-ce/sun8i-ce-hash.c +++ b/drivers/crypto/allwinner/sun8i-ce/sun8i-ce-hash.c @@ -31,9 +31,7 @@ static void sun8i_ce_hash_stat_fb_inc(struct crypto_ahash *tfm) algt = container_of(alg, struct sun8i_ce_alg_template, alg.hash.base); -#ifdef CONFIG_CRYPTO_DEV_SUN8I_CE_DEBUG algt->stat_fb++; -#endif } } @@ -354,9 +352,9 @@ int sun8i_ce_hash_run(struct crypto_engine *engine, void *breq) flow = rctx->flow; chan = &ce->chanlist[flow]; -#ifdef CONFIG_CRYPTO_DEV_SUN8I_CE_DEBUG - algt->stat_req++; -#endif + if (IS_ENABLED(CONFIG_CRYPTO_DEV_SUN8I_CE_DEBUG)) + algt->stat_req++; + dev_dbg(ce->dev, "%s %s len=%d\n", __func__, crypto_tfm_alg_name(areq->base.tfm), areq->nbytes); cet = chan->tl; From patchwork Tue Apr 1 19:23:20 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ovidiu Panait X-Patchwork-Id: 1864 Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5210F2144A6 for ; Tue, 1 Apr 2025 19:24:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743535445; cv=none; b=fWp3dvKRm/3b6SvXFb/fG4o63TN6fMZJr1GO2Ir4HWA8L96B39sx5nUmLAa/pj332aUW3F/w4NctnAceKYekZw/M5OBWKyrQ4Uc0Mubxu10Za7g1u+5frxJDsOvvFrjK4Lgf5bEN1Qr3nbEW6bmp8Vnbe24nxfO4yp3rYBQWj5g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743535445; c=relaxed/simple; bh=8ZKDGGf8d4/6E2eiXmvJNyK8cfqVo2y1RKH/3zxXGNg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=m59d6ZugYhJDpNrX5jVZmJc3M0U0UQxrkkPT2cep2LQw1QLWp5MM33oBtDJsH3gN4gwVMUcPjsQqBO4RoLBTIn8CypM4hZJ3J57hNk9xNE9K/TRSaPJwQC3UtIJGDTsBggRy4hkJP4W5QwKLxOS6+qoNPURzamnzdDG4+1JYceI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=MgPivK7x; arc=none smtp.client-ip=209.85.128.47 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="MgPivK7x" Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-43cec5cd73bso39480015e9.3 for ; Tue, 01 Apr 2025 12:24:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743535441; x=1744140241; darn=lists.linux.dev; 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=i8z+fSx5TSn2FrXLNFfU/1u/JP6JDm+uKA06s523rtI=; b=MgPivK7xpTLZuIcjtNw8nFMZNXlwG/QBHRYkuduTvfOoG18Lauf9B+mFa5hnUNK9tX 5o5xwRK0qSzDmhZ6pryyllXU+SEtLED1HwodPKmSwaB2bI5s9NLnkTu05OKVdKFah85m bBK7WzRbrbiWBlCgvezxFPudkNeNO8PPRyaJLMYCQI/y6RmjjXx94i9UDXhPY3HhOXD7 rZ3g8Z72UUl8hNxfdBaIx+iQCYtqgrlGDN4J8XjypmWivodhP5SMkJOQ+OWjqWMkN6dV Ox/Qtq6KOZGN1eJot85BBSZkML6c2GkjS8aOKlRnAA4pV/UpDDPVsvSeiQDq2WVgj+Be m4aQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743535441; x=1744140241; 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=i8z+fSx5TSn2FrXLNFfU/1u/JP6JDm+uKA06s523rtI=; b=TkyvIH3zl/j++hVJAgcw4VAP2vgavMAAoyxNFyjt4qyITP5ipFim4APS0aQoQrJ5vS Spmtay5MEBdx+feDnOJdxTufupeQvc6kiAsPFYqsBLcdNQuP26JVcGkwTnWSwovO6m8O b+0HcuVnXjBY7BsIsOCm/wtYmolY/G0H8FaTC+NqH/YAB8TuLcWYUN7wF9GEAIXwt2u0 8bhLjZL0k4afU0gS47yvo4uuIeSTpvR0Vodsa4eaFqcRlFLSZJqKHVzHL4m5/n8vwS9O UQ1Gy62pllV28AwY+NR7HtjJ+/GMpGJR4wQ2eO+KBZh6dr5DlnHaE5hxHj+z5qZJZsTV R1Hw== X-Forwarded-Encrypted: i=1; AJvYcCWMYkqUny5qmkh6srivyibYjiLCPvOdKSiRugNwtDDUAs6pupyHbMCzy9qncXPyALGVoE9OGU4i0V42Cw==@lists.linux.dev X-Gm-Message-State: AOJu0YyUUIdtIZ6kXgYbpNR5ckR0FE1aOAqH4lBi+A3aqsP7bewa+eE5 U1Va7wWGHiYMahJB7DVWCVzyBBjlep58OLKnP7NM3ZC5btViE8Eo X-Gm-Gg: ASbGnct1AanPIwmwbWR45d/0lGL1iV2IlCnltUO7vtToXZ/xjXgw5JdmRVwlxwlCUyQ CKjDapKLoQ8iMzePtN8/Vn5xX6DZ6RcNKlAEg9Yutw9WBL++fSjGhQw9qQMlYkLj84wkylO0T9q ygpH56kb+d9SC3G/kvoLPSEKlodzB/h10xkjVN0upwvLq0C/AXVMwvb9EJ27vXSlswYFsyLAAn0 tLET3vexjxeedfbBVzNx+qQ7v/8wpTwLBYo2Gtil/Hc+UHWHYLoecaGt4cC4XlS6wQNPKtXw2SO VnsclCQu+fHkTjEDKRa3gsL9/hybzgyxWZzEb8z8d6l3BGaGAahLUruRaMTIw9Ca/j5zKcfG X-Google-Smtp-Source: AGHT+IHEh+OGGdBfpbw9Ezhf9HsQaZImvcYBc/BECi3M6V/8EKmHii6CQkGoC7DxQblK6JTqZon8Ig== X-Received: by 2002:a05:6000:418a:b0:391:22e2:cd21 with SMTP id ffacd0b85a97d-39c12117df4mr9452334f8f.36.1743535441394; Tue, 01 Apr 2025 12:24:01 -0700 (PDT) Received: from localhost.localdomain ([2a02:2f0e:c50a:8800:cf9e:ee0b:4a01:37f6]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-39c0b66aa32sm15353438f8f.50.2025.04.01.12.24.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Apr 2025 12:24:00 -0700 (PDT) From: Ovidiu Panait To: clabbe.montjoie@gmail.com, herbert@gondor.apana.org.au, davem@davemloft.net, linux-crypto@vger.kernel.org Cc: wens@csie.org, jernej.skrabec@gmail.com, samuel@sholland.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev, linux-kernel@vger.kernel.org, Ovidiu Panait Subject: [PATCH 5/6] crypto: sun8i-ce-hash - add IS_ENABLED() checks to debugfs stats Date: Tue, 1 Apr 2025 22:23:20 +0300 Message-ID: <20250401192321.3370188-5-ovidiu.panait.oss@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250401192321.3370188-1-ovidiu.panait.oss@gmail.com> References: <20250401192321.3370188-1-ovidiu.panait.oss@gmail.com> Precedence: bulk X-Mailing-List: linux-sunxi@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Status: O Add IS_ENABLED(CONFIG_CRYPTO_DEV_SUN8I_CE_DEBUG) checks before the fallback counter updates to make sure the code is not included when debugfs statistics support is not enabled. Signed-off-by: Ovidiu Panait --- .../crypto/allwinner/sun8i-ce/sun8i-ce-hash.c | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/drivers/crypto/allwinner/sun8i-ce/sun8i-ce-hash.c b/drivers/crypto/allwinner/sun8i-ce/sun8i-ce-hash.c index 530c5181d73c..f2481e1585ba 100644 --- a/drivers/crypto/allwinner/sun8i-ce/sun8i-ce-hash.c +++ b/drivers/crypto/allwinner/sun8i-ce/sun8i-ce-hash.c @@ -60,8 +60,10 @@ int sun8i_ce_hash_init_tfm(struct crypto_ahash *tfm) sizeof(struct sun8i_ce_hash_reqctx) + crypto_ahash_reqsize(op->fallback_tfm)); - memcpy(algt->fbname, crypto_ahash_driver_name(op->fallback_tfm), - CRYPTO_MAX_ALG_NAME); + if (IS_ENABLED(CONFIG_CRYPTO_DEV_SUN8I_CE_DEBUG)) + memcpy(algt->fbname, + crypto_ahash_driver_name(op->fallback_tfm), + CRYPTO_MAX_ALG_NAME); err = pm_runtime_get_sync(op->ce->dev); if (err < 0) @@ -198,22 +200,30 @@ static bool sun8i_ce_hash_need_fallback(struct ahash_request *areq) algt = container_of(alg, struct sun8i_ce_alg_template, alg.hash.base); if (areq->nbytes == 0) { - algt->stat_fb_len0++; + if (IS_ENABLED(CONFIG_CRYPTO_DEV_SUN8I_CE_DEBUG)) + algt->stat_fb_len0++; + return true; } /* we need to reserve one SG for padding one */ if (sg_nents_for_len(areq->src, areq->nbytes) > MAX_SG - 1) { - algt->stat_fb_maxsg++; + if (IS_ENABLED(CONFIG_CRYPTO_DEV_SUN8I_CE_DEBUG)) + algt->stat_fb_maxsg++; + return true; } sg = areq->src; while (sg) { if (sg->length % 4) { - algt->stat_fb_srclen++; + if (IS_ENABLED(CONFIG_CRYPTO_DEV_SUN8I_CE_DEBUG)) + algt->stat_fb_srclen++; + return true; } if (!IS_ALIGNED(sg->offset, sizeof(u32))) { - algt->stat_fb_srcali++; + if (IS_ENABLED(CONFIG_CRYPTO_DEV_SUN8I_CE_DEBUG)) + algt->stat_fb_srcali++; + return true; } sg = sg_next(sg); From patchwork Tue Apr 1 19:23:21 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ovidiu Panait X-Patchwork-Id: 1863 Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 426F6215045 for ; Tue, 1 Apr 2025 19:24:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743535446; cv=none; b=HIf7synM92Lj3nm5OHhVNAvp5q6X/LfUNQA9eOWQXTew9jOLyHlEQ+vQbFeYbGjX8YH+opYe/QuWPspjA1BIkcjLH3bMwIDq/OW8oIm/vOvx2U7skd0XGjdcHTb9tJlPEywUduPwBMk/V2FREMDoQaUd0I/j0oixbPWci4hThg8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743535446; c=relaxed/simple; bh=NRVhERk2BAR2xqBjMJivMm5iv64usDIZsZsw3SPAVmI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rjNtLJG9VGukvgCKa0oupprkMzxNpjyUsPJMFr4k42Ea38GXTwCf91urzaMv4BZ79NA24gTrgu0VhsnDJN9eIl4KkBm8tb0bb2HTYBvySEx8IyT71UmNQ9S5ll9+58eqpVXbWPDb0xIutgB41zq/JEPeNS2oKEr0fYn/5U4Yw7g= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=ERDQCu+t; arc=none smtp.client-ip=209.85.221.43 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ERDQCu+t" Received: by mail-wr1-f43.google.com with SMTP id ffacd0b85a97d-399749152b4so2722924f8f.3 for ; Tue, 01 Apr 2025 12:24:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743535443; x=1744140243; darn=lists.linux.dev; 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=FPD+7okMltc/dAuqJI3eHLzfTcaBka9M3a4LKpm2uhg=; b=ERDQCu+tDsMxzQaYH5kkw3iaXDY7OzmZVn6BxFpbU9uZiGvDGBBJ2TTx3jmCEHo1xQ lfdcMG9sMCBYw/wtUOImBkMSC33epXMs2/iKZYCtaXK8LFdNBbJCEaip4mI4Xc55hhgQ ENwYWR23cCn+jzzYaXOtEoLyV1Nai+7ZGDmgGnIqSJdPlWzSWSdEtL3TZM2svr2ieA8A qS+Ul9gs2SWw1lHPZ4UfYXcjvkoGvvi8Hv5cgI71OPBIBJ+I2AhlA0hDErG2p7i2kYXI p0B4oAJtCeUSVbdh+t5b4/e4il2TgTNHt1A9B00tOX6DVcwCHC9HbZh9sD9PzbFZu41g esFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743535443; x=1744140243; 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=FPD+7okMltc/dAuqJI3eHLzfTcaBka9M3a4LKpm2uhg=; b=KjJ4zovf5khA4VmeqSDvg0aOTATdXhPzpWgDvOks2ngSKFrRf4mqWRFoW9BiHUDSAD DsqmO3oC/uSq8tEBF2xp8rVlc37N+7CpBk+i8UHgPtArKcOjfACqzLoyX5EPmT2WWvYY +3TrvwWNbBR+4EUJ9sPluUxhFL2AbohlDnhSPxPN07aejOZ/e0ZBhgoFSZxLdfkyoww+ oc5yuKSywyCzQTwIjBiv97/ofaL9gkURZF8UcUExeD/dZBKVFzLYCVqPYe7sSV4a6xii Jw5xugzFL3R4AgRmlhdKPCBkQzAUlbQdmqcBjztUTTi16ERyS4Edl74ORD9YzsLayPN7 LuOg== X-Forwarded-Encrypted: i=1; AJvYcCUm4YuctjRHQRMJh0BVLXhk+yU4x7qMwe3xsv+IghK+7ZT1tUjN3O188E2fkX1n8YoZdDrUDemxmi2CNg==@lists.linux.dev X-Gm-Message-State: AOJu0YwbhVRvKh9Q59dTgBAjk17ZOlXJF0x/QUqn4/afKlaCYyN89IrD UZWMmv1EaFxTeVnjZTw7GXLU8YaNTZSf6ygp4IfkvL1XmD1PWERY X-Gm-Gg: ASbGnct19x8H8E10QCA2dodCyxdHxpbd/PpY0TJhfznZ7Q+OaI1Nxj8iZmzc4ziSDGL RwgXBnI1S9Zy9uSHtuoQn3Byyx/snfLy2BjSLaChB7ZYNj07Dk2HfYIuB9tg0dxYHk6VYQJfWTt 9lkx+Qdl/gcLy8MYfUp6l/4tyhtH828K8t0DIXFtHwBKbx0OQg/xXuvpBR6/gzseFBTqeK0X1Pw KuM1RmmALVDFBYwZwbeWT7OF0Pex9oxnWJvdPY69k+9AStobxTsKVOosw0LKFT1gsa8xbZvt7H/ anP549M4+p/lI/93d20z1TV9UC9/iFZy3j7IdKfRLxyGsLeWppXl7o4iDCMi4CWP0Ba7ukZI X-Google-Smtp-Source: AGHT+IEaiKwLn7JsnD/3lJiU7PGrasf+3+s7Prm3UNAJkOHPWOkOwYJ5/33v9GOGEA2VI8+dpTqX0g== X-Received: by 2002:a05:6000:1a8b:b0:39a:c9c1:5453 with SMTP id ffacd0b85a97d-39c2367439dmr3498181f8f.49.1743535442768; Tue, 01 Apr 2025 12:24:02 -0700 (PDT) Received: from localhost.localdomain ([2a02:2f0e:c50a:8800:cf9e:ee0b:4a01:37f6]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-39c0b66aa32sm15353438f8f.50.2025.04.01.12.24.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Apr 2025 12:24:02 -0700 (PDT) From: Ovidiu Panait To: clabbe.montjoie@gmail.com, herbert@gondor.apana.org.au, davem@davemloft.net, linux-crypto@vger.kernel.org Cc: wens@csie.org, jernej.skrabec@gmail.com, samuel@sholland.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev, linux-kernel@vger.kernel.org, Ovidiu Panait Subject: [PATCH 6/6] crypto: sun8i-ce-hash - use API helpers to setup fallback request Date: Tue, 1 Apr 2025 22:23:21 +0300 Message-ID: <20250401192321.3370188-6-ovidiu.panait.oss@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250401192321.3370188-1-ovidiu.panait.oss@gmail.com> References: <20250401192321.3370188-1-ovidiu.panait.oss@gmail.com> Precedence: bulk X-Mailing-List: linux-sunxi@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Status: O Rather than setting up the fallback request by hand, use ahash_request_set_callback() and ahash_request_set_crypt() API helpers to properly setup the new request. Signed-off-by: Ovidiu Panait --- .../crypto/allwinner/sun8i-ce/sun8i-ce-hash.c | 49 ++++++++++--------- 1 file changed, 27 insertions(+), 22 deletions(-) diff --git a/drivers/crypto/allwinner/sun8i-ce/sun8i-ce-hash.c b/drivers/crypto/allwinner/sun8i-ce/sun8i-ce-hash.c index f2481e1585ba..ba13fb75c05d 100644 --- a/drivers/crypto/allwinner/sun8i-ce/sun8i-ce-hash.c +++ b/drivers/crypto/allwinner/sun8i-ce/sun8i-ce-hash.c @@ -92,7 +92,9 @@ int sun8i_ce_hash_init(struct ahash_request *areq) memset(rctx, 0, sizeof(struct sun8i_ce_hash_reqctx)); ahash_request_set_tfm(&rctx->fallback_req, tfmctx->fallback_tfm); - rctx->fallback_req.base.flags = areq->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP; + ahash_request_set_callback(&rctx->fallback_req, + areq->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP, + areq->base.complete, areq->base.data); return crypto_ahash_init(&rctx->fallback_req); } @@ -104,7 +106,9 @@ int sun8i_ce_hash_export(struct ahash_request *areq, void *out) struct sun8i_ce_hash_tfm_ctx *tfmctx = crypto_ahash_ctx(tfm); ahash_request_set_tfm(&rctx->fallback_req, tfmctx->fallback_tfm); - rctx->fallback_req.base.flags = areq->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP; + ahash_request_set_callback(&rctx->fallback_req, + areq->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP, + areq->base.complete, areq->base.data); return crypto_ahash_export(&rctx->fallback_req, out); } @@ -116,7 +120,9 @@ int sun8i_ce_hash_import(struct ahash_request *areq, const void *in) struct sun8i_ce_hash_tfm_ctx *tfmctx = crypto_ahash_ctx(tfm); ahash_request_set_tfm(&rctx->fallback_req, tfmctx->fallback_tfm); - rctx->fallback_req.base.flags = areq->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP; + ahash_request_set_callback(&rctx->fallback_req, + areq->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP, + areq->base.complete, areq->base.data); return crypto_ahash_import(&rctx->fallback_req, in); } @@ -130,9 +136,10 @@ int sun8i_ce_hash_final(struct ahash_request *areq) sun8i_ce_hash_stat_fb_inc(tfm); ahash_request_set_tfm(&rctx->fallback_req, tfmctx->fallback_tfm); - rctx->fallback_req.base.flags = areq->base.flags & - CRYPTO_TFM_REQ_MAY_SLEEP; - rctx->fallback_req.result = areq->result; + ahash_request_set_callback(&rctx->fallback_req, + areq->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP, + areq->base.complete, areq->base.data); + ahash_request_set_crypt(&rctx->fallback_req, NULL, areq->result, 0); return crypto_ahash_final(&rctx->fallback_req); } @@ -144,10 +151,10 @@ int sun8i_ce_hash_update(struct ahash_request *areq) struct sun8i_ce_hash_tfm_ctx *tfmctx = crypto_ahash_ctx(tfm); ahash_request_set_tfm(&rctx->fallback_req, tfmctx->fallback_tfm); - rctx->fallback_req.base.flags = areq->base.flags & - CRYPTO_TFM_REQ_MAY_SLEEP; - rctx->fallback_req.nbytes = areq->nbytes; - rctx->fallback_req.src = areq->src; + ahash_request_set_callback(&rctx->fallback_req, + areq->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP, + areq->base.complete, areq->base.data); + ahash_request_set_crypt(&rctx->fallback_req, areq->src, NULL, areq->nbytes); return crypto_ahash_update(&rctx->fallback_req); } @@ -161,12 +168,11 @@ int sun8i_ce_hash_finup(struct ahash_request *areq) sun8i_ce_hash_stat_fb_inc(tfm); ahash_request_set_tfm(&rctx->fallback_req, tfmctx->fallback_tfm); - rctx->fallback_req.base.flags = areq->base.flags & - CRYPTO_TFM_REQ_MAY_SLEEP; - - rctx->fallback_req.nbytes = areq->nbytes; - rctx->fallback_req.src = areq->src; - rctx->fallback_req.result = areq->result; + ahash_request_set_callback(&rctx->fallback_req, + areq->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP, + areq->base.complete, areq->base.data); + ahash_request_set_crypt(&rctx->fallback_req, areq->src, areq->result, + areq->nbytes); return crypto_ahash_finup(&rctx->fallback_req); } @@ -180,12 +186,11 @@ static int sun8i_ce_hash_digest_fb(struct ahash_request *areq) sun8i_ce_hash_stat_fb_inc(tfm); ahash_request_set_tfm(&rctx->fallback_req, tfmctx->fallback_tfm); - rctx->fallback_req.base.flags = areq->base.flags & - CRYPTO_TFM_REQ_MAY_SLEEP; - - rctx->fallback_req.nbytes = areq->nbytes; - rctx->fallback_req.src = areq->src; - rctx->fallback_req.result = areq->result; + ahash_request_set_callback(&rctx->fallback_req, + areq->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP, + areq->base.complete, areq->base.data); + ahash_request_set_crypt(&rctx->fallback_req, areq->src, areq->result, + areq->nbytes); return crypto_ahash_digest(&rctx->fallback_req); }