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 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 108D0C433EF for ; Sun, 3 Oct 2021 08:07:46 +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 ABB9461A78 for ; Sun, 3 Oct 2021 08:07:45 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org ABB9461A78 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:52308 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mWwXA-0000uE-T1 for qemu-devel@archiver.kernel.org; Sun, 03 Oct 2021 04:07:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36974) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mWw9T-0004Ap-BV for qemu-devel@nongnu.org; Sun, 03 Oct 2021 03:43:15 -0400 Received: from mail-ed1-x535.google.com ([2a00:1450:4864:20::535]:33747) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mWw9R-00011C-NX for qemu-devel@nongnu.org; Sun, 03 Oct 2021 03:43:15 -0400 Received: by mail-ed1-x535.google.com with SMTP id p13so23617987edw.0 for ; Sun, 03 Oct 2021 00:43:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=QwdzjPR8WZDeMpfLkQQqWDyohKpDUiK9I55YvVVcH58=; b=PG3PcsJIpAQzSYqyIQWOkkS9TZTeeWdWexrR19gky2VaGekQMzGJzYakgGiUoio15q dhtsa7gTDOVWbsI0veNGr5/etfzJh2xm4uCrx8QkCc8kcr6kHurUFtHLW5QmDgC29+a8 jvATa6kZrK3cArU6IGf/z5JDElC93tT0G7ur5JwGR32iW6cCq6l26Uhp01VxJpZgPVBZ 2qFzunYdNU+P4w+4wjgjNmcJI4C8eCcz5WIrwTH6ehB19zyX5nYl3b0X69Dk+9AJdyn2 /TXhLYSiANYwb28wXzcWSGwDq3M0ULlHjio0WSHXLFP+jryKzbTHpJ43VAswNRFEkxZa cFZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=QwdzjPR8WZDeMpfLkQQqWDyohKpDUiK9I55YvVVcH58=; b=FfEcsbPRSkwY5RtoHMWxvRG8ZheBhWhMqWgdfZzpx2rzwJcLU//EhHYAm7PDwccslo yxJWwhUghoaoubAJ2g65+St7pdXLD6yq3SAckWgTXVZjsDrnqYX52L9GiXTgtrKp8GZc 7RNw2SCVbTvDkJ0M1W2TnOlsJcQJUJFAsmzAUsEjCPiDnkc/9ab9Dp2Axi+p3oXMKbAP RLgYooow+GgbIFFRz8h4FS9EVc/E++INDqohhOhNR8WIBMAktPs/cN+GsLG65N8TxfXR 4/uuOLbYjYeRtnPPKPIm5VUaEZMesNDqKRhmNSe53j81o8PS0Y7t1+1bkDeU96snhQ7f Opqg== X-Gm-Message-State: AOAM532d3O3mz3FTWx/raaePWNNHrBfaHLbTHdYFmUPQWk9DyWjOLYox IrZcAFn1E666ETOGH6tifw+EbHbiFLs= X-Google-Smtp-Source: ABdhPJz4s09VyCQELcMS4avZIhnsx8yjTPr/XpZ5oFO0QUg0zXo4zMelvoO2C1nu2POxFEPKxIlTKw== X-Received: by 2002:a17:906:29d0:: with SMTP id y16mr9585658eje.477.1633246992426; Sun, 03 Oct 2021 00:43:12 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id n6sm5560856eds.10.2021.10.03.00.43.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Oct 2021 00:43:12 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 27/30] tpm: mark correct memory region range dirty when clearing RAM Date: Sun, 3 Oct 2021 09:42:47 +0200 Message-Id: <20211003074250.60869-28-pbonzini@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211003074250.60869-1-pbonzini@redhat.com> References: <20211003074250.60869-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::535; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x535.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: Laurent Vivier , Thomas Huth , Stefan Berger , Eduardo Habkost , "Michael S. Tsirkin" , David Hildenbrand , "Dr . David Alan Gilbert" , Peter Xu , Alex Williamson , Claudio Fontana , Igor Mammedov , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Stefan Berger Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: David Hildenbrand We might not start at the beginning of the memory region. Let's calculate the offset into the memory region via the difference in the host addresses. Acked-by: Stefan Berger Fixes: ffab1be70692 ("tpm: clear RAM when "memory overwrite" requested") Cc: Marc-André Lureau Cc: Paolo Bonzini Cc: "Michael S. Tsirkin" Cc: Eduardo Habkost Cc: Alex Williamson Cc: Dr. David Alan Gilbert Cc: Igor Mammedov Cc: Claudio Fontana Cc: Thomas Huth Cc: "Alex Bennée" Cc: Peter Xu Cc: Laurent Vivier Cc: Stefan Berger Signed-off-by: David Hildenbrand Reviewed-by: Peter Xu Message-Id: <20210727082545.17934-2-david@redhat.com> Signed-off-by: Paolo Bonzini --- hw/tpm/tpm_ppi.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hw/tpm/tpm_ppi.c b/hw/tpm/tpm_ppi.c index 362edcc5c9..274e9aa4b0 100644 --- a/hw/tpm/tpm_ppi.c +++ b/hw/tpm/tpm_ppi.c @@ -30,11 +30,14 @@ void tpm_ppi_reset(TPMPPI *tpmppi) guest_phys_blocks_init(&guest_phys_blocks); guest_phys_blocks_append(&guest_phys_blocks); QTAILQ_FOREACH(block, &guest_phys_blocks.head, next) { + hwaddr mr_offs = block->host_addr - + (uint8_t *)memory_region_get_ram_ptr(block->mr); + trace_tpm_ppi_memset(block->host_addr, block->target_end - block->target_start); memset(block->host_addr, 0, block->target_end - block->target_start); - memory_region_set_dirty(block->mr, 0, + memory_region_set_dirty(block->mr, mr_offs, block->target_end - block->target_start); } guest_phys_blocks_free(&guest_phys_blocks); -- 2.31.1