From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) (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 2C99430F81A for ; Thu, 28 Aug 2025 12:08:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.49 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756382906; cv=none; b=AcA4JpcKixSKrdOy5frYwamRmANYVo+V4BKEnKbR1gx/4YZETkOSDVbnmQnM5PuKjfnt0ERiDwh5C+SIxt9W9DexwIZ/SieR842HB0eyvgNUPhV9QZK6JqdgBwqBH35S2A0hHNlLpjQ1gsXNOWPxp34X60nlbjI2Bto8pnxf4BY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756382906; c=relaxed/simple; bh=dvFy0GvyED3/N0rdK6Pd8G6BU5DSoCUAM+z9gA8HfzM=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=BetijzIYRo7rrVorz1ZYsMvh6ZuRAejfI/E0oU/moBAmjHrl6hzyrYjJXdZXC7yWjOk+N/nIYF1DbE+4Vm/LSBR4/4QHzkdFFo+cGm7QBMaLISlnKtKdH+YYlVFCWECK0LeiabdqMORMdVuETmxKWhka/MCcB/Id+1qYClyx6Fw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=ionos.com; spf=pass smtp.mailfrom=ionos.com; dkim=pass (2048-bit key) header.d=ionos.com header.i=@ionos.com header.b=Gr8R7XHl; arc=none smtp.client-ip=209.85.128.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=ionos.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ionos.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ionos.com header.i=@ionos.com header.b="Gr8R7XHl" Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-45b65469a5bso8004635e9.0 for ; Thu, 28 Aug 2025 05:08:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ionos.com; s=google; t=1756382900; x=1756987700; 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=1KGYCo47M8HnSkDcYvSaLWw6pGEaggMof1VkMNBF1tM=; b=Gr8R7XHlAScTlK7jkBoRJGCb2ztYSNVONoneSBIMa9uc+oFMhLn/RwiMd99VPvK6Hs WaZta+CZbnWtArlHZuWZYYZU8sRejKHgNNFAIJ50O+3GGoH7J0xYq9zIma2MYSviq/GW 9M3UQbuyOQzMM3aXCStBcbwZAkxQg47VVJBk5OT8UWHV9SChWQH3BcqsDqzpx6WStIN3 0ornb2bOrgGk9NCAsf/2bxwo4gzOieMPvDe4+6Nb2+RrzG/M6QYQiGbE8LcLph3WFjrx 8TETr9Xb9iNQQzd6bf2nSDDJ+absI5Usw4J0xaFQKbSxskNgcp5/8dT+hs7OC8qzPBPD fz9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756382900; x=1756987700; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=1KGYCo47M8HnSkDcYvSaLWw6pGEaggMof1VkMNBF1tM=; b=IZc04Kt1gABPkBnZxaUAGmxdf6fvfuYYhFIv2r4+b3vkJ0C4g7PZxD5U4MlOD1oukT 0PQUr/8afeEe7owuSyLujlHb51tYpfoDzMWPynL05MKxxd2fZ+ljNPAqcRR5cPmi6R+E LHHVt2M56A3BEx5dL4KoHPcWj4nhBVd6G0JPfeqXMPUuyI7Hw6r967ogWSbSIo/J8JxI iIi2MGMLgQK5niGMUTqZCeK1KZH9tLwjOwN5xdtVDrbcA/9s+aYEfC0Sn4A/nsF/1kVa SZQzi57HCsrHvJj7/uzYNy9oAjMDJuzpBt0SRjjUT6o4fVvKTFwra9UX0gkymckK3CnQ GgLQ== X-Forwarded-Encrypted: i=1; AJvYcCWQTb7HgMwdW5NFojKroz47KW4K5/aAMAsm3b793waQkutl0KkJUNyzt3YdCxBce+b4NFfoKnBM1neQEO0=@vger.kernel.org X-Gm-Message-State: AOJu0YxJVMxW39CS+JxEnWFyuo1W5GBCUGkjgW8t7tQs12rKqK/ZFVZ/ STkNYL/D7aDW0I4gSd9sFzhj6NOhI5ri+rgHc/4uU7bbzHMhIPcnegBXDMTMPi96Jp4= X-Gm-Gg: ASbGncvfmlav3q6af0pWYaYdUYnB+IxiugXmWPtn8OnXXtSAWQHLy/S8vuMzQYTIvvt R9wFC3oMJtvhiHDl5ROUmzDE+Aee3opLsreAwY9Ar8VcX0Y1vBl35xjrmGneFYE/dj/jZYba/aq qvfYlaHD9qZDGsoQElorMKVzIoRqReYYEXFzjUZY2Bp7O9CABUsqXodAxFmiZBKsYNPUOweMONt rQMcxFMmlE6y1rOeXTmFK6drOgJflMugStHE8e8DiAyBgW3iBD+TrJ/bQaCuiu1MycYx4KQk7P1 f/8ItdGwii16uCpxye3VG0KzyiV2hzCrRDiFTncsj1fNFI0E6DaLoW++mXzWGHIIj7Ec5hc5kHy BkhwhI6FaSpna1RxulSAMfeYwaAzxCoYEWUSIN2zhZqNjwTDjb6O1mLWgoMEfaTiM544N+WYozs ztx7tO4dq5F3n40V9UZRCW2w== X-Google-Smtp-Source: AGHT+IECbDtWH0zZDMSKQZOU5aAbQreBTJQRG/QRaYxDFV+HkzE+dMQ4ECYxCUIikuFUOY4MkAjhIA== X-Received: by 2002:a05:600c:1d10:b0:458:b01c:8f with SMTP id 5b1f17b1804b1-45b51798f30mr224386925e9.8.1756382898974; Thu, 28 Aug 2025 05:08:18 -0700 (PDT) Received: from raven.intern.cm-ag (p200300dc6f1d0f00023064fffe740809.dip0.t-ipconnect.de. [2003:dc:6f1d:f00:230:64ff:fe74:809]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-45b797e5cd5sm30382385e9.22.2025.08.28.05.08.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Aug 2025 05:08:18 -0700 (PDT) From: Max Kellermann To: Slava.Dubeyko@ibm.com, xiubli@redhat.com, idryomov@gmail.com, amarkuze@redhat.com, ceph-devel@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Max Kellermann Subject: [PATCH v2] fs/ceph/addr: convert `op_idx`, `data_pages` back to a local variables Date: Thu, 28 Aug 2025 14:08:16 +0200 Message-ID: <20250828120816.752278-1-max.kellermann@ionos.com> X-Mailer: git-send-email 2.47.2 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit These were local variables until commit f08068df4aa4 ("ceph: extend ceph_writeback_ctl for ceph_writepages_start() refactoring"), but were moved to the struct ceph_writeback_ctl for no obvious reason. Having these in a struct means overhead, so let's move them back. For the "allocate new pages array for next request" code block, however I decided to introduce a new local variable `old_pages` instead, because reusing `data_pages` for reallocation seemed confusing to me. Signed-off-by: Max Kellermann --- v1 -> v2: now really removed "op_idx" from the struct (d'oh) --- fs/ceph/addr.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/fs/ceph/addr.c b/fs/ceph/addr.c index 8b202d789e93..88dea8887ef7 100644 --- a/fs/ceph/addr.c +++ b/fs/ceph/addr.c @@ -601,7 +601,6 @@ struct ceph_writeback_ctl unsigned int max_pages; unsigned int locked_pages; - int op_idx; int num_ops; u64 offset; u64 len; @@ -611,7 +610,6 @@ struct ceph_writeback_ctl bool from_pool; struct page **pages; - struct page **data_pages; }; /* @@ -1051,7 +1049,6 @@ void ceph_init_writeback_ctl(struct address_space *mapping, ceph_wbc->tag = PAGECACHE_TAG_DIRTY; } - ceph_wbc->op_idx = -1; ceph_wbc->num_ops = 0; ceph_wbc->offset = 0; ceph_wbc->len = 0; @@ -1060,7 +1057,6 @@ void ceph_init_writeback_ctl(struct address_space *mapping, ceph_folio_batch_init(ceph_wbc); ceph_wbc->pages = NULL; - ceph_wbc->data_pages = NULL; } static inline @@ -1417,10 +1413,12 @@ int ceph_submit_write(struct address_space *mapping, struct ceph_vino vino = ceph_vino(inode); struct ceph_osd_request *req = NULL; struct page *page = NULL; + struct page **data_pages; bool caching = ceph_is_cache_enabled(inode); u64 offset; u64 len; unsigned i; + int op_idx; new_request: offset = ceph_fscrypt_page_offset(ceph_wbc->pages[0]); @@ -1481,8 +1479,8 @@ int ceph_submit_write(struct address_space *mapping, /* Format the osd request message and submit the write */ len = 0; - ceph_wbc->data_pages = ceph_wbc->pages; - ceph_wbc->op_idx = 0; + data_pages = ceph_wbc->pages; + op_idx = 0; for (i = 0; i < ceph_wbc->locked_pages; i++) { u64 cur_offset; @@ -1495,29 +1493,29 @@ int ceph_submit_write(struct address_space *mapping, */ if (offset + len != cur_offset) { /* If it's full, stop here */ - if (ceph_wbc->op_idx + 1 == req->r_num_ops) + if (op_idx + 1 == req->r_num_ops) break; /* Kick off an fscache write with what we have so far. */ ceph_fscache_write_to_cache(inode, offset, len, caching); /* Start a new extent */ - osd_req_op_extent_dup_last(req, ceph_wbc->op_idx, + osd_req_op_extent_dup_last(req, op_idx, cur_offset - offset); doutc(cl, "got pages at %llu~%llu\n", offset, len); - osd_req_op_extent_osd_data_pages(req, ceph_wbc->op_idx, - ceph_wbc->data_pages, + osd_req_op_extent_osd_data_pages(req, op_idx, + data_pages, len, 0, ceph_wbc->from_pool, false); - osd_req_op_extent_update(req, ceph_wbc->op_idx, len); + osd_req_op_extent_update(req, op_idx, len); len = 0; offset = cur_offset; - ceph_wbc->data_pages = ceph_wbc->pages + i; - ceph_wbc->op_idx++; + data_pages = ceph_wbc->pages + i; + op_idx++; } set_page_writeback(page); @@ -1555,25 +1553,27 @@ int ceph_submit_write(struct address_space *mapping, offset, len); } - osd_req_op_extent_osd_data_pages(req, ceph_wbc->op_idx, - ceph_wbc->data_pages, len, + osd_req_op_extent_osd_data_pages(req, op_idx, + data_pages, len, 0, ceph_wbc->from_pool, false); - osd_req_op_extent_update(req, ceph_wbc->op_idx, len); + osd_req_op_extent_update(req, op_idx, len); - BUG_ON(ceph_wbc->op_idx + 1 != req->r_num_ops); + BUG_ON(op_idx + 1 != req->r_num_ops); ceph_wbc->from_pool = false; if (i < ceph_wbc->locked_pages) { + struct page **old_pages; + BUG_ON(ceph_wbc->num_ops <= req->r_num_ops); ceph_wbc->num_ops -= req->r_num_ops; ceph_wbc->locked_pages -= i; /* allocate new pages array for next request */ - ceph_wbc->data_pages = ceph_wbc->pages; + old_pages = ceph_wbc->pages; __ceph_allocate_page_array(ceph_wbc, ceph_wbc->locked_pages); - memcpy(ceph_wbc->pages, ceph_wbc->data_pages + i, + memcpy(ceph_wbc->pages, old_pages + i, ceph_wbc->locked_pages * sizeof(*ceph_wbc->pages)); - memset(ceph_wbc->data_pages + i, 0, + memset(old_pages + i, 0, ceph_wbc->locked_pages * sizeof(*ceph_wbc->pages)); } else { BUG_ON(ceph_wbc->num_ops != req->r_num_ops); -- 2.47.2