mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2024-12-27 11:29:36 +03:00
7df05a4266
Commit c409e4647f introduced a
number of module parameters. This required several types to be
changed to accomidate the required module parameters Linux macros.
Unfortunately, arc.c contained its own extern definition of the
zfs_write_limit_max variable and its type was not updated to be
consistent with its dsl_pool.c counterpart. If the variable had
been properly marked extern in a common header, then gcc would
have generated a warning and this would not have slipped through.
The result of this was that the ARC unconditionally expected
zfs_write_limit_max to be 64-bit. Unfortunately, the largest size
integer module parameter that Linux supports is unsigned long, which
varies in size depending on the host system's native word size. The
effect was that on 32-bit systems, ARC incorrectly performed 64-bit
operations on a 32-bit value by reading the neighboring 32 bits as
the upper 32 bits of the 64-bit value.
We correct that by changing the extern declaration to use the unsigned
long type and move these extern definitions in to the common arc.h
header. This should make ARC correctly treat zfs_write_limit_max as a
32-bit value on 32-bit systems.
Reported-by: Jorgen Lundman <lundman@lundman.net>
Signed-off-by: Richard Yao <ryao@cs.stonybrook.edu>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #749
163 lines
4.9 KiB
C
163 lines
4.9 KiB
C
/*
|
|
* CDDL HEADER START
|
|
*
|
|
* The contents of this file are subject to the terms of the
|
|
* Common Development and Distribution License (the "License").
|
|
* You may not use this file except in compliance with the License.
|
|
*
|
|
* You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
|
|
* or http://www.opensolaris.org/os/licensing.
|
|
* See the License for the specific language governing permissions
|
|
* and limitations under the License.
|
|
*
|
|
* When distributing Covered Code, include this CDDL HEADER in each
|
|
* file and include the License file at usr/src/OPENSOLARIS.LICENSE.
|
|
* If applicable, add the following below this CDDL HEADER, with the
|
|
* fields enclosed by brackets "[]" replaced with your own identifying
|
|
* information: Portions Copyright [yyyy] [name of copyright owner]
|
|
*
|
|
* CDDL HEADER END
|
|
*/
|
|
/*
|
|
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
|
|
*/
|
|
|
|
#ifndef _SYS_ARC_H
|
|
#define _SYS_ARC_H
|
|
|
|
#include <sys/zfs_context.h>
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
#include <sys/zio.h>
|
|
#include <sys/dmu.h>
|
|
#include <sys/spa.h>
|
|
#include <sys/refcount.h>
|
|
|
|
typedef struct arc_buf_hdr arc_buf_hdr_t;
|
|
typedef struct arc_buf arc_buf_t;
|
|
typedef struct arc_prune arc_prune_t;
|
|
typedef void arc_done_func_t(zio_t *zio, arc_buf_t *buf, void *private);
|
|
typedef void arc_prune_func_t(int64_t bytes, void *private);
|
|
typedef int arc_evict_func_t(void *private);
|
|
|
|
/* generic arc_done_func_t's which you can use */
|
|
arc_done_func_t arc_bcopy_func;
|
|
arc_done_func_t arc_getbuf_func;
|
|
|
|
/* generic arc_prune_func_t wrapper for callbacks */
|
|
struct arc_prune {
|
|
arc_prune_func_t *p_pfunc;
|
|
void *p_private;
|
|
list_node_t p_node;
|
|
refcount_t p_refcnt;
|
|
};
|
|
|
|
struct arc_buf {
|
|
arc_buf_hdr_t *b_hdr;
|
|
arc_buf_t *b_next;
|
|
kmutex_t b_evict_lock;
|
|
krwlock_t b_data_lock;
|
|
void *b_data;
|
|
arc_evict_func_t *b_efunc;
|
|
void *b_private;
|
|
};
|
|
|
|
typedef enum arc_buf_contents {
|
|
ARC_BUFC_DATA, /* buffer contains data */
|
|
ARC_BUFC_METADATA, /* buffer contains metadata */
|
|
ARC_BUFC_NUMTYPES
|
|
} arc_buf_contents_t;
|
|
/*
|
|
* These are the flags we pass into calls to the arc
|
|
*/
|
|
#define ARC_WAIT (1 << 1) /* perform I/O synchronously */
|
|
#define ARC_NOWAIT (1 << 2) /* perform I/O asynchronously */
|
|
#define ARC_PREFETCH (1 << 3) /* I/O is a prefetch */
|
|
#define ARC_CACHED (1 << 4) /* I/O was already in cache */
|
|
#define ARC_L2CACHE (1 << 5) /* cache in L2ARC */
|
|
|
|
/*
|
|
* The following breakdows of arc_size exist for kstat only.
|
|
*/
|
|
typedef enum arc_space_type {
|
|
ARC_SPACE_DATA,
|
|
ARC_SPACE_HDRS,
|
|
ARC_SPACE_L2HDRS,
|
|
ARC_SPACE_OTHER,
|
|
ARC_SPACE_NUMTYPES
|
|
} arc_space_type_t;
|
|
|
|
void arc_space_consume(uint64_t space, arc_space_type_t type);
|
|
void arc_space_return(uint64_t space, arc_space_type_t type);
|
|
void *arc_data_buf_alloc(uint64_t space);
|
|
void arc_data_buf_free(void *buf, uint64_t space);
|
|
arc_buf_t *arc_buf_alloc(spa_t *spa, int size, void *tag,
|
|
arc_buf_contents_t type);
|
|
arc_buf_t *arc_loan_buf(spa_t *spa, int size);
|
|
void arc_return_buf(arc_buf_t *buf, void *tag);
|
|
void arc_loan_inuse_buf(arc_buf_t *buf, void *tag);
|
|
void arc_buf_add_ref(arc_buf_t *buf, void *tag);
|
|
int arc_buf_remove_ref(arc_buf_t *buf, void *tag);
|
|
int arc_buf_size(arc_buf_t *buf);
|
|
void arc_release(arc_buf_t *buf, void *tag);
|
|
int arc_release_bp(arc_buf_t *buf, void *tag, blkptr_t *bp, spa_t *spa,
|
|
zbookmark_t *zb);
|
|
int arc_released(arc_buf_t *buf);
|
|
int arc_has_callback(arc_buf_t *buf);
|
|
void arc_buf_freeze(arc_buf_t *buf);
|
|
void arc_buf_thaw(arc_buf_t *buf);
|
|
#ifdef ZFS_DEBUG
|
|
int arc_referenced(arc_buf_t *buf);
|
|
#endif
|
|
|
|
int arc_read(zio_t *pio, spa_t *spa, const blkptr_t *bp, arc_buf_t *pbuf,
|
|
arc_done_func_t *done, void *private, int priority, int zio_flags,
|
|
uint32_t *arc_flags, const zbookmark_t *zb);
|
|
int arc_read_nolock(zio_t *pio, spa_t *spa, const blkptr_t *bp,
|
|
arc_done_func_t *done, void *private, int priority, int flags,
|
|
uint32_t *arc_flags, const zbookmark_t *zb);
|
|
zio_t *arc_write(zio_t *pio, spa_t *spa, uint64_t txg,
|
|
blkptr_t *bp, arc_buf_t *buf, boolean_t l2arc, const zio_prop_t *zp,
|
|
arc_done_func_t *ready, arc_done_func_t *done, void *private,
|
|
int priority, int zio_flags, const zbookmark_t *zb);
|
|
|
|
arc_prune_t *arc_add_prune_callback(arc_prune_func_t *func, void *private);
|
|
void arc_remove_prune_callback(arc_prune_t *p);
|
|
|
|
void arc_set_callback(arc_buf_t *buf, arc_evict_func_t *func, void *private);
|
|
int arc_buf_evict(arc_buf_t *buf);
|
|
|
|
void arc_adjust_meta(int64_t adjustment, boolean_t may_prune);
|
|
void arc_flush(spa_t *spa);
|
|
void arc_tempreserve_clear(uint64_t reserve);
|
|
int arc_tempreserve_space(uint64_t reserve, uint64_t txg);
|
|
|
|
void arc_init(void);
|
|
void arc_fini(void);
|
|
|
|
/*
|
|
* Level 2 ARC
|
|
*/
|
|
|
|
void l2arc_add_vdev(spa_t *spa, vdev_t *vd);
|
|
void l2arc_remove_vdev(vdev_t *vd);
|
|
boolean_t l2arc_vdev_present(vdev_t *vd);
|
|
void l2arc_init(void);
|
|
void l2arc_fini(void);
|
|
void l2arc_start(void);
|
|
void l2arc_stop(void);
|
|
|
|
/* Global tunings */
|
|
extern int zfs_write_limit_shift;
|
|
extern unsigned long zfs_write_limit_max;
|
|
extern kmutex_t zfs_write_limit_lock;
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
|
|
#endif /* _SYS_ARC_H */
|