From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qt1-f173.google.com (mail-qt1-f173.google.com [209.85.160.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 33A6C3803D0 for ; Wed, 14 Jan 2026 08:52:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.173 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768380776; cv=none; b=nihIB3GxFSNXuRJqfRvBznq86c0KI9LKuZ7L2NqrP50AB/kCSple1aAK5RjoLERHtinbzLxYWduc5G4kIwYv89uT5EzA2tYfr/d4upK6cH5JwXLVUlbIZMa8Rc6Mb1xmhXT6w3nwnftvpl1/DbWArUvpTajB9Cr5J45sQ81ZMIo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768380776; c=relaxed/simple; bh=WuxU623lbbMTdGzzm+5bCzIY7yeXdH6a4+PbwDkCxIQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pIRUIB+9R2KRG4vRqP+r48S6+ivpwnOJJUt8vUYELki80hbZ/voY1wPxTTBaMpRBV1wtzplYbMJYNnzsKIT6i/vRoCwn4WgMe00pqZgx+W8hjSMWe/4dhr3Q16CE3WdzdaUQkqJEgFBsq/Zz81d64FdlyjrJqP90EBZshF4Rx1w= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=gourry.net; spf=pass smtp.mailfrom=gourry.net; dkim=pass (2048-bit key) header.d=gourry.net header.i=@gourry.net header.b=ZIZ5iOb4; arc=none smtp.client-ip=209.85.160.173 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=gourry.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gourry.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gourry.net header.i=@gourry.net header.b="ZIZ5iOb4" Received: by mail-qt1-f173.google.com with SMTP id d75a77b69052e-50145d27b4cso10547301cf.2 for ; Wed, 14 Jan 2026 00:52:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gourry.net; s=google; t=1768380761; x=1768985561; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=AHib3jWzP7kVcnP0SE1eJQabXI1WWwo6ABSGI/iwYvU=; b=ZIZ5iOb4rMsUs1UX8j+1JHIC4h47DqjyJrDIkI3nNU024JWtqV3x09yU5Fppc/Z8FF j0D5zHkM6/zIzEq3mx4Rdj0j0r93rooVx9lfp2bf5c2pOeIcDtqi7gq22+pXOlShDQ/J rZf1YX02w0sDK+vzzsnyB45VARdWLadzQwW9V4X4eFC8oK/WnOIXSfyz1QrFzSR/wxYq R4iI1fFpuNBBIFmDvVideJqcbsac+FByujCm5PSkAXXWex/nYp9LGwBhySKLZm7eIM3G wdBE1wP2Bn54wNsPNRVzT4h7KkXqmGayZv2bmIQYHdF4gf3AQcu3iWFe0BtpBQpH439i fptA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768380761; x=1768985561; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=AHib3jWzP7kVcnP0SE1eJQabXI1WWwo6ABSGI/iwYvU=; b=Es3Lrh+V6xJ4+P8O2yyDMrJb9pQ1CQJKg4TZl/JclbUh2Ni5HEWklSbyw20Q/qnmt+ RPpqUmjQrl/p1rwjW+8Y+WBKFWE2e5ZnRh2yKgzeupzuRU3E7ONu606uY/4DSY+2YC+B kbMzWx5XvZuu2Iqvhc2W4WG6GEdlLLhD4CEXUbJLch4FRE/+VPPnwoxlvkFu2fDhF35R nbd4PRhPfF+1C8awHnWy75DNAW0HYSQcKttYBm2VerXS6Oz3Ne2K/CQKFs1yXhON8f6o izf5w90ZOvm2QGopU1X3r3nsGtiAzJjiLT+KXDOGrHGk8FrigVludAJNrg/ed75aJg26 WEwQ== X-Forwarded-Encrypted: i=1; AJvYcCX8qDFch3mvpimrzI7kzUEdUeBok4hidhuZ8wn7451hiK/qTP8dP6KrlBJboc2Msk0Hjg7AfU5UAFEpTTA=@vger.kernel.org X-Gm-Message-State: AOJu0YxTg0D/4pin6ShDV0lib3amfcdckzHlfOWZjh214tok2/qFxJ8p lgp5Ha3yZC+EPhsfXCRj4n9aAOYb5EDm4JgzOrlvBqqkxdENLXf/yP9OXQ4UZ5hUetg= X-Gm-Gg: AY/fxX44qcT9B9Y7SDMAx+7xRMMAHOcaf1EgqX8aRgSEMqFldACn1w3Arf2CAE5I+6D FDWqR3p9DhyRVgCjZSuOVpuJBzdEB9ydueOFBV+gi+I0Zz8+9mYvcGIW4+3H3+JHRuwkn8sCF/z V5yQ0NNO30mwI+t+aL+F8vXiBWtcyMI6CU2/iN/+GCiIEThcnxi3sY9rg3wHwaGHbXytqU5gG4/ 9A1R6aeYB8oxjRwka3PbfSrZQQAkPWbkQWhjL/H9FKdEO9r4sX/qmgWeJkwxg2V0BUAyJxCpm4a J2weDwmWxoQ4QVURcs/z5IiU9n9sB6ZRaNIcU4fkqXjQHopLtQd2g/Z4yeGZKgIZ4nLi+7l0EtS VhXSJUFeaylUeuda85lliHvAXDyCy7jAQBv09yDn5nDFBT6Al0TIQTlmvfNtuLxONdt9T0ANFtA OuUzPj1GcdfNhnPdaN76V8DcnDvumMmD1GbLMCAV3G2AmwngsbCBU1ywXhmI5tWMRhLP+ZkKSD5 6A= X-Received: by 2002:ac8:7f0a:0:b0:4ee:228d:d6b8 with SMTP id d75a77b69052e-50148482933mr21948301cf.70.1768380761194; Wed, 14 Jan 2026 00:52:41 -0800 (PST) Received: from gourry-fedora-PF4VCD3F.lan (pool-96-255-20-138.washdc.ftas.verizon.net. [96.255.20.138]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-50148df8759sm10131931cf.10.2026.01.14.00.52.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jan 2026 00:52:40 -0800 (PST) From: Gregory Price To: linux-mm@kvack.org Cc: linux-cxl@vger.kernel.org, nvdimm@lists.linux.dev, linux-kernel@vger.kernel.org, virtualization@lists.linux.dev, kernel-team@meta.com, dan.j.williams@intel.com, vishal.l.verma@intel.com, dave.jiang@intel.com, david@kernel.org, mst@redhat.com, jasowang@redhat.com, xuanzhuo@linux.alibaba.com, eperezma@redhat.com, osalvador@suse.de, akpm@linux-foundation.org Subject: [PATCH 4/8] mm/memory_hotplug: return online type from add_memory_driver_managed() Date: Wed, 14 Jan 2026 03:51:56 -0500 Message-ID: <20260114085201.3222597-5-gourry@gourry.net> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260114085201.3222597-1-gourry@gourry.net> References: <20260114085201.3222597-1-gourry@gourry.net> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Change add_memory_driver_managed() to return the online type (MMOP_*) on success instead of 0. This allows callers to determine the actual online state of the memory after addition, which is important when MMOP_SYSTEM_DEFAULT is used and the actual online type depends on the system default policy. Update virtio_mem to handle the new return value semantics by checking for rc < 0 to detect errors. Signed-off-by: Gregory Price --- drivers/dax/kmem.c | 2 +- drivers/virtio/virtio_mem.c | 5 +++-- mm/memory_hotplug.c | 4 +++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/drivers/dax/kmem.c b/drivers/dax/kmem.c index 5e0cf94a9620..d0dd36c536a0 100644 --- a/drivers/dax/kmem.c +++ b/drivers/dax/kmem.c @@ -178,7 +178,7 @@ static int dev_dax_kmem_probe(struct dev_dax *dev_dax) range_len(&range), kmem_name, mhp_flags, MMOP_SYSTEM_DEFAULT); - if (rc) { + if (rc < 0) { dev_warn(dev, "mapping%d: %#llx-%#llx memory add failed\n", i, range.start, range.end); remove_resource(res); diff --git a/drivers/virtio/virtio_mem.c b/drivers/virtio/virtio_mem.c index b1ec8f2b9e31..4decb44f5a43 100644 --- a/drivers/virtio/virtio_mem.c +++ b/drivers/virtio/virtio_mem.c @@ -656,15 +656,16 @@ static int virtio_mem_add_memory(struct virtio_mem *vm, uint64_t addr, rc = add_memory_driver_managed(vm->mgid, addr, size, vm->resource_name, MHP_MERGE_RESOURCE | MHP_NID_IS_MGID, MMOP_SYSTEM_DEFAULT); - if (rc) { + if (rc < 0) { atomic64_sub(size, &vm->offline_size); dev_warn(&vm->vdev->dev, "adding memory failed: %d\n", rc); /* * TODO: Linux MM does not properly clean up yet in all cases * where adding of memory failed - especially on -ENOMEM. */ + return rc; } - return rc; + return 0; } /* diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index 515ff9d18039..41974a1ccb91 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -1689,7 +1689,7 @@ EXPORT_SYMBOL_GPL(add_memory); * MMOP_ONLINE_MOVABLE to online with that type, MMOP_OFFLINE to leave offline, * or MMOP_SYSTEM_DEFAULT to use the system default policy. * - * Returns 0 on success, negative error code on failure. + * Returns the online type (MMOP_*) on success, negative error code on failure. */ int add_memory_driver_managed(int nid, u64 start, u64 size, const char *resource_name, mhp_t mhp_flags, @@ -1721,6 +1721,8 @@ int add_memory_driver_managed(int nid, u64 start, u64 size, rc = __add_memory_resource(nid, res, mhp_flags, online_type); if (rc < 0) release_memory_resource(res); + else + rc = online_type; out_unlock: unlock_device_hotplug(); -- 2.52.0