Received: by 2002:a05:6a10:2726:0:0:0:0 with SMTP id ib38csp1858400pxb; Sat, 2 Apr 2022 06:11:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx1RmCsSyoGdy30Ht1929z0R1VrY6NaguuugYT6NOLOwTflS5EBQnZZ936WJhRPEMduZh62 X-Received: by 2002:a63:2f03:0:b0:398:b2fc:250c with SMTP id v3-20020a632f03000000b00398b2fc250cmr13829227pgv.75.1648905104661; Sat, 02 Apr 2022 06:11:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648905104; cv=none; d=google.com; s=arc-20160816; b=hCH/WH+cdaiEPBUDAbv4dt7NryI/X9wgL6TMtAG6eQrqa0S5ovqpdbTltcAAqCO0yY P4B30eyfnjJatMbRomHgM3i5ACW9yrIRRRLY2PEbl+sDsUdxKNKra2veMiRe8Rns2KDF ICDkuafVYJwDs21phahvvtl51kTnMB8KX2LO7XzNBZm6w7HpUX5/SFLtvwixY2iYvU67 UIdFv251rj3qIgqLey/ax8an/av2m43YpE+hdU2Riq9lwj/duSafxkjAv2DFCU1u4UAZ j7oMilng2XWC5ymrIAoiwkW461X19IltmUyhr2Fp/yJKnnaTi87DtO23OxtQkdY48ntj aLKQ== 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 :message-id:date:subject:cc:to:from:dkim-signature:dkim-signature; bh=LAYvz0hJSPWBWZb7wY9ZS6Pxs0R0ipWo+Er9FVtXgGs=; b=EuiXs14DUB0IdzxjZF9BIGafE3k8NWHei+NLR1lGYf54alilHeVbXngSc9MYolewN1 tb25/vDFzG3ElS73HmNXGSX/FmMl89ROUh2EcECEMNGjkDJVpkk+HoSqdN2Q38XKBeQv xxsqIUihvtY5aud8fmeqz8jOEZBJt26CHvZ2TctOJA5sbJE374mg50sOiui4ubDd8oEu zz6HqcvJaADidWPZjBJlPVp4eeQ4gbI+koTEyDfbRkv4o2mCWNmOFynro92sLdqZoAHp Lq+KsLJ2OrXT9y+ZyrNjZRu1274Gm8fqaSL+jwV9qjwR3T+G2kvr/rp47P+BoXk+Nipj USyw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=T7PCMC5I; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519; 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=suse.de Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id m9-20020a655649000000b00398580e51c9si5034122pgs.76.2022.04.02.06.11.30; Sat, 02 Apr 2022 06:11:44 -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=@suse.de header.s=susede2_rsa header.b=T7PCMC5I; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519; 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=suse.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345557AbiDALjw (ORCPT + 99 others); Fri, 1 Apr 2022 07:39:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47756 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236414AbiDALjv (ORCPT ); Fri, 1 Apr 2022 07:39:51 -0400 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2FDA21D7DB1; Fri, 1 Apr 2022 04:38:02 -0700 (PDT) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id E235521A91; Fri, 1 Apr 2022 11:38:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1648813080; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LAYvz0hJSPWBWZb7wY9ZS6Pxs0R0ipWo+Er9FVtXgGs=; b=T7PCMC5IwEpXOrp3gNwYDyC2GaJwgBQTaLvY+QPCpmAjzg4P78kD8ngCrlqpzDoMqu1D6n vxAL0XtXAi/oDEPr8sn7oY4Lgk5tlbpcKDHFpHLNMuMW26xMXC2Wpfet4pZdtoYDzI/kLh VFAlGG6+8bVKOeUCTsrYxN2DZs0h4Lk= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1648813080; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LAYvz0hJSPWBWZb7wY9ZS6Pxs0R0ipWo+Er9FVtXgGs=; b=L+phv4ITqea8XFzQrAHlKewz37vEdvAUQ5yB+MwLpk4TyusSHcEbhyaw9gw9CrhGrJjry4 /4gyP1vUlkcZTPCA== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 787F81331E; Fri, 1 Apr 2022 11:38:00 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id QYZYGhjkRmL4HgAAMHmgww (envelope-from ); Fri, 01 Apr 2022 11:38:00 +0000 Received: from localhost (brahms.olymp [local]) by brahms.olymp (OpenSMTPD) with ESMTPA id 41960ec0; Fri, 1 Apr 2022 11:38:22 +0000 (UTC) From: =?UTF-8?q?Lu=C3=ADs=20Henriques?= To: Jeff Layton , Xiubo Li , Ilya Dryomov Cc: ceph-devel@vger.kernel.org, linux-kernel@vger.kernel.org, =?UTF-8?q?Lu=C3=ADs=20Henriques?= Subject: [PATCH] ceph: truncate page cache when doing DIO in encrypted inodes Date: Fri, 1 Apr 2022 12:38:22 +0100 Message-Id: <20220401113822.32545-1-lhenriques@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham 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 When doing DIO on an encrypted node, we need to truncate the page cache in the range being written to, otherwise the cache will include invalid data. Signed-off-by: Luís Henriques --- fs/ceph/file.c | 5 +++++ 1 file changed, 5 insertions(+) This patch should fix generic/647 fstest when run with test_dummy_encryption. diff --git a/fs/ceph/file.c b/fs/ceph/file.c index 5072570c2203..0f31c4d352a4 100644 --- a/fs/ceph/file.c +++ b/fs/ceph/file.c @@ -1895,6 +1895,11 @@ ceph_sync_write(struct kiocb *iocb, struct iov_iter *from, loff_t pos, req->r_inode = inode; req->r_mtime = mtime; + if (IS_ENCRYPTED(inode) && (iocb->ki_flags & IOCB_DIRECT)) + truncate_inode_pages_range( + inode->i_mapping, write_pos, + PAGE_ALIGN(write_pos + write_len) - 1); + /* Set up the assertion */ if (rmw) { /*