From patchwork Fri Apr 2 16:02:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akihiko Odaki X-Patchwork-Id: 12181289 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=-13.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,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 59CBAC433ED for ; Fri, 2 Apr 2021 16:10:02 +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 E0D0F610D1 for ; Fri, 2 Apr 2021 16:10:01 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E0D0F610D1 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]:36908 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lSMMy-0005WA-Vk for qemu-devel@archiver.kernel.org; Fri, 02 Apr 2021 12:10:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43256) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lSMGQ-0000Dt-Uz; Fri, 02 Apr 2021 12:03:14 -0400 Received: from mail-pj1-x102d.google.com ([2607:f8b0:4864:20::102d]:53996) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lSMGP-0002Bz-9x; Fri, 02 Apr 2021 12:03:14 -0400 Received: by mail-pj1-x102d.google.com with SMTP id t18so2887076pjs.3; Fri, 02 Apr 2021 09:03:12 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=0dthNCxoWM5R/u/5zvjAtyDLPaOOu/14OIq3l3c/fOY=; b=ECFJuon9tNBZQgpjYQZsYJ5H4sxOdRozCEZlcFx+bac/Ctp32cExrZzbdLd2lR7dUu QqFA28flW+hYIIAAlYj82BMfJihpO/TgBp1zp3vM9GWndRIr2FuRiHtc1Vi+1Xty9hlE u4f78YknV3cr0aGEQA06rAekZlLPe5TEgIs5tZhzjjMZffSkM2xhnAeI6O9QYuciXR41 jben+ZjnV/hYthFTkaDgxwrGJlEvCpAtR1BBlwmMpEIgbTfSlejPtv9dCX8wxuPt+yav +QOnVP+8N8BYcEsLWC/tVqhTY3E237H29CL6R8spk5MlC+R1JakdASZhLSqwBRS8zBPk pOYQ== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=0dthNCxoWM5R/u/5zvjAtyDLPaOOu/14OIq3l3c/fOY=; b=LPcsytSZrP+/QtarqxURXb7fi6CNYbEQzifor6RqbG5hqP468GMTrunn1Or+cyoxi4 ruHwOBRcYQ2ukCg5ADYYwTjFejqzmZWdg80c0vFYeMye74HJQqbxOaa5KD6afrMyJ2jQ /i5KfqvOY2CPxTk0Ej5UAbJKoYtcGCrYih+U3q9c/exCWR3u1qctcAP1eQsm8+w8r4MJ vBPv60bbx6pacOWAcUlP6It6DAdMX3s/ghCdMuG36EBrC71wI4+9X7UxCzGJ0EyewmIh wS7zZIlx6RKh+wRZ9ExR2Vd4KkTweUJuy6NPy+NVQQ/MvySSW/IndIsZdltWnDdf6QYm QjEg== X-Gm-Message-State: AOAM530KVRcuAXDGokF01soM8EF4SVbXionEmJ88+Lxiy6OuS8aiIN/J /ZYoCyxama8a8iz3vMthnIBDLtMEkb9gaw== X-Google-Smtp-Source: ABdhPJw32kOP7Lnop4UannvunOv6L+cYzYlkRnU5cI1vGKsyGSAmqc4eEDWUXCBvg84bL72L87fwRA== X-Received: by 2002:a17:90a:c20a:: with SMTP id e10mr13945685pjt.221.1617379391529; Fri, 02 Apr 2021 09:03:11 -0700 (PDT) Received: from localhost.localdomain ([2400:4050:c360:8200:3c79:94d8:55ff:9601]) by smtp.gmail.com with ESMTPSA id w84sm8708723pfc.142.2021.04.02.09.03.08 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 02 Apr 2021 09:03:11 -0700 (PDT) From: Akihiko Odaki To: Subject: [v5 3/3] block/io: Merge discard request alignments Date: Sat, 3 Apr 2021 01:02:56 +0900 Message-Id: <20210402160256.39647-3-akihiko.odaki@gmail.com> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: <20210402160256.39647-1-akihiko.odaki@gmail.com> References: <20210402160256.39647-1-akihiko.odaki@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::102d; envelope-from=akihiko.odaki@gmail.com; helo=mail-pj1-x102d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: Kevin Wolf , Fam Zheng , pkrempa@redhat.com, Akihiko Odaki , qemu-block@nongnu.org, Markus Armbruster , qemu-devel@nongnu.org, Max Reitz , Konstantin Nazarov , Stefan Hajnoczi , John Snow , dgilbert@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Akihiko Odaki --- block/io.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/block/io.c b/block/io.c index ca2dca30070..aad74bd6714 100644 --- a/block/io.c +++ b/block/io.c @@ -124,6 +124,8 @@ void bdrv_parent_drained_begin_single(BdrvChild *c, bool poll) static void bdrv_merge_limits(BlockLimits *dst, const BlockLimits *src) { + dst->pdiscard_alignment = MAX(dst->pdiscard_alignment, + src->pdiscard_alignment); dst->opt_transfer = MAX(dst->opt_transfer, src->opt_transfer); dst->max_transfer = MIN_NON_ZERO(dst->max_transfer, src->max_transfer); dst->opt_mem_alignment = MAX(dst->opt_mem_alignment,