From 09eb36ce3d98e0eeaeec9c333ac818b2bc3f85bf Mon Sep 17 00:00:00 2001 From: Mateusz Guzik Date: Mon, 2 Nov 2020 20:51:12 +0100 Subject: Introduce CPU_SEQID_UNSTABLE Current CPU_SEQID users don't care about possibly changing CPU ID, but enclose it within kpreempt disable/enable in order to fend off warnings from Linux's CONFIG_DEBUG_PREEMPT. There is no need to do it. The expected way to get CPU ID while allowing for migration is to use raw_smp_processor_id. In order to make this future-proof this patch keeps CPU_SEQID as is and introduces CPU_SEQID_UNSTABLE instead, to make it clear that consumers explicitly want this behavior. Reviewed-by: Brian Behlendorf Reviewed-by: Ryan Moeller Reviewed-by: Matt Macy Signed-off-by: Mateusz Guzik Closes #11142 --- module/zfs/dmu_object.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'module/zfs/dmu_object.c') diff --git a/module/zfs/dmu_object.c b/module/zfs/dmu_object.c index 453a2842c..12cdbd68b 100644 --- a/module/zfs/dmu_object.c +++ b/module/zfs/dmu_object.c @@ -58,10 +58,8 @@ dmu_object_alloc_impl(objset_t *os, dmu_object_type_t ot, int blocksize, int dnodes_per_chunk = 1 << dmu_object_alloc_chunk_shift; int error; - kpreempt_disable(); - cpuobj = &os->os_obj_next_percpu[CPU_SEQID % + cpuobj = &os->os_obj_next_percpu[CPU_SEQID_UNSTABLE % os->os_obj_next_percpu_len]; - kpreempt_enable(); if (dn_slots == 0) { dn_slots = DNODE_MIN_SLOTS; -- cgit v1.2.3