From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 15335C2BA2B for ; Sat, 11 Apr 2020 06:26:06 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D2B0820757 for ; Sat, 11 Apr 2020 06:26:05 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ejgvmyD1" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D2B0820757 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:49234 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jN9af-0000ge-0E for qemu-devel@archiver.kernel.org; Sat, 11 Apr 2020 02:26:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56391) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jN9Zt-00008W-Jv for qemu-devel@nongnu.org; Sat, 11 Apr 2020 02:25:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jN9Zs-0000G5-Jw for qemu-devel@nongnu.org; Sat, 11 Apr 2020 02:25:17 -0400 Received: from mail-qk1-x743.google.com ([2607:f8b0:4864:20::743]:46361) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jN9Zs-0000Fa-AQ for qemu-devel@nongnu.org; Sat, 11 Apr 2020 02:25:16 -0400 Received: by mail-qk1-x743.google.com with SMTP id g74so4253415qke.13 for ; Fri, 10 Apr 2020 23:25:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=GzzuzoJO5dzeQyXnKq8icvH6vIhlp30+SlHLfpaP/gY=; b=ejgvmyD1JskgBcdZLwwxIqtwFHZ7rC+vPsOEso4o8uMEiATvBZCRcZqOMZTi4EqMjh 9L9Aq4efvBJvxW3TEXrXbew+kQ3TAeTkJIKZtaDuRFisdI9UrR1G3smNIfR7RRP5s0n6 UlFdPinTpt5mvUZG15qm6jz1CCpGARjWgiKU+RDU+qSmcOUZC1RJjPBVBEfL3dk0/s7Z PgYhp7Hp8pHTsVr9feK7giK4JXGCbqBZB9psCXXkCkgZbc9YkQP2Ebmt9VxuXYo5iMY2 NttClR1uptGwOywEc1IaAdP4AfVZBj1IPcI5r5ilHvwCbQt5AyB6xO6+BDmbFEJ6rTaE RZeg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=GzzuzoJO5dzeQyXnKq8icvH6vIhlp30+SlHLfpaP/gY=; b=jVVn7nz1kIiTGNxMTnlrnahL1aULTDP+Hgi40+6GaxijQKgrL0a2NP2cEfsdNC9Fq7 F74XApy5rDP284C61uWZK/Fbw0lgmBEfeEf98LKip+3+hPjqrXubjcyskCgKTV5uPdZu wZ4sxjRA0/uKwvy4p9xbB3yKTSin96WG8D4Elg3NByLLFH0fU2aCPTV5yMC/bxOLLr/A y5ZhdRb8QIsPv1wR1+ZwVAgifmyCe6dfnxk+CUhWT2HnAxaPNQgaObD5c/59B3NWc7qr WxiyVxkIpYi+2vnlGKPTRAKxLvX+wGPQ05So3If6Ll3rwoF0rmulSKlMWmFozZxpocds NgJQ== X-Gm-Message-State: AGi0PuaPsKFGH7gJUOpmI6CuIMhaA52dTQVOgJtUghmc69diPdLW3I1q 25YHk584aKdJMlUykrB/W5g= X-Google-Smtp-Source: APiQypKZCEhKj1pPo6WtNY5eaf61hSrM/8cGaXWWAEXHqsYUv7sqoKKdPcDRYXmsA8ufAxi29CIFNQ== X-Received: by 2002:a05:620a:15f4:: with SMTP id p20mr7058116qkm.496.1586586315225; Fri, 10 Apr 2020 23:25:15 -0700 (PDT) Received: from host.localdomain ([104.129.187.94]) by smtp.gmail.com with ESMTPSA id z18sm3432044qtz.77.2020.04.10.23.25.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 10 Apr 2020 23:25:14 -0700 (PDT) From: Catherine Ho To: "Dr. David Alan Gilbert" , Stefan Hajnoczi , qemu-devel@nongnu.org Subject: [PATCH] virtiofsd/passthrough_ll: don't remove O_DIRECT when cache=none Date: Sat, 11 Apr 2020 02:19:57 -0400 Message-Id: <1586585997-24446-1-git-send-email-catherine.hecx@gmail.com> X-Mailer: git-send-email 1.7.1 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::743 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Catherine Ho Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" cache=none means to bypass host cache. So we can't remove O_DIRECT flag in unconditionally in update_open_flags(); Signed-off-by: Catherine Ho --- tools/virtiofsd/passthrough_ll.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough_ll.c index 4c35c95..889e144 100644 --- a/tools/virtiofsd/passthrough_ll.c +++ b/tools/virtiofsd/passthrough_ll.c @@ -1677,7 +1677,8 @@ static void lo_releasedir(fuse_req_t req, fuse_ino_t ino, fuse_reply_err(req, 0); } -static void update_open_flags(int writeback, struct fuse_file_info *fi) +static void update_open_flags(int writeback, int cache_mode, + struct fuse_file_info *fi) { /* * With writeback cache, kernel may send read requests even @@ -1702,10 +1703,13 @@ static void update_open_flags(int writeback, struct fuse_file_info *fi) /* * O_DIRECT in guest should not necessarily mean bypassing page - * cache on host as well. If somebody needs that behavior, it - * probably should be a configuration knob in daemon. + * cache on host as well. If cache=none, set the flag to O_DIRECT */ - fi->flags &= ~O_DIRECT; + if (cache_mode == CACHE_NONE) { + fi->flags |= O_DIRECT; + } else { + fi->flags &= ~O_DIRECT; + } } static void lo_create(fuse_req_t req, fuse_ino_t parent, const char *name, @@ -1737,7 +1741,7 @@ static void lo_create(fuse_req_t req, fuse_ino_t parent, const char *name, goto out; } - update_open_flags(lo->writeback, fi); + update_open_flags(lo->writeback, lo->cache, fi); fd = openat(parent_inode->fd, name, (fi->flags | O_CREAT) & ~O_NOFOLLOW, mode); @@ -1947,7 +1951,7 @@ static void lo_open(fuse_req_t req, fuse_ino_t ino, struct fuse_file_info *fi) fuse_log(FUSE_LOG_DEBUG, "lo_open(ino=%" PRIu64 ", flags=%d)\n", ino, fi->flags); - update_open_flags(lo->writeback, fi); + update_open_flags(lo->writeback, lo->cache, fi); sprintf(buf, "%i", lo_fd(req, ino)); fd = openat(lo->proc_self_fd, buf, fi->flags & ~O_NOFOLLOW); -- 1.7.1