Patch Detail

HTTP 200 OK
Allow: GET, PUT, PATCH, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "id": 810121,
    "url": "http://patchwork.ozlabs.org/api/patches/810121/?format=api",
    "web_url": "http://patchwork.ozlabs.org/project/netdev/patch/1504615144-29770-10-git-send-email-gilad@benyossef.com/",
    "project": {
        "id": 7,
        "url": "http://patchwork.ozlabs.org/api/projects/7/?format=api",
        "name": "Linux network development",
        "link_name": "netdev",
        "list_id": "netdev.vger.kernel.org",
        "list_email": "netdev@vger.kernel.org",
        "web_url": null,
        "scm_url": null,
        "webscm_url": null,
        "list_archive_url": "",
        "list_archive_url_format": "",
        "commit_url_format": ""
    },
    "msgid": "<1504615144-29770-10-git-send-email-gilad@benyossef.com>",
    "list_archive_url": null,
    "date": "2017-09-05T12:38:48",
    "name": "[v8,09/20] crypto: move drbg to generic async completion",
    "commit_ref": null,
    "pull_url": null,
    "state": "not-applicable",
    "archived": true,
    "hash": "d16e6db60300445af8e4e30f96dfa76df23ddbe9",
    "submitter": {
        "id": 11198,
        "url": "http://patchwork.ozlabs.org/api/people/11198/?format=api",
        "name": "Gilad Ben-Yossef",
        "email": "gilad@benyossef.com"
    },
    "delegate": {
        "id": 34,
        "url": "http://patchwork.ozlabs.org/api/users/34/?format=api",
        "username": "davem",
        "first_name": "David",
        "last_name": "Miller",
        "email": "davem@davemloft.net"
    },
    "mbox": "http://patchwork.ozlabs.org/project/netdev/patch/1504615144-29770-10-git-send-email-gilad@benyossef.com/mbox/",
    "series": [
        {
            "id": 1573,
            "url": "http://patchwork.ozlabs.org/api/series/1573/?format=api",
            "web_url": "http://patchwork.ozlabs.org/project/netdev/list/?series=1573",
            "date": "2017-09-05T12:38:39",
            "name": "simplify crypto wait for async op",
            "version": 8,
            "mbox": "http://patchwork.ozlabs.org/series/1573/mbox/"
        }
    ],
    "comments": "http://patchwork.ozlabs.org/api/patches/810121/comments/",
    "check": "pending",
    "checks": "http://patchwork.ozlabs.org/api/patches/810121/checks/",
    "tags": {},
    "related": [],
    "headers": {
        "Return-Path": "<netdev-owner@vger.kernel.org>",
        "X-Original-To": "patchwork-incoming@ozlabs.org",
        "Delivered-To": "patchwork-incoming@ozlabs.org",
        "Authentication-Results": "ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netdev-owner@vger.kernel.org;\n\treceiver=<UNKNOWN>)",
        "Received": [
            "from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xmmYl2qNpz9sRm\n\tfor <patchwork-incoming@ozlabs.org>;\n\tTue,  5 Sep 2017 22:41:47 +1000 (AEST)",
            "(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1752014AbdIEMlj (ORCPT <rfc822;patchwork-incoming@ozlabs.org>);\n\tTue, 5 Sep 2017 08:41:39 -0400",
            "from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70]:39404 \"EHLO\n\tfoss.arm.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP\n\tid S1751386AbdIEMld (ORCPT <rfc822;netdev@vger.kernel.org>);\n\tTue, 5 Sep 2017 08:41:33 -0400",
            "from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249])\n\tby usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id F2F70165D;\n\tTue,  5 Sep 2017 05:41:31 -0700 (PDT)",
            "from gby.kfn.arm.com (unknown [10.45.48.140])\n\tby usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id\n\t424893F3E1; Tue,  5 Sep 2017 05:41:20 -0700 (PDT)"
        ],
        "From": "Gilad Ben-Yossef <gilad@benyossef.com>",
        "To": "Herbert Xu <herbert@gondor.apana.org.au>,\n\t\"David S. Miller\" <davem@davemloft.net>,\n\tJonathan Corbet <corbet@lwn.net>, David Howells <dhowells@redhat.com>,\n\tTom Lendacky <thomas.lendacky@amd.com>, Gary Hook <gary.hook@amd.com>,\n\tBoris Brezillon <boris.brezillon@free-electrons.com>,\n\tArnaud Ebalard <arno@natisbad.org>,\n\tMatthias Brugger <matthias.bgg@gmail.com>,\n\tAlasdair Kergon <agk@redhat.com>,\n\tMike Snitzer <snitzer@redhat.com>, dm-devel@redhat.com,\n\tShaohua Li <shli@kernel.org>, Steve French <sfrench@samba.org>,\n\t\"Theodore Y. Ts'o\" <tytso@mit.edu>, Jaegeuk Kim <jaegeuk@kernel.org>,\n\tSteffen Klassert <steffen.klassert@secunet.com>,\n\tAlexey Kuznetsov <kuznet@ms2.inr.ac.ru>,\n\tHideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>,\n\tMimi Zohar <zohar@linux.vnet.ibm.com>,\n\tDmitry Kasatkin <dmitry.kasatkin@gmail.com>,\n\tJames Morris <james.l.morris@oracle.com>,\n\t\"Serge E. Hallyn\" <serge@hallyn.com>, linux-crypto@vger.kernel.org,\n\tlinux-doc@vger.kernel.org, linux-kernel@vger.kernel.org,\n\tkeyrings@vger.kernel.org, linux-arm-kernel@lists.infradead.org,\n\tlinux-mediatek@lists.infradead.org, linux-raid@vger.kernel.org,\n\tlinux-cifs@vger.kernel.org, samba-technical@lists.samba.org,\n\tlinux-fscrypt@vger.kernel.org, netdev@vger.kernel.org,\n\tlinux-ima-devel@lists.sourceforge.net,\n\tlinux-ima-user@lists.sourceforge.net,\n\tlinux-security-module@vger.kernel.org",
        "Cc": "Ofir Drang <ofir.drang@arm.com>",
        "Subject": "[PATCH v8 09/20] crypto: move drbg to generic async completion",
        "Date": "Tue,  5 Sep 2017 15:38:48 +0300",
        "Message-Id": "<1504615144-29770-10-git-send-email-gilad@benyossef.com>",
        "X-Mailer": "git-send-email 2.1.4",
        "In-Reply-To": "<1504615144-29770-1-git-send-email-gilad@benyossef.com>",
        "References": "<1504615144-29770-1-git-send-email-gilad@benyossef.com>",
        "Sender": "netdev-owner@vger.kernel.org",
        "Precedence": "bulk",
        "List-ID": "<netdev.vger.kernel.org>",
        "X-Mailing-List": "netdev@vger.kernel.org"
    },
    "content": "DRBG is starting an async. crypto op and waiting for it complete.\nMove it over to generic code doing the same.\n\nThe code now also passes CRYPTO_TFM_REQ_MAY_SLEEP flag indicating\ncrypto request memory allocation may use GFP_KERNEL which should\nbe perfectly fine as the code is obviously sleeping for the\ncompletion of the request any way.\n\nSigned-off-by: Gilad Ben-Yossef <gilad@benyossef.com>\n---\n crypto/drbg.c         | 36 +++++++++---------------------------\n include/crypto/drbg.h |  3 +--\n 2 files changed, 10 insertions(+), 29 deletions(-)",
    "diff": "diff --git a/crypto/drbg.c b/crypto/drbg.c\nindex 633a88e..c522251 100644\n--- a/crypto/drbg.c\n+++ b/crypto/drbg.c\n@@ -1651,16 +1651,6 @@ static int drbg_fini_sym_kernel(struct drbg_state *drbg)\n \treturn 0;\n }\n \n-static void drbg_skcipher_cb(struct crypto_async_request *req, int error)\n-{\n-\tstruct drbg_state *drbg = req->data;\n-\n-\tif (error == -EINPROGRESS)\n-\t\treturn;\n-\tdrbg->ctr_async_err = error;\n-\tcomplete(&drbg->ctr_completion);\n-}\n-\n static int drbg_init_sym_kernel(struct drbg_state *drbg)\n {\n \tstruct crypto_cipher *tfm;\n@@ -1691,7 +1681,7 @@ static int drbg_init_sym_kernel(struct drbg_state *drbg)\n \t\treturn PTR_ERR(sk_tfm);\n \t}\n \tdrbg->ctr_handle = sk_tfm;\n-\tinit_completion(&drbg->ctr_completion);\n+\tcrypto_init_wait(&drbg->ctr_wait);\n \n \treq = skcipher_request_alloc(sk_tfm, GFP_KERNEL);\n \tif (!req) {\n@@ -1700,8 +1690,9 @@ static int drbg_init_sym_kernel(struct drbg_state *drbg)\n \t\treturn -ENOMEM;\n \t}\n \tdrbg->ctr_req = req;\n-\tskcipher_request_set_callback(req, CRYPTO_TFM_REQ_MAY_BACKLOG,\n-\t\t\t\t\tdrbg_skcipher_cb, drbg);\n+\tskcipher_request_set_callback(req, CRYPTO_TFM_REQ_MAY_BACKLOG |\n+\t\t\t\t\t\tCRYPTO_TFM_REQ_MAY_SLEEP,\n+\t\t\t\t\tcrypto_req_done, &drbg->ctr_wait);\n \n \talignmask = crypto_skcipher_alignmask(sk_tfm);\n \tdrbg->ctr_null_value_buf = kzalloc(DRBG_CTR_NULL_LEN + alignmask,\n@@ -1762,21 +1753,12 @@ static int drbg_kcapi_sym_ctr(struct drbg_state *drbg,\n \t\t/* Output buffer may not be valid for SGL, use scratchpad */\n \t\tskcipher_request_set_crypt(drbg->ctr_req, &sg_in, &sg_out,\n \t\t\t\t\t   cryptlen, drbg->V);\n-\t\tret = crypto_skcipher_encrypt(drbg->ctr_req);\n-\t\tswitch (ret) {\n-\t\tcase 0:\n-\t\t\tbreak;\n-\t\tcase -EINPROGRESS:\n-\t\tcase -EBUSY:\n-\t\t\twait_for_completion(&drbg->ctr_completion);\n-\t\t\tif (!drbg->ctr_async_err) {\n-\t\t\t\treinit_completion(&drbg->ctr_completion);\n-\t\t\t\tbreak;\n-\t\t\t}\n-\t\tdefault:\n+\t\tret = crypto_wait_req(crypto_skcipher_encrypt(drbg->ctr_req),\n+\t\t\t\t\t&drbg->ctr_wait);\n+\t\tif (ret)\n \t\t\tgoto out;\n-\t\t}\n-\t\tinit_completion(&drbg->ctr_completion);\n+\n+\t\tcrypto_init_wait(&drbg->ctr_wait);\n \n \t\tmemcpy(outbuf, drbg->outscratchpad, cryptlen);\n \ndiff --git a/include/crypto/drbg.h b/include/crypto/drbg.h\nindex 22f884c..8f94110 100644\n--- a/include/crypto/drbg.h\n+++ b/include/crypto/drbg.h\n@@ -126,8 +126,7 @@ struct drbg_state {\n \t__u8 *ctr_null_value;\t\t\t/* CTR mode aligned zero buf */\n \t__u8 *outscratchpadbuf;\t\t\t/* CTR mode output scratchpad */\n         __u8 *outscratchpad;\t\t\t/* CTR mode aligned outbuf */\n-\tstruct completion ctr_completion;\t/* CTR mode async handler */\n-\tint ctr_async_err;\t\t\t/* CTR mode async error */\n+\tstruct crypto_wait ctr_wait;\t\t/* CTR mode async wait obj */\n \n \tbool seeded;\t\t/* DRBG fully seeded? */\n \tbool pr;\t\t/* Prediction resistance enabled? */\n",
    "prefixes": [
        "v8",
        "09/20"
    ]
}