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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 847A5C41535 for ; Tue, 12 Dec 2023 20:48:09 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id F0B836B0392; Tue, 12 Dec 2023 15:47:44 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id E6D8A6B0394; Tue, 12 Dec 2023 15:47:44 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D0DF16B0395; Tue, 12 Dec 2023 15:47:44 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id BEB5A6B0392 for ; Tue, 12 Dec 2023 15:47:44 -0500 (EST) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 93A77120861 for ; Tue, 12 Dec 2023 20:47:44 +0000 (UTC) X-FDA: 81559352448.19.312694A Received: from mail-yb1-f201.google.com (mail-yb1-f201.google.com [209.85.219.201]) by imf15.hostedemail.com (Postfix) with ESMTP id D4023A0007 for ; Tue, 12 Dec 2023 20:47:42 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b="z/zdS5yn"; spf=pass (imf15.hostedemail.com: domain of 37cZ4ZQUKCJACu02C08805y.w86527EH-664Fuw4.8B0@flex--sagis.bounces.google.com designates 209.85.219.201 as permitted sender) smtp.mailfrom=37cZ4ZQUKCJACu02C08805y.w86527EH-664Fuw4.8B0@flex--sagis.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1702414062; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=QZdQqVk39iJlhBpyUnh6sf+6Hw3ATYVfrr1vi3AMJYE=; b=3LkTcJvkhhdASe/W2qc77f/Rt4K4HrGnxL7ZK5tGd6v8+LcFMrbwI4BPlPbF+eW8QroRzQ L9mW8ctVs1Y6morqFR6swacJ0DP8LPUdwmavG+ZZatbSUVz0spTrlDZDxn4J1j4xWCJYDP k6uwHSpJKxHUeoH7il1ABoiAm1ZjVvo= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b="z/zdS5yn"; spf=pass (imf15.hostedemail.com: domain of 37cZ4ZQUKCJACu02C08805y.w86527EH-664Fuw4.8B0@flex--sagis.bounces.google.com designates 209.85.219.201 as permitted sender) smtp.mailfrom=37cZ4ZQUKCJACu02C08805y.w86527EH-664Fuw4.8B0@flex--sagis.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1702414062; a=rsa-sha256; cv=none; b=aPipo2xVxPxyq4x8czayud7k1zN2KVmiRBVOXJq2KEHk3Z147eExYEE6IBh1MgvFrpOdVP MAX3UODgIOd4iu/nVNOp3r5NMGkwtHjdKVllIHaw4lTr4ppt4hc2c2yOvf9xUCRClA+WWq N/Na716Z8Ehg3UXTuIMdE5rXhR6g1oQ= Received: by mail-yb1-f201.google.com with SMTP id 3f1490d57ef6-dbc4f389835so5067256276.2 for ; Tue, 12 Dec 2023 12:47:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1702414062; x=1703018862; darn=kvack.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=QZdQqVk39iJlhBpyUnh6sf+6Hw3ATYVfrr1vi3AMJYE=; b=z/zdS5ynRDCSTMZfXPWbpRgzriou7kvIEDoB7GTN93tzHTnHXC6wluMSGSVF2BqaPZ qsLM7raZP6NRGuDdnvt/GYfn5/pCVx975ch0pqcwxJFNOoQcnHP4Ne6AJixWB3YJBODV 4Zz2TlNBBbx8zzSXwNWAJkw9CCf+fl98OYUceIYhp0j2I0RxLBK+ouTCfZRUectT2Qdc fKhjtRy14VqwAOEjeerLQatLYzul82/2qK3EZRgb744so7KvIjiHVsMT11z5uu/64nFK GfVCzDCDiTdZfg5qvrWNgMsDFLtYOOjttnb8+YYfsQNA4vrFprYBJQspXnX6MroXd1TK CBpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702414062; x=1703018862; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=QZdQqVk39iJlhBpyUnh6sf+6Hw3ATYVfrr1vi3AMJYE=; b=VliNp+zEJqIRqeiW4GjKtNhoMkHH6tYSfgyGb4KuXNwOBfXau9FD4o6Qu9lnpkLm9k Y7wyLPnpKb23MCKz0YFZ0uJp3dW7JUrBAP8Is+Xk6TsZhUcVljqLSHBj6PxHfVHTnKLQ shib7zGPNnaTZFQbQaP1nS/X50NBGIkRLsy9KrC8xqhek/TwO17fs7cGri4uVCbhyS4t YPZmC+Ajm+hVTCWRhJb+dmJ3Qyhmw/mtBCAxDUWoHvWzij3IftHv73sHKHM7BekCS4FP 87h/cWrmQI4iXvCPyr+QZqqBbBI4jIzOmBoXHHIreKL8L8MGsyiRfKVSVj7mLqU0k4Ss 1HnQ== X-Gm-Message-State: AOJu0YzT+fC4fPB2idxJk7HhGWoAuwOh5yNvKliFoPtIA9aj3eyb9q9b lDN+N8YGX8f/kZdoEnmBMtZqS2pDIA== X-Google-Smtp-Source: AGHT+IH9RTDsHLGt6TFEaMhulg0Kd1/ZUyxFq2VWB91JPo3oRoRjEYyJ0UXRvW/aN3iOVxrGFxYaEUsQOw== X-Received: from sagi.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:241b]) (user=sagis job=sendgmr) by 2002:a25:9e90:0:b0:db3:fa34:50b0 with SMTP id p16-20020a259e90000000b00db3fa3450b0mr51580ybq.4.1702414061971; Tue, 12 Dec 2023 12:47:41 -0800 (PST) Date: Tue, 12 Dec 2023 12:46:39 -0800 In-Reply-To: <20231212204647.2170650-1-sagis@google.com> Mime-Version: 1.0 References: <20231212204647.2170650-1-sagis@google.com> X-Mailer: git-send-email 2.43.0.472.g3155946c3a-goog Message-ID: <20231212204647.2170650-25-sagis@google.com> Subject: [RFC PATCH v5 24/29] KVM: selftests: Expose _vm_vaddr_alloc From: Sagi Shahar To: linux-kselftest@vger.kernel.org, Ackerley Tng , Ryan Afranji , Erdem Aktas , Sagi Shahar , Isaku Yamahata Cc: Sean Christopherson , Paolo Bonzini , Shuah Khan , Peter Gonda , Haibo Xu , Chao Peng , Vishal Annapurve , Roger Wang , Vipin Sharma , jmattson@google.com, dmatlack@google.com, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, linux-mm@kvack.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: D4023A0007 X-Rspam-User: X-Stat-Signature: yaxu8iozb46ttpak85x4thbwsp9h8a56 X-Rspamd-Server: rspam01 X-HE-Tag: 1702414062-748547 X-HE-Meta: U2FsdGVkX1/58pIDAHzdEBSChxEia28EDq643s2JX3v/kIV6KUMJ18Q7WEB6K0HcZbzy1ZEpzkMCXoWSLvQDQtwPIXaF/UNJdmsE/Xydb/0tueltP1chQG2+Z5f1fFPx0SsgTEUiIb481AHpguR7dgIlFkjI5DTabxOUUvn3CBHykKeT9hyA+jbYRld9Wo3YPmCipMLMkiyfe5UUx1vr8LSr1XN+YrSuxh9EIlQ2rly9PmNtFQPIF4XU5tXmoKiEC7fVLWMnHA0gqqlxP2yQinPW8stha2+lD9nDYna6kJN+qvQtQa4GJTjP7QYRR3Djrw/yXPC6WskeUu6v96wXlunLmhfqYJNI7By8DKg/z/W7TN4W4UjPuFybZSL4bDgH/BOV422m5GXna1eu6kvf1yQHRTw1/ePY8EzqmGWLZpKp2k8f/vvm1BmmmTYcHi2UIcpuI1mVDNz+vppJp3BX8gAJhFxmW9nGv0BCcpOVzNFqKFkQVAbjyJIhyjcvLtBCWMlm2yxJiBOqWBF4Vo6S2TSggsguy2z24x16dN2LCSGMeersIfkntWeatN/x4HH6PfTFXtnnKbirAIMmpKjEdYd+Yqou2sc07Xbh9Y4/KmDoevVVyXa9+RmSlxwXskS9UK/ZoJ8XJ7f+H9pNiFS6z1CBNPA7a8aUN2gEgymz/yPbLmqHLE2TOzhQazb3zkHGfpWW0TGKqSU1vwy9LEOQKR5g3nBiPo00t583g/8U7+3W9HhPXCOuEMmiwmmuwZK21jd/wzog8qFMIswKrZvD80N8Z+/+mIs6lfMR3WF8ZZgNSdWRTqHV5d2Pt3LtihjBkgT0Jz6yddiMKVVX8JrxQombtOWWhFRBGjNkczyoVG6dVJdwkZQayiCnTelBkESJbc4kPhUUV/bz6LnYiVzvlJAfZ3NwwTFqwY0ZT1sxzt67gZ/DkCm3FJbba5k6Metfqx3vuXbUeob3W8yrP4A iPpeqXn8 i+ULb3LgCQ7QlyKwRMLwaoIHewrc25cTOx5ddHJ22pnmIJ4GwXbLIKSvEgSinRPtl+eguDW8kCSSKjK597adi5qfANc2Sm7JJ2JxJiTF47Yk9H8XjsiA2k58tHc76kK/uzpiPZqhmoO96di41eOl1gMffJsVyebYoqJqQ5kfE1fnwHjdfwX3UJU8hx2XVxtfFPFT98YLcSjiBkQiDwzhNs8SNSMYrYVNGLpJDY6sOyVlFAFXm17TymjVHK5N5VqbmyuwH2UJqjAxwTgOawL0592piHXVh8wdRHvh4c/51FwulnR4+fiq2TZKpDQm9V8novk05r9ag2zQl/jpOZU6U2s+3P1+raUnEeK0wHZKPdZU+Iz2yKEikY7WTfWy+/stq5lPLEPvtFRW2tJQfqm9NZv5v55U20k9rrFcrNlQglRtFoQ9VH2Yw0oK0X1ul5eSe6QTpQEnfdCbEjQmUkTvug/eckpW2Q8h5jXGY8dbaWxFiYxiEp2IVbq198ZNTSO+Ck0Ge1viNqH192QjdCUGtSkaLMMPBAR2uRDv480gfYwHYSlZDkw4Ng77pWefI32e6yzDm1+7ScHbcBXVwAF/4aiBZvo27WH3Jm2iBqAPZYhIt4JSvy3zfmJ9sHgMWjb+YeR0LwYj35+1xKgSKX/3ZqB9dci1J1gkbDx6Sh9xdxgaJ/B2HaVmeqAp6mw== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: From: Ackerley Tng vm_vaddr_alloc always allocates memory in memslot 0. This allows users of this function to choose which memslot to allocate virtual memory in. Signed-off-by: Ackerley Tng Signed-off-by: Ryan Afranji Signed-off-by: Sagi Shahar --- tools/testing/selftests/kvm/include/kvm_util_base.h | 3 +++ tools/testing/selftests/kvm/lib/kvm_util.c | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/tools/testing/selftests/kvm/include/kvm_util_base.h b/tools/testing/selftests/kvm/include/kvm_util_base.h index efd7ae8abb20..5dbebf5cfd07 100644 --- a/tools/testing/selftests/kvm/include/kvm_util_base.h +++ b/tools/testing/selftests/kvm/include/kvm_util_base.h @@ -561,6 +561,9 @@ void vm_mem_region_delete(struct kvm_vm *vm, uint32_t slot); struct kvm_vcpu *__vm_vcpu_add(struct kvm_vm *vm, uint32_t vcpu_id); void vm_populate_vaddr_bitmap(struct kvm_vm *vm); vm_vaddr_t vm_vaddr_unused_gap(struct kvm_vm *vm, size_t sz, vm_vaddr_t vaddr_min); +vm_vaddr_t ____vm_vaddr_alloc(struct kvm_vm *vm, size_t sz, + vm_vaddr_t vaddr_min, vm_paddr_t paddr_min, + uint32_t data_memslot, bool encrypt); vm_vaddr_t vm_vaddr_alloc(struct kvm_vm *vm, size_t sz, vm_vaddr_t vaddr_min); vm_vaddr_t __vm_vaddr_alloc(struct kvm_vm *vm, size_t sz, vm_vaddr_t vaddr_min, enum kvm_mem_region_type type); diff --git a/tools/testing/selftests/kvm/lib/kvm_util.c b/tools/testing/selftests/kvm/lib/kvm_util.c index 28780fa1f0f2..d024abc5379c 100644 --- a/tools/testing/selftests/kvm/lib/kvm_util.c +++ b/tools/testing/selftests/kvm/lib/kvm_util.c @@ -1410,9 +1410,9 @@ vm_vaddr_t vm_vaddr_unused_gap(struct kvm_vm *vm, size_t sz, * a unique set of pages, with the minimum real allocation being at least * a page. */ -static vm_vaddr_t ____vm_vaddr_alloc(struct kvm_vm *vm, size_t sz, - vm_vaddr_t vaddr_min, vm_paddr_t paddr_min, - uint32_t data_memslot, bool encrypt) +vm_vaddr_t ____vm_vaddr_alloc(struct kvm_vm *vm, size_t sz, + vm_vaddr_t vaddr_min, vm_paddr_t paddr_min, + uint32_t data_memslot, bool encrypt) { uint64_t pages = (sz >> vm->page_shift) + ((sz % vm->page_size) != 0); -- 2.43.0.472.g3155946c3a-goog