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 C03FF37187D for ; Thu, 2 Apr 2026 06:14:15 +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=1775110457; cv=none; b=fUm6qvlREsuYx71/9wX21KXx9LabLwtH11W2PupVMFY5mHUJENNuFl3i6ERwgUc892kJ8TEk/DHlBfQNUwlR4JSczJCgQbuHwHZrnfgt4ev+KhHkeCy/JhzaZvAC6CjiTrKJnEQMjUKdVTYXJ5S44OFYh4wVrropf1HZU1fUars= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775110457; c=relaxed/simple; bh=UqIywYlrrofZMIY2Uh/eKQJZ5gsUVWnpyaehp6XmD0Q=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ap6JEXnBqw/Exs2/6whEyBmaZnxJkxzPnM/AqzwLo6XHt1NrCjF8Av0Uapkfcv6T4uR+W5JAnLf/+qiYkz4qwyDl+usK0CH6GQ39J8a/X83+8d5ZRveZz9m2js0cBRRKr+SAg/3AZDx2wwQrWkSslWZngcvYauvZtPHdU3BUowI= 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=ZqjnZkwH; 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="ZqjnZkwH" Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-48558d6ef83so4085345e9.3 for ; Wed, 01 Apr 2026 23:14:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775110454; x=1775715254; 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=GVqIzm8m//ymXBpB0pyluskL8sS6UcY+x4y2VchiXAs=; b=ZqjnZkwHiB3h2ggBQn2aAa4k7WPHpwRmyfQeLRUS5t5M0kSN0v16Z2qFCgCIIDxvKn t7ZwToJhbtjA/DDWwTmVwDzn74aAraooqcqNdnsl3eghIXXX58pPmRiCpbBb+eOoYFHz KAGTQlcd95K8lIpmO4JgU+rBZwOJnXowkJCooeFv+11SCbehedPsj+lSXhuUqZs9hCDn H8ffecTah2YKkV0mhDLJCrSBf5jGZ3cS3RkPxKzOKezlTxx97fn6o+nQXP8Ht5/cX3if ABzD9ZkiGrmsc7NS1O4e8VL5NnRI1hOnUUsCKb2XPDNZUzM71VlA0TzPAvHuDvwq2XGH J37w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775110454; x=1775715254; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=GVqIzm8m//ymXBpB0pyluskL8sS6UcY+x4y2VchiXAs=; b=ruB1g+xNmDcCPn5qi+qJPYU5OzwJR37wtuKERYwzHBX8U34YWkk8uc/SBxraSBGqOg Z8gG+bNv6kLcmYTqfS+drwdeXyXHKB9SKnH8pU6zh22Xlxu3LllBOCbTNcRL0KZl3U5w cPuhql+Z9Gz3IAN9+3etRmZEQZdZlhA7WFLjepiYSLmvoJpGsZHL8J2buJubUQh9Ub1y X+sopzArp/TOcfxFuhBrrq/juoYu+VVorn6rU621vIGwezwghrsDACeMg/gFhleI59q1 81Sc14uYkOo4vt36YCx/e1SDnuKrVs+LIU0mVxFPuFhEg7YVNQzfbDrin+ovaVmkorwM hvhQ== X-Gm-Message-State: AOJu0YxoSYYQdHUdcISPTBLnWxtsi/fZ+0xoR5LxEXTh0xvoh7y4m3KL qmBCWgZI68nKJNkc2HzR68XexoeOmYonrT6n6vGsbPstABlLRt7Rg7Iu X-Gm-Gg: ATEYQzyJrfjOArvivA1tTBHDWgI85z/M7Jx0JUft782zmA3iaK9E7st+JqCoTVWK+WK sSTdCQ5ElYFbUNEPBDxtsFSEz2MMAXUOTJGBkX8LGm0ZVfZaDUa3lGMtk4V+92+7bkTa0NcfieW euthv3gYrisZdRcZakxlTLQlAPcxfK5v535ddkoXPI7IrEVyRvnsm4WmmTjPXS5WFCdJktbjCDn uignRO9EJgJC4ASrHfzBl88Mzgi7hUymta3gOwQ+JByQ9EsNbLwFg86RA7jGcK16LBlxnRja5ha 5LQ9Vo92lC3iorPhGGn5daFTPR2G+ZgzIBffwhsVA48PZklViPUV9sSW6xGR5eMbpo8nvFVtGfI +w/gFYgMM7k6eUD5LoYwkTHtXfhoSboqD8jCLHP3mQ9Xy3mo5AR8cZgacB4mx3LwiqIQUEQ+fH4 gjGeksleHhyeRpvTJwAAlNHT9eN10pEcfROqBMLCkLKwWm6qaL7u+wmG/KS8zsbplYwZSvq5HD0 n8qmmSnfFzR X-Received: by 2002:a05:600c:1f11:b0:485:39d1:b4dd with SMTP id 5b1f17b1804b1-48883575eb7mr100478095e9.10.1775110453857; Wed, 01 Apr 2026 23:14:13 -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-4887c8ee2d3sm61916095e9.32.2026.04.01.23.14.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Apr 2026 23:14:13 -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)" Subject: [PATCH v4 2/2] mm/page_io: rename swap_iocb->pages to swap_iocb->bvecs Date: Thu, 2 Apr 2026 07:14:08 +0100 Message-ID: <20260402061408.36119-2-devnexen@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260402061408.36119-1-devnexen@gmail.com> References: <20260402061408.36119-1-devnexen@gmail.com> 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 it to bvecs to accurately reflect its purpose. Suggested-by: Matthew Wilcox (Oracle) Signed-off-by: David Carlier --- mm/page_io.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/mm/page_io.c b/mm/page_io.c index 1389cd57ca88..e524cb821d04 100644 --- a/mm/page_io.c +++ b/mm/page_io.c @@ -327,7 +327,7 @@ 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; + int bvecs; int len; }; static mempool_t *sio_pool; @@ -362,14 +362,14 @@ 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++) { + for (p = 0; p < sio->bvecs; p++) { page = sio->bvec[p].bv_page; set_page_dirty(page); ClearPageReclaim(page); } } - for (p = 0; p < sio->pages; p++) + for (p = 0; p < sio->bvecs; p++) end_page_writeback(sio->bvec[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->bvecs = 0; sio->len = 0; } - bvec_set_folio(&sio->bvec[sio->pages], folio, folio_size(folio), 0); + bvec_set_folio(&sio->bvec[sio->bvecs], folio, folio_size(folio), 0); sio->len += folio_size(folio); - sio->pages += 1; - if (sio->pages == ARRAY_SIZE(sio->bvec) || !swap_plug) { + sio->bvecs += 1; + if (sio->bvecs == ARRAY_SIZE(sio->bvec) || !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->bvec, sio->bvecs, sio->len); ret = mapping->a_ops->swap_rw(&sio->iocb, &from); if (ret != -EIOCBQUEUED) sio_write_complete(&sio->iocb, ret); @@ -489,7 +489,7 @@ static void sio_read_complete(struct kiocb *iocb, long ret) int p; if (ret == sio->len) { - for (p = 0; p < sio->pages; p++) { + for (p = 0; p < sio->bvecs; p++) { struct folio *folio = page_folio(sio->bvec[p].bv_page); count_mthp_stat(folio_order(folio), MTHP_STAT_SWPIN); @@ -499,7 +499,7 @@ 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++) { + for (p = 0; p < sio->bvecs; p++) { struct folio *folio = page_folio(sio->bvec[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->bvecs = 0; sio->len = 0; } - bvec_set_folio(&sio->bvec[sio->pages], folio, folio_size(folio), 0); + bvec_set_folio(&sio->bvec[sio->bvecs], folio, folio_size(folio), 0); sio->len += folio_size(folio); - sio->pages += 1; - if (sio->pages == ARRAY_SIZE(sio->bvec) || !plug) { + sio->bvecs += 1; + if (sio->bvecs == ARRAY_SIZE(sio->bvec) || !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->bvec, sio->bvecs, sio->len); ret = mapping->a_ops->swap_rw(&sio->iocb, &from); if (ret != -EIOCBQUEUED) sio_read_complete(&sio->iocb, ret); -- 2.53.0