From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) (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 4D9601F12F6 for ; Tue, 3 Dec 2024 13:53:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.50 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733234006; cv=none; b=RrvnrPXdue4xbWUGRcLzB8zU2BYC4xkWWt5ml2zK8aPwDkiJaL0Lvymb0Lu+Lpc20Ean5rzznlJ8VMfQ6oMlGZlXWWzks24hk9tzWv9nv/NbrQBSjHhKM5oeAAVM5T5vj+OMm9HwhDMLau4xf49WlBWA/Fit8r6Ysb7HG2r0uCA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733234006; c=relaxed/simple; bh=MfM0drVwbDYoPluV0REjpJpK0fyBprYzaokHgqmg1QA=; h=Message-ID:Date:MIME-Version:From:Subject:To:Cc:References: In-Reply-To:Content-Type; b=IKpLQjLncSp3Fy+WFbM4c5LA5E5YBgyqg2uQnPQ0b/cCsoP1iyh/PPvJyiGUFFDuBW86zelqu5QDMM09cyhTkuuc0aFuf2mkWdkHas5U/lCVWFHjBL5UYYqi4TiQFJlOBnpadow6E3b2iULmnhKmNW3zTzdHderNBK6/iXts8Ww= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=OS2Rhfn1; arc=none smtp.client-ip=209.85.221.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="OS2Rhfn1" Received: by mail-wr1-f50.google.com with SMTP id ffacd0b85a97d-385e27c75f4so2395899f8f.2 for ; Tue, 03 Dec 2024 05:53:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1733234003; x=1733838803; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:organization:autocrypt :content-language:references:cc:to:subject:reply-to:from:user-agent :mime-version:date:message-id:from:to:cc:subject:date:message-id :reply-to; bh=wDNjqsNTvkXwslsyJDHeLHfffqCQZCYq3Xs1+G1L73g=; b=OS2Rhfn16X2DnccQyEsDMeN2i08kkIRnYum6HsZOYsDTqD46DayBumhkMttelvwZTl aiTNoorgZ0JsswbYJHPvWCDPqtQvo/bXr/Uy5BVh5Q5qFsCjH0kur7oOeLN8YI5DaAhJ KtItMQGYX4WlnERP2nNIY+gazW0QsPn1aF+KgpIfoGsRKBxIIbiCcxgkQ4lGAG8wzJwu HY7vOIgH/sj0IkU1Ti+o/ihy+cNpoNxfIPz/AYYcr/CSjWPAjGuZ9KqmgokrnmJM5QsP 7VCzV3CYhQmOV3OIpBE3t6q1dEBrlSOa4VlQnRmbEfrdTdErt25A2xdWcmQw13oDjPCv cD2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733234003; x=1733838803; h=content-transfer-encoding:in-reply-to:organization:autocrypt :content-language:references:cc:to:subject:reply-to:from:user-agent :mime-version:date:message-id:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to; bh=wDNjqsNTvkXwslsyJDHeLHfffqCQZCYq3Xs1+G1L73g=; b=cNCUM9QZ69ZhYwDR/yB8inOCcXt8wvv/Eco7nLLYSDtBHq4LxDpQgYj9YQyM2h7ZCr A9OuuvRJLzSr1iACugUDXp7bViHeAL1a5ZPGQXEr15V9/sdPBRwLyrug0YHwELlYUc73 FYTDSu63TQ0zhptZWYwV86pnv9n48Lsv4r44vu2ViNW/7tSf3++dzKUacBjXFYxRG4u2 NJFTermxaurDaZ3NIOi/aMEJhRfhZTgqp1zz7Vu4/HPntRAk23MvCUtsQCLoiWXazeuf eQ8SoS3fpSTkerQ9v/1VajlA9lx8iVGOMDhkw9tjCqm6rSr3CgHl6Gcr44fSEpoSIICg bwGA== X-Forwarded-Encrypted: i=1; AJvYcCUA2dbLo1ez8k44+SiHuCo2BTU7rS3V5KSnkLm+sCANojDWv/qSQZUzbVWbQ7XjMx0czfrmBtMHyYv0DCU=@vger.kernel.org X-Gm-Message-State: AOJu0Ywx2v5PN//FACo3N8tS/wqM38u+kTfZT0GYELNfYs57IE9OxsQN 017kW9XGHtw6ssSwrZjl/YjJ7Nfjxazd8MeUNw9uSXCXNWxagq/sdnfyQ0c80Ks= X-Gm-Gg: ASbGnctoWe4a7TPtF34fHxQ6tC8jshOJ4btxQNxO344T35djpAsJKzOhn/GAFa7W60q sVMl52Wnxde3K3gShEBjwsT69trZ21fVB8oZqwF/T6thBDWZKm4G2OsC2Uy5Z/10dQ5RbjgD7qN Q6h0sDyQcdDeyNWs1+zaVLEwytkWOrH30J0Tvk0ADH4XTzBE1Y79cDPXqUktswJeqWuUzdmAFAz kPbOv8b8xEJ/vbQdtwLIfRSlEMvkfHMeDUSzR61oEwFm6BrXjHGyahzfk8lM6vvb8H4WL6GxQcA cTm/opW9Ltwfp+nk0f2HtBuZ X-Google-Smtp-Source: AGHT+IGh+XS+vM0CbuRcrxDNTg3Y8TKQ9gEnvK0wrtUF8j62EtQ0gbCJvdajb5h8bz5IO1GMuUl3LQ== X-Received: by 2002:a5d:648f:0:b0:385:e13c:5409 with SMTP id ffacd0b85a97d-385fd3c68d2mr2122986f8f.5.1733234002695; Tue, 03 Dec 2024 05:53:22 -0800 (PST) Received: from ?IPV6:2a01:e0a:982:cbb0:b668:b88:4ecf:c065? ([2a01:e0a:982:cbb0:b668:b88:4ecf:c065]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-434b0d9bef8sm189836875e9.7.2024.12.03.05.53.21 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 03 Dec 2024 05:53:22 -0800 (PST) Message-ID: Date: Tue, 3 Dec 2024 14:53:21 +0100 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird From: neil.armstrong@linaro.org Reply-To: neil.armstrong@linaro.org Subject: Re: [PATCH 9/9] crypto: qce - switch to using a mutex To: Bartosz Golaszewski , Thara Gopinath , Herbert Xu , "David S. Miller" , Stanimir Varbanov Cc: linux-crypto@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski References: <20241203-crypto-qce-refactor-v1-0-c5901d2dd45c@linaro.org> <20241203-crypto-qce-refactor-v1-9-c5901d2dd45c@linaro.org> Content-Language: en-US, fr Autocrypt: addr=neil.armstrong@linaro.org; keydata= xsBNBE1ZBs8BCAD78xVLsXPwV/2qQx2FaO/7mhWL0Qodw8UcQJnkrWmgTFRobtTWxuRx8WWP GTjuhvbleoQ5Cxjr+v+1ARGCH46MxFP5DwauzPekwJUD5QKZlaw/bURTLmS2id5wWi3lqVH4 BVF2WzvGyyeV1o4RTCYDnZ9VLLylJ9bneEaIs/7cjCEbipGGFlfIML3sfqnIvMAxIMZrvcl9 qPV2k+KQ7q+aXavU5W+yLNn7QtXUB530Zlk/d2ETgzQ5FLYYnUDAaRl+8JUTjc0CNOTpCeik 80TZcE6f8M76Xa6yU8VcNko94Ck7iB4vj70q76P/J7kt98hklrr85/3NU3oti3nrIHmHABEB AAHNKk5laWwgQXJtc3Ryb25nIDxuZWlsLmFybXN0cm9uZ0BsaW5hcm8ub3JnPsLAkQQTAQoA OwIbIwULCQgHAwUVCgkICwUWAgMBAAIeAQIXgBYhBInsPQWERiF0UPIoSBaat7Gkz/iuBQJk Q5wSAhkBAAoJEBaat7Gkz/iuyhMIANiD94qDtUTJRfEW6GwXmtKWwl/mvqQtaTtZID2dos04 YqBbshiJbejgVJjy+HODcNUIKBB3PSLaln4ltdsV73SBcwUNdzebfKspAQunCM22Mn6FBIxQ GizsMLcP/0FX4en9NaKGfK6ZdKK6kN1GR9YffMJd2P08EO8mHowmSRe/ExAODhAs9W7XXExw UNCY4pVJyRPpEhv373vvff60bHxc1k/FF9WaPscMt7hlkbFLUs85kHtQAmr8pV5Hy9ezsSRa GzJmiVclkPc2BY592IGBXRDQ38urXeM4nfhhvqA50b/nAEXc6FzqgXqDkEIwR66/Gbp0t3+r yQzpKRyQif3OwE0ETVkGzwEIALyKDN/OGURaHBVzwjgYq+ZtifvekdrSNl8TIDH8g1xicBYp QTbPn6bbSZbdvfeQPNCcD4/EhXZuhQXMcoJsQQQnO4vwVULmPGgtGf8PVc7dxKOeta+qUh6+ SRh3vIcAUFHDT3f/Zdspz+e2E0hPV2hiSvICLk11qO6cyJE13zeNFoeY3ggrKY+IzbFomIZY 4yG6xI99NIPEVE9lNBXBKIlewIyVlkOaYvJWSV+p5gdJXOvScNN1epm5YHmf9aE2ZjnqZGoM Mtsyw18YoX9BqMFInxqYQQ3j/HpVgTSvmo5ea5qQDDUaCsaTf8UeDcwYOtgI8iL4oHcsGtUX oUk33HEAEQEAAcLAXwQYAQIACQUCTVkGzwIbDAAKCRAWmrexpM/4rrXiB/sGbkQ6itMrAIfn M7IbRuiSZS1unlySUVYu3SD6YBYnNi3G5EpbwfBNuT3H8//rVvtOFK4OD8cRYkxXRQmTvqa3 3eDIHu/zr1HMKErm+2SD6PO9umRef8V82o2oaCLvf4WeIssFjwB0b6a12opuRP7yo3E3gTCS KmbUuLv1CtxKQF+fUV1cVaTPMyT25Od+RC1K+iOR0F54oUJvJeq7fUzbn/KdlhA8XPGzwGRy 4zcsPWvwnXgfe5tk680fEKZVwOZKIEuJC3v+/yZpQzDvGYJvbyix0lHnrCzq43WefRHI5XTT QbM0WUIBIcGmq38+OgUsMYu4NzLu7uZFAcmp6h8g Organization: Linaro In-Reply-To: <20241203-crypto-qce-refactor-v1-9-c5901d2dd45c@linaro.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 03/12/2024 10:19, Bartosz Golaszewski wrote: > From: Bartosz Golaszewski > > Having switched to workqueue from tasklet, we are no longer limited to > atomic APIs and can now convert the spinlock to a mutex. This, along > with the conversion from tasklet to workqueue grants us ~15% improvement > in cryptsetup benchmarks for AES encryption. Can you share on which platforms you did the tests and the results you got ? > > While at it: use guards to simplify locking code. > > Signed-off-by: Bartosz Golaszewski > --- > drivers/crypto/qce/core.c | 46 +++++++++++++++++++++------------------------- > drivers/crypto/qce/core.h | 3 ++- > 2 files changed, 23 insertions(+), 26 deletions(-) > > diff --git a/drivers/crypto/qce/core.c b/drivers/crypto/qce/core.c > index 6de9f1e23e282..e95e84486d9ae 100644 > --- a/drivers/crypto/qce/core.c > +++ b/drivers/crypto/qce/core.c > @@ -3,6 +3,7 @@ > * Copyright (c) 2010-2014, The Linux Foundation. All rights reserved. > */ > > +#include > #include > #include > #include > @@ -11,7 +12,6 @@ > #include > #include > #include > -#include > #include > #include > #include > @@ -89,34 +89,28 @@ static int qce_handle_queue(struct qce_device *qce, > struct crypto_async_request *req) > { > struct crypto_async_request *async_req, *backlog; > - unsigned long flags; > int ret = 0, err; > > - spin_lock_irqsave(&qce->lock, flags); > + scoped_guard(mutex, &qce->lock) { > + if (req) > + ret = crypto_enqueue_request(&qce->queue, req); > > - if (req) > - ret = crypto_enqueue_request(&qce->queue, req); > + /* busy, do not dequeue request */ > + if (qce->req) > + return ret; > > - /* busy, do not dequeue request */ > - if (qce->req) { > - spin_unlock_irqrestore(&qce->lock, flags); > - return ret; > + backlog = crypto_get_backlog(&qce->queue); > + async_req = crypto_dequeue_request(&qce->queue); > + if (async_req) > + qce->req = async_req; > } > > - backlog = crypto_get_backlog(&qce->queue); > - async_req = crypto_dequeue_request(&qce->queue); > - if (async_req) > - qce->req = async_req; > - > - spin_unlock_irqrestore(&qce->lock, flags); > - > if (!async_req) > return ret; > > if (backlog) { > - spin_lock_bh(&qce->lock); > - crypto_request_complete(backlog, -EINPROGRESS); > - spin_unlock_bh(&qce->lock); > + scoped_guard(mutex, &qce->lock) > + crypto_request_complete(backlog, -EINPROGRESS); > } > > err = qce_handle_request(async_req); > @@ -133,12 +127,11 @@ static void qce_req_done_work(struct work_struct *work) > struct qce_device *qce = container_of(work, struct qce_device, > done_work); > struct crypto_async_request *req; > - unsigned long flags; > > - spin_lock_irqsave(&qce->lock, flags); > - req = qce->req; > - qce->req = NULL; > - spin_unlock_irqrestore(&qce->lock, flags); > + scoped_guard(mutex, &qce->lock) { > + req = qce->req; > + qce->req = NULL; > + } > > if (req) > crypto_request_complete(req, qce->result); > @@ -243,7 +236,10 @@ static int qce_crypto_probe(struct platform_device *pdev) > if (ret) > return ret; > > - spin_lock_init(&qce->lock); > + ret = devm_mutex_init(qce->dev, &qce->lock); > + if (ret) > + return ret; > + > INIT_WORK(&qce->done_work, qce_req_done_work); > crypto_init_queue(&qce->queue, QCE_QUEUE_LENGTH); > > diff --git a/drivers/crypto/qce/core.h b/drivers/crypto/qce/core.h > index 39e75a75a4293..eb6fa7a8b64a8 100644 > --- a/drivers/crypto/qce/core.h > +++ b/drivers/crypto/qce/core.h > @@ -6,6 +6,7 @@ > #ifndef _CORE_H_ > #define _CORE_H_ > > +#include > #include > > #include "dma.h" > @@ -30,7 +31,7 @@ > */ > struct qce_device { > struct crypto_queue queue; > - spinlock_t lock; > + struct mutex lock; > struct work_struct done_work; > struct crypto_async_request *req; > int result; > Reviewed-by: Neil Armstrong