From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.170]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id ECE814437C for ; Sun, 10 Nov 2024 15:29:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.170 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731252557; cv=none; b=aO2ZLeTjz27u4vGcNdEIcwTt8It58WAOT+GoH5GDl++juPrymOUDI/GHc7oHI7I02zemiHbSk+QZzhSxC8+JwfPjQvawDx/EqAAjs0z/mIl5F4GwjmSNvX3m4Hmk5I9YXCTykaCY4GqotVu40+Y3QCTKgTb/ZXMIcl88CeHEGnk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731252557; c=relaxed/simple; bh=ZCGFBh3RRNjXY6L8R9jv8JwBpMjmEe8zEwEeTVk4ewI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UQFm1UPs0OlRUdQKiPaBsQuIPPhBK8RDXmcty62rqS3yNFEV1UJMa/XBrcM3Z2QIoVWAW23E8gpui60jTXUvHuSjhAIcx9XoJ5pPqy+82CBzxTEWd580mkqQiOTtb5p7iKZoW5OiXQVN5BD2iZ860zA3/fj2BFC6kS8GKmDnL5Y= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk; spf=pass smtp.mailfrom=kernel.dk; dkim=pass (2048-bit key) header.d=kernel-dk.20230601.gappssmtp.com header.i=@kernel-dk.20230601.gappssmtp.com header.b=KTl4ld6s; arc=none smtp.client-ip=209.85.210.170 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=kernel.dk Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel-dk.20230601.gappssmtp.com header.i=@kernel-dk.20230601.gappssmtp.com header.b="KTl4ld6s" Received: by mail-pf1-f170.google.com with SMTP id d2e1a72fcca58-720e94d36c8so4106188b3a.1 for ; Sun, 10 Nov 2024 07:29:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20230601.gappssmtp.com; s=20230601; t=1731252554; x=1731857354; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ATQlrsiKbF4ovWTP3SQYfEdawQE8siSIL4Gn+HYptZ0=; b=KTl4ld6skRxSUjxGhT1V8ehwnsGKMPL+zhhjRER3/6dCrjKJ/md8tyGXKDg0irkY5Y XHzCen6Vqy7NTNVGL3M0RnPhdxZ9sGlA8kB3KXX8Pz+pRXdTpkfZv10ALipRUNipGHo3 rBX5fqdQLoZz6Q9KEuT9ZtOp3bY+oWqfZrKZeg1x3VGfOm+orvUFnKWuqgkft6XoNS0H R3j0lfKERtziifFyeRBvNlzL28fX6o/PwpvzJaQUCwlYsYdxtjohDLWQ7mOPxJRhVplC /BZn/wGFrBxnLh3JwzGV+87H5QVpCPphfebHRsoH16ArCTAhcWZtdGE5yfU2PDUEyiHb YH4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1731252554; x=1731857354; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ATQlrsiKbF4ovWTP3SQYfEdawQE8siSIL4Gn+HYptZ0=; b=VhXtU3Xb9S366wdYfwPYO+QD50t+c+JtYdMtWMHQLATGXufY7bH80zhbq59HylayY5 En15AVw7E8XL+yjT2bqK0HxRZdSqfjzfTOoME4TUzCCCVTMjXSM9V1GrF5ZFWPnHz671 ErFrBnd7kODXlG4zbLbnS4HMEjddT5d+fUexYyLKVzhzRutT4gdNCeGXOyPsnPot+GtV /+g+biav5sg+RB8KOLBEz3IsBax8fIyfA1dDfmqF+LAZVHhD2hWa1LlnV36rv3pUbZy0 hdJMvn65aR+N4N3V8AQq9wneffsoym/wycHyOfgrQUSxMQuYQW63x9myHTfvwPjiBzYP v0QA== X-Forwarded-Encrypted: i=1; AJvYcCVYcUfHKLAcQFa7DKgLuffw2sBb4Vmuyq+B5Rs41rJRMoV+uvE4mVaQ68ZHuaCAvkLsdJAy7o4Ft7iWLAyo@vger.kernel.org X-Gm-Message-State: AOJu0Yy3g6Z8Kg7o2AhNCptAgpTyBOPxvEmv8RfKfq8Uk5VypOQnZwDx Ltwz8oxCYtZh/xpKaenu+03X00b8E3qoSH7y3I8oVch/Lmf7MR2K9IMo7+E8VQw= X-Google-Smtp-Source: AGHT+IHudq5kHes2nSMTtH3m+uxQGkBDk1+1Ad9rVBdouFER/SNEbqW3PARIVnuSTIfSKRPsHGRgYA== X-Received: by 2002:a17:90b:388d:b0:2e2:b94c:d6a2 with SMTP id 98e67ed59e1d1-2e9b1e13166mr14624611a91.0.1731252554158; Sun, 10 Nov 2024 07:29:14 -0800 (PST) Received: from localhost.localdomain ([198.8.77.157]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2e99a5f935dsm9940973a91.35.2024.11.10.07.29.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 Nov 2024 07:29:13 -0800 (PST) From: Jens Axboe To: linux-mm@kvack.org, linux-fsdevel@vger.kernel.org Cc: hannes@cmpxchg.org, clm@meta.com, linux-kernel@vger.kernel.org, willy@infradead.org, Jens Axboe Subject: [PATCH 01/15] mm/filemap: change filemap_create_folio() to take a struct kiocb Date: Sun, 10 Nov 2024 08:27:53 -0700 Message-ID: <20241110152906.1747545-2-axboe@kernel.dk> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20241110152906.1747545-1-axboe@kernel.dk> References: <20241110152906.1747545-1-axboe@kernel.dk> Precedence: bulk X-Mailing-List: linux-fsdevel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Rather than pass in both the file and position directly from the kiocb, just take a struct kiocb instead. While doing so, move the ki_flags checking into filemap_create_folio() as well. In preparation for actually needing the kiocb in the function. No functional changes in this patch. Signed-off-by: Jens Axboe --- mm/filemap.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/mm/filemap.c b/mm/filemap.c index 36d22968be9a..0b187938b999 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -2460,15 +2460,17 @@ static int filemap_update_page(struct kiocb *iocb, return error; } -static int filemap_create_folio(struct file *file, - struct address_space *mapping, loff_t pos, - struct folio_batch *fbatch) +static int filemap_create_folio(struct kiocb *iocb, + struct address_space *mapping, struct folio_batch *fbatch) { struct folio *folio; int error; unsigned int min_order = mapping_min_folio_order(mapping); pgoff_t index; + if (iocb->ki_flags & (IOCB_NOWAIT | IOCB_WAITQ)) + return -EAGAIN; + folio = filemap_alloc_folio(mapping_gfp_mask(mapping), min_order); if (!folio) return -ENOMEM; @@ -2487,7 +2489,7 @@ static int filemap_create_folio(struct file *file, * well to keep locking rules simple. */ filemap_invalidate_lock_shared(mapping); - index = (pos >> (PAGE_SHIFT + min_order)) << min_order; + index = (iocb->ki_pos >> (PAGE_SHIFT + min_order)) << min_order; error = filemap_add_folio(mapping, folio, index, mapping_gfp_constraint(mapping, GFP_KERNEL)); if (error == -EEXIST) @@ -2495,7 +2497,8 @@ static int filemap_create_folio(struct file *file, if (error) goto error; - error = filemap_read_folio(file, mapping->a_ops->read_folio, folio); + error = filemap_read_folio(iocb->ki_filp, mapping->a_ops->read_folio, + folio); if (error) goto error; @@ -2551,9 +2554,7 @@ static int filemap_get_pages(struct kiocb *iocb, size_t count, filemap_get_read_batch(mapping, index, last_index - 1, fbatch); } if (!folio_batch_count(fbatch)) { - if (iocb->ki_flags & (IOCB_NOWAIT | IOCB_WAITQ)) - return -EAGAIN; - err = filemap_create_folio(filp, mapping, iocb->ki_pos, fbatch); + err = filemap_create_folio(iocb, mapping, fbatch); if (err == AOP_TRUNCATED_PAGE) goto retry; return err; -- 2.45.2