From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) (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 A592D38AC66 for ; Thu, 2 Apr 2026 07:27:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.50 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775114823; cv=none; b=OnXbw8Qu4SrREpMd73Jy3GBDgSKeKCLdVEpYjeX3RSoMDdn6GrronFTL6skbJU3WqMG/O0ZQ6p682QynPNWOhnjXkL/nncWnwPjDN3R1Xxkr5n0FaiQyVDWtNAz9VwCdeYv9XCEbSsmSWWfilZMDfL6wfMB3nbgb5o8dXWo8/3k= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775114823; c=relaxed/simple; bh=RIMPQ30O66gZyxi1GgdfOfqsNXr9TJuWz4WmZFNnTz8=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=N04SggIrDF+gwlrQt/dFMCyp8Y7K3ac8qjEAusy6N0htjwXaWSRQpar7CmXaOy3X1FDR+DjwzekuVk+vRyGz1l+JzR1KzTfANthKLKHv3HM1K1wmu74taWQ4/SaG5E8EFj2PBNVV3Nzu88DRy0omtmp1gJN9u9z0pz+rsRANDuE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=CN5B2l4Y; arc=none smtp.client-ip=209.85.128.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="CN5B2l4Y" Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-48541edecf9so6262105e9.1 for ; Thu, 02 Apr 2026 00:27:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775114820; x=1775719620; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=mTjmxxQGIpdzFW5FWCBE7RIhDHSyBFWxxqNS0QNlPrY=; b=CN5B2l4YeQ5FK76n00bWS8KXp0+6dZkgTDB9LHc7FlC+J7lduz3uovegWeRx4S4Kb2 1Ku6VOKIKep2YqYqudcKDR9tNlSuhwA4NAMJpV1FqX9byNI/eV3y6a+RCTkW7ouvkHfT F12RFmKv+83MnFz+OExDTatXHWkTsMiMGOycFrTj2QjuyUTcz1q+Y3q6U6XSvX7XYu7e 1z5FmiONTn9+LmW6lhngOOxKPDWw1ZjyBOHU8iBzdYFSfT3pAPrhD/eK27KB1lx3w2Mw QTsZmbK7eacTKJtYqxUpH+BfgH+3lfNFGkqGUJru8gH/eWkwFWHbwYds9Grbsj0IaEmF GmPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775114820; x=1775719620; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=mTjmxxQGIpdzFW5FWCBE7RIhDHSyBFWxxqNS0QNlPrY=; b=W7Rz146NwzeOFRtgdRV/jmjXZPGl9m6fzU2PamJYeGCGnNrQ05/kGDNnxA5ftm/70D TfLPKonwko1h9NXOBpjTMtJ9iGLhXRMSCymc07P4FwC87YdnKypxH57rmxsPaFoCgRdM wKRkSFaCYwQNq1KL3Cp2ISO2Z24SAtujHbvSNhSQ68bY6LdIk+uwvqa7PzPcaxTUK5rp Ar2UQ+WdqbovdBrmnONWyDdNPntFEc82Xsw3f2bRIYdDtN7aXZCRKy3xqyE8WeaXqCOn ltVH7cd9unWJwvwX4xY//i9WTi0wEAwwvh3xqtdI8E+4TXgZFkVvXIVUcAJEHGmtFb80 JxWg== X-Gm-Message-State: AOJu0YzkldMARWbLPrt2N3LFI5iFxb0qt/62MzOoxUEle1t/t8MYtm/2 491aQCUkESiO0Ou7r8m3b7lc6mPcXiEf7/lMK9Sob9LHk7fVajdZcHe0 X-Gm-Gg: ATEYQzy09zJ+KqogXrJlJ3B+JaYqbny6oOSWme0HKmmfmWi/+rQyO7aC46M9rNqmJmd jlzUBjgsoRRElAbKK102EpEi9zyxx4OGTUtpVVvQFvWn6ivtYM1hBH3sd8n/t13Xl0DUtII33SF F3sRwSiOCxub068eUY18bs4NtCI0YfI3Z9WxaKulh3+tGzn7X5+A+Kb89kedRF7QiBSHigCeZDA UUzWs3qmAma/cJ2pcxLApntklnbBgZ4NLvNM98okQHwWgNncaqS23xJnVncBskMiL8H62BfJbG9 F/0SCib24h3wiai426VWQySP3u5BL3iyz53b06l/q5IXE0c+U+8rvyK6WON7TnFyqWckAOMhpu6 1tdSxaaGyr+cj8EBvp8wlXFoUpvdieJi24Q+Lvw/wuZbNAQf7HNUbub76SNBlQ4dBHcP3qwhfso nVeXcgvaGCH50FMEB6w5/JkeqwWoK7wlFu8zh7nZ2jo3Lv4WiN8KAsEC85ZGvp33vImF82ojqoj wfBI/cSULS3 X-Received: by 2002:a05:600c:4704:b0:486:fcc7:d6a with SMTP id 5b1f17b1804b1-4888358931fmr107340145e9.13.1775114817821; Thu, 02 Apr 2026 00:26:57 -0700 (PDT) Received: from dohko.chello.ie (188-141-5-72.dynamic.upc.ie. [188.141.5.72]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4887e80a616sm280661805e9.2.2026.04.02.00.26.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Apr 2026 00:26:57 -0700 (PDT) From: David Carlier To: David Hildenbrand , Kairui Song , Chris Li , Andrew Morton , Kemeng Shi , Nhat Pham , Baoquan He , Youngjun Park , NeilBrown Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, David Carlier , "Matthew Wilcox (Oracle)" , David Hildenbrand Subject: [PATCH v5] mm/page_io: rename swap_iocb fields for clarity Date: Thu, 2 Apr 2026 08:26:50 +0100 Message-ID: <20260402072650.48811-1-devnexen@gmail.com> X-Mailer: git-send-email 2.53.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit swap_iocb->pages tracks the number of bvec entries (folios), not base pages. Rename the array from bvec to bvecs and the counter from pages to nr_bvecs to accurately reflect their purpose. Suggested-by: Matthew Wilcox (Oracle) Suggested-by: David Hildenbrand Signed-off-by: David Carlier --- mm/page_io.c | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/mm/page_io.c b/mm/page_io.c index 1389cd57ca88..18ff6f559cbd 100644 --- a/mm/page_io.c +++ b/mm/page_io.c @@ -326,8 +326,8 @@ static void bio_associate_blkg_from_page(struct bio *bio, struct folio *folio) struct swap_iocb { struct kiocb iocb; - struct bio_vec bvec[SWAP_CLUSTER_MAX]; - int pages; + struct bio_vec bvecs[SWAP_CLUSTER_MAX]; + int nr_bvecs; int len; }; static mempool_t *sio_pool; @@ -348,7 +348,7 @@ int sio_pool_init(void) static void sio_write_complete(struct kiocb *iocb, long ret) { struct swap_iocb *sio = container_of(iocb, struct swap_iocb, iocb); - struct page *page = sio->bvec[0].bv_page; + struct page *page = sio->bvecs[0].bv_page; int p; if (ret != sio->len) { @@ -362,15 +362,15 @@ static void sio_write_complete(struct kiocb *iocb, long ret) */ pr_err_ratelimited("Write error %ld on dio swapfile (%llu)\n", ret, swap_dev_pos(page_swap_entry(page))); - for (p = 0; p < sio->pages; p++) { - page = sio->bvec[p].bv_page; + for (p = 0; p < sio->nr_bvecs; p++) { + page = sio->bvecs[p].bv_page; set_page_dirty(page); ClearPageReclaim(page); } } - for (p = 0; p < sio->pages; p++) - end_page_writeback(sio->bvec[p].bv_page); + for (p = 0; p < sio->nr_bvecs; p++) + end_page_writeback(sio->bvecs[p].bv_page); mempool_free(sio, sio_pool); } @@ -397,13 +397,13 @@ static void swap_writepage_fs(struct folio *folio, struct swap_iocb **swap_plug) init_sync_kiocb(&sio->iocb, swap_file); sio->iocb.ki_complete = sio_write_complete; sio->iocb.ki_pos = pos; - sio->pages = 0; + sio->nr_bvecs = 0; sio->len = 0; } - bvec_set_folio(&sio->bvec[sio->pages], folio, folio_size(folio), 0); + bvec_set_folio(&sio->bvecs[sio->nr_bvecs], folio, folio_size(folio), 0); sio->len += folio_size(folio); - sio->pages += 1; - if (sio->pages == ARRAY_SIZE(sio->bvec) || !swap_plug) { + sio->nr_bvecs += 1; + if (sio->nr_bvecs == ARRAY_SIZE(sio->bvecs) || !swap_plug) { swap_write_unplug(sio); sio = NULL; } @@ -477,7 +477,7 @@ void swap_write_unplug(struct swap_iocb *sio) struct address_space *mapping = sio->iocb.ki_filp->f_mapping; int ret; - iov_iter_bvec(&from, ITER_SOURCE, sio->bvec, sio->pages, sio->len); + iov_iter_bvec(&from, ITER_SOURCE, sio->bvecs, sio->nr_bvecs, sio->len); ret = mapping->a_ops->swap_rw(&sio->iocb, &from); if (ret != -EIOCBQUEUED) sio_write_complete(&sio->iocb, ret); @@ -489,8 +489,8 @@ static void sio_read_complete(struct kiocb *iocb, long ret) int p; if (ret == sio->len) { - for (p = 0; p < sio->pages; p++) { - struct folio *folio = page_folio(sio->bvec[p].bv_page); + for (p = 0; p < sio->nr_bvecs; p++) { + struct folio *folio = page_folio(sio->bvecs[p].bv_page); count_mthp_stat(folio_order(folio), MTHP_STAT_SWPIN); count_memcg_folio_events(folio, PSWPIN, folio_nr_pages(folio)); @@ -499,8 +499,8 @@ static void sio_read_complete(struct kiocb *iocb, long ret) } count_vm_events(PSWPIN, sio->len >> PAGE_SHIFT); } else { - for (p = 0; p < sio->pages; p++) { - struct folio *folio = page_folio(sio->bvec[p].bv_page); + for (p = 0; p < sio->nr_bvecs; p++) { + struct folio *folio = page_folio(sio->bvecs[p].bv_page); folio_unlock(folio); } @@ -559,13 +559,13 @@ static void swap_read_folio_fs(struct folio *folio, struct swap_iocb **plug) init_sync_kiocb(&sio->iocb, sis->swap_file); sio->iocb.ki_pos = pos; sio->iocb.ki_complete = sio_read_complete; - sio->pages = 0; + sio->nr_bvecs = 0; sio->len = 0; } - bvec_set_folio(&sio->bvec[sio->pages], folio, folio_size(folio), 0); + bvec_set_folio(&sio->bvecs[sio->nr_bvecs], folio, folio_size(folio), 0); sio->len += folio_size(folio); - sio->pages += 1; - if (sio->pages == ARRAY_SIZE(sio->bvec) || !plug) { + sio->nr_bvecs += 1; + if (sio->nr_bvecs == ARRAY_SIZE(sio->bvecs) || !plug) { swap_read_unplug(sio); sio = NULL; } @@ -666,7 +666,7 @@ void __swap_read_unplug(struct swap_iocb *sio) struct address_space *mapping = sio->iocb.ki_filp->f_mapping; int ret; - iov_iter_bvec(&from, ITER_DEST, sio->bvec, sio->pages, sio->len); + iov_iter_bvec(&from, ITER_DEST, sio->bvecs, sio->nr_bvecs, sio->len); ret = mapping->a_ops->swap_rw(&sio->iocb, &from); if (ret != -EIOCBQUEUED) sio_read_complete(&sio->iocb, ret); -- 2.53.0