From patchwork Tue May 30 14:16:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 13260171 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id DD1DFC7EE2F for ; Tue, 30 May 2023 14:17:51 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 791826B007B; Tue, 30 May 2023 10:17:51 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 74130280004; Tue, 30 May 2023 10:17:51 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 60947280003; Tue, 30 May 2023 10:17:51 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 52BF06B007B for ; Tue, 30 May 2023 10:17:51 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id D955F1C70D9 for ; Tue, 30 May 2023 14:17:50 +0000 (UTC) X-FDA: 80847125100.07.1A6708F Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf09.hostedemail.com (Postfix) with ESMTP id 0197F140006 for ; Tue, 30 May 2023 14:17:48 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=LiwnWWok; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf09.hostedemail.com: domain of dhowells@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1685456269; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=jPGukvQXP4Tai7PUqcbnIswr++Y11hB7rT1QDpn/afo=; b=sOiF5EEN7jhDSoIYGFYrLoREvkPTSfoDjSs7jhY4z4x5xp+0qi2Z2IkJ11Iz07EtJtkY94 0O602YAVIGOTQM+FILt6+Xbp2vWJpg+ayuluFpivYbfAPlh/ORpf1XtY7K+hd004aCG0vm d3V6gOGaLICuUCy2AASx/b0DErPsXAs= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=LiwnWWok; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf09.hostedemail.com: domain of dhowells@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1685456269; a=rsa-sha256; cv=none; b=K3qp2s0PCrItenb3GiNPHTEgPHKVur5ojRp09tz1kh3md/3vMOvlUKJJjMtnDRcaZ2kT8+ V9zHsCx15BZA1hvWfgMWOZZxOeVYEtV5J4sLIA+xoieKAnWkC+/Q5Lvmn2op3Svt+yoXD8 R86NJUZ2O7IkPehRB7SgixK3OtFWSBY= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1685456268; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jPGukvQXP4Tai7PUqcbnIswr++Y11hB7rT1QDpn/afo=; b=LiwnWWoksiHsp7q/gmxwWad7MKo4uS+jGDCxwsjFAqi7zV4vLoEFdaDO9wJuSUwIwOswkx TkC7cslrxalPH7ReWDDaplqyI7ku8HTZq4fnQ/2frIff838ey9073oDSIVz+xvb72o2cJ+ XgGYxqNAxEZz96t7waWcLmoguhT0y9Q= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-422-RSYDLXzDO6mBKtqBJIWETQ-1; Tue, 30 May 2023 10:17:43 -0400 X-MC-Unique: RSYDLXzDO6mBKtqBJIWETQ-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4404B280BC52; Tue, 30 May 2023 14:17:31 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.42.28.182]) by smtp.corp.redhat.com (Postfix) with ESMTP id 10D55C154D3; Tue, 30 May 2023 14:17:28 +0000 (UTC) From: David Howells To: netdev@vger.kernel.org Cc: David Howells , Herbert Xu , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Willem de Bruijn , David Ahern , Matthew Wilcox , Jens Axboe , linux-crypto@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next v2 05/10] crypto: af_alg: Pin pages rather than ref'ing if appropriate Date: Tue, 30 May 2023 15:16:29 +0100 Message-ID: <20230530141635.136968-6-dhowells@redhat.com> In-Reply-To: <20230530141635.136968-1-dhowells@redhat.com> References: <20230530141635.136968-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 X-Rspamd-Queue-Id: 0197F140006 X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: wnxy8gyw4ckjn3wny3nms3mzypjudoi1 X-HE-Tag: 1685456268-969443 X-HE-Meta: U2FsdGVkX1/1zdJfitHr9qEike5HMEoQELOFX03p9sWgIS/n+tIwQabjipaWlzeUdgzwkKIhR5L8SxB8YBdKZdL4PqQ+DIV/HHQsXqeOR91KzG2DVU/Tom7yBGTN8hiEguDa4j+AGiXvEtCcrGKh0DqMKBUTdAM3eA03acKH7hmGVd3rOOfa4+4jQsQP13M4lCgO1a4FCDtKwakLGznaNqRa84vNQoWgqwyWEFD5mf79GTTEaMiQXRoECMCkt6t6ggcDPCpz+iIXONnnoLYJnVKDxzIFCfIOjcJAVE92MoYYfjAd9ZzSKAr26xYEq9r5olSikm/ZiS13YgpNQblOTpoeerxYAV4bGksN0ikKS8fDysWSaow4pmOwVkit85lz8gtcknyTT2gnsvxiXrnK+X3LfY0ojkpoI9xgdLVJZv9ahzSXmZ7hxWiGbM7yZzbngqSvLikUDUBILojNVAl1Z9VBQPer7oIAyQ074T8EH8iq9DaGK+zDqiRzBTLjU39jPrb0HcP8rNnBp4VBJR4qyNbuWqXZFrm9DrTRv+KG4YzIV++VhqEOQN2cAM28U4d0mxytSIPIKBXg/R1b0kloTgPOsQURJVG2LkNNfHT9GhRXRVQ+d1CW9NBvZhN31C6lDOh2LYmOc778HXSyhOD4QNy1W/EBKNPcZNKvJ4ahpHW4Pg2E0zXIxpkj/E/4wZ9wlaYlWy8plINvgmJ1EAx1l2Uv2Rfmd48SKeYNtY/VslDeujsQW2e/1bhr9yLtMe5m05KO1bc2BjRWDwr9sAYAYoesiXTcRJCrX+0Q3WvUNJguVoR2Jm2GjLDt3buDlZckNaDworl5vBPGsBfkN2zXgD4/hdAQ3W0D0zgbF5nSJ/pQ+g2shHOhSQyvz2ceoARZNdTu0S7ujs4GQpzOM3pMH7fO3YTw6eV51hhz8djC5dUtaP5WhqAT+GNYw72sPMEuoFkAAxAG5E6laYgIYeM R3ea58mC deLeGVx8YD4Q9ZwzW4cJ/1A7H90WOASpxT57veWvyUQ8VaPVJu4S21F+NYqPjtOOopaAC3hsOEIKz97uUjOGy39zeU2obWPriFZCoPMZmR9bFtAvUS2pMKd8m43FuuqveekCApC1+CaVS304h3HASFFCOaROa9MapvpKcevIU1tf6kTzj0quqCMYgZVo/tTqSuv48pl3Vc4VJlMkt3OM2XxxpXRdYG+20490F8GwDRSg4vJIxkc8q+zWOmVVmC4bPQbavFGO2YakYZla5dzETCSFAWrywU7qu+wzgiP88d9qyUbiDvaEOp2iRHi1pba9ayk9zrWe5JZP6snhz0pHvWJqq+3sknaYG5waliPmAJPhJFZ3bDlp99E/gnCIKtQ2zVIfS9bHOBvkc/KawLeq8UNnDKzR/Equ5bUhHwmfkhLGSzjcwmp6Yw6Oyq3MkpEmpjz4kSjgnY3dzRKCiL9xB1JNOXmDlgm9uDNHwk1QMxeHDy90i3UY75oJU1oX0A4KA2+5wWW4RqmOmzQrsFGeAxqa6aLyc2Dcd55RmBKyWDq65SGw= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Convert AF_ALG to use iov_iter_extract_pages() instead of iov_iter_get_pages(). This will pin pages or leave them unaltered rather than getting a ref on them as appropriate to the iterator. The pages need to be pinned for DIO-read rather than having refs taken on them to prevent VM copy-on-write from malfunctioning during a concurrent fork() (the result of the I/O would otherwise end up only visible to the child process and not the parent). Signed-off-by: David Howells cc: Herbert Xu cc: "David S. Miller" cc: Eric Dumazet cc: Jakub Kicinski cc: Paolo Abeni cc: Jens Axboe cc: Matthew Wilcox cc: linux-crypto@vger.kernel.org cc: netdev@vger.kernel.org --- crypto/af_alg.c | 10 +++++++--- include/crypto/if_alg.h | 1 + 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/crypto/af_alg.c b/crypto/af_alg.c index 5f7252a5b7b4..7caff10df643 100644 --- a/crypto/af_alg.c +++ b/crypto/af_alg.c @@ -533,14 +533,17 @@ static const struct net_proto_family alg_family = { int af_alg_make_sg(struct af_alg_sgl *sgl, struct iov_iter *iter, int len) { + struct page **pages = sgl->pages; size_t off; ssize_t n; int npages, i; - n = iov_iter_get_pages2(iter, sgl->pages, len, ALG_MAX_PAGES, &off); + n = iov_iter_extract_pages(iter, &pages, len, ALG_MAX_PAGES, 0, &off); if (n < 0) return n; + sgl->need_unpin = iov_iter_extract_will_pin(iter); + npages = DIV_ROUND_UP(off + n, PAGE_SIZE); if (WARN_ON(npages == 0)) return -EINVAL; @@ -573,8 +576,9 @@ void af_alg_free_sg(struct af_alg_sgl *sgl) { int i; - for (i = 0; i < sgl->npages; i++) - put_page(sgl->pages[i]); + if (sgl->need_unpin) + for (i = 0; i < sgl->npages; i++) + unpin_user_page(sgl->pages[i]); } EXPORT_SYMBOL_GPL(af_alg_free_sg); diff --git a/include/crypto/if_alg.h b/include/crypto/if_alg.h index 7e76623f9ec3..46494b33f5bc 100644 --- a/include/crypto/if_alg.h +++ b/include/crypto/if_alg.h @@ -59,6 +59,7 @@ struct af_alg_sgl { struct scatterlist sg[ALG_MAX_PAGES + 1]; struct page *pages[ALG_MAX_PAGES]; unsigned int npages; + bool need_unpin; }; /* TX SGL entry */