From patchwork Wed Oct 18 07:00:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gilad Ben-Yossef X-Patchwork-Id: 116213 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp5743298qgn; Wed, 18 Oct 2017 00:02:38 -0700 (PDT) X-Google-Smtp-Source: AOwi7QCSgQWBuMInjKh6IHBPu7l8mp4qND39xUAYxCNIG6W9eLvS/odMjzvUrS8vsyM72KK6xEsk X-Received: by 10.84.240.70 with SMTP id h6mr14201853plt.109.1508310158111; Wed, 18 Oct 2017 00:02:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508310158; cv=none; d=google.com; s=arc-20160816; b=DhsF8UA3QP3S6cuAAJ2Uk2JtTW2ZPjNkMjhMLavHioyMjU8CxuNCu6Y5fVR1TFz2Fx Km+0ac31Pf29+yI72PSwB3ET9CQJuwwXPvsw40UDmVoQIglV53hGXVOQj0v2Pdl6OAJL 4Cjbzuqh+bJvoClUDyg8sCWHgU3kz0pmwUJwaxxlqi0n15oLXCXIC7d4Us6532aJK7/b fpYKgV3K2h8CIh267L/eS1cabn03WMdZqDs/K6ChLmpJWYBE/+LqWfWYV4hE8P9ZywPG B/MeOZnbubzTuGEFIke6GXvZVI1niGtlOdBA6RymuWOodGDVpf3QJnf5xnn1sYcUYbiX wYZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=z4l4zwvH0TjGCQVfT11MC7MncPts0ezZFmCFlus0l2w=; b=e/iNFrrxHO6DQ36oCirMvRjSKIahtsNL+NOWlzyFrQtyvLW5snG203Z7teLfuxJljT cRlvC07SUcc1M9SCw82cWZoVZkGKR2MZs/vjlD2swrsUFxFh13VHA9QdRPK4YwtKvfRF uyDsdS+R52YApuzjFeVJzLpmJYF32e1EJJ9+A6rtjXNBKiwaQGhxRp7ydKjfWeOHi2XZ rXCptRDma+4jNS56O6MkdINEMYzVdyBH6h9Gb2H6bmLGxAwTXkqlTUXnfnhaiA+jUiwW Ka7AeKjC154KlxIWdr4NQ+fwiDVkKz7GCPCgKvTBHA+dT6RJtUEF4mfJ4x1iaDlAdyjF tTgA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f19si7328514plr.246.2017.10.18.00.02.37; Wed, 18 Oct 2017 00:02:38 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966494AbdJRHCg (ORCPT + 27 others); Wed, 18 Oct 2017 03:02:36 -0400 Received: from foss.arm.com ([217.140.101.70]:33294 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932290AbdJRHCa (ORCPT ); Wed, 18 Oct 2017 03:02:30 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 8A68D15BE; Wed, 18 Oct 2017 00:02:29 -0700 (PDT) Received: from localhost.localdomain (usa-sjc-mx-foss1.foss.arm.com [217.140.101.70]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 33F363F590; Wed, 18 Oct 2017 00:02:20 -0700 (PDT) From: Gilad Ben-Yossef To: Herbert Xu , "David S. Miller" , Jonathan Corbet , David Howells , Tom Lendacky , Gary Hook , Boris Brezillon , Arnaud Ebalard , Matthias Brugger , Alasdair Kergon , Mike Snitzer , dm-devel@redhat.com, Steve French , "Theodore Y. Ts'o" , Jaegeuk Kim , Steffen Klassert , Alexey Kuznetsov , Hideaki YOSHIFUJI , Mimi Zohar , Dmitry Kasatkin , James Morris , "Serge E. Hallyn" Cc: Ofir Drang , linux-crypto@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, keyrings@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-cifs@vger.kernel.org, samba-technical@lists.samba.org, linux-fscrypt@vger.kernel.org, netdev@vger.kernel.org, linux-ima-devel@lists.sourceforge.net, linux-ima-user@lists.sourceforge.net, linux-security-module@vger.kernel.org Subject: [PATCH v10 02/20] crypto: ccp: use -ENOSPC for transient busy indication Date: Wed, 18 Oct 2017 08:00:34 +0100 Message-Id: <1508310057-25369-3-git-send-email-gilad@benyossef.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1508310057-25369-1-git-send-email-gilad@benyossef.com> References: <1508310057-25369-1-git-send-email-gilad@benyossef.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Replace -EBUSY with -ENOSPC when reporting transient busy indication in the absence of backlog. Signed-off-by: Gilad Ben-Yossef Reviewed-by: Gary R Hook --- Please squash this patch with the previous one when merging upstream. drivers/crypto/ccp/ccp-crypto-main.c | 8 +++----- drivers/crypto/ccp/ccp-dev.c | 7 +++++-- 2 files changed, 8 insertions(+), 7 deletions(-) -- 2.7.4 diff --git a/drivers/crypto/ccp/ccp-crypto-main.c b/drivers/crypto/ccp/ccp-crypto-main.c index 35a9de7..b95d199 100644 --- a/drivers/crypto/ccp/ccp-crypto-main.c +++ b/drivers/crypto/ccp/ccp-crypto-main.c @@ -222,9 +222,10 @@ static int ccp_crypto_enqueue_cmd(struct ccp_crypto_cmd *crypto_cmd) /* Check if the cmd can/should be queued */ if (req_queue.cmd_count >= CCP_CRYPTO_MAX_QLEN) { - ret = -EBUSY; - if (!(crypto_cmd->cmd->flags & CCP_CMD_MAY_BACKLOG)) + if (!(crypto_cmd->cmd->flags & CCP_CMD_MAY_BACKLOG)) { + ret = -ENOSPC; goto e_lock; + } } /* Look for an entry with the same tfm. If there is a cmd @@ -243,9 +244,6 @@ static int ccp_crypto_enqueue_cmd(struct ccp_crypto_cmd *crypto_cmd) ret = ccp_enqueue_cmd(crypto_cmd->cmd); if (!ccp_crypto_success(ret)) goto e_lock; /* Error, don't queue it */ - if ((ret == -EBUSY) && - !(crypto_cmd->cmd->flags & CCP_CMD_MAY_BACKLOG)) - goto e_lock; /* Not backlogging, don't queue it */ } if (req_queue.cmd_count >= CCP_CRYPTO_MAX_QLEN) { diff --git a/drivers/crypto/ccp/ccp-dev.c b/drivers/crypto/ccp/ccp-dev.c index 4e029b1..1b5035d 100644 --- a/drivers/crypto/ccp/ccp-dev.c +++ b/drivers/crypto/ccp/ccp-dev.c @@ -292,9 +292,12 @@ int ccp_enqueue_cmd(struct ccp_cmd *cmd) i = ccp->cmd_q_count; if (ccp->cmd_count >= MAX_CMD_QLEN) { - ret = -EBUSY; - if (cmd->flags & CCP_CMD_MAY_BACKLOG) + if (cmd->flags & CCP_CMD_MAY_BACKLOG) { + ret = -EBUSY; list_add_tail(&cmd->entry, &ccp->backlog); + } else { + ret = -ENOSPC; + } } else { ret = -EINPROGRESS; ccp->cmd_count++;