From patchwork Tue Jun 6 13:08:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 103811 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp3384611vqr; Tue, 6 Jun 2023 06:13:00 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ64AnmXMIwGA3jTmqMWnOEVeYcaeCKSywE/9UcQNKq+oA56P3EojFlvEI+HN1xxIwHe6/jV X-Received: by 2002:ac8:5902:0:b0:3f6:bf18:3d81 with SMTP id 2-20020ac85902000000b003f6bf183d81mr1518648qty.45.1686057180549; Tue, 06 Jun 2023 06:13:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686057180; cv=none; d=google.com; s=arc-20160816; b=kz5tOqgvEvFcAuIwzBduGTeTKCfTcWnpZEG3YHGjKCUu56CiAIqYAOplFjrJ8fgL4C 4HI1X6Ls24ze/8dsi+oOKZsVrhJypNVX8wiUBYIGkWgRHBJIW1CToOlGUsX60qsuiXDP coHCNZuFlbfHbV4+S0FjC0ZCHzgaiU/hhyaT8gdNKMi5d+jlfSbgasbv7j+bQ4inbCpp kXRA2glcqwToPPFYGC2CGozZCi8PAqX1c88k18io7/hcy8WxGBoKbUHZiJg9tuWO1+zv f8uByG8FR8go8c6g1G2u7xa/JJDyNPGI7fQV5HpW0En2VUxL/c8KMX3lOzL/cWTb3S7v 3dNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=jPGukvQXP4Tai7PUqcbnIswr++Y11hB7rT1QDpn/afo=; b=c78EcVoc57wF6LJFWDg2kjIPWrc/8ntFwhdnv4sNqJkLJPUxHMSf3Bxg1tpU27HHLz 11+ERiuD0EEsClCg9oOtdN9AU4u3PSDk3Ev0iai4HQOsr+TGCEBx4Y6aOq1SdT8qyjg0 LO9fXN0IbLa0IXp0fSlyEcHzICGLzDBQzMTrt/te7ownuvQTgoUF5YMTdivJRnQCosZy tapRH5EIOR9rJK726bX6ZOcZBZM/SKDmucpEH8lPCAhKyKPX2GDDN1oZesw0Ge+LzN9y 7Gaf3Bp1FGujtnx07+TsfUo9ZgPsM1eGPVc7Squ4hjzmx5Myv76bJERl+8JDNPwrv48E je3A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=JFMhDCAe; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id u33-20020a05622a19a100b003ef415f0190si2419850qtc.667.2023.06.06.06.12.45; Tue, 06 Jun 2023 06:13:00 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=JFMhDCAe; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238200AbjFFNLz (ORCPT + 99 others); Tue, 6 Jun 2023 09:11:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39678 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238199AbjFFNLO (ORCPT ); Tue, 6 Jun 2023 09:11:14 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 80AF21985 for ; Tue, 6 Jun 2023 06:10:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1686056971; 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=JFMhDCAeW85ItGwhFymKydrppGpBun8gMwwOfMuOjjroyOtCaJFkHcq54n4/EqPk9UD4+J UwOVu6t4pO/FBxUrCimQxT+VJ6E56lNe8xT0La5eGs5OkBxHtxaKY0foDEP5fYLoSc+FKz qo9mXRHvDAtkr4d0CyDKM7UxT3ieadI= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-173-ANQJNu_2OhaXPJwexz3WVg-1; Tue, 06 Jun 2023 09:09:28 -0400 X-MC-Unique: ANQJNu_2OhaXPJwexz3WVg-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 17D4C1019C88; Tue, 6 Jun 2023 13:09:27 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.42.28.182]) by smtp.corp.redhat.com (Postfix) with ESMTP id 17EE94087C62; Tue, 6 Jun 2023 13:09:24 +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 v3 05/10] crypto: af_alg: Pin pages rather than ref'ing if appropriate Date: Tue, 6 Jun 2023 14:08:51 +0100 Message-ID: <20230606130856.1970660-6-dhowells@redhat.com> In-Reply-To: <20230606130856.1970660-1-dhowells@redhat.com> References: <20230606130856.1970660-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1767959094180880225?= X-GMAIL-MSGID: =?utf-8?q?1767959094180880225?= 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 Acked-by: Herbert Xu --- 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 */