From patchwork Fri Jul 5 12:49:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Andrzej Siewior X-Patchwork-Id: 13725065 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 86AC81E867; Fri, 5 Jul 2024 12:51:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720183864; cv=none; b=cjR51YiYeDvcPFiWRu4l7i8lz9HbBFal22Ml4XfR0AUYr/lnYIJ/cvo1woCcuVXJcMiD/I2rIVg3h1YDAbheYZMmcxGs+MUBriKmxmj9L5B/rWvKUCsFeBs0FKGZpMgbM1QNKmPNMiUC3QpQbbR076BIXsBUulhvbKrW9uqAzMA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720183864; c=relaxed/simple; bh=k71QRPmSseA5MCLgBwvhkMDWTpuFZICNWc1N3USp+9I=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Q9nwRkh7ocaJSm8THXKVMnLLEoirmMg7fO89b/6d2fsonSu9VUwL63fAb7mrB24DbJdlCgrhf333hmxFXlvyq+gDxoGAn4TurQOpWdoDHc5IHtcstJ7DpMFqRpfyn6B9PlPdTIY8G/gw9ywP8nHH+zCmMZpDHWb/ShfZXbIUAJU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=3Lh1PBAs; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=HHrSQufw; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="3Lh1PBAs"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="HHrSQufw" From: Sebastian Andrzej Siewior DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1720183861; h=from:from:reply-to:subject:subject: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=SdUrf3Hy2C34gl1jMZkbRbR9ItFYBrR+sH8mMQClkz4=; b=3Lh1PBAs1KQUkvSVdgAnshIcgNXY3ZXbt0HlfUH74Va7RBk7TA/HdqfAAesULro2A9svql DzAu+EkOM+/xrf+hBzxKnLSAUdcz0zV3Xgrs5Q/KwfEo3RYFBMlAFCD+KUFHAd/sF159ON NDgGxSlSrb54/M81eE0rxTL++3SI/4SpFdPAKHV2qaXDVfTeiSSgnq/SM5fXN/BUTnZlst g+TyI/7M6WpRYJ/GqAMebUb1Kecn73FKdMbl9XEayl6NUmrl4ZFuk3XhWySCT8QbS02gM9 ubzA4/dOh4pIP8/fDBx2y3lAUb2kF6ouPokxcuA9IdbEGI8ULQrR1xtmV/qkew== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1720183861; h=from:from:reply-to:subject:subject: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=SdUrf3Hy2C34gl1jMZkbRbR9ItFYBrR+sH8mMQClkz4=; b=HHrSQufwqCEvgf3s77nlhkCBKa8qcQtCUB14NFbQIOzuIZGfN5TeddGqQu3WUNYIjgFE3O wVqT4gXrACulkvAQ== To: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Jens Axboe , Mike Galbraith , Minchan Kim , Sergey Senozhatsky , Thomas Gleixner , Alexander Lobakin , Sebastian Andrzej Siewior Subject: [PATCH v3 1/3] zram: Replace bit spinlocks with a spinlock_t. Date: Fri, 5 Jul 2024 14:49:14 +0200 Message-ID: <20240705125058.1564001-2-bigeasy@linutronix.de> In-Reply-To: <20240705125058.1564001-1-bigeasy@linutronix.de> References: <20240705125058.1564001-1-bigeasy@linutronix.de> Precedence: bulk X-Mailing-List: linux-block@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Mike Galbraith The bit spinlock disables preemption. The spinlock_t lock becomes a sleeping lock on PREEMPT_RT and it can not be acquired in this context. In this locked section, zs_free() acquires a zs_pool::lock, and there is access to zram::wb_limit_lock. Add a spinlock_t for locking. Keep the set/ clear ZRAM_LOCK bit after the lock has been acquired/ dropped. The size of struct zram_table_entry increases by 4 bytes due to lock and additional 4 bytes padding with CONFIG_ZRAM_TRACK_ENTRY_ACTIME enabled. Signed-off-by: Mike Galbraith Reviewed-by: Sergey Senozhatsky Signed-off-by: Sebastian Andrzej Siewior --- drivers/block/zram/zram_drv.c | 20 +++++++++++++++++--- drivers/block/zram/zram_drv.h | 1 + 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c index 3acd7006ad2cc..72006e6e34883 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -57,19 +57,32 @@ static void zram_free_page(struct zram *zram, size_t index); static int zram_read_page(struct zram *zram, struct page *page, u32 index, struct bio *parent); +static void zram_meta_init_table_locks(struct zram *zram, size_t num_pages) +{ + for (size_t index = 0; index < num_pages; index++) + spin_lock_init(&zram->table[index].lock); +} + static int zram_slot_trylock(struct zram *zram, u32 index) { - return bit_spin_trylock(ZRAM_LOCK, &zram->table[index].flags); + int ret; + + ret = spin_trylock(&zram->table[index].lock); + if (ret) + __set_bit(ZRAM_LOCK, &zram->table[index].flags); + return ret; } static void zram_slot_lock(struct zram *zram, u32 index) { - bit_spin_lock(ZRAM_LOCK, &zram->table[index].flags); + spin_lock(&zram->table[index].lock); + __set_bit(ZRAM_LOCK, &zram->table[index].flags); } static void zram_slot_unlock(struct zram *zram, u32 index) { - bit_spin_unlock(ZRAM_LOCK, &zram->table[index].flags); + __clear_bit(ZRAM_LOCK, &zram->table[index].flags); + spin_unlock(&zram->table[index].lock); } static inline bool init_done(struct zram *zram) @@ -1226,6 +1239,7 @@ static bool zram_meta_alloc(struct zram *zram, u64 disksize) if (!huge_class_size) huge_class_size = zs_huge_class_size(zram->mem_pool); + zram_meta_init_table_locks(zram, num_pages); return true; } diff --git a/drivers/block/zram/zram_drv.h b/drivers/block/zram/zram_drv.h index 35e3221446292..dcc3c106ce713 100644 --- a/drivers/block/zram/zram_drv.h +++ b/drivers/block/zram/zram_drv.h @@ -69,6 +69,7 @@ struct zram_table_entry { unsigned long element; }; unsigned long flags; + spinlock_t lock; #ifdef CONFIG_ZRAM_TRACK_ENTRY_ACTIME ktime_t ac_time; #endif From patchwork Fri Jul 5 12:49:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Andrzej Siewior X-Patchwork-Id: 13725066 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 128C914A087; Fri, 5 Jul 2024 12:51:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720183864; cv=none; b=q3RX1v8jDYc8DDI6gWtq3rFDCWSr5im0HLJn0zY1zWd7DgQmesWVcMR1te71+75ytybFFSXtG1G87oBvnXnSye+67xCw0YC2/CYTS58gryTKUUw7v74t0WoN4PDV7Cq/9+SIl/5Eix28F9TlUhhX15pUrAelgKdQsDvl2m8UXEE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720183864; c=relaxed/simple; bh=EAWubWSnfGSGLRqgS01JzvZesUh7mES4zlMOY/GQMM4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Vp26rcBnO+xvBw2BfGS6lcyT/PTM0tNKjqQm9XjvmCM68cb74aedPI3YbYX67iiTpHAYl56JvftW3sopPh1dfNeBczXun6jIUcdRwMxShyn16Nge0A3Z608HF8/jXM1IHtQ1ykBDx7vyl6/0T09vGsb6K8cqJ8xnZhbVBMEs3s8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=bRcTjfaO; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=KsMTcShT; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="bRcTjfaO"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="KsMTcShT" From: Sebastian Andrzej Siewior DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1720183861; h=from:from:reply-to:subject:subject: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=JmesQQeq7k8AI187QyjXjrDqOsgX4aH0MdV/eZEBAmI=; b=bRcTjfaOWuYXOOT3gphUlvV3nG65Wbw1a8UHbkFCTC++6yWmnqPxPHPaVWmjy7j5weI2De g7fXtezolZwV+1pBFAu66TEF4O8vARHD72zfFDR8Sq4hAri0QrDkNFDv1p9z5Lkm/EeJrA 2Noeqe6F96SQvDcPkP5gwrhNSyxYRpQT0G5kLdJgicp0qTZ68EBWrY9YNCeuRZKxUyLfj8 QmdeEsE6MGML4IwhTAp4KosC19iZ+mqmPOAZgie3YD2u685SI348u+56lNPV5ew3ALyzPb QwneXfiVmwSbUovrOBnmozoan9tTnSI8U6G/N5JfRwRjqH1HBDSTR0c/7JRKCQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1720183861; h=from:from:reply-to:subject:subject: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=JmesQQeq7k8AI187QyjXjrDqOsgX4aH0MdV/eZEBAmI=; b=KsMTcShT3c5TRRIqJ4sgA3XV3Qvo0oOQfJ5MU7i+mbfTdndUY4PfidS/Mv9dPfvHe7ev+t a/7IoTHMS++PD4AQ== To: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Jens Axboe , Mike Galbraith , Minchan Kim , Sergey Senozhatsky , Thomas Gleixner , Alexander Lobakin , Sebastian Andrzej Siewior Subject: [PATCH v3 2/3] zram: Remove ZRAM_LOCK Date: Fri, 5 Jul 2024 14:49:15 +0200 Message-ID: <20240705125058.1564001-3-bigeasy@linutronix.de> In-Reply-To: <20240705125058.1564001-1-bigeasy@linutronix.de> References: <20240705125058.1564001-1-bigeasy@linutronix.de> Precedence: bulk X-Mailing-List: linux-block@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 The ZRAM_LOCK was used for locking and after the addition of spinlock_t the bit set and cleared but there no reader of it. Remove the ZRAM_LOCK bit. Reviewed-by: Sergey Senozhatsky Signed-off-by: Sebastian Andrzej Siewior --- drivers/block/zram/zram_drv.c | 11 ++--------- drivers/block/zram/zram_drv.h | 4 +--- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c index 72006e6e34883..e683a9fc68b6c 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -65,23 +65,16 @@ static void zram_meta_init_table_locks(struct zram *zram, size_t num_pages) static int zram_slot_trylock(struct zram *zram, u32 index) { - int ret; - - ret = spin_trylock(&zram->table[index].lock); - if (ret) - __set_bit(ZRAM_LOCK, &zram->table[index].flags); - return ret; + return spin_trylock(&zram->table[index].lock); } static void zram_slot_lock(struct zram *zram, u32 index) { spin_lock(&zram->table[index].lock); - __set_bit(ZRAM_LOCK, &zram->table[index].flags); } static void zram_slot_unlock(struct zram *zram, u32 index) { - __clear_bit(ZRAM_LOCK, &zram->table[index].flags); spin_unlock(&zram->table[index].lock); } @@ -1297,7 +1290,7 @@ static void zram_free_page(struct zram *zram, size_t index) zram_set_handle(zram, index, 0); zram_set_obj_size(zram, index, 0); WARN_ON_ONCE(zram->table[index].flags & - ~(1UL << ZRAM_LOCK | 1UL << ZRAM_UNDER_WB)); + ~(1UL << ZRAM_UNDER_WB)); } /* diff --git a/drivers/block/zram/zram_drv.h b/drivers/block/zram/zram_drv.h index dcc3c106ce713..262fa960a0783 100644 --- a/drivers/block/zram/zram_drv.h +++ b/drivers/block/zram/zram_drv.h @@ -45,9 +45,7 @@ /* Flags for zram pages (table[page_no].flags) */ enum zram_pageflags { - /* zram slot is locked */ - ZRAM_LOCK = ZRAM_FLAG_SHIFT, - ZRAM_SAME, /* Page consists the same element */ + ZRAM_SAME = ZRAM_FLAG_SHIFT, /* Page consists the same element */ ZRAM_WB, /* page is stored on backing_device */ ZRAM_UNDER_WB, /* page is under writeback */ ZRAM_HUGE, /* Incompressible page */ From patchwork Fri Jul 5 12:49:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Andrzej Siewior X-Patchwork-Id: 13725067 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 12879149C4C; Fri, 5 Jul 2024 12:51:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720183865; cv=none; b=roWCDqe2ktIwai6Xs0YHlAA661jvQCdXVGzg0cyWdp2XspdKbZBeFSWUvYUeUtSyNSM6HJ2x4E4mwA7ZTcV3QnirSuibW2Grt/dCPjECnRdZUdrWZh6FQQO0Zz7iSj/yiTjWuRZNcwXV8Z24C7U8+Ks+vQgou/iZcYhfaHxr8BI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720183865; c=relaxed/simple; bh=Tg+HfrYUbcTf4m66IXzTHsNS/XoVI55Nli/4Xak15iE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=D6Am0C0hStCkuHgXfDrVwADrkpBgqOqIeRi7tj7ufxN0W4PMNPEE1Gl3zYuFZHtLfsKGvO5LF/UbbZ9g2NnX68buqtQrLetG/FA8G/ewUACoA70m0dFN0FxaMnkWEwN7gpy3pFkVaaciM7OEGpXElzpRkDR1xxJjBBNMVr+O2Ic= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=fDxWzmg3; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=PQxtIIzm; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="fDxWzmg3"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="PQxtIIzm" From: Sebastian Andrzej Siewior DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1720183861; h=from:from:reply-to:subject:subject: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=rsG//7rYWfTYC6on5Th6BnejVdtNYOCn5Z8HIMJ/YeQ=; b=fDxWzmg3YY81rEeuzXL27xU06qWVtKUxjjFZrGY1Dbf0zv0PI7gQ3eRupdJdEuICO4NXVZ PK/nTwT9PD0bcSbaRMmx19CNqP6LqfqsJjMKh4B6zXmEgHRtAghA+4XkDvrlpSanZN5zDY oAIUvXXYG8T6fafDYuIu2tlnEiUeGSYgXfioylQJARJdZlNk4hGERYhSP8RRPChXOIg1R6 VrOPGW+vHA3tbqFRcPSLFBPOD/hQNOjxD+TC/Ltg5r4r4/8RSSYIWoAO518HKxuWWzhsRZ cTuWtgXsbs/rSNm40iogbtsvoBb+lAY5qAhyXxzzBB+PQfkqmqUWY9jGliKitg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1720183861; h=from:from:reply-to:subject:subject: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=rsG//7rYWfTYC6on5Th6BnejVdtNYOCn5Z8HIMJ/YeQ=; b=PQxtIIzmgXyoxV6rzhzILNTiKI1nRtHPWw2n1dzhwBCg+lF4R1TY1YNZwCNz1uEHbBxqmc FGfu9sfhQMomfZBQ== To: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Jens Axboe , Mike Galbraith , Minchan Kim , Sergey Senozhatsky , Thomas Gleixner , Alexander Lobakin , Sebastian Andrzej Siewior Subject: [PATCH v3 3/3] zram: Shrink zram_table_entry::flags. Date: Fri, 5 Jul 2024 14:49:16 +0200 Message-ID: <20240705125058.1564001-4-bigeasy@linutronix.de> In-Reply-To: <20240705125058.1564001-1-bigeasy@linutronix.de> References: <20240705125058.1564001-1-bigeasy@linutronix.de> Precedence: bulk X-Mailing-List: linux-block@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 The zram_table_entry::flags member is of type long and uses 8 bytes on a 64bit architecture. With a PAGE_SIZE of 256KiB we have PAGE_SHIFT of 18 which in turn leads to __NR_ZRAM_PAGEFLAGS = 27. This still fits in an ordinary integer. By reducing it the size of `flags' to four bytes, the size of the struct goes back to 16 bytes. The padding between the lock and ac_time (if enabled) is also gone. Make zram_table_entry::flags an unsigned int and update the build test to reflect the change. Reviewed-by: Sergey Senozhatsky Signed-off-by: Sebastian Andrzej Siewior --- drivers/block/zram/zram_drv.c | 3 ++- drivers/block/zram/zram_drv.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c index e683a9fc68b6c..dde45a084733f 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -2410,9 +2410,10 @@ static void destroy_devices(void) static int __init zram_init(void) { + struct zram_table_entry zram_te; int ret; - BUILD_BUG_ON(__NR_ZRAM_PAGEFLAGS > BITS_PER_LONG); + BUILD_BUG_ON(__NR_ZRAM_PAGEFLAGS > sizeof(zram_te.flags) * 8); ret = cpuhp_setup_state_multi(CPUHP_ZCOMP_PREPARE, "block/zram:prepare", zcomp_cpu_up_prepare, zcomp_cpu_dead); diff --git a/drivers/block/zram/zram_drv.h b/drivers/block/zram/zram_drv.h index 262fa960a0783..531cefc666682 100644 --- a/drivers/block/zram/zram_drv.h +++ b/drivers/block/zram/zram_drv.h @@ -66,7 +66,7 @@ struct zram_table_entry { unsigned long handle; unsigned long element; }; - unsigned long flags; + unsigned int flags; spinlock_t lock; #ifdef CONFIG_ZRAM_TRACK_ENTRY_ACTIME ktime_t ac_time;