From patchwork Tue Feb 11 12:04:32 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juergen Gross X-Patchwork-Id: 13969587 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 lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id ED052C0219B for ; Tue, 11 Feb 2025 14:48:35 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.885635.1295442 (Exim 4.92) (envelope-from ) id 1thrYj-0001eL-AJ; Tue, 11 Feb 2025 14:48:21 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 885635.1295442; Tue, 11 Feb 2025 14:48:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1thrYj-0001eE-7U; Tue, 11 Feb 2025 14:48:21 +0000 Received: by outflank-mailman (input) for mailman id 885635; Tue, 11 Feb 2025 14:48:20 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1thrYi-0001e8-2U for xen-devel@lists.xenproject.org; Tue, 11 Feb 2025 14:48:20 +0000 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 38f80ff2-e887-11ef-b3ef-695165c68f79; Tue, 11 Feb 2025 15:48:14 +0100 (CET) Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 5B9D93E9A0; Tue, 11 Feb 2025 12:04:47 +0000 (UTC) Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id F29BD13AA6; Tue, 11 Feb 2025 12:04:46 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id TPfMOd48q2e+GgAAD6G6ig (envelope-from ); Tue, 11 Feb 2025 12:04:46 +0000 X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 38f80ff2-e887-11ef-b3ef-695165c68f79 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1739275487; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=dd93zxOHd1VhtU6mAQSadywTP6rstYV/DWhGEd1EtSQ=; b=QWakJvfkC5i24MEMDLBVgyRlvu7G2gCf2hX7ThuqrvKd9Nu5oTpNA+H8WHPqrIpHmOX9Vd nQ5LmKooy+yXN7ajnbq7w43O3KiaP9VkD5bVcQg5u1okl6Ug5HCtJ2ZB3IjL+5PSuHf5A3 qI0HzkA5q247LxPRLfjX/7iyTSkB5Ik= Authentication-Results: smtp-out1.suse.de; dkim=pass header.d=suse.com header.s=susede1 header.b=QWakJvfk DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1739275487; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=dd93zxOHd1VhtU6mAQSadywTP6rstYV/DWhGEd1EtSQ=; b=QWakJvfkC5i24MEMDLBVgyRlvu7G2gCf2hX7ThuqrvKd9Nu5oTpNA+H8WHPqrIpHmOX9Vd nQ5LmKooy+yXN7ajnbq7w43O3KiaP9VkD5bVcQg5u1okl6Ug5HCtJ2ZB3IjL+5PSuHf5A3 qI0HzkA5q247LxPRLfjX/7iyTSkB5Ik= From: Juergen Gross To: linux-kernel@vger.kernel.org, x86@kernel.org, iommu@lists.linux.dev Cc: Juergen Gross , Stefano Stabellini , Boris Ostrovsky , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "H. Peter Anvin" , Oleksandr Tyshchenko , xen-devel@lists.xenproject.org Subject: [PATCH 2/2] xen/swiotlb: don't destroy contiguous region in all cases Date: Tue, 11 Feb 2025 13:04:32 +0100 Message-ID: <20250211120432.29493-3-jgross@suse.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250211120432.29493-1-jgross@suse.com> References: <20250211120432.29493-1-jgross@suse.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 5B9D93E9A0 X-Rspamd-Action: no action X-Spamd-Result: default: False [-3.01 / 50.00]; BAYES_HAM(-3.00)[100.00%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; R_DKIM_ALLOW(-0.20)[suse.com:s=susede1]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; FUZZY_BLOCKED(0.00)[rspamd.com]; DKIM_SIGNED(0.00)[suse.com:s=susede1]; MIME_TRACE(0.00)[0:+]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:104:10:150:64:97:from]; RCPT_COUNT_TWELVE(0.00)[13]; ARC_NA(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RECEIVED_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:106:10:150:64:167:received]; FROM_EQ_ENVFROM(0.00)[]; ASN(0.00)[asn:25478, ipnet:::/0, country:RU]; RCVD_TLS_ALL(0.00)[]; DKIM_TRACE(0.00)[suse.com:+]; TO_DN_SOME(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:rdns,imap1.dmz-prg2.suse.org:helo,suse.com:dkim,suse.com:mid,suse.com:email] X-Rspamd-Server: rspamd1.dmz-prg2.suse.org In case xen_swiotlb_alloc_coherent() needed to create a contiguous region only for other reason than the memory not being compliant with the device's DMA mask, there is no reason why this contiguous region should be destroyed by xen_swiotlb_free_coherent() later. Destroying this region should be done only, if the memory of the region was allocated with more stringent placement requirements than the memory it did replace. Signed-off-by: Juergen Gross --- arch/x86/include/asm/xen/swiotlb-xen.h | 5 +++-- arch/x86/xen/mmu_pv.c | 18 ++++++++++++------ drivers/xen/swiotlb-xen.c | 11 +++++++---- 3 files changed, 22 insertions(+), 12 deletions(-) diff --git a/arch/x86/include/asm/xen/swiotlb-xen.h b/arch/x86/include/asm/xen/swiotlb-xen.h index abde0f44df57..a353f20c7e79 100644 --- a/arch/x86/include/asm/xen/swiotlb-xen.h +++ b/arch/x86/include/asm/xen/swiotlb-xen.h @@ -4,8 +4,9 @@ int xen_swiotlb_fixup(void *buf, unsigned long nslabs); int xen_create_contiguous_region(phys_addr_t pstart, unsigned int order, - unsigned int address_bits, - dma_addr_t *dma_handle); + unsigned int address_bits, + dma_addr_t *dma_handle, + unsigned int *address_bits_in); void xen_destroy_contiguous_region(phys_addr_t pstart, unsigned int order); #endif /* _ASM_X86_SWIOTLB_XEN_H */ diff --git a/arch/x86/xen/mmu_pv.c b/arch/x86/xen/mmu_pv.c index 2c70cd35e72c..fb586238f7c4 100644 --- a/arch/x86/xen/mmu_pv.c +++ b/arch/x86/xen/mmu_pv.c @@ -2208,19 +2208,22 @@ void __init xen_init_mmu_ops(void) static unsigned long discontig_frames[1<coherent_dma_mask; + unsigned int address_bits = fls64(dma_mask), address_bits_in; int order = get_order(size); phys_addr_t phys; void *ret; @@ -160,10 +162,11 @@ xen_swiotlb_alloc_coherent(struct device *dev, size_t size, if (*dma_handle + size - 1 > dma_mask || range_straddles_page_boundary(phys, size) || range_requires_alignment(phys, size)) { - if (xen_create_contiguous_region(phys, order, fls64(dma_mask), - dma_handle) != 0) + if (xen_create_contiguous_region(phys, order, address_bits, + dma_handle, &address_bits_in)) goto out_free_pages; - SetPageXenRemapped(virt_to_page(ret)); + if (address_bits_in > address_bits) + SetPageXenRemapped(virt_to_page(ret)); } memset(ret, 0, size);