From patchwork Tue Nov 7 06:19:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Biggers X-Patchwork-Id: 10045775 X-Patchwork-Delegate: herbert@gondor.apana.org.au Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0BF1F60360 for ; Tue, 7 Nov 2017 06:21:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F14242A064 for ; Tue, 7 Nov 2017 06:21:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E2F142A089; Tue, 7 Nov 2017 06:21:46 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9E9DA2A064 for ; Tue, 7 Nov 2017 06:21:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754259AbdKGGVp (ORCPT ); Tue, 7 Nov 2017 01:21:45 -0500 Received: from mail-pg0-f68.google.com ([74.125.83.68]:57253 "EHLO mail-pg0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754242AbdKGGVn (ORCPT ); Tue, 7 Nov 2017 01:21:43 -0500 Received: by mail-pg0-f68.google.com with SMTP id m18so10225719pgd.13; Mon, 06 Nov 2017 22:21:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=erVmDFsSJ/HEcLelwCm0hMpNaR77mpmnMrrAdjiLtL0=; b=Ftn8z9EMtlCwFGwkTGigEY6AHWcDkbz3KCgfxv73NZeEn4SCWXhNw2qHbQHP5V6UMF zXsFtXLOwqsWsN+m20XVDbxwZfb3ueYp+yfgLyTHlWMDn0ArNrLbhGcEdNb5TDqX2JhE 67TU6EJZSHwdVoJuBCrIIee1jRerw9bfN+FisnaKqq1KoBZLEpR5NrQx7r2sZABOf6Rj 0o4QIxiKl6Hv/SawLFPQLTkzL0ivXeI2SicO7KDGjrhTGYb9iMnxKVqz9Q+WZaCC4kZU FKEWhmnvMZ4O00wHAsJ925EvZ416+s8uxBTa7a5Zz0L0zzmfU3rdFF0eOtgB3ZMoifhM QxXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=erVmDFsSJ/HEcLelwCm0hMpNaR77mpmnMrrAdjiLtL0=; b=AT49L66L1l0RNG/oYkyEdZzH16oqGEqxqcNPz3XdyZsGtFSJE8zvy4R3IyE4+yBlsM hSJJSlx8nPKakO/iMUQGZ3e/B/TgRQ9gOhDq6IJuK9aVoRy94DKHGOF7GSo5RQuWlhmM XANgvh+p70Gi77VVJ238g6N3j4wHfMLWBHhxhioGIBGX/OPXZTV4Wkysl10U6x+E04xt uNpVl7IzE8cr2g72DcUf4DT/CCBnXEv7/p5rC/hjqLsaocIRvup9qgNESRnWd2ohMPBl eRKajmNSoujoNerR2UAwU0fQ1y3z3aWlEj7sAnWwhcdDeQ2ueZBD5VsGCyQ4yhBAb6FN UC2w== X-Gm-Message-State: AMCzsaUnwNJK1UHY0INdlButC5ACfSY/Uto/Mo/sQiwUgiPZfH/lUSjc rTCGj00wbNe19opQh4zB4L9YwTrd X-Google-Smtp-Source: ABhQp+QZFbDloAkeydYyVZCvEplsOy+jZJdTZLOb8NWPJ00UlGCJJW5YHzroCBfWSdAcISiAotL0bw== X-Received: by 10.84.129.34 with SMTP id 31mr16772756plb.368.1510035702904; Mon, 06 Nov 2017 22:21:42 -0800 (PST) Received: from zzz.hsd1.wa.comcast.net (c-67-185-97-198.hsd1.wa.comcast.net. [67.185.97.198]) by smtp.gmail.com with ESMTPSA id q13sm1245285pfi.166.2017.11.06.22.21.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Nov 2017 22:21:42 -0800 (PST) From: Eric Biggers To: linux-crypto@vger.kernel.org, Herbert Xu Cc: Tudor-Dan Ambarus , Mat Martineau , Salvatore Benedetto , keyrings@vger.kernel.org, linux-kernel@vger.kernel.org, Eric Biggers , stable@vger.kernel.org Subject: [PATCH] lib/mpi: call cond_resched() from mpi_powm() loop Date: Mon, 6 Nov 2017 22:19:51 -0800 Message-Id: <20171107061951.861-1-ebiggers3@gmail.com> X-Mailer: git-send-email 2.15.0 Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Eric Biggers On a non-preemptible kernel, if KEYCTL_DH_COMPUTE is called with the largest permitted inputs (16384 bits), the kernel spends 10+ seconds doing modular exponentiation in mpi_powm() without rescheduling. If all threads do it, it locks up the system. Moreover, it can cause rcu_sched-stall warnings. Notwithstanding the insanity of doing this calculation in kernel mode rather than in userspace, fix it by calling cond_resched() as each bit from the exponent is processed. It's still noninterruptible, but at least it's preemptible now. Cc: stable@vger.kernel.org # v4.12+ Signed-off-by: Eric Biggers --- lib/mpi/mpi-pow.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/mpi/mpi-pow.c b/lib/mpi/mpi-pow.c index e24388a863a7..f089a52dbbdb 100644 --- a/lib/mpi/mpi-pow.c +++ b/lib/mpi/mpi-pow.c @@ -26,6 +26,7 @@ * however I decided to publish this code under the plain GPL. */ +#include #include #include "mpi-internal.h" #include "longlong.h" @@ -263,6 +264,8 @@ int mpi_powm(MPI res, MPI base, MPI exp, MPI mod) break; e = ep[i]; c = BITS_PER_MPI_LIMB; + + cond_resched(); } /* We shifted MOD, the modulo reduction argument, left MOD_SHIFT_CNT