From patchwork Fri Mar 31 16:08:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 77834 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp676557vqo; Fri, 31 Mar 2023 09:12:39 -0700 (PDT) X-Google-Smtp-Source: AKy350bskidqCC+uoUWE+ZDXBfc5SjL5kr3yQWmkG3nvFAzviqiAiWj8zQFweu3AtHIUU4EERDGZ X-Received: by 2002:aa7:c948:0:b0:4fe:94a2:81be with SMTP id h8-20020aa7c948000000b004fe94a281bemr24256330edt.7.1680279159735; Fri, 31 Mar 2023 09:12:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680279159; cv=none; d=google.com; s=arc-20160816; b=rnxOmBsOgSudmybEdfcDq/OYGnhXGhCTlldi6mpTf4KieKMqyuvfovAdZt8VMtMb+x xDPos88Y74MEMPbD1IsqHPPc6FGOLIccQC3rj/dxinVeYDc+U6weCmsIcmKioyV83fvV q9bIgCxiFwO1myiPasID5dfvHHFRVZZ/83NshO8BaKBNTszGGxbYESrUfS5eCA3uDfCK mrUVJgccJ+hvV38B6CBjkLM5uZRouKA71lUHTEh9eEmFNFz0QoZThQdWSxI86ImEKplw 77f2+/GYtU/dLoItYPUxf0yvRizz57KAA6lMoXpKYF5R727fhIeEP41zVeDl/J9HISIS pdew== 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=fsOLHSRSLMInNcD449MTPXsGwp1kWYvONeYqTpf/Ez4=; b=pPzAWMD7fwm6LPVUknVuqNoMFCUgvWowurP4OsfSlZDFZRu29ty78oEd/aVDJ7sYi3 peqKD4lMV3SlVvscdtVvBGGWS6rl/wzRvMTx5c1nkerAv9s2CdoF/ZI98vT8VtnYCwyY +q17PgS3HR8mR5t18XBSE5Olp6pfa0hWKapZURbGdFtW+dThoDm0uJr7sUU6/FcJdYo/ sSTdYy1w5hHfTRB7HLY4vmkWNSvr+xaLt5oNh5jXWiWY1UEY7fNQS+J8Z5lNb2MbWywe cGojs7sti64i4U1vlA9gfVddyS+KNsSZVWxNzwGafAwvSpAt1hYaK4WQQRNNPwu544aU EmKA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=e+orkJzF; 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 w12-20020a50fa8c000000b0050245e7f729si2479353edr.615.2023.03.31.09.12.14; Fri, 31 Mar 2023 09:12:39 -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=e+orkJzF; 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 S230183AbjCaQKe (ORCPT + 99 others); Fri, 31 Mar 2023 12:10:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60628 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231915AbjCaQKU (ORCPT ); Fri, 31 Mar 2023 12:10:20 -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 409121FD0F for ; Fri, 31 Mar 2023 09:09:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1680278971; 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=fsOLHSRSLMInNcD449MTPXsGwp1kWYvONeYqTpf/Ez4=; b=e+orkJzFD76gmRpxn+WfSAxlz7D1UIfey4LCbc+UnzrKaZI7sAkekmGuhKPriGs/8aBWjn GNXiES0l004Z7wkuBP3/SwMcOTRzI7JipycWosaEmAocG1Jz+hFSK9494ZhhKc6sJ0zrf3 6nCJfl0IhdZud6zHT4MSW+BqXL9nAIg= 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-613-JBunTOtONMCZ2eDMDHE0OA-1; Fri, 31 Mar 2023 12:09:25 -0400 X-MC-Unique: JBunTOtONMCZ2eDMDHE0OA-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 56800855425; Fri, 31 Mar 2023 16:09:24 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.33.36.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id CF52D4042AC0; Fri, 31 Mar 2023 16:09:21 +0000 (UTC) From: David Howells To: Matthew Wilcox , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: David Howells , Al Viro , Christoph Hellwig , Jens Axboe , Jeff Layton , Christian Brauner , Chuck Lever III , Linus Torvalds , netdev@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Steve French , Shyam Prasad N , Rohith Surabattula , linux-cachefs@redhat.com, linux-cifs@vger.kernel.org Subject: [PATCH v3 01/55] netfs: Fix netfs_extract_iter_to_sg() for ITER_UBUF/IOVEC Date: Fri, 31 Mar 2023 17:08:20 +0100 Message-Id: <20230331160914.1608208-2-dhowells@redhat.com> In-Reply-To: <20230331160914.1608208-1-dhowells@redhat.com> References: <20230331160914.1608208-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 X-Spam-Status: No, score=-0.2 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE 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?1761900399976586820?= X-GMAIL-MSGID: =?utf-8?q?1761900399976586820?= Fix netfs_extract_iter_to_sg() for ITER_UBUF and ITER_IOVEC to set the size of the page to the part of the page extracted, not the remaining amount of data in the extracted page array at that point. This doesn't yet affect anything as cifs, the only current user, only passes in non-user-backed iterators. Fixes: 018584697533 ("netfs: Add a function to extract an iterator into a scatterlist") Signed-off-by: David Howells cc: Jeff Layton cc: Steve French cc: Shyam Prasad N cc: Rohith Surabattula cc: linux-cachefs@redhat.com cc: linux-cifs@vger.kernel.org cc: linux-fsdevel@vger.kernel.org Reviewed-by: Jeff Layton --- fs/netfs/iterator.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/netfs/iterator.c b/fs/netfs/iterator.c index e9a45dea748a..8a4c86687429 100644 --- a/fs/netfs/iterator.c +++ b/fs/netfs/iterator.c @@ -139,7 +139,7 @@ static ssize_t netfs_extract_user_to_sg(struct iov_iter *iter, size_t seg = min_t(size_t, PAGE_SIZE - off, len); *pages++ = NULL; - sg_set_page(sg, page, len, off); + sg_set_page(sg, page, seg, off); sgtable->nents++; sg++; len -= seg;